From 65b79d567b6161a7a296c27c85c194e82af95ac1 Mon Sep 17 00:00:00 2001 From: chen828 Date: Thu, 3 Jul 2025 03:47:35 +0000 Subject: [PATCH 001/746] update api/@ohos.UiTest.d.ts. Signed-off-by: chen828 --- api/@ohos.UiTest.d.ts | 334 +++++++++++++++++++++--------------------- 1 file changed, 163 insertions(+), 171 deletions(-) diff --git a/api/@ohos.UiTest.d.ts b/api/@ohos.UiTest.d.ts index 7ffdeef4a4..f79f487cfb 100755 --- a/api/@ohos.UiTest.d.ts +++ b/api/@ohos.UiTest.d.ts @@ -1078,14 +1078,14 @@ declare interface Point { /** * The x-coordinate of the coordinate point. * - * @type { number } + * @type { int } * @syscap SystemCapability.Test.UiTest * @crossplatform * @atomicservice * @since arkts {'1.1':'20','1.2':'20'} * @arkts 1.1&1.2 */ - x: number; + x: int; /** * The y-coordinate of the coordinate point. * @@ -1116,14 +1116,14 @@ declare interface Point { /** * The y-coordinate of the coordinate point. * - * @type { number } + * @type { int } * @syscap SystemCapability.Test.UiTest * @crossplatform * @atomicservice * @since arkts {'1.1':'20','1.2':'20'} * @arkts 1.1&1.2 */ - y: number; + y: int; /** * The displayId to which the coordinate point belongs, default is the displayId of the main scrren. * @@ -1191,14 +1191,14 @@ declare interface Rect { /** * The x-coordinate of the top left corner of the rectangle. * - * @type { number } + * @type { int } * @syscap SystemCapability.Test.UiTest * @crossplatform * @atomicservice * @since arkts {'1.1':'20','1.2':'20'} * @arkts 1.1&1.2 */ - left: number; + left: int; /** * The y-coordinate of the top left corner of the rectangle. * @@ -1229,14 +1229,14 @@ declare interface Rect { /** * The y-coordinate of the top left corner of the rectangle. * - * @type { number } + * @type { int } * @syscap SystemCapability.Test.UiTest * @crossplatform * @atomicservice * @since arkts {'1.1':'20','1.2':'20'} * @arkts 1.1&1.2 */ - top: number; + top: int; /** * The x-coordinate at the bottom right corner of the rectangle. * @@ -1267,14 +1267,14 @@ declare interface Rect { /** * The x-coordinate at the bottom right corner of the rectangle. * - * @type { number } + * @type { int } * @syscap SystemCapability.Test.UiTest * @crossplatform * @atomicservice * @since arkts {'1.1':'20','1.2':'20'} * @arkts 1.1&1.2 */ - right: number; + right: int; /** * The y-coordinate at the bottom right corner of the rectangle. * @@ -1305,23 +1305,14 @@ declare interface Rect { /** * The y-coordinate at the bottom right corner of the rectangle. * - * @type { number } + * @type { int } * @syscap SystemCapability.Test.UiTest * @crossplatform * @atomicservice * @since arkts {'1.1':'20','1.2':'20'} * @arkts 1.1&1.2 */ - bottom: number; - /** - * The displayId to which the rect belongs, default is the displayId of the main screen. - * - * @type { ?number } - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since 20 - */ - displayId?: number; + bottom: int; } /** @@ -1423,7 +1414,7 @@ declare interface WindowFilter { * @arkts 1.1&1.2 */ active?: boolean; - + /** * Find the window in the specified ID display. By default, it searches all displays. * @@ -1807,14 +1798,14 @@ declare interface TouchPadSwipeOptions { /** * Speed(pixels per second) of touchpad multi-finger swipe, default is 2000, the value ranges from 200 to 40000,set it 2000 if out of range. - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Test.UiTest * @atomicservice * @since arkts {'1.1':'18','1.2':'20'} * @test * @arkts 1.1&1.2 */ - speed?: number; + speed?: int; } /** @@ -3128,7 +3119,7 @@ declare class Component { /** * Scroll on this {@link Component} to the top,applicable to scrollable one. * - * @param { number } [speed] - the speed of swipe(pixels per second),ranges from 200 to 40000.Set it default 600 if out of range or null or undefined. + * @param { int } [speed] - the speed of swipe(pixels per second),ranges from 200 to 40000.Set it default 600 if out of range or null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Incorrect parameter types; 2. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -3140,7 +3131,7 @@ declare class Component { * @test * @arkts 1.1&1.2 */ - scrollToTop(speed?: number): Promise; + scrollToTop(speed?: int): Promise; /** * Scroll on this {@link Component} to the bottom,applicable to scrollable one. @@ -3170,7 +3161,7 @@ declare class Component { /** * Scroll on this {@link Component} to the bottom,applicable to scrollable one. * - * @param { number } [speed] - the speed of swipe(pixels per second),ranges from 200 to 40000. Set it default 600 if out of range or null or undefined. + * @param { int } [speed] - the speed of swipe(pixels per second),ranges from 200 to 40000. Set it default 600 if out of range or null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Incorrect parameter types; 2. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -3182,7 +3173,7 @@ declare class Component { * @test * @arkts 1.1&1.2 */ - scrollToBottom(speed?: number): Promise; + scrollToBottom(speed?: int): Promise; /** * Get the bounds rect of this {@link Component}. @@ -3219,6 +3210,62 @@ declare class Component { * @arkts 1.1&1.2 */ getBounds(): Promise; + /** + * Pinch enlarge this {@link Component} to the target scale. + * + * @param { number } scale The scale of the pinch enlarge this {@link Component}'s size. + * @returns { Promise } + * @throws { BusinessError } 401 - if the input parameters are invalid. + * @throws { BusinessError } 17000002 - if the async function was not called with await. + * @throws { BusinessError } 17000004 - if the component is invisible or destroyed. + * @syscap SystemCapability.Test.UiTest + * @since 9 + * @test + */ + /** + * Pinch enlarge this {@link Component} to the target scale. + * + * @param { double } scale - the scale of the pinch enlarge this {@link Component}'s size, ranges greater than 1. + * @returns { Promise } + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17000002 - The async function is not called with await. + * @throws { BusinessError } 17000004 - The window or component is invisible or destroyed. + * @syscap SystemCapability.Test.UiTest + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} + * @test + * @arkts 1.1&1.2 + */ + pinchOut(scale: double): Promise; + /** + * Pinch shrink this {@link Component} to the target scale. + * + * @param { number } scale The scale of the pinch shrink this {@link Component}'s size. + * @returns { Promise } + * @throws { BusinessError } 401 - if the input parameters are invalid. + * @throws { BusinessError } 17000002 - if the async function was not called with await. + * @throws { BusinessError } 17000004 - if the component is invisible or destroyed. + * @syscap SystemCapability.Test.UiTest + * @since 9 + * @test + */ + /** + * Pinch shrink this {@link Component} to the target scale. + * + * @param { double } scale - the scale of the pinch shrink this {@link Component}'s size, ranges from 0 to 1. + * @returns { Promise } + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17000002 - The async function is not called with await. + * @throws { BusinessError } 17000004 - The window or component is invisible or destroyed. + * @syscap SystemCapability.Test.UiTest + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} + * @test + * @arkts 1.1&1.2 + */ + pinchIn(scale: double): Promise; /** * Scroll on this {@link Component}to find matched {@link Component},applicable to scrollable one. * @@ -3324,63 +3371,8 @@ declare class Component { */ dragTo(target: Component): Promise; - /** - * Pinch enlarge this {@link Component} to the target scale. - * - * @param { number } scale The scale of the pinch enlarge this {@link Component}'s size. - * @returns { Promise } - * @throws { BusinessError } 401 - if the input parameters are invalid. - * @throws { BusinessError } 17000002 - if the async function was not called with await. - * @throws { BusinessError } 17000004 - if the component is invisible or destroyed. - * @syscap SystemCapability.Test.UiTest - * @since 9 - * @test - */ - /** - * Pinch enlarge this {@link Component} to the target scale. - * - * @param { number } scale - the scale of the pinch enlarge this {@link Component}'s size, ranges greater than 1. - * @returns { Promise } - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17000002 - The async function is not called with await. - * @throws { BusinessError } 17000004 - The window or component is invisible or destroyed. - * @syscap SystemCapability.Test.UiTest - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @test - * @arkts 1.1&1.2 - */ - pinchOut(scale: number): Promise; - /** - * Pinch shrink this {@link Component} to the target scale. - * - * @param { number } scale The scale of the pinch shrink this {@link Component}'s size. - * @returns { Promise } - * @throws { BusinessError } 401 - if the input parameters are invalid. - * @throws { BusinessError } 17000002 - if the async function was not called with await. - * @throws { BusinessError } 17000004 - if the component is invisible or destroyed. - * @syscap SystemCapability.Test.UiTest - * @since 9 - * @test - */ - /** - * Pinch shrink this {@link Component} to the target scale. - * - * @param { number } scale - the scale of the pinch shrink this {@link Component}'s size, ranges from 0 to 1. - * @returns { Promise } - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17000002 - The async function is not called with await. - * @throws { BusinessError } 17000004 - The window or component is invisible or destroyed. - * @syscap SystemCapability.Test.UiTest - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @test - * @arkts 1.1&1.2 - */ - pinchIn(scale: number): Promise; + /** * Scroll on this {@link Component}to find matched {@link Component},applicable to scrollable one. * @@ -3444,7 +3436,7 @@ declare class Component { * * @param { On } on - the attribute requirements of the target {@link Component}. * @param { boolean } [vertical] - Whether the swipe direction is vertical, default is true. - * @param { number } [offset] - Offset from the swipe start/end point to the component border, default is 80. + * @param { int } [offset] - Offset from the swipe start/end point to the component border, default is 80. * @returns { Promise } the found result,or null if not found. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -3455,7 +3447,7 @@ declare class Component { * @test * @arkts 1.2 */ - scrollSearch(on: On, vertical?: boolean, offset?: number): Promise; + scrollSearch(on: On, vertical?: boolean, offset?: int): Promise; /** * Get the original text attribute value. * If the accessibility property 'accessibilityLevel' of a component is set to 'no' or 'no-hide-descendants', @@ -3561,7 +3553,7 @@ declare class Driver { /** * Delay with specified duration. * - * @param { number } duration - the delay duration in milliseconds, not less than 0. + * @param { int } duration - the delay duration in milliseconds, not less than 0. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -3572,7 +3564,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - delayMs(duration: number): Promise; + delayMs(duration: int): Promise; /** * Find the first matched {@link Component} on current UI. @@ -3693,7 +3685,7 @@ declare class Driver { * Find the first matched {@link Component} on current UI during the time given. * * @param { On } on - the attribute requirements of the target {@link Component}. - * @param { number } time - duration of finding in milliseconds, not less than 0. + * @param { int } time - duration of finding in milliseconds, not less than 0. * @returns { Promise } the first matched {@link Component} or undefined. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -3703,7 +3695,7 @@ declare class Driver { * @test * @arkts 1.2 */ - waitForComponent(on: On, time: number): Promise; + waitForComponent(on: On, time: int): Promise; /** * Find all the matched {@link Component}s on current UI. * @@ -3858,7 +3850,7 @@ declare class Driver { /** * Press the specified key. * - * @param { number } keyCode - the target keyCode. + * @param { int } keyCode - the target keyCode. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -3869,7 +3861,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - triggerKey(keyCode: number): Promise; + triggerKey(keyCode: int): Promise; /** * Press the specified key on the specified display. @@ -3902,9 +3894,9 @@ declare class Driver { /** * Press two or three key combinations * - * @param { number } key0 - the first keyCode. - * @param { number } key1 - the second keyCode. - * @param { number } [key2] - the third keyCode,set it default 0 if null or undefined. + * @param { int } key0 - the first keyCode. + * @param { int } key1 - the second keyCode. + * @param { int } [key2] - the third keyCode,set it default 0 if null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -3915,7 +3907,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - triggerCombineKeys(key0: number, key1: number, key2?: number): Promise; + triggerCombineKeys(key0: int, key1: int, key2?: int): Promise; /** * Press two or three key combinations on the specified display. @@ -3962,8 +3954,8 @@ declare class Driver { /** * Click on the specified location on the screen. * - * @param { number } x - the x-coordinate, not less than 0. - * @param { number } y - the y-coordinate, not less than 0. + * @param { int } x - the x-coordinate, not less than 0. + * @param { int } y - the y-coordinate, not less than 0. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -3974,7 +3966,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - click(x: number, y: number): Promise; + click(x: int, y: int): Promise; /** * DoubleClick on the specified location on the screen. @@ -4004,8 +3996,8 @@ declare class Driver { /** * DoubleClick on the specified location on the screen. * - * @param { number } x - the x-coordinate, not less than 0. - * @param { number } y - the y-coordinate, not less than 0. + * @param { int } x - the x-coordinate, not less than 0. + * @param { int } y - the y-coordinate, not less than 0. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4016,7 +4008,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - doubleClick(x: number, y: number): Promise; + doubleClick(x: int, y: int): Promise; /** * LongClick on the specified location on the screen. @@ -4046,8 +4038,8 @@ declare class Driver { /** * LongClick on the specified location on the screen. * - * @param { number } x - the x-coordinate, not less than 0. - * @param { number } y - the y-coordinate, not less than 0. + * @param { int } x - the x-coordinate, not less than 0. + * @param { int } y - the y-coordinate, not less than 0. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4058,7 +4050,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - longClick(x: number, y: number): Promise; + longClick(x: int, y: int): Promise; /** * Swipe on the screen between the specified points. @@ -4094,11 +4086,11 @@ declare class Driver { /** * Swipe on the screen between the specified points. * - * @param { number } startx - the x-coordinate of the starting point, not less than 0. - * @param { number } starty - the y-coordinate of the starting point, not less than 0. - * @param { number } endx - the x-coordinate of the ending point, not less than 0. - * @param { number } endy - the y-coordinate of the ending point, not less than 0. - * @param { number } [speed] - the speed of swipe(pixels per second),ranges from 200 to 40000. Set it default 600 if out of range or null or undefined. + * @param { int } startx - the x-coordinate of the starting point, not less than 0. + * @param { int } starty - the y-coordinate of the starting point, not less than 0. + * @param { int } endx - the x-coordinate of the ending point, not less than 0. + * @param { int } endy - the y-coordinate of the ending point, not less than 0. + * @param { int } [speed] - the speed of swipe(pixels per second),ranges from 200 to 40000. Set it default 600 if out of range or null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4109,7 +4101,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - swipe(startx: number, starty: number, endx: number, endy: number, speed?: number): Promise; + swipe(startx: int, starty: int, endx: int, endy: int, speed?: int): Promise; /** * Drag on the screen between the specified points. @@ -4129,11 +4121,11 @@ declare class Driver { /** * Drag on the screen between the specified points. * - * @param { number } startx - the x-coordinate of the starting point, not less than 0. - * @param { number } starty - the y-coordinate of the starting point, not less than 0. - * @param { number } endx - the x-coordinate of the ending point, not less than 0. - * @param { number } endy - the y-coordinate of the ending point, not less than 0. - * @param { number } [speed] the speed of drag(pixels per second),ranges from 200 to 40000. Set it default 600 if out of range or null or undefined. + * @param { int } startx - the x-coordinate of the starting point, not less than 0. + * @param { int } starty - the y-coordinate of the starting point, not less than 0. + * @param { int } endx - the x-coordinate of the ending point, not less than 0. + * @param { int } endy - the y-coordinate of the ending point, not less than 0. + * @param { int } [speed] the speed of drag(pixels per second),ranges from 200 to 40000. Set it default 600 if out of range or null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4143,7 +4135,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - drag(startx: number, starty: number, endx: number, endy: number, speed?: number): Promise; + drag(startx: int, starty: int, endx: int, endy: int, speed?: int): Promise; /** * Click on the specified location on the screen. @@ -4495,8 +4487,8 @@ declare class Driver { /** * Wait for the UI become idle. * - * @param { number } idleTime - the threshold of UI idle time, in millisecond, not less than 0. - * @param { number } timeout - the maximum time to wait for idle, in millisecond, not less than 0. + * @param { int } idleTime - the threshold of UI idle time, in millisecond, not less than 0. + * @param { int } timeout - the maximum time to wait for idle, in millisecond, not less than 0. * @returns { Promise } true if wait for idle succeed in the timeout, false otherwise. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4506,7 +4498,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - waitForIdle(idleTime: number, timeout: number): Promise; + waitForIdle(idleTime: int, timeout: int): Promise; /** * Inject fling on the device display. @@ -4542,8 +4534,8 @@ declare class Driver { * * @param { Point } from - the coordinate point where the finger touches the screen. * @param { Point } to - the coordinate point where the finger leaves the screen. - * @param { number } stepLen - the length of each step, in pixels. - * @param { number } [speed] - the speed of fling(pixels per second),ranges from 200 to 40000. Set it default 600 if out of range or null or undefined. + * @param { int } stepLen - the length of each step, in pixels. + * @param { int } [speed] - the speed of fling(pixels per second),ranges from 200 to 40000. Set it default 600 if out of range or null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4554,7 +4546,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - fling(from: Point, to: Point, stepLen: number, speed: number): Promise; + fling(from: Point, to: Point, stepLen: int, speed: int): Promise; /** * Inject multi-pointer action on the device display. @@ -4572,7 +4564,7 @@ declare class Driver { * Inject multi-pointer action on the device display. * * @param { PointerMatrix } pointers - the two-dimensional array of pointers to inject. - * @param { number } [speed] - the speed of swipe(pixels per second),ranges from 200 to 40000. Set it default 600 if out of range or null or undefined. + * @param { int } [speed] - the speed of swipe(pixels per second),ranges from 200 to 40000. Set it default 600 if out of range or null or undefined. * @returns { Promise } true if the operation finished, false * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4583,7 +4575,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - injectMultiPointerAction(pointers: PointerMatrix, speed?: number): Promise; + injectMultiPointerAction(pointers: PointerMatrix, speed?: int): Promise; /** * Inject fling on the device display. @@ -4614,7 +4606,7 @@ declare class Driver { * Inject fling on the device display. * * @param { UiDirection } direction - the direction of this action. - * @param { number } speed - the speed of fling (pixels per second),default is 600,the value ranges from 200 to 40000,set it 600 if out of range. + * @param { int } speed - the speed of fling (pixels per second),default is 600,the value ranges from 200 to 40000,set it 600 if out of range. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4625,7 +4617,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - fling(direction: UiDirection, speed: number): Promise; + fling(direction: UiDirection, speed: int): Promise; /** * Inject fling on the specified device display. @@ -4662,8 +4654,8 @@ declare class Driver { * * @param { Point } p - the coordinate of the specified location. * @param { MouseButton } btnId - the button of Mouse. - * @param { number } [key1] - the first keyCode,set it default 0 if null or undefined. - * @param { number } [key2] - the second keyCode,set it default 0 if null or undefined. + * @param { int } [key1] - the first keyCode,set it default 0 if null or undefined. + * @param { int } [key2] - the second keyCode,set it default 0 if null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4673,7 +4665,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - mouseClick(p: Point, btnId: MouseButton, key1?: number, key2?: number): Promise; + mouseClick(p: Point, btnId: MouseButton, key1?: int, key2?: int): Promise; /** * Move the mouse cursor to the specified location. @@ -4721,9 +4713,9 @@ declare class Driver { * * @param { Point } p - the coordinate of the specified location. * @param { boolean } down - whether the mouse wheel rolls down. - * @param { number } d - the number of cells that the mouse wheel scrolls, each cell will make the target point shift 120 pixels. - * @param { number } [key1] - the first keyCode,set it default 0 if null or undefined. - * @param { number } [key2] - the second keyCode,set it default 0 if null or undefined. + * @param { int } d - the number of cells that the mouse wheel scrolls, each cell will make the target point shift 120 pixels. + * @param { int } [key1] - the first keyCode,set it default 0 if null or undefined. + * @param { int } [key2] - the second keyCode,set it default 0 if null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4733,17 +4725,17 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - mouseScroll(p: Point, down: boolean, d: number, key1?: number, key2?: number): Promise; + mouseScroll(p: Point, down: boolean, d: int, key1?: int, key2?: int): Promise; /** * The mouse wheel scrolls the specified cell at the specified position, and press the specified key simultaneously if necessary. * * @param { Point } p - the coordinate of the specified location. * @param { boolean } down - whether the mouse wheel rolls down. - * @param { number } d - the number of cells that the mouse wheel scrolls, each cell will make the target point shift 120 pixels. - * @param { number } [key1] - the first keyCode,set it default 0 if null or undefined. - * @param { number } [key2] - the second keyCode,set it default 0 if null or undefined. - * @param { number } [speed] - The Speed of mouse wheel rolls(cells per second),ranges from 1 to 500.Set it default 20 if out of range or null or undefined. + * @param { int } d - the number of cells that the mouse wheel scrolls, each cell will make the target point shift 120 pixels. + * @param { int } [key1] - the first keyCode,set it default 0 if null or undefined. + * @param { int } [key2] - the second keyCode,set it default 0 if null or undefined. + * @param { int } [speed] - The Speed of mouse wheel rolls(cells per second),ranges from 1 to 500.Set it default 20 if out of range or null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4753,7 +4745,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - mouseScroll(p: Point, down: boolean, d: number, key1?: number, key2?: number, speed?: number): Promise; + mouseScroll(p: Point, down: boolean, d: int, key1?: int, key2?: int, speed?: int): Promise; /** * Capture the specified area of current screen and save as picture which PNG format. @@ -4810,8 +4802,8 @@ declare class Driver { * * @param { Point } p - the coordinate of the specified location. * @param { MouseButton } btnId - the button of Mouse. - * @param { number } [key1] - the first keyCode,set it default 0 if null or undefined. - * @param { number } [key2] - the second keyCode,set it default 0 if null or undefined. + * @param { int } [key1] - the first keyCode,set it default 0 if null or undefined. + * @param { int } [key2] - the second keyCode,set it default 0 if null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4821,15 +4813,15 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - mouseDoubleClick(p: Point, btnId: MouseButton, key1?: number, key2?: number): Promise; + mouseDoubleClick(p: Point, btnId: MouseButton, key1?: int, key2?: int): Promise; /** * Long click on the specified location on the screen with the specified mouse button, and press the specified key simultaneously if necessary. * * @param { Point } p - the coordinate of the specified location. * @param { MouseButton } btnId - the button of Mouse. - * @param { number } [key1] - the first keyCode,set it default 0 if null or undefined. - * @param { number } [key2] - the second keyCode,set it default 0 if null or undefined. + * @param { int } [key1] - the first keyCode,set it default 0 if null or undefined. + * @param { int } [key2] - the second keyCode,set it default 0 if null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4839,7 +4831,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - mouseLongClick(p: Point, btnId: MouseButton, key1?: number, key2?: number): Promise; + mouseLongClick(p: Point, btnId: MouseButton, key1?: int, key2?: int): Promise; /** * Long click on the specified location on the screen with the specified mouse button, and press the specified key simultaneously if necessary. @@ -4864,7 +4856,7 @@ declare class Driver { * * @param { Point } from - the starting point. * @param { Point } to - the ending point. - * @param { number } [speed] - speed of swipe (pixels per second),the value ranges from 200 to 40000.Set it default 600 if out of range or null or undefined. + * @param { int } [speed] - speed of swipe (pixels per second),the value ranges from 200 to 40000.Set it default 600 if out of range or null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4874,14 +4866,14 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - mouseMoveWithTrack(from: Point, to: Point, speed?: number): Promise; + mouseMoveWithTrack(from: Point, to: Point, speed?: int): Promise; /** * Hold down the left mouse button and drag on the screen between the specified points. * * @param { Point } from - the starting point. * @param { Point } to - the ending point. - * @param { number } [speed] - speed of drag (pixels per second),the value ranges from 200 to 40000,Set it default 600 if out of range or null or undefined. + * @param { int } [speed] - speed of drag (pixels per second),the value ranges from 200 to 40000,Set it default 600 if out of range or null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4891,7 +4883,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - mouseDrag(from: Point, to: Point, speed?: number): Promise; + mouseDrag(from: Point, to: Point, speed?: int): Promise; /** * Hold down the left mouse button and drag on the screen between the specified points. @@ -4945,7 +4937,7 @@ declare class Driver { /** * Simulate touchpad multi-finger swipe gestures. - * @param { number } fingers Finger count of touchpad multi-finger swipe, ranges from 3 to 4. + * @param { int } fingers Finger count of touchpad multi-finger swipe, ranges from 3 to 4. * @param { UiDirection } direction Direction of touchpad multi-finger swipe. * @param { TouchPadSwipeOptions } [options] Additional options touchpad multi-finger swipe gestures, set its parameters to default values if null or undefined. * @returns { Promise } @@ -4958,7 +4950,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - touchPadMultiFingerSwipe(fingers: number, direction: UiDirection, options?: TouchPadSwipeOptions): Promise; + touchPadMultiFingerSwipe(fingers: int, direction: UiDirection, options?: TouchPadSwipeOptions): Promise; /** * Simulate pen click operation. @@ -4977,7 +4969,7 @@ declare class Driver { /** * Simulate pen long click operation. * @param { Point } point Coordinate of the specified location. - * @param { number } [pressure] Pressure of pen long click operation, default is 1.0, the value ranges from 0.0 to 1.0. + * @param { double } [pressure] Pressure of pen long click operation, default is 1.0, the value ranges from 0.0 to 1.0. * @returns { Promise } * @throws { BusinessError } 401 Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 The async function is not called with await. @@ -4987,7 +4979,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - penLongClick(point: Point, pressure?: number): Promise; + penLongClick(point: Point, pressure?: double): Promise; /** * Simulate pen double click operation. @@ -5007,8 +4999,8 @@ declare class Driver { * Simulate pen swipe operation. * @param { Point } startPoint Coordinate of the specified location. * @param { Point } endPoint Coordinate of the specified location. - * @param { number } [speed] Speed(pixels per second) of pen swipe, default is 600,the value ranges from 200 to 40000,set it 600 if out of range. - * @param { number } [pressure] Pressure of pen swipe operation, default is 1.0, the value ranges from 0.0 to 1.0. + * @param { int } [speed] Speed(pixels per second) of pen swipe, default is 600,the value ranges from 200 to 40000,set it 600 if out of range. + * @param { double } [pressure] Pressure of pen swipe operation, default is 1.0, the value ranges from 0.0 to 1.0. * @returns { Promise } * @throws { BusinessError } 401 Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 The async function is not called with await. @@ -5018,13 +5010,13 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - penSwipe(startPoint: Point, endPoint: Point, speed?: number, pressure?: number): Promise; + penSwipe(startPoint: Point, endPoint: Point, speed?: int, pressure?: double): Promise; /** * Inject pen multi-pointer action on the device display. * @param { PointerMatrix } pointers The two-dimensional array of pointers to inject. - * @param { number } [speed] Speed(pixels per second) of inject pen pointer action, default is 600,the value ranges from 200 to 40000,set it 600 if out of range. - * @param { number } [pressure] Pressure of inject pen pointer action operation, default is 1.0, the value ranges from 0.0 to 1.0. + * @param { int } [speed] Speed(pixels per second) of inject pen pointer action, default is 600,the value ranges from 200 to 40000,set it 600 if out of range. + * @param { double } [pressure] Pressure of inject pen pointer action operation, default is 1.0, the value ranges from 0.0 to 1.0. * @returns { Promise } * @throws { BusinessError } 401 Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 The async function is not called with await. @@ -5034,7 +5026,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - injectPenPointerAction(pointers: PointerMatrix, speed?: number, pressure?: number): Promise; + injectPenPointerAction(pointers: PointerMatrix, speed?: int, pressure?: double): Promise; /** * Inject a watch crown rotation event, specifies the rotation speed if necessary. @@ -5254,8 +5246,8 @@ declare class UiWindow { /** * Move this {@link UiWindow} to the specified points. * - * @param { number } x - the x coordinate of destination, not less than 0. - * @param { number } y - the y coordinate of destination, not less than 0. + * @param { int } x - the x coordinate of destination, not less than 0. + * @param { int } y - the y coordinate of destination, not less than 0. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -5267,7 +5259,7 @@ declare class UiWindow { * @test * @arkts 1.1&1.2 */ - moveTo(x: number, y: number): Promise; + moveTo(x: int, y: int): Promise; /** * Resize this {@link UiWindow} to the specified size for the specified direction. @@ -5287,8 +5279,8 @@ declare class UiWindow { /** * Resize this {@link UiWindow} to the specified size for the specified direction. * - * @param { number } wide - the expected wide of the window after resizing. - * @param { number } height - the expected height of the window after resizing. + * @param { int } wide - the expected wide of the window after resizing. + * @param { int } height - the expected height of the window after resizing. * @param { ResizeDirection } direction - the expected direction of the window after resizing. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. @@ -5301,7 +5293,7 @@ declare class UiWindow { * @test * @arkts 1.1&1.2 */ - resize(wide: number, height: number, direction: ResizeDirection): Promise; + resize(wide: int, height: int, direction: ResizeDirection): Promise; /** * Change this {@link UiWindow} into split screen mode. @@ -5495,8 +5487,8 @@ declare class PointerMatrix { /** * Create an {@link PointerMatrix} object. * - * @param { number } fingers - The number of fingers, ranges from 1 to 10. - * @param { number } steps - The number of steps of each finger trace, ranges from 1 to 1000. + * @param { int } fingers - The number of fingers, ranges from 1 to 10. + * @param { int } steps - The number of steps of each finger trace, ranges from 1 to 1000. * @returns { PointerMatrix } the {@link PointerMatrix} object. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.Test.UiTest @@ -5506,7 +5498,7 @@ declare class PointerMatrix { * @test * @arkts 1.1&1.2 */ - static create(fingers: number, steps: number): PointerMatrix; + static create(fingers: int, steps: int): PointerMatrix; /** * Set the point value of an element in the PointerMatrix. @@ -5522,8 +5514,8 @@ declare class PointerMatrix { /** * Set the point value of an element in the PointerMatrix. * - * @param { number } finger - the index of target finger to set. - * @param { number } step - the index of target step to set. + * @param { int } finger - the index of target finger to set. + * @param { int } step - the index of target step to set. * @param { Point } point - the coordinate of target step to set. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.Test.UiTest @@ -5533,7 +5525,7 @@ declare class PointerMatrix { * @test * @arkts 1.1&1.2 */ - setPoint(finger: number, step: number, point: Point): void; + setPoint(finger: int, step: int, point: Point): void; } /** -- Gitee From ba8c588aa5c63cfc64bd314ef4046d026386b9d7 Mon Sep 17 00:00:00 2001 From: chen828 Date: Thu, 3 Jul 2025 06:40:36 +0000 Subject: [PATCH 002/746] update api/@ohos.UiTest.d.ts. Signed-off-by: chen828 --- api/@ohos.UiTest.d.ts | 332 ++++++++++++++++++++++-------------------- 1 file changed, 171 insertions(+), 161 deletions(-) diff --git a/api/@ohos.UiTest.d.ts b/api/@ohos.UiTest.d.ts index f79f487cfb..5d3c32e267 100755 --- a/api/@ohos.UiTest.d.ts +++ b/api/@ohos.UiTest.d.ts @@ -1078,14 +1078,14 @@ declare interface Point { /** * The x-coordinate of the coordinate point. * - * @type { int } + * @type { int } * @syscap SystemCapability.Test.UiTest * @crossplatform * @atomicservice * @since arkts {'1.1':'20','1.2':'20'} * @arkts 1.1&1.2 */ - x: int; + x: int; /** * The y-coordinate of the coordinate point. * @@ -1116,14 +1116,14 @@ declare interface Point { /** * The y-coordinate of the coordinate point. * - * @type { int } + * @type { int } * @syscap SystemCapability.Test.UiTest * @crossplatform * @atomicservice * @since arkts {'1.1':'20','1.2':'20'} * @arkts 1.1&1.2 */ - y: int; + y: int; /** * The displayId to which the coordinate point belongs, default is the displayId of the main scrren. * @@ -1191,14 +1191,14 @@ declare interface Rect { /** * The x-coordinate of the top left corner of the rectangle. * - * @type { int } + * @type { int } * @syscap SystemCapability.Test.UiTest * @crossplatform * @atomicservice * @since arkts {'1.1':'20','1.2':'20'} * @arkts 1.1&1.2 */ - left: int; + left: int; /** * The y-coordinate of the top left corner of the rectangle. * @@ -1229,14 +1229,14 @@ declare interface Rect { /** * The y-coordinate of the top left corner of the rectangle. * - * @type { int } + * @type { int } * @syscap SystemCapability.Test.UiTest * @crossplatform * @atomicservice * @since arkts {'1.1':'20','1.2':'20'} * @arkts 1.1&1.2 */ - top: int; + top: int; /** * The x-coordinate at the bottom right corner of the rectangle. * @@ -1267,14 +1267,14 @@ declare interface Rect { /** * The x-coordinate at the bottom right corner of the rectangle. * - * @type { int } + * @type { int } * @syscap SystemCapability.Test.UiTest * @crossplatform * @atomicservice * @since arkts {'1.1':'20','1.2':'20'} * @arkts 1.1&1.2 */ - right: int; + right: int; /** * The y-coordinate at the bottom right corner of the rectangle. * @@ -1305,14 +1305,23 @@ declare interface Rect { /** * The y-coordinate at the bottom right corner of the rectangle. * - * @type { int } + * @type { int } * @syscap SystemCapability.Test.UiTest * @crossplatform * @atomicservice * @since arkts {'1.1':'20','1.2':'20'} * @arkts 1.1&1.2 */ - bottom: int; + bottom: int; + /** + * The displayId to which the rect belongs, default is the displayId of the main screen. + * + * @type { ?number } + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since 20 + */ + displayId?: number; } /** @@ -1798,14 +1807,14 @@ declare interface TouchPadSwipeOptions { /** * Speed(pixels per second) of touchpad multi-finger swipe, default is 2000, the value ranges from 200 to 40000,set it 2000 if out of range. - * @type { ?int } + * @type { ?int } * @syscap SystemCapability.Test.UiTest * @atomicservice * @since arkts {'1.1':'18','1.2':'20'} * @test * @arkts 1.1&1.2 */ - speed?: int; + speed?: int; } /** @@ -3119,7 +3128,7 @@ declare class Component { /** * Scroll on this {@link Component} to the top,applicable to scrollable one. * - * @param { int } [speed] - the speed of swipe(pixels per second),ranges from 200 to 40000.Set it default 600 if out of range or null or undefined. + * @param { int } [speed] - the speed of swipe(pixels per second),ranges from 200 to 40000.Set it default 600 if out of range or null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Incorrect parameter types; 2. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -3131,7 +3140,7 @@ declare class Component { * @test * @arkts 1.1&1.2 */ - scrollToTop(speed?: int): Promise; + scrollToTop(speed?: int): Promise; /** * Scroll on this {@link Component} to the bottom,applicable to scrollable one. @@ -3161,7 +3170,7 @@ declare class Component { /** * Scroll on this {@link Component} to the bottom,applicable to scrollable one. * - * @param { int } [speed] - the speed of swipe(pixels per second),ranges from 200 to 40000. Set it default 600 if out of range or null or undefined. + * @param { int } [speed] - the speed of swipe(pixels per second),ranges from 200 to 40000. Set it default 600 if out of range or null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Incorrect parameter types; 2. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -3173,7 +3182,7 @@ declare class Component { * @test * @arkts 1.1&1.2 */ - scrollToBottom(speed?: int): Promise; + scrollToBottom(speed?: int): Promise; /** * Get the bounds rect of this {@link Component}. @@ -3210,62 +3219,7 @@ declare class Component { * @arkts 1.1&1.2 */ getBounds(): Promise; - /** - * Pinch enlarge this {@link Component} to the target scale. - * - * @param { number } scale The scale of the pinch enlarge this {@link Component}'s size. - * @returns { Promise } - * @throws { BusinessError } 401 - if the input parameters are invalid. - * @throws { BusinessError } 17000002 - if the async function was not called with await. - * @throws { BusinessError } 17000004 - if the component is invisible or destroyed. - * @syscap SystemCapability.Test.UiTest - * @since 9 - * @test - */ - /** - * Pinch enlarge this {@link Component} to the target scale. - * - * @param { double } scale - the scale of the pinch enlarge this {@link Component}'s size, ranges greater than 1. - * @returns { Promise } - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17000002 - The async function is not called with await. - * @throws { BusinessError } 17000004 - The window or component is invisible or destroyed. - * @syscap SystemCapability.Test.UiTest - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @test - * @arkts 1.1&1.2 - */ - pinchOut(scale: double): Promise; - /** - * Pinch shrink this {@link Component} to the target scale. - * - * @param { number } scale The scale of the pinch shrink this {@link Component}'s size. - * @returns { Promise } - * @throws { BusinessError } 401 - if the input parameters are invalid. - * @throws { BusinessError } 17000002 - if the async function was not called with await. - * @throws { BusinessError } 17000004 - if the component is invisible or destroyed. - * @syscap SystemCapability.Test.UiTest - * @since 9 - * @test - */ - /** - * Pinch shrink this {@link Component} to the target scale. - * - * @param { double } scale - the scale of the pinch shrink this {@link Component}'s size, ranges from 0 to 1. - * @returns { Promise } - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17000002 - The async function is not called with await. - * @throws { BusinessError } 17000004 - The window or component is invisible or destroyed. - * @syscap SystemCapability.Test.UiTest - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @test - * @arkts 1.1&1.2 - */ - pinchIn(scale: double): Promise; + /** * Scroll on this {@link Component}to find matched {@link Component},applicable to scrollable one. * @@ -3370,7 +3324,63 @@ declare class Component { * @arkts 1.1&1.2 */ dragTo(target: Component): Promise; - + + /** + * Pinch enlarge this {@link Component} to the target scale. + * + * @param { number } scale The scale of the pinch enlarge this {@link Component}'s size. + * @returns { Promise } + * @throws { BusinessError } 401 - if the input parameters are invalid. + * @throws { BusinessError } 17000002 - if the async function was not called with await. + * @throws { BusinessError } 17000004 - if the component is invisible or destroyed. + * @syscap SystemCapability.Test.UiTest + * @since 9 + * @test + */ + /** + * Pinch enlarge this {@link Component} to the target scale. + * + * @param { double } scale - the scale of the pinch enlarge this {@link Component}'s size, ranges greater than 1. + * @returns { Promise } + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17000002 - The async function is not called with await. + * @throws { BusinessError } 17000004 - The window or component is invisible or destroyed. + * @syscap SystemCapability.Test.UiTest + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} + * @test + * @arkts 1.1&1.2 + */ + pinchOut(scale: double): Promise; + /** + * Pinch shrink this {@link Component} to the target scale. + * + * @param { number } scale The scale of the pinch shrink this {@link Component}'s size. + * @returns { Promise } + * @throws { BusinessError } 401 - if the input parameters are invalid. + * @throws { BusinessError } 17000002 - if the async function was not called with await. + * @throws { BusinessError } 17000004 - if the component is invisible or destroyed. + * @syscap SystemCapability.Test.UiTest + * @since 9 + * @test + */ + /** + * Pinch shrink this {@link Component} to the target scale. + * + * @param { double } scale - the scale of the pinch shrink this {@link Component}'s size, ranges from 0 to 1. + * @returns { Promise } + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17000002 - The async function is not called with await. + * @throws { BusinessError } 17000004 - The window or component is invisible or destroyed. + * @syscap SystemCapability.Test.UiTest + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} + * @test + * @arkts 1.1&1.2 + */ + pinchIn(scale: double): Promise; /** @@ -3447,7 +3457,7 @@ declare class Component { * @test * @arkts 1.2 */ - scrollSearch(on: On, vertical?: boolean, offset?: int): Promise; + scrollSearch(on: On, vertical?: boolean, offset?: int): Promise; /** * Get the original text attribute value. * If the accessibility property 'accessibilityLevel' of a component is set to 'no' or 'no-hide-descendants', @@ -3553,7 +3563,7 @@ declare class Driver { /** * Delay with specified duration. * - * @param { int } duration - the delay duration in milliseconds, not less than 0. + * @param { int } duration - the delay duration in milliseconds, not less than 0. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -3564,7 +3574,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - delayMs(duration: int): Promise; + delayMs(duration: int): Promise; /** * Find the first matched {@link Component} on current UI. @@ -3695,7 +3705,7 @@ declare class Driver { * @test * @arkts 1.2 */ - waitForComponent(on: On, time: int): Promise; + waitForComponent(on: On, time: int): Promise; /** * Find all the matched {@link Component}s on current UI. * @@ -3850,7 +3860,7 @@ declare class Driver { /** * Press the specified key. * - * @param { int } keyCode - the target keyCode. + * @param { int } keyCode - the target keyCode. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -3861,7 +3871,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - triggerKey(keyCode: int): Promise; + triggerKey(keyCode: int): Promise; /** * Press the specified key on the specified display. @@ -3894,9 +3904,9 @@ declare class Driver { /** * Press two or three key combinations * - * @param { int } key0 - the first keyCode. - * @param { int } key1 - the second keyCode. - * @param { int } [key2] - the third keyCode,set it default 0 if null or undefined. + * @param { int } key0 - the first keyCode. + * @param { int } key1 - the second keyCode. + * @param { int } [key2] - the third keyCode,set it default 0 if null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -3907,7 +3917,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - triggerCombineKeys(key0: int, key1: int, key2?: int): Promise; + triggerCombineKeys(key0: int, key1: int, key2?: int): Promise; /** * Press two or three key combinations on the specified display. @@ -3954,8 +3964,8 @@ declare class Driver { /** * Click on the specified location on the screen. * - * @param { int } x - the x-coordinate, not less than 0. - * @param { int } y - the y-coordinate, not less than 0. + * @param { int } x - the x-coordinate, not less than 0. + * @param { int } y - the y-coordinate, not less than 0. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -3966,7 +3976,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - click(x: int, y: int): Promise; + click(x: int, y: int): Promise; /** * DoubleClick on the specified location on the screen. @@ -3996,8 +4006,8 @@ declare class Driver { /** * DoubleClick on the specified location on the screen. * - * @param { int } x - the x-coordinate, not less than 0. - * @param { int } y - the y-coordinate, not less than 0. + * @param { int } x - the x-coordinate, not less than 0. + * @param { int } y - the y-coordinate, not less than 0. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4008,7 +4018,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - doubleClick(x: int, y: int): Promise; + doubleClick(x: int, y: int): Promise; /** * LongClick on the specified location on the screen. @@ -4038,8 +4048,8 @@ declare class Driver { /** * LongClick on the specified location on the screen. * - * @param { int } x - the x-coordinate, not less than 0. - * @param { int } y - the y-coordinate, not less than 0. + * @param { int } x - the x-coordinate, not less than 0. + * @param { int } y - the y-coordinate, not less than 0. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4050,7 +4060,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - longClick(x: int, y: int): Promise; + longClick(x: int, y: int): Promise; /** * Swipe on the screen between the specified points. @@ -4086,11 +4096,11 @@ declare class Driver { /** * Swipe on the screen between the specified points. * - * @param { int } startx - the x-coordinate of the starting point, not less than 0. - * @param { int } starty - the y-coordinate of the starting point, not less than 0. - * @param { int } endx - the x-coordinate of the ending point, not less than 0. - * @param { int } endy - the y-coordinate of the ending point, not less than 0. - * @param { int } [speed] - the speed of swipe(pixels per second),ranges from 200 to 40000. Set it default 600 if out of range or null or undefined. + * @param { int } startx - the x-coordinate of the starting point, not less than 0. + * @param { int } starty - the y-coordinate of the starting point, not less than 0. + * @param { int } endx - the x-coordinate of the ending point, not less than 0. + * @param { int } endy - the y-coordinate of the ending point, not less than 0. + * @param { int } [speed] - the speed of swipe(pixels per second),ranges from 200 to 40000. Set it default 600 if out of range or null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4101,7 +4111,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - swipe(startx: int, starty: int, endx: int, endy: int, speed?: int): Promise; + swipe(startx: int, starty: int, endx: int, endy: int, speed?: int): Promise; /** * Drag on the screen between the specified points. @@ -4121,11 +4131,11 @@ declare class Driver { /** * Drag on the screen between the specified points. * - * @param { int } startx - the x-coordinate of the starting point, not less than 0. - * @param { int } starty - the y-coordinate of the starting point, not less than 0. - * @param { int } endx - the x-coordinate of the ending point, not less than 0. - * @param { int } endy - the y-coordinate of the ending point, not less than 0. - * @param { int } [speed] the speed of drag(pixels per second),ranges from 200 to 40000. Set it default 600 if out of range or null or undefined. + * @param { int } startx - the x-coordinate of the starting point, not less than 0. + * @param { int } starty - the y-coordinate of the starting point, not less than 0. + * @param { int } endx - the x-coordinate of the ending point, not less than 0. + * @param { int } endy - the y-coordinate of the ending point, not less than 0. + * @param { int } [speed] the speed of drag(pixels per second),ranges from 200 to 40000. Set it default 600 if out of range or null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4135,7 +4145,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - drag(startx: int, starty: int, endx: int, endy: int, speed?: int): Promise; + drag(startx: int, starty: int, endx: int, endy: int, speed?: int): Promise; /** * Click on the specified location on the screen. @@ -4487,8 +4497,8 @@ declare class Driver { /** * Wait for the UI become idle. * - * @param { int } idleTime - the threshold of UI idle time, in millisecond, not less than 0. - * @param { int } timeout - the maximum time to wait for idle, in millisecond, not less than 0. + * @param { int } idleTime - the threshold of UI idle time, in millisecond, not less than 0. + * @param { int } timeout - the maximum time to wait for idle, in millisecond, not less than 0. * @returns { Promise } true if wait for idle succeed in the timeout, false otherwise. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4498,7 +4508,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - waitForIdle(idleTime: int, timeout: int): Promise; + waitForIdle(idleTime: int, timeout: int): Promise; /** * Inject fling on the device display. @@ -4534,8 +4544,8 @@ declare class Driver { * * @param { Point } from - the coordinate point where the finger touches the screen. * @param { Point } to - the coordinate point where the finger leaves the screen. - * @param { int } stepLen - the length of each step, in pixels. - * @param { int } [speed] - the speed of fling(pixels per second),ranges from 200 to 40000. Set it default 600 if out of range or null or undefined. + * @param { int } stepLen - the length of each step, in pixels. + * @param { int } [speed] - the speed of fling(pixels per second),ranges from 200 to 40000. Set it default 600 if out of range or null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4546,7 +4556,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - fling(from: Point, to: Point, stepLen: int, speed: int): Promise; + fling(from: Point, to: Point, stepLen: int, speed: int): Promise; /** * Inject multi-pointer action on the device display. @@ -4564,7 +4574,7 @@ declare class Driver { * Inject multi-pointer action on the device display. * * @param { PointerMatrix } pointers - the two-dimensional array of pointers to inject. - * @param { int } [speed] - the speed of swipe(pixels per second),ranges from 200 to 40000. Set it default 600 if out of range or null or undefined. + * @param { int } [speed] - the speed of swipe(pixels per second),ranges from 200 to 40000. Set it default 600 if out of range or null or undefined. * @returns { Promise } true if the operation finished, false * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4575,7 +4585,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - injectMultiPointerAction(pointers: PointerMatrix, speed?: int): Promise; + injectMultiPointerAction(pointers: PointerMatrix, speed?: int): Promise; /** * Inject fling on the device display. @@ -4606,7 +4616,7 @@ declare class Driver { * Inject fling on the device display. * * @param { UiDirection } direction - the direction of this action. - * @param { int } speed - the speed of fling (pixels per second),default is 600,the value ranges from 200 to 40000,set it 600 if out of range. + * @param { int } speed - the speed of fling (pixels per second),default is 600,the value ranges from 200 to 40000,set it 600 if out of range. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4617,7 +4627,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - fling(direction: UiDirection, speed: int): Promise; + fling(direction: UiDirection, speed: int): Promise; /** * Inject fling on the specified device display. @@ -4625,7 +4635,7 @@ declare class Driver { * @param { UiDirection } direction - the direction of this action. * @param { number } speed - the speed of fling (pixels per second),default is 600,the value ranges from 200 to 40000,set it 600 if out of range. * @param { number } displayId - the Id of the specified display. - * @returns { Promise } + * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. * @syscap SystemCapability.Test.UiTest @@ -4654,8 +4664,8 @@ declare class Driver { * * @param { Point } p - the coordinate of the specified location. * @param { MouseButton } btnId - the button of Mouse. - * @param { int } [key1] - the first keyCode,set it default 0 if null or undefined. - * @param { int } [key2] - the second keyCode,set it default 0 if null or undefined. + * @param { int } [key1] - the first keyCode,set it default 0 if null or undefined. + * @param { int } [key2] - the second keyCode,set it default 0 if null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4665,7 +4675,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - mouseClick(p: Point, btnId: MouseButton, key1?: int, key2?: int): Promise; + mouseClick(p: Point, btnId: MouseButton, key1?: int, key2?: int): Promise; /** * Move the mouse cursor to the specified location. @@ -4713,9 +4723,9 @@ declare class Driver { * * @param { Point } p - the coordinate of the specified location. * @param { boolean } down - whether the mouse wheel rolls down. - * @param { int } d - the number of cells that the mouse wheel scrolls, each cell will make the target point shift 120 pixels. - * @param { int } [key1] - the first keyCode,set it default 0 if null or undefined. - * @param { int } [key2] - the second keyCode,set it default 0 if null or undefined. + * @param { int } d - the number of cells that the mouse wheel scrolls, each cell will make the target point shift 120 pixels. + * @param { int } [key1] - the first keyCode,set it default 0 if null or undefined. + * @param { int } [key2] - the second keyCode,set it default 0 if null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4725,17 +4735,17 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - mouseScroll(p: Point, down: boolean, d: int, key1?: int, key2?: int): Promise; + mouseScroll(p: Point, down: boolean, d: int, key1?: int, key2?: int): Promise; /** * The mouse wheel scrolls the specified cell at the specified position, and press the specified key simultaneously if necessary. * * @param { Point } p - the coordinate of the specified location. * @param { boolean } down - whether the mouse wheel rolls down. - * @param { int } d - the number of cells that the mouse wheel scrolls, each cell will make the target point shift 120 pixels. - * @param { int } [key1] - the first keyCode,set it default 0 if null or undefined. - * @param { int } [key2] - the second keyCode,set it default 0 if null or undefined. - * @param { int } [speed] - The Speed of mouse wheel rolls(cells per second),ranges from 1 to 500.Set it default 20 if out of range or null or undefined. + * @param { int } d - the number of cells that the mouse wheel scrolls, each cell will make the target point shift 120 pixels. + * @param { int } [key1] - the first keyCode,set it default 0 if null or undefined. + * @param { int } [key2] - the second keyCode,set it default 0 if null or undefined. + * @param { int } [speed] - The Speed of mouse wheel rolls(cells per second),ranges from 1 to 500.Set it default 20 if out of range or null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4745,7 +4755,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - mouseScroll(p: Point, down: boolean, d: int, key1?: int, key2?: int, speed?: int): Promise; + mouseScroll(p: Point, down: boolean, d: int, key1?: int, key2?: int, speed?: int): Promise; /** * Capture the specified area of current screen and save as picture which PNG format. @@ -4802,8 +4812,8 @@ declare class Driver { * * @param { Point } p - the coordinate of the specified location. * @param { MouseButton } btnId - the button of Mouse. - * @param { int } [key1] - the first keyCode,set it default 0 if null or undefined. - * @param { int } [key2] - the second keyCode,set it default 0 if null or undefined. + * @param { int } [key1] - the first keyCode,set it default 0 if null or undefined. + * @param { int } [key2] - the second keyCode,set it default 0 if null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4813,15 +4823,15 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - mouseDoubleClick(p: Point, btnId: MouseButton, key1?: int, key2?: int): Promise; + mouseDoubleClick(p: Point, btnId: MouseButton, key1?: int, key2?: int): Promise; /** * Long click on the specified location on the screen with the specified mouse button, and press the specified key simultaneously if necessary. * * @param { Point } p - the coordinate of the specified location. * @param { MouseButton } btnId - the button of Mouse. - * @param { int } [key1] - the first keyCode,set it default 0 if null or undefined. - * @param { int } [key2] - the second keyCode,set it default 0 if null or undefined. + * @param { int } [key1] - the first keyCode,set it default 0 if null or undefined. + * @param { int } [key2] - the second keyCode,set it default 0 if null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4831,7 +4841,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - mouseLongClick(p: Point, btnId: MouseButton, key1?: int, key2?: int): Promise; + mouseLongClick(p: Point, btnId: MouseButton, key1?: int, key2?: int): Promise; /** * Long click on the specified location on the screen with the specified mouse button, and press the specified key simultaneously if necessary. @@ -4856,7 +4866,7 @@ declare class Driver { * * @param { Point } from - the starting point. * @param { Point } to - the ending point. - * @param { int } [speed] - speed of swipe (pixels per second),the value ranges from 200 to 40000.Set it default 600 if out of range or null or undefined. + * @param { int } [speed] - speed of swipe (pixels per second),the value ranges from 200 to 40000.Set it default 600 if out of range or null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4866,14 +4876,14 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - mouseMoveWithTrack(from: Point, to: Point, speed?: int): Promise; + mouseMoveWithTrack(from: Point, to: Point, speed?: int): Promise; /** * Hold down the left mouse button and drag on the screen between the specified points. * * @param { Point } from - the starting point. * @param { Point } to - the ending point. - * @param { int } [speed] - speed of drag (pixels per second),the value ranges from 200 to 40000,Set it default 600 if out of range or null or undefined. + * @param { int } [speed] - speed of drag (pixels per second),the value ranges from 200 to 40000,Set it default 600 if out of range or null or undefined. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -4883,7 +4893,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - mouseDrag(from: Point, to: Point, speed?: int): Promise; + mouseDrag(from: Point, to: Point, speed?: int): Promise; /** * Hold down the left mouse button and drag on the screen between the specified points. @@ -4937,7 +4947,7 @@ declare class Driver { /** * Simulate touchpad multi-finger swipe gestures. - * @param { int } fingers Finger count of touchpad multi-finger swipe, ranges from 3 to 4. + * @param { int } fingers Finger count of touchpad multi-finger swipe, ranges from 3 to 4. * @param { UiDirection } direction Direction of touchpad multi-finger swipe. * @param { TouchPadSwipeOptions } [options] Additional options touchpad multi-finger swipe gestures, set its parameters to default values if null or undefined. * @returns { Promise } @@ -4950,7 +4960,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - touchPadMultiFingerSwipe(fingers: int, direction: UiDirection, options?: TouchPadSwipeOptions): Promise; + touchPadMultiFingerSwipe(fingers: int, direction: UiDirection, options?: TouchPadSwipeOptions): Promise; /** * Simulate pen click operation. @@ -4969,7 +4979,7 @@ declare class Driver { /** * Simulate pen long click operation. * @param { Point } point Coordinate of the specified location. - * @param { double } [pressure] Pressure of pen long click operation, default is 1.0, the value ranges from 0.0 to 1.0. + * @param { double } [pressure] Pressure of pen long click operation, default is 1.0, the value ranges from 0.0 to 1.0. * @returns { Promise } * @throws { BusinessError } 401 Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 The async function is not called with await. @@ -4979,7 +4989,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - penLongClick(point: Point, pressure?: double): Promise; + penLongClick(point: Point, pressure?: double): Promise; /** * Simulate pen double click operation. @@ -4999,8 +5009,8 @@ declare class Driver { * Simulate pen swipe operation. * @param { Point } startPoint Coordinate of the specified location. * @param { Point } endPoint Coordinate of the specified location. - * @param { int } [speed] Speed(pixels per second) of pen swipe, default is 600,the value ranges from 200 to 40000,set it 600 if out of range. - * @param { double } [pressure] Pressure of pen swipe operation, default is 1.0, the value ranges from 0.0 to 1.0. + * @param { int } [speed] Speed(pixels per second) of pen swipe, default is 600,the value ranges from 200 to 40000,set it 600 if out of range. + * @param { double } [pressure] Pressure of pen swipe operation, default is 1.0, the value ranges from 0.0 to 1.0. * @returns { Promise } * @throws { BusinessError } 401 Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 The async function is not called with await. @@ -5010,13 +5020,13 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - penSwipe(startPoint: Point, endPoint: Point, speed?: int, pressure?: double): Promise; + penSwipe(startPoint: Point, endPoint: Point, speed?: int, pressure?: double): Promise; /** * Inject pen multi-pointer action on the device display. * @param { PointerMatrix } pointers The two-dimensional array of pointers to inject. - * @param { int } [speed] Speed(pixels per second) of inject pen pointer action, default is 600,the value ranges from 200 to 40000,set it 600 if out of range. - * @param { double } [pressure] Pressure of inject pen pointer action operation, default is 1.0, the value ranges from 0.0 to 1.0. + * @param { int } [speed] Speed(pixels per second) of inject pen pointer action, default is 600,the value ranges from 200 to 40000,set it 600 if out of range. + * @param { double } [pressure] Pressure of inject pen pointer action operation, default is 1.0, the value ranges from 0.0 to 1.0. * @returns { Promise } * @throws { BusinessError } 401 Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 The async function is not called with await. @@ -5026,7 +5036,7 @@ declare class Driver { * @test * @arkts 1.1&1.2 */ - injectPenPointerAction(pointers: PointerMatrix, speed?: int, pressure?: double): Promise; + injectPenPointerAction(pointers: PointerMatrix, speed?: int, pressure?: double): Promise; /** * Inject a watch crown rotation event, specifies the rotation speed if necessary. @@ -5246,8 +5256,8 @@ declare class UiWindow { /** * Move this {@link UiWindow} to the specified points. * - * @param { int } x - the x coordinate of destination, not less than 0. - * @param { int } y - the y coordinate of destination, not less than 0. + * @param { int } x - the x coordinate of destination, not less than 0. + * @param { int } y - the y coordinate of destination, not less than 0. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. @@ -5259,7 +5269,7 @@ declare class UiWindow { * @test * @arkts 1.1&1.2 */ - moveTo(x: int, y: int): Promise; + moveTo(x: int, y: int): Promise; /** * Resize this {@link UiWindow} to the specified size for the specified direction. @@ -5279,8 +5289,8 @@ declare class UiWindow { /** * Resize this {@link UiWindow} to the specified size for the specified direction. * - * @param { int } wide - the expected wide of the window after resizing. - * @param { int } height - the expected height of the window after resizing. + * @param { int } wide - the expected wide of the window after resizing. + * @param { int } height - the expected height of the window after resizing. * @param { ResizeDirection } direction - the expected direction of the window after resizing. * @returns { Promise } * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. @@ -5293,7 +5303,7 @@ declare class UiWindow { * @test * @arkts 1.1&1.2 */ - resize(wide: int, height: int, direction: ResizeDirection): Promise; + resize(wide: int, height: int, direction: ResizeDirection): Promise; /** * Change this {@link UiWindow} into split screen mode. @@ -5487,8 +5497,8 @@ declare class PointerMatrix { /** * Create an {@link PointerMatrix} object. * - * @param { int } fingers - The number of fingers, ranges from 1 to 10. - * @param { int } steps - The number of steps of each finger trace, ranges from 1 to 1000. + * @param { int } fingers - The number of fingers, ranges from 1 to 10. + * @param { int } steps - The number of steps of each finger trace, ranges from 1 to 1000. * @returns { PointerMatrix } the {@link PointerMatrix} object. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.Test.UiTest @@ -5498,7 +5508,7 @@ declare class PointerMatrix { * @test * @arkts 1.1&1.2 */ - static create(fingers: int, steps: int): PointerMatrix; + static create(fingers: int, steps: int): PointerMatrix; /** * Set the point value of an element in the PointerMatrix. @@ -5514,8 +5524,8 @@ declare class PointerMatrix { /** * Set the point value of an element in the PointerMatrix. * - * @param { int } finger - the index of target finger to set. - * @param { int } step - the index of target step to set. + * @param { int } finger - the index of target finger to set. + * @param { int } step - the index of target step to set. * @param { Point } point - the coordinate of target step to set. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.Test.UiTest @@ -5525,7 +5535,7 @@ declare class PointerMatrix { * @test * @arkts 1.1&1.2 */ - setPoint(finger: int, step: int, point: Point): void; + setPoint(finger: int, step: int, point: Point): void; } /** -- Gitee From 8cafce4a1a3582ac1aa31d4365b85579730d3de6 Mon Sep 17 00:00:00 2001 From: zzz701 Date: Wed, 25 Jun 2025 10:46:22 +0800 Subject: [PATCH 003/746] =?UTF-8?q?AsyncCallback=20Error=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E5=8F=AF=E9=80=89=E7=9A=84=E5=8F=82=E6=95=B0=20Signed-off-by:?= =?UTF-8?q?=20zzz701=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/@ohos.base.d.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/@ohos.base.d.ets b/api/@ohos.base.d.ets index 39f9d3995f..0f7d42b99c 100644 --- a/api/@ohos.base.d.ets +++ b/api/@ohos.base.d.ets @@ -51,7 +51,7 @@ export type ErrorCallback = (err: T)=> void; * @atomicservice * @since 20 */ -export type AsyncCallback = (err: BusinessError, data: T)=> void; +export type AsyncCallback = (err: BusinessError | null, data: T | undefined)=> void; /** * Defines the error interface. -- Gitee From 87d115e7cf0b8f475ffb4f718cbfa6da41075ebb Mon Sep 17 00:00:00 2001 From: caoxiaogang Date: Fri, 4 Jul 2025 20:21:53 +0800 Subject: [PATCH 004/746] =?UTF-8?q?=E5=BC=BA=E5=9F=BAapi/@ohos.logLibrary.?= =?UTF-8?q?d.ts=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: caoxiaogang --- api/@ohos.logLibrary.d.ts | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/api/@ohos.logLibrary.d.ts b/api/@ohos.logLibrary.d.ts index e73e661afa..f6ce0a56bc 100644 --- a/api/@ohos.logLibrary.d.ts +++ b/api/@ohos.logLibrary.d.ts @@ -24,7 +24,8 @@ import type { AsyncCallback } from './@ohos.base'; * @namespace logLibrary * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace logLibrary { /** @@ -33,7 +34,8 @@ declare namespace logLibrary { * @typedef LogEntry * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ interface LogEntry { /** @@ -42,7 +44,8 @@ declare namespace logLibrary { * @type { string } * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ name: string; @@ -52,7 +55,8 @@ declare namespace logLibrary { * @type { number } * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ mtime: number; @@ -62,7 +66,8 @@ declare namespace logLibrary { * @type { number } * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ size: number; } @@ -81,7 +86,8 @@ declare namespace logLibrary { *
3. Parameter verification failed. * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function list(logType: string): LogEntry[]; @@ -102,7 +108,8 @@ declare namespace logLibrary { * @throws { BusinessError } 21300001 - Source file does not exists * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function copy(logType: string, logName: string, dest: string): Promise; @@ -123,7 +130,8 @@ declare namespace logLibrary { * @throws { BusinessError } 21300001 - Source file does not exists * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function copy(logType: string, logName: string, dest: string, callback: AsyncCallback): void; @@ -144,7 +152,8 @@ declare namespace logLibrary { * @throws { BusinessError } 21300001 - Source file does not exists * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function move(logType: string, logName: string, dest: string): Promise; @@ -165,7 +174,8 @@ declare namespace logLibrary { * @throws { BusinessError } 21300001 - Source file does not exists * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function move(logType: string, logName: string, dest: string, callback: AsyncCallback): void; @@ -184,7 +194,8 @@ declare namespace logLibrary { * @throws { BusinessError } 21300001 - Source file does not exists * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function remove(logType: string, logName: string): void; } -- Gitee From 97d834cd36b26e95bb79add0f6b7bfaa2302eebe Mon Sep 17 00:00:00 2001 From: cxy251 Date: Sat, 5 Jul 2025 16:19:02 +0800 Subject: [PATCH 005/746] sync0328 Signed-off-by: cxy251 --- api/@internal/component/ets/form_link.d.ts | 41 +- api/@ohos.app.form.FormExtensionAbility.d.ts | 26 +- api/@ohos.app.form.formInfo.d.ts | 597 +++++++++++-------- api/@ohos.app.form.formProvider.d.ts | 49 +- api/@ohos.application.formError.d.ts | 75 ++- 5 files changed, 472 insertions(+), 316 deletions(-) diff --git a/api/@internal/component/ets/form_link.d.ts b/api/@internal/component/ets/form_link.d.ts index 8647932350..700211a7b8 100644 --- a/api/@internal/component/ets/form_link.d.ts +++ b/api/@internal/component/ets/form_link.d.ts @@ -17,7 +17,9 @@ * @file * @kit ArkUI */ - +/*** if arkts 1.2 */ +import { CommonMethod} from './common'; +/*** endif */ /** * Defines the FormLink options. * @@ -25,7 +27,7 @@ * @syscap SystemCapability.ArkUI.ArkUI.Full * @form * @since 10 -*/ + */ /** * Defines the FormLink options. * @@ -33,8 +35,9 @@ * @syscap SystemCapability.ArkUI.ArkUI.Full * @form * @atomicservice - * @since 11 -*/ + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ declare interface FormLinkOptions { /** * Action types: "router" and "message". @@ -51,7 +54,8 @@ declare interface FormLinkOptions { * @syscap SystemCapability.ArkUI.ArkUI.Full * @form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ action: string; @@ -70,7 +74,8 @@ declare interface FormLinkOptions { * @syscap SystemCapability.ArkUI.ArkUI.Full * @form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ moduleName?: string; @@ -89,7 +94,8 @@ declare interface FormLinkOptions { * @syscap SystemCapability.ArkUI.ArkUI.Full * @form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ bundleName?: string; @@ -108,7 +114,8 @@ declare interface FormLinkOptions { * @syscap SystemCapability.ArkUI.ArkUI.Full * @form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ abilityName?: string; @@ -119,7 +126,8 @@ declare interface FormLinkOptions { * @syscap SystemCapability.ArkUI.ArkUI.Full * @form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ uri?: string; @@ -138,7 +146,8 @@ declare interface FormLinkOptions { * @syscap SystemCapability.ArkUI.ArkUI.Full * @form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ params?: Object; } @@ -158,7 +167,8 @@ declare interface FormLinkOptions { * @syscap SystemCapability.ArkUI.ArkUI.Full * @form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ interface FormLinkInterface { /** @@ -178,7 +188,8 @@ interface FormLinkInterface { * @syscap SystemCapability.ArkUI.ArkUI.Full * @form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ (options: FormLinkOptions): FormLinkAttribute; } @@ -198,10 +209,10 @@ interface FormLinkInterface { * @syscap SystemCapability.ArkUI.ArkUI.Full * @form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ -declare class FormLinkAttribute extends CommonMethod { -} +declare class FormLinkAttribute extends CommonMethod {} /** * Defines FormLink component. diff --git a/api/@ohos.app.form.FormExtensionAbility.d.ts b/api/@ohos.app.form.FormExtensionAbility.d.ts index f106f0c109..7faef1c38f 100644 --- a/api/@ohos.app.form.FormExtensionAbility.d.ts +++ b/api/@ohos.app.form.FormExtensionAbility.d.ts @@ -19,13 +19,23 @@ */ import formBindingData from './@ohos.app.form.formBindingData'; -/*** if arkts 1.1 */ import formInfo from './@ohos.app.form.formInfo'; -/*** endif */ import FormExtensionContext from './application/FormExtensionContext'; import Want from './@ohos.app.ability.Want'; import { Configuration } from './@ohos.app.ability.Configuration'; +/** + * Called when this ability breaks the last link, notifying the provider that the provider process is about to stop. + * + * @typedef { function } + * @syscap SystemCapability.Ability.Form + * @stagemodelonly + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +type OnStopFn = () => void; + /** * class of form extension. * @@ -327,6 +337,18 @@ declare class FormExtensionAbility { */ onStop?(): void; + /** + * Called when this ability breaks the last link, notifying the provider that the provider process is about to stop. + * + * @type { ?OnStopFn } + * @syscap SystemCapability.Ability.Form + * @stagemodelonly + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + onStop?: OnStopFn; + /** * Called to notify the form provider that the form location of the form has been changed. * diff --git a/api/@ohos.app.form.formInfo.d.ts b/api/@ohos.app.form.formInfo.d.ts index 72db9a2b37..a1d033a4df 100644 --- a/api/@ohos.app.form.formInfo.d.ts +++ b/api/@ohos.app.form.formInfo.d.ts @@ -33,7 +33,8 @@ import Want from './@ohos.app.ability.Want'; * @namespace formInfo * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace formInfo { /** @@ -49,7 +50,8 @@ declare namespace formInfo { * @typedef FormInfo * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ interface FormInfo { /** @@ -65,7 +67,8 @@ declare namespace formInfo { * @type { string } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ bundleName: string; @@ -82,7 +85,8 @@ declare namespace formInfo { * @type { string } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ moduleName: string; @@ -99,7 +103,8 @@ declare namespace formInfo { * @type { string } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ abilityName: string; @@ -116,7 +121,8 @@ declare namespace formInfo { * @type { string } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ name: string; @@ -126,19 +132,21 @@ declare namespace formInfo { * @type { string } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ displayName: string; /** * Obtains the displayName resource id of this form. * - * @type { number } + * @type { int } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - displayNameId: number; + displayNameId: int; /** * Obtains the description of this form. @@ -153,26 +161,28 @@ declare namespace formInfo { * @type { string } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ description: string; /** * Obtains the description id of this form. * - * @type { number } + * @type { int } * @syscap SystemCapability.Ability.Form * @since 10 */ /** * Obtains the description id of this form. * - * @type { number } + * @type { int } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - descriptionId: number; + descriptionId: int; /** * Obtains the type of this form. Currently, JS forms are supported. @@ -187,7 +197,8 @@ declare namespace formInfo { * @type { FormType } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ type: FormType; @@ -204,7 +215,8 @@ declare namespace formInfo { * @type { string } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ jsComponentName: string; @@ -226,17 +238,6 @@ declare namespace formInfo { */ colorMode: ColorMode; - /** - * Obtains the rendering mode of the form. - * - * @type { ?RenderingMode } - * @readonly - * @syscap SystemCapability.Ability.Form - * @systemapi - * @since 18 - */ - readonly renderingMode?: RenderingMode; - /** * Checks whether this form is a default form. * @@ -250,7 +251,8 @@ declare namespace formInfo { * @type { boolean } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isDefault: boolean; @@ -267,7 +269,8 @@ declare namespace formInfo { * @type { boolean } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ updateEnabled: boolean; @@ -284,7 +287,8 @@ declare namespace formInfo { * @type { boolean } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ formVisibleNotify: boolean; @@ -301,7 +305,8 @@ declare namespace formInfo { * @type { string } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ scheduledUpdateTime: string; @@ -318,60 +323,64 @@ declare namespace formInfo { * @type { string } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ formConfigAbility: string; /** * Obtains the updateDuration. * - * @type { number } + * @type { int } * @syscap SystemCapability.Ability.Form * @since 9 */ /** * Obtains the updateDuration. * - * @type { number } + * @type { int } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - updateDuration: number; + updateDuration: int; /** * Obtains the default grid style of this form. * - * @type { number } + * @type { int } * @syscap SystemCapability.Ability.Form * @since 9 */ /** * Obtains the default grid style of this form. * - * @type { number } + * @type { int } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - defaultDimension: number; + defaultDimension: int; /** * Obtains the grid styles supported by this form. * - * @type { Array } + * @type { Array } * @syscap SystemCapability.Ability.Form * @since 9 */ /** * Obtains the grid styles supported by this form. * - * @type { Array } + * @type { Array } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - supportDimensions: Array; + supportDimensions: Array; /** * Obtains the custom data defined in this form. @@ -386,7 +395,8 @@ declare namespace formInfo { * @type { Record } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ customizeData: Record; @@ -403,7 +413,8 @@ declare namespace formInfo { * @type { boolean } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isDynamic: boolean; @@ -414,31 +425,34 @@ declare namespace formInfo { * @default false * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ transparencyEnabled: boolean; /** * Obtains the shape supported by this form. * - * @type { Array } + * @type { Array } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - supportedShapes: Array; + supportedShapes: Array; /** * Indicates the form previewImage IDs map corresponds to the \"supportDimensions\". * - * @type { ?Array } + * @type { ?Array } * @readonly * @syscap SystemCapability.Ability.Form * @systemapi * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ - readonly previewImages?: Array; + readonly previewImages?: Array; /** * Indicates whether the form uses a blur background provided by the form host. @@ -447,47 +461,78 @@ declare namespace formInfo { * @readonly * @syscap SystemCapability.Ability.Form * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly enableBlurBackground?: boolean; /** - * Indicates the fun interaction form params + * Obtains the rendering mode of the form. * - * @type { ?FunInteractionParams } + * @type { ?RenderingMode } * @readonly * @syscap SystemCapability.Ability.Form * @systemapi - * @since 20 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ - readonly funInteractionParams?: FunInteractionParams; + readonly renderingMode?: RenderingMode; + } + /** + * Rendering mode. + * + * @enum { int } + * @syscap SystemCapability.Ability.Form + * @systemapi + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + enum RenderingMode { /** - * Indicates the scene animation form params + * Auto color mode. * - * @type { ?SceneAnimationParams } - * @readonly * @syscap SystemCapability.Ability.Form * @systemapi - * @since 20 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ - readonly sceneAnimationParams?: SceneAnimationParams; + AUTO_COLOR = 0, + /** + * Full color mode. + * + * @syscap SystemCapability.Ability.Form + * @systemapi + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + FULL_COLOR = 1, + /** + * Single color mode. + * + * @syscap SystemCapability.Ability.Form + * @systemapi + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + SINGLE_COLOR = 2 } /** * Type of form. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Ability.Form * @since 9 */ /** * Type of form. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ enum FormType { /** @@ -501,7 +546,8 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ JS = 1, @@ -516,7 +562,8 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ eTS = 2 } @@ -524,14 +571,14 @@ declare namespace formInfo { /** * Color mode. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Ability.Form * @since 9 */ /** * Color mode. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Ability.Form * @atomicservice * @since 11 @@ -550,6 +597,7 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @atomicservice * @since 11 + * @deprecated since 20 */ MODE_AUTO = -1, @@ -565,6 +613,7 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @atomicservice * @since 11 + * @deprecated since 20 */ MODE_DARK = 0, @@ -580,47 +629,11 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @atomicservice * @since 11 + * @deprecated since 20 */ MODE_LIGHT = 1 } - /** - * Rendering mode. - * - * @enum { number } - * @syscap SystemCapability.Ability.Form - * @systemapi - * @since 18 - */ - enum RenderingMode { - /** - * Auto color mode. - * - * @syscap SystemCapability.Ability.Form - * @systemapi - * @since 18 - */ - AUTO_COLOR = 0, - - /** - * Full color mode. - * - * @syscap SystemCapability.Ability.Form - * @systemapi - * @since 18 - */ - FULL_COLOR = 1, - - /** - * Single color mode. - * - * @syscap SystemCapability.Ability.Form - * @systemapi - * @since 18 - */ - SINGLE_COLOR = 2 - } - /** * Provides state information about a form. * @@ -634,7 +647,8 @@ declare namespace formInfo { * @typedef FormStateInfo * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ interface FormStateInfo { /** @@ -650,7 +664,8 @@ declare namespace formInfo { * @type { FormState } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ formState: FormState; @@ -667,7 +682,8 @@ declare namespace formInfo { * @type { Want } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ want: Want; } @@ -675,17 +691,18 @@ declare namespace formInfo { /** * Provides state about a form. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Ability.Form * @since 9 */ /** * Provides state about a form. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ enum FormState { /** @@ -699,7 +716,8 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ UNKNOWN = -1, @@ -714,7 +732,8 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DEFAULT = 0, @@ -729,7 +748,8 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ READY = 1 } @@ -747,7 +767,8 @@ declare namespace formInfo { * @enum { string } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ enum FormParam { /** @@ -771,9 +792,10 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - IDENTITY_KEY = 'ohos.extra.param.key.form_identity', + IDENTITY_KEY = "ohos.extra.param.key.form_identity", /** * Indicates the key specifying the grid style of the form to be obtained, which is represented as @@ -796,9 +818,10 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - DIMENSION_KEY = 'ohos.extra.param.key.form_dimension', + DIMENSION_KEY = "ohos.extra.param.key.form_dimension", /** * Indicates the key specifying the name of the form to be obtained, which is represented as @@ -821,9 +844,10 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - NAME_KEY = 'ohos.extra.param.key.form_name', + NAME_KEY = "ohos.extra.param.key.form_name", /** * Indicates the key specifying the name of the module to which the form to be obtained belongs, which is @@ -850,9 +874,10 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - MODULE_NAME_KEY = 'ohos.extra.param.key.module_name', + MODULE_NAME_KEY = "ohos.extra.param.key.module_name", /** * Indicates the key specifying the width of the form to be obtained, which is represented as @@ -875,9 +900,10 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - WIDTH_KEY = 'ohos.extra.param.key.form_width', + WIDTH_KEY = "ohos.extra.param.key.form_width", /** * Indicates the key specifying the height of the form to be obtained, which is represented as @@ -900,9 +926,10 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - HEIGHT_KEY = 'ohos.extra.param.key.form_height', + HEIGHT_KEY = "ohos.extra.param.key.form_height", /** * Indicates the key specifying whether a form is temporary, which is represented as @@ -925,9 +952,10 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - TEMPORARY_KEY = 'ohos.extra.param.key.form_temporary', + TEMPORARY_KEY = "ohos.extra.param.key.form_temporary", /** * Indicates the key specifying the name of the bundle to be obtained, which is represented as @@ -950,9 +978,10 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - BUNDLE_NAME_KEY = 'ohos.extra.param.key.bundle_name', + BUNDLE_NAME_KEY = "ohos.extra.param.key.bundle_name", /** * Indicates the key specifying the name of the ability to be obtained, which is represented as @@ -975,9 +1004,10 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - ABILITY_NAME_KEY = 'ohos.extra.param.key.ability_name', + ABILITY_NAME_KEY = "ohos.extra.param.key.ability_name", /** * Indicates the key specifying whether a form type is theme, which is represented as @@ -989,7 +1019,8 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ THEME_KEY = 'ohos.extra.param.key.form_is_theme', @@ -1003,9 +1034,10 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - DEVICE_ID_KEY = 'ohos.extra.param.key.device_id', + DEVICE_ID_KEY = "ohos.extra.param.key.device_id", /** * Indicates the key specifying the launch reason of the form to be obtained, which is represented as @@ -1028,9 +1060,10 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - LAUNCH_REASON_KEY = 'ohos.extra.param.key.form_launch_reason', + LAUNCH_REASON_KEY = "ohos.extra.param.key.form_launch_reason", /** * Indicates the key specifying the custom data of the form to be obtained, which is represented as @@ -1057,9 +1090,10 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - PARAM_FORM_CUSTOMIZE_KEY = 'ohos.extra.param.key.form_customize', + PARAM_FORM_CUSTOMIZE_KEY = "ohos.extra.param.key.form_customize", /** * Indicates the key specifying the form location, which is represented as @@ -1070,7 +1104,8 @@ declare namespace formInfo { * }. * * @syscap SystemCapability.Ability.Form - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ FORM_LOCATION_KEY = 'ohos.extra.param.key.form_location', @@ -1095,7 +1130,8 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ FORM_RENDERING_MODE_KEY = 'ohos.extra.param.key.form_rendering_mode', @@ -1109,7 +1145,8 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ HOST_BG_INVERSE_COLOR_KEY = 'ohos.extra.param.key.host_bg_inverse_color', @@ -1123,7 +1160,8 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ FORM_PERMISSION_NAME_KEY = 'ohos.extra.param.key.permission_name', @@ -1137,7 +1175,8 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ FORM_PERMISSION_GRANTED_KEY = 'ohos.extra.param.key.permission_granted', } @@ -1157,7 +1196,8 @@ declare namespace formInfo { * @typedef FormInfoFilter * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ interface FormInfoFilter { /** @@ -1167,7 +1207,8 @@ declare namespace formInfo { * @type { ?string } * @syscap SystemCapability.Ability.Form * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ bundleName?: string; @@ -1186,7 +1227,8 @@ declare namespace formInfo { * @type { ?string } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ moduleName?: string; @@ -1194,39 +1236,42 @@ declare namespace formInfo { * optional supportedDimensions that used to ask getFormsInfo to return * form infos with the same supportedDimensions. * - * @type { ?Array } + * @type { ?Array } * @syscap SystemCapability.Ability.Form * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - supportedDimensions?: Array; + supportedDimensions?: Array; /** * optional supportedShapes that used to ask getFormsInfo to return * form infos with the same supportedShapes. * - * @type { ?Array } + * @type { ?Array } * @syscap SystemCapability.Ability.Form * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - supportedShapes?: Array; + supportedShapes?: Array; } /** * Defines the FormDimension enum. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Ability.Form * @since 9 */ /** * Defines the FormDimension enum. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ enum FormDimension { /** @@ -1240,7 +1285,8 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Dimension_1_2 = 1, @@ -1255,9 +1301,10 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - Dimension_2_2, + Dimension_2_2 = 2, /** * 2 x 4 form @@ -1270,9 +1317,10 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - Dimension_2_4, + Dimension_2_4 = 3, /** * 4 x 4 form @@ -1285,9 +1333,10 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - Dimension_4_4, + Dimension_4_4 = 4, /** * 2 x 1 form @@ -1301,33 +1350,37 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @atomicservice * @since 11 + * @deprecated since 20 */ - Dimension_2_1, + Dimension_2_1 = 5, /** * 1 x 1 form * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - DIMENSION_1_1, + DIMENSION_1_1 = 6, /** * 6 x 4 form * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - DIMENSION_6_4, + DIMENSION_6_4 = 7, /** * 2 x 3 form used for wearable devices * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ DIMENSION_2_3 = 8, @@ -1336,27 +1389,20 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ - DIMENSION_3_3 = 9, - - /** - * 3 x 4 form used for tv devices - * - * @syscap SystemCapability.Ability.Form - * @atomicservice - * @since 18 - */ - DIMENSION_3_4 = 10, + DIMENSION_3_3 = 9 } - /** + /** * Defines the FormShape enum. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum FormShape { /** @@ -1364,7 +1410,8 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ RECT = 1, @@ -1373,25 +1420,27 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - CIRCLE, + CIRCLE = 2 } /** * The visibility of a form. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Ability.Form * @since 9 */ /** * The visibility of a form. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ enum VisibilityType { /** @@ -1409,7 +1458,8 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ UNKNOWN = 0, /** @@ -1427,7 +1477,8 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ FORM_VISIBLE = 1, /** @@ -1445,25 +1496,27 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - FORM_INVISIBLE + FORM_INVISIBLE = 2 } /** * Indicates the launch reason of a form. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Ability.Form * @since 10 */ /** * Indicates the launch reason of a form. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ enum LaunchReason { /** @@ -1477,7 +1530,8 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ FORM_DEFAULT = 1, /** @@ -1491,9 +1545,10 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - FORM_SHARE + FORM_SHARE = 2 } /** @@ -1503,7 +1558,8 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface PublishFormResult { /** @@ -1513,7 +1569,8 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ code: PublishFormErrorCode; @@ -1524,7 +1581,8 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ message: string; } @@ -1532,11 +1590,12 @@ declare namespace formInfo { /** * The error code of publish form. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Ability.Form * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum PublishFormErrorCode { /** @@ -1545,9 +1604,10 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - SUCCESS, + SUCCESS = 0, /** * Host has no space to publish form. @@ -1555,9 +1615,10 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - NO_SPACE, + NO_SPACE = 1, /** * Check param failed. @@ -1565,9 +1626,10 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - PARAM_ERROR, + PARAM_ERROR = 2, /** * Internal error occurs during form processing. @@ -1575,9 +1637,10 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - INTERNAL_ERROR, + INTERNAL_ERROR = 3 } /** @@ -1587,7 +1650,8 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ interface FormProviderFilter { /** @@ -1597,7 +1661,8 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ bundleName: string; @@ -1608,9 +1673,10 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - formName?: string; + formName ?: string; /** * Obtains the module name of the provider application module. @@ -1619,9 +1685,10 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - moduleName?: string; + moduleName ?: string; /** * Obtains the ability name of the provider application module. @@ -1630,9 +1697,10 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - abilityName?: string; + abilityName ?: string; /** * Indicates whether to include unused form. @@ -1642,7 +1710,8 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @stagemodelonly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isUnusedIncluded?: boolean; } @@ -1653,7 +1722,8 @@ declare namespace formInfo { * @typedef RunningFormInfo * @syscap SystemCapability.Ability.Form * @systemapi hide this for inner system use - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ interface RunningFormInfo { /** @@ -1664,7 +1734,8 @@ declare namespace formInfo { * @default - * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly formId: string; @@ -1676,7 +1747,8 @@ declare namespace formInfo { * @default - * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly bundleName: string; @@ -1688,7 +1760,8 @@ declare namespace formInfo { * @default - * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly hostBundleName: string; @@ -1700,7 +1773,8 @@ declare namespace formInfo { * @default - * @syscap SystemCapability.Ability.Form * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly formLocation: FormLocation; @@ -1712,7 +1786,8 @@ declare namespace formInfo { * @default - * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly visibilityType: VisibilityType; @@ -1724,7 +1799,8 @@ declare namespace formInfo { * @default - * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly moduleName: string; @@ -1736,7 +1812,8 @@ declare namespace formInfo { * @default - * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly abilityName: string; @@ -1748,21 +1825,23 @@ declare namespace formInfo { * @default - * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly formName: string; /** * Obtains the grid style of this form. * - * @type { number } - * @readonly + * @type { int } * @default - + * @readonly * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - readonly dimension: number; + readonly dimension: int; /** * Obtains the stage of form use. @@ -1772,7 +1851,8 @@ declare namespace formInfo { * @readonly * @syscap SystemCapability.Ability.Form * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly formUsageState: FormUsageState; @@ -1783,7 +1863,8 @@ declare namespace formInfo { * @readonly * @syscap SystemCapability.Ability.Form * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly formDescription: string; @@ -1795,7 +1876,8 @@ declare namespace formInfo { * @readonly * @syscap SystemCapability.Ability.Form * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly extraData?: Record; } @@ -1803,10 +1885,11 @@ declare namespace formInfo { /** * The stage of form use. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Ability.Form * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ enum FormUsageState { /** @@ -1814,7 +1897,8 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ USED = 0, /** @@ -1822,15 +1906,16 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - UNUSED = 1, + UNUSED = 1 } /** * Defines the FormLocation enum. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Ability.Form * @systemapi * @since 12 @@ -1838,9 +1923,10 @@ declare namespace formInfo { /** * Defines the FormLocation enum. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Ability.Form * @since 20 + * @arkts 1.1&1.2 */ enum FormLocation { /** @@ -1848,7 +1934,8 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ OTHER = -1, @@ -1864,6 +1951,7 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @since 20 + * @arkts 1.1&1.2 */ DESKTOP = 0, @@ -1879,6 +1967,7 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @since 20 + * @arkts 1.1&1.2 */ FORM_CENTER = 1, @@ -1894,6 +1983,7 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @since 20 + * @arkts 1.1&1.2 */ FORM_MANAGER = 2, @@ -1909,6 +1999,7 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @since 20 + * @arkts 1.1&1.2 */ NEGATIVE_SCREEN = 3, @@ -1917,7 +2008,8 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ FORM_CENTER_NEGATIVE_SCREEN = 4, @@ -1926,7 +2018,8 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ FORM_MANAGER_NEGATIVE_SCREEN = 5, @@ -1942,6 +2035,7 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @since 20 + * @arkts 1.1&1.2 */ SCREEN_LOCK = 6, @@ -1957,6 +2051,7 @@ declare namespace formInfo { * * @syscap SystemCapability.Ability.Form * @since 20 + * @arkts 1.1&1.2 */ AI_SUGGESTION = 7, } diff --git a/api/@ohos.app.form.formProvider.d.ts b/api/@ohos.app.form.formProvider.d.ts index 7bd2de5b9b..969b7cda1b 100644 --- a/api/@ohos.app.form.formProvider.d.ts +++ b/api/@ohos.app.form.formProvider.d.ts @@ -36,14 +36,15 @@ import Want from './@ohos.app.ability.Want'; * @namespace formProvider * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace formProvider { /** * Set next update time for a specified form. * * @param { string } formId - Indicates the form ID. - * @param { number } minute - Indicates duration minute before next update. + * @param { int } minute - Indicates duration minute before next update. * @param { AsyncCallback } callback - The callback of setFormNextRefreshTime. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. @@ -61,7 +62,7 @@ declare namespace formProvider { * Set next update time for a specified form. * * @param { string } formId - Indicates the form ID. - * @param { number } minute - Indicates duration minute before next update. + * @param { int } minute - Indicates duration minute before next update. * @param { AsyncCallback } callback - The callback of setFormNextRefreshTime. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. @@ -74,15 +75,16 @@ declare namespace formProvider { * @throws { BusinessError } 16501003 - The form cannot be operated by the current application. * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - function setFormNextRefreshTime(formId: string, minute: number, callback: AsyncCallback): void; + function setFormNextRefreshTime(formId: string, minute: int, callback: AsyncCallback): void; /** * Set next update time for a specified form. * * @param { string } formId - Indicates the form ID. - * @param { number } minute - Indicates duration minute before next update. + * @param { int } minute - Indicates duration minute before next update. * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. @@ -100,7 +102,7 @@ declare namespace formProvider { * Set next update time for a specified form. * * @param { string } formId - Indicates the form ID. - * @param { number } minute - Indicates duration minute before next update. + * @param { int } minute - Indicates duration minute before next update. * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. @@ -113,9 +115,10 @@ declare namespace formProvider { * @throws { BusinessError } 16501003 - The form cannot be operated by the current application. * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - function setFormNextRefreshTime(formId: string, minute: number): Promise; + function setFormNextRefreshTime(formId: string, minute: int): Promise; /** * Update a specified form. @@ -404,20 +407,6 @@ declare namespace formProvider { */ function getPublishedFormInfos(): Promise>; - /** - * Open the view of forms belonging to current bundle. - * Client to communication with FormManagerService. - * - * @param { Want } want - The want of the form to open. - * @throws { BusinessError } 16500050 - IPC connection error. - * @throws { BusinessError } 16500100 - Failed to obtain the configuration information. - * @throws { BusinessError } 16501000 - An internal functional error occurred. - * @syscap SystemCapability.Ability.Form - * @atomicservice - * @since 18 - */ - function openFormManager(want: Want): void; - /** * Open the view of forms belonging to the specified bundle. * Client to communication with FormManagerService. @@ -452,6 +441,20 @@ declare namespace formProvider { */ function openFormEditAbility(abilityName: string, formId: string, isMainPage?: boolean): void; + /** + * Open the view of forms belonging to current bundle. + * Client to communication with FormManagerService. + * + * @param { Want } want - The want of the form to open. + * @throws { BusinessError } 16500050 - IPC connection error. + * @throws { BusinessError } 16500100 - Failed to obtain the configuration information. + * @throws { BusinessError } 16501000 - An internal functional error occurred. + * @syscap SystemCapability.Ability.Form + * @atomicservice + * @since 18 + */ + function openFormManager(want: Want): void; + /** * Activate scene animation * diff --git a/api/@ohos.application.formError.d.ts b/api/@ohos.application.formError.d.ts index 41eedb7197..2bdd74bd99 100644 --- a/api/@ohos.application.formError.d.ts +++ b/api/@ohos.application.formError.d.ts @@ -23,7 +23,8 @@ * * @namespace formError * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace formError { /** @@ -31,14 +32,16 @@ declare namespace formError { * * @enum { number } * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ enum FormError { /** * A common internal error occurs during form processing. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_COMMON = 1, @@ -48,7 +51,8 @@ declare namespace formError { * and ohos.permission.GET_BUNDLE_INFO_PRIVILEGED permissions. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_PERMISSION_DENY = 2, @@ -58,7 +62,8 @@ declare namespace formError { * consistent with those provided by the form provider. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_GET_INFO_FAILED = 4, @@ -67,7 +72,8 @@ declare namespace formError { * Ensure that the bundle to which the form to be added belongs is available. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_GET_BUNDLE_FAILED = 5, @@ -76,7 +82,8 @@ declare namespace formError { * Ensure that the grid style of the form is supported by the form provider. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_GET_LAYOUT_FAILED = 6, @@ -85,7 +92,8 @@ declare namespace formError { * parameters are valid. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_ADD_INVALID_PARAM = 7, @@ -94,7 +102,8 @@ declare namespace formError { * different from that obtained for the first time. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CFG_NOT_MATCH_ID = 8, @@ -102,7 +111,8 @@ declare namespace formError { * The ID of the form to be operated does not exist in the Form Manager Service. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_NOT_EXIST_ID = 9, @@ -110,7 +120,8 @@ declare namespace formError { * Failed to bind the Form Manager Service to the provider service. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_BIND_PROVIDER_FAILED = 10, @@ -118,7 +129,8 @@ declare namespace formError { * The total number of added forms exceeds the maximum allowed by the system. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_MAX_SYSTEM_FORMS = 11, @@ -127,7 +139,8 @@ declare namespace formError { * exceeds the maximum allowed by the system. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_MAX_INSTANCES_PER_FORM = 12, @@ -136,7 +149,8 @@ declare namespace formError { * operated by the current application. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_OPERATION_FORM_NOT_SELF = 13, @@ -144,7 +158,8 @@ declare namespace formError { * The Form Manager Service failed to instruct the form provider to delete the form. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_PROVIDER_DEL_FAIL = 14, @@ -152,7 +167,8 @@ declare namespace formError { * The total number of added forms exceeds the maximum per client. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_MAX_FORMS_PER_CLIENT = 15, @@ -160,7 +176,8 @@ declare namespace formError { * The total number of added temp forms exceeds the maximum in system. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_MAX_SYSTEM_TEMP_FORMS = 16, @@ -168,7 +185,8 @@ declare namespace formError { * The module can not be find in system. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_FORM_NO_SUCH_MODULE = 17, @@ -176,7 +194,8 @@ declare namespace formError { * The ability can not be find in system. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_FORM_NO_SUCH_ABILITY = 18, @@ -184,7 +203,8 @@ declare namespace formError { * The dimension is not exist in the form. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_FORM_NO_SUCH_DIMENSION = 19, @@ -192,7 +212,8 @@ declare namespace formError { * The ability is not installed. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_FORM_FA_NOT_INSTALLED = 20, @@ -201,7 +222,8 @@ declare namespace formError { * the service is not started.Please try again after the service is started. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SYSTEM_RESPONSES_FAILED = 30, @@ -213,7 +235,8 @@ declare namespace formError { * the request parameters. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_FORM_DUPLICATE_ADDED = 31, @@ -222,7 +245,8 @@ declare namespace formError { * the restoration is complete. * * @syscap SystemCapability.Ability.Form - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_IN_RECOVERY = 36, @@ -231,7 +255,8 @@ declare namespace formError { * * @syscap SystemCapability.Ability.Form * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ ERR_DISTRIBUTED_SCHEDULE_FAILED = 37 } -- Gitee From c1cefdadf9566e1dfbcbbaa6a7f28433ed07a4e0 Mon Sep 17 00:00:00 2001 From: cxy251 Date: Sun, 6 Jul 2025 15:43:39 +0800 Subject: [PATCH 006/746] sync0328 Signed-off-by: cxy251 --- .../component/ets/form_component.d.ts | 222 +++++++++++------- ...hos.app.form.FormEditExtensionAbility.d.ts | 3 +- api/@ohos.app.form.FormExtensionAbility.d.ts | 8 +- ...hos.app.form.LiveFormExtensionAbility.d.ts | 5 +- api/@ohos.app.form.formBindingData.d.ts | 20 +- api/@ohos.app.form.formHost.d.ts | 8 +- api/@ohos.app.form.formProvider.d.ts | 2 + api/@ohos.application.formError.d.ts | 2 +- api/application/FormEditExtensionContext.d.ts | 4 +- api/application/FormExtensionContext.d.ts | 10 +- api/application/LiveFormExtensionContext.d.ts | 5 +- 11 files changed, 177 insertions(+), 112 deletions(-) diff --git a/api/@internal/component/ets/form_component.d.ts b/api/@internal/component/ets/form_component.d.ts index a0a4f51d16..3e9d4c6c3d 100644 --- a/api/@internal/component/ets/form_component.d.ts +++ b/api/@internal/component/ets/form_component.d.ts @@ -17,14 +17,20 @@ * @file * @kit ArkUI */ - +/*** if arkts 1.2 */ +import { CommonMethod,Callback } from './common'; +import Want from '../../@ohos.app.ability.Want'; +import { Visibility } from './enums' +import { VoidCallback } from './units'; +/*** endif */ /** * Defines the FormDimension enum. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ declare enum FormDimension { /** @@ -32,36 +38,40 @@ declare enum FormDimension { * * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ - Dimension_1_2, + Dimension_1_2 = 0, /** * 2 x 2 cards * * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ - Dimension_2_2, + Dimension_2_2 = 1, /** * 2 x 4 cards * * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ - Dimension_2_4, + Dimension_2_4 = 2, /** * 4 x 4 cards * * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ - Dimension_4_4, + Dimension_4_4 = 3, /** * 2 x 1 cards @@ -69,8 +79,9 @@ declare enum FormDimension { * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi * @since 9 + * @deprecated since 20 */ - Dimension_2_1, + Dimension_2_1 = 4, /** * 1 x 1 cards @@ -78,7 +89,8 @@ declare enum FormDimension { * * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ DIMENSION_1_1 = 6, @@ -87,16 +99,18 @@ declare enum FormDimension { * * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - DIMENSION_6_4, + DIMENSION_6_4 = 7, /** * 2 x 3 cards used for wearable devices * * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ DIMENSION_2_3 = 8, @@ -105,27 +119,20 @@ declare enum FormDimension { * * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 18 - */ - DIMENSION_3_3 = 9, - - /** - * 3 x 4 cards used for tv devices - * - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - DIMENSION_3_4 = 10, + DIMENSION_3_3 = 9 } /** * Defines the FormRenderingMode enum. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ declare enum FormRenderingMode { @@ -134,7 +141,8 @@ declare enum FormRenderingMode { * * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ FULL_COLOR, @@ -143,7 +151,8 @@ declare enum FormRenderingMode { * * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ SINGLE_COLOR, } @@ -151,10 +160,11 @@ declare enum FormRenderingMode { /** * Defines the FormShape enum. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ declare enum FormShape { /** @@ -162,7 +172,8 @@ declare enum FormShape { * * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ RECT = 1, @@ -171,7 +182,8 @@ declare enum FormShape { * * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CIRCLE, } @@ -182,18 +194,20 @@ declare enum FormShape { * @interface FormInfo * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ declare interface FormInfo { /** * The id the form. * - * @type { number | string } + * @type { long | string } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - id: number | string; + id: long | string; /** * The name of the form. @@ -201,7 +215,8 @@ declare interface FormInfo { * @type { string } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ name: string; @@ -211,7 +226,8 @@ declare interface FormInfo { * @type { string } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ bundle: string; @@ -221,7 +237,8 @@ declare interface FormInfo { * @type { string } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ability: string; @@ -231,7 +248,8 @@ declare interface FormInfo { * @type { string } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ module: string; @@ -241,7 +259,8 @@ declare interface FormInfo { * @type { ?FormDimension } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ dimension?: FormDimension; @@ -251,7 +270,8 @@ declare interface FormInfo { * @type { ?boolean } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ temporary?: boolean; @@ -265,13 +285,25 @@ declare interface FormInfo { */ want?: import('../api/@ohos.app.ability.Want').default; + /** + * The want of the form. + * + * @type { ?Want } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @since 20 + * @arkts 1.2 + */ + want?: Want; + /** * The renderingMode of the form. * * @type { ?FormRenderingMode } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ renderingMode?: FormRenderingMode; @@ -281,7 +313,8 @@ declare interface FormInfo { * @type { ?FormShape } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ shape?: FormShape; } @@ -292,14 +325,15 @@ declare interface FormInfo { * @interface FormComponentInterface * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ interface FormComponentInterface { /** * Set a new value. * * @param { { - * id: number; + * id: long; * name: string; * bundle: string; * ability: string; @@ -338,7 +372,8 @@ interface FormComponentInterface { * @returns { FormComponentAttribute } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ (value: FormInfo): FormComponentAttribute; } @@ -349,18 +384,20 @@ interface FormComponentInterface { * @interface FormCallbackInfo * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface FormCallbackInfo { /** * The id of the form. * - * @type { number } + * @type { long } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - id: number; + id: long; /** * The string id of the form. @@ -368,7 +405,8 @@ interface FormCallbackInfo { * @type { string } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ idString: string; } @@ -376,33 +414,35 @@ interface FormCallbackInfo { /** * Defines the size of Form. * - * @typedef FormSize + * @interface FormSize * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 18 + * @since arkts{ '1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface FormSize { /** * The width of the form. * Anonymous Object Rectification * - * @type { number } + * @type { double } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 18 + * @since arkts{ '1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - width: number; - + width: double; /** * The height of the form. * Anonymous Object Rectification * - * @type { number } + * @type { double } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 18 + * @since arkts{ '1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - height: number; + height: double; } /** @@ -411,19 +451,21 @@ interface FormSize { * @typedef ErrorInformation * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 18 + * @since arkts{ '1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface ErrorInformation { /** * Error code. * Anonymous Object Rectification * - * @type { number } + * @type { int } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 18 + * @since arkts{ '1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - errcode: number; + errcode: int; /** * Error information. @@ -432,7 +474,8 @@ interface ErrorInformation { * @type { string } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 18 + * @since arkts{ '1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ msg: string; } @@ -441,7 +484,8 @@ interface ErrorInformation { * @extends CommonMethod * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ declare class FormComponentAttribute extends CommonMethod { /** @@ -455,13 +499,13 @@ declare class FormComponentAttribute extends CommonMethod): FormComponentAttribute; @@ -542,13 +591,13 @@ declare class FormComponentAttribute extends CommonMethod } callback * @returns { FormComponentAttribute } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ onError(callback: Callback): FormComponentAttribute; @@ -569,7 +618,8 @@ declare class FormComponentAttribute extends CommonMethod): FormComponentAttribute; @@ -589,7 +639,8 @@ declare class FormComponentAttribute extends CommonMethod): FormComponentAttribute; @@ -604,13 +655,13 @@ declare class FormComponentAttribute extends CommonMethod): FormComponentAttribute; } diff --git a/api/@ohos.app.form.FormEditExtensionAbility.d.ts b/api/@ohos.app.form.FormEditExtensionAbility.d.ts index a89e2c08d0..975799bfc6 100644 --- a/api/@ohos.app.form.FormEditExtensionAbility.d.ts +++ b/api/@ohos.app.form.FormEditExtensionAbility.d.ts @@ -28,7 +28,7 @@ import FormEditExtensionContext from './application/FormEditExtensionContext'; * @stagemodelonly * @since 18 */ -export default class FormEditExtensionAbility extends UIExtensionAbility { +declare class FormEditExtensionAbility extends UIExtensionAbility { /** * Indicates configuration infomation about an form edit extension ability context. * @@ -39,3 +39,4 @@ export default class FormEditExtensionAbility extends UIExtensionAbility { */ context: FormEditExtensionContext; } +export default FormEditExtensionAbility; diff --git a/api/@ohos.app.form.FormExtensionAbility.d.ts b/api/@ohos.app.form.FormExtensionAbility.d.ts index 7faef1c38f..c7321cf67f 100644 --- a/api/@ohos.app.form.FormExtensionAbility.d.ts +++ b/api/@ohos.app.form.FormExtensionAbility.d.ts @@ -19,10 +19,14 @@ */ import formBindingData from './@ohos.app.form.formBindingData'; +/*** if arkts 1.1 */ import formInfo from './@ohos.app.form.formInfo'; +/*** endif */ import FormExtensionContext from './application/FormExtensionContext'; import Want from './@ohos.app.ability.Want'; +/*** if arkts 1.1 */ import { Configuration } from './@ohos.app.ability.Configuration'; +/*** endif */ /** * Called when this ability breaks the last link, notifying the provider that the provider process is about to stop. @@ -169,7 +173,7 @@ declare class FormExtensionAbility { /** * Called when the form provider receives form events from the system. * - * @param { Record } newStatus - Indicates the form events occurred. The key in the {@code Map} + * @param { Record } newStatus - Indicates the form events occurred. The key in the {@code Map} * object indicates the form ID, and the value indicates the event * type, which can be either * {@link formInfo#VisibilityType#FORM_VISIBLE} or @@ -183,7 +187,7 @@ declare class FormExtensionAbility { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - onChangeFormVisibility(newStatus: Record): void; + onChangeFormVisibility(newStatus: Record): void; /** * Called when a specified message event defined by the form provider is triggered. This method is valid only for diff --git a/api/@ohos.app.form.LiveFormExtensionAbility.d.ts b/api/@ohos.app.form.LiveFormExtensionAbility.d.ts index 88ad4daeaa..8a47a1405c 100644 --- a/api/@ohos.app.form.LiveFormExtensionAbility.d.ts +++ b/api/@ohos.app.form.LiveFormExtensionAbility.d.ts @@ -75,7 +75,7 @@ export interface LiveFormInfo { * @atomicservice * @since 20 */ -export default class LiveFormExtensionAbility extends ExtensionAbility { +declare class LiveFormExtensionAbility extends ExtensionAbility { /** * Indicates configuration information about a live form extension ability context. * @@ -109,4 +109,5 @@ export default class LiveFormExtensionAbility extends ExtensionAbility { * @since 20 */ onLiveFormDestroy(liveFormInfo: LiveFormInfo): void; -} \ No newline at end of file +} +export default LiveFormExtensionAbility; diff --git a/api/@ohos.app.form.formBindingData.d.ts b/api/@ohos.app.form.formBindingData.d.ts index 3cdd10aaac..356ef5858a 100644 --- a/api/@ohos.app.form.formBindingData.d.ts +++ b/api/@ohos.app.form.formBindingData.d.ts @@ -16,12 +16,9 @@ /** * @file * @kit FormKit + * @arkts 1.1&1.2 */ -/*** if arkts 1.1 */ -import { BusinessError } from './@ohos.base'; -/*** endif */ - /** * Interface of formBindingData. * @@ -93,7 +90,8 @@ declare namespace formBindingData { * @type { Object } * @syscap SystemCapability.Ability.Form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ data: Object; @@ -112,7 +110,8 @@ declare namespace formBindingData { * @syscap SystemCapability.Ability.Form * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ proxies?: Array; } @@ -132,7 +131,8 @@ declare namespace formBindingData { * @syscap SystemCapability.Ability.Form * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ interface ProxyData { /** @@ -150,7 +150,8 @@ declare namespace formBindingData { * @syscap SystemCapability.Ability.Form * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ key: string; @@ -169,7 +170,8 @@ declare namespace formBindingData { * @syscap SystemCapability.Ability.Form * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ subscriberId?: string; } diff --git a/api/@ohos.app.form.formHost.d.ts b/api/@ohos.app.form.formHost.d.ts index ab3638953e..12eb8ddc62 100644 --- a/api/@ohos.app.form.formHost.d.ts +++ b/api/@ohos.app.form.formHost.d.ts @@ -617,7 +617,7 @@ declare namespace formHost { * * @permission ohos.permission.REQUIRE_FORM * @param { Array } formIds - Indicates the specified form id. - * @param { AsyncCallback } callback - The callback is used to return the number of invalid forms deleted + * @param { AsyncCallback } callback - The callback is used to return the number of invalid forms deleted * by the Form Manager Service. * @throws { BusinessError } 201 - Permissions denied. * @throws { BusinessError } 202 - The application is not a system application. @@ -630,7 +630,7 @@ declare namespace formHost { * @systemapi * @since 9 */ - function deleteInvalidForms(formIds: Array, callback: AsyncCallback): void; + function deleteInvalidForms(formIds: Array, callback: AsyncCallback): void; /** * Deletes invalid forms of the application in the Form Manager Service based on the list of. @@ -638,7 +638,7 @@ declare namespace formHost { * * @permission ohos.permission.REQUIRE_FORM * @param { Array } formIds - Indicates the specified form id. - * @returns { Promise } Returns the number of invalid forms deleted by the Form Manager Service. + * @returns { Promise } Returns the number of invalid forms deleted by the Form Manager Service. * @throws { BusinessError } 201 - Permissions denied. * @throws { BusinessError } 202 - The application is not a system application. * @throws { BusinessError } 401 - Parameter error. Possible causes: @@ -650,7 +650,7 @@ declare namespace formHost { * @systemapi * @since 9 */ - function deleteInvalidForms(formIds: Array): Promise; + function deleteInvalidForms(formIds: Array): Promise; /** * Obtains the Form state. diff --git a/api/@ohos.app.form.formProvider.d.ts b/api/@ohos.app.form.formProvider.d.ts index 969b7cda1b..cfecd4eb15 100644 --- a/api/@ohos.app.form.formProvider.d.ts +++ b/api/@ohos.app.form.formProvider.d.ts @@ -20,7 +20,9 @@ import { AsyncCallback } from './@ohos.base'; import formBindingData from './@ohos.app.form.formBindingData'; +/*** if arkts 1.1 */ import formInfo from './@ohos.app.form.formInfo'; +/*** endif */ import Want from './@ohos.app.ability.Want'; /** diff --git a/api/@ohos.application.formError.d.ts b/api/@ohos.application.formError.d.ts index 2bdd74bd99..e0a3fd4698 100644 --- a/api/@ohos.application.formError.d.ts +++ b/api/@ohos.application.formError.d.ts @@ -30,7 +30,7 @@ declare namespace formError { /** * Error of form. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Ability.Form * @since arkts {'1.1':'8', '1.2':'20'} * @arkts 1.1&1.2 diff --git a/api/application/FormEditExtensionContext.d.ts b/api/application/FormEditExtensionContext.d.ts index c236f8d1a0..86daad8f29 100644 --- a/api/application/FormEditExtensionContext.d.ts +++ b/api/application/FormEditExtensionContext.d.ts @@ -31,7 +31,7 @@ import type { AbilityResult } from '../ability/abilityResult'; * @stagemodelonly * @since 18 */ -export default class FormEditExtensionContext extends UIExtensionContext { +declare class FormEditExtensionContext extends UIExtensionContext { /** * Start second editor extension ability. * @@ -47,3 +47,5 @@ export default class FormEditExtensionContext extends UIExtensionContext { */ startSecondPage(want: Want): Promise; } +export default FormEditExtensionContext; + diff --git a/api/application/FormExtensionContext.d.ts b/api/application/FormExtensionContext.d.ts index a07bd0a86d..17b56c331f 100644 --- a/api/application/FormExtensionContext.d.ts +++ b/api/application/FormExtensionContext.d.ts @@ -21,11 +21,9 @@ /*** if arkts 1.1 */ import { AsyncCallback } from '../@ohos.base'; import type { ConnectOptions } from '../ability/connectOptions'; -/*** endif */ -import ExtensionContext from './ExtensionContext'; -/*** if arkts 1.1 */ import Want from '../@ohos.app.ability.Want'; /*** endif */ +import ExtensionContext from './ExtensionContext'; /** * The context of form extension. It allows access to @@ -47,7 +45,7 @@ import Want from '../@ohos.app.ability.Want'; * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ -export default class FormExtensionContext extends ExtensionContext { +declare class FormExtensionContext extends ExtensionContext { /** * Start an ability within the same bundle. * @@ -136,7 +134,7 @@ export default class FormExtensionContext extends ExtensionContext { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @throws { BusinessError } 16000001 - The specified ability does not exist. * @throws { BusinessError } 16000002 - Incorrect ability type. - * @throws { BusinessError } 16000004 - Cannot start an invisible component. + * @throws { BusinessError } 16000004 - Can not start invisible component. * @throws { BusinessError } 16000005 - The specified process does not have the permission. * @throws { BusinessError } 16000006 - Cross-user operations are not allowed. * @throws { BusinessError } 16000008 - The crowdtesting application expires. @@ -183,3 +181,5 @@ export default class FormExtensionContext extends ExtensionContext { */ disconnectServiceExtensionAbility(connection: number): Promise; } + +export default FormExtensionContext; \ No newline at end of file diff --git a/api/application/LiveFormExtensionContext.d.ts b/api/application/LiveFormExtensionContext.d.ts index dbc3bab3d5..9dbc7890d5 100644 --- a/api/application/LiveFormExtensionContext.d.ts +++ b/api/application/LiveFormExtensionContext.d.ts @@ -30,7 +30,7 @@ import ExtensionContext from './ExtensionContext'; * @atomicservice * @since 20 */ -export default class LiveFormExtensionContext extends ExtensionContext { +declare class LiveFormExtensionContext extends ExtensionContext { /** * Set the background image of the live form. * @@ -44,4 +44,5 @@ export default class LiveFormExtensionContext extends ExtensionContext { * @since 20 */ setBackgroundImage(res: Resource): Promise; -} \ No newline at end of file +} +export default LiveFormExtensionContext; -- Gitee From 13b0e77ede2f8e075a1be4d0f6685d5a21f5624d Mon Sep 17 00:00:00 2001 From: cxy251 Date: Mon, 7 Jul 2025 09:17:46 +0800 Subject: [PATCH 007/746] sync0328 Signed-off-by: cxy251 --- api/@ohos.app.form.formProvider.d.ts | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/@ohos.app.form.formProvider.d.ts b/api/@ohos.app.form.formProvider.d.ts index cfecd4eb15..02cf9ea01f 100644 --- a/api/@ohos.app.form.formProvider.d.ts +++ b/api/@ohos.app.form.formProvider.d.ts @@ -409,6 +409,20 @@ declare namespace formProvider { */ function getPublishedFormInfos(): Promise>; + /** + * Open the view of forms belonging to current bundle. + * Client to communication with FormManagerService. + * + * @param { Want } want - The want of the form to open. + * @throws { BusinessError } 16500050 - IPC connection error. + * @throws { BusinessError } 16500100 - Failed to obtain the configuration information. + * @throws { BusinessError } 16501000 - An internal functional error occurred. + * @syscap SystemCapability.Ability.Form + * @atomicservice + * @since 18 + */ + function openFormManager(want: Want): void; + /** * Open the view of forms belonging to the specified bundle. * Client to communication with FormManagerService. @@ -443,20 +457,6 @@ declare namespace formProvider { */ function openFormEditAbility(abilityName: string, formId: string, isMainPage?: boolean): void; - /** - * Open the view of forms belonging to current bundle. - * Client to communication with FormManagerService. - * - * @param { Want } want - The want of the form to open. - * @throws { BusinessError } 16500050 - IPC connection error. - * @throws { BusinessError } 16500100 - Failed to obtain the configuration information. - * @throws { BusinessError } 16501000 - An internal functional error occurred. - * @syscap SystemCapability.Ability.Form - * @atomicservice - * @since 18 - */ - function openFormManager(want: Want): void; - /** * Activate scene animation * -- Gitee From 200751622fe4be1948d0d79f7b8f80961ebb701a Mon Sep 17 00:00:00 2001 From: liujia178 Date: Tue, 24 Jun 2025 16:20:42 +0800 Subject: [PATCH 008/746] =?UTF-8?q?feature:=E5=BC=BA=E5=9F=BAapi/@ohos.hid?= =?UTF-8?q?ebug.d.ts=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liujia178 Signed-off-by: yuhaoqiang Change-Id: Ifb1553319a462eea27820f2ac3a16f3fd2836e66 --- api/@ohos.hidebug.d.ts | 207 +++++++++++++++++++++++++++-------------- 1 file changed, 138 insertions(+), 69 deletions(-) diff --git a/api/@ohos.hidebug.d.ts b/api/@ohos.hidebug.d.ts index 604bd743cf..18f5696d0f 100644 --- a/api/@ohos.hidebug.d.ts +++ b/api/@ohos.hidebug.d.ts @@ -37,7 +37,8 @@ * @namespace hidebug * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace hidebug { /** @@ -46,7 +47,8 @@ declare namespace hidebug { * * @returns { bigint } Returns the total number of bytes occupied by the total space. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getNativeHeapSize(): bigint; @@ -55,7 +57,8 @@ declare namespace hidebug { * a process, which is measured by the memory allocator. * @returns { bigint } Returns the total number of bytes occupied by the total allocated space. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getNativeHeapAllocatedSize(): bigint; @@ -65,7 +68,8 @@ declare namespace hidebug { * * @returns { bigint } Returns the size of the memory occupied by the free normal blocks held by the process, in bytes. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getNativeHeapFreeSize(): bigint; @@ -75,7 +79,8 @@ declare namespace hidebug { * * @returns { bigint } Returns the virtual set size used by the application process, in KB. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function getVss(): bigint; @@ -85,7 +90,8 @@ declare namespace hidebug { * * @returns { bigint } Returns the size of the physical memory actually used by the application process, in KB. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getPss(): bigint; @@ -95,7 +101,8 @@ declare namespace hidebug { * * @returns { bigint } Returns the size of the shared dirty memory of the process, in KB. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getSharedDirty(): bigint; @@ -105,7 +112,8 @@ declare namespace hidebug { * * @returns { bigint } Returns the size of the private dirty memory of the process, in KB. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getPrivateDirty(): bigint; @@ -114,7 +122,8 @@ declare namespace hidebug { * * @returns { number } Returns the CPU usage of the process. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getCpuUsage(): number; @@ -210,7 +219,8 @@ declare namespace hidebug { * 2.the args parameter is not string array. * @throws {BusinessError} 11400101 - ServiceId invalid. The system ability does not exist. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getServiceDump(serviceid: number, fd: number, args: Array): void; @@ -220,7 +230,8 @@ declare namespace hidebug { * @returns { number } Returns the CPU usage of the system. * @throws { BusinessError } 11400104 - The status of the system CPU usage is abnormal. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function getSystemCpuUsage(): number; @@ -229,7 +240,8 @@ declare namespace hidebug { * * @interface ThreadCpuUsage * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ThreadCpuUsage { /** @@ -237,7 +249,8 @@ declare namespace hidebug { * * @type { number } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ threadId: number; /** @@ -245,7 +258,8 @@ declare namespace hidebug { * * @type { number } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ cpuUsage: number; } @@ -255,7 +269,8 @@ declare namespace hidebug { * * @returns { ThreadCpuUsage[] } Returns the CPU usage of all threads of the current application process. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function getAppThreadCpuUsage(): ThreadCpuUsage[]; @@ -264,7 +279,8 @@ declare namespace hidebug { * * @interface SystemMemInfo * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface SystemMemInfo { /** @@ -273,7 +289,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ totalMem: bigint; /** @@ -282,7 +299,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ freeMem: bigint; /** @@ -291,7 +309,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ availableMem: bigint; } @@ -301,7 +320,8 @@ declare namespace hidebug { * * @returns { SystemMemInfo } Returns the system memory information. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function getSystemMemInfo(): SystemMemInfo; @@ -310,7 +330,8 @@ declare namespace hidebug { * * @interface NativeMemInfo * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface NativeMemInfo { /** @@ -320,7 +341,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ pss: bigint; /** @@ -330,7 +352,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ vss: bigint; /** @@ -339,7 +362,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ rss: bigint; /** @@ -348,7 +372,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ sharedDirty: bigint; /** @@ -357,7 +382,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ privateDirty: bigint; /** @@ -366,7 +392,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ sharedClean: bigint; /** @@ -375,7 +402,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ privateClean: bigint; } @@ -386,7 +414,8 @@ declare namespace hidebug { * * @returns { NativeMemInfo } Returns the memory information of the application process. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function getAppNativeMemInfo(): NativeMemInfo; @@ -489,21 +518,24 @@ declare namespace hidebug { * * @enum { number } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum TraceFlag { /** * The main thread of the application. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MAIN_THREAD = 1, /** * All threads of the application. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ALL_THREADS = 2 } @@ -513,231 +545,264 @@ declare namespace hidebug { * * @namespace tags * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ namespace tags { /** * Ability Manager tag. The corresponding HiTrace command is tagName:ability. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const ABILITY_MANAGER: number; /** * ArkUI development framework. The corresponding HiTrace command is tagName:ace. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const ARKUI: number; /** * JSVM VM. The corresponding HiTrace command is tagName:ark. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const ARK: number; /** * Bluetooth. The corresponding HiTrace command is tagName:bluetooth. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const BLUETOOTH: number; /** * Common library subsystem. The corresponding HiTrace command is tagName:commonlibrary. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const COMMON_LIBRARY: number; /** * Distributed hardware device management. The corresponding HiTrace command is tagName:devicemanager. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const DISTRIBUTED_HARDWARE_DEVICE_MANAGER: number; /** * Distributed audio. The corresponding HiTrace command is tagName:daudio. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const DISTRIBUTED_AUDIO: number; /** * Distributed camera. The corresponding HiTrace command is tagName:dcamera. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const DISTRIBUTED_CAMERA: number; /** * Distributed data management. The corresponding HiTrace command is tagName:distributeddatamgr. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const DISTRIBUTED_DATA: number; /** * Distributed hardware framework. The corresponding HiTrace command is tagName:dhfwk. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const DISTRIBUTED_HARDWARE_FRAMEWORK: number; /** * Distributed input. The corresponding HiTrace command is tagName:dinput. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const DISTRIBUTED_INPUT: number; /** * Distributed screen. The corresponding HiTrace command is tagName:dscreen. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const DISTRIBUTED_SCREEN: number; /** * Distributed scheduler. The corresponding HiTrace command is tagName:dsched. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const DISTRIBUTED_SCHEDULER: number; /** * FFRT task. The corresponding HiTrace command is tagName:ffrt. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const FFRT: number; /** * File management system. The corresponding HiTrace command is tagName:filemanagement. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const FILE_MANAGEMENT: number; /** * Global resource management. The corresponding HiTrace command is tagName:gresource. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const GLOBAL_RESOURCE_MANAGER: number; /** * Graphics module. The corresponding HiTrace command is tagName:graphic. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const GRAPHICS: number; /** * HDF subsystem. The corresponding HiTrace command is tagName:hdf. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const HDF: number; /** * MISC module. The corresponding HiTrace command is tagName:misc. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const MISC: number; /** * Multi-modal input module. The corresponding HiTrace command is tagName:multimodalinput. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const MULTIMODAL_INPUT: number; /** * Network. The corresponding HiTrace command is tagName:net. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const NET: number; /** * Notification module. The corresponding HiTrace command is tagName:notification. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const NOTIFICATION: number; /** * Nweb. The corresponding HiTrace command is tagName:nweb. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const NWEB: number; /** * OHOS. The corresponding HiTrace command is tagName:ohos. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const OHOS: number; /** * Power management. The corresponding HiTrace command is tagName:power. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const POWER_MANAGER: number; /** * RPC. The corresponding HiTrace command is tagName:rpc. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const RPC: number; /** * System capability management. The corresponding HiTrace command is tagName:samgr. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const SAMGR: number; /** * Window management. The corresponding HiTrace command is tagName:window. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const WINDOW_MANAGER: number; /** * Audio module. The corresponding HiTrace command is tagName:zaudio. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const AUDIO: number; /** * Camera module. The corresponding HiTrace command is tagName:zcamera. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const CAMERA: number; /** * Image module. The corresponding HiTrace command is tagName:zimage. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const IMAGE: number; /** * Media module. The corresponding HiTrace command is tagName:zmedia. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const MEDIA: number; } @@ -760,7 +825,8 @@ declare namespace hidebug { * @throws { BusinessError } 11400103 - No write permission on the file. * @throws { BusinessError } 11400104 - Abnormal trace status. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function startAppTraceCapture(tags: number[], flag: TraceFlag, limitSize: number): string; @@ -771,7 +837,8 @@ declare namespace hidebug { * @throws { BusinessError } 11400104 - The status of the trace is abnormal. * @throws { BusinessError } 11400105 - No capture trace running. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function stopAppTraceCapture(): void; @@ -848,7 +915,8 @@ declare namespace hidebug { * @throws { BusinessError } 11400104 - Failed to get the application memory due to a remote exception. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ function getGraphicsMemory(): Promise; @@ -859,7 +927,8 @@ declare namespace hidebug { * @throws { BusinessError } 11400104 - Failed to get the application memory due to a remote exception. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ function getGraphicsMemorySync(): number; -- Gitee From 409804dac2cd9b94f3f99044e28f46926c5eccd1 Mon Sep 17 00:00:00 2001 From: wangqing Date: Mon, 7 Jul 2025 11:25:49 +0800 Subject: [PATCH 009/746] add hitrace ani interfaces Signed-off-by: wangqing Change-Id: I60970428e25d8ed4b20669abc627e83304f95eea --- api/@ohos.hiTraceChain.d.ts | 108 ++++++++++++++++++++++++------------ api/@ohos.hiTraceMeter.d.ts | 22 ++++++-- 2 files changed, 89 insertions(+), 41 deletions(-) diff --git a/api/@ohos.hiTraceChain.d.ts b/api/@ohos.hiTraceChain.d.ts index 0e3c01da19..e10a356cdc 100644 --- a/api/@ohos.hiTraceChain.d.ts +++ b/api/@ohos.hiTraceChain.d.ts @@ -26,7 +26,8 @@ * * @namespace hiTraceChain * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace hiTraceChain { /** @@ -34,14 +35,16 @@ declare namespace hiTraceChain { * * @enum { number } * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ enum HiTraceFlag { /** * Default value * * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ DEFAULT = 0, @@ -49,7 +52,8 @@ declare namespace hiTraceChain { * Trace sync and async call. default: trace sync call only. * * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ INCLUDE_ASYNC = 1, @@ -57,7 +61,8 @@ declare namespace hiTraceChain { * Do not create child span. default: create child span. * * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ DONOT_CREATE_SPAN = 1 << 1, @@ -65,7 +70,8 @@ declare namespace hiTraceChain { * Output tracepoint info in span. default: do not output tracepoint info. * * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ TP_INFO = 1 << 2, @@ -73,7 +79,8 @@ declare namespace hiTraceChain { * Do not output begin and end info. default: output begin and end info. * * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ NO_BE_INFO = 1 << 3, @@ -81,7 +88,8 @@ declare namespace hiTraceChain { * Do not add id to log. default: add id to log. * * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ DISABLE_LOG = 1 << 4, @@ -89,7 +97,8 @@ declare namespace hiTraceChain { * The trace is triggered by fault. * * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ FAILURE_TRIGGER = 1 << 5, @@ -97,7 +106,8 @@ declare namespace hiTraceChain { * Output device-to-device tracepoint info in span only. default: do not output device-to-device tracepoint info. * * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ D2D_TP_INFO = 1 << 6 } @@ -107,14 +117,16 @@ declare namespace hiTraceChain { * * @enum { number } * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ enum HiTraceTracepointType { /** * Client send * * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ CS = 0, @@ -122,7 +134,8 @@ declare namespace hiTraceChain { * Client receive * * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ CR = 1, @@ -130,7 +143,8 @@ declare namespace hiTraceChain { * Server send * * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ SS = 2, @@ -138,7 +152,8 @@ declare namespace hiTraceChain { * Server receive * * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ SR = 3, @@ -146,7 +161,8 @@ declare namespace hiTraceChain { * General info * * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ GENERAL = 4 } @@ -156,14 +172,16 @@ declare namespace hiTraceChain { * * @enum { number } * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ enum HiTraceCommunicationMode { /** * Unspecified * * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ DEFAULT = 0, @@ -171,7 +189,8 @@ declare namespace hiTraceChain { * Thread-to-thread * * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ THREAD = 1, @@ -179,7 +198,8 @@ declare namespace hiTraceChain { * Process-to-process * * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ PROCESS = 2, @@ -187,7 +207,8 @@ declare namespace hiTraceChain { * Device-to-device * * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ DEVICE = 3 } @@ -197,7 +218,8 @@ declare namespace hiTraceChain { * * @interface HiTraceId * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ interface HiTraceId { /** @@ -205,7 +227,8 @@ declare namespace hiTraceChain { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ chainId: bigint; @@ -214,7 +237,8 @@ declare namespace hiTraceChain { * * @type { ?number } * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ spanId?: number; @@ -223,7 +247,8 @@ declare namespace hiTraceChain { * * @type { ?number } * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ parentSpanId?: number; @@ -232,7 +257,8 @@ declare namespace hiTraceChain { * * @type { ?number } * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ flags?: number; } @@ -244,7 +270,8 @@ declare namespace hiTraceChain { * @param { number } flags Trace function flag. * @returns { HiTraceId } Valid if first call, otherwise invalid. * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function begin(name: string, flags?: number): HiTraceId; @@ -254,7 +281,8 @@ declare namespace hiTraceChain { * * @param { HiTraceId } id The trace id that need to stop. * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function end(id: HiTraceId): void; @@ -264,7 +292,8 @@ declare namespace hiTraceChain { * * @returns { HiTraceId } Valid if current thread have a trace id, otherwise invalid. * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getId(): HiTraceId; @@ -273,7 +302,8 @@ declare namespace hiTraceChain { * * @param { HiTraceId } id Set id as trace id of current thread. * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function setId(id: HiTraceId): void; @@ -281,7 +311,8 @@ declare namespace hiTraceChain { * Clear trace id of current thread and set it invalid. * * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function clearId(): void; @@ -290,7 +321,8 @@ declare namespace hiTraceChain { * * @returns { HiTraceId } A valid span trace id. Otherwise trace id of current thread if do not allow create span. * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function createSpan(): HiTraceId; @@ -302,7 +334,8 @@ declare namespace hiTraceChain { * @param { HiTraceId } id Trace id that need to print. * @param { string } msg Customized info that need to print. * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function tracepoint(mode: HiTraceCommunicationMode, type: HiTraceTracepointType, id: HiTraceId, msg?: string): void; @@ -312,7 +345,8 @@ declare namespace hiTraceChain { * @param { HiTraceId } id Trace id that need to judge. * @returns { boolean } True for a valid trace id, otherwise false. * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function isValid(id: HiTraceId): boolean; @@ -323,7 +357,8 @@ declare namespace hiTraceChain { * @param { HiTraceFlag } flag Trace flag that need to judge. * @returns { boolean } true if the trace id has enabled the flag. * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function isFlagEnabled(id: HiTraceId, flag: HiTraceFlag): boolean; @@ -333,7 +368,8 @@ declare namespace hiTraceChain { * @param { HiTraceId } id Trace id that need to enable a flag. * @param { HiTraceFlag } flag the designative trace flag that need to be enabled in the trace id. * @syscap SystemCapability.HiviewDFX.HiTrace - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function enableFlag(id: HiTraceId, flag: HiTraceFlag): void; } diff --git a/api/@ohos.hiTraceMeter.d.ts b/api/@ohos.hiTraceMeter.d.ts index 47b2820207..6b1a88c151 100644 --- a/api/@ohos.hiTraceMeter.d.ts +++ b/api/@ohos.hiTraceMeter.d.ts @@ -135,6 +135,7 @@ declare namespace hiTraceMeter { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ enum HiTraceOutputLevel { /** @@ -151,6 +152,7 @@ declare namespace hiTraceMeter { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ DEBUG = 0, @@ -168,6 +170,7 @@ declare namespace hiTraceMeter { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ INFO = 1, @@ -185,6 +188,7 @@ declare namespace hiTraceMeter { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ CRITICAL = 2, @@ -202,6 +206,7 @@ declare namespace hiTraceMeter { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ COMMERCIAL = 3, @@ -219,6 +224,7 @@ declare namespace hiTraceMeter { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ MAX = COMMERCIAL } @@ -336,6 +342,7 @@ declare namespace hiTraceMeter { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ function traceByValue(name: string, count: number): void; @@ -348,7 +355,7 @@ declare namespace hiTraceMeter { * * @param { HiTraceOutputLevel } level Indicates trace output priority level. * @param { string } name Indicates the task name. - * @param { string } customArgs Indicates key=value pair to be output in trace; multiple pairs should use comma + * @param { string } [customArgs] Indicates key=value pair to be output in trace; multiple pairs should use comma * as separator. * @syscap SystemCapability.HiviewDFX.HiTrace * @atomicservice @@ -363,12 +370,13 @@ declare namespace hiTraceMeter { * * @param { HiTraceOutputLevel } level Indicates trace output priority level. * @param { string } name Indicates the task name. - * @param { string } customArgs Indicates key=value pair to be output in trace; multiple pairs should use comma + * @param { string } [customArgs] Indicates key=value pair to be output in trace; multiple pairs should use comma * as separator. * @syscap SystemCapability.HiviewDFX.HiTrace * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ function startSyncTrace(level: HiTraceOutputLevel, name: string, customArgs?: string): void; @@ -396,6 +404,7 @@ declare namespace hiTraceMeter { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ function finishSyncTrace(level: HiTraceOutputLevel): void; @@ -411,7 +420,7 @@ declare namespace hiTraceMeter { * @param { number } taskId The unique id used to distinguish the task and match with the id of the * corresponding finishAsyncTrace. * @param { string } customCategory Indicates the label to aggregate asynchronous task display. - * @param { string } customArgs Indicates key=value pair to be output in trace; multiple pairs should use comma + * @param { string } [customArgs] Indicates key=value pair to be output in trace; multiple pairs should use comma * as Separator. * @syscap SystemCapability.HiviewDFX.HiTrace * @atomicservice @@ -429,12 +438,13 @@ declare namespace hiTraceMeter { * @param { number } taskId The unique id used to distinguish the task and match with the id of the * corresponding finishAsyncTrace. * @param { string } customCategory Indicates the label to aggregate asynchronous task display. - * @param { string } customArgs Indicates key=value pair to be output in trace; multiple pairs should use comma + * @param { string } [customArgs] Indicates key=value pair to be output in trace; multiple pairs should use comma * as Separator. * @syscap SystemCapability.HiviewDFX.HiTrace * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ function startAsyncTrace(level: HiTraceOutputLevel, name: string, taskId: number, customCategory: string, customArgs?: string): void; @@ -469,6 +479,7 @@ declare namespace hiTraceMeter { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ function finishAsyncTrace(level: HiTraceOutputLevel, name: string, taskId: number): void; @@ -492,6 +503,7 @@ declare namespace hiTraceMeter { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ function traceByValue(level: HiTraceOutputLevel, name: string, count: number): void; @@ -511,9 +523,9 @@ declare namespace hiTraceMeter { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ function isTraceEnabled(): boolean; - } export default hiTraceMeter; -- Gitee From 0706b0e151b3cdff3cfaec08f35dc26774f6fac4 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 7 Jul 2025 14:05:04 +0800 Subject: [PATCH 010/746] =?UTF-8?q?=E6=94=AF=E6=8C=81arkts1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: unknown --- api/@ohos.resourceschedule.systemload.d.ts | 39 ++++++++++++++-------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/api/@ohos.resourceschedule.systemload.d.ts b/api/@ohos.resourceschedule.systemload.d.ts index 53ff2a57c5..ea6bf44d8c 100644 --- a/api/@ohos.resourceschedule.systemload.d.ts +++ b/api/@ohos.resourceschedule.systemload.d.ts @@ -25,7 +25,8 @@ import type { Callback } from './@ohos.base'; * * @namespace systemLoad * @syscap SystemCapability.ResourceSchedule.SystemLoad - * @since 12 + * @since arkts{ '1.1':'12', '1.2':'20' } + * @arkts 1.1&1.2 */ declare namespace systemLoad { /** @@ -33,63 +34,72 @@ declare namespace systemLoad { * * @enum {number} * @syscap SystemCapability.ResourceSchedule.SystemLoad - * @since 12 + * @since arkts{ '1.1':'12', '1.2':'20' } + * @arkts 1.1&1.2 */ export enum SystemLoadLevel { /** * level low * * @syscap SystemCapability.ResourceSchedule.SystemLoad - * @since 12 + * @since arkts{ '1.1':'12', '1.2':'20' } + * @arkts 1.1&1.2 */ LOW = 0, /** * level NORMAL * * @syscap SystemCapability.ResourceSchedule.SystemLoad - * @since 12 + * @since arkts{ '1.1':'12', '1.2':'20' } + * @arkts 1.1&1.2 */ NORMAL = 1, /** * level MEDIUM * * @syscap SystemCapability.ResourceSchedule.SystemLoad - * @since 12 + * @since arkts{ '1.1':'12', '1.2':'20' } + * @arkts 1.1&1.2 */ MEDIUM = 2, /** * level HIGH * * @syscap SystemCapability.ResourceSchedule.SystemLoad - * @since 12 + * @since arkts{ '1.1':'12', '1.2':'20' } + * @arkts 1.1&1.2 */ HIGH = 3, /** * level OVERHEATED * * @syscap SystemCapability.ResourceSchedule.SystemLoad - * @since 12 + * @since arkts{ '1.1':'12', '1.2':'20' } + * @arkts 1.1&1.2 */ OVERHEATED = 4, /** * level WARNING * * @syscap SystemCapability.ResourceSchedule.SystemLoad - * @since 12 + * @since arkts{ '1.1':'12', '1.2':'20' } + * @arkts 1.1&1.2 */ WARNING = 5, /** * level EMERGENCY * * @syscap SystemCapability.ResourceSchedule.SystemLoad - * @since 12 + * @since arkts{ '1.1':'12', '1.2':'20' } + * @arkts 1.1&1.2 */ EMERGENCY = 6, /** * level ESCAPE * * @syscap SystemCapability.ResourceSchedule.SystemLoad - * @since 12 + * @since arkts{ '1.1':'12', '1.2':'20' } + * @arkts 1.1&1.2 */ ESCAPE = 7 } @@ -101,7 +111,8 @@ declare namespace systemLoad { * @throws { BusinessError } 401 - Parameter error. Possible cause: 1. Callback parameter error; *
2. Register a exist callback type; 3. Parameter verification failed. * @syscap SystemCapability.ResourceSchedule.SystemLoad - * @since 12 + * @since arkts{ '1.1':'12', '1.2':'20' } + * @arkts 1.1&1.2 */ function on(type: 'systemLoadChange', callback: Callback): void; @@ -112,7 +123,8 @@ declare namespace systemLoad { * @throws { BusinessError } 401 - Parameter error. Possible cause: 1. Callback parameter error; *
2. Unregister type has not register; 3. Parameter verification failed. * @syscap SystemCapability.ResourceSchedule.SystemLoad - * @since 12 + * @since arkts{ '1.1':'12', '1.2':'20' } + * @arkts 1.1&1.2 */ function off(type: 'systemLoadChange', callback?: Callback): void; @@ -120,7 +132,8 @@ declare namespace systemLoad { * @returns { Promise } The promise form returns the SystemLoadLevel result * Queries the current system level * @syscap SystemCapability.ResourceSchedule.SystemLoad - * @since 12 + * @since arkts{ '1.1':'12', '1.2':'20' } + * @arkts 1.1&1.2 */ function getLevel(): Promise; } -- Gitee From 95030e98c2d34aa8b5c2d35b7c061daed6bfd000 Mon Sep 17 00:00:00 2001 From: zzvscx Date: Mon, 7 Jul 2025 15:20:36 +0800 Subject: [PATCH 011/746] =?UTF-8?q?displaysync=E6=8E=A5=E5=8F=A3=E6=96=B0?= =?UTF-8?q?=E5=A2=9E1.2=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zzvscx Change-Id: I838369167558d63d2ee58d5747b8697f4ee78a56 --- api/@ohos.graphics.displaySync.d.ts | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/api/@ohos.graphics.displaySync.d.ts b/api/@ohos.graphics.displaySync.d.ts index 64492f0336..2faa399873 100644 --- a/api/@ohos.graphics.displaySync.d.ts +++ b/api/@ohos.graphics.displaySync.d.ts @@ -16,6 +16,7 @@ /** * @file * @kit ArkGraphics2D + * @arkts 1.1&1.2 */ import type { Callback } from './@ohos.base'; @@ -25,21 +26,21 @@ import type { Callback } from './@ohos.base'; * * @namespace displaySync * @syscap SystemCapability.ArkUI.ArkUI.Full - * @since 11 + * @since arkts {'1.1': '11', '1.2': '20'} */ declare namespace displaySync { /** * Provides the IntervalInfo interface, which includes timestamp and targetTimestamp. * @interface IntervalInfo * @syscap SystemCapability.ArkUI.ArkUI.Full - * @since 11 + * @since arkts {'1.1': '11', '1.2': '20'} */ interface IntervalInfo { /** * The timestamp means the current drawing frame time. * @type { number } * @syscap SystemCapability.ArkUI.ArkUI.Full - * @since 11 + * @since arkts {'1.1': '11', '1.2': '20'} */ timestamp: number; @@ -47,7 +48,7 @@ declare namespace displaySync { * The timestamp means the next drawing frame time. * @type { number } * @syscap SystemCapability.ArkUI.ArkUI.Full - * @since 11 + * @since arkts {'1.1': '11', '1.2': '20'} */ targetTimestamp: number; } @@ -57,7 +58,7 @@ declare namespace displaySync { * the frequency of triggering callback function. * @interface DisplaySync * @syscap SystemCapability.ArkUI.ArkUI.Full - * @since 11 + * @since arkts {'1.1': '11', '1.2': '20'} */ interface DisplaySync { /** @@ -71,7 +72,7 @@ declare namespace displaySync { *
3. Parameter verification failed. * or check ExpectedFrameRateRange if valid. * @syscap SystemCapability.ArkUI.ArkUI.Full - * @since 11 + * @since arkts {'1.1': '11', '1.2': '20'} */ setExpectedFrameRateRange(rateRange: ExpectedFrameRateRange) : void; @@ -81,7 +82,7 @@ declare namespace displaySync { * @param { 'frame' } type - The type of event to remove the listener for. Must be 'frame'. * @param { Callback } callback - The callback function to be called when DisplaySync dispatching. * @syscap SystemCapability.ArkUI.ArkUI.Full - * @since 11 + * @since arkts {'1.1': '11', '1.2': '20'} */ on(type: 'frame', callback: Callback): void; @@ -92,7 +93,7 @@ declare namespace displaySync { * @param { Callback } [callback] - The callback function to remove. If not provided, all callbacks for the given event type * will be removed. * @syscap SystemCapability.ArkUI.ArkUI.Full - * @since 11 + * @since arkts {'1.1': '11', '1.2': '20'} */ off(type: 'frame', callback?: Callback): void; @@ -100,7 +101,7 @@ declare namespace displaySync { * Add DisplaySync to Pipeline. It means that * the callback function be enabled. * @syscap SystemCapability.ArkUI.ArkUI.Full - * @since 11 + * @since arkts {'1.1': '11', '1.2': '20'} */ start(): void; @@ -108,7 +109,7 @@ declare namespace displaySync { * Delete DisplaySync from Pipeline. It means that * the callback function be disabled. * @syscap SystemCapability.ArkUI.ArkUI.Full - * @since 11 + * @since arkts {'1.1': '11', '1.2': '20'} */ stop(): void; } @@ -117,7 +118,7 @@ declare namespace displaySync { * Create a new DisplaySync object. * @returns { DisplaySync } DisplaySync * @syscap SystemCapability.ArkUI.ArkUI.Full - * @since 11 + * @since arkts {'1.1': '11', '1.2': '20'} */ function create(): DisplaySync; } -- Gitee From 829084725aa58a2121c35133417b546878813cf1 Mon Sep 17 00:00:00 2001 From: zhangziye Date: Thu, 3 Jul 2025 21:11:16 +0800 Subject: [PATCH 012/746] =?UTF-8?q?[=E6=96=B0=E9=9C=80=E6=B1=82]:=200328?= =?UTF-8?q?=20merge=20to=200702?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue: https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/ICJYED Signed-off-by: zhangziye --- api/@ohos.buffer.d.ts | 12 + api/@ohos.transfer.d.ets | 72 ++++ api/@ohos.util.ArrayList.d.ts | 16 +- api/@ohos.util.Deque.d.ts | 8 +- api/@ohos.util.HashMap.d.ts | 2 +- api/@ohos.util.HashSet.d.ts | 2 +- api/@ohos.util.LightWeightMap.d.ts | 2 +- api/@ohos.util.LightWeightSet.d.ts | 2 +- api/@ohos.util.LinkedList.d.ts | 2 +- api/@ohos.util.List.d.ts | 4 +- api/@ohos.util.PlainArray.d.ts | 18 +- api/@ohos.util.Queue.d.ts | 2 +- api/@ohos.util.Stack.d.ts | 2 +- api/@ohos.util.TreeMap.d.ts | 4 +- api/@ohos.util.TreeSet.d.ts | 4 +- api/@ohos.util.d.ets | 625 +++++++++++++++++++++++++++-- api/@ohos.util.stream.d.ts | 595 +++++++++++++++++++++++---- arkts/@arkts.collections.d.ets | 305 ++++++++++++++ kits/@kit.ArkTS.d.ets | 16 +- 19 files changed, 1537 insertions(+), 156 deletions(-) create mode 100644 api/@ohos.transfer.d.ets diff --git a/api/@ohos.buffer.d.ts b/api/@ohos.buffer.d.ts index f771c07194..1627e06e8e 100644 --- a/api/@ohos.buffer.d.ts +++ b/api/@ohos.buffer.d.ts @@ -2390,6 +2390,18 @@ declare namespace buffer { * @since 11 */ toJSON(): Object; + + /** + * Converts this Buffer instance into a JsonElement. + * + * @returns { jsonx.JsonElement } A new JsonElement containing the Buffer + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + toJSON(): jsonx.JsonElement; /** * Decodes buf to a string according to the specified character encoding in encoding diff --git a/api/@ohos.transfer.d.ets b/api/@ohos.transfer.d.ets new file mode 100644 index 0000000000..9f401a8502 --- /dev/null +++ b/api/@ohos.transfer.d.ets @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file + * @kit ArkTS + * @arkts 1.2 + */ + +/** + * The transfer module provides transfer ability for subsystem class or interface. + * + * @namespace transfer + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ +declare namespace transfer { + + /** + * Any is used for the parameter type and return type of the transfer methods + * + * @typedef {Object | undefined | null} + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + type Any = Object | undefined | null; + + /** + * Converting the 1.0 object to a 1.2 object. + * + * @param { Any } input The 1.0 object that needs to be converted + * @param { string } inputName name registered by the subsystem. + * @returns { Object } Object + * @throws { BusinessError } 10200067 - Transfer Error. The input name is not supported! + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + function transferStatic(input: Any, inputName: string): Object; + + /** + * Converting the 1.2 object to a 1.0 object. + * + * @param { Object } input The 1.2 object that needs to be converted + * @param { string } inputName name registered by the subsystem. + * @returns { Any } Object + * @throws { BusinessError } 10200067 - Transfer Error. The input name is not supported! + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + function transferDynamic(input: Object, inputName: string): Any; + +} export default transfer; \ No newline at end of file diff --git a/api/@ohos.util.ArrayList.d.ts b/api/@ohos.util.ArrayList.d.ts index 29f71166f0..55f957b50b 100644 --- a/api/@ohos.util.ArrayList.d.ts +++ b/api/@ohos.util.ArrayList.d.ts @@ -474,14 +474,14 @@ declare class ArrayList { /** * Replaces all elements in this container with new elements, and returns the new ones. * - * @param { ArrayListCbFn1 } callbackFn - Callback invoked for the replacement. + * @param { ArrayListReplaceCb } callbackFn - Callback invoked for the replacement. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice * @since 20 * @arkts 1.2 */ - replaceAllElements(callbackFn: ArrayListCbFn1): void; + replaceAllElements(callbackFn: ArrayListReplaceCb): void; /** * Executes a provided function once for each value in the arraylist object. @@ -539,14 +539,14 @@ declare class ArrayList { /** * Iterates over elements in a generic ArrayList and executes a callback function for each element. * - * @param { ArrayListCbFn } callbackFn - A callback function to execute for each element. + * @param { ArrayListForEachCb } callbackFn - A callback function to execute for each element. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice * @since 20 * @arkts 1.2 */ - forEach(callbackFn: ArrayListCbFn): void; + forEach(callbackFn: ArrayListForEachCb): void; /** * Sorts this arraylist according to the order induced by the specified comparator,without comparator this parameter, @@ -943,7 +943,7 @@ declare class ArrayList { /** * The type of ArrayList callback function. * - * @typedef { function } ArrayListCbFn + * @typedef { function } ArrayListForEachCb * @param { T } value - The current element being processed * @param { number } index - The index of the current element * @param { ArrayList } arrlist - The ArrayList instance being traversed @@ -953,12 +953,12 @@ declare class ArrayList { * @since 20 * @arkts 1.2 */ - type ArrayListCbFn = (value: T, index: number, arrlist: ArrayList) => void; + export type ArrayListForEachCb = (value: T, index: number, arrlist: ArrayList) => void; /** * The type of ArrayList callback function. * - * @typedef { function } ArrayListCbFn + * @typedef { function } ArrayListReplaceCb * @param { T } value - The current element being processed * @param { number } index - The index of the current element * @param { ArrayList } arrlist - The ArrayList instance being traversed @@ -968,6 +968,6 @@ declare class ArrayList { * @since 20 * @arkts 1.2 */ - type ArrayListCbFn1 = (value: T, index?: number, arrlist?: ArrayList) => T; + export type ArrayListReplaceCb = (value: T, index: number, arrlist: ArrayList) => T; export default ArrayList; diff --git a/api/@ohos.util.Deque.d.ts b/api/@ohos.util.Deque.d.ts index 8e4758b126..73f2f662e3 100644 --- a/api/@ohos.util.Deque.d.ts +++ b/api/@ohos.util.Deque.d.ts @@ -419,14 +419,14 @@ declare class Deque { /** * Iterates over elements in a generic Deque (double-ended queue) and executes a callback function for each element. * - * @param { DequeCbFnforEach } callbackFn - A callback function to execute for each element. + * @param { DequeForEachCb } callbackFn - A callback function to execute for each element. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice * @since 20 * @arkts 1.2 */ - forEach(callbackFn: DequeCbFnforEach): void; + forEach(callbackFn: DequeForEachCb): void; /** * Returns the byte at the specified index. * @@ -498,7 +498,7 @@ declare class Deque { /** * The type of Deque forEach callback function. * - * @typedef { function } DequeCbFnforEach + * @typedef { function } DequeForEachCb * @param { T } value - The current element being processed * @param { number } index - The index of the current element * @param { Deque } deque - The Deque instance being traversed @@ -508,6 +508,6 @@ declare class Deque { * @since 20 * @arkts 1.2 */ - type DequeCbFnforEach = (value: T, index: number, deque: Deque) => void; + export type DequeForEachCb = (value: T, index: number, deque: Deque) => void; export default Deque; diff --git a/api/@ohos.util.HashMap.d.ts b/api/@ohos.util.HashMap.d.ts index d95f7ca2cb..31522c3168 100644 --- a/api/@ohos.util.HashMap.d.ts +++ b/api/@ohos.util.HashMap.d.ts @@ -634,6 +634,6 @@ declare class HashMap { * @since 20 * @arkts 1.2 */ - type HashMapCbFn = (value: V, key: K, map: HashMap) => void; + export type HashMapCbFn = (value: V, key: K, map: HashMap) => void; export default HashMap; diff --git a/api/@ohos.util.HashSet.d.ts b/api/@ohos.util.HashSet.d.ts index 654a6e7c8f..6607d94f10 100644 --- a/api/@ohos.util.HashSet.d.ts +++ b/api/@ohos.util.HashSet.d.ts @@ -468,6 +468,6 @@ declare class HashSet { * @since 20 * @arkts 1.2 */ -type HashSetCbFn = (value: T, key: T, set: HashSet) => void; +export type HashSetCbFn = (value: T, key: T, set: HashSet) => void; export default HashSet; diff --git a/api/@ohos.util.LightWeightMap.d.ts b/api/@ohos.util.LightWeightMap.d.ts index 4b64ae7b16..ff83f28ea5 100644 --- a/api/@ohos.util.LightWeightMap.d.ts +++ b/api/@ohos.util.LightWeightMap.d.ts @@ -998,6 +998,6 @@ declare class LightWeightMap { * @since 20 * @arkts 1.2 */ - type LightWeightMapCbFn = (value: V, key: K, map: LightWeightMap) => void; + export type LightWeightMapCbFn = (value: V, key: K, map: LightWeightMap) => void; export default LightWeightMap; diff --git a/api/@ohos.util.LightWeightSet.d.ts b/api/@ohos.util.LightWeightSet.d.ts index 612b677db1..cd20907d09 100644 --- a/api/@ohos.util.LightWeightSet.d.ts +++ b/api/@ohos.util.LightWeightSet.d.ts @@ -787,6 +787,6 @@ declare class LightWeightSet { * @since 20 * @arkts 1.2 */ -type LightWeightSetForEachCb = (value: T, key: T, set: LightWeightSet) => void +export type LightWeightSetForEachCb = (value: T, key: T, set: LightWeightSet) => void export default LightWeightSet; diff --git a/api/@ohos.util.LinkedList.d.ts b/api/@ohos.util.LinkedList.d.ts index 37160e6cf5..b51904d4b4 100644 --- a/api/@ohos.util.LinkedList.d.ts +++ b/api/@ohos.util.LinkedList.d.ts @@ -1012,6 +1012,6 @@ declare class LinkedList { * @since 20 * @arkts 1.2 */ -type LinkedListForEachCb = (value: T, index: number, linkedList: LinkedList) => void +export type LinkedListForEachCb = (value: T, index: number, linkedList: LinkedList) => void export default LinkedList; diff --git a/api/@ohos.util.List.d.ts b/api/@ohos.util.List.d.ts index b2fe9cc1e4..405a412252 100644 --- a/api/@ohos.util.List.d.ts +++ b/api/@ohos.util.List.d.ts @@ -1007,7 +1007,7 @@ declare class List { * @since 20 * @arkts 1.2 */ -type ListForEachCb = (value: T, index: number, list: List) => void +export type ListForEachCb = (value: T, index: number, list: List) => void /** * The type of List callback function. @@ -1022,6 +1022,6 @@ type ListForEachCb = (value: T, index: number, list: List) => void * @since 20 * @arkts 1.2 */ -type ListReplaceCb = (value: T, index: number, list: List) => T +export type ListReplaceCb = (value: T, index: number, list: List) => T export default List; diff --git a/api/@ohos.util.PlainArray.d.ts b/api/@ohos.util.PlainArray.d.ts index 6b28d6ba11..d6c40f936a 100644 --- a/api/@ohos.util.PlainArray.d.ts +++ b/api/@ohos.util.PlainArray.d.ts @@ -439,10 +439,22 @@ declare class PlainArray { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ getKeyAt(index: number): number; + /** + * Queries the key at a specified index + * + * @param { number } index - index index Target subscript for search + * @returns { number | undefined } the key of key-value pairs, or undefined if the index is out of range. + * @throws { BusinessError } 10200011 - The getKeyAt method cannot be bound. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + getKeyAt(index: number): number | undefined; /** * Remove the key-value pair based on a specified key if it exists and return the value * @@ -838,6 +850,6 @@ declare class PlainArray { * @since 20 * @arkts 1.2 */ -type PlainArrayForEachCb = (value: T, key: number, PlainArray: PlainArray) => void +export type PlainArrayForEachCb = (value: T, key: number, PlainArray: PlainArray) => void export default PlainArray; diff --git a/api/@ohos.util.Queue.d.ts b/api/@ohos.util.Queue.d.ts index abdba11d47..90724be60b 100644 --- a/api/@ohos.util.Queue.d.ts +++ b/api/@ohos.util.Queue.d.ts @@ -349,6 +349,6 @@ declare class Queue { * @since 20 * @arkts 1.2 */ -type QueueForEachCb = (value: T, index: number, queue: Queue) => void +export type QueueForEachCb = (value: T, index: number, queue: Queue) => void export default Queue; diff --git a/api/@ohos.util.Stack.d.ts b/api/@ohos.util.Stack.d.ts index 340ed2c85f..1e76aa0578 100644 --- a/api/@ohos.util.Stack.d.ts +++ b/api/@ohos.util.Stack.d.ts @@ -412,6 +412,6 @@ declare class Stack { * @since 20 * @arkts 1.2 */ -type StackForEachCb = (value: T, index: number, stack: Stack) => void +export type StackForEachCb = (value: T, index: number, stack: Stack) => void export default Stack; diff --git a/api/@ohos.util.TreeMap.d.ts b/api/@ohos.util.TreeMap.d.ts index ad93707e33..abd92fe674 100644 --- a/api/@ohos.util.TreeMap.d.ts +++ b/api/@ohos.util.TreeMap.d.ts @@ -871,7 +871,7 @@ declare class TreeMap { * @since 20 * @arkts 1.2 */ -type TreeMapForEachCb = (value: V, key: K, map: TreeMap) => void +export type TreeMapForEachCb = (value: V, key: K, map: TreeMap) => void /** * The type of TreeMap comparator. @@ -885,6 +885,6 @@ type TreeMapForEachCb = (value: V, key: K, map: TreeMap) => void * @since 20 * @arkts 1.2 */ -type TreeMapComparator = (firstValue: K, secondValue: K) => number +export type TreeMapComparator = (firstValue: K, secondValue: K) => number export default TreeMap; diff --git a/api/@ohos.util.TreeSet.d.ts b/api/@ohos.util.TreeSet.d.ts index d09e7b0548..234c1885de 100644 --- a/api/@ohos.util.TreeSet.d.ts +++ b/api/@ohos.util.TreeSet.d.ts @@ -765,7 +765,7 @@ declare class TreeSet { * @since 20 * @arkts 1.2 */ -type TreeSetForEachCb = (value: T, key: T, set: TreeSet) => void +export type TreeSetForEachCb = (value: T, key: T, set: TreeSet) => void /** * The type of TreeSet comparator. @@ -779,6 +779,6 @@ type TreeSetForEachCb = (value: T, key: T, set: TreeSet) => void * @since 20 * @arkts 1.2 */ -type TreeSetComparator = (firstValue: T, secondValue: T) => number +export type TreeSetComparator = (firstValue: T, secondValue: T) => number export default TreeSet; diff --git a/api/@ohos.util.d.ets b/api/@ohos.util.d.ets index 8d7fe62fc9..c3883f4614 100644 --- a/api/@ohos.util.d.ets +++ b/api/@ohos.util.d.ets @@ -143,7 +143,7 @@ declare namespace util { * @atomicservice * @since 20 */ - encodeSync(src: Uint8Array, options: Type = Type.BASIC): Uint8Array; + encodeSync(src: Uint8Array, options?: Type): Uint8Array; /** * Encodes the specified byte array into a String using the Base64 encoding scheme. @@ -159,12 +159,12 @@ declare namespace util { * @atomicservice * @since 20 */ - encodeToStringSync(src: Uint8Array, options: Type = Type.BASIC): string; + encodeToStringSync(src: Uint8Array, options?: Type): string; /** * Decodes a Base64 encoded String or input u8 array into a newly-allocated u8 array using the Base64 encoding scheme. * - * @param { string } src - A string value + * @param { Uint8Array | string } src - A Uint8Array value or a string value * @param { Type } [options] - one of the Type enumeration * @returns { Uint8Array } Return the decoded Uint8Array. * @throws { BusinessError } 401 - Parameter error. Possible causes: @@ -175,23 +175,7 @@ declare namespace util { * @atomicservice * @since 20 */ - decodeSync(src: string, options: Type = Type.BASIC): Uint8Array; - - /** - * Decodes a Base64 encoded String or input u8 array into a newly-allocated u8 array using the Base64 encoding scheme. - * - * @param { Uint8Array } src - A Uint8Array value - * @param { Type } [options] - one of the Type enumeration - * @returns { Uint8Array } Return the decoded Uint8Array. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.Mandatory parameters are left unspecified; - * 2.Incorrect parameter types. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - */ - decodeSync(src: Uint8Array, options: Type = Type.BASIC): Uint8Array; + decodeSync(src: Uint8Array | string, options?: Type): Uint8Array; /** * Asynchronously encodes all bytes in the specified u8 array into the newly allocated u8 array using the Base64 encoding scheme. @@ -207,7 +191,7 @@ declare namespace util { * @atomicservice * @since 20 */ - encode(src: Uint8Array, options: Type = Type.BASIC): Promise; + encode(src: Uint8Array, options?: Type): Promise; /** * Asynchronously encodes the specified byte array into a String using the Base64 encoding scheme. @@ -223,13 +207,13 @@ declare namespace util { * @atomicservice * @since 20 */ - encodeToString(src: Uint8Array, options: Type = Type.BASIC): Promise; + encodeToString(src: Uint8Array, options?: Type): Promise; /** * Use the Base64 encoding scheme to asynchronously decode a Base64-encoded string or * input u8 array into a newly allocated u8 array. * - * @param { Uint8Array } src - A Uint8Array value + * @param { Uint8Array | string } src - A Uint8Array value or a string value * @param { Type } [options] - one of the Type enumeration * @returns { Promise } Return the decoded asynchronous Uint8Array. * @throws { BusinessError } 401 - Parameter error. Possible causes: @@ -240,24 +224,7 @@ declare namespace util { * @atomicservice * @since 20 */ - decode(src: Uint8Array, options: Type = Type.BASIC): Promise; - - /** - * Use the Base64 encoding scheme to asynchronously decode a Base64-encoded string or - * input u8 array into a newly allocated u8 array. - * - * @param { string } src - A string value - * @param { Type } [options] - one of the Type enumeration - * @returns { Promise } Return the decoded asynchronous Uint8Array. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.Mandatory parameters are left unspecified; - * 2.Incorrect parameter types. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - */ - decode(src: string, options: Type = Type.BASIC): Promise; + decode(src: Uint8Array | string, options?: Type): Promise; } /** @@ -730,6 +697,60 @@ declare namespace util { stream?: boolean; } + /** + * Provide the ability to decode binary streams into strings. The supported encoding types include: utf-8, iso-8859-2, + * koi8-r, macintosh, windows-1250, windows-1251, gbk, gb18030, big5, utf-16be, utf-16 le, etc. + * + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + class StringDecoder { + /** + * The StringDecoder constructor. + * + * @param { string } [encoding] - Encoding type of the input data.Default: utf8. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified; + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + constructor(encoding?: string); + + /** + * Returns a decoded string, ensuring that any incomplete multiple byte characters at the end of the Uint8Array are + * omitted from the returned string and stored in an internal buffer. + * + * @param { string | Uint8Array } chunk - The bytes to decode. + * @returns { string } Returns a decoded string. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified; + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + write(chunk: string | Uint8Array): string; + + /** + * Returns any remaining input stored in the internal buffer as a string. After end() is called, + * this object can be reused for new input. + * + * @param { string | Uint8Array } [chunk] - The bytes to decode. + * @returns { string } Returns any remaining input stored in the internal buffer as a string. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified; + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + end(chunk?: string | Uint8Array): string; + } + /** * The TextDecoder represents a text decoder that accepts a string as input, * decodes it in UTF-8 format, and outputs UTF-8 byte stream. @@ -845,6 +866,177 @@ declare namespace util { written: int; } + /** + * The rational number is mainly to compare rational numbers and obtain the numerator and denominator. + * + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + class RationalNumber { + /** + * A constructor used to create a RationalNumber instance with a given numerator and denominator. + * + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + constructor(); + + /** + * Used to create a RationalNumber instance with a given numerator and denominator. + * + * @param { number } numerator - An integer number + * @param { number } denominator - An integer number + * @returns { RationalNumber } + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified; + * 2.Incorrect parameter types. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + static parseRationalNumber(numerator: number, denominator: number): RationalNumber; + + /** + * Creates a RationalNumber object based on a given string. + * + * @param { string } rationalString - String Expression of Rational Numbers + * @returns { RationalNumber } Returns a RationalNumber object generated based on the given string. + * @throws { BusinessError } 401 - The type of rationalString must be string. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + static createRationalFromString(rationalString: string): RationalNumber; + + /** + * Compares the current RationalNumber object to the given object. + * + * @param { RationalNumber } another - An object of other rational numbers + * @returns { number } Returns 0 or 1, or -1, depending on the comparison. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified; + * 2.Incorrect parameter types. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + compare(another: RationalNumber): number; + + /** + * Compares two objects for equality. + * + * @param { Object } obj - An object + * @returns { boolean } Returns true if the given object is the same as the current object; + * Otherwise, false is returned. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + equals(obj: Object): boolean; + + /** + * Gets integer and floating-point values of a rational number object. + * + * @returns { number } Returns the integer and floating-point values of a rational number object. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 12 + */ + valueOf(): number; + + /** + * Get the greatest common factor of two integers. + * + * @param { number } number1 - Is an integer. + * @param { number } number2 - Is an integer. + * @returns { number } Returns the greatest common factor of two integers, integer type. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified; + * 2.Incorrect parameter types. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + static getCommonFactor(number1: number, number2: number): number; + + /** + * Gets the denominator of the current object. + * + * @returns { number } Returns the denominator of the current object. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + getDenominator(): number; + + /** + * Gets the numerator of the current object. + * + * @returns { number } Returns the numerator of the current object. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + getNumerator(): number; + + /** + * Checks whether the current RationalNumber object represents an infinite value. + * + * @returns { boolean } If the denominator is not 0, true is returned. Otherwise, false is returned. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isFinite(): boolean; + + /** + * Checks whether the current RationalNumber object represents a Not-a-Number (NaN) value. + * + * @returns { boolean } If both the denominator and numerator are 0, true is returned. Otherwise, false is returned. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isNaN(): boolean; + + /** + * Checks whether the current RationalNumber object represents the value 0. + * + * @returns { boolean } If the value represented by the current object is 0, true is returned. + * Otherwise, false is returned. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isZero(): boolean; + + /** + * Obtains a string representation of the current RationalNumber object. + * + * @returns { string } Returns a string representation of the current RationalNumber object. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + toString(): string; + } + /** * The TextEncoder interface represents a text encoder. * The encoder takes the byte stream as the input and outputs the String string. @@ -918,5 +1110,356 @@ declare namespace util { */ encodeIntoUint8Array(input: string, dest: Uint8Array): EncodeIntoUint8ArrayInfo; } + + /** + * Check the type of parameter. + * + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + class types { + + /** + * Check whether the entered value is of arraybuffer or sharedarraybuffer type. + * + * @param { Object } value - A ArrayBuffer or SharedArrayBuffer value + * @returns { boolean } Returns true if the value is a built-in ArrayBuffer or SharedArrayBuffer instance. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isAnyArrayBuffer(value: Object): boolean; + /** + * Check whether the type is included in the isAnyArrayBuffer. + * + * @param { Object } value - A included in the isAnyArrayBuffer value + * @returns { boolean } Returns true if the value is an instance of one of the ArrayBuffer views, + * such as typed array objects or DataView. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isArrayBufferView(value: Object): boolean; + /** + * Check whether the entered value is of arraybuffer type. + * + * @param { Object } value - A arraybuffer value + * @returns { boolean } Returns true if the value is a built-in ArrayBuffer instance. + * This does not include SharedArrayBuffer instances. + * Usually, it is desirable to test for both; See isAnyArrayBuffer() for that. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isArrayBuffer(value: Object): boolean; + /** + * Check whether the entered value is of bigint64array array type. + * + * @param { Object } value - A BigInt64Array value + * @returns { boolean } Returns true if the value is a BigInt64Array instance. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isBigInt64Array(value: Object): boolean; + /** + * Check whether the entered value is of biguint64array array array type. + * + * @param { Object } value - A BigUint64Array value + * @returns { boolean } Returns true if the value is a BigUint64Array instance. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isBigUint64Array(value: Object): boolean; + /** + * Check whether the entered value is of DataView type. + * + * @param { Object } value - A DataView value + * @returns { boolean } Returns true if the value is a built-in DataView instance. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isDataView(value: Object): boolean; + /** + * Check whether the entered value is of type date. + * + * @param { Object } value - A Date value + * @returns { boolean } Returns true if the value is a built-in Date instance. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isDate(value: Object): boolean; + /** + * Check whether the entered value is of float32array array type. + * + * @param { Object } value - A Float32Array value + * @returns { boolean } Returns true if the value is a built-in Float32Array instance. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isFloat32Array(value: Object): boolean; + /** + * Check whether the entered value is of float64array array type. + * + * @param { Object } value - A Float64Array value + * @returns { boolean } Returns true if the value is a built-in Float64Array instance. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isFloat64Array(value: Object): boolean; + /** + * Check whether the entered value is of int8array array type. + * + * @param { Object } value - A Int8Array value + * @returns { boolean } Returns true if the value is a built-in Int8Array instance. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isInt8Array(value: Object): boolean; + /** + * Check whether the entered value is the int16array type. + * + * @param { Object } value - A Int16Array value + * @returns { boolean } Returns true if the value is a built-in Int16Array instance. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isInt16Array(value: Object): boolean; + /** + * Check whether the entered value is the int32array array type. + * + * @param { Object } value - A Int32Array value + * @returns { boolean } Returns true if the value is a built-in Int32Array instance. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isInt32Array(value: Object): boolean; + /** + * Check whether the entered value is of map type. + * + * @param { Object } value - A Map value + * @returns { boolean } Returns true if the value is a built-in Map instance. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isMap(value: Object): boolean; + /** + * Check whether the entered value is the iterator type of map. + * + * @param { Object } value - A Map iterator value + * @returns { boolean } Returns true if the value is an iterator returned for a built-in Map instance. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isMapIterator(value: Object): boolean; + /** + * Check whether the value entered is of type error. + * + * @param { Object } value - A Error value + * @returns { boolean } Returns true if the value is an instance of a built-in Error type. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isNativeError(value: Object): boolean; + /** + * Check whether the entered value is of promise type. + * + * @param { Object } value - A Promise value + * @returns { boolean } Returns true if the value is a built-in Promise. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isPromise(value: Object): boolean; + /** + * Check whether the entered value is of type regexp. + * + * @param { Object } value - A regular expression object value + * @returns { boolean } Returns true if the value is a regular expression object. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isRegExp(value: Object): boolean; + /** + * Check whether the entered value is of type set. + * + * @param { Object } value - A Set instance value + * @returns { boolean } Returns true if the value is a built-in Set instance. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isSet(value: Object): boolean; + /** + * Check whether the entered value is the iterator type of set. + * + * @param { Object } value - A Set iterator value + * @returns { boolean } Returns true if the value is an iterator returned for a built-in Set instance. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isSetIterator(value: Object): boolean; + /** + * Check whether the entered value is a type contained in typedarray. + * + * @param { Object } value - A TypedArray instance value + * @returns { boolean } Returns true if the value is a built-in TypedArray instance. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isTypedArray(value: Object): boolean; + /** + * Check whether the entered value is the uint8array array type. + * + * @param { Object } value - A Uint8Array value + * @returns { boolean } Returns true if the value is a built-in Uint8Array instance. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isUint8Array(value: Object): boolean; + /** + * Check whether the entered value is the uint8clapedarray array type. + * + * @param { Object } value - A Uint8ClampedArray value + * @returns { boolean } Returns true if the value is a built-in Uint8ClampedArray instance. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isUint8ClampedArray(value: Object): boolean; + /** + * Check whether the entered value is the uint16array array array type. + * + * @param { Object } value - A Uint16Array value + * @returns { boolean } Returns true if the value is a built-in Uint16Array instance. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isUint16Array(value: Object): boolean; + /** + * Check whether the entered value is the uint32array array type. + * + * @param { Object } value - A Uint32Array value + * @returns { boolean } Returns true if the value is a built-in Uint32Array instance. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isUint32Array(value: Object): boolean; + /** + * Check whether the entered value is of type weakmap. + * + * @param { Object } value - A WeakMap value + * @returns { boolean } Returns true if the value is a built-in WeakMap instance. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isWeakMap(value: Object): boolean; + /** + * Check whether the entered value is of type weakset. + * + * @param { Object } value - A WeakSet value + * @returns { boolean } Returns true if the value is a built-in WeakSet instance. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + isWeakSet(value: Object): boolean; + } + + /** + * Takes a function following the common error-first callback style, i.e taking an (err, value) => + * callback as the last argument, and return a function that returns promises. + * + * @param { Function } original - Asynchronous Function + * @returns { Function } Return a function that returns promises + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + function promisify(original: Function): (...args: FixedArray) => Promise; + + /** + * Get the hash code of an object. + * + * @param { object } [object] - The object that need to get hash code. + * @returns { number } Return a hash code of an object. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + function getHash(object: object): number; + + /** + * Generate a random RFC 4122 version 4 binary UUID using a cryptographically secure random number generator. + * + * @param { boolean } [entropyCache] - Whether to generate the UUID with using the cache. Default: true. + * @returns { Uint8Array | undefined } Return a Uint8Array representing this UUID, or undefined on failure. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + function generateRandomBinaryUUID(entropyCache?: boolean): Uint8Array | undefined; + + /** + * Parse a UUID from the string standard representation as described in the RFC 4122 version 4. + * + * @param { string } uuid - String that specifies a UUID + * @returns { Uint8Array } Return a Uint8Array representing this UUID. Throw SyntaxError if parsing fails. + * @throws { BusinessError } 10200002 - Invalid uuid string. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + function parseUUID(uuid: string): Uint8Array; } export default util; diff --git a/api/@ohos.util.stream.d.ts b/api/@ohos.util.stream.d.ts index 072128b1f7..bc2a0151eb 100644 --- a/api/@ohos.util.stream.d.ts +++ b/api/@ohos.util.stream.d.ts @@ -17,30 +17,69 @@ * @file * @kit ArkTS */ - import { Callback } from './@ohos.base'; - import emitter from './@ohos.events.emitter'; - - /** - * The stream module provides a comprehensive set of stream processing capabilities, including four types of streams: - * - Writable: streams designed for writing data to. - * - Readable: streams designed for reading data from. - * - Duplex: streams that are both readable and writable. - * - Transform: a specialized type of duplex stream that can modify or transform data as it's being written and read. - * - * @namespace stream - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 12 - */ + +/*** if arkts 1.1 */ +import { Callback } from './@ohos.base'; +import emitter from './@ohos.events.emitter'; +/*** endif */ +/*** if arkts 1.2 */ +import buffer from '@ohos.buffer'; +/*** endif */ + +/** + * The stream module provides a comprehensive set of stream processing capabilities, including four types of streams: + * - Writable: streams designed for writing data to. + * - Readable: streams designed for reading data from. + * - Duplex: streams that are both readable and writable. + * - Transform: a specialized type of duplex stream that can modify or transform data as it's being written and read. + * + * @namespace stream + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ declare namespace stream { + /** + * Return readable options. + * + * @interface ReadableOptions + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ + interface ReadableOptions { + /** + * Specifies the encoding format of the data. If this parameter is provided, + * the readable stream decodes the data into a string in the specified encoding format. Default: utf8. + * If an invalid string is entered, a 401 exception is thrown in the Readable constructor. + * Supported encoding formats: utf-8, ibm866, iso-8859-2, iso-8859-3, iso-8859-4, iso-8859-5, iso-8859-6, + * iso-8859-7, iso-8859-8, iso-8859-8-i, iso-8859-10, iso-8859-13, iso-8859-14, iso-8859-15, koi8-r, koi8-u, + * macintosh, windows-874, windows-1250, windows-1251, windows-1252, windows-1253, windows-1254, windows-1255, + * windows-1256, windows-1257, windows-1258, x-mac-cyrillic, gbk, gb18030, big5, euc-jp, iso-2022-jp, shift_jis, + * euc-kr, utf-16be, utf-16le. + * + * @type { ?string } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ + encoding?: string; + } + /** * Streams to which data can be written. * * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ class Writable { /** @@ -49,9 +88,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); + /** * writes a chunk to Writable and invokes callback when the chunk is flushed. The return value indicates * whether the internal buffer of the Writable reaches the hightWaterMark. If true is returned, the buffer @@ -73,9 +114,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 - */ + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ write(chunk?: string | Uint8Array, encoding?: string, callback?: Function): boolean; + /** * Write the last chunk to Writable. * @@ -91,9 +134,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ end(chunk?: string | Uint8Array, encoding?: string, callback?: Function): Writable; + /** * Set the default encoding mode. * @@ -106,9 +151,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 - */ + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ setDefaultEncoding(encoding?: string): boolean; + /** * After the call, all Write operations will be forced to write to the buffer instead of being flushed. * @@ -116,9 +163,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ cork(): boolean; + /** * After calling, flush all buffers. * @@ -126,9 +175,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ uncork(): boolean; + /** * Registering Event Messages. * @@ -144,6 +195,20 @@ declare namespace stream { * @since 12 */ on(event: string, callback: Callback): void; + + /** + * Registering Event Messages. + * + * @param { string } event - Register Event. + * @param { Function } callback - event callbacks. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + on(event: string, callback: Function): void; + /** * Cancel event message. * @@ -158,6 +223,20 @@ declare namespace stream { * @since 12 */ off(event: string, callback?: Callback): void; + + /** + * Cancel event message. + * + * @param { string } event - Register Event. + * @param { Function } [callback] - event callbacks. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + off(event: string, callback?: Function): void; + /** * This method is invoked by the Writable method during initialization and must not be invoked directly. * After the resource is initialized in the doInitialize method, the callback () method is invoked. @@ -169,9 +248,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ doInitialize(callback: Function): void; + /** * Implemented by subclass inheritance. The implementation logic of flushing chunks in the buffer must not be * directly called. The call is controlled by Writable.write. @@ -186,9 +267,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ doWrite(chunk: string | Uint8Array, encoding: string, callback: Function): void; + /** * The implementation logic of flushing chunks in the buffer in batches should not be actively called. * The call is controlled by Writable.write. @@ -202,9 +285,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ doWritev(chunks: string[] | Uint8Array[], callback: Function): void; + /** * Returns boolean indicating whether it is in ObjectMode. * @@ -216,6 +301,19 @@ declare namespace stream { * @since 12 */ readonly writableObjectMode: boolean; + + /** + * Returns boolean indicating whether it is in ObjectMode. + * + * @type { boolean } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get writableObjectMode(): boolean; + /** * Value of highWatermark. * @@ -227,6 +325,19 @@ declare namespace stream { * @since 12 */ readonly writableHighWatermark: number; + + /** + * Value of highWatermark. + * + * @type { number } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get writableHighWatermark(): number; + /** * Is true if it is safe to call writable.write(), which means the stream has not been destroyed, error or end. * @@ -238,6 +349,19 @@ declare namespace stream { * @since 12 */ readonly writable: boolean; + + /** + * Is true if it is safe to call writable.write(), which means the stream has not been destroyed, error or end. + * + * @type { boolean } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get writable(): boolean; + /** * Size of data that can be flushed, in bytes or objects. * @@ -249,6 +373,19 @@ declare namespace stream { * @since 12 */ readonly writableLength: number; + + /** + * Size of data that can be flushed, in bytes or objects. + * + * @type { number } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get writableLength(): number; + /** * Number of times writable.uncork() needs to be called in order to fully uncork the stream. * @@ -260,9 +397,22 @@ declare namespace stream { * @since 12 */ readonly writableCorked: number; + /** * Whether Writable.end has been called. * + * @type { number } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get writableCorked(): number; + + /** + * Whether Writable.end has been called and all buffers have been flushed. + * * @type { boolean } * @readonly * @syscap SystemCapability.Utils.Lang @@ -271,6 +421,19 @@ declare namespace stream { * @since 12 */ readonly writableEnded: boolean; + + /** + * Whether Writable.end has been called. + * + * @type { boolean } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get writableEnded(): boolean; + /** * Whether Writable.end has been called and all buffers have been flushed. * @@ -281,8 +444,22 @@ declare namespace stream { * @atomicservice * @since 12 */ - readonly writableFinished: boolean; + readonly writableFinished: boolean; + + + /** + * Whether Writable.end has been called and all buffers have been flushed. + * + * @type { boolean } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get writableFinished(): boolean; } + /** * Transform stream is a Duplex stream where the output is computed in some way from the input. * Transform implementations must implement the doTransform() method and may also implement the doFlush() method. @@ -291,7 +468,8 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ class Transform extends Duplex { /** @@ -300,9 +478,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); + /** * Convert the input data. After the conversion, Transform.push can be called to send the input to the read stream. * Transform.push should not be called Transform.write to call. @@ -318,9 +498,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ doTransform(chunk: string, encoding: string, callback: Function): void; + /** * After all data is flushed to the write stream, you can use the Transform.doFlush writes some extra data, must * not be called directly, only called by Writable after flushing all data. @@ -333,39 +515,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ doFlush(callback: Function): void; - } - - /** - * Return readable options. - * - * @interface ReadableOptions - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 12 - */ - interface ReadableOptions { - /** - * Specifies the encoding format of the data. If this parameter is provided, - * the readable stream decodes the data into a string in the specified encoding format. Default: utf8. - * If an invalid string is entered, a 401 exception is thrown in the Readable constructor. - * Supported encoding formats: utf-8, ibm866, iso-8859-2, iso-8859-3, iso-8859-4, iso-8859-5, iso-8859-6, - * iso-8859-7, iso-8859-8, iso-8859-8-i, iso-8859-10, iso-8859-13, iso-8859-14, iso-8859-15, koi8-r, koi8-u, - * macintosh, windows-874, windows-1250, windows-1251, windows-1252, windows-1253, windows-1254, windows-1255, - * windows-1256, windows-1257, windows-1258, x-mac-cyrillic, gbk, gb18030, big5, euc-jp, iso-2022-jp, shift_jis, - * euc-kr, utf-16be, utf-16le. - * - * @type { ?string } - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 12 - */ - encoding?: string; - } + } /** * The stream from which data can be read. @@ -373,7 +527,8 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ class Readable { /** @@ -382,9 +537,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); + /** * The Readable constructor. * @@ -396,9 +553,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(options: ReadableOptions); + /** * Reads a buffer of a specified size from the buffer. If the available buffer is sufficient, the result * of the specified size is returned. Otherwise, if Readable has ended, all remaining buffers are returned. @@ -416,6 +575,26 @@ declare namespace stream { * @since 12 */ read(size?: number): string | null; + + /** + * Reads a buffer of a specified size from the buffer. If the available buffer is sufficient, the result + * of the specified size is returned. Otherwise, if Readable has ended, all remaining buffers are returned. + * + * @param { number } [size] - Expected length of the data to be read. + * @returns { buffer.Buffer | string | null } If no data is available to read, null is returned. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified; + * 2.Incorrect parameter types; + * 3.Parameter verification failed. + * @throws { BusinessError } 10200038 - The doRead method has not been implemented. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + read(size?: number): buffer.Buffer | string | null; + /** * Switch Readable to Streaming Mode. * @@ -423,9 +602,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ resume(): Readable; + /** * Toggle Readable to Suspend Mode. * @@ -433,9 +614,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ pause(): Readable; + /** * Sets the encoding format of the input binary data.Default: utf8. * @@ -447,9 +630,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ setEncoding(encoding?: string): boolean; + /** * Query whether it is in pause state. * @@ -457,9 +642,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ isPaused(): boolean; + /** * Concatenated a Writable to a Readable and switches the Readable to stream mode. * @@ -473,9 +660,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ pipe(destination: Writable, options?: Object): Writable; + /** * Disconnect Writable from Readable. * @@ -488,9 +677,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ unpipe(destination?: Writable): Readable; + /** * Registering Event Messages. * @@ -505,6 +696,20 @@ declare namespace stream { * @since 12 */ on(event: string, callback: Callback): void; + + /** + * Registering Event Messages. + * + * @param { string } event - Registering Events. + * @param { Function } callback - Event callback. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + on(event: string, callback: Function): void; + /** * Cancel event message. * @@ -519,6 +724,20 @@ declare namespace stream { * @since 12 */ off(event: string, callback?: Callback): void; + + /** + * Cancel event message. + * + * @param { string } event - Registering Events. + * @param { Function } [callback] - Event callback. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + off(event: string, callback?: Function): void; + /** * It may be implemented by child classes, and if so, will be called by the Readable class methods only. * It must not be called directly. @@ -531,9 +750,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ doInitialize(callback: Function): void; + /** * The specific implementation of data production. It must not be actively called. * After data production, Readable.push should be called to push the produced data into the buffer. @@ -547,9 +768,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ doRead(size: number): void; + /** * Adds the generated data to the buffer. The return value indicates whether the data in the buffer has not * reached the highWaterMark (similar to Writable.write). If the chunk is null, all data has been generated. @@ -564,9 +787,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ push(chunk: Uint8Array | string | null, encoding?: string): boolean; + /** * Returns boolean indicating whether it is in ObjectMode. * @@ -578,6 +803,19 @@ declare namespace stream { * @since 12 */ readonly readableObjectMode: boolean; + + /** + * Returns boolean indicating whether it is in ObjectMode. + * + * @type { boolean } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get readableObjectMode(): boolean; + /** * Is true if it is safe to call readable.read(), which means * the stream has not been destroyed or emitted 'error' or 'end'. @@ -590,6 +828,20 @@ declare namespace stream { * @since 12 */ readonly readable: boolean; + + /** + * Is true if it is safe to call readable.read(), which means + * the stream has not been destroyed or emitted 'error' or 'end'. + * + * @type { boolean } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get readable(): boolean; + /** * Returns the value of highWatermark passed when creating this Readable. * @@ -601,6 +853,19 @@ declare namespace stream { * @since 12 */ readonly readableHighWatermark: number; + + /** + * Returns the value of highWatermark passed when creating this Readable. + * + * @type { number } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get readableHighWatermark(): number; + /** * This property reflects the current state of the readable stream null/true/false. * @@ -612,6 +877,19 @@ declare namespace stream { * @since 12 */ readonly readableFlowing: boolean | null; + + /** + * This property reflects the current state of the readable stream null/true/false. + * + * @type { boolean | null } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get readableFlowing(): boolean | null; + /** * Size of the data that can be read, in bytes or objects. * @@ -623,6 +901,19 @@ declare namespace stream { * @since 12 */ readonly readableLength: number; + + /** + * Size of the data that can be read, in bytes or objects. + * + * @type { number } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get readableLength(): number; + /** * Getter for the property encoding of a given Readable stream. The encoding property can be set using the * readable.setEncoding() method. @@ -635,6 +926,20 @@ declare namespace stream { * @since 12 */ readonly readableEncoding: string | null; + + /** + * Getter for the property encoding of a given Readable stream. The encoding property can be set using the + * readable.setEncoding() method. + * + * @type { string | null } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get readableEncoding(): string | null; + /** * Whether all data has been generated. * @@ -646,7 +951,20 @@ declare namespace stream { * @since 12 */ readonly readableEnded: boolean; + + /** + * Whether all data has been generated. + * + * @type { boolean } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get readableEnded(): boolean; } + /** * Duplex streams are streams that implement both the Readable streams and Writable streams interfaces. * @@ -654,18 +972,21 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ class Duplex extends Readable { /** - * The Duplex constructor. + * The Duplex constructor. * * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); + /** * writes a chunk to Writable and invokes callback when the chunk is flushed. The return value indicates * whether the internal buffer of the Writable reaches the hightWaterMark. If true is returned, the buffer @@ -687,9 +1008,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ write(chunk?: string | Uint8Array, encoding?: string, callback?: Function): boolean; + /** * Write the last chunk to Writable. * @@ -705,9 +1028,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ end(chunk?: string | Uint8Array, encoding?: string, callback?: Function): Writable; + /** * Set the default encoding mode. * @@ -720,9 +1045,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ setDefaultEncoding(encoding?: string): boolean; + /** * After the call, all Write operations will be forced to write to the buffer instead of being flushed. * @@ -730,9 +1057,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ cork(): boolean; + /** * After calling, flush all buffers. * @@ -740,9 +1069,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ uncork(): boolean; + /** * Implemented by subclass inheritance. The implementation logic of flushing chunks in the buffer must not be * directly called. The call is controlled by Writable.write. @@ -757,9 +1088,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ doWrite(chunk: string | Uint8Array, encoding: string, callback: Function): void; + /** * The implementation logic of flushing chunks in the buffer in batches should not be actively called. * The call is controlled by Writable.write. @@ -773,9 +1106,11 @@ declare namespace stream { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ doWritev(chunks: string[] | Uint8Array[], callback: Function): void; + /** * Returns boolean indicating whether it is in ObjectMode. * @@ -787,6 +1122,19 @@ declare namespace stream { * @since 12 */ readonly writableObjectMode: boolean; + + /** + * Returns boolean indicating whether it is in ObjectMode. + * + * @type { boolean } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get writableObjectMode(): boolean; + /** * Value of highWatermark. * @@ -798,6 +1146,19 @@ declare namespace stream { * @since 12 */ readonly writableHighWatermark: number; + + /** + * Value of highWatermark. + * + * @type { number } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get writableHighWatermark(): number; + /** * Is true if it is safe to call writable.write(), which means the stream has not been destroyed, error or end. * @@ -809,6 +1170,19 @@ declare namespace stream { * @since 12 */ readonly writable: boolean; + + /** + * Is true if it is safe to call writable.write(), which means the stream has not been destroyed, error or end. + * + * @type { boolean } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get writable(): boolean; + /** * Size of data that can be flushed, in bytes or objects. * @@ -820,6 +1194,19 @@ declare namespace stream { * @since 12 */ readonly writableLength: number; + + /** + * Size of data that can be flushed, in bytes or objects. + * + * @type { number } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get writableLength(): number; + /** * Number of times writable.uncork() needs to be called in order to fully uncork the stream. * @@ -831,6 +1218,19 @@ declare namespace stream { * @since 12 */ readonly writableCorked: number; + + /** + * Number of times writable.uncork() needs to be called in order to fully uncork the stream. + * + * @type { number } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get writableCorked(): number; + /** * Whether Writable.end has been called. * @@ -842,6 +1242,19 @@ declare namespace stream { * @since 12 */ readonly writableEnded: boolean; + + /** + * Whether Writable.end has been called. + * + * @type { boolean } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get writableEnded(): boolean; + /** * Whether Writable.end has been called and all buffers have been flushed. * @@ -853,6 +1266,18 @@ declare namespace stream { * @since 12 */ readonly writableFinished: boolean; + + /** + * Whether Writable.end has been called and all buffers have been flushed. + * + * @type { boolean } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get writableFinished(): boolean; } } export default stream; \ No newline at end of file diff --git a/arkts/@arkts.collections.d.ets b/arkts/@arkts.collections.d.ets index 49ccadf010..f8127b775b 100644 --- a/arkts/@arkts.collections.d.ets +++ b/arkts/@arkts.collections.d.ets @@ -18,7 +18,9 @@ * @kit ArkTS */ +/*** if arkts 1.1 */ import lang from './@arkts.lang' +/*** endif */ /** * ArkTS collections. @@ -11692,6 +11694,309 @@ declare namespace collections { static of(...items: number[]): Float32Array; } + /** + * An ordered collections of bit values, which are either 0 or 1. + * If multiple threads access a BitVector instance concurrently, + * and at least one of the threads modifies the array structurally, + * it must be synchronized externally. + * + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + class BitVector { + /** + * A constructor used to create a BitVector object. + * + * @param { number } length - The length of BitVector object. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + constructor(length: number); + /** + * Gets the element number of the BitVector. This is a number one higher than the highest index in the bit vector. + * It can be changed by resize(). + * + * @readonly + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get length(): number; + /** + * Appends the bit element to the end of this bit vector. + * + * @param { number } element - Element to be appended to this bit vector (0 means 0, else means 1). + * @returns { boolean } The boolean type, returns true if the addition is successful, and returns false if it fails. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified. + * 2.Incorrect parameter types. + * @throws { BusinessError } 10200011 - The push method cannot be bound. + * @throws { BusinessError } 10200201 - Concurrent modification error. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + push(element: number): boolean; + /** + * Retrieves and removes the bit element to the end of this bit vector. + * + * @returns { number | undefined } The boolean type, if the bit push successfully, return true, else return false. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + pop(): number | undefined; + /** + * Check if bit vector contains a particular bit element. + * + * @param { number } element - Element to be contained (0 means 0, else means 1). + * @param { number } fromIndex - The starting position of the index, containing the value at that index position. + * @param { number } toIndex - The end of the index, containing the value at that index. + * @returns { boolean } The boolean type, if bit vector contains the specified element, return true, + else return false. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified. + * 2.Incorrect parameter types. + * @throws { BusinessError } 10200001 - The value of fromIndex or toIndex is out of range. + * @throws { BusinessError } 10200011 - The has method cannot be bound. + * @throws { BusinessError } 10200201 - Concurrent modification error. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + has(element: number, fromIndex: number, toIndex: number): boolean; + /** + * Sets a range of bits in a bit vector to a particular element. + * + * @param { number } element - Element to be set (0 means 0, else means 1). + * @param { number } fromIndex - The starting position of the index, containing the value at that index position. + * @param { number } toIndex - The end of the index, excluding the value at that index. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified. + * 2.Incorrect parameter types. + * @throws { BusinessError } 10200001 - The value of fromIndex or toIndex is out of range. + * @throws { BusinessError } 10200011 - The setBitsByRange method cannot be bound. + * @throws { BusinessError } 10200201 - Concurrent modification error. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + setBitsByRange(element: number, fromIndex: number, toIndex: number): void; + /** + * Sets all of bits in a bit vector to a particular element. + * + * @param { number } element - Element to be set (0 means 0, else means 1). + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified. + * 2.Incorrect parameter types. + * @throws { BusinessError } 10200011 - The setAllBits method cannot be bound. + * @throws { BusinessError } 10200201 - Concurrent modification error. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + setAllBits(element: number): void; + /** + * Returns the bit values in a range of indices in a bit vector. + * + * @param { number } fromIndex - The starting position of the index, containing the value at that index position. + * @param { number } toIndex - The end of the index, excluding the value at that index. + * @returns { BitVector } The BitVector type, returns the bit values in a range of indices in a bit vector. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified. + * 2.Incorrect parameter types. + * @throws { BusinessError } 10200001 - The value of fromIndex or toIndex is out of range. + * @throws { BusinessError } 10200011 - The getBitsByRange method cannot be bound. + * @throws { BusinessError } 10200201 - Concurrent modification error. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + getBitsByRange(fromIndex: number, toIndex: number): BitVector; + /** + * Resize the bitVector's length. + * + * @param { number } size - The new size for bitVector. If count is greater than the current size of bitVector, + * the additional bit elements are set to 0. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified. + * 2.Incorrect parameter types. + * @throws { BusinessError } 10200011 - The resize method cannot be bound. + * @throws { BusinessError } 10200201 - Concurrent modification error. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + resize(size: number): void; + /** + * Counts the number of times a certain bit element occurs within a range of bits in a bit vector. + * + * @param { number } element - Element to be counted (0 means 0, else means 1). + * @param { number } fromIndex - The starting position of the index, containing the value at that index position. + * @param { number } toIndex - The end of the index, excluding the value at that index. + * @returns { number } The number type, return the number of times a certain bit element + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified. + * 2.Incorrect parameter types. + * @throws { BusinessError } 10200001 - The value of fromIndex or toIndex is out of range. + * @throws { BusinessError } 10200011 - The getBitCountByRange method cannot be bound. + * @throws { BusinessError } 10200201 - Concurrent modification error. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + getBitCountByRange(element: number, fromIndex: number, toIndex: number): number; + /** + * Locates the first occurrence of a certain bit value within a range of bits in a bit vector. + * + * @param { number } element - Element to be Located (0 means 0, else means 1). + * @param { number } fromIndex - The starting position of the index, containing the value at that index position. + * @param { number } toIndex - The end of the index, excluding the value at that index. + * @returns { number } The number type, return the first index of specified bit within a range, + * or -1 if this range of the bitVector does not contain the element. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified. + * 2.Incorrect parameter types. + * @throws { BusinessError } 10200001 - The value of fromIndex or toIndex is out of range. + * @throws { BusinessError } 10200011 - The getIndexOf method cannot be bound. + * @throws { BusinessError } 10200201 - Concurrent modification error. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + getIndexOf(element: number, fromIndex: number, toIndex: number): number; + /** + * Locates the last occurrence of a certain bit value within a range of bits in a bit vector. + * + * @param { number } element - Element to be Located (0 means 0, else means 1). + * @param { number } fromIndex - The starting position of the index, containing the value at that index position. + * @param { number } toIndex - The end of the index, excluding the value at that index. + * @returns { number } The number type, return the last index of specified bit within a range, + * or -1 if this range of the bitVector does not contain the element. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified. + * 2.Incorrect parameter types. + * @throws { BusinessError } 10200001 - The value of fromIndex or toIndex is out of range. + * @throws { BusinessError } 10200011 - The getLastIndexOf method cannot be bound. + * @throws { BusinessError } 10200201 - Concurrent modification error. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + getLastIndexOf(element: number, fromIndex: number, toIndex: number): number; + /** + * Flips the bit value by index in a bit vector.(Flip 0 to 1, flip 1 to 0) + * + * @param { number } index - The index in the bit vector. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified. + * 2.Incorrect parameter types. + * @throws { BusinessError } 10200001 - The value of index is out of range. + * @throws { BusinessError } 10200011 - The flipBitByIndex method cannot be bound. + * @throws { BusinessError } 10200201 - Concurrent modification error. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + flipBitByIndex(index: number): void; + /** + * Flips a range of bit values in a bit vector.(Flip 0 to 1, flip 1 to 0). + * + * @param { number } fromIndex - The starting position of the index, containing the value at that index position. + * @param { number } toIndex - The end of the index, excluding the value at that index. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified. + * 2.Incorrect parameter types. + * @throws { BusinessError } 10200001 - The value of fromIndex or toIndex is out of range. + * @throws { BusinessError } 10200011 - The flipBitsByRange method cannot be bound. + * @throws { BusinessError } 10200201 - Concurrent modification error. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + flipBitsByRange(fromIndex: number, toIndex: number): void; + /** + * Returns an iterator that iterates over bit vector. + * + * @returns { IterableIterator } A new iterable iterator object. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + $_iterator(): IterableIterator; + /** + * Returns an iterable of values in the bit vector + * + * @returns { IterableIterator } A new iterable iterator object. + * @throws { BusinessError } 10200011 - The values method cannot be bound. + * @throws { BusinessError } 10200201 - Concurrent modification error. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + values(): IterableIterator; + /** + * Returns the item at that index. + * + * @param { number } index - The zero-based index of the desired code unit. + * @returns { number } The element in the bitVector matching the given index. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + $_get(index: number): number; + /** + * Set the value of item at that index. + * + * @param { number } index - The index of the element to set. + * @param { number } value - The value to set at the specified index. + * @syscap SystemCapability.Utils.Lang + * @atomicservice + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + $_set(index: number, value: number): void; + } + /** * An ordered collections of bit values, which are either 0 or 1. * If multiple threads access a BitVector instance concurrently, diff --git a/kits/@kit.ArkTS.d.ets b/kits/@kit.ArkTS.d.ets index d0c5c6b2c4..a495996fb8 100644 --- a/kits/@kit.ArkTS.d.ets +++ b/kits/@kit.ArkTS.d.ets @@ -29,8 +29,20 @@ import LightWeightMap from '@ohos.util.LightWeightMap'; import Queue from '@ohos.util.Queue'; import JSON from '@ohos.util.json'; import stream from '@ohos.util.stream'; +import HashMap from '@ohos.util.HashMap'; +import HashSet from '@ohos.util.HashSet'; +import LightWeightSet from '@ohos.util.LightWeightSet'; +import LinkedList from '@ohos.util.LinkedList'; +import List from '@ohos.util.List'; +import PlainArray from '@ohos.util.PlainArray'; +import Stack from '@ohos.util.Stack'; +import TreeMap from '@ohos.util.TreeMap'; +import TreeSet from '@ohos.util.TreeSet'; +import xml from '@ohos.xml'; +import collections from '@arkts.collections'; +import Decimal from '@arkts.math.Decimal'; export { - ArrayList, Deque, HashMap, HashSet, LightWeightMap, LightWeightSet, LinkedList, List, - PlainArray, Queue, Stack, TreeMap, TreeSet, buffer, uri, url, util, JSON, stream + ArrayList, Deque, HashMap, HashSet, LightWeightMap, LightWeightSet, LinkedList, List, + PlainArray, Queue, Stack, TreeMap, TreeSet, buffer, uri, url, util, JSON, stream, xml, collections, Decimal }; -- Gitee From d97ebd85e26289dc441cd3ea1b62d1b93556d21c Mon Sep 17 00:00:00 2001 From: weishaoxiong Date: Mon, 7 Jul 2025 16:02:23 +0800 Subject: [PATCH 013/746] =?UTF-8?q?fix:=20cherry-pick=20from=200328?= =?UTF-8?q?=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: weishaoxiong --- api/@ohos.InputMethodSubtype.d.ts | 43 ++- api/@ohos.inputMethod.Panel.d.ts | 30 +- api/@ohos.inputMethod.d.ts | 514 +++++++++++++++++++----------- 3 files changed, 377 insertions(+), 210 deletions(-) diff --git a/api/@ohos.InputMethodSubtype.d.ts b/api/@ohos.InputMethodSubtype.d.ts index c86eeccd74..1cb08c348e 100644 --- a/api/@ohos.InputMethodSubtype.d.ts +++ b/api/@ohos.InputMethodSubtype.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -23,7 +23,8 @@ * * @interface InputMethodSubtype * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export default interface InputMethodSubtype { /** @@ -32,19 +33,21 @@ export default interface InputMethodSubtype { * @type { ?string } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly label?: string; /** * The label id of input method subtype. * - * @type { ?number } + * @type { ?double } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - readonly labelId?: number; + readonly labelId?: double; /** * The name of input method. @@ -52,7 +55,8 @@ export default interface InputMethodSubtype { * @type { string } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly name: string; @@ -62,7 +66,8 @@ export default interface InputMethodSubtype { * @type { string } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly id: string; @@ -72,7 +77,8 @@ export default interface InputMethodSubtype { * @type { ?('upper' | 'lower') } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly mode?: 'upper' | 'lower'; @@ -82,7 +88,8 @@ export default interface InputMethodSubtype { * @type { string } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly locale: string; @@ -92,7 +99,8 @@ export default interface InputMethodSubtype { * @type { string } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly language: string; @@ -102,19 +110,21 @@ export default interface InputMethodSubtype { * @type { ?string } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly icon?: string; /** * The icon id of input method subtype. * - * @type { ?number } + * @type { ?double } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - readonly iconId?: number; + readonly iconId?: double; /** * The extra info of input method subtype. @@ -128,7 +138,8 @@ export default interface InputMethodSubtype { * * @type { ?object } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ extra?: object; } \ No newline at end of file diff --git a/api/@ohos.inputMethod.Panel.d.ts b/api/@ohos.inputMethod.Panel.d.ts index b9c045c9c0..b216b49058 100644 --- a/api/@ohos.inputMethod.Panel.d.ts +++ b/api/@ohos.inputMethod.Panel.d.ts @@ -23,7 +23,8 @@ * * @typedef PanelInfo * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface PanelInfo { /** @@ -31,7 +32,8 @@ export interface PanelInfo { * * @type { PanelType } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ type: PanelType; @@ -42,7 +44,8 @@ export interface PanelInfo { * @type { ?PanelFlag } * @default FLG_FIXED * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ flag?: PanelFlag; } @@ -52,7 +55,8 @@ export interface PanelInfo { * * @enum { number } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum PanelFlag { /** @@ -61,7 +65,8 @@ export enum PanelFlag { * When the flag is set, the soft keyboard is fixed at the bottom of the screen.

* * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ FLAG_FIXED = 0, @@ -71,7 +76,8 @@ export enum PanelFlag { * When the flag is set, the soft keyboard is floating.

* * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ FLAG_FLOATING, @@ -83,7 +89,8 @@ export enum PanelFlag { * Input method application developers are supposed to control the panel status on their own.

* * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ FLAG_CANDIDATE } @@ -93,14 +100,16 @@ export enum PanelFlag { * * @enum { number } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum PanelType { /** * Panel for displaying a virtual soft keyboard. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SOFT_KEYBOARD = 0, @@ -108,7 +117,8 @@ export enum PanelType { * Panel for displaying status bar. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ STATUS_BAR } diff --git a/api/@ohos.inputMethod.d.ts b/api/@ohos.inputMethod.d.ts index f4e99ba13c..a8a5e10de1 100644 --- a/api/@ohos.inputMethod.d.ts +++ b/api/@ohos.inputMethod.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -18,16 +18,23 @@ * @kit IMEKit */ import type { Callback, AsyncCallback } from './@ohos.base'; -import type { ElementName } from './bundleManager/ElementName'; import InputMethodSubtype from './@ohos.InputMethodSubtype'; +/*** if arkts 1.1 */ +import type { ElementName } from './bundleManager/ElementName'; import type { PanelInfo } from './@ohos.inputMethod.Panel'; +/*** endif */ +/*** if arkts 1.2 */ +import { ElementName } from './bundleManager/ElementName'; +import { PanelInfo } from './@ohos.inputMethod.Panel'; +/*** endif */ /** * Input method * * @namespace inputMethod * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 6 + * @since arkts {'1.1':'6', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace inputMethod { /** @@ -67,7 +74,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800007 - input method setter error. Possible cause: * create InputmethodSetting object failed. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSetting(): InputMethodSetting; @@ -78,7 +86,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800006 - input method controller error. Possible cause: * create InputmethodController object failed. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getController(): InputMethodController; @@ -89,7 +98,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDefaultInputMethod(): InputMethodProperty; @@ -100,7 +110,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSystemInputMethodConfigAbility(): ElementName; @@ -130,7 +141,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function switchInputMethod(target: InputMethodProperty, callback: AsyncCallback): void; @@ -160,7 +172,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function switchInputMethod(target: InputMethodProperty): Promise; @@ -169,7 +182,8 @@ declare namespace inputMethod { * * @returns { InputMethodProperty } the property of current inputmethod. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getCurrentInputMethod(): InputMethodProperty; @@ -214,7 +228,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function switchCurrentInputMethodSubtype(target: InputMethodSubtype, callback: AsyncCallback): void; @@ -259,7 +274,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function switchCurrentInputMethodSubtype(target: InputMethodSubtype): Promise; @@ -268,7 +284,8 @@ declare namespace inputMethod { * * @returns { InputMethodSubtype } the subtype of the current input method. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getCurrentInputMethodSubtype(): InputMethodSubtype; @@ -360,7 +377,8 @@ declare namespace inputMethod { * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function switchInputMethod(bundleName: string, subtypeId?: string): Promise; @@ -376,7 +394,8 @@ declare namespace inputMethod { /** * @interface InputMethodSetting * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ interface InputMethodSetting { /** @@ -385,7 +404,8 @@ declare namespace inputMethod { * @param { 'imeChange' } type - Indicates the event type. * @param { function } callback - the callback of 'imeChange' * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ on( type: 'imeChange', @@ -399,7 +419,8 @@ declare namespace inputMethod { * @param { function } [callback] - the callback of 'imeChange', * when subscriber unsubscribes all callback functions of event 'imeChange', this parameter can be left blank. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ off( type: 'imeChange', @@ -414,7 +435,8 @@ declare namespace inputMethod { * @throws { BusinessError } 202 - not system application. * @syscap SystemCapability.MiscServices.InputMethodFramework * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'imeShow', callback: (info: Array) => void): void; @@ -426,7 +448,8 @@ declare namespace inputMethod { * when subscriber unsubscribes all callback functions of event 'imeShow', this parameter can be left blank. * @syscap SystemCapability.MiscServices.InputMethodFramework * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'imeShow', callback?: (info: Array) => void): void; @@ -438,7 +461,8 @@ declare namespace inputMethod { * @throws { BusinessError } 202 - not system application. * @syscap SystemCapability.MiscServices.InputMethodFramework * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'imeHide', callback: (info: Array) => void): void; @@ -450,7 +474,8 @@ declare namespace inputMethod { * when subscriber unsubscribes all callback functions of event 'imeHide', this parameter can be left blank. * @syscap SystemCapability.MiscServices.InputMethodFramework * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'imeHide', callback?: (info: Array) => void): void; @@ -468,7 +493,8 @@ declare namespace inputMethod { * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isPanelShown(panelInfo: PanelInfo): boolean; @@ -483,7 +509,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ listInputMethodSubtype( inputMethodProperty: InputMethodProperty, @@ -501,7 +528,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ listInputMethodSubtype(inputMethodProperty: InputMethodProperty): Promise>; @@ -513,7 +541,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ listCurrentInputMethodSubtype(callback: AsyncCallback>): void; @@ -525,7 +554,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ listCurrentInputMethodSubtype(): Promise>; @@ -542,7 +572,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getInputMethods(enable: boolean, callback: AsyncCallback>): void; @@ -559,7 +590,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getInputMethods(enable: boolean): Promise>; @@ -576,7 +608,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getInputMethodsSync(enable: boolean): Array; @@ -588,7 +621,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getAllInputMethods(callback: AsyncCallback>): void; @@ -600,7 +634,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getAllInputMethods(): Promise>; @@ -612,7 +647,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getAllInputMethodsSync(): Array; @@ -712,7 +748,8 @@ declare namespace inputMethod { /** * @interface InputMethodController * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 6 + * @since arkts {'1.1':'6', '1.2':'20'} + * @arkts 1.1&1.2 */ interface InputMethodController { /** @@ -728,7 +765,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ attach(showKeyboard: boolean, textConfig: TextConfig, callback: AsyncCallback): void; /** @@ -744,7 +782,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ attach(showKeyboard: boolean, textConfig: TextConfig): Promise; /** @@ -761,7 +800,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ attach(showKeyboard: boolean, textConfig: TextConfig, requestKeyboardReason: RequestKeyboardReason): Promise; @@ -787,7 +827,8 @@ declare namespace inputMethod { * a system error, such as null pointer, IPC exception. * @throws { BusinessError } 12800009 - input method client detached. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ showTextInput(callback: AsyncCallback): void; /** @@ -800,7 +841,8 @@ declare namespace inputMethod { * a system error, such as null pointer, IPC exception. * @throws { BusinessError } 12800009 - input method client detached. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ showTextInput(): Promise; /** @@ -814,7 +856,8 @@ declare namespace inputMethod { * a system error, such as null pointer, IPC exception. * @throws { BusinessError } 12800009 - input method client detached. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ showTextInput(requestKeyboardReason: RequestKeyboardReason): Promise; /** @@ -827,7 +870,8 @@ declare namespace inputMethod { * a system error, such as null pointer, IPC exception. * @throws { BusinessError } 12800009 - input method client detached. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ hideTextInput(callback: AsyncCallback): void; @@ -841,7 +885,8 @@ declare namespace inputMethod { * a system error, such as null pointer, IPC exception. * @throws { BusinessError } 12800009 - input method client detached. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ hideTextInput(): Promise; @@ -854,7 +899,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ detach(callback: AsyncCallback): void; @@ -867,7 +913,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ detach(): Promise; @@ -1104,7 +1151,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ hideSoftKeyboard(callback: AsyncCallback): void; @@ -1120,7 +1168,8 @@ declare namespace inputMethod { * @throws { BusinessError } 12800008 - input method manager service error. Possible cause: * a system error, such as null pointer, IPC exception. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ hideSoftKeyboard(): Promise; @@ -1164,7 +1213,8 @@ declare namespace inputMethod { * @throws { BusinessError } 401 - parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'selectByRange', callback: Callback): void; @@ -1175,7 +1225,8 @@ declare namespace inputMethod { * @param { Callback } [callback] - the callback of 'selectByRange', * when subscriber unsubscribes all callback functions of event 'selectByRange', this parameter can be left blank. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'selectByRange', callback?: Callback): void; @@ -1190,7 +1241,8 @@ declare namespace inputMethod { * @throws { BusinessError } 401 - parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'selectByMovement', callback: Callback): void; @@ -1201,7 +1253,8 @@ declare namespace inputMethod { * @param { Callback } [callback] - the callback of 'selectByMovement', * when subscriber unsubscribes all callback functions of event 'selectByMovement', this parameter can be left blank. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'selectByMovement', callback?: Callback): void; @@ -1215,7 +1268,8 @@ declare namespace inputMethod { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @throws { BusinessError } 12800009 - input method client detached. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'insertText', callback: (text: string) => void): void; @@ -1226,7 +1280,8 @@ declare namespace inputMethod { * @param { function } [callback] - the callback of 'insertText', * when subscriber unsubscribes all callback functions of event 'insertText', this parameter can be left blank. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'insertText', callback?: (text: string) => void): void; @@ -1242,9 +1297,10 @@ declare namespace inputMethod { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @throws { BusinessError } 12800009 - input method client detached. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - on(type: 'deleteLeft', callback: (length: number) => void): void; + on(type: 'deleteLeft', callback: (length: int) => void): void; /** * Unregister the callback of deleteLeft. @@ -1253,9 +1309,10 @@ declare namespace inputMethod { * @param { function } [callback] - the callback of 'deleteLeft', * when subscriber unsubscribes all callback functions of event 'deleteLeft', this parameter can be left blank. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - off(type: 'deleteLeft', callback?: (length: number) => void): void; + off(type: 'deleteLeft', callback?: (length: int) => void): void; /** * Register a callback and when IME sends delete right event with length, @@ -1269,9 +1326,10 @@ declare namespace inputMethod { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @throws { BusinessError } 12800009 - input method client detached. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - on(type: 'deleteRight', callback: (length: number) => void): void; + on(type: 'deleteRight', callback: (length: int) => void): void; /** * Unregister the callback of deleteRight. @@ -1280,9 +1338,10 @@ declare namespace inputMethod { * @param { function } [callback] - the callback of 'deleteRight', * when subscriber unsubscribes all callback functions of event 'deleteRight', this parameter can be left blank. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - off(type: 'deleteRight', callback?: (length: number) => void): void; + off(type: 'deleteRight', callback?: (length: int) => void): void; /** * Register a callback and when IME sends keyboard status, the callback will be invoked. @@ -1294,7 +1353,8 @@ declare namespace inputMethod { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @throws { BusinessError } 12800009 - input method client detached. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'sendKeyboardStatus', callback: (keyboardStatus: KeyboardStatus) => void): void; @@ -1305,7 +1365,8 @@ declare namespace inputMethod { * @param { function } [callback] - the callback of 'sendKeyboardStatus', * when subscriber unsubscribes all callback functions of event 'sendKeyboardStatus', this parameter can be left blank. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'sendKeyboardStatus', callback?: (keyboardStatus: KeyboardStatus) => void): void; @@ -1320,7 +1381,8 @@ declare namespace inputMethod { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @throws { BusinessError } 12800009 - input method client detached. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'sendFunctionKey', callback: (functionKey: FunctionKey) => void): void; @@ -1331,7 +1393,8 @@ declare namespace inputMethod { * @param { function } [callback] - the callback of 'sendFunctionKey', * when subscriber unsubscribes all callback functions of event 'sendFunctionKey', this parameter can be left blank. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'sendFunctionKey', callback?: (functionKey: FunctionKey) => void): void; @@ -1346,7 +1409,8 @@ declare namespace inputMethod { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @throws { BusinessError } 12800009 - input method client detached. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'moveCursor', callback: (direction: Direction) => void): void; @@ -1357,7 +1421,8 @@ declare namespace inputMethod { * @param { function } [callback] - the callback of 'moveCursor', * when subscriber unsubscribes all callback functions of event 'moveCursor', this parameter can be left blank. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'moveCursor', callback?: (direction: Direction) => void): void; @@ -1371,7 +1436,8 @@ declare namespace inputMethod { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @throws { BusinessError } 12800009 - input method client detached. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'handleExtendAction', callback: (action: ExtendAction) => void): void; @@ -1382,7 +1448,8 @@ declare namespace inputMethod { * @param { function } [callback] - the callback of 'handleExtendAction', * when subscriber unsubscribes all callback functions of event 'handleExtendAction', this parameter can be left blank. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'handleExtendAction', callback?: (action: ExtendAction) => void): void; @@ -1396,9 +1463,10 @@ declare namespace inputMethod { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @throws { BusinessError } 12800009 - input method client detached. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - on(type: 'getLeftTextOfCursor', callback: (length: number) => string): void; + on(type: 'getLeftTextOfCursor', callback: (length: int) => string): void; /** * Unregister the callback of getLeftTextOfCursor event. @@ -1407,9 +1475,10 @@ declare namespace inputMethod { * @param { function } [callback] - the callback of 'getLeftTextOfCursor', * when subscriber unsubscribes all callback functions of event 'getLeftTextOfCursor', this parameter can be left blank. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - off(type: 'getLeftTextOfCursor', callback?: (length: number) => string): void; + off(type: 'getLeftTextOfCursor', callback?: (length: int) => string): void; /** * Register a callback and when input method ability gets right text of cursor, the callback will be invoked. @@ -1421,9 +1490,10 @@ declare namespace inputMethod { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @throws { BusinessError } 12800009 - input method client detached. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - on(type: 'getRightTextOfCursor', callback: (length: number) => string): void; + on(type: 'getRightTextOfCursor', callback: (length: int) => string): void; /** * Unregister the callback of getRightTextOfCursor event. @@ -1432,9 +1502,10 @@ declare namespace inputMethod { * @param { function } [callback] - the callback of 'getRightTextOfCursor', * when subscriber unsubscribes all callback functions of event 'getRightTextOfCursor', this parameter can be left blank. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - off(type: 'getRightTextOfCursor', callback?: (length: number) => string): void; + off(type: 'getRightTextOfCursor', callback?: (length: int) => string): void; /** * Register a callback and when input method ability gets the text index at cursor, the callback will be invoked. @@ -1446,9 +1517,10 @@ declare namespace inputMethod { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @throws { BusinessError } 12800009 - input method client detached. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - on(type: 'getTextIndexAtCursor', callback: () => number): void; + on(type: 'getTextIndexAtCursor', callback: () => int): void; /** * Unregister the callback of getTextIndexAtCursor. @@ -1457,9 +1529,10 @@ declare namespace inputMethod { * @param { function } [callback] - the callback of 'getTextIndexAtCursor', * when subscriber unsubscribes all callback functions of event 'getTextIndexAtCursor', this parameter can be left blank. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - off(type: 'getTextIndexAtCursor', callback?: () => number): void; + off(type: 'getTextIndexAtCursor', callback?: () => int): void; /** *

Subscribe 'setPreviewText' event.

@@ -1513,7 +1586,8 @@ declare namespace inputMethod { * * @interface InputMethodProperty * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ interface InputMethodProperty { /** @@ -1544,7 +1618,8 @@ declare namespace inputMethod { * @type { string } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly name: string; @@ -1554,7 +1629,8 @@ declare namespace inputMethod { * @type { string } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly id: string; @@ -1564,19 +1640,21 @@ declare namespace inputMethod { * @type { ?string } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly label?: string; /** * The label id of input method * - * @type { ?number } + * @type { ?double } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - readonly labelId?: number; + readonly labelId?: double; /** * The icon of input method @@ -1584,19 +1662,21 @@ declare namespace inputMethod { * @type { ?string } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly icon?: string; /** * The icon id of input method * - * @type { ?number } + * @type { ?double } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - readonly iconId?: number; + readonly iconId?: double; /** * The enabledState of input method @@ -1628,16 +1708,18 @@ declare namespace inputMethod { /** * Enumerates the moving direction of cursor * - * @enum { number } + * @enum { int } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum Direction { /** * Cursor moves up * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ CURSOR_UP = 1, @@ -1645,7 +1727,8 @@ declare namespace inputMethod { * Cursor moves down * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ CURSOR_DOWN, @@ -1653,7 +1736,8 @@ declare namespace inputMethod { * Cursor moves left * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ CURSOR_LEFT, @@ -1661,7 +1745,8 @@ declare namespace inputMethod { * Cursor moves right * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ CURSOR_RIGHT } @@ -1671,26 +1756,29 @@ declare namespace inputMethod { * * @typedef Range * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface Range { /** * Indicates the index of the first character of the selected text. * - * @type { number } + * @type { int } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - start: number; + start: int; /** * Indicates the index of the last character of the selected text. * - * @type { number } + * @type { int } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - end: number; + end: int; } /** @@ -1698,7 +1786,8 @@ declare namespace inputMethod { * * @typedef Movement * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface Movement { /** @@ -1706,7 +1795,8 @@ declare namespace inputMethod { * * @type { Direction } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ direction: Direction; } @@ -1714,16 +1804,18 @@ declare namespace inputMethod { /** * Enumerates the text input type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum TextInputType { /** * The text input type is NONE. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ NONE = -1, @@ -1731,7 +1823,8 @@ declare namespace inputMethod { * The text input type is TEXT. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ TEXT = 0, @@ -1739,7 +1832,8 @@ declare namespace inputMethod { * The text input type is MULTILINE. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ MULTILINE, @@ -1747,7 +1841,8 @@ declare namespace inputMethod { * The text input type is NUMBER. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ NUMBER, @@ -1755,7 +1850,8 @@ declare namespace inputMethod { * The text input type is PHONE. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ PHONE, @@ -1763,7 +1859,8 @@ declare namespace inputMethod { * The text input type is DATETIME. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ DATETIME, @@ -1771,7 +1868,8 @@ declare namespace inputMethod { * The text input type is EMAIL_ADDRESS. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ EMAIL_ADDRESS, @@ -1779,7 +1877,8 @@ declare namespace inputMethod { * The text input type is URL. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ URL, @@ -1787,7 +1886,8 @@ declare namespace inputMethod { * The text input type is VISIBLE_PASSWORD. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ VISIBLE_PASSWORD, @@ -1795,7 +1895,8 @@ declare namespace inputMethod { * The text input type is NUMBER_PASSWORD. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ NUMBER_PASSWORD, @@ -1843,16 +1944,18 @@ declare namespace inputMethod { /** * Enumerates the enter key type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum EnterKeyType { /** * The enter key type is UNSPECIFIED. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ UNSPECIFIED = 0, @@ -1860,7 +1963,8 @@ declare namespace inputMethod { * The enter key type is NONE. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ NONE, @@ -1868,7 +1972,8 @@ declare namespace inputMethod { * The enter key type is GO. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ GO, @@ -1876,7 +1981,8 @@ declare namespace inputMethod { * The enter key type is SEARCH. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ SEARCH, @@ -1884,7 +1990,8 @@ declare namespace inputMethod { * The enter key type is SEND. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ SEND, @@ -1892,7 +1999,8 @@ declare namespace inputMethod { * The enter key type is NEXT. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ NEXT, @@ -1900,7 +2008,8 @@ declare namespace inputMethod { * The enter key type is DONE. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ DONE, @@ -1908,7 +2017,8 @@ declare namespace inputMethod { * The enter key type is PREVIOUS. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ PREVIOUS, @@ -1916,7 +2026,8 @@ declare namespace inputMethod { * The enter key type is NEWLINE. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NEWLINE } @@ -1924,16 +2035,18 @@ declare namespace inputMethod { /** * Enumerates the keyboard status. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum KeyboardStatus { /** * The keyboard status is none. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ NONE = 0, @@ -1941,7 +2054,8 @@ declare namespace inputMethod { * The keyboard status is hide. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ HIDE = 1, @@ -1949,7 +2063,8 @@ declare namespace inputMethod { * The keyboard status is show. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ SHOW = 2 } @@ -1959,7 +2074,8 @@ declare namespace inputMethod { * * @typedef InputAttribute * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface InputAttribute { /** @@ -1967,7 +2083,8 @@ declare namespace inputMethod { * * @type { TextInputType } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ textInputType: TextInputType; @@ -1976,7 +2093,8 @@ declare namespace inputMethod { * * @type { EnterKeyType } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ enterKeyType: EnterKeyType; @@ -2004,7 +2122,8 @@ declare namespace inputMethod { * * @typedef FunctionKey * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface FunctionKey { /** @@ -2012,7 +2131,8 @@ declare namespace inputMethod { * * @type { EnterKeyType } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ enterKeyType: EnterKeyType; } @@ -2022,44 +2142,49 @@ declare namespace inputMethod { * * @typedef CursorInfo * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface CursorInfo { /** * Indicates the left point of the cursor info and must be absolute coordinate of the physical screen. * - * @type { number } + * @type { double } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - left: number; + left: double; /** * Indicates the top point of the cursor info and must be absolute coordinate of the physical screen. * - * @type { number } + * @type { double } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - top: number; + top: double; /** * Indicates the width point of the cursor info. * - * @type { number } + * @type { double } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - width: number; + width: double; /** * Indicates the height point of the cursor info. * - * @type { number } + * @type { double } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - height: number; + height: double; } /** @@ -2067,7 +2192,8 @@ declare namespace inputMethod { * * @typedef TextConfig * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface TextConfig { /** @@ -2075,7 +2201,8 @@ declare namespace inputMethod { * * @type { InputAttribute } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ inputAttribute: InputAttribute; @@ -2084,7 +2211,8 @@ declare namespace inputMethod { * * @type { ?CursorInfo } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ cursorInfo?: CursorInfo; @@ -2093,18 +2221,20 @@ declare namespace inputMethod { * * @type { ?Range } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ selection?: Range; /** * The window ID of the application currently bound to the input method. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - windowId?: number; + windowId?: int; /** *Indicates that this is a new edit box. @@ -2129,16 +2259,18 @@ declare namespace inputMethod { /** * Enumerates the extend action. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum ExtendAction { /** * Select all text. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ SELECT_ALL = 0, @@ -2146,7 +2278,8 @@ declare namespace inputMethod { * Cut selecting text. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ CUT = 3, @@ -2154,7 +2287,8 @@ declare namespace inputMethod { * Copy selecting text. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COPY = 4, @@ -2162,7 +2296,8 @@ declare namespace inputMethod { * Paste from paste board. * * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ PASTE = 5 } @@ -2172,7 +2307,8 @@ declare namespace inputMethod { * * @typedef InputWindowInfo * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface InputWindowInfo { /** @@ -2180,45 +2316,50 @@ declare namespace inputMethod { * * @type { string } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ name: string; /** * Indicates the abscissa of the upper-left vertex of input window. * - * @type { number } + * @type { int } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - left: number; + left: int; /** * Indicates the ordinate of the upper-left vertex of input window. * - * @type { number } + * @type { int } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - top: number; + top: int; /** * Indicates the width of the input window. * - * @type { number } + * @type { double } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - width: number; + width: double; /** * Indicates the height of the input window. * - * @type { number } + * @type { double } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - height: number; + height: double; } /** @@ -2285,33 +2426,38 @@ declare namespace inputMethod { /** * requestKeyboardReason of input click * - * @enum { number } + * @enum { int } * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum RequestKeyboardReason { /** * The request keyboard reason is NONE. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ NONE = 0, /** * The request keyboard reason is MOUSE. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ MOUSE = 1, /** * The request keyboard reason is TOUCH. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ TOUCH = 2, /** * The request keyboard reason is OTHER. * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ OTHER = 20 } -- Gitee From 85d2a53e12050e835be89880352ebc6ccda826da Mon Sep 17 00:00:00 2001 From: wangzhiyusss Date: Tue, 17 Jun 2025 19:41:36 +0800 Subject: [PATCH 014/746] =?UTF-8?q?=E6=96=B0=E5=A2=9Eint=E3=80=81float?= =?UTF-8?q?=E3=80=81double=E8=BD=ACnubmer=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangzhiyusss --- build-tools/intToNumber.js | 500 +++++++++++++++++++++++++++++++++++++ 1 file changed, 500 insertions(+) create mode 100644 build-tools/intToNumber.js diff --git a/build-tools/intToNumber.js b/build-tools/intToNumber.js new file mode 100644 index 0000000000..89c687e3b1 --- /dev/null +++ b/build-tools/intToNumber.js @@ -0,0 +1,500 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +const ts = require('typescript'); +const fs = require('fs'); +const path = require('path'); +const commander = require('commander'); + +const typeArray = ['float', 'double', 'int']; + +let inputDir = ''; +let outputDir = ''; +let jsDocContent = ''; +let tagDataList = []; + +function main() { + const program = new commander.Command(); + program + .name('intToNumber') + .version('0.0.1'); + program + .option('--path ', 'input path') + .option('--output ', 'output path') + .action((opts) => { + if (!opts.path || !opts.output) { + console.error('Error: Must provide --path and --output parameters'); + process.exit(1); + } + + // 将相对路径解析为绝对路径 + inputDir = path.resolve(opts.path); + outputDir = path.resolve(opts.output); + + // 检查输入目录是否存在 + if (!fs.existsSync(inputDir)) { + console.error(`Error: Input directory does not exist: ${inputDir}`); + process.exit(1); + } + + const apiUtFiles1 = []; + readFile(inputDir + '/api', apiUtFiles1); + readFile(inputDir + '/arkts', apiUtFiles1); + tsTransform(apiUtFiles1, recursionAstCallback); + const apiUtFiles2 = []; + readFile(outputDir + '/api', apiUtFiles2); + readFile(outputDir + '/arkts', apiUtFiles2); + tsTransform(apiUtFiles2, recursionAstCallback2); + + const jsDocUtFiles1 = []; + readFile(outputDir + '/api', jsDocUtFiles1); + readFile(outputDir + '/arkts', jsDocUtFiles1); + tsTransform(jsDocUtFiles1, parseJSDocCallback); + const jsDocUtFiles2 = []; + readFile(outputDir + '/api', jsDocUtFiles2); + readFile(outputDir + '/arkts', jsDocUtFiles2); + tsTransform(jsDocUtFiles2, parseJSDocCallback2); + }); + program.parse(process.argv); +} + +/** + * 读取目录下所有文件 + * @param {string} dir 文件目录 + * @param {Array} utFiles 所有文件 + */ +function readFile(dir, utFiles) { + try { + const files = fs.readdirSync(dir); + files.forEach((element) => { + if (element === 'build-tools') { + return; + } + const filePath = path.join(dir, element); + const status = fs.statSync(filePath); + if (status.isDirectory()) { + readFile(filePath, utFiles); + } else { + utFiles.push(filePath); + } + }); + } catch (e) { + console.error('Error reading files: ' + e.message); + } +} + + +/** + * 遍历所有文件进行处理 + * @param {Array} utFiles 所有文件 + * @param {recursionAstCallback} callback 回调函数 + */ +function tsTransform(utFiles, callback) { + utFiles.forEach((url) => { + let content = fs.readFileSync(url, 'utf-8'); + jsDocContent = content; + const apiBaseName = path.basename(url); + tagDataList = []; + if (/\.d\.ts/.test(apiBaseName) || /\.d\.ets/.test(apiBaseName)) { + const fileName = processFileName(url); + ts.transpileModule(content, { + compilerOptions: { + target: ts.ScriptTarget.ES2017, + }, + fileName: fileName, + transformers: { before: [callback(url, content)] } + }); + } else { + const outputPath = replaceInputDirWithOutputDir(url, inputDir, outputDir); + ensureDirectoryExists(outputPath); + fs.writeFileSync(outputPath, content); + } + }); +} + +/** + * 统一处理文件名称,修改后缀等 + * @param {string} filePath 文件路径 + * @returns {string} filename 文件名称 + */ +function processFileName(filePath) { + return path + .basename(filePath) + .replace(/\.d\.ts$/g, '.ts') + .replace(/\.d\.ets$/g, '.ets'); +} + +/** + * 每个文件处理签回调函数第一个 + * @callback recursionAstCallback + * @param {string} url 文件路径 + * @returns {Function} + */ +function recursionAstCallback(url) { + return (context) => { + return (sourceFile) => { + node = processVisitEachChild1(context, sourceFile); + const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed }); + const result = printer.printNode(ts.EmitHint.Unspecified, node, sourceFile); + const outputPath = replaceInputDirWithOutputDir(url, inputDir, outputDir); + ensureDirectoryExists(outputPath); + fs.writeFileSync(outputPath, result); + return ts.factory.createSourceFile([], ts.SyntaxKind.EndOfFileToken, ts.NodeFlags.None); + }; + }; +} + +/** + * 每个文件处理签回调函数第一个 + * @callback recursionAstCallback + * @param {string} url 文件路径 + * @returns {Function} + */ +function recursionAstCallback2(url) { + return (context) => { + return (sourceFile) => { + node = processVisitEachChild2(context, sourceFile); + const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed }); + const result = printer.printNode(ts.EmitHint.Unspecified, node, sourceFile); + const outputPath = replaceInputDirWithOutputDir(url, inputDir, outputDir); + ensureDirectoryExists(outputPath); + fs.writeFileSync(outputPath, result); + return ts.factory.createSourceFile([], ts.SyntaxKind.EndOfFileToken, ts.NodeFlags.None); + }; + }; +} + +/** + * 每个文件处理签回调函数第一个 + * @callback parseJSDocCallback + * @param {string} url 文件路径 + * @returns {Function} + */ +function parseJSDocCallback(url, content) { + return (context) => { + return (sourceFile) => { + node = parseJSDocVisitEachChild1(context, sourceFile, content); + const outputPath = replaceInputDirWithOutputDir(url, inputDir, outputDir); + ensureDirectoryExists(outputPath); + fs.writeFileSync(outputPath, jsDocContent); + return ts.factory.createSourceFile([], ts.SyntaxKind.EndOfFileToken, ts.NodeFlags.None); + }; + }; +} + +/** + * 每个文件处理签回调函数第一个 + * @callback parseJSDocCallback + * @param {string} url 文件路径 + * @returns {Function} + */ +function parseJSDocCallback2(url, content) { + return (context) => { + return (sourceFile) => { + const contents = fs.readFileSync(url, 'utf-8'); + node = parseJSDocVisitEachChild2(context, sourceFile, contents); + const outputPath = replaceInputDirWithOutputDir(url, inputDir, outputDir); + ensureDirectoryExists(outputPath); + fs.writeFileSync(outputPath, jsDocContent); + return ts.factory.createSourceFile([], ts.SyntaxKind.EndOfFileToken, ts.NodeFlags.None); + }; + }; +} + +/** + * 遍历处理tsnode节点 + * @param {context} 解下过后的内容 + * @param {node} 解下过后的节点 + * @returns ts.node + */ +function parseJSDocVisitEachChild1(context, node, content) { + return ts.visitEachChild(node, processAllNodes, context); + function processAllNodes(node) { + if (node.jsDoc) { + processAllNodesJSDoc(node.jsDoc); + } + return ts.visitEachChild(node, processAllNodes, context); + } + function jsDocNodeForeach(tags) { + tags.forEach(tag => { + if (!tag.typeExpression) { + return; + } + const typeExpr = tag.typeExpression; + const newTypeExpr = parseTypeExpr(typeExpr); + applJSDocTransformations(typeExpr.type, newTypeExpr, content, tagDataList); + }); + } + function processAllNodesJSDoc(jsDocNode) { + jsDocNode.forEach(doc => { + if (!doc.tags) { + return; + } + if (/(float|double|int)/g.test(doc.getText())) { + jsDocNodeForeach(doc.tags); + } + }); + } + function parseTypeExpr(typeExpr) { + let newTypeExpr = typeExpr; + if (typeExpr.type.kind === ts.SyntaxKind.JSDocNullableType) { + newTypeExpr = judgeKind(typeExpr.type); + } else { + newTypeExpr = parseTypeExpression(typeExpr.type); + } + return newTypeExpr; + } + function judgeKind(typeExprType) { + if (typeExprType.type.kind && typeExprType.type.kind === ts.SyntaxKind.ParenthesizedType) { + return parseTypeExpression(typeExprType.type.type); + } else { + return parseTypeExpression(typeExprType.type); + } + } + function parseTypeExpression(node) { + if (ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && typeArray.includes(node.typeName.getText())) { + node = ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword); + } + return ts.visitEachChild(node, parseTypeExpression, context); + } +} + +/** + * + * @param {typeExpr} 原始typeExpr + * @param {newTypeExpr} 新typeExpr + * @param {content} 文本内容 + */ +function applJSDocTransformations(typeExpr, newTypeExpr, content, tagDataList) { + const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed }); + const finalContent = printer.printNode(ts.EmitHint.Unspecified, newTypeExpr); + if (finalContent.includes('number')) { + const data = { + pos: typeExpr.pos, + end: typeExpr.end, + convertedText: finalContent + }; + tagDataList.push(data); + changeContent(content, tagDataList); + } +} + +/** + * + * @param {typeExpr} 原始typeExpr + * @param {newTypeExpr} 新typeExpr + * @param {content} 文本内容 + */ +function changeContent(content, tagDataList) { + tagDataList.sort((a, b) => b.pos - a.pos); + let result = content; + for (const data of tagDataList) { + const before = result.substring(0, data.pos); + const after = result.substring(data.end); + result = before + ` ${data.convertedText}` + after; + } + jsDocContent = result; +} + +/** + * 遍历处理tsnode节点 + * @param {context} 解下过后的内容 + * @param {node} 解下过后的节点 + * @returns ts.node + */ +function parseJSDocVisitEachChild2(context, node, content) { + const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed }); + return ts.visitEachChild(node, processAllNodes, context); + function processAllNodes(node) { + if (node.jsDoc) { + removeChangeData(node.jsDoc); + } + return ts.visitEachChild(node, processAllNodes, context); + } + function jsDocNodeForeach(tags) { + tags.forEach(tag => { + if (!tag.typeExpression) { + return; + } + writeDataToFile(tag); + }); + } + function removeChangeData(node) { + node.forEach(doc => { + if (!doc.tags) { + return; + } + jsDocNodeForeach(doc.tags); + }); + } + function writeDataToFile(tag) { + const typeExpr = tag.typeExpression; + const newTypeExpr = parseTypeExpression(typeExpr.type); + const finalContent = printer.printNode(ts.EmitHint.Unspecified, newTypeExpr); + const before = content.substring(0, typeExpr.type.pos); + const after = content.substring(typeExpr.type.end); + jsDocContent = before + ` ${finalContent}` + after; + } + function parseTypeExpression(node) { + if (ts.isUnionTypeNode(node)) { + const types = node.types; + const newTypes1 = []; + let newTypes2 = []; + types.forEach(type => { + newTypes1.push(collectNewTypes(type)); + }); + newTypes1.forEach(type => { + newTypes2 = duplicateRemoval(type); + }); + node = ts.factory.updateUnionTypeNode(node, newTypes2); + } + return ts.visitEachChild(node, parseTypeExpression, context); + } +} + + +/** + * @param {type} 需要去重的节点 + */ +function collectNewTypes(type) { + if (ts.isTypeReferenceNode(type) && ts.isIdentifier(type.typeName) && typeArray.includes(type.typeName.getText())) { + return ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword); + } else { + return type; + } +} + + +/** + * + * @param {type} 解析过后的节点 + * @returns + */ +function duplicateRemoval(type) { + let newTypes2 = []; + let hasNumberKeyWorld = false; + if (type.kind === ts.SyntaxKind.NumberKeyword) { + if (!hasNumberKeyWorld) { + newTypes2.push(type); + hasNumberKeyWorld = true; + } + } else { + newTypes2.push(type); + } + return newTypes2; +} + +/** + * 遍历处理tsnode节点 + * @param {context} 解下过后的内容 + * @param {node} 解下过后的节点 + * @returns ts.node + */ +function processVisitEachChild1(context, node) { + return ts.visitEachChild(node, processAllNodes, context); + function processAllNodes(node) { + if (ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && typeArray.includes(node.typeName.getText())) { + node = ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword); + } + if (ts.isStructDeclaration(node)) { + node = processStructDeclaration(node); + } + return ts.visitEachChild(node, processAllNodes, context); + }; +} + +/** + * 处理struct子节点 + */ +function processStructDeclaration(node) { + const newMembers = []; + node.members.forEach((member, index) => { + if (index >= 1) { + newMembers.push(member); + } + }); + node = ts.factory.updateStructDeclaration( + node, + node.modifiers, + node.name, + node.typeParameters, + node.heritageClauses, + newMembers + ); + return node; +} + + +/** + * 遍历处理tsnode节点去重 + * @param {context} 解下过后的内容 + * @param {node} 解下过后的节点 + * @returns ts.node + */ +function processVisitEachChild2(context, node) { + const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed }); + return ts.visitEachChild(node, processAllNodes, context); + function processAllNodes(node) { + if (ts.isUnionTypeNode(node)) { + apiDuplicateRemoval(node); + } + if (ts.isStructDeclaration(node)) { + node = processStructDeclaration(node); + } + return ts.visitEachChild(node, processAllNodes, context); + }; + + function apiDuplicateRemoval(node) { + const types = node.types; + const newTypes = []; + const newTypesText = new Set([]); + types.forEach(type => { + const text = printer.printNode(ts.EmitHint.Unspecified, type); + if (!newTypesText.has(text)) { + newTypes.push(type); + newTypesText.add(text); + } + }); + node = ts.factory.updateUnionTypeNode(node, newTypes); + } +} + +/** + * 将输入路径替换为输出路径 + * @param {string} inputFilePath 输入文件的绝对路径 + * @param {string} inputDir 输入目录的绝对路径 + * @param {string} outputDir 输出目录的绝对路径 + * @returns {string} 输出文件的绝对路径 + */ +function replaceInputDirWithOutputDir(inputFilePath, inputDir, outputDir) { + return inputFilePath.replace(inputDir, outputDir); +} + +/** + * 确保目录结构存在,如果不存在则创建 + * @param {string} filePath 文件路径 + */ +function ensureDirectoryExists(filePath) { + try { + const dir = path.dirname(filePath); + if (!fs.existsSync(dir)) { + fs.mkdirSync(dir, { recursive: true }); + } + } catch (error) { + console.error(`Error creating directory: ${error.message}`); + } +} + +main(); \ No newline at end of file -- Gitee From e8a6fa6f5864bfa94a21583d922694de02047f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9B=B9=E5=AE=87?= Date: Tue, 1 Jul 2025 14:16:42 +0800 Subject: [PATCH 015/746] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=89=93=E5=8C=85?= =?UTF-8?q?=E7=A9=BA=E6=96=87=E4=BB=B6=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 王曹宇 --- build-tools/handleApiFiles.js | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/build-tools/handleApiFiles.js b/build-tools/handleApiFiles.js index eab1ffd3d5..d12bbacff8 100755 --- a/build-tools/handleApiFiles.js +++ b/build-tools/handleApiFiles.js @@ -30,6 +30,15 @@ const DirType = { 'typeThree': 'noTagInEts2', }; +const NotNullFilePath = [ + 'api', + 'api/@internal/ets', + 'api/@internal/component/ets', + 'api/arkui/component', + 'arkts', + 'kits', +]; + const NOT_COPY_DIR = ['build-tools', '.git', '.gitee']; function isEtsFile(path) { @@ -103,6 +112,20 @@ function handleApiFiles(rootPath, type, output) { console.log('error===>', error); } } + if (type === DirType.typeTwo) { + NotNullFilePath.forEach((dir) => { + const outDir = path.join(output, dir); + if (!fs.existsSync(outDir)) { + fs.mkdirSync(outDir, { recursive: true }); + writeFile(path.join(outDir, '.keep'), ' '); + return; + } + const fileNames = fs.readdirSync(outDir); + if (fileNames.length === 0) { + writeFile(path.join(outDir, '.keep'), ' '); + } + }); + } } -- Gitee From a25279aebefc1702dcecf62225c939a851b8d43d Mon Sep 17 00:00:00 2001 From: black Date: Tue, 3 Jun 2025 11:29:52 +0800 Subject: [PATCH 016/746] support closed-source hds components transfomrer Signed-off-by: black --- arkui_transformer.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arkui_transformer.py b/arkui_transformer.py index 0d00f1b74d..dbb1f2f126 100755 --- a/arkui_transformer.py +++ b/arkui_transformer.py @@ -30,6 +30,10 @@ def compile_package(options): nodejs = os.path.abspath(options.node_js) input_dir = os.path.abspath(options.input) output = os.path.abspath(options.output) + config_path = '' + if (len(options.config_path) > 0): + config_path = os.path.abspath(options.config_path) + custom_env = { 'PATH': f"{os.path.dirname(os.path.abspath(options.node_js))}:{os.environ.get('PATH')}", 'NODE_HOME': os.path.dirname(os.path.abspath(options.node_js)), @@ -38,7 +42,10 @@ def compile_package(options): process = subprocess.run([npm, "run", "compile:arkui"], env=custom_env, cwd=tool_path, shell=False) if os.path.exists(package_path): - p = subprocess.run([nodejs, package_path, "--input-dir", input_dir, "--target-dir", output], cwd=tool_path, shell=False) + if (len(config_path) > 0): + p = subprocess.run([nodejs, package_path, "--input-dir", input_dir, "--target-dir", output, "--config-path", config_path], cwd=tool_path, shell=False) + else: + p = subprocess.run([nodejs, package_path, "--input-dir", input_dir, "--target-dir", output], cwd=tool_path, shell=False) else: print("arkui_transformer: tool path does not exist") @@ -49,6 +56,7 @@ def main(): parser = argparse.ArgumentParser() parser.add_argument('--input', required=True) parser.add_argument('--output', required=True) + parser.add_argument('--config_path', required=False, default='') parser.add_argument('--source_root_dir', required=True) parser.add_argument('--npm-path', required=True) parser.add_argument('--node-js', required=True) -- Gitee From df73b2bf51f1e3744a357bab61c131618b1bc01e Mon Sep 17 00:00:00 2001 From: black Date: Tue, 3 Jun 2025 15:12:13 +0800 Subject: [PATCH 017/746] format code Signed-off-by: black --- arkui_transformer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arkui_transformer.py b/arkui_transformer.py index dbb1f2f126..0f6919fd6e 100755 --- a/arkui_transformer.py +++ b/arkui_transformer.py @@ -43,9 +43,9 @@ def compile_package(options): if os.path.exists(package_path): if (len(config_path) > 0): - p = subprocess.run([nodejs, package_path, "--input-dir", input_dir, "--target-dir", output, "--config-path", config_path], cwd=tool_path, shell=False) + p = subprocess.run([nodejs, package_path, "--input-dir", input_dir, "--target-dir", output, "--config-path", config_path], cwd=tool_path, shell=False) else: - p = subprocess.run([nodejs, package_path, "--input-dir", input_dir, "--target-dir", output], cwd=tool_path, shell=False) + p = subprocess.run([nodejs, package_path, "--input-dir", input_dir, "--target-dir", output], cwd=tool_path, shell=False) else: print("arkui_transformer: tool path does not exist") -- Gitee From e58cd2d9cee8b2628c2532d010b8f4e433d8836c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=81=A5?= Date: Thu, 3 Jul 2025 21:54:35 +0800 Subject: [PATCH 018/746] =?UTF-8?q?number=E8=BD=ACint,long,double=20Signed?= =?UTF-8?q?-off-by:=20=E5=AD=99=E5=81=A5=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/@ohos.i18n.d.ts | 303 ++++++++++++++++++++++---------------------- api/@ohos.intl.d.ts | 164 ++++++++++++------------ 2 files changed, 237 insertions(+), 230 deletions(-) diff --git a/api/@ohos.i18n.d.ts b/api/@ohos.i18n.d.ts index 6b78d6c6d7..268888210f 100644 --- a/api/@ohos.i18n.d.ts +++ b/api/@ohos.i18n.d.ts @@ -508,34 +508,38 @@ declare namespace i18n { * * @permission ohos.permission.UPDATE_CONFIGURATION * @param { string } language - Valid ID of the language to be added as a preferred language. - * @param { number } [index] - Position to which the preferred language is added. The default value is the length + * @param { int } [index] - Position to which the preferred language is added. The default value is the length * of the preferred language list. * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission * required to call the API. + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. * @throws { BusinessError } 890001 - Invalid parameter. Possible causes: Parameter verification failed. + * @static * @syscap SystemCapability.Global.I18n * @systemapi Hide this for inner system use. * @since 9 */ - static addPreferredLanguage(language: string, index?: number): void; + static addPreferredLanguage(language: string, index?: int): void; /** * Removes a preferred language from the specified position on the preferred language list. * * @permission ohos.permission.UPDATE_CONFIGURATION - * @param { number } index - Position of the preferred language to delete. + * @param { int } index - Position of the preferred language to delete. * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission * required to call the API. + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. * @throws { BusinessError } 890001 - Invalid parameter. Possible causes: Parameter verification failed. + * @static * @syscap SystemCapability.Global.I18n * @systemapi Hide this for inner system use. * @since 9 */ - static removePreferredLanguage(index: number): void; + static removePreferredLanguage(index: int): void; /** * Access the system preferred language list. @@ -953,7 +957,7 @@ declare namespace i18n { /** * Enumerates the first day of a week. The value ranges from Monday to Sunday. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Global.I18n * @atomicservice * @since 18 @@ -1026,7 +1030,7 @@ declare namespace i18n { /** * Enumerates temperature units. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Global.I18n * @atomicservice * @since 18 @@ -1075,7 +1079,7 @@ declare namespace i18n { * * @param { UnitInfo } fromUnit - Measurement unit to be converted. * @param { UnitInfo } toUnit - Measurement unit to be converted to. - * @param { number } value - Value of the measurement unit to be converted. + * @param { double } value - Value of the measurement unit to be converted. * @param { string } locale - Locale ID used for formatting, for example, "zh-Hans-CN". * @param { string } [style] - Style used for formatting. The value can be "long", "short", or "narrow". The * default value is short. @@ -1085,7 +1089,7 @@ declare namespace i18n { * @deprecated since 9 * @useinstead ohos.i18n/i18n.I18NUtil#unitConvert */ - unitConvert(fromUnit: UnitInfo, toUnit: UnitInfo, value: number, locale: string, style?: string): string; + unitConvert(fromUnit: UnitInfo, toUnit: UnitInfo, value: double, locale: string, style?: string): string; } /** @@ -1115,7 +1119,7 @@ declare namespace i18n { * * @param { UnitInfo } fromUnit - Information of the unit to be converted. * @param { UnitInfo } toUnit - Information about the unit to be converted to. - * @param { number } value - Indicates the number to be formatted. + * @param { double } value - Indicates the number to be formatted. * @param { string } locale - The locale to be used. * @param { string } [style] - The style of format. * @returns { string } converted number and unit. @@ -1127,18 +1131,19 @@ declare namespace i18n { * * @param { UnitInfo } fromUnit - Measurement unit to be converted. * @param { UnitInfo } toUnit - Measurement unit to be converted to. - * @param { number } value - Value of the measurement unit to be converted. + * @param { double } value - Value of the measurement unit to be converted. * @param { string } locale - Locale ID, which consists of the language, script, and country/region, for example, * "zh-Hans-CN". * @param { string } [style] - Style used for formatting. The value can be long, short, or narrow. The default * value is short. For details about the meaning or display effect of different values, * see Number and Unit of Measurement Formatting. * @returns { string } String converted to the measurement unit after formatting. + * @static * @syscap SystemCapability.Global.I18n * @atomicservice * @since 12 */ - static unitConvert(fromUnit: UnitInfo, toUnit: UnitInfo, value: number, locale: string, style?: string): string; + static unitConvert(fromUnit: UnitInfo, toUnit: UnitInfo, value: double, locale: string, style?: string): string; /** * Get the order of year, month, day in the specified locale. Year, month, day are separated by '-'. @@ -1176,7 +1181,7 @@ declare namespace i18n { /** * Get the time period name for the specified hour. * - * @param { number } hour - the hour value. + * @param { int } hour - the hour value. * @param { string } [locale] - specified the locale. Use current app locale by default. It must be a valid locale. * @returns { string } the string of time period name. The return value may be empty string * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. @@ -1187,18 +1192,19 @@ declare namespace i18n { /** * Obtains the localized expression of the specified time in the specified locale. * - * @param { number } hour - Specified time, for example, 16. + * @param { int } hour - Specified time, for example, 16. * @param { string } [locale] - System locale, which consists of the language, script, and country/region. for * example, "zh-Hans-CN". The default value is the current system locale. * @returns { string } Localized expression of the specified time in the specified locale. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. * @throws { BusinessError } 890001 - Invalid parameter. Possible causes: Parameter verification failed. + * @static * @syscap SystemCapability.Global.I18n * @atomicservice * @since 12 */ - static getTimePeriodName(hour:number, locale?: string): string; + static getTimePeriodName(hour:int, locale?: string): string; /** * Obtains the locale that best matches a region from the specified locale list. @@ -1628,14 +1634,14 @@ declare namespace i18n { /** * set the time. * - * @param { number } time - Indicates the elapsed milliseconds from 1970.1.1 00:00:00 GMT. + * @param { double } time - Indicates the elapsed milliseconds from 1970.1.1 00:00:00 GMT. * @syscap SystemCapability.Global.I18n * @since 8 */ /** * set the time. * - * @param { number } time - Indicates the elapsed milliseconds from 1970.1.1 00:00:00 GMT. + * @param { double } time - Indicates the elapsed milliseconds from 1970.1.1 00:00:00 GMT. * @syscap SystemCapability.Global.I18n * @crossplatform * @since 10 @@ -1643,36 +1649,36 @@ declare namespace i18n { /** * Sets the date and time for a Calendar object. * - * @param { number } time - Unix timestamp, which indicates the number of milliseconds that have elapsed since the + * @param { double } time - Unix timestamp, which indicates the number of milliseconds that have elapsed since the * Unix epoch. * @syscap SystemCapability.Global.I18n * @crossplatform * @atomicservice * @since 12 */ - setTime(time: number): void; + setTime(time: double): void; /** * Set the time * - * @param { number } year - The year field of the calendar, ranges from 0 to 9999. - * @param { number } month - The month field of the calendar, ranges from 0 to 11. - * @param { number } date - The day field of the calendar, ranges from 1 to 31. - * @param { number } hour - The hour field of the calendar, ranges from 0 to 23. - * @param { number } minute - The minute field of the calendar, ranges from 0 to 59. - * @param { number } second - the second field of the calendar, ranges from 0 to 59. + * @param { int } year - The year field of the calendar, ranges from 0 to 9999. + * @param { int } month - The month field of the calendar, ranges from 0 to 11. + * @param { int } date - The day field of the calendar, ranges from 1 to 31. + * @param { int } hour - The hour field of the calendar, ranges from 0 to 23. + * @param { int } minute - The minute field of the calendar, ranges from 0 to 59. + * @param { int } second - the second field of the calendar, ranges from 0 to 59. * @syscap SystemCapability.Global.I18n * @since 8 */ /** * Set the time * - * @param { number } year - The year field of the calendar, ranges from 0 to 9999. - * @param { number } month - The month field of the calendar, ranges from 0 to 11. - * @param { number } date - The day field of the calendar, ranges from 1 to 31. - * @param { number } hour - The hour field of the calendar, ranges from 0 to 23. - * @param { number } minute - The minute field of the calendar, ranges from 0 to 59. - * @param { number } second - the second field of the calendar, ranges from 0 to 59. + * @param { int } year - The year field of the calendar, ranges from 0 to 9999. + * @param { int } month - The month field of the calendar, ranges from 0 to 11. + * @param { int } date - The day field of the calendar, ranges from 1 to 31. + * @param { int } hour - The hour field of the calendar, ranges from 0 to 23. + * @param { int } minute - The minute field of the calendar, ranges from 0 to 59. + * @param { int } second - the second field of the calendar, ranges from 0 to 59. * @syscap SystemCapability.Global.I18n * @crossplatform * @since 10 @@ -1680,18 +1686,18 @@ declare namespace i18n { /** * Sets the year, month, day, hour, minute, and second for this Calendar object. * - * @param { number } year - Year to set. - * @param { number } month - Month to set. Note: The month starts from 0. For example, 0 indicates January. - * @param { number } date - Day to set. - * @param { number } hour - Hour to set. The default value is the current system time. - * @param { number } minute - Minute to set. The default value is the current system time. - * @param { number } second - Second to set. The default value is the current system time. + * @param { int } year - Year to set. + * @param { int } month - Month to set. Note: The month starts from 0. For example, 0 indicates January. + * @param { int } date - Day to set. + * @param { int } hour - Hour to set. The default value is the current system time. + * @param { int } minute - Minute to set. The default value is the current system time. + * @param { int } second - Second to set. The default value is the current system time. * @syscap SystemCapability.Global.I18n * @crossplatform * @atomicservice * @since 12 */ - set(year: number, month: number, date: number, hour?: number, minute?: number, second?: number): void; + set(year: int, month: int, date: int, hour?: int, minute?: int, second?: int): void; /** * Set the timezone of this calendar. @@ -1749,14 +1755,14 @@ declare namespace i18n { /** * Get the start day of a week. 1 indicates Sunday, 7 indicates Saturday. * - * @returns { number } start day of a week. + * @returns { int } start day of a week. * @syscap SystemCapability.Global.I18n * @since 8 */ /** * Get the start day of a week. 1 indicates Sunday, 7 indicates Saturday. * - * @returns { number } start day of a week. + * @returns { int } start day of a week. * @syscap SystemCapability.Global.I18n * @crossplatform * @since 10 @@ -1764,25 +1770,25 @@ declare namespace i18n { /** * Obtains the first day of a week for this Calendar object. * - * @returns { number } First day of a week. The value 1 indicates Sunday, and the value 7 indicates Saturday. + * @returns { int } First day of a week. The value 1 indicates Sunday, and the value 7 indicates Saturday. * @syscap SystemCapability.Global.I18n * @crossplatform * @atomicservice * @since 12 */ - getFirstDayOfWeek(): number; + getFirstDayOfWeek(): int; /** * Set the start day of a week. 1 indicates Sunday, 7 indicates Saturday. * - * @param { number } value - Indicates the start day of a week. 1 indicates Sunday, 7 indicates Saturday. + * @param { int } value - Indicates the start day of a week. 1 indicates Sunday, 7 indicates Saturday. * @syscap SystemCapability.Global.I18n * @since 8 */ /** * Set the start day of a week. 1 indicates Sunday, 7 indicates Saturday. * - * @param { number } value - Indicates the start day of a week. 1 indicates Sunday, 7 indicates Saturday. + * @param { int } value - Indicates the start day of a week. 1 indicates Sunday, 7 indicates Saturday. * @syscap SystemCapability.Global.I18n * @crossplatform * @since 10 @@ -1790,25 +1796,25 @@ declare namespace i18n { /** * Sets the first day of a week for this Calendar object. * - * @param { number } value - Start day of a week. The value 1 indicates Sunday, and the value 7 indicates Saturday. + * @param { int } value - Start day of a week. The value 1 indicates Sunday, and the value 7 indicates Saturday. * @syscap SystemCapability.Global.I18n * @crossplatform * @atomicservice * @since 12 */ - setFirstDayOfWeek(value: number): void; + setFirstDayOfWeek(value: int): void; /** * Get the minimal days of a week, which is needed for the first day of a year. * - * @returns { number } the minimal days of a week. + * @returns { int } the minimal days of a week. * @syscap SystemCapability.Global.I18n * @since 8 */ /** * Get the minimal days of a week, which is needed for the first day of a year. * - * @returns { number } the minimal days of a week. + * @returns { int } the minimal days of a week. * @syscap SystemCapability.Global.I18n * @crossplatform * @since 10 @@ -1816,25 +1822,25 @@ declare namespace i18n { /** * Obtains the minimum number of days in the first week for this Calendar object. * - * @returns { number } Minimum number of days in the first week of a year. + * @returns { int } Minimum number of days in the first week of a year. * @syscap SystemCapability.Global.I18n * @crossplatform * @atomicservice * @since 12 */ - getMinimalDaysInFirstWeek(): number; + getMinimalDaysInFirstWeek(): int; /** * Set the minimal days of a week, which is needed for the first week of a year. * - * @param { number } value - The value to be set. + * @param { int } value - The value to be set. * @syscap SystemCapability.Global.I18n * @since 8 */ /** * Set the minimal days of a week, which is needed for the first week of a year. * - * @param { number } value - The value to be set. + * @param { int } value - The value to be set. * @syscap SystemCapability.Global.I18n * @crossplatform * @since 10 @@ -1842,13 +1848,13 @@ declare namespace i18n { /** * Sets the minimum number of days in the first week for this Calendar object. * - * @param { number } value - Minimum number of days in the first week of a year. + * @param { int } value - Minimum number of days in the first week of a year. * @syscap SystemCapability.Global.I18n * @crossplatform * @atomicservice * @since 12 */ - setMinimalDaysInFirstWeek(value: number): void; + setMinimalDaysInFirstWeek(value: int): void; /** * Get the associated value with the field. @@ -1856,7 +1862,7 @@ declare namespace i18n { * @param { string } field - Field values such as era, year, month, week_of_year, week_of_month, date, day_of_year, day_of_week * day_of_week_in_month, hour, hour_of_day, minute, second, millisecond, zone_offset, dst_offset, year_woy, * dow_local, extended_year, julian_day, milliseconds_in_day, is_leap_month. - * @returns { number } the associated value. + * @returns { int } the associated value. * @syscap SystemCapability.Global.I18n * @since 8 */ @@ -1866,7 +1872,7 @@ declare namespace i18n { * @param { string } field - Field values such as era, year, month, week_of_year, week_of_month, date, day_of_year, day_of_week * day_of_week_in_month, hour, hour_of_day, minute, second, millisecond, zone_offset, dst_offset, year_woy, * dow_local, extended_year, julian_day, milliseconds_in_day, is_leap_month. - * @returns { number } the associated value. + * @returns { int } the associated value. * @syscap SystemCapability.Global.I18n * @crossplatform * @since 10 @@ -1875,7 +1881,7 @@ declare namespace i18n { * Obtains the values of the calendar attributes in this Calendar object. * * @param { string } field - Calendar attributes. The following table lists the supported attribute values. - * @returns { number } Value of the calendar attribute. For example, if the year of the internal date of the + * @returns { int } Value of the calendar attribute. For example, if the year of the internal date of the * current Calendar object is 1990, get('year') returns 1990. * @syscap SystemCapability.Global.I18n * @crossplatform @@ -1883,7 +1889,7 @@ declare namespace i18n { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - get(field: string): number; + get(field: string): int; /** * Get calendar's name localized for display in the given locale. @@ -1943,7 +1949,7 @@ declare namespace i18n { * * @param { string } field - field values such as year, month, week_of_year, week_of_month, date, day_of_year, day_of_week * day_of_week_in_month, hour, hour_of_day, minute, second, millisecond - * @param { number } amount - the amount of date or time to be added to the field. + * @param { int } amount - the amount of date or time to be added to the field. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. * @throws { BusinessError } 890001 - Invalid parameter. Possible causes: Parameter verification failed. * @syscap SystemCapability.Global.I18n @@ -1956,7 +1962,7 @@ declare namespace i18n { * @param { string } field - Calendar attribute. The value can be any of the following: year, month, week_of_year, * week_of_month, date, day_of_year, day_of_week, day_of_week_in_month, hour, * hour_of_day, minute, second, millisecond. For details about the values, see get. - * @param { number } amount - Addition or subtraction amount. + * @param { int } amount - Addition or subtraction amount. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. * @throws { BusinessError } 890001 - Invalid parameter. Possible causes: Parameter verification failed. @@ -1965,12 +1971,12 @@ declare namespace i18n { * @atomicservice * @since 12 */ - add(field: string, amount: number): void; + add(field: string, amount: int): void; /** * Get the UTC milliseconds. * - * @returns { number } the calendar time as UTC milliseconds. + * @returns { long } the calendar time as UTC milliseconds. * @syscap SystemCapability.Global.I18n * @crossplatform * @since 11 @@ -1978,20 +1984,20 @@ declare namespace i18n { /** * Obtains the timestamp of this Calendar object. * - * @returns { number } Unix timestamp, which indicates the number of milliseconds that have elapsed since the + * @returns { long } Unix timestamp, which indicates the number of milliseconds that have elapsed since the * Unix epoch. * @syscap SystemCapability.Global.I18n * @crossplatform * @atomicservice * @since 12 */ - getTimeInMillis(): number; + getTimeInMillis(): long; /** * Returns days comparison result. * * @param { Date } date - Date object to be compared. - * @returns { number } value of of the comparison result. A positive value indicates that the date is later, + * @returns { int } value of of the comparison result. A positive value indicates that the date is later, * and a negative value indicates that the date is earlier. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. * @syscap SystemCapability.Global.I18n @@ -2003,7 +2009,7 @@ declare namespace i18n { * days. * * @param { Date } date - Date and time. Note: The month starts from 0. For example, 0 indicates January. - * @returns { number } Difference in the number of days. A positive number indicates that the calendar date is + * @returns { int } Difference in the number of days. A positive number indicates that the calendar date is * earlier, and a negative number indicates the opposite. The value is accurate to * milliseconds. If the value is less than one day, it is considered as one day. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; @@ -2013,7 +2019,7 @@ declare namespace i18n { * @atomicservice * @since 12 */ - compareDays(date: Date): number; + compareDays(date: Date): int; } /** @@ -2085,43 +2091,43 @@ declare namespace i18n { /** * Obtains the current position of the BreakIterator instance. * - * @returns { number } the current position of the BreakIterator instance. + * @returns { int } the current position of the BreakIterator instance. * @syscap SystemCapability.Global.I18n * @since 8 */ /** * Obtains the position of the break iterator in the text. * - * @returns { number } Position of the break iterator in the text. + * @returns { int } Position of the break iterator in the text. * @syscap SystemCapability.Global.I18n * @atomicservice * @since 12 */ - current(): number; + current(): int; /** * Set the BreakIterator's position to the first break point, the first break point is always the beginning of the * processed text. * - * @returns { number } the index of the first break point. + * @returns { int } the index of the first break point. * @syscap SystemCapability.Global.I18n * @since 8 */ /** * Moves the break iterator to the first line break point, which is always at the beginning of the processed text. * - * @returns { number } Offset of the first line break point in the processed text. + * @returns { int } Offset of the first line break point in the processed text. * @syscap SystemCapability.Global.I18n * @atomicservice * @since 12 */ - first(): number; + first(): int; /** * Set the BreakIterator's position to the last break point. the last break point is always the index beyond the * last character of the processed text. * - * @returns { number } the index of the last break point. + * @returns { int } the index of the last break point. * @syscap SystemCapability.Global.I18n * @since 8 */ @@ -2129,52 +2135,52 @@ declare namespace i18n { * Moves the break iterator to the last line break point, which is always the next position after the end of the * processed text. * - * @returns { number } Offset of the last line break point in the processed text. + * @returns { int } Offset of the last line break point in the processed text. * @syscap SystemCapability.Global.I18n * @atomicservice * @since 12 */ - last(): number; + last(): int; /** * Set the BreakIterator's position to the nth break point from the current break point. * - * @param { number } [index] - indicates the number of break points to advance. If index is not given, n is treated as 1. - * @returns { number } the index of the BreakIterator after moving. If there is not enough break points, returns -1. + * @param { int } [index] - indicates the number of break points to advance. If index is not given, n is treated as 1. + * @returns { int } the index of the BreakIterator after moving. If there is not enough break points, returns -1. * @syscap SystemCapability.Global.I18n * @since 8 */ /** * Moves the break iterator backward by the specified number of line break points. * - * @param { number } [index] - Number of line break points for moving the break iterator. The value is an integer. + * @param { int } [index] - Number of line break points for moving the break iterator. The value is an integer. * A positive number means to move the break iterator backward, and a negative number * means to move the break iterator forward. The default value is 1. - * @returns { number } Position of the break iterator in the text after movement. The value -1 is returned if the + * @returns { int } Position of the break iterator in the text after movement. The value -1 is returned if the * position of the break iterator is outside of the processed text after movement. * @syscap SystemCapability.Global.I18n * @atomicservice * @since 12 */ - next(index?: number): number; + next(index?: int): int; /** * Set the BreakIterator's position to the break point preceding the current break point. * - * @returns { number } the index of the BreakIterator after moving. If there is not enough break points, returns -1. + * @returns { int } the index of the BreakIterator after moving. If there is not enough break points, returns -1. * @syscap SystemCapability.Global.I18n * @since 8 */ /** * Moves the break iterator foreward by one line break point. * - * @returns { number } Position of the break iterator in the text after movement. The value -1 is returned if the + * @returns { int } Position of the break iterator in the text after movement. The value -1 is returned if the * position of the break iterator is outside of the processed text after movement. * @syscap SystemCapability.Global.I18n * @atomicservice * @since 12 */ - previous(): number; + previous(): int; /** * Set the text to be processed. @@ -2196,22 +2202,22 @@ declare namespace i18n { /** * Set the BreakIterator's position to the first break point following the specified offset. * - * @param { number } offset - * @returns { number } the index of the BreakIterator after moving. If there is not enough break points, returns -1. + * @param { int } offset + * @returns { int } the index of the BreakIterator after moving. If there is not enough break points, returns -1. * @syscap SystemCapability.Global.I18n * @since 8 */ /** * Moves the line break iterator to the line break point after the specified position. * - * @param { number } offset - Offset of the line break point. - * @returns { number } Position of the break iterator in the text after movement. The value -1 is returned if the + * @param { int } offset - Offset of the line break point. + * @returns { int } Position of the break iterator in the text after movement. The value -1 is returned if the * position of the break iterator is outside of the processed text after movement. * @syscap SystemCapability.Global.I18n * @atomicservice * @since 12 */ - following(offset: number): number; + following(offset: int): int; /** * Obtains the text being processed. @@ -2235,7 +2241,7 @@ declare namespace i18n { * position will be set to the position indicated by the offset if it returns true, otherwise the BreakIterator * will be moved to the break point following the offset. * - * @param { number } offset The offset to be checked. + * @param { int } offset The offset to be checked. * @returns { boolean } true if the offset is a break point. * @syscap SystemCapability.Global.I18n * @since 8 @@ -2243,7 +2249,7 @@ declare namespace i18n { /** * Checks whether the specified position is a line break point. * - * @param { number } offset - Specified position in the text. + * @param { int } offset - Specified position in the text. * @returns { boolean } Whether the specified position is a line break point. The value "true" indicates that the * specified position is a line break point, and the value "false" indicates the opposite. * If true is returned, the break iterator is moved to the position specified by offset. @@ -2253,7 +2259,7 @@ declare namespace i18n { * @atomicservice * @since 12 */ - isBoundary(offset: number): boolean; + isBoundary(offset: int): boolean; } /** @@ -2800,7 +2806,7 @@ declare namespace i18n { * * @permission ohos.permission.UPDATE_CONFIGURATION * @param { string } language - Preferred language to add. - * @param { number } [index] - Position to which the preferred language is added. The default value is the length of + * @param { int } [index] - Position to which the preferred language is added. The default value is the length of * the preferred language list. * @returns { boolean } true if the operation is successful, and false otherwise. * @syscap SystemCapability.Global.I18n @@ -2808,13 +2814,13 @@ declare namespace i18n { * @deprecated since 9 * @useinstead ohos.i18n/i18n.System#addPreferredLanguage */ - export function addPreferredLanguage(language: string, index?: number): boolean; + export function addPreferredLanguage(language: string, index?: int): boolean; /** * Removes a preferred language from the specified position on the preferred language list. * * @permission ohos.permission.UPDATE_CONFIGURATION - * @param { number } index - Position of the preferred language to delete. + * @param { int } index - Position of the preferred language to delete. * @returns { boolean } Whether the operation is successful. The value "true" indicates that the operation is * successful, and the value "false" indicates the opposite. * @syscap SystemCapability.Global.I18n @@ -2822,7 +2828,7 @@ declare namespace i18n { * @deprecated since 9 * @useinstead ohos.i18n/i18n.System#removePreferredLanguage */ - export function removePreferredLanguage(index: number): boolean; + export function removePreferredLanguage(index: int): boolean; /** * Obtains the list of preferred languages. @@ -2952,14 +2958,14 @@ declare namespace i18n { /** * Get the raw offset of the TimeZone object. * - * @returns { number } a number represents the raw offset. + * @returns { int } a number represents the raw offset. * @syscap SystemCapability.Global.I18n * @since 7 */ /** * Get the raw offset of the TimeZone object. * - * @returns { number } a number represents the raw offset. + * @returns { int } a number represents the raw offset. * @syscap SystemCapability.Global.I18n * @crossplatform * @since 10 @@ -2967,27 +2973,27 @@ declare namespace i18n { /** * Obtains the raw offset of the specified time zone. * - * @returns { number } Raw offset of the time zone, in milliseconds. + * @returns { int } Raw offset of the time zone, in milliseconds. * @syscap SystemCapability.Global.I18n * @crossplatform * @atomicservice * @since 12 */ - getRawOffset(): number; + getRawOffset(): int; /** * Get the offset of the TimeZone object. * - * @param { number } [date] - Indicates a date use to compute offset. - * @returns { number } a number represents the offset with date. + * @param { double } [date] - Indicates a date use to compute offset. + * @returns { int } a number represents the offset with date. * @syscap SystemCapability.Global.I18n * @since 7 */ /** * Get the offset of the TimeZone object. * - * @param { number } [date] - Indicates a date use to compute offset. - * @returns { number } a number represents the offset with date. + * @param { double } [date] - Indicates a date use to compute offset. + * @returns { int } a number represents the offset with date. * @syscap SystemCapability.Global.I18n * @crossplatform * @since 10 @@ -2995,15 +3001,15 @@ declare namespace i18n { /** * Obtains the offset of the specified time zone at the specified time. * - * @param { number } [date] - Specified time, in milliseconds. The default value is the system time. - * @returns { number } Time zone offset, in milliseconds. When the DST is used, the time zone offset + * @param { double } [date] - Specified time, in milliseconds. The default value is the system time. + * @returns { int } Time zone offset, in milliseconds. When the DST is used, the time zone offset * is the raw time zone offset plus the DST offset. * @syscap SystemCapability.Global.I18n * @crossplatform * @atomicservice * @since 12 */ - getOffset(date?: number): number; + getOffset(date?: double): int; /** * Get available TimeZone ID list. @@ -3091,8 +3097,8 @@ declare namespace i18n { /** * Get the possible time zones from the specified longitude and latitude. * - * @param { number } longitude value - * @param { number } latitude value + * @param { double } longitude value + * @param { double } latitude value * @returns { Array } Returns a TimeZone array from the specified longitude and latitude. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. * @throws { BusinessError } 890001 - Invalid parameter. Possible causes: Parameter verification failed. @@ -3103,19 +3109,20 @@ declare namespace i18n { /** * Creates an array of TimeZone objects corresponding to the specified location. * - * @param { number } longitude - Longitude. The value range is [-180, 179.9). A positive value is used for east + * @param { double } longitude - Longitude. The value range is [-180, 179.9). A positive value is used for east * longitude and a negative value is used for west longitude. - * @param { number } latitude - Latitude. The value range is [-90, 89.9). A positive value is used for north + * @param { double } latitude - Latitude. The value range is [-90, 89.9). A positive value is used for north * latitude and a negative value is used for south latitude. * @returns { Array } TimeZone objects corresponding to the specified location. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. * @throws { BusinessError } 890001 - Invalid parameter. Possible causes: Parameter verification failed. + * @static * @syscap SystemCapability.Global.I18n * @atomicservice * @since 12 */ - static getTimezonesByLocation(longitude: number, latitude: number): Array; + static getTimezonesByLocation(longitude: double, latitude: double): Array; /** * Get the zone rules object corresponds to the timezone objects. @@ -3139,13 +3146,13 @@ declare namespace i18n { /** * Get the next timezone offset transition after date. * - * @param { number } [ date ] - Indicates milliseconds. + * @param { double } [ date ] - Indicates milliseconds. * @returns { ZoneOffsetTransition } Returns a timezone offset transition after date. * @syscap SystemCapability.Global.I18n * @atomicservice * @since 20 */ - public nextTransition(date?: number): ZoneOffsetTransition; + public nextTransition(date?: double): ZoneOffsetTransition; } /** @@ -3159,32 +3166,32 @@ declare namespace i18n { /** * Obtains the timestamp of the change in the time zone offset. * - * @returns { number } Timestamp of the change in the time zone offset. + * @returns { double } Timestamp of the change in the time zone offset. * @syscap SystemCapability.Global.I18n * @atomicservice * @since 20 */ - public getMilliseconds(): number; + public getMilliseconds(): double; /** * Get the offset after time zone offset trasition. * - * @returns { number } Returns the offset after time zone offset trasition. + * @returns { int } Returns the offset after time zone offset trasition. * @syscap SystemCapability.Global.I18n * @atomicservice * @since 20 */ - public getOffsetAfter(): number; + public getOffsetAfter(): int; /** * Get the offset before time zone offset trasition. * - * @returns { number } Returns the offset before time zone offset trasition. + * @returns { int } Returns the offset before time zone offset trasition. * @syscap SystemCapability.Global.I18n * @atomicservice * @since 20 */ - public getOffsetBefore(): number; + public getOffsetBefore(): int; } /** @@ -3262,14 +3269,14 @@ declare namespace i18n { /** * Enumerates the Normalizer modes. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Global.I18n * @since 10 */ /** * Enumerates text normalization modes. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Global.I18n * @atomicservice * @since 12 @@ -3395,7 +3402,7 @@ declare namespace i18n { /** * Represents the language or country/region suggestion type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Global.I18n * @systemapi Hide this for inner system use. * @since 10 @@ -3563,12 +3570,12 @@ declare namespace i18n { /** * Offset of the time zone ID. * - * @type { number } + * @type { int } * @syscap SystemCapability.Global.I18n * @systemapi Hide this for inner system use. * @since 10 */ - offset: number; + offset: int; /** * Time zone display name in the system locale. @@ -3583,12 +3590,12 @@ declare namespace i18n { /** * Fixed offset of the time zone ID. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @systemapi Hide this for inner system use. * @since 10 */ - rawOffset?: number; + rawOffset?: int; } /** @@ -3721,53 +3728,53 @@ declare namespace i18n { /** * Holiday start year. * - * @type { number } + * @type { int } * @syscap SystemCapability.Global.I18n * @since 11 */ /** * Year of the holiday. * - * @type { number } + * @type { int } * @syscap SystemCapability.Global.I18n * @atomicservice * @since 12 */ - year: number; + year: int; /** * Holiday start month. * - * @type { number } + * @type { int } * @syscap SystemCapability.Global.I18n * @since 11 */ /** * Month of the holiday. * - * @type { number } + * @type { int } * @syscap SystemCapability.Global.I18n * @atomicservice * @since 12 */ - month: number; + month: int; /** * Holiday start day. * - * @type { number } + * @type { int } * @syscap SystemCapability.Global.I18n * @since 11 */ /** * Day of the holiday. * - * @type { number } + * @type { int } * @syscap SystemCapability.Global.I18n * @atomicservice * @since 12 */ - day: number; + day: int; /** * Holiday local name array. @@ -3901,7 +3908,7 @@ declare namespace i18n { /** * Obtains holiday info array for a specified year * - * @param { number } [year] - specified holiday year. If the year is not given, + * @param { int } [year] - specified holiday year. If the year is not given, * the current year is used. * @returns { Array } holiday information array for one year. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. @@ -3912,7 +3919,7 @@ declare namespace i18n { /** * Obtains the holiday information list of the specified year. * - * @param { number } [year] - Specified year, for example, 2023.
The default value is the current year. + * @param { int } [year] - Specified year, for example, 2023.
The default value is the current year. * @returns { Array } Holiday information list. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. @@ -3921,7 +3928,7 @@ declare namespace i18n { * @atomicservice * @since 12 */ - getHolidayInfoItemArray(year?: number): Array; + getHolidayInfoItemArray(year?: int): Array; } /** @@ -3943,36 +3950,36 @@ declare namespace i18n { /** * Entity begin position. * - * @type { number } + * @type { int } * @syscap SystemCapability.Global.I18n * @since 11 */ /** * Start position of the entity in the input string. * - * @type { number } + * @type { int } * @syscap SystemCapability.Global.I18n * @atomicservice * @since 12 */ - begin: number; + begin: int; /** * Entity end position. * - * @type { number } + * @type { int } * @syscap SystemCapability.Global.I18n * @since 11 */ /** * End position of the entity the input string. * - * @type { number } + * @type { int } * @syscap SystemCapability.Global.I18n * @atomicservice * @since 12 */ - end: number; + end: int; /** * Entity type. Field values such as phone_number, date @@ -4180,13 +4187,13 @@ declare namespace i18n { /** * Formats a number. * - * @param { number } value - Number to be formatted. + * @param { double } value - Number to be formatted. * @returns { string } Formatted number. * @syscap SystemCapability.Global.I18n * @atomicservice * @since 18 */ - format(value: number): string; + format(value: double): string; } /** @@ -4225,13 +4232,13 @@ declare namespace i18n { /** * Formats a number as a rich text object. * - * @param { number } value - Number to be formatted. + * @param { double } value - Number to be formatted. * @returns { StyledString } Rich text object after formatting. * @syscap SystemCapability.Global.I18n * @atomicservice * @since 18 */ - format(value: number): StyledString; + format(value: double): StyledString; } /** diff --git a/api/@ohos.intl.d.ts b/api/@ohos.intl.d.ts index 445c96bea5..06133a40b5 100644 --- a/api/@ohos.intl.d.ts +++ b/api/@ohos.intl.d.ts @@ -2952,21 +2952,21 @@ declare namespace intl { /** * Indicates the minimumIntegerDigits. * - * @type { number } + * @type { int } * @syscap SystemCapability.Global.I18n * @since 6 */ /** * Indicates the minimumIntegerDigits. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @since 9 */ /** * Indicates the minimumIntegerDigits. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @crossplatform * @since 10 @@ -2975,35 +2975,35 @@ declare namespace intl { * Minimum number of digits allowed in the integer part of a number. The value ranges from 1 to 21. * The default value is 1. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @crossplatform * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 * @deprecated since 20 * @useinstead Intl.NumberOptions.minimumIntegerDigits + * @arkts 1.1&1.2 */ - minimumIntegerDigits?: number; + minimumIntegerDigits?: int; /** * Indicates the minimumFractionDigits. * - * @type { number } + * @type { int } * @syscap SystemCapability.Global.I18n * @since 6 */ /** * Indicates the minimumFractionDigits. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @since 9 */ /** * Indicates the minimumFractionDigits. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @crossplatform * @since 10 @@ -3012,35 +3012,35 @@ declare namespace intl { * Minimum number of digits in the fraction part of a number. The value ranges from 0 to 20. * The default value is 0. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @crossplatform * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 * @deprecated since 20 * @useinstead Intl.NumberOptions.minimumFractionDigits + * @arkts 1.1&1.2 */ - minimumFractionDigits?: number; + minimumFractionDigits?: int; /** * Indicates the maximumFractionDigits. * - * @type { number } + * @type { int } * @syscap SystemCapability.Global.I18n * @since 6 */ /** * Indicates the maximumFractionDigits. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @since 9 */ /** * Indicates the maximumFractionDigits. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @crossplatform * @since 10 @@ -3049,35 +3049,35 @@ declare namespace intl { * Maximum number of digits in the fraction part of a number. The value ranges from 1 to 21. * The default value is 3. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} + * @atomicservices * @arkts 1.1&1.2 + * @since arkts {'1.1':'12', '1.2':'20'} * @deprecated since 20 * @useinstead Intl.NumberOptions.maximumFractionDigits */ - maximumFractionDigits?: number; + maximumFractionDigits?: int; /** * Indicates the minimumSignificantDigits. * - * @type { number } + * @type { int } * @syscap SystemCapability.Global.I18n * @since 6 */ /** * Indicates the minimumSignificantDigits. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @since 9 */ /** * Indicates the minimumSignificantDigits. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @crossplatform * @since 10 @@ -3085,35 +3085,35 @@ declare namespace intl { /** * Minimum number of the least significant digits. The value ranges from 1 to 21. The default value is 1. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @crossplatform * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 * @deprecated since 20 * @useinstead Intl.NumberOptions.minimumSignificantDigits + * @arkts 1.1&1.2 */ - minimumSignificantDigits?: number; + minimumSignificantDigits?: int; /** * Indicates the maximumSignificantDigits. * - * @type { number } + * @type { int } * @syscap SystemCapability.Global.I18n * @since 6 */ /** * Indicates the maximumSignificantDigits. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @since 9 */ /** * Indicates the maximumSignificantDigits. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @crossplatform * @since 10 @@ -3121,16 +3121,16 @@ declare namespace intl { /** * Maximum number of the least significant digits. The value ranges from 1 to 21. The default value is 21. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @crossplatform * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 * @deprecated since 20 * @useinstead Intl.NumberOptions.maximumSignificantDigits + * @arkts 1.1&1.2 */ - maximumSignificantDigits?: number; + maximumSignificantDigits?: int; /** * Rounding priority used when both the maximum number of fraction digits and the maximum number of valid digits @@ -3151,14 +3151,14 @@ declare namespace intl { * Rounding increment. The value can be: 1, 2, 5, 10, 20, 25, 50, 100, 200, 250, 500, 1000, 2000, 2500, or 5000. * The default value is 1. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @atomicservice * @since 18 * @deprecated since 20 * @useinstead Intl.NumberOptions.roundingIncrement */ - roundingIncrement?: number; + roundingIncrement?: int; /** * Rounding mode. The value can be: @@ -3277,7 +3277,7 @@ declare namespace intl { /** * Obtains the formatted number string. * - * @param { number } number Indicates the number to be formatted. + * @param { double } number Indicates the number to be formatted. * @returns { string } a number string formatted based on the specified locale. * @syscap SystemCapability.Global.I18n * @since 6 @@ -3285,7 +3285,7 @@ declare namespace intl { /** * Obtains the formatted number string. * - * @param { number } number Indicates the number to be formatted. + * @param { double } number Indicates the number to be formatted. * @returns { string } a number string formatted based on the specified locale. * @syscap SystemCapability.Global.I18n * @crossplatform @@ -3294,23 +3294,23 @@ declare namespace intl { /** * Formats a number. * - * @param { number } number - Number to be formatted. + * @param { double } number - Number to be formatted. * @returns { string } Formatted number. * @syscap SystemCapability.Global.I18n * @crossplatform * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 * @deprecated since 20 * @useinstead Intl.NumberFormat.format + * @arkts 1.1&1.2 */ - format(number: number): string; + format(number: double): string; /** * Formats a number range. * - * @param { number } startRange - Start number. - * @param { number } endRange - End number. + * @param { double } startRange - Start number. + * @param { double } endRange - End number. * @returns { string } Formatted number range. * @syscap SystemCapability.Global.I18n * @atomicservice @@ -3318,7 +3318,7 @@ declare namespace intl { * @deprecated since 20 * @useinstead Intl.NumberFormat.formatRange */ - formatRange(startRange: number, endRange: number): string; + formatRange(startRange: double, endRange: double): string; /** * Obtains the options of the NumberFormat object. @@ -3743,7 +3743,7 @@ declare namespace intl { * * @param { string } first - The first string to compare. * @param { string } second - The second string to compare. - * @returns { number } a number indicating how first compare to second: + * @returns { int } a number indicating how first compare to second: * a negative value if string1 comes before string2; * a positive value if string1 comes after string2; * 0 if they are considered equal. @@ -3755,7 +3755,7 @@ declare namespace intl { * * @param { string } first - The first string to compare. * @param { string } second - The second string to compare. - * @returns { number } a number indicating how first compare to second: + * @returns { int } a number indicating how first compare to second: * a negative value if string1 comes before string2; * a positive value if string1 comes after string2; * 0 if they are considered equal. @@ -3768,7 +3768,7 @@ declare namespace intl { * * @param { string } first - First string to compare. * @param { string } second - Second string to compare. - * @returns { number } Comparison result. If the value is a negative number, the first string comes before the + * @returns { int } Comparison result. If the value is a negative number, the first string comes before the * second string. If the value is 0, the first and second strings are in the same sequence. * If the value is a positive number, the first string is comes after the second string. * @syscap SystemCapability.Global.I18n @@ -3778,7 +3778,7 @@ declare namespace intl { * @deprecated since 20 * @useinstead Intl.Collator.compare */ - compare(first: string, second: string): number; + compare(first: string, second: string): int; /** * Returns a new object with properties that reflect the locale and collation options computed @@ -3914,7 +3914,7 @@ declare namespace intl { * The minimum number of integer digits to use. * Possible values are from 1 to 21; the default is 1. * - * @type { number } + * @type { int } * @syscap SystemCapability.Global.I18n * @since 8 */ @@ -3922,7 +3922,7 @@ declare namespace intl { * The minimum number of integer digits to use. * Possible values are from 1 to 21; the default is 1. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @since 9 */ @@ -3930,7 +3930,7 @@ declare namespace intl { * The minimum number of integer digits to use. * Possible values are from 1 to 21; the default is 1. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @crossplatform * @since 10 @@ -3939,7 +3939,7 @@ declare namespace intl { * Minimum number of digits allowed in the integer part of a number. The value ranges from 1 to 21. * The default value is 1. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @crossplatform * @atomicservice @@ -3947,13 +3947,13 @@ declare namespace intl { * @deprecated since 20 * @useinstead Intl.PluralRulesOptions.minimumIntegerDigits */ - minimumIntegerDigits?: number; + minimumIntegerDigits?: int; /** * The minimum number of fraction digits to use. * Possible values are from 0 to 20; the default for plain number and percent formatting is 0; * - * @type { number } + * @type { int } * @syscap SystemCapability.Global.I18n * @since 8 */ @@ -3961,7 +3961,7 @@ declare namespace intl { * The minimum number of fraction digits to use. * Possible values are from 0 to 20; the default for plain number and percent formatting is 0; * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @since 9 */ @@ -3969,7 +3969,7 @@ declare namespace intl { * The minimum number of fraction digits to use. * Possible values are from 0 to 20; the default for plain number and percent formatting is 0; * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @crossplatform * @since 10 @@ -3978,7 +3978,7 @@ declare namespace intl { * Minimum number of digits in the fraction part of a number. The value ranges from 0 to 20. * The default value is 0. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @crossplatform * @atomicservice @@ -3986,14 +3986,14 @@ declare namespace intl { * @deprecated since 20 * @useinstead Intl.PluralRulesOptions.minimumFractionDigits */ - minimumFractionDigits?: number; + minimumFractionDigits?: int; /** * The maximum number of fraction digits to use. * Possible values are from 0 to 20; * the default for plain number formatting is the larger of minimumFractionDigits and 3; * - * @type { number } + * @type { int } * @syscap SystemCapability.Global.I18n * @since 8 */ @@ -4002,7 +4002,7 @@ declare namespace intl { * Possible values are from 0 to 20; * the default for plain number formatting is the larger of minimumFractionDigits and 3; * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @since 9 */ @@ -4011,7 +4011,7 @@ declare namespace intl { * Possible values are from 0 to 20; * the default for plain number formatting is the larger of minimumFractionDigits and 3; * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @crossplatform * @since 10 @@ -4020,7 +4020,7 @@ declare namespace intl { * Maximum number of digits in the fraction part of a number. The value ranges from 1 to 21. * The default value is 3. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @crossplatform * @atomicservice @@ -4028,13 +4028,13 @@ declare namespace intl { * @deprecated since 20 * @useinstead Intl.PluralRulesOptions.maximumFractionDigits */ - maximumFractionDigits?: number; + maximumFractionDigits?: int; /** * The minimum number of significant digits to use. * Possible values are from 1 to 21; the default is 1. * - * @type { number } + * @type { int } * @syscap SystemCapability.Global.I18n * @since 8 */ @@ -4042,7 +4042,7 @@ declare namespace intl { * The minimum number of significant digits to use. * Possible values are from 1 to 21; the default is 1. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @since 9 */ @@ -4050,7 +4050,7 @@ declare namespace intl { * The minimum number of significant digits to use. * Possible values are from 1 to 21; the default is 1. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @crossplatform * @since 10 @@ -4058,7 +4058,7 @@ declare namespace intl { /** * Minimum number of the least significant digits. The value ranges from 1 to 21. The default value is 1. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @crossplatform * @atomicservice @@ -4066,13 +4066,13 @@ declare namespace intl { * @deprecated since 20 * @useinstead Intl.PluralRulesOptions.minimumSignificantDigits */ - minimumSignificantDigits?: number; + minimumSignificantDigits?: int; /** * The maximum number of significant digits to use. * Possible values are from 1 to 21; the default is 21. * - * @type { number } + * @type { int } * @syscap SystemCapability.Global.I18n * @since 8 */ @@ -4080,7 +4080,7 @@ declare namespace intl { * The maximum number of significant digits to use. * Possible values are from 1 to 21; the default is 21. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @since 9 */ @@ -4088,7 +4088,7 @@ declare namespace intl { * The maximum number of significant digits to use. * Possible values are from 1 to 21; the default is 21. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @crossplatform * @since 10 @@ -4096,7 +4096,7 @@ declare namespace intl { /** * Maximum number of the least significant digits. The value ranges from 1 to 21. The default value is 21. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Global.I18n * @crossplatform * @atomicservice @@ -4104,7 +4104,7 @@ declare namespace intl { * @deprecated since 20 * @useinstead Intl.PluralRulesOptions.maximumSignificantDigits */ - maximumSignificantDigits?: number; + maximumSignificantDigits?: int; } /** @@ -4191,7 +4191,7 @@ declare namespace intl { /** * Returns a string indicating which plural rule to use for locale-aware formatting. * - * @param { number } n - The number to get a plural rule for. + * @param { double } n - The number to get a plural rule for. * @returns { string } A string representing the pluralization category of the number, * can be one of zero, one, two, few, many or other. * @syscap SystemCapability.Global.I18n @@ -4200,7 +4200,7 @@ declare namespace intl { /** * Returns a string indicating which plural rule to use for locale-aware formatting. * - * @param { number } n - The number to get a plural rule for. + * @param { double } n - The number to get a plural rule for. * @returns { string } A string representing the pluralization category of the number, * can be one of zero, one, two, few, many or other. * @syscap SystemCapability.Global.I18n @@ -4210,7 +4210,7 @@ declare namespace intl { /** * Obtains the singular-plural type of the specified number. * - * @param { number } n - Number for which the singular-plural type is to be obtained. + * @param { double } n - Number for which the singular-plural type is to be obtained. * @returns { string } Singular-plural type. The value can be any of the following: "zero", "one", "two", "few", * "many", "others". For details about the meanings of different values, see * [Language Plural Rules](https://www.unicode.org/cldr/charts/45/supplemental/language_plural_rules.html). @@ -4221,7 +4221,7 @@ declare namespace intl { * @deprecated since 20 * @useinstead Intl.PluralRules.select */ - select(n: number): string; + select(n: double): string; } /** @@ -4591,7 +4591,7 @@ declare namespace intl { /** * formats a value and unit according to the locale and formatting options of this object. * - * @param { number } value - Numeric value to use in the internationalized relative time message. + * @param { double } value - Numeric value to use in the internationalized relative time message. * @param { string } unit - Unit to use in the relative time internationalized message. * Possible values are: year, quarter, month, week, day, hour, minute, second. * @returns { string } formatted language-sensitive relative time. @@ -4601,7 +4601,7 @@ declare namespace intl { /** * formats a value and unit according to the locale and formatting options of this object. * - * @param { number } value - Numeric value to use in the internationalized relative time message. + * @param { double } value - Numeric value to use in the internationalized relative time message. * @param { string } unit - Unit to use in the relative time internationalized message. * Possible values are: year, quarter, month, week, day, hour, minute, second. * @returns { string } formatted language-sensitive relative time. @@ -4612,7 +4612,7 @@ declare namespace intl { /** * Formats a relative time. * - * @param { number } value - Value to format. + * @param { double } value - Value to format. * @param { string } unit - Unit of the relative time.
The value can be any of the following: "year", "quarter", * "month", "week", "day", "hour", "minute", or "second". * @returns { string } Relative time after formatting. @@ -4623,13 +4623,13 @@ declare namespace intl { * @deprecated since 20 * @useinstead Intl.RelativeTimeFormat.format */ - format(value: number, unit: string): string; + format(value: double, unit: string): string; /** * returns an Array of objects representing the relative time format in parts that can be used for * custom locale-aware formatting * - * @param { number } value - Numeric value to use in the internationalized relative time message. + * @param { double } value - Numeric value to use in the internationalized relative time message. * @param { string } unit - to use in the relative time internationalized message. * Possible values are: year, quarter, month, week, day, hour, minute, second. * @returns { Array } an Array of objects representing the relative time format in parts @@ -4640,7 +4640,7 @@ declare namespace intl { * returns an Array of objects representing the relative time format in parts that can be used for * custom locale-aware formatting * - * @param { number } value - Numeric value to use in the internationalized relative time message. + * @param { double } value - Numeric value to use in the internationalized relative time message. * @param { string } unit - to use in the relative time internationalized message. * Possible values are: year, quarter, month, week, day, hour, minute, second. * @returns { Array } an Array of objects representing the relative time format in parts @@ -4651,7 +4651,7 @@ declare namespace intl { /** * Formats the relative time. * - * @param { number } value - Value to format. + * @param { double } value - Value to format. * @param { string } unit - Unit of the relative time.
The value can be any of the following: "year", "quarter", * "month", "week", "day", "hour", "minute", or "second". * @returns { Array } to parts. @@ -4662,7 +4662,7 @@ declare namespace intl { * @deprecated since 20 * @useinstead Intl.RelativeTimeFormat.formatToParts */ - formatToParts(value: number, unit: string): Array; + formatToParts(value: double, unit: string): Array; /** * Returns a new object with properties that reflect the locale and formatting options computed during -- Gitee From c325d9512c62c3b42bd865f87bc6b5d82bb6bb05 Mon Sep 17 00:00:00 2001 From: wangzhiyusss Date: Sat, 28 Jun 2025 10:36:12 +0800 Subject: [PATCH 019/746] =?UTF-8?q?=E4=BF=AE=E6=94=B9float=E4=B8=BAlong?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangzhiyusss --- build-tools/intToNumber.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-tools/intToNumber.js b/build-tools/intToNumber.js index 89c687e3b1..d3f072408e 100644 --- a/build-tools/intToNumber.js +++ b/build-tools/intToNumber.js @@ -18,7 +18,7 @@ const fs = require('fs'); const path = require('path'); const commander = require('commander'); -const typeArray = ['float', 'double', 'int']; +const typeArray = ['long', 'double', 'int']; let inputDir = ''; let outputDir = ''; @@ -242,7 +242,7 @@ function parseJSDocVisitEachChild1(context, node, content) { if (!doc.tags) { return; } - if (/(float|double|int)/g.test(doc.getText())) { + if (/(long|double|int)/g.test(doc.getText())) { jsDocNodeForeach(doc.tags); } }); -- Gitee From a343c55c65d2f73d75e2cd7eda0b0fad0b42b4ab Mon Sep 17 00:00:00 2001 From: wangzhiyusss Date: Mon, 30 Jun 2025 19:54:58 +0800 Subject: [PATCH 020/746] =?UTF-8?q?=E4=BC=98=E5=8C=96int=E8=BD=ACnumber?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangzhiyusss --- build-tools/intToNumber.js | 47 +++++++++++++++----------------------- 1 file changed, 18 insertions(+), 29 deletions(-) diff --git a/build-tools/intToNumber.js b/build-tools/intToNumber.js index d3f072408e..5b3a4d317c 100644 --- a/build-tools/intToNumber.js +++ b/build-tools/intToNumber.js @@ -114,7 +114,7 @@ function tsTransform(utFiles, callback) { target: ts.ScriptTarget.ES2017, }, fileName: fileName, - transformers: { before: [callback(url, content)] } + transformers: { before: [callback(url)] } }); } else { const outputPath = replaceInputDirWithOutputDir(url, inputDir, outputDir); @@ -168,9 +168,7 @@ function recursionAstCallback2(url) { node = processVisitEachChild2(context, sourceFile); const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed }); const result = printer.printNode(ts.EmitHint.Unspecified, node, sourceFile); - const outputPath = replaceInputDirWithOutputDir(url, inputDir, outputDir); - ensureDirectoryExists(outputPath); - fs.writeFileSync(outputPath, result); + fs.writeFileSync(url, result); return ts.factory.createSourceFile([], ts.SyntaxKind.EndOfFileToken, ts.NodeFlags.None); }; }; @@ -182,13 +180,12 @@ function recursionAstCallback2(url) { * @param {string} url 文件路径 * @returns {Function} */ -function parseJSDocCallback(url, content) { +function parseJSDocCallback(url) { return (context) => { return (sourceFile) => { - node = parseJSDocVisitEachChild1(context, sourceFile, content); - const outputPath = replaceInputDirWithOutputDir(url, inputDir, outputDir); - ensureDirectoryExists(outputPath); - fs.writeFileSync(outputPath, jsDocContent); + node = parseJSDocVisitEachChild1(context, sourceFile); + changeContent(tagDataList); + fs.writeFileSync(url, jsDocContent); return ts.factory.createSourceFile([], ts.SyntaxKind.EndOfFileToken, ts.NodeFlags.None); }; }; @@ -200,14 +197,13 @@ function parseJSDocCallback(url, content) { * @param {string} url 文件路径 * @returns {Function} */ -function parseJSDocCallback2(url, content) { +function parseJSDocCallback2(url) { return (context) => { return (sourceFile) => { const contents = fs.readFileSync(url, 'utf-8'); node = parseJSDocVisitEachChild2(context, sourceFile, contents); - const outputPath = replaceInputDirWithOutputDir(url, inputDir, outputDir); - ensureDirectoryExists(outputPath); - fs.writeFileSync(outputPath, jsDocContent); + changeContent(tagDataList); + fs.writeFileSync(url, jsDocContent); return ts.factory.createSourceFile([], ts.SyntaxKind.EndOfFileToken, ts.NodeFlags.None); }; }; @@ -219,7 +215,7 @@ function parseJSDocCallback2(url, content) { * @param {node} 解下过后的节点 * @returns ts.node */ -function parseJSDocVisitEachChild1(context, node, content) { +function parseJSDocVisitEachChild1(context, node) { return ts.visitEachChild(node, processAllNodes, context); function processAllNodes(node) { if (node.jsDoc) { @@ -234,7 +230,7 @@ function parseJSDocVisitEachChild1(context, node, content) { } const typeExpr = tag.typeExpression; const newTypeExpr = parseTypeExpr(typeExpr); - applJSDocTransformations(typeExpr.type, newTypeExpr, content, tagDataList); + applJSDocTransformations(typeExpr.type, newTypeExpr, tagDataList); }); } function processAllNodesJSDoc(jsDocNode) { @@ -277,7 +273,7 @@ function parseJSDocVisitEachChild1(context, node, content) { * @param {newTypeExpr} 新typeExpr * @param {content} 文本内容 */ -function applJSDocTransformations(typeExpr, newTypeExpr, content, tagDataList) { +function applJSDocTransformations(typeExpr, newTypeExpr, tagDataList) { const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed }); const finalContent = printer.printNode(ts.EmitHint.Unspecified, newTypeExpr); if (finalContent.includes('number')) { @@ -287,7 +283,6 @@ function applJSDocTransformations(typeExpr, newTypeExpr, content, tagDataList) { convertedText: finalContent }; tagDataList.push(data); - changeContent(content, tagDataList); } } @@ -297,15 +292,13 @@ function applJSDocTransformations(typeExpr, newTypeExpr, content, tagDataList) { * @param {newTypeExpr} 新typeExpr * @param {content} 文本内容 */ -function changeContent(content, tagDataList) { +function changeContent(tagDataList) { tagDataList.sort((a, b) => b.pos - a.pos); - let result = content; for (const data of tagDataList) { - const before = result.substring(0, data.pos); - const after = result.substring(data.end); - result = before + ` ${data.convertedText}` + after; + const before = jsDocContent.substring(0, data.pos); + const after = jsDocContent.substring(data.end); + jsDocContent = before + ` ${data.convertedText}` + after; } - jsDocContent = result; } /** @@ -314,8 +307,7 @@ function changeContent(content, tagDataList) { * @param {node} 解下过后的节点 * @returns ts.node */ -function parseJSDocVisitEachChild2(context, node, content) { - const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed }); +function parseJSDocVisitEachChild2(context, node) { return ts.visitEachChild(node, processAllNodes, context); function processAllNodes(node) { if (node.jsDoc) { @@ -342,10 +334,7 @@ function parseJSDocVisitEachChild2(context, node, content) { function writeDataToFile(tag) { const typeExpr = tag.typeExpression; const newTypeExpr = parseTypeExpression(typeExpr.type); - const finalContent = printer.printNode(ts.EmitHint.Unspecified, newTypeExpr); - const before = content.substring(0, typeExpr.type.pos); - const after = content.substring(typeExpr.type.end); - jsDocContent = before + ` ${finalContent}` + after; + applJSDocTransformations(typeExpr.type, newTypeExpr, tagDataList); } function parseTypeExpression(node) { if (ts.isUnionTypeNode(node)) { -- Gitee From 13cb2b471fc70241d9669cebf291b6463465ecdd Mon Sep 17 00:00:00 2001 From: wangzhiyusss Date: Wed, 2 Jul 2025 09:51:49 +0000 Subject: [PATCH 021/746] update build-tools/intToNumber.js. Signed-off-by: wangzhiyusss --- build-tools/intToNumber.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-tools/intToNumber.js b/build-tools/intToNumber.js index 5b3a4d317c..37c448abb1 100644 --- a/build-tools/intToNumber.js +++ b/build-tools/intToNumber.js @@ -437,7 +437,7 @@ function processVisitEachChild2(context, node) { return ts.visitEachChild(node, processAllNodes, context); function processAllNodes(node) { if (ts.isUnionTypeNode(node)) { - apiDuplicateRemoval(node); + node = apiDuplicateRemoval(node); } if (ts.isStructDeclaration(node)) { node = processStructDeclaration(node); @@ -457,6 +457,7 @@ function processVisitEachChild2(context, node) { } }); node = ts.factory.updateUnionTypeNode(node, newTypes); + return node; } } -- Gitee From 5ebeb2ec4700d6021a47091ddebb3e8107c1f9de Mon Sep 17 00:00:00 2001 From: gaosix Date: Mon, 7 Jul 2025 17:06:04 +0800 Subject: [PATCH 022/746] =?UTF-8?q?=E5=AE=9A=E5=88=B6=E9=9D=99=E6=80=81?= =?UTF-8?q?=E5=8C=96=E5=9B=9E=E5=90=880702=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gaosix --- api/@ohos.configPolicy.d.ts | 61 ++++++++++++----------- api/@ohos.customization.customConfig.d.ts | 5 +- 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/api/@ohos.configPolicy.d.ts b/api/@ohos.configPolicy.d.ts index 30a15b2ab8..2bffaa511e 100644 --- a/api/@ohos.configPolicy.d.ts +++ b/api/@ohos.configPolicy.d.ts @@ -16,6 +16,7 @@ /** * @file * @kit BasicServicesKit + * @arkts 1.1&1.2 */ import { AsyncCallback } from './@ohos.base'; @@ -26,7 +27,7 @@ import { AsyncCallback } from './@ohos.base'; * @namespace configPolicy * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} */ declare namespace configPolicy { /** @@ -35,7 +36,7 @@ declare namespace configPolicy { * @enum { number } * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} */ export enum FollowXMode { /** @@ -43,7 +44,7 @@ declare namespace configPolicy { * * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} */ DEFAULT = 0, @@ -52,7 +53,7 @@ declare namespace configPolicy { * * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} */ NO_RULE_FOLLOWED = 1, @@ -61,7 +62,7 @@ declare namespace configPolicy { * * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} */ SIM_DEFAULT = 10, @@ -70,7 +71,7 @@ declare namespace configPolicy { * * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} */ SIM_1 = 11, @@ -79,7 +80,7 @@ declare namespace configPolicy { * * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} */ SIM_2 = 12, @@ -89,7 +90,7 @@ declare namespace configPolicy { * * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} */ USER_DEFINED = 100 } @@ -103,9 +104,9 @@ declare namespace configPolicy { *
2.Incorrect parameter types. * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} */ - function getOneCfgFile(relPath: string, callback: AsyncCallback); + function getOneCfgFile(relPath: string, callback: AsyncCallback): void; /** * Gets the file from the highest priority config path containing the given file name in follow mode. @@ -117,9 +118,9 @@ declare namespace configPolicy { *
2.Incorrect parameter types. * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} */ - function getOneCfgFile(relPath: string, followMode: FollowXMode, callback: AsyncCallback); + function getOneCfgFile(relPath: string, followMode: FollowXMode, callback: AsyncCallback): void; /** * Gets the file from the highest priority config path containing the given file name in follow mode. @@ -132,9 +133,9 @@ declare namespace configPolicy { *
2.Incorrect parameter types. * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} */ - function getOneCfgFile(relPath: string, followMode: FollowXMode, extra: string, callback: AsyncCallback); + function getOneCfgFile(relPath: string, followMode: FollowXMode, extra: string, callback: AsyncCallback): void; /** * Gets the file from the highest priority config path containing the given file name. @@ -145,7 +146,7 @@ declare namespace configPolicy { *
2.Incorrect parameter types. * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} */ function getOneCfgFile(relPath: string): Promise; @@ -160,7 +161,7 @@ declare namespace configPolicy { *
2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} */ function getOneCfgFile(relPath: string, followMode: FollowXMode, extra?: string): Promise; @@ -175,7 +176,7 @@ declare namespace configPolicy { *
2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} */ function getOneCfgFileSync(relPath: string, followMode?: FollowXMode, extra?: string): string; @@ -188,9 +189,9 @@ declare namespace configPolicy { *
2.Incorrect parameter types. * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} */ - function getCfgFiles(relPath: string, callback: AsyncCallback>); + function getCfgFiles(relPath: string, callback: AsyncCallback>): void; /** * Gets the config files in device architecture in follow mode, ordered by priority from low to high. @@ -202,9 +203,9 @@ declare namespace configPolicy { *
2.Incorrect parameter types. * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} */ - function getCfgFiles(relPath: string, followMode: FollowXMode, callback: AsyncCallback>); + function getCfgFiles(relPath: string, followMode: FollowXMode, callback: AsyncCallback>): void; /** * Gets the config files in device architecture in follow mode, ordered by priority from low to high. @@ -217,9 +218,9 @@ declare namespace configPolicy { *
2.Incorrect parameter types. * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} */ - function getCfgFiles(relPath: string, followMode: FollowXMode, extra: string, callback: AsyncCallback>); + function getCfgFiles(relPath: string, followMode: FollowXMode, extra: string, callback: AsyncCallback>): void; /** * Gets the config files in device architecture, ordered by priority from low to high. @@ -230,7 +231,7 @@ declare namespace configPolicy { *
2.Incorrect parameter types. * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} */ function getCfgFiles(relPath: string): Promise>; @@ -245,7 +246,7 @@ declare namespace configPolicy { *
2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} */ function getCfgFiles(relPath: string, followMode: FollowXMode, extra?: string): Promise>; @@ -260,7 +261,7 @@ declare namespace configPolicy { *
2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} */ function getCfgFilesSync(relPath: string, followMode?: FollowXMode, extra?: string): Array; @@ -272,9 +273,9 @@ declare namespace configPolicy { *
2.Incorrect parameter types. * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} */ - function getCfgDirList(callback: AsyncCallback>); + function getCfgDirList(callback: AsyncCallback>): void; /** * Gets the config directory in the device architecture, ordered by priority from low to high. @@ -291,7 +292,7 @@ declare namespace configPolicy { * @returns { Promise> } the promise returns the list of configuration level directories. * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} */ function getCfgDirList(): Promise>; @@ -310,7 +311,7 @@ declare namespace configPolicy { * @returns { Array } the list of configuration level directories. * @syscap SystemCapability.Customization.ConfigPolicy * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} */ function getCfgDirListSync(): Array; } diff --git a/api/@ohos.customization.customConfig.d.ts b/api/@ohos.customization.customConfig.d.ts index 2717e05114..0dfc711b0c 100644 --- a/api/@ohos.customization.customConfig.d.ts +++ b/api/@ohos.customization.customConfig.d.ts @@ -16,6 +16,7 @@ /** * @file * @kit BasicServicesKit + * @arkts 1.1&1.2 */ /** @@ -31,7 +32,7 @@ * @namespace customConfig * @syscap SystemCapability.Customization.CustomConfig * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} */ declare namespace customConfig { @@ -48,7 +49,7 @@ declare namespace customConfig { * @returns { string } the channelId or empty if not exist. * @syscap SystemCapability.Customization.CustomConfig * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} */ function getChannelId(): string; -- Gitee From 3fd3de5ec4a8b98956a46638cf759279245a7bcc Mon Sep 17 00:00:00 2001 From: tan-qingliu Date: Sat, 28 Jun 2025 15:10:00 +0800 Subject: [PATCH 023/746] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=94=AF=E6=8C=81arkts1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tan-qingliu --- api/@ohos.security.certManager.d.ts | 353 ++++++++++++++-------- api/@ohos.security.certManagerDialog.d.ts | 81 +++-- 2 files changed, 286 insertions(+), 148 deletions(-) diff --git a/api/@ohos.security.certManager.d.ts b/api/@ohos.security.certManager.d.ts index 1ff0fe378b..43121e90d2 100644 --- a/api/@ohos.security.certManager.d.ts +++ b/api/@ohos.security.certManager.d.ts @@ -25,22 +25,25 @@ import type { AsyncCallback } from './@ohos.base'; * * @namespace certificateManager * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace certificateManager { /** * Enum for result code * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum CMErrorCode { /** * Indicates that the application has no permission to call the API. * * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_ERROR_NO_PERMISSION = 201, @@ -49,7 +52,8 @@ declare namespace certificateManager { * * @syscap SystemCapability.Security.CertificateManager * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_ERROR_NOT_SYSTEM_APP = 202, @@ -57,7 +61,8 @@ declare namespace certificateManager { * Indicates that the input parameters are invalid. * * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_ERROR_INVALID_PARAMS = 401, @@ -66,7 +71,8 @@ declare namespace certificateManager { *
2. Memory operation error; 3. File operation error. * * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_ERROR_GENERIC = 17500001, @@ -74,7 +80,8 @@ declare namespace certificateManager { * Indicates that the certificate does not exist. * * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_ERROR_NO_FOUND = 17500002, @@ -82,7 +89,8 @@ declare namespace certificateManager { * Indicates that the keystore is in an invalid format or the keystore password is incorrect. * * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_ERROR_INCORRECT_FORMAT = 17500003, @@ -90,7 +98,8 @@ declare namespace certificateManager { * Indicates that the number of certificates or credentials reaches the maximum allowed. * * @syscap SystemCapability.Security.CertificateManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_ERROR_MAX_CERT_COUNT_REACHED = 17500004, @@ -98,7 +107,8 @@ declare namespace certificateManager { * Indicates that the application is not authorized by the user. * * @syscap SystemCapability.Security.CertificateManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_ERROR_NO_AUTHORIZATION = 17500005, @@ -106,7 +116,8 @@ declare namespace certificateManager { * Indicates that the device enters advanced security mode. * * @syscap SystemCapability.Security.CertificateManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_ERROR_DEVICE_ENTER_ADVSECMODE = 17500007, @@ -124,7 +135,8 @@ declare namespace certificateManager { * * @typedef CertInfo * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface CertInfo { /** @@ -132,7 +144,8 @@ declare namespace certificateManager { * * @type { string } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ uri: string; @@ -141,7 +154,8 @@ declare namespace certificateManager { * * @type { string } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ certAlias: string; @@ -150,7 +164,8 @@ declare namespace certificateManager { * * @type { boolean } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ state: boolean; @@ -159,7 +174,8 @@ declare namespace certificateManager { * * @type { string } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ issuerName: string; @@ -168,7 +184,8 @@ declare namespace certificateManager { * * @type { string } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ subjectName: string; @@ -177,7 +194,8 @@ declare namespace certificateManager { * * @type { string } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ serial: string; @@ -186,7 +204,8 @@ declare namespace certificateManager { * * @type { string } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ notBefore: string; @@ -195,7 +214,8 @@ declare namespace certificateManager { * * @type { string } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ notAfter: string; @@ -204,7 +224,8 @@ declare namespace certificateManager { * * @type { string } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ fingerprintSha256: string; @@ -213,7 +234,8 @@ declare namespace certificateManager { * * @type { Uint8Array } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ cert: Uint8Array; } @@ -223,7 +245,8 @@ declare namespace certificateManager { * * @typedef CertAbstract * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface CertAbstract { /** @@ -231,7 +254,8 @@ declare namespace certificateManager { * * @type { string } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ uri: string; @@ -240,7 +264,8 @@ declare namespace certificateManager { * * @type { string } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ certAlias: string; @@ -249,7 +274,8 @@ declare namespace certificateManager { * * @type { boolean } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ state: boolean; @@ -258,7 +284,8 @@ declare namespace certificateManager { * * @type { string } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ subjectName: string; } @@ -268,7 +295,8 @@ declare namespace certificateManager { * * @typedef Credential * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface Credential { /** @@ -276,7 +304,8 @@ declare namespace certificateManager { * * @type { string } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ type: string; @@ -285,7 +314,8 @@ declare namespace certificateManager { * * @type { string } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ alias: string; @@ -294,34 +324,38 @@ declare namespace certificateManager { * * @type { string } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ keyUri: string; /** * Indicates the number of certificates included in the credential. * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - certNum: number; + certNum: int; /** * Indicates the number of key included in the credential. * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - keyNum: number; + keyNum: int; /** * Indicates the credential binary data. * * @type { Uint8Array } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ credentialData: Uint8Array; } @@ -331,7 +365,8 @@ declare namespace certificateManager { * * @typedef CredentialAbstract * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface CredentialAbstract { /** @@ -339,7 +374,8 @@ declare namespace certificateManager { * * @type { string } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ type: string; @@ -348,7 +384,8 @@ declare namespace certificateManager { * * @type { string } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ alias: string; @@ -357,7 +394,8 @@ declare namespace certificateManager { * * @type { string } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ keyUri: string; } @@ -367,7 +405,8 @@ declare namespace certificateManager { * * @typedef CMResult * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface CMResult { /** @@ -375,7 +414,8 @@ declare namespace certificateManager { * * @type { ?Array } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ certList?: Array; @@ -384,7 +424,8 @@ declare namespace certificateManager { * * @type { ?CertInfo } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ certInfo?: CertInfo; @@ -393,7 +434,8 @@ declare namespace certificateManager { * * @type { ?Array } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ credentialList?: Array; @@ -402,7 +444,8 @@ declare namespace certificateManager { * * @type { ?Credential } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ credential?: Credential; @@ -411,7 +454,8 @@ declare namespace certificateManager { * * @type { ?Array } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ appUidList?: Array; @@ -420,7 +464,8 @@ declare namespace certificateManager { * * @type { ?string } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ uri?: string; @@ -429,7 +474,8 @@ declare namespace certificateManager { * * @type { ?Uint8Array } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ outData?: Uint8Array; } @@ -437,16 +483,18 @@ declare namespace certificateManager { /** * Enum for Key Purpose * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum CmKeyPurpose { /** * Indicates that key for signature. * * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_KEY_PURPOSE_SIGN = 4, @@ -454,7 +502,8 @@ declare namespace certificateManager { * Indicates that key for verify. * * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_KEY_PURPOSE_VERIFY = 8 } @@ -462,16 +511,18 @@ declare namespace certificateManager { /** * Enum for Key Digest * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum CmKeyDigest { /** * Indicates that key digest is none. * * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_DIGEST_NONE = 0, @@ -479,7 +530,8 @@ declare namespace certificateManager { * Indicates that key digest is md5. * * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_DIGEST_MD5 = 1, @@ -487,7 +539,8 @@ declare namespace certificateManager { * Indicates that key digest is sha1. * * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_DIGEST_SHA1 = 2, @@ -495,7 +548,8 @@ declare namespace certificateManager { * Indicates that key digest is sha224. * * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_DIGEST_SHA224 = 3, @@ -503,7 +557,8 @@ declare namespace certificateManager { * Indicates that key digest is sha256. * * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_DIGEST_SHA256 = 4, @@ -511,7 +566,8 @@ declare namespace certificateManager { * Indicates that key digest is sha384. * * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_DIGEST_SHA384 = 5, @@ -519,7 +575,8 @@ declare namespace certificateManager { * Indicates that key digest is sha512. * * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_DIGEST_SHA512 = 6, @@ -527,7 +584,8 @@ declare namespace certificateManager { * Indicates that key digest is SM3. * * @syscap SystemCapability.Security.CertificateManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_DIGEST_SM3 = 7 } @@ -535,16 +593,18 @@ declare namespace certificateManager { /** * Enum for Key Padding * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum CmKeyPadding { /** * Indicates that key padding is none. * * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_PADDING_NONE = 0, @@ -552,7 +612,8 @@ declare namespace certificateManager { * Indicates that key padding is PSS. * * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_PADDING_PSS = 1, @@ -560,7 +621,8 @@ declare namespace certificateManager { * Indicates that key padding is PKCS1_V1_5. * * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CM_PADDING_PKCS1_V1_5 = 2 } @@ -570,7 +632,8 @@ declare namespace certificateManager { * * @typedef CMSignatureSpec * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface CMSignatureSpec { /** @@ -578,7 +641,8 @@ declare namespace certificateManager { * * @type { CmKeyPurpose } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ purpose: CmKeyPurpose; @@ -587,7 +651,8 @@ declare namespace certificateManager { * * @type { ?CmKeyPadding } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ padding?: CmKeyPadding; @@ -596,7 +661,8 @@ declare namespace certificateManager { * * @type { ?CmKeyDigest } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ digest?: CmKeyDigest; } @@ -606,7 +672,8 @@ declare namespace certificateManager { * * @typedef CMHandle * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface CMHandle { /** @@ -614,7 +681,8 @@ declare namespace certificateManager { * * @type { Uint8Array } * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ handle: Uint8Array; } @@ -652,7 +720,8 @@ declare namespace certificateManager { * @throws { BusinessError } 17500003 - The keystore is in an invalid format or the keystore password is incorrect. * @throws { BusinessError } 17500004 - The number of certificates or credentials reaches the maximum allowed. * @syscap SystemCapability.Security.CertificateManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function installPrivateCertificate( keystore: Uint8Array, @@ -694,7 +763,8 @@ declare namespace certificateManager { * @throws { BusinessError } 17500003 - The keystore is in an invalid format or the keystore password is incorrect. * @throws { BusinessError } 17500004 - The number of certificates or credentials reaches the maximum allowed. * @syscap SystemCapability.Security.CertificateManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function installPrivateCertificate(keystore: Uint8Array, keystorePwd: string, certAlias: string): Promise; @@ -711,7 +781,8 @@ declare namespace certificateManager { *
2. Memory operation error; 3. File operation error. * @throws { BusinessError } 17500002 - The certificate does not exist. * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function uninstallPrivateCertificate(keyUri: string, callback: AsyncCallback): void; @@ -728,7 +799,8 @@ declare namespace certificateManager { *
2. Memory operation error; 3. File operation error. * @throws { BusinessError } 17500002 - The certificate does not exist. * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function uninstallPrivateCertificate(keyUri: string): Promise; @@ -745,7 +817,8 @@ declare namespace certificateManager { *
2. Memory operation error; 3. File operation error. * @syscap SystemCapability.Security.CertificateManager * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllAppPrivateCertificates(callback: AsyncCallback): void; @@ -760,7 +833,8 @@ declare namespace certificateManager { *
2. Memory operation error; 3. File operation error. * @syscap SystemCapability.Security.CertificateManager * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllAppPrivateCertificates(): Promise; @@ -777,7 +851,8 @@ declare namespace certificateManager { *
2. Memory operation error; 3. File operation error. * @throws { BusinessError } 17500002 - The certificate does not exist. * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getPrivateCertificate(keyUri: string, callback: AsyncCallback): void; @@ -794,7 +869,8 @@ declare namespace certificateManager { *
2. Memory operation error; 3. File operation error. * @throws { BusinessError } 17500002 - The certificate does not exist. * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getPrivateCertificate(keyUri: string): Promise; @@ -829,7 +905,8 @@ declare namespace certificateManager { * @throws { BusinessError } 17500002 - The certificate does not exist. * @throws { BusinessError } 17500005 - The application is not authorized by the user. * @syscap SystemCapability.Security.CertificateManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function init(authUri: string, spec: CMSignatureSpec, callback: AsyncCallback): void; @@ -864,7 +941,8 @@ declare namespace certificateManager { * @throws { BusinessError } 17500002 - The certificate does not exist. * @throws { BusinessError } 17500005 - The application is not authorized by the user. * @syscap SystemCapability.Security.CertificateManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function init(authUri: string, spec: CMSignatureSpec): Promise; @@ -881,7 +959,8 @@ declare namespace certificateManager { * @throws { BusinessError } 17500001 - Internal error. Possible causes: 1. IPC communication failed; *
2. Memory operation error; 3. File operation error. * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function update(handle: Uint8Array, data: Uint8Array, callback: AsyncCallback): void; @@ -898,7 +977,8 @@ declare namespace certificateManager { * @throws { BusinessError } 17500001 - Internal error. Possible causes: 1. IPC communication failed; *
2. Memory operation error; 3. File operation error. * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function update(handle: Uint8Array, data: Uint8Array): Promise; @@ -914,7 +994,8 @@ declare namespace certificateManager { * @throws { BusinessError } 17500001 - Internal error. Possible causes: 1. IPC communication failed; *
2. Memory operation error; 3. File operation error. * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function finish(handle: Uint8Array, callback: AsyncCallback): void; @@ -931,7 +1012,8 @@ declare namespace certificateManager { * @throws { BusinessError } 17500001 - Internal error. Possible causes: 1. IPC communication failed; *
2. Memory operation error; 3. File operation error. * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function finish(handle: Uint8Array, signature: Uint8Array, callback: AsyncCallback): void; @@ -948,7 +1030,8 @@ declare namespace certificateManager { * @throws { BusinessError } 17500001 - Internal error. Possible causes: 1. IPC communication failed; *
2. Memory operation error; 3. File operation error. * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function finish(handle: Uint8Array, signature?: Uint8Array): Promise; @@ -964,7 +1047,8 @@ declare namespace certificateManager { * @throws { BusinessError } 17500001 - Internal error. Possible causes: 1. IPC communication failed; *
2. Memory operation error; 3. File operation error. * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function abort(handle: Uint8Array, callback: AsyncCallback): void; @@ -980,7 +1064,8 @@ declare namespace certificateManager { * @throws { BusinessError } 17500001 - Internal error. Possible causes: 1. IPC communication failed; *
2. Memory operation error; 3. File operation error. * @syscap SystemCapability.Security.CertificateManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function abort(handle: Uint8Array): Promise; @@ -998,7 +1083,8 @@ declare namespace certificateManager { * @throws { BusinessError } 17500002 - The certificate does not exist. * @throws { BusinessError } 17500005 - The application is not authorized by the user. * @syscap SystemCapability.Security.CertificateManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getPublicCertificate(keyUri: string): Promise; @@ -1014,7 +1100,8 @@ declare namespace certificateManager { * @throws { BusinessError } 17500001 - Internal error. Possible causes: 1. IPC communication failed; *
2. Memory operation error; 3. File operation error. * @syscap SystemCapability.Security.CertificateManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function isAuthorizedApp(keyUri: string): Promise; @@ -1027,7 +1114,8 @@ declare namespace certificateManager { * @throws { BusinessError } 17500001 - Internal error. Possible causes: 1. IPC communication failed; *
2. Memory operation error; 3. File operation error. * @syscap SystemCapability.Security.CertificateManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllUserTrustedCertificates(): Promise; @@ -1043,7 +1131,8 @@ declare namespace certificateManager { * @throws { BusinessError } 17500001 - Internal error. Possible causes: 1. IPC communication failed; *
2. Memory operation error; 3. File operation error. * @syscap SystemCapability.Security.CertificateManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllUserTrustedCertificates(scope: CertScope): Promise; @@ -1060,7 +1149,8 @@ declare namespace certificateManager { *
2. Memory operation error; 3. File operation error. * @throws { BusinessError } 17500002 - The certificate does not exist. * @syscap SystemCapability.Security.CertificateManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getUserTrustedCertificate(certUri: string): Promise; @@ -1075,7 +1165,8 @@ declare namespace certificateManager { *
2. Memory operation error; 3. File operation error. * @syscap SystemCapability.Security.CertificateManager * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllSystemAppCertificates(): Promise; @@ -1088,23 +1179,26 @@ declare namespace certificateManager { * @throws { BusinessError } 17500001 - Internal error. Possible causes: 1. IPC communication failed; *
2. Memory operation error; 3. File operation error. * @syscap SystemCapability.Security.CertificateManager - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ function getPrivateCertificates(): Promise; /** * Enum for certificate type managed by Certificate Manager. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CertificateManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum CertType { /** * Indicates that ca certificate that installed by HarmonyOS system. * * @syscap SystemCapability.Security.CertificateManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ CA_CERT_SYSTEM = 0, @@ -1112,7 +1206,8 @@ declare namespace certificateManager { * Indicates that ca certificate that installed by user. * * @syscap SystemCapability.Security.CertificateManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ CA_CERT_USER = 1 } @@ -1120,9 +1215,10 @@ declare namespace certificateManager { /** * Enum for the scope of user ca certificate. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CertificateManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum CertScope { @@ -1130,7 +1226,8 @@ declare namespace certificateManager { * Indicates that the user ca certificate for a current user. * * @syscap SystemCapability.Security.CertificateManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ CURRENT_USER = 1, @@ -1138,7 +1235,8 @@ declare namespace certificateManager { * Indicates that the user ca certificate for all users. * * @syscap SystemCapability.Security.CertificateManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ GLOBAL_USER = 2 } @@ -1146,9 +1244,10 @@ declare namespace certificateManager { /** * Enum for the certificate algorithm type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CertificateManager * @since 20 + * @arkts 1.1&1.2 */ export enum CertAlgorithm { /** @@ -1156,6 +1255,7 @@ declare namespace certificateManager { * * @syscap SystemCapability.Security.CertificateManager * @since 20 + * @arkts 1.1&1.2 */ INTERNATIONAL = 1, @@ -1164,6 +1264,7 @@ declare namespace certificateManager { * * @syscap SystemCapability.Security.CertificateManager * @since 20 + * @arkts 1.1&1.2 */ SM = 2, } @@ -1173,7 +1274,8 @@ declare namespace certificateManager { * * @typedef CertStoreProperty * @syscap SystemCapability.Security.CertificateManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface CertStoreProperty { /** @@ -1181,7 +1283,8 @@ declare namespace certificateManager { * * @type { CertType } * @syscap SystemCapability.Security.CertificateManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ certType: CertType; @@ -1190,7 +1293,8 @@ declare namespace certificateManager { * * @type { ?CertScope } * @syscap SystemCapability.Security.CertificateManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ certScope?: CertScope; @@ -1200,6 +1304,7 @@ declare namespace certificateManager { * @type { ?CertAlgorithm } * @syscap SystemCapability.Security.CertificateManager * @since 20 + * @arkts 1.1&1.2 */ certAlg?: CertAlgorithm; } @@ -1228,6 +1333,7 @@ declare namespace certificateManager { * @throws { BusinessError } 17500009 - The device does not support the specified certificate store path, such as the overseas device does not support the certificate which algorithm is SM. * @syscap SystemCapability.Security.CertificateManager * @since 20 + * @arkts 1.1&1.2 */ function getCertificateStorePath(property: CertStoreProperty): string; @@ -1247,7 +1353,8 @@ declare namespace certificateManager { * @throws { BusinessError } 17500004 - Indicates that the number of certificates reaches the maximum allowed. * @throws { BusinessError } 17500007 - Indicates that the device enters advanced security mode. In this mode, the user CA certificate cannot be installed. * @syscap SystemCapability.Security.CertificateManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function installUserTrustedCertificateSync(cert: Uint8Array, certScope: CertScope) : CMResult; @@ -1263,7 +1370,8 @@ declare namespace certificateManager { *
2. Memory operation error; 3. File operation error. * @throws { BusinessError } 17500002 - Indicates that the certificate does not exist. * @syscap SystemCapability.Security.CertificateManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function uninstallUserTrustedCertificateSync(certUri: string) : void; @@ -1284,23 +1392,26 @@ declare namespace certificateManager { * @throws { BusinessError } 17500003 - The keystore is in an invalid format or the keystore password is incorrect. * @throws { BusinessError } 17500004 - The number of certificates or credentials reaches the maximum allowed. * @syscap SystemCapability.Security.CertificateManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function installPrivateCertificate(keystore: Uint8Array, keystorePwd: string, certAlias: string, level: AuthStorageLevel): Promise; /** * Enum for storage authentication level * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CertificateManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum AuthStorageLevel { /** * Indicates that the file can be accessed after the device is started. * * @syscap SystemCapability.Security.CertificateManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ EL1 = 1, @@ -1308,7 +1419,8 @@ declare namespace certificateManager { * Indicates that the file can be accessed after the device is unlocked for the first time. * * @syscap SystemCapability.Security.CertificateManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ EL2 = 2, @@ -1316,7 +1428,8 @@ declare namespace certificateManager { * Indicates that the file can be accessed when the device is unlocked. * * @syscap SystemCapability.Security.CertificateManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ EL4 = 4, } diff --git a/api/@ohos.security.certManagerDialog.d.ts b/api/@ohos.security.certManagerDialog.d.ts index 1f0de777eb..9ab6e71e62 100644 --- a/api/@ohos.security.certManagerDialog.d.ts +++ b/api/@ohos.security.certManagerDialog.d.ts @@ -26,16 +26,18 @@ import type common from '@ohos.app.ability.common'; * @namespace certificateManagerDialog * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace certificateManagerDialog { /** * Enum for result code * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum CertificateDialogErrorCode { @@ -44,7 +46,8 @@ declare namespace certificateManagerDialog { * * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ ERROR_GENERIC = 29700001, @@ -53,7 +56,8 @@ declare namespace certificateManagerDialog { * * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ ERROR_OPERATION_CANCELED = 29700002, @@ -62,7 +66,8 @@ declare namespace certificateManagerDialog { * * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ ERROR_OPERATION_FAILED = 29700003, @@ -71,7 +76,8 @@ declare namespace certificateManagerDialog { * * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ ERROR_DEVICE_NOT_SUPPORTED = 29700004, @@ -80,7 +86,8 @@ declare namespace certificateManagerDialog { * * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ ERROR_NOT_COMPLY_SECURITY_POLICY = 29700005, } @@ -89,10 +96,11 @@ declare namespace certificateManagerDialog { /** * Enum for page type of certificate manager dialog * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum CertificateDialogPageType { /** @@ -100,7 +108,8 @@ declare namespace certificateManagerDialog { * * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ PAGE_MAIN = 1, @@ -109,7 +118,8 @@ declare namespace certificateManagerDialog { * * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ PAGE_CA_CERTIFICATE = 2, @@ -118,7 +128,8 @@ declare namespace certificateManagerDialog { * * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ PAGE_CREDENTIAL = 3, @@ -127,7 +138,8 @@ declare namespace certificateManagerDialog { * * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ PAGE_INSTALL_CERTIFICATE = 4 } @@ -146,7 +158,8 @@ declare namespace certificateManagerDialog { *
2. Memory operation error; 3. File operation error. * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ function openCertificateManagerDialog(context: common.Context, pageType: CertificateDialogPageType): Promise; @@ -155,10 +168,11 @@ declare namespace certificateManagerDialog { /** * Enum for certificate type * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum CertificateType { /** @@ -166,7 +180,8 @@ declare namespace certificateManagerDialog { * * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ CA_CERT = 1 } @@ -174,10 +189,11 @@ declare namespace certificateManagerDialog { /** * Enum for certificate scope * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum CertificateScope { /** @@ -185,7 +201,8 @@ declare namespace certificateManagerDialog { * * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ NOT_SPECIFIED = 0, @@ -194,7 +211,8 @@ declare namespace certificateManagerDialog { * * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ CURRENT_USER = 1, @@ -203,7 +221,8 @@ declare namespace certificateManagerDialog { * * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ GLOBAL_USER = 2, } @@ -249,7 +268,8 @@ declare namespace certificateManagerDialog { * @throws { BusinessError } 29700005 - The operation does not comply with the device security policy, such as the device does not allow users to manage the ca certificate of the global user. * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function openInstallCertificateDialog(context: common.Context, certType: CertificateType, certScope: CertificateScope, cert: Uint8Array): Promise; @@ -272,7 +292,8 @@ declare namespace certificateManagerDialog { * @throws { BusinessError } 29700005 - The operation does not comply with the device security policy, such as the device does not allow users to manage the ca certificate of the global user. * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function openUninstallCertificateDialog(context: common.Context, certType: CertificateType, certUri: string): Promise; @@ -282,7 +303,8 @@ declare namespace certificateManagerDialog { * @typedef CertificateDialogProperty * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface CertificateDialogProperty { /** @@ -291,7 +313,8 @@ declare namespace certificateManagerDialog { * @type { boolean } * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ showInstallButton: boolean; } @@ -313,7 +336,8 @@ declare namespace certificateManagerDialog { * @throws { BusinessError } 29700004 - The API is not supported on this device. * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function openCertificateDetailDialog(context: common.Context, cert: Uint8Array, property: CertificateDialogProperty): Promise; @@ -335,6 +359,7 @@ declare namespace certificateManagerDialog { * @syscap SystemCapability.Security.CertificateManagerDialog * @stagemodelonly * @since 20 + * @arkts 1.1&1.2 */ function openAuthorizeDialog(context: common.Context): Promise; } -- Gitee From e9ef5d3afec5197831066ec3ce5ecaef3dbc7589 Mon Sep 17 00:00:00 2001 From: qsftw Date: Mon, 7 Jul 2025 17:12:07 +0800 Subject: [PATCH 024/746] drawing ani sync from 0328 Signed-off-by: qsftw Change-Id: If43458dc3d3d2a0b18ff366e9b93d4ba04734e9a --- api/@ohos.graphics.common2D.d.ts | 42 ++-- api/@ohos.graphics.drawing.d.ts | 324 ++++++++++++++++++++----------- 2 files changed, 244 insertions(+), 122 deletions(-) diff --git a/api/@ohos.graphics.common2D.d.ts b/api/@ohos.graphics.common2D.d.ts index ea035d27bd..3795b8afde 100644 --- a/api/@ohos.graphics.common2D.d.ts +++ b/api/@ohos.graphics.common2D.d.ts @@ -22,42 +22,48 @@ * * @namespace common2D * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace common2D { /** * Describes a color in ARGB format. * @typedef Color * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ interface Color { /** * Alpha component of the color. The value is an integer ranging from 0 to 255. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ alpha: number; /** * Red component of the color. The value is an integer ranging from 0 to 255. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ red: number; /** * Green component of the color. The value is an integer ranging from 0 to 255. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ green: number; /** * Blue component of the color. The value is an integer ranging from 0 to 255. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ blue: number; } @@ -66,35 +72,40 @@ declare namespace common2D { * Describes a rectangle, which can be defined by two coordinate points: upper left corner point and lower right corner point. * @typedef Rect * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ interface Rect { /** * X coordinate of the upper left corner of the rectangle. The value is a floating point number. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ left: number; /** * Y coordinate of the upper left corner of the rectangle. The value is a floating point number. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ top: number; /** * X coordinate of the lower right corner of the rectangle. The value is a floating point number. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ right: number; /** * Y coordinate of the lower right corner of the rectangle. The value is a floating point number. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ bottom: number; } @@ -103,14 +114,16 @@ declare namespace common2D { * Describes a coordinate point. * @typedef Point * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface Point { /** * Horizontal coordinate. The value is a floating point number. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ x: number; @@ -118,7 +131,8 @@ declare namespace common2D { * Vertical coordinate. The value is a floating point number. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ y: number; } diff --git a/api/@ohos.graphics.drawing.d.ts b/api/@ohos.graphics.drawing.d.ts index 01ab26aafa..3f52a32d80 100644 --- a/api/@ohos.graphics.drawing.d.ts +++ b/api/@ohos.graphics.drawing.d.ts @@ -28,7 +28,8 @@ import { Resource } from './global/resource'; * * @namespace drawing * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace drawing { /** @@ -52,182 +53,212 @@ declare namespace drawing { * * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ enum BlendMode { /** * r = 0, sets the the destination pixels to fully transparent. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CLEAR = 0, /** * r = s (all channels of the result equal those of the source), replaces the destination pixels with the source pixels. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SRC = 1, /** * r = d (all channels of the result equal those of the destination), keeps the destination pixels unchanged. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DST = 2, /** * r = s + (1 - sa) * d, draws the source pixels over the destination pixels, considering the source's transparency. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SRC_OVER = 3, /** * r = d + (1 - da) * s, draws the destination pixels over the source pixels, considering the destination's transparency. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DST_OVER = 4, /** * r = s * da, retains only the intersection of the source pixels with the opaque parts of the destination. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SRC_IN = 5, /** * r = d * sa, retains only the intersection of the destination pixels with the opaque parts of the source. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DST_IN = 6, /** * r = s * (1 - da), retains the parts of the source pixels that do not overlap with the destination. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SRC_OUT = 7, /** * r = d * (1 - sa), retains the parts of the destination pixels that do not overlap with the source. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DST_OUT = 8, /** * r = s * da + d * (1 - sa), covers the destination pixels with the source pixels, showing the source only in the opaque parts of the destination. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SRC_ATOP = 9, /** * r = d * sa + s * (1 - da), covers the source pixels with the destination pixels, showing the destination only in the opaque parts of the source. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DST_ATOP = 10, /** * r = s * (1 - da) + d * (1 - sa), shows only the non-overlapping parts of the source and destination pixels. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ XOR = 11, /** * r = min(s + d, 1), adds the color values of the source and destination pixels. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ PLUS = 12, /** * r = s * d, multiplies the color values of the source and destination pixels. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ MODULATE = 13, /** * r = s + d - s * d, inverts the color values of the source and destination pixels, multiplies them, * and then inverts the result, typically producing a brighter outcome. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SCREEN = 14, /** * Selectively applies MULTIPLY or SCREEN based on the brightness of the destination pixels, enhancing contrast. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ OVERLAY = 15, /** * rc = s + d - max(s * da, d * sa), ra = s + (1 - sa) * d, takes the darker color values between the source and destination pixels. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DARKEN = 16, /** * rc = s + d - min(s * da, d * sa), ra = s + (1 - sa) * d, takes the lighter color values between the source and destination pixels. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ LIGHTEN = 17, /** * Brightens the destination pixels by reducing contrast to reflect the source pixels. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ COLOR_DODGE = 18, /** * Darkens the destination pixels by increasing contrast to reflect the source pixels. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ COLOR_BURN = 19, /** * Selectively applies MULTIPLY or SCREEN based on the brightness of the source pixels. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ HARD_LIGHT = 20, /** * Softly brightens or darkens the destination pixels based on the brightness of the source pixels. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SOFT_LIGHT = 21, /** * rc = s + d - 2 * (min(s * da, d * sa)), ra = s + (1 - sa) * d, calculates the difference between the color values of the source and destination pixels. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DIFFERENCE = 22, /** * rc = s + d - two(s * d), ra = s + (1 - sa) * d, similar to DIFFERENCE but with lower contrast. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ EXCLUSION = 23, /** * r = s * (1 - da) + d * (1 - sa) + s * d, multiplies the color values of the source and destination pixels, typically resulting in a darker outcome. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ MULTIPLY = 24, /** * Uses the hue of the source pixels and the saturation and brightness of the destination pixels. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ HUE = 25, /** * Uses the saturation of the source pixels and the hue and brightness of the destination pixels. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SATURATION = 26, /** * Uses the hue and saturation of the source pixels and the brightness of the destination pixels. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ COLOR = 27, /** * Uses the brightness of the source pixels and the hue and saturation of the destination pixels. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ LUMINOSITY = 28, } @@ -328,7 +359,8 @@ declare namespace drawing { * Implements a rounded rectangle. * * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ class RoundRect { @@ -350,7 +382,8 @@ declare namespace drawing { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(rect: common2D.Rect, xRadii: number, yRadii: number); @@ -396,41 +429,47 @@ declare namespace drawing { * Enumerates the path operation types. It is often used in path combination and clipping scenarios. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum PathOp { /** * Difference operation. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ DIFFERENCE = 0, /** * Intersection operation. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ INTERSECT = 1, /** * Union operation. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ UNION = 2, /** * XOR operation. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ XOR = 3, /** * Reverse difference operation. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ REVERSE_DIFFERENCE = 4, } @@ -496,14 +535,16 @@ declare namespace drawing { * Implements a path operation iterator. You can read path operation instructions by traversing the iterator. * * @syscap SystemCapability.Graphics.Drawing - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ class PathIterator { /** * Creates an iterator and binds it with a path. * @param { Path } path - Path object bound to the iterator. * @syscap SystemCapability.Graphics.Drawing - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(path: Path); @@ -540,13 +581,15 @@ declare namespace drawing { * A compound geometric path consisting of line segments, arcs, quadratic Bezier curves, and cubic Bezier curves. * * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ class Path { /** * Constructs a path. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -554,7 +597,8 @@ declare namespace drawing { * Constructs a copy of an existing path. * @param { Path } path - Path to copy. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(path: Path); @@ -603,7 +647,8 @@ declare namespace drawing { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ arcTo(x1: number, y1: number, x2: number, y2: number, startDeg: number, sweepDeg: number): void; @@ -931,7 +976,8 @@ declare namespace drawing { /** * Resets the path data. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ reset(): void; @@ -1136,20 +1182,23 @@ declare namespace drawing { * Enumerates the filter modes. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum FilterMode { /** * Nearest filter mode. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ FILTER_MODE_NEAREST = 0, /** * Linear filter mode. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ FILTER_MODE_LINEAR = 1, } @@ -1193,13 +1242,15 @@ declare namespace drawing { /** * Implements sampling options. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ class SamplingOptions { /** * Creates a SamplingOptions object. The default value of FilterMode is FILTER_MODE_NEAREST. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); /** @@ -1208,7 +1259,8 @@ declare namespace drawing { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(filterMode: FilterMode); } @@ -1216,7 +1268,8 @@ declare namespace drawing { /** * A carrier that carries the drawn content and drawing status. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ class Canvas { /** @@ -1225,7 +1278,8 @@ declare namespace drawing { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(pixelmap: image.PixelMap); @@ -1235,7 +1289,8 @@ declare namespace drawing { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ drawRect(rect: common2D.Rect): void; @@ -1248,7 +1303,8 @@ declare namespace drawing { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ drawRect(left: number, top: number, right: number, bottom: number): void; @@ -1398,7 +1454,8 @@ declare namespace drawing { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ drawImageRect(pixelmap: image.PixelMap, dstRect: common2D.Rect, samplingOptions?: SamplingOptions): void; @@ -1595,7 +1652,8 @@ declare namespace drawing { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ drawPixelMapMesh(pixelmap: image.PixelMap, meshWidth: number, meshHeight: number, vertices: Array, vertOffset: number, colors: Array, colorOffset: number): void; @@ -1626,7 +1684,8 @@ declare namespace drawing { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ attachBrush(brush: Brush): void; @@ -1640,7 +1699,8 @@ declare namespace drawing { /** * Detaches the brush from the canvas. When you draw on the canvas, the brush is no longer used to fill the interior of shapes. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ detachBrush(): void; @@ -1662,7 +1722,8 @@ declare namespace drawing { * @returns { number } Number of canvas statuses that have been saved. The value is a positive integer. * @throws { BusinessError } 401 - Parameter error. Possible causes: Mandatory parameters are left unspecified. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ saveLayer(rect?: common2D.Rect | null, brush?: Brush | null): number; @@ -1687,7 +1748,8 @@ declare namespace drawing { /** * Restores the canvas state (canvas matrix and clipping area) saved on the top of the stack. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ restore(): void; @@ -1781,7 +1843,8 @@ declare namespace drawing { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ rotate(degrees: number, sx: number, sy: number) : void; @@ -1907,19 +1970,22 @@ declare namespace drawing { * * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum ClipOp { /** * Clips a specified area. That is, the difference set is obtained. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ DIFFERENCE = 0, /** * Retains a specified area. That is, the intersection is obtained. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ INTERSECT = 1, } @@ -2089,7 +2155,8 @@ declare namespace drawing { * Describes the style of a typeface, such as SimSun or KaiTi. * * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ class Typeface { /** @@ -2117,7 +2184,8 @@ declare namespace drawing { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ static makeFromFile(filePath: string): Typeface; @@ -2230,7 +2298,8 @@ declare namespace drawing { * Describes the attributes used for text rendering, such as size and typeface. * * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ class Font { /** @@ -2273,7 +2342,8 @@ declare namespace drawing { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setSize(textSize: number): void; @@ -2291,7 +2361,8 @@ declare namespace drawing { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setTypeface(typeface: Typeface): void; @@ -2307,7 +2378,8 @@ declare namespace drawing { * Obtains the font metrics of the typeface. * @returns { FontMetrics } The fontMetrics value returned to the caller. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMetrics(): FontMetrics; @@ -2631,7 +2703,8 @@ declare namespace drawing { * Describes the attributes that describe the font size and layout. A typeface has similar font metrics. * @typedef FontMetrics * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ interface FontMetrics { /** @@ -2646,28 +2719,32 @@ declare namespace drawing { * Maximum distance from the baseline to the highest coordinate of the text. The value is a floating point number. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ top: number; /** * Distance from the baseline to the highest coordinate of the text. The value is a floating point number. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ ascent: number; /** * Distance from the baseline to the lowest coordinate of the text. The value is a floating point number. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ descent: number; /** * Maximum distance from the baseline to the lowest coordinate of the text. The value is a floating point number. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ bottom: number; /** @@ -2675,7 +2752,8 @@ declare namespace drawing { * The value is a floating point number. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ leading: number; /** @@ -2764,7 +2842,8 @@ declare namespace drawing { /** * Implements a lattice object, which is used to divide an image by lattice. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ class Lattice { /** @@ -2788,7 +2867,8 @@ declare namespace drawing { *
2. Incorrect parameter types; 3. Parameter verification failed. * @static * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ static createImageLattice(xDivs: Array, yDivs: Array, fXCount: number, fYCount: number, fBounds?: common2D.Rect | null, fRectTypes?: Array | null, fColors?: Array | null): Lattice; @@ -2825,27 +2905,31 @@ declare namespace drawing { * Enumerates the types of rectangles used to fill the lattices. This enum is used only in Lattice. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum RectType { /** * Draws an image into the lattice. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ DEFAULT = 0, /** * Sets the lattice to transparent. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ TRANSPARENT = 1, /** * Draws the colors in the fColors array in Lattice into the lattice. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ FIXEDCOLOR = 2 } @@ -3216,7 +3300,8 @@ declare namespace drawing { * Defines a color filter. * * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ class ColorFilter { /** @@ -3228,7 +3313,8 @@ declare namespace drawing { *
2. Incorrect parameter types; 3. Parameter verification failed. * @static * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static createBlendModeColorFilter(color: common2D.Color, mode: BlendMode): ColorFilter; @@ -3241,7 +3327,8 @@ declare namespace drawing { *
2. Incorrect parameter types; 3. Parameter verification failed. * @static * @syscap SystemCapability.Graphics.Drawing - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static createBlendModeColorFilter(color: common2D.Color | number, mode: BlendMode): ColorFilter; @@ -3512,13 +3599,15 @@ declare namespace drawing { /** * Defines a pen, which is used to describe the style and color to outline a shape. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ class Pen { /** * A constructor used to create a Pen object. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -3528,7 +3617,8 @@ declare namespace drawing { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(pen: Pen); @@ -3761,7 +3851,8 @@ declare namespace drawing { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setBlendMode(mode: BlendMode): void; @@ -3819,7 +3910,8 @@ declare namespace drawing { /** * Resets this pen to the initial state. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ reset(): void; /** @@ -3839,13 +3931,15 @@ declare namespace drawing { /** * Defines a brush, which is used to describe the style and color to fill in a shape. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ class Brush { /** * A constructor used to create a Brush object. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -3855,7 +3949,8 @@ declare namespace drawing { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(brush: Brush); @@ -4033,14 +4128,16 @@ declare namespace drawing { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.Graphics.Drawing - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setBlendMode(mode: BlendMode): void; /** * Resets this brush to the initial state. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ reset(): void; } @@ -4049,13 +4146,15 @@ declare namespace drawing { * Implements a matrix. * * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ class Matrix { /** * Creates a Matrix object. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -4360,7 +4459,8 @@ declare namespace drawing { /** * Resets this matrix to an identity matrix. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ reset(): void; /** @@ -4476,7 +4576,8 @@ declare namespace drawing { /** * Describes a region, which is used to describe the region where the shape can be drawn. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ class Region { /** @@ -4675,48 +4776,55 @@ declare namespace drawing { * Enumerates the operations for combining two regions. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum RegionOp { /** * Difference operation. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ DIFFERENCE = 0, /** * Intersect operation. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ INTERSECT = 1, /** * Union operation. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ UNION = 2, /** * Xor operation. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ XOR = 3, /** * Reverse difference operation. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ REVERSE_DIFFERENCE = 4, /** * Replace operation. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ REPLACE = 5 } -- Gitee From e77489f0d2dda5b0b6e5a02727829a3bb560842f Mon Sep 17 00:00:00 2001 From: adelelimi Date: Mon, 7 Jul 2025 18:26:43 +0800 Subject: [PATCH 025/746] =?UTF-8?q?arkts=E9=9D=99=E6=80=81=E5=8C=96?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=9B=9E=E5=90=880702?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: adelelimi --- ....app.ability.UserAuthExtensionAbility.d.ts | 3 +- api/@ohos.userIAM.faceAuth.d.ts | 13 +- api/@ohos.userIAM.userAccessCtrl.d.ts | 49 ++-- api/@ohos.userIAM.userAuth.d.ts | 250 +++++++++++++----- kits/@kit.UserAuthenticationKit.d.ts | 11 +- 5 files changed, 233 insertions(+), 93 deletions(-) diff --git a/api/@ohos.app.ability.UserAuthExtensionAbility.d.ts b/api/@ohos.app.ability.UserAuthExtensionAbility.d.ts index 7a8e808c03..959833aa70 100644 --- a/api/@ohos.app.ability.UserAuthExtensionAbility.d.ts +++ b/api/@ohos.app.ability.UserAuthExtensionAbility.d.ts @@ -16,6 +16,7 @@ /** * @file * @kit UserAuthenticationKit + * @arkts 1.1&1.2 */ import UIExtensionAbility from './@ohos.app.ability.UIExtensionAbility'; @@ -27,7 +28,7 @@ import UIExtensionAbility from './@ohos.app.ability.UIExtensionAbility'; * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi Hide this for inner system use. * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} */ export default class UserAuthExtensionAbility extends UIExtensionAbility { } \ No newline at end of file diff --git a/api/@ohos.userIAM.faceAuth.d.ts b/api/@ohos.userIAM.faceAuth.d.ts index f0876d95a9..44df2b4454 100644 --- a/api/@ohos.userIAM.faceAuth.d.ts +++ b/api/@ohos.userIAM.faceAuth.d.ts @@ -16,6 +16,7 @@ /** * @file * @kit UserAuthenticationKit + * @arkts 1.1&1.2 */ /** @@ -23,7 +24,8 @@ * * @namespace faceAuth * @syscap SystemCapability.UserIAM.UserAuth.FaceAuth - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace faceAuth { /** @@ -31,7 +33,8 @@ declare namespace faceAuth { * * @syscap SystemCapability.UserIAM.UserAuth.FaceAuth * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ class FaceAuthManager { /** @@ -39,7 +42,8 @@ declare namespace faceAuth { * * @syscap SystemCapability.UserIAM.UserAuth.FaceAuth * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -53,7 +57,8 @@ declare namespace faceAuth { * @throws { BusinessError } 12700001 - The service is unavailable. * @syscap SystemCapability.UserIAM.UserAuth.FaceAuth * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ setSurfaceId(surfaceId: string): void; } diff --git a/api/@ohos.userIAM.userAccessCtrl.d.ts b/api/@ohos.userIAM.userAccessCtrl.d.ts index 6bbbc9c6dd..4fb39ab9d9 100644 --- a/api/@ohos.userIAM.userAccessCtrl.d.ts +++ b/api/@ohos.userIAM.userAccessCtrl.d.ts @@ -16,6 +16,7 @@ /** * @file * @kit UserAuthenticationKit + * @arkts 1.1&1.2 */ import userAuth from '@ohos.userIAM.userAuth'; @@ -25,7 +26,8 @@ import userAuth from '@ohos.userIAM.userAuth'; * * @namespace userAccessCtrl * @syscap SystemCapability.UserIAM.UserAuth.Core - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace userAccessCtrl { /** @@ -46,7 +48,8 @@ declare namespace userAccessCtrl { * @throws { BusinessError } 12500016 - AuthToken has expired. * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ function verifyAuthToken(authToken: Uint8Array, allowableDuration: number): Promise; @@ -56,7 +59,8 @@ declare namespace userAccessCtrl { * @typedef AuthToken * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface AuthToken { /** @@ -65,7 +69,8 @@ declare namespace userAccessCtrl { * @type { Uint8Array } * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ challenge: Uint8Array; @@ -75,7 +80,8 @@ declare namespace userAccessCtrl { * @type { userAuth.AuthTrustLevel } * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ authTrustLevel: userAuth.AuthTrustLevel; @@ -85,7 +91,8 @@ declare namespace userAccessCtrl { * @type { userAuth.UserAuthType } * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ authType: userAuth.UserAuthType; @@ -95,7 +102,8 @@ declare namespace userAccessCtrl { * @type { AuthTokenType } * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ tokenType: AuthTokenType; @@ -105,7 +113,8 @@ declare namespace userAccessCtrl { * @type { number } * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ userId: number; @@ -115,7 +124,8 @@ declare namespace userAccessCtrl { * @type { bigint } * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ timeInterval: bigint; @@ -125,7 +135,8 @@ declare namespace userAccessCtrl { * @type { ?bigint } * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ secureUid?: bigint; @@ -135,7 +146,8 @@ declare namespace userAccessCtrl { * @type { ?bigint } * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ enrolledId?: bigint; @@ -145,7 +157,8 @@ declare namespace userAccessCtrl { * @type { ?bigint } * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ credentialId?: bigint; } @@ -156,7 +169,8 @@ declare namespace userAccessCtrl { * @enum { number } * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ enum AuthTokenType { /** @@ -164,7 +178,8 @@ declare namespace userAccessCtrl { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ TOKEN_TYPE_LOCAL_AUTH = 0, @@ -173,7 +188,8 @@ declare namespace userAccessCtrl { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ TOKEN_TYPE_LOCAL_RESIGN = 1, @@ -182,7 +198,8 @@ declare namespace userAccessCtrl { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ TOKEN_TYPE_COAUTH = 2 } diff --git a/api/@ohos.userIAM.userAuth.d.ts b/api/@ohos.userIAM.userAuth.d.ts index 7002e6fc3e..90faac3abe 100644 --- a/api/@ohos.userIAM.userAuth.d.ts +++ b/api/@ohos.userIAM.userAuth.d.ts @@ -18,7 +18,12 @@ * @kit UserAuthenticationKit */ +/*** if arkts 1.1 */ import type { AsyncCallback } from './@ohos.base'; +/*** endif */ +/*** if arkts 1.2 */ +import Context from './application/Context'; +/*** endif */ /** * User authentication @@ -34,7 +39,8 @@ import type { AsyncCallback } from './@ohos.base'; * @namespace userAuth * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace userAuth { /** @@ -46,6 +52,16 @@ declare namespace userAuth { * @since 12 */ const MAX_ALLOWABLE_REUSE_DURATION: 300000; + /** + * Maximum reuse duration of the authentication result, in milliseconds. The value is 300000. + * + * @constant + * @syscap SystemCapability.UserIAM.UserAuth.Core + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + const MAX_ALLOWABLE_REUSE_DURATION: number = 300000; /** * Enum for authentication result. @@ -679,7 +695,8 @@ declare namespace userAuth { * @enum { number } * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum UserAuthType { /** @@ -693,7 +710,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ PIN = 1, @@ -708,7 +726,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ FACE = 2, @@ -723,7 +742,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ FINGERPRINT = 4, @@ -732,7 +752,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRIVATE_PIN = 16 } @@ -752,7 +773,8 @@ declare namespace userAuth { * @enum { number } * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AuthTrustLevel { /** @@ -768,7 +790,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ATL1 = 10000, @@ -785,7 +808,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ATL2 = 20000, @@ -801,7 +825,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ATL3 = 30000, @@ -817,7 +842,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ATL4 = 40000 } @@ -1060,7 +1086,8 @@ declare namespace userAuth { * @throws { BusinessError } 12500013 - Operation failed because of PIN expired. * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function getAvailableStatus(authType: UserAuthType, authTrustLevel: AuthTrustLevel): void; @@ -1070,7 +1097,8 @@ declare namespace userAuth { * @typedef EnrolledState * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface EnrolledState { /** @@ -1079,7 +1107,8 @@ declare namespace userAuth { * @type { number } * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ credentialDigest: number; @@ -1089,7 +1118,8 @@ declare namespace userAuth { * @type { number } * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ credentialCount: number; } @@ -1108,7 +1138,8 @@ declare namespace userAuth { * @throws { BusinessError } 12500010 - The type of credential has not been enrolled. * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function getEnrolledState(authType: UserAuthType): EnrolledState; @@ -1136,7 +1167,8 @@ declare namespace userAuth { * @enum { number } * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ enum WindowModeType { /** @@ -1144,7 +1176,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ DIALOG_BOX = 1, @@ -1153,7 +1186,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ FULLSCREEN = 2 } @@ -1164,7 +1198,8 @@ declare namespace userAuth { * @enum { number } * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum ReuseMode { /** @@ -1173,7 +1208,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AUTH_TYPE_RELEVANT = 1, @@ -1183,7 +1219,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AUTH_TYPE_IRRELEVANT = 2, @@ -1194,7 +1231,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ CALLER_IRRELEVANT_AUTH_TYPE_RELEVANT = 3, @@ -1204,7 +1242,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ CALLER_IRRELEVANT_AUTH_TYPE_IRRELEVANT = 4 } @@ -1226,7 +1265,8 @@ declare namespace userAuth { * @typedef ReuseUnlockResult * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ReuseUnlockResult { /** @@ -1235,7 +1275,8 @@ declare namespace userAuth { * @type { ReuseMode } * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ reuseMode: ReuseMode; @@ -1246,7 +1287,8 @@ declare namespace userAuth { * @type { number } * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ reuseDuration: number; } @@ -1264,7 +1306,8 @@ declare namespace userAuth { * @typedef AuthParam * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AuthParam { /** @@ -1281,7 +1324,8 @@ declare namespace userAuth { * @type { Uint8Array } * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ challenge: Uint8Array; @@ -1298,7 +1342,8 @@ declare namespace userAuth { * @type { UserAuthType[] } * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ authType: UserAuthType[]; @@ -1315,7 +1360,8 @@ declare namespace userAuth { * @type { AuthTrustLevel } * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ authTrustLevel: AuthTrustLevel; @@ -1325,7 +1371,8 @@ declare namespace userAuth { * @type { ?ReuseUnlockResult } * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ reuseUnlockResult?: ReuseUnlockResult; @@ -1336,7 +1383,8 @@ declare namespace userAuth { * @default The ID of the current user. The value is a positive integer greater than or equal to 0. * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ userId?: number; } @@ -1354,7 +1402,8 @@ declare namespace userAuth { * @typedef WidgetParam * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface WidgetParam { /** @@ -1370,7 +1419,8 @@ declare namespace userAuth { * @type { string } * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ title: string; @@ -1389,7 +1439,8 @@ declare namespace userAuth { * @type { ?string } * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ navigationButtonText?: string; @@ -1400,7 +1451,8 @@ declare namespace userAuth { * @default WindowModeType.DIALOG_BOX * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ windowMode?: WindowModeType; @@ -1412,7 +1464,8 @@ declare namespace userAuth { * @type { ?Context } * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ uiContext?: Context; } @@ -1431,7 +1484,8 @@ declare namespace userAuth { * @typedef UserAuthResult * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface UserAuthResult { /** @@ -1448,7 +1502,8 @@ declare namespace userAuth { * @type { number } * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ result: number; @@ -1465,7 +1520,8 @@ declare namespace userAuth { * @type { ?Uint8Array } * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ token?: Uint8Array; @@ -1482,7 +1538,8 @@ declare namespace userAuth { * @type { ?UserAuthType } * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ authType?: UserAuthType; @@ -1492,7 +1549,8 @@ declare namespace userAuth { * @type { ?EnrolledState } * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enrolledState?: EnrolledState; } @@ -1510,7 +1568,8 @@ declare namespace userAuth { * @interface IAuthCallback * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface IAuthCallback { /** @@ -1531,6 +1590,17 @@ declare namespace userAuth { * @since 12 */ onResult(result: UserAuthResult): void; + /** + * Called to return the authentication result. If the authentication is successful, + * UserAuthResult contains the token information. + * + * @type { function } + * @syscap SystemCapability.UserIAM.UserAuth.Core + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + onResult: (result: UserAuthResult) => void; } /** @@ -1547,7 +1617,8 @@ declare namespace userAuth { * @interface UserAuthInstance * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface UserAuthInstance { /** @@ -1575,7 +1646,8 @@ declare namespace userAuth { * @throws { BusinessError } 12500002 - General operation error. * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'result', callback: IAuthCallback): void; @@ -1608,7 +1680,8 @@ declare namespace userAuth { * @throws { BusinessError } 12500002 - General operation error. * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'result', callback?: IAuthCallback): void; @@ -1683,6 +1756,7 @@ declare namespace userAuth { * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ start(): void; @@ -1711,7 +1785,8 @@ declare namespace userAuth { * @throws { BusinessError } 12500002 - General operation error. * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ cancel(): void; } @@ -1751,7 +1826,8 @@ declare namespace userAuth { * @throws { BusinessError } 12500006 - The authentication trust level is not supported. * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function getUserAuthInstance(authParam: AuthParam, widgetParam: WidgetParam): UserAuthInstance; @@ -1761,7 +1837,8 @@ declare namespace userAuth { * @enum { number } * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ enum NoticeType { /** @@ -1769,7 +1846,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ WIDGET_NOTICE = 1 } @@ -1789,7 +1867,8 @@ declare namespace userAuth { * @throws { BusinessError } 12500002 - General operation error. * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function sendNotice(noticeType: NoticeType, eventData: string): void; @@ -1806,7 +1885,8 @@ declare namespace userAuth { * @enum { number } * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum UserAuthResultCode { /** @@ -1820,7 +1900,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SUCCESS = 12500000, @@ -1835,7 +1916,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ FAIL = 12500001, @@ -1850,7 +1932,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ GENERAL_ERROR = 12500002, @@ -1865,7 +1948,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CANCELED = 12500003, @@ -1880,7 +1964,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ TIMEOUT = 12500004, @@ -1895,7 +1980,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ TYPE_NOT_SUPPORT = 12500005, @@ -1910,7 +1996,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ TRUST_LEVEL_NOT_SUPPORT = 12500006, @@ -1925,7 +2012,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ BUSY = 12500007, @@ -1940,7 +2028,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LOCKED = 12500009, @@ -1955,7 +2044,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ NOT_ENROLLED = 12500010, @@ -1971,7 +2061,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CANCELED_FROM_WIDGET = 12500011, @@ -1980,7 +2071,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ PIN_EXPIRED = 12500013, @@ -1989,7 +2081,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ AUTH_TOKEN_CHECK_FAILED = 12500015, @@ -1999,7 +2092,8 @@ declare namespace userAuth { * * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ AUTH_TOKEN_EXPIRED = 12500016 } @@ -2011,7 +2105,8 @@ declare namespace userAuth { * @interface UserAuthWidgetMgr * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ interface UserAuthWidgetMgr { /** @@ -2045,7 +2140,8 @@ declare namespace userAuth { * @throws { BusinessError } 12500002 - General operation error. * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'command', callback?: IAuthWidgetCallback): void; } @@ -2068,7 +2164,8 @@ declare namespace userAuth { * @throws { BusinessError } 12500002 - General operation error. * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function getUserAuthWidgetMgr(version: number): UserAuthWidgetMgr; @@ -2079,7 +2176,8 @@ declare namespace userAuth { * @interface IAuthWidgetCallback * @syscap SystemCapability.UserIAM.UserAuth.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ interface IAuthWidgetCallback { /** @@ -2092,6 +2190,16 @@ declare namespace userAuth { * @since 10 */ sendCommand(cmdData: string): void; + /** + * Called to return the command sent from the user authentication framework to the user authentication widget. + * + * @type { function } + * @syscap SystemCapability.UserIAM.UserAuth.Core + * @systemapi Hide this for inner system use. + * @since 20 + * @arkts 1.2 + */ + sendCommand: (cmdData: string) => void; } /** diff --git a/kits/@kit.UserAuthenticationKit.d.ts b/kits/@kit.UserAuthenticationKit.d.ts index e205a6dc45..59e6e37e41 100644 --- a/kits/@kit.UserAuthenticationKit.d.ts +++ b/kits/@kit.UserAuthenticationKit.d.ts @@ -17,7 +17,7 @@ * @file * @kit UserAuthenticationKit */ - +/*** if arkts 1.1 */ import faceAuth from '@ohos.userIAM.faceAuth'; import userAccessCtrl from '@ohos.userIAM.userAccessCtrl'; import userAuth from '@ohos.userIAM.userAuth'; @@ -25,3 +25,12 @@ import UserAuthIcon from '@ohos.userIAM.userAuthIcon'; import UserAuthExtensionAbility from '@ohos.app.ability.UserAuthExtensionAbility'; export { faceAuth, userAccessCtrl, userAuth, UserAuthIcon, UserAuthExtensionAbility }; +/*** endif */ +/*** if arkts 1.2 */ +import faceAuth from '@ohos.userIAM.faceAuth'; +import userAccessCtrl from '@ohos.userIAM.userAccessCtrl'; +import userAuth from '@ohos.userIAM.userAuth'; +import UserAuthExtensionAbility from '@ohos.app.ability.UserAuthExtensionAbility'; + +export { faceAuth, userAccessCtrl, userAuth, UserAuthExtensionAbility }; +/*** endif */ -- Gitee From 3946249a8bf85208fc966b566cbbf63f12b2b84e Mon Sep 17 00:00:00 2001 From: liujiaxing19 Date: Mon, 7 Jul 2025 19:30:52 +0800 Subject: [PATCH 026/746] =?UTF-8?q?hiappevent=20arkts=201.2=200328?= =?UTF-8?q?=E5=88=86=E6=94=AF=E6=8C=91master?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liujiaxing19 Change-Id: I0db0cd1d0f0c79bcc32458b2bfeac549e08713af --- api/@ohos.hiviewdfx.hiAppEvent.d.ts | 201 ++++++++++++++++++---------- 1 file changed, 134 insertions(+), 67 deletions(-) diff --git a/api/@ohos.hiviewdfx.hiAppEvent.d.ts b/api/@ohos.hiviewdfx.hiAppEvent.d.ts index 6ef79c5df6..06f66e43dd 100644 --- a/api/@ohos.hiviewdfx.hiAppEvent.d.ts +++ b/api/@ohos.hiviewdfx.hiAppEvent.d.ts @@ -191,7 +191,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ namespace domain { /** @@ -207,7 +208,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ const OS: string; } @@ -240,7 +242,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ namespace event { /** @@ -254,7 +257,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ const USER_LOGIN: string; @@ -269,7 +273,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ const USER_LOGOUT: string; @@ -284,7 +289,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ const DISTRIBUTED_SERVICE_START: string; @@ -301,7 +307,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ const APP_CRASH: string; @@ -310,7 +317,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ const APP_FREEZE: string; @@ -319,7 +327,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const APP_LAUNCH: string; @@ -328,7 +337,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const SCROLL_JANK: string; @@ -337,7 +347,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const CPU_USAGE_HIGH: string; @@ -346,7 +357,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const BATTERY_USAGE: string; @@ -355,7 +367,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const RESOURCE_OVERLIMIT: string; @@ -364,7 +377,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const ADDRESS_SANITIZER: string; @@ -373,7 +387,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const MAIN_THREAD_JANK: string; @@ -384,6 +399,7 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ const APP_KILLED: string; } @@ -410,7 +426,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ namespace param { /** @@ -432,7 +449,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ const USER_ID: string; @@ -455,7 +473,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ const DISTRIBUTED_SERVICE_NAME: string; @@ -478,7 +497,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ const DISTRIBUTED_SERVICE_INSTANCE_ID: string; } @@ -516,7 +536,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ function configure(config: ConfigOption): void; @@ -542,7 +563,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ interface ConfigOption { /** @@ -573,7 +595,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ disable?: boolean; @@ -608,7 +631,8 @@ declare namespace hiAppEvent { * @type { ?string } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ maxStorage?: string; } @@ -953,7 +977,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ type ParamType = number | string | boolean | Array; @@ -1010,7 +1035,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ function setEventParam(params: Record, domain: string, name?: string): Promise; @@ -1031,7 +1057,8 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ function setEventConfig(name: string, config: Record): Promise; @@ -1060,7 +1087,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ interface AppEventPackage { /** @@ -1085,7 +1113,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ packageId: number; @@ -1111,7 +1140,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ row: number; @@ -1137,7 +1167,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ size: number; @@ -1163,7 +1194,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ data: string[]; @@ -1182,7 +1214,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ appEventInfos: Array; } @@ -1206,7 +1239,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ class AppEventPackageHolder { /** @@ -1237,7 +1271,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ constructor(watcherName: string); @@ -1274,7 +1309,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ setSize(size: number): void; @@ -1303,7 +1339,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ setRow(size: number): void; @@ -1344,7 +1381,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ takeNext(): AppEventPackage; } @@ -1371,7 +1409,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ interface TriggerCondition { /** @@ -1402,7 +1441,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ row?: number; @@ -1434,7 +1474,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ size?: number; @@ -1466,7 +1507,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ timeOut?: number; } @@ -1499,7 +1541,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ interface AppEventFilter { /** @@ -1527,7 +1570,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ domain: string; @@ -1553,7 +1597,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ eventTypes?: EventType[]; @@ -1572,7 +1617,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ names?: string[]; } @@ -1594,7 +1640,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ interface AppEventGroup { /** @@ -1612,7 +1659,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ name: string; @@ -1631,7 +1679,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ appEventInfos: Array; } @@ -1661,7 +1710,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ interface Watcher { /** @@ -1692,7 +1742,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ name: string; @@ -1721,7 +1772,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ triggerCondition?: TriggerCondition; @@ -1750,7 +1802,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ appEventFilters?: AppEventFilter[]; @@ -1788,7 +1841,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ onTrigger?: (curRow: number, curSize: number, holder: AppEventPackageHolder) => void; @@ -1813,7 +1867,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ onReceive?: (domain: string, appEventGroups: Array) => void; } @@ -1866,7 +1921,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ function addWatcher(watcher: Watcher): AppEventPackageHolder; @@ -1903,7 +1959,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ function removeWatcher(watcher: Watcher): void; @@ -1929,7 +1986,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ function clearData(): void; @@ -1960,7 +2018,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ function setUserId(name: string, value: string): void; @@ -1989,7 +2048,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ function getUserId(name: string): string; @@ -2020,7 +2080,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ function setUserProperty(name: string, value: string): void; @@ -2049,7 +2110,8 @@ declare namespace hiAppEvent { * @syscap SystemCapability.HiviewDFX.HiAppEvent * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ function getUserProperty(name: string): string; @@ -2059,7 +2121,8 @@ declare namespace hiAppEvent { * @interface AppEventReportConfig * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ interface AppEventReportConfig { /** @@ -2070,7 +2133,8 @@ declare namespace hiAppEvent { * @type { ?string } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ domain?: string; @@ -2082,7 +2146,8 @@ declare namespace hiAppEvent { * @type { ?string } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ name?: string; @@ -2093,7 +2158,8 @@ declare namespace hiAppEvent { * @type { ?boolean } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ isRealTime?: boolean; } @@ -2309,7 +2375,7 @@ declare namespace hiAppEvent { * @param { string } processorName The name of the processor. * @param { string } [configName] Initialize the processor by reading the configuration file based on the name. * @returns { Promise } The processor unique ID. - * @throws { BusinessError } 11105001 - Invalid parameter value. Possible causes: 1. Incorrect parameter length. + * @throws { BusinessError } 11105001 - Invalid parameter value. Possible causes: 1. Incorrect parameter length; *
2. Incorrect parameter format. * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent @@ -2329,7 +2395,8 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function removeProcessor(id: number): void; } -- Gitee From 36b457b6c473237387b27085b7e3cca728dd4bb9 Mon Sep 17 00:00:00 2001 From: lanhaoyu Date: Mon, 7 Jul 2025 20:05:36 +0800 Subject: [PATCH 027/746] bms sdk arkts1.2 Signed-off-by: lanhaoyu --- api/@ohos.bundle.appControl.d.ts | 123 ++++--- api/@ohos.bundle.bundleManager.d.ts | 337 ++++++++++++------ api/@ohos.bundle.bundleMonitor.d.ts | 24 +- api/@ohos.bundle.bundleResourceManager.d.ts | 26 +- api/@ohos.bundle.defaultAppManager.d.ts | 78 ++-- ...@ohos.bundle.distributedBundleManager.d.ts | 30 +- api/@ohos.bundle.freeInstall.d.ts | 186 +++++++++- api/@ohos.bundle.installer.d.ts | 196 +++++++--- api/@ohos.bundle.launcherBundleManager.d.ts | 26 +- api/@ohos.bundle.overlay.d.ts | 60 +++- api/@ohos.zlib.d.ts | 36 +- api/bundleManager/AppProvisionInfo.d.ts | 48 ++- api/bundleManager/BundlePackInfo.d.ts | 150 +++++--- api/bundleManager/DispatchInfo.d.ts | 9 +- api/bundleManager/LauncherAbilityInfo.d.ts | 21 +- .../LauncherAbilityResourceInfo.d.ts | 23 +- api/bundleManager/OverlayModuleInfo.d.ts | 18 +- api/bundleManager/PermissionDef.d.ts | 15 +- api/bundleManager/PluginBundleInfo.d.ts | 39 +- .../RecoverableApplicationInfo.d.ts | 24 +- api/bundleManager/RemoteAbilityInfo.d.ts | 12 +- api/bundleManager/SharedBundleInfo.d.ts | 30 +- kits/@kit.AbilityKit.d.ts | 10 +- kits/@kit.BasicServicesKit.d.ts | 8 + 24 files changed, 1087 insertions(+), 442 deletions(-) mode change 100755 => 100644 api/bundleManager/OverlayModuleInfo.d.ts diff --git a/api/@ohos.bundle.appControl.d.ts b/api/@ohos.bundle.appControl.d.ts index d57d3694f7..b7f6ac7d90 100644 --- a/api/@ohos.bundle.appControl.d.ts +++ b/api/@ohos.bundle.appControl.d.ts @@ -19,7 +19,12 @@ */ import { AsyncCallback } from './@ohos.base'; +/*** if arkts 1.1 */ import type { ElementName } from './bundleManager/ElementName'; +/*** endif */ +/*** if arkts 1.2 */ +import { ElementName } from './bundleManager/ElementName'; +/*** endif */ import Want from './@ohos.app.ability.Want'; /** @@ -28,7 +33,8 @@ import Want from './@ohos.app.ability.Want'; * @namespace appControl * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace appControl { /** @@ -37,7 +43,8 @@ declare namespace appControl { * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum ComponentType { /** @@ -45,7 +52,8 @@ declare namespace appControl { * * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ UI_ABILITY = 1, @@ -54,7 +62,8 @@ declare namespace appControl { * * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ UI_EXTENSION = 2 } @@ -65,7 +74,8 @@ declare namespace appControl { * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum UninstallComponentType { /** @@ -73,7 +83,8 @@ declare namespace appControl { * * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ EXTENSION = 1, } @@ -84,7 +95,8 @@ declare namespace appControl { * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum DisposedType { /** @@ -92,7 +104,8 @@ declare namespace appControl { * * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ BLOCK_APPLICATION = 1, /** @@ -100,7 +113,8 @@ declare namespace appControl { * * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ BLOCK_ABILITY = 2, /** @@ -108,7 +122,8 @@ declare namespace appControl { * * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ NON_BLOCK = 3 } @@ -119,7 +134,8 @@ declare namespace appControl { * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum ControlType { /** @@ -127,7 +143,8 @@ declare namespace appControl { * * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ ALLOWED_LIST = 1, /** @@ -135,7 +152,8 @@ declare namespace appControl { * * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DISALLOWED_LIST = 2 } @@ -146,7 +164,8 @@ declare namespace appControl { * @typedef DisposedRule * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface DisposedRule { /** @@ -155,7 +174,8 @@ declare namespace appControl { * @type { Want } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ want: Want; @@ -165,7 +185,8 @@ declare namespace appControl { * @type { ComponentType } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ componentType: ComponentType; @@ -175,7 +196,8 @@ declare namespace appControl { * @type { DisposedType } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ disposedType: DisposedType; @@ -185,7 +207,8 @@ declare namespace appControl { * @type { ControlType } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ controlType: ControlType; @@ -195,9 +218,10 @@ declare namespace appControl { * @type { Array } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - elementList: Array ; + elementList: Array; /** * Indicates priority of the rule. @@ -205,7 +229,8 @@ declare namespace appControl { * @type { number } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ priority: number; } @@ -216,7 +241,8 @@ declare namespace appControl { * @typedef UninstallDisposedRule * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface UninstallDisposedRule { /** @@ -225,7 +251,8 @@ declare namespace appControl { * @type { Want } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ want: Want; @@ -235,7 +262,8 @@ declare namespace appControl { * @type { UninstallComponentType } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ uninstallComponentType: UninstallComponentType; @@ -245,7 +273,8 @@ declare namespace appControl { * @type { number } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ priority: number; } @@ -304,7 +333,8 @@ declare namespace appControl { * @throws { BusinessError } 17700005 - The specified app ID is empty string. * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDisposedStatus(appId: string, disposedWant: Want, callback: AsyncCallback): void; @@ -322,7 +352,8 @@ declare namespace appControl { * @throws { BusinessError } 17700005 - The specified app ID is empty string. * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDisposedStatus(appId: string, disposedWant: Want): Promise; @@ -339,7 +370,8 @@ declare namespace appControl { * @throws { BusinessError } 17700005 - The specified app ID is empty string. * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDisposedStatusSync(appId: string, disposedWant: Want): void; @@ -356,7 +388,8 @@ declare namespace appControl { * @throws { BusinessError } 17700005 - The specified app ID is empty string. * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDisposedStatus(appId: string, callback: AsyncCallback): void; @@ -373,7 +406,8 @@ declare namespace appControl { * @throws { BusinessError } 17700005 - The specified app ID is empty string. * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDisposedStatus(appId: string): Promise; @@ -390,7 +424,8 @@ declare namespace appControl { * @throws { BusinessError } 17700005 - The specified app ID is empty string. * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDisposedStatusSync(appId: string): Want; @@ -407,7 +442,8 @@ declare namespace appControl { * @throws { BusinessError } 17700005 - The specified app ID is empty string. * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function deleteDisposedStatus(appId: string, callback: AsyncCallback): void; @@ -424,7 +460,8 @@ declare namespace appControl { * @throws { BusinessError } 17700005 - The specified app ID is empty string. * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function deleteDisposedStatus(appId: string): Promise; @@ -456,7 +493,8 @@ declare namespace appControl { * @throws { BusinessError } 17700061 - AppIndex is not in the valid range. * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function deleteDisposedStatusSync(appId: string, appIndex?: number): void; @@ -490,7 +528,8 @@ declare namespace appControl { * @throws { BusinessError } 17700061 - AppIndex is not in the valid range. * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDisposedRule(appId: string, appIndex?: number): DisposedRule; @@ -524,9 +563,10 @@ declare namespace appControl { * @throws { BusinessError } 17700061 - AppIndex is not in the valid range. * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - function setDisposedRule(appId: string, rule: DisposedRule, appIndex?: number): void; + function setDisposedRule(appId: string, rule: DisposedRule, appIndex?: number): void; /** * Sets the uninstall disposed rule of a specified bundle. @@ -544,7 +584,8 @@ declare namespace appControl { * @throws { BusinessError } 17700075 - The specified bundleName of want is not the same with caller. * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ function setUninstallDisposedRule(appIdentifier: string, rule: UninstallDisposedRule, appIndex?: number): void; @@ -563,7 +604,8 @@ declare namespace appControl { * @throws { BusinessError } 17700074 - The specified appIdentifier is invalid. * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ function getUninstallDisposedRule(appIdentifier: string, appIndex?: number): UninstallDisposedRule; @@ -581,7 +623,8 @@ declare namespace appControl { * @throws { BusinessError } 17700074 - The specified appIdentifier is invalid. * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ function deleteUninstallDisposedRule(appIdentifier: string, appIndex?: number): void; diff --git a/api/@ohos.bundle.bundleManager.d.ts b/api/@ohos.bundle.bundleManager.d.ts index 1e26e7c6bb..525a06ae37 100644 --- a/api/@ohos.bundle.bundleManager.d.ts +++ b/api/@ohos.bundle.bundleManager.d.ts @@ -21,14 +21,14 @@ import { AsyncCallback } from './@ohos.base'; import { Metadata as _Metadata } from './bundleManager/Metadata'; import { ElementName as _ElementName } from './bundleManager/ElementName'; -/*** if arkts 1.1 */ -import type { ApplicationInfo as _ApplicationInfo, ModuleMetadata as _ModuleMetadata, - PreinstalledApplicationInfo as _PreinstalledApplicationInfo } from './bundleManager/ApplicationInfo'; +import Want from './@ohos.app.ability.Want'; import { PermissionDef as _PermissionDef } from './bundleManager/PermissionDef'; import { PluginBundleInfo as _PluginBundleInfo, PluginModuleInfo as _PluginModuleInfo} from './bundleManager/PluginBundleInfo'; import { SharedBundleInfo as _SharedBundleInfo } from './bundleManager/SharedBundleInfo'; +/*** if arkts 1.1 */ +import type { ApplicationInfo as _ApplicationInfo, ModuleMetadata as _ModuleMetadata, + PreinstalledApplicationInfo as _PreinstalledApplicationInfo } from './bundleManager/ApplicationInfo'; import type { RecoverableApplicationInfo as _RecoverableApplicationInfo } from './bundleManager/RecoverableApplicationInfo'; -import Want from './@ohos.app.ability.Want'; import * as _AbilityInfo from './bundleManager/AbilityInfo'; import * as _AppProvisionInfo from './bundleManager/AppProvisionInfo'; import * as _BundleInfo from './bundleManager/BundleInfo'; @@ -39,7 +39,9 @@ import * as _Skill from './bundleManager/Skill'; /*** if arkts 1.2 */ import { ApplicationInfo as _ApplicationInfo, ModuleMetadata as _ModuleMetadata, PreinstalledApplicationInfo as _PreinstalledApplicationInfo } from './bundleManager/ApplicationInfo'; +import { RecoverableApplicationInfo as _RecoverableApplicationInfo } from './bundleManager/RecoverableApplicationInfo'; import { AbilityInfo as _AbilityInfo, WindowSize as _WindowSize } from './bundleManager/AbilityInfo'; +import { AppProvisionInfo as _AppProvisionInfo, Validity as _Validity } from './bundleManager/AppProvisionInfo'; import { BundleInfo as _BundleInfo, UsedScene as _UsedScene, ReqPermissionDetail as _ReqPermissionDetail, SignatureInfo as _SignatureInfo, AppCloneIdentity as _AppCloneIdentity } from './bundleManager/BundleInfo'; import { HapModuleInfo as _HapModuleInfo, PreloadItem as _PreloadItem, Dependency as _Dependency, @@ -397,7 +399,7 @@ declare namespace bundleManager { GET_BUNDLE_INFO_ONLY_WITH_LAUNCHER_ABILITY = 0x00001000, /** * Used to obtain the bundle information of an application installed by any user. - * It must be used together with GET_BUNDLE_INFO_WITH_APPLICATION. + * It must be used together with GET_BUNDLE_INFO_WITH_APPLICATION. * It is valid only in the {@link getBundleInfo} and {@link getAllBundleInfo} APIs. * * @syscap SystemCapability.BundleManager.BundleFramework.Core @@ -704,8 +706,7 @@ declare namespace bundleManager { * Indicates extension info with type of form * * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ /** * Indicates extension info with type of form @@ -2191,7 +2192,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700026 - The specified bundle is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getApplicationInfo(bundleName: string, appFlags: number, callback: AsyncCallback): void; @@ -2211,7 +2213,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700026 - The specified bundle is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getApplicationInfo(bundleName: string, appFlags: number, userId: number, callback: AsyncCallback): void; @@ -2232,7 +2235,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700026 - The specified bundle is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getApplicationInfo(bundleName: string, appFlags: number, userId?: number): Promise; @@ -2247,7 +2251,8 @@ declare namespace bundleManager { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllBundleInfo(bundleFlags: number, callback: AsyncCallback>): void; @@ -2264,7 +2269,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700004 - The specified user ID is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllBundleInfo(bundleFlags: number, userId: number, callback: AsyncCallback>): void; @@ -2281,7 +2287,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700004 - The specified user ID is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllBundleInfo(bundleFlags: number, userId?: number): Promise>; @@ -2296,7 +2303,8 @@ declare namespace bundleManager { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllApplicationInfo(appFlags: number, callback: AsyncCallback>): void; @@ -2313,7 +2321,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700004 - The specified user ID is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllApplicationInfo(appFlags: number, userId: number, callback: AsyncCallback>): void; @@ -2331,7 +2340,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700004 - The specified user ID is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllApplicationInfo(appFlags: number, userId?: number): Promise>; @@ -2352,7 +2362,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700029 - The specified ability is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function queryAbilityInfo(want: Want, abilityFlags: number, callback: AsyncCallback>): void; @@ -2375,7 +2386,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700029 - The specified ability is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function queryAbilityInfo(want: Want, abilityFlags: number, userId: number, callback: AsyncCallback>): void; @@ -2399,7 +2411,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700029 - The specified ability is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function queryAbilityInfo(want: Want, abilityFlags: number, userId?: number): Promise>; @@ -2422,7 +2435,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700029 - The specified ability is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function queryAbilityInfo(wants: Array, abilityFlags: number, userId?: number): Promise>; @@ -2445,7 +2459,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700029 - The specified ability is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function queryAbilityInfoSync(want: Want, abilityFlags: number, userId?: number): Array; @@ -2482,7 +2497,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700026 - The specified bundle is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function queryExtensionAbilityInfo(want: Want, extensionAbilityType: ExtensionAbilityType, extensionAbilityFlags: number, callback: AsyncCallback>): void; @@ -2507,7 +2523,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700026 - The specified bundle is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function queryExtensionAbilityInfo(want: Want, extensionAbilityType: ExtensionAbilityType, extensionAbilityFlags: number, userId: number, callback: AsyncCallback>): void; @@ -2532,7 +2549,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700026 - The specified bundle is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function queryExtensionAbilityInfo(want: Want, extensionAbilityType: ExtensionAbilityType, extensionAbilityFlags: number, userId?: number): Promise>; @@ -2557,7 +2575,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700026 - The specified bundle is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function queryExtensionAbilityInfoSync(want: Want, extensionAbilityType: ExtensionAbilityType, extensionAbilityFlags: number, userId?: number): Array; @@ -2582,7 +2601,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700026 - The specified bundle is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function queryExtensionAbilityInfoSync(want: Want, extensionAbilityType: string, extensionAbilityFlags: number, userId?: number): Array; @@ -2604,7 +2624,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700004 - The specified userId is invalid. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function queryExtensionAbilityInfoSync(extensionAbilityType: string, extensionAbilityFlags: number, userId?: number): Array; @@ -2619,7 +2640,8 @@ declare namespace bundleManager { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @throws { BusinessError } 17700021 - The uid is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function getBundleNameByUid(uid: number, callback: AsyncCallback): void; @@ -2633,7 +2655,8 @@ declare namespace bundleManager { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @throws { BusinessError } 17700021 - The uid is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function getBundleNameByUid(uid: number): Promise; @@ -2647,7 +2670,8 @@ declare namespace bundleManager { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @throws { BusinessError } 17700021 - The uid is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function getBundleNameByUidSync(uid: number): string; @@ -2665,7 +2689,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700022 - The hapFilePath is invalid. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getBundleArchiveInfo(hapFilePath: string, bundleFlags: number, callback: AsyncCallback): void; @@ -2683,7 +2708,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700022 - The hapFilePath is invalid. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getBundleArchiveInfo(hapFilePath: string, bundleFlags: number): Promise; @@ -2701,7 +2727,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700022 - The hapFilePath is invalid. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getBundleArchiveInfoSync(hapFilePath: string, bundleFlags: number): BundleInfo; @@ -2718,7 +2745,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700030 - The specified bundle does not support clearing of cache files. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function cleanBundleCacheFiles(bundleName: string, callback: AsyncCallback): void; @@ -2735,7 +2763,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700030 - The specified bundle does not support clearing of cache files. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function cleanBundleCacheFiles(bundleName: string): Promise; @@ -2754,7 +2783,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700061 - AppIndex not in valid range. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ function cleanBundleCacheFiles(bundleName: string, appIndex: number): Promise; @@ -2767,7 +2797,8 @@ declare namespace bundleManager { * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllBundleCacheSize(): Promise; @@ -2780,7 +2811,8 @@ declare namespace bundleManager { * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ function cleanAllBundleCache(): Promise; @@ -2799,7 +2831,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700061 - AppIndex not in valid range. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function setApplicationEnabled(bundleName: string, appIndex: number, isEnabled: boolean): Promise; @@ -2816,7 +2849,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700001 - The specified bundleName is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function setApplicationEnabled(bundleName: string, isEnabled: boolean, callback: AsyncCallback): void; @@ -2833,7 +2867,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700001 - The specified bundleName is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function setApplicationEnabled(bundleName: string, isEnabled: boolean): Promise; @@ -2849,7 +2884,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700001 - The specified bundleName is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function setApplicationEnabledSync(bundleName: string, isEnabled: boolean): void; @@ -2869,7 +2905,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700061 - AppIndex not in valid range. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function setAbilityEnabled(info: AbilityInfo, appIndex: number, isEnabled: boolean): Promise; @@ -2887,7 +2924,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700003 - The specified abilityInfo is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function setAbilityEnabled(info: AbilityInfo, isEnabled: boolean, callback: AsyncCallback): void; @@ -2905,7 +2943,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700003 - The specified abilityInfo is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function setAbilityEnabled(info: AbilityInfo, isEnabled: boolean): Promise; @@ -2922,7 +2961,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700003 - The specified abilityInfo is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function setAbilityEnabledSync(info: AbilityInfo, isEnabled: boolean): void; @@ -2938,7 +2978,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700061 - AppIndex not in valid range. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function isApplicationEnabled(bundleName: string, appIndex: number): Promise; @@ -2952,7 +2993,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700001 - The specified bundleName is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isApplicationEnabled(bundleName: string, callback: AsyncCallback): void; @@ -2966,7 +3008,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700001 - The specified bundleName is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isApplicationEnabled(bundleName: string): Promise; @@ -2998,7 +3041,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700061 - AppIndex not in valid range. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function isAbilityEnabled(info: AbilityInfo, appIndex: number): Promise; @@ -3013,7 +3057,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700003 - The specified abilityName is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isAbilityEnabled(info: AbilityInfo, callback: AsyncCallback): void; @@ -3028,7 +3073,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700003 - The specified abilityName is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isAbilityEnabled(info: AbilityInfo): Promise; @@ -3043,7 +3089,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700003 - The specified abilityName is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function isAbilityEnabledSync(info: AbilityInfo): boolean; @@ -3064,7 +3111,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700026 - The specified bundle is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getLaunchWantForBundle(bundleName: string, userId: number, callback: AsyncCallback): void; @@ -3083,7 +3131,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700026 - The specified bundle is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getLaunchWantForBundle(bundleName: string, callback: AsyncCallback): void; @@ -3104,7 +3153,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700026 - The specified bundle is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getLaunchWantForBundle(bundleName: string, userId?: number): Promise; @@ -3125,7 +3175,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700026 - The specified bundle is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getLaunchWantForBundleSync(bundleName: string, userId?: number): Want; @@ -3138,7 +3189,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700072 - The launch want is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ function getLaunchWant(): Want; @@ -3171,7 +3223,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700029 - The specified ability is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getProfileByAbility(moduleName: string, abilityName: string, metadataName: string, callback: AsyncCallback>): void; @@ -3204,7 +3257,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700029 - The specified ability is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getProfileByAbility(moduleName: string, abilityName: string, metadataName?: string): Promise>; @@ -3237,7 +3291,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700029 - The specified ability is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getProfileByAbilitySync(moduleName: string, abilityName: string, metadataName?: string): Array; @@ -3268,7 +3323,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700024 - Failed to get the profile because there is no profile in the HAP. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getProfileByExtensionAbility(moduleName: string, extensionAbilityName: string, metadataName: string, callback: AsyncCallback>): void; @@ -3299,7 +3355,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700024 - Failed to get the profile because there is no profile in the HAP. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getProfileByExtensionAbility(moduleName: string, extensionAbilityName: string, metadataName?: string): Promise>; @@ -3330,7 +3387,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700024 - Failed to get the profile because there is no profile in the HAP. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getProfileByExtensionAbilitySync(moduleName: string, extensionAbilityName: string, metadataName?: string): Array; @@ -3346,7 +3404,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700006 - The specified permission is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getPermissionDef(permissionName: string, callback: AsyncCallback): void; @@ -3362,7 +3421,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700006 - The specified permission is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getPermissionDef(permissionName: string): Promise; @@ -3378,7 +3438,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700006 - The specified permission is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getPermissionDefSync(permissionName: string): PermissionDef; @@ -3401,7 +3462,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700029 - The specified ability is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAbilityLabel(bundleName: string, moduleName: string, abilityName: string, callback: AsyncCallback): void; @@ -3424,7 +3486,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700029 - The specified ability is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAbilityLabel(bundleName: string, moduleName: string, abilityName: string): Promise; @@ -3447,7 +3510,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700029 - The specified ability is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAbilityLabelSync(bundleName: string, moduleName: string, abilityName: string): string; @@ -3536,7 +3600,8 @@ declare namespace bundleManager { * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllSharedBundleInfo(callback: AsyncCallback>): void; @@ -3549,7 +3614,8 @@ declare namespace bundleManager { * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllSharedBundleInfo(): Promise>; @@ -3567,7 +3633,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700002 - The specified moduleName is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSharedBundleInfo(bundleName: string, moduleName: string, callback: AsyncCallback>): void; @@ -3585,7 +3652,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700002 - The specified moduleName is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSharedBundleInfo(bundleName: string, moduleName: string): Promise>; @@ -3602,7 +3670,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700001 - The specified bundleName is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAppProvisionInfo(bundleName: string, callback: AsyncCallback): void; @@ -3621,7 +3690,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700004 - The specified user ID is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAppProvisionInfo(bundleName: string, userId: number, callback: AsyncCallback): void; @@ -3640,7 +3710,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700004 - The specified user ID is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAppProvisionInfo(bundleName: string, userId?: number): Promise; @@ -3659,7 +3730,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700004 - The specified user ID is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAppProvisionInfoSync(bundleName: string, userId?: number): AppProvisionInfo; @@ -3675,7 +3747,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700001 - The specified bundleName is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSpecifiedDistributionType(bundleName: string): string; @@ -3692,7 +3765,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700001 - The specified bundleName is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAdditionalInfo(bundleName: string): string; @@ -3734,7 +3808,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700026 - The specified bundle is disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getJsonProfile(profileType: ProfileType, bundleName: string, moduleName?: string, userId?: number): string; @@ -3751,7 +3826,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700303 - Failed to obtain extended resources. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getExtResource(bundleName: string): Promise>; @@ -3789,6 +3865,7 @@ declare namespace bundleManager { * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since 20 + * @arkts 1.1&1.2 */ function enableDynamicIcon(bundleName: string, moduleName: string): Promise; @@ -3831,7 +3908,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700305 - Failed to disable the dynamic icon. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function disableDynamicIcon(bundleName: string): Promise; @@ -3871,7 +3949,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700306 - Failed to obtain the dynamic icon. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDynamicIcon(bundleName: string): Promise; @@ -3937,7 +4016,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700201 - Failed to verify the abc file. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function verifyAbc(abcPaths: Array, deleteOriginalFiles: boolean, callback: AsyncCallback): void; @@ -3967,7 +4047,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700201 - Failed to verify the abc file. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function verifyAbc(abcPaths: Array, deleteOriginalFiles: boolean): Promise; @@ -3980,7 +4061,8 @@ declare namespace bundleManager { * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRecoverableApplicationInfo(callback: AsyncCallback>): void; @@ -3993,7 +4075,8 @@ declare namespace bundleManager { * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRecoverableApplicationInfo(): Promise>; @@ -4011,7 +4094,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700053 - The caller is not AppGallery. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function setAdditionalInfo(bundleName: string, additionalInfo: string): void; @@ -4039,7 +4123,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700202 - Failed to delete the abc file. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function deleteAbc(abcPath: string): Promise; @@ -4053,7 +4138,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700056 - The scheme of the specified link is not in the querySchemes. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function canOpenLink(link: string): boolean; @@ -4066,7 +4152,8 @@ declare namespace bundleManager { * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllPreinstalledApplicationInfo(): Promise>; @@ -4083,7 +4170,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700059 - The specified developerId is invalid. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllBundleInfoByDeveloperId(developerId: string): Array; @@ -4098,7 +4186,8 @@ declare namespace bundleManager { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDeveloperIds(appDistributionType?: number): Array; @@ -4115,7 +4204,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700060 - The specified application cannot be uninstalled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function switchUninstallState(bundleName: string, state: boolean): void; @@ -4128,7 +4218,8 @@ declare namespace bundleManager { * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 17700021 - The uid is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSignatureInfo(uid: number): SignatureInfo; @@ -4150,7 +4241,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700061 - AppIndex not in valid range. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAppCloneBundleInfo(bundleName: string, appIndex: number, bundleFlags: number, userId?: number): Promise; @@ -4170,7 +4262,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700026 - The specified bundle and clone apps are all disabled. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllAppCloneBundleInfo(bundleName: string, bundleFlags: number, userId?: number): Promise>; @@ -4184,7 +4277,8 @@ declare namespace bundleManager { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @throws { BusinessError } 17700021 - The uid is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAppCloneIdentity(uid: number): Promise; @@ -4201,13 +4295,14 @@ declare namespace bundleManager { * @throws { BusinessError } 17700004 - The specified user ID is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllPluginInfo(hostBundleName: string, userId?: number): Promise>; /** * Migrate files from the source paths to the destination path. - * + * * @permission ohos.permission.MIGRATE_DATA * @param { Array } sourcePaths - Indicates the source paths to be migrated. * @param { string } destinationPath - Target path for data migration. @@ -4223,7 +4318,8 @@ declare namespace bundleManager { * @throws { BusinessError } 17700086 - System error occurred during copy execution. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function migrateData(sourcePaths: Array, destinationPath: string): Promise; @@ -4748,7 +4844,8 @@ declare namespace bundleManager { * @typedef { _PermissionDef } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type PermissionDef = _PermissionDef; @@ -4776,7 +4873,8 @@ declare namespace bundleManager { * @typedef { _SharedBundleInfo } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export type SharedBundleInfo = _SharedBundleInfo; @@ -4790,6 +4888,17 @@ declare namespace bundleManager { */ export type AppProvisionInfo = _AppProvisionInfo.AppProvisionInfo; + /** + * Obtains profile file information about a bundle. + * + * @typedef { _AppProvisionInfo } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi + * @since 20 + * @arkts 1.2 + */ + export type AppProvisionInfo = _AppProvisionInfo; + /** * Obtains profile file validity about a bundle. * @@ -4800,13 +4909,25 @@ declare namespace bundleManager { */ export type Validity = _AppProvisionInfo.Validity; + /** + * Obtains profile file validity about a bundle. + * + * @typedef { _Validity } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi + * @since 20 + * @arkts 1.2 + */ + export type Validity = _Validity; + /** * Obtains information about a recoverable preinstalled application. * * @typedef { _RecoverableApplicationInfo } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export type RecoverableApplicationInfo = _RecoverableApplicationInfo; @@ -4869,7 +4990,8 @@ declare namespace bundleManager { * @typedef { _PluginBundleInfo } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ export type PluginBundleInfo = _PluginBundleInfo; @@ -4879,7 +5001,8 @@ declare namespace bundleManager { * @typedef { _PluginModuleInfo } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ export type PluginModuleInfo = _PluginModuleInfo; diff --git a/api/@ohos.bundle.bundleMonitor.d.ts b/api/@ohos.bundle.bundleMonitor.d.ts index 8e63401b26..a9f1ed5e4f 100644 --- a/api/@ohos.bundle.bundleMonitor.d.ts +++ b/api/@ohos.bundle.bundleMonitor.d.ts @@ -26,7 +26,8 @@ import { Callback } from './@ohos.base'; * @namespace bundleMonitor * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace bundleMonitor { /** @@ -35,7 +36,8 @@ declare namespace bundleMonitor { * @typedef BundleChangedInfo * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface BundleChangedInfo { /** @@ -45,7 +47,8 @@ declare namespace bundleMonitor { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly bundleName: string; /** @@ -55,7 +58,8 @@ declare namespace bundleMonitor { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly userId: number; /** @@ -65,7 +69,8 @@ declare namespace bundleMonitor { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly appIndex: number; } @@ -76,7 +81,8 @@ declare namespace bundleMonitor { * @typedef { 'add' | 'update' | 'remove' } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ type BundleChangedEvent = 'add' | 'update' | 'remove'; @@ -91,7 +97,8 @@ declare namespace bundleMonitor { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: BundleChangedEvent, callback: Callback): void; @@ -106,7 +113,8 @@ declare namespace bundleMonitor { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: BundleChangedEvent, callback?: Callback): void; } diff --git a/api/@ohos.bundle.bundleResourceManager.d.ts b/api/@ohos.bundle.bundleResourceManager.d.ts index a4b4608c5d..20cbf30fd3 100644 --- a/api/@ohos.bundle.bundleResourceManager.d.ts +++ b/api/@ohos.bundle.bundleResourceManager.d.ts @@ -24,7 +24,9 @@ import type { BundleResourceInfo as _BundleResourceInfo } from './bundleManager/ import type { LauncherAbilityResourceInfo as _LauncherAbilityResourceInfo } from './bundleManager/LauncherAbilityResourceInfo'; /*** endif */ /*** if arkts 1.2 */ +import { AsyncCallback } from './@ohos.base'; import { BundleResourceInfo as _BundleResourceInfo } from './bundleManager/BundleResourceInfo'; +import { LauncherAbilityResourceInfo as _LauncherAbilityResourceInfo } from './bundleManager/LauncherAbilityResourceInfo'; /*** endif */ /** @@ -123,7 +125,8 @@ declare namespace bundleResourceManager { * @throws { BusinessError } 17700001 - The specified bundleName is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getBundleResourceInfo(bundleName: string, resourceFlags?: number): BundleResourceInfo; @@ -160,7 +163,8 @@ declare namespace bundleResourceManager { * @throws { BusinessError } 17700001 - The specified bundleName is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: number): Array; @@ -180,7 +184,8 @@ declare namespace bundleResourceManager { * @throws { BusinessError } 17700061 - AppIndex not in valid range or not found. * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: number, appIndex?: number): Array; @@ -195,7 +200,8 @@ declare namespace bundleResourceManager { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllBundleResourceInfo(resourceFlags: number, callback: AsyncCallback>): void; @@ -210,7 +216,8 @@ declare namespace bundleResourceManager { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllBundleResourceInfo(resourceFlags: number): Promise>; @@ -225,7 +232,8 @@ declare namespace bundleResourceManager { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllLauncherAbilityResourceInfo(resourceFlags: number, callback: AsyncCallback>): void; @@ -240,7 +248,8 @@ declare namespace bundleResourceManager { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllLauncherAbilityResourceInfo(resourceFlags: number): Promise>; @@ -282,7 +291,8 @@ declare namespace bundleResourceManager { * @typedef { _LauncherAbilityResourceInfo } * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export type LauncherAbilityResourceInfo = _LauncherAbilityResourceInfo; } diff --git a/api/@ohos.bundle.defaultAppManager.d.ts b/api/@ohos.bundle.defaultAppManager.d.ts index 7ee73e02f6..358a1d920b 100644 --- a/api/@ohos.bundle.defaultAppManager.d.ts +++ b/api/@ohos.bundle.defaultAppManager.d.ts @@ -27,7 +27,8 @@ import { ElementName } from './bundleManager/ElementName'; * * @namespace defaultAppManager * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace defaultAppManager { /** @@ -35,70 +36,80 @@ declare namespace defaultAppManager { * * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum ApplicationType { /** * Default browser identifier. * * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ BROWSER = 'Web Browser', /** * Default image identifier. * * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ IMAGE = 'Image Gallery', /** * Default audio identifier. * * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ AUDIO = 'Audio Player', /** * Default video identifier. * * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ VIDEO = 'Video Player', /** * Default PDF identifier. * * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ PDF = 'PDF Viewer', /** * Default word identifier. * * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ WORD = 'Word Viewer', /** * Default excel identifier. * * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ EXCEL = 'Excel Viewer', /** * Default PPT identifier. * * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ PPT = 'PPT Viewer', /** * Default email identifier. * * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ EMAIL = 'Email' } @@ -111,7 +122,8 @@ declare namespace defaultAppManager { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @throws { BusinessError } 801 - Capability not supported. * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isDefaultApplication(type: string, callback: AsyncCallback): void; @@ -123,7 +135,8 @@ declare namespace defaultAppManager { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @throws { BusinessError } 801 - Capability not supported. * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isDefaultApplication(type: string): Promise; @@ -135,7 +148,8 @@ declare namespace defaultAppManager { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @throws { BusinessError } 801 - Capability not supported. * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function isDefaultApplicationSync(type: string): boolean; @@ -155,7 +169,8 @@ declare namespace defaultAppManager { * @throws { BusinessError } 17700025 - The specified type is invalid. * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDefaultApplication(type: string, userId: number, callback: AsyncCallback): void; @@ -173,7 +188,8 @@ declare namespace defaultAppManager { * @throws { BusinessError } 17700025 - The specified type is invalid. * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDefaultApplication(type: string, callback: AsyncCallback): void; @@ -193,7 +209,8 @@ declare namespace defaultAppManager { * @throws { BusinessError } 17700025 - The specified type is invalid. * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDefaultApplication(type: string, userId?: number): Promise; @@ -213,7 +230,8 @@ declare namespace defaultAppManager { * @throws { BusinessError } 17700025 - The specified type is invalid. * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDefaultApplicationSync(type: string, userId?: number): BundleInfo; @@ -234,7 +252,8 @@ declare namespace defaultAppManager { * @throws { BusinessError } 17700028 - The specified ability does not match the type. * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDefaultApplication(type: string, elementName: ElementName, userId: number, callback: AsyncCallback): void; @@ -254,7 +273,8 @@ declare namespace defaultAppManager { * @throws { BusinessError } 17700028 - The specified ability does not match the type. * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDefaultApplication(type: string, elementName: ElementName, callback: AsyncCallback): void; @@ -275,7 +295,8 @@ declare namespace defaultAppManager { * @throws { BusinessError } 17700028 - The specified ability does not match the type. * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDefaultApplication(type: string, elementName: ElementName, userId?: number): Promise; @@ -295,7 +316,8 @@ declare namespace defaultAppManager { * @throws { BusinessError } 17700028 - The specified ability does not match the type. * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDefaultApplicationSync(type: string, elementName: ElementName, userId?: number): void; @@ -314,7 +336,8 @@ declare namespace defaultAppManager { * @throws { BusinessError } 17700025 - The specified type is invalid. * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function resetDefaultApplication(type: string, userId: number, callback: AsyncCallback): void; @@ -331,7 +354,8 @@ declare namespace defaultAppManager { * @throws { BusinessError } 17700025 - The specified type is invalid. * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function resetDefaultApplication(type: string, callback: AsyncCallback): void; @@ -350,7 +374,8 @@ declare namespace defaultAppManager { * @throws { BusinessError } 17700025 - The specified type is invalid. * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function resetDefaultApplication(type: string, userId?: number): Promise; @@ -368,7 +393,8 @@ declare namespace defaultAppManager { * @throws { BusinessError } 17700025 - The specified type is invalid. * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function resetDefaultApplicationSync(type: string, userId?: number): void; } diff --git a/api/@ohos.bundle.distributedBundleManager.d.ts b/api/@ohos.bundle.distributedBundleManager.d.ts index bc13c960d8..a85231f931 100644 --- a/api/@ohos.bundle.distributedBundleManager.d.ts +++ b/api/@ohos.bundle.distributedBundleManager.d.ts @@ -28,7 +28,8 @@ import { RemoteAbilityInfo as _RemoteAbilityInfo } from './bundleManager/RemoteA * @namespace distributedBundleManager * @syscap SystemCapability.BundleManager.DistributedBundleFramework * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace distributedBundleManager { /** @@ -47,7 +48,8 @@ declare namespace distributedBundleManager { * @throws { BusinessError } 17700027 - The distributed service is not running. * @syscap SystemCapability.BundleManager.DistributedBundleFramework * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRemoteAbilityInfo(elementName: ElementName, callback: AsyncCallback): void; @@ -67,7 +69,8 @@ declare namespace distributedBundleManager { * @throws { BusinessError } 17700027 - The distributed service is not running. * @syscap SystemCapability.BundleManager.DistributedBundleFramework * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRemoteAbilityInfo(elementName: ElementName): Promise; @@ -87,7 +90,8 @@ declare namespace distributedBundleManager { * @throws { BusinessError } 17700027 - The distributed service is not running. * @syscap SystemCapability.BundleManager.DistributedBundleFramework * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRemoteAbilityInfo(elementNames: Array, callback: AsyncCallback>): void; @@ -108,7 +112,8 @@ declare namespace distributedBundleManager { * @throws { BusinessError } 17700027 - The distributed service is not running. * @syscap SystemCapability.BundleManager.DistributedBundleFramework * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRemoteAbilityInfo(elementNames: Array): Promise>; @@ -129,7 +134,8 @@ declare namespace distributedBundleManager { * @throws { BusinessError } 17700027 - The distributed service is not running. * @syscap SystemCapability.BundleManager.DistributedBundleFramework * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRemoteAbilityInfo(elementName: ElementName, locale: string, callback: AsyncCallback): void; @@ -151,7 +157,8 @@ declare namespace distributedBundleManager { * @throws { BusinessError } 17700027 - The distributed service is not running. * @syscap SystemCapability.BundleManager.DistributedBundleFramework * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRemoteAbilityInfo(elementName: ElementName, locale: string): Promise; @@ -172,7 +179,8 @@ declare namespace distributedBundleManager { * @throws { BusinessError } 17700027 - The distributed service is not running. * @syscap SystemCapability.BundleManager.DistributedBundleFramework * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRemoteAbilityInfo(elementNames: Array, locale: string, callback: AsyncCallback>): void; @@ -194,7 +202,8 @@ declare namespace distributedBundleManager { * @throws { BusinessError } 17700027 - The distributed service is not running. * @syscap SystemCapability.BundleManager.DistributedBundleFramework * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRemoteAbilityInfo(elementNames: Array, locale: string): Promise>; @@ -204,7 +213,8 @@ declare namespace distributedBundleManager { * @typedef { _RemoteAbilityInfo } * @syscap SystemCapability.BundleManager.DistributedBundleFramework * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type RemoteAbilityInfo = _RemoteAbilityInfo; } diff --git a/api/@ohos.bundle.freeInstall.d.ts b/api/@ohos.bundle.freeInstall.d.ts index 1a2aae8686..a156bc3015 100644 --- a/api/@ohos.bundle.freeInstall.d.ts +++ b/api/@ohos.bundle.freeInstall.d.ts @@ -20,7 +20,15 @@ import { AsyncCallback } from './@ohos.base'; import { DispatchInfo as _DispatchInfo } from './bundleManager/DispatchInfo'; +/*** if arkts 1.1 */ import * as _PackInfo from './bundleManager/BundlePackInfo'; +/*** endif */ +/*** if arkts 1.2 */ +import { BundlePackInfo as _BundlePackInfo, PackageConfig as _PackageConfig, PackageSummary as _PackageSummary, + BundleConfigInfo as _BundleConfigInfo, ExtensionAbility as _ExtensionAbility, ModuleConfigInfo as _ModuleConfigInfo, + ModuleDistroInfo as _ModuleDistroInfo, ModuleAbilityInfo as _ModuleAbilityInfo, AbilityFormInfo as _AbilityFormInfo, + Version as _Version, ApiVersion as _ApiVersion } from './bundleManager/BundlePackInfo'; +/*** endif */ /** * Free install bundle manager. @@ -28,7 +36,8 @@ import * as _PackInfo from './bundleManager/BundlePackInfo'; * @namespace freeInstall * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace freeInstall { /** @@ -37,7 +46,8 @@ declare namespace freeInstall { * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum UpgradeFlag { /** @@ -45,7 +55,8 @@ declare namespace freeInstall { * * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ NOT_UPGRADE = 0, /** @@ -53,7 +64,8 @@ declare namespace freeInstall { * * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ SINGLE_UPGRADE = 1, /** @@ -61,7 +73,8 @@ declare namespace freeInstall { * * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ RELATION_UPGRADE = 2 } @@ -73,7 +86,8 @@ declare namespace freeInstall { * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum BundlePackFlag { /** @@ -81,7 +95,8 @@ declare namespace freeInstall { * * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ GET_PACK_INFO_ALL = 0x00000000, /** @@ -89,7 +104,8 @@ declare namespace freeInstall { * * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ GET_PACKAGES = 0x00000001, /** @@ -97,7 +113,8 @@ declare namespace freeInstall { * * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ GET_BUNDLE_SUMMARY = 0x00000002, /** @@ -105,7 +122,8 @@ declare namespace freeInstall { * * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ GET_MODULE_SUMMARY = 0x00000004 } @@ -126,7 +144,8 @@ declare namespace freeInstall { * @throws { BusinessError } 17700002 - The specified module name is not found. * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function setHapModuleUpgradeFlag(bundleName: string, moduleName: string, upgradeFlag: UpgradeFlag, callback: AsyncCallback): void; @@ -147,7 +166,8 @@ declare namespace freeInstall { * @throws { BusinessError } 17700002 - The specified module name is not found. * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function setHapModuleUpgradeFlag(bundleName: string, moduleName: string, upgradeFlag: UpgradeFlag): Promise; @@ -167,7 +187,8 @@ declare namespace freeInstall { * @throws { BusinessError } 17700002 - The specified module name is not found. * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isHapModuleRemovable(bundleName: string, moduleName: string, callback: AsyncCallback): void; @@ -186,7 +207,8 @@ declare namespace freeInstall { * @throws { BusinessError } 17700002 - The specified module name is not found. * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isHapModuleRemovable(bundleName: string, moduleName: string): Promise; @@ -204,7 +226,8 @@ declare namespace freeInstall { * @throws { BusinessError } 17700001 - The specified bundle name is not found. * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getBundlePackInfo(bundleName: string, bundlePackFlag: BundlePackFlag, callback: AsyncCallback): void; @@ -223,7 +246,8 @@ declare namespace freeInstall { * @throws { BusinessError } 17700001 - The specified bundle name is not found. * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getBundlePackInfo(bundleName: string, bundlePackFlag: BundlePackFlag): Promise; @@ -237,7 +261,8 @@ declare namespace freeInstall { * @throws { BusinessError } 801 - Capability not supported. * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDispatchInfo(callback: AsyncCallback): void; @@ -251,7 +276,8 @@ declare namespace freeInstall { * @throws { BusinessError } 801 - Capability not supported. * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDispatchInfo(): Promise; @@ -261,7 +287,8 @@ declare namespace freeInstall { * @typedef { _DispatchInfo } * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type DispatchInfo = _DispatchInfo; @@ -275,6 +302,17 @@ declare namespace freeInstall { */ export type BundlePackInfo = _PackInfo.BundlePackInfo; + /** + * The bundle pack info class. + * + * @typedef { _BundlePackInfo } + * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall + * @systemapi + * @since 20 + * @arkts 1.2 + */ + export type BundlePackInfo = _BundlePackInfo; + /** * The package info class. * @@ -285,6 +323,17 @@ declare namespace freeInstall { */ export type PackageConfig = _PackInfo.PackageConfig; + /** + * The package info class. + * + * @typedef { _PackageConfig } + * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall + * @systemapi + * @since 20 + * @arkts 1.2 + */ + export type PackageConfig = _PackageConfig; + /** * The package summary class. * @@ -295,6 +344,17 @@ declare namespace freeInstall { */ export type PackageSummary = _PackInfo.PackageSummary; + /** + * The package summary class. + * + * @typedef { _PackageSummary } + * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall + * @systemapi + * @since 20 + * @arkts 1.2 + */ + export type PackageSummary = _PackageSummary; + /** * The bundle summary class. * @@ -305,6 +365,17 @@ declare namespace freeInstall { */ export type BundleConfigInfo = _PackInfo.BundleConfigInfo; + /** + * The bundle summary class. + * + * @typedef { _BundleConfigInfo } + * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall + * @systemapi + * @since 20 + * @arkts 1.2 + */ + export type BundleConfigInfo = _BundleConfigInfo; + /** * The extension ability forms class. * @@ -315,6 +386,17 @@ declare namespace freeInstall { */ export type ExtensionAbility = _PackInfo.ExtensionAbility; + /** + * The extension ability forms class. + * + * @typedef { _ExtensionAbility } + * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall + * @systemapi + * @since 20 + * @arkts 1.2 + */ + export type ExtensionAbility = _ExtensionAbility; + /** * The module summary of a bundle. * @@ -325,6 +407,17 @@ declare namespace freeInstall { */ export type ModuleConfigInfo = _PackInfo.ModuleConfigInfo; + /** + * The module summary of a bundle. + * + * @typedef { _ModuleConfigInfo } + * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall + * @systemapi + * @since 20 + * @arkts 1.2 + */ + export type ModuleConfigInfo = _ModuleConfigInfo; + /** * The bundle info summary class. * @@ -335,6 +428,17 @@ declare namespace freeInstall { */ export type ModuleDistroInfo = _PackInfo.ModuleDistroInfo; + /** + * The bundle info summary class. + * + * @typedef { _ModuleDistroInfo } + * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall + * @systemapi + * @since 20 + * @arkts 1.2 + */ + export type ModuleDistroInfo = _ModuleDistroInfo; + /** * The ability info of a module. * @@ -345,6 +449,17 @@ declare namespace freeInstall { */ export type ModuleAbilityInfo = _PackInfo.ModuleAbilityInfo; + /** + * The ability info of a module. + * + * @typedef { _ModuleAbilityInfo } + * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall + * @systemapi + * @since 20 + * @arkts 1.2 + */ + export type ModuleAbilityInfo = _ModuleAbilityInfo; + /** * The form info of an ability. * @@ -355,6 +470,17 @@ declare namespace freeInstall { */ export type AbilityFormInfo = _PackInfo.AbilityFormInfo; + /** + * The form info of an ability. + * + * @typedef { _AbilityFormInfo } + * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall + * @systemapi + * @since 20 + * @arkts 1.2 + */ + export type AbilityFormInfo = _AbilityFormInfo; + /** * The bundle version class. * @@ -365,6 +491,17 @@ declare namespace freeInstall { */ export type Version = _PackInfo.Version; + /** + * The bundle version class. + * + * @typedef { _Version } + * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall + * @systemapi + * @since 20 + * @arkts 1.2 + */ + export type Version = _Version; + /** * The bundle Api version class. * @@ -374,6 +511,17 @@ declare namespace freeInstall { * @since 9 */ export type ApiVersion = _PackInfo.ApiVersion; + + /** + * The bundle Api version class. + * + * @typedef { _ApiVersion } + * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall + * @systemapi + * @since 20 + * @arkts 1.2 + */ + export type ApiVersion = _ApiVersion; } export default freeInstall; diff --git a/api/@ohos.bundle.installer.d.ts b/api/@ohos.bundle.installer.d.ts index 6f0fc7461f..e3623e7de4 100644 --- a/api/@ohos.bundle.installer.d.ts +++ b/api/@ohos.bundle.installer.d.ts @@ -26,7 +26,8 @@ import { AsyncCallback } from './@ohos.base'; * @namespace installer * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace installer { /** @@ -37,7 +38,8 @@ declare namespace installer { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Incorrect parameter types. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getBundleInstaller(callback: AsyncCallback): void; @@ -48,7 +50,8 @@ declare namespace installer { * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getBundleInstaller(): Promise; @@ -59,7 +62,8 @@ declare namespace installer { * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getBundleInstallerSync(): BundleInstaller; @@ -69,7 +73,8 @@ declare namespace installer { * @interface BundleInstaller * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface BundleInstaller { /** @@ -363,7 +368,8 @@ declare namespace installer { * @throws { BusinessError } 17700077 - Failed to install the HAP and restore to preinstalled bundle. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ install(hapFilePaths: Array, installParam: InstallParam, callback: AsyncCallback): void; @@ -640,7 +646,8 @@ declare namespace installer { * @throws { BusinessError } 17700077 - Failed to install the HAP and restore to preinstalled bundle. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ install(hapFilePaths: Array, callback: AsyncCallback): void; @@ -935,7 +942,8 @@ declare namespace installer { * @throws { BusinessError } 17700077 - Failed to install the HAP and restore to preinstalled bundle. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ install(hapFilePaths: Array, installParam?: InstallParam): Promise; @@ -1019,7 +1027,8 @@ declare namespace installer { * @throws { BusinessError } 17700067 - Failed to uninstall the HAP because uninstalling the native package failed. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ uninstall(bundleName: string, installParam: InstallParam, callback: AsyncCallback): void; @@ -1075,7 +1084,8 @@ declare namespace installer { * @throws { BusinessError } 17700067 - Failed to uninstall the HAP because uninstalling the native package failed. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ uninstall(bundleName: string, callback: AsyncCallback): void; @@ -1159,7 +1169,8 @@ declare namespace installer { * @throws { BusinessError } 17700067 - Failed to uninstall the HAP because uninstalling the native package failed. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ uninstall(bundleName: string, installParam?: InstallParam): Promise; @@ -1215,7 +1226,8 @@ declare namespace installer { *
bundle name but different signature information exists on the device. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ recover(bundleName: string, installParam: InstallParam, callback: AsyncCallback): void; @@ -1265,7 +1277,8 @@ declare namespace installer { *
bundle name but different signature information exists on the device. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ recover(bundleName: string, callback: AsyncCallback): void; @@ -1321,7 +1334,8 @@ declare namespace installer { *
bundle name but different signature information exists on the device. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ recover(bundleName: string, installParam?: InstallParam): Promise; @@ -1339,7 +1353,8 @@ declare namespace installer { * @throws { BusinessError } 17700038 - The specified shared bundle does not exist. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ uninstall(uninstallParam: UninstallParam, callback: AsyncCallback): void; @@ -1357,7 +1372,8 @@ declare namespace installer { * @throws { BusinessError } 17700038 - The specified shared bundle does not exist. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ uninstall(uninstallParam: UninstallParam): Promise; @@ -1429,7 +1445,8 @@ declare namespace installer { * @throws { BusinessError } 17700051 - Failed to install the HAP because the distribution type of caller application is not enterprise_mdm. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ updateBundleForSelf(hapFilePaths: Array, installParam: InstallParam, callback: AsyncCallback): void; @@ -1493,7 +1510,8 @@ declare namespace installer { * @throws { BusinessError } 17700051 - Failed to install the HAP because the distribution type of caller application is not enterprise_mdm. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ updateBundleForSelf(hapFilePaths: Array, callback: AsyncCallback): void; @@ -1565,7 +1583,8 @@ declare namespace installer { * @throws { BusinessError } 17700051 - Failed to install the HAP because the distribution type of caller application is not enterprise_mdm. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ updateBundleForSelf(hapFilePaths: Array, installParam?: InstallParam): Promise; @@ -1605,7 +1624,8 @@ declare namespace installer { *
bundle name but different signature information exists on the device. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ uninstallUpdates(bundleName: string, installParam?: InstallParam): Promise; @@ -1623,7 +1643,8 @@ declare namespace installer { * @throws { BusinessError } 17700301 - AddExtResource failed due to parse file failed. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ addExtResource(bundleName: string, filePaths: Array): Promise; @@ -1641,7 +1662,8 @@ declare namespace installer { * @throws { BusinessError } 17700302 - RemoveExtResource failed due to module does not exist. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ removeExtResource(bundleName: string, moduleNames: Array): Promise; @@ -1661,7 +1683,8 @@ declare namespace installer { * @throws { BusinessError } 17700069 - The app does not support the creation of an appClone instance. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ createAppClone(bundleName: string, createAppCloneParam?: CreateAppCloneParam): Promise; @@ -1706,6 +1729,28 @@ declare namespace installer { */ destroyAppClone(bundleName: string, appIndex: number, destroyAppCloneParam?: DestroyAppCloneParam): Promise; + /** + * Destroy clone instance for an application. + * + * @permission ohos.permission.UNINSTALL_CLONE_BUNDLE + * @param { string } bundleName - Indicates the bundleName of clone app. + * @param { number } appIndex - Indicates the clone application's index. + * @param { number | DestroyAppCloneParam } [options] - Indicates other parameters required for the uninstallation. + * @returns { Promise } the promise returned by the function. + * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.UNINSTALL_CLONE_BUNDLE'. + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. + * @throws { BusinessError } 17700001 - The specified bundleName cannot be found or the bundle is not installed by the specified user. + * @throws { BusinessError } 17700004 - The userId is invalid. + * @throws { BusinessError } 17700061 - AppIndex not in valid range. + * @throws { BusinessError } 17700062 - Failed to uninstall the app because the app is locked. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi + * @since 20 + * @arkts 1.2 + */ + destroyAppClone(bundleName: string, appIndex: number, options?: number | DestroyAppCloneParam): Promise; + /** * Install application by bundle name with specified user. * @@ -1740,7 +1785,8 @@ declare namespace installer { *
from being installed on this device or by specified users. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ installPreexistingApp(bundleName: string, userId?: number): Promise; @@ -1773,7 +1819,8 @@ declare namespace installer { * @throws { BusinessError } 17700091 - Failed to install the plugin because the plugin name is same as host bundle name. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ installPlugin(hostBundleName: string, pluginFilePaths: Array, pluginParam?: PluginParam): Promise; @@ -1792,7 +1839,8 @@ declare namespace installer { * @throws { BusinessError } 17700092 - Failed to uninstall the plugin because the specified plugin is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ uninstallPlugin(hostBundleName: string, pluginBundleName: string, pluginParam?: PluginParam): Promise; } @@ -1803,7 +1851,8 @@ declare namespace installer { * @typedef HashParam * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface HashParam { /** @@ -1812,7 +1861,8 @@ declare namespace installer { * @type { string } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ moduleName: string; @@ -1822,7 +1872,8 @@ declare namespace installer { * @type { string } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ hashValue: string; } @@ -1866,7 +1917,8 @@ declare namespace installer { * @typedef PGOParam * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface PGOParam { /** @@ -1875,7 +1927,8 @@ declare namespace installer { * @type { string } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ moduleName: string; @@ -1885,7 +1938,8 @@ declare namespace installer { * @type { string } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ pgoFilePath: string; } @@ -1896,7 +1950,8 @@ declare namespace installer { * @typedef Parameters * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface Parameters { /** @@ -1905,7 +1960,8 @@ declare namespace installer { * @type { string } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ key: string; @@ -1915,7 +1971,8 @@ declare namespace installer { * @type { string } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ value: string; } @@ -1926,7 +1983,8 @@ declare namespace installer { * @typedef InstallParam * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface InstallParam { /** @@ -1935,7 +1993,8 @@ declare namespace installer { * @type { ?number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ userId?: number; @@ -1945,7 +2004,8 @@ declare namespace installer { * @type { ?number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ installFlag?: number; @@ -1955,7 +2015,8 @@ declare namespace installer { * @type { ?boolean } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ isKeepData?: boolean; @@ -1965,7 +2026,8 @@ declare namespace installer { * @type { ?Array } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ hashParams?: Array; @@ -1975,7 +2037,8 @@ declare namespace installer { * @type { ?number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ crowdtestDeadline?: number; @@ -1985,7 +2048,8 @@ declare namespace installer { * @type { ?Array } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ sharedBundleDirPaths?: Array; @@ -1995,7 +2059,8 @@ declare namespace installer { * @type { ?string } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ specifiedDistributionType?: string; @@ -2005,7 +2070,8 @@ declare namespace installer { * @type { ?string } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ additionalInfo?: string; @@ -2026,7 +2092,8 @@ declare namespace installer { * @type { ?Array } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ pgoParams?: Array; @@ -2036,7 +2103,8 @@ declare namespace installer { * @type { ?Array } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ parameters?: Array; } @@ -2047,7 +2115,8 @@ declare namespace installer { * @typedef UninstallParam * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface UninstallParam { /** @@ -2056,7 +2125,8 @@ declare namespace installer { * @type { string } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ bundleName: string; @@ -2066,7 +2136,8 @@ declare namespace installer { * @type { ?number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ versionCode?: number; } @@ -2077,7 +2148,8 @@ declare namespace installer { * @typedef CreateAppCloneParam * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface CreateAppCloneParam { /** @@ -2086,7 +2158,8 @@ declare namespace installer { * @type { ?number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ userId?: number; /** @@ -2095,7 +2168,8 @@ declare namespace installer { * @type { ?number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ appIndex?: number; } @@ -2106,7 +2180,8 @@ declare namespace installer { * @typedef DestroyAppCloneParam * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface DestroyAppCloneParam { /** @@ -2115,7 +2190,8 @@ declare namespace installer { * @type { ?number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ userId?: number; /** @@ -2124,7 +2200,8 @@ declare namespace installer { * @type { ?Array } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ parameters?: Array; } @@ -2135,7 +2212,8 @@ declare namespace installer { * @typedef PluginParam * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface PluginParam { /** @@ -2144,7 +2222,8 @@ declare namespace installer { * @type { ?number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ userId?: number; @@ -2154,7 +2233,8 @@ declare namespace installer { * @type { ?Array } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ parameters?: Array; } diff --git a/api/@ohos.bundle.launcherBundleManager.d.ts b/api/@ohos.bundle.launcherBundleManager.d.ts index 04a2b525eb..d6d897bb73 100644 --- a/api/@ohos.bundle.launcherBundleManager.d.ts +++ b/api/@ohos.bundle.launcherBundleManager.d.ts @@ -18,9 +18,9 @@ * @kit AbilityKit */ -/*** if arkts 1.1 */ import { AsyncCallback } from './@ohos.base'; import { LauncherAbilityInfo as _LauncherAbilityInfo } from './bundleManager/LauncherAbilityInfo'; +/*** if arkts 1.1 */ import AbilityConstant from './@ohos.app.ability.AbilityConstant'; /*** endif */ import { ShortcutInfo as _ShortcutInfo, ShortcutWant as _ShortcutWant, ParameterItem as _ParameterItem } from './bundleManager/ShortcutInfo'; @@ -50,7 +50,8 @@ declare namespace launcherBundleManager { * @throws { BusinessError } 17700004 - The specified user ID is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getLauncherAbilityInfo(bundleName: string, userId: number, callback: AsyncCallback>): void; @@ -70,7 +71,8 @@ declare namespace launcherBundleManager { * @throws { BusinessError } 17700004 - The specified user ID is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getLauncherAbilityInfo(bundleName: string, userId: number): Promise>; @@ -86,7 +88,8 @@ declare namespace launcherBundleManager { * @throws { BusinessError } 17700001 - The specified bundle name is not found. * @throws { BusinessError } 17700004 - The specified user ID is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getLauncherAbilityInfoSync(bundleName: string, userId: number): Array; @@ -103,7 +106,8 @@ declare namespace launcherBundleManager { * @throws { BusinessError } 17700004 - The specified user ID is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllLauncherAbilityInfo(userId: number, callback: AsyncCallback>): void; @@ -120,7 +124,8 @@ declare namespace launcherBundleManager { * @throws { BusinessError } 17700004 - The specified user ID is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllLauncherAbilityInfo(userId: number): Promise>; @@ -137,7 +142,8 @@ declare namespace launcherBundleManager { * @throws { BusinessError } 17700001 - The specified bundle name is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getShortcutInfo(bundleName: string, callback: AsyncCallback>): void; @@ -154,7 +160,8 @@ declare namespace launcherBundleManager { * @throws { BusinessError } 17700001 - The specified bundle name is not found. * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getShortcutInfo(bundleName: string): Promise>; @@ -258,7 +265,8 @@ declare namespace launcherBundleManager { * * @typedef { _LauncherAbilityInfo } * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ export type LauncherAbilityInfo = _LauncherAbilityInfo; diff --git a/api/@ohos.bundle.overlay.d.ts b/api/@ohos.bundle.overlay.d.ts index 56f0b171e9..f4bcece3b4 100755 --- a/api/@ohos.bundle.overlay.d.ts +++ b/api/@ohos.bundle.overlay.d.ts @@ -19,14 +19,20 @@ */ import { AsyncCallback } from './@ohos.base'; +/*** if arkts 1.1 */ import * as _OverlayModuleInfo from './bundleManager/OverlayModuleInfo'; +/*** endif */ +/*** if arkts 1.2 */ +import { OverlayModuleInfo as _OverlayModuleInfo } from './bundleManager/OverlayModuleInfo'; +/*** endif */ /** * Used for application interception overlay * * @namespace overlay * @syscap SystemCapability.BundleManager.BundleFramework.Overlay - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace overlay { /** @@ -39,7 +45,8 @@ declare namespace overlay { * @throws { BusinessError } 17700002 - The specified module name is not found. * @throws { BusinessError } 17700033 - The specified module is not an overlay module. * @syscap SystemCapability.BundleManager.BundleFramework.Overlay - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function setOverlayEnabled(moduleName: string, isEnabled: boolean, callback: AsyncCallback): void; @@ -53,7 +60,8 @@ declare namespace overlay { * @throws { BusinessError } 17700002 - The specified module name is not found. * @throws { BusinessError } 17700033 - The specified module is not an overlay module. * @syscap SystemCapability.BundleManager.BundleFramework.Overlay - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function setOverlayEnabled(moduleName: string, isEnabled: boolean): Promise; @@ -74,7 +82,8 @@ declare namespace overlay { * @throws { BusinessError } 17700033 - The specified module is not an overlay module. * @syscap SystemCapability.BundleManager.BundleFramework.Overlay * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function setOverlayEnabledByBundleName(bundleName: string, moduleName: string, isEnabled: boolean, callback: AsyncCallback): void; @@ -96,7 +105,8 @@ declare namespace overlay { * @throws { BusinessError } 17700033 - The specified module is not an overlay module. * @syscap SystemCapability.BundleManager.BundleFramework.Overlay * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function setOverlayEnabledByBundleName(bundleName: string, moduleName: string, isEnabled: boolean): Promise; @@ -110,7 +120,8 @@ declare namespace overlay { * @throws { BusinessError } 17700032 - The specified bundle does not contain any overlay module. * @throws { BusinessError } 17700033 - The specified module is not an overlay module. * @syscap SystemCapability.BundleManager.BundleFramework.Overlay - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getOverlayModuleInfo(moduleName: string, callback: AsyncCallback): void; @@ -124,7 +135,8 @@ declare namespace overlay { * @throws { BusinessError } 17700032 - The specified bundle does not contain any overlay module. * @throws { BusinessError } 17700033 - The specified module is not an overlay module. * @syscap SystemCapability.BundleManager.BundleFramework.Overlay - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getOverlayModuleInfo(moduleName: string): Promise; @@ -137,7 +149,8 @@ declare namespace overlay { * @throws { BusinessError } 17700002 - The specified module name is not found. * @throws { BusinessError } 17700034 - The specified module is an overlay module. * @syscap SystemCapability.BundleManager.BundleFramework.Overlay - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getTargetOverlayModuleInfos(targetModuleName: string, callback: AsyncCallback>): void; @@ -151,7 +164,8 @@ declare namespace overlay { * @throws { BusinessError } 17700002 - The specified module name is not found. * @throws { BusinessError } 17700034 - The specified module is an overlay module. * @syscap SystemCapability.BundleManager.BundleFramework.Overlay - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getTargetOverlayModuleInfos(targetModuleName: string): Promise>; @@ -168,7 +182,8 @@ declare namespace overlay { * @throws { BusinessError } 17700032 - The specified bundle does not contain any overlay module. * @syscap SystemCapability.BundleManager.BundleFramework.Overlay * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getOverlayModuleInfoByBundleName(bundleName: string, callback: AsyncCallback>): void; @@ -189,7 +204,8 @@ declare namespace overlay { * @throws { BusinessError } 17700033 - The specified module is not an overlay module. * @syscap SystemCapability.BundleManager.BundleFramework.Overlay * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getOverlayModuleInfoByBundleName(bundleName: string, moduleName: string, callback: AsyncCallback>): void; @@ -210,7 +226,8 @@ declare namespace overlay { * @throws { BusinessError } 17700033 - The specified module is not an overlay module. * @syscap SystemCapability.BundleManager.BundleFramework.Overlay * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getOverlayModuleInfoByBundleName(bundleName: string, moduleName?: string): Promise>; @@ -228,7 +245,8 @@ declare namespace overlay { * @throws { BusinessError } 17700035 - The specified bundle is an overlay bundle. * @syscap SystemCapability.BundleManager.BundleFramework.Overlay * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getTargetOverlayModuleInfosByBundleName(targetBundleName: string, callback: AsyncCallback>): void; @@ -249,7 +267,8 @@ declare namespace overlay { * @throws { BusinessError } 17700035 - The specified bundle is an overlay bundle. * @syscap SystemCapability.BundleManager.BundleFramework.Overlay * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getTargetOverlayModuleInfosByBundleName(targetBundleName: string, moduleName: string, callback: AsyncCallback>): void; @@ -270,7 +289,8 @@ declare namespace overlay { * @throws { BusinessError } 17700035 - The specified bundle is an overlay bundle. * @syscap SystemCapability.BundleManager.BundleFramework.Overlay * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getTargetOverlayModuleInfosByBundleName(targetBundleName: string, moduleName?: string): Promise>; @@ -283,6 +303,16 @@ declare namespace overlay { * @since 10 */ export type OverlayModuleInfo = _OverlayModuleInfo.OverlayModuleInfo; + + /** + * Obtains configuration information about a overlay hap module. + * + * @typedef { _OverlayModuleInfo } + * @syscap SystemCapability.BundleManager.BundleFramework.Overlay + * @since 20 + * @arkts 1.2 + */ + export type OverlayModuleInfo = _OverlayModuleInfo; } export default overlay; diff --git a/api/@ohos.zlib.d.ts b/api/@ohos.zlib.d.ts index 6b2429d312..3378c2d3ea 100644 --- a/api/@ohos.zlib.d.ts +++ b/api/@ohos.zlib.d.ts @@ -1028,7 +1028,8 @@ declare namespace zlib { * @syscap SystemCapability.BundleManager.Zlib * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function compressFile(inFile: string, outFile: string, options: Options, callback: AsyncCallback): void; @@ -1058,7 +1059,8 @@ declare namespace zlib { * @syscap SystemCapability.BundleManager.Zlib * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function compressFile(inFile: string, outFile: string, options: Options): Promise; @@ -1074,7 +1076,8 @@ declare namespace zlib { * @throws { BusinessError } 900002 - The input destination file is invalid. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function compressFiles(inFiles: Array, outFile: string, options: Options): Promise; @@ -1212,7 +1215,8 @@ declare namespace zlib { * @syscap SystemCapability.BundleManager.Zlib * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getOriginalSize(compressedFile: string): Promise; @@ -1222,7 +1226,8 @@ declare namespace zlib { * @returns { Promise } Returns verification objects. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function createChecksum(): Promise; @@ -1232,7 +1237,8 @@ declare namespace zlib { * @returns { Checksum } Returns verification objects. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function createChecksumSync(): Checksum; @@ -1282,7 +1288,8 @@ declare namespace zlib { * @typedef Checksum * @syscap SystemCapability.BundleManager.Zlib * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface Checksum { /** @@ -1295,7 +1302,8 @@ declare namespace zlib { *
2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ adler32(adler: number, buf: ArrayBuffer): Promise; @@ -1310,7 +1318,8 @@ declare namespace zlib { *
2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ adler32Combine(adler1: number, adler2: number, len2: number): Promise; @@ -1324,7 +1333,8 @@ declare namespace zlib { *
2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ crc32(crc: number, buf: ArrayBuffer): Promise; @@ -1339,7 +1349,8 @@ declare namespace zlib { *
2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ crc32Combine(crc1: number, crc2: number, len2: number): Promise; @@ -1363,7 +1374,8 @@ declare namespace zlib { * @returns { Promise> } Return a array to the CRC-32 table. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ getCrcTable(): Promise>; diff --git a/api/bundleManager/AppProvisionInfo.d.ts b/api/bundleManager/AppProvisionInfo.d.ts index 43351d6971..98ed464fce 100644 --- a/api/bundleManager/AppProvisionInfo.d.ts +++ b/api/bundleManager/AppProvisionInfo.d.ts @@ -24,7 +24,8 @@ * @typedef AppProvisionInfo * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface AppProvisionInfo { /** @@ -34,7 +35,8 @@ export interface AppProvisionInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly versionCode: number; @@ -45,7 +47,8 @@ export interface AppProvisionInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly versionName: string; @@ -56,7 +59,8 @@ export interface AppProvisionInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly uuid: string; @@ -67,7 +71,8 @@ export interface AppProvisionInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly type: string; @@ -78,7 +83,8 @@ export interface AppProvisionInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly appDistributionType: string; @@ -89,7 +95,8 @@ export interface AppProvisionInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly validity: Validity; @@ -100,7 +107,8 @@ export interface AppProvisionInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly developerId: string; @@ -111,7 +119,8 @@ export interface AppProvisionInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly certificate: string; @@ -122,7 +131,8 @@ export interface AppProvisionInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly apl: string; @@ -133,7 +143,8 @@ export interface AppProvisionInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly issuer: string; @@ -146,7 +157,8 @@ export interface AppProvisionInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly appIdentifier: string; @@ -157,7 +169,8 @@ export interface AppProvisionInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly organization: string; } @@ -168,7 +181,8 @@ export interface AppProvisionInfo { * @typedef Validity * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface Validity { /** @@ -178,7 +192,8 @@ export interface Validity { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly notBefore: number; @@ -189,7 +204,8 @@ export interface Validity { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly notAfter: number; } diff --git a/api/bundleManager/BundlePackInfo.d.ts b/api/bundleManager/BundlePackInfo.d.ts index ad82c13271..e8ea4a275c 100644 --- a/api/bundleManager/BundlePackInfo.d.ts +++ b/api/bundleManager/BundlePackInfo.d.ts @@ -24,7 +24,8 @@ * @typedef BundlePackInfo * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface BundlePackInfo { /** @@ -34,7 +35,8 @@ export interface BundlePackInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly packages: Array; @@ -45,7 +47,8 @@ export interface BundlePackInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly summary: PackageSummary; } @@ -56,7 +59,8 @@ export interface BundlePackInfo { * @typedef PackageConfig * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface PackageConfig { /** @@ -66,7 +70,8 @@ export interface PackageConfig { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly deviceTypes: Array; @@ -77,7 +82,8 @@ export interface PackageConfig { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly name: string; @@ -88,7 +94,8 @@ export interface PackageConfig { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly moduleType: string; @@ -99,7 +106,8 @@ export interface PackageConfig { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly deliveryWithInstall: boolean; } @@ -110,7 +118,8 @@ export interface PackageConfig { * @typedef PackageSummary * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface PackageSummary { /** @@ -120,7 +129,8 @@ export interface PackageSummary { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly app: BundleConfigInfo; @@ -131,7 +141,8 @@ export interface PackageSummary { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly modules: Array; } @@ -142,7 +153,8 @@ export interface PackageSummary { * @typedef BundleConfigInfo * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface BundleConfigInfo { /** @@ -152,7 +164,8 @@ export interface BundleConfigInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly bundleName: string; @@ -163,7 +176,8 @@ export interface BundleConfigInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly version: Version; } @@ -174,7 +188,8 @@ export interface BundleConfigInfo { * @typedef ExtensionAbility * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface ExtensionAbility { /** @@ -184,7 +199,8 @@ export interface ExtensionAbility { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly name: string; @@ -195,7 +211,8 @@ export interface ExtensionAbility { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly forms: Array; } @@ -206,7 +223,8 @@ export interface ExtensionAbility { * @typedef ModuleConfigInfo * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface ModuleConfigInfo { /** @@ -216,7 +234,8 @@ export interface ModuleConfigInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly mainAbility: string; @@ -227,7 +246,8 @@ export interface ModuleConfigInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly apiVersion: ApiVersion; @@ -238,7 +258,8 @@ export interface ModuleConfigInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly deviceTypes: Array; @@ -249,7 +270,8 @@ export interface ModuleConfigInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly distro: ModuleDistroInfo; @@ -260,7 +282,8 @@ export interface ModuleConfigInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly abilities: Array; @@ -271,7 +294,8 @@ export interface ModuleConfigInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly extensionAbilities: Array; } @@ -282,7 +306,8 @@ export interface ModuleConfigInfo { * @typedef ModuleDistroInfo * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface ModuleDistroInfo { /** @@ -292,7 +317,8 @@ export interface ModuleDistroInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly deliveryWithInstall: boolean; @@ -303,7 +329,8 @@ export interface ModuleDistroInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly installationFree: boolean; @@ -314,7 +341,8 @@ export interface ModuleDistroInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly moduleName: string; @@ -325,7 +353,8 @@ export interface ModuleDistroInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly moduleType: string; } @@ -336,7 +365,8 @@ export interface ModuleDistroInfo { * @typedef ModuleAbilityInfo * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface ModuleAbilityInfo { /** @@ -346,7 +376,8 @@ export interface ModuleAbilityInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly name: string; @@ -357,7 +388,8 @@ export interface ModuleAbilityInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly label: string; @@ -368,7 +400,8 @@ export interface ModuleAbilityInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly exported: boolean; @@ -379,7 +412,8 @@ export interface ModuleAbilityInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly forms: Array; } @@ -390,7 +424,8 @@ export interface ModuleAbilityInfo { * @typedef AbilityFormInfo * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface AbilityFormInfo { /** @@ -400,7 +435,8 @@ export interface AbilityFormInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly name: string; @@ -411,7 +447,8 @@ export interface AbilityFormInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly type: string; @@ -422,7 +459,8 @@ export interface AbilityFormInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly updateEnabled: boolean; @@ -433,7 +471,8 @@ export interface AbilityFormInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly scheduledUpdateTime: string; @@ -444,7 +483,8 @@ export interface AbilityFormInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly updateDuration: number; @@ -455,7 +495,8 @@ export interface AbilityFormInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly supportDimensions: Array; @@ -466,7 +507,8 @@ export interface AbilityFormInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly defaultDimension: string; } @@ -477,7 +519,8 @@ export interface AbilityFormInfo { * @typedef Version * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface Version { /** @@ -487,7 +530,8 @@ export interface Version { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly minCompatibleVersionCode: number; @@ -498,7 +542,8 @@ export interface Version { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly name: string; @@ -509,7 +554,8 @@ export interface Version { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly code: number; } @@ -520,7 +566,8 @@ export interface Version { * @typedef ApiVersion * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface ApiVersion { /** @@ -530,7 +577,8 @@ export interface ApiVersion { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly releaseType: string; @@ -541,7 +589,8 @@ export interface ApiVersion { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly compatible: number; @@ -552,7 +601,8 @@ export interface ApiVersion { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly target: number; } diff --git a/api/bundleManager/DispatchInfo.d.ts b/api/bundleManager/DispatchInfo.d.ts index 601b9d2382..779cc44c4e 100644 --- a/api/bundleManager/DispatchInfo.d.ts +++ b/api/bundleManager/DispatchInfo.d.ts @@ -24,7 +24,8 @@ * @typedef DispatchInfo * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface DispatchInfo { /** @@ -34,7 +35,8 @@ export interface DispatchInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly version: string; @@ -45,7 +47,8 @@ export interface DispatchInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly dispatchAPIVersion: string; } diff --git a/api/bundleManager/LauncherAbilityInfo.d.ts b/api/bundleManager/LauncherAbilityInfo.d.ts index 5544a7347b..de21df51c0 100644 --- a/api/bundleManager/LauncherAbilityInfo.d.ts +++ b/api/bundleManager/LauncherAbilityInfo.d.ts @@ -26,7 +26,8 @@ import { ElementName } from './ElementName'; * * @typedef LauncherAbilityInfo * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface LauncherAbilityInfo { /** @@ -35,7 +36,8 @@ export interface LauncherAbilityInfo { * @type { ApplicationInfo } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly applicationInfo: ApplicationInfo; @@ -45,7 +47,8 @@ export interface LauncherAbilityInfo { * @type { ElementName } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly elementName: ElementName; @@ -55,7 +58,8 @@ export interface LauncherAbilityInfo { * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly labelId: number; @@ -65,7 +69,8 @@ export interface LauncherAbilityInfo { * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly iconId: number; @@ -75,7 +80,8 @@ export interface LauncherAbilityInfo { * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly userId: number; @@ -85,7 +91,8 @@ export interface LauncherAbilityInfo { * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly installTime: number; } diff --git a/api/bundleManager/LauncherAbilityResourceInfo.d.ts b/api/bundleManager/LauncherAbilityResourceInfo.d.ts index 0210a04e1b..bd303e501a 100644 --- a/api/bundleManager/LauncherAbilityResourceInfo.d.ts +++ b/api/bundleManager/LauncherAbilityResourceInfo.d.ts @@ -18,7 +18,9 @@ * @kit AbilityKit */ +/*** if arkts 1.1 */ import { DrawableDescriptor } from './../@ohos.arkui.drawableDescriptor'; +/*** endif */ /** * Obtains resource information about a launcher ability @@ -26,7 +28,8 @@ import { DrawableDescriptor } from './../@ohos.arkui.drawableDescriptor'; * @typedef LauncherAbilityResourceInfo * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface LauncherAbilityResourceInfo { /** @@ -36,7 +39,8 @@ export interface LauncherAbilityResourceInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly bundleName: string; @@ -47,7 +51,8 @@ export interface LauncherAbilityResourceInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly moduleName: string; @@ -58,7 +63,8 @@ export interface LauncherAbilityResourceInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly abilityName: string; @@ -69,7 +75,8 @@ export interface LauncherAbilityResourceInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly icon: string; @@ -80,7 +87,8 @@ export interface LauncherAbilityResourceInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly label: string; @@ -102,7 +110,8 @@ export interface LauncherAbilityResourceInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly appIndex: number; } diff --git a/api/bundleManager/OverlayModuleInfo.d.ts b/api/bundleManager/OverlayModuleInfo.d.ts old mode 100755 new mode 100644 index 39621a9515..aa2b660c73 --- a/api/bundleManager/OverlayModuleInfo.d.ts +++ b/api/bundleManager/OverlayModuleInfo.d.ts @@ -23,7 +23,8 @@ * * @typedef OverlayModuleInfo * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface OverlayModuleInfo { /** @@ -32,7 +33,8 @@ export interface OverlayModuleInfo { * @type { string } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly bundleName: string; @@ -42,7 +44,8 @@ export interface OverlayModuleInfo { * @type { string } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly moduleName: string; @@ -52,7 +55,8 @@ export interface OverlayModuleInfo { * @type { string } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly targetModuleName: string; @@ -62,7 +66,8 @@ export interface OverlayModuleInfo { * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly priority: number; @@ -72,7 +77,8 @@ export interface OverlayModuleInfo { * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly state: number; } diff --git a/api/bundleManager/PermissionDef.d.ts b/api/bundleManager/PermissionDef.d.ts index 6d6634bea9..4b93792ec6 100644 --- a/api/bundleManager/PermissionDef.d.ts +++ b/api/bundleManager/PermissionDef.d.ts @@ -24,7 +24,8 @@ * @typedef PermissionDef * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface PermissionDef { /** @@ -34,7 +35,8 @@ export interface PermissionDef { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly permissionName: string; @@ -45,7 +47,8 @@ export interface PermissionDef { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly grantMode: number; @@ -56,7 +59,8 @@ export interface PermissionDef { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly labelId: number; @@ -67,7 +71,8 @@ export interface PermissionDef { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly descriptionId: number; } diff --git a/api/bundleManager/PluginBundleInfo.d.ts b/api/bundleManager/PluginBundleInfo.d.ts index d3bc13ecb8..40933b54af 100644 --- a/api/bundleManager/PluginBundleInfo.d.ts +++ b/api/bundleManager/PluginBundleInfo.d.ts @@ -24,7 +24,8 @@ * @typedef PluginBundleInfo * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface PluginBundleInfo { /** @@ -34,7 +35,8 @@ export interface PluginBundleInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly label: string; @@ -45,7 +47,8 @@ export interface PluginBundleInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly labelId: number; @@ -56,7 +59,8 @@ export interface PluginBundleInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly icon: string; @@ -67,7 +71,8 @@ export interface PluginBundleInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly iconId: number; @@ -78,7 +83,8 @@ export interface PluginBundleInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly pluginBundleName: string; @@ -89,7 +95,8 @@ export interface PluginBundleInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly versionCode: number; @@ -100,7 +107,8 @@ export interface PluginBundleInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly versionName: string; @@ -111,7 +119,8 @@ export interface PluginBundleInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly pluginModuleInfos: Array; } @@ -122,7 +131,8 @@ export interface PluginBundleInfo { * @typedef PluginModuleInfo * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface PluginModuleInfo { /** @@ -132,7 +142,8 @@ export interface PluginModuleInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly moduleName: string; @@ -143,7 +154,8 @@ export interface PluginModuleInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly descriptionId: number; @@ -154,7 +166,8 @@ export interface PluginModuleInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly description: string; } \ No newline at end of file diff --git a/api/bundleManager/RecoverableApplicationInfo.d.ts b/api/bundleManager/RecoverableApplicationInfo.d.ts index 62b36b0eac..29b78aed38 100644 --- a/api/bundleManager/RecoverableApplicationInfo.d.ts +++ b/api/bundleManager/RecoverableApplicationInfo.d.ts @@ -26,7 +26,8 @@ import bundleManager from './../@ohos.bundle.bundleManager'; * @typedef RecoverableApplicationInfo * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface RecoverableApplicationInfo { /** @@ -36,7 +37,8 @@ export interface RecoverableApplicationInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly bundleName: string; @@ -47,7 +49,8 @@ export interface RecoverableApplicationInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly moduleName: string; @@ -58,7 +61,8 @@ export interface RecoverableApplicationInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly labelId: number; @@ -69,7 +73,8 @@ export interface RecoverableApplicationInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly iconId: number; @@ -80,7 +85,8 @@ export interface RecoverableApplicationInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly systemApp: boolean; @@ -91,7 +97,8 @@ export interface RecoverableApplicationInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly bundleType: bundleManager.BundleType; @@ -102,7 +109,8 @@ export interface RecoverableApplicationInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly codePaths: Array; } diff --git a/api/bundleManager/RemoteAbilityInfo.d.ts b/api/bundleManager/RemoteAbilityInfo.d.ts index efd294bc3f..217b88d040 100644 --- a/api/bundleManager/RemoteAbilityInfo.d.ts +++ b/api/bundleManager/RemoteAbilityInfo.d.ts @@ -26,7 +26,8 @@ import { ElementName } from './ElementName'; * @typedef RemoteAbilityInfo * @syscap SystemCapability.BundleManager.DistributedBundleFramework * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface RemoteAbilityInfo { /** @@ -36,7 +37,8 @@ export interface RemoteAbilityInfo { * @readonly * @syscap SystemCapability.BundleManager.DistributedBundleFramework * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly elementName: ElementName; @@ -47,7 +49,8 @@ export interface RemoteAbilityInfo { * @readonly * @syscap SystemCapability.BundleManager.DistributedBundleFramework * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly label: string; @@ -58,7 +61,8 @@ export interface RemoteAbilityInfo { * @readonly * @syscap SystemCapability.BundleManager.DistributedBundleFramework * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly icon: string; } diff --git a/api/bundleManager/SharedBundleInfo.d.ts b/api/bundleManager/SharedBundleInfo.d.ts index 3e8078810f..4065fc3925 100644 --- a/api/bundleManager/SharedBundleInfo.d.ts +++ b/api/bundleManager/SharedBundleInfo.d.ts @@ -27,7 +27,8 @@ import bundleManager from '../@ohos.bundle.bundleManager'; * @typedef SharedBundleInfo * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface SharedBundleInfo { /** @@ -37,7 +38,8 @@ export interface SharedBundleInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly name: string; @@ -48,7 +50,8 @@ export interface SharedBundleInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly compatiblePolicy: bundleManager.CompatiblePolicy; @@ -59,7 +62,8 @@ export interface SharedBundleInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly sharedModuleInfo: Array; } @@ -70,7 +74,8 @@ export interface SharedBundleInfo { * @typedef SharedModuleInfo * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface SharedModuleInfo { /** @@ -80,7 +85,8 @@ export interface SharedModuleInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly name: string; @@ -91,7 +97,8 @@ export interface SharedModuleInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly versionCode: number; @@ -102,7 +109,8 @@ export interface SharedModuleInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly versionName: string; @@ -113,7 +121,8 @@ export interface SharedModuleInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly description: string; @@ -124,7 +133,8 @@ export interface SharedModuleInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly descriptionId: number; } diff --git a/kits/@kit.AbilityKit.d.ts b/kits/@kit.AbilityKit.d.ts index f3a1822121..793da982bf 100644 --- a/kits/@kit.AbilityKit.d.ts +++ b/kits/@kit.AbilityKit.d.ts @@ -135,12 +135,20 @@ export { }; /*** if arkts 1.2 */ +import appControl from '@ohos.bundle.appControl'; import bundleManager from '@ohos.bundle.bundleManager'; +import bundleMonitor from '@ohos.bundle.bundleMonitor'; import bundleResourceManager from '@ohos.bundle.bundleResourceManager'; +import defaultAppManager from '@ohos.bundle.defaultAppManager'; +import distributedBundleManager from '@ohos.bundle.distributedBundleManager'; +import freeInstall from '@ohos.bundle.freeInstall'; +import installer from '@ohos.bundle.installer'; import launcherBundleManager from '@ohos.bundle.launcherBundleManager'; +import overlay from '@ohos.bundle.overlay'; import shortcutManager from '@ohos.bundle.shortcutManager'; export { - bundleManager, bundleResourceManager, launcherBundleManager, shortcutManager + appControl, bundleManager, bundleMonitor, bundleResourceManager, defaultAppManager, distributedBundleManager, + freeInstall, installer, launcherBundleManager, overlay, shortcutManager }; /*** endif */ diff --git a/kits/@kit.BasicServicesKit.d.ts b/kits/@kit.BasicServicesKit.d.ts index e53bf72584..dff33e1ea9 100644 --- a/kits/@kit.BasicServicesKit.d.ts +++ b/kits/@kit.BasicServicesKit.d.ts @@ -87,3 +87,11 @@ export { StaticSubscriberExtensionContext, systemLoad, intelligentVoice, selectionManager, SelectionExtensionAbility, PanelInfo, PanelType }; + +/*** if arkts 1.2 */ +import zlib from '@ohos.zlib'; + +export { + zlib +}; +/*** endif */ -- Gitee From e2c9e2b3cf5d71bde8c6fb0555cc5663e9143cc1 Mon Sep 17 00:00:00 2001 From: Yeyuning Date: Mon, 7 Jul 2025 20:28:06 +0800 Subject: [PATCH 028/746] arkts1.2 update Signed-off-by: Yeyuning Change-Id: I13901325e1fd193ca362519f76475ebadd445df1 --- api/@ohos.account.appAccount.d.ts | 386 +++-- api/@ohos.account.distributedAccount.d.ts | 96 +- api/@ohos.account.osAccount.d.ts | 1555 ++++++++++++--------- 3 files changed, 1178 insertions(+), 859 deletions(-) diff --git a/api/@ohos.account.appAccount.d.ts b/api/@ohos.account.appAccount.d.ts index d814c3546f..cf053c5168 100644 --- a/api/@ohos.account.appAccount.d.ts +++ b/api/@ohos.account.appAccount.d.ts @@ -27,7 +27,8 @@ import type rpc from './@ohos.rpc'; * * @namespace appAccount * @syscap SystemCapability.Account.AppAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace appAccount { /** @@ -35,7 +36,8 @@ declare namespace appAccount { * * @returns { AppAccountManager } Returns the instance of the AppAccountManager. * @syscap SystemCapability.Account.AppAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ function createAppAccountManager(): AppAccountManager; @@ -44,7 +46,8 @@ declare namespace appAccount { * * @interface AppAccountManager * @syscap SystemCapability.Account.AppAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ interface AppAccountManager { /** @@ -107,7 +110,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300004 - Account already exists. * @throws { BusinessError } 12300007 - The number of accounts reaches the upper limit. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ createAccount(name: string, callback: AsyncCallback): void; @@ -127,7 +131,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300004 - Account already exists. * @throws { BusinessError } 12300007 - The number of accounts reaches the upper limit. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ createAccount(name: string, options: CreateAccountOptions, callback: AsyncCallback): void; @@ -147,7 +152,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300004 - Account already exists. * @throws { BusinessError } 12300007 - The number of accounts reaches the upper limit. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ createAccount(name: string, options?: CreateAccountOptions): Promise; @@ -184,7 +190,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300113 - Authenticator service not found. * @throws { BusinessError } 12300114 - Authenticator service exception. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ createAccountImplicitly(owner: string, callback: AuthCallback): void; @@ -203,7 +210,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300113 - Authenticator service not found. * @throws { BusinessError } 12300114 - Authenticator service exception. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ createAccountImplicitly(owner: string, options: CreateAccountImplicitlyOptions, callback: AuthCallback): void; @@ -248,7 +256,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300002 - Invalid name. * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ removeAccount(name: string, callback: AsyncCallback): void; @@ -265,7 +274,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300002 - Invalid name. * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ removeAccount(name: string): Promise; @@ -359,7 +369,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300003 - Account not found. * @throws { BusinessError } 12400005 - The size of authorization list reaches the upper limit. * @syscap SystemCapability.Account.AppAccount - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ setAppAccess(name: string, bundleName: string, isAccessible: boolean, callback: AsyncCallback): void; @@ -395,7 +406,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300003 - Account not found. * @throws { BusinessError } 12400005 - The size of authorization list reaches the upper limit. * @syscap SystemCapability.Account.AppAccount - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ setAppAccess(name: string, bundleName: string, isAccessible: boolean): Promise; @@ -412,7 +424,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300002 - Invalid name or bundleName. * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ checkAppAccess(name: string, bundleName: string, callback: AsyncCallback): void; @@ -429,7 +442,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300002 - Invalid name or bundleName. * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ checkAppAccess(name: string, bundleName: string): Promise; @@ -487,7 +501,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300002 - Invalid name. * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ checkDataSyncEnabled(name: string, callback: AsyncCallback): void; @@ -509,7 +524,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300002 - Invalid name. * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ checkDataSyncEnabled(name: string): Promise; @@ -554,9 +570,11 @@ declare namespace appAccount { * @throws { BusinessError } 12300002 - Invalid name, credentialType or credential. * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - setCredential(name: string, credentialType: string, credential: string, callback: AsyncCallback): void; + setCredential(name: string, credentialType: string, credential: string, + callback: AsyncCallback): void; /** * Sets the credential for this application account. @@ -571,7 +589,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300002 - Invalid name, credentialType or credential. * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ setCredential(name: string, credentialType: string, credential: string): Promise; @@ -688,7 +707,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300002 - Invalid name. * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ setDataSyncEnabled(name: string, isEnabled: boolean, callback: AsyncCallback): void; @@ -719,7 +739,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300002 - Invalid name. * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ setDataSyncEnabled(name: string, isEnabled: boolean): Promise; @@ -765,7 +786,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300003 - Account not found. * @throws { BusinessError } 12400003 - The number of custom data reaches the upper limit. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ setCustomData(name: string, key: string, value: string, callback: AsyncCallback): void; @@ -783,7 +805,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300003 - Account not found. * @throws { BusinessError } 12400003 - The number of custom data reaches the upper limit. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ setCustomData(name: string, key: string, value: string): Promise; @@ -832,7 +855,8 @@ declare namespace appAccount { *
2. Incorrect parameter types. * @throws { BusinessError } 12300001 - System service exception. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getAllAccounts(callback: AsyncCallback>): void; @@ -847,7 +871,8 @@ declare namespace appAccount { * @returns { Promise> } Returns a list of application accounts. * @throws { BusinessError } 12300001 - System service exception. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getAllAccounts(): Promise>; @@ -918,7 +943,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300001 - System service exception. * @throws { BusinessError } 12300002 - Invalid owner. * @syscap SystemCapability.Account.AppAccount - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ getAccountsByOwner(owner: string, callback: AsyncCallback>): void; @@ -955,7 +981,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300001 - System service exception. * @throws { BusinessError } 12300002 - Invalid owner. * @syscap SystemCapability.Account.AppAccount - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ getAccountsByOwner(owner: string): Promise>; @@ -998,7 +1025,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300003 - Account not found. * @throws { BusinessError } 12300102 - Credential not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getCredential(name: string, credentialType: string, callback: AsyncCallback): void; @@ -1015,7 +1043,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300003 - Account not found. * @throws { BusinessError } 12300102 - Credential not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getCredential(name: string, credentialType: string): Promise; @@ -1085,7 +1114,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300003 - Account not found. * @throws { BusinessError } 12400002 - Custom data not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getCustomData(name: string, key: string, callback: AsyncCallback): void; @@ -1102,7 +1132,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300003 - Account not found. * @throws { BusinessError } 12400002 - Custom data not found * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getCustomData(name: string, key: string): Promise; @@ -1119,7 +1150,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300003 - Account not found. * @throws { BusinessError } 12400002 - Custom data not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getCustomDataSync(name: string, key: string): string; @@ -1173,7 +1205,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300001 - System service exception. * @throws { BusinessError } 12300002 - Invalid type or owners. * @syscap SystemCapability.Account.AppAccount - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'accountChange', owners: Array, callback: Callback>): void; @@ -1199,7 +1232,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300001 - System service exception. * @throws { BusinessError } 12300002 - Invalid type. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'accountChange', callback?: Callback>): void; @@ -1240,7 +1274,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300113 - Authenticator service not found. * @throws { BusinessError } 12300114 - Authenticator service exception. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ auth(name: string, owner: string, authType: string, callback: AuthCallback): void; @@ -1261,7 +1296,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300113 - Authenticator service not found. * @throws { BusinessError } 12300114 - Authenticator service exception. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ auth( name: string, @@ -1313,7 +1349,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300003 - Account not found. * @throws { BusinessError } 12300107 - AuthType not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getAuthToken(name: string, owner: string, authType: string, callback: AsyncCallback): void; @@ -1331,7 +1368,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300003 - Account not found. * @throws { BusinessError } 12300107 - AuthType not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getAuthToken(name: string, owner: string, authType: string): Promise; @@ -1383,7 +1421,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300003 - Account not found. * @throws { BusinessError } 12400004 - The number of tokens reaches the upper limit. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ setAuthToken(name: string, authType: string, token: string, callback: AsyncCallback): void; @@ -1403,7 +1442,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300003 - Account not found. * @throws { BusinessError } 12400004 - The number of tokens reaches the upper limit. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ setAuthToken(name: string, authType: string, token: string): Promise; @@ -1458,7 +1498,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300003 - Account not found. * @throws { BusinessError } 12300107 - AuthType not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ deleteAuthToken(name: string, owner: string, authType: string, token: string, callback: AsyncCallback): void; @@ -1479,7 +1520,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300003 - Account not found. * @throws { BusinessError } 12300107 - AuthType not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ deleteAuthToken(name: string, owner: string, authType: string, token: string): Promise; @@ -1562,7 +1604,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300107 - AuthType not found. * @throws { BusinessError } 12400005 - The size of authorization list reaches the upper limit. * @syscap SystemCapability.Account.AppAccount - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ setAuthTokenVisibility( name: string, @@ -1611,7 +1654,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300107 - AuthType not found. * @throws { BusinessError } 12400005 - The size of authorization list reaches the upper limit. * @syscap SystemCapability.Account.AppAccount - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ setAuthTokenVisibility(name: string, authType: string, bundleName: string, isVisible: boolean): Promise; @@ -1668,14 +1712,10 @@ declare namespace appAccount { * @throws { BusinessError } 12300003 - Account not found. * @throws { BusinessError } 12300107 - AuthType not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - checkAuthTokenVisibility( - name: string, - authType: string, - bundleName: string, - callback: AsyncCallback - ): void; + checkAuthTokenVisibility(name: string, authType: string, bundleName: string, callback: AsyncCallback): void; /** * Checks the auth token visibility of the specified authentication type for a third-party application. @@ -1693,7 +1733,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300003 - Account not found. * @throws { BusinessError } 12300107 - AuthType not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ checkAuthTokenVisibility(name: string, authType: string, bundleName: string): Promise; @@ -1736,7 +1777,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300002 - Invalid name or owner. * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getAllAuthTokens(name: string, owner: string, callback: AsyncCallback>): void; @@ -1752,7 +1794,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300002 - Invalid name or owner. * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getAllAuthTokens(name: string, owner: string): Promise>; @@ -1803,7 +1846,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300003 - Account not found. * @throws { BusinessError } 12300107 - AuthType not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getAuthList(name: string, authType: string, callback: AsyncCallback>): void; @@ -1822,7 +1866,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300003 - Account not found. * @throws { BusinessError } 12300107 - AuthType not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getAuthList(name: string, authType: string): Promise>; @@ -1869,7 +1914,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300002 - Invalid sessionId. * @throws { BusinessError } 12300108 - Session not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getAuthCallback(sessionId: string, callback: AsyncCallback): void; @@ -1886,7 +1932,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300002 - Invalid sessionId. * @throws { BusinessError } 12300108 - Session not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getAuthCallback(sessionId: string): Promise; @@ -1927,7 +1974,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300002 - Invalid owner. * @throws { BusinessError } 12300113 - Authenticator service not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ queryAuthenticatorInfo(owner: string, callback: AsyncCallback): void; @@ -1942,7 +1990,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300002 - Invalid owner. * @throws { BusinessError } 12300113 - Authenticator service not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ queryAuthenticatorInfo(owner: string): Promise; @@ -1962,7 +2011,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300113 - Authenticator service not found. * @throws { BusinessError } 12300114 - Authenticator service exception. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ checkAccountLabels(name: string, owner: string, labels: Array, callback: AsyncCallback): void; @@ -1982,7 +2032,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300113 - Authenticator service not found. * @throws { BusinessError } 12300114 - Authenticator service exception. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ checkAccountLabels(name: string, owner: string, labels: Array): Promise; @@ -1999,7 +2050,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300003 - Account not found. * @throws { BusinessError } 12300102 - Credential not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ deleteCredential(name: string, credentialType: string, callback: AsyncCallback): void; @@ -2016,7 +2068,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300003 - Account not found. * @throws { BusinessError } 12300102 - Credential not found. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ deleteCredential(name: string, credentialType: string): Promise; @@ -2032,7 +2085,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300010 - Account service busy. * @throws { BusinessError } 12300114 - Authenticator service exception. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ selectAccountsByOptions(options: SelectAccountsOptions, callback: AsyncCallback>): void; @@ -2048,7 +2102,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300010 - Account service busy. * @throws { BusinessError } 12300114 - Authenticator service exception. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ selectAccountsByOptions(options: SelectAccountsOptions): Promise>; @@ -2067,7 +2122,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300113 - Authenticator service not found. * @throws { BusinessError } 12300114 - Authenticator service exception. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ verifyCredential(name: string, owner: string, callback: AuthCallback): void; /** @@ -2086,7 +2142,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300113 - Authenticator service not found. * @throws { BusinessError } 12300114 - Authenticator service exception. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ verifyCredential(name: string, owner: string, options: VerifyCredentialOptions, callback: AuthCallback): void; @@ -2106,7 +2163,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300113 - Authenticator service not found. * @throws { BusinessError } 12300114 - Authenticator service exception. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ setAuthenticatorProperties(owner: string, callback: AuthCallback): void; /** @@ -2126,7 +2184,8 @@ declare namespace appAccount { * @throws { BusinessError } 12300113 - Authenticator service not found. * @throws { BusinessError } 12300114 - Authenticator service exception. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ setAuthenticatorProperties(owner: string, options: SetPropertiesOptions, callback: AuthCallback): void; } @@ -2136,7 +2195,8 @@ declare namespace appAccount { * * @interface AppAccountInfo * @syscap SystemCapability.Account.AppAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ interface AppAccountInfo { /** @@ -2144,7 +2204,8 @@ declare namespace appAccount { * * @type { string } * @syscap SystemCapability.Account.AppAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ owner: string; @@ -2153,7 +2214,8 @@ declare namespace appAccount { * * @type { string } * @syscap SystemCapability.Account.AppAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ name: string; } @@ -2194,7 +2256,8 @@ declare namespace appAccount { * * @interface AuthTokenInfo * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface AuthTokenInfo { /** @@ -2202,7 +2265,8 @@ declare namespace appAccount { * * @type { string } * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ authType: string; @@ -2211,7 +2275,8 @@ declare namespace appAccount { * * @type { string } * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ token: string; @@ -2220,7 +2285,8 @@ declare namespace appAccount { * * @type { ?AppAccountInfo } * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ account?: AppAccountInfo; } @@ -2230,7 +2296,8 @@ declare namespace appAccount { * * @interface AuthenticatorInfo * @syscap SystemCapability.Account.AppAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ interface AuthenticatorInfo { /** @@ -2238,27 +2305,30 @@ declare namespace appAccount { * * @type { string } * @syscap SystemCapability.Account.AppAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ owner: string; /** * The icon id of an authenticator. * - * @type { number } + * @type { long } * @syscap SystemCapability.Account.AppAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - iconId: number; + iconId: long; /** * The label id of an authenticator. * - * @type { number } + * @type { long } * @syscap SystemCapability.Account.AppAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - labelId: number; + labelId: long; } /** @@ -2266,7 +2336,8 @@ declare namespace appAccount { * * @interface AuthResult * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface AuthResult { /** @@ -2274,7 +2345,8 @@ declare namespace appAccount { * * @type { ?AppAccountInfo } * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ account?: AppAccountInfo; @@ -2283,7 +2355,8 @@ declare namespace appAccount { * * @type { ?AuthTokenInfo } * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ tokenInfo?: AuthTokenInfo; } @@ -2293,7 +2366,8 @@ declare namespace appAccount { * * @interface CreateAccountOptions * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface CreateAccountOptions { /** @@ -2302,7 +2376,8 @@ declare namespace appAccount { * * @type { ?Record } * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ customData?: Record; } @@ -2312,7 +2387,8 @@ declare namespace appAccount { * * @interface CreateAccountImplicitlyOptions * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface CreateAccountImplicitlyOptions { /** @@ -2320,7 +2396,8 @@ declare namespace appAccount { * * @type { ?Array } * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ requiredLabels?: Array; @@ -2329,7 +2406,8 @@ declare namespace appAccount { * * @type { ?string } * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ authType?: string; @@ -2341,7 +2419,8 @@ declare namespace appAccount { * * @type { ?Record } * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ parameters?: Record; } @@ -2351,7 +2430,8 @@ declare namespace appAccount { * * @interface SelectAccountsOptions * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface SelectAccountsOptions { /** @@ -2359,7 +2439,8 @@ declare namespace appAccount { * * @type { ?Array } * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ allowedAccounts?: Array; @@ -2368,7 +2449,8 @@ declare namespace appAccount { * * @type { ?Array } * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ allowedOwners?: Array; @@ -2377,7 +2459,8 @@ declare namespace appAccount { * * @type { ?Array } * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ requiredLabels?: Array; } @@ -2387,7 +2470,8 @@ declare namespace appAccount { * * @interface VerifyCredentialOptions * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface VerifyCredentialOptions { /** @@ -2395,7 +2479,8 @@ declare namespace appAccount { * * @type { ?string } * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ credentialType?: string; @@ -2404,7 +2489,8 @@ declare namespace appAccount { * * @type { ?string } * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ credential?: string; @@ -2416,7 +2502,8 @@ declare namespace appAccount { * * @type { ?Record } * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ parameters?: Record; } @@ -2426,7 +2513,8 @@ declare namespace appAccount { * * @interface SetPropertiesOptions * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface SetPropertiesOptions { /** @@ -2434,7 +2522,8 @@ declare namespace appAccount { * * @type { ?Record } * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ properties?: Record; @@ -2446,7 +2535,8 @@ declare namespace appAccount { * * @type { ?Record } * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ parameters?: Record; } @@ -2456,7 +2546,8 @@ declare namespace appAccount { * * @enum { string } Constants * @syscap SystemCapability.Account.AppAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ enum Constants { /** @@ -2483,7 +2574,8 @@ declare namespace appAccount { * Indicates the action for creating account implicitly. * * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ ACTION_CREATE_ACCOUNT_IMPLICITLY = 'createAccountImplicitly', @@ -2491,7 +2583,8 @@ declare namespace appAccount { * Indicates the action for authenticating. * * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ ACTION_AUTH = 'auth', @@ -2499,7 +2592,8 @@ declare namespace appAccount { * Indicates the action for verifying credential. * * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ ACTION_VERIFY_CREDENTIAL = 'verifyCredential', @@ -2507,7 +2601,8 @@ declare namespace appAccount { * Indicates the action for set authenticator properties. * * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ ACTION_SET_AUTHENTICATOR_PROPERTIES = 'setAuthenticatorProperties', @@ -2515,7 +2610,8 @@ declare namespace appAccount { * Indicates the key of name. * * @syscap SystemCapability.Account.AppAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ KEY_NAME = 'name', @@ -2523,7 +2619,8 @@ declare namespace appAccount { * Indicates the key of owner. * * @syscap SystemCapability.Account.AppAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ KEY_OWNER = 'owner', @@ -2531,7 +2628,8 @@ declare namespace appAccount { * Indicates the key of token. * * @syscap SystemCapability.Account.AppAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ KEY_TOKEN = 'token', @@ -2539,7 +2637,8 @@ declare namespace appAccount { * Indicates the key of action. * * @syscap SystemCapability.Account.AppAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ KEY_ACTION = 'action', @@ -2547,7 +2646,8 @@ declare namespace appAccount { * Indicates the key of authentication type. * * @syscap SystemCapability.Account.AppAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ KEY_AUTH_TYPE = 'authType', @@ -2555,7 +2655,8 @@ declare namespace appAccount { * Indicates the key of session id. * * @syscap SystemCapability.Account.AppAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ KEY_SESSION_ID = 'sessionId', @@ -2563,7 +2664,8 @@ declare namespace appAccount { * Indicates the key of caller pid. * * @syscap SystemCapability.Account.AppAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ KEY_CALLER_PID = 'callerPid', @@ -2571,7 +2673,8 @@ declare namespace appAccount { * Indicates the key of caller uid. * * @syscap SystemCapability.Account.AppAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ KEY_CALLER_UID = 'callerUid', @@ -2579,7 +2682,8 @@ declare namespace appAccount { * Indicates the key of caller bundle name. * * @syscap SystemCapability.Account.AppAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ KEY_CALLER_BUNDLE_NAME = 'callerBundleName', @@ -2587,7 +2691,8 @@ declare namespace appAccount { * Indicates the key of required labels. * * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEY_REQUIRED_LABELS = 'requiredLabels', @@ -2595,7 +2700,8 @@ declare namespace appAccount { * Indicates the key of boolean result. * * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEY_BOOLEAN_RESULT = 'booleanResult' } @@ -2817,7 +2923,8 @@ declare namespace appAccount { * * @interface AuthCallback * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface AuthCallback { /** @@ -2825,16 +2932,18 @@ declare namespace appAccount { * * @type { function } * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - onResult: (code: number, result?: AuthResult) => void; + onResult: (code: int, result?: AuthResult) => void; /** * Notifies the client that the authentication request need to be redirected. * * @type { function } * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ onRequestRedirected: (request: Want) => void; @@ -2843,7 +2952,8 @@ declare namespace appAccount { * * @type { ?function } * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ onRequestContinued?: () => void; } @@ -2852,7 +2962,8 @@ declare namespace appAccount { * Provides methods for authenticator. * * @syscap SystemCapability.Account.AppAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 * @name Authenticator */ class Authenticator { @@ -2881,7 +2992,8 @@ declare namespace appAccount { * @param { CreateAccountImplicitlyOptions } options - Indicates the authenticator-specific options for the request. * @param { AuthCallback } callback - Indicates the authenticator callback. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ createAccountImplicitly(options: CreateAccountImplicitlyOptions, callback: AuthCallback): void; @@ -2914,7 +3026,8 @@ declare namespace appAccount { * @param { Record } options - Indicates the authenticator-specific options for the request. * @param { AuthCallback } callback - Indicates the authenticator callback. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ auth(name: string, authType: string, options: Record, callback: AuthCallback): void; @@ -2928,7 +3041,8 @@ declare namespace appAccount { * @param { VerifyCredentialOptions } options - Indicates the options for verifying credential. * @param { AuthCallback } callback - Indicates the authenticator callback. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ verifyCredential(name: string, options: VerifyCredentialOptions, callback: AuthCallback): void; @@ -2938,7 +3052,8 @@ declare namespace appAccount { * @param { SetPropertiesOptions } options - Indicates the options for setting properties. * @param { AuthCallback } callback - Indicates the authenticator callback. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ setProperties(options: SetPropertiesOptions, callback: AuthCallback): void; @@ -2949,7 +3064,8 @@ declare namespace appAccount { * @param { Array } labels - Indicates an array of labels to check. * @param { AuthCallback } callback - Indicates the authenticator callback. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ checkAccountLabels(name: string, labels: Array, callback: AuthCallback): void; @@ -2959,7 +3075,8 @@ declare namespace appAccount { * @param { string } name - Indicates the account name. * @param { AuthCallback } callback - Indicates the authenticator callback. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ checkAccountRemovable(name: string, callback: AuthCallback): void; @@ -2968,7 +3085,8 @@ declare namespace appAccount { * * @returns { rpc.RemoteObject } Returns a remote object. * @syscap SystemCapability.Account.AppAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getRemoteObject(): rpc.RemoteObject; } diff --git a/api/@ohos.account.distributedAccount.d.ts b/api/@ohos.account.distributedAccount.d.ts index 1ad094694a..004da5fcf7 100644 --- a/api/@ohos.account.distributedAccount.d.ts +++ b/api/@ohos.account.distributedAccount.d.ts @@ -25,7 +25,8 @@ import type { AsyncCallback } from './@ohos.base'; * * @namespace distributedAccount * @syscap SystemCapability.Account.OsAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace distributedAccount { /** @@ -33,7 +34,8 @@ declare namespace distributedAccount { * * @returns { DistributedAccountAbility } Ability to manage operations of distributed account. * @syscap SystemCapability.Account.OsAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDistributedAccountAbility(): DistributedAccountAbility; @@ -42,7 +44,8 @@ declare namespace distributedAccount { * * @interface DistributedAccountAbility * @syscap SystemCapability.Account.OsAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ interface DistributedAccountAbility { /** @@ -79,7 +82,8 @@ declare namespace distributedAccount { *
2. Incorrect parameter types. * @throws { BusinessError } 12300001 - System service exception. * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getOsAccountDistributedInfo(callback: AsyncCallback): void; @@ -91,7 +95,8 @@ declare namespace distributedAccount { * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 12300001 - System service exception. * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getOsAccountDistributedInfo(): Promise; @@ -99,37 +104,39 @@ declare namespace distributedAccount { * Gets the distributed information of the specified OS account. * * @permission ohos.permission.MANAGE_DISTRIBUTED_ACCOUNTS or ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS - * @param { number } localId - Indicates the local ID of the specified OS account. + * @param { int } localId - Indicates the local ID of the specified OS account. * @param { AsyncCallback } callback - Asynchronous callback interface. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. - *
2. Incorrect parameter types. + *
2. Incorrect parameter types. * @throws { BusinessError } 12300001 - System service exception. * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - getOsAccountDistributedInfoByLocalId(localId: number, callback: AsyncCallback): void; + getOsAccountDistributedInfoByLocalId(localId: int, callback: AsyncCallback): void; /** * Gets the distributed information of the specified OS account. * * @permission ohos.permission.MANAGE_DISTRIBUTED_ACCOUNTS or ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS - * @param { number } localId - Indicates the local ID of the specified OS account. + * @param { int } localId - Indicates the local ID of the specified OS account. * @returns { Promise } The distributed information of the specified OS account. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. - *
2. Incorrect parameter types. + *
2. Incorrect parameter types. * @throws { BusinessError } 12300001 - System service exception. * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - getOsAccountDistributedInfoByLocalId(localId: number): Promise; + getOsAccountDistributedInfoByLocalId(localId: int): Promise; /** * Updates the distributed information of the OS account. @@ -164,14 +171,15 @@ declare namespace distributedAccount { * @param { DistributedInfo } accountInfo - Indicates the information of the OS account used for a distributed system. * @param { AsyncCallback } callback - Asynchronous callback interface. * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
2. Incorrect parameter types. * @throws { BusinessError } 12300001 - System service exception. * @throws { BusinessError } 12300002 - Invalid accountInfo. * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.OsAccount * This API can be called only by system applications. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ setOsAccountDistributedInfo(accountInfo: DistributedInfo, callback: AsyncCallback): void; @@ -189,7 +197,8 @@ declare namespace distributedAccount { * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.OsAccount * This API can be called only by system applications. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ setOsAccountDistributedInfo(accountInfo: DistributedInfo): Promise; @@ -197,7 +206,7 @@ declare namespace distributedAccount { * Sets the distributed information of the specified OS account. * * @permission ohos.permission.MANAGE_DISTRIBUTED_ACCOUNTS - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @param { DistributedInfo } distributedInfo - Indicates the distributed information. * @param { AsyncCallback } callback - Asynchronous callback interface. * @throws { BusinessError } 201 - Permission denied. @@ -210,19 +219,16 @@ declare namespace distributedAccount { * @throws { BusinessError } 12300008 - Restricted OS account. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - setOsAccountDistributedInfoByLocalId( - localId: number, - distributedInfo: DistributedInfo, - callback: AsyncCallback - ): void; + setOsAccountDistributedInfoByLocalId(localId: int, distributedInfo: DistributedInfo, callback: AsyncCallback): void; /** * Sets the distributed information of the specified OS account. * * @permission ohos.permission.MANAGE_DISTRIBUTED_ACCOUNTS - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @param { DistributedInfo } distributedInfo - Indicates the distributed information. * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 201 - Permission denied. @@ -235,24 +241,27 @@ declare namespace distributedAccount { * @throws { BusinessError } 12300008 - Restricted OS account. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - setOsAccountDistributedInfoByLocalId(localId: number, distributedInfo: DistributedInfo): Promise; + setOsAccountDistributedInfoByLocalId(localId: int, distributedInfo: DistributedInfo): Promise; } /** * Enum for distributed account status. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Account.OsAccount - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ enum DistributedAccountStatus { /** * Indicates that the account is not logged in. * * @syscap SystemCapability.Account.OsAccount - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ NOT_LOGGED_IN = 0, @@ -260,7 +269,8 @@ declare namespace distributedAccount { * Indicates that the account is logged in. * * @syscap SystemCapability.Account.OsAccount - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ LOGGED_IN = 1 } @@ -270,7 +280,8 @@ declare namespace distributedAccount { * * @interface DistributedInfo * @syscap SystemCapability.Account.OsAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ interface DistributedInfo { /** @@ -278,7 +289,8 @@ declare namespace distributedAccount { * * @type { string } * @syscap SystemCapability.Account.OsAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ name: string; @@ -287,7 +299,8 @@ declare namespace distributedAccount { * * @type { string } * @syscap SystemCapability.Account.OsAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ id: string; @@ -296,7 +309,8 @@ declare namespace distributedAccount { * * @type { string } * @syscap SystemCapability.Account.OsAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ event: string; @@ -305,7 +319,8 @@ declare namespace distributedAccount { * * @type { ?string } * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ nickname?: string; @@ -314,7 +329,8 @@ declare namespace distributedAccount { * * @type { ?string } * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ avatar?: string; @@ -324,7 +340,8 @@ declare namespace distributedAccount { * @type { ?DistributedAccountStatus } * @readonly * @syscap SystemCapability.Account.OsAccount - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly status?: DistributedAccountStatus; @@ -333,10 +350,11 @@ declare namespace distributedAccount { * * @type { ?object } * @syscap SystemCapability.Account.OsAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ scalableData?: object; } } -export default distributedAccount; \ No newline at end of file +export default distributedAccount; diff --git a/api/@ohos.account.osAccount.d.ts b/api/@ohos.account.osAccount.d.ts index 662dd6b646..c0610430dc 100644 --- a/api/@ohos.account.osAccount.d.ts +++ b/api/@ohos.account.osAccount.d.ts @@ -26,7 +26,8 @@ import type { AsyncCallback, Callback } from './@ohos.base'; * * @namespace osAccount * @syscap SystemCapability.Account.OsAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace osAccount { /** @@ -34,7 +35,8 @@ declare namespace osAccount { * * @returns { AccountManager } Returns the instance of the AccountManager. * @syscap SystemCapability.Account.OsAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAccountManager(): AccountManager; @@ -43,7 +45,8 @@ declare namespace osAccount { * * @interface AccountManager * @syscap SystemCapability.Account.OsAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ interface AccountManager { /** @@ -55,7 +58,7 @@ declare namespace osAccount { *

* * @permission ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS_EXTENSION - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @param { AsyncCallback } callback - Asynchronous callback interface. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. @@ -79,7 +82,7 @@ declare namespace osAccount { *

* * @permission ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS_EXTENSION - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @param { AsyncCallback } callback - Asynchronous callback interface. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. @@ -93,9 +96,10 @@ declare namespace osAccount { * @throws { BusinessError } 12300016 - The number of logged in accounts reaches the upper limit. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - activateOsAccount(localId: number, callback: AsyncCallback): void; + activateOsAccount(localId: int, callback: AsyncCallback): void; /** * Activates a specified OS account. @@ -106,7 +110,7 @@ declare namespace osAccount { *

* * @permission ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS_EXTENSION - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. @@ -130,7 +134,7 @@ declare namespace osAccount { *

* * @permission ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS_EXTENSION - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. @@ -144,15 +148,16 @@ declare namespace osAccount { * @throws { BusinessError } 12300016 - The number of logged in accounts reaches the upper limit. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - activateOsAccount(localId: number): Promise; + activateOsAccount(localId: int): Promise; /** * Deactivates a specified OS account. * * @permission ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS_EXTENSION - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. @@ -164,9 +169,10 @@ declare namespace osAccount { * @throws { BusinessError } 12300010 - Service busy. Possible causes: The target account is being operated. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - deactivateOsAccount(localId: number): Promise; + deactivateOsAccount(localId: int): Promise; /** * Checks whether the function of supporting multiple OS accounts is enabled. @@ -198,7 +204,8 @@ declare namespace osAccount { *
2. Incorrect parameter types. * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ checkMultiOsAccountEnabled(callback: AsyncCallback): void; @@ -208,7 +215,8 @@ declare namespace osAccount { * @returns { Promise } Returns {@code true} if this function is enabled; returns {@code false} otherwise. * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ checkMultiOsAccountEnabled(): Promise; @@ -278,7 +286,7 @@ declare namespace osAccount { * Checks whether an OS account is activated based on its local ID. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS or ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @returns { Promise } - Returns {@code true} if the OS account is activated; returns {@code false} otherwise. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. @@ -288,9 +296,10 @@ declare namespace osAccount { * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - isOsAccountActivated(localId: number): Promise; + isOsAccountActivated(localId: int): Promise; /** * Checks whether a constraint has been enabled for an OS account based on its local ID. @@ -393,7 +402,8 @@ declare namespace osAccount { *
2. Incorrect parameter types. * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isOsAccountConstraintEnabled(constraint: string): Promise; @@ -401,7 +411,7 @@ declare namespace osAccount { * Checks whether the given constraint is enabled for the specified OS account. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS or ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @param { string } constraint - Indicates the constraint to check. For example: the value can be: *
{@code constraint.wifi.set} - Indicates the constraint on configuring the Wi-Fi access point. *
{@code constraint.sms.use} - Indicates the constraint on sending and receiving short messages. @@ -417,9 +427,10 @@ declare namespace osAccount { * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - isOsAccountConstraintEnabled(localId: number, constraint: string): Promise; + isOsAccountConstraintEnabled(localId: int, constraint: string): Promise; /** * Checks whether this OS account is a test OS account. @@ -451,7 +462,8 @@ declare namespace osAccount { *
2. Incorrect parameter types. * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ checkOsAccountTestable(callback: AsyncCallback): void; @@ -461,7 +473,8 @@ declare namespace osAccount { * @returns { Promise } Returns {@code true} if this account is testable; returns {@code false} otherwise. * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ checkOsAccountTestable(): Promise; @@ -572,7 +585,8 @@ declare namespace osAccount { * @returns { Promise } Returns whether the current OS account is unlocked. * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isOsAccountUnlocked(): Promise; @@ -580,7 +594,7 @@ declare namespace osAccount { * Checks whether the specified OS account is unlocked. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS or ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @returns { Promise } Returns whether the specified OS account is unlocked. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. @@ -590,15 +604,16 @@ declare namespace osAccount { * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - isOsAccountUnlocked(localId: number): Promise; + isOsAccountUnlocked(localId: int): Promise; /** * Removes an OS account based on its local ID. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @param { AsyncCallback } callback - Indicates the callback for removing the specified OS account. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. @@ -611,15 +626,16 @@ declare namespace osAccount { * @throws { BusinessError } 12300010 - Service busy. Possible causes: The target account is being operated. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - removeOsAccount(localId: number, callback: AsyncCallback): void; + removeOsAccount(localId: int, callback: AsyncCallback): void; /** * Removes an OS account based on its local ID. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. @@ -632,15 +648,16 @@ declare namespace osAccount { * @throws { BusinessError } 12300010 - Service busy. Possible causes: The target account is being operated. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - removeOsAccount(localId: number): Promise; + removeOsAccount(localId: int): Promise; /** * Sets constraints for an OS account based on its local ID. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @param { Array } constraints - Indicates the constraints to set for the OS account. The value can be: *
{@code constraint.wifi.set} - Indicates the constraint on configuring the Wi-Fi access point. *
{@code constraint.sms.use} - Indicates the constraint on sending and receiving short messages. @@ -659,20 +676,17 @@ declare namespace osAccount { * @throws { BusinessError } 12300008 - Restricted Account. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - setOsAccountConstraints( - localId: number, - constraints: Array, - enable: boolean, - callback: AsyncCallback - ): void; + setOsAccountConstraints(localId: int, constraints: Array, enable: boolean, + callback: AsyncCallback): void; /** * Sets constraints for an OS account based on its local ID. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @param { Array } constraints - Indicates the constraints to set for the OS account. The value can be: *
{@code constraint.wifi.set} - Indicates the constraint on configuring the Wi-Fi access point. *
{@code constraint.sms.use} - Indicates the constraint on sending and receiving short messages. @@ -691,15 +705,16 @@ declare namespace osAccount { * @throws { BusinessError } 12300008 - Restricted Account. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - setOsAccountConstraints(localId: number, constraints: Array, enable: boolean): Promise; + setOsAccountConstraints(localId: int, constraints: Array, enable: boolean): Promise; /** * Sets the local name for an OS account based on its local ID. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @param { string } localName - Indicates the local name to set for the OS account. * @param { AsyncCallback } callback - Indicates the callback for setting the specified OS account name. * @throws { BusinessError } 201 - Permission denied. @@ -712,15 +727,16 @@ declare namespace osAccount { * @throws { BusinessError } 12300008 - Restricted Account. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - setOsAccountName(localId: number, localName: string, callback: AsyncCallback): void; + setOsAccountName(localId: int, localName: string, callback: AsyncCallback): void; /** * Sets the local name for an OS account based on its local ID. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @param { string } localName - Indicates the local name to set for the OS account. * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 201 - Permission denied. @@ -733,9 +749,10 @@ declare namespace osAccount { * @throws { BusinessError } 12300008 - Restricted Account. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - setOsAccountName(localId: number, localName: string): Promise; + setOsAccountName(localId: int, localName: string): Promise; /** * Gets the name of the OS account to which the caller belongs. @@ -743,7 +760,8 @@ declare namespace osAccount { * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ getOsAccountName(): Promise; @@ -775,29 +793,31 @@ declare namespace osAccount { * Obtains the number of all OS accounts created on a device. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS - * @param { AsyncCallback } callback - Returns the number of created OS accounts. + * @param { AsyncCallback } callback - Returns the number of created OS accounts. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
2. Incorrect parameter types. * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount * This API can be called only by system applications. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - getOsAccountCount(callback: AsyncCallback): void; + getOsAccountCount(callback: AsyncCallback): void; /** * Obtains the number of all OS accounts created on a device. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS - * @returns { Promise } Returns the number of created OS accounts. + * @returns { Promise } Returns the number of created OS accounts. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount * This API can be called only by system applications. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - getOsAccountCount(): Promise; + getOsAccountCount(): Promise; /** * Obtains the local ID of an OS account from the current process UID. @@ -824,24 +844,26 @@ declare namespace osAccount { /** * Gets the local ID of the current OS account. * - * @param { AsyncCallback } callback - Indicates the callback for getting the local ID of the current OS account. + * @param { AsyncCallback } callback - Indicates the callback for getting the local ID of the current OS account. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
2. Incorrect parameter types. * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - getOsAccountLocalId(callback: AsyncCallback): void; + getOsAccountLocalId(callback: AsyncCallback): void; /** * Get the local ID of the current OS account. * - * @returns { Promise } Returns the local ID of the current account. + * @returns { Promise } Returns the local ID of the current account. * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - getOsAccountLocalId(): Promise; + getOsAccountLocalId(): Promise; /** * Gets the local ID of an OS account from the process UID @@ -870,43 +892,46 @@ declare namespace osAccount { /** * Gets the local ID of the OS account associated with the specified UID. * - * @param { number } uid - Indicates the process UID. - * @param { AsyncCallback } callback - Indicates the callback for getting the local ID of the OS account associated with the specified UID. + * @param { int } uid - Indicates the process UID. + * @param { AsyncCallback } callback - Indicates the callback for getting the local ID of the OS account associated with the specified UID. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
2. Incorrect parameter types. * @throws { BusinessError } 12300001 - The system service works abnormally. * @throws { BusinessError } 12300002 - Invalid uid. * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - getOsAccountLocalIdForUid(uid: number, callback: AsyncCallback): void; + getOsAccountLocalIdForUid(uid: int, callback: AsyncCallback): void; /** * Get the local ID of the OS account associated with the specified UID. * - * @param { number } uid - Indicates the process UID. - * @returns { Promise } - Returns the local ID of the OS account associated with the specified UID. + * @param { int } uid - Indicates the process UID. + * @returns { Promise } - Returns the local ID of the OS account associated with the specified UID. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
2. Incorrect parameter types. * @throws { BusinessError } 12300001 - The system service works abnormally. * @throws { BusinessError } 12300002 - Invalid uid. * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - getOsAccountLocalIdForUid(uid: number): Promise; + getOsAccountLocalIdForUid(uid: int): Promise; /** * Gets the local ID of the OS account associated with the specified UID synchronously. * - * @param { number } uid - Indicates the process UID. - * @returns { number } Returns the local ID of the OS account associated with the specified UID. + * @param { int } uid - Indicates the process UID. + * @returns { int } Returns the local ID of the OS account associated with the specified UID. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
2. Incorrect parameter types. * @throws { BusinessError } 12300002 - Invalid uid. * @syscap SystemCapability.Account.OsAccount - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - getOsAccountLocalIdForUidSync(uid: number): number; + getOsAccountLocalIdForUidSync(uid: int): int; /** * Queries the local ID of an OS account which is bound to the specified domain account. @@ -939,7 +964,7 @@ declare namespace osAccount { * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS * @param { DomainAccountInfo } domainInfo - Indicates the domain account info. - * @param { AsyncCallback } callback - Indicates the callback for + * @param { AsyncCallback } callback - Indicates the callback for * getting the local ID of the OS account associated with the specified domain account. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. @@ -948,16 +973,17 @@ declare namespace osAccount { * @throws { BusinessError } 12300002 - Invalid domainInfo. * @syscap SystemCapability.Account.OsAccount * This API can be called only by system applications. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - getOsAccountLocalIdForDomain(domainInfo: DomainAccountInfo, callback: AsyncCallback): void; + getOsAccountLocalIdForDomain(domainInfo: DomainAccountInfo, callback: AsyncCallback): void; /** * Gets the local ID of the OS account associated with the specified domain account. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS * @param { DomainAccountInfo } domainInfo - Indicates the domain account info. - * @returns { Promise } Returns the local ID of the OS account associated with the specified domain account. + * @returns { Promise } Returns the local ID of the OS account associated with the specified domain account. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
2. Incorrect parameter types. @@ -965,47 +991,51 @@ declare namespace osAccount { * @throws { BusinessError } 12300002 - Invalid domainInfo. * @syscap SystemCapability.Account.OsAccount * This API can be called only by system applications. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - getOsAccountLocalIdForDomain(domainInfo: DomainAccountInfo): Promise; + getOsAccountLocalIdForDomain(domainInfo: DomainAccountInfo): Promise; /** * Queries the maximum number of OS accounts that can be created on a device. * - * @param { AsyncCallback } callback - Returns the maximum number of OS accounts that can be created. + * @param { AsyncCallback } callback - Returns the maximum number of OS accounts that can be created. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
2. Incorrect parameter types. * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - queryMaxOsAccountNumber(callback: AsyncCallback): void; + queryMaxOsAccountNumber(callback: AsyncCallback): void; /** * Queries the maximum number of OS accounts that can be created on a device. * - * @returns { Promise } Returns the maximum number of OS accounts that can be created. + * @returns { Promise } Returns the maximum number of OS accounts that can be created. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - queryMaxOsAccountNumber(): Promise; + queryMaxOsAccountNumber(): Promise; /** * Queries the maximum number of OS accounts that can be logged in. * - * @returns { Promise } Returns the maximum number of OS accounts that can be logged in. + * @returns { Promise } Returns the maximum number of OS accounts that can be logged in. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - queryMaxLoggedInOsAccountNumber(): Promise; + queryMaxLoggedInOsAccountNumber(): Promise; /** * Obtains all constraints of an OS account based on its local ID. @@ -1073,7 +1103,7 @@ declare namespace osAccount { * Gets all enabled constraints of the specified OS account by its local ID. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS or ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @returns { Promise> } Returns a list of constraints. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. @@ -1083,9 +1113,10 @@ declare namespace osAccount { * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - getEnabledOsAccountConstraints(localId: number): Promise>; + getEnabledOsAccountConstraints(localId: int): Promise>; /** * Queries the list of all the OS accounts that have been created in the system. @@ -1099,7 +1130,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ queryAllCreatedOsAccounts(callback: AsyncCallback>): void; @@ -1113,7 +1145,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ queryAllCreatedOsAccounts(): Promise>; @@ -1142,34 +1175,37 @@ declare namespace osAccount { /** * Gets the local IDs of all activated OS accounts. * - * @param { AsyncCallback> } callback - Indicates the callback for getting the local IDs of all activated OS accounts. + * @param { AsyncCallback> } callback - Indicates the callback for getting the local IDs of all activated OS accounts. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
2. Incorrect parameter types. * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - getActivatedOsAccountLocalIds(callback: AsyncCallback>): void; + getActivatedOsAccountLocalIds(callback: AsyncCallback>): void; /** * Gets the local IDs of all activated OS accounts. * - * @returns { Promise> } Returns all activated accounts. + * @returns { Promise> } Returns all activated accounts. * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - getActivatedOsAccountLocalIds(): Promise>; + getActivatedOsAccountLocalIds(): Promise>; /** * Gets the local ID of the foreground OS account. * - * @returns { Promise } Returns local ID of the foreground OS account. + * @returns { Promise } Returns local ID of the foreground OS account. * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ - getForegroundOsAccountLocalId(): Promise; + getForegroundOsAccountLocalId(): Promise; /** * Creates an OS account using the local name and account type. @@ -1212,7 +1248,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300007 - The number of accounts has reached the upper limit. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ createOsAccount(localName: string, type: OsAccountType, callback: AsyncCallback): void; @@ -1259,7 +1296,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300015 - The short name already exists. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ createOsAccount(localName: string, type: OsAccountType, options?: CreateOsAccountOptions): Promise; @@ -1306,7 +1344,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300007 - The number of accounts has reached the upper limit. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ createOsAccountForDomain( type: OsAccountType, @@ -1359,7 +1398,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300015 - The short name already exists. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ createOsAccountForDomain(type: OsAccountType, domainInfo: DomainAccountInfo, options?: CreateOsAccountForDomainOptions): Promise; @@ -1449,7 +1489,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ queryOsAccount(): Promise; @@ -1457,7 +1498,7 @@ declare namespace osAccount { * Queries OS account information based on the local ID. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS or ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS_EXTENSION - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @param { AsyncCallback } callback - Returns the OS account information; returns {@code null} if the query fails. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. @@ -1468,15 +1509,16 @@ declare namespace osAccount { * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - queryOsAccountById(localId: number, callback: AsyncCallback): void; + queryOsAccountById(localId: int, callback: AsyncCallback): void; /** * Queries OS account information based on the local ID. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS or ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS_EXTENSION - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @returns { Promise } Returns the OS account information; returns {@code null} if the query fails. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. @@ -1487,15 +1529,16 @@ declare namespace osAccount { * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - queryOsAccountById(localId: number): Promise; + queryOsAccountById(localId: int): Promise; /** * Gets the domain account information associated with the specified OS account. * * @permission ohos.permission.GET_DOMAIN_ACCOUNTS and ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS - * @param { number } localId - Indicates the local ID of the specified OS account. + * @param { int } localId - Indicates the local ID of the specified OS account. * @returns { Promise } Returns the domain account information. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. @@ -1503,9 +1546,10 @@ declare namespace osAccount { * @throws { BusinessError } 12300001 - The system service works abnormally. * @throws { BusinessError } 12300003 - OS account not found. * @syscap SystemCapability.Account.OsAccount - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ - getOsAccountDomainInfo(localId: number): Promise; + getOsAccountDomainInfo(localId: int): Promise; /** * Obtains the type of this OS account from the current process. @@ -1540,7 +1584,8 @@ declare namespace osAccount { *
2. Incorrect parameter types. * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getOsAccountType(callback: AsyncCallback): void; @@ -1551,7 +1596,8 @@ declare namespace osAccount { * {@link OsAccountType#NORMAL}, and {@link OsAccountType#GUEST}. * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getOsAccountType(): Promise; @@ -1559,7 +1605,7 @@ declare namespace osAccount { * Gets the type of the specified OS account. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS or ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @returns { Promise } Returns the OS account type. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. @@ -1569,9 +1615,10 @@ declare namespace osAccount { * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - getOsAccountType(localId: number): Promise; + getOsAccountType(localId: int): Promise; /** * Obtains the distributed virtual device ID (DVID). @@ -1625,7 +1672,8 @@ declare namespace osAccount { *
2. Incorrect parameter types. * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ queryDistributedVirtualDeviceId(callback: AsyncCallback): void; @@ -1643,7 +1691,8 @@ declare namespace osAccount { * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ queryDistributedVirtualDeviceId(): Promise; @@ -1651,7 +1700,7 @@ declare namespace osAccount { * Obtains the profile photo of an OS account based on its local ID. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @param { AsyncCallback } callback - Returns the profile photo if obtained; * returns {@code null} if the profile photo fails to be obtained. * @throws { BusinessError } 201 - Permission denied. @@ -1663,15 +1712,16 @@ declare namespace osAccount { * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - getOsAccountProfilePhoto(localId: number, callback: AsyncCallback): void; + getOsAccountProfilePhoto(localId: int, callback: AsyncCallback): void; /** * Obtains the profile photo of an OS account based on its local ID. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @returns { Promise } Returns the profile photo if obtained; * returns {@code null} if the profile photo fails to be obtained. * @throws { BusinessError } 201 - Permission denied. @@ -1683,15 +1733,16 @@ declare namespace osAccount { * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - getOsAccountProfilePhoto(localId: number): Promise; + getOsAccountProfilePhoto(localId: int): Promise; /** * Sets the profile photo for an OS account based on its local ID. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @param { string } photo - Indicates the profile photo to set for the OS account. * @param { AsyncCallback } callback - Asynchronous callback interface. * @throws { BusinessError } 201 - Permission denied. @@ -1704,15 +1755,16 @@ declare namespace osAccount { * @throws { BusinessError } 12300008 - Restricted Account. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - setOsAccountProfilePhoto(localId: number, photo: string, callback: AsyncCallback): void; + setOsAccountProfilePhoto(localId: int, photo: string, callback: AsyncCallback): void; /** * Sets the profile photo for an OS account based on its local ID. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @param { string } photo - Indicates the profile photo to set for the OS account. * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 201 - Permission denied. @@ -1725,63 +1777,66 @@ declare namespace osAccount { * @throws { BusinessError } 12300008 - Restricted Account. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - setOsAccountProfilePhoto(localId: number, photo: string): Promise; + setOsAccountProfilePhoto(localId: int, photo: string): Promise; /** * Obtain localId according to serial number * * @param { number } serialNumber - Indicates serial number. - * @param { AsyncCallback } callback - Returns localId. + * @param { AsyncCallback } callback - Returns localId. * @syscap SystemCapability.Account.OsAccount * @since 8 * @deprecated since 9 * @useinstead osAccount.AccountManager#getOsAccountLocalIdForSerialNumber */ - getOsAccountLocalIdBySerialNumber(serialNumber: number, callback: AsyncCallback): void; + getOsAccountLocalIdBySerialNumber(serialNumber: number, callback: AsyncCallback): void; /** * Obtain localId according to serial number * * @param { number } serialNumber - Indicates serial number. - * @returns { Promise } Returns localId. + * @returns { Promise } Returns localId. * @syscap SystemCapability.Account.OsAccount * @since 8 * @deprecated since 9 * @useinstead osAccount.AccountManager#getOsAccountLocalIdForSerialNumber */ - getOsAccountLocalIdBySerialNumber(serialNumber: number): Promise; + getOsAccountLocalIdBySerialNumber(serialNumber: number): Promise; /** * Gets the local ID of the OS account associated with the serial number. * - * @param { number } serialNumber - Indicates serial number. - * @param { AsyncCallback } callback - Indicates the callback for getting the local ID of the OS account associated with the serial number. + * @param { long } serialNumber - Indicates serial number. + * @param { AsyncCallback } callback - Indicates the callback for getting the local ID of the OS account associated with the serial number. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
2. Incorrect parameter types. * @throws { BusinessError } 12300001 - The system service works abnormally. * @throws { BusinessError } 12300002 - Invalid serialNumber. * @throws { BusinessError } 12300003 - The account indicated by serialNumber dose not exist. * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - getOsAccountLocalIdForSerialNumber(serialNumber: number, callback: AsyncCallback): void; + getOsAccountLocalIdForSerialNumber(serialNumber: long, callback: AsyncCallback): void; /** * Gets the local ID of the OS account associated with the serial number. * - * @param { number } serialNumber - Indicates serial number. - * @returns { Promise } Returns the local ID of the OS account associated with the serial number. + * @param { long } serialNumber - Indicates serial number. + * @returns { Promise } Returns the local ID of the OS account associated with the serial number. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
2. Incorrect parameter types. * @throws { BusinessError } 12300001 - The system service works abnormally. * @throws { BusinessError } 12300002 - Invalid serialNumber. * @throws { BusinessError } 12300003 - The account indicated by serialNumber dose not exist. * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - getOsAccountLocalIdForSerialNumber(serialNumber: number): Promise; + getOsAccountLocalIdForSerialNumber(serialNumber: long): Promise; /** * Obtain serial number according to localId. @@ -1810,32 +1865,34 @@ declare namespace osAccount { /** * Gets the serial number for the specified os account local id. * - * @param { number } localId - Indicates the local ID of the OS account. - * @param { AsyncCallback } callback - Indicates the callback for getting the serial number for the specified os account local id. + * @param { int } localId - Indicates the local ID of the OS account. + * @param { AsyncCallback } callback - Indicates the callback for getting the serial number for the specified os account local id. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
2. Incorrect parameter types. * @throws { BusinessError } 12300001 - The system service works abnormally. * @throws { BusinessError } 12300002 - Invalid localId. * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - getSerialNumberForOsAccountLocalId(localId: number, callback: AsyncCallback): void; + getSerialNumberForOsAccountLocalId(localId: int, callback: AsyncCallback): void; /** * Gets the serial number for the specified os account local id. * - * @param { number } localId - Indicates the local ID of the OS account. - * @returns { Promise } Returns the serial number according to local ID. + * @param { int } localId - Indicates the local ID of the OS account. + * @returns { Promise } Returns the serial number according to local ID. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
2. Incorrect parameter types. * @throws { BusinessError } 12300001 - The system service works abnormally. * @throws { BusinessError } 12300002 - Invalid localId. * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.OsAccount - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - getSerialNumberForOsAccountLocalId(localId: number): Promise; + getSerialNumberForOsAccountLocalId(localId: int): Promise; /** * Subscribes to the change events of accounts. @@ -1846,7 +1903,7 @@ declare namespace osAccount { * @permission ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS_EXTENSION * @param { 'activate' | 'activating' } type - Event type. * @param { string } name - Indicates the name of subscriber. - * @param { Callback } callback - Asynchronous callback interface. + * @param { Callback } callback - Asynchronous callback interface. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. @@ -1855,9 +1912,10 @@ declare namespace osAccount { * @throws { BusinessError } 12300002 - Invalid type or name. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - on(type: 'activate' | 'activating', name: string, callback: Callback): void; + on(type: 'activate' | 'activating', name: string, callback: Callback): void; /** * Unsubscribes from account events. @@ -1865,7 +1923,7 @@ declare namespace osAccount { * @permission ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS_EXTENSION * @param { 'activate' | 'activating' } type - Event type. * @param { string } name - Indicates the name of subscriber. - * @param { Callback } callback - Asynchronous callback interface. + * @param { Callback } callback - Asynchronous callback interface. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. @@ -1874,9 +1932,10 @@ declare namespace osAccount { * @throws { BusinessError } 12300002 - Invalid type or name. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - off(type: 'activate' | 'activating', name: string, callback?: Callback): void; + off(type: 'activate' | 'activating', name: string, callback?: Callback): void; /** * Subscribes to the OS account switching event. @@ -1892,7 +1951,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300002 - Invalid type. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'switching', callback: Callback): void; @@ -1910,7 +1970,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300002 - Invalid type. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'switching', callback?: Callback): void; @@ -1928,7 +1989,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300002 - Invalid type. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'switched', callback: Callback): void; @@ -1946,15 +2008,16 @@ declare namespace osAccount { * @throws { BusinessError } 12300002 - Invalid type. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'switched', callback?: Callback): void; /** * Gets the bundle ID associated with the specified UID. * - * @param { number } uid - Indicates the target uid. - * @param { AsyncCallback } callback - Indicates the callback for getting the bundle ID associated with the specified UID. + * @param { int } uid - Indicates the target uid. + * @param { AsyncCallback } callback - Indicates the callback for getting the bundle ID associated with the specified UID. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
2. Incorrect parameter types. @@ -1962,15 +2025,16 @@ declare namespace osAccount { * @throws { BusinessError } 12300002 - Invalid uid. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - getBundleIdForUid(uid: number, callback: AsyncCallback): void; + getBundleIdForUid(uid: int, callback: AsyncCallback): void; /** * Gets the bundle ID associated with the specified UID. * - * @param { number } uid - Indicates the target uid. - * @returns { Promise } Returns the bundle ID associated with the specified UID. + * @param { int } uid - Indicates the target uid. + * @returns { Promise } Returns the bundle ID associated with the specified UID. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
2. Incorrect parameter types. @@ -1978,24 +2042,26 @@ declare namespace osAccount { * @throws { BusinessError } 12300002 - Invalid uid. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - getBundleIdForUid(uid: number): Promise; + getBundleIdForUid(uid: int): Promise; /** * Gets the bundle ID associated with the specified UID synchronously. * - * @param { number } uid - Indicates the target uid. - * @returns { number } Returns the bundle ID associated with the specified UID. + * @param { int } uid - Indicates the target uid. + * @returns { int } Returns the bundle ID associated with the specified UID. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
2. Incorrect parameter types. * @throws { BusinessError } 12300002 - Invalid uid. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - getBundleIdForUidSync(uid: number): number; + getBundleIdForUidSync(uid: int): int; /** * Check whether current process belongs to the main account. @@ -2010,7 +2076,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ isMainOsAccount(callback: AsyncCallback): void; @@ -2025,7 +2092,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ isMainOsAccount(): Promise; @@ -2033,7 +2101,7 @@ declare namespace osAccount { * Gets a list of constraint source types for the specified os account. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @param { string } constraint - Indicates the constraint to query the source type. * @param { AsyncCallback> } callback - Indicates the callback for * getting a list of constraint source types for the specified os account. @@ -2046,19 +2114,16 @@ declare namespace osAccount { * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - getOsAccountConstraintSourceTypes( - localId: number, - constraint: string, - callback: AsyncCallback> - ): void; + getOsAccountConstraintSourceTypes(localId: int, constraint: string, callback: AsyncCallback>): void; /** * Gets a list of constraint source types for the specified os account. * * @permission ohos.permission.MANAGE_LOCAL_ACCOUNTS - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @param { string } constraint - Indicates the constraint to query the source type. * @returns { Promise> } Returns a list of constraint source types for the specified os account. * @throws { BusinessError } 201 - Permission denied. @@ -2070,9 +2135,10 @@ declare namespace osAccount { * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - getOsAccountConstraintSourceTypes(localId: number, constraint: string): Promise>; + getOsAccountConstraintSourceTypes(localId: int, constraint: string): Promise>; /** * Binds the specified domain account to the target OS account. @@ -2103,24 +2169,27 @@ declare namespace osAccount { * * @interface OsAccountInfo * @syscap SystemCapability.Account.OsAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ interface OsAccountInfo { /** * The local ID of an OS account. * - * @type { number } + * @type { int } * @syscap SystemCapability.Account.OsAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - localId: number; + localId: int; /** * The local name of an OS account. * * @type { string } * @syscap SystemCapability.Account.OsAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ localName: string; @@ -2130,7 +2199,8 @@ declare namespace osAccount { * @type { ?string } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ shortName?: string; @@ -2139,7 +2209,8 @@ declare namespace osAccount { * * @type { OsAccountType } * @syscap SystemCapability.Account.OsAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ type: OsAccountType; @@ -2148,7 +2219,8 @@ declare namespace osAccount { * * @type { Array } * @syscap SystemCapability.Account.OsAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ constraints: Array; @@ -2168,7 +2240,8 @@ declare namespace osAccount { * * @type { boolean } * @syscap SystemCapability.Account.OsAccount - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isUnlocked: boolean; @@ -2177,36 +2250,40 @@ declare namespace osAccount { * * @type { string } * @syscap SystemCapability.Account.OsAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ photo: string; /** * Os account create time. * - * @type { number } + * @type { long } * @syscap SystemCapability.Account.OsAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - createTime: number; + createTime: long; /** * The last time to log in. * - * @type { number } + * @type { long } * @syscap SystemCapability.Account.OsAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - lastLoginTime: number; + lastLoginTime: long; /** * Os account serial number. * - * @type { number } + * @type { long } * @syscap SystemCapability.Account.OsAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - serialNumber: number; + serialNumber: long; /** * Os account is activated or not. @@ -2224,7 +2301,8 @@ declare namespace osAccount { * * @type { boolean } * @syscap SystemCapability.Account.OsAccount - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isActivated: boolean; @@ -2234,7 +2312,8 @@ declare namespace osAccount { * @type { ?boolean } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ isLoggedIn?: boolean; @@ -2243,7 +2322,8 @@ declare namespace osAccount { * * @type { boolean } * @syscap SystemCapability.Account.OsAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ isCreateCompleted: boolean; @@ -2252,7 +2332,8 @@ declare namespace osAccount { * * @type { distributedAccount.DistributedInfo } * @syscap SystemCapability.Account.OsAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ distributedInfo: distributedAccount.DistributedInfo; @@ -2261,7 +2342,8 @@ declare namespace osAccount { * * @type { DomainAccountInfo } * @syscap SystemCapability.Account.OsAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ domainInfo: DomainAccountInfo; } @@ -2272,28 +2354,31 @@ declare namespace osAccount { * @typedef OsAccountSwitchEventData * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface OsAccountSwitchEventData { /** * Indicates which OS account to switch from. * - * @type { number } + * @type { int } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - fromAccountId: number; + fromAccountId: int; /** * Indicates which OS account to switch to. * - * @type { number } + * @type { int } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - toAccountId: number; + toAccountId: int; } /** @@ -2302,7 +2387,8 @@ declare namespace osAccount { * @interface CreateOsAccountOptions * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface CreateOsAccountOptions { /** @@ -2311,29 +2397,10 @@ declare namespace osAccount { * @type { string } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ shortName: string; - - /** - * Indicates the bundles are disallowed to be preinstalled on the OS account. - * - * @type { ?Array } - * @syscap SystemCapability.Account.OsAccount - * @systemapi Hide this for inner system use. - * @since 19 - */ - disallowedPreinstalledBundles?: Array; - - /** - * Indicates the bundles are allowed to be preinstalled on the OS account. - * - * @type { ?Array } - * @syscap SystemCapability.Account.OsAccount - * @systemapi Hide this for inner system use. - * @since 19 - */ - allowedPreinstalledBundles?: Array; } /** @@ -2343,7 +2410,8 @@ declare namespace osAccount { * @interface CreateOsAccountForDomainOptions * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface CreateOsAccountForDomainOptions extends CreateOsAccountOptions {} @@ -2352,7 +2420,8 @@ declare namespace osAccount { * * @interface DomainAccountInfo * @syscap SystemCapability.Account.OsAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ interface DomainAccountInfo { /** @@ -2360,7 +2429,8 @@ declare namespace osAccount { * * @type { string } * @syscap SystemCapability.Account.OsAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ domain: string; @@ -2369,7 +2439,8 @@ declare namespace osAccount { * * @type { string } * @syscap SystemCapability.Account.OsAccount - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ accountName: string; @@ -2379,7 +2450,8 @@ declare namespace osAccount { * @type { ?string } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ accountId?: string; @@ -2389,7 +2461,8 @@ declare namespace osAccount { * @type { ?boolean } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isAuthenticated?: boolean; @@ -2398,7 +2471,8 @@ declare namespace osAccount { * * @type { ?string } * @syscap SystemCapability.Account.OsAccount - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ serverConfigId?: string; } @@ -2406,16 +2480,18 @@ declare namespace osAccount { /** * Enumerates OS account types. * - * @enum { number } OsAccountType + * @enum { int } OsAccountType * @syscap SystemCapability.Account.OsAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ enum OsAccountType { /** * Indicates the administrator account, which has the permission to manage other OS accounts. * * @syscap SystemCapability.Account.OsAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ ADMIN = 0, @@ -2423,7 +2499,8 @@ declare namespace osAccount { * Indicates a normal account, which has access to common functions of OS accounts. * * @syscap SystemCapability.Account.OsAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ NORMAL = 1, @@ -2431,7 +2508,8 @@ declare namespace osAccount { * Indicates a guest account, which is used to temporarily access the device and may be deleted at any time. * * @syscap SystemCapability.Account.OsAccount - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ GUEST = 2, @@ -2440,7 +2518,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PRIVATE = 1024 } @@ -2450,7 +2529,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 * @name UserAuth */ class UserAuth { @@ -2460,20 +2540,22 @@ declare namespace osAccount { * @throws { BusinessError } 202 - Not system application. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); /** * Gets version information. * - * @returns { number } Returns the version information. + * @returns { int } Returns the version information. * @throws { BusinessError } 202 - Not system application. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - getVersion(): number; + getVersion(): int; /** * Checks whether the authentication capability is available. @@ -2481,7 +2563,7 @@ declare namespace osAccount { * @permission ohos.permission.ACCESS_USER_AUTH_INTERNAL * @param { AuthType } authType - Indicates the credential type for authentication. * @param { AuthTrustLevel } authTrustLevel - Indicates the trust level of authentication result. - * @returns { number } Returns a status result. + * @returns { int } Returns a status result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. @@ -2490,9 +2572,10 @@ declare namespace osAccount { * @throws { BusinessError } 12300002 - Invalid authType or authTrustLevel. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - getAvailableStatus(authType: AuthType, authTrustLevel: AuthTrustLevel): number; + getAvailableStatus(authType: AuthType, authTrustLevel: AuthTrustLevel): int; /** * Gets the property based on the specified request information. @@ -2525,7 +2608,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ getProperty(request: GetPropertyRequest, callback: AsyncCallback): void; @@ -2560,7 +2644,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ getProperty(request: GetPropertyRequest): Promise; @@ -2580,7 +2665,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300102 - The credential does not exist. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ getPropertyByCredentialId(credentialId: Uint8Array, keys: Array): Promise; @@ -2598,7 +2684,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300002 - Invalid request. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ setProperty(request: SetPropertyRequest, callback: AsyncCallback): void; @@ -2616,7 +2703,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300002 - Invalid request. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ setProperty(request: SetPropertyRequest): Promise; @@ -2633,24 +2721,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300002 - Invalid remoteNetworkId. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 - */ - /** - * Prepares remote authentication. - * - * @permission ohos.permission.ACCESS_USER_AUTH_INTERNAL - * @param { string } remoteNetworkId - Indicates the remote network identifier. - * @returns { Promise } The promise returned by the function. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Not system application. - * @throws { BusinessError } 12300001 - System service exception. - * @throws { BusinessError } 12300002 - Invalid remoteNetworkId. - * @throws { BusinessError } 12300090 - Cross-device capability not supported. - * @throws { BusinessError } 12300091 - Cross-device communication failed. - * @throws { BusinessError } 12300111 - Operation timeout. - * @syscap SystemCapability.Account.OsAccount - * @systemapi - * @since 20 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ prepareRemoteAuth(remoteNetworkId: string): Promise; @@ -2711,41 +2783,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300211 - Server unreachable. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 - */ - /** - * Executes authentication. - * - * @permission ohos.permission.ACCESS_USER_AUTH_INTERNAL - * @param { Uint8Array } challenge - Indicates the challenge value. - * @param { AuthType } authType - Indicates the authentication type. - * @param { AuthTrustLevel } authTrustLevel - Indicates the trust level of authentication result. - * @param { IUserAuthCallback } callback - Indicates the callback to get result and acquireInfo. - * @returns { Uint8Array } Returns a context ID for cancellation. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Not system application. - * @throws { BusinessError } 12300001 - The system service works abnormally. - * @throws { BusinessError } 12300002 - Invalid challenge, authType or authTrustLevel. - * @throws { BusinessError } 12300013 - Network exception. - * @throws { BusinessError } 12300020 - Device hardware abnormal. - * @throws { BusinessError } 12300090 - Cross-device capability not supported. - * @throws { BusinessError } 12300091 - Cross-device communication failed. - * @throws { BusinessError } 12300101 - The credential is incorrect. - * @throws { BusinessError } 12300102 - The credential does not exist. - * @throws { BusinessError } 12300105 - The trust level is not supported. - * @throws { BusinessError } 12300106 - The authentication type is not supported. - * @throws { BusinessError } 12300109 - The authentication, enrollment, or update operation is canceled. - * @throws { BusinessError } 12300110 - The authentication is locked. - * @throws { BusinessError } 12300111 - The authentication timeout. - * @throws { BusinessError } 12300112 - The authentication service is busy. - * @throws { BusinessError } 12300113 - The authentication service does not exist. - * @throws { BusinessError } 12300114 - The authentication service works abnormally. - * @throws { BusinessError } 12300117 - PIN is expired. - * @throws { BusinessError } 12300119 - Multi-factor authentication failed. - * @throws { BusinessError } 12300211 - Server unreachable. - * @syscap SystemCapability.Account.OsAccount - * @systemapi - * @since 20 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ auth( challenge: Uint8Array, @@ -2786,43 +2825,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300211 - Server unreachable. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 - */ - /** - * Executes authentication. - * - * @permission ohos.permission.ACCESS_USER_AUTH_INTERNAL - * @param { Uint8Array } challenge - Indicates the challenge value. - * @param { AuthType } authType - Indicates the authentication type. - * @param { AuthTrustLevel } authTrustLevel - Indicates the trust level of authentication result. - * @param { AuthOptions } options - Indicates authentication options. - * @param { IUserAuthCallback } callback - Indicates the callback to get result and acquireInfo. - * @returns { Uint8Array } Returns a context ID for cancellation. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Not system application. - * @throws { BusinessError } 12300001 - The system service works abnormally. - * @throws { BusinessError } 12300002 - Invalid challenge, authType, authTrustLevel or options. - * @throws { BusinessError } 12300003 - Account not found. - * @throws { BusinessError } 12300013 - Network exception. - * @throws { BusinessError } 12300020 - Device hardware abnormal. - * @throws { BusinessError } 12300090 - Cross-device capability not supported. - * @throws { BusinessError } 12300091 - Cross-device communication failed. - * @throws { BusinessError } 12300101 - The credential is incorrect. - * @throws { BusinessError } 12300102 - The credential does not exist. - * @throws { BusinessError } 12300105 - The trust level is not supported. - * @throws { BusinessError } 12300106 - The authentication type is not supported. - * @throws { BusinessError } 12300109 - The authentication, enrollment, or update operation is canceled. - * @throws { BusinessError } 12300110 - The authentication is locked. - * @throws { BusinessError } 12300111 - The authentication timeout. - * @throws { BusinessError } 12300112 - The authentication service is busy. - * @throws { BusinessError } 12300113 - The authentication service does not exist. - * @throws { BusinessError } 12300114 - The authentication service works abnormally. - * @throws { BusinessError } 12300117 - PIN is expired. - * @throws { BusinessError } 12300119 - Multi-factor authentication failed. - * @throws { BusinessError } 12300211 - Server unreachable. - * @syscap SystemCapability.Account.OsAccount - * @systemapi - * @since 20 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ auth( challenge: Uint8Array, @@ -2836,7 +2840,7 @@ declare namespace osAccount { * Executes user authentication. * * @permission ohos.permission.ACCESS_USER_AUTH_INTERNAL - * @param { number } userId - Indicates the user identification. + * @param { int } userId - Indicates the user identification. * @param { Uint8Array } challenge - Indicates the challenge value. * @param { AuthType } authType - Indicates the authentication type. * @param { AuthTrustLevel } authTrustLevel - Indicates the trust level of authentication result. @@ -2864,7 +2868,7 @@ declare namespace osAccount { * Executes user authentication. * * @permission ohos.permission.ACCESS_USER_AUTH_INTERNAL - * @param { number } userId - Indicates the user identification. + * @param { int } userId - Indicates the user identification. * @param { Uint8Array } challenge - Indicates the challenge value. * @param { AuthType } authType - Indicates the authentication type. * @param { AuthTrustLevel } authTrustLevel - Indicates the trust level of authentication result. @@ -2892,46 +2896,11 @@ declare namespace osAccount { * @throws { BusinessError } 12300211 - Server unreachable. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 - */ - /** - * Executes user authentication. - * - * @permission ohos.permission.ACCESS_USER_AUTH_INTERNAL - * @param { number } userId - Indicates the user identification. - * @param { Uint8Array } challenge - Indicates the challenge value. - * @param { AuthType } authType - Indicates the authentication type. - * @param { AuthTrustLevel } authTrustLevel - Indicates the trust level of authentication result. - * @param { IUserAuthCallback } callback - Indicates the callback to get result and acquireInfo. - * @returns { Uint8Array } Returns a context ID for cancellation. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Not system application. - * @throws { BusinessError } 12300001 - The system service works abnormally. - * @throws { BusinessError } 12300002 - Invalid challenge, authType or authTrustLevel. - * @throws { BusinessError } 12300003 - Account not found. - * @throws { BusinessError } 12300013 - Network exception. - * @throws { BusinessError } 12300020 - Device hardware abnormal. - * @throws { BusinessError } 12300090 - Cross-device capability not supported. - * @throws { BusinessError } 12300091 - Cross-device communication failed. - * @throws { BusinessError } 12300101 - The credential is incorrect. - * @throws { BusinessError } 12300102 - The credential does not exist. - * @throws { BusinessError } 12300105 - The trust level is not supported. - * @throws { BusinessError } 12300106 - The authentication type is not supported. - * @throws { BusinessError } 12300109 - The authentication, enrollment, or update operation is canceled. - * @throws { BusinessError } 12300110 - The authentication is locked. - * @throws { BusinessError } 12300111 - The authentication timeout. - * @throws { BusinessError } 12300112 - The authentication service is busy. - * @throws { BusinessError } 12300113 - The authentication service does not exist. - * @throws { BusinessError } 12300114 - The authentication service works abnormally. - * @throws { BusinessError } 12300117 - PIN is expired. - * @throws { BusinessError } 12300119 - Multi-factor authentication failed. - * @throws { BusinessError } 12300211 - Server unreachable. - * @syscap SystemCapability.Account.OsAccount - * @systemapi - * @since 20 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ authUser( - userId: number, + userId: int, challenge: Uint8Array, authType: AuthType, authTrustLevel: AuthTrustLevel, @@ -2951,7 +2920,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300002 - Invalid contextId. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ cancelAuth(contextID: Uint8Array): void; } @@ -2961,7 +2931,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 * @name PINAuth */ class PINAuth { @@ -2971,7 +2942,8 @@ declare namespace osAccount { * @throws { BusinessError } 202 - Not system application. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -2989,7 +2961,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300103 - The credential inputer already exists. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ registerInputer(inputer: IInputer): void; @@ -3001,7 +2974,8 @@ declare namespace osAccount { * @throws { BusinessError } 202 - Not system application. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ unregisterInputer(): void; } @@ -3011,7 +2985,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 * @name InputerManager */ class InputerManager { @@ -3032,7 +3007,8 @@ declare namespace osAccount { * @static * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ static registerInputer(authType: AuthType, inputer: IInputer): void; @@ -3049,7 +3025,8 @@ declare namespace osAccount { * @static * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ static unregisterInputer(authType: AuthType): void; } @@ -3060,28 +3037,31 @@ declare namespace osAccount { * @interface AuthStatusInfo * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ interface AuthStatusInfo { /** * Indicates the remaining times that authentication can be performed. * - * @type { number } + * @type { int } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - remainTimes: number; + remainTimes: int; /** * Indicates the freezing time before performing the next authentication. * - * @type { number } + * @type { int } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - freezingTime: number; + freezingTime: int; } /** @@ -3090,7 +3070,8 @@ declare namespace osAccount { * @typedef GetDomainAccessTokenOptions * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ interface GetDomainAccessTokenOptions { /** @@ -3099,7 +3080,8 @@ declare namespace osAccount { * @type { DomainAccountInfo } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ domainAccountInfo: DomainAccountInfo; @@ -3109,7 +3091,8 @@ declare namespace osAccount { * @type { Uint8Array } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ domainAccountToken: Uint8Array; @@ -3119,19 +3102,21 @@ declare namespace osAccount { * @type { Record } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ businessParams: Record; /** * Indicates caller UID. * - * @type { number } + * @type { int } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - callerUid: number; + callerUid: int; } /** @@ -3140,7 +3125,8 @@ declare namespace osAccount { * @typedef GetDomainAccountInfoOptions * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ interface GetDomainAccountInfoOptions { /** @@ -3149,7 +3135,8 @@ declare namespace osAccount { * @type { string } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ accountName: string; @@ -3159,7 +3146,8 @@ declare namespace osAccount { * @type { ?string } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ domain?: string; @@ -3169,7 +3157,8 @@ declare namespace osAccount { * @type { ?string } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ serverConfigId?: string; } @@ -3181,18 +3170,20 @@ declare namespace osAccount { * @extends GetDomainAccountInfoOptions * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ interface GetDomainAccountInfoPluginOptions extends GetDomainAccountInfoOptions { /** * Indicates the caller UID. * - * @type { number } + * @type { int } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - callerUid: number; + callerUid: int; } /** @@ -3201,7 +3192,8 @@ declare namespace osAccount { * @interface DomainPlugin * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface DomainPlugin { /** @@ -3212,7 +3204,8 @@ declare namespace osAccount { * @param { IUserAuthCallback } callback - Indicates the authentication callback. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ auth(domainAccountInfo: DomainAccountInfo, credential: Uint8Array, callback: IUserAuthCallback): void; @@ -3223,7 +3216,8 @@ declare namespace osAccount { * @param { IUserAuthCallback } callback - Indicates the callback for notifying the authentication result. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ authWithPopup(domainAccountInfo: DomainAccountInfo, callback: IUserAuthCallback): void; @@ -3235,7 +3229,8 @@ declare namespace osAccount { * @param { IUserAuthCallback } callback - Indicates the callback for notifying the authentication result. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ authWithToken(domainAccountInfo: DomainAccountInfo, token: Uint8Array, callback: IUserAuthCallback): void; @@ -3246,7 +3241,8 @@ declare namespace osAccount { * @param { AsyncCallback } callback - Indicates the callback for notifying the domain account information. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ getAccountInfo(options: GetDomainAccountInfoPluginOptions, callback: AsyncCallback): void; @@ -3257,7 +3253,8 @@ declare namespace osAccount { * @param { AsyncCallback } callback - Indicates the callback for notifying the domain authentication status information. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ getAuthStatusInfo(domainAccountInfo: DomainAccountInfo, callback: AsyncCallback): void; @@ -3265,13 +3262,14 @@ declare namespace osAccount { * Binds the specified domain account with an OS account. * * @param { DomainAccountInfo } domainAccountInfo - Indicates the domain account information. - * @param { number } localId - Indicates the local ID of the OS account. + * @param { int } localId - Indicates the local ID of the OS account. * @param { AsyncCallback } callback - Indicates the callback for notifying the binding result. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - bindAccount(domainAccountInfo: DomainAccountInfo, localId: number, callback: AsyncCallback): void; + bindAccount(domainAccountInfo: DomainAccountInfo, localId: int, callback: AsyncCallback): void; /** * Unbind the specified domain account. @@ -3280,7 +3278,8 @@ declare namespace osAccount { * @param { AsyncCallback } callback - Indicates the callback for notifying the unbinding result. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ unbindAccount(domainAccountInfo: DomainAccountInfo, callback: AsyncCallback): void; @@ -3292,7 +3291,8 @@ declare namespace osAccount { * @param { AsyncCallback } callback - Indicates the callback for notifying the checking result. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ isAccountTokenValid( domainAccountInfo: DomainAccountInfo, @@ -3307,7 +3307,8 @@ declare namespace osAccount { * @param { AsyncCallback } callback - Indicates the callback for returning the access token. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ getAccessToken(options: GetDomainAccessTokenOptions, callback: AsyncCallback): void; } @@ -3316,7 +3317,8 @@ declare namespace osAccount { * Provides abilities for the management of domain account. * * @syscap SystemCapability.Account.OsAccount - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ class DomainAccountManager { /** @@ -3348,7 +3350,8 @@ declare namespace osAccount { * @static * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static registerPlugin(plugin: DomainPlugin): void; @@ -3373,7 +3376,8 @@ declare namespace osAccount { * @static * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static unregisterPlugin(): void; @@ -3403,7 +3407,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300211 - Server unreachable. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ static auth(domainAccountInfo: DomainAccountInfo, credential: Uint8Array, callback: IUserAuthCallback): void; @@ -3454,7 +3459,8 @@ declare namespace osAccount { * @static * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static authWithPopup(callback: IUserAuthCallback): void; @@ -3462,7 +3468,7 @@ declare namespace osAccount { * Authenticates the domain account bound to the specified OS account with a popup. * * @permission ohos.permission.ACCESS_USER_AUTH_INTERNAL - * @param { number } localId - Indicates the local ID of the specified OS account. + * @param { int } localId - Indicates the local ID of the specified OS account. * @param { IUserAuthCallback } callback - Indicates the callback for getting the authentication result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. @@ -3488,7 +3494,7 @@ declare namespace osAccount { /** * Authenticates the domain account bound to the specified OS account with a popup. * - * @param { number } localId - Indicates the local ID of the specified OS account. + * @param { int } localId - Indicates the local ID of the specified OS account. * @param { IUserAuthCallback } callback - Indicates the callback for getting the authentication result. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. @@ -3509,9 +3515,10 @@ declare namespace osAccount { * @static * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - static authWithPopup(localId: number, callback: IUserAuthCallback): void; + static authWithPopup(localId: int, callback: IUserAuthCallback): void; /** * Checks whether the specified domain account exists. @@ -3534,7 +3541,8 @@ declare namespace osAccount { * @static * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ static hasAccount(domainAccountInfo: DomainAccountInfo, callback: AsyncCallback): void; @@ -3559,7 +3567,8 @@ declare namespace osAccount { * @static * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ static hasAccount(domainAccountInfo: DomainAccountInfo): Promise; @@ -3582,7 +3591,8 @@ declare namespace osAccount { * @static * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ static updateAccountToken( domainAccountInfo: DomainAccountInfo, @@ -3609,7 +3619,8 @@ declare namespace osAccount { * @static * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ static updateAccountToken(domainAccountInfo: DomainAccountInfo, token: Uint8Array): Promise; @@ -3628,7 +3639,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300004 - The new account already exists. * @static * @syscap SystemCapability.Account.OsAccount - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static updateAccountInfo(oldAccountInfo: DomainAccountInfo, newAccountInfo: DomainAccountInfo): Promise; @@ -3653,7 +3665,8 @@ declare namespace osAccount { * @static * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ static getAccountInfo(options: GetDomainAccountInfoOptions, callback: AsyncCallback): void; @@ -3678,7 +3691,8 @@ declare namespace osAccount { * @static * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ static getAccountInfo(options: GetDomainAccountInfoOptions): Promise; @@ -3702,7 +3716,8 @@ declare namespace osAccount { * @static * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static getAccessToken(businessParams: Record, callback: AsyncCallback): void; @@ -3726,7 +3741,8 @@ declare namespace osAccount { * @static * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static getAccessToken(businessParams: Record): Promise; @@ -3746,7 +3762,8 @@ declare namespace osAccount { * @static * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ static isAuthenticationExpired(domainAccountInfo: DomainAccountInfo): Promise; } @@ -3756,7 +3773,8 @@ declare namespace osAccount { * * @typedef DomainServerConfig * @syscap SystemCapability.Account.OsAccount - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ interface DomainServerConfig { /** @@ -3764,7 +3782,8 @@ declare namespace osAccount { * * @type { Record } * @syscap SystemCapability.Account.OsAccount - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ parameters: Record; @@ -3773,7 +3792,8 @@ declare namespace osAccount { * * @type { string } * @syscap SystemCapability.Account.OsAccount - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ id: string; @@ -3782,7 +3802,8 @@ declare namespace osAccount { * * @type { string } * @syscap SystemCapability.Account.OsAccount - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ domain: string; } @@ -3791,7 +3812,8 @@ declare namespace osAccount { * Provides abilities for managing domain server config. * * @syscap SystemCapability.Account.OsAccount - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ class DomainServerConfigManager { /** @@ -3809,7 +3831,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300215 - The number of server config reaches the upper limit. * @static * @syscap SystemCapability.Account.OsAccount - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static addServerConfig(parameters: Record): Promise; @@ -3826,7 +3849,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300214 - Server config has been associated with an account. * @static * @syscap SystemCapability.Account.OsAccount - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static removeServerConfig(configId: string): Promise; @@ -3847,7 +3871,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300214 - Server config has been associated with an account. * @static * @syscap SystemCapability.Account.OsAccount - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static updateServerConfig(configId: string, parameters: Record): Promise; @@ -3863,7 +3888,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300212 - Server config not found. * @static * @syscap SystemCapability.Account.OsAccount - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static getServerConfig(configId: string): Promise; @@ -3877,7 +3903,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300001 - The system service works abnormally. * @static * @syscap SystemCapability.Account.OsAccount - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static getAllServerConfigs(): Promise>; @@ -3893,7 +3920,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300003 - Domain account not found. * @static * @syscap SystemCapability.Account.OsAccount - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static getAccountServerConfig(domainAccountInfo: DomainAccountInfo): Promise; } @@ -3903,7 +3931,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 * @name UserIdentityManager */ class UserIdentityManager { @@ -3913,7 +3942,8 @@ declare namespace osAccount { * @throws { BusinessError } 202 - Not system application. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -3932,7 +3962,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ openSession(callback: AsyncCallback): void; @@ -3958,7 +3989,7 @@ declare namespace osAccount { * Start an IDM operation to obtain challenge value. * * @permission ohos.permission.MANAGE_USER_IDM - * @param { number } [accountId] - Indicates the local ID of the OS account. + * @param { int } [accountId] - Indicates the local ID of the OS account. * @returns { Promise } Returns a challenge value. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. @@ -3968,9 +3999,10 @@ declare namespace osAccount { * @throws { BusinessError } 12300008 - Restricted account. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - openSession(accountId?: number): Promise; + openSession(accountId?: int): Promise; /** * Adds credential. @@ -4023,7 +4055,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300116 - Credential complexity verification failed. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ addCredential(credentialInfo: CredentialInfo, callback: IIdmCallback): void; @@ -4069,7 +4102,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300116 - Credential complexity verification failed. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ updateCredential(credentialInfo: CredentialInfo, callback: IIdmCallback): void; @@ -4091,7 +4125,7 @@ declare namespace osAccount { * End an IDM operation. * * @permission ohos.permission.MANAGE_USER_IDM - * @param { number } [accountId] - Indicates the local ID of the OS account. + * @param { int } [accountId] - Indicates the local ID of the OS account. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 401 - Parameter error. Possible causes: Incorrect parameter types. @@ -4100,9 +4134,10 @@ declare namespace osAccount { * @throws { BusinessError } 12300008 - Restricted account. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - closeSession(accountId?: number): void; + closeSession(accountId?: int): void; /** * Cancels entry with a challenge value. @@ -4117,7 +4152,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300002 - Invalid challenge. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ cancel(challenge: Uint8Array): void; @@ -4135,7 +4171,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300101 - The token is invalid. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ delUser(token: Uint8Array, callback: IIdmCallback): void; @@ -4156,7 +4193,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300102 - The credential does not exist. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ delCred(credentialId: Uint8Array, token: Uint8Array, callback: IIdmCallback): void; @@ -4173,7 +4211,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300001 - The system service works abnormally. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ getAuthInfo(callback: AsyncCallback>): void; @@ -4192,7 +4231,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300002 - Invalid authType. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ getAuthInfo(authType: AuthType, callback: AsyncCallback>): void; @@ -4210,9 +4250,10 @@ declare namespace osAccount { * @throws { BusinessError } 12300002 - Invalid authType. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - getAuthInfo(authType?: AuthType): Promise>; + getAuthInfo(authType: AuthType): Promise>; /** * Gets authentication information. @@ -4229,7 +4270,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300003 - Account not found. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ getAuthInfo(options?: GetAuthInfoOptions): Promise>; @@ -4238,7 +4280,7 @@ declare namespace osAccount { * * @permission ohos.permission.USE_USER_IDM * @param { AuthType } authType - Indicates the authentication type. - * @param { number } [accountId] - Indicates the OS account identifier. + * @param { int } [accountId] - Indicates the OS account identifier. * @returns { Promise } Returns the enrolled identifier. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system application. @@ -4251,9 +4293,10 @@ declare namespace osAccount { * @throws { BusinessError } 12300106 - The authentication type is not supported. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - getEnrolledId(authType: AuthType, accountId?: number): Promise; + getEnrolledId(authType: AuthType, accountId?: int): Promise; } /** @@ -4262,7 +4305,8 @@ declare namespace osAccount { * @typedef GetAuthInfoOptions * @syscap SystemCapability.Account.OsAccount * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface GetAuthInfoOptions { /** @@ -4271,28 +4315,31 @@ declare namespace osAccount { * @type { ?AuthType } * @syscap SystemCapability.Account.OsAccount * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ authType?: AuthType; /** * Indicates the OS account identifier. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Account.OsAccount * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - accountId?: number; + accountId?: int; } /** * Indicates the enumeration of the authentication intent. * - * @enum { number } AuthIntent + * @enum { int } AuthIntent * @syscap SystemCapability.Account.OsAccount * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum AuthIntent { /** @@ -4300,7 +4347,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ UNLOCK = 1, @@ -4309,7 +4357,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ SILENT_AUTH = 2, @@ -4318,7 +4367,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ QUESTION_AUTH = 3, @@ -4338,7 +4388,8 @@ declare namespace osAccount { * @interface RemoteAuthOptions * @syscap SystemCapability.Account.OsAccount * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface RemoteAuthOptions { /** @@ -4347,7 +4398,8 @@ declare namespace osAccount { * @type { ?string } * @syscap SystemCapability.Account.OsAccount * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ verifierNetworkId?: string; @@ -4357,19 +4409,21 @@ declare namespace osAccount { * @type { ?string } * @syscap SystemCapability.Account.OsAccount * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ collectorNetworkId?: string; /** * Indicates the collector token identifier. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Account.OsAccount * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - collectorTokenId?: number; + collectorTokenId?: int; } /** @@ -4378,18 +4432,20 @@ declare namespace osAccount { * @interface AuthOptions * @syscap SystemCapability.Account.OsAccount * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface AuthOptions { /** * Indicates the local ID of the OS account to be authenticated. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Account.OsAccount * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - accountId?: number; + accountId?: int; /** * Indicates the authentication intent. @@ -4397,7 +4453,8 @@ declare namespace osAccount { * @type { ?AuthIntent } * @syscap SystemCapability.Account.OsAccount * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ authIntent?: AuthIntent; @@ -4407,7 +4464,8 @@ declare namespace osAccount { * @type { ?RemoteAuthOptions } * @syscap SystemCapability.Account.OsAccount * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ remoteAuthOptions?: RemoteAuthOptions; } @@ -4418,7 +4476,8 @@ declare namespace osAccount { * @interface IInputData * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ interface IInputData { /** @@ -4431,7 +4490,8 @@ declare namespace osAccount { * @throws { BusinessError } 12300002 - Invalid pinSubType. * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ onSetData: (authSubType: AuthSubType, data: Uint8Array) => void; } @@ -4442,7 +4502,8 @@ declare namespace osAccount { * @interface GetInputDataOptions * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface GetInputDataOptions { /** @@ -4451,7 +4512,8 @@ declare namespace osAccount { * @type { ?Uint8Array } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ challenge?: Uint8Array; } @@ -4462,7 +4524,8 @@ declare namespace osAccount { * @interface IInputer * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ interface IInputer { /** @@ -4471,7 +4534,8 @@ declare namespace osAccount { * @type { function } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ onGetData: (authSubType: AuthSubType, callback: IInputData, options: GetInputDataOptions) => void; } @@ -4482,7 +4546,8 @@ declare namespace osAccount { * @interface IUserAuthCallback * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ interface IUserAuthCallback { /** @@ -4494,9 +4559,10 @@ declare namespace osAccount { * @type { function } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - onResult: (result: number, extraInfo: AuthResult) => void; + onResult: (result: int, extraInfo: AuthResult) => void; /** * During an authentication, the TipsCode is returned through the callback. @@ -4504,9 +4570,10 @@ declare namespace osAccount { * @type { ?function } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - onAcquireInfo?: (module: number, acquire: number, extraInfo: Uint8Array) => void; + onAcquireInfo?: (module: int, acquire: int, extraInfo: Uint8Array) => void; } /** @@ -4515,7 +4582,8 @@ declare namespace osAccount { * @interface IIdmCallback * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ interface IIdmCallback { /** @@ -4524,9 +4592,10 @@ declare namespace osAccount { * @type { function } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - onResult: (result: number, extraInfo: RequestResult) => void; + onResult: (result: int, extraInfo: RequestResult) => void; /** * During an authentication, the TipsCode is returned through the callback. @@ -4534,9 +4603,10 @@ declare namespace osAccount { * @type { ?function } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - onAcquireInfo?: (module: number, acquire: number, extraInfo: Uint8Array) => void; + onAcquireInfo?: (module: int, acquire: int, extraInfo: Uint8Array) => void; } /** @@ -4545,7 +4615,8 @@ declare namespace osAccount { * @interface GetPropertyRequest * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ interface GetPropertyRequest { /** @@ -4554,7 +4625,8 @@ declare namespace osAccount { * @type { AuthType } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ authType: AuthType; @@ -4564,19 +4636,21 @@ declare namespace osAccount { * @type { Array } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ keys: Array; /** * Indicates the OS account identifier. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - accountId?: number; + accountId?: int; } /** @@ -4585,7 +4659,8 @@ declare namespace osAccount { * @interface SetPropertyRequest * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ interface SetPropertyRequest { /** @@ -4594,7 +4669,8 @@ declare namespace osAccount { * @type { AuthType } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ authType: AuthType; @@ -4604,7 +4680,8 @@ declare namespace osAccount { * @type { SetPropertyType } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ key: SetPropertyType; @@ -4614,7 +4691,8 @@ declare namespace osAccount { * @type { Uint8Array } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ setInfo: Uint8Array; } @@ -4625,18 +4703,20 @@ declare namespace osAccount { * @interface ExecutorProperty * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ interface ExecutorProperty { /** * Indicates the result. * - * @type { number } + * @type { int } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - result: number; + result: int; /** * Indicates the authentication credential subtype. @@ -4644,39 +4724,43 @@ declare namespace osAccount { * @type { AuthSubType } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ authSubType: AuthSubType; /** * Indicates the remaining times. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - remainTimes?: number; + remainTimes?: int; /** * Indicates the freezing times. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - freezingTime?: number; + freezingTime?: int; /** * Indicates next phase freezing time. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - nextPhaseFreezingTime?: number; + nextPhaseFreezingTime?: int; /** * Indicates the enrollment progress. @@ -4684,7 +4768,8 @@ declare namespace osAccount { * @type { ?string } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ enrollmentProgress?: string; @@ -4694,19 +4779,20 @@ declare namespace osAccount { * @type { ?string } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ sensorInfo?: string; /** * Indicates the credential length. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Account.OsAccount * @systemapi * @since 20 */ - credentialLength?: number; + credentialLength?: int; } /** @@ -4715,7 +4801,8 @@ declare namespace osAccount { * @interface AuthResult * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ interface AuthResult { /** @@ -4724,39 +4811,43 @@ declare namespace osAccount { * @type { ?Uint8Array } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ token?: Uint8Array; /** * Indicates the remaining times. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - remainTimes?: number; + remainTimes?: int; /** * Indicates the freezing times. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - freezingTime?: number; + freezingTime?: int; /** * Indicates next phase freezing time. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - nextPhaseFreezingTime?: number; + nextPhaseFreezingTime?: int; /** * Indicates the credential ID. @@ -4764,29 +4855,32 @@ declare namespace osAccount { * @type { ?Uint8Array } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ credentialId?: Uint8Array; /** * Indicates the local ID of the authenticated OS account. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - accountId?: number; + accountId?: int; /** * Indicates the validity period after which the PIN will expire. * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - pinValidityPeriod?: number; + pinValidityPeriod?: long; } /** @@ -4795,7 +4889,8 @@ declare namespace osAccount { * @interface CredentialInfo * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ interface CredentialInfo { /** @@ -4804,7 +4899,8 @@ declare namespace osAccount { * @type { AuthType } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ credType: AuthType; @@ -4814,7 +4910,8 @@ declare namespace osAccount { * @type { AuthSubType } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ credSubType: AuthSubType; @@ -4824,19 +4921,21 @@ declare namespace osAccount { * @type { Uint8Array } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ token: Uint8Array; /** * Indicates the local ID of the OS account to which the credential belongs. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - accountId?: number; + accountId?: int; } /** @@ -4845,7 +4944,8 @@ declare namespace osAccount { * @interface RequestResult * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ interface RequestResult { /** @@ -4854,7 +4954,8 @@ declare namespace osAccount { * @type { ?Uint8Array } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ credentialId?: Uint8Array; } @@ -4865,7 +4966,8 @@ declare namespace osAccount { * @interface EnrolledCredInfo * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ interface EnrolledCredInfo { /** @@ -4874,7 +4976,8 @@ declare namespace osAccount { * @type { Uint8Array } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ credentialId: Uint8Array; @@ -4884,7 +4987,8 @@ declare namespace osAccount { * @type { AuthType } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ authType: AuthType; @@ -4894,7 +4998,8 @@ declare namespace osAccount { * @type { AuthSubType } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ authSubType: AuthSubType; @@ -4904,7 +5009,8 @@ declare namespace osAccount { * @type { Uint8Array } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ templateId: Uint8Array; @@ -4920,21 +5026,22 @@ declare namespace osAccount { /** * Indicates the validity period. * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.Account.OsAccount * @systemapi * @since 20 */ - validityPeriod?: number; + validityPeriod?: long; } /** * Indicates the property type to get. * - * @enum { number } GetPropertyType + * @enum { int } GetPropertyType * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ enum GetPropertyType { /** @@ -4942,7 +5049,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ AUTH_SUB_TYPE = 1, @@ -4951,7 +5059,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ REMAIN_TIMES = 2, @@ -4960,7 +5069,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FREEZING_TIME = 3, @@ -4969,7 +5079,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ ENROLLMENT_PROGRESS = 4, @@ -4978,7 +5089,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ SENSOR_INFO = 5, @@ -4987,7 +5099,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NEXT_PHASE_FREEZING_TIME = 6, @@ -5004,10 +5117,11 @@ declare namespace osAccount { /** * Indicates the property type to set. * - * @enum { number } SetPropertyType + * @enum { int } SetPropertyType * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ enum SetPropertyType { /** @@ -5015,7 +5129,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ INIT_ALGORITHM = 1 } @@ -5023,10 +5138,11 @@ declare namespace osAccount { /** * Indicates the credential type for authentication. * - * @enum { number } AuthType + * @enum { int } AuthType * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ enum AuthType { /** @@ -5034,7 +5150,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ PIN = 1, @@ -5043,7 +5160,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FACE = 2, @@ -5052,7 +5170,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ FINGERPRINT = 4, @@ -5061,7 +5180,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ RECOVERY_KEY = 8, @@ -5070,7 +5190,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ PRIVATE_PIN = 16, @@ -5079,7 +5200,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ DOMAIN = 1024 } @@ -5087,10 +5209,11 @@ declare namespace osAccount { /** * Indicates the credential subtype for authentication. * - * @enum { number } AuthSubType + * @enum { int } AuthSubType * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ enum AuthSubType { /** @@ -5098,7 +5221,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ PIN_SIX = 10000, @@ -5107,7 +5231,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ PIN_NUMBER = 10001, @@ -5116,7 +5241,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ PIN_MIXED = 10002, @@ -5125,7 +5251,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PIN_FOUR = 10003, @@ -5134,7 +5261,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PIN_PATTERN = 10004, @@ -5143,7 +5271,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ PIN_QUESTION = 10005, @@ -5152,7 +5281,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FACE_2D = 20000, @@ -5161,7 +5291,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FACE_3D = 20001, @@ -5170,7 +5301,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ FINGERPRINT_CAPACITIVE = 30000, @@ -5179,7 +5311,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ FINGERPRINT_OPTICAL = 30001, @@ -5188,7 +5321,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ FINGERPRINT_ULTRASONIC = 30002, @@ -5197,7 +5331,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ DOMAIN_MIXED = 10240001 } @@ -5205,10 +5340,11 @@ declare namespace osAccount { /** * Indicates the trusted level of authentication results. * - * @enum { number } AuthTrustLevel + * @enum { int } AuthTrustLevel * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ enum AuthTrustLevel { /** @@ -5216,7 +5352,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ATL1 = 10000, @@ -5225,7 +5362,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ATL2 = 20000, @@ -5234,7 +5372,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ATL3 = 30000, @@ -5243,7 +5382,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ ATL4 = 40000 } @@ -5251,10 +5391,11 @@ declare namespace osAccount { /** * Indicates the module of acquired information. * - * @enum { number } Module + * @enum { int } Module * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ enum Module { /** @@ -5262,7 +5403,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FACE_AUTH = 1 } @@ -5270,10 +5412,11 @@ declare namespace osAccount { /** * Indicates the enumeration of authentication result code. * - * @enum { number } ResultCode + * @enum { int } ResultCode * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ enum ResultCode { /** @@ -5281,7 +5424,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ SUCCESS = 0, @@ -5290,7 +5434,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FAIL = 1, @@ -5299,7 +5444,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ GENERAL_ERROR = 2, @@ -5308,7 +5454,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ CANCELED = 3, @@ -5317,7 +5464,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ TIMEOUT = 4, @@ -5326,7 +5474,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ TYPE_NOT_SUPPORT = 5, @@ -5335,7 +5484,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ TRUST_LEVEL_NOT_SUPPORT = 6, @@ -5344,7 +5494,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ BUSY = 7, @@ -5353,7 +5504,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ INVALID_PARAMETERS = 8, @@ -5362,7 +5514,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ LOCKED = 9, @@ -5371,7 +5524,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ NOT_ENROLLED = 10 } @@ -5379,10 +5533,11 @@ declare namespace osAccount { /** * Indicates the enumeration of prompt codes in the process of face authentication. * - * @enum { number } FaceTipsCode + * @enum { int } FaceTipsCode * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ enum FaceTipsCode { /** @@ -5390,7 +5545,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FACE_AUTH_TIP_TOO_BRIGHT = 1, @@ -5399,7 +5555,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FACE_AUTH_TIP_TOO_DARK = 2, @@ -5408,7 +5565,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FACE_AUTH_TIP_TOO_CLOSE = 3, @@ -5417,7 +5575,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FACE_AUTH_TIP_TOO_FAR = 4, @@ -5426,7 +5585,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FACE_AUTH_TIP_TOO_HIGH = 5, @@ -5435,7 +5595,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FACE_AUTH_TIP_TOO_LOW = 6, @@ -5444,7 +5605,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FACE_AUTH_TIP_TOO_RIGHT = 7, @@ -5453,7 +5615,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FACE_AUTH_TIP_TOO_LEFT = 8, @@ -5462,7 +5625,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FACE_AUTH_TIP_TOO_MUCH_MOTION = 9, @@ -5471,7 +5635,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FACE_AUTH_TIP_POOR_GAZE = 10, @@ -5480,7 +5645,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FACE_AUTH_TIP_NOT_DETECTED = 11 } @@ -5488,10 +5654,11 @@ declare namespace osAccount { /** * Indicates the enumeration of prompt codes in the process of fingerprint authentication. * - * @enum { number } FingerprintTips + * @enum { int } FingerprintTips * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ enum FingerprintTips { /** @@ -5499,7 +5666,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FINGERPRINT_TIP_GOOD = 0, @@ -5508,7 +5676,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FINGERPRINT_TIP_IMAGER_DIRTY = 1, @@ -5517,7 +5686,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FINGERPRINT_TIP_INSUFFICIENT = 2, @@ -5526,7 +5696,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FINGERPRINT_TIP_PARTIAL = 3, @@ -5535,7 +5706,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FINGERPRINT_TIP_TOO_FAST = 4, @@ -5544,7 +5716,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ FINGERPRINT_TIP_TOO_SLOW = 5, @@ -5553,7 +5726,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ FINGERPRINT_TIP_FINGER_DOWN = 6, @@ -5562,7 +5736,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ FINGERPRINT_TIP_FINGER_UP = 7 } @@ -5570,10 +5745,11 @@ declare namespace osAccount { /** * Enumerates for constraint source types. * - * @enum { number } ConstraintSourceType + * @enum { int } ConstraintSourceType * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ enum ConstraintSourceType { /** @@ -5581,7 +5757,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ CONSTRAINT_NOT_EXIST = 0, @@ -5590,7 +5767,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ CONSTRAINT_TYPE_BASE = 1, @@ -5599,7 +5777,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ CONSTRAINT_TYPE_DEVICE_OWNER = 2, @@ -5608,7 +5787,8 @@ declare namespace osAccount { * * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ CONSTRAINT_TYPE_PROFILE_OWNER = 3 } @@ -5619,19 +5799,21 @@ declare namespace osAccount { * @interface ConstraintSourceTypeInfo * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface ConstraintSourceTypeInfo { /** * Indicates the id of an os account who set the constraint. * When type is CONSTRAINT_NOT_EXIST or CONSTRAINT_TYPE_BASE, localId will be -1. * - * @type { number } + * @type { int } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - localId: number; + localId: int; /** * Indicates the source type of the constraint. @@ -5639,10 +5821,11 @@ declare namespace osAccount { * @type { ConstraintSourceType } * @syscap SystemCapability.Account.OsAccount * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ type: ConstraintSourceType; } } -export default osAccount; \ No newline at end of file +export default osAccount; -- Gitee From b6a8794f1ad327682326e423f4da70bfb1d844f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8A=89=E5=87=A1?= Date: Mon, 7 Jul 2025 20:38:59 +0800 Subject: [PATCH 029/746] sync MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 劉凡 --- api/@ohos.effectKit.d.ts | 246 +++++++++++++------------- api/@ohos.graphics.uiEffect.d.ts | 291 +++++-------------------------- 2 files changed, 164 insertions(+), 373 deletions(-) diff --git a/api/@ohos.effectKit.d.ts b/api/@ohos.effectKit.d.ts index 6d5954d3c8..507f0c73b8 100644 --- a/api/@ohos.effectKit.d.ts +++ b/api/@ohos.effectKit.d.ts @@ -18,13 +18,10 @@ * @kit ArkGraphics2D */ -/*** if arkts 1.1 */ + import { AsyncCallback } from './@ohos.base'; import image from './@ohos.multimedia.image'; -/*** endif */ -/*** if arkts 1.2 */ -import image from './@ohos.multimedia.image'; -/*** endif */ + /** * @namespace effectKit @@ -62,7 +59,7 @@ declare namespace effectKit { * @since 12 */ /** - * A class used to add a specified effect to an image. Before calling any method of Filter, use createEffect to create a Filter instance. + * The Filter of FilterChain. * @typedef Filter * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform @@ -90,28 +87,26 @@ declare namespace effectKit { * @since 12 */ /** - * Adds the blur effect to the filter linked list, and returns the head node of the linked list. - * @param { number } radius - Blur radius, in pixels. The blur effect is proportional to the configured value. - * A larger value indicates a more obvious effect. - * @returns { Filter } Final image effect. + * A blur effect is added to the image. + * @param { number } radius - The degree of blur, the value is measured in pixels. + * @returns { Filter } Filters for the current effect have been added. * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form * @atomicservice * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @arkts 1.1&1.2 */ blur(radius: number): Filter; /** - * Adds the blur effect to the filter linked list, and returns the head node of the linked list. - * @param { number } radius - Blur radius, in pixels. The blur effect is proportional to the configured value. - * A larger value indicates a more obvious effect. - * @param { TileMode } tileMode - Tile mode of the shader effect. The blur effect of image edges is affected. Currently, - * only CPU rendering is supported. Therefore, the tile mode supports only DECAL. - * @returns { Filter } Final image effect. + * A blur effect is added to the image. + * @param { number } radius - The degree of blur, the value is measured in pixels. + * @param { TileMode } tileMode - The tile mode of blur. + * @returns { Filter } Filters for the current effect have been added. * @syscap SystemCapability.Multimedia.Image.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ blur(radius: number, tileMode: TileMode): Filter; @@ -132,14 +127,15 @@ declare namespace effectKit { * @since 12 */ /** - * Adds the brightness effect to the filter linked list, and returns the head node of the linked list. - * @param { number } bright - Brightness value, ranging from 0 to 1. When the value is 0, the image brightness remains unchanged. - * @returns { Filter } Final image effect. + * A Brightness effect is added to the image. + * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. + * @returns { Filter } Filters for the current effect have been added. * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ brightness(bright: number): Filter; @@ -158,13 +154,14 @@ declare namespace effectKit { * @since 12 */ /** - * Adds the grayscale effect to the filter linked list, and returns the head node of the linked list. - * @returns { Filter } Final image effect. + * A Grayscale effect is added to the image. + * @returns { Filter } Filters for the current effect have been added. * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ grayscale(): Filter; @@ -175,11 +172,12 @@ declare namespace effectKit { * @since 12 */ /** - * Adds the inversion effect to the filter linked list, and returns the head node of the linked list. - * @returns { Filter } Final image effect. + * A invert effect is added to the image. + * @returns { Filter } Filters for the current effect have been added. * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ invert(): Filter; @@ -193,22 +191,20 @@ declare namespace effectKit { * @since 12 */ /** - * Adds a custom effect to the filter linked list, and returns the head node of the linked list. + * A custom effect is added to the image. * - * @param { Array } colorMatrix - Custom color matrix. - * A 5 x 4 matrix can be created. The value range of the matrix element is [0, 1], - * where 0 indicates that the color channel is not involved in the calculation, - * and 1 indicates that the color channel is involved in the calculation and retains the original weight. - * @returns { Filter } Final image effect. + * @param { Array } colorMatrix - A matrix of 5x4 size for create effect filter. + * @returns { Filter } Filters for the current effect have been added. * @throws { BusinessError } 401 - Input parameter error. * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ setColorMatrix(colorMatrix: Array): Filter; /** - * Obtains image.PixelMap of the source image to which the filter linked list is added. + * Gets the PixelMap where all filter effects have been added to the image. * @returns { image.PixelMap } image.PixelMap. * @syscap SystemCapability.Multimedia.Image.Core * @since 9 @@ -232,14 +228,14 @@ declare namespace effectKit { * @since 12 */ /** - * Obtains image.PixelMap of the source image to which the filter linked list is added. This API uses a promise to return the result. - * @returns { Promise } - Promise used to return image.PixelMap of the source image. + * Gets the PixelMap where all filter effects have been added to the image. + * @returns { Promise } - returns the PixelMap generated. * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form * @atomicservice * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @arkts 1.1&1.2 */ getEffectPixelMap(): Promise; } @@ -259,13 +255,14 @@ declare namespace effectKit { * @since 12 */ /** - * A class used to obtain the color from an image. Before calling any method of ColorPicker, use createColorPicker to create a ColorPicker instance. + * The color picker of an image. * @typedef ColorPicker * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ interface ColorPicker { @@ -284,13 +281,14 @@ declare namespace effectKit { * @since 12 */ /** - * Obtains the main color from the image and writes the result to a Color instance. This API uses a promise to return the result. - * @returns { Promise } Promise used to return the color value of the main color. If the operation fails, an error message is returned. + * get main color of an image + * @returns { Promise } returns the MainColor generated. * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ getMainColor(): Promise; @@ -309,13 +307,14 @@ declare namespace effectKit { * @since 12 */ /** - * Obtains the main color from the image and writes the result to a Color instance. This API returns the result synchronously. - * @returns { Color } Color value of the main color. If the operation fails, null is returned. + * get main color of an image + * @returns { Color } Main color picked in the image. * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ getMainColorSync(): Color; @@ -334,13 +333,14 @@ declare namespace effectKit { * @since 12 */ /** - * Obtains the color with the largest proportion from the image and writes the result to a Color instance. This API returns the result synchronously. - * @returns { Color } Color value of the color with the largest proportion. If the operation fails, null is returned. + * Get largest proportion color of an image + * @returns { Color } Largest proportion color picked in the image. * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ getLargestProportionColor(): Color; @@ -355,17 +355,16 @@ declare namespace effectKit { * @since 12 */ /** - * Obtains a given number of colors with the top proportions in the image. This API returns the result synchronously. - * @param { number } colorCount - Number of colors to obtain. The value range is [1, 10]. If a non-integer is passed in, the value will be rounded down. - * @returns { Array } Array of colors, sorted by proportion. - * - If the number of colors obtained is less than the value of colorCount, the array size is the actual number obtained. - * - If the colors fail to be obtained or the number of colors obtained is less than 1, [null] is returned. - * - If the value of colorCount is greater than 10, an array holding the first 10 colors with the top proportions is returned. + * Get top proportion color of an image + * @param { number } colorCount - The number of colors to require, the value is 1 to 10. + * @returns { Array } An array of feature colors sorted by proportion, with a size equal to + * the minimum of colorCount and the actual number of extracted feature colors. * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ getTopProportionColors(colorCount: number): Array; @@ -384,13 +383,14 @@ declare namespace effectKit { * @since 12 */ /** - * Obtains the color with the highest saturation from the image and writes the result to a Color instance. This API returns the result synchronously. - * @returns { Color } Color value of the color with the highest saturation. If the operation fails, null is returned. + * Get highest saturation color of an image + * @returns { Color } Highest saturation color picked in the image. * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ getHighestSaturationColor(): Color; @@ -409,13 +409,14 @@ declare namespace effectKit { * @since 12 */ /** - * Obtains the average color from the image and writes the result to a Color instance. This API returns the result synchronously. - * @returns { Color } Average color value. If the operation fails, null is returned. + * Get average color of an image + * @returns { Color } Average color calculated in the image. * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ getAverageColor(): Color; @@ -436,14 +437,15 @@ declare namespace effectKit { * @since 12 */ /** - * Checks whether a color is black, white, and gray. - * @param { number } color - Color to check. The value range is [0x0, 0xFFFFFFFF]. - * @returns { boolean } Returns true if the image is black, white, and gray; returns false otherwise. + * Determine whether the color is black or white or gray + * @param { number } color - The 32 bit ARGB color to discriminate. + * @returns { boolean } Result of judging black, white and gray. * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ isBlackOrWhiteOrGrayColor(color: number): boolean; } @@ -463,13 +465,14 @@ declare namespace effectKit { * @since 12 */ /** - * A class that stores the color picked. + * The color param. * @typedef Color * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ interface Color { @@ -488,13 +491,14 @@ declare namespace effectKit { * @since 12 */ /** - * Value of the red component. The value range is [0x0, 0xFF]. + * Red * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ red: number; @@ -513,13 +517,14 @@ declare namespace effectKit { * @since 12 */ /** - * Value of the green component. The value range is [0x0, 0xFF]. + * Green * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ green: number; @@ -538,13 +543,14 @@ declare namespace effectKit { * @since 12 */ /** - * Value of the blue component. The value range is [0x0, 0xFF]. + * Blue * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ blue: number; @@ -563,13 +569,14 @@ declare namespace effectKit { * @since 12 */ /** - * Value of the alpha component. The value range is [0x0, 0xFF]. + * Alpha * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ alpha: number; } @@ -591,10 +598,9 @@ declare namespace effectKit { * @since 12 */ /** - * Creates a Filter instance based on a pixel map. - * @param { image.PixelMap } source - PixelMap instance created by the image module. An instance can be obtained - * by decoding an image or directly created. For details, see Image Overview. - * @returns { Filter } Head node of the filter linked list without any effect. If the operation fails, null is returned. + * Create a FilterChain to add multiple effects to an image. + * @param { image.PixelMap } source - the source pixelmap. + * @returns { Filter } Returns the head node of FilterChain. * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form @@ -623,16 +629,16 @@ declare namespace effectKit { * @since 12 */ /** - * Creates a ColorPicker instance based on a pixel map. This API uses a promise to return the result. - * @param { image.PixelMap } source - PixelMap instance created by the image module. An instance can be - * obtained by decoding an image or directly created. For details, see Image Overview. - * @returns { Promise } - Promise used to return the ColorPicker instance created. + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @returns { Promise } - returns the ColorPicker generated. * @throws { BusinessError } 401 - Input parameter error. * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function createColorPicker(source: image.PixelMap): Promise; @@ -659,21 +665,18 @@ declare namespace effectKit { * @since 12 */ /** - * Creates a ColorPicker instance for the selected region based on a pixel map. This API uses a promise to return the result. - * @param { image.PixelMap } source - PixelMap instance created by the image module. An instance can be obtained by decoding - * an image or directly created. For details, see Image Overview. - * @param { Array } region - Region of the image from which the color is picked. - * The array consists of four elements, representing the left, top, right, and bottom positions of the image, respectively. - * The value of each element must be in the range [0, 1]. The leftmost and topmost positions of the image correspond to 0, - * and the rightmost and bottom positions correspond to 1. In the array, the third element must be greater than the first element, - * and the fourth element must be greater than the second element. - * @returns { Promise } - Promise used to return the ColorPicker instance created. + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, + * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. + * @returns { Promise } - returns the ColorPicker generated. * @throws { BusinessError } 401 - Input parameter error. * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function createColorPicker(source: image.PixelMap, region: Array): Promise; @@ -696,16 +699,16 @@ declare namespace effectKit { * @since 12 */ /** - * Creates a ColorPicker instance based on a pixel map. This API uses an asynchronous callback to return the result. - * @param { image.PixelMap } source - PixelMap instance created by the image module. An instance can be obtained by - * decoding an image or directly created. For details, see Image Overview. + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. * @param { AsyncCallback } callback - the callback of createColorPicker. * @throws { BusinessError } 401 - Input parameter error. * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function createColorPicker(source: image.PixelMap, callback: AsyncCallback): void; @@ -732,62 +735,63 @@ declare namespace effectKit { * @since 12 */ /** - * Creates a ColorPicker instance for the selected region based on a pixel map. This API uses an asynchronous callback to return the result. - * @param { image.PixelMap } source - PixelMap instance created by the image module. An instance can be obtained by decoding an - * image or directly created. For details, see Image Overview.PixelMap instance created by the image module. An instance can be - * obtained by decoding an image or directly created. For details, see Image Overview. - * @param { Array } region - Region of the image from which the color is picked. - * The array consists of four elements, representing the left, top, right, and bottom positions of the image, respectively. - * The value of each element must be in the range [0, 1]. The leftmost and topmost positions of the image correspond to 0, - * and the rightmost and bottom positions correspond to 1. In the array, the third element must be greater than the first element, - * and the fourth element must be greater than the second element. - * @param { AsyncCallback } callback - Callback used to return the ColorPicker instance created. + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, + * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. + * @param { AsyncCallback } callback - the callback of createColorPicker. * @throws { BusinessError } 401 - Input parameter error. * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function createColorPicker(source: image.PixelMap, region: Array, callback: AsyncCallback): void; /** - * Enumerates the tile modes of the shader effect. + * TileMode enumeration description * * @enum { number } * @syscap SystemCapability.Multimedia.Image.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ enum TileMode { /** - * Replicates the edge color if the shader effect draws outside of its original boundary. + * Clamp mode. * * @syscap SystemCapability.Multimedia.Image.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ CLAMP = 0, /** - * Repeats the shader effect in both horizontal and vertical directions. + * Repeat mode. * * @syscap SystemCapability.Multimedia.Image.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ REPEAT = 1, /** - * Repeats the shader effect in both horizontal and vertical directions, alternating mirror images. + * Mirror mode. * * @syscap SystemCapability.Multimedia.Image.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ MIRROR = 2, /** - * Renders the shader effect only within the original boundary. + * Decal mode. * * @syscap SystemCapability.Multimedia.Image.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ DECAL = 3, } diff --git a/api/@ohos.graphics.uiEffect.d.ts b/api/@ohos.graphics.uiEffect.d.ts index 929fbdc1db..daa434171b 100644 --- a/api/@ohos.graphics.uiEffect.d.ts +++ b/api/@ohos.graphics.uiEffect.d.ts @@ -19,10 +19,7 @@ */ import { AsyncCallback } from './@ohos.base'; -/*** if arkts 1.1 */ -import type common2D from './@ohos.graphics.common2D'; -import type image from './@ohos.multimedia.image'; -/*** endif */ + /** * @namespace uiEffect @@ -31,7 +28,6 @@ import type image from './@ohos.multimedia.image'; * @arkts 1.1&1.2 */ declare namespace uiEffect { - /** * The Filter for Component. * @typedef Filter @@ -48,7 +44,8 @@ declare namespace uiEffect { * @returns { Filter } * @syscap SystemCapability.Graphics.Drawing * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ pixelStretch(stretchSizes: Array, tileMode: TileMode): Filter; @@ -58,7 +55,8 @@ declare namespace uiEffect { * @param { number } blurRadius * @returns { Filter } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ blur(blurRadius: number): Filter; @@ -75,7 +73,8 @@ declare namespace uiEffect { * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @syscap SystemCapability.Graphics.Drawing * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ waterRipple(progress: number, waveCount: number, x: number, y: number, rippleMode: WaterRippleMode): Filter; @@ -89,7 +88,8 @@ declare namespace uiEffect { * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @syscap SystemCapability.Graphics.Drawing * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ flyInFlyOutEffect(degree: number, flyMode: FlyMode): Filter; @@ -104,123 +104,10 @@ declare namespace uiEffect { * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @syscap SystemCapability.Graphics.Drawing * @systemapi - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ distort(distortionK: number): Filter; - - /** - * Adds the content radius gradient blurring effect for the current component. The input parameter is the blurring radius. - * - * @param { number } value - the blurring radius. - * The larger the blurring radius, the more blurring the content, and if the value is 0, the content blurring effect is not blurring. - * @param { LinearGradientBlurOptions } options - the radius gradient blur options. - * @returns { Filter } - Returns radius gradient blur Filter. - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @syscap SystemCapability.Graphics.Drawing - * @systemapi - * @since 19 - */ - radiusGradientBlur(value: number, options: LinearGradientBlurOptions): Filter; - - /** - * Sets the deformation effect controlled by bezier curves of the component. - * - * @param { Array } controlPoints - The bezier control points, 12 points needed. - * @returns { Filter } - Returns the Filter that the current effect have been added. - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @syscap SystemCapability.Graphics.Drawing - * @systemapi - * @since 20 - */ - bezierWarp(controlPoints: Array): Filter; - - /** - * Sets the content light filter. - * - * @param { common2D.Point3d } lightPosition - * @param { common2D.Color } lightColor - * @param { number } lightIntensity - * @param { Mask } [displacementMap] - * @returns { Filter } - Returns the Filter that the current effect have been added. - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @syscap SystemCapability.Graphics.Drawing - * @systemapi - * @since 20 - */ - contentLight(lightPosition: common2D.Point3d, lightColor: common2D.Color, lightIntensity: number, - displacementMap?: Mask): Filter; - - /** - * Sets the color gradient filter, may blend with alpha mask. - * - * @param { Array } colors - * @param { Array } positions - * @param { Array } strengths - * @param { Mask } [alphaMask] - * @returns { Filter } - Returns the Filter that the current effect have been added. - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @syscap SystemCapability.Graphics.Drawing - * @systemapi - * @since 20 - */ - colorGradient(colors: Array, positions: Array, strengths: Array, - alphaMask?: Mask): Filter; - - /** - * Detects and glows edges of contents. - * - * @param { number } alpha - * @param { Color } [color] - * @param { Mask } [mask] - * @param { boolean } [bloom] - * @returns { Filter } - Returns the Filter that the current effect have been added. - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @syscap SystemCapability.Graphics.Drawing - * @systemapi - * @since 20 - */ - edgeLight(alpha: number, color?: Color, mask?: Mask, bloom?: boolean): Filter; - - /** - * Sets distort effect with displacement map. - * - * @param { Mask } displacementMap - * @param { [number, number] } [factor] - * @returns { Filter } - Returns the Filter that the current effect have been added. - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @syscap SystemCapability.Graphics.Drawing - * @systemapi - * @since 20 - */ - displacementDistort(displacementMap: Mask, factor?: [number, number]): Filter; - - /** - * Sets dispersion effect with mask map. - * - * @param { Mask } dispersionMap - * @param { number } alpha - * @param { [number, number] } [rFactor] - * @param { [number, number] } [gFactor] - * @param { [number, number] } [bFactor] - * @returns { Filter } - Returns the Filter that the current effect have been added. - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @syscap SystemCapability.Graphics.Drawing - * @systemapi - * @since 20 - */ - maskDispersion(dispersionMap: Mask, alpha: number, rFactor?: [number, number], gFactor?: [number, number], - bFactor?: [number, number]): Filter; - - /** - * Applies a high dynamic range (HDR) brightness enhancement filter to the component. - * @param { number } ratio - The brightness multiplier ratio (1.0 = original, >1.0 = brighter). - * @returns { Filter } - Returns hdr brightness Filter. - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @syscap SystemCapability.Graphics.Drawing - * @systemapi - * @since 20 - */ - hdrBrightnessRatio(ratio: number): Filter; } /** @@ -229,7 +116,8 @@ declare namespace uiEffect { * @enum { number } * @syscap SystemCapability.Graphics.Drawing * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum TileMode { /** @@ -237,7 +125,8 @@ declare namespace uiEffect { * * @syscap SystemCapability.Graphics.Drawing * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ CLAMP = 0, @@ -246,7 +135,8 @@ declare namespace uiEffect { * * @syscap SystemCapability.Graphics.Drawing * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ REPEAT = 1, @@ -255,7 +145,8 @@ declare namespace uiEffect { * * @syscap SystemCapability.Graphics.Drawing * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ MIRROR = 2, @@ -264,7 +155,8 @@ declare namespace uiEffect { * * @syscap SystemCapability.Graphics.Drawing * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ DECAL = 3, } @@ -275,7 +167,8 @@ declare namespace uiEffect { * @enum { number } * @syscap SystemCapability.Graphics.Drawing * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum WaterRippleMode { /** @@ -283,7 +176,8 @@ declare namespace uiEffect { * * @syscap SystemCapability.Graphics.Drawing * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ SMALL2MEDIUM_RECV = 0, @@ -292,7 +186,8 @@ declare namespace uiEffect { * * @syscap SystemCapability.Graphics.Drawing * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ SMALL2MEDIUM_SEND = 1, @@ -301,7 +196,8 @@ declare namespace uiEffect { * * @syscap SystemCapability.Graphics.Drawing * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ SMALL2SMALL = 2, @@ -310,7 +206,8 @@ declare namespace uiEffect { * * @syscap SystemCapability.Graphics.Drawing * @systemapi - * @since 17 + * @since arkts {'1.1':'17', '1.2':'20'} + * @arkts 1.1&1.2 */ MINI_RECV = 3, } @@ -321,7 +218,8 @@ declare namespace uiEffect { * @enum { number } * @syscap SystemCapability.Graphics.Drawing * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum FlyMode { /** @@ -329,7 +227,8 @@ declare namespace uiEffect { * * @syscap SystemCapability.Graphics.Drawing * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ BOTTOM = 0, @@ -338,7 +237,8 @@ declare namespace uiEffect { * * @syscap SystemCapability.Graphics.Drawing * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ TOP = 1, } @@ -361,22 +261,6 @@ declare namespace uiEffect { * @arkts 1.1&1.2 */ backgroundColorBlender(blender: BrightnessBlender): VisualEffect; - - /** - * Sets the border light effect. - * - * @param { common2D.Point3d } lightPosition - * @param { common2D.Color } lightColor - * @param { number } lightIntensity - * @param { number } borderWidth - * @returns { VisualEffect } - Returns the VisualEffect that the current effect have been added. - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @syscap SystemCapability.Graphics.Drawing - * @systemapi - * @since 20 - */ - borderLight(lightPosition: common2D.Point3d, lightColor: common2D.Color, lightIntensity: number, - borderWidth: number): VisualEffect; } /** @@ -487,109 +371,12 @@ declare namespace uiEffect { fraction: number; } - /** - * The Color of Light. - * @typedef Color - * @syscap SystemCapability.Graphics.Drawing - * @systemapi - * @since 20 - */ - interface Color { - /** - * Red component of color. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing - * @systemapi - * @since 20 - */ - red: number; - /** - * Green component of color. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing - * @systemapi - * @since 20 - */ - green: number; - /** - * Blue component of color - * @type { number } - * @syscap SystemCapability.Graphics.Drawing - * @systemapi - * @since 20 - */ - blue: number; - /** - * Alpha component of color. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing - * @systemapi - * @since 20 - */ - alpha: number; - } - - /** - * Defines the mask for Filter or VisualEffect. - * @typedef { Mask } - * @syscap SystemCapability.Graphics.Drawing - * @systemapi - * @since 20 - */ - class Mask { - /** - * Create a Mask of ripple. - * @param { common2D.Point } center - * @param { number } radius - * @param { number } width - * @param { number } [offset] - * @returns { Mask } - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @static - * @syscap SystemCapability.Graphics.Drawing - * @systemapi - * @since 20 - */ - static createRippleMask(center: common2D.Point, radius: number, width: number, offset?: number): Mask; - - /** - * Create a Mask of pixelmap. - * @param { image.PixelMap } pixelMap - * @param { common2D.Rect } srcRect - * @param { common2D.Rect } dstRect - * @param { Color } [fillColor] - * @returns { Mask } - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @static - * @syscap SystemCapability.Graphics.Drawing - * @systemapi - * @since 20 - */ - static createPixelMapMask(pixelMap: image.PixelMap, srcRect: common2D.Rect, dstRect: common2D.Rect, - fillColor?: Color): Mask; - - /** - * Create a Mask of radial gradient. - * @param { common2D.Point } center - * @param { number } radiusX - * @param { number } radiusY - * @param { Array<[number, number]> } values - * @returns { Mask } - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @static - * @syscap SystemCapability.Graphics.Drawing - * @systemapi - * @since 20 - */ - static createRadialGradientMask(center: common2D.Point, radiusX: number, radiusY: number, - values: Array<[number, number]>): Mask; - } - /** * Create a Filter to add multiple effects to the component. * @returns { Filter } Returns the head node of Filter. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function createFilter(): Filter; -- Gitee From 498963ab3cd21cd6a0c40c54eba4d209ba446476 Mon Sep 17 00:00:00 2001 From: xuzihan129 Date: Mon, 7 Jul 2025 23:32:02 +0800 Subject: [PATCH 030/746] =?UTF-8?q?sdk=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xuzihan129 --- api/@ohos.window.d.ts | 63 ++++++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 18 deletions(-) diff --git a/api/@ohos.window.d.ts b/api/@ohos.window.d.ts index cb45fd3b21..07741a8a50 100644 --- a/api/@ohos.window.d.ts +++ b/api/@ohos.window.d.ts @@ -33,7 +33,6 @@ import bundleManager from './@ohos.bundle.bundleManager'; import { LocalStorage } from '@ohos.arkui.stateManagement'; import { UIContext } from '@ohos.arkui.UIContext'; import { ColorMetrics } from '@ohos.arkui.node'; -import { Callback } from './@ohos.base'; /*** endif */ /*** if arkts 1.1 */ @@ -59,6 +58,17 @@ declare interface Callback { } /*** endif */ +/** + * Defines the window callback. + * + * @typedef {function} + * @syscap SystemCapability.Window.SessionManager + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +type Callback = (data: T) => V; + /** * Defines the window animation curve param. * @@ -2097,7 +2107,8 @@ declare namespace window { * @type { ?colorMode } * @syscap SystemCapability.Window.SessionManager * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ colorMode?: ConfigurationConstant.ColorMode; @@ -2107,7 +2118,8 @@ declare namespace window { * @type { ?number } * @syscap SystemCapability.Window.SessionManager * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ buttonBackgroundSize? : number; @@ -2117,7 +2129,8 @@ declare namespace window { * @type { ?number } * @syscap SystemCapability.Window.SessionManager * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ spacingBetweenButtons? : number; @@ -2127,7 +2140,8 @@ declare namespace window { * @type { ?number } * @syscap SystemCapability.Window.SessionManager * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ closeButtonRightMargin? : number; @@ -7587,7 +7601,8 @@ declare namespace window { * @throws { BusinessError } 1300004 - Unauthorized operation. * @syscap SystemCapability.Window.SessionManager * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'windowWillClose', callback: Callback>): void; @@ -7607,7 +7622,8 @@ declare namespace window { * @throws { BusinessError } 1300004 - Unauthorized operation. * @syscap SystemCapability.Window.SessionManager * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'windowWillClose', callback?: Callback>): void; @@ -9516,7 +9532,8 @@ declare namespace window { * @throws { BusinessError } 1300003 - This window manager service works abnormally. * @syscap SystemCapability.Window.SessionManager * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ minimize(callback: AsyncCallback): void; @@ -9540,7 +9557,8 @@ declare namespace window { * @throws { BusinessError } 1300003 - This window manager service works abnormally. * @syscap SystemCapability.Window.SessionManager * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ minimize(): Promise; @@ -10018,7 +10036,8 @@ declare namespace window { * @throws { BusinessError } 1300004 - Unauthorized operation. * @syscap SystemCapability.Window.SessionManager * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ setDecorButtonStyle(dectorStyle: DecorButtonStyle): void; @@ -10108,7 +10127,8 @@ declare namespace window { * @throws { BusinessError } 1300004 - Unauthorized operation. * @syscap SystemCapability.Window.SessionManager * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ setWindowTitleButtonVisible(isMaximizeButtonVisible: boolean, isMinimizeButtonVisible: boolean, isCloseButtonVisible?: boolean): void; @@ -10136,7 +10156,8 @@ declare namespace window { * @throws { BusinessError } 1300004 - Unauthorized operation. * @syscap SystemCapability.Window.SessionManager * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ startMoving(): Promise; @@ -10160,7 +10181,8 @@ declare namespace window { * @throws { BusinessError } 1300004 - Unauthorized operation. * @syscap SystemCapability.Window.SessionManager * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ startMoving(offsetX: number, offsetY: number): Promise; @@ -10282,7 +10304,8 @@ declare namespace window { * @throws { BusinessError } 1300002 - This window state is abnormal. * @syscap SystemCapability.Window.SessionManager * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'windowTitleButtonRectChange', callback: Callback): void; @@ -10311,7 +10334,8 @@ declare namespace window { * @throws { BusinessError } 1300002 - This window state is abnormal. * @syscap SystemCapability.Window.SessionManager * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'windowTitleButtonRectChange', callback?: Callback): void; @@ -10548,7 +10572,8 @@ declare namespace window { * @throws { BusinessError } 1300002 - This window state is abnormal. * @syscap SystemCapability.Window.SessionManager * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ getWindowStatus(): WindowStatusType; @@ -11762,7 +11787,8 @@ declare namespace window { * @syscap SystemCapability.Window.SessionManager * @stagemodelonly * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ on(eventType: 'windowStageClose', callback: Callback): void; @@ -11782,7 +11808,8 @@ declare namespace window { * @syscap SystemCapability.Window.SessionManager * @stagemodelonly * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ off(eventType: 'windowStageClose', callback?: Callback): void; -- Gitee From 715180c56c433f1da3fa199b71206f03dbc9b077 Mon Sep 17 00:00:00 2001 From: kang1024 Date: Tue, 8 Jul 2025 09:52:28 +0800 Subject: [PATCH 031/746] =?UTF-8?q?=E7=AE=97=E6=B3=95=E5=BA=93sdk=E6=94=AF?= =?UTF-8?q?=E6=8C=81arkts1.2=E5=9B=9E=E5=90=88=E5=BC=BA=E5=9F=BA=E6=96=B0?= =?UTF-8?q?=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: kang1024 --- api/@ohos.security.cert.d.ts | 982 ++++++++++++------- api/@ohos.security.cryptoFramework.d.ts | 1158 +++++++++++++++-------- 2 files changed, 1379 insertions(+), 761 deletions(-) diff --git a/api/@ohos.security.cert.d.ts b/api/@ohos.security.cert.d.ts index 54ceff022a..13d576bef3 100644 --- a/api/@ohos.security.cert.d.ts +++ b/api/@ohos.security.cert.d.ts @@ -52,14 +52,14 @@ declare namespace cert { /** * Enum for result code * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @since 9 */ /** * Enum for result code * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @crossplatform * @since 11 @@ -67,11 +67,12 @@ declare namespace cert { /** * Enum for result code * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum CertResult { /** @@ -93,7 +94,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ INVALID_PARAMS = 401, @@ -116,7 +118,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ NOT_SUPPORT = 801, @@ -139,7 +142,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_OUT_OF_MEMORY = 19020001, @@ -162,7 +166,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_RUNTIME_ERROR = 19020002, @@ -173,6 +178,7 @@ declare namespace cert { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ ERR_PARAMETER_CHECK_FAILED = 19020003, @@ -195,7 +201,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CRYPTO_OPERATION = 19030001, @@ -218,7 +225,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERT_SIGNATURE_FAILURE = 19030002, @@ -241,7 +249,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERT_NOT_YET_VALID = 19030003, @@ -264,7 +273,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERT_HAS_EXPIRED = 19030004, @@ -287,7 +297,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY = 19030005, @@ -310,7 +321,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_KEYUSAGE_NO_CERTSIGN = 19030006, @@ -333,7 +345,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE = 19030007, @@ -343,7 +356,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_MAYBE_WRONG_PASSWORD = 19030008 } @@ -370,7 +384,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface DataBlob { /** @@ -395,7 +410,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ data: Uint8Array; } @@ -422,7 +438,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface DataArray { /** @@ -447,7 +464,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ data: Array; } @@ -455,14 +473,14 @@ declare namespace cert { /** * Enum for supported cert encoding format. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @since 9 */ /** * Enum for supported cert encoding format. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @crossplatform * @since 11 @@ -470,11 +488,12 @@ declare namespace cert { /** * Enum for supported cert encoding format. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum EncodingFormat { /** @@ -496,7 +515,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ FORMAT_DER = 0, @@ -519,7 +539,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ FORMAT_PEM = 1, @@ -536,7 +557,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ FORMAT_PKCS7 = 2 } @@ -544,14 +566,14 @@ declare namespace cert { /** * Enum for the certificate item type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @since 10 */ /** * Enum for the certificate item type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @crossplatform * @since 11 @@ -559,11 +581,12 @@ declare namespace cert { /** * Enum for the certificate item type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum CertItemType { /** @@ -585,7 +608,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CERT_ITEM_TYPE_TBS = 0, @@ -608,7 +632,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CERT_ITEM_TYPE_PUBLIC_KEY = 1, @@ -631,7 +656,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CERT_ITEM_TYPE_ISSUER_UNIQUE_ID = 2, @@ -654,7 +680,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CERT_ITEM_TYPE_SUBJECT_UNIQUE_ID = 3, @@ -677,7 +704,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CERT_ITEM_TYPE_EXTENSIONS = 4 } @@ -685,14 +713,14 @@ declare namespace cert { /** * Enumerates for the certificate extension object identifier (OID) types. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @since 10 */ /** * Enumerates for the certificate extension object identifier (OID) types. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @crossplatform * @since 11 @@ -700,11 +728,12 @@ declare namespace cert { /** * Enumerates for the certificate extension object identifier (OID) types. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum ExtensionOidType { /** @@ -726,7 +755,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ EXTENSION_OID_TYPE_ALL = 0, @@ -749,7 +779,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ EXTENSION_OID_TYPE_CRITICAL = 1, @@ -772,7 +803,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ EXTENSION_OID_TYPE_UNCRITICAL = 2 } @@ -780,14 +812,14 @@ declare namespace cert { /** * Enum for the certificate extension entry type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @since 10 */ /** * Enum for the certificate extension entry type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @crossplatform * @since 11 @@ -795,11 +827,12 @@ declare namespace cert { /** * Enum for the certificate extension entry type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum ExtensionEntryType { /** @@ -821,7 +854,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ EXTENSION_ENTRY_TYPE_ENTRY = 0, @@ -844,7 +878,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ EXTENSION_ENTRY_TYPE_ENTRY_CRITICAL = 1, @@ -867,7 +902,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ EXTENSION_ENTRY_TYPE_ENTRY_VALUE = 2 } @@ -894,7 +930,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface EncodingBlob { /** @@ -919,7 +956,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ data: Uint8Array; /** @@ -944,7 +982,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ encodingFormat: EncodingFormat; } @@ -971,7 +1010,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface CertChainData { /** @@ -996,20 +1036,21 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ data: Uint8Array; /** * The number of certs. * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.Cert * @since 9 */ /** * The number of certs. * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.Cert * @crossplatform * @since 11 @@ -1017,13 +1058,14 @@ declare namespace cert { /** * The number of certs. * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - count: number; + count: int; /** * The data encoding format. * @@ -1046,7 +1088,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ encodingFormat: EncodingFormat; } @@ -1054,11 +1097,12 @@ declare namespace cert { /** * Enum for Encoding type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum EncodingType { /** @@ -1067,7 +1111,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ENCODING_UTF8 = 0 } @@ -1094,7 +1139,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface X509Cert { /** @@ -1131,7 +1177,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ verify(key: cryptoFramework.PubKey, callback: AsyncCallback): void; @@ -1169,7 +1216,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ verify(key: cryptoFramework.PubKey): Promise; @@ -1213,7 +1261,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getEncoded(callback: AsyncCallback): void; @@ -1257,7 +1306,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getEncoded(): Promise; @@ -1289,7 +1339,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getPublicKey(): cryptoFramework.PubKey; @@ -1333,21 +1384,22 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ checkValidityWithDate(date: string): void; /** * Get X509 cert version. * - * @returns { number } X509 cert version. + * @returns { int } X509 cert version. * @syscap SystemCapability.Security.Cert * @since 9 */ /** * Get X509 cert version. * - * @returns { number } X509 cert version. + * @returns { int } X509 cert version. * @syscap SystemCapability.Security.Cert * @crossplatform * @since 11 @@ -1355,24 +1407,25 @@ declare namespace cert { /** * Get X509 cert version. * - * @returns { number } X509 cert version. + * @returns { int } X509 cert version. * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getVersion(): number; + getVersion(): int; /** * Get X509 cert serial number. * - * @returns { number } X509 cert serial number. + * @returns { int } X509 cert serial number. * @syscap SystemCapability.Security.Cert * @since 9 * @deprecated since 10 * @useinstead ohos.security.cert.X509Cert.getCertSerialNumber */ - getSerialNumber(): number; + getSerialNumber(): int; /** * Get X509 cert serial number. @@ -1402,7 +1455,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getCertSerialNumber(): bigint; @@ -1440,7 +1494,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getIssuerName(): DataBlob; @@ -1459,6 +1514,7 @@ declare namespace cert { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ getIssuerName(encodingType: EncodingType): string; @@ -1500,7 +1556,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSubjectName(encodingType?: EncodingType): DataBlob; @@ -1538,7 +1595,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getNotBeforeTime(): string; @@ -1576,7 +1634,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getNotAfterTime(): string; @@ -1614,7 +1673,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSignature(): DataBlob; @@ -1652,7 +1712,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSignatureAlgName(): string; @@ -1690,7 +1751,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSignatureAlgOid(): string; @@ -1731,7 +1793,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSignatureAlgParams(): DataBlob; @@ -1763,7 +1826,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getKeyUsage(): DataBlob; @@ -1801,21 +1865,22 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getExtKeyUsage(): DataArray; /** * Get X509 cert basic constraints path len. * - * @returns { number } X509 cert basic constraints path len. + * @returns { int } X509 cert basic constraints path len. * @syscap SystemCapability.Security.Cert * @since 9 */ /** * Get X509 cert basic constraints path len. * - * @returns { number } X509 cert basic constraints path len. + * @returns { int } X509 cert basic constraints path len. * @syscap SystemCapability.Security.Cert * @crossplatform * @since 11 @@ -1823,13 +1888,14 @@ declare namespace cert { /** * Get X509 cert basic constraints path len. * - * @returns { number } X509 cert basic constraints path len. + * @returns { int } X509 cert basic constraints path len. * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getBasicConstraints(): number; + getBasicConstraints(): int; /** * Get X509 cert subject alternative name. @@ -1865,7 +1931,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSubjectAltNames(): DataArray; @@ -1903,7 +1970,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getIssuerAltNames(): DataArray; @@ -1950,7 +2018,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getItem(itemType: CertItemType): DataBlob; @@ -1979,7 +2048,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ match(param: X509CertMatchParameters): boolean; @@ -1994,7 +2064,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getCRLDistributionPoint(): DataArray; @@ -2009,7 +2080,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getIssuerX500DistinguishedName(): X500DistinguishedName; @@ -2024,7 +2096,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSubjectX500DistinguishedName(): X500DistinguishedName; @@ -2039,7 +2112,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ toString(): string; @@ -2058,6 +2132,7 @@ declare namespace cert { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ toString(encodingType: EncodingType): string; @@ -2072,7 +2147,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ hashCode(): Uint8Array; @@ -2087,7 +2163,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getExtensionsObject(): CertExtension; } @@ -2135,7 +2212,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createX509Cert(inStream: EncodingBlob, callback: AsyncCallback): void; @@ -2182,7 +2260,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createX509Cert(inStream: EncodingBlob): Promise; @@ -2208,7 +2287,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface CertExtension { /** @@ -2245,7 +2325,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getEncoded(): EncodingBlob; @@ -2292,7 +2373,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getOidList(valueType: ExtensionOidType): DataArray; @@ -2342,7 +2424,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getEntry(valueType: ExtensionEntryType, oid: DataBlob): DataBlob; @@ -2351,7 +2434,7 @@ declare namespace cert { * If not a CA, return -1, otherwise return the path length constraint in BasicConstraints. * If the certificate is a CA and the path length constraint does not appear, then return -2 to indicate that there is no limit to path length. * - * @returns { number } path length constraint. + * @returns { int } path length constraint. * @throws { BusinessError } 19020001 - memory malloc failed. * @throws { BusinessError } 19020002 - runtime error. Possible causes: 1. Memory copy failed; *
2. A null pointer occurs inside the system; 3. Failed to convert parameters between ArkTS and C. @@ -2364,7 +2447,7 @@ declare namespace cert { * If not a CA, return -1, otherwise return the path length constraint in BasicConstraints. * If the certificate is a CA and the path length constraint does not appear, then return -2 to indicate that there is no limit to path length. * - * @returns { number } path length constraint. + * @returns { int } path length constraint. * @throws { BusinessError } 19020001 - memory malloc failed. * @throws { BusinessError } 19020002 - runtime error. Possible causes: 1. Memory copy failed; *
2. A null pointer occurs inside the system; 3. Failed to convert parameters between ArkTS and C. @@ -2378,7 +2461,7 @@ declare namespace cert { * If not a CA, return -1, otherwise return the path length constraint in BasicConstraints. * If the certificate is a CA and the path length constraint does not appear, then return -2 to indicate that there is no limit to path length. * - * @returns { number } path length constraint. + * @returns { int } path length constraint. * @throws { BusinessError } 19020001 - memory malloc failed. * @throws { BusinessError } 19020002 - runtime error. Possible causes: 1. Memory copy failed; *
2. A null pointer occurs inside the system; 3. Failed to convert parameters between ArkTS and C. @@ -2386,9 +2469,10 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - checkCA(): number; + checkCA(): int; /** * Check if exists Unsupported critical extension. @@ -2413,7 +2497,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ hasUnsupportedCriticalExtension(): boolean; } @@ -2461,7 +2546,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createCertExtension(inStream: EncodingBlob, callback: AsyncCallback): void; @@ -2508,7 +2594,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createCertExtension(inStream: EncodingBlob): Promise; @@ -2559,13 +2646,13 @@ declare namespace cert { /** * Get the serial number from this x509crl entry. * - * @returns { number } serial number of crl entry. + * @returns { int } serial number of crl entry. * @syscap SystemCapability.Security.Cert * @since 9 * @deprecated since 11 * @useinstead ohos.security.cert.X509CRLEntry#getSerialNumber */ - getSerialNumber(): number; + getSerialNumber(): int; /** * Get the issuer of the x509 certificate described by this entry. @@ -2613,7 +2700,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface X509CRLEntry { /** @@ -2643,7 +2731,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getEncoded(callback: AsyncCallback): void; @@ -2674,7 +2763,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getEncoded(): Promise; @@ -2701,7 +2791,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSerialNumber(): bigint; @@ -2730,7 +2821,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getCertIssuer(): DataBlob; @@ -2750,6 +2842,7 @@ declare namespace cert { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ getCertIssuer(encodingType: EncodingType): string; @@ -2776,7 +2869,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getRevocationDate(): string; @@ -2803,7 +2897,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getExtensions(): DataBlob; @@ -2830,7 +2925,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ hasExtensions(): boolean; @@ -2845,7 +2941,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getCertIssuerX500DistinguishedName(): X500DistinguishedName; @@ -2860,7 +2957,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ toString(): string; @@ -2875,7 +2973,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ hashCode(): Uint8Array; @@ -2890,7 +2989,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getExtensionsObject(): CertExtension; } @@ -2997,13 +3097,13 @@ declare namespace cert { /** * Get version number from CRL. * - * @returns { number } version of crl. + * @returns { int } version of crl. * @syscap SystemCapability.Security.Cert * @since 9 * @deprecated since 11 * @useinstead ohos.security.cert.X509CRL#getVersion */ - getVersion(): number; + getVersion(): int; /** * Get the issuer name from CRL. Issuer means the entity that signs and publishes the CRL. @@ -3053,7 +3153,7 @@ declare namespace cert { /** * This method can be used to find CRL entries in specified CRLs. * - * @param { number } serialNumber - serial number of crl. + * @param { int } serialNumber - serial number of crl. * @returns { X509CrlEntry } next update of crl. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. @@ -3064,7 +3164,7 @@ declare namespace cert { * @deprecated since 11 * @useinstead ohos.security.cert.X509CRL#getRevokedCert */ - getRevokedCert(serialNumber: number): X509CrlEntry; + getRevokedCert(serialNumber: int): X509CrlEntry; /** * This method can be used to find CRL entries in specified cert. @@ -3238,7 +3338,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface X509CRL { /** @@ -3262,7 +3363,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isRevoked(cert: X509Cert): boolean; @@ -3281,7 +3383,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getType(): string; @@ -3312,7 +3415,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getEncoded(callback: AsyncCallback): void; @@ -3343,7 +3447,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getEncoded(): Promise; @@ -3370,7 +3475,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ verify(key: cryptoFramework.PubKey, callback: AsyncCallback): void; @@ -3397,14 +3503,15 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ verify(key: cryptoFramework.PubKey): Promise; /** * Get version number from CRL. * - * @returns { number } version of CRL. + * @returns { int } version of CRL. * @syscap SystemCapability.Security.Cert * @crossplatform * @since 11 @@ -3412,13 +3519,14 @@ declare namespace cert { /** * Get version number from CRL. * - * @returns { number } version of CRL. + * @returns { int } version of CRL. * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getVersion(): number; + getVersion(): int; /** * Get the issuer name from CRL. Issuer means the entity that signs and publishes the CRL. @@ -3443,7 +3551,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getIssuerName(): DataBlob; @@ -3462,6 +3571,7 @@ declare namespace cert { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ getIssuerName(encodingType: EncodingType): string; @@ -3488,7 +3598,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getLastUpdate(): string; @@ -3515,7 +3626,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getNextUpdate(): string; @@ -3544,7 +3656,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getRevokedCert(serialNumber: bigint): X509CRLEntry; @@ -3573,7 +3686,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getRevokedCertWithCert(cert: X509Cert): X509CRLEntry; @@ -3600,7 +3714,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getRevokedCerts(callback: AsyncCallback>): void; @@ -3627,7 +3742,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getRevokedCerts(): Promise>; @@ -3654,7 +3770,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getTBSInfo(): DataBlob; @@ -3681,7 +3798,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSignature(): DataBlob; @@ -3708,7 +3826,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSignatureAlgName(): string; @@ -3735,7 +3854,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSignatureAlgOid(): string; @@ -3764,7 +3884,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSignatureAlgParams(): DataBlob; @@ -3791,7 +3912,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getExtensions(): DataBlob; @@ -3820,7 +3942,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ match(param: X509CRLMatchParameters): boolean; @@ -3835,7 +3958,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getIssuerX500DistinguishedName(): X500DistinguishedName; @@ -3850,7 +3974,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ toString(): string; @@ -3869,6 +3994,7 @@ declare namespace cert { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ toString(encodingType: EncodingType): string; @@ -3883,7 +4009,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ hashCode(): Uint8Array; @@ -3898,7 +4025,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getExtensionsObject(): CertExtension; } @@ -3930,7 +4058,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createX509CRL(inStream: EncodingBlob, callback: AsyncCallback): void; @@ -3961,7 +4090,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createX509CRL(inStream: EncodingBlob): Promise; @@ -3987,7 +4117,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface CertChainValidator { /** @@ -4051,7 +4182,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ validate(certChain: CertChainData, callback: AsyncCallback): void; @@ -4116,7 +4248,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ validate(certChain: CertChainData): Promise; @@ -4145,7 +4278,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly algorithm: string; } @@ -4196,18 +4330,20 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createCertChainValidator(algorithm: string): CertChainValidator; /** * Enum for general name use type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum GeneralNameType { /** @@ -4216,7 +4352,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ GENERAL_NAME_TYPE_OTHER_NAME = 0, @@ -4226,7 +4363,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ GENERAL_NAME_TYPE_RFC822_NAME = 1, @@ -4236,7 +4374,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ GENERAL_NAME_TYPE_DNS_NAME = 2, @@ -4246,7 +4385,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ GENERAL_NAME_TYPE_X400_ADDRESS = 3, @@ -4256,7 +4396,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ GENERAL_NAME_TYPE_DIRECTORY_NAME = 4, @@ -4266,7 +4407,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ GENERAL_NAME_TYPE_EDI_PARTY_NAME = 5, @@ -4276,7 +4418,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ GENERAL_NAME_TYPE_UNIFORM_RESOURCE_ID = 6, @@ -4286,7 +4429,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ GENERAL_NAME_TYPE_IP_ADDRESS = 7, @@ -4296,7 +4440,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ GENERAL_NAME_TYPE_REGISTERED_ID = 8 } @@ -4308,7 +4453,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface GeneralName { /** @@ -4318,7 +4464,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ type: GeneralNameType; @@ -4329,7 +4476,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ name?: Uint8Array; } @@ -4349,7 +4497,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface X509CertMatchParameters { /** @@ -4362,7 +4511,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ subjectAlternativeNames?: Array; @@ -4376,7 +4526,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ matchAllSubjectAltNames?: boolean; @@ -4390,7 +4541,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ authorityKeyIdentifier?: Uint8Array; @@ -4401,13 +4553,14 @@ declare namespace cert { * -2 : The cA field in the BaseConstraints extension of the certificate must be set to false or the certificate does not contain BaseConstraints extension. * other : Do not match. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - minPathLenConstraint?: number; + minPathLenConstraint?: int; /** * To match X509Cert: @@ -4430,7 +4583,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ x509Cert?: X509Cert; @@ -4455,7 +4609,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ validDate?: string; @@ -4480,7 +4635,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ issuer?: Uint8Array; @@ -4495,7 +4651,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ extendedKeyUsage?: Array; @@ -4510,7 +4667,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ nameConstraints?: Uint8Array; @@ -4525,7 +4683,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ certPolicy?: Array; @@ -4540,7 +4699,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ privateKeyValid?: string; @@ -4567,7 +4727,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ keyUsage?: Array; @@ -4592,7 +4753,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ serialNumber?: bigint; @@ -4617,7 +4779,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ subject?: Uint8Array; @@ -4631,7 +4794,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ subjectKeyIdentifier?: Uint8Array; @@ -4656,7 +4820,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ publicKey?: DataBlob; @@ -4681,7 +4846,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ publicKeyAlgID?: string; } @@ -4701,7 +4867,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface X509CRLMatchParameters { /** @@ -4725,7 +4892,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ issuer?: Array; @@ -4750,7 +4918,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ x509Cert?: X509Cert; @@ -4764,7 +4933,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ updateDateTime?: string; @@ -4778,7 +4948,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ maxCRL?: bigint; @@ -4792,7 +4963,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ minCRL?: bigint; } @@ -4812,7 +4984,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface CertCRLCollection { /** @@ -4840,7 +5013,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ selectCerts(param: X509CertMatchParameters): Promise>; @@ -4869,7 +5043,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ selectCerts(param: X509CertMatchParameters, callback: AsyncCallback>): void; @@ -4898,7 +5073,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ selectCRLs(param: X509CRLMatchParameters): Promise>; @@ -4927,7 +5103,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ selectCRLs(param: X509CRLMatchParameters, callback: AsyncCallback>): void; } @@ -4957,7 +5134,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createCertCRLCollection(certs: Array, crls?: Array): CertCRLCollection; @@ -4976,7 +5154,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface X509CertChain { /** @@ -5002,7 +5181,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getCertList(): Array; @@ -5047,7 +5227,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ validate(param: CertChainValidationParameters): Promise; @@ -5092,7 +5273,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ validate(param: CertChainValidationParameters, callback: AsyncCallback): void; @@ -5107,7 +5289,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ toString(): string; @@ -5122,7 +5305,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ hashCode(): Uint8Array; } @@ -5154,7 +5338,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createX509CertChain(inStream: EncodingBlob): Promise; @@ -5185,7 +5370,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createX509CertChain(inStream: EncodingBlob, callback: AsyncCallback): void; @@ -5214,7 +5400,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createX509CertChain(certs: Array): X509CertChain; @@ -5238,18 +5425,20 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function buildX509CertChain(param: CertChainBuildParameters): Promise; /** * The encoding base format. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ enum EncodingBaseFormat { /** @@ -5258,7 +5447,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ PEM = 0, @@ -5268,9 +5458,10 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - DER = 1, + DER = 1 } /** @@ -5280,7 +5471,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface Pkcs12Data { /** @@ -5290,7 +5482,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ privateKey?: string | Uint8Array; @@ -5301,7 +5494,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ cert?: X509Cert; @@ -5312,7 +5506,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ otherCerts?: Array; } @@ -5324,7 +5519,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface Pkcs12ParsingConfig { /** @@ -5334,7 +5530,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ password: string; @@ -5346,7 +5543,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ needsPrivateKey?: boolean; @@ -5358,7 +5556,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ privateKeyFormat?: EncodingBaseFormat; @@ -5370,7 +5569,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ needsCert?: boolean; @@ -5382,7 +5582,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ needsOtherCerts?: boolean; } @@ -5403,7 +5604,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ function parsePkcs12(data: Uint8Array, config: Pkcs12ParsingConfig): Pkcs12Data; @@ -5428,7 +5630,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createTrustAnchorsWithKeyStore(keystore: Uint8Array, pwd: string): Promise>; @@ -5452,7 +5655,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createX500DistinguishedName(nameStr: string): Promise; @@ -5476,7 +5680,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createX500DistinguishedName(nameDer: Uint8Array): Promise; @@ -5487,7 +5692,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface X500DistinguishedName { /** @@ -5501,7 +5707,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getName(): string; @@ -5520,6 +5727,7 @@ declare namespace cert { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ getName(encodingType: EncodingType): string; @@ -5537,7 +5745,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getName(type: string): Array; @@ -5552,7 +5761,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getEncoded(): EncodingBlob; } @@ -5572,7 +5782,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface X509TrustAnchor { /** @@ -5590,7 +5801,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CACert?: X509Cert; @@ -5609,7 +5821,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CAPubKey?: Uint8Array; @@ -5628,7 +5841,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CASubject?: Uint8Array; @@ -5639,7 +5853,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ nameConstraints?: Uint8Array; } @@ -5647,11 +5862,12 @@ declare namespace cert { /** * Enum for revocation check option. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum RevocationCheckOptions { /** @@ -5660,7 +5876,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ REVOCATION_CHECK_OPTION_PREFER_OCSP = 0, @@ -5670,7 +5887,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ REVOCATION_CHECK_OPTION_ACCESS_NETWORK, @@ -5682,7 +5900,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ REVOCATION_CHECK_OPTION_FALLBACK_NO_PREFER, @@ -5694,7 +5913,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ REVOCATION_CHECK_OPTION_FALLBACK_LOCAL } @@ -5702,11 +5922,12 @@ declare namespace cert { /** * Enum for validation policy type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum ValidationPolicyType { /** @@ -5715,7 +5936,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ VALIDATION_POLICY_TYPE_X509 = 0, @@ -5725,7 +5947,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ VALIDATION_POLICY_TYPE_SSL } @@ -5733,11 +5956,12 @@ declare namespace cert { /** * Enum for validation keyusage type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum KeyUsageType { /** @@ -5746,7 +5970,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ KEYUSAGE_DIGITAL_SIGNATURE = 0, @@ -5756,7 +5981,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ KEYUSAGE_NON_REPUDIATION, @@ -5766,7 +5992,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ KEYUSAGE_KEY_ENCIPHERMENT, @@ -5776,7 +6003,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ KEYUSAGE_DATA_ENCIPHERMENT, @@ -5786,7 +6014,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ KEYUSAGE_KEY_AGREEMENT, @@ -5796,7 +6025,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ KEYUSAGE_KEY_CERT_SIGN, @@ -5806,7 +6036,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ KEYUSAGE_CRL_SIGN, @@ -5816,7 +6047,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ KEYUSAGE_ENCIPHER_ONLY, @@ -5826,7 +6058,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ KEYUSAGE_DECIPHER_ONLY } @@ -5838,7 +6071,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface RevocationCheckParameter { /** @@ -5848,7 +6082,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ocspRequestExtension?: Array; @@ -5859,7 +6094,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ocspResponderURI?: string; @@ -5870,7 +6106,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ocspResponderCert?: X509Cert; @@ -5881,7 +6118,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ocspResponses?: Uint8Array; @@ -5892,7 +6130,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ crlDownloadURI?: string; @@ -5903,7 +6142,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ options?: Array; @@ -5915,7 +6155,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ocspDigest?: string; } @@ -5935,7 +6176,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface CertChainValidationParameters { /** @@ -5953,7 +6195,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ date?: string; @@ -5972,7 +6215,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ trustAnchors: Array; @@ -5991,7 +6235,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ certCRLs?: Array; @@ -6002,7 +6247,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ revocationCheckParam?: RevocationCheckParameter; @@ -6013,7 +6259,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ policy?: ValidationPolicyType; @@ -6024,7 +6271,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ sslHostname?: string; @@ -6035,7 +6283,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ keyUsage?: Array; } @@ -6055,7 +6304,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface CertChainValidationResult { /** @@ -6075,7 +6325,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly trustAnchor: X509TrustAnchor; @@ -6096,7 +6347,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly entityCert: X509Cert; } @@ -6108,7 +6360,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface CertChainBuildParameters { /** @@ -6118,20 +6371,22 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ certMatchParameters: X509CertMatchParameters; /** * The maximum length of the certificate chain to be built. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - maxLength?: number; + maxLength?: int; /** * The CertChain validation parameters. @@ -6140,7 +6395,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ validationParameters: CertChainValidationParameters; } @@ -6152,7 +6408,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface CertChainBuildResult { /** @@ -6163,7 +6420,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly certChain: X509CertChain; @@ -6175,7 +6433,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly validationResult: CertChainValidationResult; } @@ -6183,11 +6442,12 @@ declare namespace cert { /** * Enum for CMS content type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ enum CmsContentType { /** @@ -6196,7 +6456,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ SIGNED_DATA = 0 } @@ -6204,11 +6465,12 @@ declare namespace cert { /** * Enum for CMS content data format. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ enum CmsContentDataFormat { /** @@ -6217,7 +6479,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ BINARY = 0, @@ -6227,7 +6490,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ TEXT = 1 } @@ -6235,11 +6499,12 @@ declare namespace cert { /** * Enum for CMS format. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ enum CmsFormat { /** @@ -6248,7 +6513,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ PEM = 0, @@ -6258,7 +6524,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ DER = 1 } @@ -6270,7 +6537,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface PrivateKeyInfo { /** @@ -6280,7 +6548,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ key: string | Uint8Array; @@ -6291,7 +6560,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ password?: string; } @@ -6303,7 +6573,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface CmsSignerConfig { /** @@ -6313,7 +6584,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ mdName: string; @@ -6325,7 +6597,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ addCert?: boolean; @@ -6337,7 +6610,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ addAttr?: boolean; @@ -6349,9 +6623,10 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - addSmimeCapAttr?: boolean + addSmimeCapAttr?: boolean; } /** @@ -6361,7 +6636,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface CmsGeneratorOptions { /** @@ -6372,7 +6648,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ contentDataFormat?: CmsContentDataFormat; @@ -6384,7 +6661,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ outFormat?: CmsFormat; @@ -6396,7 +6674,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ isDetached?: boolean; } @@ -6408,7 +6687,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface CmsGenerator { /** @@ -6427,7 +6707,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ addSigner(cert: X509Cert, keyInfo: PrivateKeyInfo, config: CmsSignerConfig): void; @@ -6444,7 +6725,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ addCert(cert: X509Cert): void; @@ -6463,7 +6745,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ doFinal(data: Uint8Array, options?: CmsGeneratorOptions): Promise; @@ -6482,7 +6765,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ doFinalSync(data: Uint8Array, options?: CmsGeneratorOptions): Uint8Array | string; } @@ -6501,7 +6785,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ function createCmsGenerator(contentType: CmsContentType): CmsGenerator; @@ -6512,7 +6797,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface CsrAttribute { /** @@ -6522,7 +6808,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ type: string; @@ -6533,7 +6820,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ value: string; } @@ -6545,7 +6833,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface CsrGenerationConfig { /** @@ -6555,7 +6844,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ subject: X500DistinguishedName; @@ -6566,7 +6856,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ mdName: string; @@ -6577,7 +6868,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ attributes?: Array; @@ -6589,7 +6881,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ outFormat?: EncodingBaseFormat; } @@ -6610,7 +6903,8 @@ declare namespace cert { * @syscap SystemCapability.Security.Cert * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ function generateCsr(keyInfo: PrivateKeyInfo, config: CsrGenerationConfig): string | Uint8Array; } diff --git a/api/@ohos.security.cryptoFramework.d.ts b/api/@ohos.security.cryptoFramework.d.ts index df5fa62fb0..986d48c70b 100644 --- a/api/@ohos.security.cryptoFramework.d.ts +++ b/api/@ohos.security.cryptoFramework.d.ts @@ -17,7 +17,7 @@ * @file * @kit CryptoArchitectureKit */ -import type { AsyncCallback, Callback } from './@ohos.base'; +import type { AsyncCallback } from './@ohos.base'; /** * Provides a set of encryption and decryption algorithm library framework, shields the underlying differences, @@ -42,18 +42,19 @@ declare namespace cryptoFramework { /** * Enum for result code. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CryptoFramework * @since 9 */ /** * Enum for result code. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CryptoFramework * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ enum Result { /** @@ -68,7 +69,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ INVALID_PARAMS = 401, @@ -91,7 +93,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ NOT_SUPPORT = 801, @@ -107,7 +110,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_OUT_OF_MEMORY = 17620001, @@ -130,7 +134,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_RUNTIME_ERROR = 17620002, @@ -141,6 +146,7 @@ declare namespace cryptoFramework { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ ERR_PARAMETER_CHECK_FAILED = 17620003, @@ -156,7 +162,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CRYPTO_OPERATION = 17630001 } @@ -222,7 +229,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ParamsSpec { /** @@ -247,7 +255,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ algName: string; } @@ -278,7 +287,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface IvParamsSpec extends ParamsSpec { /** @@ -307,7 +317,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ iv: DataBlob; } @@ -337,7 +348,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface GcmParamsSpec extends ParamsSpec { /** @@ -362,7 +374,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ iv: DataBlob; @@ -388,7 +401,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ aad: DataBlob; @@ -414,7 +428,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ authTag: DataBlob; } @@ -444,7 +459,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface CcmParamsSpec extends ParamsSpec { /** @@ -469,7 +485,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ iv: DataBlob; @@ -495,7 +512,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ aad: DataBlob; @@ -521,7 +539,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ authTag: DataBlob; } @@ -529,14 +548,14 @@ declare namespace cryptoFramework { /** * Enum for obtain the crypto operation. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CryptoFramework * @since 9 */ /** * Enum for obtain the crypto operation. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CryptoFramework * @crossplatform * @since 11 @@ -544,11 +563,12 @@ declare namespace cryptoFramework { /** * Enumerates the cryptographic operations. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum CryptoMode { /** @@ -570,7 +590,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ENCRYPT_MODE = 0, @@ -593,7 +614,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DECRYPT_MODE = 1 } @@ -605,7 +627,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface KeyEncodingConfig { /** @@ -615,7 +638,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ password: string; @@ -626,7 +650,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ cipherName: string; } @@ -693,7 +718,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getEncoded(): DataBlob; @@ -722,7 +748,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly format: string; @@ -751,7 +778,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly algName: string; } @@ -806,7 +834,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.SymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ clearMem(): void; } @@ -836,7 +865,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface PriKey extends Key { /** @@ -858,7 +888,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ clearMem(): void; @@ -866,7 +897,7 @@ declare namespace cryptoFramework { * Get the specified parameter of the private key. * * @param { AsyKeySpecItem } itemType - indicates the specified parameters type. - * @returns { bigint | string | number } the specified parameters value. + * @returns { bigint | string | int } the specified parameters value. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - this operation is not supported. @@ -879,7 +910,7 @@ declare namespace cryptoFramework { * Get the specified parameter of the private key. * * @param { AsyKeySpecItem } itemType - indicates the specified parameters type. - * @returns { bigint | string | number } the specified parameters value. + * @returns { bigint | string | int } the specified parameters value. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - this operation is not supported. @@ -893,7 +924,7 @@ declare namespace cryptoFramework { * Get the specified parameter of the private key. * * @param { AsyKeySpecItem } itemType - indicates the specified parameters type. - * @returns { bigint | string | number } the specified parameters value. + * @returns { bigint | string | int } the specified parameters value. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - this operation is not supported. @@ -902,9 +933,10 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getAsyKeySpec(itemType: AsyKeySpecItem): bigint | string | number; + getAsyKeySpec(itemType: AsyKeySpecItem): bigint | string | int; /** * Encode the private key object to binary data in DER format. @@ -918,7 +950,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getEncodedDer(format: string): DataBlob; @@ -935,7 +968,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getEncodedPem(format: string): string; @@ -954,7 +988,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ getEncodedPem(format: string, config: KeyEncodingConfig): string; } @@ -984,14 +1019,15 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface PubKey extends Key { /** * Get the specified parameter of the public key. * * @param { AsyKeySpecItem } itemType - indicates the specified parameters type. - * @returns { bigint | string | number } the specified parameters value. + * @returns { bigint | string | int } the specified parameters value. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17620001 - memory operation failed. @@ -1003,7 +1039,7 @@ declare namespace cryptoFramework { * Get the specified parameter of the public key. * * @param { AsyKeySpecItem } itemType - indicates the specified parameters type. - * @returns { bigint | string | number } the specified parameters value. + * @returns { bigint | string | int } the specified parameters value. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17620001 - memory operation failed. @@ -1016,7 +1052,7 @@ declare namespace cryptoFramework { * Get the specified parameter of the public key. * * @param { AsyKeySpecItem } itemType - indicates the specified parameters type. - * @returns { bigint | string | number } the specified parameters value. + * @returns { bigint | string | int } the specified parameters value. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - this operation is not supported. @@ -1025,9 +1061,10 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getAsyKeySpec(itemType: AsyKeySpecItem): bigint | string | number; + getAsyKeySpec(itemType: AsyKeySpecItem): bigint | string | int; /** * Encode the public key object to binary data in DER format. @@ -1042,7 +1079,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getEncodedDer(format: string): DataBlob; @@ -1059,7 +1097,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getEncodedPem(format: string): string; } @@ -1086,7 +1125,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface KeyPair { /** @@ -1114,7 +1154,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly priKey: PriKey; @@ -1143,7 +1184,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly pubKey: PubKey; } @@ -1171,13 +1213,14 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Rand * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface Random { /** * Generate random DataBlob by given length. * - * @param { number } len - indicates the length of random DataBlob. + * @param { int } len - indicates the length of random DataBlob. * @param { AsyncCallback } callback - the callback used to return random DataBlob. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. @@ -1189,7 +1232,7 @@ declare namespace cryptoFramework { /** * Generate random DataBlob by given length. * - * @param { number } len - indicates the length of random DataBlob. + * @param { int } len - indicates the length of random DataBlob. * @param { AsyncCallback } callback - the callback used to return random DataBlob. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. @@ -1203,7 +1246,7 @@ declare namespace cryptoFramework { /** * Generate random DataBlob by given length. * - * @param { number } len - indicates the length of random DataBlob. + * @param { int } len - indicates the length of random DataBlob. * @param { AsyncCallback } callback - the callback used to return random DataBlob. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. @@ -1212,14 +1255,15 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Rand * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - generateRandom(len: number, callback: AsyncCallback): void; + generateRandom(len: int, callback: AsyncCallback): void; /** * Generate random DataBlob by given length. * - * @param { number } len - indicates the length of random DataBlob. + * @param { int } len - indicates the length of random DataBlob. * @returns { Promise } the promise used to return the generated random blob. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. @@ -1231,7 +1275,7 @@ declare namespace cryptoFramework { /** * Generate random DataBlob by given length. * - * @param { number } len - indicates the length of random DataBlob. + * @param { int } len - indicates the length of random DataBlob. * @returns { Promise } the promise used to return the generated random blob. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. @@ -1245,7 +1289,7 @@ declare namespace cryptoFramework { /** * Generate random DataBlob by given length. * - * @param { number } len - indicates the length of random DataBlob. + * @param { int } len - indicates the length of random DataBlob. * @returns { Promise } the promise used to return the generated random blob. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. @@ -1254,14 +1298,15 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Rand * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - generateRandom(len: number): Promise; + generateRandom(len: int): Promise; /** * Generate random DataBlob by given length synchronously. * - * @param { number } len - indicates the length of random DataBlob. + * @param { int } len - indicates the length of random DataBlob. * @returns { DataBlob } return the generated random blob. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. @@ -1273,7 +1318,7 @@ declare namespace cryptoFramework { /** * Generate random DataBlob by given length synchronously. * - * @param { number } len - indicates the length of random DataBlob. + * @param { int } len - indicates the length of random DataBlob. * @returns { DataBlob } return the generated random blob. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. @@ -1287,7 +1332,7 @@ declare namespace cryptoFramework { /** * Generate random DataBlob by given length synchronously. * - * @param { number } len - indicates the length of random DataBlob. + * @param { int } len - indicates the length of random DataBlob. * @returns { DataBlob } return the generated random blob. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. @@ -1296,9 +1341,10 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Rand * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - generateRandomSync(len: number): DataBlob; + generateRandomSync(len: int): DataBlob; /** * Set seed by given DataBlob. @@ -1327,7 +1373,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Rand * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setSeed(seed: DataBlob): void; @@ -1357,7 +1404,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Rand * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly algName: string; } @@ -1388,7 +1436,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Rand * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createRandom(): Random; @@ -1414,7 +1463,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AsyKeyGenerator { /** @@ -1448,7 +1498,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generateKeyPair(callback: AsyncCallback): void; @@ -1486,7 +1537,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generateKeyPair(): Promise; @@ -1501,7 +1553,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generateKeyPairSync(): KeyPair; @@ -1589,7 +1642,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ convertKey(pubKey: DataBlob | null, priKey: DataBlob | null, callback: AsyncCallback): void; @@ -1677,7 +1731,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ convertKey(pubKey: DataBlob | null, priKey: DataBlob | null): Promise; @@ -1694,7 +1749,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ convertKeySync(pubKey: DataBlob | null, priKey: DataBlob | null): KeyPair; @@ -1711,7 +1767,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ convertPemKey(pubKey: string | null, priKey: string | null): Promise; @@ -1729,7 +1786,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ convertPemKey(pubKey: string | null, priKey: string | null, password: string): Promise; @@ -1746,7 +1804,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ convertPemKeySync(pubKey: string | null, priKey: string | null): KeyPair; @@ -1764,7 +1823,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ convertPemKeySync(pubKey: string | null, priKey: string | null, password: string): KeyPair; @@ -1793,7 +1853,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly algName: string; } @@ -1849,7 +1910,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.SymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generateSymKey(callback: AsyncCallback): void; @@ -1878,7 +1940,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.SymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generateSymKey(): Promise; @@ -1890,7 +1953,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.SymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generateSymKeySync(): SymKey; @@ -1928,7 +1992,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.SymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ convertKey(key: DataBlob, callback: AsyncCallback): void; @@ -1966,7 +2031,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.SymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ convertKey(key: DataBlob): Promise; @@ -2011,7 +2077,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.SymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly algName: string; } @@ -2053,7 +2120,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createAsyKeyGenerator(algName: string): AsyKeyGenerator; @@ -2104,7 +2172,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Mac * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface MacSpec { /** @@ -2114,7 +2183,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Mac * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ algName: string; } @@ -2127,7 +2197,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Mac * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface HmacSpec extends MacSpec { /** @@ -2137,7 +2208,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Mac * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ mdName: string; } @@ -2150,7 +2222,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Mac * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface CmacSpec extends MacSpec { /** @@ -2160,7 +2233,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Mac * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ cipherName: string; } @@ -2231,7 +2305,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Mac * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ init(key: SymKey, callback: AsyncCallback): void; @@ -2274,7 +2349,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Mac * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ init(key: SymKey): Promise; @@ -2333,7 +2409,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Mac * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ update(input: DataBlob, callback: AsyncCallback): void; @@ -2374,7 +2451,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Mac * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ update(input: DataBlob): Promise; @@ -2422,7 +2500,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Mac * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ doFinal(callback: AsyncCallback): void; @@ -2454,7 +2533,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Mac * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ doFinal(): Promise; @@ -2478,7 +2558,7 @@ declare namespace cryptoFramework { /** * Output the length of mac result. * - * @returns { number } returns the length of the mac result. + * @returns { int } returns the length of the mac result. * @throws { BusinessError } 17630001 - crypto operation error. * @syscap SystemCapability.Security.CryptoFramework * @since 9 @@ -2486,7 +2566,7 @@ declare namespace cryptoFramework { /** * Output the length of mac result. * - * @returns { number } returns the length of the mac result. + * @returns { int } returns the length of the mac result. * @throws { BusinessError } 17630001 - crypto operation error. * @syscap SystemCapability.Security.CryptoFramework * @crossplatform @@ -2495,14 +2575,15 @@ declare namespace cryptoFramework { /** * Output the length of mac result. * - * @returns { number } returns the length of the mac result. + * @returns { int } returns the length of the mac result. * @throws { BusinessError } 17630001 - crypto operation error. * @syscap SystemCapability.Security.CryptoFramework.Mac * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getMacLength(): number; + getMacLength(): int; /** * Indicates the algorithm name. @@ -2529,7 +2610,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Mac * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly algName: string; } @@ -2586,7 +2668,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Mac * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ function createMac(macSpec: MacSpec): Mac; @@ -2613,7 +2696,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.MessageDigest * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface Md { /** @@ -2653,7 +2737,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.MessageDigest * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ update(input: DataBlob, callback: AsyncCallback): void; @@ -2694,7 +2779,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.MessageDigest * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ update(input: DataBlob): Promise; @@ -2709,7 +2795,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.MessageDigest * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ updateSync(input: DataBlob): void; @@ -2741,7 +2828,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.MessageDigest * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ digest(callback: AsyncCallback): void; @@ -2773,7 +2861,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.MessageDigest * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ digest(): Promise; @@ -2789,14 +2878,15 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.MessageDigest * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ digestSync(): DataBlob; /** * Output the length of md result. * - * @returns { number } returns the length of the md result. + * @returns { int } returns the length of the md result. * @throws { BusinessError } 17630001 - crypto operation error. * @syscap SystemCapability.Security.CryptoFramework * @since 9 @@ -2804,7 +2894,7 @@ declare namespace cryptoFramework { /** * Output the length of md result. * - * @returns { number } returns the length of the md result. + * @returns { int } returns the length of the md result. * @throws { BusinessError } 17630001 - crypto operation error. * @syscap SystemCapability.Security.CryptoFramework * @crossplatform @@ -2813,14 +2903,15 @@ declare namespace cryptoFramework { /** * Output the length of md result. * - * @returns { number } returns the length of the md result. + * @returns { int } returns the length of the md result. * @throws { BusinessError } 17630001 - crypto operation error. * @syscap SystemCapability.Security.CryptoFramework.MessageDigest * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getMdLength(): number; + getMdLength(): int; /** * Indicates the algorithm name. @@ -2847,7 +2938,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.MessageDigest * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly algName: string; } @@ -2886,21 +2978,22 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.MessageDigest * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createMd(algName: string): Md; /** * Enum for encryption specified parameters. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CryptoFramework * @since 10 */ /** * Enum for encryption specified parameters. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CryptoFramework * @crossplatform * @since 11 @@ -2909,11 +3002,12 @@ declare namespace cryptoFramework { * Enum for encryption specified parameters. * You can use setCipherSpec to set cipher parameters, and use getCipherSpec to obtain cipher parameters. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum CipherSpecItem { /** @@ -2935,7 +3029,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ OAEP_MD_NAME_STR = 100, @@ -2958,7 +3053,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ OAEP_MGF_NAME_STR = 101, @@ -2981,7 +3077,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ OAEP_MGF1_MD_STR = 102, @@ -3004,7 +3101,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ OAEP_MGF1_PSRC_UINT8ARR = 103, @@ -3021,7 +3119,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SM2_MD_NAME_STR = 104 } @@ -3029,14 +3128,14 @@ declare namespace cryptoFramework { /** * Enum for signature specified parameters, also used for verification. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CryptoFramework * @since 10 */ /** * Enum for signature specified parameters, also used for verification. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CryptoFramework * @crossplatform * @since 11 @@ -3045,11 +3144,12 @@ declare namespace cryptoFramework { * Enum for signature specified parameters, also used for verification. * You can use setSignSpec and setVerifySpec to set these parameters, and use getSignSpec and getVerifySpec to obtain the parameters. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum SignSpecItem { /** @@ -3071,7 +3171,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ PSS_MD_NAME_STR = 100, @@ -3094,7 +3195,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ PSS_MGF_NAME_STR = 101, @@ -3120,7 +3222,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ PSS_MGF1_MD_STR = 102, @@ -3143,7 +3246,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ PSS_SALT_LEN_NUM = 103, @@ -3166,7 +3270,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ PSS_TRAILER_FIELD_NUM = 104, @@ -3183,7 +3288,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SM2_USER_ID_UINT8ARR = 105 } @@ -3210,7 +3316,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface Cipher { /** @@ -3311,7 +3418,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ init(opMode: CryptoMode, key: Key, params: ParamsSpec | null, callback: AsyncCallback): void; @@ -3413,7 +3521,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ init(opMode: CryptoMode, key: Key, params: ParamsSpec | null): Promise; @@ -3432,7 +3541,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ initSync(opMode: CryptoMode, key: Key, params: ParamsSpec | null): void; @@ -3479,7 +3589,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ update(data: DataBlob, callback: AsyncCallback): void; @@ -3526,7 +3637,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ update(data: DataBlob): Promise; @@ -3544,7 +3656,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ updateSync(data: DataBlob): DataBlob; @@ -3638,7 +3751,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ doFinal(data: DataBlob | null, callback: AsyncCallback): void; @@ -3732,7 +3846,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ doFinal(data: DataBlob | null): Promise; @@ -3750,7 +3865,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ doFinalSync(data: DataBlob | null): DataBlob; @@ -3797,7 +3913,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setCipherSpec(itemType: CipherSpecItem, itemValue: Uint8Array): void; @@ -3844,7 +3961,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getCipherSpec(itemType: CipherSpecItem): string | Uint8Array; @@ -3873,7 +3991,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly algName: string; } @@ -3922,7 +4041,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createCipher(transformation: string): Cipher; @@ -3949,7 +4069,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface Sign { /** @@ -3993,7 +4114,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ init(priKey: PriKey, callback: AsyncCallback): void; @@ -4038,7 +4160,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ init(priKey: PriKey): Promise; @@ -4055,7 +4178,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ initSync(priKey: PriKey): void; @@ -4100,7 +4224,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ update(data: DataBlob, callback: AsyncCallback): void; @@ -4145,7 +4270,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ update(data: DataBlob): Promise; @@ -4162,7 +4288,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ updateSync(data: DataBlob): void; @@ -4250,7 +4377,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ sign(data: DataBlob | null, callback: AsyncCallback): void; @@ -4338,7 +4466,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ sign(data: DataBlob | null): Promise; @@ -4355,7 +4484,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ signSync(data: DataBlob | null): DataBlob; @@ -4364,7 +4494,7 @@ declare namespace cryptoFramework { * Currently, only the PSS_SALT_LEN parameter in RSA is supported. * * @param { SignSpecItem } itemType - indicates the specified parameter type. - * @param { number } itemValue - the value of the specified parameter. + * @param { int } itemValue - the value of the specified parameter. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - this operation is not supported. @@ -4378,7 +4508,7 @@ declare namespace cryptoFramework { * Currently, only the PSS_SALT_LEN parameter in RSA is supported. * * @param { SignSpecItem } itemType - indicates the specified parameter type. - * @param { number } itemValue - the value of the specified parameter. + * @param { int } itemValue - the value of the specified parameter. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - this operation is not supported. @@ -4393,7 +4523,7 @@ declare namespace cryptoFramework { * Currently, only the PSS_SALT_LEN parameter in RSA is supported. * * @param { SignSpecItem } itemType - indicates the specified parameter type. - * @param { number } itemValue - the value of the specified parameter. + * @param { int } itemValue - the value of the specified parameter. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - this operation is not supported. @@ -4404,14 +4534,14 @@ declare namespace cryptoFramework { * @atomicservice * @since 12 */ - setSignSpec(itemType: SignSpecItem, itemValue: number): void; + setSignSpec(itemType: SignSpecItem, itemValue: int): void; /** * Set the specified parameter to the sign object. * Currently, only PSS_SALT_LEN in RSA and USER_ID in SM2 are supported. * * @param { SignSpecItem } itemType - indicates the specified parameter type. - * @param { number | Uint8Array } itemValue - the value of the specified parameter. + * @param { int | Uint8Array } itemValue - the value of the specified parameter. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - this operation is not supported. @@ -4426,7 +4556,7 @@ declare namespace cryptoFramework { * Currently, only PSS_SALT_LEN in RSA and USER_ID in SM2 are supported. * * @param { SignSpecItem } itemType - indicates the specified parameter type. - * @param { number | Uint8Array } itemValue - the value of the specified parameter. + * @param { int | Uint8Array } itemValue - the value of the specified parameter. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - this operation is not supported. @@ -4435,16 +4565,17 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - setSignSpec(itemType: SignSpecItem, itemValue: number | Uint8Array): void; + setSignSpec(itemType: SignSpecItem, itemValue: int | Uint8Array): void; /** * Get the specified parameter from the sign object. * Currently, only PSS parameters in RSA is supported. * * @param { SignSpecItem } itemType - indicates the specified parameter type. - * @returns { string | number } the value of the specified parameter. + * @returns { string | int } the value of the specified parameter. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - this operation is not supported. @@ -4458,7 +4589,7 @@ declare namespace cryptoFramework { * Currently, only PSS parameters in RSA is supported. * * @param { SignSpecItem } itemType - indicates the specified parameter type. - * @returns { string | number } the value of the specified parameter. + * @returns { string | int } the value of the specified parameter. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - this operation is not supported. @@ -4473,7 +4604,7 @@ declare namespace cryptoFramework { * Currently, only PSS parameters in RSA is supported. * * @param { SignSpecItem } itemType - indicates the specified parameter type. - * @returns { string | number } the value of the specified parameter. + * @returns { string | int } the value of the specified parameter. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - this operation is not supported. @@ -4482,9 +4613,10 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getSignSpec(itemType: SignSpecItem): string | number; + getSignSpec(itemType: SignSpecItem): string | int; /** * Indicates the algorithm name of the sign object. @@ -4511,7 +4643,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly algName: string; } @@ -4540,7 +4673,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface Verify { /** @@ -4583,7 +4717,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ init(pubKey: PubKey, callback: AsyncCallback): void; @@ -4627,7 +4762,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ init(pubKey: PubKey): Promise; @@ -4643,7 +4779,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ initSync(pubKey: PubKey): void; @@ -4687,7 +4824,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ update(data: DataBlob, callback: AsyncCallback): void; @@ -4731,7 +4869,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ update(data: DataBlob): Promise; @@ -4747,7 +4886,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ updateSync(data: DataBlob): void; @@ -4841,7 +4981,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ verify(data: DataBlob | null, signatureData: DataBlob, callback: AsyncCallback): void; @@ -4935,7 +5076,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ verify(data: DataBlob | null, signatureData: DataBlob): Promise; @@ -4953,7 +5095,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ verifySync(data: DataBlob | null, signatureData: DataBlob): boolean; @@ -4971,7 +5114,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ recover(signatureData: DataBlob): Promise; @@ -4989,7 +5133,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ recoverSync(signatureData: DataBlob): DataBlob | null; @@ -4998,7 +5143,7 @@ declare namespace cryptoFramework { * Currently, only the PSS_SALT_LEN parameter in RSA is supported. * * @param { SignSpecItem } itemType - indicates the specified parameter type. - * @param { number } itemValue - the value of the specified parameter. + * @param { int } itemValue - the value of the specified parameter. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - this operation is not supported. @@ -5012,7 +5157,7 @@ declare namespace cryptoFramework { * Currently, only the PSS_SALT_LEN parameter in RSA is supported. * * @param { SignSpecItem } itemType - indicates the specified parameter type. - * @param { number } itemValue - the value of the specified parameter. + * @param { int } itemValue - the value of the specified parameter. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - this operation is not supported. @@ -5027,7 +5172,7 @@ declare namespace cryptoFramework { * Currently, only the PSS_SALT_LEN parameter in RSA is supported. * * @param { SignSpecItem } itemType - indicates the specified parameter type. - * @param { number } itemValue - the value of the specified parameter. + * @param { int } itemValue - the value of the specified parameter. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - this operation is not supported. @@ -5038,14 +5183,14 @@ declare namespace cryptoFramework { * @atomicservice * @since 12 */ - setVerifySpec(itemType: SignSpecItem, itemValue: number): void; + setVerifySpec(itemType: SignSpecItem, itemValue: int): void; /** * Set the specified parameter to the verify object. * Currently, only PSS_SALT_LEN in RSA and USER_ID in SM2 are supported. * * @param { SignSpecItem } itemType - indicates the specified parameter type. - * @param { number | Uint8Array } itemValue - the value of the specified parameter. + * @param { int | Uint8Array } itemValue - the value of the specified parameter. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - this operation is not supported. @@ -5060,7 +5205,7 @@ declare namespace cryptoFramework { * Currently, only PSS_SALT_LEN in RSA and USER_ID in SM2 are supported. * * @param { SignSpecItem } itemType - indicates the specified parameter type. - * @param { number | Uint8Array } itemValue - the value of the specified parameter. + * @param { int | Uint8Array } itemValue - the value of the specified parameter. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - this operation is not supported. @@ -5069,16 +5214,17 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - setVerifySpec(itemType: SignSpecItem, itemValue: number | Uint8Array): void; + setVerifySpec(itemType: SignSpecItem, itemValue: int | Uint8Array): void; /** * Get the specified parameter from the verify object. * Currently, only PSS parameters in RSA is supported. * * @param { SignSpecItem } itemType - indicates the specified parameter type. - * @returns { string | number } the value of the specified parameter. + * @returns { string | int } the value of the specified parameter. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - this operation is not supported. @@ -5092,7 +5238,7 @@ declare namespace cryptoFramework { * Currently, only PSS parameters in RSA is supported. * * @param { SignSpecItem } itemType - indicates the specified parameter type. - * @returns { string | number } the value of the specified parameter. + * @returns { string | int } the value of the specified parameter. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - this operation is not supported. @@ -5107,7 +5253,7 @@ declare namespace cryptoFramework { * Currently, only PSS parameters in RSA is supported. * * @param { SignSpecItem } itemType - indicates the specified parameter type. - * @returns { string | number } the value of the specified parameter. + * @returns { string | int } the value of the specified parameter. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - this operation is not supported. @@ -5116,9 +5262,10 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getVerifySpec(itemType: SignSpecItem): string | number; + getVerifySpec(itemType: SignSpecItem): string | int; /** * Indicates the algorithm name of the verify object. @@ -5145,7 +5292,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly algName: string; } @@ -5187,7 +5335,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createSign(algName: string): Sign; @@ -5228,7 +5377,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Signature * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createVerify(algName: string): Verify; @@ -5255,7 +5405,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.KeyAgreement * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface KeyAgreement { /** @@ -5301,7 +5452,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.KeyAgreement * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generateSecret(priKey: PriKey, pubKey: PubKey, callback: AsyncCallback): void; @@ -5348,7 +5500,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.KeyAgreement * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generateSecret(priKey: PriKey, pubKey: PubKey): Promise; @@ -5366,7 +5519,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.KeyAgreement * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generateSecretSync(priKey: PriKey, pubKey: PubKey): DataBlob; @@ -5395,7 +5549,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.KeyAgreement * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly algName: string; } @@ -5437,21 +5592,22 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.KeyAgreement * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createKeyAgreement(algName: string): KeyAgreement; /** * Enum for algorithm specified parameters. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CryptoFramework * @since 10 */ /** * Enum for algorithm specified parameters. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CryptoFramework * @crossplatform * @since 11 @@ -5459,11 +5615,12 @@ declare namespace cryptoFramework { /** * Enum for algorithm specified parameters. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AsyKeySpecItem { /** @@ -5485,7 +5642,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DSA_P_BN = 101, @@ -5508,7 +5666,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DSA_Q_BN = 102, @@ -5531,7 +5690,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DSA_G_BN = 103, @@ -5554,7 +5714,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DSA_SK_BN = 104, @@ -5577,7 +5738,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DSA_PK_BN = 105, @@ -5600,7 +5762,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ECC_FP_P_BN = 201, @@ -5623,7 +5786,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ECC_A_BN = 202, @@ -5646,7 +5810,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ECC_B_BN = 203, @@ -5669,7 +5834,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ECC_G_X_BN = 204, @@ -5692,7 +5858,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ECC_G_Y_BN = 205, @@ -5715,7 +5882,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ECC_N_BN = 206, @@ -5738,7 +5906,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ECC_H_NUM = 207, @@ -5761,7 +5930,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ECC_SK_BN = 208, @@ -5784,7 +5954,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ECC_PK_X_BN = 209, @@ -5807,7 +5978,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ECC_PK_Y_BN = 210, @@ -5830,7 +6002,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ECC_FIELD_TYPE_STR = 211, @@ -5856,7 +6029,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ECC_FIELD_SIZE_NUM = 212, @@ -5879,7 +6053,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ECC_CURVE_NAME_STR = 213, @@ -5902,7 +6077,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ RSA_N_BN = 301, @@ -5925,7 +6101,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ RSA_SK_BN = 302, @@ -5948,7 +6125,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ RSA_PK_BN = 303, @@ -5965,7 +6143,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DH_P_BN = 401, @@ -5982,7 +6161,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DH_G_BN = 402, @@ -5999,7 +6179,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DH_L_NUM = 403, @@ -6016,7 +6197,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DH_SK_BN = 404, @@ -6033,7 +6215,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DH_PK_BN = 405, @@ -6050,7 +6233,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ED25519_SK_BN = 501, @@ -6067,7 +6251,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ED25519_PK_BN = 502, @@ -6084,7 +6269,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ X25519_SK_BN = 601, @@ -6101,7 +6287,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ X25519_PK_BN = 602 } @@ -6109,14 +6296,14 @@ declare namespace cryptoFramework { /** * Enum for algorithm specified parameters type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CryptoFramework * @since 10 */ /** * Enum for algorithm specified parameters type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CryptoFramework * @crossplatform * @since 11 @@ -6124,11 +6311,12 @@ declare namespace cryptoFramework { /** * Enum for algorithm specified parameters type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AsyKeySpecType { /** @@ -6150,7 +6338,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_PARAMS_SPEC = 0, @@ -6173,7 +6362,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ PRIVATE_KEY_SPEC = 1, @@ -6196,7 +6386,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ PUBLIC_KEY_SPEC = 2, @@ -6219,7 +6410,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ KEY_PAIR_SPEC = 3 } @@ -6246,7 +6438,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AsyKeySpec { /** @@ -6271,7 +6464,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ algName: string; @@ -6297,7 +6491,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ specType: AsyKeySpecType; } @@ -6328,7 +6523,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface DSACommonParamsSpec extends AsyKeySpec { /** @@ -6353,7 +6549,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ p: bigint; @@ -6379,7 +6576,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ q: bigint; @@ -6405,7 +6603,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ g: bigint; } @@ -6436,7 +6635,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface DSAPubKeySpec extends AsyKeySpec { /** @@ -6461,7 +6661,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ params: DSACommonParamsSpec; @@ -6487,7 +6688,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ pk: bigint; } @@ -6518,7 +6720,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface DSAKeyPairSpec extends AsyKeySpec { /** @@ -6543,7 +6746,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ params: DSACommonParamsSpec; @@ -6569,7 +6773,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ sk: bigint; @@ -6595,7 +6800,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ pk: bigint; } @@ -6622,7 +6828,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ECField { /** @@ -6650,7 +6857,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ fieldType: string; } @@ -6680,7 +6888,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ECFieldFp extends ECField { /** @@ -6705,7 +6914,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ p: bigint; } @@ -6732,7 +6942,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface Point { /** @@ -6757,7 +6968,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ x: bigint; @@ -6783,7 +6995,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ y: bigint; } @@ -6813,7 +7026,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ECCCommonParamsSpec extends AsyKeySpec { /** @@ -6838,7 +7052,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ field: ECField; @@ -6864,7 +7079,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ a: bigint; @@ -6890,7 +7106,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ b: bigint; @@ -6916,7 +7133,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ g: Point; @@ -6942,21 +7160,22 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ n: bigint; /** * Indicates the cofactor h. * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.CryptoFramework * @since 10 */ /** * Indicates the cofactor h. * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.CryptoFramework * @crossplatform * @since 11 @@ -6964,13 +7183,14 @@ declare namespace cryptoFramework { /** * Indicates the cofactor h. * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - h: number; + h: int; } /** @@ -6999,7 +7219,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ECCPriKeySpec extends AsyKeySpec { /** @@ -7024,7 +7245,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ params: ECCCommonParamsSpec; @@ -7050,7 +7272,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ sk: bigint; } @@ -7081,7 +7304,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ECCPubKeySpec extends AsyKeySpec { /** @@ -7106,7 +7330,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ params: ECCCommonParamsSpec; @@ -7132,7 +7357,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ pk: Point; } @@ -7163,7 +7389,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ECCKeyPairSpec extends AsyKeySpec { /** @@ -7188,7 +7415,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ params: ECCCommonParamsSpec; @@ -7214,7 +7442,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ sk: bigint; @@ -7240,7 +7469,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ pk: Point; } @@ -7258,7 +7488,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ class ECCKeyUtil { /** @@ -7288,7 +7519,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ static genECCCommonParamsSpec(curveName: string): ECCCommonParamsSpec; @@ -7306,7 +7538,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ static convertPoint(curveName: string, encodedPoint: Uint8Array): Point; @@ -7325,7 +7558,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ static getEncodedPoint(curveName: string, point: Point, format: string): Uint8Array; } @@ -7348,7 +7582,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface DHCommonParamsSpec extends AsyKeySpec { /** @@ -7366,7 +7601,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ p: bigint; @@ -7385,14 +7621,15 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ g: bigint; /** * Indicates the byte length of the private key. * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.CryptoFramework * @crossplatform * @since 11 @@ -7400,13 +7637,14 @@ declare namespace cryptoFramework { /** * Indicates the byte length of the private key. * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - l: number; + l: int; } /** @@ -7427,7 +7665,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface DHPriKeySpec extends AsyKeySpec { /** @@ -7445,7 +7684,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ params: DHCommonParamsSpec; @@ -7464,7 +7704,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ sk: bigint; } @@ -7487,7 +7728,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface DHPubKeySpec extends AsyKeySpec { /** @@ -7505,7 +7747,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ params: DHCommonParamsSpec; @@ -7524,7 +7767,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ pk: bigint; } @@ -7547,7 +7791,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface DHKeyPairSpec extends AsyKeySpec { /** @@ -7565,7 +7810,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ params: DHCommonParamsSpec; @@ -7584,7 +7830,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ sk: bigint; @@ -7603,7 +7850,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ pk: bigint; } @@ -7621,14 +7869,15 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ class DHKeyUtil { /** * Create the common parameter set. * - * @param { number } pLen - indicates the byte length of the prime p. - * @param { number } [skLen] - indicates the byte length of the private key. + * @param { int } pLen - indicates the byte length of the prime p. + * @param { int } [skLen] - indicates the byte length of the private key. * @returns { DHCommonParamsSpec } the DH common params spec obj. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. @@ -7643,8 +7892,8 @@ declare namespace cryptoFramework { /** * Generates common parameters for a DH key based on the prime p length and the private key length. * - * @param { number } pLen - indicates the byte length of the prime p. - * @param { number } [skLen] - indicates the byte length of the private key. + * @param { int } pLen - indicates the byte length of the prime p. + * @param { int } [skLen] - indicates the byte length of the private key. * @returns { DHCommonParamsSpec } the DH common params spec obj. * @throws { BusinessError } 401 - invalid parameters. Possible causes: 1. Mandatory parameters are left unspecified; *
2. Incorrect parameter types; 3. Parameter verification failed. @@ -7655,9 +7904,10 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - static genDHCommonParamsSpec(pLen: number, skLen?: number): DHCommonParamsSpec; + static genDHCommonParamsSpec(pLen: int, skLen?: int): DHCommonParamsSpec; } /** @@ -7678,7 +7928,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ED25519PriKeySpec extends AsyKeySpec { /** @@ -7696,7 +7947,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ sk: bigint; } @@ -7719,7 +7971,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ED25519PubKeySpec extends AsyKeySpec { /** @@ -7737,7 +7990,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ pk: bigint; } @@ -7760,7 +8014,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ED25519KeyPairSpec extends AsyKeySpec { /** @@ -7778,7 +8033,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ sk: bigint; @@ -7797,7 +8053,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ pk: bigint; } @@ -7820,7 +8077,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface X25519PriKeySpec extends AsyKeySpec { /** @@ -7838,7 +8096,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ sk: bigint; } @@ -7861,7 +8120,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface X25519PubKeySpec extends AsyKeySpec { /** @@ -7879,7 +8139,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ pk: bigint; } @@ -7902,7 +8163,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface X25519KeyPairSpec extends AsyKeySpec { /** @@ -7920,7 +8182,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ sk: bigint; @@ -7939,7 +8202,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ pk: bigint; } @@ -7970,7 +8234,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface RSACommonParamsSpec extends AsyKeySpec { /** @@ -7995,7 +8260,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ n: bigint; } @@ -8026,7 +8292,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface RSAPubKeySpec extends AsyKeySpec { /** @@ -8051,7 +8318,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ params: RSACommonParamsSpec; @@ -8077,7 +8345,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ pk: bigint; } @@ -8108,7 +8377,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface RSAKeyPairSpec extends AsyKeySpec { /** @@ -8133,7 +8403,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ params: RSACommonParamsSpec; @@ -8159,7 +8430,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ sk: bigint; @@ -8185,7 +8457,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ pk: bigint; } @@ -8213,7 +8486,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AsyKeyGeneratorBySpec { /** @@ -8247,7 +8521,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generateKeyPair(callback: AsyncCallback): void; @@ -8285,7 +8560,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generateKeyPair(): Promise; @@ -8300,7 +8576,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generateKeyPairSync(): KeyPair; @@ -8335,7 +8612,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generatePriKey(callback: AsyncCallback): void; @@ -8373,7 +8651,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generatePriKey(): Promise; @@ -8388,7 +8667,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generatePriKeySync(): PriKey; @@ -8423,7 +8703,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generatePubKey(callback: AsyncCallback): void; @@ -8461,7 +8742,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generatePubKey(): Promise; @@ -8476,7 +8758,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generatePubKeySync(): PubKey; @@ -8505,7 +8788,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly algName: string; } @@ -8547,7 +8831,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Key.AsymKey * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createAsyKeyGeneratorBySpec(asyKeySpec: AsyKeySpec): AsyKeyGeneratorBySpec; @@ -8567,7 +8852,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface KdfSpec { /** @@ -8585,7 +8871,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ algName: string; } @@ -8607,7 +8894,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface PBKDF2Spec extends KdfSpec { /** @@ -8625,7 +8913,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ password: string | Uint8Array; @@ -8644,14 +8933,15 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ salt: Uint8Array; /** * Indicates the iteration number of PBKDF2. * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.CryptoFramework * @crossplatform * @since 11 @@ -8659,18 +8949,19 @@ declare namespace cryptoFramework { /** * Indicates the iteration number of PBKDF2. * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - iterations: number; + iterations: int; /** * Indicates the byte length of output key of PBKDF2. * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.CryptoFramework * @crossplatform * @since 11 @@ -8678,13 +8969,14 @@ declare namespace cryptoFramework { /** * Indicates the byte length of output key of PBKDF2. * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - keySize: number; + keySize: int; } /** @@ -8695,7 +8987,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface HKDFSpec extends KdfSpec { /** @@ -8705,7 +8998,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ key: string | Uint8Array; @@ -8716,7 +9010,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ salt: Uint8Array; @@ -8727,20 +9022,22 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ info: Uint8Array; /** * Indicates the byte length of output key of HKDF. * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - keySize: number; + keySize: int; } /** @@ -8751,7 +9048,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface ScryptSpec extends KdfSpec { /** @@ -8761,7 +9059,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ passphrase: string | Uint8Array; @@ -8772,64 +9071,70 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ salt: Uint8Array; /** * Indicates the cost parameter of SCRYPT. * - * @type { number } + * @type { long } * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - n: number; + n: long; /** * Indicates the block size parameter of SCRYPT. * - * @type { number } + * @type { long } * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - r: number; + r: long; /** * Indicates the parallelization parameter of SCRYPT. * - * @type { number } + * @type { long } * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - p: number; + p: long; /** * Indicates the byte length of memory of SCRYPT. * - * @type { number } + * @type { long } * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - maxMemory: number; + maxMemory: long; /** * Indicates the byte length of output key of SCRYPT. * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - keySize: number; + keySize: int; } /** @@ -8848,7 +9153,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface Kdf { /** @@ -8876,7 +9182,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generateSecret(params: KdfSpec, callback: AsyncCallback): void; @@ -8905,7 +9212,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generateSecret(params: KdfSpec): Promise; @@ -8922,7 +9230,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generateSecretSync(params: KdfSpec): DataBlob; @@ -8943,7 +9252,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly algName: string; } @@ -8973,7 +9283,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Kdf * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createKdf(algName: string): Kdf; @@ -8984,7 +9295,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface SM2CipherTextSpec { /** @@ -8994,7 +9306,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ xCoordinate: bigint; @@ -9005,7 +9318,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ yCoordinate: bigint; @@ -9016,7 +9330,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ cipherTextData: Uint8Array; @@ -9027,7 +9342,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ hashData: Uint8Array; } @@ -9038,7 +9354,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ class SM2CryptoUtil { /** @@ -9055,7 +9372,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ static genCipherTextBySpec(spec: SM2CipherTextSpec, mode?: string): DataBlob; @@ -9073,7 +9391,8 @@ declare namespace cryptoFramework { * @syscap SystemCapability.Security.CryptoFramework.Cipher * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ static getCipherTextSpec(cipherText: DataBlob, mode?: string): SM2CipherTextSpec; } @@ -9086,8 +9405,8 @@ declare namespace cryptoFramework { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ - interface EccSignatureSpec { /** * Indicates the r value of the signature. @@ -9097,6 +9416,7 @@ declare namespace cryptoFramework { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ r: bigint; @@ -9108,6 +9428,7 @@ declare namespace cryptoFramework { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ s: bigint; } @@ -9119,6 +9440,7 @@ declare namespace cryptoFramework { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ class SignatureUtils { /** @@ -9136,6 +9458,7 @@ declare namespace cryptoFramework { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ static genEccSignatureSpec(data: Uint8Array): EccSignatureSpec; @@ -9154,6 +9477,7 @@ declare namespace cryptoFramework { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ static genEccSignature(spec: EccSignatureSpec): Uint8Array; } -- Gitee From ed1aa7c14710595a2cdb84a55728533391a8957a Mon Sep 17 00:00:00 2001 From: hxf Date: Tue, 8 Jul 2025 02:59:16 +0000 Subject: [PATCH 032/746] =?UTF-8?q?import=E6=96=B9=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20import=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hxf --- api/@ohos.WorkSchedulerExtensionAbility.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/@ohos.WorkSchedulerExtensionAbility.d.ts b/api/@ohos.WorkSchedulerExtensionAbility.d.ts index 7b64c003c9..4f2eedcb5f 100644 --- a/api/@ohos.WorkSchedulerExtensionAbility.d.ts +++ b/api/@ohos.WorkSchedulerExtensionAbility.d.ts @@ -19,7 +19,7 @@ */ import workScheduler from './@ohos.resourceschedule.workScheduler'; -import { WorkSchedulerExtensionContext as _WorkSchedulerExtensionContext } from './application/WorkSchedulerExtensionContext'; +import _WorkSchedulerExtensionContext from './application/WorkSchedulerExtensionContext'; /** * The context of work scheduler extension. It allows access to -- Gitee From c600c28cf5aa5e1b1be95f2d3f94f56d4125eade Mon Sep 17 00:00:00 2001 From: chen828 Date: Tue, 8 Jul 2025 04:43:16 +0000 Subject: [PATCH 033/746] update api/@ohos.UiTest.d.ts. Signed-off-by: chen828 --- api/@ohos.UiTest.d.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/api/@ohos.UiTest.d.ts b/api/@ohos.UiTest.d.ts index 5d3c32e267..5f7b7fdf42 100755 --- a/api/@ohos.UiTest.d.ts +++ b/api/@ohos.UiTest.d.ts @@ -3392,8 +3392,6 @@ declare class Component { * @throws { BusinessError } 17000002 - The async function is not called with await. * @throws { BusinessError } 17000004 - The window or component is invisible or destroyed. * @syscap SystemCapability.Test.UiTest - * @crossplatform - * @atomicservice * @since 20 * @test * @arkts 1.2 @@ -3452,7 +3450,6 @@ declare class Component { * @throws { BusinessError } 17000002 - The async function is not called with await. * @throws { BusinessError } 17000004 - The window or component is invisible or destroyed. * @syscap SystemCapability.Test.UiTest - * @atomicservice * @since 20 * @test * @arkts 1.2 @@ -3621,7 +3618,6 @@ declare class Driver { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. * @syscap SystemCapability.Test.UiTest - * @atomicservice * @since 20 * @test * @arkts 1.2 @@ -3659,7 +3655,6 @@ declare class Driver { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. * @syscap SystemCapability.Test.UiTest - * @atomicservice * @since 20 * @test * @arkts 1.2 @@ -3700,7 +3695,6 @@ declare class Driver { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. * @syscap SystemCapability.Test.UiTest - * @atomicservice * @since 20 * @test * @arkts 1.2 @@ -3751,7 +3745,6 @@ declare class Driver { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. * @syscap SystemCapability.Test.UiTest - * @atomicservice * @since 20 * @test * @arkts 1.2 -- Gitee From 6b08281c6d8eb681ac6958b7ed7c1bd851d675fa Mon Sep 17 00:00:00 2001 From: yanhui Date: Mon, 19 May 2025 19:31:42 +0800 Subject: [PATCH 034/746] =?UTF-8?q?Preferneces=20Arkts=E9=9D=99=E6=80=81?= =?UTF-8?q?=E5=8C=96=E6=BC=94=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yanhui Change-Id: Ifd7741d215497203372bf79bb9dcc0bbf628edd9 Signed-off-by: yanhui --- api/@ohos.data.preferences.d.ts | 39 ++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/api/@ohos.data.preferences.d.ts b/api/@ohos.data.preferences.d.ts index 59e4f91fda..a01564d4f5 100644 --- a/api/@ohos.data.preferences.d.ts +++ b/api/@ohos.data.preferences.d.ts @@ -114,7 +114,8 @@ declare namespace preferences { * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ const MAX_KEY_LENGTH: number; @@ -148,7 +149,8 @@ declare namespace preferences { * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ const MAX_VALUE_LENGTH: number; @@ -158,7 +160,8 @@ declare namespace preferences { * @enum { number } * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ enum StorageType { /** @@ -166,7 +169,8 @@ declare namespace preferences { * * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ XML = 0, @@ -175,7 +179,8 @@ declare namespace preferences { * * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ GSKV } @@ -243,7 +248,8 @@ declare namespace preferences { * @type { ?(StorageType | null | undefined) } * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ storageType?: StorageType | null | undefined; } @@ -1825,7 +1831,8 @@ declare namespace preferences { * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @crossplatform * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ flushSync(): void; @@ -1864,7 +1871,8 @@ declare namespace preferences { * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'change', callback: Callback): void; @@ -1892,7 +1900,8 @@ declare namespace preferences { * @throws { BusinessError } 15500019 - Failed to obtain the subscription service. * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'multiProcessChange', callback: Callback): void; @@ -1923,7 +1932,8 @@ declare namespace preferences { * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @crossplatform * @atomicservice - * @since 20 + * @since arkts {'1.1':'20', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'dataChange', keys: Array, callback: Callback>): void; @@ -1962,7 +1972,8 @@ declare namespace preferences { * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'change', callback?: Callback): void; @@ -1988,7 +1999,8 @@ declare namespace preferences { * @throws { BusinessError } 15500000 - Inner error. * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'multiProcessChange', callback?: Callback): void; @@ -2019,7 +2031,8 @@ declare namespace preferences { * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @crossplatform * @atomicservice - * @since 20 + * @since arkts {'1.1':'20', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'dataChange', keys: Array, callback?: Callback>): void; } -- Gitee From 981e6346173784b6d86d13b2f4b1a1232a783a19 Mon Sep 17 00:00:00 2001 From: cat Date: Tue, 8 Jul 2025 15:39:52 +0800 Subject: [PATCH 035/746] reset 0328code to 0702 Signed-off-by: cat --- api/@ohos.deviceInfo.d.ets | 392 +++++++++++++++++++++++++++++++- api/@ohos.systemCapability.d.ts | 1 + 2 files changed, 391 insertions(+), 2 deletions(-) diff --git a/api/@ohos.deviceInfo.d.ets b/api/@ohos.deviceInfo.d.ets index 950c68220e..0297a224da 100644 --- a/api/@ohos.deviceInfo.d.ets +++ b/api/@ohos.deviceInfo.d.ets @@ -1,6 +1,6 @@ /* * Copyright (c) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the "License"), * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * @file * @kit BasicServicesKit @@ -20,7 +21,7 @@ /** * A static class pertaining to the product information. * - * @namespace deviceInfo + * @class deviceInfo * @syscap SystemCapability.Startup.SystemInfo * @crossplatform * @since 20 @@ -41,6 +42,17 @@ declare class deviceInfo { */ static get deviceType(): string; + /** + * Obtains the device manufacturer represented by a string. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get manufacture(): string; + /** * Obtains the external product series represented by a string. * @@ -51,6 +63,17 @@ declare class deviceInfo { * @arkts 1.2 */ static get brand(): string; + + /** + * Obtains the external product series represented by a string. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get marketName(): string; /** * Obtains the product series represented by a string. @@ -75,6 +98,190 @@ declare class deviceInfo { */ static get productModel(): string; + /** + * Obtains the product model alias represented by a string. + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get productModelAlias(): string; + + /** + * Obtains the software model represented by a string. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get softwareModel(): string; + + /** + * Obtains the hardware model represented by a string. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get hardwareModel(): string; + + /** + * Obtains the hardware model represented by a string. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get hardwareProfile(): string; + + /** + * Obtains the device serial number represented by a string. + * + * @permission ohos.permission.sec.ACCESS_UDID + * + * @syscap SystemCapability.Startup.SystemInfo + * @since 20 + * @arkts 1.2 + */ + static get serial(): string; + + /** + * Obtains the bootloader version number represented by a string. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get bootloaderVersion(): string; + + /** + * Obtains the application binary interface (Abi) list represented by a string. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get abiList(): string; + + /** + * Obtains the security patch level represented by a string. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get securityPatchTag(): string; + + /** + * Obtains the product version represented by a string. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get displayVersion(): string; + + /** + * Obtains the incremental version represented by a string. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get incrementalVersion(): string; + + /** + * Obtains the OS release type represented by a string. + *

The OS release category can be {@code Release}, {@code Beta}, or {@code Canary}. + * The specific release type may be {@code Release}, {@code Beta1}, or others alike. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get osReleaseType(): string; + + + /** + * Obtains the OS version represented by a string. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get osFullName(): string; + + /** + * Obtains the major (M) version number, which increases with any updates to the overall architecture. + *

The M version number monotonically increases from 1 to 99. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get majorVersion(): int; + + /** + * Obtains the senior (S) version number, which increases with any updates to the partial + * architecture or major features. + *

The S version number monotonically increases from 0 to 99. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get seniorVersion(): int; + + /** + * Obtains the feature (F) version number, which increases with any planned new features. + *

The F version number monotonically increases from 0 or 1 to 99. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get featureVersion(): int; + + /** + * Obtains the build (B) version number, which increases with each new development build. + *

The B version number monotonically increases from 0 or 1 to 999. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get buildVersion(): int; + + /** * Obtains the SDK API version number. * @@ -85,6 +292,157 @@ declare class deviceInfo { * @arkts 1.2 */ static get sdkApiVersion(): int; + + /** + * Obtains the first API version number. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get firstApiVersion(): int; + + /** + * Obtains the version ID by a string. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get versionId(): string; + + /** + * Obtains the build types of the same baseline code. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get buildType(): string; + + /** + * Obtains the different build user of the same baseline code. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get buildUser(): string; + + /** + * Obtains the different build host of the same baseline code. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get buildHost(): string; + + /** + * Obtains the build time. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get buildTime(): string; + + /** + * Obtains the version hash. + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get buildRootHash(): string; + + /** + * Obtains the device udid. + * + * @permission ohos.permission.sec.ACCESS_UDID + * + * @syscap SystemCapability.Startup.SystemInfo + * @since 20 + * @arkts 1.2 + */ + static get udid(): string; + + /** + * Obtains the Distribution OS name. + *

Independent Software Vendor (ISV) may distribute OHOS with their own OS name. + * distributionOsName will return the ISV OS name + * If ISV not specified, it will return an empty string + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @since 20 + * @arkts 1.2 + */ + static get distributionOSName(): string; + + /** + * Obtains the Distribution OS version. + *

Independent Software Vendor (ISV) may distribute OHOS with their own OS version. + * distributionOSVersion will return the ISV OS version + * If ISV not specified, it will return the same value as osFullName + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @since 20 + * @arkts 1.2 + */ + static get distributionOSVersion(): string; + + /** + * Obtains the Distribution OS version. + *

Independent Software Vendor (ISV) may distribute OHOS with their own OS api version. + * distributionOSVersion will return the ISV OS api version + * If ISV not specified, it will return the same value as sdkApiVersion + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @since 20 + * @arkts 1.2 + */ + static get distributionOSApiVersion(): int; + + /** + * Obtains the Distribution OS api name. + *

Independent Software Vendor (ISV) may distribute OHOS with their own OS api name. + * distributionOSApiName will return the ISV OS api name + * + * @syscap SystemCapability.Startup.SystemInfo + * @since 20 + * @arkts 1.2 + */ + static get distributionOSApiName(): string; + + /** + * Obtains the Distribution OS release type. + *

Independent Software Vendor (ISV) may distribute OHOS with their own OS release type. + * distributionOSVersion will return the ISV OS release type + * If ISV not specified, it will return the same value as osReleaseType + * + * + * @syscap SystemCapability.Startup.SystemInfo + * @since 20 + * @arkts 1.2 + */ + static get distributionOSReleaseType(): string; /** * Open Device Identifier (ODID): a developer-level non-permanent device identifier. @@ -107,5 +465,35 @@ declare class deviceInfo { * @arkts 1.2 */ static get ODID(): string; + + /** + * Obtaining the hard drive serial number. + * + * @permission ohos.permission.ACCESS_DISK_PHY_INFO + * @syscap SystemCapability.Startup.SystemInfo + * @since 20 + * @arkts 1.2 + */ + static get diskSN(): string; + + /** + * Obtains the sdk minor api version + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get sdkMinorApiVersion(): int; + + /** + * Obtains the sdk patch api version + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + static get sdkPatchApiVersion(): int; } export default deviceInfo; diff --git a/api/@ohos.systemCapability.d.ts b/api/@ohos.systemCapability.d.ts index 67f5b06f94..553873d7fd 100644 --- a/api/@ohos.systemCapability.d.ts +++ b/api/@ohos.systemCapability.d.ts @@ -16,6 +16,7 @@ /** * @file * @kit BasicServicesKit + * @arkts 1.1&1.2 */ import { AsyncCallback, Callback } from './@ohos.base'; -- Gitee From 5ea8d395f8a2955c9ff361c061f45f478857cc04 Mon Sep 17 00:00:00 2001 From: fqwert Date: Tue, 22 Apr 2025 10:25:34 +0800 Subject: [PATCH 036/746] =?UTF-8?q?arkts1.2=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fqwert Change-Id: Ibfac6bc9da8e6f2b724efe7586b2ddbe7cf579cf --- api/@ohos.net.connection.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/@ohos.net.connection.d.ts b/api/@ohos.net.connection.d.ts index 283b93bbd9..bf190f06de 100644 --- a/api/@ohos.net.connection.d.ts +++ b/api/@ohos.net.connection.d.ts @@ -1430,7 +1430,7 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} + * @since arkts {'1.1': '11', '1.2': '20'} * @arkts 1.1&1.2 */ export interface NetHandle { -- Gitee From 04f99ba8e5ba130f8ffaeeee2533f50be7375058 Mon Sep 17 00:00:00 2001 From: fqwert Date: Thu, 22 May 2025 11:49:07 +0800 Subject: [PATCH 037/746] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E6=A8=A1=E5=9D=97=20?= =?UTF-8?q?ets=20=E6=8E=A5=E5=8F=A3=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fqwert Change-Id: Idb2fcfe8886bf50d040ae1fdfb21cae5f32d834f --- api/@ohos.net.connection.d.ts | 385 ++++++++++------ api/@ohos.net.http.d.ts | 682 ++++++++++++++++++----------- api/@ohos.net.networkSecurity.d.ts | 47 +- api/@ohos.net.sharing.d.ts | 134 +++--- api/@ohos.net.statistics.d.ts | 317 ++++++++------ api/@ohos.net.webSocket.d.ts | 105 +++-- 6 files changed, 1048 insertions(+), 622 deletions(-) diff --git a/api/@ohos.net.connection.d.ts b/api/@ohos.net.connection.d.ts index bf190f06de..22108480e2 100644 --- a/api/@ohos.net.connection.d.ts +++ b/api/@ohos.net.connection.d.ts @@ -23,6 +23,7 @@ import type { AsyncCallback, Callback } from './@ohos.base'; /*** if arkts 1.1 */ import type http from './@ohos.net.http'; import type socket from './@ohos.net.socket'; +import { int } from './@ohos.base'; /*** endif */ /** @@ -102,7 +103,7 @@ declare namespace connection { /** * Create a network connection with optional netSpecifier and timeout. * @param { NetSpecifier } [netSpecifier] - Indicates the network specifier. See {@link NetSpecifier}. - * @param { number } [timeout] - The time in milliseconds to attempt looking for a suitable network before + * @param { int } [timeout] - The time in milliseconds to attempt looking for a suitable network before * {@link NetConnection#netUnavailable} is called. * @returns { NetConnection } the NetConnection of the NetSpecifier. * @syscap SystemCapability.Communication.NetManager.Core @@ -111,7 +112,7 @@ declare namespace connection { /** * Create a network connection with optional netSpecifier and timeout. * @param { NetSpecifier } [netSpecifier] - Indicates the network specifier. See {@link NetSpecifier}. - * @param { number } [timeout] - The time in milliseconds to attempt looking for a suitable network before + * @param { int } [timeout] - The time in milliseconds to attempt looking for a suitable network before * {@link NetConnection#netUnavailable} is called. * @returns { NetConnection } the NetConnection of the NetSpecifier. * @syscap SystemCapability.Communication.NetManager.Core @@ -121,15 +122,16 @@ declare namespace connection { /** * Create a network connection with optional netSpecifier and timeout. * @param { NetSpecifier } [netSpecifier] - Indicates the network specifier. See {@link NetSpecifier}. - * @param { number } [timeout] - The time in milliseconds to attempt looking for a suitable network before + * @param { int } [timeout] - The time in milliseconds to attempt looking for a suitable network before * {@link NetConnection#netUnavailable} is called. * @returns { NetConnection } the NetConnection of the NetSpecifier. * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - function createNetConnection(netSpecifier?: NetSpecifier, timeout?: number): NetConnection; + function createNetConnection(netSpecifier?: NetSpecifier, timeout?: int): NetConnection; /** * Obtains the data network that is activated by default. @@ -223,7 +225,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function getAllNets(callback: AsyncCallback>): void; @@ -236,7 +239,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getAllNets(): Promise>; @@ -249,7 +253,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function getAllNetsSync(): Array; @@ -265,7 +270,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getConnectionProperties(netHandle: NetHandle, callback: AsyncCallback): void; @@ -281,7 +287,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getConnectionProperties(netHandle: NetHandle): Promise; @@ -297,7 +304,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function getConnectionPropertiesSync(netHandle: NetHandle): ConnectionProperties; @@ -328,7 +336,8 @@ declare namespace connection { * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function getNetCapabilities(netHandle: NetHandle, callback: AsyncCallback): void; @@ -359,7 +368,8 @@ declare namespace connection { * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function getNetCapabilities(netHandle: NetHandle): Promise; @@ -390,7 +400,8 @@ declare namespace connection { * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function getNetCapabilitiesSync(netHandle: NetHandle): NetCapabilities; @@ -465,7 +476,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function isDefaultNetMetered(callback: AsyncCallback): void; @@ -477,7 +489,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function isDefaultNetMetered(): Promise; @@ -489,7 +502,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function isDefaultNetMeteredSync(): boolean; @@ -516,7 +530,8 @@ declare namespace connection { * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function hasDefaultNet(callback: AsyncCallback): void; @@ -540,7 +555,8 @@ declare namespace connection { * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function hasDefaultNet(): Promise; @@ -552,7 +568,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function hasDefaultNetSync(): boolean; @@ -568,7 +585,8 @@ declare namespace connection { * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. Only used for system app. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function enableAirplaneMode(callback: AsyncCallback): void; @@ -583,7 +601,8 @@ declare namespace connection { * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. Only used for system app. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function enableAirplaneMode(): Promise; @@ -599,7 +618,8 @@ declare namespace connection { * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. Only used for system app. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function disableAirplaneMode(callback: AsyncCallback): void; @@ -614,7 +634,8 @@ declare namespace connection { * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. Only used for system app. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function disableAirplaneMode(): Promise; @@ -629,7 +650,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function reportNetConnected(netHandle: NetHandle, callback: AsyncCallback): void; @@ -644,7 +666,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function reportNetConnected(netHandle: NetHandle): Promise; @@ -659,7 +682,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function reportNetDisconnected(netHandle: NetHandle, callback: AsyncCallback): void; @@ -674,7 +698,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function reportNetDisconnected(netHandle: NetHandle): Promise; @@ -689,7 +714,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getAddressesByName(host: string, callback: AsyncCallback>): void; @@ -704,7 +730,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getAddressesByName(host: string): Promise>; @@ -716,7 +743,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getAppNet(callback: AsyncCallback): void; @@ -726,7 +754,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getAppNet(): Promise; @@ -736,7 +765,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function getAppNetSync(): NetHandle; @@ -753,7 +783,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function setAppNet(netHandle: NetHandle, callback: AsyncCallback): void; @@ -770,7 +801,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function setAppNet(netHandle: NetHandle): Promise; @@ -786,7 +818,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function getDefaultHttpProxy(callback: AsyncCallback): void; @@ -802,7 +835,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function getDefaultHttpProxy(): Promise; @@ -815,7 +849,8 @@ declare namespace connection { * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function getGlobalHttpProxy(callback: AsyncCallback): void; @@ -827,7 +862,8 @@ declare namespace connection { * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function getGlobalHttpProxy(): Promise; @@ -837,7 +873,8 @@ declare namespace connection { * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 2100001 - Invalid http proxy. * @syscap SystemCapability.Communication.NetManager.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function setAppHttpProxy(httpProxy: HttpProxy): void; @@ -854,7 +891,8 @@ declare namespace connection { * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function setGlobalHttpProxy(httpProxy: HttpProxy, callback: AsyncCallback): void; @@ -871,7 +909,8 @@ declare namespace connection { * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function setGlobalHttpProxy(httpProxy: HttpProxy): Promise; @@ -885,7 +924,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ function setPacUrl(pacUrl: string): void; @@ -895,7 +935,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ function getPacUrl(): string; @@ -926,7 +967,8 @@ declare namespace connection { * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ function addCustomDnsRule(host: string, ip: Array, callback: AsyncCallback): void; @@ -957,7 +999,8 @@ declare namespace connection { * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ function addCustomDnsRule(host: string, ip: Array): Promise; @@ -986,7 +1029,8 @@ declare namespace connection { * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ function removeCustomDnsRule(host: string, callback: AsyncCallback): void; @@ -1015,7 +1059,8 @@ declare namespace connection { * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ function removeCustomDnsRule(host: string): Promise; @@ -1029,7 +1074,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function clearCustomDnsRules(callback: AsyncCallback): void; @@ -1042,7 +1088,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function clearCustomDnsRules(): Promise; @@ -1058,7 +1105,8 @@ declare namespace connection { * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. Only used for system app. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function factoryReset(): Promise; @@ -1081,7 +1129,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface NetConnection { /** @@ -1326,7 +1375,8 @@ declare namespace connection { * @interface NetSpecifier * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface NetSpecifier { /** @@ -1340,7 +1390,8 @@ declare namespace connection { * @type {NetCapabilities} * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ netCapabilities: NetCapabilities; @@ -1355,7 +1406,8 @@ declare namespace connection { * @type {?string} * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ bearerPrivateIdentifier?: string; } @@ -1373,7 +1425,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface NetCapabilityInfo { /** @@ -1389,7 +1442,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ netHandle: NetHandle; @@ -1406,7 +1460,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ netCap: NetCapabilities; } @@ -1436,27 +1491,27 @@ declare namespace connection { export interface NetHandle { /** * Network ID, a value of 0 means that there is no default network, and the other values must be greater than or equal to 100. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetManager.Core * @since 8 */ /** * Network ID, a value of 0 means that there is no default network, and the other values must be greater than or equal to 100. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @since 10 */ /** * Network ID, a value of 0 means that there is no default network, and the other values must be greater than or equal to 100. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ - netId: number; + netId: int; /** *

Binds a TCPSocket or UDPSocket to the current network. All data flows from @@ -1513,7 +1568,8 @@ declare namespace connection { * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ getAddressesByName(host: string, callback: AsyncCallback>): void; @@ -1542,7 +1598,8 @@ declare namespace connection { * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ getAddressesByName(host: string): Promise>; @@ -1557,7 +1614,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ getAddressByName(host: string, callback: AsyncCallback): void; @@ -1572,7 +1630,8 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ getAddressByName(host: string): Promise; } @@ -1596,24 +1655,27 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface NetCapabilities { /** * Uplink (device-to-network) bandwidth. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ - linkUpBandwidthKbps?: number; + linkUpBandwidthKbps?: int; /** * Downstream (network-to-device) bandwidth. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ - linkDownBandwidthKbps?: number; + linkDownBandwidthKbps?: int; /** * Network-specific capabilities. @@ -1626,7 +1688,8 @@ declare namespace connection { * @type {?Array} * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ networkCap?: Array; @@ -1649,7 +1712,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ bearerTypes: Array; } @@ -1658,21 +1722,24 @@ declare namespace connection { * Get information about network connections. * @interface NetConnectionPropertyInfo * @syscap SystemCapability.Communication.NetManager.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface NetConnectionPropertyInfo { /** * Defines the handle of the data network. * @type { NetHandle } * @syscap SystemCapability.Communication.NetManager.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ netHandle: NetHandle; /** * Defines the network connection properties. * @type { ConnectionProperties } * @syscap SystemCapability.Communication.NetManager.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ connectionProperties: ConnectionProperties; } @@ -1681,21 +1748,24 @@ declare namespace connection { * Get network status information. * @interface NetBlockStatusInfo * @syscap SystemCapability.Communication.NetManager.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface NetBlockStatusInfo { /** * Defines the handle of the data network. * @type { NetHandle } * @syscap SystemCapability.Communication.NetManager.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ netHandle: NetHandle; /** * Check whether the current state is blocked. * @type { boolean } * @syscap SystemCapability.Communication.NetManager.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ blocked: boolean; } @@ -1711,7 +1781,8 @@ declare namespace connection { * @enum {number} * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export enum NetCap { /** @@ -1723,7 +1794,8 @@ declare namespace connection { * Indicates that the network can access the carrier's MMSC to send and receive multimedia messages. * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ NET_CAPABILITY_MMS = 0, @@ -1736,7 +1808,8 @@ declare namespace connection { * Indicates that the network traffic is not metered. * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ NET_CAPABILITY_NOT_METERED = 11, @@ -1749,7 +1822,8 @@ declare namespace connection { * Indicates that the network can access the Internet. * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ NET_CAPABILITY_INTERNET = 12, @@ -1762,7 +1836,8 @@ declare namespace connection { * Indicates that the network does not use a VPN. * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ NET_CAPABILITY_NOT_VPN = 15, @@ -1775,14 +1850,16 @@ declare namespace connection { * Indicates that the network is available. * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ NET_CAPABILITY_VALIDATED = 16, /** * Indicates that the network is portal. * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ NET_CAPABILITY_PORTAL = 17, @@ -1790,7 +1867,8 @@ declare namespace connection { * Indicates that the network is checking connectivity. * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ NET_CAPABILITY_CHECKING_CONNECTIVITY = 31 } @@ -1814,7 +1892,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export enum NetBearType { /** @@ -1833,7 +1912,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ BEARER_CELLULAR = 0, @@ -1853,7 +1933,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ BEARER_WIFI = 1, @@ -1862,7 +1943,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ BEARER_BLUETOOTH = 2, @@ -1875,14 +1957,16 @@ declare namespace connection { * Indicates that the network is an Ethernet network. * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ BEARER_ETHERNET = 3, /** * Indicates that the network is based on a VPN network. * @syscap SystemCapability.Communication.NetManager.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ BEARER_VPN = 4, } @@ -1891,28 +1975,32 @@ declare namespace connection { * Defines the network connection properties. * @interface ConnectionProperties * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ export interface ConnectionProperties { /** * Network card name. * @type {string} * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ interfaceName: string; /** * Domain. The default value is "". * @type {string} * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ domains: string; /** * Link information. * @type {Array} * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ linkAddresses: Array; @@ -1920,7 +2008,8 @@ declare namespace connection { * Network address, refer to [NetAddress]. * @type {Array} * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ dnses: Array; @@ -1928,24 +2017,27 @@ declare namespace connection { * Routing information. * @type {Array} * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ routes: Array; /** * Maximum transmission unit. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ - mtu: number; + mtu: int; } /** * Defines network route information. * @interface RouteInfo * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ export interface RouteInfo { /** @@ -1953,14 +2045,25 @@ declare namespace connection { * @type {string} * @syscap SystemCapability.Communication.NetManager.Core * @since 8 + * @arkts 1.1 */ interface: string; + /** + * Network card name. + * @type {string} + * @syscap SystemCapability.Communication.NetManager.Core + * @since 20 + * @arkts 1.2 + */ + iface: string; + /** * Destination Address * @type {LinkAddress} * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ destination: LinkAddress; @@ -1968,7 +2071,8 @@ declare namespace connection { * Gateway address. * @type {NetAddress} * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ gateway: NetAddress; @@ -1976,7 +2080,8 @@ declare namespace connection { * Whether a gateway is present. * @type {boolean} * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ hasGateway: boolean; @@ -1984,7 +2089,8 @@ declare namespace connection { * Whether the route is the default route. * @type {boolean} * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ isDefaultRoute: boolean; } @@ -1993,23 +2099,26 @@ declare namespace connection { * Defines network link information. * @interface LinkAddress * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ export interface LinkAddress { /** * Link address. * @type {NetAddress} * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ address: NetAddress; /** * The length of the link address prefix. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ - prefixLength: number; + prefixLength: int; } /** @@ -2023,7 +2132,8 @@ declare namespace connection { * @interface NetAddress * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export interface NetAddress { /** @@ -2037,39 +2147,42 @@ declare namespace connection { * @type {string} * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ address: string; /** * Address family identifier. The value is 1 for IPv4 and 2 for IPv6. The default value is 1. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetManager.Core * @since 8 */ /** * Address family identifier. The value is 1 for IPv4 and 2 for IPv6. The default value is 1. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - family?: number; + family?: int; /** * Port number. The value ranges from 0 to 65535. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetManager.Core * @since 8 */ /** * Port number. The value ranges from 0 to 65535. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - port?: number; + port?: int; } /** @@ -2083,7 +2196,8 @@ declare namespace connection { * @interface HttpProxy * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface HttpProxy { /** @@ -2097,30 +2211,33 @@ declare namespace connection { * @type {string} * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ host: string; /** * Host port. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetManager.Core * @since 10 */ /** * Host port. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - port: number; + port: int; /** * Http proxy username. * @type {?string} * @syscap SystemCapability.Communication.NetManager.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ username?: string; @@ -2128,7 +2245,8 @@ declare namespace connection { * Http proxy password. * @type {?string} * @syscap SystemCapability.Communication.NetManager.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ password?: string; @@ -2143,7 +2261,8 @@ declare namespace connection { * @type {Array} * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ exclusionList: Array; } diff --git a/api/@ohos.net.http.d.ts b/api/@ohos.net.http.d.ts index c6f5778621..9af5d466df 100644 --- a/api/@ohos.net.http.d.ts +++ b/api/@ohos.net.http.d.ts @@ -21,6 +21,10 @@ import type { AsyncCallback, Callback } from './@ohos.base'; import type connection from './@ohos.net.connection'; +/*** if arkts 1.1 */ +import { int } from './@ohos.base'; +/*** endif */ + /** * Provides http related APIs. * @namespace http @@ -40,7 +44,8 @@ import type connection from './@ohos.net.connection'; * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace http { /** @@ -60,7 +65,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ type HttpProxy = connection.HttpProxy; @@ -83,7 +89,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function createHttp(): HttpRequest; @@ -91,27 +98,31 @@ declare namespace http { * Enum for Address Family * @enum {string} * @syscap SystemCapability.Communication.NetStack - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ export enum AddressFamily { /** * Default, can use addresses of all IP versions that your system allows. * @syscap SystemCapability.Communication.NetStack - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ DEFAULT = 'CURL_IPRESOLVE_WHATEVER', /** * ONLYV4 Uses only IPv4 addresses. * @syscap SystemCapability.Communication.NetStack - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ ONLY_V4 = 'CURL_IPRESOLVE_V4', /** * ONLYV6 Uses only IPv6 addresses. * @syscap SystemCapability.Communication.NetStack - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ ONLY_V6 = 'CURL_IPRESOLVE_V6' } @@ -135,7 +146,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface HttpRequestOptions { /** @@ -157,7 +169,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ method?: RequestMethod; @@ -183,7 +196,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ extraData?: string | Object | ArrayBuffer; @@ -206,7 +220,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ expectDataType?: HttpDataType; @@ -229,32 +244,34 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ usingCache?: boolean; /** * [1, 1000], default is 1. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetStack * @since 9 */ /** * [1, 1000], default is 1. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetStack * @crossplatform * @since 10 */ /** * [1, 1000], default is 1. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - priority?: number; + priority?: int; /** * HTTP request header. default is 'content-type': 'application/json' @@ -275,55 +292,58 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ header?: Object; /** * Read timeout period. The default value is 60,000, in ms. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetStack * @since 6 */ /** * Read timeout period. The default value is 60,000, in ms. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetStack * @crossplatform * @since 10 */ /** * Read timeout period. The default value is 60,000, in ms. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - readTimeout?: number; + readTimeout?: int; /** * Connection timeout interval. The default value is 60,000, in ms. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetStack * @since 6 */ /** * Connection timeout interval. The default value is 60,000, in ms. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetStack * @crossplatform * @since 10 */ /** * Connection timeout interval. The default value is 60,000, in ms. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - connectTimeout?: number; + connectTimeout?: int; /** * default is automatically specified by the system. @@ -344,7 +364,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ usingProtocol?: HttpProtocol; @@ -370,7 +391,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ usingProxy?: boolean | HttpProxy; @@ -393,7 +415,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ caPath?: string; @@ -401,7 +424,7 @@ declare namespace http { * Used to set to uploading or downloading the start bytes. The default value is 0. * HTTP standard (RFC 7233 section 3.1) allows servers to ignore range requests. * For HTTP PUT uploads this option should not be used, since it may conflict with other options. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetStack * @since 11 */ @@ -409,18 +432,19 @@ declare namespace http { * Used to set to uploading or downloading the start bytes. The default value is 0. * HTTP standard (RFC 7233 section 3.1) allows servers to ignore range requests. * For HTTP PUT uploads this option should not be used, since it may conflict with other options. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - resumeFrom?: number; + resumeFrom?: int; /** * Used to set to uploading or downloading the end bytes. Translate to the end if not set. * HTTP standard (RFC 7233 section 3.1) allows servers to ignore range requests. * For HTTP PUT uploads this option should not be used, since it may conflict with other options. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetStack * @since 11 */ @@ -428,12 +452,13 @@ declare namespace http { * Used to set to uploading or downloading the end bytes. Translate to the end if not set. * HTTP standard (RFC 7233 section 3.1) allows servers to ignore range requests. * For HTTP PUT uploads this option should not be used, since it may conflict with other options. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - resumeTo?: number; + resumeTo?: int; /** * Support the application to pass in client certificates, allowing the server to verify the client's identity. @@ -446,7 +471,8 @@ declare namespace http { * @type {?ClientCert} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ clientCert?: ClientCert; @@ -465,7 +491,8 @@ declare namespace http { * @type {?string} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ dnsOverHttps?: string; @@ -484,26 +511,28 @@ declare namespace http { * @type {?Array} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ dnsServers?: Array; /** * The maximum limit of the response body. The default value is 5 * 1024 * 1024, in Byte. * The maximum value is 100 * 1024 *1024, in Byte. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetStack * @since 11 */ /** * The maximum limit of the response body. The default value is 5 * 1024 * 1024, in Byte. * The maximum value is 100 * 1024 *1024, in Byte. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - maxLimit?: number; + maxLimit?: int; /** * The data fields which is supported by the HTTP protocol to post @@ -520,7 +549,8 @@ declare namespace http { * @type {?Array} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ multiFormDataList?: Array; @@ -529,7 +559,8 @@ declare namespace http { * {@link CertificatePinning.publicKeyHash}, request will fail. * @type {?(CertificatePinning | CertificatePinning[])} * @syscap SystemCapability.Communication.NetStack - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ certificatePinning?: CertificatePinning | CertificatePinning[]; @@ -538,7 +569,8 @@ declare namespace http { * @type {?RemoteValidation} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ remoteValidation?: RemoteValidation; @@ -547,7 +579,8 @@ declare namespace http { * @type {?TlsOptions} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ tlsOptions?: TlsOptions; @@ -556,7 +589,8 @@ declare namespace http { * @type {?ServerAuthentication} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ serverAuthentication?: ServerAuthentication; @@ -564,7 +598,8 @@ declare namespace http { * Address family option. * @type {?AddressFamily} * @syscap SystemCapability.Communication.NetStack - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ addressFamily?: AddressFamily; } @@ -574,7 +609,8 @@ declare namespace http { * @typedef ServerAuthentication * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ export interface ServerAuthentication { /** @@ -582,7 +618,8 @@ declare namespace http { * @type {Credential} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ credential: Credential; /** @@ -590,7 +627,8 @@ declare namespace http { * @type {?AuthenticationType} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ authenticationType?: AuthenticationType; } @@ -602,7 +640,8 @@ declare namespace http { * @typedef {'system' | TlsConfig} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ export type TlsOptions = 'system' | TlsConfig; @@ -611,7 +650,8 @@ declare namespace http { * @typedef {'system' | 'skip'} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ export type RemoteValidation = 'system' | 'skip'; @@ -620,7 +660,8 @@ declare namespace http { * @typedef {'basic' | 'ntlm' | 'digest'} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ export type AuthenticationType = 'basic' | 'ntlm' | 'digest'; @@ -629,7 +670,8 @@ declare namespace http { * @typedef Credential * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ export interface Credential { /** @@ -637,7 +679,8 @@ declare namespace http { * @type {string} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ username: string; /** @@ -645,7 +688,8 @@ declare namespace http { * @type {string} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ password: string; } @@ -655,7 +699,8 @@ declare namespace http { * @typedef TlsConfig * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ export interface TlsConfig { /** @@ -663,7 +708,8 @@ declare namespace http { * @type {TlsVersion} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ tlsVersionMin: TlsVersion; /** @@ -671,7 +717,8 @@ declare namespace http { * @type {TlsVersion} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ tlsVersionMax: TlsVersion; /** @@ -679,7 +726,8 @@ declare namespace http { * @type {?CipherSuite[]} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ cipherSuites?: CipherSuite[]; } @@ -690,7 +738,8 @@ declare namespace http { * @typedef {'TLS_AES_128_GCM_SHA256' | 'TLS_AES_256_GCM_SHA384' | 'TLS_CHACHA20_POLY1305_SHA256'} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ export type TlsV13SpecificCipherSuite = 'TLS_AES_128_GCM_SHA256' | 'TLS_AES_256_GCM_SHA384' | 'TLS_CHACHA20_POLY1305_SHA256'; @@ -699,7 +748,8 @@ declare namespace http { * @typedef {'TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256' | 'TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256' | 'TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384' | 'TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384' | 'TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256' | 'TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256' | 'TLS_RSA_WITH_AES_128_GCM_SHA256' | 'TLS_RSA_WITH_AES_256_GCM_SHA384'} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ export type TlsV12SpecificCipherSuite = 'TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256' | 'TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256' | 'TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384' | 'TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384' | 'TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256' | 'TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256' | 'TLS_RSA_WITH_AES_128_GCM_SHA256' | 'TLS_RSA_WITH_AES_256_GCM_SHA384'; @@ -708,7 +758,8 @@ declare namespace http { * @typedef {'TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA' | 'TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA' | 'TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA' | 'TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA' | 'TLS_RSA_WITH_AES_128_CBC_SHA' | 'TLS_RSA_WITH_AES_256_CBC_SHA' | 'TLS_RSA_WITH_3DES_EDE_CBC_SHA'} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ export type TlsV10SpecificCipherSuite = 'TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA' | 'TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA' | 'TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA' | 'TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA' | 'TLS_RSA_WITH_AES_128_CBC_SHA' | 'TLS_RSA_WITH_AES_256_CBC_SHA' | 'TLS_RSA_WITH_3DES_EDE_CBC_SHA'; @@ -717,7 +768,8 @@ declare namespace http { * @typedef {TlsV13CipherSuite} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ export type CipherSuite = TlsV13CipherSuite; @@ -726,7 +778,8 @@ declare namespace http { * @typedef {TlsV12CipherSuite | TlsV13SpecificCipherSuite} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ export type TlsV13CipherSuite = TlsV12CipherSuite | TlsV13SpecificCipherSuite; @@ -735,7 +788,8 @@ declare namespace http { * @typedef {TlsV11CipherSuite | TlsV12SpecificCipherSuite} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ export type TlsV12CipherSuite = TlsV11CipherSuite | TlsV12SpecificCipherSuite; @@ -744,7 +798,8 @@ declare namespace http { * @typedef {TlsV10CipherSuite} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ export type TlsV11CipherSuite = TlsV10CipherSuite; @@ -753,7 +808,8 @@ declare namespace http { * @typedef {TlsV10SpecificCipherSuite} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ export type TlsV10CipherSuite = TlsV10SpecificCipherSuite; @@ -762,14 +818,16 @@ declare namespace http { * @enum {number} * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ export enum TlsVersion { /** * Tls version 1.0 * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ TLS_V_1_0 = 4, @@ -777,7 +835,8 @@ declare namespace http { * Tls version 1.1 * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ TLS_V_1_1 = 5, @@ -785,7 +844,8 @@ declare namespace http { * Tls version 1.2 * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ TLS_V_1_2 = 6, @@ -793,7 +853,8 @@ declare namespace http { * Tls version 1.3 * @syscap SystemCapability.Communication.NetStack * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ TLS_V_1_3 = 7 } @@ -809,7 +870,8 @@ declare namespace http { * @interface MultiFormData * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export interface MultiFormData { /** @@ -823,7 +885,8 @@ declare namespace http { * @type {string} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ name: string; @@ -838,7 +901,8 @@ declare namespace http { * @type {string} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ contentType: string; @@ -853,7 +917,8 @@ declare namespace http { * @type {?string} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ remoteFileName?: string; @@ -868,7 +933,8 @@ declare namespace http { * @type {?(string | Object | ArrayBuffer)} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ data?: string | Object | ArrayBuffer; @@ -889,7 +955,8 @@ declare namespace http { * @type {?string} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ filePath?: string; } @@ -905,7 +972,8 @@ declare namespace http { * @enum {string} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum CertType { /** @@ -917,7 +985,8 @@ declare namespace http { * PEM format certificate * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ PEM = 'PEM', @@ -930,7 +999,8 @@ declare namespace http { * DER format certificate * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DER = 'DER', @@ -943,7 +1013,8 @@ declare namespace http { * P12 format certificate * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ P12 = 'P12' } @@ -961,7 +1032,8 @@ declare namespace http { * @interface ClientCert * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export interface ClientCert { /** @@ -975,7 +1047,8 @@ declare namespace http { * @type {string} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ certPath: string; @@ -990,7 +1063,8 @@ declare namespace http { * @type {?CertType} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ certType?: CertType; @@ -1005,7 +1079,8 @@ declare namespace http { * @type {string} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ keyPath: string; @@ -1020,7 +1095,8 @@ declare namespace http { * @type {?string} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ keyPassword?: string; } @@ -1029,21 +1105,24 @@ declare namespace http { * Certificate pinning option. * @interface CertificatePinning * @syscap SystemCapability.Communication.NetStack - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface CertificatePinning { /** * Public key hash. * @type {string} * @syscap SystemCapability.Communication.NetStack - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ publicKeyHash: string; /** * Certificate public key hash algorithm. * @type {'SHA-256'} * @syscap SystemCapability.Communication.NetStack - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ hashAlgorithm: 'SHA-256'; } @@ -1070,7 +1149,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface HttpRequest { /** @@ -1276,7 +1356,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ request(url: string, callback: AsyncCallback): void; @@ -1488,7 +1569,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ request(url: string, options: HttpRequestOptions, callback: AsyncCallback): void; @@ -1700,7 +1782,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ request(url: string, options?: HttpRequestOptions): Promise; @@ -1708,7 +1791,7 @@ declare namespace http { * Initiates an HTTP request to a given URL, applicable to scenarios where http response supports streaming. * @permission ohos.permission.INTERNET * @param { string } url - URL for initiating an HTTP request. - * @param { AsyncCallback } callback - Returns the callback of requestInStream {@link ResponseCode}, + * @param { AsyncCallback } callback - Returns the callback of requestInStream {@link ResponseCode}, * should use on_headersReceive and on_dataReceive to get http response. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 201 - Permission denied. @@ -1748,7 +1831,7 @@ declare namespace http { * Initiates an HTTP request to a given URL, applicable to scenarios where http response supports streaming. * @permission ohos.permission.INTERNET * @param { string } url - URL for initiating an HTTP request. - * @param { AsyncCallback } callback - Returns the callback of requestInStream {@link ResponseCode}, + * @param { AsyncCallback } callback - Returns the callback of requestInStream {@link ResponseCode}, * should use on_headersReceive and on_dataReceive to get http response. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 201 - Permission denied. @@ -1789,7 +1872,7 @@ declare namespace http { * Initiates an HTTP request to a given URL, applicable to scenarios where http response supports streaming. * @permission ohos.permission.INTERNET * @param { string } url - URL for initiating an HTTP request. - * @param { AsyncCallback } callback - Returns the callback of requestInStream {@link ResponseCode}, + * @param { AsyncCallback } callback - Returns the callback of requestInStream {@link ResponseCode}, * should use on_headersReceive and on_dataReceive to get http response. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 201 - Permission denied. @@ -1831,7 +1914,7 @@ declare namespace http { * Initiates an HTTP request to a given URL, applicable to scenarios where http response supports streaming. * @permission ohos.permission.INTERNET * @param { string } url - URL for initiating an HTTP request. - * @param { AsyncCallback } callback - Returns the callback of requestInStream {@link ResponseCode}, + * @param { AsyncCallback } callback - Returns the callback of requestInStream {@link ResponseCode}, * should use on_headersReceive and on_dataReceive to get http response. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 201 - Permission denied. @@ -1869,16 +1952,17 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - requestInStream(url: string, callback: AsyncCallback): void; + requestInStream(url: string, callback: AsyncCallback): void; /** * Initiates an HTTP request to a given URL, applicable to scenarios where http response supports streaming. * @permission ohos.permission.INTERNET * @param { string } url - URL for initiating an HTTP request. * @param { HttpRequestOptions } options - Optional parameters {@link HttpRequestOptions}. - * @param { AsyncCallback } callback - the callback of requestInStream. + * @param { AsyncCallback } callback - the callback of requestInStream. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 2300001 - Unsupported protocol. @@ -1918,7 +2002,7 @@ declare namespace http { * @permission ohos.permission.INTERNET * @param { string } url - URL for initiating an HTTP request. * @param { HttpRequestOptions } options - Optional parameters {@link HttpRequestOptions}. - * @param { AsyncCallback } callback - the callback of requestInStream. + * @param { AsyncCallback } callback - the callback of requestInStream. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 2300001 - Unsupported protocol. @@ -1959,7 +2043,7 @@ declare namespace http { * @permission ohos.permission.INTERNET * @param { string } url - URL for initiating an HTTP request. * @param { HttpRequestOptions } options - Optional parameters {@link HttpRequestOptions}. - * @param { AsyncCallback } callback - the callback of requestInStream. + * @param { AsyncCallback } callback - the callback of requestInStream. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 2300001 - Unsupported protocol. @@ -2001,7 +2085,7 @@ declare namespace http { * @permission ohos.permission.INTERNET * @param { string } url - URL for initiating an HTTP request. * @param { HttpRequestOptions } options - Optional parameters {@link HttpRequestOptions}. - * @param { AsyncCallback } callback - the callback of requestInStream. + * @param { AsyncCallback } callback - the callback of requestInStream. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 2300001 - Unsupported protocol. @@ -2038,16 +2122,17 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - requestInStream(url: string, options: HttpRequestOptions, callback: AsyncCallback): void; + requestInStream(url: string, options: HttpRequestOptions, callback: AsyncCallback): void; /** * Initiates an HTTP request to a given URL, applicable to scenarios where http response supports streaming. * @permission ohos.permission.INTERNET * @param { string } url - URL for initiating an HTTP request. * @param { HttpRequestOptions } [options] - Optional parameters {@link HttpRequestOptions}. - * @returns { Promise } the promise returned by the function. + * @returns { Promise } the promise returned by the function. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 2300001 - Unsupported protocol. @@ -2087,7 +2172,7 @@ declare namespace http { * @permission ohos.permission.INTERNET * @param { string } url - URL for initiating an HTTP request. * @param { HttpRequestOptions } [options] - Optional parameters {@link HttpRequestOptions}. - * @returns { Promise } the promise returned by the function. + * @returns { Promise } the promise returned by the function. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 2300001 - Unsupported protocol. @@ -2128,7 +2213,7 @@ declare namespace http { * @permission ohos.permission.INTERNET * @param { string } url - URL for initiating an HTTP request. * @param { HttpRequestOptions } [options] - Optional parameters {@link HttpRequestOptions}. - * @returns { Promise } the promise returned by the function. + * @returns { Promise } the promise returned by the function. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 2300001 - Unsupported protocol. @@ -2170,7 +2255,7 @@ declare namespace http { * @permission ohos.permission.INTERNET * @param { string } url - URL for initiating an HTTP request. * @param { HttpRequestOptions } [options] - Optional parameters {@link HttpRequestOptions}. - * @returns { Promise } the promise returned by the function. + * @returns { Promise } the promise returned by the function. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 2300001 - Unsupported protocol. @@ -2207,9 +2292,10 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - requestInStream(url: string, options?: HttpRequestOptions): Promise; + requestInStream(url: string, options?: HttpRequestOptions): Promise; /** * Destroys an HTTP request. @@ -2227,7 +2313,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ destroy(): void; @@ -2573,7 +2660,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export enum RequestMethod { /** @@ -2592,7 +2680,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ OPTIONS = "OPTIONS", @@ -2612,7 +2701,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ GET = "GET", @@ -2632,7 +2722,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HEAD = "HEAD", @@ -2652,7 +2743,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ POST = "POST", @@ -2672,7 +2764,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PUT = "PUT", @@ -2692,7 +2785,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ DELETE = "DELETE", @@ -2712,7 +2806,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ TRACE = "TRACE", @@ -2732,7 +2827,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CONNECT = "CONNECT" } @@ -2756,7 +2852,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export enum ResponseCode { /** @@ -2775,7 +2872,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ OK = 200, @@ -2795,7 +2893,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CREATED, @@ -2815,7 +2914,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ ACCEPTED, @@ -2835,7 +2935,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ NOT_AUTHORITATIVE, @@ -2855,7 +2956,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ NO_CONTENT, @@ -2875,7 +2977,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ RESET, @@ -2895,7 +2998,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PARTIAL, @@ -2915,7 +3019,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ MULT_CHOICE = 300, @@ -2938,7 +3043,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ MOVED_PERM, @@ -2958,7 +3064,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ MOVED_TEMP, @@ -2978,7 +3085,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ SEE_OTHER, @@ -2998,7 +3106,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ NOT_MODIFIED, @@ -3018,7 +3127,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ USE_PROXY, @@ -3038,7 +3148,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ BAD_REQUEST = 400, @@ -3058,7 +3169,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ UNAUTHORIZED, @@ -3078,7 +3190,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PAYMENT_REQUIRED, @@ -3098,7 +3211,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ FORBIDDEN, @@ -3118,7 +3232,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ NOT_FOUND, @@ -3138,7 +3253,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ BAD_METHOD, @@ -3158,7 +3274,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ NOT_ACCEPTABLE, @@ -3178,7 +3295,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PROXY_AUTH, @@ -3198,7 +3316,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CLIENT_TIMEOUT, @@ -3221,7 +3340,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CONFLICT, @@ -3241,7 +3361,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ GONE, @@ -3261,7 +3382,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ LENGTH_REQUIRED, @@ -3281,7 +3403,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PRECON_FAILED, @@ -3301,7 +3424,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ ENTITY_TOO_LARGE, @@ -3321,7 +3445,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ REQ_TOO_LONG, @@ -3341,7 +3466,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ UNSUPPORTED_TYPE, @@ -3350,7 +3476,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ RANGE_NOT_SATISFIABLE, @@ -3370,7 +3497,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ INTERNAL_ERROR = 500, @@ -3390,7 +3518,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ NOT_IMPLEMENTED, @@ -3410,7 +3539,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ BAD_GATEWAY, @@ -3430,7 +3560,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ UNAVAILABLE, @@ -3450,7 +3581,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ GATEWAY_TIMEOUT, @@ -3470,7 +3602,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ VERSION } @@ -3494,7 +3627,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HttpProtocol { @@ -3514,7 +3648,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HTTP1_1, @@ -3534,7 +3669,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HTTP2, @@ -3551,7 +3687,8 @@ declare namespace http { * Fallback to http2 or http1.1 if needed. * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HTTP3 } @@ -3575,7 +3712,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HttpDataType { /** @@ -3594,7 +3732,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ STRING, @@ -3614,7 +3753,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ OBJECT = 1, @@ -3634,7 +3774,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ ARRAY_BUFFER = 2 } @@ -3658,7 +3799,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface HttpResponse { /** @@ -3683,7 +3825,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ result: string | Object | ArrayBuffer; @@ -3712,32 +3855,34 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ resultType: HttpDataType; /** * Server status code. - * @type {ResponseCode | number} + * @type {ResponseCode | int} * @syscap SystemCapability.Communication.NetStack * @since 6 */ /** * Server status code. - * @type {ResponseCode | number} + * @type {ResponseCode | int} * @syscap SystemCapability.Communication.NetStack * @crossplatform * @since 10 */ /** * Server status code. - * @type {ResponseCode | number} + * @type {ResponseCode | int} * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - responseCode: ResponseCode | number; + responseCode: ResponseCode | int; /** * All headers in the response from the server. @@ -3758,7 +3903,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ header: Object; @@ -3781,7 +3927,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ cookies: string; @@ -3796,7 +3943,8 @@ declare namespace http { * @type {PerformanceTiming} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ performanceTiming: PerformanceTiming; } @@ -3812,158 +3960,169 @@ declare namespace http { * @interface PerformanceTiming * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export interface PerformanceTiming { /** * Time taken from startup to DNS resolution completion, in milliseconds. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @since 11 */ /** * Time taken from startup to DNS resolution completion, in milliseconds. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - dnsTiming: number; + dnsTiming: int; /** * Time taken from startup to TCP connection completion, in milliseconds. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @since 11 */ /** * Time taken from startup to TCP connection completion, in milliseconds. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - tcpTiming: number; + tcpTiming: int; /** * Time taken from startup to TLS connection completion, in milliseconds. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @since 11 */ /** * Time taken from startup to TLS connection completion, in milliseconds. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - tlsTiming: number; + tlsTiming: int; /** * Time taken from startup to start sending the first byte, in milliseconds. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @since 11 */ /** * Time taken from startup to start sending the first byte, in milliseconds. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - firstSendTiming: number; + firstSendTiming: int; /** * Time taken from startup to receiving the first byte, in milliseconds. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @since 11 */ /** * Time taken from startup to receiving the first byte, in milliseconds. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - firstReceiveTiming: number; + firstReceiveTiming: int; /** * Time taken from startup to the completion of the request, in milliseconds. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @since 11 */ /** * Time taken from startup to the completion of the request, in milliseconds. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - totalFinishTiming: number; + totalFinishTiming: int; /** * Time taken from startup to completion of all redirection steps, in milliseconds. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @since 11 */ /** * Time taken from startup to completion of all redirection steps, in milliseconds. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - redirectTiming: number; + redirectTiming: int; /** * Time taken from HTTP request to header completion, in milliseconds. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @since 11 */ /** * Time taken from HTTP request to header completion, in milliseconds. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - responseHeaderTiming: number; + responseHeaderTiming: int; /** * Time taken from HTTP Request to body completion, in milliseconds. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @since 11 */ /** * Time taken from HTTP Request to body completion, in milliseconds. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - responseBodyTiming: number; + responseBodyTiming: int; /** * Time taken from HTTP Request to callback to the application, in milliseconds. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @since 11 */ /** * Time taken from HTTP Request to callback to the application, in milliseconds. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - totalTiming: number; + totalTiming: int; } /** @@ -3985,53 +4144,56 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ export interface DataReceiveProgressInfo { /** * Number of data bytes received. - * @type { number } + * @type { int } * @syscap SystemCapability.Communication.NetStack * @since 11 */ /** * Number of data bytes received. - * @type { number } + * @type { int } * @syscap SystemCapability.Communication.NetStack * @crossplatform * @since 12 */ /** * Number of data bytes received. - * @type { number } + * @type { int } * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ - receiveSize: number; + receiveSize: int; /** * Total number of bytes to receive. - * @type { number } + * @type { int } * @syscap SystemCapability.Communication.NetStack * @since 11 */ /** * Total number of bytes to receive. - * @type { number } + * @type { int } * @syscap SystemCapability.Communication.NetStack * @crossplatform * @since 12 */ /** * Total number of bytes to receive. - * @type { number } + * @type { int } * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ - totalSize: number; + totalSize: int; } /** @@ -4058,60 +4220,62 @@ declare namespace http { export interface DataSendProgressInfo { /** * Used to specify the data size to be sent. - * @type { number } + * @type { int } * @syscap SystemCapability.Communication.NetStack * @since 11 */ /** * Used to specify the data size to be sent. - * @type { number } + * @type { int } * @syscap SystemCapability.Communication.NetStack * @crossplatform * @since 12 */ /** * Used to specify the data size to be sent. - * @type { number } + * @type { int } * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ - sendSize: number; + sendSize: int; /** * Total number of bytes to receive. - * @type { number } + * @type { int } * @syscap SystemCapability.Communication.NetStack * @since 11 */ /** * Total number of bytes to receive. - * @type { number } + * @type { int } * @syscap SystemCapability.Communication.NetStack * @crossplatform * @since 12 */ /** * Total number of bytes to receive. - * @type { number } + * @type { int } * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ - totalSize: number; + totalSize: int; } /** * Creates a default {@code HttpResponseCache} object to store the responses of HTTP access requests. - * @param { number } cacheSize - the size of cache(max value is 10MB), default is 10*1024*1024(10MB). + * @param { int } cacheSize - the size of cache(max value is 10MB), default is 10*1024*1024(10MB). * @returns { HttpResponseCache } the HttpResponseCache of the createHttpResponseCache. * @syscap SystemCapability.Communication.NetStack * @since 9 */ /** * Creates a default {@code HttpResponseCache} object to store the responses of HTTP access requests. - * @param { number } cacheSize - the size of cache(max value is 10MB), default is 10*1024*1024(10MB). + * @param { int } cacheSize - the size of cache(max value is 10MB), default is 10*1024*1024(10MB). * @returns { HttpResponseCache } the HttpResponseCache of the createHttpResponseCache. * @syscap SystemCapability.Communication.NetStack * @crossplatform @@ -4119,14 +4283,15 @@ declare namespace http { */ /** * Creates a default {@code HttpResponseCache} object to store the responses of HTTP access requests. - * @param { number } cacheSize - the size of cache(max value is 10MB), default is 10*1024*1024(10MB). + * @param { int } cacheSize - the size of cache(max value is 10MB), default is 10*1024*1024(10MB). * @returns { HttpResponseCache } the HttpResponseCache of the createHttpResponseCache. * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - function createHttpResponseCache(cacheSize?: number): HttpResponseCache; + function createHttpResponseCache(cacheSize?: int): HttpResponseCache; /** * Defines an object that stores the response to an HTTP request. @@ -4147,7 +4312,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface HttpResponseCache { /** @@ -4169,7 +4335,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ flush(callback: AsyncCallback): void; @@ -4192,7 +4359,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ flush(): Promise; @@ -4215,7 +4383,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ delete(callback: AsyncCallback): void; @@ -4238,7 +4407,8 @@ declare namespace http { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ delete(): Promise; } diff --git a/api/@ohos.net.networkSecurity.d.ts b/api/@ohos.net.networkSecurity.d.ts index c5eae54dfe..e82a820cd6 100644 --- a/api/@ohos.net.networkSecurity.d.ts +++ b/api/@ohos.net.networkSecurity.d.ts @@ -20,31 +20,39 @@ import type { AsyncCallback } from './@ohos.base'; +/*** if arkts 1.1 */ +import { int } from './@ohos.base'; +/*** endif */ + /** * Provides networkSecurity related APIs. * @namespace networkSecurity * @syscap SystemCapability.Communication.NetStack - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace networkSecurity { /** * Defines the certificate type. * @enum {number} * @syscap SystemCapability.Communication.NetStack - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export enum CertType { /** * PEM type certificate. * @syscap SystemCapability.Communication.NetStack - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CERT_TYPE_PEM = 0, /** * DER type certificate. * @syscap SystemCapability.Communication.NetStack - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CERT_TYPE_DER = 1 } @@ -53,14 +61,16 @@ declare namespace networkSecurity { * Define the certificate content. * @interface CertBlob * @syscap SystemCapability.Communication.NetStack - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface CertBlob { /** * Certificate type. * @type { CertType } * @syscap SystemCapability.Communication.NetStack - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ type: CertType; @@ -68,7 +78,8 @@ declare namespace networkSecurity { * Certificate data. * @type {string | ArrayBuffer} * @syscap SystemCapability.Communication.NetStack - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ data: string | ArrayBuffer; } @@ -77,7 +88,7 @@ declare namespace networkSecurity { * Certificate verification to the server. * @param { CertBlob } cert - Certificates to be verified. * @param { CertBlob } [caCert] - Incoming custom CA cert. - * @returns { Promise } The promise returned by the function. + * @returns { Promise } The promise returned by the function. * Number equals 0 if verify of certification from server succeed, else verify failed. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 2305001 - Unspecified error. @@ -102,7 +113,7 @@ declare namespace networkSecurity { * Certificate verification to the server. * @param { CertBlob } cert - Certificates to be verified. * @param { CertBlob } [caCert] - Incoming custom CA cert. - * @returns { Promise } The promise returned by the function. + * @returns { Promise } The promise returned by the function. * Number equals 0 if verify of certification from server succeed, else verify failed. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 2305001 - Unspecified error. @@ -123,9 +134,10 @@ declare namespace networkSecurity { * @throws { BusinessError } 2305027 - Certificate is untrusted. * @throws { BusinessError } 2305069 - Invalid certificate verification context. * @syscap SystemCapability.Communication.NetStack - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - export function certVerification(cert: CertBlob, caCert?: CertBlob): Promise; + export function certVerification(cert: CertBlob, caCert?: CertBlob): Promise; /** * Certificate verification to the server. @@ -155,7 +167,7 @@ declare namespace networkSecurity { * Certificate verification to the server. * @param { CertBlob } cert - Certificates to be verified. * @param { CertBlob } [caCert] - Incoming custom CA cert. - * @returns { number } Returns 0 if verify of certification from server succeed, else verify failed. + * @returns { int } Returns 0 if verify of certification from server succeed, else verify failed. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 2305001 - Unspecified error. * @throws { BusinessError } 2305002 - Unable to get issuer certificate. @@ -175,9 +187,10 @@ declare namespace networkSecurity { * @throws { BusinessError } 2305027 - Certificate is untrusted. * @throws { BusinessError } 2305069 - Invalid certificate verification context. * @syscap SystemCapability.Communication.NetStack - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - export function certVerificationSync(cert: CertBlob, caCert?: CertBlob): number; + export function certVerificationSync(cert: CertBlob, caCert?: CertBlob): int; /** * Checks whether the Cleartext traffic is permitted. @@ -186,7 +199,8 @@ declare namespace networkSecurity { * @returns { boolean } Returns true if the Cleartext traffic is permitted, else returns false. * @throws { BusinessError } 201 - Permission denied. * @syscap SystemCapability.Communication.NetStack - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ export function isCleartextPermitted(): boolean; @@ -198,7 +212,8 @@ declare namespace networkSecurity { * @returns { boolean } Returns true if the Cleartext traffic is permitted, else returns false. * @throws { BusinessError } 201 - Permission denied. * @syscap SystemCapability.Communication.NetStack - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ export function isCleartextPermittedByHostName(hostName: string): boolean; } diff --git a/api/@ohos.net.sharing.d.ts b/api/@ohos.net.sharing.d.ts index 74d63c28ce..45267f19ca 100644 --- a/api/@ohos.net.sharing.d.ts +++ b/api/@ohos.net.sharing.d.ts @@ -21,18 +21,25 @@ import type { AsyncCallback, Callback } from './@ohos.base'; import type connection from './@ohos.net.connection'; +/*** if arkts 1.1 */ +import { int } from './@ohos.base'; +/*** endif */ + + /** * Provides network sharing related interfaces. * @namespace sharing * @syscap SystemCapability.Communication.NetManager.NetSharing - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace sharing { /** * Get the handle of the data network. * @typedef { connection.NetHandle } * @syscap SystemCapability.Communication.NetManager.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ type NetHandle = connection.NetHandle; @@ -48,7 +55,8 @@ declare namespace sharing { * @throws { BusinessError } 2202011 - Cannot get network sharing configuration. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function isSharingSupported(callback: AsyncCallback): void; @@ -63,7 +71,8 @@ declare namespace sharing { * @throws { BusinessError } 2202011 - Cannot get network sharing configuration. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function isSharingSupported(): Promise; @@ -79,7 +88,8 @@ declare namespace sharing { * @throws { BusinessError } 2202011 - Cannot get network sharing configuration. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function isSharing(callback: AsyncCallback): void; @@ -94,7 +104,8 @@ declare namespace sharing { * @throws { BusinessError } 2202011 - Cannot get network sharing configuration. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function isSharing(): Promise; @@ -116,7 +127,8 @@ declare namespace sharing { * @throws { BusinessError } 2202011 - Cannot get network sharing configuration. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function startSharing(type: SharingIfaceType, callback: AsyncCallback): void; @@ -138,7 +150,8 @@ declare namespace sharing { * @throws { BusinessError } 2202011 - Cannot get network sharing configuration. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function startSharing(type: SharingIfaceType): Promise; @@ -159,7 +172,8 @@ declare namespace sharing { * @throws { BusinessError } 2202011 - Cannot get network sharing configuration. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function stopSharing(type: SharingIfaceType, callback: AsyncCallback): void; @@ -180,14 +194,15 @@ declare namespace sharing { * @throws { BusinessError } 2202011 - Cannot get network sharing configuration. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function stopSharing(type: SharingIfaceType): Promise; /** * Obtains the number of downlink data bytes of the sharing network interfaces. * @permission ohos.permission.CONNECTIVITY_INTERNAL - * @param { AsyncCallback } callback - Returns the number of downlink data bytes of the sharing network interfaces. + * @param { AsyncCallback } callback - Returns the number of downlink data bytes of the sharing network interfaces. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Non-system applications use system APIs. * @throws { BusinessError } 401 - Parameter error. @@ -195,29 +210,30 @@ declare namespace sharing { * @throws { BusinessError } 2200003 - System internal error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ - function getStatsRxBytes(callback: AsyncCallback): void; + function getStatsRxBytes(callback: AsyncCallback): void; /** * Obtains the number of downlink data bytes of the sharing network interfaces. * @permission ohos.permission.CONNECTIVITY_INTERNAL - * @returns { Promise } The promise returned by the function. + * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Non-system applications use system APIs. - * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 2200002 - Failed to connect to the service. * @throws { BusinessError } 2200003 - System internal error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ - function getStatsRxBytes(): Promise; + function getStatsRxBytes(): Promise; /** * Obtains the number of uplink data bytes of the sharing network interfaces. * @permission ohos.permission.CONNECTIVITY_INTERNAL - * @param { AsyncCallback } callback - Returns the number of uplink data bytes of the sharing network interfaces. + * @param { AsyncCallback } callback - Returns the number of uplink data bytes of the sharing network interfaces. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Non-system applications use system APIs. * @throws { BusinessError } 401 - Parameter error. @@ -225,29 +241,30 @@ declare namespace sharing { * @throws { BusinessError } 2200003 - System internal error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ - function getStatsTxBytes(callback: AsyncCallback): void; + function getStatsTxBytes(callback: AsyncCallback): void; /** * Obtains the number of uplink data bytes of the sharing network interfaces. * @permission ohos.permission.CONNECTIVITY_INTERNAL - * @returns { Promise } The promise returned by the function. + * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Non-system applications use system APIs. - * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 2200002 - Failed to connect to the service. * @throws { BusinessError } 2200003 - System internal error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ - function getStatsTxBytes(): Promise; + function getStatsTxBytes(): Promise; /** * Obtains the number of total data bytes of the sharing network interfaces. * @permission ohos.permission.CONNECTIVITY_INTERNAL - * @param { AsyncCallback } callback - Returns the number of total data bytes of the sharing network interfaces. + * @param { AsyncCallback } callback - Returns the number of total data bytes of the sharing network interfaces. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Non-system applications use system APIs. * @throws { BusinessError } 401 - Parameter error. @@ -255,24 +272,25 @@ declare namespace sharing { * @throws { BusinessError } 2200003 - System internal error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ - function getStatsTotalBytes(callback: AsyncCallback): void; + function getStatsTotalBytes(callback: AsyncCallback): void; /** * Obtains the number of total data bytes of the sharing network interfaces. * @permission ohos.permission.CONNECTIVITY_INTERNAL - * @returns { Promise } The promise returned by the function. + * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Non-system applications use system APIs. - * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 2200002 - Failed to connect to the service. * @throws { BusinessError } 2200003 - System internal error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ - function getStatsTotalBytes(): Promise; + function getStatsTotalBytes(): Promise; /** * Obtains the names of interfaces in each sharing state. @@ -287,7 +305,8 @@ declare namespace sharing { * @throws { BusinessError } 2200003 - System internal error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getSharingIfaces(state: SharingIfaceState, callback: AsyncCallback>): void; @@ -304,7 +323,8 @@ declare namespace sharing { * @throws { BusinessError } 2200003 - System internal error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getSharingIfaces(state: SharingIfaceState): Promise>; @@ -321,7 +341,8 @@ declare namespace sharing { * @throws { BusinessError } 2200003 - System internal error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getSharingState(type: SharingIfaceType, callback: AsyncCallback): void; @@ -338,7 +359,8 @@ declare namespace sharing { * @throws { BusinessError } 2200003 - System internal error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getSharingState(type: SharingIfaceType): Promise; @@ -355,7 +377,8 @@ declare namespace sharing { * @throws { BusinessError } 2200003 - System internal error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getSharableRegexes(type: SharingIfaceType, callback: AsyncCallback>): void; @@ -372,7 +395,8 @@ declare namespace sharing { * @throws { BusinessError } 2200003 - System internal error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getSharableRegexes(type: SharingIfaceType): Promise>; @@ -489,14 +513,16 @@ declare namespace sharing { * @enum {number} * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export enum SharingIfaceState { /** * Indicates the names of the NICs that are serving as network sharing. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ SHARING_NIC_SERVING = 1, @@ -504,7 +530,8 @@ declare namespace sharing { * Indicates the names of the NICs that can serve as network sharing. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ SHARING_NIC_CAN_SERVER = 2, @@ -512,7 +539,8 @@ declare namespace sharing { * Indicates the names of the NICs that serving error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ SHARING_NIC_ERROR = 3 } @@ -522,7 +550,8 @@ declare namespace sharing { * @interface InterfaceSharingStateInfo * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface InterfaceSharingStateInfo { /** @@ -530,7 +559,8 @@ declare namespace sharing { * @type { SharingIfaceType } * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ type: SharingIfaceType; /** @@ -538,7 +568,8 @@ declare namespace sharing { * @type { string } * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ iface: string; /** @@ -546,7 +577,8 @@ declare namespace sharing { * @type { SharingIfaceState } * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ state: SharingIfaceState; } @@ -556,14 +588,16 @@ declare namespace sharing { * @enum {number} * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export enum SharingIfaceType { /** * Network sharing type for Wi-Fi. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ SHARING_WIFI = 0, @@ -571,7 +605,8 @@ declare namespace sharing { * Network sharing type for USB. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ SHARING_USB = 1, @@ -579,7 +614,8 @@ declare namespace sharing { * Network sharing type for BLUETOOTH. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ SHARING_BLUETOOTH = 2 } diff --git a/api/@ohos.net.statistics.d.ts b/api/@ohos.net.statistics.d.ts index 1d0e9ec386..83f1e2b762 100644 --- a/api/@ohos.net.statistics.d.ts +++ b/api/@ohos.net.statistics.d.ts @@ -21,6 +21,10 @@ import type { AsyncCallback, Callback } from './@ohos.base'; import type connection from './@ohos.net.connection'; +/*** if arkts 1.1 */ +import { int, long } from './@ohos.base'; +/*** endif */ + /** * Obtains traffic statistics. * @namespace statistics @@ -32,20 +36,22 @@ import type connection from './@ohos.net.connection'; * @namespace statistics * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace statistics { /** * @typedef {connection.NetBearType} * @syscap SystemCapability.Communication.NetManager.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ type NetBearType = connection.NetBearType; /** * Queries the data traffic (including all TCP and UDP data packets) received through a specified NIC. * @param { string } nic - Network interface card. - * @param { AsyncCallback } callback - Returns the data traffic received through the specified NIC. + * @param { AsyncCallback } callback - Returns the data traffic received through the specified NIC. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. @@ -53,14 +59,15 @@ declare namespace statistics { * @throws { BusinessError } 2103011 - Failed to create a system map. * @throws { BusinessError } 2103012 - Failed to obtain the NIC name. * @syscap SystemCapability.Communication.NetManager.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ - function getIfaceRxBytes(nic: string, callback: AsyncCallback): void; + function getIfaceRxBytes(nic: string, callback: AsyncCallback): void; /** * Queries the data traffic (including all TCP and UDP data packets) received through a specified NIC. * @param { string } nic - Network interface card. - * @returns { Promise } The promise returned by the function. + * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. @@ -68,14 +75,15 @@ declare namespace statistics { * @throws { BusinessError } 2103011 - Failed to create a system map. * @throws { BusinessError } 2103012 - Failed to obtain the NIC name. * @syscap SystemCapability.Communication.NetManager.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ - function getIfaceRxBytes(nic: string): Promise; + function getIfaceRxBytes(nic: string): Promise; /** * Queries the data traffic (including all TCP and UDP data packets) sent through a specified NIC. * @param { string } nic - Network interface card. - * @param { AsyncCallback } callback - Returns the data traffic sent through the specified NIC. + * @param { AsyncCallback } callback - Returns the data traffic sent through the specified NIC. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. @@ -83,14 +91,15 @@ declare namespace statistics { * @throws { BusinessError } 2103011 - Failed to create a system map. * @throws { BusinessError } 2103012 - Failed to obtain the NIC name. * @syscap SystemCapability.Communication.NetManager.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ - function getIfaceTxBytes(nic: string, callback: AsyncCallback): void; + function getIfaceTxBytes(nic: string, callback: AsyncCallback): void; /** * Queries the data traffic (including all TCP and UDP data packets) sent through a specified NIC. * @param { string } nic - Network interface card. - * @returns { Promise } The promise returned by the function. + * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. @@ -98,65 +107,70 @@ declare namespace statistics { * @throws { BusinessError } 2103011 - Failed to create a system map. * @throws { BusinessError } 2103012 - Failed to obtain the NIC name. * @syscap SystemCapability.Communication.NetManager.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ - function getIfaceTxBytes(nic: string): Promise; + function getIfaceTxBytes(nic: string): Promise; /** * Queries the data traffic (including all TCP and UDP data packets) received through the cellular network. - * @param { AsyncCallback } callback - Returns the data traffic received through the cellular network. + * @param { AsyncCallback } callback - Returns the data traffic received through the cellular network. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @throws { BusinessError } 2103005 - Failed to read the system map. * @throws { BusinessError } 2103011 - Failed to create a system map. * @throws { BusinessError } 2103012 - Failed to obtain the NIC name. * @syscap SystemCapability.Communication.NetManager.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ - function getCellularRxBytes(callback: AsyncCallback): void; + function getCellularRxBytes(callback: AsyncCallback): void; /** * Queries the data traffic (including all TCP and UDP data packets) received through the cellular network. - * @returns { Promise } The promise returned by the function. + * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @throws { BusinessError } 2103005 - Failed to read the system map. * @throws { BusinessError } 2103011 - Failed to create a system map. * @throws { BusinessError } 2103012 - Failed to obtain the NIC name. * @syscap SystemCapability.Communication.NetManager.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ - function getCellularRxBytes(): Promise; + function getCellularRxBytes(): Promise; /** * Queries the data traffic (including all TCP and UDP data packets) sent through the cellular network. - * @param { AsyncCallback } callback - Returns the data traffic sent through the cellular network. + * @param { AsyncCallback } callback - Returns the data traffic sent through the cellular network. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @throws { BusinessError } 2103005 - Failed to read the system map. * @throws { BusinessError } 2103011 - Failed to create a system map. * @throws { BusinessError } 2103012 - Failed to obtain the NIC name. * @syscap SystemCapability.Communication.NetManager.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ - function getCellularTxBytes(callback: AsyncCallback): void; + function getCellularTxBytes(callback: AsyncCallback): void; /** * Queries the data traffic (including all TCP and UDP data packets) sent through the cellular network. - * @returns { Promise } The promise returned by the function. + * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @throws { BusinessError } 2103005 - Failed to read the system map. * @throws { BusinessError } 2103011 - Failed to create a system map. * @throws { BusinessError } 2103012 - Failed to obtain the NIC name. * @syscap SystemCapability.Communication.NetManager.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ - function getCellularTxBytes(): Promise; + function getCellularTxBytes(): Promise; /** * Queries the data traffic (including all TCP and UDP data packets) received through all NICs. - * @param { AsyncCallback } callback - Returns the data traffic received through all NICs. + * @param { AsyncCallback } callback - Returns the data traffic received through all NICs. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @throws { BusinessError } 2103005 - Failed to read the system map. @@ -166,20 +180,21 @@ declare namespace statistics { */ /** * Queries the data traffic (including all TCP and UDP data packets) received through all NICs. - * @param { AsyncCallback } callback - Returns the data traffic received through all NICs. + * @param { AsyncCallback } callback - Returns the data traffic received through all NICs. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @throws { BusinessError } 2103005 - Failed to read the system map. * @throws { BusinessError } 2103011 - Failed to create a system map. * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ - function getAllRxBytes(callback: AsyncCallback): void; + function getAllRxBytes(callback: AsyncCallback): void; /** * Queries the data traffic (including all TCP and UDP data packets) received through all NICs. - * @returns { Promise } The promise returned by the function. + * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @throws { BusinessError } 2103005 - Failed to read the system map. @@ -189,20 +204,21 @@ declare namespace statistics { */ /** * Queries the data traffic (including all TCP and UDP data packets) received through all NICs. - * @returns { Promise } The promise returned by the function. + * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @throws { BusinessError } 2103005 - Failed to read the system map. * @throws { BusinessError } 2103011 - Failed to create a system map. * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ - function getAllRxBytes(): Promise; + function getAllRxBytes(): Promise; /** * Queries the data traffic (including all TCP and UDP data packets) sent through all NICs. - * @param { AsyncCallback } callback - Returns the data traffic sent through all NICs. + * @param { AsyncCallback } callback - Returns the data traffic sent through all NICs. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @throws { BusinessError } 2103005 - Failed to read the system map. @@ -212,20 +228,21 @@ declare namespace statistics { */ /** * Queries the data traffic (including all TCP and UDP data packets) sent through all NICs. - * @param { AsyncCallback } callback - Returns the data traffic sent through all NICs. + * @param { AsyncCallback } callback - Returns the data traffic sent through all NICs. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @throws { BusinessError } 2103005 - Failed to read the system map. * @throws { BusinessError } 2103011 - Failed to create a system map. * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ - function getAllTxBytes(callback: AsyncCallback): void; + function getAllTxBytes(callback: AsyncCallback): void; /** * Queries the data traffic (including all TCP and UDP data packets) sent through all NICs. - * @returns { Promise } The promise returned by the function. + * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @throws { BusinessError } 2103005 - Failed to read the system map. @@ -235,78 +252,83 @@ declare namespace statistics { */ /** * Queries the data traffic (including all TCP and UDP data packets) sent through all NICs. - * @returns { Promise } The promise returned by the function. + * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @throws { BusinessError } 2103005 - Failed to read the system map. * @throws { BusinessError } 2103011 - Failed to create a system map. * @syscap SystemCapability.Communication.NetManager.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ - function getAllTxBytes(): Promise; + function getAllTxBytes(): Promise; /** * Queries the data traffic (including all TCP and UDP data packets) received by a specified application. - * @param { number } uid - Indicates the process ID of the application. - * @param { AsyncCallback } callback - Returns the data traffic received by the specified application. + * @param { int } uid - Indicates the process ID of the application. + * @param { AsyncCallback } callback - Returns the data traffic received by the specified application. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @throws { BusinessError } 2103005 - Failed to read the system map. * @throws { BusinessError } 2103011 - Failed to create a system map. * @syscap SystemCapability.Communication.NetManager.Core - * @since 10 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ - function getUidRxBytes(uid: number, callback: AsyncCallback): void; + function getUidRxBytes(uid: int, callback: AsyncCallback): void; /** * Queries the data traffic (including all TCP and UDP data packets) received by a specified application. - * @param { number } uid - Indicates the process ID of the application. - * @returns { Promise } The promise returned by the function. + * @param { int } uid - Indicates the process ID of the application. + * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @throws { BusinessError } 2103005 - Failed to read the system map. * @throws { BusinessError } 2103011 - Failed to create a system map. * @syscap SystemCapability.Communication.NetManager.Core - * @since 10 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ - function getUidRxBytes(uid: number): Promise; + function getUidRxBytes(uid: int): Promise; /** * Queries the data traffic (including all TCP and UDP data packets) sent by a specified application. - * @param { number } uid - Indicates the process ID of the application. - * @param { AsyncCallback } callback - Returns the data traffic sent by the specified application. + * @param { int } uid - Indicates the process ID of the application. + * @param { AsyncCallback } callback - Returns the data traffic sent by the specified application. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @throws { BusinessError } 2103005 - Failed to read the system map. * @throws { BusinessError } 2103011 - Failed to create a system map. * @syscap SystemCapability.Communication.NetManager.Core - * @since 10 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ - function getUidTxBytes(uid: number, callback: AsyncCallback): void; + function getUidTxBytes(uid: int, callback: AsyncCallback): void; /** * Queries the data traffic (including all TCP and UDP data packets) sent by a specified application. - * @param { number } uid - Indicates the process ID of the application. - * @returns { Promise } The promise returned by the function. + * @param { int } uid - Indicates the process ID of the application. + * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @throws { BusinessError } 2103005 - Failed to read the system map. * @throws { BusinessError } 2103011 - Failed to create a system map. * @syscap SystemCapability.Communication.NetManager.Core - * @since 10 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ - function getUidTxBytes(uid: number): Promise; + function getUidTxBytes(uid: int): Promise; /** * Register notifications of network traffic updates. * @permission ohos.permission.GET_NETWORK_STATS * @param { 'netStatsChange' } type - Indicates Event name. - * @param { Callback<{ iface: string, uid?: number }> } callback - The callback of on. + * @param { Callback<{ iface: string, uid?: int }> } callback - The callback of on. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Non-system applications use system APIs. * @throws { BusinessError } 401 - Parameter error. @@ -336,7 +358,7 @@ declare namespace statistics { * Unregister notifications of network traffic updates. * @permission ohos.permission.GET_NETWORK_STATS * @param { 'netStatsChange' } type - Indicates Event name. - * @param { Callback<{ iface: string, uid?: number }> } callback - The callback of off. + * @param { Callback<{ iface: string, uid?: int }> } callback - The callback of off. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Non-system applications use system APIs. * @throws { BusinessError } 401 - Parameter error. @@ -376,7 +398,8 @@ declare namespace statistics { * @throws { BusinessError } 2103017 - Failed to read the database. * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function getTrafficStatsByIface(ifaceInfo: IfaceInfo, callback: AsyncCallback): void; @@ -394,7 +417,8 @@ declare namespace statistics { * @throws { BusinessError } 2103017 - Failed to read the database. * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function getTrafficStatsByIface(ifaceInfo: IfaceInfo): Promise; @@ -412,7 +436,8 @@ declare namespace statistics { * @throws { BusinessError } 2103017 - Failed to read the database. * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function getTrafficStatsByUid(uidInfo: UidInfo, callback: AsyncCallback): void; @@ -430,68 +455,74 @@ declare namespace statistics { * @throws { BusinessError } 2103017 - Failed to read the database. * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function getTrafficStatsByUid(uidInfo: UidInfo): Promise; /** * Queries the data traffic (including all TCP and UDP data packets) received through a specified sockfd. - * @param { number } sockfd - Indicates the file descriptor of the given socket. - * @param { AsyncCallback } callback - Returns the data traffic bytes received by the specified sockfd. + * @param { int } sockfd - Indicates the file descriptor of the given socket. + * @param { AsyncCallback } callback - Returns the data traffic bytes received by the specified sockfd. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 2100001 - Invalid parameter value. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - function getSockfdRxBytes(sockfd: number, callback: AsyncCallback): void; + function getSockfdRxBytes(sockfd: int, callback: AsyncCallback): void; /** * Queries the data traffic (including all TCP and UDP data packets) received through a specified sockfd. - * @param { number } sockfd - Indicates the file descriptor of the given socket. - * @returns { Promise } Returns the data traffic bytes received by the specified sockfd. + * @param { int } sockfd - Indicates the file descriptor of the given socket. + * @returns { Promise } Returns the data traffic bytes received by the specified sockfd. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 2100001 - Invalid parameter value. * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - function getSockfdRxBytes(sockfd: number): Promise; + function getSockfdRxBytes(sockfd: int): Promise; /** * Queries the data traffic (including all TCP and UDP data packets) sent through a specified sockfd. - * @param { number } sockfd - Indicates the file descriptor of the given socket. - * @param { AsyncCallback } callback - Returns the data traffic bytes sent by the specified sockfd. + * @param { int } sockfd - Indicates the file descriptor of the given socket. + * @param { AsyncCallback } callback - Returns the data traffic bytes sent by the specified sockfd. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 2100001 - Invalid parameter value * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - function getSockfdTxBytes(sockfd: number, callback: AsyncCallback): void; + function getSockfdTxBytes(sockfd: int, callback: AsyncCallback): void; /** * Queries the data traffic (including all TCP and UDP data packets) sent through a specified sockfd. - * @param { number } sockfd - Indicates the file descriptor of the given socket. - * @returns { Promise } Returns the data traffic bytes sent by the specified sockfd. + * @param { int } sockfd - Indicates the file descriptor of the given socket. + * @returns { Promise } Returns the data traffic bytes sent by the specified sockfd. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 2100001 - Invalid parameter value * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - function getSockfdTxBytes(sockfd: number): Promise; + function getSockfdTxBytes(sockfd: int): Promise; /** * Parameters for obtaining detailed information on network interface traffic usage. * @interface IfaceInfo * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ export interface IfaceInfo { /** @@ -499,27 +530,30 @@ declare namespace statistics { * @type {string} * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ iface: string; /** * Start time for querying traffic. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ - startTime: number; + startTime: int; /** * End time for querying traffic. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ - endTime: number; + endTime: int; } /** @@ -527,7 +561,8 @@ declare namespace statistics { * @interface UidInfo * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ export interface UidInfo { /** @@ -535,18 +570,20 @@ declare namespace statistics { * @type {IfaceInfo} * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ ifaceInfo: IfaceInfo; /** * Uid of app for querying traffic. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ - uid: number; + uid: int; } /** @@ -554,44 +591,49 @@ declare namespace statistics { * @interface NetStatsInfo * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ export interface NetStatsInfo { /** * Bytes of received. - * @type {number} + * @type {long} * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ - rxBytes: number; + rxBytes: long; /** * Bytes of send. - * @type {number} + * @type {long} * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ - txBytes: number; + txBytes: long; /** * Packets of received. - * @type {number} + * @type {long} * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ - rxPackets: number; + rxPackets: long; /** * Packets of send. - * @type {number} + * @type {long} * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ - txPackets: number; + txPackets: long; } /** @@ -599,7 +641,8 @@ declare namespace statistics { * @interface NetStatsChangeInfo * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface NetStatsChangeInfo { /** @@ -607,17 +650,19 @@ declare namespace statistics { * @type { string } * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ iface: string; /** * Network interface for querying traffic. - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - uid?: number; + uid?: int; } /** @@ -629,26 +674,29 @@ declare namespace statistics { export type NetStatsInfoSequence = { /** * Start time for querying traffic. - * @type { number } + * @type { int } * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - startTime: number; + startTime: int; /** * End time for querying traffic. - * @type { number } + * @type { int } * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - endTime: number; + endTime: int; /** * Detailed information of statistics. * @type { NetStatsInfo } * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ info: NetStatsInfo; }[]; @@ -660,7 +708,7 @@ declare namespace statistics { * @since 12 */ export type UidNetStatsInfo = { - [uid: number]: NetStatsInfo; + [uid: int]: NetStatsInfo; }; /** @@ -668,7 +716,8 @@ declare namespace statistics { * @interface NetworkInfo * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export interface NetworkInfo { /** @@ -676,33 +725,37 @@ declare namespace statistics { * @type { NetBearType } * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ type: NetBearType; /** * Start time for querying traffic. - * @type { number } + * @type { int } * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - startTime: number; + startTime: int; /** * End time for querying traffic. - * @type { number } + * @type { int } * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - endTime: number; + endTime: int; /** * SIM card id for querying traffic. - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Communication.NetManager.Core * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - simId?: number; + simId?: int; } /** @@ -725,7 +778,7 @@ declare namespace statistics { /** * Get the traffic usage sequence of the specified network of the application in the specified time period. * @permission ohos.permission.GET_NETWORK_STATS - * @param { number } uid - UID with this parameter, get stats info of this UID. + * @param { int } uid - UID with this parameter, get stats info of this UID. * @param { NetworkInfo } networkInfo - Information about the network to be queried. * @returns { Promise } The statistics history of the sim card. * @throws { BusinessError } 201 - Permission denied. @@ -739,7 +792,7 @@ declare namespace statistics { * @systemapi Hide this for inner system use. * @since 12 */ - function getTrafficStatsByUidNetwork(uid: number, networkInfo: NetworkInfo): Promise; + function getTrafficStatsByUidNetwork(uid: int, networkInfo: NetworkInfo): Promise; } export default statistics; \ No newline at end of file diff --git a/api/@ohos.net.webSocket.d.ts b/api/@ohos.net.webSocket.d.ts index 27a9c8f7e9..8a707557df 100644 --- a/api/@ohos.net.webSocket.d.ts +++ b/api/@ohos.net.webSocket.d.ts @@ -21,6 +21,10 @@ import type { AsyncCallback, ErrorCallback, Callback } from './@ohos.base'; import type connection from './@ohos.net.connection'; +/*** if arkts 1.1 */ +import { int } from './@ohos.base'; +/*** endif */ + /** * Provides WebSocket APIs. * @namespace webSocket @@ -40,13 +44,15 @@ import type connection from './@ohos.net.connection'; * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace webSocket { /** * @typedef { connection.HttpProxy } * @syscap SystemCapability.Communication.NetManager.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ type HttpProxy = connection.HttpProxy; @@ -69,7 +75,8 @@ declare namespace webSocket { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function createWebSocket(): WebSocket; @@ -92,7 +99,8 @@ declare namespace webSocket { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface WebSocketRequestOptions { /** @@ -114,7 +122,8 @@ declare namespace webSocket { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ header?: Object; @@ -129,7 +138,8 @@ declare namespace webSocket { * @type {?string} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ caPath?: string; @@ -144,7 +154,8 @@ declare namespace webSocket { * @type {?ClientCert} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ clientCert?: ClientCert; @@ -152,7 +163,8 @@ declare namespace webSocket { * HTTP proxy configuration. Use 'system' if this filed is not set. * @type {?ProxyConfiguration} * @syscap SystemCapability.Communication.NetStack - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ proxy?: ProxyConfiguration; @@ -160,7 +172,8 @@ declare namespace webSocket { * Self defined protocol. * @type {?string} * @syscap SystemCapability.Communication.NetStack - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ protocol?: string; } @@ -172,7 +185,8 @@ declare namespace webSocket { * object of @type {connection.HttpProxy} means providing custom proxy settings * @typedef { 'system' | 'no-proxy' | HttpProxy } * @syscap SystemCapability.Communication.NetStack - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export type ProxyConfiguration = 'system' | 'no-proxy' | HttpProxy; @@ -191,7 +205,8 @@ declare namespace webSocket { * @interface ClientCert * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export interface ClientCert { /** @@ -205,7 +220,8 @@ declare namespace webSocket { * @type {string} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ certPath: string; @@ -220,7 +236,8 @@ declare namespace webSocket { * @type {string} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ keyPath: string; @@ -235,7 +252,8 @@ declare namespace webSocket { * @type {?string} * @syscap SystemCapability.Communication.NetStack * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ keyPassword?: string; } @@ -259,31 +277,33 @@ declare namespace webSocket { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface WebSocketCloseOptions { /** * Error code. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetStack * @since 6 */ /** * Error code. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetStack * @crossplatform * @since 10 */ /** * Error code. - * @type {?number} + * @type {?int} * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - code?: number; + code?: int; /** * Error cause. * @type {?string} @@ -303,7 +323,8 @@ declare namespace webSocket { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ reason?: string; } @@ -321,25 +342,27 @@ declare namespace webSocket { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface CloseResult { /** * Error code. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @crossplatform * @since 10 */ /** * Error code. - * @type {number} + * @type {int} * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - code: number; + code: int; /** * Error cause. * @type {string} @@ -353,7 +376,8 @@ declare namespace webSocket { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ reason: string; } @@ -390,7 +414,8 @@ declare namespace webSocket { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface WebSocket { /** @@ -443,7 +468,8 @@ declare namespace webSocket { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ connect(url: string, callback: AsyncCallback): void; @@ -501,7 +527,8 @@ declare namespace webSocket { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ connect(url: string, options: WebSocketRequestOptions, callback: AsyncCallback): void; @@ -559,7 +586,8 @@ declare namespace webSocket { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ connect(url: string, options?: WebSocketRequestOptions): Promise; @@ -594,7 +622,8 @@ declare namespace webSocket { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ send(data: string | ArrayBuffer, callback: AsyncCallback): void; @@ -629,7 +658,8 @@ declare namespace webSocket { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ send(data: string | ArrayBuffer): Promise; @@ -661,7 +691,8 @@ declare namespace webSocket { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ close(callback: AsyncCallback): void; @@ -696,7 +727,8 @@ declare namespace webSocket { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ close(options: WebSocketCloseOptions, callback: AsyncCallback): void; @@ -731,7 +763,8 @@ declare namespace webSocket { * @syscap SystemCapability.Communication.NetStack * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ close(options?: WebSocketCloseOptions): Promise; -- Gitee From d06f6661837427904dc9196fe32a5dfba6dafd79 Mon Sep 17 00:00:00 2001 From: s00659936 <282229496@qq.com> Date: Fri, 6 Jun 2025 12:50:40 +0800 Subject: [PATCH 038/746] telephony arkts1.2 Signed-off-by: s00659936 <282229496@qq.com> Change-Id: Ie16d2d46158c3d379b153396ae1ba57d1ee8b0c8 --- api/@ohos.telephony.data.d.ts | 66 +++++++++----- api/@ohos.telephony.esim.d.ts | 132 ++++++++++++++++++---------- api/@ohos.telephony.sim.d.ts | 159 ++++++++++++++++++++++------------ 3 files changed, 238 insertions(+), 119 deletions(-) diff --git a/api/@ohos.telephony.data.d.ts b/api/@ohos.telephony.data.d.ts index 0238fd0b39..8c2fb6033e 100644 --- a/api/@ohos.telephony.data.d.ts +++ b/api/@ohos.telephony.data.d.ts @@ -25,7 +25,8 @@ import type { AsyncCallback } from './@ohos.base'; * * @namespace data * @syscap SystemCapability.Telephony.CellularData - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace data { /** @@ -51,7 +52,8 @@ declare namespace data { * * @returns { number } Returns default cellular data slot id. * @syscap SystemCapability.Telephony.CellularData - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getDefaultCellularDataSlotIdSync(): number; @@ -134,7 +136,8 @@ declare namespace data { *

  • {@code DataConnectState#DATA_STATE_SUSPENDED} * * @syscap SystemCapability.Telephony.CellularData - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ function getCellularDataState(callback: AsyncCallback): void; @@ -150,7 +153,8 @@ declare namespace data { *
  • {@code DataConnectState#DATA_STATE_SUSPENDED} * * @syscap SystemCapability.Telephony.CellularData - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ function getCellularDataState(): Promise; @@ -168,7 +172,8 @@ declare namespace data { * @throws { BusinessError } 8300003 - System internal error. * @throws { BusinessError } 8300999 - Internal error. * @syscap SystemCapability.Telephony.CellularData - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ function isCellularDataEnabled(callback: AsyncCallback): void; @@ -183,7 +188,8 @@ declare namespace data { * @throws { BusinessError } 8300003 - System internal error. * @throws { BusinessError } 8300999 - Internal error. * @syscap SystemCapability.Telephony.CellularData - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ function isCellularDataEnabled(): Promise; @@ -217,7 +223,8 @@ declare namespace data { * @throws { BusinessError } 8300999 - Internal error. * @syscap SystemCapability.Telephony.CellularData * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ function enableCellularData(callback: AsyncCallback): void; @@ -233,7 +240,8 @@ declare namespace data { * @throws { BusinessError } 8300999 - Internal error. * @syscap SystemCapability.Telephony.CellularData * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ function enableCellularData(): Promise; @@ -252,7 +260,8 @@ declare namespace data { * @throws { BusinessError } 8300999 - Internal error. * @syscap SystemCapability.Telephony.CellularData * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ function disableCellularData(callback: AsyncCallback): void; @@ -268,7 +277,8 @@ declare namespace data { * @throws { BusinessError } 8300999 - Internal error. * @syscap SystemCapability.Telephony.CellularData * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ function disableCellularData(): Promise; @@ -551,14 +561,16 @@ declare namespace data { * * @enum { number } * @syscap SystemCapability.Telephony.CellularData - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ export enum DataFlowType { /** * Indicates that there is no uplink or downlink data. * * @syscap SystemCapability.Telephony.CellularData - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ DATA_FLOW_TYPE_NONE = 0, @@ -566,7 +578,8 @@ declare namespace data { * Indicates that there is only downlink data. * * @syscap SystemCapability.Telephony.CellularData - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ DATA_FLOW_TYPE_DOWN = 1, @@ -574,7 +587,8 @@ declare namespace data { * Indicates that there is only uplink data. * * @syscap SystemCapability.Telephony.CellularData - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ DATA_FLOW_TYPE_UP = 2, @@ -582,7 +596,8 @@ declare namespace data { * Indicates that there is uplink and downlink data. * * @syscap SystemCapability.Telephony.CellularData - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ DATA_FLOW_TYPE_UP_DOWN = 3, @@ -590,7 +605,8 @@ declare namespace data { * Indicates that there is no uplink or downlink data, and the bottom-layer link is in the dormant state. * * @syscap SystemCapability.Telephony.CellularData - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ DATA_FLOW_TYPE_DORMANT = 4 } @@ -600,14 +616,16 @@ declare namespace data { * * @enum { number } * @syscap SystemCapability.Telephony.CellularData - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ export enum DataConnectState { /** * Indicates that a cellular data link is unknown. * * @syscap SystemCapability.Telephony.CellularData - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ DATA_STATE_UNKNOWN = -1, @@ -615,7 +633,8 @@ declare namespace data { * Indicates that a cellular data link is disconnected. * * @syscap SystemCapability.Telephony.CellularData - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ DATA_STATE_DISCONNECTED = 0, @@ -623,7 +642,8 @@ declare namespace data { * Indicates that a cellular data link is being connected. * * @syscap SystemCapability.Telephony.CellularData - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ DATA_STATE_CONNECTING = 1, @@ -631,7 +651,8 @@ declare namespace data { * Indicates that a cellular data link is connected. * * @syscap SystemCapability.Telephony.CellularData - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ DATA_STATE_CONNECTED = 2, @@ -639,7 +660,8 @@ declare namespace data { * Indicates that a cellular data link is suspended. * * @syscap SystemCapability.Telephony.CellularData - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ DATA_STATE_SUSPENDED = 3 } diff --git a/api/@ohos.telephony.esim.d.ts b/api/@ohos.telephony.esim.d.ts index 8e2f80afe0..41148c8e0f 100644 --- a/api/@ohos.telephony.esim.d.ts +++ b/api/@ohos.telephony.esim.d.ts @@ -26,7 +26,8 @@ import type { AsyncCallback } from './@ohos.base'; * * @namespace eSIM * @syscap SystemCapability.Telephony.CoreService.Esim - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace eSIM { /** @@ -298,7 +299,8 @@ declare namespace eSIM { * @throws { BusinessError } 3120002 - System internal error. * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ function resetMemory(slotId: number, options?:ResetOption): Promise; @@ -850,7 +852,8 @@ declare namespace eSIM { * @enum { number } * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ export enum ResetOption { /** @@ -858,7 +861,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ DELETE_OPERATIONAL_PROFILES = 1, @@ -867,7 +871,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ DELETE_FIELD_LOADED_TEST_PROFILES = 1 << 1, @@ -876,7 +881,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESET_DEFAULT_SMDP_ADDRESS = 1 << 2, } @@ -942,7 +948,8 @@ declare namespace eSIM { * @enum { number } * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ export enum ResultCode { /** @@ -950,7 +957,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_SOLVABLE_ERRORS = -2, @@ -959,7 +967,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_MUST_DISABLE_PROFILE = -1, @@ -968,7 +977,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_OK = 0, @@ -977,7 +987,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_GET_EID_FAILED = 201, @@ -986,7 +997,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_ACTIVATION_CODE_CHANGED = 203, @@ -995,7 +1007,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_ACTIVATION_CODE_INVALID = 204, @@ -1004,7 +1017,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_SMDP_ADDRESS_INVALID = 205, @@ -1013,7 +1027,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_EUICC_INFO_INVALID = 206, @@ -1022,7 +1037,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_TLS_HANDSHAKE_FAILED = 207, @@ -1031,7 +1047,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_CERTIFICATE_IO_ERROR = 208, @@ -1040,7 +1057,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_CERTIFICATE_RESPONSE_TIMEOUT = 209, @@ -1049,7 +1067,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_AUTHENTICATION_FAILED = 210, @@ -1058,7 +1077,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_RESPONSE_HTTP_FAILED = 211, @@ -1067,7 +1087,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_CONFIRMATION_CODE_INCORRECT = 212, @@ -1076,7 +1097,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_EXCEEDED_CONFIRMATION_CODE_TRY_LIMIT = 213, @@ -1085,7 +1107,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_NO_PROFILE_ON_SERVER = 214, @@ -1094,7 +1117,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_TRANSACTION_ID_INVALID = 215, @@ -1103,7 +1127,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_SERVER_ADDRESS_INVALID = 216, @@ -1112,7 +1137,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_GET_BOUND_PROFILE_PACKAGE_FAILED = 217, @@ -1121,7 +1147,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_USER_CANCEL_DOWNLOAD = 218, @@ -1130,7 +1157,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_SERVER_UNAVAILABLE = 220, @@ -1139,7 +1167,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_PROFILE_NON_DELETE = 223, @@ -1148,7 +1177,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_SMDP_ADDRESS_INCORRECT = 226, @@ -1157,7 +1187,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_ANALYZE_AUTHENTICATION_SERVER_RESPONSE_FAILED = 228, @@ -1166,7 +1197,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_ANALYZE_AUTHENTICATION_CLIENT_RESPONSE_FAILED = 229, @@ -1175,7 +1207,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_ANALYZE_AUTHENTICATION_CLIENT_MATCHING_ID_REFUSED = 231, @@ -1184,7 +1217,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_PROFILE_TYPE_ERROR_AUTHENTICATION_STOPPED = 233, @@ -1193,7 +1227,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_CARRIER_SERVER_REFUSED_ERRORS = 249, @@ -1202,7 +1237,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_CERTIFICATE_INVALID = 251, @@ -1211,7 +1247,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_OUT_OF_MEMORY = 263, @@ -1220,7 +1257,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_PPR_FORBIDDEN = 268, @@ -1229,7 +1267,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_NOTHING_TO_DELETE = 270, @@ -1238,7 +1277,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_PPR_NOT_MATCH = 276, @@ -1247,7 +1287,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_CAT_BUSY = 283, @@ -1256,7 +1297,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_PROFILE_EID_INVALID = 284, @@ -1265,7 +1307,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_DOWNLOAD_TIMEOUT = 287, @@ -1274,7 +1317,8 @@ declare namespace eSIM { * * @syscap SystemCapability.Telephony.CoreService.Esim * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RESULT_SGP_22_OTHER = 400, } diff --git a/api/@ohos.telephony.sim.d.ts b/api/@ohos.telephony.sim.d.ts index 37f1d31d08..c57d6880fd 100644 --- a/api/@ohos.telephony.sim.d.ts +++ b/api/@ohos.telephony.sim.d.ts @@ -26,7 +26,8 @@ import type { AsyncCallback } from './@ohos.base'; * * @namespace sim * @syscap SystemCapability.Telephony.CoreService - * @since 6 + * @since arkts {'1.1':'6','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace sim { /** @@ -38,7 +39,8 @@ declare namespace sim { * whether the SIM card in a specified slot is activated. * Returns {@code true} if the SIM card is activated; returns {@code false} otherwise. * @syscap SystemCapability.Telephony.CoreService - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ function isSimActive(slotId: number, callback: AsyncCallback): void; @@ -49,7 +51,8 @@ declare namespace sim { * ranging from {@code 0} to the maximum card slot index number supported by the device. * @returns { Promise } Returns {@code true} if the SIM card is activated; returns {@code false} otherwise. * @syscap SystemCapability.Telephony.CoreService - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ function isSimActive(slotId: number): Promise; @@ -60,7 +63,8 @@ declare namespace sim { * ranging from 0 to the maximum card slots supported by the device. * @returns { boolean } Returns {@code true} if the SIM card is activated; returns {@code false} otherwise. * @syscap SystemCapability.Telephony.CoreService - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function isSimActiveSync(slotId: number): boolean; @@ -73,7 +77,8 @@ declare namespace sim { * returns {@code 1} if card 2 is used as the default card slot for the voice service; * returns {@code -1} if no card is available for the voice service. * @syscap SystemCapability.Telephony.CoreService - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ function getDefaultVoiceSlotId(callback: AsyncCallback): void; @@ -84,7 +89,8 @@ declare namespace sim { * returns {@code 1} if card 2 is used as the default card slot for the voice service; * returns {@code -1} if no card is available for the voice service. * @syscap SystemCapability.Telephony.CoreService - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ function getDefaultVoiceSlotId(): Promise; @@ -141,7 +147,8 @@ declare namespace sim { * @throws { BusinessError } 8300004 - No SIM card found. * @throws { BusinessError } 8300999 - Unknown error. * @syscap SystemCapability.Telephony.CoreService - * @since 6 + * @since arkts {'1.1':'6','1.2':'20'} + * @arkts 1.1&1.2 */ function getISOCountryCodeForSim(slotId: number, callback: AsyncCallback): void; @@ -160,7 +167,8 @@ declare namespace sim { * @throws { BusinessError } 8300004 - No SIM card found. * @throws { BusinessError } 8300999 - Unknown error. * @syscap SystemCapability.Telephony.CoreService - * @since 6 + * @since arkts {'1.1':'6','1.2':'20'} + * @arkts 1.1&1.2 */ function getISOCountryCodeForSim(slotId: number): Promise; @@ -313,7 +321,8 @@ declare namespace sim { * @throws { BusinessError } 8300003 - System internal error. * @throws { BusinessError } 8300999 - Unknown error. * @syscap SystemCapability.Telephony.CoreService - * @since 6 + * @since arkts {'1.1':'6','1.2':'20'} + * @arkts 1.1&1.2 */ function getSimState(slotId: number, callback: AsyncCallback): void; @@ -338,7 +347,8 @@ declare namespace sim { * @throws { BusinessError } 8300003 - System internal error. * @throws { BusinessError } 8300999 - Unknown error. * @syscap SystemCapability.Telephony.CoreService - * @since 6 + * @since arkts {'1.1':'6','1.2':'20'} + * @arkts 1.1&1.2 */ function getSimState(slotId: number): Promise; @@ -357,7 +367,8 @@ declare namespace sim { *
  • {@code SimState#SIM_STATE_LOADED} * * @syscap SystemCapability.Telephony.CoreService - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function getSimStateSync(slotId: number): SimState; @@ -704,7 +715,8 @@ declare namespace sim { * * @returns { number } Returns the maximum number of SIM card slots. * @syscap SystemCapability.Telephony.CoreService - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ function getMaxSimCount(): number; @@ -788,7 +800,8 @@ declare namespace sim { * @throws { BusinessError } 8300003 - System internal error. * @throws { BusinessError } 8300999 - Unknown error. * @syscap SystemCapability.Telephony.CoreService - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ function hasSimCard(slotId: number, callback: AsyncCallback): void; @@ -805,7 +818,8 @@ declare namespace sim { * @throws { BusinessError } 8300003 - System internal error. * @throws { BusinessError } 8300999 - Unknown error. * @syscap SystemCapability.Telephony.CoreService - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ function hasSimCard(slotId: number): Promise; @@ -838,7 +852,8 @@ declare namespace sim { * @throws { BusinessError } 8300999 - Unknown error. * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. * @syscap SystemCapability.Telephony.CoreService - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function getSimAccountInfo(slotId: number, callback: AsyncCallback): void; @@ -859,7 +874,8 @@ declare namespace sim { * @throws { BusinessError } 8300999 - Unknown error. * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. * @syscap SystemCapability.Telephony.CoreService - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function getSimAccountInfo(slotId: number): Promise; @@ -878,7 +894,8 @@ declare namespace sim { * @throws { BusinessError } 8300004 - No SIM card found. * @throws { BusinessError } 8300999 - Unknown error. * @syscap SystemCapability.Telephony.CoreService - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function getActiveSimAccountInfoList(callback: AsyncCallback>): void; @@ -893,7 +910,8 @@ declare namespace sim { * @throws { BusinessError } 8300004 - No SIM card found. * @throws { BusinessError } 8300999 - Unknown error. * @syscap SystemCapability.Telephony.CoreService - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function getActiveSimAccountInfoList(): Promise>; @@ -1230,7 +1248,8 @@ declare namespace sim { * @throws { BusinessError } 8300999 - Unknown error. * @syscap SystemCapability.Telephony.CoreService * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getOperatorConfigs(slotId: number, callback: AsyncCallback>): void; @@ -1252,7 +1271,8 @@ declare namespace sim { * @throws { BusinessError } 8300999 - Unknown error. * @syscap SystemCapability.Telephony.CoreService * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getOperatorConfigs(slotId: number): Promise>; @@ -1277,7 +1297,8 @@ declare namespace sim { * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. * @syscap SystemCapability.Telephony.CoreService * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ function unlockPin(slotId: number, pin: string, callback: AsyncCallback): void; @@ -1302,7 +1323,8 @@ declare namespace sim { * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. * @syscap SystemCapability.Telephony.CoreService * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ function unlockPin(slotId: number, pin: string): Promise; @@ -1328,7 +1350,8 @@ declare namespace sim { * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. * @syscap SystemCapability.Telephony.CoreService * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ function unlockPuk(slotId: number, newPin: string, puk: string, callback: AsyncCallback): void; @@ -1354,7 +1377,8 @@ declare namespace sim { * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. * @syscap SystemCapability.Telephony.CoreService * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ function unlockPuk(slotId: number, newPin: string, puk: string): Promise; @@ -1833,7 +1857,8 @@ declare namespace sim { * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. * @syscap SystemCapability.Telephony.CoreService * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getLockState(slotId: number, lockType: LockType, callback: AsyncCallback): void; @@ -1857,7 +1882,8 @@ declare namespace sim { * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. * @syscap SystemCapability.Telephony.CoreService * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getLockState(slotId: number, lockType: LockType): Promise; @@ -2223,7 +2249,8 @@ declare namespace sim { * @interface OperatorConfig * @syscap SystemCapability.Telephony.CoreService * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ export interface OperatorConfig { /** @@ -2232,7 +2259,8 @@ declare namespace sim { * @type { string } * @syscap SystemCapability.Telephony.CoreService * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ field: string; @@ -2242,7 +2270,8 @@ declare namespace sim { * @type { string } * @syscap SystemCapability.Telephony.CoreService * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ value: string; } @@ -2252,7 +2281,8 @@ declare namespace sim { * * @interface IccAccountInfo * @syscap SystemCapability.Telephony.CoreService - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ export interface IccAccountInfo { /** @@ -2260,7 +2290,8 @@ declare namespace sim { * * @type { number } * @syscap SystemCapability.Telephony.CoreService - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ simId: number; @@ -2270,7 +2301,8 @@ declare namespace sim { * * @type { number } * @syscap SystemCapability.Telephony.CoreService - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ slotIndex: number; @@ -2279,7 +2311,8 @@ declare namespace sim { * * @type { boolean } * @syscap SystemCapability.Telephony.CoreService - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ isEsim: boolean; @@ -2288,7 +2321,8 @@ declare namespace sim { * * @type { boolean } * @syscap SystemCapability.Telephony.CoreService - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ isActive: boolean; @@ -2297,7 +2331,8 @@ declare namespace sim { * * @type { string } * @syscap SystemCapability.Telephony.CoreService - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ iccId: string; @@ -2306,7 +2341,8 @@ declare namespace sim { * * @type { string } * @syscap SystemCapability.Telephony.CoreService - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ showName: string; @@ -2315,7 +2351,8 @@ declare namespace sim { * * @type { string } * @syscap SystemCapability.Telephony.CoreService - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ showNumber: string; } @@ -2326,7 +2363,8 @@ declare namespace sim { * @interface LockStatusResponse * @syscap SystemCapability.Telephony.CoreService * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ export interface LockStatusResponse { /** @@ -2335,7 +2373,8 @@ declare namespace sim { * @type { number } * @syscap SystemCapability.Telephony.CoreService * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ result: number; @@ -2345,7 +2384,8 @@ declare namespace sim { * @type { ?number } * @syscap SystemCapability.Telephony.CoreService * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ remain?: number; } @@ -2476,7 +2516,8 @@ declare namespace sim { * @enum { number } * @syscap SystemCapability.Telephony.CoreService * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ export enum LockType { /** @@ -2484,7 +2525,8 @@ declare namespace sim { * * @syscap SystemCapability.Telephony.CoreService * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ PIN_LOCK = 1, @@ -2493,7 +2535,8 @@ declare namespace sim { * * @syscap SystemCapability.Telephony.CoreService * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ FDN_LOCK = 2, } @@ -2591,7 +2634,8 @@ declare namespace sim { * * @enum { number } * @syscap SystemCapability.Telephony.CoreService - * @since 6 + * @since arkts {'1.1':'6','1.2':'20'} + * @arkts 1.1&1.2 */ export enum SimState { /** @@ -2599,7 +2643,8 @@ declare namespace sim { * obtained. * * @syscap SystemCapability.Telephony.CoreService - * @since 6 + * @since arkts {'1.1':'6','1.2':'20'} + * @arkts 1.1&1.2 */ SIM_STATE_UNKNOWN, @@ -2608,7 +2653,8 @@ declare namespace sim { * no SIM card is inserted into the card slot. * * @syscap SystemCapability.Telephony.CoreService - * @since 6 + * @since arkts {'1.1':'6','1.2':'20'} + * @arkts 1.1&1.2 */ SIM_STATE_NOT_PRESENT, @@ -2618,7 +2664,8 @@ declare namespace sim { * unblocking key (PUK) or network. * * @syscap SystemCapability.Telephony.CoreService - * @since 6 + * @since arkts {'1.1':'6','1.2':'20'} + * @arkts 1.1&1.2 */ SIM_STATE_LOCKED, @@ -2627,7 +2674,8 @@ declare namespace sim { * the SIM card is in position but cannot work properly. * * @syscap SystemCapability.Telephony.CoreService - * @since 6 + * @since arkts {'1.1':'6','1.2':'20'} + * @arkts 1.1&1.2 */ SIM_STATE_NOT_READY, @@ -2636,7 +2684,8 @@ declare namespace sim { * SIM card is in position and is working properly. * * @syscap SystemCapability.Telephony.CoreService - * @since 6 + * @since arkts {'1.1':'6','1.2':'20'} + * @arkts 1.1&1.2 */ SIM_STATE_READY, @@ -2645,7 +2694,8 @@ declare namespace sim { * SIM card is in position and is working properly. * * @syscap SystemCapability.Telephony.CoreService - * @since 6 + * @since arkts {'1.1':'6','1.2':'20'} + * @arkts 1.1&1.2 */ SIM_STATE_LOADED } @@ -2656,7 +2706,8 @@ declare namespace sim { * @enum { number } * @syscap SystemCapability.Telephony.CoreService * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ export enum LockState { /** @@ -2664,7 +2715,8 @@ declare namespace sim { * * @syscap SystemCapability.Telephony.CoreService * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ LOCK_OFF = 0, @@ -2673,7 +2725,8 @@ declare namespace sim { * * @syscap SystemCapability.Telephony.CoreService * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ LOCK_ON = 1, } -- Gitee From f1657b8a5035e02ec600bd9f94284a1bccaef23f Mon Sep 17 00:00:00 2001 From: BrainL Date: Tue, 8 Jul 2025 16:48:59 +0800 Subject: [PATCH 039/746] =?UTF-8?q?dm=200328=E5=90=88=E5=B9=B60702?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: BrainL --- api/@ohos.file.fileuri.d.ts | 2 +- api/@ohos.file.keyManager.d.ts | 10 +-- api/@ohos.file.storageStatistics.d.ts | 99 ++++++++++++++++----------- api/@ohos.file.volumeManager.d.ts | 26 ++++--- api/@ohos.fileshare.d.ts | 14 ++-- 5 files changed, 89 insertions(+), 62 deletions(-) diff --git a/api/@ohos.file.fileuri.d.ts b/api/@ohos.file.fileuri.d.ts index 93d80cdf64..e93b1bc3db 100644 --- a/api/@ohos.file.fileuri.d.ts +++ b/api/@ohos.file.fileuri.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2023 Huawei Device Co., Ltd. + * Copyright (C) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/api/@ohos.file.keyManager.d.ts b/api/@ohos.file.keyManager.d.ts index 058ad8dd99..e408f34592 100644 --- a/api/@ohos.file.keyManager.d.ts +++ b/api/@ohos.file.keyManager.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2024-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -23,14 +23,14 @@ * * @namespace keyManager * @syscap SystemCapability.FileManagement.StorageService.Encryption - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} */ declare namespace keyManager { /** * Initiate the deactivation of user key for the specified user when user screen is locked. * * @permission ohos.permission.STORAGE_MANAGER_CRYPT - * @param { number } userId + * @param { long } userId * @throws { BusinessError } 201 - Permission verification failed. * @throws { BusinessError } 202 - The caller is not a system application. * @throws { BusinessError } 401 - The input parameter is invalid. Possible causes: Mandatory @@ -40,9 +40,9 @@ declare namespace keyManager { * @throws { BusinessError } 13600009 - User ID out of range. Possible causes: input parameter userId < 100 or userId > 10736. * @syscap SystemCapability.FileManagement.StorageService.Encryption * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} */ - function deactivateUserKey(userId: number):void; + function deactivateUserKey(userId: long):void; } export default keyManager; \ No newline at end of file diff --git a/api/@ohos.file.storageStatistics.d.ts b/api/@ohos.file.storageStatistics.d.ts index 0bcb09387a..7627a32416 100644 --- a/api/@ohos.file.storageStatistics.d.ts +++ b/api/@ohos.file.storageStatistics.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2023 Huawei Device Co., Ltd. + * Copyright (C) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -25,7 +25,8 @@ import { AsyncCallback, Callback } from './@ohos.base'; * * @namespace storageStatistics * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace storageStatistics { /** @@ -112,35 +113,39 @@ parameters are left unspecified; * * @interface BundleStats * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface BundleStats { /** * The size of application installation data. * - * @type { number } + * @type { long } * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - appSize: number; + appSize: long; /** * The size of application cache data. * - * @type { number } + * @type { long } * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - cacheSize: number; + cacheSize: long; /** * The size of application local data, distributed data and database data. * - * @type { number } + * @type { long } * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - dataSize: number; + dataSize: long; } /** * Get the bundle statistics. @@ -225,7 +230,8 @@ parameters are left unspecified; * @throws { BusinessError } 13600001 - IPC error. * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getCurrentBundleStats(callback: AsyncCallback): void; @@ -238,7 +244,8 @@ parameters are left unspecified; * @throws { BusinessError } 13600001 - IPC error. * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getCurrentBundleStats(): Promise; @@ -282,18 +289,20 @@ parameters are left unspecified; * @interface StorageStats * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface StorageStats { /** * The total size of device. * - * @type { number } + * @type { long } * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - total: number; + total: long; /** * The size of audio file. @@ -360,7 +369,8 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getUserStorageStats(): Promise; @@ -378,7 +388,8 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getUserStorageStats(callback: AsyncCallback): void; @@ -386,7 +397,7 @@ parameters are left unspecified; * Get the user storage statistics. * * @permission ohos.permission.STORAGE_MANAGER - * @param { number } userId - The id of the user + * @param { long } userId - The id of the user * @returns { Promise } return Promise * @throws { BusinessError } 201 - Permission verification failed. * @throws { BusinessError } 202 - The caller is not a system application. @@ -398,15 +409,16 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - function getUserStorageStats(userId: number): Promise; + function getUserStorageStats(userId: long): Promise; /** * Get the user storage statistics. * * @permission ohos.permission.STORAGE_MANAGER - * @param { number } userId - The id of the user + * @param { long } userId - The id of the user * @param { AsyncCallback } callback - callback * @throws { BusinessError } 201 - Permission verification failed. * @throws { BusinessError } 202 - The caller is not a system application. @@ -418,15 +430,16 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - function getUserStorageStats(userId: number, callback: AsyncCallback): void; + function getUserStorageStats(userId: long, callback: AsyncCallback): void; /** * Get the total size. * * @permission ohos.permission.STORAGE_MANAGER - * @param { AsyncCallback } callback - callback + * @param { AsyncCallback } callback - callback * @throws { BusinessError } 201 - Permission verification failed. * @throws { BusinessError } 202 - The caller is not a system application. * @throws { BusinessError } 401 - The input parameter is invalid.Possible causes:Mandatory @@ -440,21 +453,22 @@ parameters are left unspecified; /** * Get the total size. * - * @param { AsyncCallback } callback - callback + * @param { AsyncCallback } callback - callback * @throws { BusinessError } 401 - The input parameter is invalid.Possible causes:Mandatory parameters are left unspecified; * @throws { BusinessError } 13600001 - IPC error. * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ - function getTotalSize(callback: AsyncCallback): void; + function getTotalSize(callback: AsyncCallback): void; /** * Get the total size. * * @permission ohos.permission.STORAGE_MANAGER - * @returns { Promise } return Promise + * @returns { Promise } return Promise * @throws { BusinessError } 201 - Permission verification failed. * @throws { BusinessError } 202 - The caller is not a system application. * @throws { BusinessError } 401 - The input parameter is invalid.Possible causes:Mandatory @@ -468,13 +482,14 @@ parameters are left unspecified; /** * Get the total size. * - * @returns { Promise } return Promise + * @returns { Promise } return Promise * @throws { BusinessError } 13600001 - IPC error. * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ - function getTotalSize(): Promise; + function getTotalSize(): Promise; /** * Get the total size with sync interface @@ -520,21 +535,22 @@ parameters are left unspecified; /** * Get the free size. * - * @param { AsyncCallback } callback - callback + * @param { AsyncCallback } callback - callback * @throws { BusinessError } 401 - The input parameter is invalid.Possible causes:Mandatory parameters are left unspecified; * @throws { BusinessError } 13600001 - IPC error. * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ - function getFreeSize(callback: AsyncCallback): void; + function getFreeSize(callback: AsyncCallback): void; /** * Get the free size. * * @permission ohos.permission.STORAGE_MANAGER - * @returns { Promise } return Promise + * @returns { Promise } return Promise * @throws { BusinessError } 201 - Permission verification failed. * @throws { BusinessError } 202 - The caller is not a system application. * @throws { BusinessError } 401 - The input parameter is invalid.Possible causes:Mandatory @@ -548,13 +564,14 @@ parameters are left unspecified; /** * Get the free size. * - * @returns { Promise } return Promise + * @returns { Promise } return Promise * @throws { BusinessError } 13600001 - IPC error. * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ - function getFreeSize(): Promise; + function getFreeSize(): Promise; /** * Get the free size with sync interface. diff --git a/api/@ohos.file.volumeManager.d.ts b/api/@ohos.file.volumeManager.d.ts index 87377b2690..1b90ba7c3f 100644 --- a/api/@ohos.file.volumeManager.d.ts +++ b/api/@ohos.file.volumeManager.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2023 Huawei Device Co., Ltd. + * Copyright (C) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -26,7 +26,8 @@ import { AsyncCallback, Callback } from './@ohos.base'; * @namespace volumeManager * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace volumeManager { /** @@ -35,7 +36,8 @@ declare namespace volumeManager { * @interface Volume * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface Volume { /** @@ -54,7 +56,8 @@ declare namespace volumeManager { * @type { string } * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ uuid: string; @@ -74,7 +77,8 @@ declare namespace volumeManager { * @type { string } * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ description: string; @@ -131,7 +135,8 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllVolumes(callback: AsyncCallback>): void; @@ -148,7 +153,8 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllVolumes(): Promise>; @@ -260,7 +266,8 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getVolumeByUuid(uuid: string, callback: AsyncCallback): void; @@ -280,7 +287,8 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getVolumeByUuid(uuid: string): Promise; diff --git a/api/@ohos.fileshare.d.ts b/api/@ohos.fileshare.d.ts index ec9b89fe1a..6deb82eca6 100644 --- a/api/@ohos.fileshare.d.ts +++ b/api/@ohos.fileshare.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Huawei Device Co., Ltd. + * Copyright (C) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -38,7 +38,7 @@ declare namespace fileShare { /** * Enumerates the uri operate mode types. * - * @enum { number } OperationMode + * @enum { int } OperationMode * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 @@ -186,12 +186,12 @@ declare namespace fileShare { /** * Indicates the mode of operation for the URI, example { OperationMode.READ_MODE } or { OperationMode.READ_MODE | OperationMode.WRITE_MODE } * - * @type { number } + * @type { int } * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - operationMode: number; + operationMode: int; } /** @@ -357,7 +357,8 @@ declare namespace fileShare { * @throws { BusinessError } 13900001 - Operation not permitted. * @throws { BusinessError } 13900042 - Out of memory * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function activatePermission(policies: Array): Promise; @@ -374,7 +375,8 @@ declare namespace fileShare { * @throws { BusinessError } 13900001 - Operation not permitted. * @throws { BusinessError } 13900042 - Out of memory * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function deactivatePermission(policies: Array): Promise; -- Gitee From 9ff2f061b88e9beaad1bed13b846643dd4a5d6b4 Mon Sep 17 00:00:00 2001 From: fengyang Date: Tue, 1 Jul 2025 20:11:30 +0800 Subject: [PATCH 040/746] =?UTF-8?q?usageStatistics=20=E6=94=AF=E6=8C=81Ark?= =?UTF-8?q?Ts=201.2=20Signed-off-by:=20fengyang=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ohos.resourceschedule.usageStatistics.d.ts | 294 ++++++++++++------ 1 file changed, 196 insertions(+), 98 deletions(-) diff --git a/api/@ohos.resourceschedule.usageStatistics.d.ts b/api/@ohos.resourceschedule.usageStatistics.d.ts index c27d16e1fa..4f4ccd9ec1 100644 --- a/api/@ohos.resourceschedule.usageStatistics.d.ts +++ b/api/@ohos.resourceschedule.usageStatistics.d.ts @@ -31,14 +31,16 @@ import { AsyncCallback, Callback } from './@ohos.base'; * * @namespace usageStatistics * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ declare namespace usageStatistics { /** * @interface BundleStatsInfo * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ interface BundleStatsInfo { /** @@ -46,7 +48,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ id: number; @@ -55,7 +58,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ abilityInFgTotalTime?: number; @@ -64,7 +68,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ abilityPrevAccessTime?: number; @@ -73,7 +78,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ abilityPrevSeenTime?: number; @@ -82,7 +88,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ abilitySeenTotalTime?: number; @@ -91,7 +98,8 @@ declare namespace usageStatistics { * @type { ?string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ bundleName?: string; @@ -100,7 +108,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ fgAbilityAccessTotalTime?: number; @@ -109,7 +118,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ fgAbilityPrevAccessTime?: number; @@ -119,7 +129,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ infosBeginTime?: number; @@ -129,7 +140,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ infosEndTime?: number; @@ -138,7 +150,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 15 + * @since arkts{ '1.1':'15', '1.2':'20' } + * @arkts 1.1&1.2 */ appIndex?: number; } @@ -147,7 +160,8 @@ declare namespace usageStatistics { * @interface HapFormInfo * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ interface HapFormInfo { /** @@ -155,7 +169,8 @@ declare namespace usageStatistics { * @type { string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ formName: string; @@ -164,7 +179,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ formDimension: number; @@ -173,7 +189,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ formId: number; @@ -182,7 +199,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ formLastUsedTime: number; @@ -191,7 +209,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ count: number; } @@ -200,7 +219,8 @@ declare namespace usageStatistics { * @interface HapModuleInfo * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ interface HapModuleInfo { /** @@ -208,7 +228,8 @@ declare namespace usageStatistics { * @type { ?string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ deviceId?: string; @@ -217,7 +238,8 @@ declare namespace usageStatistics { * @type { string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ bundleName: string; @@ -226,7 +248,8 @@ declare namespace usageStatistics { * @type { string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ moduleName: string; @@ -235,7 +258,8 @@ declare namespace usageStatistics { * @type { ?string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ abilityName?: string; @@ -244,7 +268,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ appLabelId?: number; @@ -253,7 +278,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ labelId?: number; @@ -262,7 +288,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ descriptionId?: number; @@ -271,7 +298,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ abilityLableId?: number; @@ -280,7 +308,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ abilityDescriptionId?: number; @@ -289,7 +318,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ abilityIconId?: number; @@ -298,7 +328,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ launchedCount: number; @@ -307,7 +338,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ lastModuleUsedTime: number; @@ -316,7 +348,8 @@ declare namespace usageStatistics { * @type { Array } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ formRecords: Array; } @@ -325,7 +358,8 @@ declare namespace usageStatistics { * @interface DeviceEventStats * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ interface DeviceEventStats { /** @@ -333,7 +367,8 @@ declare namespace usageStatistics { * @type { string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ name: string; @@ -342,7 +377,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ eventId: number; @@ -351,7 +387,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ count: number; } @@ -360,7 +397,8 @@ declare namespace usageStatistics { * @interface BundleEvents * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ interface BundleEvents { /** @@ -368,7 +406,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ appGroup?: number; @@ -377,7 +416,8 @@ declare namespace usageStatistics { * @type { ?string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ bundleName?: string; @@ -386,7 +426,8 @@ declare namespace usageStatistics { * @type { ?string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ indexOfLink?: string; @@ -395,7 +436,8 @@ declare namespace usageStatistics { * @type { ?string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ nameOfClass?: string; @@ -404,7 +446,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ eventOccurredTime?: number; @@ -413,7 +456,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ eventId?: number; } @@ -422,7 +466,8 @@ declare namespace usageStatistics { * @interface AppGroupCallbackInfo * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ interface AppGroupCallbackInfo { /** @@ -430,7 +475,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ appOldGroup: number; @@ -439,7 +485,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ appNewGroup: number; @@ -448,7 +495,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ userId: number; @@ -457,7 +505,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ changeReason: number; @@ -466,7 +515,8 @@ declare namespace usageStatistics { * @type { string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ bundleName: string; } @@ -492,7 +542,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000006 - Failed to get the application information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function isIdleState(bundleName: string, callback: AsyncCallback): void; @@ -517,7 +568,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000006 - Failed to get the application information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function isIdleState(bundleName: string): Promise; @@ -542,7 +594,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000006 - Failed to get the application information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts{ '1.1':'10', '1.2':'20' } + * @arkts 1.1&1.2 */ function isIdleStateSync(bundleName: string): boolean; @@ -568,7 +621,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100002 - Failed to get the application group information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryAppGroup(callback: AsyncCallback): void; @@ -594,7 +648,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100002 - Failed to get the application group information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryAppGroup(): Promise; @@ -619,7 +674,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100002 - Failed to get the application group information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts{ '1.1':'10', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryAppGroupSync(): number; @@ -646,7 +702,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100002 - Failed to get the application group information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryAppGroup(bundleName: string, callback: AsyncCallback): void; @@ -673,7 +730,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100002 - Failed to get the application group information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryAppGroup(bundleName: string): Promise; @@ -699,7 +757,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100002 - Failed to get the application group information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts{ '1.1':'10', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryAppGroupSync(bundleName: string): number; @@ -707,7 +766,8 @@ declare namespace usageStatistics { * @typedef { Record } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ type BundleStatsMap = Record; @@ -733,7 +793,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryBundleStatsInfos(begin: number, end: number, callback: AsyncCallback): void; @@ -759,7 +820,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryBundleStatsInfos(begin: number, end: number): Promise; @@ -767,7 +829,8 @@ declare namespace usageStatistics { * @typedef { Record> } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 15 + * @since arkts{ '1.1':'15', '1.2':'20' } + * @arkts 1.1&1.2 */ type AppStatsMap = Record>; @@ -793,7 +856,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 15 + * @since arkts{ '1.1':'15', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryAppStatsInfos(begin: number, end: number): Promise; @@ -818,7 +882,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 15 + * @since arkts{ '1.1':'15', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryLastUseTime(appInfo: Record>): Promise; @@ -828,7 +893,8 @@ declare namespace usageStatistics { * @enum { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ export enum IntervalType { /** @@ -836,7 +902,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ BY_OPTIMIZED = 0, @@ -845,7 +912,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ BY_DAILY = 1, @@ -854,7 +922,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ BY_WEEKLY = 2, @@ -863,7 +932,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ BY_MONTHLY = 3, @@ -872,7 +942,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ BY_ANNUALLY = 4 } @@ -901,7 +972,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryBundleStatsInfoByInterval( byInterval: IntervalType, @@ -934,7 +1006,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryBundleStatsInfoByInterval( byInterval: IntervalType, @@ -964,7 +1037,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryBundleEvents(begin: number, end: number, callback: AsyncCallback>): void; @@ -990,7 +1064,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryBundleEvents(begin: number, end: number): Promise>; @@ -1014,7 +1089,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryCurrentBundleEvents(begin: number, end: number, callback: AsyncCallback>): void; @@ -1038,7 +1114,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryCurrentBundleEvents(begin: number, end: number): Promise>; @@ -1063,7 +1140,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryModuleUsageRecords(maxNum: number, callback: AsyncCallback>): void; @@ -1088,7 +1166,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryModuleUsageRecords(maxNum: number): Promise>; @@ -1112,7 +1191,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryModuleUsageRecords(callback: AsyncCallback>): void; @@ -1136,7 +1216,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryModuleUsageRecords(): Promise>; @@ -1146,7 +1227,8 @@ declare namespace usageStatistics { * @enum { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ export enum GroupType { /** @@ -1154,7 +1236,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ ALIVE_GROUP = 10, @@ -1163,7 +1246,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ DAILY_GROUP = 20, @@ -1172,7 +1256,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ FIXED_GROUP = 30, @@ -1181,7 +1266,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ RARE_GROUP = 40, @@ -1190,7 +1276,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ LIMITED_GROUP = 50, @@ -1199,7 +1286,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ NEVER_GROUP = 60 } @@ -1225,7 +1313,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100001 - Repeated operation on the application group. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function setAppGroup(bundleName: string, newGroup: GroupType, callback: AsyncCallback): void; @@ -1250,7 +1339,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100001 - Repeated operation on the application group. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function setAppGroup(bundleName: string, newGroup: GroupType): Promise; @@ -1274,7 +1364,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100001 - Repeated operation on the application group. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function registerAppGroupCallBack(groupCallback: Callback, callback: AsyncCallback): void; @@ -1298,7 +1389,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100001 - Repeated operation on the application group. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function registerAppGroupCallBack(groupCallback: Callback): Promise; @@ -1320,7 +1412,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100001 - Repeated operation on the application group. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function unregisterAppGroupCallBack(callback: AsyncCallback): void; @@ -1342,7 +1435,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100001 - Repeated operation on the application group. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function unregisterAppGroupCallBack(): Promise; @@ -1368,7 +1462,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryDeviceEventStats(begin: number, end: number, callback: AsyncCallback>): void; @@ -1394,7 +1489,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryDeviceEventStats(begin: number, end: number): Promise>; @@ -1420,7 +1516,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryNotificationEventStats( begin: number, @@ -1450,7 +1547,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryNotificationEventStats(begin: number, end: number): Promise>; } -- Gitee From eba740f34ba2c11d54bfd08870e2bd1c12006086 Mon Sep 17 00:00:00 2001 From: YinZong Date: Tue, 8 Jul 2025 11:54:18 +0000 Subject: [PATCH 041/746] update api/@ohos.fileshare.d.ts. Signed-off-by: YinZong --- api/@ohos.fileshare.d.ts | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/api/@ohos.fileshare.d.ts b/api/@ohos.fileshare.d.ts index ec9b89fe1a..2eed8dfe44 100644 --- a/api/@ohos.fileshare.d.ts +++ b/api/@ohos.fileshare.d.ts @@ -199,7 +199,8 @@ declare namespace fileShare { * * @interface PathPolicyInfo * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface PathPolicyInfo { /** @@ -207,7 +208,8 @@ declare namespace fileShare { * * @type { string } * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ path: string; @@ -216,7 +218,8 @@ declare namespace fileShare { * * @type { OperationMode } * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ operationMode: OperationMode; } @@ -226,14 +229,16 @@ declare namespace fileShare { * * @enum { number } policyType * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum PolicyType { /** * Indicates that the policy is temporary. * * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ TEMPORARY_TYPE = 0, @@ -241,7 +246,8 @@ declare namespace fileShare { * Indicates that the policy is persistent. * * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ PERSISTENT_TYPE = 1, } @@ -410,7 +416,7 @@ declare namespace fileShare { * Check permissions for the path. * * @permission ohos.permission.CHECK_SANDBOX_POLICY - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Array } policies - Policy information to check on paths. * @param { PolicyType } policyType - Persistent or temporary type. * @returns { Promise> } Returns the permission state of paths. @@ -421,9 +427,10 @@ declare namespace fileShare { * @throws { BusinessError } 801 - Capability not supported. * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ - function checkPathPermission(tokenID: number, policies: Array, policyType: PolicyType): Promise>; + function checkPathPermission(tokenID: int, policies: Array, policyType: PolicyType): Promise>; } export default fileShare; -- Gitee From 3d79b63e89c873ee7ae4957807e192dafade4d9a Mon Sep 17 00:00:00 2001 From: wangzhiyusss Date: Tue, 8 Jul 2025 20:00:20 +0800 Subject: [PATCH 042/746] =?UTF-8?q?=E8=A3=81=E5=89=AA=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E6=80=8E=E5=8A=A0=E8=BF=87=E6=BB=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangzhiyusss --- build-tools/delete_systemapi_plugin.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-tools/delete_systemapi_plugin.js b/build-tools/delete_systemapi_plugin.js index 82a3eb989a..984f488749 100644 --- a/build-tools/delete_systemapi_plugin.js +++ b/build-tools/delete_systemapi_plugin.js @@ -327,6 +327,9 @@ function tsTransform(utFiles, callback) { isTransformer = false; } } + if (/\.static\.d\.ets$/.test(apiBaseName)) { + isTransformer = false; + } if (!isTransformer) { writeFile(url, content); return; -- Gitee From bc279322ebcadc1c79cbb6356876eba337c7304c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=99=BA=E5=AE=87?= Date: Wed, 9 Jul 2025 09:21:22 +0800 Subject: [PATCH 043/746] =?UTF-8?q?1.2=E9=9D=99=E6=80=81=E5=8C=96=E6=8C=91?= =?UTF-8?q?07021.2=E9=9D=99=E6=80=81=E5=8C=96=E6=8C=910702?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If49c7f1cab523df52ddeeacfcb7694f6def51495 Signed-off-by: 谢智宇 --- api/@ohos.enterprise.adminManager.d.ts | 21 ++++++++++++++------- api/@ohos.enterprise.securityManager.d.ts | 22 ++++++++++++++-------- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/api/@ohos.enterprise.adminManager.d.ts b/api/@ohos.enterprise.adminManager.d.ts index de7d7d017c..17915f6485 100644 --- a/api/@ohos.enterprise.adminManager.d.ts +++ b/api/@ohos.enterprise.adminManager.d.ts @@ -27,7 +27,8 @@ import common from '@ohos.app.ability.common'; * * @namespace adminManager * @syscap SystemCapability.Customization.EnterpriseDeviceManager - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace adminManager { /** @@ -36,7 +37,8 @@ declare namespace adminManager { * @typedef EnterpriseInfo * @syscap SystemCapability.Customization.EnterpriseDeviceManager * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface EnterpriseInfo { /** @@ -45,7 +47,8 @@ declare namespace adminManager { * @type { string } * @syscap SystemCapability.Customization.EnterpriseDeviceManager * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ name: string; @@ -55,7 +58,8 @@ declare namespace adminManager { * @type { string } * @syscap SystemCapability.Customization.EnterpriseDeviceManager * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ description: string; } @@ -455,7 +459,8 @@ declare namespace adminManager { * @syscap SystemCapability.Customization.EnterpriseDeviceManager * @systemapi * @stagemodelonly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getEnterpriseInfo(admin: Want, callback: AsyncCallback): void; @@ -471,7 +476,8 @@ declare namespace adminManager { * @syscap SystemCapability.Customization.EnterpriseDeviceManager * @systemapi * @stagemodelonly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getEnterpriseInfo(admin: Want): Promise; @@ -692,7 +698,8 @@ declare namespace adminManager { * @syscap SystemCapability.Customization.EnterpriseDeviceManager * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSuperAdmin(): Promise; diff --git a/api/@ohos.enterprise.securityManager.d.ts b/api/@ohos.enterprise.securityManager.d.ts index a82ec35a5e..b7fc14ab1d 100644 --- a/api/@ohos.enterprise.securityManager.d.ts +++ b/api/@ohos.enterprise.securityManager.d.ts @@ -27,7 +27,8 @@ import type image from './@ohos.multimedia.image'; * @namespace securityManager * @syscap SystemCapability.Customization.EnterpriseDeviceManager * @stagemodelonly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace securityManager { /** @@ -269,7 +270,8 @@ declare namespace securityManager { * @syscap SystemCapability.Customization.EnterpriseDeviceManager * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getPasswordPolicy(): PasswordPolicy; @@ -386,7 +388,8 @@ declare namespace securityManager { * @typedef PasswordPolicy * @syscap SystemCapability.Customization.EnterpriseDeviceManager * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface PasswordPolicy { /** @@ -395,19 +398,21 @@ declare namespace securityManager { * @type { ?string } * @syscap SystemCapability.Customization.EnterpriseDeviceManager * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ complexityRegex?: string; /** * Period of validity * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.Customization.EnterpriseDeviceManager * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - validityPeriod?: number; + validityPeriod?: long; /** * Other supplementary description @@ -415,7 +420,8 @@ declare namespace securityManager { * @type { ?string } * @syscap SystemCapability.Customization.EnterpriseDeviceManager * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ additionalDescription?: string; } -- Gitee From 27d7e398fe9e259f3d78b10eaa373a596d8d8e60 Mon Sep 17 00:00:00 2001 From: linzs Date: Mon, 7 Jul 2025 18:16:17 +0800 Subject: [PATCH 044/746] huks rebase 0328 Signed-off-by: linzs Change-Id: Ia2829c5967adea57764386e957df0ff09938505c --- api/@ohos.security.huks.d.ts | 1047 +++++++++++++++++---------- kits/@kit.UniversalKeystoreKit.d.ts | 2 + 2 files changed, 662 insertions(+), 387 deletions(-) diff --git a/api/@ohos.security.huks.d.ts b/api/@ohos.security.huks.d.ts index 2482bf2bdf..30f772e308 100644 --- a/api/@ohos.security.huks.d.ts +++ b/api/@ohos.security.huks.d.ts @@ -17,8 +17,13 @@ * @file * @kit UniversalKeystoreKit */ - +/*** if arkts 1.1 */ import type { AsyncCallback } from './@ohos.base'; +/*** endif */ + +/*** if arkts 1.2 */ +import { BusinessError, AsyncCallback } from '@ohos.base'; +/*** endif */ /** * OpenHarmony Universal KeyStore @@ -33,7 +38,8 @@ import type { AsyncCallback } from './@ohos.base'; * @namespace huks * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace huks { /** @@ -115,7 +121,8 @@ declare namespace huks { * @throws { BusinessError } 12000015 - Failed to obtain the security information via UserIAM * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function generateKeyItem(keyAlias: string, options: HuksOptions, callback: AsyncCallback): void; @@ -172,7 +179,8 @@ declare namespace huks { * @throws { BusinessError } 12000015 - Failed to obtain the security information via UserIAM * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function generateKeyItem(keyAlias: string, options: HuksOptions): Promise; @@ -180,7 +188,7 @@ declare namespace huks { * Generate Key As User. * * @permission ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS - * @param { number } userId - userId indicates the userId of the owner of the key. + * @param { int } userId - userId indicates the userId of the owner of the key. * @param { string } keyAlias - keyAlias indicates the key's name. * @param { HuksOptions } huksOptions - huksOptions indicates the properties of the key. * @returns { Promise } the promise returned by the function. @@ -204,9 +212,10 @@ declare namespace huks { * @throws { BusinessError } 12000015 - Failed to obtain the security information via UserIAM * @syscap SystemCapability.Security.Huks.Extension * @systemapi this method can be used only by system applications. - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - function generateKeyItemAsUser(userId: number, keyAlias: string, huksOptions: HuksOptions): Promise; + function generateKeyItemAsUser(userId: int, keyAlias: string, huksOptions: HuksOptions): Promise; /** * Delete Key. @@ -279,7 +288,8 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function deleteKeyItem(keyAlias: string, options: HuksOptions, callback: AsyncCallback): void; @@ -326,7 +336,8 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function deleteKeyItem(keyAlias: string, options: HuksOptions): Promise; @@ -334,7 +345,7 @@ declare namespace huks { * Delete Key As User. * * @permission ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS - * @param { number } userId - userId indicates the userId of the owner of the key. + * @param { int } userId - userId indicates the userId of the owner of the key. * @param { string } keyAlias - keyAlias indicates the key's name. * @param { HuksOptions } huksOptions - huksOptions indicates the properties of the key. * @returns { Promise } the promise returned by the function. @@ -353,9 +364,10 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Extension * @systemapi this method can be used only by system applications. - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - function deleteKeyItemAsUser(userId: number, keyAlias: string, huksOptions: HuksOptions): Promise; + function deleteKeyItemAsUser(userId: int, keyAlias: string, huksOptions: HuksOptions): Promise; /** * Import Key. @@ -464,7 +476,8 @@ declare namespace huks { * @throws { BusinessError } 12000015 - Failed to obtain the security information via UserIAM * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function importKeyItem(keyAlias: string, options: HuksOptions, callback: AsyncCallback): void; @@ -519,7 +532,8 @@ declare namespace huks { * @throws { BusinessError } 12000015 - Failed to obtain the security information via UserIAM * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function importKeyItem(keyAlias: string, options: HuksOptions): Promise; @@ -527,7 +541,7 @@ declare namespace huks { * Import Key As User. * * @permission ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS - * @param { number } userId - userId indicates the userId of the owner of the key. + * @param { int } userId - userId indicates the userId of the owner of the key. * @param { string } keyAlias - keyAlias indicates the key's name. * @param { HuksOptions } huksOptions - huksOptions indicates the properties of the key. * @returns { Promise } the promise returned by the function. @@ -552,9 +566,10 @@ declare namespace huks { * @throws { BusinessError } 12000015 - Failed to obtain the security information via UserIAM * @syscap SystemCapability.Security.Huks.Extension * @systemapi this method can be used only by system applications. - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - function importKeyItemAsUser(userId: number, keyAlias: string, huksOptions: HuksOptions): Promise; + function importKeyItemAsUser(userId: int, keyAlias: string, huksOptions: HuksOptions): Promise; /** * Imports a wrapped key. This API uses an asynchronous callback to return the result. @@ -611,7 +626,8 @@ declare namespace huks { * @throws { BusinessError } 12000015 - Failed to obtain the security information via UserIAM * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function importWrappedKeyItem( keyAlias: string, @@ -624,7 +640,7 @@ declare namespace huks { * Import Wrapped Key As User. * * @permission ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS - * @param { number } userId - userId indicates the userId of the owner of the key. + * @param { int } userId - userId indicates the userId of the owner of the key. * @param { string } keyAlias - keyAlias indicates the name of key to be imported. * @param { string } wrappingKeyAlias - wrappingKeyAlias indicates the name of key for wrapping the key to be imported. * @param { HuksOptions } huksOptions - huksOptions indicates the properties of the key. @@ -650,9 +666,10 @@ declare namespace huks { * @throws { BusinessError } 12000015 - Failed to obtain the security information via UserIAM * @syscap SystemCapability.Security.Huks.Extension * @systemapi this method can be used only by system applications. - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - function importWrappedKeyItemAsUser(userId: number, keyAlias: string, wrappingKeyAlias: string, huksOptions: HuksOptions): Promise; + function importWrappedKeyItemAsUser(userId: int, keyAlias: string, wrappingKeyAlias: string, huksOptions: HuksOptions): Promise; /** * Imports a wrapped key. This API uses a promise to return the result. @@ -707,7 +724,8 @@ declare namespace huks { * @throws { BusinessError } 12000015 - Failed to obtain the security information via UserIAM * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function importWrappedKeyItem(keyAlias: string, wrappingKeyAlias: string, options: HuksOptions): Promise; @@ -786,7 +804,8 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function exportKeyItem(keyAlias: string, options: HuksOptions, callback: AsyncCallback): void; @@ -794,7 +813,7 @@ declare namespace huks { * Export Key As User. * * @permission ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS - * @param { number } userId - userId indicates the userId of the owner of the key. + * @param { int } userId - userId indicates the userId of the owner of the key. * @param { string } keyAlias - keyAlias indicates the key's name. * @param { HuksOptions } huksOptions - huksOptions indicates the properties of the key. * @returns { Promise } the promise returned by the function. @@ -817,9 +836,10 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Extension * @systemapi this method can be used only by system applications. - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - function exportKeyItemAsUser(userId: number, keyAlias: string, huksOptions: HuksOptions): Promise; + function exportKeyItemAsUser(userId: int, keyAlias: string, huksOptions: HuksOptions): Promise; /** * Exports a key. This API uses a promise to return the result. @@ -868,7 +888,8 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function exportKeyItem(keyAlias: string, options: HuksOptions): Promise; @@ -959,7 +980,7 @@ declare namespace huks { * Get properties of the key as user. * * @permission ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS - * @param { number } userId - userId indicates the userId of the owner of the key. + * @param { int } userId - userId indicates the userId of the owner of the key. * @param { string } keyAlias - keyAlias indicates the key's name. * @param { HuksOptions } huksOptions - huksOptions indicates the properties of the key. * @returns { Promise } the promise returned by the function. @@ -984,7 +1005,7 @@ declare namespace huks { * @systemapi this method can be used only by system applications. * @since 12 */ - function getKeyItemPropertiesAsUser(userId: number, keyAlias: string, huksOptions: HuksOptions): Promise; + function getKeyItemPropertiesAsUser(userId: int, keyAlias: string, huksOptions: HuksOptions): Promise; /** * Obtains key properties. This API uses a promise to return the result. @@ -1086,7 +1107,8 @@ declare namespace huks { * @throws { BusinessError } 12000012 - Device environment or input parameter abnormal * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function isKeyItemExist(keyAlias: string, options: HuksOptions, callback: AsyncCallback): void; @@ -1112,7 +1134,8 @@ declare namespace huks { * @throws { BusinessError } 12000012 - Device environment or input parameter abnormal * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Extension - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function isKeyItemExist(keyAlias: string, options: HuksOptions): Promise; @@ -1139,7 +1162,8 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function hasKeyItem(keyAlias: string, options: HuksOptions, callback: AsyncCallback): void; @@ -1147,7 +1171,7 @@ declare namespace huks { * Check whether the key exists as user. * * @permission ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS - * @param { number } userId - userId indicates the userId of the owner of the key. + * @param { int } userId - userId indicates the userId of the owner of the key. * @param { string } keyAlias - keyAlias indicates the key's name. * @param { HuksOptions } huksOptions - huksOptions indicates the properties of the key. * @returns { Promise } the promise returned by the function. @@ -1168,9 +1192,10 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Extension * @systemapi this method can be used only by system applications. - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - function hasKeyItemAsUser(userId: number, keyAlias: string, huksOptions: HuksOptions): Promise; + function hasKeyItemAsUser(userId: int, keyAlias: string, huksOptions: HuksOptions): Promise; /** * Checks whether a key exists. This API uses a promise to return the result. @@ -1195,7 +1220,8 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function hasKeyItem(keyAlias: string, options: HuksOptions): Promise; @@ -1276,7 +1302,8 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function initSession(keyAlias: string, options: HuksOptions, callback: AsyncCallback): void; @@ -1329,7 +1356,8 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function initSession(keyAlias: string, options: HuksOptions): Promise; @@ -1337,7 +1365,7 @@ declare namespace huks { * Init Operation As User. * * @permission ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS - * @param { number } userId - userId indicates the userId of the owner of the key. + * @param { int } userId - userId indicates the userId of the owner of the key. * @param { string } keyAlias - keyAlias indicates the key's name. * @param { HuksOptions } huksOptions - huksOptions indicates the properties of the key. * @returns { Promise } the promise returned by the function. @@ -1361,14 +1389,15 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Extension * @systemapi this method can be used only by system applications. - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - function initSessionAsUser(userId: number, keyAlias: string, huksOptions: HuksOptions): Promise; + function initSessionAsUser(userId: int, keyAlias: string, huksOptions: HuksOptions): Promise; /** * Update Operation. * - * @param { number } handle - indicates the handle of the init operation. + * @param { long } handle - indicates the handle of the init operation. * @param { Uint8Array } token - token indicates the value of token. * @param { HuksOptions } options - options indicates the properties of the update operation. * @param { AsyncCallback } callback - the callback of update. @@ -1377,12 +1406,12 @@ declare namespace huks { * @deprecated since 9 * @useinstead ohos.security.huks.updateSession */ - function update(handle: number, token?: Uint8Array, options: HuksOptions, callback: AsyncCallback): void; + function update(handle: long, token?: Uint8Array, options: HuksOptions, callback: AsyncCallback): void; /** * Update Operation. * - * @param { number } handle - indicates the handle of the init operation. + * @param { long } handle - indicates the handle of the init operation. * @param { Uint8Array } token - indicates the value of token. * @param { HuksOptions } options - options indicates the properties of the update operation. * @returns { Promise } the promise returned by the function. @@ -1391,13 +1420,13 @@ declare namespace huks { * @deprecated since 9 * @useinstead ohos.security.huks.updateSession */ - function update(handle: number, token?: Uint8Array, options: HuksOptions): Promise; + function update(handle: long, token?: Uint8Array, options: HuksOptions): Promise; /** * Updates the key operation by segment. This API uses an asynchronous callback to return the result. * huks.initSession, huks.updateSession, and huks.finishSession must be used together. * - * @param { number } handle - Handle for the updateSession operation. + * @param { long } handle - Handle for the updateSession operation. * @param { HuksOptions } options - Parameter set used for the updateSession operation. * @param { AsyncCallback } callback - Callback used to return the updateSession operation result. * @throws { BusinessError } 401 - Parameter error. Possible causes: @@ -1424,7 +1453,7 @@ declare namespace huks { * Updates the key operation by segment. This API uses an asynchronous callback to return the result. * huks.initSession, huks.updateSession, and huks.finishSession must be used together. * - * @param { number } handle - Handle for the updateSession operation. + * @param { long } handle - Handle for the updateSession operation. * @param { HuksOptions } options - Parameter set used for the updateSession operation. * @param { AsyncCallback } callback - Callback used to return the updateSession operation result. * @throws { BusinessError } 401 - Parameter error. Possible causes: @@ -1446,15 +1475,16 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - function updateSession(handle: number, options: HuksOptions, callback: AsyncCallback): void; + function updateSession(handle: long, options: HuksOptions, callback: AsyncCallback): void; /** * Updates the key operation by segment. This API uses an asynchronous callback to return the result. * huks.initSession, huks.updateSession, and huks.finishSession must be used together. * - * @param { number } handle - Handle for the updateSession operation. + * @param { long } handle - Handle for the updateSession operation. * @param { HuksOptions } options - Parameter set used for the updateSession operation. * @param { Uint8Array } token - Authentication token for refined key access control. * @param { AsyncCallback } callback - Callback used to return the updateSession operation result. @@ -1482,7 +1512,7 @@ declare namespace huks { * Updates the key operation by segment. This API uses an asynchronous callback to return the result. * huks.initSession, huks.updateSession, and huks.finishSession must be used together. * - * @param { number } handle - Handle for the updateSession operation. + * @param { long } handle - Handle for the updateSession operation. * @param { HuksOptions } options - Parameter set used for the updateSession operation. * @param { Uint8Array } token - Authentication token for refined key access control. * @param { AsyncCallback } callback - Callback used to return the updateSession operation result. @@ -1505,10 +1535,11 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function updateSession( - handle: number, + handle: long, options: HuksOptions, token: Uint8Array, callback: AsyncCallback @@ -1518,7 +1549,7 @@ declare namespace huks { * Updates the key operation by segment. This API uses a promise to return the result. huks.initSession, * huks.updateSession, and huks.finishSession must be used together. * - * @param { number } handle - Handle for the updateSession operation. + * @param { long } handle - Handle for the updateSession operation. * @param { HuksOptions } options - Parameter set used for the updateSession operation. * @param { Uint8Array } token - Authentication token for refined key access control. If this parameter is left blank, * refined key access control is not performed. @@ -1547,7 +1578,7 @@ declare namespace huks { * Updates the key operation by segment. This API uses a promise to return the result. huks.initSession, * huks.updateSession, and huks.finishSession must be used together. * - * @param { number } handle - Handle for the updateSession operation. + * @param { long } handle - Handle for the updateSession operation. * @param { HuksOptions } options - Parameter set used for the updateSession operation. * @param { Uint8Array } token - Authentication token for refined key access control. If this parameter is left blank, * refined key access control is not performed. @@ -1571,14 +1602,15 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - function updateSession(handle: number, options: HuksOptions, token?: Uint8Array): Promise; + function updateSession(handle: long, options: HuksOptions, token?: Uint8Array): Promise; /** * Finish Operation. * - * @param { number } handle - indicates the handle of the init operation. + * @param { long } handle - indicates the handle of the init operation. * @param { HuksOptions } options - options indicates the properties of the finish operation. * @param { AsyncCallback } callback - the callback of finish. * @syscap SystemCapability.Security.Huks.Extension @@ -1586,12 +1618,12 @@ declare namespace huks { * @deprecated since 9 * @useinstead ohos.security.huks.finishSession */ - function finish(handle: number, options: HuksOptions, callback: AsyncCallback): void; + function finish(handle: long, options: HuksOptions, callback: AsyncCallback): void; /** * Finish Operation. * - * @param { number } handle - indicates the handle of the init operation. + * @param { long } handle - indicates the handle of the init operation. * @param { HuksOptions } options - options indicates the properties of the finish operation. * @returns { Promise } the promise returned by the function. * @syscap SystemCapability.Security.Huks.Extension @@ -1599,13 +1631,13 @@ declare namespace huks { * @deprecated since 9 * @useinstead ohos.security.huks.finishSession */ - function finish(handle: number, options: HuksOptions): Promise; + function finish(handle: long, options: HuksOptions): Promise; /** * Finishes the key operation. This API uses an asynchronous callback to return the result. * huks.initSession, huks.updateSession, and huks.finishSession must be used together. * - * @param { number } handle - Handle for the finishSession operation. + * @param { long } handle - Handle for the finishSession operation. * @param { HuksOptions } options - Parameter set used for the finishSession operation. * @param { AsyncCallback } callback - Callback used to return the finishSession operation result. * @throws { BusinessError } 401 - Parameter error. Possible causes: @@ -1632,7 +1664,7 @@ declare namespace huks { * Finishes the key operation. This API uses an asynchronous callback to return the result. * huks.initSession, huks.updateSession, and huks.finishSession must be used together. * - * @param { number } handle - Handle for the finishSession operation. + * @param { long } handle - Handle for the finishSession operation. * @param { HuksOptions } options - Parameter set used for the finishSession operation. * @param { AsyncCallback } callback - Callback used to return the finishSession operation result. * @throws { BusinessError } 401 - Parameter error. Possible causes: @@ -1654,15 +1686,16 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - function finishSession(handle: number, options: HuksOptions, callback: AsyncCallback): void; + function finishSession(handle: long, options: HuksOptions, callback: AsyncCallback): void; /** * Finishes the key operation. This API uses an asynchronous callback to return the result. * huks.initSession, huks.updateSession, and huks.finishSession must be used together. * - * @param { number } handle - Handle for the finishSession operation. + * @param { long } handle - Handle for the finishSession operation. * @param { HuksOptions } options - Parameter set used for the finishSession operation. * @param { Uint8Array } token - Authentication token for refined key access control. * @param { AsyncCallback } callback - Callback used to return the finishSession operation result. @@ -1690,7 +1723,7 @@ declare namespace huks { * Finishes the key operation. This API uses an asynchronous callback to return the result. * huks.initSession, huks.updateSession, and huks.finishSession must be used together. * - * @param { number } handle - Handle for the finishSession operation. + * @param { long } handle - Handle for the finishSession operation. * @param { HuksOptions } options - Parameter set used for the finishSession operation. * @param { Uint8Array } token - Authentication token for refined key access control. * @param { AsyncCallback } callback - Callback used to return the finishSession operation result. @@ -1713,10 +1746,11 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function finishSession( - handle: number, + handle: long, options: HuksOptions, token: Uint8Array, callback: AsyncCallback @@ -1726,7 +1760,7 @@ declare namespace huks { * Finishes the key operation. This API uses a promise to return the result. huks.initSession, * huks.updateSession, and huks.finishSession must be used together. * - * @param { number } handle - Handle for the finishSession operation. + * @param { long } handle - Handle for the finishSession operation. * @param { HuksOptions } options - Parameter set used for the finishSession operation. * @param { Uint8Array } token - Authentication token for refined key access control. If this parameter is left blank, * refined key access control is not performed. @@ -1755,7 +1789,7 @@ declare namespace huks { * Finishes the key operation. This API uses a promise to return the result. huks.initSession, * huks.updateSession, and huks.finishSession must be used together. * - * @param { number } handle - Handle for the finishSession operation. + * @param { long } handle - Handle for the finishSession operation. * @param { HuksOptions } options - Parameter set used for the finishSession operation. * @param { Uint8Array } token - Authentication token for refined key access control. If this parameter is left blank, * refined key access control is not performed. @@ -1779,14 +1813,15 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - function finishSession(handle: number, options: HuksOptions, token?: Uint8Array): Promise; + function finishSession(handle: long, options: HuksOptions, token?: Uint8Array): Promise; /** * Abort Operation. * - * @param { number } handle - indicates the handle of the init operation. + * @param { long } handle - indicates the handle of the init operation. * @param { HuksOptions } options - options indicates the properties of the abort operation. * @param { AsyncCallback } callback - the callback of finishSession. * @syscap SystemCapability.Security.Huks.Extension @@ -1794,12 +1829,12 @@ declare namespace huks { * @deprecated since 9 * @useinstead ohos.security.huks.abortSession */ - function abort(handle: number, options: HuksOptions, callback: AsyncCallback): void; + function abort(handle: long, options: HuksOptions, callback: AsyncCallback): void; /** * Abort Operation. * - * @param { number } handle - indicates the handle of the init operation. + * @param { long } handle - indicates the handle of the init operation. * @param { HuksOptions } options - options indicates the properties of the abort operation. * @returns { Promise } the promise returned by the function. * @syscap SystemCapability.Security.Huks.Extension @@ -1807,12 +1842,12 @@ declare namespace huks { * @deprecated since 9 * @useinstead ohos.security.huks.abortSession */ - function abort(handle: number, options: HuksOptions): Promise; + function abort(handle: long, options: HuksOptions): Promise; /** * Aborts a key operation. This API uses an asynchronous callback to return the result. * - * @param { number } handle - Handle for the abortSession operation. + * @param { long } handle - Handle for the abortSession operation. * @param { HuksOptions } options - Parameter set used for the abortSession operation. * @param { AsyncCallback } callback - Callback used to return the abortSession operation result. * @throws { BusinessError } 401 - Parameter error. Possible causes: @@ -1831,7 +1866,7 @@ declare namespace huks { /** * Aborts a key operation. This API uses an asynchronous callback to return the result. * - * @param { number } handle - Handle for the abortSession operation. + * @param { long } handle - Handle for the abortSession operation. * @param { HuksOptions } options - Parameter set used for the abortSession operation. * @param { AsyncCallback } callback - Callback used to return the abortSession operation result. * @throws { BusinessError } 401 - Parameter error. Possible causes: @@ -1846,14 +1881,15 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - function abortSession(handle: number, options: HuksOptions, callback: AsyncCallback): void; + function abortSession(handle: long, options: HuksOptions, callback: AsyncCallback): void; /** * Aborts a key operation. This API uses a promise to return the result. * - * @param { number } handle - Handle for the abortSession operation. + * @param { long } handle - Handle for the abortSession operation. * @param { HuksOptions } options - Parameter set used for the abortSession operation. * @returns { Promise } Promise used to return the abortSession operation result. * @throws { BusinessError } 401 - Parameter error. Possible causes: @@ -1872,7 +1908,7 @@ declare namespace huks { /** * Aborts a key operation. This API uses a promise to return the result. * - * @param { number } handle - Handle for the abortSession operation. + * @param { long } handle - Handle for the abortSession operation. * @param { HuksOptions } options - Parameter set used for the abortSession operation. * @returns { Promise } Promise used to return the abortSession operation result. * @throws { BusinessError } 401 - Parameter error. Possible causes: @@ -1887,9 +1923,10 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - function abortSession(handle: number, options: HuksOptions): Promise; + function abortSession(handle: long, options: HuksOptions): Promise; /** * Obtains the certificate used to attest a key. This API uses an asynchronous callback to return the result. @@ -1915,7 +1952,8 @@ declare namespace huks { * @throws { BusinessError } 12000012 - Device environment or input parameter abnormal * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Extension - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function attestKeyItem(keyAlias: string, options: HuksOptions, callback: AsyncCallback): void; @@ -1923,7 +1961,7 @@ declare namespace huks { * Key Attestation As User. * * @permission ohos.permission.ATTEST_KEY and ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS - * @param { number } userId - userId indicates the userId of the owner of the key. + * @param { int } userId - userId indicates the userId of the owner of the key. * @param { string } keyAlias - keyAlias indicates the key's name. * @param { HuksOptions } huksOptions - huksOptions indicates the properties of the key attestation operation. * @returns { Promise } the promise returned by the function. @@ -1946,9 +1984,10 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Extension * @systemapi this method can be used only by system applications. - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - function attestKeyItemAsUser(userId: number, keyAlias: string, huksOptions: HuksOptions): Promise; + function attestKeyItemAsUser(userId: int, keyAlias: string, huksOptions: HuksOptions): Promise; /** * Obtains the certificate used to attest a key. This API uses a promise to return the result. @@ -1974,7 +2013,8 @@ declare namespace huks { * @throws { BusinessError } 12000012 - Device environment or input parameter abnormal * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Extension - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function attestKeyItem(keyAlias: string, options: HuksOptions): Promise; @@ -2031,7 +2071,8 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function anonAttestKeyItem(keyAlias: string, options: HuksOptions, callback: AsyncCallback): void; @@ -2039,7 +2080,7 @@ declare namespace huks { * Key Attestation with anonymous certificate as user. * * @permission ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS - * @param { number } userId - userId indicates the userId of the owner of the key. + * @param { int } userId - userId indicates the userId of the owner of the key. * @param { string } keyAlias - keyAlias indicates the key's name. * @param { HuksOptions } huksOptions - huksOptions indicates the properties of the key attestation operation. * @returns { Promise } the promise returned by the function. @@ -2062,9 +2103,10 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Extension * @systemapi this method can be used only by system applications. - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - function anonAttestKeyItemAsUser(userId: number, keyAlias: string, huksOptions: HuksOptions): Promise; + function anonAttestKeyItemAsUser(userId: int, keyAlias: string, huksOptions: HuksOptions): Promise; /** * Obtains the certificate for anonymous attestation. This API uses a promise to return the result. This @@ -2119,7 +2161,8 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function anonAttestKeyItem(keyAlias: string, options: HuksOptions): Promise; @@ -2149,7 +2192,8 @@ declare namespace huks { * @throws { BusinessError } 12000014 - memory is insufficient * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function listAliases(options: HuksOptions): Promise; @@ -2211,7 +2255,8 @@ declare namespace huks { * @typedef HuksParam * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface HuksParam { /** @@ -2222,7 +2267,8 @@ declare namespace huks { * @type { HuksTag } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ tag: HuksTag; /** @@ -2230,12 +2276,13 @@ declare namespace huks { * @since 8 */ /** - * @type { boolean | number | bigint | Uint8Array } + * @type { boolean | int | bigint | Uint8Array } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - value: boolean | number | bigint | Uint8Array; + value: boolean | int | bigint | Uint8Array; } /** @@ -2249,19 +2296,19 @@ declare namespace huks { */ export interface HuksHandle { /** - * @type { number } + * @type { int } * @syscap SystemCapability.Security.Huks.Extension * @since 8 * @deprecated since 9 */ - errorCode: number; + errorCode: int; /** - * @type { number } + * @type { long } * @syscap SystemCapability.Security.Huks.Extension * @since 8 * @deprecated since 9 */ - handle: number; + handle: long; /** * @type { ?Uint8Array } * @syscap SystemCapability.Security.Huks.Extension @@ -2284,7 +2331,8 @@ declare namespace huks { * @typedef HuksSessionHandle * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface HuksSessionHandle { /** @@ -2292,12 +2340,13 @@ declare namespace huks { * @since 9 */ /** - * @type { number } + * @type { long } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - handle: number; + handle: long; /** * @syscap SystemCapability.Security.Huks.Core * @since 9 @@ -2306,7 +2355,8 @@ declare namespace huks { * @type { ?Uint8Array } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ challenge?: Uint8Array; } @@ -2324,7 +2374,8 @@ declare namespace huks { * @typedef HuksOptions * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface HuksOptions { /** @@ -2335,7 +2386,8 @@ declare namespace huks { * @type { ?Array } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ properties?: Array; /** @@ -2346,7 +2398,8 @@ declare namespace huks { * @type { ?Uint8Array } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ inData?: Uint8Array; } @@ -2362,12 +2415,12 @@ declare namespace huks { */ export interface HuksResult { /** - * @type { number } + * @type { int } * @syscap SystemCapability.Security.Huks.Extension * @since 8 * @deprecated since 9 */ - errorCode: number; + errorCode: int; /** * @type { ?Uint8Array } * @syscap SystemCapability.Security.Huks.Extension @@ -2404,7 +2457,8 @@ declare namespace huks { * @typedef HuksReturnResult * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface HuksReturnResult { /** @@ -2415,7 +2469,8 @@ declare namespace huks { * @type { ?Uint8Array } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ outData?: Uint8Array; /** @@ -2426,7 +2481,8 @@ declare namespace huks { * @type { ?Array } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ properties?: Array; /** @@ -2437,7 +2493,8 @@ declare namespace huks { * @type { ?Array } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ certChains?: Array; } @@ -2448,7 +2505,8 @@ declare namespace huks { * @typedef HuksListAliasesReturnResult * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export interface HuksListAliasesReturnResult { @@ -2458,7 +2516,8 @@ declare namespace huks { * @type { Array } * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ keyAliases: Array; } @@ -2466,7 +2525,7 @@ declare namespace huks { /** * Enum for huks error code. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Extension * @since 8 * @deprecated since 9 @@ -2880,17 +2939,18 @@ declare namespace huks { /** * Enumerates the error codes. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @since 9 */ /** * Enumerates the error codes. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksExceptionErrCode { /** @@ -2904,14 +2964,16 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ERR_CODE_PERMISSION_FAIL = 201, /** * The caller is not a system application and cannot call the system API. * * @syscap SystemCapability.Security.Huks.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ERR_CODE_NOT_SYSTEM_APP = 202, /** @@ -2931,7 +2993,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ERR_CODE_ILLEGAL_ARGUMENT = 401, /** @@ -2945,7 +3008,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ERR_CODE_NOT_SUPPORTED_API = 801, /** @@ -2959,7 +3023,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ERR_CODE_FEATURE_NOT_SUPPORTED = 12000001, /** @@ -2973,7 +3038,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ERR_CODE_MISSING_CRYPTO_ALG_ARGUMENT = 12000002, /** @@ -2987,7 +3053,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ERR_CODE_INVALID_CRYPTO_ALG_ARGUMENT = 12000003, /** @@ -3001,7 +3068,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ERR_CODE_FILE_OPERATION_FAIL = 12000004, /** @@ -3015,7 +3083,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ERR_CODE_COMMUNICATION_FAIL = 12000005, /** @@ -3029,7 +3098,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ERR_CODE_CRYPTO_FAIL = 12000006, /** @@ -3043,7 +3113,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ERR_CODE_KEY_AUTH_PERMANENTLY_INVALIDATED = 12000007, /** @@ -3057,7 +3128,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ERR_CODE_KEY_AUTH_VERIFY_FAILED = 12000008, /** @@ -3071,7 +3143,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ERR_CODE_KEY_AUTH_TIME_OUT = 12000009, /** @@ -3085,7 +3158,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ERR_CODE_SESSION_LIMIT = 12000010, /** @@ -3099,7 +3173,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ERR_CODE_ITEM_NOT_EXIST = 12000011, /** @@ -3113,7 +3188,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ERR_CODE_EXTERNAL_ERROR = 12000012, /** @@ -3127,7 +3203,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ERR_CODE_CREDENTIAL_NOT_EXIST = 12000013, /** @@ -3141,7 +3218,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ERR_CODE_INSUFFICIENT_MEMORY = 12000014, /** @@ -3155,7 +3233,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ERR_CODE_CALL_SERVICE_FAILED = 12000015, /** @@ -3169,7 +3248,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ERR_CODE_DEVICE_PASSWORD_UNSET = 12000016, /** @@ -3193,17 +3273,18 @@ declare namespace huks { /** * Enumerates the key purposes. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @since 8 */ /** * Enumerates the key purposes. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksKeyPurpose { /** @@ -3217,7 +3298,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_KEY_PURPOSE_ENCRYPT = 1, /** @@ -3231,7 +3313,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_KEY_PURPOSE_DECRYPT = 2, /** @@ -3245,7 +3328,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_KEY_PURPOSE_SIGN = 4, /** @@ -3259,7 +3343,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_KEY_PURPOSE_VERIFY = 8, /** @@ -3273,7 +3358,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_KEY_PURPOSE_DERIVE = 16, /** @@ -3287,7 +3373,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_KEY_PURPOSE_WRAP = 32, /** @@ -3301,7 +3388,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_KEY_PURPOSE_UNWRAP = 64, /** @@ -3315,7 +3403,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_KEY_PURPOSE_MAC = 128, /** @@ -3329,7 +3418,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_KEY_PURPOSE_AGREE = 256 } @@ -3337,7 +3427,7 @@ declare namespace huks { /** * Enumerates the digest algorithms. * - * @enum { number } + * @enum { int } * * @syscap SystemCapability.Security.Huks.Extension * @since 8 @@ -3345,11 +3435,12 @@ declare namespace huks { /** * Enumerates the digest algorithms. * - * @enum { number } + * @enum { int } * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksKeyDigest { /** @@ -3363,7 +3454,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_DIGEST_NONE = 0, /** @@ -3377,7 +3469,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_DIGEST_MD5 = 1, /** @@ -3391,7 +3484,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_DIGEST_SM3 = 2, /** @@ -3405,7 +3499,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_DIGEST_SHA1 = 10, /** @@ -3419,7 +3514,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_DIGEST_SHA224 = 11, /** @@ -3433,7 +3529,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_DIGEST_SHA256 = 12, /** @@ -3447,7 +3544,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_DIGEST_SHA384 = 13, /** @@ -3461,7 +3559,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_DIGEST_SHA512 = 14 } @@ -3469,17 +3568,18 @@ declare namespace huks { /** * Enumerates the padding algorithms. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @since 8 */ /** * Enumerates the padding algorithms. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksKeyPadding { /** @@ -3493,7 +3593,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_PADDING_NONE = 0, /** @@ -3507,7 +3608,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_PADDING_OAEP = 1, /** @@ -3521,7 +3623,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_PADDING_PSS = 2, /** @@ -3535,7 +3638,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_PADDING_PKCS1_V1_5 = 3, /** @@ -3549,7 +3653,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_PADDING_PKCS5 = 4, /** @@ -3563,7 +3668,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_PADDING_PKCS7 = 5, /** @@ -3571,7 +3677,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_PADDING_ISO_IEC_9796_2 = 6, /** @@ -3579,7 +3686,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_PADDING_ISO_IEC_9797_1 = 7, } @@ -3587,17 +3695,18 @@ declare namespace huks { /** * Enumerates the cipher modes. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @since 8 */ /** * Enumerates the cipher modes. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksCipherMode { /** @@ -3611,7 +3720,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_MODE_ECB = 1, /** @@ -3625,7 +3735,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_MODE_CBC = 2, /** @@ -3639,7 +3750,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_MODE_CTR = 3, /** @@ -3653,7 +3765,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_MODE_OFB = 4, /** @@ -3661,7 +3774,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_MODE_CFB = 5, /** @@ -3675,7 +3789,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_MODE_CCM = 31, @@ -3690,7 +3805,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_MODE_GCM = 32 } @@ -3698,17 +3814,18 @@ declare namespace huks { /** * Enumerates the key sizes. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @since 8 */ /** * Enumerates the key sizes. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksKeySize { /** @@ -3722,7 +3839,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_RSA_KEY_SIZE_512 = 512, /** @@ -3736,7 +3854,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_RSA_KEY_SIZE_768 = 768, /** @@ -3749,7 +3868,8 @@ declare namespace huks { * RSA key of 1024 bits. * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_RSA_KEY_SIZE_1024 = 1024, /** @@ -3763,7 +3883,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_RSA_KEY_SIZE_2048 = 2048, /** @@ -3777,7 +3898,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_RSA_KEY_SIZE_3072 = 3072, /** @@ -3791,7 +3913,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_RSA_KEY_SIZE_4096 = 4096, @@ -3806,7 +3929,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ECC_KEY_SIZE_224 = 224, /** @@ -3820,7 +3944,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ECC_KEY_SIZE_256 = 256, /** @@ -3834,7 +3959,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ECC_KEY_SIZE_384 = 384, /** @@ -3848,7 +3974,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ECC_KEY_SIZE_521 = 521, @@ -3863,7 +3990,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_AES_KEY_SIZE_128 = 128, /** @@ -3877,7 +4005,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_AES_KEY_SIZE_192 = 192, /** @@ -3891,7 +4020,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_AES_KEY_SIZE_256 = 256, @@ -3915,7 +4045,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_CURVE25519_KEY_SIZE_256 = 256, @@ -3930,7 +4061,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_DH_KEY_SIZE_2048 = 2048, /** @@ -3944,7 +4076,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_DH_KEY_SIZE_3072 = 3072, /** @@ -3958,7 +4091,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_DH_KEY_SIZE_4096 = 4096, @@ -3973,7 +4107,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_SM2_KEY_SIZE_256 = 256, /** @@ -3987,7 +4122,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_SM4_KEY_SIZE_128 = 128, /** @@ -3995,7 +4131,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_DES_KEY_SIZE_64 = 64, /** @@ -4003,7 +4140,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_3DES_KEY_SIZE_128 = 128, /** @@ -4011,7 +4149,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_3DES_KEY_SIZE_192 = 192, } @@ -4019,17 +4158,18 @@ declare namespace huks { /** * Enumerates the key algorithms. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @since 8 */ /** * Enumerates the key algorithms. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksKeyAlg { /** @@ -4043,7 +4183,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ALG_RSA = 1, /** @@ -4057,7 +4198,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ALG_ECC = 2, /** @@ -4071,7 +4213,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ALG_DSA = 3, @@ -4086,7 +4229,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ALG_AES = 20, /** @@ -4100,7 +4244,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ALG_HMAC = 50, /** @@ -4114,7 +4259,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ALG_HKDF = 51, /** @@ -4128,7 +4274,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ALG_PBKDF2 = 52, @@ -4143,7 +4290,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ALG_ECDH = 100, /** @@ -4157,7 +4305,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ALG_X25519 = 101, /** @@ -4171,7 +4320,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ALG_ED25519 = 102, /** @@ -4185,7 +4335,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ALG_DH = 103, @@ -4200,7 +4351,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ALG_SM2 = 150, /** @@ -4214,7 +4366,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ALG_SM3 = 151, /** @@ -4228,7 +4381,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ALG_SM4 = 152, /** @@ -4236,7 +4390,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ALG_DES = 160, /** @@ -4244,7 +4399,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ALG_3DES = 161, /** @@ -4252,7 +4408,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_ALG_CMAC = 162 } @@ -4260,17 +4417,18 @@ declare namespace huks { /** * Enumerates the algorithm suites that can be used for importing a key in ciphertext. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Extension * @since 9 */ /** * Enumerates the algorithm suites that can be used for importing a key in ciphertext. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksUnwrapSuite { /** @@ -4284,7 +4442,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_UNWRAP_SUITE_X25519_AES_256_GCM_NOPADDING = 1, /** @@ -4298,7 +4457,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_UNWRAP_SUITE_ECDH_AES_256_GCM_NOPADDING = 2 } @@ -4306,17 +4466,18 @@ declare namespace huks { /** * Enumerates the key generation types. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Extension * @since 8 */ /** * Enumerates the key generation types. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksKeyGenerateType { /** @@ -4330,7 +4491,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_KEY_GENERATE_TYPE_DEFAULT = 0, /** @@ -4344,7 +4506,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_KEY_GENERATE_TYPE_DERIVE = 1, /** @@ -4358,7 +4521,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_KEY_GENERATE_TYPE_AGREE = 2 } @@ -4366,17 +4530,18 @@ declare namespace huks { /** * Enumerates the key generation modes. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @since 8 */ /** * Enumerates the key generation modes. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksKeyFlag { /** @@ -4390,7 +4555,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_KEY_FLAG_IMPORT_KEY = 1, /** @@ -4404,7 +4570,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_KEY_FLAG_GENERATE_KEY = 2, /** @@ -4418,7 +4585,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_KEY_FLAG_AGREE_KEY = 3, /** @@ -4432,7 +4600,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_KEY_FLAG_DERIVE_KEY = 4 } @@ -4440,17 +4609,18 @@ declare namespace huks { /** * Enumerates the key storage modes. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @since 8 */ /** * Enumerates the key storage modes. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksKeyStorageType { /** @@ -4484,7 +4654,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_STORAGE_ONLY_USED_IN_HUKS = 2, /** @@ -4498,7 +4669,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_STORAGE_KEY_EXPORT_ALLOWED = 3 } @@ -4507,7 +4679,7 @@ declare namespace huks { * Enumerates the types of keys to import. By default, a public key is imported. This field is not * required when a symmetric key is imported. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Extension * @since 9 */ @@ -4515,10 +4687,11 @@ declare namespace huks { * Enumerates the types of keys to import. By default, a public key is imported. This field is not * required when a symmetric key is imported. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksImportKeyType { /** @@ -4532,7 +4705,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_KEY_TYPE_PUBLIC_KEY = 0, /** @@ -4546,7 +4720,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_KEY_TYPE_PRIVATE_KEY = 1, /** @@ -4560,7 +4735,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_KEY_TYPE_KEY_PAIR = 2 } @@ -4569,7 +4745,7 @@ declare namespace huks { * Enumerates the salt_len types to set when PSS padding is used in RSA signing or signature * verification. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Extension * @since 10 */ @@ -4577,10 +4753,11 @@ declare namespace huks { * Enumerates the salt_len types to set when PSS padding is used in RSA signing or signature * verification. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksRsaPssSaltLenType { /** @@ -4594,7 +4771,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_RSA_PSS_SALT_LEN_DIGEST = 0, @@ -4609,7 +4787,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_RSA_PSS_SALT_LEN_MAX = 1 } @@ -4617,17 +4796,18 @@ declare namespace huks { /** * Enumerates the user authentication types. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Extension * @since 9 */ /** * Enumerates the user authentication types. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksUserAuthType { /** @@ -4641,7 +4821,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_USER_AUTH_TYPE_FINGERPRINT = 1 << 0, /** @@ -4655,7 +4836,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_USER_AUTH_TYPE_FACE = 1 << 1, /** @@ -4669,7 +4851,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_USER_AUTH_TYPE_PIN = 1 << 2, /** @@ -4684,17 +4867,18 @@ declare namespace huks { /** * Enumerates the access control types. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Extension * @since 9 */ /** * Enumerates the access control types. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksAuthAccessType { /** @@ -4708,7 +4892,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_AUTH_ACCESS_INVALID_CLEAR_PASSWORD = 1 << 0, /** @@ -4722,7 +4907,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_AUTH_ACCESS_INVALID_NEW_BIO_ENROLL = 1 << 1, /** @@ -4736,7 +4922,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_AUTH_ACCESS_ALWAYS_VALID = 1 << 2 } @@ -4744,10 +4931,11 @@ declare namespace huks { /** * Enumerates the user authentication modes. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksUserAuthMode { /** @@ -4755,7 +4943,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_USER_AUTH_MODE_LOCAL = 0, /** @@ -4763,24 +4952,26 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_USER_AUTH_MODE_COAUTH = 1, } /** * Enumerates the storage security levels of a key. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Extension * @since 11 */ /** * Enumerates the storage security levels of a key. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksAuthStorageLevel { /** @@ -4794,7 +4985,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_AUTH_STORAGE_LEVEL_DE = 0, /** @@ -4808,7 +5000,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_AUTH_STORAGE_LEVEL_CE = 1, /** @@ -4822,7 +5015,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_AUTH_STORAGE_LEVEL_ECE = 2, } @@ -4830,17 +5024,18 @@ declare namespace huks { /** * Enumerates the types of the challenges generated when a key is used. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Extension * @since 9 */ /** * Enumerates the types of the challenges generated when a key is used. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksChallengeType { /** @@ -4854,7 +5049,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_CHALLENGE_TYPE_NORMAL = 0, /** @@ -4868,7 +5064,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_CHALLENGE_TYPE_CUSTOM = 1, /** @@ -4882,7 +5079,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_CHALLENGE_TYPE_NONE = 2 } @@ -4890,17 +5088,18 @@ declare namespace huks { /** * Enumerates the positions of the 8-byte valid value in a custom challenge generated. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Extension * @since 9 */ /** * Enumerates the positions of the 8-byte valid value in a custom challenge generated. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksChallengePosition { /** @@ -4914,7 +5113,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_CHALLENGE_POS_0 = 0, /** @@ -4928,7 +5128,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_CHALLENGE_POS_1, /** @@ -4942,7 +5143,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_CHALLENGE_POS_2, /** @@ -4956,7 +5158,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_CHALLENGE_POS_3 } @@ -4964,17 +5167,18 @@ declare namespace huks { /** * Enumerates the signature types of the key generated or imported. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Extension * @since 9 */ /** * Enumerates the signature types of the key generated or imported. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksSecureSignType { /** @@ -4992,7 +5196,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_SECURE_SIGN_WITH_AUTHINFO = 1 } @@ -5000,17 +5205,18 @@ declare namespace huks { /** * Enumerates the tag transfer modes. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Extension * @since 8 */ /** * Enumerates the tag transfer modes. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksSendType { /** @@ -5024,7 +5230,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_SEND_TYPE_ASYNC = 0, /** @@ -5038,7 +5245,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_SEND_TYPE_SYNC = 1 } @@ -5046,7 +5254,7 @@ declare namespace huks { /** * Enum for key wrap type * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @atomicservice * @since 20 @@ -5065,17 +5273,18 @@ declare namespace huks { /** * Enumerates the tag data types. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @since 8 */ /** * Enumerates the tag data types. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksTagType { /** @@ -5089,7 +5298,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_TYPE_INVALID = 0 << 28, /** @@ -5103,7 +5313,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_TYPE_INT = 1 << 28, /** @@ -5117,7 +5328,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_TYPE_UINT = 2 << 28, /** @@ -5131,7 +5343,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_TYPE_ULONG = 3 << 28, /** @@ -5145,7 +5358,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_TYPE_BOOL = 4 << 28, /** @@ -5159,7 +5373,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_TYPE_BYTES = 5 << 28 } @@ -5167,17 +5382,18 @@ declare namespace huks { /** * Enumerates the tags used to invoke parameters. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @since 8 */ /** * Enumerates the tags used to invoke parameters. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export enum HuksTag { /** @@ -5189,7 +5405,7 @@ declare namespace huks { */ HUKS_TAG_INVALID = HuksTagType.HUKS_TAG_TYPE_INVALID | 0, - /* Base algorithm TAG: 1 - 200 */ + /** Base algorithm TAG: 1 - 200 */ /** * Algorithm. * @@ -5201,7 +5417,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_ALGORITHM = HuksTagType.HUKS_TAG_TYPE_UINT | 1, /** @@ -5215,7 +5432,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_PURPOSE = HuksTagType.HUKS_TAG_TYPE_UINT | 2, /** @@ -5229,7 +5447,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_KEY_SIZE = HuksTagType.HUKS_TAG_TYPE_UINT | 3, @@ -5244,7 +5463,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_DIGEST = HuksTagType.HUKS_TAG_TYPE_UINT | 4, /** @@ -5258,7 +5478,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_PADDING = HuksTagType.HUKS_TAG_TYPE_UINT | 5, /** @@ -5272,7 +5493,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_BLOCK_MODE = HuksTagType.HUKS_TAG_TYPE_UINT | 6, /** @@ -5286,7 +5508,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_KEY_TYPE = HuksTagType.HUKS_TAG_TYPE_UINT | 7, /** @@ -5300,7 +5523,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_ASSOCIATED_DATA = HuksTagType.HUKS_TAG_TYPE_BYTES | 8, @@ -5315,7 +5539,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_NONCE = HuksTagType.HUKS_TAG_TYPE_BYTES | 9, /** @@ -5329,7 +5554,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_IV = HuksTagType.HUKS_TAG_TYPE_BYTES | 10, @@ -5344,7 +5570,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_INFO = HuksTagType.HUKS_TAG_TYPE_BYTES | 11, /** @@ -5358,7 +5585,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_SALT = HuksTagType.HUKS_TAG_TYPE_BYTES | 12, /** @@ -5378,7 +5606,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_ITERATION = HuksTagType.HUKS_TAG_TYPE_UINT | 14, @@ -5393,7 +5622,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_KEY_GENERATE_TYPE = HuksTagType.HUKS_TAG_TYPE_UINT | 15, @@ -5426,7 +5656,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_AGREE_ALG = HuksTagType.HUKS_TAG_TYPE_UINT | 19, /** @@ -5440,7 +5671,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_AGREE_PUBLIC_KEY_IS_KEY_ALIAS = HuksTagType.HUKS_TAG_TYPE_BOOL | 20, /** @@ -5454,7 +5686,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_AGREE_PRIVATE_KEY_ALIAS = HuksTagType.HUKS_TAG_TYPE_BYTES | 21, /** @@ -5468,7 +5701,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_AGREE_PUBLIC_KEY = HuksTagType.HUKS_TAG_TYPE_BYTES | 22, /** @@ -5482,7 +5716,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_KEY_ALIAS = HuksTagType.HUKS_TAG_TYPE_BYTES | 23, /** @@ -5496,7 +5731,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_DERIVE_KEY_SIZE = HuksTagType.HUKS_TAG_TYPE_UINT | 24, @@ -5511,7 +5747,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_IMPORT_KEY_TYPE = HuksTagType.HUKS_TAG_TYPE_UINT | 25, @@ -5526,7 +5763,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_UNWRAP_ALGORITHM_SUITE = HuksTagType.HUKS_TAG_TYPE_UINT | 26, @@ -5541,7 +5779,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_DERIVED_AGREED_KEY_STORAGE_FLAG = HuksTagType.HUKS_TAG_TYPE_UINT | 29, @@ -5556,7 +5795,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_RSA_PSS_SALT_LEN_TYPE = HuksTagType.HUKS_TAG_TYPE_UINT | 30, @@ -5596,7 +5836,7 @@ declare namespace huks { */ HUKS_TAG_CREATION_DATETIME = HuksTagType.HUKS_TAG_TYPE_ULONG | 204, - /* Other authentication related TAG: 301 - 500 */ + /** Other authentication related TAG: 301 - 500 */ /** * Reserved. * @@ -5608,7 +5848,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_ALL_USERS = HuksTagType.HUKS_TAG_TYPE_BOOL | 301, /** @@ -5622,7 +5863,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_USER_ID = HuksTagType.HUKS_TAG_TYPE_UINT | 302, /** @@ -5636,7 +5878,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_NO_AUTH_REQUIRED = HuksTagType.HUKS_TAG_TYPE_BOOL | 303, /** @@ -5658,7 +5901,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_USER_AUTH_TYPE = HuksTagType.HUKS_TAG_TYPE_UINT | 304, /** @@ -5672,7 +5916,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_AUTH_TIMEOUT = HuksTagType.HUKS_TAG_TYPE_UINT | 305, /** @@ -5686,11 +5931,12 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_AUTH_TOKEN = HuksTagType.HUKS_TAG_TYPE_BYTES | 306, - /* Key secure access control and user auth TAG */ + /** Key secure access control and user auth TAG */ /** * Access control type. For details, see HuksAuthAccessType. This parameter must be set together with * HuksUserAuthType. @@ -5704,7 +5950,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_KEY_AUTH_ACCESS_TYPE = HuksTagType.HUKS_TAG_TYPE_UINT | 307, @@ -5719,7 +5966,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_KEY_SECURE_SIGN_TYPE = HuksTagType.HUKS_TAG_TYPE_UINT | 308, @@ -5734,7 +5982,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_CHALLENGE_TYPE = HuksTagType.HUKS_TAG_TYPE_UINT | 309, @@ -5749,7 +5998,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_CHALLENGE_POS = HuksTagType.HUKS_TAG_TYPE_UINT | 310, @@ -5764,7 +6014,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_KEY_AUTH_PURPOSE = HuksTagType.HUKS_TAG_TYPE_UINT | 311, @@ -5779,7 +6030,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_AUTH_STORAGE_LEVEL = HuksTagType.HUKS_TAG_TYPE_UINT | 316, @@ -5788,11 +6040,12 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_USER_AUTH_MODE = HuksTagType.HUKS_TAG_TYPE_UINT | 319, - /* Attestation related TAG: 501 - 600 */ + /** Attestation related TAG: 501 - 600 */ /** * Challenge value used in the attestation. * @@ -5804,7 +6057,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_ATTESTATION_CHALLENGE = HuksTagType.HUKS_TAG_TYPE_BYTES | 501, /** @@ -5818,7 +6072,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_ATTESTATION_APPLICATION_ID = HuksTagType.HUKS_TAG_TYPE_BYTES | 502, /** @@ -5880,7 +6135,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_ATTESTATION_ID_ALIAS = HuksTagType.HUKS_TAG_TYPE_BYTES | 511, /** @@ -5906,7 +6162,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_ATTESTATION_ID_SEC_LEVEL_INFO = HuksTagType.HUKS_TAG_TYPE_BYTES | 514, /** @@ -5920,7 +6177,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_ATTESTATION_ID_VERSION_INFO = HuksTagType.HUKS_TAG_TYPE_BYTES | 515, /** @@ -5949,7 +6207,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_IS_KEY_ALIAS = HuksTagType.HUKS_TAG_TYPE_BOOL | 1001, /** @@ -5963,7 +6222,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_KEY_STORAGE_FLAG = HuksTagType.HUKS_TAG_TYPE_UINT | 1002, /** @@ -5977,7 +6237,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_IS_ALLOWED_WRAP = HuksTagType.HUKS_TAG_TYPE_BOOL | 1003, /** @@ -5991,7 +6252,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_KEY_WRAP_TYPE = HuksTagType.HUKS_TAG_TYPE_UINT | 1004, /** @@ -6005,7 +6267,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_KEY_AUTH_ID = HuksTagType.HUKS_TAG_TYPE_BYTES | 1005, /** @@ -6019,7 +6282,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_KEY_ROLE = HuksTagType.HUKS_TAG_TYPE_UINT | 1006, /** @@ -6033,7 +6297,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_KEY_FLAG = HuksTagType.HUKS_TAG_TYPE_UINT | 1007, /** @@ -6047,7 +6312,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_IS_ASYNCHRONIZED = HuksTagType.HUKS_TAG_TYPE_UINT | 1008, /** @@ -6073,7 +6339,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_KEY_DOMAIN = HuksTagType.HUKS_TAG_TYPE_UINT | 1011, @@ -6088,11 +6355,12 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Extension * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_IS_DEVICE_PASSWORD_SET = HuksTagType.HUKS_TAG_TYPE_BOOL | 1012, - /* Inner-use TAG: 10001 - 10999 */ + /** Inner-use TAG: 10001 - 10999 */ /** * @syscap SystemCapability.Security.Huks.Core @@ -6135,7 +6403,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_KEY = HuksTagType.HUKS_TAG_TYPE_BYTES | 10006, /** @@ -6162,7 +6431,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_AE_TAG = HuksTagType.HUKS_TAG_TYPE_BYTES | 10009, @@ -6206,7 +6476,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_SYMMETRIC_KEY_DATA = HuksTagType.HUKS_TAG_TYPE_BYTES | 20001, /** @@ -6220,7 +6491,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_ASYMMETRIC_PUBLIC_KEY_DATA = HuksTagType.HUKS_TAG_TYPE_BYTES | 20002, /** @@ -6234,7 +6506,8 @@ declare namespace huks { * * @syscap SystemCapability.Security.Huks.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HUKS_TAG_ASYMMETRIC_PRIVATE_KEY_DATA = HuksTagType.HUKS_TAG_TYPE_BYTES | 20003 } diff --git a/kits/@kit.UniversalKeystoreKit.d.ts b/kits/@kit.UniversalKeystoreKit.d.ts index cea76342ab..af9d9080c4 100644 --- a/kits/@kit.UniversalKeystoreKit.d.ts +++ b/kits/@kit.UniversalKeystoreKit.d.ts @@ -18,6 +18,8 @@ * @kit UniversalKeystoreKit */ +/*** if arkts 1.1&1.2 */ import huks from '@ohos.security.huks'; export { huks }; +/*** endif */ -- Gitee From b94c209571fe45a0cf1ce1b2b1b4c0f7820b0977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=9B=B9=E5=AE=87?= Date: Tue, 8 Jul 2025 18:09:44 +0800 Subject: [PATCH 045/746] change node use default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 王曹宇 --- BUILD.gn | 28 +--- .../src/arkui_config_util.ts | 123 ++++++++-------- .../arkui_transformer/src/component_file.ts | 16 +- .../src/interface_converter.ts | 138 +++++++++--------- 4 files changed, 145 insertions(+), 160 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 6fc0f303ab..a7a70d9d9e 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -25,16 +25,6 @@ action("ohos_base_split") { script = "//build/ohos/sdk/parse_interface_sdk.py" ohos_sdk_arkts_description_file = "${interface_sdk_path}/ohos_sdk_pub_description_std.json" - if (host_os == "mac") { - node_path = "//prebuilts/build-tools/common/nodejs/node-v16.20.2-darwin-x64/bin/node" - npm_path = - "//prebuilts/build-tools/common/nodejs/node-v16.20.2-darwin-x64/bin/npm" - } else { - node_path = - "//prebuilts/build-tools/common/nodejs/node-v16.20.2-linux-x64/bin/node" - npm_path = - "//prebuilts/build-tools/common/nodejs/node-v16.20.2-linux-x64/bin/npm" - } args = [ "--sdk-description-file", rebase_path("//build/ohos/sdk/ohos_sdk_description_std.json", @@ -42,7 +32,7 @@ action("ohos_base_split") { "--root-build-dir", rebase_path("//", root_build_dir), "--node-js", - rebase_path(node_path, root_build_dir), + rebase_path(nodejs, root_build_dir), "--output-arkts-sdk-desc-file", rebase_path(ohos_sdk_arkts_description_file, root_build_dir), "--sdk-build-public", @@ -50,7 +40,7 @@ action("ohos_base_split") { "--sdk-build-arkts", "${sdk_build_arkts}", "--npm-path", - rebase_path(npm_path, root_build_dir), + rebase_path(npm, root_build_dir), "--output-interface-sdk", rebase_path(interface_sdk_path, root_build_dir), ] @@ -325,16 +315,6 @@ action("ohos_ets_api_arkui_tmp") { deps = [ ":ohos_ets_api_tmp" ] script = "//interface/sdk-js/arkui_transformer.py" - if (host_os == "mac") { - node_path = "//prebuilts/build-tools/common/nodejs/node-v16.20.2-darwin-x64/bin/node" - npm_path = - "//prebuilts/build-tools/common/nodejs/node-v16.20.2-darwin-x64/bin/npm" - } else { - node_path = - "//prebuilts/build-tools/common/nodejs/node-v16.20.2-linux-x64/bin/node" - npm_path = - "//prebuilts/build-tools/common/nodejs/node-v16.20.2-linux-x64/bin/npm" - } args = [ "--input", rebase_path(ohos_ets_api_tmp_path + "/@internal/component/ets", @@ -344,9 +324,9 @@ action("ohos_ets_api_arkui_tmp") { "--source_root_dir", rebase_path("//", root_build_dir), "--npm-path", - rebase_path(npm_path, root_build_dir), + rebase_path(npm, root_build_dir), "--node-js", - rebase_path(node_path, root_build_dir), + rebase_path(nodejs, root_build_dir), ] outputs = [ "$ohos_ets_api_arkui_tmp_path" ] } diff --git a/build-tools/arkui_transformer/src/arkui_config_util.ts b/build-tools/arkui_transformer/src/arkui_config_util.ts index b0b2d91c04..965b95a389 100644 --- a/build-tools/arkui_transformer/src/arkui_config_util.ts +++ b/build-tools/arkui_transformer/src/arkui_config_util.ts @@ -13,110 +13,115 @@ * limitations under the License. */ -import { OptionValues } from "commander" -import * as fs from "fs" +import { OptionValues } from 'commander'; +import * as fs from 'fs'; -import path from "path" +import path from 'path'; export interface ArkUIConfig { - components: Array + components: Array; } interface NoneUIConfig { - files: Array + files: Array; } interface UseM3Config { - useM3: Array + useM3: Array; } export class ArkUIConfigUtil { - static instance: ArkUIConfigUtil = new ArkUIConfigUtil + static instance: ArkUIConfigUtil = new ArkUIConfigUtil(); constructor() { - this.config = JSON.parse(fs.readFileSync("./config/arkui_config.json", 'utf-8')) + this.config = JSON.parse(fs.readFileSync('./config/arkui_config.json', 'utf-8')); this.config.components.forEach(c => { - this.componentSet.add(c) - }) - this.noneUIconfig = JSON.parse(fs.readFileSync("./config/none_arkui_files.json", 'utf-8')) + this.componentSet.add(c); + }); + this.noneUIconfig = JSON.parse(fs.readFileSync('./config/none_arkui_files.json', 'utf-8')); this.noneUIconfig.files.forEach(f => { - this.noneUIFileSet.add(f) - }) - const useM3Config: UseM3Config = JSON.parse(fs.readFileSync("./config/arkui_m3_white_list.json", 'utf-8')) - this._useM3Files = useM3Config.useM3 + this.noneUIFileSet.add(f); + }); + const useM3Config: UseM3Config = JSON.parse(fs.readFileSync("./config/arkui_m3_white_list.json", 'utf-8')); + this._useM3Files = useM3Config.useM3; } // ui components - private config: ArkUIConfig + private config: ArkUIConfig; // None ui files - private noneUIconfig: NoneUIConfig - private noneUIFileSet: Set = new Set + private noneUIconfig: NoneUIConfig; + private noneUIFileSet: Set = new Set(); // Full set of component, should be manually mantained by config file - private componentSet: Set = new Set + private componentSet: Set = new Set(); // Component superclass set, generated by traversing the declartion AST - private componentSuperclassSet: Set = new Set + private componentSuperclassSet: Set = new Set(); // All class/interface name related to component attribute heritage - private componentHeritage: Set = new Set + private componentHeritage: Set = new Set(); // All implement relationship of component heritage - private componentHerirageRelation: Map = new Map + private componentHerirageRelation: Map = new Map(); // All component filename - private componentFiles: Set = new Set - private file2Attrbiute: Map = new Map - private shouldNotHaveAttributeModifier: Set = new Set - private _useMemoM3: boolean = false - private _useM3Files: Array = [] - private _configPath: string = '' + private componentFiles: Set = new Set(); + private file2Attrbiute: Map = new Map(); + private shouldNotHaveAttributeModifier: Set = new Set(); + private _useMemoM3: boolean = false; + private _useM3Files: Array = []; + private _configPath: string = ''; get useMemoM3(): boolean { - return this._useMemoM3 + return this._useMemoM3; } set useMemoM3(value: boolean) { - this._useMemoM3 = value + this._useMemoM3 = value; } withM3File(file: string): boolean { if (this._useMemoM3) { return true; } - return this._useM3Files.includes(path.basename(file)) + return this._useM3Files.includes(path.basename(file)); } get isHdsComponent(): boolean { - return this._configPath.length > 0 + return this._configPath.length > 0; } public loadConfig(config: OptionValues): void { if (config.useMemoM3) { - this._useMemoM3 = true + this._useMemoM3 = true; } if (config.configPath != undefined && config.configPath != '') { - this._configPath = config.configPath + this._configPath = config.configPath; // exception process: avoid non-existing given path try { - this.config = JSON.parse(fs.readFileSync(this._configPath + "/hds_uicomponents.json", 'utf-8')) - this.componentSet.clear() + this.config = JSON.parse(fs.readFileSync(this._configPath + "/hds_uicomponents.json", 'utf-8')); + this.componentSet.clear(); this.config.components.forEach(c => { - this.componentSet.add(c) - }) - this.noneUIconfig = JSON.parse(fs.readFileSync(this._configPath + "/hds_non_uicomponents.json", 'utf-8')) - this.noneUIFileSet.clear() + this.componentSet.add(c); + }); + this.noneUIconfig = JSON.parse(fs.readFileSync(this._configPath + "/hds_non_uicomponents.json", 'utf-8')); + this.noneUIFileSet.clear(); this.noneUIconfig.files.forEach(f => { - this.noneUIFileSet.add(f) - }) + this.noneUIFileSet.add(f); + }); } catch (error) { - this._configPath = '' + this._configPath = ''; console.log("Load given hds_uicomponents file failed!", error); } } } private getPureName(name: string): string { - return path.basename(name).replaceAll(".d.ts", "").replaceAll(".d.ets", "").replaceAll("_","").toLowerCase() + return path + .basename(name) + .replace(/\.d\.e?ts/g, '') + .replace(/_/g, '') + .toLowerCase(); } public isRelatedToComponent(name: string): boolean { - return this.componentSet.has(name) || this.componentSuperclassSet.has(name) + return this.componentSet.has(name) || this.componentSuperclassSet.has(name); } public isComponent(name: string, subfix: string): boolean { - return this.componentSet.has(name.replaceAll(subfix, "")) + const regSubfix = new RegExp(subfix, 'g'); + return this.componentSet.has(name.replace(regSubfix, '')); } public addComponentSuperclass(name: string): void { if (!this.isComponent(name, 'Attribute')) { @@ -124,36 +129,36 @@ export class ArkUIConfigUtil { } } public addComponentAttributeHeritage(name: string[]): void { - let prev: string | undefined = undefined + let prev: string | undefined = undefined; name.forEach(n => { if (prev) { - this.componentHerirageRelation.set(prev, n) + this.componentHerirageRelation.set(prev, n); } - prev = n - this.componentHeritage.add(n) - }) + prev = n; + this.componentHeritage.add(n); + }); if (name.length == 1) { - this.shouldNotHaveAttributeModifier.add(name[0]) + this.shouldNotHaveAttributeModifier.add(name[0]); } } public getComponentSuperclass(name: string): string | undefined { - return this.componentHerirageRelation.get(name) + return this.componentHerirageRelation.get(name); } public isUIHeritage(name: string): boolean { - return this.componentHeritage.has(name) + return this.componentHeritage.has(name); } public notUIFile(name: string): boolean { - return this.noneUIFileSet.has(this.getPureName(name)) + return this.noneUIFileSet.has(this.getPureName(name)); } public addComponentFile(name: string): void { - this.componentFiles.add(this.getPureName(name)) + this.componentFiles.add(this.getPureName(name)); } public isComponentFile(name: string): boolean { - return this.componentFiles.has(this.getPureName(name)) + return this.componentFiles.has(this.getPureName(name)); } public shouldHaveAttributeModifier(name: string): boolean { - return !this.shouldNotHaveAttributeModifier.has(name) && this.isComponent(name, 'Attribute') + return !this.shouldNotHaveAttributeModifier.has(name) && this.isComponent(name, 'Attribute'); } } -export default ArkUIConfigUtil.instance +export default ArkUIConfigUtil.instance; diff --git a/build-tools/arkui_transformer/src/component_file.ts b/build-tools/arkui_transformer/src/component_file.ts index 89754a53cc..6e2defbf42 100644 --- a/build-tools/arkui_transformer/src/component_file.ts +++ b/build-tools/arkui_transformer/src/component_file.ts @@ -17,8 +17,8 @@ import * as ts from 'typescript'; import * as path from 'path'; export class ComponentFile { - public componentName: string - public outFileName: string + public componentName: string; + public outFileName: string; static snake2Camel(name: string, low: boolean = false): string { if (!name.includes('_')) { @@ -37,15 +37,15 @@ export class ComponentFile { } public appendAttribute(str: string) { - this.attributeSource.push(str) + this.attributeSource.push(str); } public appendFunction(str: string) { - this.functionSource += str + this.functionSource += str; } get concactSource() { - return [...this.attributeSource, this.functionSource].join('\n') + return [...this.attributeSource, this.functionSource].join('\n'); } constructor( @@ -54,8 +54,8 @@ export class ComponentFile { public attributeSource: string[] = [], public functionSource: string = '', ) { - const pureName = path.basename(this.fileName).replaceAll(".d.ts", "").replaceAll(".d.ets", ""); - this.componentName = ComponentFile.snake2Camel(pureName) - this.outFileName = ComponentFile.snake2Camel(pureName, true).concat(".d.ets") + const pureName = path.basename(this.fileName).replace(/\.d\.e?ts/g, ""); + this.componentName = ComponentFile.snake2Camel(pureName); + this.outFileName = ComponentFile.snake2Camel(pureName, true).concat(".d.ets"); } } \ No newline at end of file diff --git a/build-tools/arkui_transformer/src/interface_converter.ts b/build-tools/arkui_transformer/src/interface_converter.ts index 5a8c874ca1..95b51421ec 100644 --- a/build-tools/arkui_transformer/src/interface_converter.ts +++ b/build-tools/arkui_transformer/src/interface_converter.ts @@ -17,12 +17,12 @@ import * as ts from 'typescript'; import * as fs from 'fs'; import * as path from 'path'; import { assert } from 'console'; -import uiconfig from './arkui_config_util' +import uiconfig from './arkui_config_util'; import { ComponentFile } from './component_file'; -import { analyzeBaseClasses, isComponentHerirage, getBaseClassName, removeDuplicateMethods, mergeUniqueOrdered } from './lib/attribute_utils' +import { analyzeBaseClasses, isComponentHerirage, getBaseClassName, removeDuplicateMethods, mergeUniqueOrdered } from './lib/attribute_utils'; function readLangTemplate(): string { - return uiconfig.useMemoM3 ? fs.readFileSync('./pattern/arkts_component_decl_m3.pattern', 'utf8') : fs.readFileSync('./pattern/arkts_component_decl.pattern', 'utf8') + return uiconfig.useMemoM3 ? fs.readFileSync('./pattern/arkts_component_decl_m3.pattern', 'utf8') : fs.readFileSync('./pattern/arkts_component_decl.pattern', 'utf8'); } function extractSignatureComment( @@ -34,19 +34,19 @@ function extractSignatureComment( const commentText = sourceFile.text - .slice(jsDoc.getStart(sourceFile), jsDoc.getEnd()) + .slice(jsDoc.getStart(sourceFile), jsDoc.getEnd()); return commentText.split('\n').map((l, index) => { if (index == 0) { return l.trimStart(); } - return ' ' + l.trimStart() - }).join('\n') + return ' ' + l.trimStart(); + }).join('\n'); } interface ComponnetFunctionInfo { sig: string[], - comment: string + comment: string; } interface ComponentPram { @@ -57,13 +57,13 @@ interface ComponentPram { function getAllInterfaceCallSignature(node: ts.InterfaceDeclaration, originalCode: ts.SourceFile, mergeCallSig: boolean = false): Array { const signatureParams: Array = []; - const comments: string[] = [] - const paramList: Array = [] + const comments: string[] = []; + const paramList: Array = []; node.members.forEach(member => { if (ts.isCallSignatureDeclaration(member)) { const currentSignature: string[] = []; - const currentParam: ComponentPram[] = [] + const currentParam: ComponentPram[] = []; const comment = extractSignatureComment(member, originalCode); comments.push(comment); @@ -71,38 +71,38 @@ function getAllInterfaceCallSignature(node: ts.InterfaceDeclaration, originalCod currentSignature.push(param.getText(originalCode)); currentParam.push({ name: (param.name as ts.Identifier).escapedText as string, type: [param.type!.getText(originalCode)], isOptional: !!param.questionToken }); }); - signatureParams.push(currentSignature) - paramList.push(currentParam) + signatureParams.push(currentSignature); + paramList.push(currentParam); } }); - const result: Array = new Array + const result: Array = new Array; if (mergeCallSig) { - const mergedParamList: Array = [] + const mergedParamList: Array = []; paramList.forEach((params, _) => { params.forEach((param, index) => { if (!mergedParamList[index]) { - mergedParamList.push(param) + mergedParamList.push(param); if (index > 0) { (mergedParamList[index] as ComponentPram).isOptional = true; } } else { - mergedParamList[index] = { name: param.name, type: mergeUniqueOrdered(mergedParamList[index].type, param.type), isOptional: mergedParamList[index].isOptional || param.isOptional } + mergedParamList[index] = { name: param.name, type: mergeUniqueOrdered(mergedParamList[index].type, param.type), isOptional: mergedParamList[index].isOptional || param.isOptional }; } - }) - }) + }); + }); const mergedSignature: string[] = []; mergedParamList.forEach((param, index) => { - mergedSignature.push(`${param.name}${param.isOptional ? '?' : ''}: ${param.type.join(' | ')}`) - }) + mergedSignature.push(`${param.name}${param.isOptional ? '?' : ''}: ${param.type.join(' | ')}`); + }); result.push({ sig: mergedSignature, comment: '' - }) + }); } else { for (let i = 0; i < signatureParams.length; i++) { - result.push({ sig: signatureParams[i], comment: comments[i] }) + result.push({ sig: signatureParams[i], comment: comments[i] }); } } return result; @@ -110,17 +110,17 @@ function getAllInterfaceCallSignature(node: ts.InterfaceDeclaration, originalCod function handleComponentInterface(node: ts.InterfaceDeclaration, file: ComponentFile) { const result = getAllInterfaceCallSignature(node, file.sourceFile, !uiconfig.useMemoM3); - const declPattern = readLangTemplate() - const declComponentFunction: string[] = [] - const attributeName = node.name!.escapedText as string - const componentName = attributeName.replaceAll('Interface', ''); + const declPattern = readLangTemplate(); + const declComponentFunction: string[] = []; + const attributeName = node.name!.escapedText as string; + const componentName = attributeName.replace(/Interface/g, ''); result.forEach(p => { declComponentFunction.push(declPattern - .replaceAll("%COMPONENT_NAME%", componentName) - .replaceAll("%FUNCTION_PARAMETERS%", p.sig?.map(it => `${it}, `).join("") ?? "") - .replaceAll("%COMPONENT_COMMENT%", p.comment)) - }) - return declComponentFunction.join('\n') + .replace(/%COMPONENT_NAME%/g, componentName) + .replace(/%FUNCTION_PARAMETERS%/g, p.sig?.map(it => `${it}, `).join("") ?? "") + .replace(/%COMPONENT_COMMENT%/g, p.comment)); + }); + return declComponentFunction.join('\n'); } function updateMethodDoc(node: ts.MethodDeclaration): ts.MethodDeclaration { @@ -129,7 +129,7 @@ function updateMethodDoc(node: ts.MethodDeclaration): ts.MethodDeclaration { const paramNameType: Map = new Map(); node.parameters.forEach(param => { paramNameType.set((param.name as ts.Identifier).escapedText!, param.type!); - }) + }); const jsDoc = node.jsDoc as ts.JSDoc[]; const updatedJsDoc = jsDoc.map((doc) => { const updatedTags = (doc.tags || []).map((tag: ts.JSDocTag) => { @@ -139,10 +139,10 @@ function updateMethodDoc(node: ts.MethodDeclaration): ts.MethodDeclaration { tag.tagName, ts.factory.createJSDocTypeExpression(returnType), tag.comment - ) + ); } if (tag.tagName.escapedText === 'param') { - const paramTag = tag as ts.JSDocParameterTag + const paramTag = tag as ts.JSDocParameterTag; return ts.factory.updateJSDocParameterTag( paramTag, paramTag.tagName, @@ -151,15 +151,15 @@ function updateMethodDoc(node: ts.MethodDeclaration): ts.MethodDeclaration { ts.factory.createJSDocTypeExpression(paramNameType.get((paramTag.name as ts.Identifier).escapedText!)!), paramTag.isNameFirst, paramTag.comment - ) + ); } - return tag - }) + return tag; + }); return ts.factory.updateJSDocComment(doc, doc.comment, updatedTags); }); - (node as any).jsDoc = updatedJsDoc + (node as any).jsDoc = updatedJsDoc; } - return node + return node; } function handleOptionalType(paramType: ts.TypeNode, wrapUndefined: boolean = true): ts.TypeNode { @@ -176,7 +176,7 @@ function handleOptionalType(paramType: ts.TypeNode, wrapUndefined: boolean = tru ...(ts.isUnionTypeNode(type) ? type.types : [type]), ts.factory.createKeywordTypeNode(ts.SyntaxKind.UndefinedKeyword), ]); - } + }; // Check if the parameter type is Optional if (typeName === 'Optional' && paramType.typeArguments?.length === 1) { @@ -205,7 +205,7 @@ function handleAttributeMember(node: ts.MethodDeclaration): ts.MethodSignature { } else if (ts.isUnionTypeNode(paramType)) { const removeOptionalTypes = paramType.types.map(type => { return handleOptionalType(type, false); - }) + }); // Check if the union type already includes undefined const hasUndefined = removeOptionalTypes.some( type => type.kind === ts.SyntaxKind.UndefinedKeyword @@ -260,7 +260,7 @@ function handleAttributeMember(node: ts.MethodDeclaration): ts.MethodSignature { returnType ); - return methodSignature + return methodSignature; } function handleHeritageClause(node: ts.NodeArray | undefined): ts.HeritageClause[] { @@ -284,7 +284,7 @@ function handleHeritageClause(node: ts.NodeArray | undefined) const newClause = ts.factory.createHeritageClause(ts.SyntaxKind.ExtendsKeyword, types); heritageClauses.push(newClause); }); - return heritageClauses + return heritageClauses; } function handleAttributeModifier(node: ts.ClassDeclaration, members: ts.MethodSignature[]) { @@ -293,8 +293,8 @@ function handleAttributeModifier(node: ts.ClassDeclaration, members: ts.MethodSi if ((m.name as ts.Identifier).escapedText === 'attributeModifier') { members.splice(members.indexOf(m), 1); } - }) - return + }); + return; } members.push( ts.factory.createMethodSignature( @@ -328,7 +328,7 @@ function handleAttributeModifier(node: ts.ClassDeclaration, members: ts.MethodSi )], ts.factory.createThisTypeNode() ) - ) + ); } function transformComponentAttribute(node: ts.ClassDeclaration): ts.Node[] { @@ -339,16 +339,16 @@ function transformComponentAttribute(node: ts.ClassDeclaration): ts.Node[] { return handleAttributeMember(member); }).filter((member): member is ts.MethodSignature => member !== undefined); - const filetredMethos = removeDuplicateMethods(members) + const filetredMethos = removeDuplicateMethods(members); if (uiconfig.shouldHaveAttributeModifier(node.name!.escapedText as string)) { - handleAttributeModifier(node, filetredMethos) + handleAttributeModifier(node, filetredMethos); } const exportModifier = ts.factory.createModifier(ts.SyntaxKind.ExportKeyword); const delcareModifier = ts.factory.createModifier(ts.SyntaxKind.DeclareKeyword); - const heritageClauses = handleHeritageClause(node.heritageClauses) + const heritageClauses = handleHeritageClause(node.heritageClauses); const noneUIAttribute = ts.factory.createInterfaceDeclaration( [exportModifier, delcareModifier], @@ -357,7 +357,7 @@ function transformComponentAttribute(node: ts.ClassDeclaration): ts.Node[] { heritageClauses, filetredMethos ); - return [noneUIAttribute] + return [noneUIAttribute]; } function getLeadingSpace(line: string): string { @@ -387,10 +387,10 @@ function addAttributeMemo(node: ts.ClassDeclaration, componentFile: ComponentFil const functionSet: Set = new Set(); node.members.forEach(m => { - functionSet.add((m.name! as ts.Identifier).escapedText!) - }) + functionSet.add((m.name! as ts.Identifier).escapedText!); + }); - const updatedCode: string[] = [] + const updatedCode: string[] = []; originalCode.forEach(l => { const name = extractMethodName(l); if (!name) { @@ -398,53 +398,53 @@ function addAttributeMemo(node: ts.ClassDeclaration, componentFile: ComponentFil return; } if (functionSet.has(name)) { - updatedCode.push(getLeadingSpace(l) + "@memo") + updatedCode.push(getLeadingSpace(l) + "@memo"); } updatedCode.push(l); - }) - const attributeName = node.name!.escapedText! - const superInterface = getBaseClassName(node) + }); + const attributeName = node.name!.escapedText!; + const superInterface = getBaseClassName(node); componentFile.appendAttribute(updatedCode.join('\n') .replace(`export declare interface ${attributeName}`, `export declare interface UI${attributeName}`) .replace(`extends ${superInterface}`, `extends UI${superInterface}`) - ) + ); } function isComponentAttribute(node: ts.Node) { if (!(ts.isClassDeclaration(node) && node.name?.escapedText)) { return false; } - return uiconfig.isComponent(node.name.escapedText, 'Attribute') + return uiconfig.isComponent(node.name.escapedText, 'Attribute'); } function isComponentInterface(node: ts.Node) { if (!(ts.isInterfaceDeclaration(node) && node.name?.escapedText)) { return false; } - return uiconfig.isComponent(node.name.escapedText, 'Interface') + return uiconfig.isComponent(node.name.escapedText, 'Interface'); } export function addMemoTransformer(componentFile: ComponentFile): ts.TransformerFactory { return (context) => { const visit: ts.Visitor = (node) => { if (isComponentHerirage(node) && !uiconfig.useMemoM3) { - addAttributeMemo(node as ts.ClassDeclaration, componentFile) + addAttributeMemo(node as ts.ClassDeclaration, componentFile); } return ts.visitEachChild(node, visit, context); - } - return (sourceFile) => { componentFile.sourceFile = sourceFile; return ts.visitNode(sourceFile, visit) }; - } + }; + return (sourceFile) => { componentFile.sourceFile = sourceFile; return ts.visitNode(sourceFile, visit); }; + }; } export function interfaceTransformer(program: ts.Program, componentFile: ComponentFile): ts.TransformerFactory { return (context) => { const visit: ts.Visitor = (node) => { if (isComponentInterface(node)) { - componentFile.appendFunction(handleComponentInterface(node as ts.InterfaceDeclaration, componentFile)) + componentFile.appendFunction(handleComponentInterface(node as ts.InterfaceDeclaration, componentFile)); return undefined; } if (isComponentHerirage(node)) { - return transformComponentAttribute(node as ts.ClassDeclaration) + return transformComponentAttribute(node as ts.ClassDeclaration); } return ts.visitEachChild(node, visit, context); }; @@ -457,10 +457,10 @@ export function componentInterfaceCollector(program: ts.Program, componentFile: return (context) => { const visit: ts.Visitor = (node) => { if (isComponentAttribute(node)) { - const attributeName = (node as ts.ClassDeclaration).name!.escapedText as string - componentFile.componentName = attributeName.replaceAll('Attribute', ''); + const attributeName = (node as ts.ClassDeclaration).name!.escapedText as string; + componentFile.componentName = attributeName.replace(/Attribute/g, ''); const baseTypes = analyzeBaseClasses(node as ts.ClassDeclaration, componentFile.sourceFile, program); - uiconfig.addComponentAttributeHeritage([attributeName, ...baseTypes]) + uiconfig.addComponentAttributeHeritage([attributeName, ...baseTypes]); } return ts.visitEachChild(node, visit, context); }; -- Gitee From 3b822fe94ac241edebf3560c131285cddcde460c Mon Sep 17 00:00:00 2001 From: BrainL Date: Wed, 9 Jul 2025 12:15:24 +0800 Subject: [PATCH 046/746] code check Signed-off-by: BrainL --- api/@ohos.file.keyManager.d.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/api/@ohos.file.keyManager.d.ts b/api/@ohos.file.keyManager.d.ts index e408f34592..e932d95acf 100644 --- a/api/@ohos.file.keyManager.d.ts +++ b/api/@ohos.file.keyManager.d.ts @@ -33,8 +33,6 @@ declare namespace keyManager { * @param { long } userId * @throws { BusinessError } 201 - Permission verification failed. * @throws { BusinessError } 202 - The caller is not a system application. - * @throws { BusinessError } 401 - The input parameter is invalid. Possible causes: Mandatory - parameters are left unspecified; Or input parameter has type different from the type the interface requires. * @throws { BusinessError } 13600001 - IPC error. * @throws { BusinessError } 13600008 - No such object. Possible causes: Cannot find userkey for the specified user. * @throws { BusinessError } 13600009 - User ID out of range. Possible causes: input parameter userId < 100 or userId > 10736. -- Gitee From f1c8f12c6cff08379ccadd61c7119008a1ddce26 Mon Sep 17 00:00:00 2001 From: zhangzezhong Date: Wed, 2 Jul 2025 16:01:32 +0800 Subject: [PATCH 047/746] merge SDK 0603ToMaster Signed-off-by: zhangzezhong --- api/@ohos.app.ability.AbilityConstant.d.ts | 33 +++-- api/@ohos.app.ability.Configuration.d.ts | 21 ++-- ...ohos.app.ability.InsightIntentContext.d.ts | 7 +- ...hos.app.ability.InsightIntentExecutor.d.ts | 22 ++-- api/@ohos.app.ability.OpenLinkOptions.d.ts | 9 +- ...s.app.ability.ServiceExtensionAbility.d.ts | 3 +- api/@ohos.app.ability.StartOptions.d.ts | 51 +++++--- api/@ohos.app.ability.UIAbility.d.ts | 35 ++++-- ...app.ability.UIExtensionContentSession.d.ts | 3 +- api/@ohos.app.ability.Want.d.ts | 3 +- ....app.ability.abilityDelegatorRegistry.d.ts | 26 ++-- api/@ohos.app.ability.abilityManager.d.ts | 33 ++++- api/@ohos.app.ability.appManager.d.ts | 100 ++++++++++----- api/@ohos.app.ability.application.d.ts | 12 +- api/@ohos.app.ability.insightIntent.d.ts | 33 +++-- ...@ohos.app.ability.insightIntentDriver.d.ts | 39 ++++-- api/@ohos.app.ability.wantAgent.d.ts | 115 ++++++++++++------ api/@ohos.app.ability.wantConstant.d.ts | 105 ++++++++++------ api/@ohos.zlib.d.ts | 27 ++-- api/application/AbilityDelegator.d.ts | 77 ++++++++---- api/application/AbilityStageContext.d.ts | 3 +- api/application/AbilityStageMonitor.d.ts | 11 +- api/application/AbilityStateData.d.ts | 30 +++-- api/application/AppStateData.d.ts | 22 ++-- api/application/ApplicationContext.d.ts | 45 ++++--- api/application/ApplicationStateObserver.d.ts | 10 +- api/application/Context.d.ts | 9 +- api/application/ExtensionContext.d.ts | 9 +- api/application/MultiAppMode.d.ts | 12 +- api/application/ProcessInformation.d.ts | 29 +++-- api/application/RunningAppClone.d.ts | 12 +- api/application/RunningMultiAppInfo.d.ts | 9 +- api/application/RunningMultiInstanceInfo.d.ts | 6 +- api/application/ServiceExtensionContext.d.ts | 31 +++-- api/application/UIAbilityContext.d.ts | 28 +++-- api/application/UIExtensionContext.d.ts | 20 +-- api/wantAgent/triggerInfo.d.ts | 29 ++++- api/wantAgent/wantAgentInfo.d.ts | 34 ++++-- 38 files changed, 750 insertions(+), 353 deletions(-) diff --git a/api/@ohos.app.ability.AbilityConstant.d.ts b/api/@ohos.app.ability.AbilityConstant.d.ts index 1f72732125..5fa367af1e 100644 --- a/api/@ohos.app.ability.AbilityConstant.d.ts +++ b/api/@ohos.app.ability.AbilityConstant.d.ts @@ -172,7 +172,8 @@ declare namespace AbilityConstant { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ lastExitMessage: string; @@ -183,7 +184,8 @@ declare namespace AbilityConstant { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ lastExitDetailInfo?: LastExitDetailInfo; } @@ -195,7 +197,8 @@ declare namespace AbilityConstant { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface LastExitDetailInfo { /** @@ -205,7 +208,8 @@ declare namespace AbilityConstant { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ pid: number; @@ -216,7 +220,8 @@ declare namespace AbilityConstant { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ processName: string; @@ -227,7 +232,8 @@ declare namespace AbilityConstant { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ uid: number; @@ -238,7 +244,8 @@ declare namespace AbilityConstant { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ exitSubReason: number; @@ -249,7 +256,8 @@ declare namespace AbilityConstant { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ exitMsg: string; @@ -260,7 +268,8 @@ declare namespace AbilityConstant { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ rss: number; @@ -271,7 +280,8 @@ declare namespace AbilityConstant { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ pss: number; @@ -282,7 +292,8 @@ declare namespace AbilityConstant { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ timestamp: number; diff --git a/api/@ohos.app.ability.Configuration.d.ts b/api/@ohos.app.ability.Configuration.d.ts index b9a2043395..e8139c14bc 100644 --- a/api/@ohos.app.ability.Configuration.d.ts +++ b/api/@ohos.app.ability.Configuration.d.ts @@ -122,7 +122,8 @@ export interface Configuration { * @syscap SystemCapability.Ability.AbilityBase * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ direction?: ConfigurationConstant.Direction; @@ -148,7 +149,8 @@ export interface Configuration { * @syscap SystemCapability.Ability.AbilityBase * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ screenDensity?: ConfigurationConstant.ScreenDensity; @@ -165,7 +167,8 @@ export interface Configuration { * @type { ?number } * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ displayId?: number; @@ -182,7 +185,8 @@ export interface Configuration { * @type { ?boolean } * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ hasPointerDevice?: boolean; @@ -222,7 +226,8 @@ export interface Configuration { * @type { ?number } * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ fontWeightScale?: number; @@ -232,7 +237,8 @@ export interface Configuration { * @type { ?string } * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ mcc?: string; @@ -242,7 +248,8 @@ export interface Configuration { * @type { ?string } * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ mnc?: string; diff --git a/api/@ohos.app.ability.InsightIntentContext.d.ts b/api/@ohos.app.ability.InsightIntentContext.d.ts index 9f2de2d357..89e087146f 100644 --- a/api/@ohos.app.ability.InsightIntentContext.d.ts +++ b/api/@ohos.app.ability.InsightIntentContext.d.ts @@ -27,9 +27,10 @@ import type Want from './@ohos.app.ability.Want'; * @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 InsightIntentContext { +declare class InsightIntentContext { /** * Starts a new ability. * This interface only allows you to start abilities within the same bundle and specify the bundleName. @@ -90,3 +91,5 @@ export default class InsightIntentContext { */ startAbility(want: Want): Promise; } + +export default InsightIntentContext; \ No newline at end of file diff --git a/api/@ohos.app.ability.InsightIntentExecutor.d.ts b/api/@ohos.app.ability.InsightIntentExecutor.d.ts index 69a71decc5..1e753f4995 100644 --- a/api/@ohos.app.ability.InsightIntentExecutor.d.ts +++ b/api/@ohos.app.ability.InsightIntentExecutor.d.ts @@ -29,9 +29,10 @@ import type UIExtensionContentSession from './@ohos.app.ability.UIExtensionConte * @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 InsightIntentExecutor { +declare class InsightIntentExecutor { /** * Indicates context of insight intent. * @@ -39,7 +40,8 @@ export default class InsightIntentExecutor { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ context: InsightIntentContext; @@ -53,7 +55,8 @@ export default class InsightIntentExecutor { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onExecuteInUIAbilityForegroundMode(name: string, param: Record, pageLoader: window.WindowStage): insightIntent.ExecuteResult | Promise; @@ -67,7 +70,8 @@ export default class InsightIntentExecutor { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onExecuteInUIAbilityBackgroundMode(name: string, param: Record): insightIntent.ExecuteResult | Promise; @@ -81,7 +85,8 @@ export default class InsightIntentExecutor { * @returns { insightIntent.ExecuteResult | Promise } The result of insight intent execution, support promise. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onExecuteInUIExtensionAbility(name: string, param: Record, pageLoader: UIExtensionContentSession): insightIntent.ExecuteResult | Promise; @@ -94,8 +99,11 @@ export default class InsightIntentExecutor { * @returns { insightIntent.ExecuteResult | Promise } The result of insight intent execution, support promise. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onExecuteInServiceExtensionAbility(name: string, param: Record): insightIntent.ExecuteResult | Promise; } + +export default InsightIntentContext; \ No newline at end of file diff --git a/api/@ohos.app.ability.OpenLinkOptions.d.ts b/api/@ohos.app.ability.OpenLinkOptions.d.ts index e93d8ff2a7..63873b4f2c 100644 --- a/api/@ohos.app.ability.OpenLinkOptions.d.ts +++ b/api/@ohos.app.ability.OpenLinkOptions.d.ts @@ -25,7 +25,8 @@ * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export default interface OpenLinkOptions { /** @@ -36,7 +37,8 @@ export default interface OpenLinkOptions { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ appLinkingOnly?: boolean; @@ -47,7 +49,8 @@ export default interface OpenLinkOptions { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ parameters?: Record; } diff --git a/api/@ohos.app.ability.ServiceExtensionAbility.d.ts b/api/@ohos.app.ability.ServiceExtensionAbility.d.ts index 0d678b9f42..9fb19d970b 100644 --- a/api/@ohos.app.ability.ServiceExtensionAbility.d.ts +++ b/api/@ohos.app.ability.ServiceExtensionAbility.d.ts @@ -155,7 +155,8 @@ declare class ServiceExtensionAbility { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ onConfigurationUpdate(newConfig: Configuration): void; diff --git a/api/@ohos.app.ability.StartOptions.d.ts b/api/@ohos.app.ability.StartOptions.d.ts index 8526689c43..07b51995b5 100644 --- a/api/@ohos.app.ability.StartOptions.d.ts +++ b/api/@ohos.app.ability.StartOptions.d.ts @@ -17,11 +17,10 @@ * @file * @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'; +/*** if arkts 1.1 */ import CompletionHandler from './@ohos.app.ability.CompletionHandler'; /*** endif */ @@ -51,7 +50,8 @@ export default class StartOptions { * @type { ?number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ windowMode?: number; @@ -81,7 +81,8 @@ export default class StartOptions { * @type { ?boolean } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ withAnimation?: boolean; @@ -91,7 +92,8 @@ export default class StartOptions { * @type { ?number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ windowLeft?: number; @@ -101,7 +103,8 @@ export default class StartOptions { * @type { ?number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ windowTop?: number; @@ -111,7 +114,8 @@ export default class StartOptions { * @type { ?number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ windowWidth?: number; @@ -121,7 +125,8 @@ export default class StartOptions { * @type { ?number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ windowHeight?: number; @@ -132,7 +137,8 @@ export default class StartOptions { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ windowFocused?: boolean; @@ -144,7 +150,8 @@ export default class StartOptions { * @type { ?contextConstant.ProcessMode } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ processMode?: contextConstant.ProcessMode; @@ -156,7 +163,8 @@ export default class StartOptions { * @type { ?contextConstant.StartupVisibility } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ startupVisibility?: contextConstant.StartupVisibility; @@ -166,7 +174,8 @@ export default class StartOptions { * @type { ?image.PixelMap } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ startWindowIcon?: image.PixelMap; @@ -176,7 +185,8 @@ export default class StartOptions { * @type { ?string } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ startWindowBackgroundColor?: string; @@ -186,7 +196,8 @@ export default class StartOptions { * @type { ?Array } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ supportWindowModes?: Array; @@ -196,7 +207,8 @@ export default class StartOptions { * @type { ?number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 17 + * @since arkts{ '1.1':'17','1.2':'20'} + * @arkts 1.1&1.2 */ minWindowWidth?: number; @@ -206,7 +218,8 @@ export default class StartOptions { * @type { ?number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 17 + * @since arkts{ '1.1':'17','1.2':'20'} + * @arkts 1.1&1.2 */ minWindowHeight?: number; @@ -216,7 +229,8 @@ export default class StartOptions { * @type { ?number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 17 + * @since arkts{ '1.1':'17','1.2':'20'} + * @arkts 1.1&1.2 */ maxWindowWidth?: number; @@ -226,7 +240,8 @@ export default class StartOptions { * @type { ?number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 17 + * @since arkts{ '1.1':'17','1.2':'20'} + * @arkts 1.1&1.2 */ maxWindowHeight?: number; diff --git a/api/@ohos.app.ability.UIAbility.d.ts b/api/@ohos.app.ability.UIAbility.d.ts index f7680dd63e..f0ee7fa13b 100644 --- a/api/@ohos.app.ability.UIAbility.d.ts +++ b/api/@ohos.app.ability.UIAbility.d.ts @@ -47,6 +47,20 @@ export interface OnReleaseCallback { (msg: string): void; } +/** + * The prototype of the listener function interface registered by the Caller. + * Defines the callback of OnRelease. + * + * @typedef OnReleaseCallback + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @param { string } msg - The notification event string listened to by the OnRelease. + * @stagemodelonly + * @since 20 + * @arkts 1.2 + */ +export type OnReleaseCallback = (msg: string)=> void; + + /** * The prototype of the listener function interface registered by the Caller. * @@ -94,7 +108,8 @@ export interface CalleeCallback { * @interface Caller * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @stagemodelonly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface Caller { /** @@ -155,7 +170,8 @@ export interface Caller { * @throws { BusinessError } 16200001 - The caller has been released. * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @stagemodelonly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ onRelease(callback: OnReleaseCallback): void; @@ -336,7 +352,8 @@ declare class UIAbility extends Ability { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ launchWant: Want; @@ -355,7 +372,8 @@ declare class UIAbility extends Ability { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ lastRequestWant: Want; @@ -442,7 +460,8 @@ declare class UIAbility extends Ability { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onWindowStageWillDestroy(windowStage: window.WindowStage): void; @@ -488,7 +507,8 @@ declare class UIAbility extends Ability { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onWindowStageRestore(windowStage: window.WindowStage): void; @@ -950,7 +970,8 @@ declare class UIAbility extends Ability { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onBackPressed(): boolean; diff --git a/api/@ohos.app.ability.UIExtensionContentSession.d.ts b/api/@ohos.app.ability.UIExtensionContentSession.d.ts index 146c2971a7..8f9f41357a 100644 --- a/api/@ohos.app.ability.UIExtensionContentSession.d.ts +++ b/api/@ohos.app.ability.UIExtensionContentSession.d.ts @@ -97,7 +97,8 @@ declare class UIExtensionContentSession { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setReceiveDataForResultCallback(callback: (data: Record) => Record): void; diff --git a/api/@ohos.app.ability.Want.d.ts b/api/@ohos.app.ability.Want.d.ts index c02d8ccd5b..ae262892e8 100644 --- a/api/@ohos.app.ability.Want.d.ts +++ b/api/@ohos.app.ability.Want.d.ts @@ -362,7 +362,8 @@ export default class Want { * @readonly * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly fds?: Record; } diff --git a/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts b/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts index 3fa78db091..c927cbc29e 100644 --- a/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts +++ b/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts @@ -21,10 +21,8 @@ import { AbilityDelegator as _AbilityDelegator } from './application/AbilityDelegator'; import { AbilityDelegatorArgs as _AbilityDelegatorArgs } from './application/abilityDelegatorArgs'; import { AbilityMonitor as _AbilityMonitor } from './application/AbilityMonitor'; -/*** if arkts 1.1 */ import { AbilityStageMonitor as _AbilityStageMonitor } from './application/AbilityStageMonitor'; import { ShellCmdResult as _ShellCmdResult } from './application/shellCmdResult'; -/*** endif */ /** * A global register used to store the AbilityDelegator and AbilityDelegatorArgs objects registered @@ -131,7 +129,8 @@ declare namespace abilityDelegatorRegistry { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum AbilityLifecycleState { /** @@ -153,7 +152,8 @@ declare namespace abilityDelegatorRegistry { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ UNINITIALIZED, @@ -176,7 +176,8 @@ declare namespace abilityDelegatorRegistry { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CREATE, @@ -199,7 +200,8 @@ declare namespace abilityDelegatorRegistry { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ FOREGROUND, @@ -222,7 +224,8 @@ declare namespace abilityDelegatorRegistry { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ BACKGROUND, @@ -245,7 +248,8 @@ declare namespace abilityDelegatorRegistry { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DESTROY } @@ -340,7 +344,8 @@ declare namespace abilityDelegatorRegistry { * @typedef { _ShellCmdResult } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export type ShellCmdResult = _ShellCmdResult; @@ -352,7 +357,8 @@ declare namespace abilityDelegatorRegistry { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ export type AbilityStageMonitor = _AbilityStageMonitor; } diff --git a/api/@ohos.app.ability.abilityManager.d.ts b/api/@ohos.app.ability.abilityManager.d.ts index 1acdb5ed81..5c02f6c9e2 100644 --- a/api/@ohos.app.ability.abilityManager.d.ts +++ b/api/@ohos.app.ability.abilityManager.d.ts @@ -18,15 +18,20 @@ * @kit AbilityKit */ -import { AbilityResult } from './ability/abilityResult'; import { AsyncCallback } from './@ohos.base'; +import { ElementName } from './bundleManager/ElementName'; +/*** if arkts 1.1 */ +import { AbilityResult } from './ability/abilityResult'; import { Configuration } from './@ohos.app.ability.Configuration'; import Context from './application/Context'; import { AbilityRunningInfo as _AbilityRunningInfo } from './application/AbilityRunningInfo'; import { ExtensionRunningInfo as _ExtensionRunningInfo } from './application/ExtensionRunningInfo'; -import { ElementName } from './bundleManager/ElementName'; import * as _AbilityForegroundStateObserver from './application/AbilityForegroundStateObserver'; import * as _AbilityStateData from './application/AbilityStateData'; +/*** endif */ +/*** if arkts 1.2 */ +import _AbilityStateData from './application/AbilityStateData'; +/*** endif */ /** * The class of an ability manager. @@ -42,6 +47,7 @@ import * as _AbilityStateData from './application/AbilityStateData'; * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ declare namespace abilityManager { /** @@ -313,7 +319,8 @@ declare namespace abilityManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getTopAbility(): Promise; @@ -327,7 +334,8 @@ declare namespace abilityManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getTopAbility(callback: AsyncCallback): void; @@ -435,7 +443,8 @@ declare namespace abilityManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getForegroundUIAbilities(callback: AsyncCallback>): void; @@ -449,7 +458,8 @@ declare namespace abilityManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getForegroundUIAbilities(): Promise>; @@ -556,6 +566,17 @@ declare namespace abilityManager { */ export type AbilityStateData = _AbilityStateData.default; + /** + * The ability state data. + * + * @typedef { _AbilityStateData } + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @since 20 + * @arkts 1.2 + */ + export type AbilityStateData = _AbilityStateData; + + /** * The class of an extension running information. * diff --git a/api/@ohos.app.ability.appManager.d.ts b/api/@ohos.app.ability.appManager.d.ts index 0dd30a6d14..1ebed985ab 100644 --- a/api/@ohos.app.ability.appManager.d.ts +++ b/api/@ohos.app.ability.appManager.d.ts @@ -19,16 +19,23 @@ */ import { AsyncCallback } from './@ohos.base'; +import { ProcessInformation as _ProcessInformation } from './application/ProcessInformation'; +import bundleManager from './@ohos.bundle.bundleManager'; +import { RunningMultiAppInfo as _RunningMultiAppInfo } from './application/RunningMultiAppInfo'; +/*** if arkts 1.1 */ import * as _ApplicationStateObserver from './application/ApplicationStateObserver'; import type * as _AppForegroundStateObserver from './application/AppForegroundStateObserver'; import * as _AbilityStateData from './application/AbilityStateData'; -import * as _AppStateData from './application/AppStateData'; +import * as _AppStateData from './application/AppStateData'; import type * as _ProcessData from './application/ProcessData'; -import { ProcessInformation as _ProcessInformation } from './application/ProcessInformation'; import * as _AbilityFirstFrameStateObserver from './application/AbilityFirstFrameStateObserver'; import * as _AbilityFirstFrameStateData from './application/AbilityFirstFrameStateData'; -import bundleManager from './@ohos.bundle.bundleManager'; -import { RunningMultiAppInfo as _RunningMultiAppInfo } from './application/RunningMultiAppInfo'; +/*** endif */ +/*** if arkts 1.2 */ +import _ApplicationStateObserver from './application/ApplicationStateObserver'; +import _AbilityStateData from './application/AbilityStateData'; +import _AppStateData from './application/AppStateData'; +/*** endif */ /** * This module provides the function of app manager service. @@ -43,7 +50,8 @@ import { RunningMultiAppInfo as _RunningMultiAppInfo } from './application/Runni * @namespace appManager * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace appManager { /** @@ -52,7 +60,8 @@ declare namespace appManager { * @enum { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum ApplicationState { /** @@ -60,7 +69,8 @@ declare namespace appManager { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ STATE_CREATE, @@ -69,7 +79,8 @@ declare namespace appManager { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ STATE_FOREGROUND, @@ -87,7 +98,8 @@ declare namespace appManager { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ STATE_BACKGROUND, @@ -96,7 +108,8 @@ declare namespace appManager { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ STATE_DESTROY } @@ -114,7 +127,8 @@ declare namespace appManager { * @enum { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum ProcessState { /** @@ -128,7 +142,8 @@ declare namespace appManager { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ STATE_CREATE, @@ -143,7 +158,8 @@ declare namespace appManager { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ STATE_FOREGROUND, @@ -158,7 +174,8 @@ declare namespace appManager { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ STATE_ACTIVE, @@ -173,7 +190,8 @@ declare namespace appManager { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ STATE_BACKGROUND, @@ -188,7 +206,8 @@ declare namespace appManager { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ STATE_DESTROY } @@ -200,7 +219,8 @@ declare namespace appManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum PreloadMode { /** @@ -209,7 +229,8 @@ declare namespace appManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PRESS_DOWN } @@ -483,7 +504,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getForegroundApplications(callback: AsyncCallback>): void; @@ -497,7 +519,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getForegroundApplications(): Promise>; @@ -849,7 +872,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRunningProcessInformation(): Promise>; @@ -892,7 +916,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRunningProcessInformation(callback: AsyncCallback>): void; @@ -974,7 +999,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRunningProcessInfoByBundleName(bundleName: string, callback: AsyncCallback>): void; @@ -990,7 +1016,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRunningProcessInfoByBundleName(bundleName: string, userId: number, callback: AsyncCallback>): void; @@ -1005,7 +1032,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRunningProcessInfoByBundleName(bundleName: string): Promise>; @@ -1021,7 +1049,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRunningProcessInfoByBundleName(bundleName: string, userId: number): Promise>; @@ -1097,7 +1126,8 @@ declare namespace appManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRunningMultiAppInfo(bundleName: string): Promise; @@ -1288,6 +1318,16 @@ declare namespace appManager { */ export type AppStateData = _AppStateData.default; + /** + * The application state data. + * + * @typedef { _AppStateData } + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @since 20 + * @arkts 1.2 + */ + export type AppStateData = _AppStateData; + /** * The application state observer. * @@ -1319,7 +1359,8 @@ declare namespace appManager { * @typedef { _ProcessInformation } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export type ProcessInformation = _ProcessInformation; @@ -1358,7 +1399,8 @@ declare namespace appManager { * @typedef { _RunningMultiAppInfo } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export type RunningMultiAppInfo = _RunningMultiAppInfo; } diff --git a/api/@ohos.app.ability.application.d.ts b/api/@ohos.app.ability.application.d.ts index 37e58fa584..9f2e8f15fa 100644 --- a/api/@ohos.app.ability.application.d.ts +++ b/api/@ohos.app.ability.application.d.ts @@ -28,7 +28,8 @@ import Context from './application/Context'; * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace application { /** @@ -41,7 +42,8 @@ declare namespace application { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export function createModuleContext(context: Context, moduleName: string): Promise; @@ -59,7 +61,8 @@ declare namespace application { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export function createModuleContext(context: Context, bundleName: string, moduleName: string): Promise; @@ -89,7 +92,8 @@ declare namespace application { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export function createBundleContext(context: Context, bundleName: string): Promise; diff --git a/api/@ohos.app.ability.insightIntent.d.ts b/api/@ohos.app.ability.insightIntent.d.ts index 15573c0ef2..c8f75ce1d1 100644 --- a/api/@ohos.app.ability.insightIntent.d.ts +++ b/api/@ohos.app.ability.insightIntent.d.ts @@ -28,7 +28,8 @@ import type wantConstant from './@ohos.app.ability.wantConstant'; * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace insightIntent { /** @@ -38,7 +39,8 @@ declare namespace insightIntent { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ enum ExecuteMode { /** @@ -47,7 +49,8 @@ declare namespace insightIntent { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ UI_ABILITY_FOREGROUND = 0, @@ -57,7 +60,8 @@ declare namespace insightIntent { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ UI_ABILITY_BACKGROUND = 1, @@ -66,7 +70,8 @@ declare namespace insightIntent { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ UI_EXTENSION_ABILITY = 2, @@ -76,7 +81,8 @@ declare namespace insightIntent { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SERVICE_EXTENSION_ABILITY = 3, } @@ -88,7 +94,8 @@ declare namespace insightIntent { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ interface ExecuteResult { /** @@ -98,7 +105,8 @@ declare namespace insightIntent { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ code: number; @@ -109,7 +117,8 @@ declare namespace insightIntent { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ result?: Record; @@ -120,7 +129,8 @@ declare namespace insightIntent { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ uris?: Array; @@ -135,7 +145,8 @@ declare namespace insightIntent { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ flags?: number; } diff --git a/api/@ohos.app.ability.insightIntentDriver.d.ts b/api/@ohos.app.ability.insightIntentDriver.d.ts index df8657ac8f..239235e183 100644 --- a/api/@ohos.app.ability.insightIntentDriver.d.ts +++ b/api/@ohos.app.ability.insightIntentDriver.d.ts @@ -30,7 +30,8 @@ import type insightIntent from './@ohos.app.ability.insightIntent'; * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace insightIntentDriver { /** @@ -40,7 +41,8 @@ declare namespace insightIntentDriver { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ interface ExecuteParam { /** @@ -50,7 +52,8 @@ declare namespace insightIntentDriver { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ bundleName: string; @@ -61,7 +64,8 @@ declare namespace insightIntentDriver { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ moduleName: string; @@ -72,7 +76,8 @@ declare namespace insightIntentDriver { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ abilityName: string; @@ -83,7 +88,8 @@ declare namespace insightIntentDriver { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ insightIntentName: string; @@ -94,7 +100,8 @@ declare namespace insightIntentDriver { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ insightIntentParam: Record; @@ -105,7 +112,8 @@ declare namespace insightIntentDriver { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ executeMode: insightIntent.ExecuteMode; @@ -116,7 +124,8 @@ declare namespace insightIntentDriver { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ displayId?: number; @@ -127,7 +136,8 @@ declare namespace insightIntentDriver { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ uris?: Array; @@ -142,7 +152,8 @@ declare namespace insightIntentDriver { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ flags?: number; } @@ -177,7 +188,8 @@ declare namespace insightIntentDriver { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function execute(param: ExecuteParam, callback: AsyncCallback): void; @@ -211,7 +223,8 @@ declare namespace insightIntentDriver { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function execute(param: ExecuteParam): Promise; diff --git a/api/@ohos.app.ability.wantAgent.d.ts b/api/@ohos.app.ability.wantAgent.d.ts index 7f6e272894..f61ab3080b 100644 --- a/api/@ohos.app.ability.wantAgent.d.ts +++ b/api/@ohos.app.ability.wantAgent.d.ts @@ -20,9 +20,12 @@ import { AsyncCallback, Callback } from './@ohos.base'; import Want from './@ohos.app.ability.Want'; -import { WantAgentInfo as _WantAgentInfo, LocalWantAgentInfo as _LocalWantAgentInfo } from './wantAgent/wantAgentInfo'; +import { WantAgentInfo as _WantAgentInfo } from './wantAgent/wantAgentInfo'; import { TriggerInfo as _TriggerInfo } from './wantAgent/triggerInfo'; import Context from './application/Context'; +/*** if arkts 1.1 */ +import { LocalWantAgentInfo as _LocalWantAgentInfo } from './wantAgent/wantAgentInfo'; +/*** endif */ /** * Provide the method obtain trigger, cancel, and compare and to obtain @@ -45,7 +48,8 @@ import Context from './application/Context'; * @namespace wantAgent * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace wantAgent { /** @@ -72,7 +76,8 @@ declare namespace wantAgent { * @throws { BusinessError } 16000151 - Invalid wantAgent object. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getBundleName(agent: WantAgent, callback: AsyncCallback): void; @@ -100,7 +105,8 @@ declare namespace wantAgent { * @throws { BusinessError } 16000151 - Invalid wantAgent object. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getBundleName(agent: WantAgent): Promise; @@ -173,7 +179,8 @@ declare namespace wantAgent { * @throws { BusinessError } 16000151 - Invalid wantAgent object. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getWant(agent: WantAgent, callback: AsyncCallback): void; @@ -190,7 +197,8 @@ declare namespace wantAgent { * @throws { BusinessError } 16000151 - Invalid wantAgent object. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getWant(agent: WantAgent): Promise; @@ -218,7 +226,8 @@ declare namespace wantAgent { * @throws { BusinessError } 16000151 - Invalid wantAgent object. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function cancel(agent: WantAgent, callback: AsyncCallback): void; @@ -246,7 +255,8 @@ declare namespace wantAgent { * @throws { BusinessError } 16000151 - Invalid wantAgent object. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function cancel(agent: WantAgent): Promise; @@ -272,7 +282,8 @@ declare namespace wantAgent { * 2. Incorrect parameter types. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function trigger(agent: WantAgent, triggerInfo: TriggerInfo, callback?: AsyncCallback): void; @@ -322,7 +333,8 @@ declare namespace wantAgent { * 2. Incorrect parameter types. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function equal(agent: WantAgent, otherAgent: WantAgent, callback: AsyncCallback): void; @@ -350,7 +362,8 @@ declare namespace wantAgent { * 2. Incorrect parameter types. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function equal(agent: WantAgent, otherAgent: WantAgent): Promise; @@ -383,7 +396,8 @@ declare namespace wantAgent { * @throws { BusinessError } 16000151 - Invalid wantAgent object. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getWantAgent(info: WantAgentInfo, callback: AsyncCallback): void; @@ -416,7 +430,8 @@ declare namespace wantAgent { * @throws { BusinessError } 16000151 - Invalid wantAgent object. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getWantAgent(info: WantAgentInfo): Promise; @@ -446,7 +461,8 @@ declare namespace wantAgent { * @throws { BusinessError } 16000151 - Invalid wantAgent object. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getOperationType(agent: WantAgent, callback: AsyncCallback): void; @@ -476,7 +492,8 @@ declare namespace wantAgent { * @throws { BusinessError } 16000151 - Invalid wantAgent object. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getOperationType(agent: WantAgent): Promise; @@ -509,7 +526,6 @@ declare namespace wantAgent { * @systemapi * @stagemodelonly * @since 20 - * @arkts 1.1&1.2 */ function createLocalWantAgent(info: LocalWantAgentInfo): WantAgent; @@ -540,7 +556,8 @@ declare namespace wantAgent { * @enum { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum WantAgentFlags { /** @@ -555,7 +572,8 @@ declare namespace wantAgent { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ONE_TIME_FLAG = 0, @@ -571,7 +589,8 @@ declare namespace wantAgent { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NO_BUILD_FLAG, @@ -587,7 +606,8 @@ declare namespace wantAgent { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ CANCEL_PRESENT_FLAG, @@ -603,7 +623,8 @@ declare namespace wantAgent { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ UPDATE_PRESENT_FLAG, @@ -618,7 +639,8 @@ declare namespace wantAgent { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ CONSTANT_FLAG, @@ -638,7 +660,8 @@ declare namespace wantAgent { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ REPLACE_ELEMENT, @@ -658,7 +681,8 @@ declare namespace wantAgent { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ REPLACE_ACTION, @@ -678,7 +702,8 @@ declare namespace wantAgent { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ REPLACE_URI, @@ -698,7 +723,8 @@ declare namespace wantAgent { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ REPLACE_ENTITIES, @@ -718,7 +744,8 @@ declare namespace wantAgent { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ REPLACE_BUNDLE } @@ -736,7 +763,8 @@ declare namespace wantAgent { * @enum { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum OperationType { /** @@ -750,7 +778,8 @@ declare namespace wantAgent { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ UNKNOWN_TYPE = 0, @@ -765,7 +794,8 @@ declare namespace wantAgent { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ START_ABILITY, @@ -780,7 +810,8 @@ declare namespace wantAgent { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ START_ABILITIES, @@ -795,7 +826,8 @@ declare namespace wantAgent { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ START_SERVICE, @@ -810,7 +842,8 @@ declare namespace wantAgent { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ SEND_COMMON_EVENT, @@ -820,7 +853,8 @@ declare namespace wantAgent { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ START_SERVICE_EXTENSION = 6 } @@ -838,7 +872,8 @@ declare namespace wantAgent { * @typedef CompleteData * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface CompleteData { /** @@ -947,7 +982,8 @@ declare namespace wantAgent { * @typedef { _TriggerInfo } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export type TriggerInfo = _TriggerInfo; @@ -964,7 +1000,8 @@ declare namespace wantAgent { * @typedef { _WantAgentInfo } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export type WantAgentInfo = _WantAgentInfo; @@ -975,7 +1012,6 @@ declare namespace wantAgent { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ export type LocalWantAgentInfo = _LocalWantAgentInfo; @@ -986,7 +1022,8 @@ declare namespace wantAgent { * * @typedef { object } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type WantAgent = object; diff --git a/api/@ohos.app.ability.wantConstant.d.ts b/api/@ohos.app.ability.wantConstant.d.ts index 93fd9775fb..3d81cfacb4 100644 --- a/api/@ohos.app.ability.wantConstant.d.ts +++ b/api/@ohos.app.ability.wantConstant.d.ts @@ -48,7 +48,8 @@ declare namespace wantConstant { * @enum { string } * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum Params { /** @@ -56,7 +57,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ DLP_PARAMS_SANDBOX = 'ohos.dlp.params.sandbox', @@ -65,7 +67,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ DLP_PARAMS_BUNDLE_NAME = 'ohos.dlp.params.bundleName', @@ -74,7 +77,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ DLP_PARAMS_MODULE_NAME = 'ohos.dlp.params.moduleName', @@ -83,7 +87,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ DLP_PARAMS_ABILITY_NAME = 'ohos.dlp.params.abilityName', @@ -92,7 +97,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ DLP_PARAMS_INDEX = 'ohos.dlp.params.index', @@ -101,7 +107,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ HIDE_SENSITIVE_TYPE = 'ohos.media.params.hideSensitiveType', @@ -118,7 +125,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ ABILITY_BACK_TO_OTHER_MISSION_STACK = 'ability.params.backToOtherMissionStack', @@ -133,7 +141,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ ABILITY_RECOVERY_RESTART = 'ohos.ability.params.abilityRecoveryRestart', @@ -148,7 +157,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CONTENT_TITLE_KEY = 'ohos.extra.param.key.contentTitle', @@ -163,7 +173,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SHARE_ABSTRACT_KEY = 'ohos.extra.param.key.shareAbstract', @@ -178,7 +189,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SHARE_URL_KEY = 'ohos.extra.param.key.shareUrl', @@ -197,7 +209,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SUPPORT_CONTINUE_PAGE_STACK_KEY = 'ohos.extra.param.key.supportContinuePageStack', @@ -216,7 +229,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SUPPORT_CONTINUE_SOURCE_EXIT_KEY = 'ohos.extra.param.key.supportContinueSourceExit', @@ -226,7 +240,8 @@ declare namespace wantConstant { * @syscap SystemCapability.Ability.AbilityBase * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ASSERT_FAULT_SESSION_ID = 'ohos.ability.params.asssertFaultSessionId', @@ -235,7 +250,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ SHOW_MODE_KEY = 'ohos.extra.param.key.showMode', @@ -244,7 +260,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PARAMS_STREAM = 'ability.params.stream', @@ -253,7 +270,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ APP_CLONE_INDEX_KEY = 'ohos.extra.param.key.appCloneIndex', @@ -262,7 +280,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ CALLER_REQUEST_CODE = 'ohos.extra.param.key.callerRequestCode', @@ -271,7 +290,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PAGE_PATH = 'ohos.param.atomicservice.pagePath', @@ -280,7 +300,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ROUTER_NAME = 'ohos.param.atomicservice.routerName', @@ -289,7 +310,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PAGE_SOURCE_FILE = 'ohos.param.atomicservice.pageSourceFile', @@ -298,7 +320,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ BUILD_FUNCTION = 'ohos.param.atomicservice.buildFunction', @@ -307,7 +330,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ SUB_PACKAGE_NAME = 'ohos.param.atomicservice.subpackageName', @@ -315,7 +339,8 @@ declare namespace wantConstant { * Indicates the param of app instance key. * * @syscap SystemCapability.Ability.AbilityBase - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ APP_INSTANCE_KEY = 'ohos.extra.param.key.appInstance', @@ -323,7 +348,8 @@ declare namespace wantConstant { * Indicates the param of creating a new instance. * * @syscap SystemCapability.Ability.AbilityBase - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ CREATE_APP_INSTANCE_KEY = 'ohos.extra.param.key.createAppInstance', @@ -331,7 +357,8 @@ declare namespace wantConstant { * Indicates the app clone index of caller. * * @syscap SystemCapability.Ability.AbilityBase - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ CALLER_APP_CLONE_INDEX = 'ohos.param.callerAppCloneIndex', @@ -342,7 +369,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ LAUNCH_REASON_MESSAGE = 'ohos.params.launchReasonMessage', @@ -434,7 +462,8 @@ declare namespace wantConstant { /** * Indicates that the URI can be persisted by the callee. * @syscap SystemCapability.Ability.AbilityBase - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ FLAG_AUTH_PERSISTABLE_URI_PERMISSION = 0x00000040, @@ -449,7 +478,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ FLAG_INSTALL_ON_DEMAND = 0x00000800, @@ -457,7 +487,8 @@ declare namespace wantConstant { * Collaborative target applications in the distributed scheduling system can be pulled up. * * @syscap SystemCapability.Ability.AbilityBase - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ FLAG_ABILITY_ON_COLLABORATE = 0x00002000, @@ -465,7 +496,8 @@ declare namespace wantConstant { * Indicates that if implicit start ability couldn't match any application, no tip dialog will be pulled up. * * @syscap SystemCapability.Ability.AbilityBase - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ FLAG_START_WITHOUT_TIPS = 0x40000000 } @@ -476,7 +508,8 @@ declare namespace wantConstant { * @enum { number } * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum ShowMode { /** @@ -484,7 +517,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ WINDOW = 0, @@ -493,7 +527,8 @@ declare namespace wantConstant { * * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ EMBEDDED_FULL = 1 } diff --git a/api/@ohos.zlib.d.ts b/api/@ohos.zlib.d.ts index 6b2429d312..cb183b18d3 100644 --- a/api/@ohos.zlib.d.ts +++ b/api/@ohos.zlib.d.ts @@ -1028,7 +1028,8 @@ declare namespace zlib { * @syscap SystemCapability.BundleManager.Zlib * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function compressFile(inFile: string, outFile: string, options: Options, callback: AsyncCallback): void; @@ -1058,7 +1059,8 @@ declare namespace zlib { * @syscap SystemCapability.BundleManager.Zlib * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function compressFile(inFile: string, outFile: string, options: Options): Promise; @@ -1232,7 +1234,8 @@ declare namespace zlib { * @returns { Checksum } Returns verification objects. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function createChecksumSync(): Checksum; @@ -1282,7 +1285,8 @@ declare namespace zlib { * @typedef Checksum * @syscap SystemCapability.BundleManager.Zlib * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface Checksum { /** @@ -1295,7 +1299,8 @@ declare namespace zlib { *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ adler32(adler: number, buf: ArrayBuffer): Promise; @@ -1310,7 +1315,8 @@ declare namespace zlib { *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ adler32Combine(adler1: number, adler2: number, len2: number): Promise; @@ -1324,7 +1330,8 @@ declare namespace zlib { *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ crc32(crc: number, buf: ArrayBuffer): Promise; @@ -1339,7 +1346,8 @@ declare namespace zlib { *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ crc32Combine(crc1: number, crc2: number, len2: number): Promise; @@ -1363,7 +1371,8 @@ declare namespace zlib { * @returns { Promise> } Return a array to the CRC-32 table. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ getCrcTable(): Promise>; diff --git a/api/application/AbilityDelegator.d.ts b/api/application/AbilityDelegator.d.ts index 1408bd24e4..d7a91d0bf7 100644 --- a/api/application/AbilityDelegator.d.ts +++ b/api/application/AbilityDelegator.d.ts @@ -23,11 +23,9 @@ import { AbilityMonitor } from './AbilityMonitor'; import Context from './Context'; import Want from '../@ohos.app.ability.Want'; import { ShellCmdResult } from './shellCmdResult'; -/*** if arkts 1.1 */ import UIAbility from '../@ohos.app.ability.UIAbility'; import AbilityStage from '../@ohos.app.ability.AbilityStage'; import { AbilityStageMonitor } from './AbilityStageMonitor'; -/*** endif */ /** * A global test utility interface used for adding AbilityMonitor objects and control lifecycle states of abilities. @@ -146,7 +144,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ addAbilityMonitorSync(monitor: AbilityMonitor): void; @@ -181,7 +180,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ addAbilityStageMonitor(monitor: AbilityStageMonitor, callback: AsyncCallback): void; @@ -216,7 +216,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ addAbilityStageMonitor(monitor: AbilityStageMonitor): Promise; @@ -239,7 +240,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ addAbilityStageMonitorSync(monitor: AbilityStageMonitor): void; @@ -274,7 +276,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ removeAbilityMonitor(monitor: AbilityMonitor, callback: AsyncCallback): void; @@ -309,7 +312,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ removeAbilityMonitor(monitor: AbilityMonitor): Promise; @@ -332,7 +336,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ removeAbilityMonitorSync(monitor: AbilityMonitor): void; @@ -367,7 +372,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ removeAbilityStageMonitor(monitor: AbilityStageMonitor, callback: AsyncCallback): void; @@ -402,7 +408,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ removeAbilityStageMonitor(monitor: AbilityStageMonitor): Promise; @@ -425,7 +432,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ removeAbilityStageMonitorSync(monitor: AbilityStageMonitor): void; @@ -460,7 +468,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ waitAbilityMonitor(monitor: AbilityMonitor, callback: AsyncCallback): void; @@ -498,7 +507,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ waitAbilityMonitor(monitor: AbilityMonitor, timeout: number, callback: AsyncCallback): void; @@ -536,7 +546,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ waitAbilityMonitor(monitor: AbilityMonitor, timeout?: number): Promise; @@ -571,7 +582,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ waitAbilityStageMonitor(monitor: AbilityStageMonitor, callback: AsyncCallback): void; @@ -609,7 +621,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ waitAbilityStageMonitor(monitor: AbilityStageMonitor, timeout: number, callback: AsyncCallback): void; @@ -647,7 +660,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ waitAbilityStageMonitor(monitor: AbilityStageMonitor, timeout?: number): Promise; @@ -706,7 +720,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getAbilityState(ability: UIAbility): number; @@ -738,7 +753,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getCurrentTopAbility(callback: AsyncCallback): void; @@ -767,7 +783,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getCurrentTopAbility(): Promise; @@ -954,7 +971,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ doAbilityForeground(ability: UIAbility, callback: AsyncCallback): void; @@ -989,7 +1007,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ doAbilityForeground(ability: UIAbility): Promise; @@ -1024,7 +1043,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ doAbilityBackground(ability: UIAbility, callback: AsyncCallback): void; @@ -1059,7 +1079,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ doAbilityBackground(ability: UIAbility): Promise; @@ -1091,7 +1112,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ print(msg: string, callback: AsyncCallback): void; @@ -1123,7 +1145,8 @@ export interface AbilityDelegator { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ print(msg: string): Promise; diff --git a/api/application/AbilityStageContext.d.ts b/api/application/AbilityStageContext.d.ts index 7ba6723754..d66ced481c 100644 --- a/api/application/AbilityStageContext.d.ts +++ b/api/application/AbilityStageContext.d.ts @@ -77,7 +77,8 @@ declare class AbilityStageContext extends Context { * @StageModelOnly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ currentHapModuleInfo: HapModuleInfo; diff --git a/api/application/AbilityStageMonitor.d.ts b/api/application/AbilityStageMonitor.d.ts index 4ad19aa35c..3ae8640147 100644 --- a/api/application/AbilityStageMonitor.d.ts +++ b/api/application/AbilityStageMonitor.d.ts @@ -43,7 +43,8 @@ * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface AbilityStageMonitor { /** @@ -68,7 +69,8 @@ export interface AbilityStageMonitor { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ moduleName: string; @@ -94,9 +96,12 @@ export interface AbilityStageMonitor { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ srcEntrance: string; } +/*** if arkts 1.1 */ export default AbilityStageMonitor; +/*** endif */ \ No newline at end of file diff --git a/api/application/AbilityStateData.d.ts b/api/application/AbilityStateData.d.ts index a7fe4b7901..fad8201ea1 100644 --- a/api/application/AbilityStateData.d.ts +++ b/api/application/AbilityStateData.d.ts @@ -22,7 +22,8 @@ * The ability or extension state data. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ export default class AbilityStateData { /** @@ -30,7 +31,8 @@ export default class AbilityStateData { * * @type { string } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ moduleName: string; @@ -39,7 +41,8 @@ export default class AbilityStateData { * * @type { string } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ bundleName: string; @@ -48,7 +51,8 @@ export default class AbilityStateData { * * @type { string } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ abilityName: string; @@ -57,7 +61,8 @@ export default class AbilityStateData { * * @type { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ pid: number; @@ -66,7 +71,8 @@ export default class AbilityStateData { * * @type { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ uid: number; @@ -75,7 +81,8 @@ export default class AbilityStateData { * * @type { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ state: number; @@ -84,7 +91,8 @@ export default class AbilityStateData { * * @type { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ abilityType: number; @@ -93,7 +101,8 @@ export default class AbilityStateData { * * @type { boolean } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ isAtomicService: boolean; @@ -101,7 +110,8 @@ export default class AbilityStateData { * The app clone index of ability instance. * @type { ?number } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ appCloneIndex?: number; } diff --git a/api/application/AppStateData.d.ts b/api/application/AppStateData.d.ts index 154b10fa81..8031f67355 100644 --- a/api/application/AppStateData.d.ts +++ b/api/application/AppStateData.d.ts @@ -22,15 +22,17 @@ * The application state data. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ -export default class AppStateData { +declare class AppStateData { /** * The bundle name. * * @type { string } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ bundleName: string; @@ -39,7 +41,8 @@ export default class AppStateData { * * @type { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ uid: number; @@ -48,7 +51,8 @@ export default class AppStateData { * * @type { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ state: number; @@ -57,7 +61,8 @@ export default class AppStateData { * * @type { boolean } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ isSplitScreenMode: boolean; @@ -66,7 +71,10 @@ export default class AppStateData { * * @type { boolean } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ isFloatingWindowMode: boolean; } + +export default AppStateData; \ No newline at end of file diff --git a/api/application/ApplicationContext.d.ts b/api/application/ApplicationContext.d.ts index b90f46c56a..e4777379ad 100644 --- a/api/application/ApplicationContext.d.ts +++ b/api/application/ApplicationContext.d.ts @@ -19,15 +19,14 @@ */ 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'; +/*** if arkts 1.1 */ +import AbilityLifecycleCallback from '../@ohos.app.ability.AbilityLifecycleCallback'; +import EnvironmentCallback from '../@ohos.app.ability.EnvironmentCallback'; +import type ApplicationStateChangeCallback from '../@ohos.app.ability.ApplicationStateChangeCallback'; /*** endif */ /** @@ -413,7 +412,8 @@ declare class ApplicationContext extends Context { * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getRunningProcessInformation(): Promise>; @@ -454,7 +454,8 @@ declare class ApplicationContext extends Context { * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getRunningProcessInformation(callback: AsyncCallback>): void; @@ -486,7 +487,8 @@ declare class ApplicationContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ killAllProcesses(): Promise; @@ -509,7 +511,8 @@ declare class ApplicationContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ killAllProcesses(clearPageStack: boolean): Promise; @@ -573,7 +576,8 @@ declare class ApplicationContext extends Context { * @stagemodelonly * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ setColorMode(colorMode: ConfigurationConstant.ColorMode): void; @@ -592,7 +596,8 @@ declare class ApplicationContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setLanguage(language: string): void; @@ -611,7 +616,8 @@ declare class ApplicationContext extends Context { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ clearUpApplicationData(): Promise; @@ -633,7 +639,8 @@ declare class ApplicationContext extends Context { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ clearUpApplicationData(callback: AsyncCallback): void; @@ -656,7 +663,8 @@ declare class ApplicationContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ restartApp(want: Want): void; @@ -682,7 +690,8 @@ declare class ApplicationContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ preloadUIExtensionAbility(want: Want): Promise; @@ -728,7 +737,8 @@ declare 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 */ setFont(font: string): void; @@ -759,7 +769,8 @@ declare class ApplicationContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ setFontSizeScale(fontSizeScale: number): void; diff --git a/api/application/ApplicationStateObserver.d.ts b/api/application/ApplicationStateObserver.d.ts index ff86fd03c2..4b9eed7a3c 100644 --- a/api/application/ApplicationStateObserver.d.ts +++ b/api/application/ApplicationStateObserver.d.ts @@ -19,16 +19,20 @@ */ import AppStateData from './AppStateData'; +/*** if arkts 1.1 */ import AbilityStateData from './AbilityStateData'; import * as _ProcessData from './ProcessData'; +/*** endif */ /** * The application state observer. * + * @typedef ApplicationStateObserver * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ -export default class ApplicationStateObserver { +declare interface ApplicationStateObserver { /** * Will be called when foreground or background application changed. * @@ -100,3 +104,5 @@ export default class ApplicationStateObserver { * @since 14 */ export type ProcessData = _ProcessData.default; + +export default ApplicationStateObserver; \ No newline at end of file diff --git a/api/application/Context.d.ts b/api/application/Context.d.ts index 29648a92b6..b226b36719 100644 --- a/api/application/Context.d.ts +++ b/api/application/Context.d.ts @@ -145,7 +145,8 @@ declare class Context extends BaseContext { * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ cacheDir: string; @@ -264,7 +265,8 @@ declare class Context extends BaseContext { * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ preferencesDir: string; @@ -639,7 +641,8 @@ declare class Context extends BaseContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ createModuleResourceManager(bundleName: string, moduleName: string): resmgr.ResourceManager; diff --git a/api/application/ExtensionContext.d.ts b/api/application/ExtensionContext.d.ts index cdb9df42a7..fee3759ff5 100644 --- a/api/application/ExtensionContext.d.ts +++ b/api/application/ExtensionContext.d.ts @@ -18,10 +18,9 @@ * @kit AbilityKit */ -/*** if arkts 1.1 */ + import { HapModuleInfo } from '../bundleManager/HapModuleInfo'; import { Configuration } from '../@ohos.app.ability.Configuration'; -/*** endif */ import Context from './Context'; import { ExtensionAbilityInfo } from '../bundleManager/ExtensionAbilityInfo'; @@ -59,7 +58,8 @@ declare class ExtensionContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ currentHapModuleInfo: HapModuleInfo; @@ -78,7 +78,8 @@ declare class ExtensionContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ config: Configuration; diff --git a/api/application/MultiAppMode.d.ts b/api/application/MultiAppMode.d.ts index af50f66357..8b821e9f21 100644 --- a/api/application/MultiAppMode.d.ts +++ b/api/application/MultiAppMode.d.ts @@ -24,7 +24,8 @@ * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum MultiAppMode { /** @@ -33,7 +34,8 @@ export enum MultiAppMode { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NOT_SUPPORTED = 0, @@ -43,7 +45,8 @@ export enum MultiAppMode { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ MULTI_INSTANCE = 1, @@ -53,7 +56,8 @@ export enum MultiAppMode { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ APP_CLONE = 2 } \ No newline at end of file diff --git a/api/application/ProcessInformation.d.ts b/api/application/ProcessInformation.d.ts index 15fe488e71..8f64c790d6 100644 --- a/api/application/ProcessInformation.d.ts +++ b/api/application/ProcessInformation.d.ts @@ -18,7 +18,12 @@ * @kit AbilityKit */ +/*** if arkts 1.1 */ import type appManager from '../@ohos.app.ability.appManager'; +/*** endif */ +/*** if arkts 1.2 */ +import appManager from '../@ohos.app.ability.appManager'; +/*** endif */ import bundleManager from '../@ohos.bundle.bundleManager'; /** @@ -43,7 +48,8 @@ import bundleManager from '../@ohos.bundle.bundleManager'; * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface ProcessInformation { /** @@ -66,7 +72,8 @@ export interface ProcessInformation { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ pid: number; @@ -81,7 +88,8 @@ export interface ProcessInformation { * @default user id * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ uid: number; @@ -105,7 +113,8 @@ export interface ProcessInformation { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ processName: string; @@ -129,7 +138,8 @@ export interface ProcessInformation { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ bundleNames: Array; @@ -146,7 +156,8 @@ export interface ProcessInformation { * @type { appManager.ProcessState } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ state: appManager.ProcessState; @@ -156,7 +167,8 @@ export interface ProcessInformation { * @type { bundleManager.BundleType } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ bundleType: bundleManager.BundleType; @@ -165,7 +177,8 @@ export interface ProcessInformation { * @type { ?number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ appCloneIndex?: number; } diff --git a/api/application/RunningAppClone.d.ts b/api/application/RunningAppClone.d.ts index b85dcbadec..261cb1d15a 100644 --- a/api/application/RunningAppClone.d.ts +++ b/api/application/RunningAppClone.d.ts @@ -24,7 +24,8 @@ * @typedef RunningAppClone * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface RunningAppClone { /** @@ -33,7 +34,8 @@ export interface RunningAppClone { * @type { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ appCloneIndex: number; @@ -43,7 +45,8 @@ export interface RunningAppClone { * @type { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ uid: number; @@ -53,7 +56,8 @@ export interface RunningAppClone { * @type { Array } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ pids: Array; } \ No newline at end of file diff --git a/api/application/RunningMultiAppInfo.d.ts b/api/application/RunningMultiAppInfo.d.ts index 29447ea549..cb77e92feb 100644 --- a/api/application/RunningMultiAppInfo.d.ts +++ b/api/application/RunningMultiAppInfo.d.ts @@ -28,7 +28,8 @@ import { RunningMultiInstanceInfo } from './RunningMultiInstanceInfo'; * @typedef RunningMultiAppInfo * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface RunningMultiAppInfo { @@ -39,7 +40,8 @@ export interface RunningMultiAppInfo { * @type { string } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ bundleName: string; @@ -59,7 +61,8 @@ export interface RunningMultiAppInfo { * @type { ?Array } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ runningMultiInstances?: Array; diff --git a/api/application/RunningMultiInstanceInfo.d.ts b/api/application/RunningMultiInstanceInfo.d.ts index fc279f3031..1645db4051 100644 --- a/api/application/RunningMultiInstanceInfo.d.ts +++ b/api/application/RunningMultiInstanceInfo.d.ts @@ -24,7 +24,8 @@ * @typedef RunningMultiInstanceInfo * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface RunningMultiInstanceInfo { /** @@ -33,7 +34,8 @@ export interface RunningMultiInstanceInfo { * @type { string } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ instanceKey: string; diff --git a/api/application/ServiceExtensionContext.d.ts b/api/application/ServiceExtensionContext.d.ts index 20a60d8e88..d133113da9 100644 --- a/api/application/ServiceExtensionContext.d.ts +++ b/api/application/ServiceExtensionContext.d.ts @@ -19,15 +19,15 @@ */ /*** if arkts 1.1 */ -import { AsyncCallback } from '../@ohos.base'; import { ConnectOptions } from '../ability/connectOptions'; import { Caller } from '../@ohos.app.ability.UIAbility'; -import Want from '../@ohos.app.ability.Want'; -import StartOptions from '../@ohos.app.ability.StartOptions'; import OpenLinkOptions from '../@ohos.app.ability.OpenLinkOptions'; import type AtomicServiceOptions from '../@ohos.app.ability.AtomicServiceOptions'; /*** endif */ +import { AsyncCallback } from '../@ohos.base'; import ExtensionContext from './ExtensionContext'; +import StartOptions from '../@ohos.app.ability.StartOptions'; +import Want from '../@ohos.app.ability.Want'; /** * The context of service extension. It allows access to @@ -40,7 +40,7 @@ import ExtensionContext from './ExtensionContext'; * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ -export default class ServiceExtensionContext extends ExtensionContext { +declare class ServiceExtensionContext extends ExtensionContext { /** * Service extension uses this method to start a specific ability. * @@ -174,7 +174,8 @@ export default class ServiceExtensionContext extends ExtensionContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ startAbility(want: Want, callback: AsyncCallback): void; @@ -309,7 +310,8 @@ export default class ServiceExtensionContext extends ExtensionContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ startAbility(want: Want, options: StartOptions, callback: AsyncCallback): void; @@ -450,7 +452,8 @@ export default class ServiceExtensionContext extends ExtensionContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ startAbility(want: Want, options?: StartOptions): Promise; @@ -1300,7 +1303,8 @@ export default class ServiceExtensionContext extends ExtensionContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ startServiceExtensionAbility(want: Want, callback: AsyncCallback): void; @@ -1383,7 +1387,8 @@ export default class ServiceExtensionContext extends ExtensionContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ startServiceExtensionAbility(want: Want): Promise; @@ -1796,7 +1801,8 @@ export default class ServiceExtensionContext extends ExtensionContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ terminateSelf(callback: AsyncCallback): void; @@ -1825,7 +1831,8 @@ export default class ServiceExtensionContext extends ExtensionContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ terminateSelf(): Promise; @@ -2526,3 +2533,5 @@ export default class ServiceExtensionContext extends ExtensionContext { */ openAtomicService(appId: string, options?: AtomicServiceOptions): Promise; } + +export default ServiceExtensionContext; \ No newline at end of file diff --git a/api/application/UIAbilityContext.d.ts b/api/application/UIAbilityContext.d.ts index b0ff546dd7..73cf76d55b 100644 --- a/api/application/UIAbilityContext.d.ts +++ b/api/application/UIAbilityContext.d.ts @@ -20,8 +20,6 @@ /*** if arkts 1.1 */ import { ConnectOptions } from '../ability/connectOptions'; -import { HapModuleInfo } from '../bundleManager/HapModuleInfo'; -import OpenLinkOptions from '../@ohos.app.ability.OpenLinkOptions'; import { Caller } from '../@ohos.app.ability.UIAbility'; import image from '../@ohos.multimedia.image'; import dialogRequest from '../@ohos.app.ability.dialogRequest'; @@ -36,6 +34,8 @@ import { AbilityInfo } from '../bundleManager/AbilityInfo'; import { AbilityResult } from '../ability/abilityResult'; import { AsyncCallback } from '../@ohos.base'; import Context from './Context'; +import { HapModuleInfo } from '../bundleManager/HapModuleInfo'; +import OpenLinkOptions from '../@ohos.app.ability.OpenLinkOptions'; import Want from '../@ohos.app.ability.Want'; import StartOptions from '../@ohos.app.ability.StartOptions'; import { Configuration } from '../@ohos.app.ability.Configuration'; @@ -125,7 +125,8 @@ declare class UIAbilityContext extends Context { * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ currentHapModuleInfo: HapModuleInfo; @@ -803,7 +804,8 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ openLink(link: string, options?: OpenLinkOptions, callback?: AsyncCallback): Promise; @@ -2908,7 +2910,8 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ startServiceExtensionAbility(want: Want, callback: AsyncCallback): void; @@ -2988,7 +2991,8 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ startServiceExtensionAbility(want: Want): Promise; @@ -3892,7 +3896,8 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isTerminating(): boolean; @@ -4577,7 +4582,8 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ requestModalUIExtension(pickerWant: Want, callback: AsyncCallback): void; @@ -4618,7 +4624,8 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ requestModalUIExtension(pickerWant: Want): Promise; @@ -4657,7 +4664,8 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ moveAbilityToBackground(): Promise; diff --git a/api/application/UIExtensionContext.d.ts b/api/application/UIExtensionContext.d.ts index c06fd20f13..9d577273b3 100755 --- a/api/application/UIExtensionContext.d.ts +++ b/api/application/UIExtensionContext.d.ts @@ -18,22 +18,23 @@ * @kit AbilityKit */ -/*** if arkts 1.2 */ -import { AbilityResult } from '../ability/abilityResult'; -/*** endif */ + import type { AsyncCallback } from '../@ohos.base'; import ExtensionContext from './ExtensionContext'; +import type Want from '../@ohos.app.ability.Want'; +import type StartOptions from '../@ohos.app.ability.StartOptions'; /*** if arkts 1.1 */ import type { AbilityResult } from '../ability/abilityResult'; import type { ConnectOptions } from '../ability/connectOptions'; -import type Want from '../@ohos.app.ability.Want'; -import type StartOptions from '../@ohos.app.ability.StartOptions'; import type AtomicServiceOptions from '../@ohos.app.ability.AtomicServiceOptions'; import OpenLinkOptions from '../@ohos.app.ability.OpenLinkOptions'; import type ConfigurationConstant from '../@ohos.app.ability.ConfigurationConstant'; import type UIServiceProxy from './UIServiceProxy'; import type UIServiceExtensionConnectCallback from './UIServiceExtensionConnectCallback'; /*** endif */ +/*** if arkts 1.2 */ +import { AbilityResult } from '../ability/abilityResult'; +/*** endif */ /** * The context of UI extension. It allows access to UIExtension-specific resources. @@ -153,7 +154,8 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16200001 - The caller has been released. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ startAbility(want: Want, callback: AsyncCallback): void; @@ -262,7 +264,8 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16200001 - The caller has been released. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ startAbility(want: Want, options: StartOptions, callback: AsyncCallback): void; @@ -377,7 +380,8 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16200001 - The caller has been released. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ startAbility(want: Want, options?: StartOptions): Promise; diff --git a/api/wantAgent/triggerInfo.d.ts b/api/wantAgent/triggerInfo.d.ts index 97daf1c0de..b487d2f2f7 100644 --- a/api/wantAgent/triggerInfo.d.ts +++ b/api/wantAgent/triggerInfo.d.ts @@ -34,7 +34,8 @@ import StartOptions from '../@ohos.app.ability.StartOptions'; * @typedef TriggerInfo * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface TriggerInfo { /** @@ -50,7 +51,8 @@ export interface TriggerInfo { * @type { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ code: number; @@ -77,7 +79,8 @@ export interface TriggerInfo { * @type { ?Want } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ want?: Want; @@ -98,7 +101,8 @@ export interface TriggerInfo { * @type { ?string } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ permission?: string; @@ -119,6 +123,17 @@ export interface TriggerInfo { */ extraInfo?: { [key: string]: any }; + /** + * Custom extra data you want to add for triggering a WantAgent. + * + * @type { ?object } + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + extraInfo?: Record; + /** * Custom extra data you want to add for triggering a WantAgent. * The ability of this property is same as extraInfo. If both are set, this property will be used. @@ -134,7 +149,8 @@ export interface TriggerInfo { * @type { ?Record } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ extraInfos?: Record; @@ -145,7 +161,8 @@ export interface TriggerInfo { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ startOptions?: StartOptions; } diff --git a/api/wantAgent/wantAgentInfo.d.ts b/api/wantAgent/wantAgentInfo.d.ts index baefab4368..862c112003 100644 --- a/api/wantAgent/wantAgentInfo.d.ts +++ b/api/wantAgent/wantAgentInfo.d.ts @@ -19,9 +19,12 @@ */ import Want from '../@ohos.app.ability.Want'; +/*** if arkts 1.1 */ import wantAgent from '../@ohos.wantAgent'; +/*** endif */ import type abilityWantAgent from '../@ohos.app.ability.wantAgent'; + /** * Provides the information required for triggering a WantAgent. * @@ -35,7 +38,8 @@ import type abilityWantAgent from '../@ohos.app.ability.wantAgent'; * @typedef WantAgentInfo * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface WantAgentInfo { /** @@ -51,7 +55,8 @@ export interface WantAgentInfo { * @type { Array } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ wants: Array; @@ -89,7 +94,8 @@ export interface WantAgentInfo { * @type { ?abilityWantAgent.OperationType } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ actionType?: abilityWantAgent.OperationType; @@ -144,7 +150,8 @@ export interface WantAgentInfo { * @type { ?Array } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ actionFlags?: Array; @@ -167,6 +174,18 @@ export interface WantAgentInfo { */ extraInfo?: { [key: string]: any }; + /** + * Extra information about how the Want starts an ability. + * If there is no extra information to set, this constant can be left empty. + * + * @type { ?object } + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + extraInfo?: Record; + /** * Extra information about how the Want starts an ability. * If there is no extra information to set, this constant can be left empty. @@ -184,7 +203,8 @@ export interface WantAgentInfo { * @type { ?Record } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ extraInfos?: Record; } @@ -197,7 +217,6 @@ export interface WantAgentInfo { * @systemapi * @stagemodelonly * @since 20 - * @arkts 1.1&1.2 */ export interface LocalWantAgentInfo { /** @@ -208,7 +227,6 @@ export interface LocalWantAgentInfo { * @systemapi * @stagemodelonly * @since 20 - * @arkts 1.1&1.2 */ wants: Array; @@ -220,7 +238,6 @@ export interface LocalWantAgentInfo { * @systemapi * @stagemodelonly * @since 20 - * @arkts 1.1&1.2 */ operationType?: abilityWantAgent.OperationType; @@ -232,7 +249,6 @@ export interface LocalWantAgentInfo { * @systemapi * @stagemodelonly * @since 20 - * @arkts 1.1&1.2 */ requestCode: number; } -- Gitee From d5ae455cd0a4a52026519ca8b67a93b41d48cf3c Mon Sep 17 00:00:00 2001 From: jxw Date: Wed, 30 Apr 2025 01:51:15 +0000 Subject: [PATCH 048/746] update kits/@kit.NetworkKit.d.ts. Signed-off-by: jxw --- kits/@kit.NetworkKit.d.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/kits/@kit.NetworkKit.d.ts b/kits/@kit.NetworkKit.d.ts index 82fe2b5060..20fd603619 100644 --- a/kits/@kit.NetworkKit.d.ts +++ b/kits/@kit.NetworkKit.d.ts @@ -17,8 +17,14 @@ * @file * @kit NetworkKit */ - +/*** if arkts 1.1&1.2 */ import connection from '@ohos.net.connection'; +export { + connection +}; +/*** endif */ + +/*** if arkts 1.1*/ import ethernet from '@ohos.net.ethernet'; import http from '@ohos.net.http'; import mdns from '@ohos.net.mdns'; @@ -34,7 +40,8 @@ import VpnExtensionAbility, { VpnExtensionContext } from '@ohos.app.ability.VpnE import netFirewall from '@ohos.net.netFirewall'; export { - connection, ethernet, http, mdns, policy, sharing, webSocket, + ethernet, http, mdns, policy, sharing, webSocket, socket, statistics, vpn, vpnExtension, networkSecurity, VpnExtensionAbility, VpnExtensionContext, netFirewall }; +/*** endif */ -- Gitee From 63ca78a9da3c88296eeb4db5e61aa810db1eb65d Mon Sep 17 00:00:00 2001 From: s00659936 <282229496@qq.com> Date: Thu, 3 Jul 2025 17:52:24 +0800 Subject: [PATCH 049/746] arkts1.2 adapt connection and sharing Signed-off-by: s00659936 <282229496@qq.com> Change-Id: I5e2598fe8b86cf072b4ebca67b0b641764d3ab3d --- api/@ohos.net.connection.d.ts | 24 ++++++++++++++++-------- api/@ohos.net.sharing.d.ts | 18 ++++++++++++------ kits/@kit.NetworkKit.d.ts | 16 ++++++++-------- 3 files changed, 36 insertions(+), 22 deletions(-) diff --git a/api/@ohos.net.connection.d.ts b/api/@ohos.net.connection.d.ts index 22108480e2..11239cc215 100644 --- a/api/@ohos.net.connection.d.ts +++ b/api/@ohos.net.connection.d.ts @@ -1155,7 +1155,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'netAvailable', callback: Callback): void; @@ -1171,7 +1172,8 @@ declare namespace connection { * @param { 'netBlockStatusChange' } type - Indicates Event name. * @param { Callback } callback - the callback used to return the result. * @syscap SystemCapability.Communication.NetManager.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'netBlockStatusChange', callback: Callback): void; @@ -1197,7 +1199,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'netCapabilitiesChange', callback: Callback): void; @@ -1213,7 +1216,8 @@ declare namespace connection { * @param { 'netConnectionPropertiesChange' } type - Indicates Event name. * @param { Callback } callback - the callback used to return the result. * @syscap SystemCapability.Communication.NetManager.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'netConnectionPropertiesChange', callback: Callback): void; @@ -1239,7 +1243,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'netLost', callback: Callback): void; @@ -1265,7 +1270,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'netUnavailable', callback: Callback): void; @@ -1309,7 +1315,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ register(callback: AsyncCallback): void; @@ -1359,7 +1366,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.NetManager.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ unregister(callback: AsyncCallback): void; } diff --git a/api/@ohos.net.sharing.d.ts b/api/@ohos.net.sharing.d.ts index 45267f19ca..52b5ce3e0f 100644 --- a/api/@ohos.net.sharing.d.ts +++ b/api/@ohos.net.sharing.d.ts @@ -410,7 +410,8 @@ declare namespace sharing { * @throws { BusinessError } 401 - Parameter error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'sharingStateChange', callback: Callback): void; @@ -424,7 +425,8 @@ declare namespace sharing { * @throws { BusinessError } 401 - Parameter error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'sharingStateChange', callback?: Callback): void; @@ -450,7 +452,8 @@ declare namespace sharing { * @throws { BusinessError } 401 - Parameter error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'interfaceSharingStateChange', callback: Callback): void; @@ -476,7 +479,8 @@ declare namespace sharing { * @throws { BusinessError } 401 - Parameter error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'interfaceSharingStateChange', callback?: Callback): void; @@ -490,7 +494,8 @@ declare namespace sharing { * @throws { BusinessError } 401 - Parameter error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'sharingUpstreamChange', callback: Callback): void; @@ -504,7 +509,8 @@ declare namespace sharing { * @throws { BusinessError } 401 - Parameter error. * @syscap SystemCapability.Communication.NetManager.NetSharing * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'sharingUpstreamChange', callback?: Callback): void; diff --git a/kits/@kit.NetworkKit.d.ts b/kits/@kit.NetworkKit.d.ts index 20fd603619..52c8c01390 100644 --- a/kits/@kit.NetworkKit.d.ts +++ b/kits/@kit.NetworkKit.d.ts @@ -19,29 +19,29 @@ */ /*** if arkts 1.1&1.2 */ import connection from '@ohos.net.connection'; +import http from '@ohos.net.http'; +import sharing from '@ohos.net.sharing'; +import webSocket from '@ohos.net.webSocket'; +import statistics from '@ohos.net.statistics'; +import networkSecurity from '@ohos.net.networkSecurity'; export { - connection + connection, http, sharing, webSocket, statistics, networkSecurity }; /*** endif */ /*** if arkts 1.1*/ import ethernet from '@ohos.net.ethernet'; -import http from '@ohos.net.http'; import mdns from '@ohos.net.mdns'; import policy from '@ohos.net.policy'; -import sharing from '@ohos.net.sharing'; import socket from '@ohos.net.socket'; -import statistics from '@ohos.net.statistics'; import vpn from '@ohos.net.vpn'; -import webSocket from '@ohos.net.webSocket'; import vpnExtension from '@ohos.net.vpnExtension'; -import networkSecurity from '@ohos.net.networkSecurity'; import VpnExtensionAbility, { VpnExtensionContext } from '@ohos.app.ability.VpnExtensionAbility'; import netFirewall from '@ohos.net.netFirewall'; export { - ethernet, http, mdns, policy, sharing, webSocket, - socket, statistics, vpn, vpnExtension, networkSecurity, + ethernet, mdns, policy, + socket, vpn, vpnExtension, VpnExtensionAbility, VpnExtensionContext, netFirewall }; /*** endif */ -- Gitee From 25790cbad52c718e2d6509593a933ad47044a2b8 Mon Sep 17 00:00:00 2001 From: lanhaoyu Date: Wed, 9 Jul 2025 17:03:17 +0800 Subject: [PATCH 050/746] bms sdk arkts1.2 add drawable Signed-off-by: lanhaoyu --- api/bundleManager/BundleResourceInfo.d.ts | 5 ++--- api/bundleManager/LauncherAbilityResourceInfo.d.ts | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/api/bundleManager/BundleResourceInfo.d.ts b/api/bundleManager/BundleResourceInfo.d.ts index 6952f3d65b..a5474cace3 100644 --- a/api/bundleManager/BundleResourceInfo.d.ts +++ b/api/bundleManager/BundleResourceInfo.d.ts @@ -18,9 +18,7 @@ * @kit AbilityKit */ -/*** if arkts 1.1 */ import { DrawableDescriptor } from './../@ohos.arkui.drawableDescriptor'; -/*** endif */ /** * Obtains resource information about a bundle @@ -75,7 +73,8 @@ export interface BundleResourceInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly drawableDescriptor: DrawableDescriptor; diff --git a/api/bundleManager/LauncherAbilityResourceInfo.d.ts b/api/bundleManager/LauncherAbilityResourceInfo.d.ts index bd303e501a..789a485885 100644 --- a/api/bundleManager/LauncherAbilityResourceInfo.d.ts +++ b/api/bundleManager/LauncherAbilityResourceInfo.d.ts @@ -18,9 +18,7 @@ * @kit AbilityKit */ -/*** if arkts 1.1 */ import { DrawableDescriptor } from './../@ohos.arkui.drawableDescriptor'; -/*** endif */ /** * Obtains resource information about a launcher ability @@ -99,7 +97,8 @@ export interface LauncherAbilityResourceInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly drawableDescriptor: DrawableDescriptor; -- Gitee From 1574c64e2bc7968381ce86ab020e765fedc5880e Mon Sep 17 00:00:00 2001 From: hongjianfeng Date: Wed, 9 Jul 2025 17:58:44 +0800 Subject: [PATCH 051/746] =?UTF-8?q?backgroundprocessmanager=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=BC=94=E8=BF=9BArkTS1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hongjianfeng --- ...urceschedule.backgroundProcessManager.d.ts | 44 ++++++++++++------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/api/@ohos.resourceschedule.backgroundProcessManager.d.ts b/api/@ohos.resourceschedule.backgroundProcessManager.d.ts index cd25b3cc13..f6ac1c537c 100644 --- a/api/@ohos.resourceschedule.backgroundProcessManager.d.ts +++ b/api/@ohos.resourceschedule.backgroundProcessManager.d.ts @@ -16,6 +16,7 @@ /** * @file * @kit BackgroundTasksKit + * @arkts 1.1&1.2 */ /** @@ -23,22 +24,25 @@ * * @namespace backgroundProcessManager * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager - * @since 17 + * @since arkts{ '1.1':'17','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace backgroundProcessManager { /** * Describes the level of BackgroundProcessManager priority. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager - * @since 17 + * @since arkts{ '1.1':'17','1.2':'20'} + * @arkts 1.1&1.2 */ export enum ProcessPriority { /** * Means the process has stopped working and in the background * * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager - * @since 17 + * @since arkts{ '1.1':'17','1.2':'20'} + * @arkts 1.1&1.2 */ PROCESS_BACKGROUND = 1, @@ -46,7 +50,8 @@ declare namespace backgroundProcessManager { * Means the process is working in the background * * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager - * @since 17 + * @since arkts{ '1.1':'17','1.2':'20'} + * @arkts 1.1&1.2 */ PROCESS_INACTIVE = 2, } @@ -54,9 +59,10 @@ declare namespace backgroundProcessManager { /** * Describes the status of the power saving mode. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager * @since 20 + * @arkts 1.1&1.2 */ export enum PowerSaveMode { /** @@ -65,6 +71,7 @@ declare namespace backgroundProcessManager { * * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager * @since 20 + * @arkts 1.1&1.2 */ EFFICIENCY_MODE = 1, @@ -73,6 +80,7 @@ declare namespace backgroundProcessManager { * * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager * @since 20 + * @arkts 1.1&1.2 */ DEFAULT_MODE = 2, } @@ -80,31 +88,33 @@ declare namespace backgroundProcessManager { /** * Set the priority of process. * - * @param { number } pid - Indicates the pid of the process to be set. + * @param { int } pid - Indicates the pid of the process to be set. * @param { ProcessPriority } priority - Indicates the priority to set. Specific priority can be referenced ProcessPriority * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 401 - Parameter error. Possible causes: priority is out of range. * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager - * @since 17 + * @since arkts{ '1.1':'17','1.2':'20'} + * @arkts 1.1&1.2 */ - function setProcessPriority(pid: number, priority: ProcessPriority): Promise; + function setProcessPriority(pid: int, priority: ProcessPriority): Promise; /** * Reset the priority of process. * - * @param { number } pid - Indicates the pid of the process to be reset. + * @param { int } pid - Indicates the pid of the process to be reset. * @returns { Promise } The promise returned by the function. * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager - * @since 17 + * @since arkts{ '1.1':'17','1.2':'20'} + * @arkts 1.1&1.2 */ - function resetProcessPriority(pid: number): Promise; + function resetProcessPriority(pid: int): Promise; /** * Set the power saving mode of process. The setting may fail due to user setting reasons or *
    system scheduling reasons. * * @permission ohos.permission.BACKGROUND_MANAGER_POWER_SAVE_MODE - * @param { number } pid - Indicates the pid of the power saving mode to be set. + * @param { int } pid - Indicates the pid of the power saving mode to be set. * @param { PowerSaveMode } powerSaveMode - Indicates the power saving mode that needs to be set. *
    For details, please refer to PowerSaveModeStatus. * @returns { Promise } The promise returned by the function. @@ -117,14 +127,15 @@ declare namespace backgroundProcessManager { * @throws { BusinessError } 801 - Capability not supported. * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager * @since 20 + * @arkts 1.1&1.2 */ - function setPowerSaveMode(pid: number, powerSaveMode: PowerSaveMode): Promise; + function setPowerSaveMode(pid: int, powerSaveMode: PowerSaveMode): Promise; /** * Check if the process is in power saving mode. * * @permission ohos.permission.BACKGROUND_MANAGER_POWER_SAVE_MODE - * @param { number } pid - Indicates the process to be checked is the pid of the power saving mode. + * @param { int } pid - Indicates the process to be checked is the pid of the power saving mode. * @returns { Promise } The promise returns whether it is in power saving mode. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 31800002 - Parameter error. Possible causes: @@ -132,8 +143,9 @@ declare namespace backgroundProcessManager { * @throws { BusinessError } 801 - Capability not supported. * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager * @since 20 + * @arkts 1.1&1.2 */ - function isPowerSaveMode(pid: number): Promise; + function isPowerSaveMode(pid: int): Promise; } export default backgroundProcessManager; -- Gitee From cb2d7d979d7626613295d696278f13cbddc5dc8b Mon Sep 17 00:00:00 2001 From: s00659936 <282229496@qq.com> Date: Thu, 10 Jul 2025 11:10:18 +0800 Subject: [PATCH 052/746] iremove int from base Signed-off-by: s00659936 <282229496@qq.com> Change-Id: Ie2eea267553cfaa3ef69e8f0a84feeac68835d26 --- api/@ohos.net.connection.d.ts | 22 ++++++---------------- api/@ohos.net.http.d.ts | 8 ++------ api/@ohos.net.networkSecurity.d.ts | 4 ---- api/@ohos.net.sharing.d.ts | 5 ----- api/@ohos.net.statistics.d.ts | 4 ---- api/@ohos.net.webSocket.d.ts | 4 ---- 6 files changed, 8 insertions(+), 39 deletions(-) diff --git a/api/@ohos.net.connection.d.ts b/api/@ohos.net.connection.d.ts index 11239cc215..77561b084b 100644 --- a/api/@ohos.net.connection.d.ts +++ b/api/@ohos.net.connection.d.ts @@ -23,7 +23,6 @@ import type { AsyncCallback, Callback } from './@ohos.base'; /*** if arkts 1.1 */ import type http from './@ohos.net.http'; import type socket from './@ohos.net.socket'; -import { int } from './@ohos.base'; /*** endif */ /** @@ -225,7 +224,7 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since arkts {'1.1':'11','1.2':'20'} + * @since arkts {'1.1':'8','1.2':'20'} * @arkts 1.1&1.2 */ function getAllNets(callback: AsyncCallback>): void; @@ -1622,7 +1621,7 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since arkts {'1.1':'15','1.2':'20'} + * @since arkts {'1.1':'8','1.2':'20'} * @arkts 1.1&1.2 */ getAddressByName(host: string, callback: AsyncCallback): void; @@ -1638,7 +1637,7 @@ declare namespace connection { * @throws { BusinessError } 2100002 - Failed to connect to the service. * @throws { BusinessError } 2100003 - System internal error. * @syscap SystemCapability.Communication.NetManager.Core - * @since arkts {'1.1':'15','1.2':'20'} + * @since arkts {'1.1':'8','1.2':'20'} * @arkts 1.1&1.2 */ getAddressByName(host: string): Promise; @@ -2052,19 +2051,10 @@ declare namespace connection { * Network card name. * @type {string} * @syscap SystemCapability.Communication.NetManager.Core - * @since 8 - * @arkts 1.1 - */ - interface: string; - - /** - * Network card name. - * @type {string} - * @syscap SystemCapability.Communication.NetManager.Core - * @since 20 - * @arkts 1.2 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ - iface: string; + iface: string; /** * Destination Address diff --git a/api/@ohos.net.http.d.ts b/api/@ohos.net.http.d.ts index 9af5d466df..fbb2c98006 100644 --- a/api/@ohos.net.http.d.ts +++ b/api/@ohos.net.http.d.ts @@ -21,10 +21,6 @@ import type { AsyncCallback, Callback } from './@ohos.base'; import type connection from './@ohos.net.connection'; -/*** if arkts 1.1 */ -import { int } from './@ohos.base'; -/*** endif */ - /** * Provides http related APIs. * @namespace http @@ -2084,7 +2080,7 @@ declare namespace http { * Initiates an HTTP request to a given URL, applicable to scenarios where http response supports streaming. * @permission ohos.permission.INTERNET * @param { string } url - URL for initiating an HTTP request. - * @param { HttpRequestOptions } options - Optional parameters {@link HttpRequestOptions}. + * @param { HttpRequestOptions } option - Optional parameters {@link HttpRequestOptions}. * @param { AsyncCallback } callback - the callback of requestInStream. * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 201 - Permission denied. @@ -2125,7 +2121,7 @@ declare namespace http { * @since arkts {'1.1':'18','1.2':'20'} * @arkts 1.1&1.2 */ - requestInStream(url: string, options: HttpRequestOptions, callback: AsyncCallback): void; + requestInStream(url: string, option: HttpRequestOptions, callback: AsyncCallback): void; /** * Initiates an HTTP request to a given URL, applicable to scenarios where http response supports streaming. diff --git a/api/@ohos.net.networkSecurity.d.ts b/api/@ohos.net.networkSecurity.d.ts index e82a820cd6..3db7aabf6d 100644 --- a/api/@ohos.net.networkSecurity.d.ts +++ b/api/@ohos.net.networkSecurity.d.ts @@ -20,10 +20,6 @@ import type { AsyncCallback } from './@ohos.base'; -/*** if arkts 1.1 */ -import { int } from './@ohos.base'; -/*** endif */ - /** * Provides networkSecurity related APIs. * @namespace networkSecurity diff --git a/api/@ohos.net.sharing.d.ts b/api/@ohos.net.sharing.d.ts index 52b5ce3e0f..c341206cef 100644 --- a/api/@ohos.net.sharing.d.ts +++ b/api/@ohos.net.sharing.d.ts @@ -21,11 +21,6 @@ import type { AsyncCallback, Callback } from './@ohos.base'; import type connection from './@ohos.net.connection'; -/*** if arkts 1.1 */ -import { int } from './@ohos.base'; -/*** endif */ - - /** * Provides network sharing related interfaces. * @namespace sharing diff --git a/api/@ohos.net.statistics.d.ts b/api/@ohos.net.statistics.d.ts index 83f1e2b762..e6a4df6f44 100644 --- a/api/@ohos.net.statistics.d.ts +++ b/api/@ohos.net.statistics.d.ts @@ -21,10 +21,6 @@ import type { AsyncCallback, Callback } from './@ohos.base'; import type connection from './@ohos.net.connection'; -/*** if arkts 1.1 */ -import { int, long } from './@ohos.base'; -/*** endif */ - /** * Obtains traffic statistics. * @namespace statistics diff --git a/api/@ohos.net.webSocket.d.ts b/api/@ohos.net.webSocket.d.ts index 8a707557df..e582a5f2ed 100644 --- a/api/@ohos.net.webSocket.d.ts +++ b/api/@ohos.net.webSocket.d.ts @@ -21,10 +21,6 @@ import type { AsyncCallback, ErrorCallback, Callback } from './@ohos.base'; import type connection from './@ohos.net.connection'; -/*** if arkts 1.1 */ -import { int } from './@ohos.base'; -/*** endif */ - /** * Provides WebSocket APIs. * @namespace webSocket -- Gitee From f23eaefbcd9a800048faa6fa9c79da6c3c10c70c Mon Sep 17 00:00:00 2001 From: zhangwenting15 Date: Thu, 10 Jul 2025 15:27:11 +0800 Subject: [PATCH 053/746] add taihe of 0702 Signed-off-by: zhangwenting15 Change-Id: I8808faf2e622ed614245813ca6218d69dd8af00f --- api/@ohos.multimedia.drm.d.ts | 377 ++++++++++++++++++++++++---------- 1 file changed, 265 insertions(+), 112 deletions(-) diff --git a/api/@ohos.multimedia.drm.d.ts b/api/@ohos.multimedia.drm.d.ts index e58565cb8d..bcd02832a2 100644 --- a/api/@ohos.multimedia.drm.d.ts +++ b/api/@ohos.multimedia.drm.d.ts @@ -29,7 +29,8 @@ * @namespace drm * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace drm { /** @@ -43,7 +44,8 @@ declare namespace drm { * @enum { number } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enum DrmErrorCode { /** @@ -55,7 +57,8 @@ declare namespace drm { * All unknown errors. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ ERROR_UNKNOWN = 24700101, /** @@ -67,7 +70,8 @@ declare namespace drm { * Meet max MediaKeySystem num limit. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ MAX_SYSTEM_NUM_REACHED = 24700103, /** @@ -79,7 +83,8 @@ declare namespace drm { * Meet max MediaKeySession num limit. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ MAX_SESSION_NUM_REACHED = 24700104, /** @@ -91,7 +96,8 @@ declare namespace drm { * Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ SERVICE_FATAL_ERROR = 24700201 } @@ -107,7 +113,8 @@ declare namespace drm { * @enum { string } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enum PreDefinedConfigName { /** @@ -119,7 +126,8 @@ declare namespace drm { * Config name vendor * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ CONFIG_DEVICE_VENDOR = 'vendor', /** @@ -131,7 +139,8 @@ declare namespace drm { * Config name version * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ CONFIG_DEVICE_VERSION = 'version', /** @@ -143,7 +152,8 @@ declare namespace drm { * Config name description * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ CONFIG_DEVICE_DESCRIPTION = 'description', /** @@ -155,7 +165,8 @@ declare namespace drm { * Config name algorithms * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ CONFIG_DEVICE_ALGORITHMS = 'algorithms', /** @@ -167,7 +178,8 @@ declare namespace drm { * Config name deviceUniqueId * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ CONFIG_DEVICE_UNIQUE_ID = 'deviceUniqueId', /** @@ -179,7 +191,8 @@ declare namespace drm { * Config name maxSessionNum * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ CONFIG_SESSION_MAX = 'maxSessionNum', /** @@ -191,7 +204,8 @@ declare namespace drm { * Config name currentSessionNum * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ CONFIG_SESSION_CURRENT = 'currentSessionNum', } @@ -207,7 +221,8 @@ declare namespace drm { * @enum { number } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enum MediaKeyType { /** @@ -219,7 +234,8 @@ declare namespace drm { * Offline media key type. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ MEDIA_KEY_TYPE_OFFLINE = 0, /** @@ -231,7 +247,8 @@ declare namespace drm { * Online media key type. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ MEDIA_KEY_TYPE_ONLINE, } @@ -247,7 +264,8 @@ declare namespace drm { * @enum { number } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enum OfflineMediaKeyStatus { /** @@ -259,7 +277,8 @@ declare namespace drm { * Offline media key status unknown. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ OFFLINE_MEDIA_KEY_STATUS_UNKNOWN = 0, /** @@ -271,7 +290,8 @@ declare namespace drm { * Offline media key status usable. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ OFFLINE_MEDIA_KEY_STATUS_USABLE = 1, /** @@ -283,7 +303,8 @@ declare namespace drm { * Offline media key status inactive. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ OFFLINE_MEDIA_KEY_STATUS_INACTIVE = 2, } @@ -299,7 +320,8 @@ declare namespace drm { * @enum { number } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enum CertificateStatus { /** @@ -311,7 +333,8 @@ declare namespace drm { * Device already provisioned. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ CERT_STATUS_PROVISIONED = 0, /** @@ -323,7 +346,8 @@ declare namespace drm { * Device not provisioned. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ CERT_STATUS_NOT_PROVISIONED, /** @@ -335,7 +359,8 @@ declare namespace drm { * Cert already expired. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ CERT_STATUS_EXPIRED, /** @@ -347,7 +372,8 @@ declare namespace drm { * Certs are invalid. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ CERT_STATUS_INVALID, /** @@ -359,7 +385,8 @@ declare namespace drm { * Get certs status failed. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ CERT_STATUS_UNAVAILABLE, } @@ -375,7 +402,8 @@ declare namespace drm { * @enum { number } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum MediaKeyRequestType { /** @@ -387,7 +415,8 @@ declare namespace drm { * Media key request type unknown. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MEDIA_KEY_REQUEST_TYPE_UNKNOWN = 0, /** @@ -399,7 +428,8 @@ declare namespace drm { * Media key request type initial. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MEDIA_KEY_REQUEST_TYPE_INITIAL = 1, /** @@ -411,7 +441,8 @@ declare namespace drm { * Media key request type renewal. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MEDIA_KEY_REQUEST_TYPE_RENEWAL = 2, /** @@ -423,7 +454,8 @@ declare namespace drm { * Media key request type release. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MEDIA_KEY_REQUEST_TYPE_RELEASE = 3, /** @@ -435,7 +467,8 @@ declare namespace drm { * Media key request type none. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MEDIA_KEY_REQUEST_TYPE_NONE = 4, /** @@ -447,7 +480,8 @@ declare namespace drm { * Media key request type update. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MEDIA_KEY_REQUEST_TYPE_UPDATE = 5, } @@ -463,7 +497,8 @@ declare namespace drm { * @enum { number } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum ContentProtectionLevel { /** @@ -475,7 +510,8 @@ declare namespace drm { * Device decrypt and decode type unknown. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONTENT_PROTECTION_LEVEL_UNKNOWN = 0, /** @@ -487,7 +523,8 @@ declare namespace drm { * Device using software level. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONTENT_PROTECTION_LEVEL_SW_CRYPTO, /** @@ -499,7 +536,8 @@ declare namespace drm { * Device using hardware level. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONTENT_PROTECTION_LEVEL_HW_CRYPTO, /** @@ -511,7 +549,8 @@ declare namespace drm { * Device using enhanced hardware level. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONTENT_PROTECTION_LEVEL_ENHANCED_HW, /** @@ -523,7 +562,8 @@ declare namespace drm { * Max mode. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONTENT_PROTECTION_LEVEL_MAX, } @@ -539,7 +579,8 @@ declare namespace drm { * @interface ProvisionRequest * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ interface ProvisionRequest { /** @@ -553,7 +594,8 @@ declare namespace drm { * @type { Uint8Array } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ data: Uint8Array; /** @@ -567,7 +609,8 @@ declare namespace drm { * @type { string } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ defaultURL: string; } @@ -583,7 +626,8 @@ declare namespace drm { * @interface OptionsData * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface OptionsData { /** @@ -597,7 +641,8 @@ declare namespace drm { * @type { string } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ name: string; /** @@ -611,7 +656,8 @@ declare namespace drm { * @type { string } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ value: string; } @@ -627,7 +673,8 @@ declare namespace drm { * @interface MediaKeyRequest * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface MediaKeyRequest { /** @@ -641,7 +688,8 @@ declare namespace drm { * @type { MediaKeyRequestType } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ mediaKeyRequestType: MediaKeyRequestType; /** @@ -655,7 +703,8 @@ declare namespace drm { * @type { Uint8Array } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ data: Uint8Array; /** @@ -669,7 +718,8 @@ declare namespace drm { * @type { string } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ defaultURL: string; } @@ -685,7 +735,8 @@ declare namespace drm { * @interface EventInfo * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface EventInfo { /** @@ -699,7 +750,8 @@ declare namespace drm { * @type { Uint8Array } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ info: Uint8Array; /** @@ -713,7 +765,8 @@ declare namespace drm { * @type { string } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ extraInfo: string; } @@ -729,7 +782,8 @@ declare namespace drm { * @interface StatisticKeyValue * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ interface StatisticKeyValue { /** @@ -743,7 +797,8 @@ declare namespace drm { * @type { string } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ name: string; /** @@ -757,7 +812,8 @@ declare namespace drm { * @type { string } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ value: string; } @@ -773,7 +829,8 @@ declare namespace drm { * @interface MediaKeyStatus * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface MediaKeyStatus { /** @@ -787,7 +844,8 @@ declare namespace drm { * @type { string } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ name: string; /** @@ -801,7 +859,8 @@ declare namespace drm { * @type { string } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ value: string; } @@ -817,7 +876,8 @@ declare namespace drm { * @interface KeysInfo * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface KeysInfo { /** @@ -831,7 +891,8 @@ declare namespace drm { * @type { Uint8Array } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ keyId: Uint8Array; /** @@ -845,7 +906,8 @@ declare namespace drm { * @type { string } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ value: string; } @@ -861,7 +923,8 @@ declare namespace drm { * @interface MediaKeySystemInfo * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface MediaKeySystemInfo { /** @@ -875,7 +938,8 @@ declare namespace drm { * @type { string } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ uuid: string; /** @@ -889,7 +953,8 @@ declare namespace drm { * @type { Uint8Array } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ pssh: Uint8Array; } @@ -905,7 +970,8 @@ declare namespace drm { * @interface MediaKeySystemDescription * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ interface MediaKeySystemDescription { /** @@ -919,7 +985,8 @@ declare namespace drm { * @type { string } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ name: string; /** @@ -933,7 +1000,8 @@ declare namespace drm { * @type { string } * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ uuid: string; } @@ -959,7 +1027,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ function getMediaKeySystemUuid(name: string): string; @@ -978,7 +1047,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ function getMediaKeySystems(): MediaKeySystemDescription[]; @@ -1009,6 +1079,21 @@ declare namespace drm { */ function createMediaKeySystem(name: string): MediaKeySystem; + /** + * Creates a MediaKeySystem instance. + * @param { string } name - Used to point a Digital Right Management solution. + * @returns { MediaKeySystem | undefined } The MediaKeySystem instance or undefined. + * @throws { BusinessError } 401 - The parameter check failed. Possibly because: + * 1.Mandatory parameters are left unspecified. 2.Parameter verification failed. + * @throws { BusinessError } 24700101 - All unknown errors. + * @throws { BusinessError } 24700103 - Meet max MediaKeySystem num limit. + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @since 20 + * @arkts 1.2 + */ + function createMediaKeySystem(name: string): MediaKeySystem | undefined; + /** * Judge whether a system that specifies name, mimetype and content protection level is supported. * @param { string } name - Used to point a Digital Right Management solution. @@ -1036,7 +1121,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ function isMediaKeySystemSupported(name: string, mimeType: string, level: ContentProtectionLevel): boolean; @@ -1065,7 +1151,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ function isMediaKeySystemSupported(name: string, mimeType: string): boolean; @@ -1092,7 +1179,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ function isMediaKeySystemSupported(name: string): boolean; @@ -1109,7 +1197,8 @@ declare namespace drm { * @interface MediaKeySystem * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ interface MediaKeySystem { /** @@ -1135,7 +1224,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ getConfigurationString(configName: string): string; @@ -1162,7 +1252,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ setConfigurationString(configName: string, value: string): void; @@ -1187,7 +1278,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ getConfigurationByteArray(configName: string): Uint8Array; @@ -1214,7 +1306,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ setConfigurationByteArray(configName: string, value: Uint8Array): void; @@ -1235,7 +1328,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ getStatistics(): StatisticKeyValue[]; @@ -1254,7 +1348,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ getMaxContentProtectionLevel(): ContentProtectionLevel; @@ -1273,7 +1368,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ generateKeySystemRequest(): Promise; @@ -1300,7 +1396,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ processKeySystemResponse(response: Uint8Array): Promise; @@ -1319,7 +1416,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ getCertificateStatus(): CertificateStatus; @@ -1342,7 +1440,8 @@ declare namespace drm { * @throws { BusinessError } 24700101 - All unknown errors. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'keySystemRequired', callback: (eventInfo: EventInfo) => void): void; @@ -1365,7 +1464,8 @@ declare namespace drm { * @throws { BusinessError } 24700101 - All unknown errors. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'keySystemRequired', callback?: (eventInfo: EventInfo) => void): void; @@ -1398,6 +1498,22 @@ declare namespace drm { */ createMediaKeySession(level: ContentProtectionLevel): MediaKeySession; + /** + * Create a MediaKeySession instance with level. + * @param { ContentProtectionLevel} level - Used to specify the content protection level. + * @returns { MediaKeySession | undefined } A MediaKeySession instance or undefined. + * @throws { BusinessError } 401 - The parameter check failed. Possibly because: + * 1.Mandatory parameters are left unspecified. 2.The param level exceeds reasonable range, + * please use value in ContentProtectionLevel. + * @throws { BusinessError } 24700101 - All unknown errors. + * @throws { BusinessError } 24700104 - Meet max MediaKeySession num limit. + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @since 20 + * @arkts 1.2 + */ + createMediaKeySession(level: ContentProtectionLevel): MediaKeySession | undefined; + /** * Create a MediaKeySession instance. * @returns { MediaKeySession } A MediaKeySession instance. @@ -1419,6 +1535,18 @@ declare namespace drm { */ createMediaKeySession(): MediaKeySession; + /** + * Create a MediaKeySession instance. + * @returns { MediaKeySession | undefined } A MediaKeySession instance or undefined + * @throws { BusinessError } 24700101 - All unknown errors. + * @throws { BusinessError } 24700104 - Meet max MediaKeySession num limit. + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @since 20 + * @arkts 1.2 + */ + createMediaKeySession(): MediaKeySession | undefined; + /** * Get the list of offline MediaKeyIds. * @returns { Uint8Array[] } The list of offline MediaKeyIds. @@ -1434,7 +1562,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ getOfflineMediaKeyIds(): Uint8Array[]; @@ -1461,7 +1590,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ getOfflineMediaKeyStatus(mediaKeyId: Uint8Array): OfflineMediaKeyStatus; @@ -1484,7 +1614,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ clearOfflineMediaKeys(mediaKeyId: Uint8Array): void; /** @@ -1500,7 +1631,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ destroy(): void; } @@ -1518,7 +1650,8 @@ declare namespace drm { * @interface MediaKeySession * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface MediaKeySession { @@ -1541,7 +1674,7 @@ declare namespace drm { * Generate the media key request. * @param { string } mimeType - Media type. * @param { Uint8Array } initData - PSSH info. - * @param { number } mediaKeyType - Offline or online. + * @param { int } mediaKeyType - Offline or online. * @param { OptionsData[] } options - Optional data the application set to drm framework. * @returns { Promise } Promise with MediaKeyRequest used to return the result. * @throws { BusinessError } 401 -The parameter check failed. Possibly because: @@ -1551,9 +1684,10 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - generateMediaKeyRequest(mimeType: string, initData: Uint8Array, mediaKeyType: number, options?: OptionsData[]): Promise; + generateMediaKeyRequest(mimeType: string, initData: Uint8Array, mediaKeyType: int, options?: OptionsData[]): Promise; /** * Process the response corresponding to the media key request obtained by the application. @@ -1578,7 +1712,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ processMediaKeyResponse(response: Uint8Array): Promise; @@ -1597,7 +1732,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ checkMediaKeyStatus(): MediaKeyStatus[]; @@ -1614,7 +1750,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ clearMediaKeys(): void; @@ -1643,7 +1780,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ generateOfflineReleaseRequest(mediaKeyId: Uint8Array): Promise; @@ -1672,7 +1810,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ processOfflineReleaseResponse(mediaKeyId: Uint8Array, response: Uint8Array): Promise; @@ -1699,7 +1838,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ restoreOfflineMediaKeys(mediaKeyId: Uint8Array): Promise; @@ -1718,7 +1858,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getContentProtectionLevel(): ContentProtectionLevel; @@ -1745,7 +1886,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ requireSecureDecoderModule(mimeType: string): boolean; @@ -1770,7 +1912,8 @@ declare namespace drm { * @throws { BusinessError } 24700101 - All unknown errors. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'keyRequired', callback: (eventInfo: EventInfo) => void): void; @@ -1795,7 +1938,8 @@ declare namespace drm { * @throws { BusinessError } 24700101 - All unknown errors. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'keyRequired', callback?: (eventInfo: EventInfo) => void): void; @@ -1820,7 +1964,8 @@ declare namespace drm { * @throws { BusinessError } 24700101 - All unknown errors. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'keyExpired', callback: (eventInfo: EventInfo) => void): void; @@ -1845,7 +1990,8 @@ declare namespace drm { * @throws { BusinessError } 24700101 - All unknown errors. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'keyExpired', callback?: (eventInfo: EventInfo) => void): void; @@ -1870,7 +2016,8 @@ declare namespace drm { * @throws { BusinessError } 24700101 - All unknown errors. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'vendorDefined', callback: (eventInfo: EventInfo) => void): void; @@ -1895,7 +2042,8 @@ declare namespace drm { * @throws { BusinessError } 24700101 - All unknown errors. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * arkts 1.1&1.2 */ off(type: 'vendorDefined', callback?: (eventInfo: EventInfo) => void): void; @@ -1920,7 +2068,8 @@ declare namespace drm { * @throws { BusinessError } 24700101 - All unknown errors. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'expirationUpdate', callback: (eventInfo: EventInfo) => void): void; @@ -1945,7 +2094,8 @@ declare namespace drm { * @throws { BusinessError } 24700101 - All unknown errors. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'expirationUpdate', callback?: (eventInfo: EventInfo) => void): void; @@ -1970,7 +2120,8 @@ declare namespace drm { * @throws { BusinessError } 24700101 - All unknown errors. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'keysChange', callback: (keyInfo: KeysInfo[], newKeyAvailable: boolean) => void): void; @@ -1995,7 +2146,8 @@ declare namespace drm { * @throws { BusinessError } 24700101 - All unknown errors. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'keysChange', callback?: (keyInfo: KeysInfo[], newKeyAvailable: boolean) => void): void; @@ -2012,7 +2164,8 @@ declare namespace drm { * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. * @syscap SystemCapability.Multimedia.Drm.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ destroy(): void; -- Gitee From e4ae7e2c98944c0d2341004cc28c511d4e004d2c Mon Sep 17 00:00:00 2001 From: hhl Date: Thu, 10 Jul 2025 21:16:59 +0800 Subject: [PATCH 054/746] add apprecovery ani Signed-off-by: hhl --- api/@ohos.app.ability.appRecovery.d.ts | 52 +++++++++++++++++--------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/api/@ohos.app.ability.appRecovery.d.ts b/api/@ohos.app.ability.appRecovery.d.ts index b6c1182d7a..517fb27763 100644 --- a/api/@ohos.app.ability.appRecovery.d.ts +++ b/api/@ohos.app.ability.appRecovery.d.ts @@ -16,6 +16,7 @@ /** * @file * @kit AbilityKit + * @arkts 1.1&1.2 */ import UIAbilityContext from './application/UIAbilityContext'; @@ -40,7 +41,8 @@ import Want from './@ohos.app.ability.Want'; * @namespace appRecovery * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace appRecovery { /** @@ -56,7 +58,8 @@ declare namespace appRecovery { * @enum { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ enum RestartFlag { /** @@ -70,7 +73,8 @@ declare namespace appRecovery { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ ALWAYS_RESTART = 0, @@ -85,7 +89,8 @@ declare namespace appRecovery { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ RESTART_WHEN_JS_CRASH = 0x0001, @@ -100,7 +105,8 @@ declare namespace appRecovery { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ RESTART_WHEN_APP_FREEZE = 0x0002, @@ -115,7 +121,8 @@ declare namespace appRecovery { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ NO_RESTART = 0xFFFF } @@ -137,7 +144,8 @@ declare namespace appRecovery { * @enum { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ enum SaveOccasionFlag { /** @@ -155,7 +163,8 @@ declare namespace appRecovery { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ SAVE_WHEN_ERROR = 0x0001, @@ -170,7 +179,8 @@ declare namespace appRecovery { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ SAVE_WHEN_BACKGROUND = 0x0002 } @@ -188,7 +198,8 @@ declare namespace appRecovery { * @enum { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ enum SaveModeFlag { /** @@ -202,7 +213,8 @@ declare namespace appRecovery { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ SAVE_WITH_FILE = 0x0001, @@ -217,7 +229,8 @@ declare namespace appRecovery { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ SAVE_WITH_SHARED_MEMORY = 0x0002 } @@ -241,7 +254,8 @@ declare namespace appRecovery { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function enableAppRecovery(restart?: RestartFlag, saveOccasion?: SaveOccasionFlag, saveMode?: SaveModeFlag): void; @@ -262,7 +276,8 @@ declare namespace appRecovery { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function restartApp(): void; @@ -281,7 +296,8 @@ declare namespace appRecovery { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function setRestartWant(want: Want): void; @@ -304,7 +320,8 @@ declare namespace appRecovery { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function saveAppState(): boolean; /** @@ -326,7 +343,8 @@ declare namespace appRecovery { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function saveAppState(context?: UIAbilityContext): boolean; } -- Gitee From 922ecfe92e76d2fc6b9c5bf1a4c833518f114ce7 Mon Sep 17 00:00:00 2001 From: Michael Wang Date: Thu, 10 Jul 2025 23:14:19 +0800 Subject: [PATCH 055/746] modify for ces Signed-off-by: Michael Wang --- ...pplication.StaticSubscriberExtensionAbility.d.ts | 13 +++++++++---- ...pplication.StaticSubscriberExtensionContext.d.ts | 12 ++++++++---- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/api/@ohos.application.StaticSubscriberExtensionAbility.d.ts b/api/@ohos.application.StaticSubscriberExtensionAbility.d.ts index d238b3dcf9..5f8dd6ed76 100644 --- a/api/@ohos.application.StaticSubscriberExtensionAbility.d.ts +++ b/api/@ohos.application.StaticSubscriberExtensionAbility.d.ts @@ -27,9 +27,10 @@ import StaticSubscriberExtensionContext from './@ohos.application.StaticSubscrib * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ -export default class StaticSubscriberExtensionAbility { +declare class StaticSubscriberExtensionAbility { /** * Indicates configuration information about an ability context. * @@ -37,7 +38,8 @@ export default class StaticSubscriberExtensionAbility { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ context: StaticSubscriberExtensionContext; @@ -48,7 +50,10 @@ export default class StaticSubscriberExtensionAbility { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ onReceiveEvent(event: CommonEventData): void; } + +export default StaticSubscriberExtensionAbility; \ No newline at end of file diff --git a/api/@ohos.application.StaticSubscriberExtensionContext.d.ts b/api/@ohos.application.StaticSubscriberExtensionContext.d.ts index ebb8029c2d..688ff07f1a 100644 --- a/api/@ohos.application.StaticSubscriberExtensionContext.d.ts +++ b/api/@ohos.application.StaticSubscriberExtensionContext.d.ts @@ -29,9 +29,10 @@ import ExtensionContext from './application/ExtensionContext'; * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ -export default class StaticSubscriberExtensionContext extends ExtensionContext { +declare class StaticSubscriberExtensionContext extends ExtensionContext { /** * Starts a new ability. If the caller application is in foreground, you can use this method to start ability; * If the caller application is in the background, you need to apply for permission:ohos.permission.START_ABILITIES_FROM_BACKGROUND. @@ -60,7 +61,8 @@ export default class StaticSubscriberExtensionContext extends ExtensionContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ startAbility(want: Want, callback: AsyncCallback): void; @@ -92,7 +94,9 @@ export default class StaticSubscriberExtensionContext extends ExtensionContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ startAbility(want: Want): Promise; } +export default StaticSubscriberExtensionContext; \ No newline at end of file -- Gitee From c8c5b3ab055ccaec0f7e9246abc745794543d385 Mon Sep 17 00:00:00 2001 From: lanhaoyu Date: Fri, 27 Jun 2025 17:41:55 +0800 Subject: [PATCH 056/746] bms sdk number to int/long/double Signed-off-by: lanhaoyu --- api/@ohos.bundle.appControl.d.ts | 40 +-- api/@ohos.bundle.bundleManager.d.ts | 302 +++++++++--------- api/@ohos.bundle.bundleMonitor.d.ts | 8 +- api/@ohos.bundle.bundleResourceManager.d.ts | 38 +-- api/@ohos.bundle.defaultAppManager.d.ts | 38 +-- api/@ohos.bundle.freeInstall.d.ts | 4 +- api/@ohos.bundle.installer.d.ts | 48 +-- api/@ohos.bundle.launcherBundleManager.d.ts | 26 +- api/@ohos.bundle.shortcutManager.d.ts | 12 +- api/@ohos.zlib.d.ts | 300 ++++++++--------- api/bundleManager/AbilityInfo.d.ts | 44 +-- api/bundleManager/AppProvisionInfo.d.ts | 12 +- api/bundleManager/ApplicationInfo.d.ts | 40 +-- api/bundleManager/BundleInfo.d.ts | 36 +-- api/bundleManager/BundlePackInfo.d.ts | 20 +- api/bundleManager/BundleResourceInfo.d.ts | 4 +- api/bundleManager/ExtensionAbilityInfo.d.ts | 16 +- api/bundleManager/HapModuleInfo.d.ts | 16 +- api/bundleManager/LauncherAbilityInfo.d.ts | 16 +- .../LauncherAbilityResourceInfo.d.ts | 4 +- api/bundleManager/Metadata.d.ts | 4 +- api/bundleManager/OverlayModuleInfo.d.ts | 8 +- api/bundleManager/PermissionDef.d.ts | 12 +- api/bundleManager/PluginBundleInfo.d.ts | 16 +- .../RecoverableApplicationInfo.d.ts | 8 +- api/bundleManager/SharedBundleInfo.d.ts | 8 +- api/bundleManager/ShortcutInfo.d.ts | 16 +- api/bundleManager/Skill.d.ts | 8 +- 28 files changed, 552 insertions(+), 552 deletions(-) diff --git a/api/@ohos.bundle.appControl.d.ts b/api/@ohos.bundle.appControl.d.ts index b7f6ac7d90..bc1ce200b5 100644 --- a/api/@ohos.bundle.appControl.d.ts +++ b/api/@ohos.bundle.appControl.d.ts @@ -40,7 +40,7 @@ declare namespace appControl { /** * Indicates the ability component type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} @@ -71,7 +71,7 @@ declare namespace appControl { /** * Indicates the ability component type when uninstalled. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi * @since arkts {'1.1':'15', '1.2':'20'} @@ -92,7 +92,7 @@ declare namespace appControl { /** * Indicates when to intercept the specified application. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} @@ -131,7 +131,7 @@ declare namespace appControl { /** * Indicates the strategy to intercept the specified application. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} @@ -226,13 +226,13 @@ declare namespace appControl { /** * Indicates priority of the rule. * - * @type { number } + * @type { int } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - priority: number; + priority: int; } /** @@ -270,13 +270,13 @@ declare namespace appControl { /** * Indicates priority of the rule. * - * @type { number } + * @type { int } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi * @since arkts {'1.1':'15', '1.2':'20'} * @arkts 1.1&1.2 */ - priority: number; + priority: int; } /** @@ -484,7 +484,7 @@ declare namespace appControl { * * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS * @param { string } appId - Indicates the app ID of the application. - * @param { number } [appIndex] Indicates the index of clone app. + * @param { int } [appIndex] Indicates the index of clone app. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -496,7 +496,7 @@ declare namespace appControl { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function deleteDisposedStatusSync(appId: string, appIndex?: number): void; + function deleteDisposedStatusSync(appId: string, appIndex?: int): void; /** * Obtains the disposed rule of a specified bundle. @@ -518,7 +518,7 @@ declare namespace appControl { * * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS * @param { string } appId - Indicates the app ID of the application. - * @param { number } [appIndex] Indicates the index of clone app. + * @param { int } [appIndex] Indicates the index of clone app. * @returns { DisposedRule } Returns the disposed rule of a specified bundle. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. @@ -531,7 +531,7 @@ declare namespace appControl { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getDisposedRule(appId: string, appIndex?: number): DisposedRule; + function getDisposedRule(appId: string, appIndex?: int): DisposedRule; /** * Sets the disposed rule of a specified bundle. @@ -554,7 +554,7 @@ declare namespace appControl { * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS * @param { string } appId - Indicates the app ID of the application. * @param { DisposedRule } rule - Indicates the disposed rule of a specified bundle. - * @param { number } [appIndex] Indicates the index of clone app. + * @param { int } [appIndex] Indicates the index of clone app. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -566,7 +566,7 @@ declare namespace appControl { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function setDisposedRule(appId: string, rule: DisposedRule, appIndex?: number): void; + function setDisposedRule(appId: string, rule: DisposedRule, appIndex?: int): void; /** * Sets the uninstall disposed rule of a specified bundle. @@ -574,7 +574,7 @@ declare namespace appControl { * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS * @param { string } appIdentifier - Indicates the appIdentifier of the application. * @param { UninstallDisposedRule } rule - Indicates the uninstall disposed rule of a specified bundle. - * @param { number } [appIndex] Indicates the index of clone app. + * @param { int } [appIndex] Indicates the index of clone app. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -587,14 +587,14 @@ declare namespace appControl { * @since arkts {'1.1':'15', '1.2':'20'} * @arkts 1.1&1.2 */ - function setUninstallDisposedRule(appIdentifier: string, rule: UninstallDisposedRule, appIndex?: number): void; + function setUninstallDisposedRule(appIdentifier: string, rule: UninstallDisposedRule, appIndex?: int): void; /** * Obtains the uninstall disposed rule of a specified bundle. * * @permission ohos.permission.GET_DISPOSED_APP_STATUS or ohos.permission.MANAGE_DISPOSED_APP_STATUS * @param { string } appIdentifier - Indicates the appIdentifier of the application. - * @param { number } [appIndex] Indicates the index of clone app. + * @param { int } [appIndex] Indicates the index of clone app. * @returns { UninstallDisposedRule } Returns the uninstall disposed rule of a specified bundle. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. @@ -607,14 +607,14 @@ declare namespace appControl { * @since arkts {'1.1':'15', '1.2':'20'} * @arkts 1.1&1.2 */ - function getUninstallDisposedRule(appIdentifier: string, appIndex?: number): UninstallDisposedRule; + function getUninstallDisposedRule(appIdentifier: string, appIndex?: int): UninstallDisposedRule; /** * Delete the uninstall disposed rule of a specified bundle. * * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS * @param { string } appIdentifier - Indicates the appIdentifier of the application. - * @param { number } [appIndex] Indicates the index of clone app. + * @param { int } [appIndex] Indicates the index of clone app. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -626,7 +626,7 @@ declare namespace appControl { * @since arkts {'1.1':'15', '1.2':'20'} * @arkts 1.1&1.2 */ - function deleteUninstallDisposedRule(appIdentifier: string, appIndex?: number): void; + function deleteUninstallDisposedRule(appIdentifier: string, appIndex?: int): void; /** * Batch set disposed rules for specified bundles. diff --git a/api/@ohos.bundle.bundleManager.d.ts b/api/@ohos.bundle.bundleManager.d.ts index 525a06ae37..ec4528274f 100644 --- a/api/@ohos.bundle.bundleManager.d.ts +++ b/api/@ohos.bundle.bundleManager.d.ts @@ -95,7 +95,7 @@ declare namespace bundleManager { * Used to query the enumeration value of bundleInfo. Multiple values can be passed in the form. * Multiple value input, such as GET_BUNDLE_INFO_DEFAULT | GET_BUNDLE_INFO_WITH_APPLICATION. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform * @atomicservice @@ -424,7 +424,7 @@ declare namespace bundleManager { * Used to query the enumeration value of applicationInfo. Multiple values can be passed in the form. * Multiple value input, such as GET_APPLICATION_INFO_DEFAULT | GET_APPLICATION_INFO_WITH_PERMISSION. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} @@ -481,7 +481,7 @@ declare namespace bundleManager { /** * Used to query the enumeration value of abilityInfo. Multiple values can be passed in the form. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since 20 @@ -630,7 +630,7 @@ declare namespace bundleManager { /** * Used to query the enumeration value of ExtensionAbilityInfo. Multiple values can be passed in the form. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} @@ -695,7 +695,7 @@ declare namespace bundleManager { /** * This enumeration value is used to identify various types of extension ability * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} @@ -1009,7 +1009,7 @@ declare namespace bundleManager { /** * PermissionGrantState * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform * @atomicservice @@ -1084,7 +1084,7 @@ declare namespace bundleManager { /** * Support window mode * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform * @atomicservice @@ -1181,7 +1181,7 @@ declare namespace bundleManager { /** * Launch type * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform * @atomicservice @@ -1317,7 +1317,7 @@ declare namespace bundleManager { /** * Display orientation * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform * @atomicservice @@ -1676,7 +1676,7 @@ declare namespace bundleManager { /** * Indicates module type * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform * @atomicservice @@ -1765,7 +1765,7 @@ declare namespace bundleManager { /** * Indicates bundle type * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} @@ -1812,7 +1812,7 @@ declare namespace bundleManager { /** * Shared bundle compatible policy * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} @@ -1839,7 +1839,7 @@ declare namespace bundleManager { /** * This enumeration value is used to identify various types of JSON profile. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} @@ -1860,7 +1860,7 @@ declare namespace bundleManager { /** * This enumeration value is used to identify the distribution type of application. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} @@ -1943,7 +1943,7 @@ declare namespace bundleManager { /** * This enumeration value is used to identify various types of extension ability * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 @@ -1978,7 +1978,7 @@ declare namespace bundleManager { /** * This enumeration value is used to identify various flags of application * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} @@ -2045,7 +2045,7 @@ declare namespace bundleManager { /** * Obtains own bundleInfo. * - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. * @returns { Promise } The result of getting the bundle info. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @syscap SystemCapability.BundleManager.BundleFramework.Core @@ -2054,7 +2054,7 @@ declare namespace bundleManager { * @since 20 * @arkts 1.1&1.2 */ - function getBundleInfoForSelf(bundleFlags: number): Promise; + function getBundleInfoForSelf(bundleFlags: int): Promise; /** * Obtains own bundleInfo. @@ -2078,7 +2078,7 @@ declare namespace bundleManager { /** * Obtains own bundleInfo. * - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. * @param { AsyncCallback } callback - The callback of getting bundle info result. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @syscap SystemCapability.BundleManager.BundleFramework.Core @@ -2087,7 +2087,7 @@ declare namespace bundleManager { * @since 20 * @arkts 1.1&1.2 */ - function getBundleInfoForSelf(bundleFlags: number, callback: AsyncCallback): void; + function getBundleInfoForSelf(bundleFlags: int, callback: AsyncCallback): void; /** * Obtains own bundleInfo. @@ -2111,7 +2111,7 @@ declare namespace bundleManager { /** * Obtains own bundleInfo. * - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. * @returns { BundleInfo } The result of getting the bundle info. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @syscap SystemCapability.BundleManager.BundleFramework.Core @@ -2120,14 +2120,14 @@ declare namespace bundleManager { * @since 20 * @arkts 1.1&1.2 */ - function getBundleInfoForSelfSync(bundleFlags: number): BundleInfo; + function getBundleInfoForSelfSync(bundleFlags: int): BundleInfo; /** * Obtains bundleInfo based on bundleName, bundleFlags. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. * @param { AsyncCallback } callback - The callback of getting bundle info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -2137,15 +2137,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleInfo(bundleName: string, bundleFlags: number, callback: AsyncCallback): void; + function getBundleInfo(bundleName: string, bundleFlags: int, callback: AsyncCallback): void; /** * Obtains bundleInfo based on bundleName, bundleFlags and userId. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @param { AsyncCallback } callback - The callback of getting bundle info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -2157,15 +2157,15 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function getBundleInfo(bundleName: string, - bundleFlags: number, userId: number, callback: AsyncCallback): void; + bundleFlags: int, userId: int, callback: AsyncCallback): void; /** * Obtains bundleInfo based on bundleName, bundleFlags and userId. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @returns { Promise } The result of getting the bundle info. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -2176,14 +2176,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleInfo(bundleName: string, bundleFlags: number, userId?: number): Promise; + function getBundleInfo(bundleName: string, bundleFlags: int, userId?: int): Promise; /** * Obtains application info based on a given bundle name. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. + * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. * @param { AsyncCallback } callback - The callback of getting application info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2195,15 +2195,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getApplicationInfo(bundleName: string, appFlags: number, callback: AsyncCallback): void; + function getApplicationInfo(bundleName: string, appFlags: int, callback: AsyncCallback): void; /** * Obtains application info based on a given bundle name. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @param { AsyncCallback } callback - The callback of getting application info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2217,15 +2217,15 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function getApplicationInfo(bundleName: string, - appFlags: number, userId: number, callback: AsyncCallback): void; + appFlags: int, userId: int, callback: AsyncCallback): void; /** * Obtains application info based on a given bundle name. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @returns { Promise } The result of getting the application info. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2238,13 +2238,13 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getApplicationInfo(bundleName: string, appFlags: number, userId?: number): Promise; + function getApplicationInfo(bundleName: string, appFlags: int, userId?: int): Promise; /** * Obtains BundleInfo of all bundles available in the system. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. * @param { AsyncCallback> } callback - The callback of getting a list of BundleInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2254,14 +2254,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllBundleInfo(bundleFlags: number, callback: AsyncCallback>): void; + function getAllBundleInfo(bundleFlags: int, callback: AsyncCallback>): void; /** * Obtains BundleInfo of all bundles available in the system. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. - * @param { number } userId - Indicates the user id. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. + * @param { int } userId - Indicates the user id. * @param { AsyncCallback> } callback - The callback of getting a list of BundleInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2272,14 +2272,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllBundleInfo(bundleFlags: number, userId: number, callback: AsyncCallback>): void; + function getAllBundleInfo(bundleFlags: int, userId: int, callback: AsyncCallback>): void; /** * Obtains BundleInfo of all bundles available in the system. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. - * @param { number } userId - Indicates the user id. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. + * @param { int } userId - Indicates the user id. * @returns { Promise> } Returns a list of BundleInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2290,13 +2290,13 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllBundleInfo(bundleFlags: number, userId?: number): Promise>; + function getAllBundleInfo(bundleFlags: int, userId?: int): Promise>; /** * Obtains information about all installed applications of a specified user. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST - * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. + * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. * @param { AsyncCallback> } callback - The callback of getting a list of ApplicationInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2306,14 +2306,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllApplicationInfo(appFlags: number, callback: AsyncCallback>): void; + function getAllApplicationInfo(appFlags: int, callback: AsyncCallback>): void; /** * Obtains information about all installed applications of a specified user. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST - * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @param { AsyncCallback> } callback - The callback of getting a list of ApplicationInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2324,15 +2324,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllApplicationInfo(appFlags: number, - userId: number, callback: AsyncCallback>): void; + function getAllApplicationInfo(appFlags: int, + userId: int, callback: AsyncCallback>): void; /** * Obtains information about all installed applications of a specified user. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST - * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @returns { Promise> } Returns a list of ApplicationInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2343,14 +2343,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllApplicationInfo(appFlags: number, userId?: number): Promise>; + function getAllApplicationInfo(appFlags: int, userId?: int): Promise>; /** * Query the AbilityInfo by the given Want. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. - * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. + * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. * @param { AsyncCallback> } callback - The callback of querying ability info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2365,15 +2365,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function queryAbilityInfo(want: Want, abilityFlags: number, callback: AsyncCallback>): void; + function queryAbilityInfo(want: Want, abilityFlags: int, callback: AsyncCallback>): void; /** * Query the AbilityInfo by the given Want. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. - * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. - * @param { number } userId - userId Indicates the user ID. + * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. + * @param { int } userId - userId Indicates the user ID. * @param { AsyncCallback> } callback - The callback of querying ability info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2390,15 +2390,15 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function queryAbilityInfo(want: Want, - abilityFlags: number, userId: number, callback: AsyncCallback>): void; + abilityFlags: int, userId: int, callback: AsyncCallback>): void; /** * Query the AbilityInfo by the given Want. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. - * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. - * @param { number } userId - userId Indicates the user ID. + * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. + * @param { int } userId - userId Indicates the user ID. * @returns { Promise> } Returns a list of AbilityInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2414,15 +2414,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function queryAbilityInfo(want: Want, abilityFlags: number, userId?: number): Promise>; + function queryAbilityInfo(want: Want, abilityFlags: int, userId?: int): Promise>; /** * Query the AbilityInfo by the given Want Array. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Array } wants - Indicates the Want Array containing the application bundle name to be queried. - * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. - * @param { number } [userId] - userId Indicates the user ID. + * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. + * @param { int } [userId] - userId Indicates the user ID. * @returns { Promise> } Returns a list of AbilityInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2438,15 +2438,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function queryAbilityInfo(wants: Array, abilityFlags: number, userId?: number): Promise>; + function queryAbilityInfo(wants: Array, abilityFlags: int, userId?: int): Promise>; /** * Query the AbilityInfo by the given Want. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. - * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. - * @param { number } userId - userId Indicates the user ID. + * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. + * @param { int } userId - userId Indicates the user ID. * @returns { Array } Returns a list of AbilityInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2462,8 +2462,8 @@ declare namespace bundleManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function queryAbilityInfoSync(want: Want, abilityFlags: number, userId?: number): Array; - + function queryAbilityInfoSync(want: Want, abilityFlags: int, userId?: int): Array; + /** * Get AbilityInfo by the given uri. * @@ -2485,7 +2485,7 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. * @param { ExtensionAbilityType } extensionAbilityType - Indicates ExtensionAbilityType. - * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the * ExtensionAbilityInfo objects that will be returned. * @param { AsyncCallback> } callback - The callback of querying extension ability info result. * @throws { BusinessError } 201 - Permission denied. @@ -2501,7 +2501,7 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function queryExtensionAbilityInfo(want: Want, extensionAbilityType: ExtensionAbilityType, - extensionAbilityFlags: number, callback: AsyncCallback>): void; + extensionAbilityFlags: int, callback: AsyncCallback>): void; /** * Query extension info of by utilizing a Want. @@ -2509,9 +2509,9 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. * @param { ExtensionAbilityType } extensionAbilityType - Indicates ExtensionAbilityType. - * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the * ExtensionAbilityInfo objects that will be returned. - * @param { number } userId - Indicates the user ID. + * @param { int } userId - Indicates the user ID. * @param { AsyncCallback> } callback - The callback of querying extension ability info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2527,7 +2527,7 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function queryExtensionAbilityInfo(want: Want, extensionAbilityType: ExtensionAbilityType, - extensionAbilityFlags: number, userId: number, callback: AsyncCallback>): void; + extensionAbilityFlags: int, userId: int, callback: AsyncCallback>): void; /** * Query the ExtensionAbilityInfo by the given Want. @@ -2535,9 +2535,9 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. * @param { ExtensionAbilityType } extensionAbilityType - Indicates ExtensionAbilityType. - * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the * ExtensionAbilityInfo objects that will be returned. - * @param { number } userId - Indicates the user ID. + * @param { int } userId - Indicates the user ID. * @returns { Promise> } Returns a list of ExtensionAbilityInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2553,7 +2553,7 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function queryExtensionAbilityInfo(want: Want, extensionAbilityType: ExtensionAbilityType, - extensionAbilityFlags: number, userId?: number): Promise>; + extensionAbilityFlags: int, userId?: int): Promise>; /** * Query the ExtensionAbilityInfo by the given Want. @@ -2561,9 +2561,9 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. * @param { ExtensionAbilityType } extensionAbilityType - Indicates ExtensionAbilityType. - * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the * ExtensionAbilityInfo objects that will be returned. - * @param { number } userId - Indicates the user ID. + * @param { int } userId - Indicates the user ID. * @returns { Array } Returns a list of ExtensionAbilityInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2579,7 +2579,7 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function queryExtensionAbilityInfoSync(want: Want, extensionAbilityType: ExtensionAbilityType, - extensionAbilityFlags: number, userId?: number): Array; + extensionAbilityFlags: int, userId?: int): Array; /** * Query the ExtensionAbilityInfo by the given Want. @@ -2587,9 +2587,9 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. * @param { string } extensionAbilityType - Indicates extensionAbilityType. - * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the * ExtensionAbilityInfo objects that will be returned. - * @param { number } userId - Indicates the user ID. + * @param { int } userId - Indicates the user ID. * @returns { Array } Returns a list of ExtensionAbilityInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2605,16 +2605,16 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function queryExtensionAbilityInfoSync(want: Want, extensionAbilityType: string, - extensionAbilityFlags: number, userId?: number): Array; + extensionAbilityFlags: int, userId?: int): Array; /** * Query the ExtensionAbilityInfo by extension ability type. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } extensionAbilityType - Indicates ExtensionAbilityType. - * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the * ExtensionAbilityInfo objects that will be returned. - * @param { number } userId - Indicates the user ID. + * @param { int } userId - Indicates the user ID. * @returns { Array } Returns a list of ExtensionAbilityInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2627,14 +2627,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - function queryExtensionAbilityInfoSync(extensionAbilityType: string, extensionAbilityFlags: number, - userId?: number): Array; + function queryExtensionAbilityInfoSync(extensionAbilityType: string, extensionAbilityFlags: int, + userId?: int): Array; /** * Obtains bundle name by the given uid. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { number } uid - Indicates the UID of an application. + * @param { int } uid - Indicates the UID of an application. * @param { AsyncCallback } callback - The callback of getting bundle name. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -2643,13 +2643,13 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleNameByUid(uid: number, callback: AsyncCallback): void; + function getBundleNameByUid(uid: int, callback: AsyncCallback): void; /** * Obtains bundle name by the given uid. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { number } uid - Indicates the UID of an application. + * @param { int } uid - Indicates the UID of an application. * @returns { Promise } Returns the bundle name. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -2658,13 +2658,13 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleNameByUid(uid: number): Promise; + function getBundleNameByUid(uid: int): Promise; /** * Obtains bundle name by the given uid. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { number } uid - Indicates the UID of an application. + * @param { int } uid - Indicates the UID of an application. * @returns { string } Returns the bundle name. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -2673,7 +2673,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleNameByUidSync(uid: number): string; + function getBundleNameByUidSync(uid: int): string; /** * Obtains information about an application bundle contained in an ohos Ability Package (HAP). @@ -2681,7 +2681,7 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } hapFilePath - Indicates the path storing the HAP. * The path should be the relative path to the data directory of the current application. - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. * @param { AsyncCallback } callback - The callback of getting bundle archive info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2692,7 +2692,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleArchiveInfo(hapFilePath: string, bundleFlags: number, callback: AsyncCallback): void; + function getBundleArchiveInfo(hapFilePath: string, bundleFlags: int, callback: AsyncCallback): void; /** * Obtains information about an application bundle contained in an ohos Ability Package (HAP). @@ -2700,7 +2700,7 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } hapFilePath - Indicates the path storing the HAP. * The path should be the relative path to the data directory of the current application. - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. * @returns { Promise } Returns the BundleInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2711,7 +2711,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleArchiveInfo(hapFilePath: string, bundleFlags: number): Promise; + function getBundleArchiveInfo(hapFilePath: string, bundleFlags: int): Promise; /** * Obtains information about an application bundle contained in an ohos Ability Package (HAP). @@ -2719,7 +2719,7 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } hapFilePath - Indicates the path storing the HAP. * The path should be the relative path to the data directory of the current application. - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. * @returns { BundleInfo } Returns the BundleInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2730,7 +2730,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleArchiveInfoSync(hapFilePath: string, bundleFlags: number): BundleInfo; + function getBundleArchiveInfoSync(hapFilePath: string, bundleFlags: int): BundleInfo; /** * Clears cache data of a specified application. @@ -2773,7 +2773,7 @@ declare namespace bundleManager { * * @permission ohos.permission.REMOVE_CACHE_FILES * @param { string } bundleName - Indicates the bundle name of the application whose cache data is to be cleaned. - * @param { number } appIndex - Indicates the index of clone app. + * @param { int } appIndex - Indicates the index of clone app. * @returns { Promise } Clean bundle cache files result * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2786,13 +2786,13 @@ declare namespace bundleManager { * @since arkts {'1.1':'15', '1.2':'20'} * @arkts 1.1&1.2 */ - function cleanBundleCacheFiles(bundleName: string, appIndex: number): Promise; + function cleanBundleCacheFiles(bundleName: string, appIndex: int): Promise; /** * Get the all bundle cache size of the current user. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @returns { Promise } Returns all bundle cache size. + * @returns { Promise } Returns all bundle cache size. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @syscap SystemCapability.BundleManager.BundleFramework.Core @@ -2800,7 +2800,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'15', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllBundleCacheSize(): Promise; + function getAllBundleCacheSize(): Promise; /** * Clean all bundle cache files of the current user, does not include the currently running program. @@ -2821,7 +2821,7 @@ declare namespace bundleManager { * * @permission ohos.permission.CHANGE_ABILITY_ENABLED_STATE * @param { string } bundleName - Indicates the bundle name of the application. - * @param { number } appIndex - Indicates the index of clone app. + * @param { int } appIndex - Indicates the index of clone app. * @param { boolean } isEnabled - The value true means to enable it, and the value false means to disable it. * @returns { Promise } set app enabled result. * @throws { BusinessError } 201 - Permission denied. @@ -2834,7 +2834,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function setApplicationEnabled(bundleName: string, appIndex: number, isEnabled: boolean): Promise; + function setApplicationEnabled(bundleName: string, appIndex: int, isEnabled: boolean): Promise; /** * Sets whether to enable a specified application. @@ -2894,7 +2894,7 @@ declare namespace bundleManager { * * @permission ohos.permission.CHANGE_ABILITY_ENABLED_STATE * @param { AbilityInfo } info - Indicates information about the ability to set. - * @param { number } appIndex - Indicates the index of clone app. + * @param { int } appIndex - Indicates the index of clone app. * @param { boolean } isEnabled - The value true means to enable it, and the value false means to disable it. * @returns { Promise } set ability enabled result. * @throws { BusinessError } 201 - Permission denied. @@ -2908,7 +2908,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function setAbilityEnabled(info: AbilityInfo, appIndex: number, isEnabled: boolean): Promise; + function setAbilityEnabled(info: AbilityInfo, appIndex: int, isEnabled: boolean): Promise; /** * Sets whether to enable a specified ability. @@ -2970,7 +2970,7 @@ declare namespace bundleManager { * Checks whether a specified application is enabled. * * @param { string } bundleName - Indicates the bundle name of the application. - * @param { number } appIndex - Indicates the index of clone app. + * @param { int } appIndex - Indicates the index of clone app. * @returns { Promise } Returns true if the application is enabled; returns false otherwise. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -2981,7 +2981,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function isApplicationEnabled(bundleName: string, appIndex: number): Promise; + function isApplicationEnabled(bundleName: string, appIndex: int): Promise; /** * Checks whether a specified application is enabled. @@ -3032,7 +3032,7 @@ declare namespace bundleManager { * Checks whether a specified ability is enabled. * * @param { AbilityInfo } info - Indicates information about the ability to check. - * @param { number } appIndex - Indicates the index of clone app. + * @param { int } appIndex - Indicates the index of clone app. * @returns { Promise } Returns true if the ability is enabled; returns false otherwise. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -3044,7 +3044,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function isAbilityEnabled(info: AbilityInfo, appIndex: number): Promise; + function isAbilityEnabled(info: AbilityInfo, appIndex: int): Promise; /** * Checks whether a specified ability is enabled. @@ -3101,7 +3101,7 @@ declare namespace bundleManager { * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the bundle name of the application. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @param { AsyncCallback } callback - The callback for starting the application's main ability. * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.GET_BUNDLE_INFO_PRIVILEGED'. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3114,7 +3114,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getLaunchWantForBundle(bundleName: string, userId: number, callback: AsyncCallback): void; + function getLaunchWantForBundle(bundleName: string, userId: int, callback: AsyncCallback): void; /** * Obtains the Want for starting the main ability of an application based on the @@ -3143,7 +3143,7 @@ declare namespace bundleManager { * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the bundle name of the application. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @returns { Promise } the Want for starting the application's main ability. * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.GET_BUNDLE_INFO_PRIVILEGED'. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3156,7 +3156,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getLaunchWantForBundle(bundleName: string, userId?: number): Promise; + function getLaunchWantForBundle(bundleName: string, userId?: int): Promise; /** * Obtains the Want for starting the main ability of an application based on the @@ -3165,7 +3165,7 @@ declare namespace bundleManager { * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the bundle name of the application. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @returns { Want } the Want for starting the application's main ability. * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.GET_BUNDLE_INFO_PRIVILEGED'. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3178,7 +3178,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function getLaunchWantForBundleSync(bundleName: string, userId?: number): Want; + function getLaunchWantForBundleSync(bundleName: string, userId?: int): Want; /** * Obtains the Want for starting the main ability of own application. @@ -3520,8 +3520,8 @@ declare namespace bundleManager { * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } applicationFlags - Indicates the flag used to specify information contained in the ApplicationInfo object that will be returned. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } applicationFlags - Indicates the flag used to specify information contained in the ApplicationInfo object that will be returned. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @returns { ApplicationInfo } - Returns the ApplicationInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3534,14 +3534,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getApplicationInfoSync(bundleName: string, applicationFlags: number, userId: number): ApplicationInfo; + function getApplicationInfoSync(bundleName: string, applicationFlags: int, userId: int): ApplicationInfo; /** * Obtains applicationInfo based on a given bundleName and bundleFlags. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } applicationFlags - Indicates the flag used to specify information contained in the ApplicationInfo object that will be returned. + * @param { int } applicationFlags - Indicates the flag used to specify information contained in the ApplicationInfo object that will be returned. * @returns { ApplicationInfo } - Returns the ApplicationInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3553,15 +3553,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getApplicationInfoSync(bundleName: string, applicationFlags: number): ApplicationInfo; + function getApplicationInfoSync(bundleName: string, applicationFlags: int): ApplicationInfo; /** * Obtains bundleInfo based on bundleName, bundleFlags and userId. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object that will be returned. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object that will be returned. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @returns { BundleInfo } - Returns the BundleInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -3572,14 +3572,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleInfoSync(bundleName: string, bundleFlags: number, userId: number): BundleInfo; + function getBundleInfoSync(bundleName: string, bundleFlags: int, userId: int): BundleInfo; /** * Obtains bundleInfo based on bundleName, bundleFlags. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object that will be returned. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object that will be returned. * @returns { BundleInfo } - Returns the BundleInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -3589,7 +3589,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleInfoSync(bundleName: string, bundleFlags: number): BundleInfo; + function getBundleInfoSync(bundleName: string, bundleFlags: int): BundleInfo; /** * Obtains SharedBundleInfo of all shared bundle available in the system. @@ -3680,7 +3680,7 @@ declare namespace bundleManager { * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the bundle name of the application to which the ability belongs. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @param { AsyncCallback } callback - Indicates the callback of getting AppProvisionInfo result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3693,14 +3693,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAppProvisionInfo(bundleName: string, userId: number, callback: AsyncCallback): void; + function getAppProvisionInfo(bundleName: string, userId: int, callback: AsyncCallback): void; /** * Obtains the profile file information of a specified bundle. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the bundle name of the application to which the ability belongs. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @returns { Promise } Returns the AppProvisionInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3713,14 +3713,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAppProvisionInfo(bundleName: string, userId?: number): Promise; + function getAppProvisionInfo(bundleName: string, userId?: int): Promise; /** * Obtains the profile file information of a specified bundle. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the bundle name of the application to which the ability belongs. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @returns { AppProvisionInfo } Returns the AppProvisionInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3733,7 +3733,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAppProvisionInfoSync(bundleName: string, userId?: number): AppProvisionInfo; + function getAppProvisionInfoSync(bundleName: string, userId?: int): AppProvisionInfo; /** * Obtains the distribution type specified during bundle installation. @@ -3796,7 +3796,7 @@ declare namespace bundleManager { * @param { ProfileType } profileType - Indicates the type of profile to be obtained. * @param { string } bundleName - Indicates the name of the bundle to which the profile belongs. * @param { string } moduleName - Indicates the name of the module to which the profile belongs. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @returns { string } Returns string in json-format of the designated profile. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3811,7 +3811,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getJsonProfile(profileType: ProfileType, bundleName: string, moduleName?: string, userId?: number): string; + function getJsonProfile(profileType: ProfileType, bundleName: string, moduleName?: string, userId?: int): string; /** * Get extend resources. @@ -4179,7 +4179,7 @@ declare namespace bundleManager { * Get a list of developedId by distribution type. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { number } appDistributionType - Indicates the distribution type of the application, and if not passed in, it gets all the developerId. + * @param { int } appDistributionType - Indicates the distribution type of the application, and if not passed in, it gets all the developerId. * @returns { Array } Returns a list of developerId. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -4189,7 +4189,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getDeveloperIds(appDistributionType?: number): Array; + function getDeveloperIds(appDistributionType?: int): Array; /** * Switch uninstall state of a specified application. @@ -4213,7 +4213,7 @@ declare namespace bundleManager { * Get the SignatureInfo of the application through UID. * * @permission ohos.permission.GET_SIGNATURE_INFO - * @param { number } uid - Indicates the UID of an application. + * @param { int } uid - Indicates the UID of an application. * @returns { SignatureInfo } The result of getting the signature info. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 17700021 - The uid is not found. @@ -4221,16 +4221,16 @@ declare namespace bundleManager { * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - function getSignatureInfo(uid: number): SignatureInfo; + function getSignatureInfo(uid: int): SignatureInfo; /** * Get the BundleInfo of the specified MultiIsolation App. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } appIndex - Indicates the index of clone app. - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. - * @param { number } [userId] - Indicates the user ID, If the user id is not specified, the current user id is used by default. + * @param { int } appIndex - Indicates the index of clone app. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { int } [userId] - Indicates the user ID, If the user id is not specified, the current user id is used by default. * @returns { Promise } Returns A BundleInfo Of MultiApp Mode. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -4244,15 +4244,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAppCloneBundleInfo(bundleName: string, appIndex: number, bundleFlags: number, userId?: number): Promise; + function getAppCloneBundleInfo(bundleName: string, appIndex: int, bundleFlags: int, userId?: int): Promise; /** * Get all BundleInfo of clone app. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. - * @param { number } [userId] - Indicates the user ID, If the user id is not specified, the current user id is used by default. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { int } [userId] - Indicates the user ID, If the user id is not specified, the current user id is used by default. * @returns { Promise> } Returns BundleInfo Arrays Of MultiApp Mode. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -4265,13 +4265,13 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllAppCloneBundleInfo(bundleName: string, bundleFlags: number, userId?: number): Promise>; + function getAllAppCloneBundleInfo(bundleName: string, bundleFlags: int, userId?: int): Promise>; /** * Obtains AppCloneIdentity contains bundleName and appIndex by the given uid. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { number } uid - Indicates the UID of an application. + * @param { int } uid - Indicates the UID of an application. * @returns { Promise } Returns the clone Identity contains bundleName and appIndex. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -4280,14 +4280,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAppCloneIdentity(uid: number): Promise; + function getAppCloneIdentity(uid: int): Promise; /** * Get all plugin info of host application. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } hostBundleName - Indicates the host application bundle name to be queried. - * @param { number } [userId] - Indicates the user ID or do not pass user ID. + * @param { int } [userId] - Indicates the user ID or do not pass user ID. * @returns { Promise> } Returns PluginBundleInfo Arrays. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -4298,7 +4298,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'19', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllPluginInfo(hostBundleName: string, userId?: number): Promise>; + function getAllPluginInfo(hostBundleName: string, userId?: int): Promise>; /** * Migrate files from the source paths to the destination path. diff --git a/api/@ohos.bundle.bundleMonitor.d.ts b/api/@ohos.bundle.bundleMonitor.d.ts index a9f1ed5e4f..af4c9cbd26 100644 --- a/api/@ohos.bundle.bundleMonitor.d.ts +++ b/api/@ohos.bundle.bundleMonitor.d.ts @@ -54,25 +54,25 @@ declare namespace bundleMonitor { /** * The user id * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly userId: number; + readonly userId: int; /** * The app index of clone app * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: number; + readonly appIndex: int; } /** diff --git a/api/@ohos.bundle.bundleResourceManager.d.ts b/api/@ohos.bundle.bundleResourceManager.d.ts index 20cbf30fd3..396e138386 100644 --- a/api/@ohos.bundle.bundleResourceManager.d.ts +++ b/api/@ohos.bundle.bundleResourceManager.d.ts @@ -43,7 +43,7 @@ declare namespace bundleResourceManager { * Used to query the enumeration value of resource info. Multiple values can be passed in the form. * Multiple value input, such as GET_RESOURCE_INFO_WITH_LABEL | GET_RESOURCE_INFO_WITH_ICON. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} @@ -117,7 +117,7 @@ declare namespace bundleResourceManager { * * @permission ohos.permission.GET_BUNDLE_RESOURCES * @param { string } bundleName - Indicates the bundle name of the application. - * @param { number } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo object that will be returned. + * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo object that will be returned. * @returns { BundleResourceInfo } Returns the BundleResourceInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -128,15 +128,15 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleResourceInfo(bundleName: string, resourceFlags?: number): BundleResourceInfo; + function getBundleResourceInfo(bundleName: string, resourceFlags?: int): BundleResourceInfo; /** * Obtains the BundleResourceInfo of a specified bundle. Default resourceFlag is GET_RESOURCE_INFO_ALL. * * @permission ohos.permission.GET_BUNDLE_RESOURCES * @param { string } bundleName - Indicates the bundle name of the application. - * @param { number } [resourceFlags] {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo object that will be returned. - * @param { number } [appIndex] - Indicates the index of the bundle,The default value is 0. + * @param { int } [resourceFlags] {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo object that will be returned. + * @param { int } [appIndex] - Indicates the index of the bundle,The default value is 0. * @returns { BundleResourceInfo } Returns the BundleResourceInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -148,14 +148,14 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleResourceInfo(bundleName: string, resourceFlags?: number, appIndex?: number): BundleResourceInfo; + function getBundleResourceInfo(bundleName: string, resourceFlags?: int, appIndex?: int): BundleResourceInfo; /** * Obtains the LauncherAbilityResourceInfo of a specified bundle. Default resourceFlag is GET_RESOURCE_INFO_ALL. * * @permission ohos.permission.GET_BUNDLE_RESOURCES * @param { string } bundleName - Indicates the bundle name of the application. - * @param { number } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo object that will be returned. + * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo object that will be returned. * @returns { Array } Returns a list of LauncherAbilityResourceInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -166,16 +166,16 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: number): Array; + function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: int): Array; /** * Obtains the LauncherAbilityResourceInfo of a specified bundle. Default resourceFlag is GET_RESOURCE_INFO_ALL. * * @permission ohos.permission.GET_BUNDLE_RESOURCES * @param { string } bundleName - Indicates the bundle name of the application. - * @param { number } [resourceFlags] {@link ResourceFlag} - Indicates the flag used to specify information + * @param { int } [resourceFlags] {@link ResourceFlag} - Indicates the flag used to specify information *
    contained in the LauncherAbilityResourceInfo object that will be returned. - * @param { number } [appIndex] - Indicates the index of the bundle,The default value is 0. + * @param { int } [appIndex] - Indicates the index of the bundle,The default value is 0. * @returns { Array } Returns a list of LauncherAbilityResourceInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -187,13 +187,13 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: number, appIndex?: number): Array; + function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: int, appIndex?: int): Array; /** * Obtains BundleResourceInfo of all bundles available in the system. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST and ohos.permission.GET_BUNDLE_RESOURCES - * @param { number } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo that will be returned. + * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo that will be returned. * @param { AsyncCallback> } callback - The callback of getting a list of BundleResourceInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -203,13 +203,13 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllBundleResourceInfo(resourceFlags: number, callback: AsyncCallback>): void; + function getAllBundleResourceInfo(resourceFlags: int, callback: AsyncCallback>): void; /** * Obtains BundleResourceInfo of all bundles available in the system. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST and ohos.permission.GET_BUNDLE_RESOURCES - * @param { number } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo that will be returned. + * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo that will be returned. * @returns { Promise> } Returns a list of BundleResourceInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -219,13 +219,13 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllBundleResourceInfo(resourceFlags: number): Promise>; + function getAllBundleResourceInfo(resourceFlags: int): Promise>; /** * Obtains LauncherAbilityResourceInfo of all launcher abilities available in the system. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST and ohos.permission.GET_BUNDLE_RESOURCES - * @param { number } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo that will be returned. + * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo that will be returned. * @param { AsyncCallback> } callback - The callback of getting a list of LauncherAbilityResourceInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -235,13 +235,13 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllLauncherAbilityResourceInfo(resourceFlags: number, callback: AsyncCallback>): void; + function getAllLauncherAbilityResourceInfo(resourceFlags: int, callback: AsyncCallback>): void; /** * Obtains LauncherAbilityResourceInfo of all launcher abilities available in the system. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST and ohos.permission.GET_BUNDLE_RESOURCES - * @param { number } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo that will be returned. + * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo that will be returned. * @returns { Promise> } Returns a list of LauncherAbilityResourceInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -251,7 +251,7 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllLauncherAbilityResourceInfo(resourceFlags: number): Promise>; + function getAllLauncherAbilityResourceInfo(resourceFlags: int): Promise>; /** * Obtains the abilityResourceInfo of a specified bundle. diff --git a/api/@ohos.bundle.defaultAppManager.d.ts b/api/@ohos.bundle.defaultAppManager.d.ts index 358a1d920b..c402034e9b 100644 --- a/api/@ohos.bundle.defaultAppManager.d.ts +++ b/api/@ohos.bundle.defaultAppManager.d.ts @@ -34,7 +34,7 @@ declare namespace defaultAppManager { /** * The constant for application type. * - * @enum { number } + * @enum { string } * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 @@ -158,7 +158,7 @@ declare namespace defaultAppManager { * * @permission ohos.permission.GET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @param { AsyncCallback } callback - The callback of the BundleInfo object result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -172,7 +172,7 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getDefaultApplication(type: string, userId: number, callback: AsyncCallback): void; + function getDefaultApplication(type: string, userId: int, callback: AsyncCallback): void; /** * Get default application based on type. @@ -198,7 +198,7 @@ declare namespace defaultAppManager { * * @permission ohos.permission.GET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @returns { Promise } Return the BundleInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -212,14 +212,14 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getDefaultApplication(type: string, userId?: number): Promise; + function getDefaultApplication(type: string, userId?: int): Promise; /** * Get default application based on type. * * @permission ohos.permission.GET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @returns { BundleInfo } Return the BundleInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -233,7 +233,7 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function getDefaultApplicationSync(type: string, userId?: number): BundleInfo; + function getDefaultApplicationSync(type: string, userId?: int): BundleInfo; /** * Set default application based on type. @@ -241,7 +241,7 @@ declare namespace defaultAppManager { * @permission ohos.permission.SET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. * @param { ElementName } elementName - Uniquely identifies an ability or extensionAbility. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @param { AsyncCallback } callback - The callback of setting default application result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -256,7 +256,7 @@ declare namespace defaultAppManager { * @arkts 1.1&1.2 */ function setDefaultApplication(type: string, - elementName: ElementName, userId: number, callback: AsyncCallback): void; + elementName: ElementName, userId: int, callback: AsyncCallback): void; /** * Set default application based on type. @@ -284,7 +284,7 @@ declare namespace defaultAppManager { * @permission ohos.permission.SET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. * @param { ElementName } elementName - Uniquely identifies an ability or extensionAbility. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @returns { Promise } The result of setting default application. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -298,7 +298,7 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function setDefaultApplication(type: string, elementName: ElementName, userId?: number): Promise; + function setDefaultApplication(type: string, elementName: ElementName, userId?: int): Promise; /** * Set default application based on type. @@ -306,7 +306,7 @@ declare namespace defaultAppManager { * @permission ohos.permission.SET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. * @param { ElementName } elementName - Uniquely identifies an ability or extensionAbility. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -319,14 +319,14 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function setDefaultApplicationSync(type: string, elementName: ElementName, userId?: number): void; + function setDefaultApplicationSync(type: string, elementName: ElementName, userId?: int): void; /** * Reset default application based on type. * * @permission ohos.permission.SET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @param { AsyncCallback } callback - The callback of resetting default application result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -339,7 +339,7 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function resetDefaultApplication(type: string, userId: number, callback: AsyncCallback): void; + function resetDefaultApplication(type: string, userId: int, callback: AsyncCallback): void; /** * Reset default application based on type. @@ -364,7 +364,7 @@ declare namespace defaultAppManager { * * @permission ohos.permission.SET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @returns { Promise } The result of resetting default application. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -377,14 +377,14 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function resetDefaultApplication(type: string, userId?: number): Promise; + function resetDefaultApplication(type: string, userId?: int): Promise; /** * Reset default application based on type. * * @permission ohos.permission.SET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -396,7 +396,7 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function resetDefaultApplicationSync(type: string, userId?: number): void; + function resetDefaultApplicationSync(type: string, userId?: int): void; } export default defaultAppManager; diff --git a/api/@ohos.bundle.freeInstall.d.ts b/api/@ohos.bundle.freeInstall.d.ts index a156bc3015..bf7aeb1813 100644 --- a/api/@ohos.bundle.freeInstall.d.ts +++ b/api/@ohos.bundle.freeInstall.d.ts @@ -43,7 +43,7 @@ declare namespace freeInstall { /** * Used to set the enumeration value of upgrading for free installation. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} @@ -83,7 +83,7 @@ declare namespace freeInstall { * Used to query the enumeration value of bundlePackInfo. * Multiple value input, such as GET_PACKAGES | GET_BUNDLE_SUMMARY. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} diff --git a/api/@ohos.bundle.installer.d.ts b/api/@ohos.bundle.installer.d.ts index e3623e7de4..6b0002226e 100644 --- a/api/@ohos.bundle.installer.d.ts +++ b/api/@ohos.bundle.installer.d.ts @@ -1673,7 +1673,7 @@ declare namespace installer { * @permission ohos.permission.INSTALL_CLONE_BUNDLE * @param { string } bundleName - Indicates the path where the HAP of the application is stored. * @param { CreateAppCloneParam } [createAppCloneParam] Indicates the optional params of create clone app. - * @returns { Promise } Return the appIndex of the clone application. + * @returns { Promise } Return the appIndex of the clone application. * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.INSTALL_CLONE_BUNDLE'. * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -1686,7 +1686,7 @@ declare namespace installer { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - createAppClone(bundleName: string, createAppCloneParam?: CreateAppCloneParam): Promise; + createAppClone(bundleName: string, createAppCloneParam?: CreateAppCloneParam): Promise; /** * Destroy clone instance for an application. @@ -1734,8 +1734,8 @@ declare namespace installer { * * @permission ohos.permission.UNINSTALL_CLONE_BUNDLE * @param { string } bundleName - Indicates the bundleName of clone app. - * @param { number } appIndex - Indicates the clone application's index. - * @param { number | DestroyAppCloneParam } [options] - Indicates other parameters required for the uninstallation. + * @param { int } appIndex - Indicates the clone application's index. + * @param { int | DestroyAppCloneParam } [options] - Indicates other parameters required for the uninstallation. * @returns { Promise } the promise returned by the function. * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.UNINSTALL_CLONE_BUNDLE'. * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. @@ -1749,7 +1749,7 @@ declare namespace installer { * @since 20 * @arkts 1.2 */ - destroyAppClone(bundleName: string, appIndex: number, options?: number | DestroyAppCloneParam): Promise; + destroyAppClone(bundleName: string, appIndex: int, options?: int | DestroyAppCloneParam): Promise; /** * Install application by bundle name with specified user. @@ -1773,8 +1773,8 @@ declare namespace installer { * * @permission ohos.permission.INSTALL_BUNDLE * @param { string } bundleName - Indicates the bundle name of application. - * @param { number } [userId] - userId Indicates the user ID. - * @returns { Promise } the promise returned by the function. + * @param { int } [userId] - userId Indicates the user ID. + * @returns { Promise } the promise returned by the function. the promise returned by the function. * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.INSTALL_BUNDLE'. * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -1788,7 +1788,7 @@ declare namespace installer { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - installPreexistingApp(bundleName: string, userId?: number): Promise; + installPreexistingApp(bundleName: string, userId?: int): Promise; /** * Install plugin for host application. @@ -1990,24 +1990,24 @@ declare namespace installer { /** * Indicates the user id * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - userId?: number; + userId?: int; /** * Indicates the installation type. The value 0x00 means normal installation, 0x01 means overwrite installation, and 0x10 means installation-free. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - installFlag?: number; + installFlag?: int; /** * Indicates whether the param has data @@ -2034,13 +2034,13 @@ declare namespace installer { /** * Indicates the deadline of the crowdtesting bundle * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - crowdtestDeadline?: number; + crowdtestDeadline?: long; /** * Indicates the shared bundle dir paths. @@ -2133,13 +2133,13 @@ declare namespace installer { /** * Indicates the shared version code. If default, indicates that all version sharing bundles are uninstalled * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - versionCode?: number; + versionCode?: int; } /** @@ -2155,23 +2155,23 @@ declare namespace installer { /** * Indicates the user id * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - userId?: number; + userId?: int; /** * Indicates the appIndex of MultiApp * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - appIndex?: number; + appIndex?: int; } /** @@ -2187,13 +2187,13 @@ declare namespace installer { /** * Indicates the user id * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'15', '1.2':'20'} * @arkts 1.1&1.2 */ - userId?: number; + userId?: int; /** * Indicates parameters. * @@ -2219,13 +2219,13 @@ declare namespace installer { /** * Indicates the user id. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'19', '1.2':'20'} * @arkts 1.1&1.2 */ - userId?: number; + userId?: int; /** * Indicates parameters. diff --git a/api/@ohos.bundle.launcherBundleManager.d.ts b/api/@ohos.bundle.launcherBundleManager.d.ts index d6d897bb73..09150c126b 100644 --- a/api/@ohos.bundle.launcherBundleManager.d.ts +++ b/api/@ohos.bundle.launcherBundleManager.d.ts @@ -40,7 +40,7 @@ declare namespace launcherBundleManager { * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @param { AsyncCallback> } callback -The callback of the LauncherAbilityInfo object result. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -54,14 +54,14 @@ declare namespace launcherBundleManager { * @arkts 1.1&1.2 */ function getLauncherAbilityInfo(bundleName: string, - userId: number, callback: AsyncCallback>): void; + userId: int, callback: AsyncCallback>): void; /** * Obtains launcher abilities info based on a given bundleName and userId. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @returns { Promise> } the LauncherAbilityInfo object. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -74,14 +74,14 @@ declare namespace launcherBundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getLauncherAbilityInfo(bundleName: string, userId: number): Promise>; + function getLauncherAbilityInfo(bundleName: string, userId: int): Promise>; /** * Obtains launcher abilities info based on a given bundleName and userId. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @returns { Array } the LauncherAbilityInfo object. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 801 - Capability not support. @@ -91,13 +91,13 @@ declare namespace launcherBundleManager { * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - function getLauncherAbilityInfoSync(bundleName: string, userId: number): Array; + function getLauncherAbilityInfoSync(bundleName: string, userId: int): Array; /** * Obtains launcher abilities info based on a given userId. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @param { AsyncCallback> } callback -The callback of the LauncherAbilityInfo object result. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -109,13 +109,13 @@ declare namespace launcherBundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllLauncherAbilityInfo(userId: number, callback: AsyncCallback>): void; + function getAllLauncherAbilityInfo(userId: int, callback: AsyncCallback>): void; /** * Obtains launcher abilities info based on a given userId. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @returns { Promise> } the LauncherAbilityInfo object. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -127,7 +127,7 @@ declare namespace launcherBundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllLauncherAbilityInfo(userId: number): Promise>; + function getAllLauncherAbilityInfo(userId: int): Promise>; /** * Obtains shortcut info based on a given bundleName. @@ -187,9 +187,9 @@ declare namespace launcherBundleManager { /** * Obtains shortcut info based on bundleName and userId. * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } userId - Indicates the user ID. + * @param { int } userId - Indicates the user ID. * @returns { Array } the LauncherShortcutInfo object. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -202,7 +202,7 @@ declare namespace launcherBundleManager { * @since arkts {'1.1':'13', '1.2':'20'} * @arkts 1.1&1.2 */ - function getShortcutInfoSync(bundleName: string, userId: number): Array; + function getShortcutInfoSync(bundleName: string, userId: int): Array; /** * Obtains shortcut info based on bundleName and appIndex. diff --git a/api/@ohos.bundle.shortcutManager.d.ts b/api/@ohos.bundle.shortcutManager.d.ts index 2f06794328..bc479a11a8 100644 --- a/api/@ohos.bundle.shortcutManager.d.ts +++ b/api/@ohos.bundle.shortcutManager.d.ts @@ -42,7 +42,7 @@ declare namespace shortcutManager { * * @permission ohos.permission.MANAGE_SHORTCUTS * @param { ShortcutInfo } shortcutInfo - Indicates the shortcut info which contains shortcut want. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @returns { Promise } the promise returned by the function. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -57,14 +57,14 @@ declare namespace shortcutManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function addDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: number): Promise; + function addDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: int): Promise; /** * Delete desktop shortcut info. * * @permission ohos.permission.MANAGE_SHORTCUTS * @param { ShortcutInfo } shortcutInfo - Indicates the shortcut info which contains shortcut want. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @returns { Promise } the promise returned by the function. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -75,13 +75,13 @@ declare namespace shortcutManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function deleteDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: number): Promise; + function deleteDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: int): Promise; /** * Get all desktop shortcut info. * * @permission ohos.permission.MANAGE_SHORTCUTS - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @returns { Promise> } the LauncherShortcutInfo object. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -92,7 +92,7 @@ declare namespace shortcutManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllDesktopShortcutInfo(userId: number): Promise>; + function getAllDesktopShortcutInfo(userId: int): Promise>; /** * Set a shortcut of current application is visible or invisible. diff --git a/api/@ohos.zlib.d.ts b/api/@ohos.zlib.d.ts index 3378c2d3ea..b8aae08c9d 100644 --- a/api/@ohos.zlib.d.ts +++ b/api/@ohos.zlib.d.ts @@ -73,7 +73,7 @@ declare namespace zlib { /** * CompressLevel * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.Zlib * @crossplatform * @atomicservice @@ -157,7 +157,7 @@ declare namespace zlib { /** * CompressStrategy * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.Zlib * @crossplatform * @atomicservice @@ -250,7 +250,7 @@ declare namespace zlib { /** * ParallelStrategy * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.Zlib * @crossplatform * @atomicservice @@ -287,7 +287,7 @@ declare namespace zlib { /** * MemLevel * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.Zlib * @crossplatform * @atomicservice @@ -348,7 +348,7 @@ declare namespace zlib { /** * CompressFlushMode * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 @@ -415,7 +415,7 @@ declare namespace zlib { /** * Return codes for the compression/decompression functions. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 @@ -450,7 +450,7 @@ declare namespace zlib { /** * The deflate compression method (the only one supported in this version). * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 @@ -469,7 +469,7 @@ declare namespace zlib { /** * Define the reference point for offset. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 @@ -597,22 +597,22 @@ declare namespace zlib { /** * Number of bytes available at nextIn. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - availableIn?: number; + availableIn?: int; /** * Total number of input bytes read so far. * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - totalIn?: number; + totalIn?: long; /** * Next output byte will go here. @@ -627,42 +627,42 @@ declare namespace zlib { /** * Remaining free space at nextOut. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - availableOut?: number; + availableOut?: int; /** * Total number of bytes output so far. * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - totalOut?: number; + totalOut?: long; /** * Best guess about the data type. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - dataType?: number; + dataType?: int; /** * Adler-32 or CRC-32 value of the uncompressed data. * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - adler?: number; + adler?: long; } /** @@ -687,32 +687,32 @@ declare namespace zlib { /** * Operating system. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - os?: number; + os?: int; /** * Modification time. * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - time?: number; + time?: long; /** * Extra flags. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - xflags?: number; + xflags?: int; /** * Extra field. @@ -727,12 +727,12 @@ declare namespace zlib { /** * Extra field length. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - extraLen?: number; + extraLen?: int; /** * Zero-terminated file name. @@ -797,12 +797,12 @@ declare namespace zlib { /** * Total sizeof the destination buffer. * - * @type { number } + * @type { long } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - destLen: number + destLen: long } /** @@ -827,12 +827,12 @@ declare namespace zlib { /** * Return dictionary length. * - * @type { number } + * @type { int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - dictionaryLength: number + dictionaryLength: int } /** @@ -857,22 +857,22 @@ declare namespace zlib { /** * Total sizeof the destination buffer. * - * @type { number } + * @type { long } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - destLength: number + destLength: long /** * Total sizeof the sourceLen. * - * @type { number } + * @type { long } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - sourceLength: number + sourceLength: long } /** @@ -897,22 +897,22 @@ declare namespace zlib { /** * The number of bytes of output that have been generated. * - * @type { number } + * @type { int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - pending: number + pending: int /** * The number of bits of output that have been generated. * - * @type { number } + * @type { int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - bits: number + bits: int } /** @@ -966,13 +966,13 @@ declare namespace zlib { * @typedef { function } * @param { object } outDesc - Object passed to output function. Object dependency requirement implementation. * @param { ArrayBuffer } buf - Used to store data to be written. - * @param { number } length - Write the length of the output buffer. - * @returns { number } Return the number of bytes output. + * @param { int } length - Write the length of the output buffer. + * @returns { int } Return the number of bytes output. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - type InflateBackOutputCallback = (outDesc: object, buf: ArrayBuffer, length: number) => number; + type InflateBackOutputCallback = (outDesc: object, buf: ArrayBuffer, length: int) => int; /** * Compress the specified file. @@ -1208,7 +1208,7 @@ declare namespace zlib { * Get the original size of the compressed zip file, the size is the meta data stored in zip file. * * @param { string } compressedFile - Indicates the path of the compressed file. - * @returns { Promise } Returns the original size of the compressed file. + * @returns { Promise } Returns the original size of the compressed file. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @throws { BusinessError } 900001 - The input source file is invalid. * @throws { BusinessError } 900003 - The input source file is not in ZIP format or is damaged. @@ -1218,7 +1218,7 @@ declare namespace zlib { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getOriginalSize(compressedFile: string): Promise; + function getOriginalSize(compressedFile: string): Promise; /** * Asynchronous creation of verification objects. @@ -1295,9 +1295,9 @@ declare namespace zlib { /** * Update a running Adler-32 checksum with the bytes buf. * - * @param { number } adler - Initial value of Adler32 checksum. + * @param { long } adler - Initial value of Adler32 checksum. * @param { ArrayBuffer } buf - Calculate checksum data buffer. - * @returns { Promise } Return the updated checksum. + * @returns { Promise } Return the updated checksum. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib @@ -1305,15 +1305,15 @@ declare namespace zlib { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - adler32(adler: number, buf: ArrayBuffer): Promise; + adler32(adler: long, buf: ArrayBuffer): Promise; /** * Combine two Adler-32 checksum into one. * - * @param { number } adler1 - The first Adler32 checksum. - * @param { number } adler2 - The second Adler32 checksum. - * @param { number } len2 - The length of the data block associated with the second Adler32 checksum. - * @returns { Promise } Returns the Adler-32 checksum. + * @param { long } adler1 - The first Adler32 checksum. + * @param { long } adler2 - The second Adler32 checksum. + * @param { long } len2 - The length of the data block associated with the second Adler32 checksum. + * @returns { Promise } Returns the Adler-32 checksum. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib @@ -1321,14 +1321,14 @@ declare namespace zlib { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - adler32Combine(adler1: number, adler2: number, len2: number): Promise; + adler32Combine(adler1: long, adler2: long, len2: long): Promise; /** * Update a running CRC-32 with the bytes buf. * - * @param { number } crc - Initial value of CRC-32 checksum. + * @param { long } crc - Initial value of CRC-32 checksum. * @param { ArrayBuffer } buf - Calculate checksum data buffer. - * @returns { Promise } Return the updated CRC-32. + * @returns { Promise } Return the updated CRC-32. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib @@ -1336,15 +1336,15 @@ declare namespace zlib { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - crc32(crc: number, buf: ArrayBuffer): Promise; + crc32(crc: long, buf: ArrayBuffer): Promise; /** * Combine two CRC-32 check values into one. * - * @param { number } crc1 - The first CRC-32 checksum. - * @param { number } crc2 - The second CRC-32 checksum. - * @param { number } len2 - The length of the data block associated with the second CRC-32 checksum. - * @returns { Promise } Returns the CRC-32 check value. + * @param { long } crc1 - The first CRC-32 checksum. + * @param { long } crc2 - The second CRC-32 checksum. + * @param { long } len2 - The length of the data block associated with the second CRC-32 checksum. + * @returns { Promise } Returns the CRC-32 check value. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib @@ -1352,42 +1352,42 @@ declare namespace zlib { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - crc32Combine(crc1: number, crc2: number, len2: number): Promise; + crc32Combine(crc1: long, crc2: long, len2: long): Promise; /** * Update a running CRC-64 with the bytes buf. * - * @param { number } crc - Initial value of CRC-64 checksum. + * @param { long } crc - Initial value of CRC-64 checksum. * @param { ArrayBuffer } buf - Calculate checksum data buffer. - * @returns { Promise } Return the updated CRC-64. + * @returns { Promise } Return the updated CRC-64. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - crc64(crc: number, buf: ArrayBuffer): Promise; + crc64(crc: long, buf: ArrayBuffer): Promise; /** * Get CRC-32 table. * - * @returns { Promise> } Return a array to the CRC-32 table. + * @returns { Promise> } Return a array to the CRC-32 table. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - getCrcTable(): Promise>; + getCrcTable(): Promise>; /** * Get CRC-64 table. * - * @returns { Promise> } Return a array to the CRC-64 table. + * @returns { Promise> } Return a array to the CRC-64 table. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - getCrc64Table(): Promise>; + getCrc64Table(): Promise>; } /** @@ -1422,7 +1422,7 @@ declare namespace zlib { /** * Return flags indicating compile-time options. * - * @returns { Promise } Return flags indicating compile-time options. + * @returns { Promise } Return flags indicating compile-time options. * Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: * 1.0: size of uInt. * 3.2: size of uLong. @@ -1455,14 +1455,14 @@ declare namespace zlib { * @atomicservice * @since 12 */ - zlibCompileFlags(): Promise; + zlibCompileFlags(): Promise; /** * Compresses the source buffer into the destination buffer. * * @param { ArrayBuffer } dest - Destination buffer. * @param { ArrayBuffer } source - Source data buffer. - * @param { number } sourceLen - Source data length. + * @param { long } sourceLen - Source data length. * @returns { Promise } Return ReturnStatus and total sizeof the destination buffer. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -1471,7 +1471,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - compress(dest: ArrayBuffer, source: ArrayBuffer, sourceLen?: number): Promise; + compress(dest: ArrayBuffer, source: ArrayBuffer, sourceLen?: long): Promise; /** * Compresses the source buffer into the destination buffer. @@ -1479,7 +1479,7 @@ declare namespace zlib { * @param { ArrayBuffer } dest - Destination buffer. * @param { ArrayBuffer } source - Source data buffer. * @param { CompressLevel } level - Compression level. - * @param { number } sourceLen - Source data length. + * @param { long } sourceLen - Source data length. * @returns { Promise } Return ReturnStatus and total sizeof the destination buffer. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -1489,27 +1489,27 @@ declare namespace zlib { * @atomicservice * @since 12 */ - compress2(dest: ArrayBuffer, source: ArrayBuffer, level: CompressLevel, sourceLen?: number,): Promise; + compress2(dest: ArrayBuffer, source: ArrayBuffer, level: CompressLevel, sourceLen?: long,): Promise; /** * Calculate the upper limit of the return compression size. * - * @param { number } sourceLen - The length of the source data. - * @returns { Promise } Returns an upper bound on the compressed size after. + * @param { int } sourceLen - The length of the source data. + * @returns { Promise } Returns an upper bound on the compressed size after. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - compressBound(sourceLen: number): Promise; + compressBound(sourceLen: int): Promise; /** * Decompress the compressed data into its original uncompressed form. * * @param { ArrayBuffer } dest - Destination buffer. * @param { ArrayBuffer } source - Source data buffer. - * @param { number } sourceLen - Source data length. + * @param { long } sourceLen - Source data length. * @returns { Promise } Return ReturnStatus and total sizeof the destination buffer. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -1519,14 +1519,14 @@ declare namespace zlib { * @atomicservice * @since 12 */ - uncompress(dest:ArrayBuffer, source: ArrayBuffer, sourceLen?: number): Promise; + uncompress(dest:ArrayBuffer, source: ArrayBuffer, sourceLen?: long): Promise; /** * Decompress the compressed data into its original uncompressed form. * * @param { ArrayBuffer } dest - Destination buffer. * @param { ArrayBuffer } source - Source data buffer. - * @param { number } sourceLen - Source data length. + * @param { long } sourceLen - Source data length. * @returns { Promise } Return ReturnStatus and total sizeof the destination buffer and total sizeof the sourceLen. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -1536,13 +1536,13 @@ declare namespace zlib { * @atomicservice * @since 12 */ - uncompress2(dest: ArrayBuffer, source: ArrayBuffer, sourceLen?: number): Promise; + uncompress2(dest: ArrayBuffer, source: ArrayBuffer, sourceLen?: long): Promise; /** * Verify the checksum inside the structure of compressed stream z_stream. * * @param { ZStream } strm - Object to structure z_stream. - * @param { number } check - Expected checksum. + * @param { int } check - Expected checksum. * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -1551,7 +1551,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - inflateValidate(strm: ZStream, check: number): Promise; + inflateValidate(strm: ZStream, check: int): Promise; /** * Find a synchronization point for the current decompressed stream. @@ -1617,7 +1617,7 @@ declare namespace zlib { * This function is equivalent to inflateEnd followed by inflateInit, but does not free and reallocate the internal decompression state. * * @param { ZStream } strm - Object to structure z_stream. - * @param { number } windowBits - Parameter is interpreted the same as it is for inflateInit2. + * @param { int } windowBits - Parameter is interpreted the same as it is for inflateInit2. * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -1626,7 +1626,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - inflateReset2(strm: ZStream, windowBits: number): Promise; + inflateReset2(strm: ZStream, windowBits: int): Promise; /** * This function is equivalent to inflateEnd followed by inflateInit, but does not free and reallocate the internal decompression state. @@ -1646,8 +1646,8 @@ declare namespace zlib { * This function inserts bits in the inflate input stream. * * @param { ZStream } strm - Object to structure z_stream. - * @param { number } bits - The provided bits. - * @param { number } value - The provided value. + * @param { int } bits - The provided bits. + * @param { int } value - The provided value. * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -1656,26 +1656,26 @@ declare namespace zlib { * @atomicservice * @since 12 */ - inflatePrime(strm: ZStream, bits: number, value: number): Promise; + inflatePrime(strm: ZStream, bits: int, value: int): Promise; /** * Is used to mark locations in the input data for random access. * * @param { ZStream } strm - Object to structure z_stream. - * @returns { Promise } Return the internal marker position of the current decompressed stream. + * @returns { Promise } Return the internal marker position of the current decompressed stream. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - inflateMark(strm: ZStream): Promise; + inflateMark(strm: ZStream): Promise; /** * Initializes the internal stream state for decompression. * * @param { ZStream } strm - Object to structure z_stream. - * @param { number } windowBits - Is the base two logarithm of the maximum window size. + * @param { int } windowBits - Is the base two logarithm of the maximum window size. * It should be in the range 8..15 for this version of the library. The default value is 15 if inflateInit is used instead. * windowBits must be greater than or equal to the windowBits value provided to deflateInit2() while compressing, * or it must be equal to 15 if deflateInit2() was not used. If a compressed stream with a larger window size is given as input, @@ -1701,7 +1701,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - inflateInit2(strm: ZStream, windowBits: number): Promise; + inflateInit2(strm: ZStream, windowBits: int): Promise; /** * Initializes the internal stream state for decompression. @@ -1778,20 +1778,20 @@ declare namespace zlib { * Obtain the number of Huffman encoding trees that have been used in the current decompression stream during the inflate process. * * @param { ZStream } strm - Object to structure z_stream. - * @returns { Promise } Return the number of used Huffman encoding trees. + * @returns { Promise } Return the number of used Huffman encoding trees. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - inflateCodesUsed(strm: ZStream): Promise; + inflateCodesUsed(strm: ZStream): Promise; /** * Initialize the internal stream state for decompression using inflateBack() calls. * * @param { ZStream } strm - Object to structure z_stream. - * @param { number } windowBits - Parameter is interpreted the same as it is for inflateInit2. The value range is between 8~15. + * @param { long } windowBits - Parameter is interpreted the same as it is for inflateInit2. The value range is between 8~15. * @param { ArrayBuffer } window - The preset sliding window buffer. * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; @@ -1801,7 +1801,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - inflateBackInit(strm: ZStream, windowBits: number, window: ArrayBuffer): Promise; + inflateBackInit(strm: ZStream, windowBits: long, window: ArrayBuffer): Promise; /** * All memory allocated by inflateBackInit() is freed. @@ -1872,7 +1872,7 @@ declare namespace zlib { * @param { ZStream } strm - Object to structure z_stream. * @param { CompressLevel } level - Compression level. * @param { CompressMethod } method - The compression method. - * @param { number } windowBits - Parameter is interpreted the same as it is for inflateInit2. + * @param { int } windowBits - Parameter is interpreted the same as it is for inflateInit2. * @param { MemLevel } memLevel - The memory usage level. * @param { CompressStrategy } strategy - The compression strategy. * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. @@ -1883,7 +1883,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - deflateInit2(strm: ZStream, level: CompressLevel, method: CompressMethod, windowBits: number, + deflateInit2(strm: ZStream, level: CompressLevel, method: CompressMethod, windowBits: int, memLevel: MemLevel, strategy: CompressStrategy): Promise; /** @@ -1920,15 +1920,15 @@ declare namespace zlib { * Calculate an upper bound on the compressed size. * * @param { ZStream } strm - Object to structure z_stream. - * @param { number } sourceLength - The length of uncompressed data. - * @returns { Promise } Return an upper bound on the compressed size. + * @param { long } sourceLength - The length of uncompressed data. + * @returns { Promise } Return an upper bound on the compressed size. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - deflateBound(strm: ZStream, sourceLength: number): Promise; + deflateBound(strm: ZStream, sourceLength: long): Promise; /** * Provides gzip header information for when a gzip stream is requested by deflateInit2(). @@ -1993,10 +1993,10 @@ declare namespace zlib { * Fine tune deflate's internal compression parameters. * * @param { ZStream } strm - Object to structure z_stream. - * @param { number } goodLength - Good matching length threshold. - * @param { number } maxLazy - Maximum lazy matching times. - * @param { number } niceLength - Good Lazy Length Threshold. - * @param { number } maxChain - Maximum chain length. + * @param { int } goodLength - Good matching length threshold. + * @param { int } maxLazy - Maximum lazy matching times. + * @param { int } niceLength - Good Lazy Length Threshold. + * @param { int } maxChain - Maximum chain length. * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -2005,7 +2005,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - deflateTune(strm: ZStream, goodLength: number, maxLazy: number, niceLength: number, maxChain: number): Promise; + deflateTune(strm: ZStream, goodLength: int, maxLazy: int, niceLength: int, maxChain: int): Promise; /** * This function is equivalent to deflateEnd followed by deflateInit, but does not free and reallocate the internal compression state. @@ -2069,8 +2069,8 @@ declare namespace zlib { * Inserts bits in the deflate output stream. * * @param { ZStream } strm - Object to structure z_stream. - * @param { number } bits - The number of bits to be inserted. The value range is between 0~16. - * @param { number } value - The bit value corresponding to the number of bits. + * @param { int } bits - The number of bits to be inserted. The value range is between 0~16. + * @param { int } value - The bit value corresponding to the number of bits. * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -2079,7 +2079,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - deflatePrime(strm: ZStream, bits: number, value: number): Promise; + deflatePrime(strm: ZStream, bits: int, value: int): Promise; } /** @@ -2095,7 +2095,7 @@ declare namespace zlib { /** * Associate a gzFile with the file descriptor fd. * - * @param { number } fd - The file descriptor. Usually this is obtained through system calls to 'open' or other methods. + * @param { int } fd - The file descriptor. Usually this is obtained through system calls to 'open' or other methods. * @param { string } mode - Used to specify access mode. * @returns { Promise } * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; @@ -2105,13 +2105,13 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzdopen(fd: number, mode: string): Promise; + gzdopen(fd: int, mode: string): Promise; /** * Set the internal buffer size used by this library's functions for file to size. * - * @param { number } size - The internal buffer size to be set. - * @returns { Promise } Returns 0 on success. + * @param { long } size - The internal buffer size to be set. + * @returns { Promise } Returns 0 on success. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2119,7 +2119,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzbuffer(size: number): Promise; + gzbuffer(size: long): Promise; /** * Open the gzip (.gz) file at path for reading and decompressing, or compressing and writing. @@ -2139,22 +2139,22 @@ declare namespace zlib { /** * Check if the reading position of the gzip compressed file has reached the end of the file. * - * @returns { Promise } Return 1 (true) if the end-of-file indicator for file has been set while reading. + * @returns { Promise } Return 1 (true) if the end-of-file indicator for file has been set while reading. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - gzeof(): Promise; + gzeof(): Promise; /** * Check if the specified gzip file handle file directly accesses the original uncompressed data. * - * @returns { Promise } returns 1 (true) if transparent writing was requested. + * @returns { Promise } returns 1 (true) if transparent writing was requested. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - gzdirect(): Promise; + gzdirect(): Promise; /** * Flush all pending output for file, if necessary, close file and deallocate the (de)compression state. @@ -2192,13 +2192,13 @@ declare namespace zlib { /** * Read and decompress one byte from file. * - * @returns { Promise } Return the ASCII code of a character. + * @returns { Promise } Return the ASCII code of a character. * @throws { BusinessError } 17800009 - Internal structure error. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - gzgetc(): Promise; + gzgetc(): Promise; /** * Flush all pending output to file. @@ -2218,9 +2218,9 @@ declare namespace zlib { * Compress and write nitems items of size size from buf to file. * * @param { ArrayBuffer } buf - The buffer to write data to. - * @param { number } size - The number of bytes in a single data block. - * @param { number } nitems - Number of data blocks to be written. - * @returns { Promise } Return the number of full items written of size size. + * @param { long } size - The number of bytes in a single data block. + * @param { long } nitems - Number of data blocks to be written. + * @returns { Promise } Return the number of full items written of size size. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2228,15 +2228,15 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzfwrite(buf: ArrayBuffer, size: number, nitems: number): Promise; + gzfwrite(buf: ArrayBuffer, size: long, nitems: long): Promise; /** * Read and decompress data from gzip compressed files. * * @param { ArrayBuffer } buf - Target buffer for storing read results. - * @param { number } size - The number of bytes in a single data block. - * @param { number } nitems - Number of data blocks to be read. - * @returns { Promise } Return the number of full items read of size size. + * @param { long } size - The number of bytes in a single data block. + * @param { long } nitems - Number of data blocks to be read. + * @returns { Promise } Return the number of full items read of size size. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2244,7 +2244,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzfread(buf: ArrayBuffer, size: number, nitems: number): Promise; + gzfread(buf: ArrayBuffer, size: long, nitems: long): Promise; /** * Same as gzclose(), gzclosew() only for use when writing or appending. @@ -2273,8 +2273,8 @@ declare namespace zlib { * Compress and write the len uncompressed bytes at buf to file. * * @param { ArrayBuffer } buf - Object to the data buffer to be written. - * @param { number } len - The len uncompressed bytes. - * @returns { Promise } Return the number of uncompressed bytes written. + * @param { long } len - The len uncompressed bytes. + * @returns { Promise } Return the number of uncompressed bytes written. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2282,13 +2282,13 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzwrite(buf: ArrayBuffer, len: number): Promise; + gzwrite(buf: ArrayBuffer, len: long): Promise; /** * Push c back onto the stream for file to be read as the first character on the next read. * - * @param { number } c - To fall back to the character before the input stream. - * @returns { Promise } Return the character pushed. + * @param { int } c - To fall back to the character before the input stream. + * @returns { Promise } Return the character pushed. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2296,18 +2296,18 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzungetc(c: number): Promise; + gzungetc(c: int): Promise; /** * Return the starting position for the next gzread or gzwrite on file. * - * @returns { Promise } Return the starting position for the next gzread or gzwrite on file. + * @returns { Promise } Return the starting position for the next gzread or gzwrite on file. * @throws { BusinessError } 17800009 - Internal structure error. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - gztell(): Promise; + gztell(): Promise; /** * Dynamically update the compression level and strategy for file. @@ -2327,9 +2327,9 @@ declare namespace zlib { /** * Set the starting position to offset relative to whence for the next gzread or gzwrite on file. * - * @param { number } offset - Specify the new offset to move to. + * @param { long } offset - Specify the new offset to move to. * @param { OffsetReferencePoint } whence - Define the reference point for offset. - * @returns { Promise } Return the resulting offset location as measured in bytes from the beginning of the uncompressed stream. + * @returns { Promise } Return the resulting offset location as measured in bytes from the beginning of the uncompressed stream. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2337,7 +2337,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzseek(offset: number, whence: OffsetReferencePoint): Promise; + gzseek(offset: long, whence: OffsetReferencePoint): Promise; /** * Rewind file. This function is supported only for reading. @@ -2354,7 +2354,7 @@ declare namespace zlib { * Read and decompress up to len uncompressed bytes from file into buf. * * @param { ArrayBuffer } buf - User provided buffer address. - * @returns { Promise } Return the number of uncompressed bytes actually read, less than len for end of file. + * @returns { Promise } Return the number of uncompressed bytes actually read, less than len for end of file. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2362,13 +2362,13 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzread(buf: ArrayBuffer): Promise; + gzread(buf: ArrayBuffer): Promise; /** * Compress and write the given null-terminated string s to file, excluding the terminating null character. * * @param { string } str - Format descriptors and plain text. - * @returns { Promise } Return the number of characters written. + * @returns { Promise } Return the number of characters written. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2376,13 +2376,13 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzputs(str: string): Promise; + gzputs(str: string): Promise; /** * Compress and write c, converted to an unsigned char, into file. * - * @param { number } char - Write ASCII values for characters. - * @returns { Promise } Return the value that was written. + * @param { int } ch - Write ASCII values for characters. + * @returns { Promise } Return the value that was written. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2390,14 +2390,14 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzputc(char: number): Promise; + gzputc(ch: int): Promise; /** * Convert, format, compress, and write the arguments to file under control of the string format, as in fprintf. * * @param { string } format - Format descriptors and plain text. * @param { Array } args - Variable argument lists. - * @returns { Promise } Return the number of uncompressed bytes actually written. + * @returns { Promise } Return the number of uncompressed bytes actually written. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800004 - Compression or decompression stream error, which may be caused by an initialization error in the zlib stream structure or a modified structure. @@ -2406,18 +2406,18 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzprintf(format: string, ...args: Array): Promise; + gzprintf(format: string, ...args: Array): Promise; /** * Return the current compressed (actual) read or write offset of file. * - * @returns { Promise } Return the current compressed (actual) read or write offset of file. + * @returns { Promise } Return the current compressed (actual) read or write offset of file. * @throws { BusinessError } 17800009 - Internal structure error. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - gzoffset(): Promise; + gzoffset(): Promise; /** * Read and decompress bytes from file into buf, until len-1 characters are read, or until a newline character is read and transferred to buf, diff --git a/api/bundleManager/AbilityInfo.d.ts b/api/bundleManager/AbilityInfo.d.ts index c178036ae4..19e7675b4f 100644 --- a/api/bundleManager/AbilityInfo.d.ts +++ b/api/bundleManager/AbilityInfo.d.ts @@ -189,7 +189,7 @@ export interface AbilityInfo { /** * Indicates the label id of the ability * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -197,7 +197,7 @@ export interface AbilityInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: number; + readonly labelId: long; /** * Indicates the ability @@ -249,7 +249,7 @@ export interface AbilityInfo { /** * Indicates the description id of the ability * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -257,7 +257,7 @@ export interface AbilityInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly descriptionId: number; + readonly descriptionId: long; /** * Indicates the icon of the ability @@ -309,7 +309,7 @@ export interface AbilityInfo { /** * Indicates the icon id of the ability * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -317,7 +317,7 @@ export interface AbilityInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: number; + readonly iconId: long; /** * Process of ability, if user do not set it, the value equal application process @@ -720,25 +720,25 @@ export interface AbilityInfo { /** * Indicates the appIndex of application, only work in clone app mode * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: number; + readonly appIndex: int; /** * Indicates the orientation id of the ability * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly orientationId: number; + readonly orientationId: long; } /** @@ -787,7 +787,7 @@ export interface WindowSize { /** * Indicates maximum ratio of width over height of window under free window status. * - * @type { number } + * @type { double } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -795,7 +795,7 @@ export interface WindowSize { * @since 20 * @arkts 1.1&1.2 */ - readonly maxWindowRatio: number; + readonly maxWindowRatio: double; /** * Indicates minimum ratio of width over height of window under free window status. @@ -817,7 +817,7 @@ export interface WindowSize { /** * Indicates minimum ratio of width over height of window under free window status. * - * @type { number } + * @type { double } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -825,7 +825,7 @@ export interface WindowSize { * @since 20 * @arkts 1.1&1.2 */ - readonly minWindowRatio: number; + readonly minWindowRatio: double; /** * Indicates maximum width of window under free window status. @@ -847,7 +847,7 @@ export interface WindowSize { /** * Indicates maximum width of window under free window status. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -855,7 +855,7 @@ export interface WindowSize { * @since 20 * @arkts 1.1&1.2 */ - readonly maxWindowWidth: number; + readonly maxWindowWidth: long; /** * Indicates minimum width of window under free window status. @@ -877,7 +877,7 @@ export interface WindowSize { /** * Indicates minimum width of window under free window status. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -885,7 +885,7 @@ export interface WindowSize { * @since 20 * @arkts 1.1&1.2 */ - readonly minWindowWidth: number; + readonly minWindowWidth: long; /** * Indicates maximum height of window under free window status. @@ -907,7 +907,7 @@ export interface WindowSize { /** * Indicates maximum height of window under free window status. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -915,7 +915,7 @@ export interface WindowSize { * @since 20 * @arkts 1.1&1.2 */ - readonly maxWindowHeight: number; + readonly maxWindowHeight: long; /** * Indicates minimum height of window under free window status. @@ -937,7 +937,7 @@ export interface WindowSize { /** * Indicates minimum height of window under free window status. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -945,5 +945,5 @@ export interface WindowSize { * @since 20 * @arkts 1.1&1.2 */ - readonly minWindowHeight: number; + readonly minWindowHeight: long; } diff --git a/api/bundleManager/AppProvisionInfo.d.ts b/api/bundleManager/AppProvisionInfo.d.ts index 98ed464fce..fde167d360 100644 --- a/api/bundleManager/AppProvisionInfo.d.ts +++ b/api/bundleManager/AppProvisionInfo.d.ts @@ -31,14 +31,14 @@ export interface AppProvisionInfo { /** * Indicates the version code of the profile file. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly versionCode: number; + readonly versionCode: long; /** * Indicates the version name of the profile file. @@ -188,24 +188,24 @@ export interface Validity { /** * Indicates the earliest validity of the profile file. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly notBefore: number; + readonly notBefore: long; /** * Indicates the latest validity of the profile file. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly notAfter: number; + readonly notAfter: long; } diff --git a/api/bundleManager/ApplicationInfo.d.ts b/api/bundleManager/ApplicationInfo.d.ts index 5a0ba69cf8..0ca6bfa0d3 100644 --- a/api/bundleManager/ApplicationInfo.d.ts +++ b/api/bundleManager/ApplicationInfo.d.ts @@ -128,7 +128,7 @@ export interface ApplicationInfo { /** * Indicates the description id of the application * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -136,7 +136,7 @@ export interface ApplicationInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly descriptionId: number; + readonly descriptionId: long; /** * Indicates whether or not this application may be instantiated @@ -218,7 +218,7 @@ export interface ApplicationInfo { /** * Indicates the label id of the application * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -226,7 +226,7 @@ export interface ApplicationInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: number; + readonly labelId: long; /** * Indicates the icon of the application @@ -278,7 +278,7 @@ export interface ApplicationInfo { /** * Indicates the icon id of the application * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -286,7 +286,7 @@ export interface ApplicationInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: number; + readonly iconId: long; /** * Process of application, if user do not set it ,the value equal bundleName @@ -470,7 +470,7 @@ export interface ApplicationInfo { /** * Indicates the access token of the application * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -478,7 +478,7 @@ export interface ApplicationInfo { * @since 20 * @arkts 1.1&1.2 */ - readonly accessTokenId: number; + readonly accessTokenId: long; /** * Indicates the uid of the application @@ -500,7 +500,7 @@ export interface ApplicationInfo { /** * Indicates the uid of the application * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -508,7 +508,7 @@ export interface ApplicationInfo { * @since 20 * @arkts 1.1&1.2 */ - readonly uid: number; + readonly uid: int; /** * Indicates icon resource of the application @@ -796,13 +796,13 @@ export interface ApplicationInfo { /** * Indicates the index of the bundle * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: number; + readonly appIndex: int; /** * Indicates sources to install the app @@ -853,14 +853,14 @@ export interface ApplicationInfo { /** * Indicates the flags of the application. * - * @type { ?number } + * @type { ?int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly flags?: number; + readonly flags?: int; } /** @@ -973,13 +973,13 @@ export interface MultiAppMode { /** * Indicates the max count of the bundle * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly maxCount: number; + readonly maxCount: int; } /** @@ -1020,24 +1020,24 @@ export interface PreinstalledApplicationInfo { /** * Indicates the icon id of the application * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: number; + readonly iconId: long; /** * Indicates the label id of the application * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: number; + readonly labelId: long; } \ No newline at end of file diff --git a/api/bundleManager/BundleInfo.d.ts b/api/bundleManager/BundleInfo.d.ts index caf837e08e..e29ef95d1b 100644 --- a/api/bundleManager/BundleInfo.d.ts +++ b/api/bundleManager/BundleInfo.d.ts @@ -128,7 +128,7 @@ export interface BundleInfo { /** * Indicates the version code of the bundle * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -136,7 +136,7 @@ export interface BundleInfo { * @since 20 * @arkts 1.1&1.2 */ - readonly versionCode: number; + readonly versionCode: long; /** * Indicates the version name of the bundle @@ -188,7 +188,7 @@ export interface BundleInfo { /** * Indicates the **minimum ** version compatible with the bundle * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -196,7 +196,7 @@ export interface BundleInfo { * @since 20 * @arkts 1.1&1.2 */ - readonly minCompatibleVersionCode: number; + readonly minCompatibleVersionCode: int; /** * Indicates the target version number of the bundle @@ -218,7 +218,7 @@ export interface BundleInfo { /** * Indicates the target version number of the bundle * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -226,7 +226,7 @@ export interface BundleInfo { * @since 20 * @arkts 1.1&1.2 */ - readonly targetVersion: number; + readonly targetVersion: int; /** * Obtains configuration information about an application @@ -389,14 +389,14 @@ export interface BundleInfo { /** * Indicates the hap install time * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly installTime: number; + readonly installTime: long; /** * Indicates the hap update time @@ -409,14 +409,14 @@ export interface BundleInfo { /** * Indicates the hap update time * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly updateTime: number; + readonly updateTime: long; /** * Indicates the router information of the application @@ -433,25 +433,25 @@ export interface BundleInfo { /** * Indicates the appIndex of application, only work in appClone mode * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: number; + readonly appIndex: int; /** * Indicates the hap first install time * - * @type { ?number } + * @type { ?long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly firstInstallTime?: number; + readonly firstInstallTime?: long; } /** @@ -570,14 +570,14 @@ export interface ReqPermissionDetail { /** * Indicates the reason id of this required permissions * - * @type { number } + * @type { long } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform * @atomicservice * @since 20 * @arkts 1.1&1.2 */ - reasonId: number; + reasonId: long; /** * Indicates the used scene of this required permissions @@ -826,13 +826,13 @@ export interface AppCloneIdentity { /** * Indicates the index of clone app. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: number; + readonly appIndex: int; } /** diff --git a/api/bundleManager/BundlePackInfo.d.ts b/api/bundleManager/BundlePackInfo.d.ts index e8ea4a275c..60ea30db70 100644 --- a/api/bundleManager/BundlePackInfo.d.ts +++ b/api/bundleManager/BundlePackInfo.d.ts @@ -479,14 +479,14 @@ export interface AbilityFormInfo { /** * Indicates the update duration * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly updateDuration: number; + readonly updateDuration: int; /** * Indicates the ability support dimensions @@ -526,14 +526,14 @@ export interface Version { /** * Indicates the min compatible code of this version * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly minCompatibleVersionCode: number; + readonly minCompatibleVersionCode: int; /** * Indicates the name of this version @@ -550,14 +550,14 @@ export interface Version { /** * Indicates the code of this version * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly code: number; + readonly code: int; } /** @@ -585,24 +585,24 @@ export interface ApiVersion { /** * Indicates the compatible version code of the api * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly compatible: number; + readonly compatible: int; /** * Indicates the target version code of the api * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly target: number; + readonly target: int; } diff --git a/api/bundleManager/BundleResourceInfo.d.ts b/api/bundleManager/BundleResourceInfo.d.ts index 6952f3d65b..0d5de3cfe8 100644 --- a/api/bundleManager/BundleResourceInfo.d.ts +++ b/api/bundleManager/BundleResourceInfo.d.ts @@ -82,12 +82,12 @@ export interface BundleResourceInfo { /** * Indicates the index of the bundle * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: number; + readonly appIndex: int; } diff --git a/api/bundleManager/ExtensionAbilityInfo.d.ts b/api/bundleManager/ExtensionAbilityInfo.d.ts index d863294176..c4fb184a03 100644 --- a/api/bundleManager/ExtensionAbilityInfo.d.ts +++ b/api/bundleManager/ExtensionAbilityInfo.d.ts @@ -111,14 +111,14 @@ export interface ExtensionAbilityInfo { /** * Indicates the label id of the extension ability info * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: number; + readonly labelId: long; /** * Indicates the description id of the extension ability info @@ -131,14 +131,14 @@ export interface ExtensionAbilityInfo { /** * Indicates the description id of the extension ability info * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly descriptionId: number; + readonly descriptionId: long; /** * Indicates the icon id of the extension ability info @@ -151,14 +151,14 @@ export interface ExtensionAbilityInfo { /** * Indicates the icon id of the extension ability info * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: number; + readonly iconId: long; /** * Indicates whether this ability can be called by other abilities @@ -347,11 +347,11 @@ export interface ExtensionAbilityInfo { /** * Indicates the appIndex of extension ability, only work in clone app mode * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: number; + readonly appIndex: int; } diff --git a/api/bundleManager/HapModuleInfo.d.ts b/api/bundleManager/HapModuleInfo.d.ts index ae02a1d3b6..d9f0e8db65 100644 --- a/api/bundleManager/HapModuleInfo.d.ts +++ b/api/bundleManager/HapModuleInfo.d.ts @@ -129,7 +129,7 @@ export interface HapModuleInfo { /** * Indicates the icon id of this hap module * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -137,7 +137,7 @@ export interface HapModuleInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: number; + readonly iconId: long; /** * Indicates the label of this hap module @@ -189,7 +189,7 @@ export interface HapModuleInfo { /** * Indicates the label id of this hap module * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -197,7 +197,7 @@ export interface HapModuleInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: number; + readonly labelId: long; /** * Describes the hap module @@ -249,7 +249,7 @@ export interface HapModuleInfo { /** * Indicates the description of this hap module * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -257,7 +257,7 @@ export interface HapModuleInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly descriptionId: number; + readonly descriptionId: long; /** * Indicates main elementName of the hap module @@ -645,14 +645,14 @@ export interface Dependency { /** * Indicates the version code of the dependency * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly versionCode: number; + readonly versionCode: long; } /** diff --git a/api/bundleManager/LauncherAbilityInfo.d.ts b/api/bundleManager/LauncherAbilityInfo.d.ts index de21df51c0..22b5bb4319 100644 --- a/api/bundleManager/LauncherAbilityInfo.d.ts +++ b/api/bundleManager/LauncherAbilityInfo.d.ts @@ -55,44 +55,44 @@ export interface LauncherAbilityInfo { /** * Obtains labelId about an launcher ability. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: number; + readonly labelId: long; /** * Obtains iconId about an launcher ability. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: number; + readonly iconId: long; /** * Obtains userId about an launcher ability. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly userId: number; + readonly userId: int; /** * Obtains installTime about an launcher ability. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly installTime: number; + readonly installTime: long; } diff --git a/api/bundleManager/LauncherAbilityResourceInfo.d.ts b/api/bundleManager/LauncherAbilityResourceInfo.d.ts index bd303e501a..5552f810d6 100644 --- a/api/bundleManager/LauncherAbilityResourceInfo.d.ts +++ b/api/bundleManager/LauncherAbilityResourceInfo.d.ts @@ -106,12 +106,12 @@ export interface LauncherAbilityResourceInfo { /** * Indicates the index of the bundle * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: number; + readonly appIndex: int; } diff --git a/api/bundleManager/Metadata.d.ts b/api/bundleManager/Metadata.d.ts index a4886fcb1b..86afd3775a 100644 --- a/api/bundleManager/Metadata.d.ts +++ b/api/bundleManager/Metadata.d.ts @@ -128,12 +128,12 @@ export interface Metadata { /** * Indicates the value id of the metadata * - * @type { ?number } + * @type { ?long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly valueId?: number; + readonly valueId?: long; } diff --git a/api/bundleManager/OverlayModuleInfo.d.ts b/api/bundleManager/OverlayModuleInfo.d.ts index aa2b660c73..1c9f680376 100644 --- a/api/bundleManager/OverlayModuleInfo.d.ts +++ b/api/bundleManager/OverlayModuleInfo.d.ts @@ -63,22 +63,22 @@ export interface OverlayModuleInfo { /** * Indicates the priority of the overlay module * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly priority: number; + readonly priority: int; /** * Indicates the state of the overlay module * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly state: number; + readonly state: int; } diff --git a/api/bundleManager/PermissionDef.d.ts b/api/bundleManager/PermissionDef.d.ts index 4b93792ec6..8b7847b0b5 100644 --- a/api/bundleManager/PermissionDef.d.ts +++ b/api/bundleManager/PermissionDef.d.ts @@ -43,36 +43,36 @@ export interface PermissionDef { /** * Indicates the grant mode of this permission * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly grantMode: number; + readonly grantMode: int; /** * Indicates the labelId of this permission * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: number; + readonly labelId: long; /** * Indicates the descriptionId of this permission * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly descriptionId: number; + readonly descriptionId: long; } diff --git a/api/bundleManager/PluginBundleInfo.d.ts b/api/bundleManager/PluginBundleInfo.d.ts index 40933b54af..c92159c05c 100644 --- a/api/bundleManager/PluginBundleInfo.d.ts +++ b/api/bundleManager/PluginBundleInfo.d.ts @@ -43,14 +43,14 @@ export interface PluginBundleInfo { /** * Indicates the label id of the plugin * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'19', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: number; + readonly labelId: long; /** * Indicates the icon of the plugin @@ -67,14 +67,14 @@ export interface PluginBundleInfo { /** * Indicates the icon id of the plugin * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'19', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: number; + readonly iconId: long; /** * Indicates the name of the plugin @@ -91,14 +91,14 @@ export interface PluginBundleInfo { /** * Indicates the version code of the plugin * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'19', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly versionCode: number; + readonly versionCode: long; /** * Indicates the version name of the plugin @@ -150,14 +150,14 @@ export interface PluginModuleInfo { /** * Indicates the description of the plugin * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'19', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly descriptionId: number; + readonly descriptionId: long; /** * Describes the plugin diff --git a/api/bundleManager/RecoverableApplicationInfo.d.ts b/api/bundleManager/RecoverableApplicationInfo.d.ts index 29b78aed38..144d484710 100644 --- a/api/bundleManager/RecoverableApplicationInfo.d.ts +++ b/api/bundleManager/RecoverableApplicationInfo.d.ts @@ -57,26 +57,26 @@ export interface RecoverableApplicationInfo { /** * Indicates the label id * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: number; + readonly labelId: long; /** * Indicates the icon id * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: number; + readonly iconId: long; /** * Indicates whether the application is a system application diff --git a/api/bundleManager/SharedBundleInfo.d.ts b/api/bundleManager/SharedBundleInfo.d.ts index 4065fc3925..e5ce19fffe 100644 --- a/api/bundleManager/SharedBundleInfo.d.ts +++ b/api/bundleManager/SharedBundleInfo.d.ts @@ -93,14 +93,14 @@ export interface SharedModuleInfo { /** * Indicates the version code of the shared module * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly versionCode: number; + readonly versionCode: long; /** * Indicates the version name of the shared module @@ -129,12 +129,12 @@ export interface SharedModuleInfo { /** * Indicates the description of this shared module * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly descriptionId: number; + readonly descriptionId: long; } diff --git a/api/bundleManager/ShortcutInfo.d.ts b/api/bundleManager/ShortcutInfo.d.ts index c4c0b8fb9f..8f3c9571c5 100644 --- a/api/bundleManager/ShortcutInfo.d.ts +++ b/api/bundleManager/ShortcutInfo.d.ts @@ -190,12 +190,12 @@ export interface ShortcutInfo { /** * Indicates the icon id of the shortcut * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @since 20 * @arkts 1.1&1.2 */ - iconId?: number; + iconId?: long; /** * Indicates the label of the shortcut @@ -244,12 +244,12 @@ export interface ShortcutInfo { /** * Indicates the label id of the shortcut * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @since 20 * @arkts 1.1&1.2 */ - labelId?: number; + labelId?: long; /** * Indicates the wants of the shortcut @@ -289,12 +289,12 @@ export interface ShortcutInfo { /** * Indicates the index of application clone. * - * @type { number } + * @type { int } * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @since 20 * @arkts 1.1&1.2 */ - appIndex: number; + appIndex: int; /** * Indicates the source type of shortcut. @@ -307,12 +307,12 @@ export interface ShortcutInfo { /** * Indicates the source type of shortcut. * - * @type { number } + * @type { int } * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @since 20 * @arkts 1.1&1.2 */ - sourceType: number; + sourceType: int; /** * Display control for indicating shortcut. diff --git a/api/bundleManager/Skill.d.ts b/api/bundleManager/Skill.d.ts index 7e09ec6787..ddaedcf470 100644 --- a/api/bundleManager/Skill.d.ts +++ b/api/bundleManager/Skill.d.ts @@ -114,14 +114,14 @@ export interface SkillUri { /** * Indicates the port of the skillUri * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly port: number; + readonly port: int; /** * Indicates the path of the skillUri @@ -186,14 +186,14 @@ export interface SkillUri { /** * Indicates the maxFileSupported of the skillUri * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly maxFileSupported: number; + readonly maxFileSupported: int; /** * Indicates the linkFeature of the skillUri -- Gitee From 400954bf0d0f9da8e1ca49bd233171cedec86976 Mon Sep 17 00:00:00 2001 From: Michael Wang Date: Fri, 11 Jul 2025 10:52:52 +0800 Subject: [PATCH 057/746] add Signed-off-by: Michael Wang --- api/@ohos.commonEventManager.d.ts | 603 ++++++++++++++------- api/commonEvent/commonEventSubscriber.d.ts | 105 ++-- 2 files changed, 472 insertions(+), 236 deletions(-) diff --git a/api/@ohos.commonEventManager.d.ts b/api/@ohos.commonEventManager.d.ts index 1055902283..767445860e 100644 --- a/api/@ohos.commonEventManager.d.ts +++ b/api/@ohos.commonEventManager.d.ts @@ -193,7 +193,8 @@ declare namespace commonEventManager { * @throws { BusinessError } 1500009 - Failed to obtain system parameters. * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 20 + * @since arkts {'1.1':'20', '1.2':'20'} + * @arkts 1.1&1.2 */ function publishAsUser(event: string, userId: number, callback: AsyncCallback): void; @@ -230,7 +231,8 @@ declare namespace commonEventManager { * @throws { BusinessError } 1500009 - Failed to obtain system parameters. * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 20 + * @since arkts {'1.1':'20', '1.2':'20'} + * @arkts 1.1&1.2 */ function publishAsUser( event: string, @@ -425,7 +427,8 @@ declare namespace commonEventManager { * @throws { BusinessError } 1500008 - Failed to initialize the common event service. * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeStickyCommonEvent(event: string, callback: AsyncCallback): void; @@ -444,7 +447,8 @@ declare namespace commonEventManager { * @throws { BusinessError } 1500008 - Failed to initialize the common event service. * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeStickyCommonEvent(event: string): Promise; @@ -461,7 +465,8 @@ declare namespace commonEventManager { * @syscap SystemCapability.Notification.CommonEvent * @systemapi Hide this for inner system use. * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function setStaticSubscriberState(enable: boolean, callback: AsyncCallback): void; @@ -478,7 +483,8 @@ declare namespace commonEventManager { * @syscap SystemCapability.Notification.CommonEvent * @systemapi Hide this for inner system use. * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function setStaticSubscriberState(enable: boolean): Promise; @@ -496,7 +502,8 @@ declare namespace commonEventManager { * @syscap SystemCapability.Notification.CommonEvent * @systemapi Hide this for inner system use. * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function setStaticSubscriberState(enable: boolean, events?: Array): Promise; @@ -522,7 +529,8 @@ declare namespace commonEventManager { * This API can be called only by system applications. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BOOT_COMPLETED = 'usual.event.BOOT_COMPLETED', @@ -530,7 +538,8 @@ declare namespace commonEventManager { * This commonEvent means when the device finnish booting, but still in the locked state. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_LOCKED_BOOT_COMPLETED = 'usual.event.LOCKED_BOOT_COMPLETED', @@ -538,7 +547,8 @@ declare namespace commonEventManager { * This commonEvent means when the device is shutting down, note: turn off, not sleeping. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_SHUTDOWN = 'usual.event.SHUTDOWN', @@ -546,7 +556,8 @@ declare namespace commonEventManager { * This commonEvent means when the charging state, level and so on about the battery. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BATTERY_CHANGED = 'usual.event.BATTERY_CHANGED', @@ -554,7 +565,8 @@ declare namespace commonEventManager { * This commonEvent means when the device in low battery state.. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BATTERY_LOW = 'usual.event.BATTERY_LOW', @@ -562,7 +574,8 @@ declare namespace commonEventManager { * This commonEvent means when the battery level is an ok state. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BATTERY_OKAY = 'usual.event.BATTERY_OKAY', @@ -570,7 +583,8 @@ declare namespace commonEventManager { * This commonEvent means when the other power is connected to the device. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_POWER_CONNECTED = 'usual.event.POWER_CONNECTED', @@ -578,7 +592,8 @@ declare namespace commonEventManager { * This commonEvent means when the other power is removed from the device. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_POWER_DISCONNECTED = 'usual.event.POWER_DISCONNECTED', @@ -604,7 +619,8 @@ declare namespace commonEventManager { * This commonEvent means when the thermal state level change * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_THERMAL_LEVEL_CHANGED = 'usual.event.THERMAL_LEVEL_CHANGED', @@ -612,7 +628,8 @@ declare namespace commonEventManager { * This commonEvent means when the device is about to enter the force sleep mode * * @syscap SystemCapability.Notification.CommonEvent - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_ENTER_FORCE_SLEEP = 'usual.event.ENTER_FORCE_SLEEP', @@ -620,7 +637,8 @@ declare namespace commonEventManager { * This commonEvent means when the device exits the force sleep mode * * @syscap SystemCapability.Notification.CommonEvent - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_EXIT_FORCE_SLEEP = 'usual.event.EXIT_FORCE_SLEEP', @@ -628,7 +646,8 @@ declare namespace commonEventManager { * This commonEvent means when the device is about to enter the hibernate mode * * @syscap SystemCapability.Notification.CommonEvent - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_ENTER_HIBERNATE = 'usual.event.ENTER_HIBERNATE', @@ -636,7 +655,8 @@ declare namespace commonEventManager { * This commonEvent means when the device exits the hibernate mode * * @syscap SystemCapability.Notification.CommonEvent - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_EXIT_HIBERNATE = 'usual.event.EXIT_HIBERNATE', @@ -653,7 +673,8 @@ declare namespace commonEventManager { * This commonEvent means when the current time is changed. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_TIME_TICK = 'usual.event.TIME_TICK', @@ -670,7 +691,8 @@ declare namespace commonEventManager { * This commonEvent means when the current date is changed. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_DATE_CHANGED = 'usual.event.DATE_CHANGED', @@ -687,7 +709,8 @@ declare namespace commonEventManager { * This commonEvent means when the dialog to dismiss. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_CLOSE_SYSTEM_DIALOGS = 'usual.event.CLOSE_SYSTEM_DIALOGS', @@ -695,7 +718,8 @@ declare namespace commonEventManager { * This commonEvent means when a new application package is installed on the device. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_PACKAGE_ADDED = 'usual.event.PACKAGE_ADDED', @@ -704,7 +728,8 @@ declare namespace commonEventManager { * replace the old version.the data contains the name of the package. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_PACKAGE_REPLACED = 'usual.event.PACKAGE_REPLACED', @@ -713,7 +738,8 @@ declare namespace commonEventManager { * replace the old version, it does not contain additional data and only be sent to the replaced application. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_MY_PACKAGE_REPLACED = 'usual.event.MY_PACKAGE_REPLACED', @@ -721,7 +747,8 @@ declare namespace commonEventManager { * This commonEvent means when an existing application package is removed from the device. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_PACKAGE_REMOVED = 'usual.event.PACKAGE_REMOVED', @@ -729,7 +756,8 @@ declare namespace commonEventManager { * This commonEvent means when an existing application package is removed from the device. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BUNDLE_REMOVED = 'usual.event.BUNDLE_REMOVED', @@ -737,7 +765,8 @@ declare namespace commonEventManager { * This commonEvent means when an existing application package is completely removed from the device. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_PACKAGE_FULLY_REMOVED = 'usual.event.PACKAGE_FULLY_REMOVED', @@ -745,7 +774,8 @@ declare namespace commonEventManager { * This commonEvent means when an existing application package has been changed. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_PACKAGE_CHANGED = 'usual.event.PACKAGE_CHANGED', @@ -753,7 +783,8 @@ declare namespace commonEventManager { * This commonEvent means the user has restarted a package, and all of its processes have been killed. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_PACKAGE_RESTARTED = 'usual.event.PACKAGE_RESTARTED', @@ -761,7 +792,8 @@ declare namespace commonEventManager { * This commonEvent means the user has cleared the package data. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_PACKAGE_DATA_CLEARED = 'usual.event.PACKAGE_DATA_CLEARED', @@ -769,7 +801,8 @@ declare namespace commonEventManager { * This commonEvent means the user has cleared the package cache. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_PACKAGE_CACHE_CLEARED = 'usual.event.PACKAGE_CACHE_CLEARED', @@ -777,7 +810,8 @@ declare namespace commonEventManager { * This commonEvent means the packages have been suspended. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_PACKAGES_SUSPENDED = 'usual.event.PACKAGES_SUSPENDED', @@ -785,7 +819,8 @@ declare namespace commonEventManager { * This commonEvent means the packages have been un-suspended. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_PACKAGES_UNSUSPENDED = 'usual.event.PACKAGES_UNSUSPENDED', @@ -793,7 +828,8 @@ declare namespace commonEventManager { * This commonEvent Sent to a package that has been suspended by the system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_MY_PACKAGE_SUSPENDED = 'usual.event.MY_PACKAGE_SUSPENDED', @@ -801,7 +837,8 @@ declare namespace commonEventManager { * Sent to a package that has been un-suspended. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_MY_PACKAGE_UNSUSPENDED = 'usual.event.MY_PACKAGE_UNSUSPENDED', @@ -809,7 +846,8 @@ declare namespace commonEventManager { * A user id has been removed from the system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_UID_REMOVED = 'usual.event.UID_REMOVED', @@ -817,7 +855,8 @@ declare namespace commonEventManager { * The application is first launched after installed. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_PACKAGE_FIRST_LAUNCH = 'usual.event.PACKAGE_FIRST_LAUNCH', @@ -825,7 +864,8 @@ declare namespace commonEventManager { * Sent by system package verifier when a package need to be verified. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_PACKAGE_NEEDS_VERIFICATION = 'usual.event.PACKAGE_NEEDS_VERIFICATION', @@ -833,7 +873,8 @@ declare namespace commonEventManager { * Sent by system package verifier when a package is verified. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_PACKAGE_VERIFIED = 'usual.event.PACKAGE_VERIFIED', @@ -842,7 +883,8 @@ declare namespace commonEventManager { * available since the media on which they exist is available. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_EXTERNAL_APPLICATIONS_AVAILABLE = 'usual.event.EXTERNAL_APPLICATIONS_AVAILABLE', @@ -850,7 +892,8 @@ declare namespace commonEventManager { * Resources for a set of packages are currently unavailable since the media on which they exist is unavailable. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_EXTERNAL_APPLICATIONS_UNAVAILABLE = 'usual.event.EXTERNAL_APPLICATIONS_UNAVAILABLE', @@ -858,7 +901,8 @@ declare namespace commonEventManager { * The device configuration such as orientation,locale have been changed. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_CONFIGURATION_CHANGED = 'usual.event.CONFIGURATION_CHANGED', @@ -866,7 +910,8 @@ declare namespace commonEventManager { * The current device's locale has changed. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_LOCALE_CHANGED = 'usual.event.LOCALE_CHANGED', @@ -874,7 +919,8 @@ declare namespace commonEventManager { * Indicates low memory condition notification acknowledged by user and package management should be started. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_MANAGE_PACKAGE_STORAGE = 'usual.event.MANAGE_PACKAGE_STORAGE', @@ -882,7 +928,8 @@ declare namespace commonEventManager { * Send by the smart function when the system in drive mode. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_DRIVE_MODE = 'common.event.DRIVE_MODE', @@ -890,7 +937,8 @@ declare namespace commonEventManager { * Send by the smart function when the system in home mode. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_HOME_MODE = 'common.event.HOME_MODE', @@ -898,7 +946,8 @@ declare namespace commonEventManager { * Send by the smart function when the system in office mode. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_OFFICE_MODE = 'common.event.OFFICE_MODE', @@ -906,7 +955,8 @@ declare namespace commonEventManager { * Remind new user of preparing to start. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_USER_STARTED = 'usual.event.USER_STARTED', @@ -914,7 +964,8 @@ declare namespace commonEventManager { * Remind previous user of that the service has been the background. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_USER_BACKGROUND = 'usual.event.USER_BACKGROUND', @@ -922,7 +973,8 @@ declare namespace commonEventManager { * Remind new user of that the service has been the foreground. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_USER_FOREGROUND = 'usual.event.USER_FOREGROUND', @@ -931,7 +983,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * This API can be called only by system applications. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_USER_SWITCHED = 'usual.event.USER_SWITCHED', @@ -940,7 +993,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * This API can be called only by system applications. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_USER_STARTING = 'usual.event.USER_STARTING', @@ -948,7 +1002,8 @@ declare namespace commonEventManager { * Remind new user of that the service has been unlocked. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_USER_UNLOCKED = 'usual.event.USER_UNLOCKED', @@ -977,7 +1032,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * This API can be called only by system applications. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_USER_STOPPING = 'usual.event.USER_STOPPING', @@ -985,7 +1041,8 @@ declare namespace commonEventManager { * Remind new user of that the service has stopped. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_USER_STOPPED = 'usual.event.USER_STOPPED', @@ -1032,7 +1089,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_DISTRIBUTED_ACCOUNT_TOKEN_INVALID = 'common.event.DISTRIBUTED_ACCOUNT_TOKEN_INVALID', @@ -1047,7 +1105,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_DISTRIBUTED_ACCOUNT_LOGOFF = 'common.event.DISTRIBUTED_ACCOUNT_LOGOFF', @@ -1055,7 +1114,8 @@ declare namespace commonEventManager { * WIFI state. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_WIFI_POWER_STATE = 'usual.event.wifi.POWER_STATE', @@ -1063,7 +1123,8 @@ declare namespace commonEventManager { * WIFI scan results. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_WIFI_SCAN_FINISHED = 'usual.event.wifi.SCAN_FINISHED', @@ -1071,7 +1132,8 @@ declare namespace commonEventManager { * WIFI RSSI change. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_WIFI_RSSI_VALUE = 'usual.event.wifi.RSSI_VALUE', @@ -1079,7 +1141,8 @@ declare namespace commonEventManager { * WIFI connect state. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_WIFI_CONN_STATE = 'usual.event.wifi.CONN_STATE', @@ -1087,7 +1150,8 @@ declare namespace commonEventManager { * WIFI hotspot state. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_WIFI_HOTSPOT_STATE = 'usual.event.wifi.HOTSPOT_STATE', @@ -1095,7 +1159,8 @@ declare namespace commonEventManager { * WIFI ap sta join. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_WIFI_AP_STA_JOIN = 'usual.event.wifi.WIFI_HS_STA_JOIN', @@ -1103,7 +1168,8 @@ declare namespace commonEventManager { * WIFI ap sta join. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_WIFI_AP_STA_LEAVE = 'usual.event.wifi.WIFI_HS_STA_LEAVE', @@ -1111,7 +1177,8 @@ declare namespace commonEventManager { * Indicates Wi-Fi MpLink state notification acknowledged by binding or unbinding MpLink. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_WIFI_MPLINK_STATE_CHANGE = 'usual.event.wifi.mplink.STATE_CHANGE', @@ -1119,7 +1186,8 @@ declare namespace commonEventManager { * Indicates Wi-Fi P2P connection state notification acknowledged by connecting or disconnected P2P. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_WIFI_P2P_CONN_STATE = 'usual.event.wifi.p2p.CONN_STATE_CHANGE', @@ -1127,7 +1195,8 @@ declare namespace commonEventManager { * Indicates that the Wi-Fi P2P state change. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_WIFI_P2P_STATE_CHANGED = 'usual.event.wifi.p2p.STATE_CHANGE', @@ -1135,7 +1204,8 @@ declare namespace commonEventManager { * Indicates that the Wi-Fi P2P peers state change. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_WIFI_P2P_PEERS_STATE_CHANGED = 'usual.event.wifi.p2p.DEVICES_CHANGE', @@ -1143,7 +1213,8 @@ declare namespace commonEventManager { * Indicates that the Wi-Fi P2P discovery state change. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_WIFI_P2P_PEERS_DISCOVERY_STATE_CHANGED = 'usual.event.wifi.p2p.PEER_DISCOVERY_STATE_CHANGE', @@ -1151,7 +1222,8 @@ declare namespace commonEventManager { * Indicates that the Wi-Fi P2P current device state change. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_WIFI_P2P_CURRENT_DEVICE_STATE_CHANGED = 'usual.event.wifi.p2p.CURRENT_DEVICE_CHANGE', @@ -1159,7 +1231,8 @@ declare namespace commonEventManager { * Indicates that the Wi-Fi P2P group info is changed. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_WIFI_P2P_GROUP_STATE_CHANGED = 'usual.event.wifi.p2p.GROUP_STATE_CHANGED', @@ -1167,7 +1240,8 @@ declare namespace commonEventManager { * Bluetooth.handsfree.ag.connect.state.update. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_HANDSFREE_AG_CONNECT_STATE_UPDATE = 'usual.event.bluetooth.handsfree.ag.CONNECT_STATE_UPDATE', @@ -1175,7 +1249,8 @@ declare namespace commonEventManager { * Bluetooth.handsfree.ag.current.device.update. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_HANDSFREE_AG_CURRENT_DEVICE_UPDATE = 'usual.event.bluetooth.handsfree.ag.CURRENT_DEVICE_UPDATE', @@ -1183,7 +1258,8 @@ declare namespace commonEventManager { * Bluetooth.handsfree.ag.audio.state.update. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_HANDSFREE_AG_AUDIO_STATE_UPDATE = 'usual.event.bluetooth.handsfree.ag.AUDIO_STATE_UPDATE', @@ -1191,7 +1267,8 @@ declare namespace commonEventManager { * Bluetooth.a2dpsource.connect.state.update. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_A2DPSOURCE_CONNECT_STATE_UPDATE = 'usual.event.bluetooth.a2dpsource.CONNECT_STATE_UPDATE', @@ -1199,7 +1276,8 @@ declare namespace commonEventManager { * Bluetooth.a2dpsource.current.device.update. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_A2DPSOURCE_CURRENT_DEVICE_UPDATE = 'usual.event.bluetooth.a2dpsource.CURRENT_DEVICE_UPDATE', @@ -1207,7 +1285,8 @@ declare namespace commonEventManager { * Bluetooth.a2dpsource.playing.state.update. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_A2DPSOURCE_PLAYING_STATE_UPDATE = 'usual.event.bluetooth.a2dpsource.PLAYING_STATE_UPDATE', @@ -1215,7 +1294,8 @@ declare namespace commonEventManager { * Bluetooth.a2dpsource.avrcp.connect.state.update. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_A2DPSOURCE_AVRCP_CONNECT_STATE_UPDATE = 'usual.event.bluetooth.a2dpsource.AVRCP_CONNECT_STATE_UPDATE', @@ -1223,7 +1303,8 @@ declare namespace commonEventManager { * Bluetooth.a2dpsource.codec.value.update. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_A2DPSOURCE_CODEC_VALUE_UPDATE = 'usual.event.bluetooth.a2dpsource.CODEC_VALUE_UPDATE', @@ -1231,7 +1312,8 @@ declare namespace commonEventManager { * Bluetooth.remotedevice.discovered. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_REMOTEDEVICE_DISCOVERED = 'usual.event.bluetooth.remotedevice.DISCOVERED', @@ -1239,7 +1321,8 @@ declare namespace commonEventManager { * Bluetooth.remotedevice.class.value.update. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_REMOTEDEVICE_CLASS_VALUE_UPDATE = 'usual.event.bluetooth.remotedevice.CLASS_VALUE_UPDATE', @@ -1247,7 +1330,8 @@ declare namespace commonEventManager { * Bluetooth.remotedevice.acl.connected. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_REMOTEDEVICE_ACL_CONNECTED = 'usual.event.bluetooth.remotedevice.ACL_CONNECTED', @@ -1255,7 +1339,8 @@ declare namespace commonEventManager { * Bluetooth.remotedevice.acl.disconnected. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_REMOTEDEVICE_ACL_DISCONNECTED = 'usual.event.bluetooth.remotedevice.ACL_DISCONNECTED', @@ -1263,7 +1348,8 @@ declare namespace commonEventManager { * Bluetooth.remotedevice.name.update. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_REMOTEDEVICE_NAME_UPDATE = 'usual.event.bluetooth.remotedevice.NAME_UPDATE', @@ -1271,7 +1357,8 @@ declare namespace commonEventManager { * Bluetooth.remotedevice.pair.state. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_REMOTEDEVICE_PAIR_STATE = 'usual.event.bluetooth.remotedevice.PAIR_STATE', @@ -1279,7 +1366,8 @@ declare namespace commonEventManager { * Bluetooth.remotedevice.battery.value.update. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_REMOTEDEVICE_BATTERY_VALUE_UPDATE = 'usual.event.bluetooth.remotedevice.BATTERY_VALUE_UPDATE', @@ -1287,7 +1375,8 @@ declare namespace commonEventManager { * Bluetooth.remotedevice.sdp.result. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_REMOTEDEVICE_SDP_RESULT = 'usual.event.bluetooth.remotedevice.SDP_RESULT', @@ -1295,7 +1384,8 @@ declare namespace commonEventManager { * Bluetooth.remotedevice.uuid.value. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_REMOTEDEVICE_UUID_VALUE = 'usual.event.bluetooth.remotedevice.UUID_VALUE', @@ -1303,7 +1393,8 @@ declare namespace commonEventManager { * Bluetooth.remotedevice.pairing.req. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_REMOTEDEVICE_PAIRING_REQ = 'usual.event.bluetooth.remotedevice.PAIRING_REQ', @@ -1311,7 +1402,8 @@ declare namespace commonEventManager { * Bluetooth.remotedevice.pairing.cancel. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_REMOTEDEVICE_PAIRING_CANCEL = 'usual.event.bluetooth.remotedevice.PAIRING_CANCEL', @@ -1319,7 +1411,8 @@ declare namespace commonEventManager { * Bluetooth.remotedevice.connect.req. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_REMOTEDEVICE_CONNECT_REQ = 'usual.event.bluetooth.remotedevice.CONNECT_REQ', @@ -1327,7 +1420,8 @@ declare namespace commonEventManager { * Bluetooth.remotedevice.connect.reply. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_REMOTEDEVICE_CONNECT_REPLY = 'usual.event.bluetooth.remotedevice.CONNECT_REPLY', @@ -1335,7 +1429,8 @@ declare namespace commonEventManager { * Bluetooth.remotedevice.connect.cancel. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_REMOTEDEVICE_CONNECT_CANCEL = 'usual.event.bluetooth.remotedevice.CONNECT_CANCEL', @@ -1343,7 +1438,8 @@ declare namespace commonEventManager { * Bluetooth.handsfreeunit.connect.state.update. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_HANDSFREEUNIT_CONNECT_STATE_UPDATE = 'usual.event.bluetooth.handsfreeunit.CONNECT_STATE_UPDATE', @@ -1351,7 +1447,8 @@ declare namespace commonEventManager { * Bluetooth.handsfreeunit.audio.state.update. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_HANDSFREEUNIT_AUDIO_STATE_UPDATE = 'usual.event.bluetooth.handsfreeunit.AUDIO_STATE_UPDATE', @@ -1359,7 +1456,8 @@ declare namespace commonEventManager { * Bluetooth.handsfreeunit.ag.common.event. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_HANDSFREEUNIT_AG_COMMON_EVENT = 'usual.event.bluetooth.handsfreeunit.AG_COMMON_EVENT', @@ -1367,7 +1465,8 @@ declare namespace commonEventManager { * Bluetooth.handsfreeunit.ag.call.state.update. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_HANDSFREEUNIT_AG_CALL_STATE_UPDATE = 'usual.event.bluetooth.handsfreeunit.AG_CALL_STATE_UPDATE', @@ -1375,7 +1474,8 @@ declare namespace commonEventManager { * Bluetooth.host.state.update. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_HOST_STATE_UPDATE = 'usual.event.bluetooth.host.STATE_UPDATE', @@ -1383,7 +1483,8 @@ declare namespace commonEventManager { * Bluetooth.host.req.discoverable. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_HOST_REQ_DISCOVERABLE = 'usual.event.bluetooth.host.REQ_DISCOVERABLE', @@ -1391,7 +1492,8 @@ declare namespace commonEventManager { * Bluetooth.host.req.enable. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_HOST_REQ_ENABLE = 'usual.event.bluetooth.host.REQ_ENABLE', @@ -1399,7 +1501,8 @@ declare namespace commonEventManager { * Bluetooth.host.req.disable. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_HOST_REQ_DISABLE = 'usual.event.bluetooth.host.REQ_DISABLE', @@ -1407,7 +1510,8 @@ declare namespace commonEventManager { * Bluetooth.host.scan.mode.update. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_HOST_SCAN_MODE_UPDATE = 'usual.event.bluetooth.host.SCAN_MODE_UPDATE', @@ -1415,7 +1519,8 @@ declare namespace commonEventManager { * Bluetooth.host.discovery.stated. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_HOST_DISCOVERY_STARTED = 'usual.event.bluetooth.host.DISCOVERY_STARTED', @@ -1423,7 +1528,8 @@ declare namespace commonEventManager { * Bluetooth.host.discovery.finished. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_HOST_DISCOVERY_FINISHED = 'usual.event.bluetooth.host.DISCOVERY_FINISHED', @@ -1431,7 +1537,8 @@ declare namespace commonEventManager { * Bluetooth.host.name.update. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_HOST_NAME_UPDATE = 'usual.event.bluetooth.host.NAME_UPDATE', @@ -1439,7 +1546,8 @@ declare namespace commonEventManager { * Bluetooth.a2dp.connect.state.update. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_A2DPSINK_CONNECT_STATE_UPDATE = 'usual.event.bluetooth.a2dpsink.CONNECT_STATE_UPDATE', @@ -1447,7 +1555,8 @@ declare namespace commonEventManager { * Bluetooth.a2dp.playing.state.update. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_A2DPSINK_PLAYING_STATE_UPDATE = 'usual.event.bluetooth.a2dpsink.PLAYING_STATE_UPDATE', @@ -1455,7 +1564,8 @@ declare namespace commonEventManager { * Bluetooth.a2dp.audio.state.update. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BLUETOOTH_A2DPSINK_AUDIO_STATE_UPDATE = 'usual.event.bluetooth.a2dpsink.AUDIO_STATE_UPDATE', @@ -1463,7 +1573,8 @@ declare namespace commonEventManager { * Nfc state change. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_NFC_ACTION_ADAPTER_STATE_CHANGED = 'usual.event.nfc.action.ADAPTER_STATE_CHANGED', @@ -1471,7 +1582,8 @@ declare namespace commonEventManager { * Nfc field on detected. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_NFC_ACTION_RF_FIELD_ON_DETECTED = 'usual.event.nfc.action.RF_FIELD_ON_DETECTED', @@ -1479,7 +1591,8 @@ declare namespace commonEventManager { * Nfc field off detected. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_NFC_ACTION_RF_FIELD_OFF_DETECTED = 'usual.event.nfc.action.RF_FIELD_OFF_DETECTED', @@ -1487,7 +1600,8 @@ declare namespace commonEventManager { * Sent when stop charging battery. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_DISCHARGING = 'usual.event.DISCHARGING', @@ -1495,7 +1609,8 @@ declare namespace commonEventManager { * Sent when start charging battery. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_CHARGING = 'usual.event.CHARGING', @@ -1504,7 +1619,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_CHARGE_TYPE_CHANGED = 'usual.event.CHARGE_TYPE_CHANGED', @@ -1512,7 +1628,8 @@ declare namespace commonEventManager { * Sent when device's idle mode changed * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_DEVICE_IDLE_MODE_CHANGED = 'usual.event.DEVICE_IDLE_MODE_CHANGED', @@ -1520,7 +1637,8 @@ declare namespace commonEventManager { * Sent when device's charge idle mode changed. * * @syscap SystemCapability.Notification.CommonEvent - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_CHARGE_IDLE_MODE_CHANGED = 'usual.event.CHARGE_IDLE_MODE_CHANGED', @@ -1529,7 +1647,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_DEVICE_IDLE_EXEMPTION_LIST_UPDATED = 'usual.event.DEVICE_IDLE_EXEMPTION_LIST_UPDATED', @@ -1537,7 +1656,8 @@ declare namespace commonEventManager { * Sent when device's power save mode changed * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_POWER_SAVE_MODE_CHANGED = 'usual.event.POWER_SAVE_MODE_CHANGED', @@ -1546,7 +1666,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * This API can be called only by system applications. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_USER_ADDED = 'usual.event.USER_ADDED', @@ -1555,7 +1676,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * This API can be called only by system applications. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_USER_REMOVED = 'usual.event.USER_REMOVED', @@ -1563,7 +1685,8 @@ declare namespace commonEventManager { * Sent when ability is added. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_ABILITY_ADDED = 'common.event.ABILITY_ADDED', @@ -1571,7 +1694,8 @@ declare namespace commonEventManager { * Sent when ability is removed. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_ABILITY_REMOVED = 'common.event.ABILITY_REMOVED', @@ -1579,7 +1703,8 @@ declare namespace commonEventManager { * Sent when ability is updated. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_ABILITY_UPDATED = 'common.event.ABILITY_UPDATED', @@ -1587,7 +1712,8 @@ declare namespace commonEventManager { * Gps mode state changed. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_LOCATION_MODE_STATE_CHANGED = 'usual.event.location.MODE_STATE_CHANGED', @@ -1596,7 +1722,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_IVI_SLEEP = 'common.event.IVI_SLEEP', @@ -1605,7 +1732,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_IVI_PAUSE = 'common.event.IVI_PAUSE', @@ -1614,7 +1742,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_IVI_STANDBY = 'common.event.IVI_STANDBY', @@ -1623,7 +1752,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_IVI_LASTMODE_SAVE = 'common.event.IVI_LASTMODE_SAVE', @@ -1632,7 +1762,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_IVI_VOLTAGE_ABNORMAL = 'common.event.IVI_VOLTAGE_ABNORMAL', @@ -1642,7 +1773,8 @@ declare namespace commonEventManager { * please use COMMON_EVENT_IVI_TEMPERATURE_ABNORMAL. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_IVI_HIGH_TEMPERATURE = 'common.event.IVI_HIGH_TEMPERATURE', @@ -1652,7 +1784,8 @@ declare namespace commonEventManager { * please use COMMON_EVENT_IVI_TEMPERATURE_ABNORMAL. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_IVI_EXTREME_TEMPERATURE = 'common.event.IVI_EXTREME_TEMPERATURE', @@ -1661,7 +1794,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_IVI_TEMPERATURE_ABNORMAL = 'common.event.IVI_TEMPERATURE_ABNORMAL', @@ -1670,7 +1804,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_IVI_VOLTAGE_RECOVERY = 'common.event.IVI_VOLTAGE_RECOVERY', @@ -1679,7 +1814,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_IVI_TEMPERATURE_RECOVERY = 'common.event.IVI_TEMPERATURE_RECOVERY', @@ -1688,7 +1824,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_IVI_ACTIVE = 'common.event.IVI_ACTIVE', @@ -1697,7 +1834,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_USB_STATE = 'usual.event.hardware.usb.action.USB_STATE', @@ -1706,7 +1844,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_USB_PORT_CHANGED = 'usual.event.hardware.usb.action.USB_PORT_CHANGED', @@ -1715,7 +1854,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_USB_DEVICE_ATTACHED = 'usual.event.hardware.usb.action.USB_DEVICE_ATTACHED', @@ -1724,7 +1864,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_USB_DEVICE_DETACHED = 'usual.event.hardware.usb.action.USB_DEVICE_DETACHED', @@ -1733,7 +1874,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_USB_ACCESSORY_ATTACHED = 'usual.event.hardware.usb.action.USB_ACCESSORY_ATTACHED', @@ -1742,7 +1884,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_USB_ACCESSORY_DETACHED = 'usual.event.hardware.usb.action.USB_ACCESSORY_DETACHED', @@ -1751,7 +1894,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_DISK_REMOVED = 'usual.event.data.DISK_REMOVED', @@ -1760,7 +1904,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_DISK_UNMOUNTED = 'usual.event.data.DISK_UNMOUNTED', @@ -1769,7 +1914,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_DISK_MOUNTED = 'usual.event.data.DISK_MOUNTED', @@ -1778,7 +1924,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_DISK_BAD_REMOVAL = 'usual.event.data.DISK_BAD_REMOVAL', @@ -1787,7 +1934,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_DISK_UNMOUNTABLE = 'usual.event.data.DISK_UNMOUNTABLE', @@ -1796,7 +1944,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_DISK_EJECT = 'usual.event.data.DISK_EJECT', @@ -1806,7 +1955,8 @@ declare namespace commonEventManager { * This API can be called only by system applications. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_VOLUME_REMOVED = 'usual.event.data.VOLUME_REMOVED', @@ -1816,7 +1966,8 @@ declare namespace commonEventManager { * This API can be called only by system applications. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_VOLUME_UNMOUNTED = 'usual.event.data.VOLUME_UNMOUNTED', @@ -1826,7 +1977,8 @@ declare namespace commonEventManager { * This API can be called only by system applications. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_VOLUME_MOUNTED = 'usual.event.data.VOLUME_MOUNTED', @@ -1836,7 +1988,8 @@ declare namespace commonEventManager { * This API can be called only by system applications. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_VOLUME_BAD_REMOVAL = 'usual.event.data.VOLUME_BAD_REMOVAL', @@ -1846,7 +1999,8 @@ declare namespace commonEventManager { * This API can be called only by system applications. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_VOLUME_EJECT = 'usual.event.data.VOLUME_EJECT', @@ -1855,7 +2009,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_VISIBLE_ACCOUNTS_UPDATED = 'usual.event.data.VISIBLE_ACCOUNTS_UPDATED', @@ -1865,7 +2020,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * This API can be called only by system applications. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_ACCOUNT_DELETED = 'usual.event.data.ACCOUNT_DELETED', @@ -1874,7 +2030,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_FOUNDATION_READY = 'common.event.FOUNDATION_READY', @@ -1883,7 +2040,8 @@ declare namespace commonEventManager { * Users can register this event to listen to the change of the airplane mode status of the device. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_AIRPLANE_MODE_CHANGED = 'usual.event.AIRPLANE_MODE', @@ -1891,14 +2049,16 @@ declare namespace commonEventManager { * sent by the window manager service when the window mode is split. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ /** * sent by the window manager service when the window mode is split. * * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_SPLIT_SCREEN = 'common.event.SPLIT_SCREEN', @@ -1908,7 +2068,8 @@ declare namespace commonEventManager { * This API can be called only by system applications. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_SLOT_CHANGE = 'usual.event.SLOT_CHANGE', @@ -1917,7 +2078,8 @@ declare namespace commonEventManager { * This common event can be triggered only by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_SPN_INFO_CHANGED = 'usual.event.SPN_INFO_CHANGED', @@ -1926,7 +2088,8 @@ declare namespace commonEventManager { * This common event can be triggered only by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_QUICK_FIX_APPLY_RESULT = 'usual.event.QUICK_FIX_APPLY_RESULT', @@ -1935,7 +2098,8 @@ declare namespace commonEventManager { * This common event can be triggered only by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_QUICK_FIX_REVOKE_RESULT = 'usual.event.QUICK_FIX_REVOKE_RESULT', @@ -1964,7 +2128,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_SIM_STATE_CHANGED = 'usual.event.SIM_STATE_CHANGED', @@ -1975,7 +2140,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_SMS_RECEIVE_COMPLETED = 'usual.event.SMS_RECEIVE_COMPLETED', @@ -1985,7 +2151,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_SMS_EMERGENCY_CB_RECEIVE_COMPLETED = 'usual.event.SMS_EMERGENCY_CB_RECEIVE_COMPLETED', @@ -1995,7 +2162,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_SMS_CB_RECEIVE_COMPLETED = 'usual.event.SMS_CB_RECEIVE_COMPLETED', @@ -2007,7 +2175,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_STK_COMMAND = 'usual.event.STK_COMMAND', @@ -2019,7 +2188,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_STK_SESSION_END = 'usual.event.STK_SESSION_END', @@ -2031,7 +2201,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_STK_CARD_STATE_CHANGED = 'usual.event.STK_CARD_STATE_CHANGED', @@ -2043,7 +2214,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_STK_ALPHA_IDENTIFIER = 'usual.event.STK_ALPHA_IDENTIFIER', @@ -2053,7 +2225,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_SMS_WAPPUSH_RECEIVE_COMPLETED = 'usual.event.SMS_WAPPUSH_RECEIVE_COMPLETED', @@ -2063,7 +2236,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_OPERATOR_CONFIG_CHANGED = 'usual.event.OPERATOR_CONFIG_CHANGED', @@ -2073,7 +2247,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_SIM_CARD_DEFAULT_SMS_SUBSCRIPTION_CHANGED = 'usual.event.SIM.DEFAULT_SMS_SUBSCRIPTION_CHANGED', @@ -2083,7 +2258,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_SIM_CARD_DEFAULT_DATA_SUBSCRIPTION_CHANGED = 'usual.event.SIM.DEFAULT_DATA_SUBSCRIPTION_CHANGED', @@ -2093,7 +2269,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_SIM_CARD_DEFAULT_MAIN_SUBSCRIPTION_CHANGED = 'usual.event.SIM.DEFAULT_MAIN_SUBSCRIPTION_CHANGED', @@ -2103,7 +2280,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_SET_PRIMARY_SLOT_STATUS = 'usual.event.SET_PRIMARY_SLOT_STATUS', @@ -2113,7 +2291,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_PRIMARY_SLOT_ROAMING = 'usual.event.PRIMARY_SLOT_ROAMING', @@ -2123,7 +2302,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_SIM_CARD_DEFAULT_VOICE_SUBSCRIPTION_CHANGED = 'usual.event.SIM.DEFAULT_VOICE_SUBSCRIPTION_CHANGED', @@ -2134,7 +2314,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_CALL_STATE_CHANGED = 'usual.event.CALL_STATE_CHANGED', @@ -2144,7 +2325,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_CELLULAR_DATA_STATE_CHANGED = 'usual.event.CELLULAR_DATA_STATE_CHANGED', @@ -2153,7 +2335,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_NETWORK_STATE_CHANGED = 'usual.event.NETWORK_STATE_CHANGED', @@ -2162,7 +2345,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_SIGNAL_INFO_CHANGED = 'usual.event.SIGNAL_INFO_CHANGED', @@ -2174,7 +2358,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_INCOMING_CALL_MISSED = 'usual.event.INCOMING_CALL_MISSED', @@ -2184,7 +2369,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_RADIO_STATE_CHANGE = 'usual.event.RADIO_STATE_CHANGE', @@ -2194,7 +2380,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_DOMAIN_ACCOUNT_STATUS_CHANGED = 'usual.event.DOMAIN_ACCOUNT_STATUS_CHANGED', @@ -2209,7 +2396,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_SCREEN_UNLOCKED = 'usual.event.SCREEN_UNLOCKED', @@ -2224,7 +2412,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_SCREEN_LOCKED = 'usual.event.SCREEN_LOCKED', @@ -2241,7 +2430,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_CONNECTIVITY_CHANGE = 'usual.event.CONNECTIVITY_CHANGE', @@ -2251,7 +2441,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_SPECIAL_CODE = 'common.event.SPECIAL_CODE', @@ -2261,7 +2452,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_AUDIO_QUALITY_CHANGE = 'usual.event.AUDIO_QUALITY_CHANGE', @@ -2271,7 +2463,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_PRIVACY_STATE_CHANGED = 'usual.event.PRIVACY_STATE_CHANGED', @@ -2281,7 +2474,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_PACKAGE_INSTALLATION_STARTED = 'usual.event.PACKAGE_INSTALLATION_STARTED', @@ -2291,7 +2485,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_DYNAMIC_ICON_CHANGED = 'usual.event.DYNAMIC_ICON_CHANGED', @@ -2325,7 +2520,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_BUNDLE_RESOURCES_CHANGED = 'usual.event.BUNDLE_RESOURCES_CHANGED', @@ -2335,7 +2531,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_DATA_SHARE_READY = 'usual.event.DATA_SHARE_READY', @@ -2345,7 +2542,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 12 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_VPN_CONNECTION_STATUS_CHANGED = 'usual.event.VPN_CONNECTION_STATUS_CHANGED', @@ -2357,7 +2555,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_RESTORE_START = 'usual.event.RESTORE_START', @@ -2366,7 +2565,8 @@ declare namespace commonEventManager { * This is a protected common event that can only be sent by system. * * @syscap SystemCapability.Notification.CommonEvent - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_MANAGED_BROWSER_POLICY_CHANGED = 'usual.event.MANAGED_BROWSER_POLICY_CHANGED', @@ -2378,7 +2578,8 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT_DEFAULT_APPLICATION_CHANGED = 'usual.event.DEFAULT_APPLICATION_CHANGED', diff --git a/api/commonEvent/commonEventSubscriber.d.ts b/api/commonEvent/commonEventSubscriber.d.ts index d9ca0aaa1e..eb2f3d03c8 100644 --- a/api/commonEvent/commonEventSubscriber.d.ts +++ b/api/commonEvent/commonEventSubscriber.d.ts @@ -55,7 +55,8 @@ export interface CommonEventSubscriber { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getCode(callback: AsyncCallback): void; @@ -72,7 +73,8 @@ export interface CommonEventSubscriber { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getCode(): Promise; @@ -89,7 +91,8 @@ export interface CommonEventSubscriber { * @returns { number } Common event code. * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getCodeSync(): number; @@ -112,7 +115,8 @@ export interface CommonEventSubscriber { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setCode(code: number, callback: AsyncCallback): void; @@ -135,7 +139,8 @@ export interface CommonEventSubscriber { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setCode(code: number): Promise; @@ -156,7 +161,8 @@ export interface CommonEventSubscriber { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setCodeSync(code: number): void; @@ -177,7 +183,8 @@ export interface CommonEventSubscriber { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getData(callback: AsyncCallback): void; @@ -194,7 +201,8 @@ export interface CommonEventSubscriber { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getData(): Promise; @@ -211,7 +219,8 @@ export interface CommonEventSubscriber { * @returns { string } Common event data. * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getDataSync(): string; @@ -234,7 +243,8 @@ export interface CommonEventSubscriber { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setData(data: string, callback: AsyncCallback): void; @@ -257,7 +267,8 @@ export interface CommonEventSubscriber { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setData(data: string): Promise; @@ -278,7 +289,8 @@ export interface CommonEventSubscriber { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setDataSync(data: string): void; @@ -303,7 +315,8 @@ export interface CommonEventSubscriber { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setCodeAndData(code: number, data: string, callback: AsyncCallback): void; @@ -328,7 +341,8 @@ export interface CommonEventSubscriber { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setCodeAndData(code: number, data: string): Promise; @@ -351,7 +365,8 @@ export interface CommonEventSubscriber { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setCodeAndDataSync(code: number, data: string): void; @@ -362,7 +377,8 @@ export interface CommonEventSubscriber { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.CommonEvent - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ isOrderedCommonEvent(callback: AsyncCallback): void; @@ -371,7 +387,8 @@ export interface CommonEventSubscriber { * * @returns { Promise } Promise used to return the result. Returns true if the common event is an ordered one; returns false otherwise. * @syscap SystemCapability.Notification.CommonEvent - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ isOrderedCommonEvent(): Promise; @@ -380,7 +397,8 @@ export interface CommonEventSubscriber { * * @returns { boolean } Returns true if the common event is an ordered one; returns false otherwise. * @syscap SystemCapability.Notification.CommonEvent - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ isOrderedCommonEventSync(): boolean; @@ -391,7 +409,8 @@ export interface CommonEventSubscriber { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.CommonEvent - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ isStickyCommonEvent(callback: AsyncCallback): void; @@ -400,7 +419,8 @@ export interface CommonEventSubscriber { * * @returns { Promise } Promise used to return the result. Returns true if the common event is a sticky one; returns false otherwise. * @syscap SystemCapability.Notification.CommonEvent - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ isStickyCommonEvent(): Promise; @@ -409,7 +429,8 @@ export interface CommonEventSubscriber { * * @returns { boolean } Returns true if the common event is a sticky one; returns false otherwise. * @syscap SystemCapability.Notification.CommonEvent - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ isStickyCommonEventSync(): boolean; @@ -420,7 +441,8 @@ export interface CommonEventSubscriber { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.CommonEvent - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ abortCommonEvent(callback: AsyncCallback): void; @@ -429,7 +451,8 @@ export interface CommonEventSubscriber { * * @returns { Promise } Promise that returns no value. * @syscap SystemCapability.Notification.CommonEvent - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ abortCommonEvent(): Promise; @@ -437,7 +460,8 @@ export interface CommonEventSubscriber { * Aborts an ordered common event when used with finishCommonEvent. After the abort, the common event is not sent to the next subscriber. * * @syscap SystemCapability.Notification.CommonEvent - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ abortCommonEventSync(): void; @@ -448,7 +472,8 @@ export interface CommonEventSubscriber { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.CommonEvent - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ clearAbortCommonEvent(callback: AsyncCallback): void; @@ -457,7 +482,8 @@ export interface CommonEventSubscriber { * * @returns { Promise } Promise that returns no value. * @syscap SystemCapability.Notification.CommonEvent - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ clearAbortCommonEvent(): Promise; @@ -465,7 +491,8 @@ export interface CommonEventSubscriber { * Clears the aborted state of an ordered common event when used with finishCommonEvent. After the clearance, the common event is sent to the next subscriber. * * @syscap SystemCapability.Notification.CommonEvent - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ clearAbortCommonEventSync(): void; @@ -476,7 +503,8 @@ export interface CommonEventSubscriber { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.CommonEvent - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ getAbortCommonEvent(callback: AsyncCallback): void; @@ -485,7 +513,8 @@ export interface CommonEventSubscriber { * * @returns { Promise } Checks whether this ordered common event should be aborted. This API uses a promise to return the result. * @syscap SystemCapability.Notification.CommonEvent - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ getAbortCommonEvent(): Promise; @@ -494,7 +523,8 @@ export interface CommonEventSubscriber { * * @returns { boolean } Returns true if the ordered common event is in the aborted state; returns false otherwise. * @syscap SystemCapability.Notification.CommonEvent - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ getAbortCommonEventSync(): boolean; @@ -516,7 +546,8 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getSubscribeInfo(callback: AsyncCallback): void; @@ -534,7 +565,8 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getSubscribeInfo(): Promise; @@ -551,7 +583,8 @@ export interface CommonEventSubscriber { * @returns { CommonEventSubscribeInfo } Subscriber information. * @syscap SystemCapability.Notification.CommonEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getSubscribeInfoSync(): CommonEventSubscribeInfo; @@ -562,7 +595,8 @@ export interface CommonEventSubscriber { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ finishCommonEvent(callback: AsyncCallback): void; @@ -571,7 +605,8 @@ export interface CommonEventSubscriber { * * @returns { Promise } Promise that returns no value. * @syscap SystemCapability.Notification.CommonEvent - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ finishCommonEvent(): Promise; } -- Gitee From 2ecc66340bff80fa679e6518ddcce3b1dcca65a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=98=8A=E8=8B=8F?= Date: Thu, 10 Jul 2025 20:49:37 +0800 Subject: [PATCH 058/746] =?UTF-8?q?=E6=89=93=E5=8D=B0number=E8=BD=ACint;?= =?UTF-8?q?=20Signed-off-by:liuhaosu@huawei.com?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘昊苏 --- ...hos.app.ability.PrintExtensionAbility.d.ts | 45 +++-- api/@ohos.print.d.ts | 163 ++++++++++-------- 2 files changed, 116 insertions(+), 92 deletions(-) diff --git a/api/@ohos.app.ability.PrintExtensionAbility.d.ts b/api/@ohos.app.ability.PrintExtensionAbility.d.ts index ce61e8acfe..e44ce52971 100644 --- a/api/@ohos.app.ability.PrintExtensionAbility.d.ts +++ b/api/@ohos.app.ability.PrintExtensionAbility.d.ts @@ -26,7 +26,8 @@ import type print from './@ohos.print'; * * @syscap SystemCapability.Print.PrintFramework * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ export default class PrintExtensionAbility { @@ -35,7 +36,8 @@ export default class PrintExtensionAbility { * @param { Want } want - call print page want params. * @syscap SystemCapability.Print.PrintFramework * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ onCreate(want: Want): void; @@ -43,7 +45,8 @@ export default class PrintExtensionAbility { * Called once to start to discover the printers connected with the device. * @syscap SystemCapability.Print.PrintFramework * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ onStartDiscoverPrinter(): void; @@ -51,27 +54,30 @@ export default class PrintExtensionAbility { * Called once to stop discovering the printer. * @syscap SystemCapability.Print.PrintFramework * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ onStopDiscoverPrinter(): void; /** * Called once to connect to the specific printer. - * @param { number } printerId - connect the printerId. + * @param { int } printerId - connect the printerId. * @syscap SystemCapability.Print.PrintFramework * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ - onConnectPrinter(printerId: number): void; + onConnectPrinter(printerId: int): void; /** * Called once to disconnect to the specific printer. - * @param { number } printerId - connect the printerId. + * @param { int } printerId - connect the printerId. * @syscap SystemCapability.Print.PrintFramework * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ - onDisconnectPrinter(printerId: number): void; + onDisconnectPrinter(printerId: int): void; /** * Called once to start print job. @@ -80,7 +86,8 @@ export default class PrintExtensionAbility { * @syscap SystemCapability.Print.PrintFramework * @systemapi Hide this for inner system use. * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ onStartPrintJob(jobInfo: print.PrintJob): void; @@ -91,21 +98,23 @@ export default class PrintExtensionAbility { * @syscap SystemCapability.Print.PrintFramework * @systemapi Hide this for inner system use. * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ onCancelPrintJob(jobInfo: print.PrintJob): void; /** * Called once to request the capability of the printer. - * @param { number } printerId - Indicates the information of printer. + * @param { int } printerId - Indicates the information of printer. * @returns { print.PrinterCapability } printer capability. * @throws { BusinessError } 202 - not system application * @syscap SystemCapability.Print.PrintFramework * @systemapi Hide this for inner system use. * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ - onRequestPrinterCapability(printerId: number): print.PrinterCapability; + onRequestPrinterCapability(printerId: int): print.PrinterCapability; /** * Called once to request preview and send result to Print SA. @@ -115,7 +124,8 @@ export default class PrintExtensionAbility { * @syscap SystemCapability.Print.PrintFramework * @systemapi Hide this for inner system use. * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ onRequestPreview(jobInfo: print.PrintJob): string; @@ -123,7 +133,8 @@ export default class PrintExtensionAbility { * Called once to finalize the extensionAbility. * @syscap SystemCapability.Print.PrintFramework * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ onDestroy(): void; } diff --git a/api/@ohos.print.d.ts b/api/@ohos.print.d.ts index bb0acedf50..da2ed40d14 100644 --- a/api/@ohos.print.d.ts +++ b/api/@ohos.print.d.ts @@ -144,6 +144,20 @@ declare namespace print { off(type: 'cancel', callback?: Callback): void; } + /** + * Defines the callback type used for receiving print file write results. + * The value of jobId indicates the identifier of the print job. + * The value of writeResult indicates the state of the print file creation. + * + * @typedef { function } PrinterWriteResultCallback + * @param { string } jobId - the identifier of the print job + * @param { PrintFileCreationState } writeResult - the state of the print file creation + * @syscap SystemCapability.Print.PrintFramework + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + type PrinterWriteResultCallback = (jobId: string, writeResult: PrintFileCreationState) => void; + /** * Third-party application implement this interface to render files to be printed. * @interface PrintDocumentAdapter @@ -152,23 +166,22 @@ declare namespace print { * @arkts 1.1&1.2 */ interface PrintDocumentAdapter { - /** * Implement this function to update the print file. * @permission ohos.permission.PRINT * @param { string } jobId - Indicates print job id. * @param { PrintAttributes } oldAttrs - Indicates old print attributes. * @param { PrintAttributes } newAttrs - Indicates new print attributes. - * @param { number } fd - Indicates print file fd. - * @param { function } writeResultCallback - Indicates this function should execute after the file is updated. + * @param { int } fd - Indicates print file fd. + * @param { PrinterWriteResultCallback } writeResultCallback - Indicates this function should execute after the file is updated. * @throws { BusinessError } 201 - the application does not have permission to call this function. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ - onStartLayoutWrite(jobId: string, oldAttrs: PrintAttributes, newAttrs: PrintAttributes, fd: number, - writeResultCallback: (jobId: string, writeResult: PrintFileCreationState) => void): void; + onStartLayoutWrite(jobId: string, oldAttrs: PrintAttributes, newAttrs: PrintAttributes, fd: int, + writeResultCallback: PrinterWriteResultCallback): void; /** * Implement this function to listen job status change. @@ -265,12 +278,12 @@ declare namespace print { interface PrintAttributes { /** * Copies of document list. - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ - copyNumber?: number; + copyNumber?: int; /** * Range size to be printed. @@ -328,30 +341,30 @@ declare namespace print { interface PrintPageRange { /** * Start page of sequence. - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ - startPage?: number; + startPage?: int; /** * End page of sequence. - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ - endPage?: number; + endPage?: int; /** * Discrete page of sequence. - * @type { ?Array } + * @type { ?Array } * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ - pages?: Array; + pages?: Array; } /** @@ -365,43 +378,43 @@ declare namespace print { interface PrintMargin { /** * Top margin. - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Print.PrintFramework * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 */ - top?: number; + top?: int; /** * Bottom margin. - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Print.PrintFramework * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 */ - bottom?: number; + bottom?: int; /** * Left margin. - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Print.PrintFramework * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 */ - left?: number; + left?: int; /** * Right margin. - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Print.PrintFramework * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 */ - right?: number; + right?: int; } /** @@ -415,33 +428,33 @@ declare namespace print { interface PrinterRange { /** * Start page of sequence. - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Print.PrintFramework * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 */ - startPage?: number; + startPage?: int; /** * End page of sequence. - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Print.PrintFramework * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 */ - endPage?: number; + endPage?: int; /** * Discrete page of sequence. - * @type { ?Array } + * @type { ?Array } * @syscap SystemCapability.Print.PrintFramework * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 */ - pages?: Array; + pages?: Array; } /** @@ -465,13 +478,13 @@ declare namespace print { /** * Preview file result. - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Print.PrintFramework * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 */ - result?: number; + result?: int; } /** @@ -495,23 +508,23 @@ declare namespace print { /** * Horizontal DPI. - * @type { number } + * @type { int } * @syscap SystemCapability.Print.PrintFramework * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 */ - horizontalDpi: number; + horizontalDpi: int; /** * Vertical DPI. - * @type { number } + * @type { int } * @syscap SystemCapability.Print.PrintFramework * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 */ - verticalDpi: number; + verticalDpi: int; } /** @@ -542,21 +555,21 @@ declare namespace print { /** * Unit: millimeter width. - * @type { number } + * @type { int } * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ - width: number; + width: int; /** * Unit: millimeter height. - * @type { number } + * @type { int } * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ - height: number; + height: int; } /** @@ -570,23 +583,23 @@ declare namespace print { interface PrinterCapability { /** * Color mode. - * @type { number } + * @type { int } * @syscap SystemCapability.Print.PrintFramework * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 */ - colorMode: number; + colorMode: int; /** * Duplex mode. - * @type { number } + * @type { int } * @syscap SystemCapability.Print.PrintFramework * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 */ - duplexMode: number; + duplexMode: int; /** * The page size list supported by the printer. @@ -670,13 +683,13 @@ declare namespace print { /** * Resource id of printer icon. - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Print.PrintFramework * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 */ - printerIcon?: number; + printerIcon?: int; /** * Printer description. @@ -720,13 +733,13 @@ declare namespace print { interface PrintJob { /** * Document fd list to be printed. - * @type { Array } + * @type { Array } * @syscap SystemCapability.Print.PrintFramework * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 */ - fdList: Array; + fdList: Array; /** * Job id. @@ -770,13 +783,13 @@ declare namespace print { /** * Copies of document list. - * @type { number } + * @type { int } * @syscap SystemCapability.Print.PrintFramework * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 */ - copyNumber: number; + copyNumber: int; /** * Range size to be printed. @@ -820,23 +833,23 @@ declare namespace print { /** * Color mode. - * @type { number } + * @type { int } * @syscap SystemCapability.Print.PrintFramework * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 */ - colorMode: number; + colorMode: int; /** * Duplex mode. - * @type { number } + * @type { int } * @syscap SystemCapability.Print.PrintFramework * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 */ - duplexMode: number; + duplexMode: int; /** * Current margin setting. @@ -871,7 +884,7 @@ declare namespace print { /** * Enumeration of Print Direction Mode. - * @enum { number } PrintDirectionMode + * @enum { int } PrintDirectionMode * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 @@ -904,7 +917,7 @@ declare namespace print { /** * Enumeration of Print Color Mode. - * @enum { number } PrintColorMode + * @enum { int } PrintColorMode * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 @@ -929,7 +942,7 @@ declare namespace print { /** * Enumeration of Print Duplex Mode. - * @enum { number } PrintDuplexMode + * @enum { int } PrintDuplexMode * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 @@ -962,7 +975,7 @@ declare namespace print { /** * Enumeration of Print Page Type. - * @enum { number } PrintPageType + * @enum { int } PrintPageType * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 @@ -1067,7 +1080,7 @@ declare namespace print { /** * Enumeration of Print Document Adapter State. - * @enum { number } PrintDocumentAdapterState + * @enum { int } PrintDocumentAdapterState * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 @@ -1116,7 +1129,7 @@ declare namespace print { /** * Enumeration of Print File Creation State. - * @enum { number } PrintFileCreationState + * @enum { int } PrintFileCreationState * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 @@ -1149,7 +1162,7 @@ declare namespace print { /** * Enumeration of Printer State. - * @enum { number } PrinterState + * @enum { int } PrinterState * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 @@ -1206,7 +1219,7 @@ declare namespace print { /** * Enumeration of Print Job State. - * @enum { number } PrintJobState + * @enum { int } PrintJobState * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 @@ -1255,7 +1268,7 @@ declare namespace print { /** * Enumeration of Print Job Sub State. - * @enum { number } PrintJobSubState + * @enum { int } PrintJobSubState * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 @@ -1496,7 +1509,7 @@ declare namespace print { /** * Enumeration of Print error Code. - * @enum { number } PrintErrorCode + * @enum { int } PrintErrorCode * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 @@ -1593,7 +1606,7 @@ declare namespace print { /** * Enumeration of application event. - * @enum { number } ApplicationEvent + * @enum { int } ApplicationEvent * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 @@ -1665,13 +1678,13 @@ declare namespace print { /** * Vendor icon. - * @type { number } + * @type { int } * @syscap SystemCapability.Print.PrintFramework * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 */ - vendorIcon: number; + vendorIcon: int; /** * Version of current printer extension. @@ -1922,7 +1935,7 @@ declare namespace print { * Request preview of the print job. * @permission ohos.permission.MANAGE_PRINT_JOB * @param { PrintJob } jobInfo - Indicates the information of print job. - * @param { Callback } callback - The callback function for indcating the result of API execution. + * @param { Callback } callback - The callback function for indcating the result of API execution. * @throws { BusinessError } 201 - the application does not have permission to call this function. * @throws { BusinessError } 202 - not system application * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. @@ -1931,13 +1944,13 @@ declare namespace print { * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 */ - function requestPrintPreview(jobInfo: PrintJob, callback: Callback): void; + function requestPrintPreview(jobInfo: PrintJob, callback: Callback): void; /** * Request preview of the print job. * @permission ohos.permission.MANAGE_PRINT_JOB * @param { PrintJob } jobInfo - Indicates the information of print job. - * @returns { Promise } the promise returned by the function. + * @returns { Promise } the promise returned by the function. * @throws { BusinessError } 201 - the application does not have permission to call this function. * @throws { BusinessError } 202 - not system application * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. @@ -1946,7 +1959,7 @@ declare namespace print { * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 */ - function requestPrintPreview(jobInfo: PrintJob): Promise; + function requestPrintPreview(jobInfo: PrintJob): Promise; /** * Register event callback for the state change of printer. @@ -2315,7 +2328,7 @@ declare namespace print { * @permission ohos.permission.MANAGE_PRINT_JOB * @param { string } jobId - Indicates id of the print job. * @param { PrintAttributes } printAttributes - Indicates print attributes. - * @param { number } fd - Indicates print file fd. + * @param { int } fd - Indicates print file fd. * @param { Callback } onFileStateChanged - The callback function for update the file state. * @throws { BusinessError } 201 - the application does not have permission to call this function. * @throws { BusinessError } 202 - not system application @@ -2325,7 +2338,7 @@ declare namespace print { * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ - function startGettingPrintFile(jobId: string, printAttributes: PrintAttributes, fd: number, + function startGettingPrintFile(jobId: string, printAttributes: PrintAttributes, fd: int, onFileStateChanged: Callback): void; /** @@ -2626,7 +2639,7 @@ declare namespace print { /** * Enumeration of Print Quality. - * @enum { number } PrintQuality + * @enum { int } PrintQuality * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 @@ -2659,7 +2672,7 @@ declare namespace print { /** * Enumeration of Print OrientationMode. - * @enum { number } PrintOrientationMode + * @enum { int } PrintOrientationMode * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 @@ -2708,7 +2721,7 @@ declare namespace print { /** * Enumeration of Printer Status. - * @enum { number } PrinterStatus + * @enum { int } PrinterStatus * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 @@ -2813,7 +2826,7 @@ declare namespace print { /** * Enumeration of Printer Change Events. - * @enum { number } PrinterEvent + * @enum { int } PrinterEvent * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'18','1.2':'20'} * @arkts 1.1&1.2 @@ -2870,7 +2883,7 @@ declare namespace print { /** * Enumeration of default printer type. - * @enum { number } DefaultPrinterType + * @enum { int } DefaultPrinterType * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'18','1.2':'20'} * @arkts 1.1&1.2 -- Gitee From 2145e7d37ff988c232ea7990679e568eab5e0d19 Mon Sep 17 00:00:00 2001 From: lxt Date: Fri, 11 Jul 2025 12:13:22 +0800 Subject: [PATCH 059/746] =?UTF-8?q?feat:pasteboard.ts=200328=E5=8F=98?= =?UTF-8?q?=E5=9F=BA0702?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lxt --- api/@ohos.pasteboard.d.ts | 159 +++++++++++++++++++++----------------- 1 file changed, 88 insertions(+), 71 deletions(-) diff --git a/api/@ohos.pasteboard.d.ts b/api/@ohos.pasteboard.d.ts index c5d0d860fd..ddd320d4b1 100644 --- a/api/@ohos.pasteboard.d.ts +++ b/api/@ohos.pasteboard.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -21,9 +21,7 @@ import { AsyncCallback } from './@ohos.base'; import Want from './@ohos.app.ability.Want'; import image from './@ohos.multimedia.image'; -/*** if arkts 1.1 */ import unifiedDataChannel from './@ohos.data.unifiedDataChannel'; -/*** endif */ /** * systemPasteboard @@ -36,7 +34,7 @@ import unifiedDataChannel from './@ohos.data.unifiedDataChannel'; * @namespace pasteboard * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ declare namespace pasteboard { @@ -65,7 +63,7 @@ declare namespace pasteboard { * @constant * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ const MIMETYPE_TEXT_HTML = 'text/html'; @@ -80,8 +78,7 @@ declare namespace pasteboard { * @constant * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ const MIMETYPE_TEXT_WANT = 'text/want'; /** @@ -95,7 +92,7 @@ declare namespace pasteboard { * @constant * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ const MIMETYPE_TEXT_PLAIN = 'text/plain'; @@ -110,7 +107,7 @@ declare namespace pasteboard { * @constant * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ const MIMETYPE_TEXT_URI = 'text/uri'; @@ -125,8 +122,7 @@ declare namespace pasteboard { * @constant * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ const MIMETYPE_PIXELMAP = 'pixelMap'; @@ -141,7 +137,7 @@ declare namespace pasteboard { * @typedef { string | image.PixelMap | Want | ArrayBuffer } * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ type ValueType = string | image.PixelMap | Want | ArrayBuffer; @@ -211,7 +207,7 @@ declare namespace pasteboard { * 3. Parameter verification failed. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ function createData(mimeType: string, value: ValueType): PasteData; @@ -224,7 +220,7 @@ declare namespace pasteboard { * 2. Incorrect parameters types; * 3. Parameter verification failed. * @syscap SystemCapability.MiscServices.Pasteboard - * @since arkts {'1.1':'14', '1.2':'20'} + * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 */ function createData(data: Record): PasteData; @@ -309,7 +305,7 @@ declare namespace pasteboard { * @returns { SystemPasteboard } The system clipboard object * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ function getSystemPasteboard(): SystemPasteboard; @@ -325,7 +321,7 @@ declare namespace pasteboard { * @enum { number } * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ enum ShareOption { @@ -338,7 +334,7 @@ declare namespace pasteboard { * INAPP indicates that only intra-application pasting is allowed. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ INAPP, @@ -351,7 +347,7 @@ declare namespace pasteboard { * LOCALDEVICE indicates that paste is allowed in any application. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ LOCALDEVICE, @@ -364,8 +360,7 @@ declare namespace pasteboard { * CROSSDEVICE indicates that paste is allowed in any application across devices. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 * @deprecated since 12 */ CROSSDEVICE @@ -375,19 +370,22 @@ declare namespace pasteboard { * Enumerates the patterns allowed in the system pasteboard. * @enum { number } * @syscap SystemCapability.MiscServices.Pasteboard - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ enum Pattern { /** * URL pattern. * @syscap SystemCapability.MiscServices.Pasteboard - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ URL = 0, /** * Number pattern. * @syscap SystemCapability.MiscServices.Pasteboard - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ NUMBER = 1, /** @@ -411,7 +409,7 @@ declare namespace pasteboard { * @interface PasteDataProperty * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ interface PasteDataProperty { @@ -458,7 +456,7 @@ declare namespace pasteboard { * @type { string } * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ tag: string; @@ -471,14 +469,14 @@ declare namespace pasteboard { */ /** * a timestamp, which indicates when data is written to the system pasteboard. - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ - readonly timestamp: number; + readonly timestamp: long; /** * Checks whether PasteData is set for local access only. * @type { boolean } @@ -506,7 +504,7 @@ declare namespace pasteboard { * @type { ShareOption } * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ shareOption: ShareOption; @@ -523,7 +521,7 @@ declare namespace pasteboard { * @interface PasteDataRecord * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ interface PasteDataRecord { @@ -566,7 +564,7 @@ declare namespace pasteboard { * @type { string } * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ mimeType: string; @@ -581,7 +579,7 @@ declare namespace pasteboard { * @type { string } * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ plainText: string; @@ -596,7 +594,7 @@ declare namespace pasteboard { * @type { string } * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ uri: string; @@ -611,7 +609,8 @@ declare namespace pasteboard { * @type { image.PixelMap } * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ pixelMap: image.PixelMap; /** @@ -663,7 +662,8 @@ declare namespace pasteboard { * @returns { string } the string returned by the function. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ toPlainText(): string; @@ -699,7 +699,8 @@ declare namespace pasteboard { * 2. Incorrect parameters types; * 3. Parameter verification failed. * @syscap SystemCapability.MiscServices.Pasteboard - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ getData(type: string): Promise; } @@ -715,7 +716,7 @@ declare namespace pasteboard { * @interface PasteData * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ interface PasteData { @@ -750,7 +751,7 @@ declare namespace pasteboard { * @param { PasteDataRecord } record - The content of a new record. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ addRecord(record: PasteDataRecord): void; @@ -805,7 +806,7 @@ declare namespace pasteboard { * 3. Parameter verification failed. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ addRecord(mimeType: string, value: ValueType): void; @@ -821,7 +822,8 @@ declare namespace pasteboard { * @returns { Array } type of array * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ getMimeTypes(): Array; @@ -836,7 +838,8 @@ declare namespace pasteboard { * @returns { string } type of htmltext * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ getPrimaryHtml(): string; @@ -851,7 +854,8 @@ declare namespace pasteboard { * @returns { Want } type of want * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ getPrimaryWant(): Want; @@ -866,7 +870,8 @@ declare namespace pasteboard { * @returns { string } type of mimetype * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ getPrimaryMimeType(): string; @@ -881,7 +886,8 @@ declare namespace pasteboard { * @returns { string } type of text * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ getPrimaryText(): string; @@ -896,7 +902,8 @@ declare namespace pasteboard { * @returns { string } type of uri * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ getPrimaryUri(): string; @@ -926,7 +933,7 @@ declare namespace pasteboard { * @returns { PasteDataProperty } PasteDataProperty type of PasteDataProperty * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ getProperty(): PasteDataProperty; @@ -946,7 +953,7 @@ declare namespace pasteboard { * 2. Incorrect parameters types. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ setProperty(property: PasteDataProperty): void; @@ -976,17 +983,17 @@ declare namespace pasteboard { */ /** * Gets record by index in PasteData. - * @param { number } index - indicates the record index in PasteData. + * @param { int } index - indicates the record index in PasteData. * @returns { PasteDataRecord } the record in PasteData with index. * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameters types. * @throws { BusinessError } 12900001 - The index is out of the record. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ - getRecord(index: number): PasteDataRecord; + getRecord(index: int): PasteDataRecord; /** * the number of records in a PasteData object. @@ -996,13 +1003,13 @@ declare namespace pasteboard { */ /** * the number of records in a PasteData object. - * @returns { number } The number of the clipboard contents + * @returns { int } The number of the clipboard contents * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ - getRecordCount(): number; + getRecordCount(): int; /** * the user-defined tag of a PasteData object. @@ -1015,7 +1022,8 @@ declare namespace pasteboard { * @returns { string } type of tag * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ getTag(): string; @@ -1300,7 +1308,7 @@ declare namespace pasteboard { * @interface SystemPasteboard * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ interface SystemPasteboard { @@ -1311,7 +1319,8 @@ declare namespace pasteboard { * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameters types. * @syscap SystemCapability.MiscServices.Pasteboard - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'update', callback: () => void): void; @@ -1323,7 +1332,8 @@ declare namespace pasteboard { * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameters types. * @syscap SystemCapability.MiscServices.Pasteboard - * @since 7 + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'update', callback?: () => void): void; @@ -1343,7 +1353,7 @@ declare namespace pasteboard { * @throws { BusinessError } 12900005 - Excessive processing time for internal data. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ getDataSource(): string; @@ -1357,7 +1367,7 @@ declare namespace pasteboard { * @throws { BusinessError } 12900005 - Excessive processing time for internal data. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ hasDataType(mimeType: string): boolean; @@ -1399,7 +1409,7 @@ declare namespace pasteboard { * 2. Incorrect parameters types. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ clearData(callback: AsyncCallback): void; @@ -1415,7 +1425,7 @@ declare namespace pasteboard { * @returns { Promise } the promise returned by the clearData. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ clearData(): Promise; @@ -1425,7 +1435,8 @@ declare namespace pasteboard { * @throws { BusinessError } 12900005 - Excessive processing time for internal data. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ clearDataSync(): void; @@ -1481,7 +1492,8 @@ declare namespace pasteboard { * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getData(callback: AsyncCallback): void; @@ -1509,7 +1521,8 @@ declare namespace pasteboard { * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getData(): Promise; @@ -1530,7 +1543,7 @@ declare namespace pasteboard { * @throws { BusinessError } 12900005 - Excessive processing time for internal data. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} + * @since arkts {'1.1':'12','1.2':'20'} * @arkts 1.1&1.2 */ getDataSync(): PasteData; @@ -1572,7 +1585,8 @@ declare namespace pasteboard { * 2. Incorrect parameters types. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ hasData(callback: AsyncCallback): void; @@ -1587,7 +1601,8 @@ declare namespace pasteboard { * @returns { Promise } the promise returned by the function. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ hasData(): Promise; @@ -1597,7 +1612,8 @@ declare namespace pasteboard { * @throws { BusinessError } 12900005 - Excessive processing time for internal data. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ hasDataSync(): boolean; @@ -1646,7 +1662,7 @@ declare namespace pasteboard { * @throws { BusinessError } 27787278 - Replication is prohibited. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ setData(data: PasteData, callback: AsyncCallback): void; @@ -1672,7 +1688,7 @@ declare namespace pasteboard { * @throws { BusinessError } 27787278 - Replication is prohibited. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ setData(data: PasteData): Promise; @@ -1808,7 +1824,8 @@ declare namespace pasteboard { * @returns { Promise> } Promise used to return the MIME types. * @syscap SystemCapability.MiscServices.Pasteboard * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ getMimeTypes(): Promise>; -- Gitee From dd230d07f6b61e2009be8db5de34219911a8cff5 Mon Sep 17 00:00:00 2001 From: liuxinbing Date: Thu, 10 Jul 2025 06:18:47 +0000 Subject: [PATCH 060/746] cherry-pick Signed-off-by: liuxinbing --- api/@ohos.geoLocationManager.d.ts | 503 ++++++++++++++++++++---------- kits/@kit.LocationKit.d.ts | 11 +- 2 files changed, 344 insertions(+), 170 deletions(-) diff --git a/api/@ohos.geoLocationManager.d.ts b/api/@ohos.geoLocationManager.d.ts index d5413e5ba8..74511e841d 100644 --- a/api/@ohos.geoLocationManager.d.ts +++ b/api/@ohos.geoLocationManager.d.ts @@ -22,9 +22,10 @@ import { AsyncCallback, Callback } from './@ohos.base'; /*** if arkts 1.1 */ import { WantAgent } from './@ohos.wantAgent'; /*** endif */ -/*** if arkts 1.1 */ -import { NotificationRequest } from './notification/notificationRequest'; +/*** if arkts 1.2 */ +import { WantAgent } from '@ohos.app.ability.wantAgent'; /*** endif */ +import { NotificationRequest } from './notification/notificationRequest'; /** * Provides interfaces for acquiring location information, managing location switches, @@ -108,7 +109,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'locationChange', request: LocationRequest | ContinuousLocationRequest, callback: Callback): void; @@ -156,7 +158,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'locationChange', callback?: Callback): void; @@ -172,7 +175,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'locationError', callback: Callback): void; @@ -188,7 +192,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'locationError', callback?: Callback): void; @@ -201,7 +206,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.on('locationEnabledChange')} due to limited device capabilities. * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'locationEnabledChange', callback: Callback): void; @@ -214,7 +220,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.off('locationEnabledChange')} due to limited device capabilities. * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'locationEnabledChange', callback?: Callback): void; @@ -247,7 +254,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'cachedGnssLocationsChange', request: CachedGnssLocationsRequest, callback: Callback>): void; @@ -278,7 +286,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'cachedGnssLocationsChange', callback?: Callback>): void; @@ -294,7 +303,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'satelliteStatusChange', callback: Callback): void; @@ -310,7 +320,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'satelliteStatusChange', callback?: Callback): void; @@ -326,7 +337,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'nmeaMessage', callback: Callback): void; @@ -342,7 +354,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'nmeaMessage', callback?: Callback): void; @@ -392,7 +405,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301500 - Failed to query the area information. * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'countryCodeChange', callback: Callback): void; @@ -406,7 +420,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301500 - Failed to query the area information. * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'countryCodeChange', callback?: Callback): void; @@ -425,7 +440,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301800 - Failed to start WiFi or Bluetooth scanning. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'locatingRequiredDataChange', config: LocatingRequiredDataConfig, callback: Callback>): void; @@ -441,7 +457,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.off('locatingRequiredDataChange')} due to limited device capabilities. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'locatingRequiredDataChange', callback?: Callback>): void; @@ -456,7 +473,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'locationIconStatusChange', callback: Callback): void; @@ -471,7 +489,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'locationIconStatusChange', callback?: Callback): void; @@ -487,7 +506,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Core - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'bluetoothScanResultChange', callback: Callback): void; @@ -502,7 +522,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.off('bluetoothScanResultChange')} due to limited device capabilities. * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'bluetoothScanResultChange', callback?: Callback): void; @@ -665,7 +686,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301200 - Failed to obtain the geographical location. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function getLastLocation(): Location; @@ -686,7 +708,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function isLocationEnabled(): boolean; @@ -730,7 +753,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 20 + * @since arkts {'1.1':'20','1.2':'20'} + * @arkts 1.1&1.2 */ function enableLocation(callback: AsyncCallback): void; @@ -758,7 +782,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 20 + * @since arkts {'1.1':'20','1.2':'20'} + * @arkts 1.1&1.2 */ function enableLocation(): Promise; @@ -800,7 +825,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 20 + * @since arkts {'1.1':'20','1.2':'20'} + * @arkts 1.1&1.2 */ function disableLocation(): void; @@ -845,7 +871,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301300 - Reverse geocoding query failed. * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getAddressesFromLocation(request: ReverseGeoCodeRequest, callback: AsyncCallback>): void; @@ -859,7 +886,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301300 - Reverse geocoding query failed. * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getAddressesFromLocation(request: ReverseGeoCodeRequest): Promise>; @@ -1190,7 +1218,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function isLocationPrivacyConfirmed(type: LocationPrivacyType): boolean; @@ -1403,7 +1432,8 @@ declare namespace geoLocationManager { * * @typedef SatelliteStatusInfo * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export interface SatelliteStatusInfo { /** @@ -1411,7 +1441,8 @@ declare namespace geoLocationManager { * * @type { number } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ satellitesNumber: number; @@ -1420,7 +1451,8 @@ declare namespace geoLocationManager { * * @type { Array } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ satelliteIds: Array; @@ -1429,7 +1461,8 @@ declare namespace geoLocationManager { * * @type { Array } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ carrierToNoiseDensitys: Array; @@ -1438,7 +1471,8 @@ declare namespace geoLocationManager { * * @type { Array } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ altitudes: Array; @@ -1447,7 +1481,8 @@ declare namespace geoLocationManager { * * @type { Array } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ azimuths: Array; @@ -1456,7 +1491,8 @@ declare namespace geoLocationManager { * * @type { Array } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ carrierFrequencies: Array; @@ -1465,7 +1501,8 @@ declare namespace geoLocationManager { * * @type { ?Array } * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ satelliteConstellation?: Array; @@ -1474,7 +1511,8 @@ declare namespace geoLocationManager { * * @type { ?Array } * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ satelliteAdditionalInfo?: Array; } @@ -1484,7 +1522,8 @@ declare namespace geoLocationManager { * * @typedef CachedGnssLocationsRequest * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export interface CachedGnssLocationsRequest { /** @@ -1492,7 +1531,8 @@ declare namespace geoLocationManager { * * @type { number } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ reportingPeriodSec: number; @@ -1501,7 +1541,8 @@ declare namespace geoLocationManager { * * @type { boolean } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ wakeUpCacheQueueFull: boolean; } @@ -1637,7 +1678,8 @@ declare namespace geoLocationManager { * * @typedef ReverseGeoCodeRequest * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export interface ReverseGeoCodeRequest { /** @@ -1645,7 +1687,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ locale?: string; @@ -1654,7 +1697,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ country?: string; @@ -1663,7 +1707,8 @@ declare namespace geoLocationManager { * * @type { number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ latitude: number; @@ -1672,7 +1717,8 @@ declare namespace geoLocationManager { * * @type { number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ longitude: number; @@ -1681,7 +1727,8 @@ declare namespace geoLocationManager { * * @type { ?number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ maxItems?: number; } @@ -1691,7 +1738,8 @@ declare namespace geoLocationManager { * * @typedef GeoCodeRequest * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export interface GeoCodeRequest { /** @@ -1699,7 +1747,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ locale?: string; @@ -1708,7 +1757,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ country?: string; @@ -1717,7 +1767,8 @@ declare namespace geoLocationManager { * * @type { string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ description: string; @@ -1726,7 +1777,8 @@ declare namespace geoLocationManager { * * @type { ?number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ maxItems?: number; @@ -1735,7 +1787,8 @@ declare namespace geoLocationManager { * * @type { ?number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ minLatitude?: number; @@ -1744,7 +1797,8 @@ declare namespace geoLocationManager { * * @type { ?number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ minLongitude?: number; @@ -1753,7 +1807,8 @@ declare namespace geoLocationManager { * * @type { ?number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ maxLatitude?: number; @@ -1762,7 +1817,8 @@ declare namespace geoLocationManager { * * @type { ?number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ maxLongitude?: number; } @@ -1772,7 +1828,8 @@ declare namespace geoLocationManager { * * @typedef GeoAddress * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export interface GeoAddress { /** @@ -1782,7 +1839,8 @@ declare namespace geoLocationManager { * * @type { ?number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ latitude?: number; @@ -1793,7 +1851,8 @@ declare namespace geoLocationManager { * * @type { ?number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ longitude?: number; @@ -1803,7 +1862,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ locale?: string; @@ -1812,7 +1872,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ placeName?: string; @@ -1821,7 +1882,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ countryCode?: string; @@ -1830,7 +1892,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ countryName?: string; @@ -1839,7 +1902,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ administrativeArea?: string; @@ -1848,7 +1912,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ subAdministrativeArea?: string; @@ -1857,7 +1922,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ locality?: string; @@ -1866,7 +1932,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ subLocality?: string; @@ -1875,7 +1942,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ roadName?: string; @@ -1884,7 +1952,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ subRoadName?: string; @@ -1893,7 +1962,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ premises?: string; @@ -1902,7 +1972,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ postalCode?: string; @@ -1911,7 +1982,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ phoneNumber?: string; @@ -1920,7 +1992,8 @@ declare namespace geoLocationManager { * * @type { ?string } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ addressUrl?: string; @@ -1929,7 +2002,8 @@ declare namespace geoLocationManager { * * @type { ?Array } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ descriptions?: Array; @@ -1938,7 +2012,8 @@ declare namespace geoLocationManager { * * @type { ?number } * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ descriptionsSize?: number; @@ -1948,7 +2023,8 @@ declare namespace geoLocationManager { * @type { ?Boolean } * @syscap SystemCapability.Location.Location.Geocoder * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ isFromMock?: Boolean; } @@ -1966,7 +2042,8 @@ declare namespace geoLocationManager { * @typedef LocationRequest * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface LocationRequest { /** @@ -1982,7 +2059,8 @@ declare namespace geoLocationManager { * @type { ?LocationRequestPriority } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ priority?: LocationRequestPriority; @@ -1999,7 +2077,8 @@ declare namespace geoLocationManager { * @type { ?LocationRequestScenario } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ scenario?: LocationRequestScenario; @@ -2016,7 +2095,8 @@ declare namespace geoLocationManager { * @type { ?number } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ timeInterval?: number; @@ -2033,7 +2113,8 @@ declare namespace geoLocationManager { * @type { ?number } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ distanceInterval?: number; @@ -2050,7 +2131,8 @@ declare namespace geoLocationManager { * @type { ?number } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ maxAccuracy?: number; } @@ -2178,7 +2260,8 @@ declare namespace geoLocationManager { * @typedef ContinuousLocationRequest * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export interface ContinuousLocationRequest { /** @@ -2187,7 +2270,8 @@ declare namespace geoLocationManager { * @type { number } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interval: number; @@ -2197,7 +2281,8 @@ declare namespace geoLocationManager { * @type { UserActivityScenario | PowerConsumptionScenario } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ locationScenario: UserActivityScenario | PowerConsumptionScenario; @@ -2209,7 +2294,8 @@ declare namespace geoLocationManager { * @syscap SystemCapability.Location.Location.Core * @systemapi * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ sportsType?: SportsType; @@ -2565,7 +2651,8 @@ declare namespace geoLocationManager { * @typedef LocatingRequiredDataConfig * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ export interface LocatingRequiredDataConfig { /** @@ -2574,7 +2661,8 @@ declare namespace geoLocationManager { * @type {LocatingRequiredDataType} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ type: LocatingRequiredDataType; @@ -2584,7 +2672,8 @@ declare namespace geoLocationManager { * @type {boolean} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ needStartScan: boolean; @@ -2595,7 +2684,8 @@ declare namespace geoLocationManager { * @type {?number} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ scanInterval?: number; @@ -2606,7 +2696,8 @@ declare namespace geoLocationManager { * @type {?number} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ scanTimeout?: number; } @@ -2616,7 +2707,8 @@ declare namespace geoLocationManager { * @typedef LocatingRequiredData * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ export interface LocatingRequiredData { /** @@ -2625,7 +2717,8 @@ declare namespace geoLocationManager { * @type {?WifiScanInfo} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ wifiData?: WifiScanInfo; @@ -2635,7 +2728,8 @@ declare namespace geoLocationManager { * @type {?BluetoothScanInfo} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ bluetoothData?: BluetoothScanInfo; } @@ -2645,7 +2739,8 @@ declare namespace geoLocationManager { * @typedef WifiScanInfo * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ export interface WifiScanInfo { /** @@ -2654,7 +2749,8 @@ declare namespace geoLocationManager { * @type {string} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ ssid: string; @@ -2664,7 +2760,8 @@ declare namespace geoLocationManager { * @type {string} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ bssid: string; @@ -2674,7 +2771,8 @@ declare namespace geoLocationManager { * @type {number} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ rssi: number; @@ -2684,7 +2782,8 @@ declare namespace geoLocationManager { * @type {number} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ frequency: number; @@ -2694,7 +2793,8 @@ declare namespace geoLocationManager { * @type {number} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ timestamp: number; } @@ -2705,7 +2805,8 @@ declare namespace geoLocationManager { * @typedef BluetoothScanInfo * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ export interface BluetoothScanInfo { /** @@ -2714,7 +2815,8 @@ declare namespace geoLocationManager { * @type {string} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ deviceName: string; @@ -2724,7 +2826,8 @@ declare namespace geoLocationManager { * @type {string} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ macAddress: string; @@ -2734,7 +2837,8 @@ declare namespace geoLocationManager { * @type {number} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ rssi: number; @@ -2744,7 +2848,8 @@ declare namespace geoLocationManager { * @type {number} * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ timestamp: number; } @@ -2754,7 +2859,8 @@ declare namespace geoLocationManager { * * @typedef BluetoothScanResult * @syscap SystemCapability.Location.Location.Core - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ export interface BluetoothScanResult { /** @@ -2762,7 +2868,8 @@ declare namespace geoLocationManager { * * @type { string } * @syscap SystemCapability.Location.Location.Core - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ deviceId: string; @@ -2771,7 +2878,8 @@ declare namespace geoLocationManager { * * @type { number } * @syscap SystemCapability.Location.Location.Core - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ rssi: number; @@ -2780,7 +2888,8 @@ declare namespace geoLocationManager { * * @type { ?ArrayBuffer } * @syscap SystemCapability.Location.Location.Core - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ data?: ArrayBuffer; @@ -2789,7 +2898,8 @@ declare namespace geoLocationManager { * * @type { string } * @syscap SystemCapability.Location.Location.Core - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ deviceName: string; @@ -2798,7 +2908,8 @@ declare namespace geoLocationManager { * * @type { boolean } * @syscap SystemCapability.Location.Location.Core - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ connectable: boolean; } @@ -3000,14 +3111,16 @@ declare namespace geoLocationManager { * * @enum { number } * @syscap SystemCapability.Location.Location.Geofence - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum CoordinateSystemType { /** * WGS84 coordinates system. * * @syscap SystemCapability.Location.Location.Geofence - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ WGS84 = 1, @@ -3015,7 +3128,8 @@ declare namespace geoLocationManager { * GCJ-02 coordinates system. * * @syscap SystemCapability.Location.Location.Geofence - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ GCJ02 = 2 } @@ -3026,7 +3140,8 @@ declare namespace geoLocationManager { * @enum { number } * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum LocationIconStatus { /** @@ -3034,7 +3149,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LOCATING_NOT_STARTED = 0, @@ -3043,7 +3159,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LOCATING_STARTED = 1, @@ -3052,7 +3169,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HD_LOCATING_STARTED = 2 } @@ -3063,7 +3181,8 @@ declare namespace geoLocationManager { * @enum { number } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum LocationError { /** @@ -3071,7 +3190,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LOCATING_FAILED_DEFAULT = -1, @@ -3080,7 +3200,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LOCATING_FAILED_LOCATION_PERMISSION_DENIED = -2, @@ -3089,7 +3210,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LOCATING_FAILED_BACKGROUND_PERMISSION_DENIED = -3, @@ -3098,7 +3220,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LOCATING_FAILED_LOCATION_SWITCH_OFF = -4, @@ -3107,7 +3230,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LOCATING_FAILED_INTERNET_ACCESS_FAILURE = -5 } @@ -3150,14 +3274,16 @@ declare namespace geoLocationManager { * * @enum { number } * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum SatelliteConstellationCategory { /** * Invalid value. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONSTELLATION_CATEGORY_UNKNOWN = 0, @@ -3165,7 +3291,8 @@ declare namespace geoLocationManager { * GPS. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONSTELLATION_CATEGORY_GPS = 1, @@ -3173,7 +3300,8 @@ declare namespace geoLocationManager { * SBAS. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONSTELLATION_CATEGORY_SBAS = 2, @@ -3181,7 +3309,8 @@ declare namespace geoLocationManager { * GLONASS. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONSTELLATION_CATEGORY_GLONASS = 3, @@ -3189,7 +3318,8 @@ declare namespace geoLocationManager { * QZSS. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONSTELLATION_CATEGORY_QZSS = 4, @@ -3197,7 +3327,8 @@ declare namespace geoLocationManager { * BEIDOU. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONSTELLATION_CATEGORY_BEIDOU = 5, @@ -3205,7 +3336,8 @@ declare namespace geoLocationManager { * GALILEO. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONSTELLATION_CATEGORY_GALILEO = 6, @@ -3213,7 +3345,8 @@ declare namespace geoLocationManager { * IRNSS. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONSTELLATION_CATEGORY_IRNSS = 7 } @@ -3223,14 +3356,16 @@ declare namespace geoLocationManager { * * @enum { number } * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum SatelliteAdditionalInfo { /** * Default value. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SATELLITES_ADDITIONAL_INFO_NULL = 0, @@ -3238,7 +3373,8 @@ declare namespace geoLocationManager { * Ephemeris data exist. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SATELLITES_ADDITIONAL_INFO_EPHEMERIS_DATA_EXIST = 1, @@ -3246,7 +3382,8 @@ declare namespace geoLocationManager { * Almanac data exist. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SATELLITES_ADDITIONAL_INFO_ALMANAC_DATA_EXIST = 2, @@ -3254,7 +3391,8 @@ declare namespace geoLocationManager { * This satellite is being used in location fix. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SATELLITES_ADDITIONAL_INFO_USED_IN_FIX = 4, @@ -3262,7 +3400,8 @@ declare namespace geoLocationManager { * Carrier frequency exist. * * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SATELLITES_ADDITIONAL_INFO_CARRIER_FREQUENCY_EXIST = 8 } @@ -3273,7 +3412,8 @@ declare namespace geoLocationManager { * @enum { number } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum UserActivityScenario { /** @@ -3281,7 +3421,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ NAVIGATION = 0x401, @@ -3290,7 +3431,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SPORT = 0x402, @@ -3299,7 +3441,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ TRANSPORT = 0x403, @@ -3308,7 +3451,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DAILY_LIFE_SERVICE = 0x404 } @@ -3546,7 +3690,8 @@ declare namespace geoLocationManager { * @enum { number } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum PowerConsumptionScenario { /** @@ -3554,7 +3699,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HIGH_POWER_CONSUMPTION = 0x601, @@ -3563,7 +3709,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LOW_POWER_CONSUMPTION = 0x602, @@ -3572,7 +3719,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ NO_POWER_CONSUMPTION = 0x603 } @@ -3583,7 +3731,8 @@ declare namespace geoLocationManager { * @enum { number } * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export enum LocationPrivacyType { /** @@ -3591,7 +3740,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ OTHERS = 0, @@ -3600,7 +3750,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ STARTUP, @@ -3609,7 +3760,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ CORE_LOCATION } @@ -3620,7 +3772,8 @@ declare namespace geoLocationManager { * @enum { number } * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ export enum SportsType { /** @@ -3628,7 +3781,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RUNNING = 1, @@ -3637,7 +3791,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ WALKING, @@ -3646,7 +3801,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ CYCLING } @@ -3683,7 +3839,8 @@ declare namespace geoLocationManager { * * @typedef CountryCode * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export interface CountryCode { /** @@ -3691,7 +3848,8 @@ declare namespace geoLocationManager { * * @type { string } * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ country: string; @@ -3700,7 +3858,8 @@ declare namespace geoLocationManager { * * @type { CountryCodeType } * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ type: CountryCodeType; } @@ -3710,14 +3869,16 @@ declare namespace geoLocationManager { * * @enum { number } * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export enum CountryCodeType { /** * Country code obtained from the locale setting. * * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ COUNTRY_CODE_FROM_LOCALE = 1, @@ -3725,7 +3886,8 @@ declare namespace geoLocationManager { * Country code obtained from the SIM information. * * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ COUNTRY_CODE_FROM_SIM, @@ -3733,7 +3895,8 @@ declare namespace geoLocationManager { * Query the country code information from the reverse geocoding result. * * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ COUNTRY_CODE_FROM_LOCATION, @@ -3741,7 +3904,8 @@ declare namespace geoLocationManager { * Obtain the country code from the cell registration information. * * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ COUNTRY_CODE_FROM_NETWORK } @@ -3752,7 +3916,8 @@ declare namespace geoLocationManager { * @enum { number } * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ export enum LocatingRequiredDataType { /** @@ -3760,7 +3925,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ WIFI = 1, @@ -3769,7 +3935,8 @@ declare namespace geoLocationManager { * * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ BLUETOOTH } diff --git a/kits/@kit.LocationKit.d.ts b/kits/@kit.LocationKit.d.ts index 24735b74e1..917b13e3fc 100644 --- a/kits/@kit.LocationKit.d.ts +++ b/kits/@kit.LocationKit.d.ts @@ -17,9 +17,15 @@ * @file * @kit LocationKit */ +/*** if arkts 1.1&1.2 */ +import geoLocationManager from '@ohos.geoLocationManager'; +export { + geoLocationManager +}; +/*** endif */ +/*** if arkts 1.1*/ import geolocation from '@ohos.geolocation'; -import geoLocationManager from '@ohos.geoLocationManager'; import FenceExtensionAbility from '@ohos.app.ability.FenceExtensionAbility'; import FenceExtensionContext from '@ohos.app.ability.FenceExtensionContext'; import Geolocation, { @@ -29,6 +35,7 @@ import Geolocation, { export { Geolocation, GeolocationResponse, GetLocationOption, GetLocationTypeOption, - GetLocationTypeResponse, SubscribeLocationOption, geoLocationManager, geolocation, + GetLocationTypeResponse, SubscribeLocationOption, geolocation, FenceExtensionAbility,FenceExtensionContext }; +/*** endif */ \ No newline at end of file -- Gitee From d9eb7b6974876aeadad68c8dae50d21e30dc2571 Mon Sep 17 00:00:00 2001 From: MisterE Date: Fri, 11 Jul 2025 14:24:44 +0800 Subject: [PATCH 061/746] =?UTF-8?q?=E5=85=B7=E8=BA=AB=E6=9C=BA=E6=A2=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MisterE --- api/device-define/default.json | 3 +-- api/device-define/tablet.json | 3 +-- build-tools/api_check_plugin/code_style_rule.json | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/api/device-define/default.json b/api/device-define/default.json index 9db411bbdc..de616b6b16 100644 --- a/api/device-define/default.json +++ b/api/device-define/default.json @@ -235,7 +235,6 @@ "SystemCapability.Ability.AppStartup", "SystemCapability.Ability.AppExtension.PhotoEditorExtension", "SystemCapability.Resourceschedule.BackgroundProcessManager", - "SystemCapability.Test.PerfTest", - "SystemCapability.Mechanic.Core" + "SystemCapability.Test.PerfTest" ] } diff --git a/api/device-define/tablet.json b/api/device-define/tablet.json index 34dfcbda61..898f1579b4 100644 --- a/api/device-define/tablet.json +++ b/api/device-define/tablet.json @@ -226,7 +226,6 @@ "SystemCapability.Ability.AppStartup", "SystemCapability.Ability.AppExtension.PhotoEditorExtension", "SystemCapability.Resourceschedule.BackgroundProcessManager", - "SystemCapability.Test.PerfTest", - "SystemCapability.Mechanic.Core" + "SystemCapability.Test.PerfTest" ] } diff --git a/build-tools/api_check_plugin/code_style_rule.json b/build-tools/api_check_plugin/code_style_rule.json index e27b5ced4a..1a591601fd 100644 --- a/build-tools/api_check_plugin/code_style_rule.json +++ b/build-tools/api_check_plugin/code_style_rule.json @@ -375,8 +375,7 @@ "SystemCapability.Security.CryptoFramework.MessageDigest", "SystemCapability.Security.CryptoFramework.Mac", "SystemCapability.Security.CryptoFramework.Kdf", - "SystemCapability.Security.CryptoFramework.Rand", - "SystemCapability.Mechanic.Core" + "SystemCapability.Security.CryptoFramework.Rand" ] }, "administrators": [ -- Gitee From fad114f3d7d6b6a032c9653b8c03b8bed34d5fcd Mon Sep 17 00:00:00 2001 From: MisterE Date: Fri, 11 Jul 2025 14:24:44 +0800 Subject: [PATCH 062/746] =?UTF-8?q?=E5=85=B7=E8=BA=AB=E6=9C=BA=E6=A2=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E6=96=87=E6=A1=A3=E6=A3=80=E8=A7=86=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MisterE --- ...ohos.distributedHardware.mechanicManager.d.ts | 16 ++++++++-------- api/device-define/default.json | 3 +-- api/device-define/tablet.json | 3 +-- .../api_check_plugin/code_style_rule.json | 3 +-- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/api/@ohos.distributedHardware.mechanicManager.d.ts b/api/@ohos.distributedHardware.mechanicManager.d.ts index f9ab1d7057..d38db3768f 100644 --- a/api/@ohos.distributedHardware.mechanicManager.d.ts +++ b/api/@ohos.distributedHardware.mechanicManager.d.ts @@ -79,7 +79,7 @@ declare namespace mechanicManager { * @param { boolean } isEnabled Whether to enable camera tracking. * @throws { BusinessError } 33300001 - Service exception. * @throws { BusinessError } 33300002 - Device not connected. - * @throws { BusinessError } 33300003 - Device not supported. + * @throws { BusinessError } 33300003 - Feature not supported. * @syscap SystemCapability.Mechanic.Core * @since 20 */ @@ -124,7 +124,7 @@ declare namespace mechanicManager { * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 33300001 - Service exception. * @throws { BusinessError } 33300002 - Device not connected. - * @throws { BusinessError } 33300003 - Device not supported. + * @throws { BusinessError } 33300003 - Feature not supported. * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 @@ -343,7 +343,7 @@ declare namespace mechanicManager { */ export interface RotationAngles { /** - * Yaw angle, ranging from -2π to 2*π, measured in radians. + * Yaw angle, ranging from -2*Math.PI to 2*Math.PI, measured in radians. * @type { ?number } * @syscap SystemCapability.Mechanic.Core * @systemapi @@ -353,7 +353,7 @@ declare namespace mechanicManager { yaw?: number; /** - * Roll angle, ranging from -2π to 2*π, measured in radians. + * Roll angle, ranging from -2*Math.PI to 2*Math.PI, measured in radians. * @type { ?number } * @syscap SystemCapability.Mechanic.Core * @systemapi @@ -363,7 +363,7 @@ declare namespace mechanicManager { roll?: number; /** - * Pitch angle, ranging from -2π to 2*π, measured in radians. + * Pitch angle, ranging from -2*Math.PI to 2*Math.PI, measured in radians. * @type { ?number } * @syscap SystemCapability.Mechanic.Core * @systemapi @@ -383,7 +383,7 @@ declare namespace mechanicManager { */ export interface EulerAngles { /** - * Yaw angle, ranging from -π to π, measured in radians. + * Yaw angle, ranging from -Math.PI to Math.PI, measured in radians. * @type { ?number } * @syscap SystemCapability.Mechanic.Core * @systemapi @@ -393,7 +393,7 @@ declare namespace mechanicManager { yaw?: number; /** - * Roll angle, ranging from -π to π, measured in radians. + * Roll angle, ranging from -Math.PI to Math.PI, measured in radians. * @type { ?number } * @syscap SystemCapability.Mechanic.Core * @systemapi @@ -403,7 +403,7 @@ declare namespace mechanicManager { roll?: number; /** - * Pitch angle, ranging from -π to π, measured in radians. + * Pitch angle, ranging from -Math.PI to Math.PI, measured in radians. * @type { ?number } * @syscap SystemCapability.Mechanic.Core * @systemapi diff --git a/api/device-define/default.json b/api/device-define/default.json index 9db411bbdc..de616b6b16 100644 --- a/api/device-define/default.json +++ b/api/device-define/default.json @@ -235,7 +235,6 @@ "SystemCapability.Ability.AppStartup", "SystemCapability.Ability.AppExtension.PhotoEditorExtension", "SystemCapability.Resourceschedule.BackgroundProcessManager", - "SystemCapability.Test.PerfTest", - "SystemCapability.Mechanic.Core" + "SystemCapability.Test.PerfTest" ] } diff --git a/api/device-define/tablet.json b/api/device-define/tablet.json index 34dfcbda61..898f1579b4 100644 --- a/api/device-define/tablet.json +++ b/api/device-define/tablet.json @@ -226,7 +226,6 @@ "SystemCapability.Ability.AppStartup", "SystemCapability.Ability.AppExtension.PhotoEditorExtension", "SystemCapability.Resourceschedule.BackgroundProcessManager", - "SystemCapability.Test.PerfTest", - "SystemCapability.Mechanic.Core" + "SystemCapability.Test.PerfTest" ] } diff --git a/build-tools/api_check_plugin/code_style_rule.json b/build-tools/api_check_plugin/code_style_rule.json index e27b5ced4a..1a591601fd 100644 --- a/build-tools/api_check_plugin/code_style_rule.json +++ b/build-tools/api_check_plugin/code_style_rule.json @@ -375,8 +375,7 @@ "SystemCapability.Security.CryptoFramework.MessageDigest", "SystemCapability.Security.CryptoFramework.Mac", "SystemCapability.Security.CryptoFramework.Kdf", - "SystemCapability.Security.CryptoFramework.Rand", - "SystemCapability.Mechanic.Core" + "SystemCapability.Security.CryptoFramework.Rand" ] }, "administrators": [ -- Gitee From 07a26fba70759b5e8ed99a163df55fb424051a4b Mon Sep 17 00:00:00 2001 From: wangzhiyusss Date: Fri, 11 Jul 2025 11:25:47 +0800 Subject: [PATCH 063/746] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=87=E6=BB=A4sta?= =?UTF-8?q?tic=E5=90=8E=E7=BC=80=E6=96=87=E4=BB=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangzhiyusss --- build-tools/delete_systemapi_plugin.js | 3 ++- build-tools/handleApiFiles.js | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/build-tools/delete_systemapi_plugin.js b/build-tools/delete_systemapi_plugin.js index 984f488749..d4fe9c6616 100644 --- a/build-tools/delete_systemapi_plugin.js +++ b/build-tools/delete_systemapi_plugin.js @@ -328,7 +328,8 @@ function tsTransform(utFiles, callback) { } } if (/\.static\.d\.ets$/.test(apiBaseName)) { - isTransformer = false; + writeFile(url.substring(0, url.length - 12) + 'd.ets', content); + return; } if (!isTransformer) { writeFile(url, content); diff --git a/build-tools/handleApiFiles.js b/build-tools/handleApiFiles.js index d12bbacff8..d6d43892ab 100755 --- a/build-tools/handleApiFiles.js +++ b/build-tools/handleApiFiles.js @@ -49,6 +49,10 @@ function isTsFile(path) { return path.endsWith('d.ts'); } +function isStaticFile(path) { + return path.endsWith('static.d.ets'); +} + function hasEtsFile(path) { // 为StateManagement.d.ts设定白名单,在1.2打包的时候在Linux上有大小写不同的重名,碰到直接返回true if (path.includes('StateManagement.d.ts')) { @@ -142,9 +146,19 @@ function handleApiFileByType(apiRelativePath, rootPath, type, output) { const fullPath = path.join(rootPath, apiRelativePath); const isEndWithEts = isEtsFile(apiRelativePath); const isEndWithTs = isTsFile(apiRelativePath); + const isEndWithStatic = isStaticFile(apiRelativePath); const outputPath = output ? path.join(output, apiRelativePath) : fullPath; const fileContent = fs.readFileSync(fullPath, 'utf-8'); + if (isEndWithStatic) { + if (type === 'ets2') { + writeFile(outputPath, fileContent); + return; + } else { + return; + } + } + if (!isEndWithEts && !isEndWithTs) { writeFile(outputPath, fileContent); return; -- Gitee From 7a00b765a3081138c328ec421ffca937672943e4 Mon Sep 17 00:00:00 2001 From: zhangzezhong Date: Fri, 11 Jul 2025 14:06:02 +0800 Subject: [PATCH 064/746] fix extrainfo Signed-off-by: zhangzezhong --- api/wantAgent/triggerInfo.d.ts | 3 +-- api/wantAgent/wantAgentInfo.d.ts | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/api/wantAgent/triggerInfo.d.ts b/api/wantAgent/triggerInfo.d.ts index b487d2f2f7..8562e2f9dc 100644 --- a/api/wantAgent/triggerInfo.d.ts +++ b/api/wantAgent/triggerInfo.d.ts @@ -126,9 +126,8 @@ export interface TriggerInfo { /** * Custom extra data you want to add for triggering a WantAgent. * - * @type { ?object } + * @type { ?Record } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @atomicservice * @since 20 * @arkts 1.2 */ diff --git a/api/wantAgent/wantAgentInfo.d.ts b/api/wantAgent/wantAgentInfo.d.ts index 862c112003..e6a44da7bc 100644 --- a/api/wantAgent/wantAgentInfo.d.ts +++ b/api/wantAgent/wantAgentInfo.d.ts @@ -178,9 +178,8 @@ export interface WantAgentInfo { * Extra information about how the Want starts an ability. * If there is no extra information to set, this constant can be left empty. * - * @type { ?object } + * @type { ?Record } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @atomicservice * @since 20 * @arkts 1.2 */ -- Gitee From 75fdbee5b1e3e865b174daf45650a0bcad5b20f5 Mon Sep 17 00:00:00 2001 From: guoxiadi Date: Fri, 11 Jul 2025 15:44:11 +0800 Subject: [PATCH 065/746] arkts 1.2 bt 0702 Signed-off-by: guoxiadi --- api/@ohos.bluetooth.a2dp.d.ts | 12 +- api/@ohos.bluetooth.access.d.ts | 39 ++- api/@ohos.bluetooth.baseProfile.d.ts | 18 +- api/@ohos.bluetooth.ble.d.ts | 387 ++++++++++++++++++--------- api/@ohos.bluetooth.connection.d.ts | 118 ++++---- api/@ohos.bluetooth.constant.d.ts | 36 ++- api/@ohos.bluetooth.hfp.d.ts | 12 +- api/@ohos.bluetooth.hid.d.ts | 12 +- 8 files changed, 413 insertions(+), 221 deletions(-) diff --git a/api/@ohos.bluetooth.a2dp.d.ts b/api/@ohos.bluetooth.a2dp.d.ts index c3eeaadd89..6a64dc35c2 100644 --- a/api/@ohos.bluetooth.a2dp.d.ts +++ b/api/@ohos.bluetooth.a2dp.d.ts @@ -34,7 +34,8 @@ import type baseProfile from './@ohos.bluetooth.baseProfile'; * @namespace a2dp * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace a2dp { /** @@ -42,7 +43,8 @@ declare namespace a2dp { * * @typedef { baseProfile.BaseProfile } BaseProfile * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ type BaseProfile = baseProfile.BaseProfile; @@ -65,7 +67,8 @@ declare namespace a2dp { * @throws { BusinessError } 801 - Capability not supported. * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ function createA2dpSrcProfile(): A2dpSourceProfile; @@ -83,7 +86,8 @@ declare namespace a2dp { * @typedef A2dpSourceProfile * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface A2dpSourceProfile extends BaseProfile { /** diff --git a/api/@ohos.bluetooth.access.d.ts b/api/@ohos.bluetooth.access.d.ts index 15547e3fbb..13915e2e9e 100644 --- a/api/@ohos.bluetooth.access.d.ts +++ b/api/@ohos.bluetooth.access.d.ts @@ -42,7 +42,8 @@ import type { AsyncCallback, Callback } from './@ohos.base'; * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace access { /** @@ -79,7 +80,8 @@ declare namespace access { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ function enableBluetooth(): void; @@ -117,7 +119,8 @@ declare namespace access { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ function disableBluetooth(): void; @@ -133,7 +136,8 @@ declare namespace access { * @throws { BusinessError } 2900099 - Operation failed. * @syscap SystemCapability.Communication.Bluetooth.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function restrictBluetooth(): Promise; @@ -172,7 +176,8 @@ declare namespace access { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ function getState(): BluetoothState; @@ -441,7 +446,8 @@ declare namespace access { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ export enum BluetoothState { /** @@ -463,7 +469,8 @@ declare namespace access { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ STATE_OFF = 0, /** @@ -485,7 +492,8 @@ declare namespace access { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ STATE_TURNING_ON = 1, /** @@ -507,7 +515,8 @@ declare namespace access { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ STATE_ON = 2, /** @@ -529,7 +538,8 @@ declare namespace access { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ STATE_TURNING_OFF = 3, /** @@ -543,7 +553,8 @@ declare namespace access { * * @syscap SystemCapability.Communication.Bluetooth.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ STATE_BLE_TURNING_ON = 4, /** @@ -557,7 +568,8 @@ declare namespace access { * * @syscap SystemCapability.Communication.Bluetooth.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ STATE_BLE_ON = 5, /** @@ -571,7 +583,8 @@ declare namespace access { * * @syscap SystemCapability.Communication.Bluetooth.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ STATE_BLE_TURNING_OFF = 6 } diff --git a/api/@ohos.bluetooth.baseProfile.d.ts b/api/@ohos.bluetooth.baseProfile.d.ts index 5034765d55..27764959f4 100644 --- a/api/@ohos.bluetooth.baseProfile.d.ts +++ b/api/@ohos.bluetooth.baseProfile.d.ts @@ -34,7 +34,8 @@ import type constant from './@ohos.bluetooth.constant'; * @namespace baseProfile * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace baseProfile { /** @@ -50,7 +51,8 @@ declare namespace baseProfile { * @typedef { constant.ProfileConnectionState } ProfileConnectionState * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ type ProfileConnectionState = constant.ProfileConnectionState; @@ -169,7 +171,8 @@ declare namespace baseProfile { * @typedef StateChangeParam * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ export interface StateChangeParam { /** @@ -185,7 +188,8 @@ declare namespace baseProfile { * @type { string } * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ deviceId: string; @@ -202,7 +206,8 @@ declare namespace baseProfile { * @type { ProfileConnectionState } * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ state: ProfileConnectionState; @@ -237,7 +242,8 @@ declare namespace baseProfile { * @typedef BaseProfile * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ export interface BaseProfile { /** diff --git a/api/@ohos.bluetooth.ble.d.ts b/api/@ohos.bluetooth.ble.d.ts index 7ec2196b21..c2feb8c777 100644 --- a/api/@ohos.bluetooth.ble.d.ts +++ b/api/@ohos.bluetooth.ble.d.ts @@ -43,7 +43,8 @@ import type constant from './@ohos.bluetooth.constant'; * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace ble { /** @@ -67,7 +68,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ type ProfileConnectionState = constant.ProfileConnectionState; @@ -93,7 +95,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ function createGattServer(): GattServer; @@ -131,13 +134,14 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ function createGattClientDevice(deviceId: string): GattClientDevice; /** * Create a ble scanner instance. Each ble scanner instance can be independently started or stopped. - * + * * @returns { BleScanner } Returns the promise object. * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform @@ -276,7 +280,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ function stopBLEScan(): void; @@ -394,7 +399,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ function stopAdvertising(): void; @@ -954,7 +960,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface GattServer { /** @@ -1100,7 +1107,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ close(): void; @@ -1797,7 +1805,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface GattClientDevice { /** @@ -1840,7 +1849,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ connect(): void; @@ -1881,7 +1891,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ disconnect(): void; @@ -1925,7 +1936,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ close(): void; @@ -2878,7 +2890,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ setBLEMtuSize(mtu: number): void; @@ -3466,7 +3479,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface GattService { /** @@ -3491,7 +3505,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ serviceUuid: string; /** @@ -3516,7 +3531,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ isPrimary: boolean; /** @@ -3541,7 +3557,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ characteristics: Array; /** @@ -3584,7 +3601,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface BLECharacteristic { /** @@ -3609,7 +3627,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ serviceUuid: string; /** @@ -3634,7 +3653,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ characteristicUuid: string; /** @@ -3659,7 +3679,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ characteristicValue: ArrayBuffer; /** @@ -3684,7 +3705,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ descriptors: Array; /** @@ -3709,7 +3731,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ properties?: GattProperties; /** @@ -3757,7 +3780,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface BLEDescriptor { /** @@ -3782,7 +3806,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ serviceUuid: string; /** @@ -3807,7 +3832,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ characteristicUuid: string; /** @@ -3832,7 +3858,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ descriptorUuid: string; /** @@ -3857,7 +3884,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ descriptorValue: ArrayBuffer; /** @@ -3871,6 +3899,7 @@ declare namespace ble { */ descriptorHandle?: number; + /** * The permissions of a BLEDescriptor instance. The default value is Readable and Writable. * @@ -3905,7 +3934,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface NotifyCharacteristic { /** @@ -3930,7 +3960,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ serviceUuid: string; /** @@ -3955,7 +3986,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ characteristicUuid: string; /** @@ -3980,7 +4012,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ characteristicValue: ArrayBuffer; /** @@ -3998,7 +4031,8 @@ declare namespace ble { * @type { boolean } * @syscap SystemCapability.Communication.Bluetooth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ confirm: boolean; } @@ -4025,7 +4059,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface CharacteristicReadRequest { /** @@ -4050,7 +4085,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ deviceId: string; /** @@ -4075,7 +4111,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ transId: number; /** @@ -4091,7 +4128,8 @@ declare namespace ble { * @type { number } * @syscap SystemCapability.Communication.Bluetooth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ offset: number; /** @@ -4116,7 +4154,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ characteristicUuid: string; /** @@ -4141,7 +4180,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ serviceUuid: string; } @@ -4168,7 +4208,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface CharacteristicWriteRequest { /** @@ -4193,7 +4234,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ deviceId: string; /** @@ -4218,7 +4260,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ transId: number; /** @@ -4234,7 +4277,8 @@ declare namespace ble { * @type { number } * @syscap SystemCapability.Communication.Bluetooth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ offset: number; /** @@ -4291,7 +4335,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ value: ArrayBuffer; /** @@ -4316,7 +4361,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ characteristicUuid: string; /** @@ -4341,7 +4387,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ serviceUuid: string; } @@ -4368,7 +4415,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface DescriptorReadRequest { /** @@ -4393,7 +4441,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ deviceId: string; /** @@ -4418,7 +4467,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ transId: number; /** @@ -4434,7 +4484,8 @@ declare namespace ble { * @type { number } * @syscap SystemCapability.Communication.Bluetooth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ offset: number; /** @@ -4459,7 +4510,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ descriptorUuid: string; /** @@ -4484,7 +4536,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ characteristicUuid: string; /** @@ -4509,7 +4562,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ serviceUuid: string; } @@ -4536,7 +4590,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface DescriptorWriteRequest { /** @@ -4561,7 +4616,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ deviceId: string; /** @@ -4586,7 +4642,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ transId: number; /** @@ -4602,7 +4659,8 @@ declare namespace ble { * @type { number } * @syscap SystemCapability.Communication.Bluetooth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ offset: number; /** @@ -4659,7 +4717,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ value: ArrayBuffer; /** @@ -4684,7 +4743,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ descriptorUuid: string; /** @@ -4709,7 +4769,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ characteristicUuid: string; /** @@ -4734,7 +4795,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ serviceUuid: string; } @@ -4761,7 +4823,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface ServerResponse { /** @@ -4786,7 +4849,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ deviceId: string; /** @@ -4811,7 +4875,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ transId: number; /** @@ -4836,7 +4901,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ status: number; /** @@ -4852,7 +4918,8 @@ declare namespace ble { * @type { number } * @syscap SystemCapability.Communication.Bluetooth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ offset: number; /** @@ -4877,7 +4944,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ value: ArrayBuffer; } @@ -4904,7 +4972,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface BLEConnectionChangeState { /** @@ -4929,7 +4998,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ deviceId: string; /** @@ -4954,7 +5024,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ state: ProfileConnectionState; } @@ -4981,7 +5052,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface ScanResult { /** @@ -5006,7 +5078,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ deviceId: string; /** @@ -5056,7 +5129,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ data: ArrayBuffer; /** @@ -5106,14 +5180,15 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ connectable: boolean; } /** * Describes the contents of the scan report. - * + * * @typedef ScanReport * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform @@ -5138,7 +5213,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ scanResult: Array; } @@ -5165,7 +5241,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface AdvertiseSetting { /** @@ -5185,7 +5262,8 @@ declare namespace ble { * @type { ?number } * @syscap SystemCapability.Communication.Bluetooth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interval?: number; /** @@ -5205,7 +5283,8 @@ declare namespace ble { * @type { ?number } * @syscap SystemCapability.Communication.Bluetooth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ txPower?: number; /** @@ -5230,7 +5309,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ connectable?: boolean; } @@ -5257,7 +5337,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface AdvertiseData { /** @@ -5282,7 +5363,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ serviceUuids: Array; /** @@ -5307,7 +5389,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ manufactureData: Array; /** @@ -5332,7 +5415,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ serviceData: Array; /** @@ -5385,7 +5469,8 @@ declare namespace ble { * @typedef AdvertisingParams * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface AdvertisingParams { /** @@ -5401,7 +5486,8 @@ declare namespace ble { * @type { AdvertiseSetting } * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ advertisingSettings: AdvertiseSetting; /** @@ -5417,7 +5503,8 @@ declare namespace ble { * @type { AdvertiseData } * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ advertisingData: AdvertiseData; /** @@ -5433,7 +5520,8 @@ declare namespace ble { * @type { ?AdvertiseData } * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ advertisingResponse?: AdvertiseData; /** @@ -5443,7 +5531,8 @@ declare namespace ble { * * @type { ?number } * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ duration?: number; } @@ -5471,7 +5560,8 @@ declare namespace ble { * * @type { ?number } * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ duration?: number; } @@ -5507,7 +5597,8 @@ declare namespace ble { * @typedef AdvertisingStateChangeInfo * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface AdvertisingStateChangeInfo { /** @@ -5539,7 +5630,8 @@ declare namespace ble { * @type { AdvertisingState } * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ state: AdvertisingState; } @@ -5566,7 +5658,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface ManufactureData { /** @@ -5643,7 +5736,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface ServiceData { /** @@ -5668,7 +5762,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ serviceUuid: string; /** @@ -5720,7 +5815,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface ScanFilter { /** @@ -5745,7 +5841,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ deviceId?: string; @@ -5797,7 +5894,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ serviceUuid?: string; @@ -5901,7 +5999,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ serviceData?: ArrayBuffer; @@ -5979,7 +6078,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ manufactureData?: ArrayBuffer; @@ -6032,7 +6132,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface ScanOptions { /** @@ -6057,7 +6158,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interval?: number; /** @@ -6082,7 +6184,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ dutyMode?: ScanDuty; /** @@ -6098,7 +6201,8 @@ declare namespace ble { * @type { ?MatchMode } * @syscap SystemCapability.Communication.Bluetooth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ matchMode?: MatchMode; /** @@ -6153,7 +6257,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface GattProperties { /** @@ -6178,7 +6283,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ write?: boolean; /** @@ -6203,7 +6309,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ writeNoResponse?: boolean; /** @@ -6228,7 +6335,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ read?: boolean; /** @@ -6253,7 +6361,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ notify?: boolean; /** @@ -6269,7 +6378,8 @@ declare namespace ble { * @type { ?boolean } * @syscap SystemCapability.Communication.Bluetooth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ indicate?: boolean; @@ -6326,7 +6436,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ enum GattWriteType { /** @@ -6348,7 +6459,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ WRITE = 1, /** @@ -6370,7 +6482,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ WRITE_NO_RESPONSE = 2 } @@ -6380,7 +6493,7 @@ declare namespace ble { * * @enum { number } * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 10 + * @since 10 */ /** * The enum of scan duty. @@ -6397,7 +6510,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ enum ScanDuty { /** @@ -6419,7 +6533,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ SCAN_MODE_LOW_POWER = 0, /** @@ -6481,7 +6596,8 @@ declare namespace ble { * @enum { number } * @syscap SystemCapability.Communication.Bluetooth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum MatchMode { /** @@ -6495,7 +6611,8 @@ declare namespace ble { * * @syscap SystemCapability.Communication.Bluetooth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MATCH_MODE_AGGRESSIVE = 1, /** @@ -6509,7 +6626,8 @@ declare namespace ble { * * @syscap SystemCapability.Communication.Bluetooth.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MATCH_MODE_STICKY = 2 } @@ -6527,7 +6645,8 @@ declare namespace ble { * @enum { number } * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ enum AdvertisingState { /** @@ -6541,21 +6660,24 @@ declare namespace ble { * * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ STARTED = 1, /** * advertising temporarily enabled. * * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ ENABLED = 2, /** * advertising temporarily disabled. * * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ DISABLED = 3, /** @@ -6569,7 +6691,8 @@ declare namespace ble { * * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ STOPPED = 4 } @@ -6628,7 +6751,7 @@ declare namespace ble { /** * Report mode used during scan. - * + * * @enum { number } * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform @@ -6647,12 +6770,12 @@ declare namespace ble { NORMAL = 1, /** * Enables the batch mode in which advertisement packets are sent after the interval specified by {@link - * ScanOptions#interval}. - * @syscap SystemCapability.Communication.Bluetooth.Core - * @atomicservice - * @since 19 - */ - BATCH = 2, + * ScanOptions#interval}. + * @syscap SystemCapability.Communication.Bluetooth.Core + * @atomicservice + * @since 19 + */ + BATCH = 2, /** * In low sensitivity fence mode, the advertisement packets are reported only when they are received for * the first time and lost for the last time. The reception sensitivity is low. diff --git a/api/@ohos.bluetooth.connection.d.ts b/api/@ohos.bluetooth.connection.d.ts index 4436723f19..efbc3b9f77 100644 --- a/api/@ohos.bluetooth.connection.d.ts +++ b/api/@ohos.bluetooth.connection.d.ts @@ -43,7 +43,8 @@ import type constant from './@ohos.bluetooth.constant'; * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace connection { /** @@ -118,7 +119,8 @@ declare namespace connection { * @typedef { constant.MajorClass } MajorClass * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ type MajorClass = constant.MajorClass; @@ -135,7 +137,8 @@ declare namespace connection { * @typedef { constant.MajorMinorClass } MajorMinorClass * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ type MajorMinorClass = constant.MajorMinorClass; @@ -461,7 +464,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ function getRemoteDeviceName(deviceId: string): string; @@ -481,7 +485,8 @@ declare namespace connection { * @throws { BusinessError } 2900099 - Failed to obtain the name or alias of the peer Bluetooth device. * @syscap SystemCapability.Communication.Bluetooth.Core * @atomicservice - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ function getRemoteDeviceName(deviceId: string, alias?: boolean): string; @@ -531,7 +536,8 @@ declare namespace connection { * @throws { BusinessError } 2900099 - Operation failed. * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ function getRemoteDeviceClass(deviceId: string): DeviceClass; @@ -602,7 +608,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ function getPairedDevices(): Array; @@ -748,7 +755,8 @@ declare namespace connection { * @throws { BusinessError } 2900003 - Bluetooth disabled. * @throws { BusinessError } 2900099 - Operation failed. * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function setBluetoothScanMode(mode: ScanMode, duration: number): void; @@ -1172,7 +1180,8 @@ declare namespace connection { * @throws { BusinessError } 2900099 - Operation failed. * @syscap SystemCapability.Communication.Bluetooth.Core * @systemapi - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ function getRemoteProductId(deviceId: string): string; @@ -1265,7 +1274,7 @@ declare namespace connection { /** * Controls the actions of Bluetooth peripherals. - * + * * @permission ohos.permission.ACCESS_BLUETOOTH and ohos.permission.MANAGE_BLUETOOTH * @param { ControlDeviceActionParams } controlDeviceActionParams - Indicates the action for Bluetooth peripherals. * @returns { Promise } Returns the promise object. @@ -1599,7 +1608,8 @@ declare namespace connection { * @typedef BondStateParam * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface BondStateParam { /** @@ -1615,7 +1625,8 @@ declare namespace connection { * @type { string } * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ deviceId: string; /** @@ -1631,7 +1642,8 @@ declare namespace connection { * @type { BondState } * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ state: BondState; /** @@ -1657,7 +1669,8 @@ declare namespace connection { * * @typedef PinRequiredParam * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ interface PinRequiredParam { /** @@ -1665,7 +1678,8 @@ declare namespace connection { * * @type { string } * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ deviceId: string; /** @@ -1700,7 +1714,8 @@ declare namespace connection { * @typedef DeviceClass * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface DeviceClass { /** @@ -1716,7 +1731,8 @@ declare namespace connection { * @type { MajorClass } * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ majorClass: MajorClass; /** @@ -1732,7 +1748,8 @@ declare namespace connection { * @type { MajorMinorClass } * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ majorMinorClass: MajorMinorClass; /** @@ -1790,7 +1807,8 @@ declare namespace connection { * @enum { number } * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ enum ScanMode { /** @@ -1846,7 +1864,8 @@ declare namespace connection { * * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ SCAN_MODE_CONNECTABLE_GENERAL_DISCOVERABLE = 4, /** @@ -1880,7 +1899,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ enum BondState { /** @@ -1946,7 +1966,8 @@ declare namespace connection { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ BOND_STATE_BONDED = 2 } @@ -2039,7 +2060,8 @@ declare namespace connection { * * @typedef DiscoveryResult * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface DiscoveryResult { /** @@ -2055,7 +2077,8 @@ declare namespace connection { * * @type { string } * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ deviceId: string; /** @@ -2113,7 +2136,8 @@ declare namespace connection { * * @typedef BatteryInfo * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface BatteryInfo { /** @@ -2122,7 +2146,8 @@ declare namespace connection { * @type { string } * @syscap SystemCapability.Communication.Bluetooth.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ deviceId: string; /** @@ -2366,16 +2391,17 @@ declare namespace connection { interface ControlDeviceActionParams { /** * Indicates the address of the peripheral. - * + * * @type { string } * @syscap SystemCapability.Communication.Bluetooth.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ deviceId: string; /** * Indicates the control type. - * + * * @type { ControlType } * @syscap SystemCapability.Communication.Bluetooth.Core * @systemapi @@ -2384,7 +2410,7 @@ declare namespace connection { type: ControlType; /** * Indicates the control value. - * + * * @type { ControlTypeValue } * @syscap SystemCapability.Communication.Bluetooth.Core * @systemapi @@ -2393,7 +2419,7 @@ declare namespace connection { typeValue: ControlTypeValue; /** * Indicates the control object. - * + * * @type { ControlObject } * @syscap SystemCapability.Communication.Bluetooth.Core * @systemapi @@ -2404,7 +2430,7 @@ declare namespace connection { /** * Describes the control type. - * + * * @enum { number } * @syscap SystemCapability.Communication.Bluetooth.Core * @systemapi @@ -2413,7 +2439,7 @@ declare namespace connection { enum ControlType { /** * Indicates the control command of play. - * + * * @syscap SystemCapability.Communication.Bluetooth.Core * @systemapi * @since 15 @@ -2421,7 +2447,7 @@ declare namespace connection { PLAY = 0, /** * Indicates the control command of vibration. - * + * * @syscap SystemCapability.Communication.Bluetooth.Core * @systemapi * @since 15 @@ -2429,7 +2455,7 @@ declare namespace connection { VIBRATE = 1, /** * Indicates the control command of flash. - * + * * @syscap SystemCapability.Communication.Bluetooth.Core * @systemapi * @since 15 @@ -2437,7 +2463,7 @@ declare namespace connection { FLASH = 2, /** * Indicates the control command of lock. - * + * * @syscap SystemCapability.Communication.Bluetooth.Core * @systemapi * @since 15 @@ -2445,7 +2471,7 @@ declare namespace connection { LOCK = 3, /** * Indicates the control command of erase. - * + * * @syscap SystemCapability.Communication.Bluetooth.Core * @systemapi * @since 15 @@ -2455,7 +2481,7 @@ declare namespace connection { /** * Describes the control type value. - * + * * @enum { number } * @syscap SystemCapability.Communication.Bluetooth.Core * @systemapi @@ -2464,7 +2490,7 @@ declare namespace connection { enum ControlTypeValue { /** * Indicates the action of disable. - * + * * @syscap SystemCapability.Communication.Bluetooth.Core * @systemapi * @since 15 @@ -2472,7 +2498,7 @@ declare namespace connection { DISABLE = 0, /** * Indicates the action of enable. - * + * * @syscap SystemCapability.Communication.Bluetooth.Core * @systemapi * @since 15 @@ -2480,7 +2506,7 @@ declare namespace connection { ENABLE = 1, /** * Indicates the action of query. - * + * * @syscap SystemCapability.Communication.Bluetooth.Core * @systemapi * @since 15 @@ -2490,7 +2516,7 @@ declare namespace connection { /** * Describes the control object. - * + * * @enum { number } * @syscap SystemCapability.Communication.Bluetooth.Core * @systemapi @@ -2499,7 +2525,7 @@ declare namespace connection { enum ControlObject { /** * Control object of left ear. - * + * * @syscap SystemCapability.Communication.Bluetooth.Core * @systemapi * @since 15 @@ -2507,7 +2533,7 @@ declare namespace connection { LEFT_EAR = 0, /** * Control object of right ear. - * + * * @syscap SystemCapability.Communication.Bluetooth.Core * @systemapi * @since 15 @@ -2515,7 +2541,7 @@ declare namespace connection { RIGHT_EAR = 1, /** * Control object of left and right ear. - * + * * @syscap SystemCapability.Communication.Bluetooth.Core * @systemapi * @since 15 @@ -2542,7 +2568,7 @@ declare namespace connection { */ trustedPairedDevices: Array; } - + /** * Describes device of cloud pair. * diff --git a/api/@ohos.bluetooth.constant.d.ts b/api/@ohos.bluetooth.constant.d.ts index 5d460b0103..2f6a671b02 100644 --- a/api/@ohos.bluetooth.constant.d.ts +++ b/api/@ohos.bluetooth.constant.d.ts @@ -40,7 +40,8 @@ * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace constant { /** @@ -364,7 +365,8 @@ declare namespace constant { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ export enum ProfileConnectionState { /** @@ -386,7 +388,8 @@ declare namespace constant { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ STATE_DISCONNECTED = 0, /** @@ -430,7 +433,8 @@ declare namespace constant { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ STATE_CONNECTED = 2, /** @@ -470,7 +474,8 @@ declare namespace constant { * @enum { number } * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ export enum MajorClass { /** @@ -491,7 +496,8 @@ declare namespace constant { * Mobile phone. * * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ MAJOR_PHONE = 0x0200, /** @@ -512,7 +518,8 @@ declare namespace constant { * * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ MAJOR_AUDIO_VIDEO = 0x0400, /** @@ -561,7 +568,8 @@ declare namespace constant { * Unclassified device. * * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ MAJOR_UNCATEGORIZED = 0x1F00 } @@ -579,7 +587,8 @@ declare namespace constant { * @enum { number } * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ export enum MajorMinorClass { /** @@ -850,7 +859,8 @@ declare namespace constant { * * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ AUDIO_VIDEO_WEARABLE_HEADSET = 0x0404, /** @@ -892,7 +902,8 @@ declare namespace constant { * * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ AUDIO_VIDEO_LOUDSPEAKER = 0x0414, /** @@ -906,7 +917,8 @@ declare namespace constant { * * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ AUDIO_VIDEO_HEADPHONES = 0x0418, /** diff --git a/api/@ohos.bluetooth.hfp.d.ts b/api/@ohos.bluetooth.hfp.d.ts index f9c6049631..53e4c633c3 100644 --- a/api/@ohos.bluetooth.hfp.d.ts +++ b/api/@ohos.bluetooth.hfp.d.ts @@ -25,7 +25,8 @@ import type baseProfile from './@ohos.bluetooth.baseProfile'; * * @namespace hfp * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace hfp { /** @@ -33,7 +34,8 @@ declare namespace hfp { * * @typedef { baseProfile.BaseProfile } BaseProfile * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ type BaseProfile = baseProfile.BaseProfile; @@ -45,7 +47,8 @@ declare namespace hfp { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @throws { BusinessError } 801 - Capability not supported. * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function createHfpAgProfile(): HandsFreeAudioGatewayProfile; @@ -55,7 +58,8 @@ declare namespace hfp { * @extends BaseProfile * @typedef HandsFreeAudioGatewayProfile * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ interface HandsFreeAudioGatewayProfile extends BaseProfile { /** diff --git a/api/@ohos.bluetooth.hid.d.ts b/api/@ohos.bluetooth.hid.d.ts index 317f129d41..7375d03744 100644 --- a/api/@ohos.bluetooth.hid.d.ts +++ b/api/@ohos.bluetooth.hid.d.ts @@ -25,7 +25,8 @@ import type baseProfile from './@ohos.bluetooth.baseProfile'; * * @namespace hid * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace hid { /** @@ -33,7 +34,8 @@ declare namespace hid { * * @typedef { baseProfile.BaseProfile } BaseProfile * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ type BaseProfile = baseProfile.BaseProfile; @@ -45,7 +47,8 @@ declare namespace hid { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @throws { BusinessError } 801 - Capability not supported. * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function createHidHostProfile(): HidHostProfile; @@ -55,7 +58,8 @@ declare namespace hid { * @extends BaseProfile * @typedef HidHostProfile * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ interface HidHostProfile extends BaseProfile { /** -- Gitee From 1be78f1598618f71dbddc2412f1e78cd9e2e3627 Mon Sep 17 00:00:00 2001 From: xia-bubai Date: Fri, 11 Jul 2025 16:51:37 +0800 Subject: [PATCH 066/746] accesstoken d.ts sync from 0328 to 0702 Signed-off-by: xia-bubai --- api/@ohos.abilityAccessCtrl.d.ets | 188 ---------- api/@ohos.abilityAccessCtrl.d.ts | 232 ++++++++----- api/@ohos.privacyManager.d.ets | 128 ------- api/@ohos.privacyManager.d.ts | 381 ++++++++++++--------- api/permissions.d.ts | 4 +- api/security/PermissionRequestResult.d.ets | 83 ----- api/security/PermissionRequestResult.d.ts | 33 +- 7 files changed, 391 insertions(+), 658 deletions(-) delete mode 100644 api/@ohos.abilityAccessCtrl.d.ets delete mode 100644 api/@ohos.privacyManager.d.ets delete mode 100644 api/security/PermissionRequestResult.d.ets diff --git a/api/@ohos.abilityAccessCtrl.d.ets b/api/@ohos.abilityAccessCtrl.d.ets deleted file mode 100644 index 05dacc231c..0000000000 --- a/api/@ohos.abilityAccessCtrl.d.ets +++ /dev/null @@ -1,188 +0,0 @@ -/* - * Copyright (c) 2021-2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * @file - * @kit AbilityKit - */ -import { AsyncCallback, Callback } from './@ohos.base'; -import { Permissions } from './permissions'; -import type _Context from './application/Context'; -import type _PermissionRequestResult from './security/PermissionRequestResult'; - -/** - * @namespace abilityAccessCtrl - * @syscap SystemCapability.Security.AccessToken - * @crossplatform - * @atomicservice - * @since 20 - */ -declare namespace abilityAccessCtrl { - /** - * Obtains the AtManager instance. - * - * @returns { AtManager } returns the instance of the AtManager. - * @syscap SystemCapability.Security.AccessToken - * @crossplatform - * @atomicservice - * @since 20 - */ - function createAtManager(): AtManager; - - /** - * Provides methods for managing access_token. - * - * @interface AtManager - * @syscap SystemCapability.Security.AccessToken - * @atomicservice - * @since 20 - */ - interface AtManager { - /** - * Checks whether a specified application has been granted the given permission synchronously. - * - * @param { int } tokenID - Token ID of the application. - * @param { Permissions } permissionName - Name of the permission to be verified. - * @returns { GrantStatus } Returns permission verify result. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, or the permissionName exceeds 256 characters. - * @syscap SystemCapability.Security.AccessToken - * @since 20 - */ - verifyAccessTokenSync(tokenID: int, permissionName: Permissions): GrantStatus; - - /** - * Checks whether a specified application has been granted the given permission. - * On the cross-platform, this function can be used to check the permission grant status for the current application only. - * - * @param { int } tokenID - Token ID of the application. - * @param { Permissions } permissionName - Name of the permission to be verified. - * @returns { Promise } Returns permission verify result. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, or the permissionName exceeds 256 characters. - * @syscap SystemCapability.Security.AccessToken - * @crossplatform - * @atomicservice - * @since 20 - */ - checkAccessToken(tokenID: int, permissionName: Permissions): Promise; - - /** - * Checks whether a specified application has been granted the given permission. - * On the cross-platform, this function can be used to check the permission grant status for the current application only. - * - * @param { int } tokenID - Token ID of the application. - * @param { Permissions } permissionName - Name of the permission to be verified. - * @returns { GrantStatus } Returns permission verify result. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, or the permissionName exceeds 256 characters. - * @syscap SystemCapability.Security.AccessToken - * @crossplatform - * @atomicservice - * @since 20 - */ - checkAccessTokenSync(tokenID: int, permissionName: Permissions): GrantStatus; - - /** - * Requests certain permissions from the user. - * - * @param { Context } context - The context that initiates the permission request. - *
    The context must belong to the Stage model and only supports UIAbilityContext and UIExtensionContext. - * @param { Array } permissionList - Indicates the list of permissions to be requested. This parameter cannot be null or empty. - * @param { AsyncCallback } requestCallback Callback for the result from requesting permissions. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @throws { BusinessError } 12100001 - Invalid parameter. The context is invalid when it does not belong to the application itself. - * @syscap SystemCapability.Security.AccessToken - * @stagemodelonly - * @crossplatform - * @atomicservice - * @since 20 - */ - requestPermissionsFromUser(context: Context, permissionList: Array, requestCallback: AsyncCallback): void; - - /** - * Requests certain permissions from the user. - * - * @param { Context } context - The context that initiates the permission request. - *
    The context must belong to the Stage model and only supports UIAbilityContext and UIExtensionContext. - * @param { Array } permissionList - Indicates the list of permissions to be requested. This parameter cannot be null or empty. - * @returns { Promise } Returns result of requesting permissions. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @throws { BusinessError } 12100001 - Invalid parameter. The context is invalid when it does not belong to the application itself. - * @syscap SystemCapability.Security.AccessToken - * @stagemodelonly - * @crossplatform - * @atomicservice - * @since 20 - */ - requestPermissionsFromUser(context: Context, permissionList: Array): Promise; - } - - /** - * GrantStatus. - * - * @enum { int } - * @syscap SystemCapability.Security.AccessToken - * @crossplatform - * @atomicservice - * @since 20 - */ - export enum GrantStatus { - /** - * access_token permission check fail - * - * @syscap SystemCapability.Security.AccessToken - * @crossplatform - * @atomicservice - * @since 20 - */ - PERMISSION_DENIED = -1, - - /** - * access_token permission check success - * - * @syscap SystemCapability.Security.AccessToken - * @crossplatform - * @atomicservice - * @since 20 - */ - PERMISSION_GRANTED = 0 - } -} -export default abilityAccessCtrl; -export { Permissions }; - -/** - * PermissionRequestResult interface. - * - * @typedef { _PermissionRequestResult } - * @syscap SystemCapability.Security.AccessToken - * @stagemodelonly - * @crossplatform - * @atomicservice - * @since 20 - */ -export type PermissionRequestResult = _PermissionRequestResult; - -/** - * Context interface. - * - * @typedef { _Context } - * @syscap SystemCapability.Security.AccessToken - * @stagemodelonly - * @crossplatform - * @atomicservice - * @since 20 - */ -export type Context = _Context; diff --git a/api/@ohos.abilityAccessCtrl.d.ts b/api/@ohos.abilityAccessCtrl.d.ts index 120ed8b2b5..748d6fbfb8 100644 --- a/api/@ohos.abilityAccessCtrl.d.ts +++ b/api/@ohos.abilityAccessCtrl.d.ts @@ -39,7 +39,8 @@ import type _PermissionRequestResult from './security/PermissionRequestResult'; * @syscap SystemCapability.Security.AccessToken * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace abilityAccessCtrl { /** @@ -64,7 +65,8 @@ declare namespace abilityAccessCtrl { * @syscap SystemCapability.Security.AccessToken * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function createAtManager(): AtManager; @@ -81,19 +83,21 @@ declare namespace abilityAccessCtrl { * @interface AtManager * @syscap SystemCapability.Security.AccessToken * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ interface AtManager { /** * Checks whether a specified application has been granted the given permission. * - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Permissions } permissionName - Name of the permission to be verified. The Permissions type supports only valid permission names. * @returns { Promise } Returns permission verify result. * @syscap SystemCapability.Security.AccessToken - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - verifyAccessToken(tokenID: number, permissionName: Permissions): Promise; + verifyAccessToken(tokenID: int, permissionName: Permissions): Promise; /** * Checks whether a specified application has been granted the given permission. @@ -111,20 +115,21 @@ declare namespace abilityAccessCtrl { /** * Checks whether a specified application has been granted the given permission synchronously. * - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Permissions } permissionName - Name of the permission to be verified. * @returns { GrantStatus } Returns permission verify result. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, or the permissionName exceeds 256 characters. * @syscap SystemCapability.Security.AccessToken - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - verifyAccessTokenSync(tokenID: number, permissionName: Permissions): GrantStatus; + verifyAccessTokenSync(tokenID: int, permissionName: Permissions): GrantStatus; /** * Checks whether a specified application has been granted the given permission. * - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Permissions } permissionName - Name of the permission to be verified. * @returns { Promise } Returns permission verify result. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. @@ -136,7 +141,7 @@ declare namespace abilityAccessCtrl { * Checks whether a specified application has been granted the given permission. * On the cross-platform, this function can be used to check the permission grant status for the current application only. * - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Permissions } permissionName - Name of the permission to be verified. * @returns { Promise } Returns permission verify result. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. @@ -149,7 +154,7 @@ declare namespace abilityAccessCtrl { * Checks whether a specified application has been granted the given permission. * On the cross-platform, this function can be used to check the permission grant status for the current application only. * - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Permissions } permissionName - Name of the permission to be verified. * @returns { Promise } Returns permission verify result. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. @@ -157,15 +162,16 @@ declare namespace abilityAccessCtrl { * @syscap SystemCapability.Security.AccessToken * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - checkAccessToken(tokenID: number, permissionName: Permissions): Promise; + checkAccessToken(tokenID: int, permissionName: Permissions): Promise; /** * Checks whether a specified application has been granted the given permission. * On the cross-platform, this function can be used to check the permission grant status for the current application only. * - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Permissions } permissionName - Name of the permission to be verified. * @returns { GrantStatus } Returns permission verify result. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. @@ -178,7 +184,7 @@ declare namespace abilityAccessCtrl { * Checks whether a specified application has been granted the given permission. * On the cross-platform, this function can be used to check the permission grant status for the current application only. * - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Permissions } permissionName - Name of the permission to be verified. * @returns { GrantStatus } Returns permission verify result. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. @@ -186,9 +192,10 @@ declare namespace abilityAccessCtrl { * @syscap SystemCapability.Security.AccessToken * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - checkAccessTokenSync(tokenID: number, permissionName: Permissions): GrantStatus; + checkAccessTokenSync(tokenID: int, permissionName: Permissions): GrantStatus; /** * Requests certain permissions from the user. @@ -230,7 +237,8 @@ declare namespace abilityAccessCtrl { * @stagemodelonly * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ requestPermissionsFromUser( context: Context, @@ -278,7 +286,8 @@ declare namespace abilityAccessCtrl { * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ requestPermissionsFromUser(context: Context, permissionList: Array): Promise; @@ -286,9 +295,9 @@ declare namespace abilityAccessCtrl { * Grants a specified user_grant permission to the given application. * * @permission ohos.permission.GRANT_SENSITIVE_PERMISSIONS - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Permissions } permissionName - Name of the permission to be granted. - * @param { number } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. + * @param { int } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.GRANT_SENSITIVE_PERMISSIONS". @@ -302,17 +311,18 @@ declare namespace abilityAccessCtrl { * @throws { BusinessError } 12100007 - The service is abnormal. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - grantUserGrantedPermission(tokenID: number, permissionName: Permissions, permissionFlags: number): Promise; + grantUserGrantedPermission(tokenID: int, permissionName: Permissions, permissionFlags: int): Promise; /** * Grants a specified user_grant permission to the given application. * * @permission ohos.permission.GRANT_SENSITIVE_PERMISSIONS - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Permissions } permissionName - Name of the permission to be granted. - * @param { number } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. + * @param { int } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. * @param { AsyncCallback } callback - Asynchronous callback interface. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.GRANT_SENSITIVE_PERMISSIONS". @@ -326,12 +336,13 @@ declare namespace abilityAccessCtrl { * @throws { BusinessError } 12100007 - The service is abnormal. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ grantUserGrantedPermission( - tokenID: number, + tokenID: int, permissionName: Permissions, - permissionFlags: number, + permissionFlags: int, callback: AsyncCallback ): void; @@ -339,9 +350,9 @@ declare namespace abilityAccessCtrl { * Revoke a specified user_grant permission to the given application. * * @permission ohos.permission.REVOKE_SENSITIVE_PERMISSIONS - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Permissions } permissionName - Name of the permission to be revoked. - * @param { number } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. + * @param { int } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS". @@ -355,17 +366,18 @@ declare namespace abilityAccessCtrl { * @throws { BusinessError } 12100007 - The service is abnormal. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - revokeUserGrantedPermission(tokenID: number, permissionName: Permissions, permissionFlags: number): Promise; + revokeUserGrantedPermission(tokenID: int, permissionName: Permissions, permissionFlags: int): Promise; /** * Revoke a specified user_grant permission to the given application. * * @permission ohos.permission.REVOKE_SENSITIVE_PERMISSIONS - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Permissions } permissionName - Name of the permission to be revoked. - * @param { number } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. + * @param { int } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. * @param { AsyncCallback } callback - Asynchronous callback interface. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS". @@ -379,12 +391,13 @@ declare namespace abilityAccessCtrl { * @throws { BusinessError } 12100007 - The service is abnormal. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ revokeUserGrantedPermission( - tokenID: number, + tokenID: int, permissionName: Permissions, - permissionFlags: number, + permissionFlags: int, callback: AsyncCallback ): void; @@ -392,9 +405,9 @@ declare namespace abilityAccessCtrl { * Queries specified permission flags of the given application. * * @permission ohos.permission.GET_SENSITIVE_PERMISSIONS or ohos.permission.GRANT_SENSITIVE_PERMISSIONS or ohos.permission.REVOKE_SENSITIVE_PERMISSIONS - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Permissions } permissionName - Name of the permission to be get. - * @returns { Promise } Return permission flags. + * @returns { Promise } Return permission flags. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission specified below. * @throws { BusinessError } 202 - Not System App. Interface caller is not a system app. @@ -405,9 +418,10 @@ declare namespace abilityAccessCtrl { * @throws { BusinessError } 12100007 - The service is abnormal. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - getPermissionFlags(tokenID: number, permissionName: Permissions): Promise; + getPermissionFlags(tokenID: int, permissionName: Permissions): Promise; /** * Set the toggle status of one permission flag. @@ -425,7 +439,8 @@ declare namespace abilityAccessCtrl { * @throws { BusinessError } 12100007 - The service is abnormal. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ setPermissionRequestToggleStatus(permissionName: Permissions, status: PermissionRequestToggleStatus): Promise; @@ -443,26 +458,28 @@ declare namespace abilityAccessCtrl { * @throws { BusinessError } 12100007 - The service is abnormal. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ getPermissionRequestToggleStatus(permissionName: Permissions): Promise; /** * Queries permission management version. * - * @returns { Promise } Return permission version. + * @returns { Promise } Return permission version. * @throws { BusinessError } 202 - Not System App. Interface caller is not a system app. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - getVersion(): Promise; + getVersion(): Promise; /** * Queries permissions status of the given application. * * @permission ohos.permission.GET_SENSITIVE_PERMISSIONS - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Array } permissionList - Indicates the list of permissions to be queried. This parameter cannot be null or empty. * @returns { Promise> } Return permission status. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. @@ -473,16 +490,17 @@ declare namespace abilityAccessCtrl { * @throws { BusinessError } 12100007 - The service is abnormal. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - getPermissionsStatus(tokenID: number, permissionList: Array): Promise>; + getPermissionsStatus(tokenID: int, permissionList: Array): Promise>; /** * Registers a permission state callback so that the application can be notified upon specified permission state of specified applications changes. * * @permission ohos.permission.GET_SENSITIVE_PERMISSIONS * @param { 'permissionStateChange' } type - Event type. - * @param { Array } tokenIDList - A list of permissions that specify the permissions to be listened on. The value in the list can be: + * @param { Array } tokenIDList - A list of permissions that specify the permissions to be listened on. The value in the list can be: *
    {@code empty} - Indicates that the application can be notified if the specified permission state of any applications changes. *
    {@code non-empty} - Indicates that the application can only be notified if the specified permission state of the specified applications change. * @param { Array } permissionList - A list of permissions that specify the permissions to be listened on. The value in the list can be: @@ -500,11 +518,12 @@ declare namespace abilityAccessCtrl { * @throws { BusinessError } 12100008 - Out of memory. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ on( type: 'permissionStateChange', - tokenIDList: Array, + tokenIDList: Array, permissionList: Array, callback: Callback ): void; @@ -529,7 +548,8 @@ declare namespace abilityAccessCtrl { * @throws { BusinessError } 12100007 - The service is abnormal. * @syscap SystemCapability.Security.AccessToken * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ on( type: 'selfPermissionStateChange', @@ -542,7 +562,7 @@ declare namespace abilityAccessCtrl { * * @permission ohos.permission.GET_SENSITIVE_PERMISSIONS * @param { 'permissionStateChange' } type - Event type. - * @param { Array } tokenIDList - A list of permissions that specify the permissions to be listened on. + * @param { Array } tokenIDList - A list of permissions that specify the permissions to be listened on. * It should correspond to the value registered by function of "on", whose type is "permissionStateChange". * @param { Array } permissionList - A list of permissions that specify the permissions to be listened on. * It should correspond to the value registered by function of "on", whose type is "permissionStateChange". @@ -556,11 +576,12 @@ declare namespace abilityAccessCtrl { * @throws { BusinessError } 12100008 - Out of memory. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ off( type: 'permissionStateChange', - tokenIDList: Array, + tokenIDList: Array, permissionList: Array, callback?: Callback ): void; @@ -578,7 +599,8 @@ declare namespace abilityAccessCtrl { * @throws { BusinessError } 12100007 - The service is abnormal. * @syscap SystemCapability.Security.AccessToken * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ off( type: 'selfPermissionStateChange', @@ -602,7 +624,8 @@ declare namespace abilityAccessCtrl { * @syscap SystemCapability.Security.AccessToken * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ requestPermissionOnSetting(context: Context, permissionList: Array): Promise>; @@ -620,14 +643,15 @@ declare namespace abilityAccessCtrl { * @syscap SystemCapability.Security.AccessToken * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ requestGlobalSwitch(context: Context, type: SwitchType): Promise; /** * Starts the permission manager page of an application. * - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 202 - Not System App. Interface caller is not a system app. * @throws { BusinessError } 12100002 - The specified tokenID does not exist. @@ -635,9 +659,10 @@ declare namespace abilityAccessCtrl { * @syscap SystemCapability.Security.AccessToken * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ - requestPermissionOnApplicationSetting(tokenID: number): Promise; + requestPermissionOnApplicationSetting(tokenID: int): Promise; /** * Queries permission status of the application synchronously. @@ -656,14 +681,14 @@ declare namespace abilityAccessCtrl { /** * GrantStatus. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.AccessToken * @since 8 */ /** * GrantStatus. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.AccessToken * @crossplatform * @since 10 @@ -671,11 +696,12 @@ declare namespace abilityAccessCtrl { /** * GrantStatus. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.AccessToken * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum GrantStatus { /** @@ -697,7 +723,8 @@ declare namespace abilityAccessCtrl { * @syscap SystemCapability.Security.AccessToken * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ PERMISSION_DENIED = -1, /** @@ -719,7 +746,8 @@ declare namespace abilityAccessCtrl { * @syscap SystemCapability.Security.AccessToken * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ PERMISSION_GRANTED = 0 } @@ -727,10 +755,11 @@ declare namespace abilityAccessCtrl { /** * Enum for permission state change type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.AccessToken * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum PermissionStateChangeType { /** @@ -738,7 +767,8 @@ declare namespace abilityAccessCtrl { * * @syscap SystemCapability.Security.AccessToken * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ PERMISSION_REVOKED_OPER = 0, /** @@ -746,7 +776,8 @@ declare namespace abilityAccessCtrl { * * @syscap SystemCapability.Security.AccessToken * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ PERMISSION_GRANTED_OPER = 1 } @@ -754,10 +785,11 @@ declare namespace abilityAccessCtrl { /** * Enum for permission request toggle status. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum PermissionRequestToggleStatus { /** @@ -765,7 +797,8 @@ declare namespace abilityAccessCtrl { * * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ CLOSED = 0, /** @@ -773,7 +806,8 @@ declare namespace abilityAccessCtrl { * * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ OPEN = 1, } @@ -784,7 +818,8 @@ declare namespace abilityAccessCtrl { * @interface PermissionStateChangeInfo * @syscap SystemCapability.Security.AccessToken * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 * @name PermissionStateChangeInfo */ interface PermissionStateChangeInfo { @@ -794,19 +829,21 @@ declare namespace abilityAccessCtrl { * @type { PermissionStateChangeType } * @syscap SystemCapability.Security.AccessToken * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ change: PermissionStateChangeType; /** * Indicates the application whose permission state has been changed. * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.AccessToken * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ - tokenID: number; + tokenID: int; /** * Indicates the permission whose state has been changed. @@ -814,7 +851,8 @@ declare namespace abilityAccessCtrl { * @type { Permissions } * @syscap SystemCapability.Security.AccessToken * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ permissionName: Permissions; } @@ -822,10 +860,11 @@ declare namespace abilityAccessCtrl { /** * PermissionStatus. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.AccessToken * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ export enum PermissionStatus { /** @@ -834,6 +873,7 @@ declare namespace abilityAccessCtrl { * @syscap SystemCapability.Security.AccessToken * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ DENIED = -1, /** @@ -842,6 +882,7 @@ declare namespace abilityAccessCtrl { * @syscap SystemCapability.Security.AccessToken * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ GRANTED = 0, /** @@ -850,6 +891,7 @@ declare namespace abilityAccessCtrl { * @syscap SystemCapability.Security.AccessToken * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ NOT_DETERMINED = 1, /** @@ -858,6 +900,7 @@ declare namespace abilityAccessCtrl { * @syscap SystemCapability.Security.AccessToken * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ INVALID = 2, /** @@ -866,6 +909,7 @@ declare namespace abilityAccessCtrl { * @syscap SystemCapability.Security.AccessToken * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ RESTRICTED = 3 } @@ -873,10 +917,11 @@ declare namespace abilityAccessCtrl { /** * SwitchType. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Security.AccessToken * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum SwitchType { /** @@ -884,7 +929,8 @@ declare namespace abilityAccessCtrl { * * @syscap SystemCapability.Security.AccessToken * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ CAMERA = 0, /** @@ -892,7 +938,8 @@ declare namespace abilityAccessCtrl { * * @syscap SystemCapability.Security.AccessToken * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ MICROPHONE = 1, /** @@ -900,7 +947,8 @@ declare namespace abilityAccessCtrl { * * @syscap SystemCapability.Security.AccessToken * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ LOCATION = 2, } @@ -925,7 +973,8 @@ export { Permissions }; * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export type PermissionRequestResult = _PermissionRequestResult; /** @@ -945,6 +994,7 @@ export type PermissionRequestResult = _PermissionRequestResult; * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export type Context = _Context; diff --git a/api/@ohos.privacyManager.d.ets b/api/@ohos.privacyManager.d.ets deleted file mode 100644 index cf44b5aeb3..0000000000 --- a/api/@ohos.privacyManager.d.ets +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * @file - * @kit AbilityKit - */ -import { AsyncCallback, Callback } from './@ohos.base'; -import { Permissions } from './permissions'; -/** - * @namespace privacyManager - * @syscap SystemCapability.Security.AccessToken - * @since 20 - */ -declare namespace privacyManager { - /** - * Adds an access record of a sensitive permission. - * - * @permission ohos.permission.PERMISSION_USED_STATS - * @param { int } tokenID - Token ID of the application. - * @param { Permissions } permissionName - Name of the permission accessed. - * @param { int } successCount - Number of successful accesses to the permission. - * @param { int } failCount - Number of failed accesses to the permission. - * @param { AddPermissionUsedRecordOptions } options - Options to be added. - * @returns { Promise } Promise that returns no value. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.PERMISSION_USED_STATS". - * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. - * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, the permissionName exceeds 256 characters, the count value is invalid, - * or usedType in AddPermissionUsedRecordOptions is invalid. - * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. - * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. - * @throws { BusinessError } 12100007 - The service is abnormal. - * @throws { BusinessError } 12100008 - Out of memory. - * @syscap SystemCapability.Security.AccessToken - * @systemapi - * @since 20 - */ - function addPermissionUsedRecord(tokenID: int, permissionName: Permissions, successCount: int, failCount: int, options?: AddPermissionUsedRecordOptions): Promise; - /** - * Adds access record of sensitive permission. - * - * @permission ohos.permission.PERMISSION_USED_STATS - * @param { int } tokenID - Token ID of the application. - * @param { Permissions } permissionName - Name of the permission to be added. - * @param { int } successCount - Access count. - * @param { int } failCount - Reject count. - * @param { AsyncCallback } callback - Asynchronous callback interface. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.PERMISSION_USED_STATS". - * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. - * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, the permissionName exceeds 256 characters, or the count value is invalid. - * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. - * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. - * @throws { BusinessError } 12100007 - The service is abnormal. - * @throws { BusinessError } 12100008 - Out of memory. - * @syscap SystemCapability.Security.AccessToken - * @systemapi - * @since 20 - */ - function addPermissionUsedRecord(tokenID: int, permissionName: Permissions, successCount: int, failCount: int, callback: AsyncCallback): void; - /** - * Enumerates the means by which sensitive resources are accessed. - * - * @enum { int } PermissionUsedType - * @syscap SystemCapability.Security.AccessToken - * @systemapi - * @since 20 - */ - enum PermissionUsedType { - /** - * Sensitive resources are accessed with the declared permission or permission granted by the user. - * - * @syscap SystemCapability.Security.AccessToken - * @systemapi - * @since 20 - */ - NORMAL_TYPE = 0, - /** - * Sensitive resources are accessed through a picker. - * - * @syscap SystemCapability.Security.AccessToken - * @systemapi - * @since 20 - */ - PICKER_TYPE = 1, - /** - * Sensitive resources are accessed through a security component. - * - * @syscap SystemCapability.Security.AccessToken - * @systemapi - * @since 20 - */ - SECURITY_COMPONENT_TYPE = 2 - } - /** - * Additional information to add. - * - * @interface AddPermissionUsedRecordOptions - * @syscap SystemCapability.Security.AccessToken - * @systemapi - * @since 20 - */ - interface AddPermissionUsedRecordOptions { - /** - * Used type of the permission accessed. - * - * @type { ?PermissionUsedType } - * @syscap SystemCapability.Security.AccessToken - * @systemapi - * @since 20 - */ - usedType?: PermissionUsedType; - } -} -export default privacyManager; -export { Permissions }; diff --git a/api/@ohos.privacyManager.d.ts b/api/@ohos.privacyManager.d.ts index 22f557c3aa..da3c676ade 100644 --- a/api/@ohos.privacyManager.d.ts +++ b/api/@ohos.privacyManager.d.ts @@ -24,17 +24,18 @@ import { Permissions } from './permissions'; /** * @namespace privacyManager * @syscap SystemCapability.Security.AccessToken - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace privacyManager { /** * Adds access record of sensitive permission. * * @permission ohos.permission.PERMISSION_USED_STATS - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Permissions } permissionName - Name of the permission to be added. - * @param { number } successCount - Access count. - * @param { number } failCount - Reject count. + * @param { int } successCount - Access count. + * @param { int } failCount - Reject count. * @returns { Promise } Promise that returns no value. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.PERMISSION_USED_STATS". @@ -52,10 +53,10 @@ declare namespace privacyManager { * Adds an access record of a sensitive permission. * * @permission ohos.permission.PERMISSION_USED_STATS - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Permissions } permissionName - Name of the permission accessed. - * @param { number } successCount - Number of successful accesses to the permission. - * @param { number } failCount - Number of failed accesses to the permission. + * @param { int } successCount - Number of successful accesses to the permission. + * @param { int } failCount - Number of failed accesses to the permission. * @param { AddPermissionUsedRecordOptions } options - Options to be added. * @returns { Promise } Promise that returns no value. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. @@ -69,13 +70,14 @@ declare namespace privacyManager { * @throws { BusinessError } 12100008 - Out of memory. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function addPermissionUsedRecord( - tokenID: number, + tokenID: int, permissionName: Permissions, - successCount: number, - failCount: number, + successCount: int, + failCount: int, options?: AddPermissionUsedRecordOptions ): Promise; @@ -83,10 +85,10 @@ declare namespace privacyManager { * Adds access record of sensitive permission. * * @permission ohos.permission.PERMISSION_USED_STATS - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Permissions } permissionName - Name of the permission to be added. - * @param { number } successCount - Access count. - * @param { number } failCount - Reject count. + * @param { int } successCount - Access count. + * @param { int } failCount - Reject count. * @param { AsyncCallback } callback - Asynchronous callback interface. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.PERMISSION_USED_STATS". @@ -98,13 +100,14 @@ declare namespace privacyManager { * @throws { BusinessError } 12100008 - Out of memory. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function addPermissionUsedRecord( - tokenID: number, + tokenID: int, permissionName: Permissions, - successCount: number, - failCount: number, + successCount: int, + failCount: int, callback: AsyncCallback ): void; @@ -124,7 +127,8 @@ declare namespace privacyManager { * @throws { BusinessError } 12100008 - Out of memory. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getPermissionUsedRecord(request: PermissionUsedRequest): Promise; @@ -144,7 +148,8 @@ declare namespace privacyManager { * @throws { BusinessError } 12100008 - Out of memory. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getPermissionUsedRecord( request: PermissionUsedRequest, @@ -155,7 +160,7 @@ declare namespace privacyManager { * Start using sensitive permission. * * @permission ohos.permission.PERMISSION_USED_STATS - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Permissions } permissionName - Name of the permission to be started. * @returns { Promise } Promise that returns no value. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. @@ -171,18 +176,19 @@ declare namespace privacyManager { * @throws { BusinessError } 12100008 - Out of memory. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - function startUsingPermission(tokenID: number, permissionName: Permissions): Promise; + function startUsingPermission(tokenID: int, permissionName: Permissions): Promise; /** * Start using sensitive permission. * * @permission ohos.permission.PERMISSION_USED_STATS - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Permissions } permissionName - Name of the permission to be started. - * @param { number } pid - Pid of the application, default -1. - * @param { PermissionUsedType } usedType - Used type of the permission accessed, default NORMAL_TYPE. + * @param { int } [pid] - Pid of the application, default -1. + * @param { PermissionUsedType } [usedType] - Used type of the permission accessed, default NORMAL_TYPE. * @returns { Promise } Promise that returns no value. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.PERMISSION_USED_STATS". @@ -197,12 +203,13 @@ declare namespace privacyManager { * @throws { BusinessError } 12100008 - Out of memory. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function startUsingPermission( - tokenID: number, + tokenID: int, permissionName: Permissions, - pid?: number, + pid?: int, usedType?: PermissionUsedType ): Promise; @@ -210,7 +217,7 @@ declare namespace privacyManager { * Start using sensitive permission. * * @permission ohos.permission.PERMISSION_USED_STATS - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Permissions } permissionName - Name of the permission to be started. * @param { AsyncCallback } callback - Asynchronous callback interface. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. @@ -226,15 +233,16 @@ declare namespace privacyManager { * @throws { BusinessError } 12100008 - Out of memory. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - function startUsingPermission(tokenID: number, permissionName: Permissions, callback: AsyncCallback): void; + function startUsingPermission(tokenID: int, permissionName: Permissions, callback: AsyncCallback): void; /** * Stop using sensitive permission. * * @permission ohos.permission.PERMISSION_USED_STATS - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Permissions } permissionName - Name of the permission to be stopped. * @returns { Promise } Promise that returns no value. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. @@ -249,17 +257,18 @@ declare namespace privacyManager { * @throws { BusinessError } 12100008 - Out of memory. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - function stopUsingPermission(tokenID: number, permissionName: Permissions): Promise; + function stopUsingPermission(tokenID: int, permissionName: Permissions): Promise; /** * Stop using sensitive permission. * * @permission ohos.permission.PERMISSION_USED_STATS - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Permissions } permissionName - Name of the permission to be stopped. - * @param { number } pid - Pid of the application, default -1. + * @param { int } [pid] - Pid of the application, default -1. * @returns { Promise } Promise that returns no value. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.PERMISSION_USED_STATS". @@ -273,19 +282,20 @@ declare namespace privacyManager { * @throws { BusinessError } 12100008 - Out of memory. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function stopUsingPermission( - tokenID: number, + tokenID: int, permissionName: Permissions, - pid?: number + pid?: int ): Promise; /** * Stop using sensitive permission. * * @permission ohos.permission.PERMISSION_USED_STATS - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Permissions } permissionName - Name of the permission to be stopped. * @param { AsyncCallback } callback - Asynchronous callback interface. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. @@ -300,9 +310,10 @@ declare namespace privacyManager { * @throws { BusinessError } 12100008 - Out of memory. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - function stopUsingPermission(tokenID: number, permissionName: Permissions, callback: AsyncCallback): void; + function stopUsingPermission(tokenID: int, permissionName: Permissions, callback: AsyncCallback): void; /** * Subscribes to the change of active state of the specified permission. @@ -321,7 +332,8 @@ declare namespace privacyManager { * @throws { BusinessError } 12100008 - Out of memory. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function on( type: 'activeStateChange', @@ -335,17 +347,18 @@ declare namespace privacyManager { * @permission ohos.permission.PERMISSION_USED_STATS * @param { 'activeStateChange' } type - Event type. This parameter cannot change. * @param { Array } permissionList - Indicates the permission list, which are specified. This parameter cannot be null or empty. - * @param { Callback } callback - Callback for listening permission change. + * @param { Callback } [callback] - Callback for listening permission change. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.PERMISSION_USED_STATS". * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. - * @throws { BusinessError } 12100001 - Invalid parameter. The permissionList is not in the listening list. + * @throws { BusinessError } 12100001 - Invalid parameter. The permissionNames in the list are all invalid, or the list size exceeds 1024 bytes. * @throws { BusinessError } 12100004 - The API is not used in pair with 'on'. * @throws { BusinessError } 12100007 - The service is abnormal. * @throws { BusinessError } 12100008 - Out of memory. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function off( type: 'activeStateChange', @@ -357,7 +370,7 @@ declare namespace privacyManager { * Obtains the used type of the permission accessed. * * @permission ohos.permission.PERMISSION_USED_STATS - * @param { number } tokenId - Token ID of the application. By default, all token IDs of the device are returned. + * @param { int } tokenId - Token ID of the application. By default, all token IDs of the device are returned. * @param { Permissions } permissionName - Name of the permission to query. By default, all permissions of the device are returned. * @returns { Promise> } Promise used to return the information obtained. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Incorrect parameter types. @@ -368,9 +381,10 @@ declare namespace privacyManager { * @throws { BusinessError } 12100003 - The input permissionName does not exist. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - function getPermissionUsedTypeInfos(tokenId?: number, permissionName?: Permissions): Promise>; + function getPermissionUsedTypeInfos(tokenId?: int, permissionName?: Permissions): Promise>; /** * Sets the toggle state of permission access records for the current user. @@ -385,7 +399,8 @@ declare namespace privacyManager { * @throws { BusinessError } 12100009 - Common inner error. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setPermissionUsedRecordToggleStatus(status: boolean): Promise; @@ -399,17 +414,19 @@ declare namespace privacyManager { * @throws { BusinessError } 12100007 - The service is abnormal. * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getPermissionUsedRecordToggleStatus(): Promise; /** * Enum for permission for status. * - * @enum { number } PermissionActiveStatus + * @enum { int } PermissionActiveStatus * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ enum PermissionActiveStatus { /** @@ -417,7 +434,8 @@ declare namespace privacyManager { * * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ PERM_INACTIVE = 0, @@ -426,7 +444,8 @@ declare namespace privacyManager { * * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ PERM_ACTIVE_IN_FOREGROUND = 1, @@ -435,7 +454,8 @@ declare namespace privacyManager { * * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ PERM_ACTIVE_IN_BACKGROUND = 2 } @@ -446,28 +466,31 @@ declare namespace privacyManager { * @interface ActiveChangeResponse * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface ActiveChangeResponse { /** * AccessTokenID which called the interface * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ - callingTokenId?: number; + callingTokenId?: int; /** * AccessTokenID * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - tokenId: number; + tokenId: int; /** * The permission name @@ -475,7 +498,8 @@ declare namespace privacyManager { * @type { Permissions } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ permissionName: Permissions; @@ -485,7 +509,8 @@ declare namespace privacyManager { * @type { string } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ deviceId: string; @@ -495,7 +520,8 @@ declare namespace privacyManager { * @type { PermissionActiveStatus } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ activeStatus: PermissionActiveStatus; @@ -505,7 +531,8 @@ declare namespace privacyManager { * @type { ?PermissionUsedType } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ usedType?: PermissionUsedType; } @@ -513,10 +540,11 @@ declare namespace privacyManager { /** * PermissionUsageFlag. * - * @enum { number } PermissionUsageFlag + * @enum { int } PermissionUsageFlag * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ enum PermissionUsageFlag { /** @@ -524,7 +552,8 @@ declare namespace privacyManager { * * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ FLAG_PERMISSION_USAGE_SUMMARY = 0, /** @@ -532,7 +561,8 @@ declare namespace privacyManager { * * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ FLAG_PERMISSION_USAGE_DETAIL = 1 } @@ -543,18 +573,20 @@ declare namespace privacyManager { * @interface PermissionUsedRequest * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface PermissionUsedRequest { /** * AccessTokenID * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - tokenId?: number; + tokenId?: int; /** * Distribute flag @@ -563,7 +595,8 @@ declare namespace privacyManager { * @default false * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ isRemote?: boolean; @@ -573,7 +606,8 @@ declare namespace privacyManager { * @type { ?string } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ deviceId?: string; @@ -583,7 +617,8 @@ declare namespace privacyManager { * @type { ?string } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ bundleName?: string; @@ -593,31 +628,34 @@ declare namespace privacyManager { * @type { ?Array } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ permissionNames?: Array; /** * The begin time, in milliseconds * - * @type { ?number } + * @type { ?long } * @default 0 * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - beginTime?: number; + beginTime?: long; /** * The end time, in milliseconds * - * @type { ?number } + * @type { ?long } * @default 0 * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - endTime?: number; + endTime?: long; /** * The permission usage flag @@ -625,7 +663,8 @@ declare namespace privacyManager { * @type { PermissionUsageFlag } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ flag: PermissionUsageFlag; } @@ -636,28 +675,31 @@ declare namespace privacyManager { * @interface PermissionUsedResponse * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface PermissionUsedResponse { /** * The begin time, in milliseconds * - * @type { number } + * @type { long } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - beginTime: number; + beginTime: long; /** * The end time, in milliseconds * - * @type { number } + * @type { long } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - endTime: number; + endTime: long; /** * The list of permission used records of bundle @@ -665,7 +707,8 @@ declare namespace privacyManager { * @type { Array } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ bundleRecords: Array; } @@ -676,18 +719,20 @@ declare namespace privacyManager { * @interface BundleUsedRecord * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface BundleUsedRecord { /** * AccessTokenID * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - tokenId: number; + tokenId: int; /** * Distribute flag @@ -695,7 +740,8 @@ declare namespace privacyManager { * @type { boolean } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ isRemote: boolean; @@ -705,7 +751,8 @@ declare namespace privacyManager { * @type { string } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ deviceId: string; @@ -715,7 +762,8 @@ declare namespace privacyManager { * @type { string } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ bundleName: string; @@ -725,7 +773,8 @@ declare namespace privacyManager { * @type { Array } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ permissionRecords: Array; } @@ -736,7 +785,8 @@ declare namespace privacyManager { * @interface PermissionUsedRecord * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface PermissionUsedRecord { /** @@ -745,59 +795,65 @@ declare namespace privacyManager { * @type { Permissions } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ permissionName: Permissions; /** * The access counts * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - accessCount: number; + accessCount: int; /** * The reject counts * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - rejectCount: number; + rejectCount: int; /** * The last access time, in milliseconds * - * @type { number } + * @type { long } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - lastAccessTime: number; + lastAccessTime: long; /** * The last reject time, in milliseconds * - * @type { number } + * @type { long } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - lastRejectTime: number; + lastRejectTime: long; /** * The last access duration, in milliseconds * - * @type { number } + * @type { long } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - lastAccessDuration: number; + lastAccessDuration: long; /** * The list of access records of details @@ -805,7 +861,8 @@ declare namespace privacyManager { * @type { Array } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ accessRecords: Array; @@ -815,7 +872,8 @@ declare namespace privacyManager { * @type { Array } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ rejectRecords: Array; } @@ -826,58 +884,64 @@ declare namespace privacyManager { * @interface UsedRecordDetail * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface UsedRecordDetail { /** * The status * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - status: number; + status: int; /** * Indicates the status of lockscreen. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - lockScreenStatus?: number; + lockScreenStatus?: int; /** * Timestamp, in milliseconds * - * @type { number } + * @type { long } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - timestamp: number; + timestamp: long; /** * The value of successCount or failCount passed in to addPermissionUsedRecord. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - count?: number; + count?: int; /** * Access duration, in milliseconds * - * @type { number } + * @type { long } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - accessDuration: number; + accessDuration: long; /** * Used type of the permission accessed. @@ -885,7 +949,8 @@ declare namespace privacyManager { * @type { ?PermissionUsedType } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ usedType?: PermissionUsedType; } @@ -893,10 +958,11 @@ declare namespace privacyManager { /** * Enumerates the means by which sensitive resources are accessed. * - * @enum { number } PermissionUsedType + * @enum { int } PermissionUsedType * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum PermissionUsedType { /** @@ -904,7 +970,8 @@ declare namespace privacyManager { * * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NORMAL_TYPE = 0, @@ -913,7 +980,8 @@ declare namespace privacyManager { * * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PICKER_TYPE = 1, @@ -922,7 +990,8 @@ declare namespace privacyManager { * * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ SECURITY_COMPONENT_TYPE = 2 } @@ -933,18 +1002,20 @@ declare namespace privacyManager { * @interface PermissionUsedTypeInfo * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface PermissionUsedTypeInfo { /** * Token ID of the application. * - * @type { number } + * @type { int } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - tokenId: number; + tokenId: int; /** * Name of the permission accessed. @@ -952,7 +1023,8 @@ declare namespace privacyManager { * @type { Permissions } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ permissionName: Permissions; @@ -962,7 +1034,8 @@ declare namespace privacyManager { * @type { PermissionUsedType } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ usedType: PermissionUsedType; } @@ -973,7 +1046,8 @@ declare namespace privacyManager { * @interface AddPermissionUsedRecordOptions * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface AddPermissionUsedRecordOptions { /** @@ -982,11 +1056,12 @@ declare namespace privacyManager { * @type { ?PermissionUsedType } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ usedType?: PermissionUsedType; } } export default privacyManager; -export { Permissions }; \ No newline at end of file +export { Permissions }; diff --git a/api/permissions.d.ts b/api/permissions.d.ts index a9e958ed16..a18d38e1ef 100644 --- a/api/permissions.d.ts +++ b/api/permissions.d.ts @@ -16,7 +16,6 @@ /** * @file Defines all permissions. * @kit AbilityKit - * @arkts 1.1&1.2 */ /** @@ -33,5 +32,6 @@ * @syscap SystemCapability.Security.AccessToken * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ -export type Permissions = string; \ No newline at end of file +export type Permissions = string; diff --git a/api/security/PermissionRequestResult.d.ets b/api/security/PermissionRequestResult.d.ets deleted file mode 100644 index 7bb9666a09..0000000000 --- a/api/security/PermissionRequestResult.d.ets +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"), - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * @file - * @kit AbilityKit - */ - - -/** - * The result of requestPermissionsFromUser with asynchronous callback. - * - * @syscap SystemCapability.Security.AccessToken - * @stagemodelonly - * @crossplatform - * @atomicservice - * @since 20 - */ -export default class PermissionRequestResult { - /** - * The permissions passed in by the user. - * - * @type { Array } - * @syscap SystemCapability.Security.AccessToken - * @stagemodelonly - * @crossplatform - * @atomicservice - * @since 20 - */ - permissions: Array; - /** - * The results for the corresponding request permissions. The value 0 indicates that a - * permission is granted, the value -1 indicates not, and the value 2 indicates the request is invalid. - * - * @type { Array } - * @syscap SystemCapability.Security.AccessToken - * @stagemodelonly - * @crossplatform - * @atomicservice - * @since 20 - */ - authResults: Array; - /** - * Specifies whether a dialog box is shown for each requested permission. - * The value true means that a dialog box is shown, and false means the opposite. - * - * @type { ?Array } - * @syscap SystemCapability.Security.AccessToken - * @stagemodelonly - * @atomicservice - * @since 20 - */ - dialogShownResults?: Array; - /** - * Enumerates the return values of the permission request operation. - * 0 The operation is successful. - * 1 The permission name is invalid. - * 2 The requested permission has not been declared. - * 3 The conditions for requesting the permission are not met. - * 4 The user does not agree to the Privacy Statement. - * 5 The permission cannot be requested in a pop-up window. - * 12 The service is abnormal. - * - * @type { ?Array } - * @syscap SystemCapability.Security.AccessToken - * @stagemodelonly - * @crossplatform - * @atomicservice - * @since 20 - */ - errorReasons?: Array; -} diff --git a/api/security/PermissionRequestResult.d.ts b/api/security/PermissionRequestResult.d.ts index 658359502f..16ff14dbae 100644 --- a/api/security/PermissionRequestResult.d.ts +++ b/api/security/PermissionRequestResult.d.ts @@ -40,9 +40,10 @@ * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ -export default class PermissionRequestResult { +declare class PermissionRequestResult { /** * The permissions passed in by the user. * @@ -68,7 +69,8 @@ export default class PermissionRequestResult { * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ permissions: Array; @@ -76,7 +78,7 @@ export default class PermissionRequestResult { * The results for the corresponding request permissions. The value 0 indicates that a * permission is granted, the value -1 indicates not, and the value 2 indicates the request is invalid. * - * @type { Array } + * @type { Array } * @syscap SystemCapability.Security.AccessToken * @stagemodelonly * @since 9 @@ -85,7 +87,7 @@ export default class PermissionRequestResult { * The results for the corresponding request permissions. The value 0 indicates that a * permission is granted, the value -1 indicates not, and the value 2 indicates the request is invalid. * - * @type { Array } + * @type { Array } * @syscap SystemCapability.Security.AccessToken * @stagemodelonly * @crossplatform @@ -95,14 +97,15 @@ export default class PermissionRequestResult { * The results for the corresponding request permissions. The value 0 indicates that a * permission is granted, the value -1 indicates not, and the value 2 indicates the request is invalid. * - * @type { Array } + * @type { Array } * @syscap SystemCapability.Security.AccessToken * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - authResults: Array; + authResults: Array; /** * Specifies whether a dialog box is shown for each requested permission. @@ -112,7 +115,8 @@ export default class PermissionRequestResult { * @syscap SystemCapability.Security.AccessToken * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ dialogShownResults?: Array; @@ -126,12 +130,15 @@ export default class PermissionRequestResult { * 5 The permission cannot be requested in a pop-up window. * 12 The service is abnormal. * - * @type { ?Array } + * @type { ?Array } * @syscap SystemCapability.Security.AccessToken * @stagemodelonly * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ - errorReasons?: Array; -} \ No newline at end of file + errorReasons?: Array; +} + +export default PermissionRequestResult; -- Gitee From fb21e9c44ff2b077285fcba0caef200b4be6f474 Mon Sep 17 00:00:00 2001 From: xujunyang Date: Fri, 11 Jul 2025 15:38:11 +0800 Subject: [PATCH 067/746] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=8B=E8=BD=BDnum?= =?UTF-8?q?ber=E8=BD=ACint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xujunyang --- api/@ohos.request.cacheDownload.d.ts | 44 +++--- api/@ohos.request.d.ts | 194 +++++++++++++-------------- 2 files changed, 119 insertions(+), 119 deletions(-) diff --git a/api/@ohos.request.cacheDownload.d.ts b/api/@ohos.request.cacheDownload.d.ts index 849df811d1..598795c10c 100644 --- a/api/@ohos.request.cacheDownload.d.ts +++ b/api/@ohos.request.cacheDownload.d.ts @@ -58,13 +58,13 @@ declare namespace cacheDownload { /** * The decompressed size of the downloaded resource. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.Request.FileTransferAgent * @since 20 * @arkts 1.1&1.2 */ - readonly size: number; + readonly size: long; } /** @@ -111,73 +111,73 @@ declare namespace cacheDownload { /** * Time taken from startup to DNS resolution completion, in milliseconds. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.Request.FileTransferAgent * @since 20 * @arkts 1.1&1.2 */ - readonly dnsTime: number; + readonly dnsTime: long; /** * Time taken from startup to TCP connection completion, in milliseconds. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.Request.FileTransferAgent * @since 20 * @arkts 1.1&1.2 */ - readonly connectTime: number; + readonly connectTime: long; /** * Time taken from startup to TLS connection completion, in milliseconds. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.Request.FileTransferAgent * @since 20 * @arkts 1.1&1.2 */ - readonly tlsTime: number; + readonly tlsTime: long; /** * Time taken from startup to start sending the first byte, in milliseconds. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.Request.FileTransferAgent * @since 20 * @arkts 1.1&1.2 */ - readonly firstSendTime: number; + readonly firstSendTime: long; /** * Time taken from startup to start receiving the first byte, in milliseconds. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.Request.FileTransferAgent * @since 20 * @arkts 1.1&1.2 */ - readonly firstReceiveTime: number; + readonly firstReceiveTime: long; /** * Time taken from startup to the completion of the request, in milliseconds. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.Request.FileTransferAgent * @since 20 * @arkts 1.1&1.2 */ - readonly totalTime: number; + readonly totalTime: long; /** * Time taken from startup to completion of all redirection steps, in milliseconds. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.Request.FileTransferAgent * @since 20 * @arkts 1.1&1.2 */ - readonly redirectTime: number; + readonly redirectTime: long; } /** @@ -255,26 +255,26 @@ declare namespace cacheDownload { * The default size is 0 bytes. * The maximum size is 1,073,741,824 bytes(1 GB). * - * @param { number } bytes - The maximum amount of data cached in memory, in bytes. + * @param { long } bytes - The maximum amount of data cached in memory, in bytes. * @throws { BusinessError } 401 - parameter error. Possible causes: 1. Missing mandatory parameters. *
    2. Incorrect parameter type. 3. Parameter verification failed. * @syscap SystemCapability.Request.FileTransferAgent * @since 18 */ - function setMemoryCacheSize(bytes: number); + function setMemoryCacheSize(bytes: long); /** * Sets the size of the file cache used to store downloaded content. * The default size is 104,857,600 bytes(100 MB). * The maximum size is 4,294,967,296 bytes(4 GB). * - * @param { number } bytes - The maximum amount of data cached in files, in bytes. + * @param { long } bytes - The maximum amount of data cached in files, in bytes. * @throws { BusinessError } 401 - parameter error. Possible causes: 1. Missing mandatory parameters. *
    2. Incorrect parameter type. 3. Parameter verification failed. * @syscap SystemCapability.Request.FileTransferAgent * @since 18 */ - function setFileCacheSize(bytes: number); + function setFileCacheSize(bytes: long); /** * Gets download information of cache downloads based on URL. @@ -303,12 +303,12 @@ declare namespace cacheDownload { * The default value of the specified size is 0. It means no download information can be stored. * The maximum value of the specified size is 8192. * - * @param { number } size - the size of the download information list. + * @param { long } size - the size of the download information list. * @syscap SystemCapability.Request.FileTransferAgent * @since 20 * @arkts 1.1&1.2 */ - function setDownloadInfoListSize(size: number): void; + function setDownloadInfoListSize(size: long): void; } export default cacheDownload; \ No newline at end of file diff --git a/api/@ohos.request.d.ts b/api/@ohos.request.d.ts index 689c7e7949..b5afbf00aa 100644 --- a/api/@ohos.request.d.ts +++ b/api/@ohos.request.d.ts @@ -60,7 +60,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const EXCEPTION_PERMISSION: number; + const EXCEPTION_PERMISSION: int; /** * Error code 401 - The parameters check fails. * @@ -74,7 +74,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const EXCEPTION_PARAMCHECK: number; + const EXCEPTION_PARAMCHECK: int; /** * Error code 801 - Call unsupported api. * @@ -88,7 +88,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const EXCEPTION_UNSUPPORTED: number; + const EXCEPTION_UNSUPPORTED: int; /** * Error code 13400001 - Invalid file or file system error. * @@ -102,7 +102,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const EXCEPTION_FILEIO: number; + const EXCEPTION_FILEIO: int; /** * Error code 13400002 - File path not supported or invalid. * @@ -116,7 +116,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const EXCEPTION_FILEPATH: number; + const EXCEPTION_FILEPATH: int; /** * Error code 13400003 - Task service ability error. * @@ -130,7 +130,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const EXCEPTION_SERVICE: number; + const EXCEPTION_SERVICE: int; /** * Error code 13499999 - Others error. * @@ -144,7 +144,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const EXCEPTION_OTHERS: number; + const EXCEPTION_OTHERS: int; /** * Code 0x00000001 - Bit flag indicating download is allowed when using the cellular network. @@ -159,7 +159,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const NETWORK_MOBILE: number; + const NETWORK_MOBILE: int; /** * Code 0x00010000 - Bit flag indicating download is allowed when using the WLAN. @@ -174,7 +174,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const NETWORK_WIFI: number; + const NETWORK_WIFI: int; /** * Error code 0 - Indicates that the download cannot be resumed for network reasons. @@ -189,7 +189,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const ERROR_CANNOT_RESUME: number; + const ERROR_CANNOT_RESUME: int; /** * Error code 1 - Indicates that no storage device, such as an SD card, is found. @@ -204,7 +204,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const ERROR_DEVICE_NOT_FOUND: number; + const ERROR_DEVICE_NOT_FOUND: int; /** * Error code 2 - Indicates that files to be downloaded already exist, and that the download session cannot overwrite the existing files. @@ -219,7 +219,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const ERROR_FILE_ALREADY_EXISTS: number; + const ERROR_FILE_ALREADY_EXISTS: int; /** * Error code 3 - Indicates that a file operation fails. @@ -234,7 +234,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const ERROR_FILE_ERROR: number; + const ERROR_FILE_ERROR: int; /** * Error code 4 - Indicates that the HTTP transmission fails. @@ -249,7 +249,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const ERROR_HTTP_DATA_ERROR: number; + const ERROR_HTTP_DATA_ERROR: int; /** * Error code 5 - Indicates insufficient storage space. @@ -264,7 +264,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const ERROR_INSUFFICIENT_SPACE: number; + const ERROR_INSUFFICIENT_SPACE: int; /** * Error code 6 - Indicates an error caused by too many network redirections. @@ -279,7 +279,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const ERROR_TOO_MANY_REDIRECTS: number; + const ERROR_TOO_MANY_REDIRECTS: int; /** * Error code 7 - Indicates an HTTP code that cannot be identified. @@ -294,7 +294,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const ERROR_UNHANDLED_HTTP_CODE: number; + const ERROR_UNHANDLED_HTTP_CODE: int; /** * Error code 8 - Indicates an undefined error. @@ -309,7 +309,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const ERROR_UNKNOWN: number; + const ERROR_UNKNOWN: int; /** * Error code 9 - Indicates network offline. @@ -324,7 +324,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const ERROR_OFFLINE: number; + const ERROR_OFFLINE: int; /** * Error code 10 - Indicates network type configuration error. @@ -339,7 +339,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const ERROR_UNSUPPORTED_NETWORK_TYPE: number; + const ERROR_UNSUPPORTED_NETWORK_TYPE: int; /** * Paused code 0 - Indicates that the download is paused and waiting for a WLAN connection, @@ -356,7 +356,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const PAUSED_QUEUED_FOR_WIFI: number; + const PAUSED_QUEUED_FOR_WIFI: int; /** * Paused code 1 - Indicates that the download is paused due to a network problem, for example, network disconnection. @@ -371,7 +371,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const PAUSED_WAITING_FOR_NETWORK: number; + const PAUSED_WAITING_FOR_NETWORK: int; /** * Paused code 2 - Indicates that a network error occurs, and the download session will be retried. @@ -386,7 +386,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const PAUSED_WAITING_TO_RETRY: number; + const PAUSED_WAITING_TO_RETRY: int; /** * Paused code 3 - Indicates that the download is paused due to the user. @@ -401,7 +401,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const PAUSED_BY_USER: number; + const PAUSED_BY_USER: int; /** * Paused code 4 - Indicates that the download is paused for some reasons. @@ -416,7 +416,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const PAUSED_UNKNOWN: number; + const PAUSED_UNKNOWN: int; /** * Session status code 0 - Indicates that the download session is completed. @@ -431,7 +431,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const SESSION_SUCCESSFUL: number; + const SESSION_SUCCESSFUL: int; /** * Session status code 1 - Indicates that the download session is in progress. @@ -446,7 +446,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const SESSION_RUNNING: number; + const SESSION_RUNNING: int; /** * Session status code 2 - Indicates that the download session is being scheduled. @@ -461,7 +461,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const SESSION_PENDING: number; + const SESSION_PENDING: int; /** * Session status code 3 - Indicates that the download session has been paused. @@ -476,7 +476,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const SESSION_PAUSED: number; + const SESSION_PAUSED: int; /** * Session status code 4 - Indicates that the download session has failed and will not be retried. @@ -491,7 +491,7 @@ declare namespace request { * @crossplatform * @since 10 */ - const SESSION_FAILED: number; + const SESSION_FAILED: int; /** * Starts a download task. @@ -800,12 +800,12 @@ declare namespace request { /** * Sets the network type allowed for download. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.MiscServices.Download * @crossplatform * @since 10 */ - networkType?: number; + networkType?: int; /** * Sets the path where the downloaded file is stored. * @@ -896,12 +896,12 @@ declare namespace request { /** * The real-time downloads size (in bytes). * - * @type { number } + * @type { long } * @syscap SystemCapability.MiscServices.Download * @crossplatform * @since 10 */ - downloadedBytes: number; + downloadedBytes: long; /** * The ID of a file to be downloaded. * @@ -911,12 +911,12 @@ declare namespace request { /** * The ID of a file to be downloaded. * - * @type { number } + * @type { long } * @syscap SystemCapability.MiscServices.Download * @crossplatform * @since 10 */ - downloadId: number; + downloadId: long; /** * Cause of the download failure, which can be any DownloadSession.ERROR_* constant. * @@ -926,12 +926,12 @@ declare namespace request { /** * Cause of the download failure, which can be any DownloadSession.ERROR_* constant. * - * @type { number } + * @type { int } * @syscap SystemCapability.MiscServices.Download * @crossplatform * @since 10 */ - failedReason: number; + failedReason: int; /** * The name of a file to be downloaded. * @@ -971,12 +971,12 @@ declare namespace request { /** * Cause of download pause, which can be any DownloadSession.PAUSED_* constant. * - * @type { number } + * @type { int } * @syscap SystemCapability.MiscServices.Download * @crossplatform * @since 10 */ - pausedReason: number; + pausedReason: int; /** * The download task status code, which can be any DownloadSession.SESSION_* constant. * @@ -986,12 +986,12 @@ declare namespace request { /** * The download task status code, which can be any DownloadSession.SESSION_* constant. * - * @type { number } + * @type { int } * @syscap SystemCapability.MiscServices.Download * @crossplatform * @since 10 */ - status: number; + status: int; /** * The URI of files to be downloaded. * @@ -1031,12 +1031,12 @@ declare namespace request { /** * The total size of files to be downloaded (in bytes). * - * @type { number } + * @type { int } * @syscap SystemCapability.MiscServices.Download * @crossplatform * @since 10 */ - downloadTotalBytes: number; + downloadTotalBytes: int; } /** @@ -1097,7 +1097,7 @@ declare namespace request { * @crossplatform * @since 12 */ - on(type: 'progress', callback: (receivedSize: number, totalSize: number) => void): void; + on(type: 'progress', callback: (receivedSize: long, totalSize: long) => void): void; /** * Called when the current download session is in process. @@ -1139,7 +1139,7 @@ declare namespace request { * @crossplatform * @since 12 */ - off(type: 'progress', callback?: (receivedSize: number, totalSize: number) => void): void; + off(type: 'progress', callback?: (receivedSize: long, totalSize: long) => void): void; /** * Called when the current download session complete pause or remove. @@ -1259,7 +1259,7 @@ declare namespace request { * @crossplatform * @since 12 */ - on(type: 'fail', callback: (err: number) => void): void; + on(type: 'fail', callback: (err: int) => void): void; /** * Called when the current download session fails. @@ -1295,7 +1295,7 @@ declare namespace request { * @crossplatform * @since 12 */ - off(type: 'fail', callback?: (err: number) => void): void; + off(type: 'fail', callback?: (err: int) => void): void; /** * Deletes a download session and the downloaded files. @@ -1991,12 +1991,12 @@ declare namespace request { * Usually used for a continuous job. * The default is 0. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.MiscServices.Upload * @crossplatform * @since 20 */ - index?: number; + index?: int; /** * The start point of a file. * Usually used for a continuous job. @@ -2013,12 +2013,12 @@ declare namespace request { * It will start read at the point in upload. * The default is 0. * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.MiscServices.Upload * @crossplatform * @since 20 */ - begins?: number; + begins?: long; /** * The end point of a file. * Usually used for a continuous job. @@ -2035,12 +2035,12 @@ declare namespace request { * It will end read at the point in upload. * The default is -1 indicating the end of the data for upload. * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.MiscServices.Upload * @crossplatform * @since 20 */ - ends?: number; + ends?: long; /** * A list of files to be uploaded. Please use multipart/form-data to submit. * @@ -2120,12 +2120,12 @@ declare namespace request { * The value 0 means that the task is successful, * and other values means that the task fails. * - * @type { number } + * @type { int } * @syscap SystemCapability.MiscServices.Upload * @crossplatform * @since 10 */ - responseCode: number; + responseCode: int; /** * Upload task information. * @@ -2201,7 +2201,7 @@ declare namespace request { * @crossplatform * @since 12 */ - on(type: 'progress', callback: (uploadedSize: number, totalSize: number) => void): void; + on(type: 'progress', callback: (uploadedSize: long, totalSize: long) => void): void; /** * Called when the current upload session is in process. @@ -2243,7 +2243,7 @@ declare namespace request { * @crossplatform * @since 12 */ - off(type: 'progress', callback?: (uploadedSize: number, totalSize: number) => void): void; + off(type: 'progress', callback?: (uploadedSize: long, totalSize: long) => void): void; /** * Called when the header of the current upload session has been received. @@ -2957,21 +2957,21 @@ declare namespace request { * If the speed of the task is lower than this value for a period of time, the task fails. * If the value is set to 0, no minimum speed limit will be activated. * - * @type { number } + * @type { long } * @syscap SystemCapability.Request.FileTransferAgent * @since 20 */ - speed: number; + speed: long; /** * Duration of the speed which is allowed to be below the minimum speed, in seconds. * If the speed of the task is lower than this value for a period of time, the task fails. * If the value is set to 0, no minimum speed limit will be activated. * - * @type { number } + * @type { int } * @syscap SystemCapability.Request.FileTransferAgent * @since 20 */ - duration: number; + duration: int; } /** @@ -2988,11 +2988,11 @@ declare namespace request { * If this value is not specified, use default value instead. The default value is 60 seconds. * The minimum value allowed is 1 second. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Request.FileTransferAgent * @since 20 */ - connectionTimeout?: number; + connectionTimeout?: int; /** * Total timeout of the task, in seconds. * Total timeout includes the time to establish a connection, send a request and receive a response. @@ -3000,11 +3000,11 @@ declare namespace request { * The minimum value allowed is 1 second. * The maximum value allowed is 604,800 seconds(1 week). * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Request.FileTransferAgent * @since 20 */ - totalTimeout?: number; + totalTimeout?: int; } /** @@ -3415,13 +3415,13 @@ declare namespace request { * Usually used for a continuous job. * The default is 0. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Request.FileTransferAgent * @crossplatform * @atomicservice * @since 11 */ - index?: number; + index?: int; /** * The start point of a file. * Usually used for a continuous job. @@ -3440,13 +3440,13 @@ declare namespace request { * It will start read at the point in upload. * The default is 0. * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.Request.FileTransferAgent * @crossplatform * @atomicservice * @since 11 */ - begins?: number; + begins?: long; /** * The end point of a file. * Usually used for a continuous job. @@ -3465,13 +3465,13 @@ declare namespace request { * It will end read at the point in upload. * The default is -1 indicating the end of the data for upload or download. * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.Request.FileTransferAgent * @crossplatform * @atomicservice * @since 11 */ - ends?: number; + ends?: long; /** * The policy of the progress notification for background task. * If false: only completed or failed notification, the default. @@ -3548,11 +3548,11 @@ declare namespace request { * In tasks of the same mode, the smaller the number, the higher the priority. * The default is 0. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Request.FileTransferAgent * @since 11 */ - priority?: number; + priority?: int; /** * The extras for the configuration. * This parameter is left empty by default. @@ -3838,7 +3838,7 @@ declare namespace request { /** * The current processing file index in a task. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Request.FileTransferAgent * @crossplatform @@ -3846,7 +3846,7 @@ declare namespace request { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly index: number; + readonly index: int; /** * The processed data size for the current file in a task. * @@ -3858,7 +3858,7 @@ declare namespace request { /** * The processed data size for the current file in a task. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.Request.FileTransferAgent * @crossplatform @@ -3866,7 +3866,7 @@ declare namespace request { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly processed: number; + readonly processed: long; /** * The sizes of files in a task, in bytes. * @@ -3878,14 +3878,14 @@ declare namespace request { /** * The sizes of files in a task, in bytes. * - * @type { Array } + * @type { Array } * @readonly * @syscap SystemCapability.Request.FileTransferAgent * @crossplatform * @atomicservice * @since 11 */ - readonly sizes: Array; + readonly sizes: Array; /** * The extras for an interaction. * Such as headers and body of response from server. @@ -4103,12 +4103,12 @@ declare namespace request { * Specify the end Unix timestamp. * The default is the moment of calling. * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.Request.FileTransferAgent * @crossplatform * @since 11 */ - before?: number; + before?: long; /** * Specify the start Unix timestamp. * The default is "`before` - 24 hours". @@ -4121,12 +4121,12 @@ declare namespace request { * Specify the start Unix timestamp. * The default is "`before` - 24 hours". * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.Request.FileTransferAgent * @crossplatform * @since 11 */ - after?: number; + after?: long; /** * Specify the state of tasks. * The default is any state. @@ -4378,12 +4378,12 @@ declare namespace request { * In tasks of the same mode, the smaller the number, the higher the priority. * The default is 0. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Request.FileTransferAgent * @since 11 */ - readonly priority: number; + readonly priority: int; /** * The MIME type in the configuration of the task. * @@ -4442,13 +4442,13 @@ declare namespace request { * The creating date and time of a task in Unix timestamp. * It is generated by system of current device. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.Request.FileTransferAgent * @crossplatform * @since 11 */ - readonly ctime: number; + readonly ctime: long; /** * The modified date and time of a task in Unix timestamp. * It is generated by system of current device. @@ -4462,13 +4462,13 @@ declare namespace request { * The modified date and time of a task in Unix timestamp. * It is generated by system of current device. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.Request.FileTransferAgent * @crossplatform * @since 11 */ - readonly mtime: number; + readonly mtime: long; /** * The retry switch of a task. * Just for background, frontend always disabled. @@ -4482,12 +4482,12 @@ declare namespace request { /** * The tried times of a task. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Request.FileTransferAgent * @since 10 */ - readonly tries: number; + readonly tries: int; /** * The faults case of a task. * @@ -4601,7 +4601,7 @@ declare namespace request { /** * The status code of the HTTP response. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Request.FileTransferAgent * @crossplatform @@ -4609,7 +4609,7 @@ declare namespace request { * @since 20 * @arkts 1.1&1.2 */ - readonly statusCode: number, + readonly statusCode: int, /** * The reason of the HTTP response. * @@ -5419,15 +5419,15 @@ declare namespace request { * Sets the maximum transfer speed of the task. * The minimum value of the speed limit is 16,384 bytes per second(16 KB/s). * - * @param { number } speed - the maximum transfer speed of the task, in bytes per second. + * @param { long } speed - the maximum transfer speed of the task, in bytes per second. * @returns { Promise } the promise returned by the function. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Missing mandatory parameters. - *
    2. Incorrect parameter type. 3. Parameter verification failed. + * 2. Incorrect parameter type. 3. Parameter verification failed. * @throws { BusinessError } 13400003 - Task service ability error. * @syscap SystemCapability.Request.FileTransferAgent * @since 18 */ - setMaxSpeed(speed: number): Promise; + setMaxSpeed(speed: long): Promise; } /** -- Gitee From 0da25009b0b062c833fd082f7ff7fd01d388a9cd Mon Sep 17 00:00:00 2001 From: xujunyang Date: Fri, 11 Jul 2025 18:15:20 +0800 Subject: [PATCH 068/746] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=97=B6=E5=8C=BAark?= =?UTF-8?q?ts=E6=A0=87=E7=AD=BEnumber=E8=BD=ACint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xujunyang --- api/@ohos.systemDateTime.d.ts | 54 +++++++++-------- api/@ohos.systemTimer.d.ts | 108 +++++++++++++++++++--------------- 2 files changed, 93 insertions(+), 69 deletions(-) diff --git a/api/@ohos.systemDateTime.d.ts b/api/@ohos.systemDateTime.d.ts index 330da468cb..6dc9cafd91 100644 --- a/api/@ohos.systemDateTime.d.ts +++ b/api/@ohos.systemDateTime.d.ts @@ -41,30 +41,32 @@ declare namespace systemDateTime { * Sets the system time. * * @permission ohos.permission.SET_TIME - * @param { number } time - Indicates the target timestamp(in milliseconds) + * @param { long } time - Indicates the target timestamp(in milliseconds) * @param { AsyncCallback } callback - The callback of setTime * @throws { BusinessError } 201 - Permission denied * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; * @syscap SystemCapability.MiscServices.Time * @systemapi Hide this for inner system use - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - function setTime(time: number, callback: AsyncCallback): void; + function setTime(time: long, callback: AsyncCallback): void; /** * Sets the system time. * * @permission ohos.permission.SET_TIME - * @param { number } time - Indicates the target timestamp(in milliseconds) + * @param { long } time - Indicates the target timestamp(in milliseconds) * @returns { Promise } The promise returned by the function * @throws { BusinessError } 201 - Permission denied * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; * @syscap SystemCapability.MiscServices.Time * @systemapi Hide this for inner system use - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - function setTime(time: number): Promise; + function setTime(time: long): Promise; /** * Obtains the number of milliseconds that have elapsed since the Unix epoch. @@ -113,13 +115,13 @@ declare namespace systemDateTime { * Obtains the number of timestamp that have elapsed since the Unix epoch. * * @param { boolean } [ isNanoseconds ] - True if the result is in nanoseconds, otherwise in milliseconds - * @returns { number } The timestamp returned of getTime. + * @returns { long } The timestamp returned of getTime. * @syscap SystemCapability.MiscServices.Time * @crossplatform * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - function getTime(isNanoseconds?: boolean): number; + function getTime(isNanoseconds?: boolean): long; /** * Obtains the number of milliseconds elapsed since the system was booted, not including deep sleep time. @@ -201,10 +203,11 @@ declare namespace systemDateTime { /** * Indicates time type. * - * @enum { number } TimeType + * @enum { int } TimeType * @syscap SystemCapability.MiscServices.Time * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ enum TimeType { /** @@ -218,9 +221,10 @@ declare namespace systemDateTime { * * @syscap SystemCapability.MiscServices.Time * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ - STARTUP, + STARTUP = 0, /** * Indicates the time elapsed since the system was booted, not including deep sleep time. @@ -233,9 +237,10 @@ declare namespace systemDateTime { * * @syscap SystemCapability.MiscServices.Time * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ - ACTIVE + ACTIVE = 1 } /** @@ -253,8 +258,9 @@ declare namespace systemDateTime { * @param { TimeType } timeType - indicates the type of get uptime. It can only be `STARTUP` or `ACTIVE`. * @param { boolean } [ isNanoseconds ] - True if the result is in nanoseconds, otherwise in milliseconds * @returns { number } The timestamp returned of getUpTime. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; - * 3. Parameter verification failed. This error code was added due to missing issues. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. This error code was added due to missing + * issues. * @syscap SystemCapability.MiscServices.Time * @since 12 */ @@ -263,14 +269,16 @@ declare namespace systemDateTime { * * @param { TimeType } timeType - indicates the type of get uptime. It can only be `STARTUP` or `ACTIVE`. * @param { boolean } [ isNanoseconds ] - True if the result is in nanoseconds, otherwise in milliseconds - * @returns { number } The timestamp returned of getUpTime. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; - * 3. Parameter verification failed. This error code was added due to missing issues. + * @returns { long } The timestamp returned of getUpTime. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. This error code was added due to missing + * issues. * @syscap SystemCapability.MiscServices.Time * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ - function getUptime(timeType: TimeType, isNanoseconds?: boolean): number; + function getUptime(timeType: TimeType, isNanoseconds?: boolean): long; /** * Sets the system time. @@ -447,14 +455,14 @@ declare namespace systemDateTime { /** * Obtains the current time of milliseconds since the Unix epoch calculated based on the last updated NTP time. * - * @returns { number } The current NTP time returned of getNtpTime. + * @returns { long } The current NTP time returned of getNtpTime. * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 13000002 - updateNtpTime() is not called successfully. * @syscap SystemCapability.MiscServices.Time * @systemapi Hide this for inner system use * @since 14 */ - function getNtpTime(): number; + function getNtpTime(): long; } export default systemDateTime; \ No newline at end of file diff --git a/api/@ohos.systemTimer.d.ts b/api/@ohos.systemTimer.d.ts index 73eaaeeb20..aef9a184a3 100644 --- a/api/@ohos.systemTimer.d.ts +++ b/api/@ohos.systemTimer.d.ts @@ -33,76 +33,81 @@ declare namespace systemTimer { /** * Indicates the timing policy the timer use, which can be REALTIME or UTC. * - * + * @type { int } * @syscap SystemCapability.MiscServices.Time * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - const TIMER_TYPE_REALTIME: number; + const TIMER_TYPE_REALTIME: int; /** * Describes whether a timer will wake the device up. * - * + * @type { int } * @syscap SystemCapability.MiscServices.Time * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - const TIMER_TYPE_WAKEUP: number; + const TIMER_TYPE_WAKEUP: int; /** * Describes whether a timer will be delivered precisely at a scheduled time. * - * + * @type { int } * @syscap SystemCapability.MiscServices.Time * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - const TIMER_TYPE_EXACT: number; + const TIMER_TYPE_EXACT: int; /** * Indicates whether the timer waking up the system is supported in low-power mode. * - * + * @type { int } * @syscap SystemCapability.MiscServices.Time * @systemapi Hide this for inner system use. * @since 7 */ - const TIMER_TYPE_IDLE: number; + const TIMER_TYPE_IDLE: int; /** * Creates a timer. * * @param { TimerOptions } options - The timer options. - * @param { AsyncCallback } callback - {number} is the timer ID. + * @param { AsyncCallback } callback - {long} is the timer ID. * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; * 3.Parameter verification failed. * @syscap SystemCapability.MiscServices.Time * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - function createTimer(options: TimerOptions, callback: AsyncCallback): void; + function createTimer(options: TimerOptions, callback: AsyncCallback): void; /** * Creates a timer. * * @param { TimerOptions } options - The timer options. - * @returns { Promise } the timer ID. + * @returns { Promise } the timer ID. * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; * 3.Parameter verification failed. * @syscap SystemCapability.MiscServices.Time * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - function createTimer(options: TimerOptions): Promise; + function createTimer(options: TimerOptions): Promise; /** * Starts a timer. * - * @param { number } timer - The timer ID. - * @param { number } triggerTime - Indicates the time at which the timer is triggered for the first time, in milliseconds. + * @param { long } timer - The timer ID. + * @param { long } triggerTime - Indicates the time at which the timer is triggered for the first time, in milliseconds. * The time will be automatically set to 5000 milliseconds after the current time if the passed * value is smaller than the current time plus 5000 milliseconds. * @param { AsyncCallback } callback - The callback function. @@ -110,15 +115,16 @@ declare namespace systemTimer { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. * @syscap SystemCapability.MiscServices.Time * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - function startTimer(timer: number, triggerTime: number, callback: AsyncCallback): void; + function startTimer(timer: long, triggerTime: long, callback: AsyncCallback): void; /** * Starts a timer. * - * @param { number } timer - The timer ID. - * @param { number } triggerTime - Indicates the time at which the timer is triggered for the first time, in milliseconds. + * @param { long } timer - The timer ID. + * @param { long } triggerTime - Indicates the time at which the timer is triggered for the first time, in milliseconds. * The time will be automatically set to 5000 milliseconds after the current time if the passed * value is smaller than the current time plus 5000 milliseconds. * @returns { Promise } return a promise object. @@ -126,61 +132,66 @@ declare namespace systemTimer { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. * @syscap SystemCapability.MiscServices.Time * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - function startTimer(timer: number, triggerTime: number): Promise; + function startTimer(timer: long, triggerTime: long): Promise; /** * Stops a timer. * - * @param { number } timer - The timer ID. + * @param { long } timer - The timer ID. * @param { AsyncCallback } callback - The callback function. * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. * @syscap SystemCapability.MiscServices.Time * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - function stopTimer(timer: number, callback: AsyncCallback): void; + function stopTimer(timer: long, callback: AsyncCallback): void; /** * Stops a timer. * - * @param { number } timer - The timer ID. + * @param { long } timer - The timer ID. * @returns { Promise } return a promise object. * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. * @syscap SystemCapability.MiscServices.Time * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - function stopTimer(timer: number): Promise; + function stopTimer(timer: long): Promise; /** * Destroy a timer. * - * @param { number } timer - The timer ID. + * @param { long } timer - The timer ID. * @param { AsyncCallback } callback - The callback function. * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. * @syscap SystemCapability.MiscServices.Time * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - function destroyTimer(timer: number, callback: AsyncCallback): void; + function destroyTimer(timer: long, callback: AsyncCallback): void; /** * Destroy a timer. * - * @param { number } timer - The timer ID. + * @param { long } timer - The timer ID. * @returns { Promise } return a promise object. * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. * @syscap SystemCapability.MiscServices.Time * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - function destroyTimer(timer: number): Promise; + function destroyTimer(timer: long): Promise; /** * When the repeat is false,the interval is not needed, choose one of wantAgent and callback. @@ -189,18 +200,20 @@ declare namespace systemTimer { * @interface TimerOptions * @syscap SystemCapability.MiscServices.Time * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ interface TimerOptions { /** * The timer type. * - * @type { number } + * @type { int } * @syscap SystemCapability.MiscServices.Time * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - type: number; + type: int; /** * Indicates a repeating timer @@ -208,7 +221,8 @@ declare namespace systemTimer { * @type { boolean } * @syscap SystemCapability.MiscServices.Time * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ repeat: boolean; @@ -216,12 +230,13 @@ declare namespace systemTimer { * Indicates the interval between two consecutive triggers, in milliseconds. * The interval will be set to 5000 milliseconds automatically if the passed value is smaller than 5000. * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.MiscServices.Time * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - interval?: number; + interval?: long; /** * Indicates the intent to send when the timer goes off. @@ -263,7 +278,8 @@ declare namespace systemTimer { * @type { ?string } * @syscap SystemCapability.MiscServices.Time * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ name?: string; } -- Gitee From 759f1cded1efae887167328f010ba8cd63ead4c2 Mon Sep 17 00:00:00 2001 From: Michael Wang Date: Fri, 11 Jul 2025 20:25:33 +0800 Subject: [PATCH 069/746] modify Signed-off-by: Michael Wang --- api/@ohos.commonEventManager.d.ts | 2 +- api/@ohos.events.emitter.d.ts | 36 ++++++++++++++++++++----------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/api/@ohos.commonEventManager.d.ts b/api/@ohos.commonEventManager.d.ts index 767445860e..34330304a7 100644 --- a/api/@ohos.commonEventManager.d.ts +++ b/api/@ohos.commonEventManager.d.ts @@ -2542,7 +2542,7 @@ declare namespace commonEventManager { * * @syscap SystemCapability.Notification.CommonEvent * @systemapi - * @since arkts {'1.1':'15', '1.2':'20'} + * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ COMMON_EVENT_VPN_CONNECTION_STATUS_CHANGED = 'usual.event.VPN_CONNECTION_STATUS_CHANGED', diff --git a/api/@ohos.events.emitter.d.ts b/api/@ohos.events.emitter.d.ts index 95023e612c..929132f420 100644 --- a/api/@ohos.events.emitter.d.ts +++ b/api/@ohos.events.emitter.d.ts @@ -93,7 +93,8 @@ declare namespace emitter { * @syscap SystemCapability.Notification.Emitter * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(eventId: string, callback: Callback): void; @@ -105,7 +106,8 @@ declare namespace emitter { * @syscap SystemCapability.Notification.Emitter * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(eventId: string, callback: Callback>): void; @@ -147,7 +149,8 @@ declare namespace emitter { * @syscap SystemCapability.Notification.Emitter * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function once(event: InnerEvent, callback: Callback): void; @@ -168,7 +171,8 @@ declare namespace emitter { * @syscap SystemCapability.Notification.Emitter * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function once(eventId: string, callback: Callback): void; @@ -180,7 +184,8 @@ declare namespace emitter { * @syscap SystemCapability.Notification.Emitter * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function once(eventId: string, callback: Callback>): void; @@ -226,7 +231,8 @@ declare namespace emitter { * @syscap SystemCapability.Notification.Emitter * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function off(eventId: string): void; @@ -277,7 +283,8 @@ declare namespace emitter { * @syscap SystemCapability.Notification.Emitter * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function off(eventId: string, callback: Callback): void; @@ -289,7 +296,8 @@ declare namespace emitter { * @syscap SystemCapability.Notification.Emitter * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function off(eventId: string, callback: Callback>): void; @@ -353,7 +361,8 @@ declare namespace emitter { * @syscap SystemCapability.Notification.Emitter * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function emit(eventId: string, data?: EventData): void; @@ -365,7 +374,8 @@ declare namespace emitter { * @syscap SystemCapability.Notification.Emitter * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function emit(eventId: string, data?: GenericEventData): void; @@ -401,7 +411,8 @@ declare namespace emitter { * @syscap SystemCapability.Notification.Emitter * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function emit(eventId: string, options: Options, data?: EventData): void; @@ -414,7 +425,8 @@ declare namespace emitter { * @syscap SystemCapability.Notification.Emitter * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function emit(eventId: string, options: Options, data?: GenericEventData): void; -- Gitee From 9ba923042a0c9a0c22c72169adbdf56f71378e2f Mon Sep 17 00:00:00 2001 From: Michael Wang Date: Fri, 11 Jul 2025 21:02:32 +0800 Subject: [PATCH 070/746] a Signed-off-by: Michael Wang --- api/@ohos.events.emitter.d.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/api/@ohos.events.emitter.d.ts b/api/@ohos.events.emitter.d.ts index 929132f420..5bc478c45d 100644 --- a/api/@ohos.events.emitter.d.ts +++ b/api/@ohos.events.emitter.d.ts @@ -106,8 +106,7 @@ declare namespace emitter { * @syscap SystemCapability.Notification.Emitter * @crossplatform * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function on(eventId: string, callback: Callback>): void; @@ -184,8 +183,7 @@ declare namespace emitter { * @syscap SystemCapability.Notification.Emitter * @crossplatform * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function once(eventId: string, callback: Callback>): void; @@ -296,8 +294,7 @@ declare namespace emitter { * @syscap SystemCapability.Notification.Emitter * @crossplatform * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function off(eventId: string, callback: Callback>): void; -- Gitee From fce7b1f0de13b54350734a0064b013fecd918902 Mon Sep 17 00:00:00 2001 From: qlxie Date: Wed, 9 Jul 2025 21:37:59 +0800 Subject: [PATCH 071/746] merge 0603 to 0702 Signed-off-by: sun-xinyan --- api/@internal/component/ets/common.d.ts | 3 +- api/@internal/component/ets/rect.d.ts | 16 +- api/@internal/component/ets/rich_editor.d.ts | 3 +- api/@internal/component/ets/search.d.ts | 3 +- api/@internal/component/ets/shape.d.ts | 14 +- api/@internal/component/ets/text.d.ts | 22 +- api/@internal/component/ets/text_area.d.ts | 3 +- api/@internal/component/ets/text_input.d.ts | 10 +- diff.patch | 111883 ++++++++++++++++ 9 files changed, 111931 insertions(+), 26 deletions(-) create mode 100644 diff.patch diff --git a/api/@internal/component/ets/common.d.ts b/api/@internal/component/ets/common.d.ts index 97741bdba1..b046a758d2 100644 --- a/api/@internal/component/ets/common.d.ts +++ b/api/@internal/component/ets/common.d.ts @@ -31320,7 +31320,8 @@ declare class ScrollableCommonMethod extends CommonMethod { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ edgeEffect(edgeEffect: EdgeEffect, options?: EdgeEffectOptions): T; diff --git a/api/@internal/component/ets/rect.d.ts b/api/@internal/component/ets/rect.d.ts index a382feb79c..f6490b36a1 100644 --- a/api/@internal/component/ets/rect.d.ts +++ b/api/@internal/component/ets/rect.d.ts @@ -756,7 +756,7 @@ declare class RectAttribute extends CommonShapeMethod { /** * Called when the fillet size is set. * - * @param { number | string | Array } value + * @param { Length | Array } value * @returns { RectAttribute } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform @@ -776,6 +776,20 @@ declare class RectAttribute extends CommonShapeMethod { * @since 20 */ radius(value: Length | Array): RectAttribute; + + /** + * Called when the fillet size is set. + * + * @param { number | string | Array } value + * @returns { RectAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + radius(value: number | string | Array): RectAttribute; } /** diff --git a/api/@internal/component/ets/rich_editor.d.ts b/api/@internal/component/ets/rich_editor.d.ts index b83d6aa2ff..f8a0be398b 100644 --- a/api/@internal/component/ets/rich_editor.d.ts +++ b/api/@internal/component/ets/rich_editor.d.ts @@ -3233,7 +3233,7 @@ declare class RichEditorController extends RichEditorBaseController { * @atomicservice * @since 11 */ - /** + /** * Add a text span. * * @param { ResourceStr } content - text value. @@ -3243,6 +3243,7 @@ declare class RichEditorController extends RichEditorBaseController { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ addTextSpan(content: ResourceStr, options?: RichEditorTextSpanOptions): number; diff --git a/api/@internal/component/ets/search.d.ts b/api/@internal/component/ets/search.d.ts index ba0de09171..65229fd131 100644 --- a/api/@internal/component/ets/search.d.ts +++ b/api/@internal/component/ets/search.d.ts @@ -867,7 +867,8 @@ declare class SearchAttribute extends CommonMethod { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 20 + * @since arkts 20 + * @arkts 1.1&1.2 */ searchButton(value: ResourceStr, option?: SearchButtonOptions): SearchAttribute; diff --git a/api/@internal/component/ets/shape.d.ts b/api/@internal/component/ets/shape.d.ts index 7acbca147f..a3567fb128 100644 --- a/api/@internal/component/ets/shape.d.ts +++ b/api/@internal/component/ets/shape.d.ts @@ -140,6 +140,7 @@ declare interface ViewportRect { * @form * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ y?: Length; @@ -197,6 +198,7 @@ declare interface ViewportRect { * @form * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ width?: Length; @@ -254,6 +256,7 @@ declare interface ViewportRect { * @form * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ height?: Length; } @@ -571,7 +574,7 @@ declare class ShapeAttribute extends CommonMethod { /** * Called when the offset of the starting point of border drawing is set. * - * @param { number | string } value + * @param { Length } value * @returns { ShapeAttribute } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform @@ -589,6 +592,7 @@ declare class ShapeAttribute extends CommonMethod { * @form * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ strokeDashOffset(value: Length): ShapeAttribute; @@ -742,7 +746,7 @@ declare class ShapeAttribute extends CommonMethod { /** * Called when the limit value for drawing acute angles as oblique angles is set. * - * @param { number | string } value + * @param { Length } value * @returns { ShapeAttribute } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform @@ -759,7 +763,8 @@ declare class ShapeAttribute extends CommonMethod { * @crossplatform * @form * @atomicservice - * @since 20 + * @since arkts 20 + * @arkts 1.1&1.2 */ strokeMiterLimit(value: Length): ShapeAttribute; @@ -873,7 +878,7 @@ declare class ShapeAttribute extends CommonMethod { /** * Called when the width of the border is set. * - * @param { number | string } value + * @param { Length } value * @returns { ShapeAttribute } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform @@ -891,6 +896,7 @@ declare class ShapeAttribute extends CommonMethod { * @form * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ strokeWidth(value: Length): ShapeAttribute; diff --git a/api/@internal/component/ets/text.d.ts b/api/@internal/component/ets/text.d.ts index e2995382db..dfb2ef8f79 100644 --- a/api/@internal/component/ets/text.d.ts +++ b/api/@internal/component/ets/text.d.ts @@ -584,14 +584,18 @@ declare class TextAttribute extends CommonMethod { /** * Called when the font weight is set. * - *

    NOTE: - *
    It is only effective for the Text component, not for its child components. - *
    For the number type, the value ranges from 100 to 900, at an interval of 100. - *
    A larger value indicates a heavier font weight. - *
    The default value is 400. - *
    For the string type, only strings that represent a number, for example, "400", - * and the following enumerated values of FontWeight are supported: "bold", "bolder", "lighter", "regular", and "medium". - *

    + * @param { number | FontWeight | ResourceStr } value + * @returns { TextAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + */ + fontWeight(value: number | FontWeight | ResourceStr): TextAttribute; + + /** + * Called when the font weight is set. * * @param { number | FontWeight | string } weight * @param { FontSettingOptions } options - font setting options. @@ -1025,6 +1029,7 @@ declare class TextAttribute extends CommonMethod { * @form * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ letterSpacing(value: number | ResourceStr): TextAttribute; @@ -1121,6 +1126,7 @@ declare class TextAttribute extends CommonMethod { * @form * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ baselineOffset(value: number | ResourceStr): TextAttribute; diff --git a/api/@internal/component/ets/text_area.d.ts b/api/@internal/component/ets/text_area.d.ts index 90fefc9c45..0fb6b4a654 100644 --- a/api/@internal/component/ets/text_area.d.ts +++ b/api/@internal/component/ets/text_area.d.ts @@ -740,7 +740,7 @@ declare class TextAreaAttribute extends CommonMethod { * @crossplatform * @since 10 */ - /** + /** * Called when the font weight is set. * *

    NOTE: @@ -767,6 +767,7 @@ declare class TextAreaAttribute extends CommonMethod { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ fontWeight(value: number | FontWeight | ResourceStr): TextAreaAttribute; diff --git a/api/@internal/component/ets/text_input.d.ts b/api/@internal/component/ets/text_input.d.ts index cd6888ae55..cd6f69004d 100644 --- a/api/@internal/component/ets/text_input.d.ts +++ b/api/@internal/component/ets/text_input.d.ts @@ -2021,15 +2021,6 @@ declare class TextInputAttribute extends CommonMethod { /** * Called when the font weight is set. * - *

    NOTE: - *
    If the value is too large, the text may be clipped depending on the font. - *
    For the number type, the value range is [100, 900], at an interval of 100. - *
    The default value is 400. - *
    A larger value indicates a heavier font weight. - *
    For the string type, only strings that represent a number, for example, "400", - * and the following enumerated values of FontWeight are supported: "bold", "bolder", "lighter", "regular", and "medium". - *

    - * * @param { number | FontWeight | string } value - Default value is FontWeight.Normal. * @returns { TextInputAttribute } * @syscap SystemCapability.ArkUI.ArkUI.Full @@ -2046,6 +2037,7 @@ declare class TextInputAttribute extends CommonMethod { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ fontWeight(value: number | FontWeight | ResourceStr): TextInputAttribute; diff --git a/diff.patch b/diff.patch new file mode 100644 index 0000000000..d1ada7da71 --- /dev/null +++ b/diff.patch @@ -0,0 +1,111883 @@ +diff --git a/ CODEOWNERS b/ CODEOWNERS +new file mode 100644 +index 000000000..0865e7945 +--- /dev/null ++++ b/ CODEOWNERS +@@ -0,0 +1,36 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++[base api] ++api/@ohos.base.d.ets @majiajun518 ++api/@ohos.base.d.ts @majiajun518 ++ ++[通用模块] ++build-tools/ @wangcaoyu @txdyyangbo @wanghanghui @Gpangjiaxue ++BUILD.gn @wangcaoyu @txdyyangbo @wanghanghui @Gpangjiaxue ++bundle.json @wangcaoyu @txdyyangbo @wanghanghui @Gpangjiaxue ++exists_path.py @wangcaoyu @txdyyangbo @wanghanghui @Gpangjiaxue ++ohos_copy_ets.py @wangcaoyu @txdyyangbo @wanghanghui @Gpangjiaxue ++process_internal.py @wangcaoyu @txdyyangbo @wanghanghui @Gpangjiaxue ++ ++[API裁剪工具] ++build-tools/delete_systemapi_plugin.js @wangcaoyu ++ ++[API打包工具] ++build-tools/handleApiFiles.js @wangzhiyusss ++arkui_transformer.py ++ ++[int转number工具] ++build-tools/intToNumber.js @wangzhiyusss +diff --git a/BUILD.gn b/BUILD.gn +index e3e163856..c51605870 100644 +--- a/BUILD.gn ++++ b/BUILD.gn +@@ -22,33 +22,18 @@ import("interface_config.gni") + # 全局变量方法见 https://gitee.com/openharmony/build/blob/master/docs/cmake%E8%BD%ACgn%E6%8C%87%E5%AF%BC%E6%96%87%E6%A1%A3.md#gn%E5%B8%B8%E7%94%A8%E7%9A%84%E5%86%85%E7%BD%AE%E5%8F%98%E9%87%8F + + # 特殊场景没有拷贝interface接口信息,强基之后源码仓api不能直接使用,需要进行处理 +-exists_path_tools = "//interface/sdk-js/exists_path.py" +-exists_path_args = [ +- "--path", +- rebase_path(interface_sdk_path_ets1, root_build_dir), +-] +-has_interface_file = +- exec_script(exists_path_tools, exists_path_args, "trim string") +- +-if (has_interface_file != "True") { +- arkts_sdk_config_parser = "//build/ohos/sdk/parse_interface_sdk.py" ++action("ohos_base_split") { ++ script = "//build/ohos/sdk/parse_interface_sdk.py" + ohos_sdk_arkts_description_file = +- "//out/sdk-interface/ohos_sdk_pub_description_std.json" +- if (host_os == "mac") { +- node_path = "//prebuilts/build-tools/common/nodejs/node-v16.20.2-darwin-x64/bin/node" +- npm_path = "//prebuilts/build-tools/common/nodejs/node-v16.20.2-darwin-x64/bin/npm" +- } else { +- node_path = "//prebuilts/build-tools/common/nodejs/node-v16.20.2-linux-x64/bin/node" +- npm_path = "//prebuilts/build-tools/common/nodejs/node-v16.20.2-linux-x64/bin/npm" +- } +- arkts_sdk_args = [ ++ "${interface_sdk_path}/ohos_sdk_pub_description_std.json" ++ args = [ + "--sdk-description-file", + rebase_path("//build/ohos/sdk/ohos_sdk_description_std.json", + root_build_dir), + "--root-build-dir", + rebase_path("//", root_build_dir), + "--node-js", +- rebase_path(node_path, root_build_dir), ++ rebase_path(nodejs, root_build_dir), + "--output-arkts-sdk-desc-file", + rebase_path(ohos_sdk_arkts_description_file, root_build_dir), + "--sdk-build-public", +@@ -56,14 +41,17 @@ if (has_interface_file != "True") { + "--sdk-build-arkts", + "${sdk_build_arkts}", + "--npm-path", +- rebase_path(npm_path, root_build_dir), ++ rebase_path(npm, root_build_dir), ++ "--output-interface-sdk", ++ rebase_path(interface_sdk_path, root_build_dir), + ] +- exec_script(arkts_sdk_config_parser, arkts_sdk_args) ++ outputs = [ "${root_out_dir}/sdk-interface" ] + } + + template("ohos_copy_internal") { + forward_variables_from(invoker, "*") + iv_input = invoker.iv_input ++ _module_info_target = "${target_name}_info" + + # fullSDK中api路径 + input_project_dir = interface_sdk_path_ets1 +@@ -73,14 +61,18 @@ template("ohos_copy_internal") { + + # 调用build/templates/common/copy.gni中的ohos_copy方法 + # 将处理完成的文件输出到中间产物对应位置 out/sdk/obj/interface/sdk-js/${target_name} +- ohos_copy(target_name) { ++ action_with_pydeps(target_name) { + # 该脚本根据传入的remove文件进行input文件规则检查,过滤不需要的文件 + # remove文件没有对应$target_name的属性 则全部输出 + # remove文件有对应$target_name的属性 保留base中的文件; + # 删除global_remove中的文件; + # ispublic为真,删除sdk_build_public_remove文件。 +- process_script = "//interface/sdk-js/process_internal.py" +- process_arguments = [ ++ deps = [ ":ohos_base_split" ] ++ deps += [ ":$_module_info_target" ] ++ inputs = [] ++ outputs = [ target_out_dir + "/${sdk_type}/${target_name}" ] ++ script = "//interface/sdk-js/process_internal.py" ++ args = [ + "--input", + rebase_path(iv_input, root_build_dir), + "--project-dir", +@@ -93,14 +85,18 @@ template("ohos_copy_internal") { + "${sdk_build_public}", + "--name", + "${target_name}", ++ "--output", ++ rebase_path(target_out_dir + "/${sdk_type}/${target_name}", ++ root_build_dir), + ] +- +- # 执行脚本 +- sources = exec_script(process_script, process_arguments, "value") +- outputs = +- [ target_out_dir + "/${sdk_type}/${target_name}/{{source_file_part}}" ] +- module_source_dir = target_out_dir + "/${sdk_type}/${target_name}" ++ } ++ _target_name = target_name ++ generate_module_info(_module_info_target) { ++ module_type = "jsdoc" + module_install_name = "" ++ module_name = _target_name ++ module_source_dir = target_out_dir + "/${sdk_type}/${_target_name}" ++ install_enable = false + } + } + +@@ -117,7 +113,9 @@ template("ohos_declaration_template") { + input_api_dir = input_project_dir + "/api" + + action_with_pydeps(target_name) { +- inputs = [ input_project_dir + "/api" ] ++ deps = [ ":ohos_base_split" ] ++ deps += [ ":$_module_info_target" ] ++ inputs = [] + outputs = [ root_out_dir + "/ohos_declaration/${sdk_type}/${target_name}" ] + + # 处理api文件下全部文件,过滤特定文件 +@@ -130,11 +128,6 @@ template("ohos_declaration_template") { + root_out_dir + "/ohos_declaration/${sdk_type}/${target_name}/", + root_build_dir), + ] +- if (defined(deps)) { +- deps += [ ":$_module_info_target" ] +- } else { +- deps = [ ":$_module_info_target" ] +- } + } + _target_name = target_name + generate_module_info(_module_info_target) { +@@ -201,7 +194,7 @@ ohos_copy_internal("ets_component") { + # ets1.2/arkui/component执行脚本 + ohos_copy_internal("ets_component2") { + sdk_type = "ets2" +- iv_input = "//out/arkui_transformer_api" ++ iv_input = interface_sdk_path + "/arkui_transformer_api" + } + + # ets/kits执行脚本 +@@ -323,16 +316,6 @@ action("ohos_ets_api_arkui_tmp") { + deps = [ ":ohos_ets_api_tmp" ] + script = "//interface/sdk-js/arkui_transformer.py" + +- if (host_os == "mac") { +- node_path = "//prebuilts/build-tools/common/nodejs/node-v16.20.2-darwin-x64/bin/node" +- npm_path = +- "//prebuilts/build-tools/common/nodejs/node-v16.20.2-darwin-x64/bin/npm" +- } else { +- node_path = +- "//prebuilts/build-tools/common/nodejs/node-v16.20.2-linux-x64/bin/node" +- npm_path = +- "//prebuilts/build-tools/common/nodejs/node-v16.20.2-linux-x64/bin/npm" +- } + args = [ + "--input", + rebase_path(ohos_ets_api_tmp_path + "/@internal/component/ets", +@@ -342,9 +325,9 @@ action("ohos_ets_api_arkui_tmp") { + "--source_root_dir", + rebase_path("//", root_build_dir), + "--npm-path", +- rebase_path(npm_path, root_build_dir), ++ rebase_path(npm, root_build_dir), + "--node-js", +- rebase_path(node_path, root_build_dir), ++ rebase_path(nodejs, root_build_dir), + ] + outputs = [ "$ohos_ets_api_arkui_tmp_path" ] + } +@@ -375,3 +358,55 @@ ohos_copy("ohos_ets_api") { + part_name = "sdk" + subsystem_name = "sdk" + } ++ ++action("install_tsc_declgen") { ++ deps = [ ++ ":ohos_base_split" ++ ] ++ external_deps = [ ++ "runtime_core:declgen_ts2sts_compile_declgen" ++ ] ++ script="run_compile_declgen.py" ++ args = [ ++ "--root-build-dir", ++ rebase_path("//", root_build_dir), ++ "--current-os-dir", ++ current_os, ++ "--output-interface-sdk", ++ rebase_path(interface_sdk_path, root_build_dir), ++ "--tool-dir", ++ rebase_path( ++ "${root_out_dir}/obj/arkcompiler/runtime_core/static_core/plugins/ets/tools/declgen_ts2sts/panda-declgen-1.0.0.tgz"), ++ "--node-js", ++ rebase_path(nodejs, root_build_dir), ++ ] ++ outputs = [ "${interface_sdk_path}/ets1.1interop" ] ++} ++ ++action("gen_api_check_plugin") { ++ deps = [ ++ "//developtools/ace_ets2bundle/arkui-plugins:ui_plugin" ++ ] ++ script = "build_api_check_plugin.py" ++ args = [ ++ "--source_path", ++ rebase_path(get_path_info("./build-tools/compiler-plugins/api-check-plugin-static", "abspath")), ++ "--output_path", ++ rebase_path("$target_gen_dir"), ++ "--npm", ++ rebase_path(npm), ++ ] ++ outputs = [ "$target_gen_dir" ] ++} ++ ++ohos_copy("api_check_plugin") { ++ deps = [ ++ ":gen_api_check_plugin" ++ ] ++ sources = [ ++ rebase_path("$target_gen_dir") ++ ] ++ outputs = [ target_out_dir + "/$target_name" ] ++ module_source_dir = target_out_dir + "/$target_name" ++ module_install_name = "" ++} +\ No newline at end of file +diff --git a/api/@internal/component/ets/action_sheet.d.ts b/api/@internal/component/ets/action_sheet.d.ts +index 166a48deb..97d673685 100644 +--- a/api/@internal/component/ets/action_sheet.d.ts ++++ b/api/@internal/component/ets/action_sheet.d.ts +@@ -166,10 +166,20 @@ declare interface DismissDialogAction { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + dismiss: Callback; ++ ++ /** ++ * Defines dialog dismiss function. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ dismiss(): void; + + /** + * Dismiss reason type. +diff --git a/api/@internal/component/ets/alert_dialog.d.ts b/api/@internal/component/ets/alert_dialog.d.ts +index 047b8a924..d608e158c 100644 +--- a/api/@internal/component/ets/alert_dialog.d.ts ++++ b/api/@internal/component/ets/alert_dialog.d.ts +@@ -27,6 +27,7 @@ import { WordBreak, DialogButtonStyle, BorderStyle } from './enums'; + import { Rectangle, BlurStyle, Callback, TransitionEffect, ShadowOptions, ShadowStyle, HoverModeAreaType, DismissReason, + BackgroundBlurStyleOptions, BackgroundEffectOptions } from './common'; + import { LevelOrder, ImmersiveMode, LevelMode } from '../../@ohos.promptAction'; ++import { DismissDialogAction } from './actionSheet'; + /*** endif */ + + /** +@@ -1307,8 +1308,7 @@ declare interface AlertDialogParamWithConfirm extends AlertDialogParam { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + declare interface DismissDialogAction { + /** +@@ -1318,8 +1318,7 @@ declare interface DismissDialogAction { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + dismiss: Callback; + +@@ -1330,8 +1329,7 @@ declare interface DismissDialogAction { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + reason: DismissReason; + } +diff --git a/api/@internal/component/ets/alphabet_indexer.d.ts b/api/@internal/component/ets/alphabet_indexer.d.ts +index c8003ca0f..1ab96b346 100644 +--- a/api/@internal/component/ets/alphabet_indexer.d.ts ++++ b/api/@internal/component/ets/alphabet_indexer.d.ts +@@ -19,7 +19,7 @@ + */ + + /*** if arkts 1.2 */ +-import { CommonMethod, BlurStyle } from './common' ++import { CommonMethod, BlurStyle, Bindable } from './common' + import { ResourceColor, Length, Position } from './units' + import { Font } from './units' + /*** endif */ +@@ -180,10 +180,20 @@ interface AlphabetIndexerOptions { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + selected: number; ++ /** ++ * ID of the selected item. ++ * ++ * @type { number | Bindable } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ selected: number | Bindable; + } + + /** +@@ -905,10 +915,21 @@ declare class AlphabetIndexerAttribute extends CommonMethod } index ++ * @returns { AlphabetIndexerAttribute } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ selected(index: number | Bindable): AlphabetIndexerAttribute; + + /** + * Position of the pop-up windows, relative to the midpoint of the top border of the indexer bar. +diff --git a/api/@internal/component/ets/calendar.d.ts b/api/@internal/component/ets/calendar.d.ts +index 90c32e3de..bf5216137 100644 +--- a/api/@internal/component/ets/calendar.d.ts ++++ b/api/@internal/component/ets/calendar.d.ts +@@ -18,11 +18,6 @@ + * @kit ArkUI + */ + +-/*** if arkts 1.2 */ +-import { ResourceColor } from './units' +-import { Axis } from './enums' +-/*** endif */ +- + /** + * Provides a monthly view component to display information such as date, shift break, and schedule. + * +@@ -38,8 +33,8 @@ import { Axis } from './enums' + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + interface CalendarDay { + /** +@@ -59,8 +54,8 @@ interface CalendarDay { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + index: number; + +@@ -81,8 +76,8 @@ interface CalendarDay { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + lunarMonth: string; + +@@ -101,8 +96,8 @@ interface CalendarDay { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + lunarDay: string; + +@@ -121,8 +116,8 @@ interface CalendarDay { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + dayMark: string; + +@@ -141,8 +136,8 @@ interface CalendarDay { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + dayMarkValue: string; + +@@ -161,8 +156,8 @@ interface CalendarDay { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + year: number; + +@@ -181,8 +176,8 @@ interface CalendarDay { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + month: number; + +@@ -201,8 +196,8 @@ interface CalendarDay { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + day: number; + +@@ -221,8 +216,8 @@ interface CalendarDay { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + isFirstOfLunar: boolean; + +@@ -243,8 +238,8 @@ interface CalendarDay { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + hasSchedule: boolean; + +@@ -263,8 +258,8 @@ interface CalendarDay { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + markLunarDay: boolean; + } +@@ -284,8 +279,8 @@ interface CalendarDay { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + interface MonthData { + /** +@@ -303,8 +298,8 @@ interface MonthData { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + year: number; + +@@ -323,8 +318,8 @@ interface MonthData { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + month: number; + +@@ -343,8 +338,8 @@ interface MonthData { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + data: CalendarDay[]; + } +@@ -364,8 +359,8 @@ interface MonthData { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + interface CurrentDayStyle { + /** +@@ -383,8 +378,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + dayColor?: ResourceColor; + +@@ -403,8 +398,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + lunarColor?: ResourceColor; + +@@ -423,8 +418,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + markLunarColor?: ResourceColor; + +@@ -443,8 +438,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + dayFontSize?: number; + +@@ -463,8 +458,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + lunarDayFontSize?: number; + +@@ -483,8 +478,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + dayHeight?: number; + +@@ -503,8 +498,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + dayWidth?: number; + +@@ -523,8 +518,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + gregorianCalendarHeight?: number; + +@@ -543,8 +538,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + dayYAxisOffset?: number; + +@@ -563,8 +558,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + lunarDayYAxisOffset?: number; + +@@ -583,8 +578,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + underscoreXAxisOffset?: number; + +@@ -603,8 +598,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + underscoreYAxisOffset?: number; + +@@ -623,8 +618,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + scheduleMarkerXAxisOffset?: number; + +@@ -643,8 +638,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + scheduleMarkerYAxisOffset?: number; + +@@ -663,8 +658,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + colSpace?: number; + +@@ -683,8 +678,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + dailyFiveRowSpace?: number; + +@@ -703,8 +698,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + dailySixRowSpace?: number; + +@@ -723,8 +718,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + lunarHeight?: number; + +@@ -743,8 +738,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + underscoreWidth?: number; + +@@ -763,8 +758,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + underscoreLength?: number; + +@@ -783,8 +778,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + scheduleMarkerRadius?: number; + +@@ -803,8 +798,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + boundaryRowOffset?: number; + +@@ -823,8 +818,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + boundaryColOffset?: number; + } +@@ -844,8 +839,8 @@ interface CurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + interface NonCurrentDayStyle { + /** +@@ -863,8 +858,8 @@ interface NonCurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + nonCurrentMonthDayColor?: ResourceColor; + +@@ -883,8 +878,8 @@ interface NonCurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + nonCurrentMonthLunarColor?: ResourceColor; + +@@ -903,8 +898,8 @@ interface NonCurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + nonCurrentMonthWorkDayMarkColor?: ResourceColor; + +@@ -923,8 +918,8 @@ interface NonCurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + nonCurrentMonthOffDayMarkColor?: ResourceColor; + } +@@ -944,8 +939,8 @@ interface NonCurrentDayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + interface TodayStyle { + /** +@@ -963,8 +958,8 @@ interface TodayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + focusedDayColor?: ResourceColor; + +@@ -983,8 +978,8 @@ interface TodayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + focusedLunarColor?: ResourceColor; + +@@ -1003,8 +998,8 @@ interface TodayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + focusedAreaBackgroundColor?: ResourceColor; + +@@ -1023,8 +1018,8 @@ interface TodayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + focusedAreaRadius?: number; + } +@@ -1044,8 +1039,8 @@ interface TodayStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + interface WeekStyle { + /** +@@ -1063,8 +1058,8 @@ interface WeekStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + weekColor?: ResourceColor; + +@@ -1083,8 +1078,8 @@ interface WeekStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + weekendDayColor?: ResourceColor; + +@@ -1103,8 +1098,8 @@ interface WeekStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + weekendLunarColor?: ResourceColor; + +@@ -1123,8 +1118,8 @@ interface WeekStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + weekFontSize?: number; + +@@ -1143,8 +1138,8 @@ interface WeekStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + weekHeight?: number; + +@@ -1163,8 +1158,8 @@ interface WeekStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + weekWidth?: number; + +@@ -1183,8 +1178,8 @@ interface WeekStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + weekAndDayRowSpace?: number; + } +@@ -1204,8 +1199,8 @@ interface WeekStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + interface WorkStateStyle { + /** +@@ -1223,8 +1218,8 @@ interface WorkStateStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + workDayMarkColor?: ResourceColor; + +@@ -1243,8 +1238,8 @@ interface WorkStateStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + offDayMarkColor?: ResourceColor; + +@@ -1263,8 +1258,8 @@ interface WorkStateStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + workDayMarkSize?: number; + +@@ -1283,8 +1278,8 @@ interface WorkStateStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + offDayMarkSize?: number; + +@@ -1303,8 +1298,8 @@ interface WorkStateStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + workStateWidth?: number; + +@@ -1323,8 +1318,8 @@ interface WorkStateStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + workStateHorizontalMovingDistance?: number; + +@@ -1343,8 +1338,8 @@ interface WorkStateStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + workStateVerticalMovingDistance?: number; + } +@@ -1364,8 +1359,8 @@ interface WorkStateStyle { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + declare interface CalendarSelectedDate { + /** +@@ -1383,8 +1378,8 @@ declare interface CalendarSelectedDate { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + year: number; + +@@ -1403,8 +1398,8 @@ declare interface CalendarSelectedDate { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + month: number; + +@@ -1423,8 +1418,8 @@ declare interface CalendarSelectedDate { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + day: number; + } +@@ -1444,8 +1439,8 @@ declare interface CalendarSelectedDate { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + declare interface CalendarRequestedData { + /** +@@ -1463,8 +1458,8 @@ declare interface CalendarRequestedData { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + year: number; + +@@ -1483,8 +1478,8 @@ declare interface CalendarRequestedData { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + month: number; + +@@ -1503,8 +1498,8 @@ declare interface CalendarRequestedData { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + currentYear: number; + +@@ -1523,8 +1518,8 @@ declare interface CalendarRequestedData { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + currentMonth: number; + +@@ -1543,59 +1538,12 @@ declare interface CalendarRequestedData { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + monthState: number; + } + +-/** +- * Defines the struct of DateOptions. +- * +- * @interface DateOptions +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @systemapi +- * @form +- * @since 20 +- * @arkts 1.2 +- */ +-interface DateOptions { +- /** +- * Gregorian calendar year. +- * +- * @type { number } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @systemapi +- * @form +- * @since 20 +- * @arkts 1.2 +- */ +- year: number; +- +- /** +- * Gregorian calendar month. +- * +- * @type { number } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @systemapi +- * @form +- * @since 20 +- * @arkts 1.2 +- */ +- month: number; +- +- /** +- * Gregorian calendar day. +- * +- * @type { number } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @systemapi +- * @form +- * @since 20 +- * @arkts 1.2 +- */ +- day: number +-} + /** + * Calendar controller. + * +@@ -1609,8 +1557,8 @@ interface DateOptions { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + declare class CalendarController { + /** +@@ -1626,8 +1574,8 @@ declare class CalendarController { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + constructor(); + +@@ -1645,20 +1593,10 @@ declare class CalendarController { + * @systemapi + * @form + * @since 10 ++ * @deprecated since 20 + */ + backToToday(); + +- /** +- * Back to day. +- * +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @systemapi +- * @form +- * @since 20 +- * @arkts 1.2 +- */ +- backToToday():void; +- + /** + * To the specified element. + * +@@ -1675,90 +1613,9 @@ declare class CalendarController { + * @systemapi + * @form + * @since 10 ++ * @deprecated since 20 + */ + goTo(value: { year: number; month: number; day: number }); +- /** +- * To the specified element. +- * +- * @param { CalendarSelectedDate } date +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @systemapi +- * @form +- * @since 20 +- * @arkts 1.2 +- */ +- goTo(date: CalendarSelectedDate): void; +-} +- +-/** +- * Defines the struct of CalendarRequestedMonths. +- * +- * @interface CalendarRequestedMonths +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @systemapi +- * @form +- * @since 20 +- * @arkts 1.2 +- */ +-declare interface CalendarRequestedMonths { +- /** +- * Default selected year/month/day. +- * @type { CalendarSelectedDate } date +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @systemapi +- * @form +- * @since 20 +- * @arkts 1.2 +- */ +- date: CalendarSelectedDate; +- +- /** +- * Dates contained in the current month. +- * +- * @type { MonthData } currentData +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @systemapi +- * @form +- * @since 20 +- * @arkts 1.2 +- */ +- currentData: MonthData; +- +- /** +- * Dates contained in the previous month. +- * +- * @type { MonthData } preData +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @systemapi +- * @form +- * @since 20 +- * @arkts 1.2 +- */ +- preData: MonthData; +- +- /** +- * Dates contained in the next month. +- * +- * @type { MonthData } nextData +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @systemapi +- * @form +- * @since 20 +- * @arkts 1.2 +- */ +- nextData: MonthData; +- +- /** +- * Calendar controller. +- * +- * @type { ?CalendarController } controller +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @systemapi +- * @form +- * @since 20 +- * @arkts 1.2 +- */ +- controller?: CalendarController; + } + + /** +@@ -1776,8 +1633,8 @@ declare interface CalendarRequestedMonths { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + interface CalendarInterface { + /** +@@ -1798,6 +1655,7 @@ interface CalendarInterface { + * @systemapi + * @form + * @since 10 ++ * @deprecated since 20 + */ + (value: { + date: { year: number; month: number; day: number }; +@@ -1806,19 +1664,6 @@ interface CalendarInterface { + nextData: MonthData; + controller?: CalendarController; + }): CalendarAttribute; +- +- /** +- * Set value. +- * +- * @param { CalendarRequestedMonths } value +- * @returns { CalendarAttribute } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @systemapi +- * @form +- * @since 20 +- * @arkts 1.2 +- */ +- (value: CalendarRequestedMonths): CalendarAttribute; + } + + /** +@@ -1830,8 +1675,8 @@ interface CalendarInterface { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + declare class CalendarAttribute { + /** +@@ -1851,8 +1696,8 @@ declare class CalendarAttribute { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + showLunar(value: boolean): CalendarAttribute; + +@@ -1873,8 +1718,8 @@ declare class CalendarAttribute { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + showHoliday(value: boolean): CalendarAttribute; + +@@ -1895,8 +1740,8 @@ declare class CalendarAttribute { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + needSlide(value: boolean): CalendarAttribute; + +@@ -1917,8 +1762,8 @@ declare class CalendarAttribute { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + startOfWeek(value: number): CalendarAttribute; + +@@ -1939,8 +1784,8 @@ declare class CalendarAttribute { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + offDays(value: number): CalendarAttribute; + +@@ -1961,8 +1806,8 @@ declare class CalendarAttribute { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + direction(value: Axis): CalendarAttribute; + +@@ -1983,8 +1828,8 @@ declare class CalendarAttribute { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + currentDayStyle(value: CurrentDayStyle): CalendarAttribute; + +@@ -2005,8 +1850,8 @@ declare class CalendarAttribute { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + nonCurrentDayStyle(value: NonCurrentDayStyle): CalendarAttribute; + +@@ -2027,8 +1872,8 @@ declare class CalendarAttribute { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + todayStyle(value: TodayStyle): CalendarAttribute; + +@@ -2049,8 +1894,8 @@ declare class CalendarAttribute { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + weekStyle(value: WeekStyle): CalendarAttribute; + +@@ -2071,8 +1916,8 @@ declare class CalendarAttribute { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + workStateStyle(value: WorkStateStyle): CalendarAttribute; + +@@ -2093,8 +1938,8 @@ declare class CalendarAttribute { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + onSelectChange(event: (event: CalendarSelectedDate) => void): CalendarAttribute; + +@@ -2115,8 +1960,8 @@ declare class CalendarAttribute { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @form +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 ++ * @deprecated since 20 + */ + onRequestData( + event: (event: CalendarRequestedData) => void, +@@ -2137,6 +1982,7 @@ declare class CalendarAttribute { + * @systemapi + * @form + * @since 10 ++ * @deprecated since 20 + */ + declare const Calendar: CalendarInterface; + +@@ -2154,5 +2000,6 @@ declare const Calendar: CalendarInterface; + * @systemapi + * @form + * @since 10 ++ * @deprecated since 20 + */ + declare const CalendarInstance: CalendarAttribute; +diff --git a/api/@internal/component/ets/checkbox.d.ts b/api/@internal/component/ets/checkbox.d.ts +index 859d3b493..d1d796b17 100644 +--- a/api/@internal/component/ets/checkbox.d.ts ++++ b/api/@internal/component/ets/checkbox.d.ts +@@ -19,7 +19,7 @@ + */ + + /*** if arkts 1.2 */ +-import { CommonConfiguration, Callback, CommonMethod, ContentModifier, Optional } from './common'; ++import { CommonConfiguration, Callback, CommonMethod, ContentModifier, Optional, Bindable } from './common'; + import { CustomBuilder } from './builder'; + import { ResourceColor, MarkStyle } from './units'; + import { CheckBoxShape } from './enums'; +@@ -365,8 +365,7 @@ declare class CheckboxAttribute extends CommonMethod { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + select(value: boolean): CheckboxAttribute; + +@@ -379,11 +378,24 @@ declare class CheckboxAttribute extends CommonMethod { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 18 + */ + select(isSelected: Optional): CheckboxAttribute; + ++ /** ++ * setting whether checkbox is selected. ++ * ++ * @param { boolean | undefined | Bindable } isSelected ++ * @returns { CheckboxAttribute } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ select(isSelected: boolean | undefined | Bindable): CheckboxAttribute; ++ + /** + * setting the display color of checkbox. + * +diff --git a/api/@internal/component/ets/checkboxgroup.d.ts b/api/@internal/component/ets/checkboxgroup.d.ts +index bee7deec0..8864f9d76 100644 +--- a/api/@internal/component/ets/checkboxgroup.d.ts ++++ b/api/@internal/component/ets/checkboxgroup.d.ts +@@ -19,7 +19,7 @@ + */ + + /*** if arkts 1.2 */ +-import { CommonMethod, Optional } from './common'; ++import { CommonMethod, Optional, Bindable } from './common'; + import { ResourceColor, MarkStyle } from './units'; + import { CheckBoxShape } from './enums'; + /*** endif */ +@@ -506,8 +506,7 @@ declare class CheckboxGroupAttribute extends CommonMethod): CheckboxGroupAttribute; + ++ /** ++ * setting whether all checkbox is selected. ++ * ++ * @param { boolean| undefined|Bindable } isAllSelected ++ * @returns { CheckboxGroupAttribute } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ selectAll(isAllSelected: boolean | undefined | Bindable): CheckboxGroupAttribute; ++ + /** + * setting the display color of checkbox. + * +diff --git a/api/@internal/component/ets/common.d.ts b/api/@internal/component/ets/common.d.ts +index fdc08b8fd..06d6ff3bd 100644 +--- a/api/@internal/component/ets/common.d.ts ++++ b/api/@internal/component/ets/common.d.ts +@@ -19,19 +19,20 @@ + */ + + /*** if arkts 1.2 */ +-import Context from '../../application/Context'; ++import OriginalContext from '../../application/Context'; + import { Resource } from '../../global/resource'; + import pointer from '../../@ohos.multimodalInput.pointer'; + import image from '../../@ohos.multimedia.image'; + import unifiedDataChannel from '../../@ohos.data.unifiedDataChannel'; + import promptAction from '../../@ohos.promptAction'; + import uniformTypeDescriptor from '../../@ohos.data.uniformTypeDescriptor'; ++import Want from '../../@ohos.app.ability.Want'; + import { IntentionCode } from '../../@ohos.multimodalInput.intentionCode'; + import { SymbolGlyphModifier } from '../../arkui/SymbolGlyphModifier'; + import { CircleShape, EllipseShape, PathShape, RectShape } from '../../@ohos.arkui.shape'; + import uiObserver from '../../@ohos.arkui.observer'; +-import { UIContext } from '../../@ohos.arkui.UIContext'; +-import { DrawContext, LengthMetrics } from '../../arkui/Graphics'; ++import { UIContext as _UIContext } from '../../@ohos.arkui.UIContext'; ++import { DrawContext as _DrawContext, LengthMetrics } from '../../arkui/Graphics'; + import uiEffect from '../../@ohos.graphics.uiEffect'; + import { FocusBoxStyle, FocusPriority } from './focus'; + import { ComponentContent } from '../../arkui/ComponentContent'; +@@ -65,8 +66,9 @@ import { CircleAttribute } from './circle'; + import { RectAttribute } from './rect'; + import { PathAttribute } from './path'; + import { EllipseAttribute } from './ellipse'; +-import { LocalStorage } from '../stateManagement/storages/localStorage'; +-import { CustomBuilder } from './builder'; ++import { LocalStorage } from '../stateManagement/storage/localStorage'; ++import { CustomBuilder, WrappedBuilder } from './builder'; ++import curves from '../../@ohos.curves'; + /*** endif */ + + /** +@@ -1514,6 +1516,19 @@ declare interface ReuseOptions { + */ + declare type Context = import('../api/application/Context').default; + ++/** ++ * Export Context. ++ * ++ * @typedef { OriginalContext } Context ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @stagemodelonly ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++export type Context = OriginalContext; ++ + /** + * Post Card Action. + * +@@ -3869,8 +3884,7 @@ declare interface AnimateParam { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + interface ICurve { + /** +@@ -3904,12 +3918,24 @@ interface ICurve { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + interpolate(fraction: number): number; + } + ++/** ++ * Interface for curve object. ++ * ++ * @typedef { curves.ICurve } ICurve ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++export type ICurve = curves.ICurve; ++ + /** + * Defines the motion path options. + * +@@ -7227,7 +7253,6 @@ declare class TransitionEffect { + * Disables the transition effect + * + * @type { TransitionEffect } +- * @readonly + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform +@@ -7236,13 +7261,12 @@ declare class TransitionEffect { + * @since 20 + * @arkts 1.2 + */ +- static readonly IDENTITY: TransitionEffect; ++ static get IDENTITY(): TransitionEffect; + + /** + * Specifies a transition effect with transparency of 0, which is equivalent to TransitionEffect.opacity(0). + * + * @type { TransitionEffect } +- * @readonly + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform +@@ -7251,13 +7275,12 @@ declare class TransitionEffect { + * @since 20 + * @arkts 1.2 + */ +- static readonly OPACITY: TransitionEffect; ++ static get OPACITY(): TransitionEffect; + + /** + * Defines a slide transition effect + * + * @type { TransitionEffect } +- * @readonly + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform +@@ -7266,7 +7289,7 @@ declare class TransitionEffect { + * @since 20 + * @arkts 1.2 + */ +- static readonly SLIDE: TransitionEffect; ++ static get SLIDE(): TransitionEffect; + + /** + * Specify a transition effect where the element enters by shrinking first and then expanding as it slides in from the right, +@@ -7275,7 +7298,6 @@ declare class TransitionEffect { + * The default animation duration is set to 600ms, and the specified animation curve is cubicBezierCurve(0.24, 0.0, 0.50, 1.0). + * + * @type { TransitionEffect } +- * @readonly + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform +@@ -7284,7 +7306,7 @@ declare class TransitionEffect { + * @since 20 + * @arkts 1.2 + */ +- static readonly SLIDE_SWITCH: TransitionEffect; ++ static get SLIDE_SWITCH(): TransitionEffect; + + /** + * Creates a translate transition effect +@@ -13195,6 +13217,17 @@ declare type Summary = unifiedDataChannel.Summary; + */ + declare type UniformDataType = import('../api/@ohos.data.uniformTypeDescriptor').default.UniformDataType; + ++/** ++ * Import the UniformDataType type object for ui component. ++ * ++ * @typedef { uniformTypeDescriptor.UniformDataType } UniformDataType ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++declare type UniformDataType = uniformTypeDescriptor.UniformDataType; ++ + /** + * Import the GetDataParams type object for ui component. + * +@@ -13207,15 +13240,16 @@ declare type UniformDataType = import('../api/@ohos.data.uniformTypeDescriptor') + declare type DataSyncOptions = import('../api/@ohos.data.unifiedDataChannel').default.GetDataParams; + + /** +- * Import the UniformDataType type object for ui component. ++ * Import the GetDataParams type object for ui component. + * +- * @typedef { uniformTypeDescriptor.UniformDataType } UniformDataType ++ * @typedef { unifiedDataChannel.GetDataParams } GetDataParams + * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +-declare type UniformDataType = uniformTypeDescriptor.UniformDataType; ++declare type DataSyncOptions = unifiedDataChannel.GetDataParams; + + /** + * Enum for Drag Result. +@@ -14481,7 +14515,8 @@ declare interface DragEvent { + * @throws { BusinessError } 190003 - Operation no allowed for current pharse. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + startDataLoading(options: DataSyncOptions): string; + } +@@ -15640,6 +15675,43 @@ declare interface SpringBackAction { + springBack: VoidCallback; + } + ++ ++/** ++ * Defines the detent array of a single length. ++ * ++ * @typedef { [SheetSize | Length] } SingleLengthDetent ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++declare type SingleLengthDetent = [SheetSize | Length]; ++ ++/** ++ * Defines the detent array of a two-length. ++ * ++ * @typedef { [(SheetSize | Length), SheetSize | Length | undefined] } DoubleLengthDetents ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++declare type DoubleLengthDetents = [(SheetSize | Length), SheetSize | Length | undefined]; ++ ++/** ++ * Defines the detent array of a three-length. ++ * ++ * @typedef { [(SheetSize | Length), SheetSize | Length | undefined, SheetSize | Length | undefined] } TripleLengthDetents ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++declare type TripleLengthDetents = [(SheetSize | Length), SheetSize | Length | undefined, SheetSize | Length | undefined]; ++ + /** + * Component sheet options + * +@@ -15747,14 +15819,14 @@ declare interface SheetOptions extends BindOptions { + /** + * Defines sheet detents + * +- * @type { ?[(SheetSize | Length), (SheetSize | Length)?, (SheetSize | Length)?] } ++ * @type { ?(SingleLengthDetent | DoubleLengthDetents | TripleLengthDetents) } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +- detents?: [(SheetSize | Length), SheetSize | Length | undefined, SheetSize | Length | undefined]; ++ detents?: SingleLengthDetent | DoubleLengthDetents | TripleLengthDetents; + + /** + * Defines sheet background blur Style +@@ -16647,11 +16719,21 @@ declare interface DismissPopupAction { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + dismiss: Callback; + ++ /** ++ * Defines popup dismiss function ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ dismiss(): void; ++ + /** + * Defines popup dismiss reason + * +@@ -17156,14 +17238,14 @@ declare interface PopupButton { + /** + * action + * +- * @type { Callback } ++ * @type { VoidCallback } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +- action: Callback; ++ action: VoidCallback; + } + + /** +@@ -26800,11 +26882,25 @@ declare class CommonMethod { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + bindContentCover(isShow: boolean, builder: CustomBuilder, type?: ModalTransition): T; + ++ /** ++ * Bind content cover ++ * ++ * @param { boolean | Bindable} isShow - true means display content, false means hide content. ++ * @param { CustomBuilder } builder - the content to be displayed. ++ * @param { ModalTransition } [type] - transition type. ++ * @returns { T } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ bindContentCover(isShow: boolean | Bindable, builder: CustomBuilder, type?: ModalTransition): T; ++ + /** + * Bind content cover + * +@@ -26826,10 +26922,24 @@ declare class CommonMethod { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 ++ */ ++ bindContentCover(isShow: boolean , builder: CustomBuilder, options?: ContentCoverOptions): T; ++ ++ /** ++ * Bind content cover ++ * ++ * @param { boolean | Bindable } isShow - true means display content, false means hide content. ++ * @param { CustomBuilder } builder - the content to be displayed. ++ * @param { ContentCoverOptions } [options] - options of content cover. ++ * @returns { T } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 + */ +- bindContentCover(isShow: boolean, builder: CustomBuilder, options?: ContentCoverOptions): T; ++ bindContentCover(isShow: boolean | Bindable, builder: CustomBuilder, options?: ContentCoverOptions): T; + + /** + * Bind sheet +@@ -26852,11 +26962,26 @@ declare class CommonMethod { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 ++ * @arkts 1.1 + */ + bindSheet(isShow: boolean, builder: CustomBuilder, options?: SheetOptions): T; + ++ /** ++ * Bind sheet ++ * ++ * @param { boolean | Bindable} isShow - true means display sheet, false means hide sheet. ++ * @param { CustomBuilder } builder - the sheet to be displayed. ++ * @param { SheetOptions } [options] - options of sheet. ++ * @returns { T } - template type ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ bindSheet(isShow: boolean | Bindable, builder: CustomBuilder, options?: SheetOptions): T; ++ + /** + * Sets styles for component state. + * +@@ -26974,7 +27099,7 @@ declare class CommonMethod { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'17','1.2':'20'} + * @arkts 1.1&1.2 + */ + onVisibleAreaApproximateChange(options: VisibleAreaEventOptions, event: VisibleAreaChangeCallback | undefined): void; +@@ -28643,8 +28768,7 @@ declare class CommonShapeMethod extends CommonMethod { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + declare interface LinearGradient { + /** +@@ -28669,8 +28793,7 @@ declare interface LinearGradient { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + angle?: number | string; + /** +@@ -28695,8 +28818,7 @@ declare interface LinearGradient { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + direction?: GradientDirection; + /** +@@ -28730,8 +28852,7 @@ declare interface LinearGradient { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + colors: Array<[ResourceColor, number]>; + /** +@@ -28756,8 +28877,7 @@ declare interface LinearGradient { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + repeating?: boolean; + } +@@ -29552,6 +29672,19 @@ declare type RouterPageInfo = uiObserver.RouterPageInfo; + */ + declare type UIContext = import('../api/@ohos.arkui.UIContext').UIContext; + ++/** ++ * UIContext. ++ * ++ * @typedef { _UIContext } UIContext ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @stagemodelonly ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++export type UIContext = _UIContext; ++ + /** + * DrawContext + * +@@ -29563,6 +29696,19 @@ declare type UIContext = import('../api/@ohos.arkui.UIContext').UIContext; + */ + declare type DrawContext = import('../api/arkui/Graphics').DrawContext; + ++/** ++ * DrawContext. ++ * ++ * @typedef { _DrawContext } DrawContext ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @stagemodelonly ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++export type DrawContext = _DrawContext; ++ + /** + * VisualEffect + * +@@ -31742,17 +31888,6 @@ declare interface LightSource { + * @since 12 + */ + declare function wrapBuilder(builder: (...args: Args) => void): WrappedBuilder; +-/** +- * Defining wrapBuilder function. +- * @param { function } builder +- * @returns { WrappedBuilder } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +-declare function wrapBuilder>(builder: (args: Args) => void): WrappedBuilder; + + /** + * Defines the WrappedBuilder class. +@@ -31801,37 +31936,6 @@ declare class WrappedBuilder { + + + +-/** +- * Defines the WrappedBuilder class. +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +-declare class WrappedBuilder> { +- +- /** +- * @type { function } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +- builder: (args: Args) => void; +- +- /** +- * @param { function } builder +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +- constructor(builder: (args: Args) => void); +-} +- + + /** + * Defines the overall animation parameters of the keyframe animation. +@@ -32609,6 +32713,36 @@ declare interface DateRange { + end?: Date; + } + ++/** ++ * Indicates the information when the provider of the embedded UI is terminated. ++ * ++ * @interface TerminationInfo ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ * @arkts 1.2 ++ */ ++declare interface TerminationInfo { ++ /** ++ * Defines the termination code. ++ * ++ * @type { number } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ code: number; ++ ++ /** ++ * Defines the additional termination information. ++ * ++ * @type { ?Want } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ want?: Want; ++} ++ + /** + * Defines the format for displaying dates and times. + * +@@ -32664,3 +32798,15 @@ export declare interface Bindable { + * @arkts 1.2 + */ + export declare function $$(value: T): Bindable; ++ ++/** ++ * Apply style function on this CommonMethod. ++ * ++ * @param { T } this ++ * @param { CustomStyles } customStyles ++ * @returns { T } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ * @arkts 1.2 ++ */ ++export declare function applyStyles(this: T, customStyles: CustomStyles): T; +diff --git a/api/@internal/component/ets/custom_dialog_controller.d.ts b/api/@internal/component/ets/custom_dialog_controller.d.ts +index 9d3c60c4a..959dcc2ea 100644 +--- a/api/@internal/component/ets/custom_dialog_controller.d.ts ++++ b/api/@internal/component/ets/custom_dialog_controller.d.ts +@@ -24,12 +24,14 @@ import { + DismissReason, BackgroundBlurStyleOptions, BackgroundEffectOptions + } from './common'; + import { CustomBuilder } from './builder'; ++import { ExtendableComponent } from './extendableComponent'; + import { DialogAlignment } from './alertDialog'; + import { Offset, ResourceColor, Dimension, BorderRadiuses, EdgeWidths, EdgeColors, EdgeStyles } from './units'; + import { BorderStyle } from './enums'; + import { LengthMetrics } from '../Graphics'; + import { LevelMode, LevelOrder, ImmersiveMode } from '../../@ohos.promptAction'; + import { CustomBuilder } from './builder'; ++import { DismissDialogAction } from './actionSheet'; + /*** endif */ + + /** +@@ -87,14 +89,14 @@ declare interface CustomDialogControllerOptions { + /** + * Custom builder function. + * +- * @type { CustomBuilder } ++ * @type { CustomBuilder | ExtendableComponent } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +- builder: CustomBuilder; ++ builder: CustomBuilder | ExtendableComponent; + + /** + * Defines the cancel function. +@@ -711,8 +713,7 @@ declare interface CustomDialogControllerOptions { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + declare interface DismissDialogAction { + /** +@@ -722,8 +723,7 @@ declare interface DismissDialogAction { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + dismiss: Callback; + +@@ -734,8 +734,7 @@ declare interface DismissDialogAction { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + reason: DismissReason; + } +diff --git a/api/@internal/component/ets/embedded_component.d.ts b/api/@internal/component/ets/embedded_component.d.ts +index 618d27c36..1dca4bf8e 100644 +--- a/api/@internal/component/ets/embedded_component.d.ts ++++ b/api/@internal/component/ets/embedded_component.d.ts +@@ -21,7 +21,7 @@ + /*** if arkts 1.2 */ + import Want from '../../@ohos.app.ability.Want' + import { Callback, ErrorCallback ,BusinessError} from '../../@ohos.base' +-import { CommonMethod } from './common' ++import { CommonMethod, TerminationInfo } from './common' + import { EmbeddedType } from './enums' + /*** endif */ + +@@ -100,36 +100,6 @@ declare interface TerminationInfo { + want?: import('../api/@ohos.app.ability.Want').default; + } + +-/** +- * Indicates the information when the provider of the embedded UI is terminated. +- * +- * @interface TerminationInfo +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @since 20 +- * @arkts 1.2 +- */ +-declare interface TerminationInfo { +- /** +- * Defines the termination code. +- * +- * @type { number } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @since 20 +- * @arkts 1.2 +- */ +- code: number; +- +- /** +- * Defines the additional termination information. +- * +- * @type { ?Want } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @since 20 +- * @arkts 1.2 +- */ +- want?: Want; +-} +- + /** + * Define the attribute functions of EmbeddedComponent. + * +@@ -177,7 +147,7 @@ declare class EmbeddedComponentAttribute extends CommonMethod } callback + * @returns { EmbeddedComponentAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +diff --git a/api/@internal/component/ets/enums.d.ts b/api/@internal/component/ets/enums.d.ts +index 9b7534ff6..d5ba928cc 100644 +--- a/api/@internal/component/ets/enums.d.ts ++++ b/api/@internal/component/ets/enums.d.ts +@@ -18,6 +18,10 @@ + * @kit ArkUI + */ + ++/*** if arkts 1.2 */ ++import curves from '../../@ohos.curves'; ++/*** endif */ ++ + /** + * common enum of the checkbox shape + * +@@ -1844,8 +1848,7 @@ declare enum AnimationStatus { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + declare enum Curve { + /** +@@ -1876,8 +1879,7 @@ declare enum Curve { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + Linear, + +@@ -1909,8 +1911,7 @@ declare enum Curve { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + Ease, + +@@ -1942,8 +1943,7 @@ declare enum Curve { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + EaseIn, + +@@ -1975,8 +1975,7 @@ declare enum Curve { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + EaseOut, + +@@ -2008,8 +2007,7 @@ declare enum Curve { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + EaseInOut, + +@@ -2041,8 +2039,7 @@ declare enum Curve { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + FastOutSlowIn, + +@@ -2074,8 +2071,7 @@ declare enum Curve { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + LinearOutSlowIn, + +@@ -2107,8 +2103,7 @@ declare enum Curve { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + FastOutLinearIn, + +@@ -2140,8 +2135,7 @@ declare enum Curve { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + ExtremeDeceleration, + +@@ -2173,8 +2167,7 @@ declare enum Curve { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + Sharp, + +@@ -2206,8 +2199,7 @@ declare enum Curve { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + Rhythm, + +@@ -2239,8 +2231,7 @@ declare enum Curve { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + Smooth, + +@@ -2272,12 +2263,24 @@ declare enum Curve { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + Friction, + } + ++/** ++ * enum Curve. ++ * ++ * @typedef { curves.Curve } Curve ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++export type Curve = curves.Curve; ++ + /** + * Sets the state before and after the animation starts. + * +diff --git a/api/@internal/component/ets/form_component.d.ts b/api/@internal/component/ets/form_component.d.ts +index 076170cab..8b2d7bc66 100644 +--- a/api/@internal/component/ets/form_component.d.ts ++++ b/api/@internal/component/ets/form_component.d.ts +@@ -21,11 +21,12 @@ + import { CommonMethod,Callback } from './common'; + import Want from '../../@ohos.app.ability.Want'; + import { Visibility } from './enums' ++import { VoidCallback } from './units'; + /*** endif */ + /** + * Defines the FormDimension enum. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @since arkts {'1.1':'7','1.2':'20'} +@@ -40,7 +41,7 @@ declare enum FormDimension { + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 + */ +- Dimension_1_2, ++ Dimension_1_2 = 0, + + /** + * 2 x 2 cards +@@ -50,7 +51,7 @@ declare enum FormDimension { + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 + */ +- Dimension_2_2, ++ Dimension_2_2 = 1, + + /** + * 2 x 4 cards +@@ -60,7 +61,7 @@ declare enum FormDimension { + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 + */ +- Dimension_2_4, ++ Dimension_2_4 = 2, + + /** + * 4 x 4 cards +@@ -70,17 +71,17 @@ declare enum FormDimension { + * @since arkts {'1.1':'7','1.2':'20'} + * @arkts 1.1&1.2 + */ +- Dimension_4_4, ++ Dimension_4_4 = 3, + + /** + * 2 x 1 cards + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since arkts {'1.1':'9','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 ++ * @deprecated since 20 + */ +- Dimension_2_1, ++ Dimension_2_1 = 4, + + /** + * 1 x 1 cards +@@ -101,7 +102,7 @@ declare enum FormDimension { + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- DIMENSION_6_4, ++ DIMENSION_6_4 = 7, + + /** + * 2 x 3 cards used for wearable devices +@@ -121,23 +122,13 @@ declare enum FormDimension { + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 + */ +- DIMENSION_3_3 = 9, +- +- /** +- * 3 x 4 cards used for tv devices +- * +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @systemapi +- * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 +- */ +- DIMENSION_3_4 = 10, ++ DIMENSION_3_3 = 9 + } + + /** + * Defines the FormRenderingMode enum. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @since arkts {'1.1':'11','1.2':'20'} +@@ -169,7 +160,7 @@ declare enum FormRenderingMode { + /** + * Defines the FormShape enum. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @since arkts {'1.1':'12','1.2':'20'} +@@ -210,13 +201,13 @@ declare interface FormInfo { + /** + * The id the form. + * +- * @type { number | string } ++ * @type { long | string } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- id: number | string; ++ id: long | string; + + /** + * The name of the form. +@@ -297,7 +288,7 @@ declare interface FormInfo { + /** + * The want of the form. + * +- * @type { ?import('../api/@ohos.app.ability.Want').default } ++ * @type { ?Want } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @since 20 +@@ -342,7 +333,7 @@ interface FormComponentInterface { + * Set a new value. + * + * @param { { +- * id: number; ++ * id: long; + * name: string; + * bundle: string; + * ability: string; +@@ -400,13 +391,13 @@ interface FormCallbackInfo { + /** + * The id of the form. + * +- * @type { number } ++ * @type { long } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- id: number; ++ id: long; + + /** + * The string id of the form. +@@ -420,67 +411,72 @@ interface FormCallbackInfo { + idString: string; + } + /** +- * Defines the FormCallbackInfo. ++ * Defines the size of Form. + * + * @interface FormSize + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since 20 +- * @arkts 1.2 ++ * @since arkts{ '1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface FormSize { + /** +- * The string id of the form. ++ * The width of the form. ++ * Anonymous Object Rectification + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since 20 +- * @arkts 1.2 ++ * @since arkts{ '1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- width: number; ++ width: double; + /** +- * The string id of the form. ++ * The height of the form. ++ * Anonymous Object Rectification + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since 20 +- * @arkts 1.2 ++ * @since arkts{ '1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- height: number; ++ height: double; + } + + /** +- * Defines the FormCallbackInfo. ++ * Defines error information for card loading. + * +- * @interface FormError ++ * @typedef ErrorInformation + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since 20 +- * @arkts 1.2 ++ * @since arkts{ '1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +-interface FormError { ++interface ErrorInformation { + /** +- * The string id of the form. ++ * Error code. ++ * Anonymous Object Rectification + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since 20 +- * @arkts 1.2 ++ * @since arkts{ '1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- errcode: number; ++ errcode: int; ++ + /** +- * The string id of the form. ++ * Error information. ++ * Anonymous Object Rectification + * +- * @type { number } ++ * @type { string } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since 20 +- * @arkts 1.2 ++ * @since arkts{ '1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- msg: string ++ msg: string; + } + + /** +@@ -500,19 +496,17 @@ declare class FormComponentAttribute extends CommonMethod void): FormComponentAttribute; +- + /** + * Card loading error. + * +- * @param { Callback } callback ++ * @param { Callback } callback + * @returns { FormComponentAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since 20 +- * @arkts 1.2 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- onError(callback: Callback): FormComponentAttribute; ++ onError(callback: Callback): FormComponentAttribute; + + /** + * Card to be redirected. +@@ -617,19 +609,18 @@ declare class FormComponentAttribute extends CommonMethod void): FormComponentAttribute; +- + /** + * Card to be redirected. ++ * Anonymous Object Rectification + * +- * @param { function } callback ++ * @param { Callback } callback + * @returns { FormComponentAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since 20 +- * @arkts 1.2 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- onRouter(callback: Callback): FormComponentAttribute; ++ onRouter(callback: Callback): FormComponentAttribute; + + /** + * Uninstall Card. +@@ -659,10 +650,19 @@ declare class FormComponentAttribute extends CommonMethod void): FormComponentAttribute; ++ onLoad(callback: VoidCallback): FormComponentAttribute; + } + + /** +diff --git a/api/@internal/component/ets/grid.d.ts b/api/@internal/component/ets/grid.d.ts +index 7a5f2d275..7e1cf1ef8 100644 +--- a/api/@internal/component/ets/grid.d.ts ++++ b/api/@internal/component/ets/grid.d.ts +@@ -1356,17 +1356,17 @@ declare class GridAttribute extends ScrollableCommonMethod { + * @atomicservice + * @since 11 + */ +- onScrollFrameBegin(event: (offset: number, state: ScrollState) => { offsetRemain: number }): GridAttribute; +- + /** + * Called when scrolling begin each frame. ++ * Anonymous Object Rectification. + * +- * @param { OnScrollFrameBeginCallback } event +- * @returns { GridAttribute } ++ * @param { OnScrollFrameBeginCallback } event - callback function, triggered when the scrolling begin each frame. ++ * @returns { GridAttribute } Returns the instance of the GridAttribute. + * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform + * @atomicservice + * @since 20 +- * @arkts 1.2 ++ * @arkts 1.1&1.2 + */ + onScrollFrameBegin(event: OnScrollFrameBeginCallback): GridAttribute; + +diff --git a/api/@internal/component/ets/image.d.ts b/api/@internal/component/ets/image.d.ts +index e6263095e..ba0171248 100644 +--- a/api/@internal/component/ets/image.d.ts ++++ b/api/@internal/component/ets/image.d.ts +@@ -1130,8 +1130,7 @@ declare class ImageAttribute extends CommonMethod { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + fillColor(value: ResourceColor): ImageAttribute; + +@@ -1143,8 +1142,7 @@ declare class ImageAttribute extends CommonMethod { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'15','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + fillColor(color: ResourceColor | ColorContent): ImageAttribute; + +diff --git a/api/@internal/component/ets/image_span.d.ts b/api/@internal/component/ets/image_span.d.ts +index 3bce91cbb..5c5ec3031 100644 +--- a/api/@internal/component/ets/image_span.d.ts ++++ b/api/@internal/component/ets/image_span.d.ts +@@ -22,7 +22,7 @@ + import { ResourceStr, ColorFilter} from './units'; + import { BaseSpan } from './span'; + import { ImageSpanAlignment, ImageFit } from './enums'; +-import { ImageErrorCallback } from './image'; ++import { ImageErrorCallback, DrawingColorFilter } from './image'; + import { PixelMap } from './common'; + import image from '../../@ohos.multimedia.image'; + /*** endif */ +@@ -118,7 +118,8 @@ declare class ImageSpanAttribute extends BaseSpan { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + colorFilter(filter: ColorFilter | DrawingColorFilter): ImageSpanAttribute; + +diff --git a/api/@internal/component/ets/lazy_grid_layout.d.ts b/api/@internal/component/ets/lazy_grid_layout.d.ts +index cea509445..cd34f5b29 100644 +--- a/api/@internal/component/ets/lazy_grid_layout.d.ts ++++ b/api/@internal/component/ets/lazy_grid_layout.d.ts +@@ -18,6 +18,12 @@ + * @kit ArkUI + */ + ++ ++/*** if arkts 1.2 */ ++import { CommonMethod } from './common'; ++import { LengthMetrics } from '../Graphics'; ++/*** endif */ ++ + /** + * Defines the lazy vertical grid layout component. + * +@@ -25,7 +31,8 @@ + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface LazyVGridLayoutInterface { + /** +@@ -35,7 +42,8 @@ interface LazyVGridLayoutInterface { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + (): LazyVGridLayoutAttribute; + } +@@ -47,30 +55,33 @@ interface LazyVGridLayoutInterface { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare class LazyGridLayoutAttribute extends CommonMethod { + /** + * The spacing between rows. + * +- * @param { Length } value ++ * @param { LengthMetrics } value + * @returns { T } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + rowsGap(value: LengthMetrics): T; + + /** + * The spacing between columns. + * +- * @param { Length } value ++ * @param { LengthMetrics } value + * @returns { T } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + columnsGap(value: LengthMetrics): T; + } +@@ -82,7 +93,8 @@ declare class LazyGridLayoutAttribute extends CommonMethod { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare class LazyVGridLayoutAttribute extends LazyGridLayoutAttribute { + /** +@@ -93,7 +105,8 @@ declare class LazyVGridLayoutAttribute extends LazyGridLayoutAttribute { + * @atomicservice + * @since 11 + */ +- onScrollFrameBegin(event: (offset: number, state: ScrollState) => { offsetRemain: number }): ListAttribute; +- + /** + * Called when scrolling begin each frame. ++ * Anonymous Object Rectification. + * +- * @param { OnScrollFrameBeginCallback } event +- * @returns { ListAttribute } ++ * @param { OnScrollFrameBeginCallback } event - callback function, triggered when the scrolling begin each frame. ++ * @returns { ListAttribute } Returns the instance of the ListAttribute. + * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform + * @form + * @atomicservice + * @since 20 +- * @arkts 1.2 ++ * @arkts 1.1&1.2 + */ + onScrollFrameBegin(event: OnScrollFrameBeginCallback): ListAttribute; + +diff --git a/api/@internal/component/ets/list_item.d.ts b/api/@internal/component/ets/list_item.d.ts +index e5149aa59..914f1fd99 100644 +--- a/api/@internal/component/ets/list_item.d.ts ++++ b/api/@internal/component/ets/list_item.d.ts +@@ -19,7 +19,7 @@ + */ + + /*** if arkts 1.2 */ +-import { CommonMethod } from './common'; ++import { CommonMethod, Bindable } from './common'; + import { CustomBuilder } from './builder' + import { Length } from './units'; + import { ComponentContent } from '../ComponentContent' +@@ -814,11 +814,25 @@ declare class ListItemAttribute extends CommonMethod { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + selected(value: boolean): ListItemAttribute; + ++ /** ++ * Called when judging whether it is selected. ++ * This parameter supports $$ for two-way binding of variables. ++ * ++ * @param { boolean | Bindable } value - if the listItem is selected. ++ * @returns { ListItemAttribute } the attribute of the listItem. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ selected(value: boolean | Bindable): ListItemAttribute; ++ + /** + * Sets the action item that appears when the list item slides in the cross axis direction of the list. + * +diff --git a/api/@internal/component/ets/menu_item.d.ts b/api/@internal/component/ets/menu_item.d.ts +index f03be8699..f83ad5a4e 100644 +--- a/api/@internal/component/ets/menu_item.d.ts ++++ b/api/@internal/component/ets/menu_item.d.ts +@@ -20,7 +20,7 @@ + + /*** if arkts 1.2 */ + import { ResourceStr, Font, ResourceColor } from './units'; +-import { CommonMethod } from './common'; ++import { CommonMethod, Bindable } from './common'; + import { CustomBuilder } from './builder'; + import { SymbolGlyphModifier } from '../../arkui/SymbolGlyphModifier'; + /*** endif */ +@@ -317,11 +317,24 @@ declare class MenuItemAttribute extends CommonMethod { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + selected(value: boolean): MenuItemAttribute; + ++ /** ++ * Setting whether menuItem is selected. ++ * ++ * @param { boolean | undefined | Bindable } value ++ * @returns { MenuItemAttribute } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ selected(value: boolean | undefined | Bindable): MenuItemAttribute; ++ ++ + /** + * Whether the relevant check icon is displayed when a menu item is selected. + * +diff --git a/api/@internal/component/ets/nav_destination.d.ts b/api/@internal/component/ets/nav_destination.d.ts +index a32de22d2..9c55c6bb5 100644 +--- a/api/@internal/component/ets/nav_destination.d.ts ++++ b/api/@internal/component/ets/nav_destination.d.ts +@@ -947,7 +947,18 @@ declare class NavDestinationAttribute extends CommonMethod>): NavDestinationAttribute; ++ /** ++ * Invoked when pop to the navDestination with result. ++ * ++ * @param {Optional>} callback - Indicates callback when pop to the navDestination with result. ++ * @returns {NavDestinationAttribute} ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.1&1.2 ++ */ ++ onResult(callback: Optional>): NavDestinationAttribute; + + /** + * Sets the different mode of NavDestination. +diff --git a/api/@internal/component/ets/navigation.d.ts b/api/@internal/component/ets/navigation.d.ts +index 44888a325..ada4780ea 100644 +--- a/api/@internal/component/ets/navigation.d.ts ++++ b/api/@internal/component/ets/navigation.d.ts +@@ -23,7 +23,7 @@ import window from '../../@ohos.window'; + import { Resource } from '../../global/resource'; + import { TextModifier } from '../../arkui/TextModifier'; + import { LengthMetrics } from '../../arkui/Graphics'; +-import { Callback, BlurStyle, CommonMethod, Optional, LayoutSafeAreaType, LayoutSafeAreaEdge, BackgroundEffectOptions, BackgroundBlurStyleOptions, PixelMap } from './common' ++import { Callback, BlurStyle, CommonMethod, Optional, LayoutSafeAreaType, LayoutSafeAreaEdge, BackgroundEffectOptions, BackgroundBlurStyleOptions, PixelMap, Bindable } from './common' + import { CustomBuilder, PageMapBuilder } from './builder' + import { Length, ResourceStr, ResourceColor, Dimension, VoidCallback } from './units' + import { TitleHeight } from './enums' +@@ -2651,11 +2651,23 @@ declare class NavigationAttribute extends CommonMethod { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + navBarWidth(value: Length): NavigationAttribute; + ++ /** ++ * Sets the width of navigation bar. ++ * ++ * @param { Length | Bindable } value ++ * @returns { NavigationAttribute } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ navBarWidth(value: Length | Bindable): NavigationAttribute; ++ + /** + * Sets the position of navigation bar. + * +diff --git a/api/@internal/component/ets/page_transition.d.ts b/api/@internal/component/ets/page_transition.d.ts +index 5c7380cc7..cef1ce53a 100644 +--- a/api/@internal/component/ets/page_transition.d.ts ++++ b/api/@internal/component/ets/page_transition.d.ts +@@ -19,8 +19,8 @@ + */ + + /*** if arkts 1.2 */ +-import { ICurve, TranslateOptions, ScaleOptions } from './common' +-import { Curve } from './enums' ++import { ICurve, TranslateOptions, ScaleOptions } from './common'; ++import { Curve } from './enums'; + /*** endif */ + + /** +@@ -756,7 +756,6 @@ interface PageTransitionEnterInterface extends CommonTransition): ParticleAttribute; +-} + +-/** +- * Defines Particle Component. +- * +- * @param { Particles } particles - Particle infomation. +- * @returns { ParticleAttribute } Returns the particle attribute. +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +-@memo +-@ComponentBuilder +-export declare function Particle( +- particles: Particles +-): ParticleAttribute ++ /** ++ * create a particle array. ++ * ++ * @param { Particles } particles - Array of particles. ++ * @returns { ParticleAttribute } Returns the particle attribute. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ (particles: Particles): ParticleAttribute; ++} + + /** + * Enumerates the particle types. +diff --git a/api/@internal/component/ets/paste_button.d.ts b/api/@internal/component/ets/paste_button.d.ts +index 3eba6bab9..97927fefc 100644 +--- a/api/@internal/component/ets/paste_button.d.ts ++++ b/api/@internal/component/ets/paste_button.d.ts +@@ -273,8 +273,6 @@ interface PasteButtonInterface { + (options: PasteButtonOptions): PasteButtonAttribute; + } + +- +- + /** + * Callback function when the paste button is clicked. + * +diff --git a/api/@internal/component/ets/plugin_component.d.ts b/api/@internal/component/ets/plugin_component.d.ts +index e2bf44475..e37e81b0b 100644 +--- a/api/@internal/component/ets/plugin_component.d.ts ++++ b/api/@internal/component/ets/plugin_component.d.ts +@@ -57,11 +57,12 @@ interface PluginComponentTemplate { + + /** + * Define options used to construct a plugin component. ++ * AnonyMous Object Rectification + * + * @interface PluginComponentOptions + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since arkts {'1.1':'14','1.2':'20'} ++ * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 + */ + declare interface PluginComponentOptions { +@@ -70,29 +71,55 @@ declare interface PluginComponentOptions { + * @type { PluginComponentTemplate } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since arkts {'1.1':'9','1.2':'20'} ++ * @since 9 ++ */ ++ /** ++ * Plugin component template. ++ * AnonyMous Object Rectification ++ * @type { PluginComponentTemplate } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @systemapi ++ * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 + */ + template: PluginComponentTemplate; + + /** + * Plugin component data. ++ * @type { any } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @systemapi ++ * @since 9 ++ */ ++ /** ++ * Plugin component data. ++ * AnonyMous Object Rectification ++ * @type { any } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @systemapi ++ * @since 18 ++ */ ++ data: any; ++ /** ++ * Plugin component data. ++ * AnonyMous Object Rectification + * @type { Object|undefined|null } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since arkts {'1.1':'9','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 20 ++ * @arkts 1.2 + */ + data: Object|undefined|null; + } + + /** + * Data provided when an error occurs. ++ * AnonyMous Object Rectification + * + * @interface PluginErrorData + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since arkts {'1.1':'14','1.2':'20'} ++ * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 + */ + declare interface PluginErrorData { +@@ -101,7 +128,15 @@ declare interface PluginErrorData { + * @type { number } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since arkts {'1.1':'9','1.2':'20'} ++ * @since 9 ++ */ ++ /** ++ * Error code. ++ * AnonyMous Object Rectification ++ * @type { number } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @systemapi ++ * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 + */ + errcode: number; +@@ -111,7 +146,15 @@ declare interface PluginErrorData { + * @type { string } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since arkts {'1.1':'9','1.2':'20'} ++ * @since 9 ++ */ ++ /** ++ * Error message. ++ * AnonyMous Object Rectification ++ * @type { string } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @systemapi ++ * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 + */ + msg: string; +@@ -119,27 +162,17 @@ declare interface PluginErrorData { + + /** + * Callback invoked when an error occurs. ++ * AnonyMous Object Rectification + * + * @typedef { function } PluginErrorCallback + * @param { PluginErrorData } info - Plugin error data + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare type PluginErrorCallback = (info: PluginErrorData) => void; + +-/** +- * Callback invoked when an error occurs. +- * +- * @typedef { function } PluginErrorCallback +- * @param { PluginErrorData } info - Plugin error data +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @systemapi +- * @since 20 +- * @arkts 1.2 +- */ +-type PluginErrorCallback = (info: PluginErrorData) => void +- + /** + * Provides plugin component. + * +@@ -161,12 +194,13 @@ interface PluginComponentInterface { + */ + /** + * Called when setting the plugin. ++ * AnonyMous Object Rectification + * + * @param { PluginComponentOptions } options - Plugin component options + * @returns { PluginComponentAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since arkts {'1.1':'14','1.2':'20'} ++ * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 + */ + (options: PluginComponentOptions): PluginComponentAttribute; +@@ -193,12 +227,13 @@ declare class PluginComponentAttribute extends CommonMethod { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + checked(value: boolean): RadioAttribute; + +@@ -468,11 +467,24 @@ declare class RadioAttribute extends CommonMethod { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 18 + */ + checked(isChecked: Optional): RadioAttribute; + ++ /** ++ * Called when the radio box is selected. ++ * ++ * @param { boolean | undefined | Bindable } isChecked ++ * @returns { RadioAttribute } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ checked(isChecked: boolean | undefined | Bindable): RadioAttribute; ++ + /** + * Called when the radio box selection status changes. + * +diff --git a/api/@internal/component/ets/rating.d.ts b/api/@internal/component/ets/rating.d.ts +index eebfbdb74..6ba182244 100644 +--- a/api/@internal/component/ets/rating.d.ts ++++ b/api/@internal/component/ets/rating.d.ts +@@ -19,7 +19,7 @@ + */ + + /*** if arkts 1.2 */ +-import { CommonConfiguration,Callback,CommonMethod,Optional,ContentModifier } from './common' ++import { CommonConfiguration, Callback, CommonMethod, Optional, ContentModifier, Bindable } from './common' + import { ResourceStr } from './units'; + /*** endif */ + +@@ -67,11 +67,23 @@ declare interface RatingOptions { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + rating: number; + ++ /** ++ * Rating option. ++ * ++ * @type { number | undefined | Bindable } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ rating: number | undefined | Bindable; ++ + /** + * Indicator option. + * +diff --git a/api/@internal/component/ets/refresh.d.ts b/api/@internal/component/ets/refresh.d.ts +index 8cb9cfd8d..567a72565 100644 +--- a/api/@internal/component/ets/refresh.d.ts ++++ b/api/@internal/component/ets/refresh.d.ts +@@ -19,7 +19,7 @@ + */ + + /*** if arkts 1.2 */ +-import { Callback, Optional, CommonMethod } from './common' ++import { Callback, Optional, CommonMethod, Bindable } from './common' + import { CustomBuilder } from './builder' + import { ResourceStr } from './units' + import { ComponentContent } from '../ComponentContent' +@@ -223,10 +223,21 @@ interface RefreshOptions { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + refreshing: boolean; ++ /** ++ * Whether the current component is being refreshed. ++ * This parameter supports $$ for two-way binding of variables. ++ * ++ * @type { boolean | Bindable } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ refreshing: boolean | Bindable; + + /** + * Distance to the top of the parent component from the component that +diff --git a/api/@internal/component/ets/rich_editor.d.ts b/api/@internal/component/ets/rich_editor.d.ts +index 0527a3ca8..a9d833953 100644 +--- a/api/@internal/component/ets/rich_editor.d.ts ++++ b/api/@internal/component/ets/rich_editor.d.ts +@@ -21,7 +21,7 @@ + /*** if arkts 1.2 */ + import { ShadowOptions, ClickEvent, SelectionOptions, CommonMethod, Callback, HapticFeedbackMode, RectResult, HoverEvent, PixelMap } from './common'; + import { CustomBuilder } from './builder'; +-import { ResourceColor, Length, ResourceStr, Dimension, Margin, BorderRadiuses, Font } from './units'; ++import { ResourceColor, Length, ResourceStr, Dimension, Margin, BorderRadiuses, Font, VoidCallback } from './units'; + import { FontStyle, FontWeight, TextAlign, WordBreak, LineBreakStrategy, ImageSpanAlignment, ImageFit, ResponseType, CopyOptions, BarState } from './enums'; + import { DecorationStyleInterface, StyledString, MutableStyledString } from './styledString'; + import { Resource } from './../../../api/global/resource'; +@@ -731,10 +731,21 @@ declare interface PasteEvent { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + preventDefault?: Callback; ++ ++ /** ++ * Override system paste event. ++ * ++ * @type { ?VoidCallback } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ preventDefault?: VoidCallback; + } + + /** +@@ -3062,11 +3073,22 @@ declare interface SelectionMenuOptions { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + onDisappear?: Callback; + ++ /** ++ * Callback function when the selection menu disappears. ++ * ++ * @type { ?VoidCallback } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ onDisappear?: VoidCallback; ++ + /** + * Menu type, default value is MenuType.SELECTION_MENU. + * +@@ -3715,11 +3737,23 @@ declare class RichEditorAttribute extends CommonMethod { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + onReady(callback: Callback): RichEditorAttribute; + ++ /** ++ * Called when on ready. ++ * ++ * @param { VoidCallback } callback - The triggered function when rich editor is ready. ++ * @returns { RichEditorAttribute } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ onReady(callback: VoidCallback): RichEditorAttribute; ++ + /** + * Called when the content is selected. + * +@@ -3896,11 +3930,23 @@ declare class RichEditorAttribute extends CommonMethod { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + onDeleteComplete(callback: Callback): RichEditorAttribute; + ++ /** ++ * Notify that the deletion has been completed ++ * ++ * @param { VoidCallback } callback - The triggered function when text content has been deleted. ++ * @returns { RichEditorAttribute } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ onDeleteComplete(callback: VoidCallback): RichEditorAttribute; ++ + /** + * Allow replication. + * +@@ -4314,10 +4360,21 @@ declare interface CutEvent { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + preventDefault?: Callback; ++ ++ /** ++ * Prevent system cut event. ++ * ++ * @type { ?VoidCallback } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ preventDefault?: VoidCallback; + } + + /** +@@ -4337,10 +4394,21 @@ declare interface CopyEvent { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + preventDefault?: Callback; ++ ++ /** ++ * Prevent system cut event. ++ * ++ * @type { ?VoidCallback } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ preventDefault?: VoidCallback; + } + + /** +diff --git a/api/@internal/component/ets/save_button.d.ts b/api/@internal/component/ets/save_button.d.ts +index 0c370416c..931bed2ff 100644 +--- a/api/@internal/component/ets/save_button.d.ts ++++ b/api/@internal/component/ets/save_button.d.ts +@@ -275,7 +275,8 @@ declare enum SaveDescription { + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SAVE_ALL = 12 + } +diff --git a/api/@internal/component/ets/search.d.ts b/api/@internal/component/ets/search.d.ts +index 1e598d043..42f355266 100644 +--- a/api/@internal/component/ets/search.d.ts ++++ b/api/@internal/component/ets/search.d.ts +@@ -19,7 +19,7 @@ + */ + + /*** if arkts 1.2 */ +-import { TextContentControllerBase, SelectionOptions,Callback,CommonMethod,Optional,TextDecorationOptions } from './common'; ++import { TextContentControllerBase, SelectionOptions,Callback,CommonMethod,Optional,TextDecorationOptions, Bindable } from './common'; + import { CustomBuilder } from './builder'; + import { ResourceStr,Length,ResourceColor ,Dimension,Font} from './units'; + import { CaretStyle, EditableTextOnChangeCallback, InsertValue, DeleteValue, EditMenuOptions,KeyboardAppearance,EditableTextChangeValue,AutoCapitalizationMode } from './textCommon'; +@@ -352,11 +352,21 @@ declare interface SearchOptions { + * @type { ?string } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + value?: string; + ++ /** ++ * Text input in the search text box. ++ * ++ * @type { ?(string | Bindable)} ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ value?: string | Bindable; ++ + /** + * Text displayed when there is no input. + * +diff --git a/api/@internal/component/ets/security_component.d.ts b/api/@internal/component/ets/security_component.d.ts +index 59fcccef6..4b9df7a79 100644 +--- a/api/@internal/component/ets/security_component.d.ts ++++ b/api/@internal/component/ets/security_component.d.ts +@@ -28,17 +28,18 @@ import { Resource } from '../../global/resource'; + /** + * Enumerates the layout direction of the icon and text. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 10 + */ + /** + * Enumerates the layout direction of the icon and text. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare enum SecurityComponentLayoutDirection { + /** +@@ -52,7 +53,8 @@ declare enum SecurityComponentLayoutDirection { + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + HORIZONTAL = 0, + +@@ -67,38 +69,8 @@ declare enum SecurityComponentLayoutDirection { + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since 11 +- */ +- VERTICAL = 1 +-} +- +-/** +- * Enumerates the layout direction of the icon and text. +- * +- * @enum { int } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +-declare enum SecurityComponentLayoutDirection { +- /** +- * Horizontal layout. +- * +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +- HORIZONTAL = 0, +- +- /** +- * Vertical layout. +- * +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @atomicservice +- * @since 20 +- * @arkts 1.2 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + VERTICAL = 1 + } +@@ -278,22 +250,11 @@ declare class SecurityComponentMethod { + /** + * Font weight of the inner text. + * +- * @param { number | FontWeight | string } value - Indicates the font weight of the text in the security component. ++ * @param { int | FontWeight | string } value - Indicates the font weight of the text in the security component. + * @returns { T } Returns the attribute of the security component. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 10 + */ +- /** +- * Font weight of the inner text. +- * +- * @param { number | FontWeight | string } value - Indicates the font weight of the text in the security component. +- * @returns { T } Returns the attribute of the security component. +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @atomicservice +- * @since 11 +- */ +- fontWeight(value: number | FontWeight | string): T; +- + /** + * Font weight of the inner text. + * +@@ -301,8 +262,8 @@ declare class SecurityComponentMethod { + * @returns { T } Returns the attribute of the security component. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since 20 +- * @arkts 1.2 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + fontWeight(value: int | FontWeight | string): T; + +@@ -473,7 +434,8 @@ declare class SecurityComponentMethod { + * @returns { T } Returns the attribute of the security component. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + borderRadius(radius: Dimension | BorderRadiuses): T; + +@@ -676,62 +638,62 @@ declare class SecurityComponentMethod { + /** + * Sets the minimum font scale factor for text. + * +- * @param { number | Resource } scale Minimum font scale factor to set. ++ * @param { double | Resource } scale Minimum font scale factor to set. + * @returns { T } Returns the attributes of the security component. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- minFontScale(scale: number | Resource): T; ++ minFontScale(scale: double | Resource): T; + + /** + * Sets the maximum font scale factor for text. + * +- * @param { number | Resource } scale Maximum font scale factor to set. ++ * @param { double | Resource } scale Maximum font scale factor to set. + * @returns { T } Returns the attributes of the security component. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- maxFontScale(scale: number | Resource): T; ++ maxFontScale(scale: double | Resource): T; + + /** + * Called when the maximum number of lines of text is set. + * +- * @param { number } line ++ * @param { int } line + * @returns { T } Returns the attribute of the security component. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- maxLines(line: number): T; ++ maxLines(line: int): T; + + /** + * Called when the minimum font size of the font is set. + * +- * @param { number | string | Resource } minSize ++ * @param { double | string | Resource } minSize + * @returns { T } Returns the attribute of the security component. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- minFontSize(minSize: number | string | Resource): T; ++ minFontSize(minSize: double | string | Resource): T; + + /** + * Called when the maximum font size of the font is set. + * +- * @param { number | string | Resource } maxSize ++ * @param { double | string | Resource } maxSize + * @returns { T } Returns the attribute of the security component. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- maxFontSize(maxSize: number | string | Resource): T; ++ maxFontSize(maxSize: double | string | Resource): T; + + /** + * Called when the height adaptive policy is set. +diff --git a/api/@internal/component/ets/select.d.ts b/api/@internal/component/ets/select.d.ts +index 2786be794..fd64fb960 100644 +--- a/api/@internal/component/ets/select.d.ts ++++ b/api/@internal/component/ets/select.d.ts +@@ -19,7 +19,7 @@ + */ + + /*** if arkts 1.2 */ +-import { CommonConfiguration, CommonMethod, ContentModifier, Optional, BlurStyle } from './common'; ++import { CommonConfiguration, CommonMethod, ContentModifier, Optional, BlurStyle, Bindable } from './common'; + import { ControlSize } from './button'; + import { DividerOptions } from './textPicker'; + import { ResourceStr, Dimension, EdgeOutlineWidths, ResourceColor, EdgeColors, Resource, Font, Length, Offset, DividerStyleOptions } from './units'; +@@ -434,8 +434,7 @@ declare class SelectAttribute extends CommonMethod { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + selected(value: number | Resource): SelectAttribute; + +@@ -447,11 +446,24 @@ declare class SelectAttribute extends CommonMethod { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 18 + */ + selected(numCount: Optional): SelectAttribute; + ++ /** ++ * Sets the serial number of the select item, starting from 0. ++ * ++ * @param { number | Resource | undefined | Bindable | Bindable } numCount - the serial number of the select item. ++ * @returns { SelectAttribute } the attribute of the select. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ selected(numCount: number | Resource | undefined | Bindable | Bindable): SelectAttribute; ++ ++ + /** + * Sets the text display of the select button itself. + * +@@ -477,8 +489,7 @@ declare class SelectAttribute extends CommonMethod { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + value(value: ResourceStr): SelectAttribute; + +@@ -490,11 +501,23 @@ declare class SelectAttribute extends CommonMethod { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 18 + */ + value(resStr: Optional): SelectAttribute; + ++ /** ++ * Sets the text display of the select button itself. ++ * ++ * @param { ResourceStr | undefined | Bindable | Bindable } resStr - the text display of the select button itself. ++ * @returns { SelectAttribute } the attribute of the select. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ value(resStr: ResourceStr | undefined | Bindable | Bindable): SelectAttribute; ++ + /** + * Sets the text properties of the select button itself. + * +diff --git a/api/@internal/component/ets/sidebar.d.ts b/api/@internal/component/ets/sidebar.d.ts +index 4a79fdd13..cbb6b4f08 100644 +--- a/api/@internal/component/ets/sidebar.d.ts ++++ b/api/@internal/component/ets/sidebar.d.ts +@@ -21,7 +21,7 @@ + /*** if arkts 1.2 */ + import { Resource } from '../../global/resource' + import { Length, ResourceColor, Dimension } from './units' +-import { CommonMethod, PixelMap } from './common' ++import { CommonMethod, PixelMap, Bindable } from './common' + /*** endif */ + + /** +@@ -708,11 +708,23 @@ declare class SideBarContainerAttribute extends CommonMethod } value ++ * @returns { SideBarContainerAttribute } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ showSideBar(value: boolean | Bindable): SideBarContainerAttribute; ++ + /** + * Callback controlButton function when setting the style of button + * +@@ -831,11 +843,24 @@ declare class SideBarContainerAttribute extends CommonMethod } value ++ * @returns { SideBarContainerAttribute } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ sideBarWidth(value: number | Bindable): SideBarContainerAttribute; ++ + /** + * Sets the min length of sidebar. + * default value is 200vp. +diff --git a/api/@internal/component/ets/slider.d.ts b/api/@internal/component/ets/slider.d.ts +index 908777a4c..5a69bfc54 100644 +--- a/api/@internal/component/ets/slider.d.ts ++++ b/api/@internal/component/ets/slider.d.ts +@@ -19,7 +19,7 @@ + */ + + /*** if arkts 1.2 */ +-import { CommonMethod, CommonConfiguration, ContentModifier, Optional } from './common'; ++import { CommonMethod, CommonConfiguration, ContentModifier, Optional, Bindable } from './common'; + import { Axis, CrownSensitivity } from './enums'; + import { ResourceStr, ResourceColor, Length, Dimension, SizeOptions } from './units'; + import { CircleAttribute } from './circle'; +@@ -462,11 +462,23 @@ declare interface SliderOptions { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + value?: number; + ++ /** ++ * Current value of Slider. ++ * ++ * @type { ?(number| undefined | Bindable) } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ value?: number | undefined | Bindable; ++ + /** + * Sets the min value of Slider. + * +diff --git a/api/@internal/component/ets/stepper.d.ts b/api/@internal/component/ets/stepper.d.ts +index fc536b6f9..222293c3a 100644 +--- a/api/@internal/component/ets/stepper.d.ts ++++ b/api/@internal/component/ets/stepper.d.ts +@@ -19,31 +19,42 @@ + */ + + /*** if arkts 1.2 */ +-import { CommonMethod } from './common' ++import { Bindable, CommonMethod } from './common' + /*** endif */ + + /** +- * Declare the StepperOptionalIndex. ++ * Declare the StepperOptions. + * +- * @interface StepperOptionalIndex ++ * @interface StepperOptions + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 +- * @arkts 1.2 ++ * @arkts 1.1&1.2 + */ +-interface StepperOptionalIndex { ++interface StepperOptions { + /** +- * Get stepper index. ++ * Set the stepper index. + * + * @type { ?number } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 ++ */ ++ index?: number; ++ ++ /** ++ * Set the stepper index. ++ * ++ * @type { ?(number | Bindable) } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.2 + */ +- index?: number ++ index?: number | Bindable; + } + + /** +@@ -99,20 +110,19 @@ interface StepperInterface { + * @atomicservice + * @since 11 + */ +- (value?: { index?: number }): StepperAttribute; +- + /** + * Called when the stepper component is used. + * +- * @param { StepperOptionalIndex } value ++ * Anonymous Object Rectification. ++ * @param { StepperOptions } value + * @returns { StepperAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 +- * @arkts 1.2 ++ * @arkts 1.1&1.2 + */ +- (value?: StepperOptionalIndex): StepperAttribute; ++ (value?: StepperOptions): StepperAttribute; + } + + /** +diff --git a/api/@internal/component/ets/styled_string.d.ts b/api/@internal/component/ets/styled_string.d.ts +index 6ee3e215e..e0426caf2 100644 +--- a/api/@internal/component/ets/styled_string.d.ts ++++ b/api/@internal/component/ets/styled_string.d.ts +@@ -1194,6 +1194,19 @@ UserDataSpan | BackgroundColorStyle; + * @arkts 1.1&1.2 + */ + declare class MutableStyledString extends StyledString { ++ /** ++ * constructor. ++ * ++ * @param { string | ImageAttachment | CustomSpan } value - indicates the current object value of the MutableStyledString. ++ * @param { Array } [styles] - indicates the SpanStyle objects. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ constructor(value: string | ImageAttachment | CustomSpan, styles?: Array); ++ + /** + * Replace the string of the specified range. + * +diff --git a/api/@internal/component/ets/swiper.d.ts b/api/@internal/component/ets/swiper.d.ts +index 66df0bdc0..357f1d17c 100644 +--- a/api/@internal/component/ets/swiper.d.ts ++++ b/api/@internal/component/ets/swiper.d.ts +@@ -20,7 +20,7 @@ + + /*** if arkts 1.2 */ + import { IndicatorComponentController } from './indicatorcomponent'; +-import { CommonMethod, Callback, ICurve, Optional } from './common'; ++import { CommonMethod, Callback, ICurve, Optional, Bindable } from './common'; + import { EdgeEffect, Curve, PageFlipMode } from './enums'; + import { Length, LengthMetrics, VoidCallback, ResourceColor, VP, Font } from './units'; + /*** endif */ +@@ -1582,10 +1582,22 @@ declare class SwiperAttribute extends CommonMethod { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + index(value: number): SwiperAttribute; ++ /** ++ * Called when the index value of the displayed subcomponent is set in the container. ++ * ++ * @param { number | Bindable } value ++ * @returns { SwiperAttribute } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ index(value: number | Bindable): SwiperAttribute; + + /** + * Called when setting whether the subcomponent plays automatically. +diff --git a/api/@internal/component/ets/tabs.d.ts b/api/@internal/component/ets/tabs.d.ts +index 015fabcf2..1e9092cc8 100644 +--- a/api/@internal/component/ets/tabs.d.ts ++++ b/api/@internal/component/ets/tabs.d.ts +@@ -19,7 +19,7 @@ + */ + + /*** if arkts 1.2 */ +-import { BackgroundBlurStyleOptions, BackgroundEffectOptions, BlurStyle, Callback, CommonMethod, Optional, TranslateOptions, DividerStyle } from './common'; ++import { BackgroundBlurStyleOptions, BackgroundEffectOptions, BlurStyle, Callback, CommonMethod, Optional, TranslateOptions, DividerStyle, Bindable } from './common'; + import { EdgeEffect, PageFlipMode } from './enums'; + import { Dimension, Length, ResourceColor } from './units'; + import { CommonModifier } from "../CommonModifier"; +@@ -537,10 +537,20 @@ declare interface TabsOptions { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + index?: number; ++ /** ++ * Set the index of the currently displayed tab. ++ * ++ * @type { ?(number | Bindable) } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ index?: number | Bindable; + + /** + * Set the Tabs controller. +diff --git a/api/@internal/component/ets/text_area.d.ts b/api/@internal/component/ets/text_area.d.ts +index 9fa8c3aad..57f9fa267 100644 +--- a/api/@internal/component/ets/text_area.d.ts ++++ b/api/@internal/component/ets/text_area.d.ts +@@ -27,7 +27,7 @@ import { BarState, CopyOptions, FontStyle, FontWeight, LineBreakStrategy, TextCo + import { EnterKeyType, SubmitEvent, ContentType } from './textInput'; + import { Dimension, Font, Length, LengthMetrics, ResourceColor, ResourceStr } from './units'; + import { InputCounterOptions, TextContentControllerBase, SelectionOptions, +- TextDecorationOptions, CommonMethod, Callback, Optional } from './common'; ++ TextDecorationOptions, CommonMethod, Callback, Optional, Bindable } from './common'; + import { CustomBuilder } from './builder'; + import { Resource } from '../../global/resource'; + /*** endif */ +@@ -235,11 +235,22 @@ declare interface TextAreaOptions { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + text?: ResourceStr; + ++ /** ++ * Sets the current value of TextArea. ++ * ++ * @type { ?(ResourceStr | Bindable | Bindable | Bindable) } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ text?: ResourceStr | Bindable | Bindable | Bindable; ++ + /** + * Called when the position of the insertion cursor is set. + * +diff --git a/api/@internal/component/ets/text_common.d.ts b/api/@internal/component/ets/text_common.d.ts +index bb0a8e515..a48d13b89 100644 +--- a/api/@internal/component/ets/text_common.d.ts ++++ b/api/@internal/component/ets/text_common.d.ts +@@ -1214,6 +1214,35 @@ declare interface TextMenuItem { + labelInfo?: ResourceStr; + } + ++/** ++ * Callback function when the selection menu create. ++ * ++ * @typedef { function } OnCreateMenuCallback ++ * @param { Array } menuItems - currently displayed menu items. ++ * @returns { Array } Return the menu items will displayed after operations. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++type OnCreateMenuCallback = (menuItems: Array) => Array; ++ ++/** ++ * Invoke upon clicking an item, capable of intercepting the default system menu execution behavior. ++ * ++ * @typedef { function } OnMenuItemClickCallback ++ * @param { TextMenuItem } menuItem - current default menu. ++ * @param { TextRange } range - current selected range. ++ * @returns { boolean } - Return True, the event is consumed, false otherwise. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++type OnMenuItemClickCallback = (menuItem: TextMenuItem, range: TextRange) => boolean ++ + /** + * EditMenuOptions + * +@@ -1233,8 +1262,7 @@ declare interface EditMenuOptions { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + onCreateMenu(menuItems: Array): Array; + /** +@@ -1246,10 +1274,33 @@ declare interface EditMenuOptions { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + onMenuItemClick(menuItem: TextMenuItem, range: TextRange): boolean; ++ ++ /** ++ * Passes the default menu, invokes before every display to generate a menu for triggering click events. ++ * ++ * @type { OnCreateMenuCallback } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ onCreateMenu: OnCreateMenuCallback; ++ ++ /** ++ * Invoke upon clicking an item, capable of intercepting the default system menu execution behavior. ++ * ++ * @type { OnMenuItemClickCallback } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ onMenuItemClick: OnMenuItemClickCallback; + } + + /** +diff --git a/api/@internal/component/ets/text_input.d.ts b/api/@internal/component/ets/text_input.d.ts +index fd0d0a454..c58a08349 100644 +--- a/api/@internal/component/ets/text_input.d.ts ++++ b/api/@internal/component/ets/text_input.d.ts +@@ -20,7 +20,7 @@ + + /*** if arkts 1.2 */ + import { CancelButtonSymbolOptions, CancelButtonOptions } from "./search"; +-import { Callback, CommonMethod, TextContentControllerBase, SelectionOptions, InputCounterOptions, TextDecorationOptions , Optional} from "./common"; ++import { Callback, CommonMethod, TextContentControllerBase, SelectionOptions, InputCounterOptions, TextDecorationOptions, Optional, Bindable} from "./common"; + import { CustomBuilder } from './builder'; + import { BarState, LineBreakStrategy, TextAlign, FontStyle, FontWeight, WordBreak, TextOverflow, + CopyOptions, TextHeightAdaptivePolicy, TextContentStyle, EllipsisMode } from './enums'; +@@ -1078,11 +1078,22 @@ declare interface TextInputOptions { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + text?: ResourceStr; + ++ /** ++ * Sets the current value of TextInput. ++ * ++ * @type { ?(ResourceStr | Bindable | Bindable | Bindable) } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ text?: ResourceStr | Bindable | Bindable | Bindable; ++ + /** + * Called when the position of the insertion cursor is set. + * +diff --git a/api/@internal/component/ets/toggle.d.ts b/api/@internal/component/ets/toggle.d.ts +index 2f63ae351..e57982116 100644 +--- a/api/@internal/component/ets/toggle.d.ts ++++ b/api/@internal/component/ets/toggle.d.ts +@@ -21,7 +21,7 @@ + /*** if arkts 1.2 */ + import { Resource } from '../../global/resource'; + import { ResourceColor } from './units'; +-import { CommonConfiguration, Callback, CommonMethod, ContentModifier } from './common'; ++import { CommonConfiguration, Callback, CommonMethod, ContentModifier, Bindable } from './common'; + /*** endif */ + + /** +@@ -351,10 +351,22 @@ declare interface ToggleOptions { + * @crossplatform + * @form + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + isOn?: boolean ++ ++ /** ++ * Whether the toggle is on. ++ * ++ * @type { ?(boolean | undefined | Bindable) } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ isOn?: boolean | undefined | Bindable + } + + /** +diff --git a/api/@internal/component/ets/ui_extension_component.d.ts b/api/@internal/component/ets/ui_extension_component.d.ts +index eac19b4aa..297e762f2 100644 +--- a/api/@internal/component/ets/ui_extension_component.d.ts ++++ b/api/@internal/component/ets/ui_extension_component.d.ts +@@ -20,8 +20,8 @@ + + /*** if arkts 1.2 */ + import Want from '../../@ohos.app.ability.Want' +-import { Callback, ErrorCallback,BusinessError } from '../../@ohos.base' +-import { CommonMethod } from './common' ++import { Callback, ErrorCallback, BusinessError } from '../../@ohos.base' ++import { CommonMethod, TerminationInfo } from './common' + import { ComponentContent } from '../ComponentContent' + /*** endif */ + +@@ -61,14 +61,16 @@ declare enum DpiFollowStrategy { + * @enum { number } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare enum WindowModeFollowStrategy { + /** + * Followed the host Window Mode. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FOLLOW_HOST_WINDOW_MODE = 0, + +@@ -76,9 +78,10 @@ declare enum WindowModeFollowStrategy { + * Followed the UIExtensionAbility. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- FOLLOW_UI_EXTENSION_ABILITY_WINDOW_MODE = 1, ++ FOLLOW_UI_EXTENSION_ABILITY_WINDOW_MODE = 1 + } + + /** +@@ -147,7 +150,8 @@ declare interface UIExtensionOptions { + * @default WindowModeFollowStrategy.FOLLOW_UI_EXTENSION_ABILITY_WINDOW_MODE + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + windowModeFollowStrategy?: WindowModeFollowStrategy; + } +@@ -182,41 +186,9 @@ declare interface TerminationInfo { + want?: import('../api/@ohos.app.ability.Want').default; + } + +-/** +- * Indicates the information when the provider of the embedded UI is terminated. +- * +- * @interface TerminationInfo +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @systemapi +- * @since 20 +- * @arkts 1.2 +- */ +-declare interface TerminationInfo { +- /** +- * Defines the termination code. +- * +- * @type { number } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @systemapi +- * @since 20 +- * @arkts 1.2 +- */ +- code: number; +- +- /** +- * Defines the additional termination information. +- * +- * @type { ?Want } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @systemapi +- * @since 20 +- * @arkts 1.2 +- */ +- want?: Want; +-} +- + /** + * Get Callback from @ohos.base. ++ * AnonyMous Object Rectification + * + * @typedef { import('../api/@ohos.base').Callback> } + * @syscap SystemCapability.ArkUI.ArkUI.Full +@@ -254,11 +226,11 @@ declare interface UIExtensionProxy { + * @param { object } data + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 + */ + /** + * This function is for sending data to the UIExtensionAbility. ++ * AnonyMous Object Rectification + * + * @param { Record } data + * @syscap SystemCapability.ArkUI.ArkUI.Full +@@ -273,7 +245,7 @@ declare interface UIExtensionProxy { + * + * @param { object } data - data send to the UIExtensionAbility + * @returns { object } data - data transferred from the UIExtensionAbility +- * @throws { BusinessError } 100011 - No callback has been registered to response this request. ++ * @throws { BusinessError } 100011 - No callback has been registered to respond to this request. + * @throws { BusinessError } 100012 - Transferring data failed. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +@@ -281,10 +253,11 @@ declare interface UIExtensionProxy { + */ + /** + * This function is for sending data to the UIExtensionAbility and waiting the result in blocking mode. ++ * AnonyMous Object Rectification + * + * @param { Record } data - Data send to the UIExtensionAbility. + * @returns { Record } data - Data transferred from the UIExtensionAbility. +- * @throws { BusinessError } 100011 - No callback has been registered to response this request. ++ * @throws { BusinessError } 100011 - No callback has been registered to respond to this request. + * @throws { BusinessError } 100012 - Transferring data failed. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi +@@ -304,6 +277,7 @@ declare interface UIExtensionProxy { + */ + /** + * Register the listener that watches for async data receiver callback being registered by UIExtensionAbility. ++ * AnonyMous Object Rectification + * + * @param { 'asyncReceiverRegister' } type - Indicates the type of event. + * @param { Callback } callback - Callback of the listened event. +@@ -325,6 +299,7 @@ declare interface UIExtensionProxy { + */ + /** + * Register the listener that watches for sync data receiver callback being registered by UIExtensionAbility. ++ * AnonyMous Object Rectification + * + * @param { 'syncReceiverRegister' } type - Indicates the type of event. + * @param { Callback } callback - Callback of the listened event. +@@ -346,6 +321,7 @@ declare interface UIExtensionProxy { + */ + /** + * Deregisters the listener that watches for async data receiver callback being registered by UIExtensionAbility. ++ * AnonyMous Object Rectification + * + * @param { 'asyncReceiverRegister' } type - Type of the listened event. + * @param { Callback } [callback] - Callback of the listened event. +@@ -367,6 +343,7 @@ declare interface UIExtensionProxy { + */ + /** + * Deregisters the listener that watches for sync data receiver callback being registered by UIExtensionAbility. ++ * AnonyMous Object Rectification + * + * @param { 'syncReceiverRegister' } type - Type of the listened event. + * @param { Callback } [callback] - Callback of the listened event. +@@ -419,9 +396,10 @@ interface UIExtensionComponentInterface { + * Construct the UIExtensionComponent.
    + * Called when the UIExtensionComponent is used. + * +- * @param { import('../api/@ohos.app.ability.Want').default } want - indicates the want of UIExtensionAbility ++ * @param { Want } want - indicates the want of UIExtensionAbility + * @param { UIExtensionOptions } [options] - Construction configuration of UIExtensionComponentAttribute + * @returns { UIExtensionComponentAttribute } ++ * @throws { BusinessError } 202 - Non-system applications are not allowed to use system APIs. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @since 20 +@@ -457,10 +435,11 @@ declare class UIExtensionComponentAttribute extends CommonMethod } callback +- * - callback called when remote UIExtensionAbility object is +- *
    ready for receive data ++ * callback called when remote UIExtensionAbility object is ready for receive data ++ * ++ * @param { Callback } callback + * @returns { UIExtensionComponentAttribute } ++ * @throws { BusinessError } 202 - Non-system applications are not allowed to use system APIs. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @since 20 +@@ -479,6 +458,8 @@ declare class UIExtensionComponentAttribute extends CommonMethod } callback + * @returns { UIExtensionComponentAttribute } ++ * @throws { BusinessError } 202 - Non-system applications are not allowed to use system APIs. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @since 20 +@@ -563,7 +546,8 @@ declare class UIExtensionComponentAttribute extends CommonMethod): UIExtensionComponentAttribute; + } +diff --git a/api/@internal/component/ets/units.d.ts b/api/@internal/component/ets/units.d.ts +index ec261a011..9c05110c4 100644 +--- a/api/@internal/component/ets/units.d.ts ++++ b/api/@internal/component/ets/units.d.ts +@@ -66,7 +66,7 @@ declare type Resource = import('../api/global/resource').Resource; + /** + * Defines the data type of the interface restriction. + * +- * @typedef { import('../api/global/resource').Resource } Resource ++ * @typedef { _Resource } Resource + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form +diff --git a/api/@internal/component/ets/water_flow.d.ts b/api/@internal/component/ets/water_flow.d.ts +index ff94c420d..937e7eb9b 100644 +--- a/api/@internal/component/ets/water_flow.d.ts ++++ b/api/@internal/component/ets/water_flow.d.ts +@@ -800,17 +800,17 @@ declare class WaterFlowAttribute extends ScrollableCommonMethod { offsetRemain: number }): WaterFlowAttribute; +- + /** + * Called when scrolling begin each frame. ++ * Anonymous Object Rectification. + * +- * @param { OnScrollFrameBeginCallback } event ++ * @param { OnScrollFrameBeginCallback } event - callback function, triggered when the scrolling begin each frame. + * @returns { WaterFlowAttribute } the attribute of the water flow. + * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform + * @atomicservice + * @since 20 +- * @arkts 1.2 ++ * @arkts 1.1&1.2 + */ + onScrollFrameBegin(event: OnScrollFrameBeginCallback): WaterFlowAttribute; + +diff --git a/api/@internal/component/ets/web.d.ts b/api/@internal/component/ets/web.d.ts +index 66dce2587..dc279cd7d 100644 +--- a/api/@internal/component/ets/web.d.ts ++++ b/api/@internal/component/ets/web.d.ts +@@ -30,15 +30,14 @@ import { CopyOptions, NestedScrollMode } from './enums'; + /*** endif */ + + /** +-* Provides methods for controlling the web controller. +-* +-* @typedef { webview.WebviewController } +-* @syscap SystemCapability.Web.Webview.Core +-* @crossplatform +-* @atomicservice +-* @since 20 +-* @arkts 1.2 +-*/ ++ * Provides methods for controlling the web controller. ++ * ++ * @typedef { webview.WebviewController } ++ * @syscap SystemCapability.Web.Webview.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ + type WebviewController = webview.WebviewController; + + /** +@@ -2309,7 +2308,7 @@ declare enum ProtectedResourceType { + * + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ + SENSOR = 'TYPE_SENSOR' +@@ -4966,7 +4965,6 @@ declare interface WebOptions { + * @type { WebviewController } + * @syscap SystemCapability.Web.Webview.Core + * @crossplatform +- * @atomicservice + * @since 20 + * @arkts 1.2 + */ +@@ -5046,7 +5044,7 @@ declare interface ScriptItem { + * @type { string } + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ + script: string; +@@ -5057,7 +5055,7 @@ declare interface ScriptItem { + * @type { Array } + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ + scriptRules: Array; +@@ -5717,14 +5715,14 @@ declare interface OnProgressChangeEvent { + /** + * The new progress of the page. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Web.Webview.Core + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- newProgress: number; ++ newProgress: int; + } + + /** +@@ -6299,7 +6297,7 @@ declare interface OnShowFileSelectorEvent { + * @syscap SystemCapability.Web.Webview.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ + result: FileSelectorResult; +@@ -6311,7 +6309,7 @@ declare interface OnShowFileSelectorEvent { + * @syscap SystemCapability.Web.Webview.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ + fileSelector: FileSelectorParam; +@@ -6643,7 +6641,7 @@ declare interface OnSslErrorEventReceiveEvent { + * + * @type { ?Array } + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'18', '1.2':'20'} ++ * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 + */ + certChainData?: Array; +@@ -6828,7 +6826,6 @@ declare interface OnFaviconReceivedEvent { + * + * @type { image.PixelMap } + * @syscap SystemCapability.Web.Webview.Core +- * @atomicservice + * @since 20 + * @arkts 1.2 + */ +@@ -6999,7 +6996,16 @@ declare interface OnOverScrollEvent { + * @typedef JavaScriptProxy + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++/** ++ * Defines the JavaScript object to be injected. ++ * ++ * @typedef JavaScriptProxy ++ * @syscap SystemCapability.Web.Webview.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + declare interface JavaScriptProxy { +@@ -7009,7 +7015,16 @@ declare interface JavaScriptProxy { + * @type { object } + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Objects participating in registration. ++ * ++ * @type { object } ++ * @syscap SystemCapability.Web.Webview.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + object: object; +@@ -7021,7 +7036,17 @@ declare interface JavaScriptProxy { + * @type { string } + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * The name of the registered object, which is consistent with the ++ * object name called in the window. ++ * ++ * @type { string } ++ * @syscap SystemCapability.Web.Webview.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + name: string; +@@ -7033,7 +7058,17 @@ declare interface JavaScriptProxy { + * @type { Array } + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * The method of the application side JavaScript object participating ++ * in the registration. ++ * ++ * @type { Array } ++ * @syscap SystemCapability.Web.Webview.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + methodList: Array; +@@ -7046,24 +7081,44 @@ declare interface JavaScriptProxy { + * @atomicservice + * @since 12 + */ ++ /** ++ * Controller. ++ * ++ * @type { WebController | WebviewController } ++ * @syscap SystemCapability.Web.Webview.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ + controller: WebController | WebviewController; ++ + /** + * Controller. + * + * @type { WebviewController } + * @syscap SystemCapability.Web.Webview.Core +- * @atomicservice ++ * @crossplatform + * @since 20 + * @arkts 1.2 + */ + controller: WebviewController; ++ + /** + * The async method of the application side JavaScript object participating in the registration. + * + * @type { ?Array } + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * The async method of the application side JavaScript object participating in the registration. ++ * ++ * @type { ?Array } ++ * @syscap SystemCapability.Web.Webview.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + asyncMethodList?: Array; +@@ -7518,7 +7573,17 @@ declare class WebAttribute extends CommonMethod { + * @returns { WebAttribute } + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Injects the JavaScript object into window and invoke the function in window. ++ * ++ * @param { JavaScriptProxy } javaScriptProxy - The JavaScript object to be injected. ++ * @returns { WebAttribute } ++ * @syscap SystemCapability.Web.Webview.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + javaScriptProxy(javaScriptProxy: JavaScriptProxy): WebAttribute; +@@ -9812,11 +9877,21 @@ declare class WebAttribute extends CommonMethod { + + /** + * Set the custom text menu. ++ * The Web component custom menu extension item interface allows users to set the extension item's text content, icon, and callback method. ++ * ++ *

    API Note:
    ++ * This interface only supports selecting plain text. When the selected content contains images and other non-text content, ++ * garbled characters will be displayed in the action information. ++ *

    + * + * @param { Array } expandedMenuOptions - Customize text menu options. ++ * The number of menu items, the content size of the menu, and the startIcon ++ * icon size are consistent with the ArkUI Menu component. + * @returns { WebAttribute } + * @syscap SystemCapability.Web.Webview.Core + * @since 12 ++ * @deprecated since 20 ++ * @useinstead ohos.web.WebAttribute#editMenuOptions + */ + selectionMenuOptions(expandedMenuOptions: Array): WebAttribute; + +@@ -10122,6 +10197,7 @@ declare interface SslErrorEvent { + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice + * @since 12 ++ * @deprecated since 20 + */ + declare interface ExpandedMenuItemOptions { + /** +@@ -10131,6 +10207,7 @@ declare interface ExpandedMenuItemOptions { + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice + * @since 12 ++ * @deprecated since 20 + */ + content: ResourceStr; + +@@ -10141,6 +10218,7 @@ declare interface ExpandedMenuItemOptions { + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice + * @since 12 ++ * @deprecated since 20 + */ + startIcon?: ResourceStr; + +@@ -10151,6 +10229,7 @@ declare interface ExpandedMenuItemOptions { + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice + * @since 12 ++ * @deprecated since 20 + */ + action: (selectedText: {plainText: string}) => void; + } +diff --git a/api/@ohos.InputMethodSubtype.d.ts b/api/@ohos.InputMethodSubtype.d.ts +index 0291b403d..1cb08c348 100644 +--- a/api/@ohos.InputMethodSubtype.d.ts ++++ b/api/@ohos.InputMethodSubtype.d.ts +@@ -41,13 +41,13 @@ export default interface InputMethodSubtype { + /** + * The label id of input method subtype. + * +- * @type { ?number } ++ * @type { ?double } + * @readonly + * @syscap SystemCapability.MiscServices.InputMethodFramework + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly labelId?: number; ++ readonly labelId?: double; + + /** + * The name of input method. +@@ -118,13 +118,13 @@ export default interface InputMethodSubtype { + /** + * The icon id of input method subtype. + * +- * @type { ?number } ++ * @type { ?double } + * @readonly + * @syscap SystemCapability.MiscServices.InputMethodFramework + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly iconId?: number; ++ readonly iconId?: double; + + /** + * The extra info of input method subtype. +diff --git a/api/@ohos.PiPWindow.d.ts b/api/@ohos.PiPWindow.d.ts +index 463f21fdd..f8a9524ab 100644 +--- a/api/@ohos.PiPWindow.d.ts ++++ b/api/@ohos.PiPWindow.d.ts +@@ -90,8 +90,7 @@ declare namespace PiPWindow { + * @throws { BusinessError } 801 - Capability not supported. Failed to call the API due to limited device capabilities. + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + function create(config: PiPConfiguration): Promise; + +@@ -111,7 +110,6 @@ declare namespace PiPWindow { + * @syscap SystemCapability.Window.SessionManager + * @atomicservice + * @since 12 +- * @arkts 1.1 + */ + function create(config: PiPConfiguration, contentNode: typeNode.XComponent): Promise; + +@@ -1067,8 +1065,7 @@ declare namespace PiPWindow { + * @param { boolean } enable - Enable auto start picture-in-picture when back home + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + setAutoStartEnabled(enable: boolean): void; + +@@ -1089,8 +1086,7 @@ declare namespace PiPWindow { + * 2. Incorrect parameter types. + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + updateContentSize(width: number, height: number): void; + +@@ -1103,8 +1099,7 @@ declare namespace PiPWindow { + * 3. Parameter verification failed + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + updatePiPControlStatus(controlType: PiPControlType, status: PiPControlStatus): void; + +@@ -1133,8 +1128,7 @@ declare namespace PiPWindow { + * 3. Parameter verification failed + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + setPiPControlEnabled(controlType: PiPControlType, enabled: boolean): void; + +@@ -1145,8 +1139,7 @@ declare namespace PiPWindow { + * @throws { BusinessError } 1300014 - PiP internal error. + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since arkts {'1.1':'15', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + getPiPWindowInfo(): Promise; + +@@ -1163,8 +1156,7 @@ declare namespace PiPWindow { + * @param { function } callback - Used to handle {'stateChange'} command + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + on(type: 'stateChange', callback: (state: PiPState, reason: string) => void): void; + +@@ -1179,8 +1171,7 @@ declare namespace PiPWindow { + * @param { 'stateChange' } type - Used to unregister listener for {'stateChange'} command + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + off(type: 'stateChange'): void; + +@@ -1198,8 +1189,7 @@ declare namespace PiPWindow { + * @param { ControlPanelActionEventCallback } callback - Used to handle {'controlPanelActionEvent'} command. + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + on(type: 'controlPanelActionEvent', callback: ControlPanelActionEventCallback): void; + +@@ -1214,8 +1204,7 @@ declare namespace PiPWindow { + * @param { 'controlPanelActionEvent' } type - Used to unregister listener for {'controlPanelActionEvent'} command + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + off(type: 'controlPanelActionEvent'): void; + +@@ -1226,8 +1215,7 @@ declare namespace PiPWindow { + * @param { Callback } callback - Used to handle {'controlEvent'} command. + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + on(type: 'controlEvent', callback: Callback): void; + +@@ -1237,8 +1225,7 @@ declare namespace PiPWindow { + * @param { Callback } callback - Used to handle {'controlEvent'} command. + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + off(type: 'controlEvent', callback?: Callback): void; + +@@ -1255,8 +1242,7 @@ declare namespace PiPWindow { + * @throws { BusinessError } 1300014 - PiP internal error. + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since arkts {'1.1':'15', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + on(type: 'pipWindowSizeChange', callback: Callback): void; + +@@ -1273,8 +1259,7 @@ declare namespace PiPWindow { + * @throws { BusinessError } 1300014 - PiP internal error. + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since arkts {'1.1':'15', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + off(type: 'pipWindowSizeChange', callback?: Callback): void; + +@@ -1286,8 +1271,7 @@ declare namespace PiPWindow { + * @throws { BusinessError } 1300014 - PiP internal error. + * @syscap SystemCapability.Window.SessionManager + * @systemapi Hide this for inner system use +- * @since arkts {'1.1':'18', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 18 + * @test + */ + isPiPSupported(): boolean; +diff --git a/api/@ohos.UiTest.d.ts b/api/@ohos.UiTest.d.ts +index f162e358f..b45551deb 100755 +--- a/api/@ohos.UiTest.d.ts ++++ b/api/@ohos.UiTest.d.ts +@@ -79,8 +79,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + EQUALS = 0, + /** +@@ -105,8 +105,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + CONTAINS = 1, + /** +@@ -131,8 +131,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + STARTS_WITH = 2, + /** +@@ -157,8 +157,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + ENDS_WITH = 3, + /** +@@ -167,8 +167,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + REG_EXP = 4, + /** +@@ -177,8 +177,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + REG_EXP_ICASE = 5, + } +@@ -723,8 +723,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + FULLSCREEN = 0, + /** +@@ -740,8 +740,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + PRIMARY = 1, + /** +@@ -757,8 +757,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + SECONDARY = 2, + /** +@@ -774,8 +774,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + FLOATING = 3, + } +@@ -810,8 +810,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + LEFT = 0, + /** +@@ -827,8 +827,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + RIGHT = 1, + /** +@@ -844,8 +844,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + UP = 2, + /** +@@ -861,8 +861,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + DOWN = 3, + /** +@@ -878,8 +878,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + LEFT_UP = 4, + /** +@@ -895,8 +895,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + LEFT_DOWN = 5, + /** +@@ -912,8 +912,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + RIGHT_UP = 6, + /** +@@ -929,8 +929,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + RIGHT_DOWN = 7, + } +@@ -965,8 +965,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + ROTATION_0 = 0, + /** +@@ -982,8 +982,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + ROTATION_90 = 1, + /** +@@ -999,8 +999,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + ROTATION_180 = 2, + /** +@@ -1016,8 +1016,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + ROTATION_270 = 3, + } +@@ -1421,8 +1421,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + declare interface UIElementInfo { + /** +@@ -1440,8 +1440,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + readonly bundleName: string; + /** +@@ -1459,8 +1459,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + readonly type: string; + /** +@@ -1478,8 +1478,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + readonly text: string; + } +@@ -1499,8 +1499,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + declare interface UIEventObserver { + /** +@@ -1522,8 +1522,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + once(type: 'toastShow', callback: Callback): void; + +@@ -1546,8 +1546,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + once(type: 'dialogShow', callback: Callback): void; + } +@@ -1600,8 +1600,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + LEFT = 0, + /** +@@ -1626,8 +1626,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + RIGHT = 1, + /** +@@ -1652,8 +1652,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + UP = 2, + /** +@@ -1678,8 +1678,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + DOWN = 3, + } +@@ -1714,8 +1714,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + MOUSE_BUTTON_LEFT = 0, + /** +@@ -1731,8 +1731,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + MOUSE_BUTTON_RIGHT = 1, + /** +@@ -1748,8 +1748,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + MOUSE_BUTTON_MIDDLE = 2, + } +@@ -1760,8 +1760,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + declare interface TouchPadSwipeOptions { + /** +@@ -1770,8 +1770,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + stay?: boolean; + +@@ -1781,8 +1781,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + speed?: number; + } +@@ -1844,8 +1844,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + text(txt: string, pattern?: MatchPattern): On; + +@@ -1880,8 +1880,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + id(id: string): On; + +@@ -1916,8 +1916,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + type(tp: string): On; + +@@ -1952,8 +1952,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + clickable(b?: boolean): On; + +@@ -1988,8 +1988,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + longClickable(b?: boolean): On; + +@@ -2024,8 +2024,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + scrollable(b?: boolean): On; + +@@ -2060,8 +2060,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + enabled(b?: boolean): On; + +@@ -2096,8 +2096,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + focused(b?: boolean): On; + +@@ -2132,8 +2132,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + selected(b?: boolean): On; + +@@ -2168,8 +2168,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + checked(b?: boolean): On; + +@@ -2204,8 +2204,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + checkable(b?: boolean): On; + +@@ -2231,8 +2231,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + isBefore(on: On): On; + +@@ -2258,8 +2258,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + isAfter(on: On): On; + +@@ -2285,8 +2285,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + within(on: On): On; + +@@ -2309,8 +2309,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + inWindow(bundleName: string): On; + +@@ -2324,8 +2324,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + description(val: string, pattern?: MatchPattern): On; + /** +@@ -2338,8 +2338,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + id(id: string, pattern: MatchPattern): On; + /** +@@ -2352,8 +2352,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + type(tp: string, pattern: MatchPattern): On; + /** +@@ -2366,8 +2366,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + hint(val: string, pattern?: MatchPattern): On; + } +@@ -2394,8 +2394,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + declare class Component { + /** +@@ -2429,8 +2429,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + click(): Promise; + +@@ -2465,8 +2465,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + doubleClick(): Promise; + +@@ -2501,8 +2501,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + longClick(): Promise; + +@@ -2537,8 +2537,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + getId(): Promise; + +@@ -2573,8 +2573,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + getText(): Promise; + +@@ -2609,8 +2609,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + getType(): Promise; + +@@ -2645,8 +2645,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + isClickable(): Promise; + +@@ -2681,8 +2681,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + isLongClickable(): Promise; + +@@ -2717,8 +2717,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + isScrollable(): Promise; + +@@ -2753,8 +2753,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + isEnabled(): Promise; + +@@ -2789,8 +2789,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + isFocused(): Promise; + +@@ -2825,8 +2825,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + isSelected(): Promise; + +@@ -2861,8 +2861,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + isChecked(): Promise; + +@@ -2897,8 +2897,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + isCheckable(): Promise; + +@@ -2939,8 +2939,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + inputText(text: string): Promise; + +@@ -2975,8 +2975,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + clearText(): Promise; + +@@ -3017,8 +3017,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + scrollToTop(speed?: number): Promise; + +@@ -3059,8 +3059,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + scrollToBottom(speed?: number): Promise; + +@@ -3095,8 +3095,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + getBounds(): Promise; + +@@ -3131,8 +3131,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + getBoundsCenter(): Promise; + +@@ -3159,8 +3159,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + dragTo(target: Component): Promise; + +@@ -3188,8 +3188,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + pinchOut(scale: number): Promise; + +@@ -3217,8 +3217,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + pinchIn(scale: number): Promise; + +@@ -3231,8 +3231,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + getDescription(): Promise; + /** +@@ -3244,8 +3244,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + getHint(): Promise; + +@@ -3302,8 +3302,8 @@ + * @crossplatform + * @atomicservice + * @since 20 +- * @arkts 1.2 + * @test ++ * @arkts 1.2 + */ + scrollSearch(on: On): Promise; + +@@ -3331,13 +3331,14 @@ + * @param { boolean } [vertical] - Whether the swipe direction is vertical, default is true. + * @param { number } [offset] - Offset from the swipe start/end point to the component border, default is 80. + * @returns { Promise } the found result,or null if not found. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17000002 - The async function is not called with await. + * @throws { BusinessError } 17000004 - The window or component is invisible or destroyed. + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since 20 +- * @arkts 1.2 + * @test ++ * @arkts 1.2 + */ + scrollSearch(on: On, vertical?: boolean, offset?: number): Promise; + } +@@ -3367,8 +3368,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + declare class Driver { + /** +@@ -3399,8 +3400,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + static create(): Driver; + +@@ -3438,8 +3439,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + delayMs(duration: number): Promise; + +@@ -3485,12 +3486,13 @@ + * + * @param { On } on - the attribute requirements of the target {@link Component}. + * @returns { Promise } the first matched {@link Component} or undefined. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17000002 - The async function is not called with await. + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since 20 +- * @arkts 1.2 + * @test ++ * @arkts 1.2 + */ + findComponent(on: On): Promise; + +@@ -3523,12 +3525,13 @@ + * + * @param { WindowFilter } filter - the filer condition of the target {@link UiWindow}. + * @returns { Promise } the first matched {@link UiWindow} or undefined. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17000002 - The async function is not called with await. + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since 20 +- * @arkts 1.2 + * @test ++ * @arkts 1.2 + */ + findWindow(filter: WindowFilter): Promise; + +@@ -3564,12 +3567,13 @@ + * @param { On } on - the attribute requirements of the target {@link Component}. + * @param { number } time - duration of finding in milliseconds, not less than 0. + * @returns { Promise } the first matched {@link Component} or undefined. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17000002 - The async function is not called with await. + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since 20 +- * @arkts 1.2 + * @test ++ * @arkts 1.2 + */ + waitForComponent(on: On, time: number): Promise; + +@@ -3616,12 +3620,13 @@ + * + * @param { On } on - the attribute requirements of the target {@link Component}. + * @returns { Promise | null> } the matched {@link Component}s list. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17000002 - The async function is not called with await. + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since 20 +- * @arkts 1.2 + * @test ++ * @arkts 1.2 + */ + findComponents(on: On): Promise | null>; + +@@ -3662,8 +3667,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + assertComponentExist(on: On): Promise; + +@@ -3695,8 +3700,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + pressBack(): Promise; + +@@ -3722,8 +3727,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + triggerKey(keyCode: number): Promise; + +@@ -3753,8 +3758,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + triggerCombineKeys(key0: number, key1: number, key2?: number): Promise; + +@@ -3795,8 +3800,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + click(x: number, y: number): Promise; + +@@ -3837,8 +3842,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + doubleClick(x: number, y: number): Promise; + +@@ -3879,8 +3884,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + longClick(x: number, y: number): Promise; + +@@ -3930,8 +3935,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + swipe(startx: number, starty: number, endx: number, endy: number, speed?: number): Promise; + +@@ -3964,8 +3969,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + drag(startx: number, starty: number, endx: number, endy: number, speed?: number): Promise; + +@@ -3990,8 +3995,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + screenCap(savePath: string): Promise; + +@@ -4016,8 +4021,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + setDisplayRotation(rotation: DisplayRotation): Promise; + +@@ -4038,8 +4043,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + getDisplayRotation(): Promise; + +@@ -4064,8 +4069,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + setDisplayRotationEnabled(enabled: boolean): Promise; + +@@ -4086,8 +4091,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + getDisplaySize(): Promise; + +@@ -4108,8 +4113,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + getDisplayDensity(): Promise; + +@@ -4130,8 +4135,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + wakeUpDisplay(): Promise; + +@@ -4152,8 +4157,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + pressHome(): Promise; + +@@ -4180,8 +4185,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + waitForIdle(idleTime: number, timeout: number): Promise; + +@@ -4228,8 +4233,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + fling(from: Point, to: Point, stepLen: number, speed: number): Promise; + +@@ -4257,8 +4262,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + injectMultiPointerAction(pointers: PointerMatrix, speed?: number): Promise; + +@@ -4299,8 +4304,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + fling(direction: UiDirection, speed: number): Promise; + +@@ -4331,8 +4336,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + mouseClick(p: Point, btnId: MouseButton, key1?: number, key2?: number): Promise; + +@@ -4357,8 +4362,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + mouseMoveTo(p: Point): Promise; + +@@ -4391,9 +4396,11 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ ++ mouseScroll(p: Point, down: boolean, d: number, key1?: number, key2?: number): Promise; ++ + /** + * The mouse wheel scrolls the specified cell at the specified position, and press the specified key simultaneously if necessary. + * +@@ -4409,8 +4416,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} ++ * @test + * @arkts 1.1&1.2 +- * @test + */ + mouseScroll(p: Point, down: boolean, d: number, key1?: number, key2?: number, speed?: number): Promise; + +@@ -4437,8 +4444,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + screenCapture(savePath: string, rect?: Rect): Promise; + +@@ -4459,8 +4466,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + createUIEventObserver(): UIEventObserver; + +@@ -4477,8 +4484,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + mouseDoubleClick(p: Point, btnId: MouseButton, key1?: number, key2?: number): Promise; + +@@ -4495,8 +4502,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + mouseLongClick(p: Point, btnId: MouseButton, key1?: number, key2?: number): Promise; + +@@ -4512,8 +4519,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + mouseMoveWithTrack(from: Point, to: Point, speed?: number): Promise; + +@@ -4529,8 +4536,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + mouseDrag(from: Point, to: Point, speed?: number): Promise; + +@@ -4545,8 +4552,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + inputText(p: Point, text: string): Promise; + +@@ -4562,8 +4569,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + touchPadMultiFingerSwipe(fingers: number, direction: UiDirection, options?: TouchPadSwipeOptions): Promise; + +@@ -4576,8 +4583,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + penClick(point: Point): Promise; + +@@ -4591,8 +4598,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + penLongClick(point: Point, pressure?: number): Promise; + +@@ -4605,8 +4612,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + penDoubleClick(point: Point): Promise; + +@@ -4622,8 +4629,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + penSwipe(startPoint: Point, endPoint: Point, speed?: number, pressure?: number): Promise; + +@@ -4638,8 +4645,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + injectPenPointerAction(pointers: PointerMatrix, speed?: number, pressure?: number): Promise; + } +@@ -4655,8 +4662,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + declare class UiWindow { + /** +@@ -4678,8 +4685,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + getBundleName(): Promise; + +@@ -4703,8 +4710,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + getBounds(): Promise; + +@@ -4727,8 +4734,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + getTitle(): Promise; + +@@ -4751,8 +4758,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + getWindowMode(): Promise; + +@@ -4775,8 +4782,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + isFocused(): Promise; + +@@ -4822,8 +4829,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + focus(): Promise; + +@@ -4854,8 +4861,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + moveTo(x: number, y: number): Promise; + +@@ -4888,8 +4895,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + resize(wide: number, height: number, direction: ResizeDirection): Promise; + +@@ -4914,8 +4921,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + split(): Promise; + +@@ -4940,8 +4947,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + maximize(): Promise; + +@@ -4966,8 +4973,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + minimize(): Promise; + +@@ -4992,8 +4999,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + resume(): Promise; + +@@ -5018,8 +5025,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + close(): Promise; + +@@ -5032,8 +5039,8 @@ + * @syscap SystemCapability.Test.UiTest + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + isActive(): Promise; + } +@@ -5054,8 +5061,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + declare class PointerMatrix { + /** +@@ -5080,8 +5087,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + static create(fingers: number, steps: number): PointerMatrix; + +@@ -5107,8 +5114,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + setPoint(finger: number, step: number, point: Point): void; + } +@@ -5138,8 +5145,8 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 + * @test ++ * @arkts 1.1&1.2 + */ + declare const ON: On; + +diff --git a/api/@ohos.WorkSchedulerExtensionAbility.d.ts b/api/@ohos.WorkSchedulerExtensionAbility.d.ts +index 7b64c003c..8bd479689 100644 +--- a/api/@ohos.WorkSchedulerExtensionAbility.d.ts ++++ b/api/@ohos.WorkSchedulerExtensionAbility.d.ts +@@ -28,7 +28,8 @@ import { WorkSchedulerExtensionContext as _WorkSchedulerExtensionContext } from + * @typedef { _WorkSchedulerExtensionContext } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export type WorkSchedulerExtensionContext = _WorkSchedulerExtensionContext; + +@@ -37,7 +38,8 @@ export type WorkSchedulerExtensionContext = _WorkSchedulerExtensionContext; + * + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export default class WorkSchedulerExtensionAbility { + /** +@@ -46,7 +48,8 @@ export default class WorkSchedulerExtensionAbility { + * @type { WorkSchedulerExtensionContext } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + context: WorkSchedulerExtensionContext; + +@@ -56,7 +59,8 @@ export default class WorkSchedulerExtensionAbility { + * @param {workScheduler.WorkInfo} work - The info of work. + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onWorkStart(work: workScheduler.WorkInfo): void; + +@@ -66,7 +70,8 @@ export default class WorkSchedulerExtensionAbility { + * @param {workScheduler.WorkInfo} work - The info of work. + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onWorkStop(work: workScheduler.WorkInfo): void; + } +diff --git a/api/@ohos.ability.errorCode.d.ts b/api/@ohos.ability.errorCode.d.ts +index bf6f1e727..83418a702 100644 +--- a/api/@ohos.ability.errorCode.d.ts ++++ b/api/@ohos.ability.errorCode.d.ts +@@ -23,14 +23,16 @@ + * + * @enum { number } + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 6 ++ * @since arkts {'1.1':'6', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum ErrorCode { + /** + * Permission denied. + * + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 6 ++ * @since arkts {'1.1':'6', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PERMISSION_DENY = -3, + +@@ -38,7 +40,8 @@ export enum ErrorCode { + * Ability not found. + * + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 6 ++ * @since arkts {'1.1':'6', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ABILITY_NOT_FOUND = -2, + +@@ -46,7 +49,8 @@ export enum ErrorCode { + * Invalid parameter. + * + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 6 ++ * @since arkts {'1.1':'6', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INVALID_PARAMETER = -1, + +@@ -54,7 +58,8 @@ export enum ErrorCode { + * No error. + * + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 6 ++ * @since arkts {'1.1':'6', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NO_ERROR = 0 + } +diff --git a/api/@ohos.ability.screenLockFileManager.d.ts b/api/@ohos.ability.screenLockFileManager.d.ts +index b6ff1876f..ee9bcbd85 100644 +--- a/api/@ohos.ability.screenLockFileManager.d.ts ++++ b/api/@ohos.ability.screenLockFileManager.d.ts +@@ -23,7 +23,8 @@ + * + * @namespace screenLockFileManager + * @syscap SystemCapability.Security.ScreenLockFileManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace screenLockFileManager { + /** +@@ -31,14 +32,16 @@ declare namespace screenLockFileManager { + * + * @enum { number } + * @syscap SystemCapability.Security.ScreenLockFileManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum DataType { + /** + * Media photo and video data. + * + * @syscap SystemCapability.Security.ScreenLockFileManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MEDIA_DATA = 0x00000001, + +@@ -46,7 +49,8 @@ declare namespace screenLockFileManager { + * All data type. + * + * @syscap SystemCapability.Security.ScreenLockFileManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ALL_DATA = 0xffffffff + } +@@ -56,14 +60,16 @@ declare namespace screenLockFileManager { + * + * @enum { number } + * @syscap SystemCapability.Security.ScreenLockFileManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum AccessStatus { + /** + * Acquire the access of data failed. + * + * @syscap SystemCapability.Security.ScreenLockFileManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ACCESS_DENIED = -1, + +@@ -71,7 +77,8 @@ declare namespace screenLockFileManager { + * Acquire the access of data success. + * + * @syscap SystemCapability.Security.ScreenLockFileManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ACCESS_GRANTED = 0 + } +@@ -81,14 +88,16 @@ declare namespace screenLockFileManager { + * + * @enum { number } + * @syscap SystemCapability.Security.ScreenLockFileManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum ReleaseStatus { + /** + * Release the access of data failed. + * + * @syscap SystemCapability.Security.ScreenLockFileManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RELEASE_DENIED = -1, + +@@ -96,7 +105,8 @@ declare namespace screenLockFileManager { + * Release the access of data success. + * + * @syscap SystemCapability.Security.ScreenLockFileManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RELEASE_GRANTED = 0 + } +@@ -106,14 +116,16 @@ declare namespace screenLockFileManager { + * + * @enum { number } + * @syscap SystemCapability.Security.ScreenLockFileManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum KeyStatus { + /** + * The application is not enabled the data protection under lock screen. + * + * @syscap SystemCapability.Security.ScreenLockFileManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEY_NOT_EXIST = -2, + +@@ -121,7 +133,8 @@ declare namespace screenLockFileManager { + * AppKey has been released. + * + * @syscap SystemCapability.Security.ScreenLockFileManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEY_RELEASED = -1, + +@@ -129,7 +142,8 @@ declare namespace screenLockFileManager { + * AppKey exists. + * + * @syscap SystemCapability.Security.ScreenLockFileManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEY_EXIST = 0 + } +@@ -143,7 +157,8 @@ declare namespace screenLockFileManager { + * @throws { BusinessError } 29300003 - The application is not enabled the data protection under lock screen. + * @throws { BusinessError } 29300004 - File access is denied. + * @syscap SystemCapability.Security.ScreenLockFileManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function acquireAccess(): AccessStatus; + +@@ -163,7 +178,8 @@ declare namespace screenLockFileManager { + * @throws { BusinessError } 29300004 - File access is denied. + * @syscap SystemCapability.Security.ScreenLockFileManager + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function acquireAccess(dataType: DataType): AccessStatus; + +@@ -176,7 +192,8 @@ declare namespace screenLockFileManager { + * @throws { BusinessError } 29300003 - The application is not enabled the data protection under lock screen. + * @throws { BusinessError } 29300005 - File access was not acquired. + * @syscap SystemCapability.Security.ScreenLockFileManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function releaseAccess(): ReleaseStatus; + +@@ -196,7 +213,8 @@ declare namespace screenLockFileManager { + * @throws { BusinessError } 29300005 - File access was not acquired. + * @syscap SystemCapability.Security.ScreenLockFileManager + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function releaseAccess(dataType: DataType): ReleaseStatus; + +@@ -207,7 +225,8 @@ declare namespace screenLockFileManager { + * @throws { BusinessError } 801 - The specified SystemCapability name was not found. + * @throws { BusinessError } 29300002 - The system ability work abnormally. + * @syscap SystemCapability.Security.ScreenLockFileManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function queryAppKeyState(): KeyStatus; + +@@ -225,7 +244,8 @@ declare namespace screenLockFileManager { + * @throws { BusinessError } 29300002 - The system ability work abnormally. + * @syscap SystemCapability.Security.ScreenLockFileManager + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function queryAppKeyState(dataType: DataType): KeyStatus; + } +diff --git a/api/@ohos.abilityAccessCtrl.d.ts b/api/@ohos.abilityAccessCtrl.d.ts +index aea2e98aa..6da3b2bd3 100644 +--- a/api/@ohos.abilityAccessCtrl.d.ts ++++ b/api/@ohos.abilityAccessCtrl.d.ts +@@ -22,9 +22,6 @@ import { AsyncCallback, Callback } from './@ohos.base'; + import { Permissions } from './permissions'; + import type _Context from './application/Context'; + import type _PermissionRequestResult from './security/PermissionRequestResult'; +-/*** if arkts 1.1 */ +-import { int } from '@ohos.base'; +-/*** endif */ + + /** + * @namespace abilityAccessCtrl +@@ -93,13 +90,14 @@ declare namespace abilityAccessCtrl { + /** + * Checks whether a specified application has been granted the given permission. + * +- * @param { number } tokenID - Token ID of the application. ++ * @param { int } tokenID - Token ID of the application. + * @param { Permissions } permissionName - Name of the permission to be verified. The Permissions type supports only valid permission names. + * @returns { Promise } Returns permission verify result. + * @syscap SystemCapability.Security.AccessToken +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- verifyAccessToken(tokenID: number, permissionName: Permissions): Promise; ++ verifyAccessToken(tokenID: int, permissionName: Permissions): Promise; + + /** + * Checks whether a specified application has been granted the given permission. +@@ -297,9 +295,9 @@ declare namespace abilityAccessCtrl { + * Grants a specified user_grant permission to the given application. + * + * @permission ohos.permission.GRANT_SENSITIVE_PERMISSIONS +- * @param { number } tokenID - Token ID of the application. ++ * @param { int } tokenID - Token ID of the application. + * @param { Permissions } permissionName - Name of the permission to be granted. +- * @param { number } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. ++ * @param { int } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. + * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.GRANT_SENSITIVE_PERMISSIONS". +@@ -312,17 +310,18 @@ declare namespace abilityAccessCtrl { + * @throws { BusinessError } 12100007 - The service is abnormal. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 8 ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- grantUserGrantedPermission(tokenID: number, permissionName: Permissions, permissionFlags: number): Promise; ++ grantUserGrantedPermission(tokenID: int, permissionName: Permissions, permissionFlags: int): Promise; + + /** + * Grants a specified user_grant permission to the given application. + * + * @permission ohos.permission.GRANT_SENSITIVE_PERMISSIONS +- * @param { number } tokenID - Token ID of the application. ++ * @param { int } tokenID - Token ID of the application. + * @param { Permissions } permissionName - Name of the permission to be granted. +- * @param { number } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. ++ * @param { int } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. + * @param { AsyncCallback } callback - Asynchronous callback interface. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.GRANT_SENSITIVE_PERMISSIONS". +@@ -335,12 +334,13 @@ declare namespace abilityAccessCtrl { + * @throws { BusinessError } 12100007 - The service is abnormal. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 8 ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + grantUserGrantedPermission( +- tokenID: number, ++ tokenID: int, + permissionName: Permissions, +- permissionFlags: number, ++ permissionFlags: int, + callback: AsyncCallback + ): void; + +@@ -348,9 +348,9 @@ declare namespace abilityAccessCtrl { + * Revoke a specified user_grant permission to the given application. + * + * @permission ohos.permission.REVOKE_SENSITIVE_PERMISSIONS +- * @param { number } tokenID - Token ID of the application. ++ * @param { int } tokenID - Token ID of the application. + * @param { Permissions } permissionName - Name of the permission to be revoked. +- * @param { number } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. ++ * @param { int } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. + * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS". +@@ -363,17 +363,18 @@ declare namespace abilityAccessCtrl { + * @throws { BusinessError } 12100007 - The service is abnormal. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 8 ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- revokeUserGrantedPermission(tokenID: number, permissionName: Permissions, permissionFlags: number): Promise; ++ revokeUserGrantedPermission(tokenID: int, permissionName: Permissions, permissionFlags: int): Promise; + + /** + * Revoke a specified user_grant permission to the given application. + * + * @permission ohos.permission.REVOKE_SENSITIVE_PERMISSIONS +- * @param { number } tokenID - Token ID of the application. ++ * @param { int } tokenID - Token ID of the application. + * @param { Permissions } permissionName - Name of the permission to be revoked. +- * @param { number } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. ++ * @param { int } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. + * @param { AsyncCallback } callback - Asynchronous callback interface. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS". +@@ -386,12 +387,13 @@ declare namespace abilityAccessCtrl { + * @throws { BusinessError } 12100007 - The service is abnormal. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 8 ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + revokeUserGrantedPermission( +- tokenID: number, ++ tokenID: int, + permissionName: Permissions, +- permissionFlags: number, ++ permissionFlags: int, + callback: AsyncCallback + ): void; + +@@ -399,9 +401,9 @@ declare namespace abilityAccessCtrl { + * Queries specified permission flags of the given application. + * + * @permission ohos.permission.GET_SENSITIVE_PERMISSIONS or ohos.permission.GRANT_SENSITIVE_PERMISSIONS or ohos.permission.REVOKE_SENSITIVE_PERMISSIONS +- * @param { number } tokenID - Token ID of the application. ++ * @param { int } tokenID - Token ID of the application. + * @param { Permissions } permissionName - Name of the permission to be get. +- * @returns { Promise } Return permission flags. ++ * @returns { Promise } Return permission flags. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission specified below. + * @throws { BusinessError } 202 - Not System App. Interface caller is not a system app. +@@ -412,9 +414,10 @@ declare namespace abilityAccessCtrl { + * @throws { BusinessError } 12100007 - The service is abnormal. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 8 ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getPermissionFlags(tokenID: number, permissionName: Permissions): Promise; ++ getPermissionFlags(tokenID: int, permissionName: Permissions): Promise; + + /** + * Set the toggle status of one permission flag. +@@ -431,7 +434,8 @@ declare namespace abilityAccessCtrl { + * @throws { BusinessError } 12100007 - The service is abnormal. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setPermissionRequestToggleStatus(permissionName: Permissions, status: PermissionRequestToggleStatus): Promise; + +@@ -449,26 +453,28 @@ declare namespace abilityAccessCtrl { + * @throws { BusinessError } 12100007 - The service is abnormal. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getPermissionRequestToggleStatus(permissionName: Permissions): Promise; + + /** + * Queries permission management version. + * +- * @returns { Promise } Return permission version. ++ * @returns { Promise } Return permission version. + * @throws { BusinessError } 202 - Not System App. Interface caller is not a system app. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getVersion(): Promise; ++ getVersion(): Promise; + + /** + * Queries permissions status of the given application. + * + * @permission ohos.permission.GET_SENSITIVE_PERMISSIONS +- * @param { number } tokenID - Token ID of the application. ++ * @param { int } tokenID - Token ID of the application. + * @param { Array } permissionList - Indicates the list of permissions to be queried. This parameter cannot be null or empty. + * @returns { Promise> } Return permission status. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. +@@ -479,16 +485,17 @@ declare namespace abilityAccessCtrl { + * @throws { BusinessError } 12100007 - The service is abnormal. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getPermissionsStatus(tokenID: number, permissionList: Array): Promise>; ++ getPermissionsStatus(tokenID: int, permissionList: Array): Promise>; + + /** + * Registers a permission state callback so that the application can be notified upon specified permission state of specified applications changes. + * + * @permission ohos.permission.GET_SENSITIVE_PERMISSIONS + * @param { 'permissionStateChange' } type - Event type. +- * @param { Array } tokenIDList - A list of permissions that specify the permissions to be listened on. The value in the list can be: ++ * @param { Array } tokenIDList - A list of permissions that specify the permissions to be listened on. The value in the list can be: + *
    {@code empty} - Indicates that the application can be notified if the specified permission state of any applications changes. + *
    {@code non-empty} - Indicates that the application can only be notified if the specified permission state of the specified applications change. + * @param { Array } permissionList - A list of permissions that specify the permissions to be listened on. The value in the list can be: +@@ -505,11 +512,12 @@ declare namespace abilityAccessCtrl { + * @throws { BusinessError } 12100008 - Out of memory. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on( + type: 'permissionStateChange', +- tokenIDList: Array, ++ tokenIDList: Array, + permissionList: Array, + callback: Callback + ): void; +@@ -529,7 +537,8 @@ declare namespace abilityAccessCtrl { + * @throws { BusinessError } 12100007 - The service is abnormal. + * @syscap SystemCapability.Security.AccessToken + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on( + type: 'selfPermissionStateChange', +@@ -542,7 +551,7 @@ declare namespace abilityAccessCtrl { + * + * @permission ohos.permission.GET_SENSITIVE_PERMISSIONS + * @param { 'permissionStateChange' } type - Event type. +- * @param { Array } tokenIDList - A list of permissions that specify the permissions to be listened on. ++ * @param { Array } tokenIDList - A list of permissions that specify the permissions to be listened on. + * It should correspond to the value registered by function of "on", whose type is "permissionStateChange". + * @param { Array } permissionList - A list of permissions that specify the permissions to be listened on. + * It should correspond to the value registered by function of "on", whose type is "permissionStateChange". +@@ -556,11 +565,12 @@ declare namespace abilityAccessCtrl { + * @throws { BusinessError } 12100008 - Out of memory. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off( + type: 'permissionStateChange', +- tokenIDList: Array, ++ tokenIDList: Array, + permissionList: Array, + callback?: Callback + ): void; +@@ -578,7 +588,8 @@ declare namespace abilityAccessCtrl { + * @throws { BusinessError } 12100007 - The service is abnormal. + * @syscap SystemCapability.Security.AccessToken + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off( + type: 'selfPermissionStateChange', +@@ -621,14 +632,15 @@ declare namespace abilityAccessCtrl { + * @syscap SystemCapability.Security.AccessToken + * @stagemodelonly + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + requestGlobalSwitch(context: Context, type: SwitchType): Promise; + + /** + * Starts the permission manager page of an application. + * +- * @param { number } tokenID - Token ID of the application. ++ * @param { int } tokenID - Token ID of the application. + * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 202 - Not System App. Interface caller is not a system app. + * @throws { BusinessError } 12100002 - The specified tokenID does not exist. +@@ -636,9 +648,10 @@ declare namespace abilityAccessCtrl { + * @syscap SystemCapability.Security.AccessToken + * @systemapi + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- requestPermissionOnApplicationSetting(tokenID: number): Promise; ++ requestPermissionOnApplicationSetting(tokenID: int): Promise; + } + + /** +@@ -825,8 +838,8 @@ declare namespace abilityAccessCtrl { + * + * @enum { int } + * @syscap SystemCapability.Security.AccessToken +- * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + export enum PermissionStatus { +@@ -834,8 +847,8 @@ declare namespace abilityAccessCtrl { + * permission has been denied, only can change it in settings + * + * @syscap SystemCapability.Security.AccessToken +- * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + DENIED = -1, +@@ -843,8 +856,8 @@ declare namespace abilityAccessCtrl { + * permission has been granted + * + * @syscap SystemCapability.Security.AccessToken +- * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + GRANTED = 0, +@@ -852,8 +865,8 @@ declare namespace abilityAccessCtrl { + * permission is not determined + * + * @syscap SystemCapability.Security.AccessToken +- * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + NOT_DETERMINED = 1, +@@ -861,8 +874,8 @@ declare namespace abilityAccessCtrl { + * permission is invalid + * + * @syscap SystemCapability.Security.AccessToken +- * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + INVALID = 2, +@@ -870,8 +883,8 @@ declare namespace abilityAccessCtrl { + * permission has been restricted + * + * @syscap SystemCapability.Security.AccessToken +- * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + RESTRICTED = 3 +diff --git a/api/@ohos.accessibility.config.d.ets b/api/@ohos.accessibility.config.d.ets +deleted file mode 100644 +index bd0ec9a64..000000000 +--- a/api/@ohos.accessibility.config.d.ets ++++ /dev/null +@@ -1,112 +0,0 @@ +-/* +- * Copyright (C) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-/** +- * @file +- * @kit AccessibilityKit +- */ +- +-import { AccessibilityError } from './@ohos.accessibility'; +- +-/** +- * Configuration of the accessibility. +- * +- * @namespace config +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @systemapi +- * @since 20 +- */ +-declare namespace config { +- /** +- * Indicates the configuration of high-contrast text. +- * +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @systemapi +- * @since 20 +- */ +- const highContrastText: HighContrastTextConfig; +- /** +- * Indicates setting and getting in configuration. +- * +- * @typedef HighContrastTextConfig +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @systemapi +- * @since 20 +- */ +- class HighContrastTextConfig { +- /** +- * Setting configuration value. +- * +- * @permission ohos.permission.WRITE_ACCESSIBILITY_CONFIG +- * @param { boolean } value Indicates the value. +- * @returns { Promise } +- * @throws { BusinessError } 201 - Permission verification failed. +- * The application does not have the permission required to call the API. +- * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. +- * @throws { BusinessError } 401 - Input parameter error. Possible causes: +- * 1. Mandatory parameters are left unspecified; +- * 2. Incorrect parameter types; +- * 3. Parameter verification failed. +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @systemapi +- * @since 20 +- */ +- set(value: boolean): Promise; +- +- /** +- * Setting configuration value. +- * +- * @permission ohos.permission.WRITE_ACCESSIBILITY_CONFIG +- * @param { boolean } value Indicates the value. +- * @param { AsyncCallback } callback +- * @throws { BusinessError } 201 - Permission verification failed. +- * The application does not have the permission required to call the API. +- * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. +- * @throws { BusinessError } 401 - Input parameter error. Possible causes: +- * 1. Mandatory parameters are left unspecified; +- * 2. Incorrect parameter types; +- * 3. Parameter verification failed. +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @systemapi +- * @since 20 +- */ +- set(value: boolean, callback: (err: AccessibilityError) => void): void; +- +- /** +- * Getting configuration value. +- * +- * @returns { Promise } +- * @throws { BusinessError } 201 - Permission verification failed. +- * The application does not have the permission required to call the API. +- * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @systemapi +- * @since 20 +- */ +- get(): Promise; +- +- /** +- * Getting configuration value. +- * +- * @param { AsyncCallback } callback +- * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @systemapi +- * @since 20 +- */ +- get(callback:(err: AccessibilityError, data: boolean) => void): void; +- } +-} +-export default config; +diff --git a/api/@ohos.accessibility.config.d.ts b/api/@ohos.accessibility.config.d.ts +index 70f86c013..a777285c2 100644 +--- a/api/@ohos.accessibility.config.d.ts ++++ b/api/@ohos.accessibility.config.d.ts +@@ -27,7 +27,8 @@ import type { AsyncCallback, Callback } from './@ohos.base'; + * @namespace config + * @syscap SystemCapability.BarrierFree.Accessibility.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace config { + /** +@@ -57,11 +58,13 @@ declare namespace config { + /** + * Indicates the configuration of high-contrast text. + * ++ * @type { Config } + * @syscap SystemCapability.BarrierFree.Accessibility.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- var highContrastText: Config; ++ let highContrastText: Config; + /** + * Indicates the configuration of invert color. + * +@@ -361,7 +364,8 @@ declare namespace config { + * @typedef Config + * @syscap SystemCapability.BarrierFree.Accessibility.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Config { + /** +@@ -379,7 +383,8 @@ declare namespace config { + * 3. Parameter verification failed. + * @syscap SystemCapability.BarrierFree.Accessibility.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + set(value: T): Promise; + +@@ -398,7 +403,8 @@ declare namespace config { + * 3. Parameter verification failed. + * @syscap SystemCapability.BarrierFree.Accessibility.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + set(value: T, callback: AsyncCallback): void; + +@@ -411,7 +417,8 @@ declare namespace config { + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @syscap SystemCapability.BarrierFree.Accessibility.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + get(): Promise; + +@@ -422,7 +429,8 @@ declare namespace config { + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @syscap SystemCapability.BarrierFree.Accessibility.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + get(callback: AsyncCallback): void; + +diff --git a/api/@ohos.accessibility.d.ets b/api/@ohos.accessibility.d.ets +deleted file mode 100644 +index f737eaa5b..000000000 +--- a/api/@ohos.accessibility.d.ets ++++ /dev/null +@@ -1,389 +0,0 @@ +-/* +- * Copyright (C) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-/** +- * @file +- * @kit AccessibilityKit +- */ +- +-import { Callback } from './@ohos.base'; +- +-/** +- * Defines the error interface. +- * +- * @extends Error +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 20 +- */ +-export declare class AccessibilityError extends Error { +- constructor(code: int, message: string); +- code: int; +-} +- +-/** +- * Defines the basic callback. +- * +- * @typedef { AccessibilityCallback } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 20 +- */ +-type AccessibilityCallback = (err: AccessibilityError, data?: T) => void; +- +-/** +- * Accessibility +- * +- * @namespace accessibility +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +-/** +- * Accessibility +- * +- * @namespace accessibility +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @atomicservice +- * @since 11 +- */ +-declare namespace accessibility { +- /** +- * The action that the ability can execute. +- * value range: { 'accessibilityFocus' | 'clearAccessibilityFocus' | 'focus' | 'clearFocus' | 'clearSelection' | +- * 'click' | 'longClick' | 'cut' | 'copy' | 'paste' | 'select' | 'setText' | 'delete' | +- * 'scrollForward' | 'scrollBackward' | 'setSelection' } +- * +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +- /** +- * The action that the ability can execute. +- * value range: { 'accessibilityFocus' | 'clearAccessibilityFocus' | 'focus' | 'clearFocus' | 'clearSelection' | +- * 'click' | 'longClick' | 'cut' | 'copy' | 'paste' | 'select' | 'setText' | 'delete' | +- * 'scrollForward' | 'scrollBackward' | 'setSelection' | 'setCursorPosition' | 'home' | +- * 'back' | 'recentTask' | 'notificationCenter' | 'controlCenter' | 'common' } +- * +- * @typedef {'accessibilityFocus' | 'clearAccessibilityFocus' | 'focus' | 'clearFocus' | 'clearSelection' | 'click' | +- * 'longClick' | 'cut' | 'copy' | 'paste' | 'select' | 'setText' | 'delete' | 'scrollForward' | 'scrollBackward' | +- * 'setSelection' | 'setCursorPosition' | 'home' | 'back' | 'recentTask' | 'notificationCenter' | +- * 'controlCenter' | 'common'} +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 12 +- */ +- type Action = 'accessibilityFocus' | 'clearAccessibilityFocus' | 'focus' | 'clearFocus' | 'clearSelection' | +- 'click' | 'longClick' | 'cut' | 'copy' | 'paste' | 'select' | 'setText' | 'delete' | +- 'scrollForward' | 'scrollBackward' | 'setSelection' | 'setCursorPosition' | 'home' | +- 'back' | 'recentTask' | 'notificationCenter' | 'controlCenter' | 'common'; +- +- /** +- * The type of the accessibility event. +- * windowsChange/windowContentChange/windowStateChange/announcement/notificationChange/textTraversedAtMove +- * value range: { 'accessibilityFocus' | 'accessibilityFocusClear' | +- * 'click' | 'longClick' | 'focus' | 'select' | 'hoverEnter' | 'hoverExit' | +- * 'textUpdate' | 'textSelectionUpdate' | 'scroll' } +- * +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +- /** +- * The type of the accessibility event. +- * windowsChange/windowContentChange/windowStateChange/announcement/notificationChange/textTraversedAtMove +- * value range: { 'accessibilityFocus' | 'accessibilityFocusClear' | +- * 'click' | 'longClick' | 'focus' | 'select' | 'hoverEnter' | 'hoverExit' | +- * 'textUpdate' | 'textSelectionUpdate' | 'scroll' | 'requestFocusForAccessibility' | +- * 'announceForAccessibility' } +- * +- * @typedef {'accessibilityFocus' | 'accessibilityFocusClear' | 'click' | 'longClick' | 'focus' | 'select' | +- * 'hoverEnter' | 'hoverExit' | 'textUpdate' | 'textSelectionUpdate' | 'scroll' | 'requestFocusForAccessibility' | +- * 'announceForAccessibility'} +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 12 +- */ +- type EventType = 'accessibilityFocus' | 'accessibilityFocusClear' | +- 'click' | 'longClick' | 'focus' | 'select' | 'hoverEnter' | 'hoverExit' | +- 'textUpdate' | 'textSelectionUpdate' | 'scroll' | 'requestFocusForAccessibility' | +- 'announceForAccessibility'; +- +- /** +- * The change type of the windowsChange event. +- * It's used when received the {@code windowsChange} event. +- * +- * @typedef {'add' | 'remove' | 'bounds' | 'active' | 'focus'} +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +- type WindowUpdateType = 'add' | 'remove' | 'bounds' | 'active' | 'focus'; +- +- /** +- * The type of the observer. +- * +- * @typedef {'accessibilityStateChange' | 'touchGuideStateChange' | 'screenReaderStateChange'} +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +- type ObserverEventType = 'accessibilityStateChange' | 'touchGuideStateChange' | 'screenReaderStateChange'; +- +- /** +- * The granularity of text move. +- * +- * @typedef {'char' | 'word' | 'line' | 'page' | 'paragraph'} +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 20 +- */ +- type TextMoveUnit = 'char' | 'word' | 'line' | 'page' | 'paragraph'; +- +- /** +- * Checks whether accessibility ability is enabled. +- * +- * @returns { boolean } Returns true if the accessibility is enabled; returns false otherwise. +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 10 +- */ +- /** +- * Checks whether accessibility ability is enabled. +- * +- * @returns { boolean } Returns true if the accessibility is enabled; returns false otherwise. +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @atomicservice +- * @since 11 +- */ +- function isOpenAccessibilitySync(): boolean; +- +- /** +- * Checks touch browser ability (which is used by talkback) is enabled. +- * +- * @returns { boolean } Returns true if the touch browser is enabled; returns false otherwise. +- * @syscap SystemCapability.BarrierFree.Accessibility.Vision +- * @since 10 +- */ +- /** +- * Checks touch browser ability (which is used by talkback) is enabled. +- * +- * @returns { boolean } Returns true if the touch browser is enabled; returns false otherwise. +- * @syscap SystemCapability.BarrierFree.Accessibility.Vision +- * @atomicservice +- * @since 11 +- */ +- function isOpenTouchGuideSync(): boolean; +- +- /** +- * Send accessibility event. +- * +- * @param { EventInfo } event The object of the accessibility {@code EventInfo} . +- * @param { AccessibilityCallback } callback Asynchronous callback interface. +- * @throws { BusinessError } 401 - Input parameter error. Possible causes: +- * 1. Mandatory parameters are left unspecified; +- * 2. Incorrect parameter types; +- * 3. Parameter verification failed. +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 9 +- */ +- function sendAccessibilityEvent(event: EventInfo, callback: AccessibilityCallback): void; +- +- /** +- * Send accessibility event. +- * +- * @param { EventInfo } event The object of the accessibility {@code EventInfo} . +- * @returns { Promise } Returns {@code true} if success ; returns {@code false} otherwise. +- * @throws { BusinessError } 401 - Input parameter error. Possible causes: +- * 1. Mandatory parameters are left unspecified; +- * 2. Incorrect parameter types; +- * 3. Parameter verification failed. +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 9 +- */ +- function sendAccessibilityEvent(event: EventInfo): Promise; +- +- /** +- * Register the observe. +- * +- * @param { ObserverEventType } type state event type. +- * @param { Callback } callback Asynchronous callback interface. +- * @throws { BusinessError } 401 - Input parameter error. Possible causes: +- * 1. Mandatory parameters are left unspecified; +- * 2. Incorrect parameter types; +- * 3. Parameter verification failed. +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +- function on(type: ObserverEventType, callback: Callback): void; +- +- /** +- * Unregister the observe. +- * +- * @param { ObserverEventType } type state event type +- * @param { Callback } callback Asynchronous callback interface. +- * @throws { BusinessError } 401 - Input parameter error. Possible causes: +- * 1. Mandatory parameters are left unspecified; +- * 2. Incorrect parameter types; +- * 3. Parameter verification failed. +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +- function off(type: ObserverEventType, callback?: Callback): void; +- +- /** +- * Indicates the info of events. +- * +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +- class EventInfo { +- /** +- * A constructor used to create a EventInfo object. +- * +- * @param { EventType } type - The type of the accessibility event. +- * @param { string } bundleName - The name of the bundle. +- * @param { Action } triggerAction - The action that the ability can execute. +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 11 +- */ +- constructor(type: EventType, bundleName: string, triggerAction: Action); +- /** +- * The type of an accessibility event. +- * @type { EventType } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +- public type: EventType; +- +- /** +- * The type of the window change event. +- * @type { ?WindowUpdateType } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +- public windowUpdateType?: WindowUpdateType; +- +- /** +- * The bundle name of the target application. +- * @type { string } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +- public bundleName: string; +- +- /** +- * The type of the event source component,such as button, chart. +- * @type { ?string } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +- public componentType?: string; +- +- /** +- * The page id of the event source. +- * @type { ?number } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +- public pageId?: number; +- +- /** +- * The accessibility event description. +- * @type { ?string } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +- public description?: string; +- +- /** +- * The action that triggers the accessibility event, for example, clicking or focusing a view. +- * @type { Action } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +- public triggerAction: Action; +- +- /** +- * The movement step used for reading texts. +- * @type { ?TextMoveUnit } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +- public textMoveUnit?: TextMoveUnit; +- +- /** +- * The content list. +- * @type { ?Array } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +- public contents?: Array; +- +- /** +- * The content changed before. +- * @type { ?string } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +- public lastContent?: string; +- +- /** +- * The start index of listed items on the screen. +- * @type { ?number } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +- public beginIndex?: number; +- +- /** +- * The index of the current item on the screen. +- * @type { ?number } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +- public currentIndex?: number; +- +- /** +- * The end index of listed items on the screen. +- * @type { ?number } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +- public endIndex?: number; +- +- /** +- * The total of the items, talkback used it when scroll. +- * @type { ?number } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 +- */ +- public itemCount?: number; +- +- /** +- * The id of element. +- * @type { ?number } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 12 +- */ +- public elementId?: number; +- +- /** +- * The content of announce accessibility text. +- * @type { ?string } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 12 +- */ +- public textAnnouncedForAccessibility?: string; +- +- /** +- * The customized element id. +- * @type { ?string } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 12 +- */ +- public customId?: string; +- } +-} +-export default accessibility; +\ No newline at end of file +diff --git a/api/@ohos.accessibility.d.ts b/api/@ohos.accessibility.d.ts +index b8de1bc19..1e6d92042 100644 +--- a/api/@ohos.accessibility.d.ts ++++ b/api/@ohos.accessibility.d.ts +@@ -35,7 +35,8 @@ import { Resource } from './global/resource'; + * @namespace accessibility + * @syscap SystemCapability.BarrierFree.Accessibility.Core + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace accessibility { + /** +@@ -73,7 +74,8 @@ declare namespace accessibility { + * + * @typedef {'accessibilityFocus' | 'clearAccessibilityFocus' | 'focus' | 'clearFocus' | 'clearSelection' | 'click' | 'longClick' | 'cut' | 'copy' | 'paste' | 'select' | 'setText' | 'delete' | 'scrollForward' | 'scrollBackward' | 'setSelection' | 'setCursorPosition' | 'home' | 'back' | 'recentTask' | 'notificationCenter' | 'controlCenter' | 'common'} + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type Action = 'accessibilityFocus' | 'clearAccessibilityFocus' | 'focus' | 'clearFocus' | 'clearSelection' | + 'click' | 'longClick' | 'cut' | 'copy' | 'paste' | 'select' | 'setText' | 'delete' | +@@ -113,7 +115,8 @@ declare namespace accessibility { + * + * @typedef {'accessibilityFocus' | 'accessibilityFocusClear' | 'click' | 'longClick' | 'focus' | 'select' | 'hoverEnter' | 'hoverExit' | 'textUpdate' | 'textSelectionUpdate' | 'scroll' | 'requestFocusForAccessibility' | 'announceForAccessibility' | 'requestFocusForAccessibilityNotInterrupt' | 'announceForAccessibilityNotInterrupt' | 'scrolling'} + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type EventType = 'accessibilityFocus' | 'accessibilityFocusClear' | + 'click' | 'longClick' | 'focus' | 'select' | 'hoverEnter' | 'hoverExit' | +@@ -127,7 +130,8 @@ declare namespace accessibility { + * + * @typedef {'add' | 'remove' | 'bounds' | 'active' | 'focus'} + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type WindowUpdateType = 'add' | 'remove' | 'bounds' | 'active' | 'focus'; + +@@ -160,7 +164,8 @@ declare namespace accessibility { + * + * @typedef {'char' | 'word' | 'line' | 'page' | 'paragraph'} + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type TextMoveUnit = 'char' | 'word' | 'line' | 'page' | 'paragraph'; + +@@ -199,7 +204,8 @@ declare namespace accessibility { + * @returns { boolean } Returns true if the accessibility is enabled; returns false otherwise. + * @syscap SystemCapability.BarrierFree.Accessibility.Core + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isOpenAccessibilitySync(): boolean; + +@@ -238,7 +244,8 @@ declare namespace accessibility { + * @returns { boolean } Returns true if the touch browser is enabled; returns false otherwise. + * @syscap SystemCapability.BarrierFree.Accessibility.Vision + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isOpenTouchGuideSync(): boolean; + +@@ -365,7 +372,8 @@ declare namespace accessibility { + * 2. Incorrect parameter types; + * 3. Parameter verification failed. + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function sendAccessibilityEvent(event: EventInfo, callback: AsyncCallback): void; + +@@ -379,7 +387,8 @@ declare namespace accessibility { + * 2. Incorrect parameter types; + * 3. Parameter verification failed. + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function sendAccessibilityEvent(event: EventInfo): Promise; + +@@ -393,7 +402,8 @@ declare namespace accessibility { + * 2. Incorrect parameter types; + * 3. Parameter verification failed. + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'accessibilityStateChange', callback: Callback): void; + +@@ -407,7 +417,8 @@ declare namespace accessibility { + * 2. Incorrect parameter types; + * 3. Parameter verification failed. + * @syscap SystemCapability.BarrierFree.Accessibility.Vision +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'touchGuideStateChange', callback: Callback): void; + +@@ -420,7 +431,8 @@ declare namespace accessibility { + * 2. Incorrect parameter types; + * 3. Parameter verification failed. + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'screenReaderStateChange', callback: Callback): void; + +@@ -434,7 +446,8 @@ declare namespace accessibility { + * 2. Incorrect parameter types; + * 3. Parameter verification failed. + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'accessibilityStateChange', callback?: Callback): void; + +@@ -448,7 +461,8 @@ declare namespace accessibility { + * 2. Incorrect parameter types; + * 3. Parameter verification failed. + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'touchGuideStateChange', callback?: Callback): void; + +@@ -461,7 +475,8 @@ declare namespace accessibility { + * 2. Incorrect parameter types; + * 3. Parameter verification failed. + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'screenReaderStateChange', callback?: Callback): void; + +@@ -733,7 +748,8 @@ declare namespace accessibility { + * Indicates the info of events. + * + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class EventInfo { + /** +@@ -751,14 +767,16 @@ declare namespace accessibility { + * @param { string } bundleName - The name of the bundle. + * @param { Action } triggerAction - The action that the ability can execute. + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + constructor(type: EventType, bundleName: string, triggerAction: Action); + /** + * The type of an accessibility event. + * @type { EventType } + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type: EventType; + +@@ -766,7 +784,8 @@ declare namespace accessibility { + * The type of the window change event. + * @type { ?WindowUpdateType } + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + windowUpdateType?: WindowUpdateType; + +@@ -774,7 +793,8 @@ declare namespace accessibility { + * The bundle name of the target application. + * @type { string } + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + bundleName: string; + +@@ -782,7 +802,8 @@ declare namespace accessibility { + * The type of the event source component,such as button, chart. + * @type { ?string } + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + componentType?: string; + +@@ -798,7 +819,8 @@ declare namespace accessibility { + * The accessibility event description. + * @type { ?string } + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + description?: string; + +@@ -806,7 +828,8 @@ declare namespace accessibility { + * The action that triggers the accessibility event, for example, clicking or focusing a view. + * @type { Action } + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + triggerAction: Action; + +@@ -814,7 +837,8 @@ declare namespace accessibility { + * The movement step used for reading texts. + * @type { ?TextMoveUnit } + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + textMoveUnit?: TextMoveUnit; + +@@ -822,7 +846,8 @@ declare namespace accessibility { + * The content list. + * @type { ?Array } + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + contents?: Array; + +@@ -830,7 +855,8 @@ declare namespace accessibility { + * The content changed before. + * @type { ?string } + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + lastContent?: string; + +@@ -878,7 +904,8 @@ declare namespace accessibility { + * The content of announce accessibility text. + * @type { ?string } + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + textAnnouncedForAccessibility?: string; + +@@ -894,7 +921,8 @@ declare namespace accessibility { + * The customized element id. + * @type { ?string } + * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + customId?: string; + } +diff --git a/api/@ohos.app.ability.ActionExtensionAbility.d.ts b/api/@ohos.app.ability.ActionExtensionAbility.d.ts +index 8ef2dfd94..bfa54a6e0 100644 +--- a/api/@ohos.app.ability.ActionExtensionAbility.d.ts ++++ b/api/@ohos.app.ability.ActionExtensionAbility.d.ts +@@ -26,7 +26,8 @@ import UIExtensionAbility from './@ohos.app.ability.UIExtensionAbility'; + * @extends UIExtensionAbility + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export default class ActionExtensionAbility extends UIExtensionAbility { + } +\ No newline at end of file +diff --git a/api/@ohos.app.ability.ApplicationStateChangeCallback.d.ts b/api/@ohos.app.ability.ApplicationStateChangeCallback.d.ts +index ec7e69fc2..f26e63dd9 100644 +--- a/api/@ohos.app.ability.ApplicationStateChangeCallback.d.ts ++++ b/api/@ohos.app.ability.ApplicationStateChangeCallback.d.ts +@@ -43,7 +43,7 @@ + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +-declare class ApplicationStateChangeCallback { ++export default class ApplicationStateChangeCallback { + /** + * Called back when the state of the application changes to foreground. + * +@@ -95,6 +95,4 @@ declare class ApplicationStateChangeCallback { + * @since 18 + */ + onApplicationBackground(): void; +-} +- +-export default ApplicationStateChangeCallback; +\ No newline at end of file ++} +\ No newline at end of file +diff --git a/api/@ohos.app.ability.AtomicServiceOptions.d.ts b/api/@ohos.app.ability.AtomicServiceOptions.d.ts +index 9168a95e2..694576fe1 100644 +--- a/api/@ohos.app.ability.AtomicServiceOptions.d.ts ++++ b/api/@ohos.app.ability.AtomicServiceOptions.d.ts +@@ -27,7 +27,8 @@ import StartOptions from './@ohos.app.ability.StartOptions'; + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export default class AtomicServiceOptions extends StartOptions { + /** +@@ -37,7 +38,8 @@ export default class AtomicServiceOptions extends StartOptions { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + flags?: number; + +@@ -48,7 +50,8 @@ export default class AtomicServiceOptions extends StartOptions { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + parameters?: Record; + } +\ No newline at end of file +diff --git a/api/@ohos.app.ability.DriverExtensionAbility.d.ts b/api/@ohos.app.ability.DriverExtensionAbility.d.ts +index e2573372e..bd373b2c2 100644 +--- a/api/@ohos.app.ability.DriverExtensionAbility.d.ts ++++ b/api/@ohos.app.ability.DriverExtensionAbility.d.ts +@@ -27,7 +27,8 @@ import _DriverExtensionContext from './application/DriverExtensionContext'; + * + * @typedef { _DriverExtensionContext } + * @syscap SystemCapability.Driver.ExternalDevice +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export type DriverExtensionContext = _DriverExtensionContext; + +@@ -35,16 +36,18 @@ export type DriverExtensionContext = _DriverExtensionContext; + * class of driver extension ability. + * @syscap SystemCapability.Driver.ExternalDevice + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +-export default class DriverExtensionAbility { ++declare class DriverExtensionAbility { + /** + * Indicates driver extension ability context. + * + * @type { DriverExtensionContext } + * @syscap SystemCapability.Driver.ExternalDevice + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + context: DriverExtensionContext; + +@@ -53,7 +56,8 @@ export default class DriverExtensionAbility { + * @param { Want } want - Indicates the want of created driver extension. + * @syscap SystemCapability.Driver.ExternalDevice + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onInit(want: Want): void; + +@@ -61,7 +65,8 @@ export default class DriverExtensionAbility { + * Called back before a driver extension is destroyed. + * @syscap SystemCapability.Driver.ExternalDevice + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onRelease(): void; + +@@ -71,7 +76,8 @@ export default class DriverExtensionAbility { + * @returns { rpc.RemoteObject | Promise } Rpc remoteObject. + * @syscap SystemCapability.Driver.ExternalDevice + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onConnect(want: Want): rpc.RemoteObject | Promise; + +@@ -85,6 +91,17 @@ export default class DriverExtensionAbility { + */ + onDisconnect(want: Want): void | Promise; + ++ /** ++ * Called back when all abilities connected to a driver extension are disconnected. ++ * @param { Want } want - Indicates disconnection information about the driver extension. ++ * @returns { undefined | Promise } ++ * @syscap SystemCapability.Driver.ExternalDevice ++ * @stagemodelonly ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ onDisconnect(want: Want): undefined | Promise; ++ + /** + * Called when dump client information is required. + * It is recommended that developers don't DUMP sensitive information. +@@ -92,7 +109,17 @@ export default class DriverExtensionAbility { + * @returns { Array } The dump info array. + * @syscap SystemCapability.Driver.ExternalDevice + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onDump(params: Array): Array; + } ++ ++/** ++ * class of driver extension ability. ++ * @syscap SystemCapability.Driver.ExternalDevice ++ * @stagemodelonly ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++export default DriverExtensionAbility; +diff --git a/api/@ohos.app.ability.EnvironmentCallback.d.ts b/api/@ohos.app.ability.EnvironmentCallback.d.ts +index a501cb684..5c1e00bae 100644 +--- a/api/@ohos.app.ability.EnvironmentCallback.d.ts ++++ b/api/@ohos.app.ability.EnvironmentCallback.d.ts +@@ -37,7 +37,7 @@ import { Configuration } from './@ohos.app.ability.Configuration'; + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +-declare class EnvironmentCallback { ++export default class EnvironmentCallback { + /** + * Called when the system configuration is updated. + * +@@ -77,5 +77,4 @@ declare class EnvironmentCallback { + * @since 11 + */ + onMemoryLevel(level: AbilityConstant.MemoryLevel): void; +-} +-export default EnvironmentCallback; +\ No newline at end of file ++} +\ No newline at end of file +diff --git a/api/@ohos.app.ability.PrintExtensionAbility.d.ts b/api/@ohos.app.ability.PrintExtensionAbility.d.ts +index ce61e8acf..eccc0acff 100644 +--- a/api/@ohos.app.ability.PrintExtensionAbility.d.ts ++++ b/api/@ohos.app.ability.PrintExtensionAbility.d.ts +@@ -18,7 +18,7 @@ + * @kit BasicServicesKit + */ + +-import type Want from './@ohos.application.Want'; ++import type Want from './@ohos.app.ability.Want'; + import type print from './@ohos.print'; + + /** +@@ -26,16 +26,18 @@ import type print from './@ohos.print'; + * + * @syscap SystemCapability.Print.PrintFramework + * @stagemodelonly +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +-export default class PrintExtensionAbility { ++declare class PrintExtensionAbility { + + /** + * Called once to initialize the extensionAbility. + * @param { Want } want - call print page want params. + * @syscap SystemCapability.Print.PrintFramework + * @stagemodelonly +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onCreate(want: Want): void; + +@@ -43,7 +45,8 @@ export default class PrintExtensionAbility { + * Called once to start to discover the printers connected with the device. + * @syscap SystemCapability.Print.PrintFramework + * @stagemodelonly +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onStartDiscoverPrinter(): void; + +@@ -51,7 +54,8 @@ export default class PrintExtensionAbility { + * Called once to stop discovering the printer. + * @syscap SystemCapability.Print.PrintFramework + * @stagemodelonly +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onStopDiscoverPrinter(): void; + +@@ -60,7 +64,8 @@ export default class PrintExtensionAbility { + * @param { number } printerId - connect the printerId. + * @syscap SystemCapability.Print.PrintFramework + * @stagemodelonly +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onConnectPrinter(printerId: number): void; + +@@ -69,7 +74,8 @@ export default class PrintExtensionAbility { + * @param { number } printerId - connect the printerId. + * @syscap SystemCapability.Print.PrintFramework + * @stagemodelonly +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onDisconnectPrinter(printerId: number): void; + +@@ -80,7 +86,8 @@ export default class PrintExtensionAbility { + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. + * @stagemodelonly +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onStartPrintJob(jobInfo: print.PrintJob): void; + +@@ -91,7 +98,8 @@ export default class PrintExtensionAbility { + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. + * @stagemodelonly +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onCancelPrintJob(jobInfo: print.PrintJob): void; + +@@ -103,7 +111,8 @@ export default class PrintExtensionAbility { + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. + * @stagemodelonly +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onRequestPrinterCapability(printerId: number): print.PrinterCapability; + +@@ -115,7 +124,8 @@ export default class PrintExtensionAbility { + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. + * @stagemodelonly +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onRequestPreview(jobInfo: print.PrintJob): string; + +@@ -123,7 +133,10 @@ export default class PrintExtensionAbility { + * Called once to finalize the extensionAbility. + * @syscap SystemCapability.Print.PrintFramework + * @stagemodelonly +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onDestroy(): void; + } ++ ++export default PrintExtensionAbility; +\ No newline at end of file +diff --git a/api/@ohos.app.ability.ServiceExtensionAbility.d.ts b/api/@ohos.app.ability.ServiceExtensionAbility.d.ts +index ec6aefcd7..d165ae8b8 100644 +--- a/api/@ohos.app.ability.ServiceExtensionAbility.d.ts ++++ b/api/@ohos.app.ability.ServiceExtensionAbility.d.ts +@@ -193,7 +193,8 @@ declare class ServiceExtensionAbility { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onDump(params: Array): Array; + } +diff --git a/api/@ohos.app.ability.ShareExtensionAbility.d.ts b/api/@ohos.app.ability.ShareExtensionAbility.d.ts +index 8f6013e83..bcedcbbf4 100644 +--- a/api/@ohos.app.ability.ShareExtensionAbility.d.ts ++++ b/api/@ohos.app.ability.ShareExtensionAbility.d.ts +@@ -26,7 +26,8 @@ import UIExtensionAbility from './@ohos.app.ability.UIExtensionAbility'; + * @extends UIExtensionAbility + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export default class ShareExtensionAbility extends UIExtensionAbility { + } +\ No newline at end of file +diff --git a/api/@ohos.app.ability.UIAbility.d.ts b/api/@ohos.app.ability.UIAbility.d.ts +index 5d9649d4d..7e26b75a9 100644 +--- a/api/@ohos.app.ability.UIAbility.d.ts ++++ b/api/@ohos.app.ability.UIAbility.d.ts +@@ -147,8 +147,7 @@ export interface Caller { + * @throws { BusinessError } 16000050 - Internal error. + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @stagemodelonly +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + call(method: string, data: rpc.Parcelable): Promise; + +@@ -539,10 +538,6 @@ declare class UIAbility extends Ability { + */ + /** + * Called back before an ability is destroyed. +- * After the onDestroy() lifecycle callback is executed, the application may exit. Consequently, +- * the asynchronous function (for example, asynchronously writing data to the database) in onDestroy() may fail to be executed. +- * You can use the asynchronous lifecycle to ensure that the subsequent lifecycle continues only after the +- * asynchronous function in onDestroy() finishes the execution. + * + * @returns { void | Promise } the promise returned by the function. + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore +@@ -620,7 +615,8 @@ declare class UIAbility extends Ability { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @stagemodelonly + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onWillForeground(): void; + +@@ -630,7 +626,8 @@ declare class UIAbility extends Ability { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @stagemodelonly + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onDidForeground(): void; + +@@ -667,7 +664,8 @@ declare class UIAbility extends Ability { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @stagemodelonly + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onWillBackground(): void; + +@@ -677,7 +675,8 @@ declare class UIAbility extends Ability { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @stagemodelonly + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onDidBackground(): void; + +@@ -735,8 +734,8 @@ declare class UIAbility extends Ability { + * @since 10 + */ + /** +- * Called when a UIAbility instance that has undergone the following states is started again: +- * started in the foreground, running in the foreground, and switched to the background. ++ * Called when the launch mode of an ability is set to singleton. ++ * This happens when you re-launch an ability that has been at the top of the ability stack. + * + * @param { Want } want - Indicates the want info of ability. + * @param { AbilityConstant.LaunchParam } launchParam - Indicates the launch parameters. +@@ -768,7 +767,8 @@ declare class UIAbility extends Ability { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @stagemodelonly + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onDump(params: Array): Array; + +diff --git a/api/@ohos.app.ability.UIExtensionContentSession.d.ts b/api/@ohos.app.ability.UIExtensionContentSession.d.ts +index c9f134923..c7d739ee3 100644 +--- a/api/@ohos.app.ability.UIExtensionContentSession.d.ts ++++ b/api/@ohos.app.ability.UIExtensionContentSession.d.ts +@@ -17,8 +17,9 @@ + * @file + * @kit AbilityKit + */ +- +-import { AbilityResult } from './ability/abilityResult'; ++/*** if arkts 1.1 */ ++import type { AbilityResult } from './ability/abilityResult'; ++/*** endif */ + import type AbilityStartCallback from './application/AbilityStartCallback'; + import type { AsyncCallback } from './@ohos.base'; + import type Want from './@ohos.app.ability.Want'; +@@ -26,6 +27,7 @@ import type StartOptions from './@ohos.app.ability.StartOptions'; + import type uiExtensionHost from './@ohos.uiExtensionHost'; + import type uiExtension from './@ohos.arkui.uiExtension'; + /*** if arkts 1.2 */ ++import { AbilityResult } from './ability/abilityResult'; + import { LocalStorage } from './@ohos.arkui.stateManagement'; + /*** endif */ + +diff --git a/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts b/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts +index cc5d65241..73a423a81 100644 +--- a/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts ++++ b/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts +@@ -21,10 +21,8 @@ + import { AbilityDelegator as _AbilityDelegator } from './application/AbilityDelegator'; + import { AbilityDelegatorArgs as _AbilityDelegatorArgs } from './application/abilityDelegatorArgs'; + import { AbilityMonitor as _AbilityMonitor } from './application/AbilityMonitor'; +-import { ShellCmdResult as _ShellCmdResult } from './application/shellCmdResult'; +-/*** if arkts 1.1 */ + import { AbilityStageMonitor as _AbilityStageMonitor } from './application/AbilityStageMonitor'; +-/*** endif */ ++import { ShellCmdResult as _ShellCmdResult } from './application/shellCmdResult'; + /** + * A global register used to store the AbilityDelegator and AbilityDelegatorArgs objects registered + * during application startup. +@@ -152,7 +150,8 @@ declare namespace abilityDelegatorRegistry { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum AbilityLifecycleState { + /** +@@ -174,7 +173,8 @@ declare namespace abilityDelegatorRegistry { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + UNINITIALIZED, + +@@ -197,7 +197,8 @@ declare namespace abilityDelegatorRegistry { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CREATE, + +@@ -220,7 +221,8 @@ declare namespace abilityDelegatorRegistry { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FOREGROUND, + +@@ -243,7 +245,8 @@ declare namespace abilityDelegatorRegistry { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BACKGROUND, + +@@ -266,7 +269,8 @@ declare namespace abilityDelegatorRegistry { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DESTROY + } +@@ -374,7 +378,8 @@ declare namespace abilityDelegatorRegistry { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export type AbilityStageMonitor = _AbilityStageMonitor; + } +diff --git a/api/@ohos.app.ability.abilityManager.d.ts b/api/@ohos.app.ability.abilityManager.d.ts +index bbff3e824..2502f3fe0 100644 +--- a/api/@ohos.app.ability.abilityManager.d.ts ++++ b/api/@ohos.app.ability.abilityManager.d.ts +@@ -20,12 +20,12 @@ + + import { AsyncCallback } from './@ohos.base'; + import { ElementName } from './bundleManager/ElementName'; ++import { AbilityRunningInfo as _AbilityRunningInfo } from './application/AbilityRunningInfo'; ++import { ExtensionRunningInfo as _ExtensionRunningInfo } from './application/ExtensionRunningInfo'; + /*** if arkts 1.1 */ + import { AbilityResult } from './ability/abilityResult'; + import { Configuration } from './@ohos.app.ability.Configuration'; + import Context from './application/Context'; +-import { AbilityRunningInfo as _AbilityRunningInfo } from './application/AbilityRunningInfo'; +-import { ExtensionRunningInfo as _ExtensionRunningInfo } from './application/ExtensionRunningInfo'; + import * as _AbilityForegroundStateObserver from './application/AbilityForegroundStateObserver'; + import * as _AbilityStateData from './application/AbilityStateData'; + /*** endif */ +@@ -48,14 +48,16 @@ declare namespace abilityManager { + * + * @enum { number } + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum AbilityState { + /** + * Ability is initialized. + * + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INITIAL = 0, + +@@ -63,7 +65,8 @@ declare namespace abilityManager { + * Ability is in the state of getting focus. + * + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FOCUS = 2, + +@@ -71,7 +74,8 @@ declare namespace abilityManager { + * Ability is in the foreground state. + * + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FOREGROUND = 9, + +@@ -79,7 +83,8 @@ declare namespace abilityManager { + * Ability is in the background state. + * + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BACKGROUND = 10, + +@@ -87,7 +92,8 @@ declare namespace abilityManager { + * Ability is in the process of scheduling at the foreground. + * + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FOREGROUNDING = 11, + +@@ -95,7 +101,8 @@ declare namespace abilityManager { + * Ability is in the process of scheduling in the background. + * + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BACKGROUNDING = 12 + } +@@ -107,7 +114,8 @@ declare namespace abilityManager { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum UserStatus { + /** +@@ -116,7 +124,8 @@ declare namespace abilityManager { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ASSERT_TERMINATE = 0, + +@@ -126,7 +135,8 @@ declare namespace abilityManager { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ASSERT_CONTINUE = 1, + +@@ -136,7 +146,8 @@ declare namespace abilityManager { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ASSERT_RETRY = 2 + } +@@ -248,7 +259,8 @@ declare namespace abilityManager { + * @returns { Promise> } Returns the array of AbilityRunningInfo. + * @throws { BusinessError } 16000050 - Internal error. + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAbilityRunningInfos(): Promise>; + +@@ -265,7 +277,8 @@ declare namespace abilityManager { + * @throws { BusinessError } 16000050 - Internal error. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAbilityRunningInfos(callback: AsyncCallback>): void; + +@@ -434,7 +447,8 @@ declare namespace abilityManager { + * @throws { BusinessError } 16000050 - Internal error. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getForegroundUIAbilities(callback: AsyncCallback>): void; + +@@ -528,7 +542,8 @@ declare namespace abilityManager { + * @typedef { _AbilityRunningInfo } + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export type AbilityRunningInfo = _AbilityRunningInfo; + +@@ -558,7 +573,8 @@ declare namespace abilityManager { + * @typedef { _ExtensionRunningInfo } + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export type ExtensionRunningInfo = _ExtensionRunningInfo; + +diff --git a/api/@ohos.app.ability.appManager.d.ts b/api/@ohos.app.ability.appManager.d.ts +index 15be7af19..ed30a9e39 100644 +--- a/api/@ohos.app.ability.appManager.d.ts ++++ b/api/@ohos.app.ability.appManager.d.ts +@@ -35,7 +35,6 @@ import * as _AbilityFirstFrameStateData from './application/AbilityFirstFrameSta + import _ApplicationStateObserver from './application/ApplicationStateObserver'; + import _AbilityStateData from './application/AbilityStateData'; + import _AppStateData from './application/AppStateData'; +-import _ProcessData from './application/ProcessData'; + /*** endif */ + /** + * This module provides the function of app manager service. +@@ -547,7 +546,8 @@ declare namespace appManager { + * @throws { BusinessError } 16000050 - Internal error. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function killProcessWithAccount(bundleName: string, accountId: number): Promise; + +@@ -567,7 +567,8 @@ declare namespace appManager { + * @throws { BusinessError } 16000050 - Internal error. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function killProcessWithAccount(bundleName: string, accountId: number, clearPageStack: boolean, appIndex?: number): + Promise; +@@ -603,7 +604,8 @@ declare namespace appManager { + * @throws { BusinessError } 16000050 - Internal error. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function killProcessWithAccount(bundleName: string, accountId: number, callback: AsyncCallback): void; + +@@ -890,7 +892,8 @@ declare namespace appManager { + * @throws { BusinessError } 16000050 - Internal error. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getRunningProcessInformationByBundleType( + bundleType: bundleManager.BundleType): Promise>; +@@ -935,7 +938,8 @@ declare namespace appManager { + * @throws { BusinessError } 16000050 - Internal error. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isSharedBundleRunning(bundleName: string, versionCode: number): Promise; + +@@ -954,7 +958,8 @@ declare namespace appManager { + * @throws { BusinessError } 16000050 - Internal error. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isSharedBundleRunning(bundleName: string, versionCode: number, callback: AsyncCallback): void; + +@@ -969,7 +974,8 @@ declare namespace appManager { + * @throws { BusinessError } 16000050 - Internal error. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getProcessMemoryByPid(pid: number): Promise; + +@@ -984,7 +990,8 @@ declare namespace appManager { + * @throws { BusinessError } 16000050 - Internal error. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getProcessMemoryByPid(pid: number, callback: AsyncCallback): void; + +@@ -1145,7 +1152,8 @@ declare namespace appManager { + * @throws { BusinessError } 16000050 - Internal error. + * @throws { BusinessError } 16000073 - The app clone index is invalid. + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isAppRunning(bundleName: string, appCloneIndex?: number): Promise; + +@@ -1200,7 +1208,8 @@ declare namespace appManager { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi + * @stagemodelonly +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSupportedProcessCachePids(bundleName : string): Promise>; + +@@ -1224,7 +1233,8 @@ declare namespace appManager { + * @throws { BusinessError } 16300010 - The target application is not attached to status bar. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setKeepAliveForBundle(bundleName: string, userId: number, enable: boolean): Promise; + +@@ -1243,7 +1253,8 @@ declare namespace appManager { + * @throws { BusinessError } 16000050 - Internal error. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getKeepAliveBundles(type: KeepAliveAppType, userId?: number): Promise>; + +@@ -1261,7 +1272,8 @@ declare namespace appManager { + * @throws { BusinessError } 16000050 - Internal error. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function killProcessesInBatch(pids: Array): Promise; + +@@ -1363,17 +1375,6 @@ declare namespace appManager { + */ + export type ProcessData = _ProcessData.default; + +- /** +- * The class of a process information. +- * +- * @typedef { _ProcessData.default } +- * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @systemapi +- * @since 20 +- * @arkts 1.2 +- */ +- export type ProcessData = _ProcessData; +- + /** + * The ability first frame state observer. + * +diff --git a/api/@ohos.app.ability.application.d.ts b/api/@ohos.app.ability.application.d.ts +index 38c7e2113..d34e6188b 100644 +--- a/api/@ohos.app.ability.application.d.ts ++++ b/api/@ohos.app.ability.application.d.ts +@@ -92,7 +92,8 @@ declare namespace application { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export function getApplicationContext(): ApplicationContext; + } +diff --git a/api/@ohos.app.ability.autoFillManager.d.ts b/api/@ohos.app.ability.autoFillManager.d.ts +index 2530bbcc6..b18eefefd 100644 +--- a/api/@ohos.app.ability.autoFillManager.d.ts ++++ b/api/@ohos.app.ability.autoFillManager.d.ts +@@ -317,7 +317,7 @@ declare namespace autoFillManager { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @stagemodelonly +- * @since 11 ++ * @since 12 + */ + export type AutoFillPopupConfig = _AutoFillPopupConfig.default; + +@@ -328,7 +328,7 @@ declare namespace autoFillManager { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @stagemodelonly +- * @since 11 ++ * @since 12 + */ + export type PopupSize = _AutoFillPopupConfig.PopupSize; + +diff --git a/api/@ohos.app.ability.dataUriUtils.d.ts b/api/@ohos.app.ability.dataUriUtils.d.ts +index cdaa9b52b..63ba6905b 100644 +--- a/api/@ohos.app.ability.dataUriUtils.d.ts ++++ b/api/@ohos.app.ability.dataUriUtils.d.ts +@@ -23,7 +23,8 @@ + * + * @namespace dataUriUtils + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace dataUriUtils { + /** +@@ -34,7 +35,8 @@ declare namespace dataUriUtils { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getId(uri: string): number; + +@@ -47,7 +49,8 @@ declare namespace dataUriUtils { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function attachId(uri: string, id: number): string; + +@@ -59,7 +62,8 @@ declare namespace dataUriUtils { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function deleteId(uri: string): string; + +@@ -72,7 +76,8 @@ declare namespace dataUriUtils { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function updateId(uri: string, id: number): string; + } +diff --git a/api/@ohos.app.ability.errorManager.d.ts b/api/@ohos.app.ability.errorManager.d.ts +index 0cfab9798..fba090a7e 100644 +--- a/api/@ohos.app.ability.errorManager.d.ts ++++ b/api/@ohos.app.ability.errorManager.d.ts +@@ -37,6 +37,16 @@ import { LoopObserver as _LoopObserver } from './application/LoopObserver'; + * @atomicservice + * @since 11 + */ ++/** ++ * This module provides the function of error manager. ++ * ++ * @namespace errorManager ++ * @syscap SystemCapability.Ability.AbilityRuntime.Core ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + declare namespace errorManager { + /** + * Register error observer. +@@ -46,7 +56,7 @@ declare namespace errorManager { + * @returns { number } Returns the number code of the observer. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. +- * @throws { BusinessError } 16000003 - Id does not exist. ++ * @throws { BusinessError } 16000003 - The specified ID does not exist. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @since 9 + */ +@@ -63,6 +73,21 @@ declare namespace errorManager { + * @atomicservice + * @since 11 + */ ++ /** ++ * Register error observer. ++ * ++ * @param { 'error' } type - error. ++ * @param { ErrorObserver } observer - The error observer. ++ * @returns { number } Returns the number code of the observer. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ * 2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 16000003 - The specified ID does not exist. ++ * @syscap SystemCapability.Ability.AbilityRuntime.Core ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + function on(type: 'error', observer: ErrorObserver): number; + + /** +@@ -73,7 +98,7 @@ declare namespace errorManager { + * @param { AsyncCallback } callback - The callback of off. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. +- * @throws { BusinessError } 16000003 - Id does not exist. ++ * @throws { BusinessError } 16000003 - The specified ID does not exist. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @since 9 + */ +@@ -90,6 +115,21 @@ declare namespace errorManager { + * @atomicservice + * @since 11 + */ ++ /** ++ * Unregister error observer. ++ * ++ * @param { 'error' } type - error. ++ * @param { number } observerId - Indicates the number code of the observer. ++ * @param { AsyncCallback } callback - The callback of off. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ * 2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 16000003 - The specified ID does not exist. ++ * @syscap SystemCapability.Ability.AbilityRuntime.Core ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + function off(type: 'error', observerId: number, callback: AsyncCallback): void; + + /** +@@ -100,7 +140,7 @@ declare namespace errorManager { + * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. +- * @throws { BusinessError } 16000003 - Id does not exist. ++ * @throws { BusinessError } 16000003 - The specified ID does not exist. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @since 9 + */ +@@ -117,6 +157,21 @@ declare namespace errorManager { + * @atomicservice + * @since 11 + */ ++ /** ++ * Unregister error observer. ++ * ++ * @param { 'error' } type - error. ++ * @param { number } observerId - Indicates the number code of the observer. ++ * @returns { Promise } The promise returned by the function. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ * 2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 16000003 - The specified ID does not exist. ++ * @syscap SystemCapability.Ability.AbilityRuntime.Core ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + function off(type: 'error', observerId: number): Promise; + + /** +@@ -272,6 +327,22 @@ declare namespace errorManager { + * @atomicservice + * @since 12 + */ ++ /** ++ * Register loop observer. This function can only by called from main thread, ++ * and if call this function multiple times, the last ++ * modification will overwrite the previous one. ++ * ++ * @param { 'loopObserver' } type - loopObserver. ++ * @param { number } timeout - Indicates timeout(ms) value of loop observer. ++ * @param { LoopObserver } observer - The loop observer. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ * 2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Ability.AbilityRuntime.Core ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + function on(type: 'loopObserver', timeout: number, observer: LoopObserver): void; + + /** +@@ -285,6 +356,19 @@ declare namespace errorManager { + * @atomicservice + * @since 12 + */ ++ /** ++ * Unregister loop observer. This function can only by called from main thread. ++ * ++ * @param { 'loopObserver' } type - loopObserver. ++ * @param { LoopObserver } observer - The loop observer. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ * 2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Ability.AbilityRuntime.Core ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + function off(type: 'loopObserver', observer?: LoopObserver): void; + + /** +@@ -294,11 +378,25 @@ declare namespace errorManager { + * @param { UnhandledRejectionObserver } observer - The unhandled rejection observer. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. +- * @throws { BusinessError } 16200001 - If the caller is invalid. ++ * @throws { BusinessError } 16200001 - The caller has been released. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @atomicservice + * @since 12 + */ ++ /** ++ * Register unhandled rejection observer. ++ * ++ * @param { 'unhandledRejection' } type - 'unhandledRejection'. ++ * @param { UnhandledRejectionObserver } observer - The unhandled rejection observer. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ * 2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 16200001 - The caller has been released. ++ * @syscap SystemCapability.Ability.AbilityRuntime.Core ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + function on(type: 'unhandledRejection', observer: UnhandledRejectionObserver): void; + + /** +@@ -308,12 +406,27 @@ declare namespace errorManager { + * @param { UnhandledRejectionObserver } [observer] - the registered observer + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. +- * @throws { BusinessError } 16200001 - If the caller is invalid. ++ * @throws { BusinessError } 16200001 - The caller has been released. + * @throws { BusinessError } 16300004 - If the observer does not exist + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @atomicservice + * @since 12 + */ ++ /** ++ * Unregister unhandled rejection observer. ++ * ++ * @param { 'unhandledRejection' } type - error. ++ * @param { UnhandledRejectionObserver } [observer] - the registered observer ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ * 2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 16200001 - The caller has been released. ++ * @throws { BusinessError } 16300004 - If the observer does not exist ++ * @syscap SystemCapability.Ability.AbilityRuntime.Core ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + function off(type: 'unhandledRejection', observer?: UnhandledRejectionObserver): void; + + /** +@@ -361,6 +474,16 @@ declare namespace errorManager { + * @atomicservice + * @since 11 + */ ++ /** ++ * The observer will be called by system when an error occurs. ++ * ++ * @typedef { _ErrorObserver.default } ++ * @syscap SystemCapability.Ability.AbilityRuntime.Core ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + export type ErrorObserver = _ErrorObserver.default; + /** + * The observer will be called when application main thread execute timeout. +@@ -370,6 +493,16 @@ declare namespace errorManager { + * @atomicservice + * @since 12 + */ ++ /** ++ * The observer will be called when application main thread execute timeout. ++ * ++ * @typedef { _LoopObserver } ++ * @syscap SystemCapability.Ability.AbilityRuntime.Core ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + export type LoopObserver = _LoopObserver; + /** + * The observer will be called by system when an unhandled rejection occurs. +@@ -381,6 +514,18 @@ declare namespace errorManager { + * @atomicservice + * @since 12 + */ ++ /** ++ * The observer will be called by system when an unhandled rejection occurs. ++ * ++ * @typedef { function } ++ * { Error | any } reason - the reason of the rejection, typically of Error type ++ * { Promise } promise - the promise that is rejected ++ * @syscap SystemCapability.Ability.AbilityRuntime.Core ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + export type UnhandledRejectionObserver = (reason: Error | any, promise: Promise) => void; + /** + * The observer will be called by system when freeze happens. +diff --git a/api/@ohos.app.ability.wantAgent.d.ts b/api/@ohos.app.ability.wantAgent.d.ts +index b2076bb03..d66164801 100644 +--- a/api/@ohos.app.ability.wantAgent.d.ts ++++ b/api/@ohos.app.ability.wantAgent.d.ts +@@ -219,7 +219,7 @@ declare namespace wantAgent { + * Cancel a WantAgent. Only the application that creates the WantAgent can cancel it. + * + * @param { WantAgent } agent - Indicates the WantAgent. +- * @returns { Promise } The promise returned by the export function. ++ * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types. + * @throws { BusinessError } 16000007 - Service busy, there are concurrent tasks, waiting for retry. +@@ -231,7 +231,7 @@ declare namespace wantAgent { + * Cancel a WantAgent. Only the application that creates the WantAgent can cancel it. + * + * @param { WantAgent } agent - Indicates the WantAgent. +- * @returns { Promise } The promise returned by the export function. ++ * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types. + * @throws { BusinessError } 16000007 - Service busy. There are concurrent tasks. Try again later. +diff --git a/api/@ohos.app.form.FormExtensionAbility.d.ts b/api/@ohos.app.form.FormExtensionAbility.d.ts +index cbd0d1bd9..45c4805d4 100644 +--- a/api/@ohos.app.form.FormExtensionAbility.d.ts ++++ b/api/@ohos.app.form.FormExtensionAbility.d.ts +@@ -173,7 +173,7 @@ declare class FormExtensionAbility { + /** + * Called when the form provider receives form events from the system. + * +- * @param { Record } newStatus - Indicates the form events occurred. The key in the {@code Map} ++ * @param { Record } newStatus - Indicates the form events occurred. The key in the {@code Map} + * object indicates the form ID, and the value indicates the event + * type, which can be either + * {@link formInfo#VisibilityType#FORM_VISIBLE} or +@@ -187,7 +187,7 @@ declare class FormExtensionAbility { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- onChangeFormVisibility(newStatus: Record): void; ++ onChangeFormVisibility(newStatus: Record): void; + + /** + * Called when a specified message event defined by the form provider is triggered. This method is valid only for +diff --git a/api/@ohos.app.form.formHost.d.ts b/api/@ohos.app.form.formHost.d.ts +index 6911d97e5..9ddda125f 100644 +--- a/api/@ohos.app.form.formHost.d.ts ++++ b/api/@ohos.app.form.formHost.d.ts +@@ -617,7 +617,7 @@ declare namespace formHost { + * + * @permission ohos.permission.REQUIRE_FORM + * @param { Array } formIds - Indicates the specified form id. +- * @param { AsyncCallback } callback - The callback is used to return the number of invalid forms deleted ++ * @param { AsyncCallback } callback - The callback is used to return the number of invalid forms deleted + * by the Form Manager Service. + * @throws { BusinessError } 201 - Permissions denied. + * @throws { BusinessError } 202 - The application is not a system application. +@@ -630,7 +630,7 @@ declare namespace formHost { + * @systemapi + * @since 9 + */ +- function deleteInvalidForms(formIds: Array, callback: AsyncCallback): void; ++ function deleteInvalidForms(formIds: Array, callback: AsyncCallback): void; + + /** + * Deletes invalid forms of the application in the Form Manager Service based on the list of. +@@ -638,7 +638,7 @@ declare namespace formHost { + * + * @permission ohos.permission.REQUIRE_FORM + * @param { Array } formIds - Indicates the specified form id. +- * @returns { Promise } Returns the number of invalid forms deleted by the Form Manager Service. ++ * @returns { Promise } Returns the number of invalid forms deleted by the Form Manager Service. + * @throws { BusinessError } 201 - Permissions denied. + * @throws { BusinessError } 202 - The application is not a system application. + * @throws { BusinessError } 401 - Parameter error. Possible causes: +@@ -650,7 +650,7 @@ declare namespace formHost { + * @systemapi + * @since 9 + */ +- function deleteInvalidForms(formIds: Array): Promise; ++ function deleteInvalidForms(formIds: Array): Promise; + + /** + * Obtains the Form state. +diff --git a/api/@ohos.app.form.formInfo.d.ts b/api/@ohos.app.form.formInfo.d.ts +index 18ca442af..eef4683c2 100644 +--- a/api/@ohos.app.form.formInfo.d.ts ++++ b/api/@ohos.app.form.formInfo.d.ts +@@ -140,13 +140,13 @@ declare namespace formInfo { + /** + * Obtains the displayName resource id of this form. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Ability.Form + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- displayNameId: number; ++ displayNameId: int; + + /** + * Obtains the description of this form. +@@ -169,20 +169,20 @@ declare namespace formInfo { + /** + * Obtains the description id of this form. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Ability.Form + * @since 10 + */ + /** + * Obtains the description id of this form. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Ability.Form + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- descriptionId: number; ++ descriptionId: int; + + /** + * Obtains the type of this form. Currently, JS forms are supported. +@@ -233,8 +233,8 @@ declare namespace formInfo { + * @type { ColorMode } + * @syscap SystemCapability.Ability.Form + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 ++ * @deprecated since 20 + */ + colorMode: ColorMode; + +@@ -331,56 +331,56 @@ declare namespace formInfo { + /** + * Obtains the updateDuration. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Ability.Form + * @since 9 + */ + /** + * Obtains the updateDuration. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Ability.Form + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- updateDuration: number; ++ updateDuration: int; + + /** + * Obtains the default grid style of this form. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Ability.Form + * @since 9 + */ + /** + * Obtains the default grid style of this form. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Ability.Form + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- defaultDimension: number; ++ defaultDimension: int; + + /** + * Obtains the grid styles supported by this form. + * +- * @type { Array } ++ * @type { Array } + * @syscap SystemCapability.Ability.Form + * @since 9 + */ + /** + * Obtains the grid styles supported by this form. + * +- * @type { Array } ++ * @type { Array } + * @syscap SystemCapability.Ability.Form + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- supportDimensions: Array; ++ supportDimensions: Array; + + /** + * Obtains the custom data defined in this form. +@@ -433,18 +433,18 @@ declare namespace formInfo { + /** + * Obtains the shape supported by this form. + * +- * @type { Array } ++ * @type { Array } + * @syscap SystemCapability.Ability.Form + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- supportedShapes: Array; ++ supportedShapes: Array; + + /** + * Indicates the form previewImage IDs map corresponds to the \"supportDimensions\". + * +- * @type { ?Array } ++ * @type { ?Array } + * @readonly + * @syscap SystemCapability.Ability.Form + * @systemapi +@@ -452,7 +452,7 @@ declare namespace formInfo { + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly previewImages?: Array; ++ readonly previewImages?: Array; + + /** + * Indicates whether the form uses a blur background provided by the form host. +@@ -482,7 +482,7 @@ declare namespace formInfo { + /** + * Rendering mode. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Ability.Form + * @systemapi + * @since arkts {'1.1':'18', '1.2':'20'} +@@ -521,14 +521,14 @@ declare namespace formInfo { + /** + * Type of form. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Ability.Form + * @since 9 + */ + /** + * Type of form. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Ability.Form + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} +@@ -571,18 +571,18 @@ declare namespace formInfo { + /** + * Color mode. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Ability.Form + * @since 9 + */ + /** + * Color mode. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Ability.Form + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 ++ * @deprecated since 20 + */ + enum ColorMode { + /** +@@ -596,8 +596,8 @@ declare namespace formInfo { + * + * @syscap SystemCapability.Ability.Form + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 ++ * @deprecated since 20 + */ + MODE_AUTO = -1, + +@@ -612,8 +612,8 @@ declare namespace formInfo { + * + * @syscap SystemCapability.Ability.Form + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 ++ * @deprecated since 20 + */ + MODE_DARK = 0, + +@@ -628,8 +628,8 @@ declare namespace formInfo { + * + * @syscap SystemCapability.Ability.Form + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 ++ * @deprecated since 20 + */ + MODE_LIGHT = 1 + } +@@ -691,14 +691,14 @@ declare namespace formInfo { + /** + * Provides state about a form. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Ability.Form + * @since 9 + */ + /** + * Provides state about a form. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Ability.Form + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} +@@ -1236,38 +1236,38 @@ declare namespace formInfo { + * optional supportedDimensions that used to ask getFormsInfo to return + * form infos with the same supportedDimensions. + * +- * @type { ?Array } ++ * @type { ?Array } + * @syscap SystemCapability.Ability.Form + * @systemapi + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- supportedDimensions?: Array; ++ supportedDimensions?: Array; + + /** + * optional supportedShapes that used to ask getFormsInfo to return + * form infos with the same supportedShapes. + * +- * @type { ?Array } ++ * @type { ?Array } + * @syscap SystemCapability.Ability.Form + * @systemapi + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- supportedShapes?: Array; ++ supportedShapes?: Array; + } + + /** + * Defines the FormDimension enum. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Ability.Form + * @since 9 + */ + /** + * Defines the FormDimension enum. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Ability.Form + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} +@@ -1304,7 +1304,7 @@ declare namespace formInfo { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- Dimension_2_2, ++ Dimension_2_2 = 2, + + /** + * 2 x 4 form +@@ -1320,7 +1320,7 @@ declare namespace formInfo { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- Dimension_2_4, ++ Dimension_2_4 = 3, + + /** + * 4 x 4 form +@@ -1336,7 +1336,7 @@ declare namespace formInfo { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- Dimension_4_4, ++ Dimension_4_4 = 4, + + /** + * 2 x 1 form +@@ -1349,10 +1349,10 @@ declare namespace formInfo { + * + * @syscap SystemCapability.Ability.Form + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 ++ * @deprecated since 20 + */ +- Dimension_2_1, ++ Dimension_2_1 = 5, + + /** + * 1 x 1 form +@@ -1392,23 +1392,13 @@ declare namespace formInfo { + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- DIMENSION_3_3 = 9, +- +- /** +- * 3 x 4 form used for tv devices +- * +- * @syscap SystemCapability.Ability.Form +- * @atomicservice +- * @since arkts {'1.1':'18', '1.2':'20'} +- * @arkts 1.1&1.2 +- */ +- DIMENSION_3_4 = 10 ++ DIMENSION_3_3 = 9 + } + + /** + * Defines the FormShape enum. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Ability.Form + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} +@@ -1439,14 +1429,14 @@ declare namespace formInfo { + /** + * The visibility of a form. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Ability.Form + * @since 9 + */ + /** + * The visibility of a form. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Ability.Form + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} +@@ -1515,14 +1505,14 @@ declare namespace formInfo { + /** + * Indicates the launch reason of a form. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Ability.Form + * @since 10 + */ + /** + * Indicates the launch reason of a form. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Ability.Form + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} +@@ -1600,7 +1590,7 @@ declare namespace formInfo { + /** + * The error code of publish form. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Ability.Form + * @systemapi + * @stagemodelonly +@@ -1843,15 +1833,15 @@ declare namespace formInfo { + /** + * Obtains the grid style of this form. + * +- * @type { number } +- * @readonly ++ * @type { int } + * @default - ++ * @readonly + * @syscap SystemCapability.Ability.Form + * @systemapi + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly dimension: number; ++ readonly dimension: int; + + /** + * Obtains the stage of form use. +@@ -1895,7 +1885,7 @@ declare namespace formInfo { + /** + * The stage of form use. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Ability.Form + * @systemapi + * @since arkts {'1.1':'11', '1.2':'20'} +@@ -1925,7 +1915,7 @@ declare namespace formInfo { + /** + * Defines the FormLocation enum. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Ability.Form + * @systemapi + * @since 12 +@@ -1933,7 +1923,7 @@ declare namespace formInfo { + /** + * Defines the FormLocation enum. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Ability.Form + * @since 20 + * @arkts 1.1&1.2 +diff --git a/api/@ohos.app.form.formProvider.d.ts b/api/@ohos.app.form.formProvider.d.ts +index a8a5583f4..f8bb55d0a 100644 +--- a/api/@ohos.app.form.formProvider.d.ts ++++ b/api/@ohos.app.form.formProvider.d.ts +@@ -46,7 +46,7 @@ declare namespace formProvider { + * Set next update time for a specified form. + * + * @param { string } formId - Indicates the form ID. +- * @param { number } minute - Indicates duration minute before next update. ++ * @param { int } minute - Indicates duration minute before next update. + * @param { AsyncCallback } callback - The callback of setFormNextRefreshTime. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. +@@ -64,7 +64,7 @@ declare namespace formProvider { + * Set next update time for a specified form. + * + * @param { string } formId - Indicates the form ID. +- * @param { number } minute - Indicates duration minute before next update. ++ * @param { int } minute - Indicates duration minute before next update. + * @param { AsyncCallback } callback - The callback of setFormNextRefreshTime. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. +@@ -80,13 +80,13 @@ declare namespace formProvider { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function setFormNextRefreshTime(formId: string, minute: number, callback: AsyncCallback): void; ++ function setFormNextRefreshTime(formId: string, minute: int, callback: AsyncCallback): void; + + /** + * Set next update time for a specified form. + * + * @param { string } formId - Indicates the form ID. +- * @param { number } minute - Indicates duration minute before next update. ++ * @param { int } minute - Indicates duration minute before next update. + * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. +@@ -104,7 +104,7 @@ declare namespace formProvider { + * Set next update time for a specified form. + * + * @param { string } formId - Indicates the form ID. +- * @param { number } minute - Indicates duration minute before next update. ++ * @param { int } minute - Indicates duration minute before next update. + * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. +@@ -120,7 +120,7 @@ declare namespace formProvider { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function setFormNextRefreshTime(formId: string, minute: number): Promise; ++ function setFormNextRefreshTime(formId: string, minute: int): Promise; + + /** + * Update a specified form. +@@ -386,8 +386,6 @@ declare namespace formProvider { + * + * @param { string } formId - Indicates the form ID. + * @returns { Promise } Returns the formInfo. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: +- * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. + * @throws { BusinessError } 16500050 - IPC connection error. + * @throws { BusinessError } 16500100 - Failed to obtain the configuration information. + * @throws { BusinessError } 16501000 - An internal functional error occurred. +@@ -434,8 +432,6 @@ declare namespace formProvider { + * Client to communication with FormManagerService. + * + * @param { Want } want - The want of the form to open. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: +- * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. + * @throws { BusinessError } 16500050 - IPC connection error. + * @throws { BusinessError } 16500100 - Failed to obtain the configuration information. + * @throws { BusinessError } 16501000 - An internal functional error occurred. +diff --git a/api/@ohos.application.AccessibilityExtensionAbility.d.ets b/api/@ohos.application.AccessibilityExtensionAbility.d.ets +deleted file mode 100644 +index 184e82be0..000000000 +--- a/api/@ohos.application.AccessibilityExtensionAbility.d.ets ++++ /dev/null +@@ -1,61 +0,0 @@ +-/* +- * Copyright (c) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"), +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-/** +- * @file +- * @kit AccessibilityKit +- */ +- +-/** +- * Indicates rectangle. +- * +- * @typedef Rect +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 20 +- */ +-export class Rect { +- /** +- * The left position of Rect +- * +- * @type { number } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 9 +- */ +- left: number; +- /** +- * The top position of Rect +- * +- * @type { number } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 9 +- */ +- top: number; +- /** +- * The width position of Rect +- * +- * @type { number } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 9 +- */ +- width: number; +- /** +- * The height position of Rect +- * +- * @type { number } +- * @syscap SystemCapability.BarrierFree.Accessibility.Core +- * @since 9 +- */ +- height: number; +-} +\ No newline at end of file +diff --git a/api/@ohos.application.BackupExtensionAbility.d.ets b/api/@ohos.application.BackupExtensionAbility.d.ets +deleted file mode 100644 +index f15261306..000000000 +--- a/api/@ohos.application.BackupExtensionAbility.d.ets ++++ /dev/null +@@ -1,78 +0,0 @@ +-/* +- * Copyright (c) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +- +-/** +- * Describe bundle version +- * +- * @interface BundleVersion +- * @syscap SystemCapability.FileManagement.StorageService.Backup +- * @StageModelOnly +- * @since 20 +- */ +-export interface BundleVersion { +- /** +- * Indicates bundle's version code. +- * +- * @type { number } +- * @syscap SystemCapability.FileManagement.StorageService.Backup +- * @StageModelOnly +- * @since 20 +- */ +- code: number; +- +- /** +- * Indicates bundle's version name. +- * +- * @type { string } +- * @syscap SystemCapability.FileManagement.StorageService.Backup +- * @StageModelOnly +- * @since 20 +- */ +- name: string; +-} +- +-/** +- * Class to be override for backup extension ability. +- * +- * @syscap SystemCapability.FileManagement.StorageService.Backup +- * @StageModelOnly +- * @since 20 +- */ +-declare class BackupExtensionAbility { +- +- /** +- * Callback to be called when the backup procedure is started. +- * Developer could override this method to build files to be backup. +- * +- * @syscap SystemCapability.FileManagement.StorageService.Backup +- * @StageModelOnly +- * @since 20 +- */ +- onBackup(): void; +- +- /** +- * Callback to be called when the restore procedure is started. +- * Developer could override this method to restore from copies for various bundle versions. +- * +- * @param { BundleVersion } bundleVersion Bundle version to be restore. +- * @syscap SystemCapability.FileManagement.StorageService.Backup +- * @StageModelOnly +- * @since 20 +- */ +- onRestore(bundleVersion: BundleVersion): void; +-} +- +-export default BackupExtensionAbility; +\ No newline at end of file +diff --git a/api/@ohos.application.BackupExtensionAbility.d.ts b/api/@ohos.application.BackupExtensionAbility.d.ts +index dc96d9865..8dede0274 100644 +--- a/api/@ohos.application.BackupExtensionAbility.d.ts ++++ b/api/@ohos.application.BackupExtensionAbility.d.ts +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2024 Huawei Device Co., Ltd. ++ * Copyright (c) 2024-2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at +@@ -18,7 +18,9 @@ + * @kit CoreFileKit + */ + ++/*** if arkts 1.1 */ + import type BackupExtensionContext from './@ohos.file.BackupExtensionContext'; ++/*** endif */ + + /** + * Describe bundle version +@@ -26,7 +28,8 @@ import type BackupExtensionContext from './@ohos.file.BackupExtensionContext'; + * @interface BundleVersion + * @syscap SystemCapability.FileManagement.StorageService.Backup + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface BundleVersion { + /** +@@ -35,7 +38,8 @@ export interface BundleVersion { + * @type { number } + * @syscap SystemCapability.FileManagement.StorageService.Backup + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + code: number; + +@@ -45,7 +49,8 @@ export interface BundleVersion { + * @type { string } + * @syscap SystemCapability.FileManagement.StorageService.Backup + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + name: string; + } +@@ -55,9 +60,10 @@ export interface BundleVersion { + * + * @syscap SystemCapability.FileManagement.StorageService.Backup + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +-export default class BackupExtensionAbility { ++declare class BackupExtensionAbility { + /** + * Indicates backup extension ability context. + * +@@ -82,7 +88,8 @@ export default class BackupExtensionAbility { + * + * @syscap SystemCapability.FileManagement.StorageService.Backup + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onBackup(): void; + +@@ -107,7 +114,8 @@ export default class BackupExtensionAbility { + * @param { BundleVersion } bundleVersion Bundle version to be restore. + * @syscap SystemCapability.FileManagement.StorageService.Backup + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onRestore(bundleVersion: BundleVersion): void; + +@@ -149,3 +157,5 @@ export default class BackupExtensionAbility { + */ + onProcess(): string; + } ++ ++export default BackupExtensionAbility; +diff --git a/api/@ohos.application.DataShareExtensionAbility.d.ts b/api/@ohos.application.DataShareExtensionAbility.d.ts +index 4dc30e550..177444235 100644 +--- a/api/@ohos.application.DataShareExtensionAbility.d.ts ++++ b/api/@ohos.application.DataShareExtensionAbility.d.ts +@@ -42,7 +42,8 @@ type UpdateOperation = dataShare.UpdateOperation; + * @syscap SystemCapability.DistributedDataManager.DataShare.Provider + * @systemapi + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export default class DataShareExtensionAbility { + /** +@@ -52,7 +53,8 @@ export default class DataShareExtensionAbility { + * @syscap SystemCapability.DistributedDataManager.DataShare.Provider + * @systemapi + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + context: ExtensionContext; + +@@ -64,7 +66,8 @@ export default class DataShareExtensionAbility { + * @syscap SystemCapability.DistributedDataManager.DataShare.Provider + * @systemapi + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onCreate?(want: Want, callback: AsyncCallback): void; + +@@ -92,7 +95,8 @@ export default class DataShareExtensionAbility { + * @syscap SystemCapability.DistributedDataManager.DataShare.Provider + * @systemapi + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + update?( + uri: string, +@@ -126,7 +130,8 @@ export default class DataShareExtensionAbility { + * @syscap SystemCapability.DistributedDataManager.DataShare.Provider + * @systemapi + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + delete?(uri: string, predicates: dataSharePredicates.DataSharePredicates, callback: AsyncCallback): void; + +@@ -143,7 +148,8 @@ export default class DataShareExtensionAbility { + * @syscap SystemCapability.DistributedDataManager.DataShare.Provider + * @systemapi + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + query?( + uri: string, +@@ -161,7 +167,8 @@ export default class DataShareExtensionAbility { + * @syscap SystemCapability.DistributedDataManager.DataShare.Provider + * @systemapi + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + batchInsert?(uri: string, valueBuckets: Array, callback: AsyncCallback): void; + +diff --git a/api/@ohos.application.StaticSubscriberExtensionAbility.d.ts b/api/@ohos.application.StaticSubscriberExtensionAbility.d.ts +index 07be8e330..c30016377 100644 +--- a/api/@ohos.application.StaticSubscriberExtensionAbility.d.ts ++++ b/api/@ohos.application.StaticSubscriberExtensionAbility.d.ts +@@ -21,6 +21,9 @@ + /*** if arkts 1.1 */ + import { CommonEventData } from './commonEvent/commonEventData'; + /*** endif */ ++/*** if arkts 1.2 */ ++import { CommonEventData } from './commonEvent/commonEventData'; ++/*** endif */ + import StaticSubscriberExtensionContext from './@ohos.application.StaticSubscriberExtensionContext'; + + /** +@@ -52,7 +55,8 @@ declare class StaticSubscriberExtensionAbility { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onReceiveEvent(event: CommonEventData): void; + } +diff --git a/api/@ohos.application.StaticSubscriberExtensionContext.d.ts b/api/@ohos.application.StaticSubscriberExtensionContext.d.ts +index 8cbab8cd8..d0b3c4977 100644 +--- a/api/@ohos.application.StaticSubscriberExtensionContext.d.ts ++++ b/api/@ohos.application.StaticSubscriberExtensionContext.d.ts +@@ -22,6 +22,10 @@ + import { AsyncCallback } from './@ohos.base'; + import Want from './@ohos.app.ability.Want'; + /*** endif */ ++/*** if arkts 1.2 */ ++import { AsyncCallback } from './@ohos.base'; ++import Want from './@ohos.app.ability.Want'; ++/*** endif */ + import ExtensionContext from './application/ExtensionContext'; + + /** +@@ -63,7 +67,8 @@ declare class StaticSubscriberExtensionContext extends ExtensionContext { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + startAbility(want: Want, callback: AsyncCallback): void; + +@@ -95,7 +100,8 @@ declare class StaticSubscriberExtensionContext extends ExtensionContext { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + startAbility(want: Want): Promise; + } +diff --git a/api/@ohos.application.formError.d.ts b/api/@ohos.application.formError.d.ts +index 2bdd74bd9..e0a3fd469 100644 +--- a/api/@ohos.application.formError.d.ts ++++ b/api/@ohos.application.formError.d.ts +@@ -30,7 +30,7 @@ declare namespace formError { + /** + * Error of form. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Ability.Form + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 +diff --git a/api/@ohos.arkui.UIContext.d.ts b/api/@ohos.arkui.UIContext.d.ts +index f225d686d..fb9e2e9d1 100644 +--- a/api/@ohos.arkui.UIContext.d.ts ++++ b/api/@ohos.arkui.UIContext.d.ts +@@ -49,13 +49,13 @@ import { + } from './arkui/component/common'; + import { CustomBuilder } from './arkui/component/builder'; + import { GestureEvent, GestureRecognizer } from './arkui/component/gesture'; +-import { ResourceStr, SizeOptions } from './arkui/component/units'; ++import { ResourceStr, SizeOptions, VoidCallback } from './arkui/component/units'; + import { Nullable, Color, FontStyle, WidthBreakpoint, HeightBreakpoint, PixelRoundMode } from './arkui/component/enums'; + import { TimePickerDialogOptions } from './arkui/component/timePicker'; + import { AlertDialogParamWithConfirm, AlertDialogParamWithButtons, AlertDialogParamWithOptions } from './arkui/component/alertDialog'; + import { ActionSheetOptions } from './arkui/component/actionSheet'; + import { TextPickerDialogOptions } from './arkui/component/textPicker'; +-import { LocalStorage } from '@ohos.arkui.stateManagement'; ++import { LocalStorage } from './arkui/stateManagement/storage/localStorage'; + import { DatePickerDialogOptions } from './arkui/component/datePicker'; + import { TabsController } from './arkui/component/tabs'; + import { Scroller } from './arkui/component/scroll'; +@@ -1083,7 +1083,7 @@ export declare class PromptAction { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts { '1.1':'13','1.2':'20' } ++ * @since arkts { '1.1':'18','1.2':'20' } + * @arkts 1.1&1.2 + */ + openToast(options: promptAction.ShowToastOptions): Promise; +@@ -1097,10 +1097,11 @@ export declare class PromptAction { + *
    2. Incorrect parameters types. + *
    3. Parameter verification failed. + * @throws { BusinessError } 100001 - Internal error. ++ * @throws { BusinessError } 103401 - Cannot find the toast. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts { '1.1':'13','1.2':'20' } ++ * @since arkts { '1.1':'18','1.2':'20' } + * @arkts 1.1&1.2 + */ + closeToast(toastId: number): void; +@@ -1328,7 +1329,8 @@ export declare class PromptAction { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts { '1.1':'12','1.2':'20' } ++ * @arkts 1.1&1.2 + */ + closeCustomDialog(dialogContent: ComponentContent): Promise; + +@@ -1653,14 +1655,24 @@ export interface OverlayManagerOptions { + */ + renderRootOverlay?: boolean; + ++/** ++ * Set whether support backPressed event or not. ++ * ++ * @type { ?boolean } ++ * @default false ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @atomicservice ++ * @since 19 ++ */ + /** + * Set whether support backPressed event or not. + * + * @type { ?boolean } +- * @default true ++ * @default false + * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform + * @atomicservice +- * @since arkts { '1.1':'15','1.2':'20' } ++ * @since 20 + * @arkts 1.1&1.2 + */ + enableBackPressedEvent?: boolean; +@@ -2665,7 +2677,7 @@ export declare class SwiperDynamicSyncScene extends DynamicSyncScene { + * @extends DynamicSyncScene + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since arkts { '1.1':'13','1.2':'20' } ++ * @since arkts { '1.1':'14','1.2':'20' } + * @arkts 1.1&1.2 + */ + export declare class MarqueeDynamicSyncScene extends DynamicSyncScene { +@@ -2675,7 +2687,7 @@ export declare class MarqueeDynamicSyncScene extends DynamicSyncScene { + * @readonly + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since arkts { '1.1':'13','1.2':'20' } ++ * @since arkts { '1.1':'14','1.2':'20' } + * @arkts 1.1&1.2 + */ + readonly type: MarqueeDynamicSyncSceneType; +@@ -4400,6 +4412,18 @@ export declare class UIContext { + * @arkts 1.1&1.2 + */ + static destroyUIContextWithoutWindow(): void; ++ ++ /** ++ * Thread-safe UI state variables updates interface. ++ * ++ * @param { VoidCallback } callback - The callback function to be executed in the UI thread. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ setUIStates(callback: VoidCallback): void; + } + + /** +@@ -4502,7 +4526,7 @@ export const enum SwiperDynamicSyncSceneType { + * @enum { number } MarqueeDynamicSyncSceneType + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since arkts { '1.1':'13','1.2':'20' } ++ * @since arkts { '1.1':'14','1.2':'20' } + * @arkts 1.1&1.2 + */ + export const enum MarqueeDynamicSyncSceneType { +@@ -4511,7 +4535,7 @@ export const enum MarqueeDynamicSyncSceneType { + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since arkts { '1.1':'13','1.2':'20' } ++ * @since arkts { '1.1':'14','1.2':'20' } + * @arkts 1.1&1.2 + */ + ANIMATION = 1 +diff --git a/api/@ohos.arkui.advanced.SplitLayout.d.ets b/api/@ohos.arkui.advanced.SplitLayout.d.ets +index d32452e04..0544d4f48 100644 +--- a/api/@ohos.arkui.advanced.SplitLayout.d.ets ++++ b/api/@ohos.arkui.advanced.SplitLayout.d.ets +@@ -17,10 +17,12 @@ + * @file + * @kit ArkUI + */ +- +- +- +- ++/*** if arkts 1.2 */ ++import { ResourceStr } from './arkui/component/units'; ++import { State, Prop } from './arkui/stateManagement/decorator'; ++import { Component } from './arkui/component/customComponent'; ++import { BuilderParam, Builder } from './arkui/component/builder'; ++/*** endif */ + + /** + * Declare SplitLayout.The SplitLayout is used for upper and lower graphic layouts. +@@ -31,7 +33,8 @@ + * Declare SplitLayout.The SplitLayout is used for upper and lower graphic layouts. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since 11 ++ * @since arkts{ '1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + @Component + export declare struct SplitLayout { +@@ -46,9 +49,10 @@ export declare struct SplitLayout { + * @type { container: () => void }. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since 11 ++ * @since arkts{ '1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- @BuilderParam container: () => void; ++ @BuilderParam container: () => void; + + /** + * Image in the layout. +@@ -61,7 +65,8 @@ export declare struct SplitLayout { + * @type { ResourceStr }. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since 11 ++ * @since arkts{ '1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + @State mainImage: ResourceStr; + +@@ -76,7 +81,8 @@ export declare struct SplitLayout { + * @type { ResourceStr }. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since 11 ++ * @since arkts{ '1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + @Prop primaryText: ResourceStr; + +@@ -91,7 +97,8 @@ export declare struct SplitLayout { + * @type { ?ResourceStr }. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since 11 ++ * @since arkts{ '1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + @Prop secondaryText?: ResourceStr; + +@@ -106,7 +113,17 @@ export declare struct SplitLayout { + * @type { ?ResourceStr }. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since 11 ++ * @since arkts{ '1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + @Prop tertiaryText?: ResourceStr; +-} +\ No newline at end of file ++ ++ /** ++ * The method to build component. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ @Builder build(): void; ++} +diff --git a/api/@ohos.arkui.advanced.SwipeRefresher.d.ets b/api/@ohos.arkui.advanced.SwipeRefresher.d.ets +index 25e3b6a78..38e115e87 100644 +--- a/api/@ohos.arkui.advanced.SwipeRefresher.d.ets ++++ b/api/@ohos.arkui.advanced.SwipeRefresher.d.ets +@@ -17,6 +17,12 @@ + * @file + * @kit ArkUI + */ ++/*** if arkts 1.2 */ ++import { ResourceStr } from './arkui/component/units'; ++import { Prop } from './arkui/stateManagement/decorator'; ++import { Component } from './arkui/component/customComponent'; ++import { Builder } from './arkui/component/builder'; ++/*** endif */ + + /** + * Declare component SwipeRefresher +@@ -27,7 +33,8 @@ + * Declare component SwipeRefresher + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since 11 ++ * @since arkts{ '1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + @Component + export declare struct SwipeRefresher { +@@ -39,12 +46,13 @@ export declare struct SwipeRefresher { + */ + /** + * Sets the content when loading. +- * @type { string } ++ * @type { ?ResourceStr } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since 11 ++ * @since arkts{ '1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- @Prop content?: string; ++ @Prop content?: ResourceStr; + + /** + * Whether the component is loading. +@@ -57,7 +65,17 @@ export declare struct SwipeRefresher { + * type { boolean } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since 11 ++ * @since arkts{ '1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + @Prop isLoading: boolean; +-} +\ No newline at end of file ++ ++ /** ++ * The method to build component. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ @Builder build(): void; ++} +diff --git a/api/@ohos.arkui.component.d.ets b/api/@ohos.arkui.component.d.ets +index 547e4afd9..a0fe3c237 100644 +--- a/api/@ohos.arkui.component.d.ets ++++ b/api/@ohos.arkui.component.d.ets +@@ -20,6 +20,7 @@ + */ + + export * from './arkui/UserView'; ++export * from './arkui/component/animation'; + export * from './arkui/component/customComponent'; + export * from './arkui/component/common'; + export * from './arkui/component/column'; +@@ -35,7 +36,6 @@ export * from './arkui/component/badge'; + export * from './arkui/component/blank'; + export * from './arkui/component/builder'; + export * from './arkui/component/button'; +-export * from './arkui/component/calendar'; + export * from './arkui/component/calendarPicker'; + export * from './arkui/component/canvas'; + export * from './arkui/component/checkbox'; +@@ -56,6 +56,7 @@ export * from './arkui/component/effectComponent'; + export * from './arkui/component/ellipse'; + export * from './arkui/component/embeddedComponent'; + export * from './arkui/component/enums'; ++export * from './arkui/component/extendableComponent'; + export * from './arkui/component/flex'; + export * from './arkui/component/flowItem'; + export * from './arkui/component/focus'; +@@ -153,3 +154,5 @@ export * from './arkui/component/windowScene'; + export * from './arkui/component/withTheme'; + export * from './arkui/component/xcomponent'; + export * from './arkui/component/resources'; ++export * from './arkui/component/lazyGridLayout'; ++export * from './arkui/component/pageTransition'; +diff --git a/api/@ohos.arkui.componentSnapshot.d.ts b/api/@ohos.arkui.componentSnapshot.d.ts +index be481f562..9d76a2482 100644 +--- a/api/@ohos.arkui.componentSnapshot.d.ts ++++ b/api/@ohos.arkui.componentSnapshot.d.ts +@@ -19,11 +19,11 @@ + */ + + /*** if arkts 1.2 */ +-import { CustomBuilder } from './arkui/component/builder' ++import { CustomBuilder } from './arkui/component/builder'; + /*** endif */ + + import { AsyncCallback } from './@ohos.base'; +-import image from './@ohos.multimedia.image' ++import image from './@ohos.multimedia.image'; + + /** + * This module allows developers to export snapshot image from a component or a custom builder. +@@ -254,9 +254,9 @@ declare namespace componentSnapshot { + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 + * @deprecated since 18 + * @useinstead ohos.arkui.UIContext.ComponentSnapshot#get ++ * @arkts 1.1&1.2 + */ + function get(id: string, callback: AsyncCallback, options?: SnapshotOptions): void; + +@@ -289,9 +289,9 @@ declare namespace componentSnapshot { + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 + * @deprecated since 18 + * @useinstead ohos.arkui.UIContext.ComponentSnapshot#get ++ * @arkts 1.1&1.2 + */ + function get(id: string, options?: SnapshotOptions): Promise; + +@@ -328,9 +328,9 @@ declare namespace componentSnapshot { + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 + * @deprecated since 18 + * @useinstead ohos.arkui.UIContext.ComponentSnapshot#createFromBuilder ++ * @arkts 1.1&1.2 + */ + function createFromBuilder(builder: CustomBuilder, callback: AsyncCallback, + delay?: number, checkImageStatus?: boolean, options?: SnapshotOptions): void; +@@ -368,9 +368,9 @@ declare namespace componentSnapshot { + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 + * @deprecated since 18 + * @useinstead ohos.arkui.UIContext.ComponentSnapshot#createFromBuilder ++ * @arkts 1.1&1.2 + */ + function createFromBuilder(builder: CustomBuilder, delay?: number, + checkImageStatus?: boolean, options?: SnapshotOptions): Promise; +diff --git a/api/@ohos.arkui.dragController.d.ts b/api/@ohos.arkui.dragController.d.ts +index cee6f7f5a..8c83754ef 100644 +--- a/api/@ohos.arkui.dragController.d.ts ++++ b/api/@ohos.arkui.dragController.d.ts +@@ -20,7 +20,7 @@ + + /*** if arkts 1.2 */ + import { DragEvent, DragPreviewOptions, DragItemInfo, ICurve } from './arkui/component/common'; +-import { CustomBuilder } from './arkui/component/builder' ++import { CustomBuilder } from './arkui/component/builder'; + import { TouchPoint, ResourceColor } from './arkui/component/units'; + import { Curve } from './arkui/component/enums'; + /*** endif */ +@@ -703,11 +703,12 @@ declare namespace dragController { + * Execute a drag event. + * @param { CustomBuilder | DragItemInfo } custom - Object used for prompts displayed when the object is dragged. + * @param { DragInfo } dragInfo - Information about the drag event. +- * @param { AsyncCallback<{ event: DragEvent, extraParams: string }> } callback - Callback that contains the drag event information. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: +- *
    1. Mandatory parameters are left unspecified. +- *
    2. Incorrect parameters types. +- *
    3. Parameter verification failed. ++ * @param { AsyncCallback<{ event: DragEvent, extraParams: string }> } callback - Callback that contains the drag ++ * event information. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: ++ *
    1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameters types. ++ *
    3. Parameter verification failed. + * @throws { BusinessError } 100001 - Internal handling failed. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 10 +@@ -717,45 +718,45 @@ declare namespace dragController { + * @param { CustomBuilder | DragItemInfo } custom - Object used for prompts displayed when the object is dragged. + * @param { DragInfo } dragInfo - Information about the drag event. + * @param { AsyncCallback } callback - Callback that contains the drag event information. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: +- *
    1. Mandatory parameters are left unspecified. +- *
    2. Incorrect parameters types. +- *
    3. Parameter verification failed. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: ++ *
    1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameters types. ++ *
    3. Parameter verification failed. + * @throws { BusinessError } 100001 - Internal handling failed. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice + * @since 12 +- */ ++ */ + /** + * Execute a drag event. + * @param { CustomBuilder | DragItemInfo } custom - Object used for prompts displayed when the object is dragged. + * @param { DragInfo } dragInfo - Information about the drag event. + * @param { AsyncCallback } callback - Callback that contains the drag event information. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: +- *
    1. Mandatory parameters are left unspecified. +- *
    2. Incorrect parameters types. +- *
    3. Parameter verification failed. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: ++ *
    1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameters types. ++ *
    3. Parameter verification failed. + * @throws { BusinessError } 100001 - Internal handling failed. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 +- * @deprecated since 18 ++ * @deprecated since 18 + * @useinstead ohos.arkui.UIContext.DragController#executeDrag ++ * @arkts 1.1&1.2 + */ + function executeDrag(custom: CustomBuilder | DragItemInfo, dragInfo: DragInfo, +- callback: AsyncCallback): void; ++ callback: AsyncCallback): void; + + /** + * Execute a drag event. + * @param { CustomBuilder | DragItemInfo } custom - Object used for prompts displayed when the object is dragged. + * @param { DragInfo } dragInfo - Information about the drag event. + * @returns { Promise<{ event: DragEvent, extraParams: string }> } A Promise with the drag event information. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: +- *
    1. Mandatory parameters are left unspecified. +- *
    2. Incorrect parameters types. +- *
    3. Parameter verification failed. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: ++ *
    1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameters types. ++ *
    3. Parameter verification failed. + * @throws { BusinessError } 100001 - Internal handling failed. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 10 +@@ -765,10 +766,10 @@ declare namespace dragController { + * @param { CustomBuilder | DragItemInfo } custom - Object used for prompts displayed when the object is dragged. + * @param { DragInfo } dragInfo - Information about the drag event. + * @returns { Promise } A Promise with the drag event information. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: +- *
    1. Mandatory parameters are left unspecified. +- *
    2. Incorrect parameters types. +- *
    3. Parameter verification failed. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: ++ *
    1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameters types. ++ *
    3. Parameter verification failed. + * @throws { BusinessError } 100001 - Internal handling failed. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +@@ -779,18 +780,18 @@ declare namespace dragController { + * @param { CustomBuilder | DragItemInfo } custom - Object used for prompts displayed when the object is dragged. + * @param { DragInfo } dragInfo - Information about the drag event. + * @returns { Promise } A Promise with the drag event information. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: +- *
    1. Mandatory parameters are left unspecified. +- *
    2. Incorrect parameters types. +- *
    3. Parameter verification failed. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: ++ *
    1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameters types. ++ *
    3. Parameter verification failed. + * @throws { BusinessError } 100001 - Internal handling failed. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 + * @deprecated since 18 + * @useinstead ohos.arkui.UIContext.DragController#executeDrag ++ * @arkts 1.1&1.2 + */ + function executeDrag(custom: CustomBuilder | DragItemInfo, dragInfo: DragInfo): Promise; + +@@ -798,13 +799,13 @@ declare namespace dragController { + * Create one drag action object, which can be used for starting drag later or monitoring + * the drag status after drag started. + * @param { Array } customArray - Objects used for prompts +- * displayed when the objects are dragged. ++ * displayed when the objects are dragged. + * @param { DragInfo } dragInfo - Information about the drag event. + * @returns { DragAction } one drag action object +- * @throws { BusinessError } 401 - Parameter error. Possible causes: +- *
    1. Mandatory parameters are left unspecified. +- *
    2. Incorrect parameters types. +- *
    3. Parameter verification failed. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: ++ *
    1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameters types. ++ *
    3. Parameter verification failed. + * @throws { BusinessError } 100001 - Internal handling failed. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 11 +@@ -813,13 +814,13 @@ declare namespace dragController { + * Create one drag action object, which can be used for starting drag later or monitoring + * the drag status after drag started. + * @param { Array } customArray - Objects used for prompts +- * displayed when the objects are dragged. ++ * displayed when the objects are dragged. + * @param { DragInfo } dragInfo - Information about the drag event. + * @returns { DragAction } one drag action object +- * @throws { BusinessError } 401 - Parameter error. Possible causes: +- *
    1. Mandatory parameters are left unspecified. +- *
    2. Incorrect parameters types. +- *
    3. Parameter verification failed. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: ++ *
    1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameters types. ++ *
    3. Parameter verification failed. + * @throws { BusinessError } 100001 - Internal handling failed. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +@@ -829,21 +830,21 @@ declare namespace dragController { + * Create one drag action object, which can be used for starting drag later or monitoring + * the drag status after drag started. + * @param { Array } customArray - Objects used for prompts +- * displayed when the objects are dragged. ++ * displayed when the objects are dragged. + * @param { DragInfo } dragInfo - Information about the drag event. + * @returns { DragAction } one drag action object +- * @throws { BusinessError } 401 - Parameter error. Possible causes: +- *
    1. Mandatory parameters are left unspecified. +- *
    2. Incorrect parameters types. +- *
    3. Parameter verification failed. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: ++ *
    1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameters types. ++ *
    3. Parameter verification failed. + * @throws { BusinessError } 100001 - Internal handling failed. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 + * @deprecated since 18 + * @useinstead ohos.arkui.UIContext.DragController#createDragAction ++ * @arkts 1.1&1.2 + */ + function createDragAction(customArray: Array, dragInfo: DragInfo): DragAction; + +@@ -867,9 +868,9 @@ declare namespace dragController { + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 + * @deprecated since 18 + * @useinstead ohos.arkui.UIContext.DragController#getDragPreview ++ * @arkts 1.1&1.2 + */ + function getDragPreview(): DragPreview; + +diff --git a/api/@ohos.arkui.drawableDescriptor.d.ts b/api/@ohos.arkui.drawableDescriptor.d.ts +index ef04461b6..2f02fe826 100644 +--- a/api/@ohos.arkui.drawableDescriptor.d.ts ++++ b/api/@ohos.arkui.drawableDescriptor.d.ts +@@ -75,10 +75,21 @@ export declare class DrawableDescriptor { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + getPixelMap(): image.PixelMap; ++ ++ /** ++ * Get pixelMap of drawable image. ++ * ++ * @returns { image.PixelMap | undefined } Return the PixelMap of the calling DrawableDescriptor object. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ getPixelMap(): image.PixelMap | undefined; + } + + /** +@@ -146,11 +157,22 @@ export declare class LayeredDrawableDescriptor extends DrawableDescriptor { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + getForeground(): DrawableDescriptor; + ++ /** ++ * Get DrawableDescriptor for the foreground. ++ * ++ * @returns { DrawableDescriptor | undefined } Return the DrawableDescriptor object of foreground. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ getForeground(): DrawableDescriptor | undefined; ++ + /** + * Get DrawableDescriptor for the background. + * +@@ -173,11 +195,22 @@ export declare class LayeredDrawableDescriptor extends DrawableDescriptor { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + getBackground(): DrawableDescriptor; + ++ /** ++ * Get DrawableDescriptor for the background. ++ * ++ * @returns { DrawableDescriptor | undefined } Return the DrawableDescriptor object of background. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ getBackground(): DrawableDescriptor | undefined; ++ + /** + * Get DrawableDescriptor for the mask. + * +@@ -200,11 +233,22 @@ export declare class LayeredDrawableDescriptor extends DrawableDescriptor { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + getMask(): DrawableDescriptor; + ++ /** ++ * Get DrawableDescriptor for the mask. ++ * ++ * @returns { DrawableDescriptor | undefined } Return the DrawableDescriptor object of mask. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ getMask(): DrawableDescriptor | undefined; ++ + + /** + * Get the clip path info of the adaptive icon mask. +@@ -265,7 +309,7 @@ export declare class PixelMapDrawableDescriptor extends DrawableDescriptor { + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +-interface AnimationOptions { ++export declare interface AnimationOptions { + /** + * The duration of animation playback once. + * +diff --git a/api/@ohos.arkui.inspector.d.ts b/api/@ohos.arkui.inspector.d.ts +index 8bea3d962..11f62dbe9 100644 +--- a/api/@ohos.arkui.inspector.d.ts ++++ b/api/@ohos.arkui.inspector.d.ts +@@ -174,6 +174,7 @@ declare namespace inspector { + * @crossplatform + * @atomicservice + * @since 20 ++ * @test + * @arkts 1.2 + */ + function getInspectorByKey(id: string): string; +@@ -186,8 +187,8 @@ declare namespace inspector { + * @crossplatform + * @atomicservice + * @since 20 +- * @arkts 1.2 + * @test ++ * @arkts 1.2 + */ + function getInspectorTree(): Object; + +@@ -202,10 +203,40 @@ declare namespace inspector { + * @crossplatform + * @atomicservice + * @since 20 +- * @arkts 1.2 + * @test ++ * @arkts 1.2 + */ + function sendEventByKey(id: string, action: number, params: string): boolean; + } + + export default inspector; ++/** ++ * export function getInspectorByKey from inspector namespace and provide it for kit ArkUI. ++ * @constant ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++export const GETINSPECTORBYKEY = inspector.getInspectorByKey; ++/** ++ * export function getInspectorTree from inspector namespace and provide it for kit ArkUI. ++ * @constant ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++export const GETINSPECTORTREE = inspector.getInspectorTree; ++/** ++ * export function sendEventByKey from inspector namespace and provide it for kit ArkUI. ++ * @constant ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++export const SENDEVENTBYKEY = inspector.sendEventByKey; +\ No newline at end of file +diff --git a/api/@ohos.arkui.shape.d.ts b/api/@ohos.arkui.shape.d.ts +index ebcc33c66..3274f282b 100644 +--- a/api/@ohos.arkui.shape.d.ts ++++ b/api/@ohos.arkui.shape.d.ts +@@ -33,7 +33,7 @@ import { Position, ResourceColor, Length, SizeOptions } from './arkui/component/ + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +-interface ShapeSize { ++export interface ShapeSize { + /** + * Defines the width of Shape. + * @type { ? (number | string) } +@@ -69,7 +69,7 @@ interface ShapeSize { + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +-interface RectShapeOptions extends ShapeSize { ++export interface RectShapeOptions extends ShapeSize { + /** + * Defines the corner radius of the RectShape. + * @type { ? (number | string | Array) } +@@ -94,7 +94,7 @@ interface RectShapeOptions extends ShapeSize { + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +-interface RoundRectShapeOptions extends ShapeSize { ++export interface RoundRectShapeOptions extends ShapeSize { + /** + * Defines the width of the corner radius for RectShape. + * @type { ? (number | string) } +@@ -129,7 +129,7 @@ interface RoundRectShapeOptions extends ShapeSize { + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +-interface PathShapeOptions { ++export interface PathShapeOptions { + /** + * Defines the commands for drawing the PathShape. + * @type { ?string } +diff --git a/api/@ohos.arkui.stateManagement.d.ets b/api/@ohos.arkui.stateManagement.d.ets +index 9a6caa8f8..1684309c3 100644 +--- a/api/@ohos.arkui.stateManagement.d.ets ++++ b/api/@ohos.arkui.stateManagement.d.ets +@@ -19,21 +19,9 @@ + * @arkts 1.2 + */ + +-export * from './arkui/stateManagement/common'; ++export * from './arkui/stateManagement/decorator'; + export * from './arkui/stateManagement/runtime'; +-export * from './arkui/stateManagement/storage'; +-export * from './arkui/stateManagement/base/backingValue'; +-export * from './arkui/stateManagement/base/decoratorBase'; +-export * from './arkui/stateManagement/base/iObservedObject'; +-export * from './arkui/stateManagement/base/mutableStateMeta'; +-export * from './arkui/stateManagement/decorators/decoratorState'; +-export * from './arkui/stateManagement/decorators/decoratorLink'; +-export * from './arkui/stateManagement/decorators/decoratorObjectLink'; +-export * from './arkui/stateManagement/decorators/decoratorProp'; +-export * from './arkui/stateManagement/decorators/decoratorProvide'; +-export * from './arkui/stateManagement/decorators/decoratorConsume'; +-export * from './arkui/stateManagement/decorators/decoratorStorageLink'; +-export * from './arkui/stateManagement/decorators/decoratorStorageProp'; +-export * from './arkui/stateManagement/decorators/decoratorWatch'; +-export * from './arkui/stateManagement/storages/appStorage'; +-export * from './arkui/stateManagement/storages/localStorage'; +\ No newline at end of file ++export * from './arkui/stateManagement/storage/appStorage'; ++export * from './arkui/stateManagement/storage/localStorage'; ++export * from './arkui/stateManagement/utils'; ++export * from './arkui/stateManagement/storage/storageProperty'; +\ No newline at end of file +diff --git a/api/@ohos.base.d.ets b/api/@ohos.base.d.ets +index 39f9d3995..0f7d42b99 100644 +--- a/api/@ohos.base.d.ets ++++ b/api/@ohos.base.d.ets +@@ -51,7 +51,7 @@ export type ErrorCallback = (err: T)=> void; + * @atomicservice + * @since 20 + */ +-export type AsyncCallback = (err: BusinessError, data: T)=> void; ++export type AsyncCallback = (err: BusinessError | null, data: T | undefined)=> void; + + /** + * Defines the error interface. +diff --git a/api/@ohos.base.d.ts b/api/@ohos.base.d.ts +index d56214a16..05e1f0301 100644 +--- a/api/@ohos.base.d.ts ++++ b/api/@ohos.base.d.ts +@@ -290,51 +290,4 @@ export interface BusinessError extends Error { + * @since 12 + */ + data?: T; +-} +- +-/** +- * In ArkTS 1.1, using int is equivalent to using number +- * +- * @typedef { number } +- * @syscap SystemCapability.Base +- * @crossplatform +- * @form +- * @atomicservice +- * @since 20 +- */ +-export type int = number; +- +-/** +- * In ArkTS 1.1, using double is equivalent to using number +- * +- * @typedef { number } +- * @syscap SystemCapability.Base +- * @crossplatform +- * @form +- * @atomicservice +- * @since 20 +- */ +-export type double = number; +-/** +- * In ArkTS 1.1, using float is equivalent to using number +- * +- * @typedef { number } +- * @syscap SystemCapability.Base +- * @crossplatform +- * @form +- * @atomicservice +- * @since 20 +- */ +-export type float = number; +- +-/** +- * In ArkTS 1.1, using long is equivalent to using number +- * +- * @typedef { number } +- * @syscap SystemCapability.Base +- * @crossplatform +- * @form +- * @atomicservice +- * @since 20 +- */ +-export type long = number; ++} +\ No newline at end of file +diff --git a/api/@ohos.batteryInfo.d.ets b/api/@ohos.batteryInfo.d.ets +index a5585c54f..533aefc59 100644 +--- a/api/@ohos.batteryInfo.d.ets ++++ b/api/@ohos.batteryInfo.d.ets +@@ -16,6 +16,7 @@ + /** + * @file + * @kit BasicServicesKit ++ * @arkts 1.2 + */ + + /** +@@ -79,8 +80,8 @@ declare namespace batteryInfo { + /** + * Battery state of charge (SoC) of the current device, in percent. + * ++ * @returns { int } Returns the battery state of charge (SoC) of the current device, in percent. + * @syscap SystemCapability.PowerManager.BatteryManager.Core +- * @atomicservice + * @since 20 + */ + function batterySOC(): int; +@@ -88,8 +89,8 @@ declare namespace batteryInfo { + /** + * Battery charging status of the current device. + * ++ * @returns { BatteryChargeState } Returns the battery charging status of the current device. + * @syscap SystemCapability.PowerManager.BatteryManager.Core +- * @atomicservice + * @since 20 + */ + function chargingStatus(): BatteryChargeState; +@@ -97,6 +98,7 @@ declare namespace batteryInfo { + /** + * Battery health state of the current device. + * ++ * @returns { BatteryHealthState } Returns the battery health state of the current device. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ +@@ -105,6 +107,7 @@ declare namespace batteryInfo { + /** + * Charger type of the current device. + * ++ * @returns { BatteryPluggedType } Returns the charger type of the current device. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ +@@ -113,6 +116,7 @@ declare namespace batteryInfo { + /** + * Battery voltage of the current device, in µV. + * ++ * @returns { int } Returns the battery voltage of the current device, in µV. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ +@@ -121,6 +125,7 @@ declare namespace batteryInfo { + /** + * Battery technology of the current device. + * ++ * @returns { string } Returns the battery technology of the current device. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ +@@ -129,6 +134,7 @@ declare namespace batteryInfo { + /** + * Battery temperature of the current device, in 0.1℃. + * ++ * @returns { int } Returns the battery temperature of the current device, in 0.1℃. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ +@@ -137,6 +143,7 @@ declare namespace batteryInfo { + /** + * Battery present state of the current device. + * ++ * @returns { boolean } Returns true if the battery is present; returns false if the battery is absent. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ +@@ -145,6 +152,7 @@ declare namespace batteryInfo { + /** + * Battery capacity level of the current device. + * ++ * @returns { BatteryCapacityLevel } Returns the battery capacity level of the current device. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ +@@ -153,6 +161,7 @@ declare namespace batteryInfo { + /** + * Estimated remaining time for the current device to be fully charged, in ms. + * ++ * @returns { long } Returns the estimated remaining time for the current device to be fully charged, in ms. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @systemapi + * @since 20 +@@ -162,6 +171,7 @@ declare namespace batteryInfo { + /** + * Battery total energy of the current device, in mAh. + * ++ * @returns { int } Returns the battery total energy of the current device, in mAh. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @systemapi + * @since 20 +@@ -171,6 +181,7 @@ declare namespace batteryInfo { + /** + * Battery immediate current of the current device, in mA. + * ++ * @returns { int } Returns the battery immediate current of the current device, in mA. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ +@@ -179,6 +190,7 @@ declare namespace batteryInfo { + /** + * Battery remaining energy of the current device, in mAh. + * ++ * @returns { int } Returns the battery remaining energy of the current device, in mAh. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @systemapi + * @since 20 +diff --git a/api/@ohos.batteryStatistics.d.ts b/api/@ohos.batteryStatistics.d.ts +index 906cb9645..1ccd48e00 100644 +--- a/api/@ohos.batteryStatistics.d.ts ++++ b/api/@ohos.batteryStatistics.d.ts +@@ -16,6 +16,7 @@ + /** + * @file + * @kit BasicServicesKit ++ * @arkts 1.1&1.2 + */ + + import { AsyncCallback, BusinessError } from './@ohos.base'; +@@ -26,88 +27,108 @@ import { AsyncCallback, BusinessError } from './@ohos.base'; + * @namespace batteryStats + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace batteryStats { + /** + * Describes the consumption type. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum ConsumptionType { +- /** Indicates an invalid consumption type ++ /** ++ * Indicates an invalid consumption type. + * + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 +- */ ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + CONSUMPTION_TYPE_INVALID = -17, + +- /** Indicates the battery power consumption generated by APP ++ /** ++ * Indicates the battery power consumption generated by APP. + * + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 +- */ ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + CONSUMPTION_TYPE_APP, + +- /** Indicates the battery power consumption generated by bluetooth ++ /** ++ * Indicates the battery power consumption generated by bluetooth. + * + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 +- */ ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + CONSUMPTION_TYPE_BLUETOOTH, + +- /** Indicates the battery power consumption generated when the CPU is idle ++ /** ++ * Indicates the battery power consumption generated when the CPU is idle. + * + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 +- */ ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + CONSUMPTION_TYPE_IDLE, + +- /** Indicates the battery power consumption generated when phone call is active ++ /** ++ * Indicates the battery power consumption generated when phone call is active. + * + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 +- */ ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + CONSUMPTION_TYPE_PHONE, + +- /** Indicates the battery power consumption generated by radio ++ /** ++ * Indicates the battery power consumption generated by radio. + * + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 +- */ ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + CONSUMPTION_TYPE_RADIO, + +- /** Indicates the battery power consumption generated by screen ++ /** ++ * Indicates the battery power consumption generated by screen. + * + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 +- */ ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + CONSUMPTION_TYPE_SCREEN, + +- /** Indicates the battery power consumption generated by user ++ /** ++ * Indicates the battery power consumption generated by user. + * + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 +- */ ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + CONSUMPTION_TYPE_USER, + +- /** Indicates the battery power consumption generated by WIFI ++ /** ++ * Indicates the battery power consumption generated by WIFI. + * + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 +- */ ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + CONSUMPTION_TYPE_WIFI + } + +@@ -119,7 +140,8 @@ declare namespace batteryStats { + * @throws { BusinessError } 4600101 - Failed to connect to the service. + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getBatteryStats(): Promise>; + +@@ -133,67 +155,72 @@ declare namespace batteryStats { + * @throws { BusinessError } 4600101 - Failed to connect to the service. + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getBatteryStats(callback: AsyncCallback>): void; + + /** + * Obtains power consumption information(mAh) for a given uid. + * +- * @param { number } uid Indicates the uid. +- * @returns { number } Power consumption information(mAh). ++ * @param { int } uid Indicates the uid. ++ * @returns { double } Power consumption information(mAh). + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. + * @throws { BusinessError } 4600101 - Failed to connect to the service. + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getAppPowerValue(uid: number): number; ++ function getAppPowerValue(uid: int): double; + + /** + * Obtains power consumption information(Percent) for a given uid. + * +- * @param { number } uid Indicates the uid. +- * @returns { number } Power consumption information(Percent). ++ * @param { int } uid Indicates the uid. ++ * @returns { double } Power consumption information(Percent). + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. + * @throws { BusinessError } 4600101 - Failed to connect to the service. + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getAppPowerPercent(uid: number): number; ++ function getAppPowerPercent(uid: int): double; + + /** + * Obtains power consumption information(mAh) for a given type. + * + * @param { ConsumptionType } type Indicates the hardware type. + * the ConsumptionType type is an enumeration class. +- * @returns { number } Power consumption information(mAh). ++ * @returns { double } Power consumption information(mAh). + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. + * @throws { BusinessError } 4600101 - Failed to connect to the service. + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getHardwareUnitPowerValue(type: ConsumptionType): number; ++ function getHardwareUnitPowerValue(type: ConsumptionType): double; + + /** + * Obtains power consumption information(Percent) for a given type. + * + * @param { ConsumptionType } type Indicates the hardware type. + * the ConsumptionType type is an enumeration class. +- * @returns { number } Power consumption information(Percent). ++ * @returns { double } Power consumption information(Percent). + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. + * @throws { BusinessError } 4600101 - Failed to connect to the service. + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getHardwareUnitPowerPercent(type: ConsumptionType): number; ++ function getHardwareUnitPowerPercent(type: ConsumptionType): double; + + /** + * Contains power consumption information of a device. +@@ -202,35 +229,42 @@ declare namespace batteryStats { + * @typedef BatteryStatsInfo + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface BatteryStatsInfo { +- /** The uid related with the power consumption info. ++ /** ++ * The uid related with the power consumption info. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 +- */ +- uid: number; ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ uid: int; + +- /** The type related with the power consumption info. ++ /** ++ * The type related with the power consumption info. + * + * @type { ConsumptionType } + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 +- */ ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + type: ConsumptionType; + +- /** The power consumption value(mAh). ++ /** ++ * The power consumption value(mAh). + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 +- */ +- power: number; ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ power: double; + } + } + +@@ -240,6 +274,7 @@ declare namespace batteryStats { + * @namespace batteryStats + * @syscap SystemCapability.PowerManager.BatteryStatistics + * @systemapi +- * @since 8 +-*/ ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + export default batteryStats; +diff --git a/api/@ohos.bluetooth.a2dp.d.ts b/api/@ohos.bluetooth.a2dp.d.ts +index a4403cf13..6e2402d56 100644 +--- a/api/@ohos.bluetooth.a2dp.d.ts ++++ b/api/@ohos.bluetooth.a2dp.d.ts +@@ -43,7 +43,8 @@ declare namespace a2dp { + * + * @typedef { baseProfile.BaseProfile } BaseProfile + * @syscap SystemCapability.Communication.Bluetooth.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type BaseProfile = baseProfile.BaseProfile; + +diff --git a/api/@ohos.bluetooth.access.d.ts b/api/@ohos.bluetooth.access.d.ts +index e04cf930b..d2e5946d9 100644 +--- a/api/@ohos.bluetooth.access.d.ts ++++ b/api/@ohos.bluetooth.access.d.ts +@@ -288,8 +288,7 @@ declare namespace access { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 18 + */ + function on(type: 'stateChange', callback: Callback): void; + +@@ -336,8 +335,7 @@ declare namespace access { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + function off(type: 'stateChange', callback?: Callback): void; + +diff --git a/api/@ohos.bluetooth.baseProfile.d.ts b/api/@ohos.bluetooth.baseProfile.d.ts +index ad71f8481..27764959f 100644 +--- a/api/@ohos.bluetooth.baseProfile.d.ts ++++ b/api/@ohos.bluetooth.baseProfile.d.ts +@@ -425,8 +425,7 @@ declare namespace baseProfile { + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + on(type: 'connectionStateChange', callback: Callback): void; + +diff --git a/api/@ohos.bluetooth.ble.d.ts b/api/@ohos.bluetooth.ble.d.ts +index c0cc1c722..3cdf87fc4 100644 +--- a/api/@ohos.bluetooth.ble.d.ts ++++ b/api/@ohos.bluetooth.ble.d.ts +@@ -570,8 +570,7 @@ declare namespace ble { + * @throws { BusinessError } 2900099 - Operation failed. + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + function stopAdvertising(advertisingId: number, callback: AsyncCallback): void; + +@@ -608,8 +607,7 @@ declare namespace ble { + * @throws { BusinessError } 2900099 - Operation failed. + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + function stopAdvertising(advertisingId: number): Promise; + +@@ -640,8 +638,7 @@ declare namespace ble { + * @throws { BusinessError } 2900099 - Operation failed. + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + function on(type: 'advertisingStateChange', callback: Callback): void; + +@@ -672,8 +669,7 @@ declare namespace ble { + * @throws { BusinessError } 2900099 - Operation failed. + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + function off(type: 'advertisingStateChange', callback?: Callback): void; + +@@ -720,8 +716,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + function on(type: 'BLEDeviceFind', callback: Callback>): void; + +@@ -768,8 +763,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + function off(type: 'BLEDeviceFind', callback?: Callback>): void; + +@@ -1159,8 +1153,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + on(type: 'characteristicRead', callback: Callback): void; + +@@ -1204,8 +1197,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + off(type: 'characteristicRead', callback?: Callback): void; + +@@ -1249,8 +1241,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + on(type: 'characteristicWrite', callback: Callback): void; + +@@ -1294,8 +1285,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + off(type: 'characteristicWrite', callback?: Callback): void; + +@@ -1339,8 +1329,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + on(type: 'descriptorRead', callback: Callback): void; + +@@ -1384,8 +1373,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + off(type: 'descriptorRead', callback?: Callback): void; + +@@ -1429,8 +1417,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + on(type: 'descriptorWrite', callback: Callback): void; + +@@ -1474,8 +1461,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + off(type: 'descriptorWrite', callback?: Callback): void; + +@@ -1519,8 +1505,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + on(type: 'connectionStateChange', callback: Callback): void; + +@@ -1564,8 +1549,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + off(type: 'connectionStateChange', callback?: Callback): void; + +@@ -1594,8 +1578,7 @@ declare namespace ble { + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + on(type: 'BLEMtuChange', callback: Callback): void; + +@@ -1624,8 +1607,7 @@ declare namespace ble { + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + off(type: 'BLEMtuChange', callback?: Callback): void; + } +@@ -1925,8 +1907,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + getServices(callback: AsyncCallback>): void; + +@@ -1973,8 +1954,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + getServices(): Promise>; + +@@ -2242,8 +2222,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + writeCharacteristicValue( + characteristic: BLECharacteristic, +@@ -2303,8 +2282,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + writeCharacteristicValue(characteristic: BLECharacteristic, writeType: GattWriteType): Promise; + +@@ -2357,8 +2335,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + writeDescriptorValue(descriptor: BLEDescriptor, callback: AsyncCallback): void; + +@@ -2411,8 +2388,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + writeDescriptorValue(descriptor: BLEDescriptor): Promise; + +@@ -2441,8 +2417,7 @@ declare namespace ble { + * @throws { BusinessError } 2900099 - Operation failed. + * @syscap SystemCapability.Communication.Bluetooth.Core + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + getRssiValue(callback: AsyncCallback): void; + +@@ -2471,8 +2446,7 @@ declare namespace ble { + * @throws { BusinessError } 2900099 - Operation failed. + * @syscap SystemCapability.Communication.Bluetooth.Core + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + getRssiValue(): Promise; + +@@ -2557,8 +2531,7 @@ declare namespace ble { + * @throws { BusinessError } 2900099 - Operation failed. + * @syscap SystemCapability.Communication.Bluetooth.Core + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + setCharacteristicChangeNotification( + characteristic: BLECharacteristic, +@@ -2599,8 +2572,7 @@ declare namespace ble { + * @throws { BusinessError } 2900099 - Operation failed. + * @syscap SystemCapability.Communication.Bluetooth.Core + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + setCharacteristicChangeNotification(characteristic: BLECharacteristic, enable: boolean): Promise; + +@@ -2707,8 +2679,7 @@ declare namespace ble { + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.Communication.Bluetooth.Core + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + on(type: 'BLECharacteristicChange', callback: Callback): void; + +@@ -2737,8 +2708,7 @@ declare namespace ble { + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.Communication.Bluetooth.Core + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + off(type: 'BLECharacteristicChange', callback?: Callback): void; + +@@ -2782,8 +2752,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + on(type: 'BLEConnectionStateChange', callback: Callback): void; + +@@ -2827,8 +2796,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + off(type: 'BLEConnectionStateChange', callback?: Callback): void; + +@@ -2872,8 +2840,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + on(type: 'BLEMtuChange', callback: Callback): void; + +@@ -2917,8 +2884,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + off(type: 'BLEMtuChange', callback?: Callback): void; + } +@@ -2992,8 +2958,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'15','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + on(type: 'BLEDeviceFind', callback: Callback): void; + /** +@@ -3010,8 +2975,7 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'15','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + off(type: 'BLEDeviceFind', callback?: Callback): void; + } +@@ -3951,7 +3915,8 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface DescriptorReadRequest { + /** +@@ -4125,7 +4090,8 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface DescriptorWriteRequest { + /** +@@ -5131,7 +5097,8 @@ declare namespace ble { + * @typedef AdvertisingStateChangeInfo + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface AdvertisingStateChangeInfo { + /** +@@ -5348,7 +5315,8 @@ declare namespace ble { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ScanFilter { + /** +@@ -6147,7 +6115,8 @@ declare namespace ble { + * @enum { number } + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum AdvertisingState { + /** +@@ -6161,21 +6130,24 @@ declare namespace ble { + * + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + STARTED = 1, + /** + * advertising temporarily enabled. + * + * @syscap SystemCapability.Communication.Bluetooth.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ENABLED = 2, + /** + * advertising temporarily disabled. + * + * @syscap SystemCapability.Communication.Bluetooth.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DISABLED = 3, + /** +@@ -6189,7 +6161,8 @@ declare namespace ble { + * + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + STOPPED = 4 + } +diff --git a/api/@ohos.bluetooth.connection.d.ts b/api/@ohos.bluetooth.connection.d.ts +index 219ca1502..ee61698e2 100644 +--- a/api/@ohos.bluetooth.connection.d.ts ++++ b/api/@ohos.bluetooth.connection.d.ts +@@ -1369,8 +1369,7 @@ declare namespace connection { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + function on(type: 'bluetoothDeviceFind', callback: Callback>): void; + +@@ -1411,8 +1410,7 @@ declare namespace connection { + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + function off(type: 'bluetoothDeviceFind', callback?: Callback>): void; + +@@ -1443,8 +1441,7 @@ declare namespace connection { + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 2900099 - Operation failed. + * @syscap SystemCapability.Communication.Bluetooth.Core +- * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 18 + */ + function on(type: 'discoveryResult', callback: Callback>): void; + +@@ -1471,8 +1468,7 @@ declare namespace connection { + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 2900099 - Operation failed. + * @syscap SystemCapability.Communication.Bluetooth.Core +- * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 18 + */ + function off(type: 'discoveryResult', callback?: Callback>): void; + +@@ -1503,8 +1499,7 @@ declare namespace connection { + * @throws { BusinessError } 2900099 - Operation failed. + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + function on(type: 'bondStateChange', callback: Callback): void; + +@@ -1535,8 +1530,7 @@ declare namespace connection { + * @throws { BusinessError } 2900099 - Operation failed. + * @syscap SystemCapability.Communication.Bluetooth.Core + * @crossplatform +- * @since arkts {'1.1':'13','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + function off(type: 'bondStateChange', callback?: Callback): void; + +@@ -1552,8 +1546,7 @@ declare namespace connection { + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 2900099 - Operation failed. + * @syscap SystemCapability.Communication.Bluetooth.Core +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 + */ + function on(type: 'pinRequired', callback: Callback): void; + +@@ -1569,8 +1562,7 @@ declare namespace connection { + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 2900099 - Operation failed. + * @syscap SystemCapability.Communication.Bluetooth.Core +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 + */ + function off(type: 'pinRequired', callback?: Callback): void; + +@@ -1583,8 +1575,7 @@ declare namespace connection { + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 2900099 - Operation failed. + * @syscap SystemCapability.Communication.Bluetooth.Core +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + function on(type: 'batteryChange', callback: Callback): void; + +@@ -1597,8 +1588,7 @@ declare namespace connection { + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 2900099 - Operation failed. + * @syscap SystemCapability.Communication.Bluetooth.Core +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + function off(type: 'batteryChange', callback?: Callback): void; + +@@ -1676,7 +1666,8 @@ declare namespace connection { + * + * @typedef PinRequiredParam + * @syscap SystemCapability.Communication.Bluetooth.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PinRequiredParam { + /** +@@ -2066,7 +2057,8 @@ declare namespace connection { + * + * @typedef DiscoveryResult + * @syscap SystemCapability.Communication.Bluetooth.Core +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface DiscoveryResult { + /** +@@ -2141,7 +2133,8 @@ declare namespace connection { + * + * @typedef BatteryInfo + * @syscap SystemCapability.Communication.Bluetooth.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface BatteryInfo { + /** +diff --git a/api/@ohos.bluetooth.hfp.d.ts b/api/@ohos.bluetooth.hfp.d.ts +index 62dfaacc3..53e4c633c 100644 +--- a/api/@ohos.bluetooth.hfp.d.ts ++++ b/api/@ohos.bluetooth.hfp.d.ts +@@ -34,7 +34,8 @@ declare namespace hfp { + * + * @typedef { baseProfile.BaseProfile } BaseProfile + * @syscap SystemCapability.Communication.Bluetooth.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type BaseProfile = baseProfile.BaseProfile; + +diff --git a/api/@ohos.bluetooth.hid.d.ts b/api/@ohos.bluetooth.hid.d.ts +index b31f161d1..7375d0374 100644 +--- a/api/@ohos.bluetooth.hid.d.ts ++++ b/api/@ohos.bluetooth.hid.d.ts +@@ -34,7 +34,8 @@ declare namespace hid { + * + * @typedef { baseProfile.BaseProfile } BaseProfile + * @syscap SystemCapability.Communication.Bluetooth.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type BaseProfile = baseProfile.BaseProfile; + +diff --git a/api/@ohos.brightness.d.ts b/api/@ohos.brightness.d.ts +index 86a55c05f..1545fa73d 100644 +--- a/api/@ohos.brightness.d.ts ++++ b/api/@ohos.brightness.d.ts +@@ -20,9 +20,6 @@ + */ + + import { BusinessError } from './@ohos.base'; +-/*** if arkts 1.1 */ +-import { int } from './@ohos.base'; +-/*** endif */ + + /** + * Provides interfaces to control the power of display. +diff --git a/api/@ohos.buffer.d.ts b/api/@ohos.buffer.d.ts +index 5052e2092..785e34994 100644 +--- a/api/@ohos.buffer.d.ts ++++ b/api/@ohos.buffer.d.ts +@@ -2390,6 +2390,18 @@ declare namespace buffer { + */ + toJSON(): Object; + ++ /** ++ * Converts this Buffer instance into a JsonElement. ++ * ++ * @returns { jsonx.JsonElement } A new JsonElement containing the Buffer ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ toJSON(): jsonx.JsonElement; ++ + /** + * Decodes buf to a string according to the specified character encoding in encoding + * +@@ -3538,30 +3550,20 @@ declare namespace buffer { + writeUIntLE(value: number, offset: number, byteLength: number): number; + + /** +- * Returns the byte at the specified index. ++ * Returns the item at that index. + * +- * @param { number } index - byte index to read +- * @returns { number | undefined } Returns the byte value at `index` ++ * @param { number } index - The zero-based index of the desired code unit. ++ * Throws error if index < 0 or index >= buffer.length. ++ * @returns { number } The element in the buffer matching the given index. ++ * @throws { BusinessError } 10200001 - The value of index is out of range. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +- $_get(index: number): number | undefined; ++ [index: number]: number; + +- /** +- * Sets the byte at the specified index. +- * +- * @param { number } index – byte index to write +- * @param { number } value – byte value (0–255) +- * @syscap SystemCapability.Utils.Lang +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +- $_set(index: number, value: number): void; + } + + /** +diff --git a/api/@ohos.bundle.appControl.d.ts b/api/@ohos.bundle.appControl.d.ts +index 33a6f0d8b..b0fd173c6 100644 +--- a/api/@ohos.bundle.appControl.d.ts ++++ b/api/@ohos.bundle.appControl.d.ts +@@ -19,7 +19,12 @@ + */ + + import { AsyncCallback } from './@ohos.base'; ++/*** if arkts 1.1 */ ++import type { ElementName } from './bundleManager/ElementName'; ++/*** endif */ ++/*** if arkts 1.2 */ + import { ElementName } from './bundleManager/ElementName'; ++/*** endif */ + import Want from './@ohos.app.ability.Want'; + + /** +@@ -28,16 +33,18 @@ import Want from './@ohos.app.ability.Want'; + * @namespace appControl + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace appControl { + /** + * Indicates the ability component type. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum ComponentType { + /** +@@ -45,7 +52,8 @@ declare namespace appControl { + * + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + UI_ABILITY = 1, + +@@ -54,7 +62,8 @@ declare namespace appControl { + * + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + UI_EXTENSION = 2 + } +@@ -62,10 +71,11 @@ declare namespace appControl { + /** + * Indicates the ability component type when uninstalled. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum UninstallComponentType { + /** +@@ -73,7 +83,8 @@ declare namespace appControl { + * + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EXTENSION = 1, + } +@@ -81,10 +92,11 @@ declare namespace appControl { + /** + * Indicates when to intercept the specified application. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum DisposedType { + /** +@@ -92,7 +104,8 @@ declare namespace appControl { + * + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BLOCK_APPLICATION = 1, + /** +@@ -100,7 +113,8 @@ declare namespace appControl { + * + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BLOCK_ABILITY = 2, + /** +@@ -108,7 +122,8 @@ declare namespace appControl { + * + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NON_BLOCK = 3 + } +@@ -116,10 +131,11 @@ declare namespace appControl { + /** + * Indicates the strategy to intercept the specified application. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum ControlType { + /** +@@ -127,7 +143,8 @@ declare namespace appControl { + * + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ALLOWED_LIST = 1, + /** +@@ -135,7 +152,8 @@ declare namespace appControl { + * + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DISALLOWED_LIST = 2 + } +@@ -146,7 +164,8 @@ declare namespace appControl { + * @typedef DisposedRule + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface DisposedRule { + /** +@@ -155,7 +174,8 @@ declare namespace appControl { + * @type { Want } + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + want: Want; + +@@ -165,7 +185,8 @@ declare namespace appControl { + * @type { ComponentType } + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + componentType: ComponentType; + +@@ -175,7 +196,8 @@ declare namespace appControl { + * @type { DisposedType } + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + disposedType: DisposedType; + +@@ -185,7 +207,8 @@ declare namespace appControl { + * @type { ControlType } + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + controlType: ControlType; + +@@ -195,19 +218,21 @@ declare namespace appControl { + * @type { Array } + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- elementList: Array ; ++ elementList: Array; + + /** + * Indicates priority of the rule. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- priority: number; ++ priority: int; + } + + /** +@@ -216,7 +241,8 @@ declare namespace appControl { + * @typedef UninstallDisposedRule + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface UninstallDisposedRule { + /** +@@ -225,7 +251,8 @@ declare namespace appControl { + * @type { Want } + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + want: Want; + +@@ -235,19 +262,21 @@ declare namespace appControl { + * @type { UninstallComponentType } + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + uninstallComponentType: UninstallComponentType; + + /** + * Indicates priority of the rule. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- priority: number; ++ priority: int; + } + + /** +@@ -264,7 +293,8 @@ declare namespace appControl { + * @throws { BusinessError } 17700005 - The specified app ID is empty string. + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setDisposedStatus(appId: string, disposedWant: Want, callback: AsyncCallback): void; + +@@ -282,7 +312,8 @@ declare namespace appControl { + * @throws { BusinessError } 17700005 - The specified app ID is empty string. + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setDisposedStatus(appId: string, disposedWant: Want): Promise; + +@@ -299,7 +330,8 @@ declare namespace appControl { + * @throws { BusinessError } 17700005 - The specified app ID is empty string. + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setDisposedStatusSync(appId: string, disposedWant: Want): void; + +@@ -316,7 +348,8 @@ declare namespace appControl { + * @throws { BusinessError } 17700005 - The specified app ID is empty string. + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getDisposedStatus(appId: string, callback: AsyncCallback): void; + +@@ -333,7 +366,8 @@ declare namespace appControl { + * @throws { BusinessError } 17700005 - The specified app ID is empty string. + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getDisposedStatus(appId: string): Promise; + +@@ -350,7 +384,8 @@ declare namespace appControl { + * @throws { BusinessError } 17700005 - The specified app ID is empty string. + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getDisposedStatusSync(appId: string): Want; + +@@ -367,7 +402,8 @@ declare namespace appControl { + * @throws { BusinessError } 17700005 - The specified app ID is empty string. + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function deleteDisposedStatus(appId: string, callback: AsyncCallback): void; + +@@ -384,7 +420,8 @@ declare namespace appControl { + * @throws { BusinessError } 17700005 - The specified app ID is empty string. + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function deleteDisposedStatus(appId: string): Promise; + +@@ -407,7 +444,7 @@ declare namespace appControl { + * + * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS + * @param { string } appId - Indicates the app ID of the application. +- * @param { number } [appIndex] Indicates the index of clone app. ++ * @param { int } [appIndex] Indicates the index of clone app. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. +@@ -416,9 +453,10 @@ declare namespace appControl { + * @throws { BusinessError } 17700061 - AppIndex is not in the valid range. + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function deleteDisposedStatusSync(appId: string, appIndex?: number): void; ++ function deleteDisposedStatusSync(appId: string, appIndex?: int): void; + + /** + * Obtains the disposed rule of a specified bundle. +@@ -440,7 +478,7 @@ declare namespace appControl { + * + * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS + * @param { string } appId - Indicates the app ID of the application. +- * @param { number } [appIndex] Indicates the index of clone app. ++ * @param { int } [appIndex] Indicates the index of clone app. + * @returns { DisposedRule } Returns the disposed rule of a specified bundle. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. +@@ -450,9 +488,10 @@ declare namespace appControl { + * @throws { BusinessError } 17700061 - AppIndex is not in the valid range. + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getDisposedRule(appId: string, appIndex?: number): DisposedRule; ++ function getDisposedRule(appId: string, appIndex?: int): DisposedRule; + + /** + * Sets the disposed rule of a specified bundle. +@@ -475,7 +514,7 @@ declare namespace appControl { + * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS + * @param { string } appId - Indicates the app ID of the application. + * @param { DisposedRule } rule - Indicates the disposed rule of a specified bundle. +- * @param { number } [appIndex] Indicates the index of clone app. ++ * @param { int } [appIndex] Indicates the index of clone app. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. +@@ -484,9 +523,10 @@ declare namespace appControl { + * @throws { BusinessError } 17700061 - AppIndex is not in the valid range. + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function setDisposedRule(appId: string, rule: DisposedRule, appIndex?: number): void; ++ function setDisposedRule(appId: string, rule: DisposedRule, appIndex?: int): void; + + /** + * Sets the uninstall disposed rule of a specified bundle. +@@ -494,7 +534,7 @@ declare namespace appControl { + * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS + * @param { string } appIdentifier - Indicates the appIdentifier of the application. + * @param { UninstallDisposedRule } rule - Indicates the uninstall disposed rule of a specified bundle. +- * @param { number } [appIndex] Indicates the index of clone app. ++ * @param { int } [appIndex] Indicates the index of clone app. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. +@@ -504,16 +544,17 @@ declare namespace appControl { + * @throws { BusinessError } 17700075 - The specified bundleName of want is not the same with caller. + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function setUninstallDisposedRule(appIdentifier: string, rule: UninstallDisposedRule, appIndex?: number): void; ++ function setUninstallDisposedRule(appIdentifier: string, rule: UninstallDisposedRule, appIndex?: int): void; + + /** + * Obtains the uninstall disposed rule of a specified bundle. + * + * @permission ohos.permission.GET_DISPOSED_APP_STATUS or ohos.permission.MANAGE_DISPOSED_APP_STATUS + * @param { string } appIdentifier - Indicates the appIdentifier of the application. +- * @param { number } [appIndex] Indicates the index of clone app. ++ * @param { int } [appIndex] Indicates the index of clone app. + * @returns { UninstallDisposedRule } Returns the uninstall disposed rule of a specified bundle. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. +@@ -523,16 +564,17 @@ declare namespace appControl { + * @throws { BusinessError } 17700074 - The specified appIdentifier is invalid. + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getUninstallDisposedRule(appIdentifier: string, appIndex?: number): UninstallDisposedRule; ++ function getUninstallDisposedRule(appIdentifier: string, appIndex?: int): UninstallDisposedRule; + + /** + * Delete the uninstall disposed rule of a specified bundle. + * + * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS + * @param { string } appIdentifier - Indicates the appIdentifier of the application. +- * @param { number } [appIndex] Indicates the index of clone app. ++ * @param { int } [appIndex] Indicates the index of clone app. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. +@@ -541,9 +583,10 @@ declare namespace appControl { + * @throws { BusinessError } 17700074 - The specified appIdentifier is invalid. + * @syscap SystemCapability.BundleManager.BundleFramework.AppControl + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function deleteUninstallDisposedRule(appIdentifier: string, appIndex?: number): void; ++ function deleteUninstallDisposedRule(appIdentifier: string, appIndex?: int): void; + } + + export default appControl; +diff --git a/api/@ohos.bundle.appDomainVerify.d.ts b/api/@ohos.bundle.appDomainVerify.d.ts +index 972f9cfab..a28a83468 100644 +--- a/api/@ohos.bundle.appDomainVerify.d.ts ++++ b/api/@ohos.bundle.appDomainVerify.d.ts +@@ -13,7 +13,8 @@ + * @syscap SystemCapability.BundleManager.AppDomainVerify + * @systemapi + * @stagemodelonly +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace appDomainVerify { + +@@ -30,7 +31,8 @@ declare namespace appDomainVerify { + * @syscap SystemCapability.BundleManager.AppDomainVerify + * @systemapi + * @stagemodelonly +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function queryAssociatedDomains(bundleName: string): string[]; + +@@ -46,7 +48,8 @@ declare namespace appDomainVerify { + * @syscap SystemCapability.BundleManager.AppDomainVerify + * @systemapi + * @stagemodelonly +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function queryAssociatedBundleNames(domain: string): string[]; + } +diff --git a/api/@ohos.bundle.bundleManager.d.ts b/api/@ohos.bundle.bundleManager.d.ts +index d1093417e..49d445121 100644 +--- a/api/@ohos.bundle.bundleManager.d.ts ++++ b/api/@ohos.bundle.bundleManager.d.ts +@@ -22,12 +22,12 @@ import { AsyncCallback } from './@ohos.base'; + import { Metadata as _Metadata } from './bundleManager/Metadata'; + import { ElementName as _ElementName } from './bundleManager/ElementName'; + import Want from './@ohos.app.ability.Want'; +-/*** if arkts 1.1 */ +-import type { ApplicationInfo as _ApplicationInfo, ModuleMetadata as _ModuleMetadata, +- PreinstalledApplicationInfo as _PreinstalledApplicationInfo } from './bundleManager/ApplicationInfo'; + import { PermissionDef as _PermissionDef } from './bundleManager/PermissionDef'; + import { PluginBundleInfo as _PluginBundleInfo, PluginModuleInfo as _PluginModuleInfo} from './bundleManager/PluginBundleInfo'; + import { SharedBundleInfo as _SharedBundleInfo } from './bundleManager/SharedBundleInfo'; ++/*** if arkts 1.1 */ ++import type { ApplicationInfo as _ApplicationInfo, ModuleMetadata as _ModuleMetadata, ++ PreinstalledApplicationInfo as _PreinstalledApplicationInfo } from './bundleManager/ApplicationInfo'; + import type { RecoverableApplicationInfo as _RecoverableApplicationInfo } from './bundleManager/RecoverableApplicationInfo'; + import * as _AbilityInfo from './bundleManager/AbilityInfo'; + import * as _AppProvisionInfo from './bundleManager/AppProvisionInfo'; +@@ -39,7 +39,9 @@ import * as _Skill from './bundleManager/Skill'; + /*** if arkts 1.2 */ + import { ApplicationInfo as _ApplicationInfo, ModuleMetadata as _ModuleMetadata, + PreinstalledApplicationInfo as _PreinstalledApplicationInfo } from './bundleManager/ApplicationInfo'; ++import { RecoverableApplicationInfo as _RecoverableApplicationInfo } from './bundleManager/RecoverableApplicationInfo'; + import { AbilityInfo as _AbilityInfo, WindowSize as _WindowSize } from './bundleManager/AbilityInfo'; ++import { AppProvisionInfo as _AppProvisionInfo, Validity as _Validity } from './bundleManager/AppProvisionInfo'; + import { BundleInfo as _BundleInfo, UsedScene as _UsedScene, ReqPermissionDetail as _ReqPermissionDetail, + SignatureInfo as _SignatureInfo, AppCloneIdentity as _AppCloneIdentity } from './bundleManager/BundleInfo'; + import { HapModuleInfo as _HapModuleInfo, PreloadItem as _PreloadItem, Dependency as _Dependency, +@@ -82,11 +84,22 @@ declare namespace bundleManager { + */ + /** + * Used to query the enumeration value of bundleInfo. Multiple values can be passed in the form. ++ * Multiple value input, such as GET_BUNDLE_INFO_DEFAULT | GET_BUNDLE_INFO_WITH_APPLICATION. + * + * @enum { number } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Used to query the enumeration value of bundleInfo. Multiple values can be passed in the form. ++ * Multiple value input, such as GET_BUNDLE_INFO_DEFAULT | GET_BUNDLE_INFO_WITH_APPLICATION. ++ * ++ * @enum { int } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + enum BundleFlag { +@@ -103,7 +116,16 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Used to obtain the default bundleInfo. The obtained bundleInfo does not contain information of ++ * signatureInfo, applicationInfo, hapModuleInfo, ability, extensionAbility and permission. ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + GET_BUNDLE_INFO_DEFAULT = 0x00000000, +@@ -120,7 +142,16 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Used to obtain the bundleInfo containing applicationInfo. The obtained bundleInfo does not ++ * contain the information of signatureInfo, hapModuleInfo, ability, extensionAbility and permission. ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + GET_BUNDLE_INFO_WITH_APPLICATION = 0x00000001, +@@ -137,33 +168,56 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Used to obtain the bundleInfo containing hapModuleInfo. The obtained bundleInfo does not ++ * contain the information of signatureInfo, applicationInfo, ability, extensionAbility and permission. ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + GET_BUNDLE_INFO_WITH_HAP_MODULE = 0x00000002, + /** + * Used to obtain the bundleInfo containing ability. The obtained bundleInfo does not + * contain the information of signatureInfo, applicationInfo, extensionAbility and permission. +- * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE. ++ * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE, ++ * such as GET_BUNDLE_INFO_WITH_ABILITY | GET_BUNDLE_INFO_WITH_HAP_MODULE. + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @since 9 + */ ++ /** ++ * Used to obtain the bundleInfo containing ability. The obtained bundleInfo does not ++ * contain the information of signatureInfo, applicationInfo, extensionAbility and permission. ++ * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE, ++ * such as GET_BUNDLE_INFO_WITH_ABILITY | GET_BUNDLE_INFO_WITH_HAP_MODULE. ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @atomicservice ++ * @since 11 ++ */ + /** + * Used to obtain the bundleInfo containing ability. The obtained bundleInfo does not + * contain the information of signatureInfo, applicationInfo, extensionAbility and permission. + * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE. ++ * such as GET_BUNDLE_INFO_WITH_ABILITY | GET_BUNDLE_INFO_WITH_HAP_MODULE. + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 20 + * @arkts 1.1&1.2 + */ + GET_BUNDLE_INFO_WITH_ABILITY = 0x00000004, + /** + * Used to obtain the bundleInfo containing extensionAbility. The obtained bundleInfo does not + * contain the information of signatureInfo, applicationInfo, ability and permission. +- * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE. ++ * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE, ++ * such as GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY | GET_BUNDLE_INFO_WITH_HAP_MODULE. + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @since 9 +@@ -171,7 +225,8 @@ declare namespace bundleManager { + /** + * Used to obtain the bundleInfo containing extensionAbility. The obtained bundleInfo does not + * contain the information of signatureInfo, applicationInfo, ability and permission. +- * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE. ++ * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE, ++ * such as GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY | GET_BUNDLE_INFO_WITH_HAP_MODULE. + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +@@ -192,26 +247,51 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Used to obtain the bundleInfo containing permission. The obtained bundleInfo does not ++ * contain the information of signatureInfo, applicationInfo, hapModuleInfo, extensionAbility and ability. ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + GET_BUNDLE_INFO_WITH_REQUESTED_PERMISSION = 0x00000010, + /** + * Used to obtain the metadata contained in applicationInfo, moduleInfo and abilityInfo. + * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_APPLICATION, +- * GET_BUNDLE_INFO_WITH_HAP_MODULE, GET_BUNDLE_INFO_WITH_ABILITIES, GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY. ++ * GET_BUNDLE_INFO_WITH_HAP_MODULE, GET_BUNDLE_INFO_WITH_ABILITY, GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY. + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @since 9 + */ ++ /** ++ * Used to obtain the metadata contained in applicationInfo, moduleInfo, abilityInfo and extensionAbility. ++ * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_APPLICATION, ++ * GET_BUNDLE_INFO_WITH_HAP_MODULE, GET_BUNDLE_INFO_WITH_ABILITY, GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY, ++ * such as GET_BUNDLE_INFO_WITH_APPLICATION | GET_BUNDLE_INFO_WITH_METADATA ++ * or GET_BUNDLE_INFO_WITH_HAP_MODULE | GET_BUNDLE_INFO_WITH_ABILITY | GET_BUNDLE_INFO_WITH_METADATA ++ * or GET_BUNDLE_INFO_WITH_HAP_MODULE | GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY | GET_BUNDLE_INFO_WITH_METADATA. ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @atomicservice ++ * @since 11 ++ */ + /** + * Used to obtain the metadata contained in applicationInfo, moduleInfo and abilityInfo. + * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_APPLICATION, +- * GET_BUNDLE_INFO_WITH_HAP_MODULE, GET_BUNDLE_INFO_WITH_ABILITIES, GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY. ++ * GET_BUNDLE_INFO_WITH_HAP_MODULE, GET_BUNDLE_INFO_WITH_ABILITY, GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY, ++ * such as GET_BUNDLE_INFO_WITH_APPLICATION | GET_BUNDLE_INFO_WITH_METADATA ++ * or GET_BUNDLE_INFO_WITH_HAP_MODULE | GET_BUNDLE_INFO_WITH_ABILITY | GET_BUNDLE_INFO_WITH_METADATA ++ * or GET_BUNDLE_INFO_WITH_HAP_MODULE | GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY | GET_BUNDLE_INFO_WITH_METADATA. + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 20 + * @arkts 1.1&1.2 + */ + GET_BUNDLE_INFO_WITH_METADATA = 0x00000020, +@@ -230,7 +310,17 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Used to obtain the default bundleInfo containing disabled application and ability. ++ * The obtained bundleInfo does not contain information of signatureInfo, applicationInfo, ++ * hapModuleInfo, ability, extensionAbility and permission. ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + GET_BUNDLE_INFO_WITH_DISABLE = 0x00000040, +@@ -247,14 +337,24 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Used to obtain the bundleInfo containing signatureInfo. The obtained bundleInfo does not ++ * contain the information of applicationInfo, hapModuleInfo, extensionAbility, ability and permission. ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + GET_BUNDLE_INFO_WITH_SIGNATURE_INFO = 0x00000080, + /** + * Used to obtain the bundleInfo containing menu configuration in hapModuleInfo. + * The obtained bundleInfo does not contain the information of applicationInfo, extensionAbility, ability and permission. +- * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE. ++ * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE, ++ * such as GET_BUNDLE_INFO_WITH_MENU | GET_BUNDLE_INFO_WITH_HAP_MODULE + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +@@ -265,7 +365,8 @@ declare namespace bundleManager { + /** + * Used to obtain the bundleInfo containing router map configuration in hapModuleInfo. + * The obtained bundleInfo does not contain the information of applicationInfo, extensionAbility, ability and permission. +- * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE. ++ * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE, ++ * such as GET_BUNDLE_INFO_WITH_ROUTER_MAP | GET_BUNDLE_INFO_WITH_HAP_MODULE + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +@@ -276,7 +377,9 @@ declare namespace bundleManager { + /** + * Used to obtain the skillInfo contained in abilityInfo and extensionInfo. + * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE, +- * GET_BUNDLE_INFO_WITH_ABILITIES, GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY. ++ * GET_BUNDLE_INFO_WITH_ABILITY, GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY, ++ * such as GET_BUNDLE_INFO_WITH_SKILL | GET_BUNDLE_INFO_WITH_HAP_MODULE | GET_BUNDLE_INFO_WITH_ABILITY ++ * or GET_BUNDLE_INFO_WITH_SKILL | GET_BUNDLE_INFO_WITH_HAP_MODULE | GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +@@ -295,7 +398,9 @@ declare namespace bundleManager { + */ + GET_BUNDLE_INFO_ONLY_WITH_LAUNCHER_ABILITY = 0x00001000, + /** +- * Used to obtain the bundleInfo only if any user installed ++ * Used to obtain the bundle information of an application installed by any user. ++ * It must be used together with GET_BUNDLE_INFO_WITH_APPLICATION. ++ * It is valid only in the {@link getBundleInfo} and {@link getAllBundleInfo} APIs. + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +@@ -318,7 +423,7 @@ declare namespace bundleManager { + /** + * Used to query the enumeration value of applicationInfo. Multiple values can be passed in the form. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} +@@ -370,7 +475,15 @@ declare namespace bundleManager { + * @enum { number } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since arkts {'1.1':'9', '1.2':'20'} ++ * @since 9 ++ */ ++ /** ++ * Used to query the enumeration value of abilityInfo. Multiple values can be passed in the form. ++ * ++ * @enum { int } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + enum AbilityFlag { +@@ -380,7 +493,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since arkts {'1.1':'9', '1.2':'20'} ++ * @since 9 ++ */ ++ /** ++ * Used to obtain the default abilityInfo. The obtained abilityInfo does not contain the information of ++ * permission, metadata and disabled abilityInfo. ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + GET_ABILITY_INFO_DEFAULT = 0x00000000, +@@ -389,7 +510,14 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since arkts {'1.1':'9', '1.2':'20'} ++ * @since 9 ++ */ ++ /** ++ * Used to obtain the abilityInfo containing permission. ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + GET_ABILITY_INFO_WITH_PERMISSION = 0x00000001, +@@ -398,7 +526,14 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since arkts {'1.1':'9', '1.2':'20'} ++ * @since 9 ++ */ ++ /** ++ * Used to obtain the abilityInfo containing applicationInfo. ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + GET_ABILITY_INFO_WITH_APPLICATION = 0x00000002, +@@ -407,7 +542,14 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since arkts {'1.1':'9', '1.2':'20'} ++ * @since 9 ++ */ ++ /** ++ * Used to obtain the abilityInfo containing metadata. ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + GET_ABILITY_INFO_WITH_METADATA = 0x00000004, +@@ -416,7 +558,14 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since arkts {'1.1':'9', '1.2':'20'} ++ * @since 9 ++ */ ++ /** ++ * Used to obtain the abilityInfo containing disabled abilityInfo. ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + GET_ABILITY_INFO_WITH_DISABLE = 0x00000008, +@@ -432,7 +581,14 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Used to obtain the abilityInfo only for system app. ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + GET_ABILITY_INFO_ONLY_SYSTEM_APP = 0x00000010, +@@ -441,7 +597,14 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Used to obtain the abilityInfo with domain verification. ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + GET_ABILITY_INFO_WITH_APP_LINKING = 0x00000040, +@@ -450,7 +613,14 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Used to obtain the abilityInfo with Skill ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + GET_ABILITY_INFO_WITH_SKILL = 0x00000080, +@@ -459,7 +629,7 @@ declare namespace bundleManager { + /** + * Used to query the enumeration value of ExtensionAbilityInfo. Multiple values can be passed in the form. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} +@@ -524,7 +694,7 @@ declare namespace bundleManager { + /** + * This enumeration value is used to identify various types of extension ability + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} +@@ -535,8 +705,7 @@ declare namespace bundleManager { + * Indicates extension info with type of form + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Indicates extension info with type of form +@@ -768,7 +937,7 @@ declare namespace bundleManager { + * Indicates extension info with type of distributed + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core +- * @since arkts {'1.1':'18', '1.2':'20'} ++ * @since 20 + * @arkts 1.1&1.2 + */ + DISTRIBUTED = 28, +@@ -796,7 +965,16 @@ declare namespace bundleManager { + * @enum { number } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * PermissionGrantState ++ * ++ * @enum { int } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + export enum PermissionGrantState { +@@ -811,7 +989,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * PERMISSION_DENIED ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + PERMISSION_DENIED = -1, +@@ -827,7 +1013,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * PERMISSION_GRANTED ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + PERMISSION_GRANTED = 0 +@@ -846,7 +1040,16 @@ declare namespace bundleManager { + * @enum { number } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Support window mode ++ * ++ * @enum { int } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + export enum SupportWindowMode { +@@ -861,7 +1064,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates supported window mode of full screen mode ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + FULL_SCREEN = 0, +@@ -876,7 +1087,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates supported window mode of split mode ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + SPLIT = 1, +@@ -891,7 +1110,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates supported window mode of floating mode ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + FLOATING = 2 +@@ -915,7 +1142,7 @@ declare namespace bundleManager { + /** + * Launch type + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice +@@ -982,7 +1209,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates that the ability can have specified instances ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + SPECIFIED = 2 +@@ -1038,7 +1273,16 @@ declare namespace bundleManager { + * @enum { number } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Display orientation ++ * ++ * @enum { int } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + export enum DisplayOrientation { +@@ -1053,7 +1297,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates that the system automatically determines the display orientation ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + UNSPECIFIED, +@@ -1069,7 +1321,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the landscape orientation ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + LANDSCAPE, +@@ -1085,7 +1345,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the portrait orientation ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + PORTRAIT, +@@ -1101,7 +1369,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the page ability orientation is the same as that of the nearest ability in the stack ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + FOLLOW_RECENT, +@@ -1117,7 +1393,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the inverted landscape orientation ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + LANDSCAPE_INVERTED, +@@ -1133,7 +1417,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the inverted portrait orientation ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + PORTRAIT_INVERTED, +@@ -1149,7 +1441,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the orientation can be auto-rotated ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + AUTO_ROTATION, +@@ -1165,7 +1465,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the landscape orientation rotated with sensor ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + AUTO_ROTATION_LANDSCAPE, +@@ -1181,7 +1489,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the portrait orientation rotated with sensor ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + AUTO_ROTATION_PORTRAIT, +@@ -1197,7 +1513,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the sensor restricted mode ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + AUTO_ROTATION_RESTRICTED, +@@ -1213,7 +1537,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the sensor landscape restricted mode ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + AUTO_ROTATION_LANDSCAPE_RESTRICTED, +@@ -1229,7 +1561,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the sensor portrait restricted mode ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + AUTO_ROTATION_PORTRAIT_RESTRICTED, +@@ -1245,7 +1585,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the locked orientation mode ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + LOCKED, +@@ -1284,7 +1632,16 @@ declare namespace bundleManager { + * @enum { number } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates module type ++ * ++ * @enum { int } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + export enum ModuleType { +@@ -1299,7 +1656,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates entry type ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + ENTRY = 1, +@@ -1314,7 +1679,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates feature type ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + FEATURE = 2, +@@ -1329,7 +1702,15 @@ declare namespace bundleManager { + * + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates shared type ++ * ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + SHARED = 3 +@@ -1345,7 +1726,7 @@ declare namespace bundleManager { + /** + * Indicates bundle type + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} +@@ -1392,7 +1773,7 @@ declare namespace bundleManager { + /** + * Shared bundle compatible policy + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} +@@ -1419,7 +1800,7 @@ declare namespace bundleManager { + /** + * This enumeration value is used to identify various types of JSON profile. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi + * @since arkts {'1.1':'11', '1.2':'20'} +@@ -1440,7 +1821,7 @@ declare namespace bundleManager { + /** + * This enumeration value is used to identify the distribution type of application. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi + * @since arkts {'1.1':'12', '1.2':'20'} +@@ -1523,7 +1904,7 @@ declare namespace bundleManager { + /** + * This enumeration value is used to identify various types of extension ability + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 +@@ -1558,7 +1939,7 @@ declare namespace bundleManager { + /** + * This enumeration value is used to identify various flags of application + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi + * @since arkts {'1.1':'12', '1.2':'20'} +@@ -1620,10 +2001,21 @@ declare namespace bundleManager { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Obtains own bundleInfo. ++ * ++ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. ++ * @returns { Promise } The result of getting the bundle info. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ +- function getBundleInfoForSelf(bundleFlags: number): Promise; ++ function getBundleInfoForSelf(bundleFlags: int): Promise; + + /** + * Obtains own bundleInfo. +@@ -1642,10 +2034,21 @@ declare namespace bundleManager { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Obtains own bundleInfo. ++ * ++ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. ++ * @param { AsyncCallback } callback - The callback of getting bundle info result. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ +- function getBundleInfoForSelf(bundleFlags: number, callback: AsyncCallback): void; ++ function getBundleInfoForSelf(bundleFlags: int, callback: AsyncCallback): void; + + /** + * Obtains own bundleInfo. +@@ -1664,17 +2067,28 @@ declare namespace bundleManager { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Obtains own bundleInfo. ++ * ++ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. ++ * @returns { BundleInfo } The result of getting the bundle info. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ +- function getBundleInfoForSelfSync(bundleFlags: number): BundleInfo; ++ function getBundleInfoForSelfSync(bundleFlags: int): BundleInfo; + + /** + * Obtains bundleInfo based on bundleName, bundleFlags. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { string } bundleName - Indicates the application bundle name to be queried. +- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. ++ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { AsyncCallback } callback - The callback of getting bundle info result. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. +@@ -1684,15 +2098,15 @@ declare namespace bundleManager { + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getBundleInfo(bundleName: string, bundleFlags: number, callback: AsyncCallback): void; ++ function getBundleInfo(bundleName: string, bundleFlags: int, callback: AsyncCallback): void; + + /** + * Obtains bundleInfo based on bundleName, bundleFlags and userId. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { string } bundleName - Indicates the application bundle name to be queried. +- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. +- * @param { number } userId - Indicates the user ID or do not pass user ID. ++ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. ++ * @param { int } userId - Indicates the user ID or do not pass user ID. + * @param { AsyncCallback } callback - The callback of getting bundle info result. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. +@@ -1704,15 +2118,15 @@ declare namespace bundleManager { + * @arkts 1.1&1.2 + */ + function getBundleInfo(bundleName: string, +- bundleFlags: number, userId: number, callback: AsyncCallback): void; ++ bundleFlags: int, userId: int, callback: AsyncCallback): void; + + /** + * Obtains bundleInfo based on bundleName, bundleFlags and userId. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { string } bundleName - Indicates the application bundle name to be queried. +- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. +- * @param { number } userId - Indicates the user ID or do not pass user ID. ++ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. ++ * @param { int } userId - Indicates the user ID or do not pass user ID. + * @returns { Promise } The result of getting the bundle info. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. +@@ -1723,14 +2137,14 @@ declare namespace bundleManager { + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getBundleInfo(bundleName: string, bundleFlags: number, userId?: number): Promise; ++ function getBundleInfo(bundleName: string, bundleFlags: int, userId?: int): Promise; + + /** + * Obtains application info based on a given bundle name. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { string } bundleName - Indicates the application bundle name to be queried. +- * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. ++ * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. + * @param { AsyncCallback } callback - The callback of getting application info result. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -1742,15 +2156,15 @@ declare namespace bundleManager { + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getApplicationInfo(bundleName: string, appFlags: number, callback: AsyncCallback): void; ++ function getApplicationInfo(bundleName: string, appFlags: int, callback: AsyncCallback): void; + + /** + * Obtains application info based on a given bundle name. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { string } bundleName - Indicates the application bundle name to be queried. +- * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. +- * @param { number } userId - Indicates the user ID or do not pass user ID. ++ * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. ++ * @param { int } userId - Indicates the user ID or do not pass user ID. + * @param { AsyncCallback } callback - The callback of getting application info result. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -1764,15 +2178,15 @@ declare namespace bundleManager { + * @arkts 1.1&1.2 + */ + function getApplicationInfo(bundleName: string, +- appFlags: number, userId: number, callback: AsyncCallback): void; ++ appFlags: int, userId: int, callback: AsyncCallback): void; + + /** + * Obtains application info based on a given bundle name. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { string } bundleName - Indicates the application bundle name to be queried. +- * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. +- * @param { number } userId - Indicates the user ID or do not pass user ID. ++ * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. ++ * @param { int } userId - Indicates the user ID or do not pass user ID. + * @returns { Promise } The result of getting the application info. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -1785,13 +2199,13 @@ declare namespace bundleManager { + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getApplicationInfo(bundleName: string, appFlags: number, userId?: number): Promise; ++ function getApplicationInfo(bundleName: string, appFlags: int, userId?: int): Promise; + + /** + * Obtains BundleInfo of all bundles available in the system. + * + * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST +- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. ++ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. + * @param { AsyncCallback> } callback - The callback of getting a list of BundleInfo objects. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -1801,14 +2215,14 @@ declare namespace bundleManager { + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getAllBundleInfo(bundleFlags: number, callback: AsyncCallback>): void; ++ function getAllBundleInfo(bundleFlags: int, callback: AsyncCallback>): void; + + /** + * Obtains BundleInfo of all bundles available in the system. + * + * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST +- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. +- * @param { number } userId - Indicates the user id. ++ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. ++ * @param { int } userId - Indicates the user id. + * @param { AsyncCallback> } callback - The callback of getting a list of BundleInfo objects. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -1819,14 +2233,14 @@ declare namespace bundleManager { + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getAllBundleInfo(bundleFlags: number, userId: number, callback: AsyncCallback>): void; ++ function getAllBundleInfo(bundleFlags: int, userId: int, callback: AsyncCallback>): void; + + /** + * Obtains BundleInfo of all bundles available in the system. + * + * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST +- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. +- * @param { number } userId - Indicates the user id. ++ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. ++ * @param { int } userId - Indicates the user id. + * @returns { Promise> } Returns a list of BundleInfo objects. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -1837,13 +2251,13 @@ declare namespace bundleManager { + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getAllBundleInfo(bundleFlags: number, userId?: number): Promise>; ++ function getAllBundleInfo(bundleFlags: int, userId?: int): Promise>; + + /** + * Obtains information about all installed applications of a specified user. + * + * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST +- * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. ++ * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. + * @param { AsyncCallback> } callback - The callback of getting a list of ApplicationInfo objects. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -1853,14 +2267,14 @@ declare namespace bundleManager { + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getAllApplicationInfo(appFlags: number, callback: AsyncCallback>): void; ++ function getAllApplicationInfo(appFlags: int, callback: AsyncCallback>): void; + + /** + * Obtains information about all installed applications of a specified user. + * + * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST +- * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. +- * @param { number } userId - Indicates the user ID or do not pass user ID. ++ * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. ++ * @param { int } userId - Indicates the user ID or do not pass user ID. + * @param { AsyncCallback> } callback - The callback of getting a list of ApplicationInfo objects. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -1871,15 +2285,15 @@ declare namespace bundleManager { + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getAllApplicationInfo(appFlags: number, +- userId: number, callback: AsyncCallback>): void; ++ function getAllApplicationInfo(appFlags: int, ++ userId: int, callback: AsyncCallback>): void; + + /** + * Obtains information about all installed applications of a specified user. + * + * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST +- * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. +- * @param { number } userId - Indicates the user ID or do not pass user ID. ++ * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. ++ * @param { int } userId - Indicates the user ID or do not pass user ID. + * @returns { Promise> } Returns a list of ApplicationInfo objects. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -1890,14 +2304,14 @@ declare namespace bundleManager { + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getAllApplicationInfo(appFlags: number, userId?: number): Promise>; ++ function getAllApplicationInfo(appFlags: int, userId?: int): Promise>; + + /** + * Query the AbilityInfo by the given Want. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { Want } want - Indicates the Want containing the application bundle name to be queried. +- * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. ++ * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. + * @param { AsyncCallback> } callback - The callback of querying ability info result. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -1912,15 +2326,15 @@ declare namespace bundleManager { + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function queryAbilityInfo(want: Want, abilityFlags: number, callback: AsyncCallback>): void; ++ function queryAbilityInfo(want: Want, abilityFlags: int, callback: AsyncCallback>): void; + + /** + * Query the AbilityInfo by the given Want. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { Want } want - Indicates the Want containing the application bundle name to be queried. +- * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. +- * @param { number } userId - userId Indicates the user ID. ++ * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. ++ * @param { int } userId - userId Indicates the user ID. + * @param { AsyncCallback> } callback - The callback of querying ability info result. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -1937,15 +2351,15 @@ declare namespace bundleManager { + * @arkts 1.1&1.2 + */ + function queryAbilityInfo(want: Want, +- abilityFlags: number, userId: number, callback: AsyncCallback>): void; ++ abilityFlags: int, userId: int, callback: AsyncCallback>): void; + + /** + * Query the AbilityInfo by the given Want. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { Want } want - Indicates the Want containing the application bundle name to be queried. +- * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. +- * @param { number } userId - userId Indicates the user ID. ++ * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. ++ * @param { int } userId - userId Indicates the user ID. + * @returns { Promise> } Returns a list of AbilityInfo objects. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -1961,15 +2375,15 @@ declare namespace bundleManager { + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function queryAbilityInfo(want: Want, abilityFlags: number, userId?: number): Promise>; ++ function queryAbilityInfo(want: Want, abilityFlags: int, userId?: int): Promise>; + + /** + * Query the AbilityInfo by the given Want Array. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { Array } wants - Indicates the Want Array containing the application bundle name to be queried. +- * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. +- * @param { number } [userId] - userId Indicates the user ID. ++ * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. ++ * @param { int } [userId] - userId Indicates the user ID. + * @returns { Promise> } Returns a list of AbilityInfo objects. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -1985,15 +2399,15 @@ declare namespace bundleManager { + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function queryAbilityInfo(wants: Array, abilityFlags: number, userId?: number): Promise>; ++ function queryAbilityInfo(wants: Array, abilityFlags: int, userId?: int): Promise>; + + /** + * Query the AbilityInfo by the given Want. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { Want } want - Indicates the Want containing the application bundle name to be queried. +- * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. +- * @param { number } userId - userId Indicates the user ID. ++ * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. ++ * @param { int } userId - userId Indicates the user ID. + * @returns { Array } Returns a list of AbilityInfo objects. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -2009,7 +2423,7 @@ declare namespace bundleManager { + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function queryAbilityInfoSync(want: Want, abilityFlags: number, userId?: number): Array; ++ function queryAbilityInfoSync(want: Want, abilityFlags: int, userId?: int): Array; + + /** + * Query extension info of by utilizing a Want. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. +@@ -2017,7 +2431,7 @@ declare namespace bundleManager { + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { Want } want - Indicates the Want containing the application bundle name to be queried. + * @param { ExtensionAbilityType } extensionAbilityType - Indicates ExtensionAbilityType. +- * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the ++ * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * ExtensionAbilityInfo objects that will be returned. + * @param { AsyncCallback> } callback - The callback of querying extension ability info result. + * @throws { BusinessError } 201 - Permission denied. +@@ -2033,7 +2447,7 @@ declare namespace bundleManager { + * @arkts 1.1&1.2 + */ + function queryExtensionAbilityInfo(want: Want, extensionAbilityType: ExtensionAbilityType, +- extensionAbilityFlags: number, callback: AsyncCallback>): void; ++ extensionAbilityFlags: int, callback: AsyncCallback>): void; + + /** + * Query extension info of by utilizing a Want. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. +@@ -2041,9 +2455,9 @@ declare namespace bundleManager { + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { Want } want - Indicates the Want containing the application bundle name to be queried. + * @param { ExtensionAbilityType } extensionAbilityType - Indicates ExtensionAbilityType. +- * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the ++ * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * ExtensionAbilityInfo objects that will be returned. +- * @param { number } userId - Indicates the user ID. ++ * @param { int } userId - Indicates the user ID. + * @param { AsyncCallback> } callback - The callback of querying extension ability info result. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -2059,7 +2473,7 @@ declare namespace bundleManager { + * @arkts 1.1&1.2 + */ + function queryExtensionAbilityInfo(want: Want, extensionAbilityType: ExtensionAbilityType, +- extensionAbilityFlags: number, userId: number, callback: AsyncCallback>): void; ++ extensionAbilityFlags: int, userId: int, callback: AsyncCallback>): void; + + /** + * Query the ExtensionAbilityInfo by the given Want. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. +@@ -2067,9 +2481,9 @@ declare namespace bundleManager { + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { Want } want - Indicates the Want containing the application bundle name to be queried. + * @param { ExtensionAbilityType } extensionAbilityType - Indicates ExtensionAbilityType. +- * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the ++ * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * ExtensionAbilityInfo objects that will be returned. +- * @param { number } userId - Indicates the user ID. ++ * @param { int } userId - Indicates the user ID. + * @returns { Promise> } Returns a list of ExtensionAbilityInfo objects. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -2085,7 +2499,7 @@ declare namespace bundleManager { + * @arkts 1.1&1.2 + */ + function queryExtensionAbilityInfo(want: Want, extensionAbilityType: ExtensionAbilityType, +- extensionAbilityFlags: number, userId?: number): Promise>; ++ extensionAbilityFlags: int, userId?: int): Promise>; + + /** + * Query the ExtensionAbilityInfo by the given Want. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. +@@ -2093,9 +2507,9 @@ declare namespace bundleManager { + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { Want } want - Indicates the Want containing the application bundle name to be queried. + * @param { ExtensionAbilityType } extensionAbilityType - Indicates ExtensionAbilityType. +- * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the ++ * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * ExtensionAbilityInfo objects that will be returned. +- * @param { number } userId - Indicates the user ID. ++ * @param { int } userId - Indicates the user ID. + * @returns { Array } Returns a list of ExtensionAbilityInfo objects. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -2111,7 +2525,7 @@ declare namespace bundleManager { + * @arkts 1.1&1.2 + */ + function queryExtensionAbilityInfoSync(want: Want, extensionAbilityType: ExtensionAbilityType, +- extensionAbilityFlags: number, userId?: number): Array; ++ extensionAbilityFlags: int, userId?: int): Array; + + /** + * Query the ExtensionAbilityInfo by the given Want. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. +@@ -2119,9 +2533,9 @@ declare namespace bundleManager { + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { Want } want - Indicates the Want containing the application bundle name to be queried. + * @param { string } extensionAbilityType - Indicates extensionAbilityType. +- * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the ++ * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * ExtensionAbilityInfo objects that will be returned. +- * @param { number } userId - Indicates the user ID. ++ * @param { int } userId - Indicates the user ID. + * @returns { Array } Returns a list of ExtensionAbilityInfo objects. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -2137,16 +2551,16 @@ declare namespace bundleManager { + * @arkts 1.1&1.2 + */ + function queryExtensionAbilityInfoSync(want: Want, extensionAbilityType: string, +- extensionAbilityFlags: number, userId?: number): Array; ++ extensionAbilityFlags: int, userId?: int): Array; + + /** + * Query the ExtensionAbilityInfo by extension ability type. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { string } extensionAbilityType - Indicates ExtensionAbilityType. +- * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the ++ * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * ExtensionAbilityInfo objects that will be returned. +- * @param { number } userId - Indicates the user ID. ++ * @param { int } userId - Indicates the user ID. + * @returns { Array } Returns a list of ExtensionAbilityInfo objects. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -2159,14 +2573,14 @@ declare namespace bundleManager { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function queryExtensionAbilityInfoSync(extensionAbilityType: string, extensionAbilityFlags: number, +- userId?: number): Array; ++ function queryExtensionAbilityInfoSync(extensionAbilityType: string, extensionAbilityFlags: int, ++ userId?: int): Array; + + /** + * Obtains bundle name by the given uid. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO +- * @param { number } uid - Indicates the UID of an application. ++ * @param { int } uid - Indicates the UID of an application. + * @param { AsyncCallback } callback - The callback of getting bundle name. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. +@@ -2175,13 +2589,13 @@ declare namespace bundleManager { + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getBundleNameByUid(uid: number, callback: AsyncCallback): void; ++ function getBundleNameByUid(uid: int, callback: AsyncCallback): void; + + /** + * Obtains bundle name by the given uid. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO +- * @param { number } uid - Indicates the UID of an application. ++ * @param { int } uid - Indicates the UID of an application. + * @returns { Promise } Returns the bundle name. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. +@@ -2190,13 +2604,13 @@ declare namespace bundleManager { + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getBundleNameByUid(uid: number): Promise; ++ function getBundleNameByUid(uid: int): Promise; + + /** + * Obtains bundle name by the given uid. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO +- * @param { number } uid - Indicates the UID of an application. ++ * @param { int } uid - Indicates the UID of an application. + * @returns { string } Returns the bundle name. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. +@@ -2205,7 +2619,7 @@ declare namespace bundleManager { + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getBundleNameByUidSync(uid: number): string; ++ function getBundleNameByUidSync(uid: int): string; + + /** + * Obtains information about an application bundle contained in an ohos Ability Package (HAP). +@@ -2213,7 +2627,7 @@ declare namespace bundleManager { + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED + * @param { string } hapFilePath - Indicates the path storing the HAP. + * The path should be the relative path to the data directory of the current application. +- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. ++ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. + * @param { AsyncCallback } callback - The callback of getting bundle archive info result. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -2221,9 +2635,10 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700022 - The hapFilePath is invalid. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getBundleArchiveInfo(hapFilePath: string, bundleFlags: number, callback: AsyncCallback): void; ++ function getBundleArchiveInfo(hapFilePath: string, bundleFlags: int, callback: AsyncCallback): void; + + /** + * Obtains information about an application bundle contained in an ohos Ability Package (HAP). +@@ -2231,7 +2646,7 @@ declare namespace bundleManager { + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED + * @param { string } hapFilePath - Indicates the path storing the HAP. + * The path should be the relative path to the data directory of the current application. +- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. ++ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. + * @returns { Promise } Returns the BundleInfo object. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -2239,9 +2654,10 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700022 - The hapFilePath is invalid. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getBundleArchiveInfo(hapFilePath: string, bundleFlags: number): Promise; ++ function getBundleArchiveInfo(hapFilePath: string, bundleFlags: int): Promise; + + /** + * Obtains information about an application bundle contained in an ohos Ability Package (HAP). +@@ -2249,7 +2665,7 @@ declare namespace bundleManager { + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED + * @param { string } hapFilePath - Indicates the path storing the HAP. + * The path should be the relative path to the data directory of the current application. +- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. ++ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. + * @returns { BundleInfo } Returns the BundleInfo object. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -2257,9 +2673,10 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700022 - The hapFilePath is invalid. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getBundleArchiveInfoSync(hapFilePath: string, bundleFlags: number): BundleInfo; ++ function getBundleArchiveInfoSync(hapFilePath: string, bundleFlags: int): BundleInfo; + + /** + * Clears cache data of a specified application. +@@ -2274,7 +2691,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700030 - The specified bundle does not support clearing of cache files. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function cleanBundleCacheFiles(bundleName: string, callback: AsyncCallback): void; + +@@ -2291,7 +2709,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700030 - The specified bundle does not support clearing of cache files. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function cleanBundleCacheFiles(bundleName: string): Promise; + +@@ -2300,7 +2719,7 @@ declare namespace bundleManager { + * + * @permission ohos.permission.REMOVE_CACHE_FILES + * @param { string } bundleName - Indicates the bundle name of the application whose cache data is to be cleaned. +- * @param { number } appIndex - Indicates the index of clone app. ++ * @param { int } appIndex - Indicates the index of clone app. + * @returns { Promise } Clean bundle cache files result + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -2310,22 +2729,24 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700061 - AppIndex not in valid range. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function cleanBundleCacheFiles(bundleName: string, appIndex: number): Promise; ++ function cleanBundleCacheFiles(bundleName: string, appIndex: int): Promise; + + /** + * Get the all bundle cache size of the current user. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED +- * @returns { Promise } Returns all bundle cache size. ++ * @returns { Promise } Returns all bundle cache size. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getAllBundleCacheSize(): Promise; ++ function getAllBundleCacheSize(): Promise; + + /** + * Clean all bundle cache files of the current user, does not include the currently running program. +@@ -2336,7 +2757,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function cleanAllBundleCache(): Promise; + +@@ -2345,7 +2767,7 @@ declare namespace bundleManager { + * + * @permission ohos.permission.CHANGE_ABILITY_ENABLED_STATE + * @param { string } bundleName - Indicates the bundle name of the application. +- * @param { number } appIndex - Indicates the index of clone app. ++ * @param { int } appIndex - Indicates the index of clone app. + * @param { boolean } isEnabled - The value true means to enable it, and the value false means to disable it. + * @returns { Promise } set app enabled result. + * @throws { BusinessError } 201 - Permission denied. +@@ -2358,7 +2780,7 @@ declare namespace bundleManager { + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function setApplicationEnabled(bundleName: string, appIndex: number, isEnabled: boolean): Promise; ++ function setApplicationEnabled(bundleName: string, appIndex: int, isEnabled: boolean): Promise; + + /** + * Sets whether to enable a specified application. +@@ -2418,7 +2840,7 @@ declare namespace bundleManager { + * + * @permission ohos.permission.CHANGE_ABILITY_ENABLED_STATE + * @param { AbilityInfo } info - Indicates information about the ability to set. +- * @param { number } appIndex - Indicates the index of clone app. ++ * @param { int } appIndex - Indicates the index of clone app. + * @param { boolean } isEnabled - The value true means to enable it, and the value false means to disable it. + * @returns { Promise } set ability enabled result. + * @throws { BusinessError } 201 - Permission denied. +@@ -2432,7 +2854,7 @@ declare namespace bundleManager { + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function setAbilityEnabled(info: AbilityInfo, appIndex: number, isEnabled: boolean): Promise; ++ function setAbilityEnabled(info: AbilityInfo, appIndex: int, isEnabled: boolean): Promise; + + /** + * Sets whether to enable a specified ability. +@@ -2494,7 +2916,7 @@ declare namespace bundleManager { + * Checks whether a specified application is enabled. + * + * @param { string } bundleName - Indicates the bundle name of the application. +- * @param { number } appIndex - Indicates the index of clone app. ++ * @param { int } appIndex - Indicates the index of clone app. + * @returns { Promise } Returns true if the application is enabled; returns false otherwise. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. +@@ -2505,7 +2927,7 @@ declare namespace bundleManager { + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function isApplicationEnabled(bundleName: string, appIndex: number): Promise; ++ function isApplicationEnabled(bundleName: string, appIndex: int): Promise; + + /** + * Checks whether a specified application is enabled. +@@ -2556,7 +2978,7 @@ declare namespace bundleManager { + * Checks whether a specified ability is enabled. + * + * @param { AbilityInfo } info - Indicates information about the ability to check. +- * @param { number } appIndex - Indicates the index of clone app. ++ * @param { int } appIndex - Indicates the index of clone app. + * @returns { Promise } Returns true if the ability is enabled; returns false otherwise. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. +@@ -2568,7 +2990,7 @@ declare namespace bundleManager { + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function isAbilityEnabled(info: AbilityInfo, appIndex: number): Promise; ++ function isAbilityEnabled(info: AbilityInfo, appIndex: int): Promise; + + /** + * Checks whether a specified ability is enabled. +@@ -2625,7 +3047,7 @@ declare namespace bundleManager { + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED + * @param { string } bundleName - Indicates the bundle name of the application. +- * @param { number } userId - Indicates the user ID or do not pass user ID. ++ * @param { int } userId - Indicates the user ID or do not pass user ID. + * @param { AsyncCallback } callback - The callback for starting the application's main ability. + * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.GET_BUNDLE_INFO_PRIVILEGED'. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -2638,7 +3060,7 @@ declare namespace bundleManager { + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getLaunchWantForBundle(bundleName: string, userId: number, callback: AsyncCallback): void; ++ function getLaunchWantForBundle(bundleName: string, userId: int, callback: AsyncCallback): void; + + /** + * Obtains the Want for starting the main ability of an application based on the +@@ -2667,7 +3089,7 @@ declare namespace bundleManager { + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED + * @param { string } bundleName - Indicates the bundle name of the application. +- * @param { number } userId - Indicates the user ID or do not pass user ID. ++ * @param { int } userId - Indicates the user ID or do not pass user ID. + * @returns { Promise } the Want for starting the application's main ability. + * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.GET_BUNDLE_INFO_PRIVILEGED'. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -2680,7 +3102,7 @@ declare namespace bundleManager { + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getLaunchWantForBundle(bundleName: string, userId?: number): Promise; ++ function getLaunchWantForBundle(bundleName: string, userId?: int): Promise; + + /** + * Obtains the Want for starting the main ability of an application based on the +@@ -2689,7 +3111,7 @@ declare namespace bundleManager { + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED + * @param { string } bundleName - Indicates the bundle name of the application. +- * @param { number } userId - Indicates the user ID or do not pass user ID. ++ * @param { int } userId - Indicates the user ID or do not pass user ID. + * @returns { Want } the Want for starting the application's main ability. + * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.GET_BUNDLE_INFO_PRIVILEGED'. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -2702,7 +3124,7 @@ declare namespace bundleManager { + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getLaunchWantForBundleSync(bundleName: string, userId?: number): Want; ++ function getLaunchWantForBundleSync(bundleName: string, userId?: int): Want; + + /** + * Obtains the Want for starting the main ability of own application. +@@ -2713,7 +3135,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700072 - The launch want is not found. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since 13 ++ * @since arkts {'1.1':'13', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getLaunchWant(): Want; + +@@ -2748,7 +3171,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700029 - The specified ability is disabled. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getProfileByAbility(moduleName: string, abilityName: string, metadataName: string, callback: AsyncCallback>): void; + +@@ -2783,7 +3207,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700029 - The specified ability is disabled. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getProfileByAbility(moduleName: string, abilityName: string, metadataName?: string): Promise>; + +@@ -2818,7 +3243,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700029 - The specified ability is disabled. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getProfileByAbilitySync(moduleName: string, abilityName: string, metadataName?: string): Array; + +@@ -2851,7 +3277,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700026 - The specified bundle is disabled. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getProfileByExtensionAbility(moduleName: string, extensionAbilityName: string, metadataName: string, callback: AsyncCallback>): void; + +@@ -2884,7 +3311,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700026 - The specified bundle is disabled. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getProfileByExtensionAbility(moduleName: string, extensionAbilityName: string, metadataName?: string): Promise>; + +@@ -2917,7 +3345,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700026 - The specified bundle is disabled. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getProfileByExtensionAbilitySync(moduleName: string, extensionAbilityName: string, metadataName?: string): Array; + +@@ -2933,7 +3362,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700006 - The specified permission is not found. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getPermissionDef(permissionName: string, callback: AsyncCallback): void; + +@@ -2949,7 +3379,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700006 - The specified permission is not found. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getPermissionDef(permissionName: string): Promise; + +@@ -2965,7 +3396,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700006 - The specified permission is not found. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getPermissionDefSync(permissionName: string): PermissionDef; + +@@ -3046,8 +3478,8 @@ declare namespace bundleManager { + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { string } bundleName - Indicates the application bundle name to be queried. +- * @param { number } applicationFlags - Indicates the flag used to specify information contained in the ApplicationInfo object that will be returned. +- * @param { number } userId - Indicates the user ID or do not pass user ID. ++ * @param { int } applicationFlags - Indicates the flag used to specify information contained in the ApplicationInfo object that will be returned. ++ * @param { int } userId - Indicates the user ID or do not pass user ID. + * @returns { ApplicationInfo } - Returns the ApplicationInfo object. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -3060,14 +3492,14 @@ declare namespace bundleManager { + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getApplicationInfoSync(bundleName: string, applicationFlags: number, userId: number): ApplicationInfo; ++ function getApplicationInfoSync(bundleName: string, applicationFlags: int, userId: int): ApplicationInfo; + + /** + * Obtains applicationInfo based on a given bundleName and bundleFlags. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { string } bundleName - Indicates the application bundle name to be queried. +- * @param { number } applicationFlags - Indicates the flag used to specify information contained in the ApplicationInfo object that will be returned. ++ * @param { int } applicationFlags - Indicates the flag used to specify information contained in the ApplicationInfo object that will be returned. + * @returns { ApplicationInfo } - Returns the ApplicationInfo object. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -3079,15 +3511,15 @@ declare namespace bundleManager { + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getApplicationInfoSync(bundleName: string, applicationFlags: number): ApplicationInfo; ++ function getApplicationInfoSync(bundleName: string, applicationFlags: int): ApplicationInfo; + + /** + * Obtains bundleInfo based on bundleName, bundleFlags and userId. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { string } bundleName - Indicates the application bundle name to be queried. +- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object that will be returned. +- * @param { number } userId - Indicates the user ID or do not pass user ID. ++ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object that will be returned. ++ * @param { int } userId - Indicates the user ID or do not pass user ID. + * @returns { BundleInfo } - Returns the BundleInfo object. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. +@@ -3098,14 +3530,14 @@ declare namespace bundleManager { + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getBundleInfoSync(bundleName: string, bundleFlags: number, userId: number): BundleInfo; ++ function getBundleInfoSync(bundleName: string, bundleFlags: int, userId: int): BundleInfo; + + /** + * Obtains bundleInfo based on bundleName, bundleFlags. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { string } bundleName - Indicates the application bundle name to be queried. +- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object that will be returned. ++ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object that will be returned. + * @returns { BundleInfo } - Returns the BundleInfo object. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. +@@ -3115,7 +3547,7 @@ declare namespace bundleManager { + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getBundleInfoSync(bundleName: string, bundleFlags: number): BundleInfo; ++ function getBundleInfoSync(bundleName: string, bundleFlags: int): BundleInfo; + + /** + * Obtains SharedBundleInfo of all shared bundle available in the system. +@@ -3126,7 +3558,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAllSharedBundleInfo(callback: AsyncCallback>): void; + +@@ -3139,7 +3572,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAllSharedBundleInfo(): Promise>; + +@@ -3157,7 +3591,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700002 - The specified moduleName is not found. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSharedBundleInfo(bundleName: string, moduleName: string, callback: AsyncCallback>): void; + +@@ -3175,7 +3610,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700002 - The specified moduleName is not found. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSharedBundleInfo(bundleName: string, moduleName: string): Promise>; + +@@ -3192,7 +3628,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700001 - The specified bundleName is not found. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAppProvisionInfo(bundleName: string, callback: AsyncCallback): void; + +@@ -3201,7 +3638,7 @@ declare namespace bundleManager { + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED + * @param { string } bundleName - Indicates the bundle name of the application to which the ability belongs. +- * @param { number } userId - Indicates the user ID or do not pass user ID. ++ * @param { int } userId - Indicates the user ID or do not pass user ID. + * @param { AsyncCallback } callback - Indicates the callback of getting AppProvisionInfo result. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -3211,16 +3648,17 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700004 - The specified user ID is not found. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getAppProvisionInfo(bundleName: string, userId: number, callback: AsyncCallback): void; ++ function getAppProvisionInfo(bundleName: string, userId: int, callback: AsyncCallback): void; + + /** + * Obtains the profile file information of a specified bundle. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED + * @param { string } bundleName - Indicates the bundle name of the application to which the ability belongs. +- * @param { number } userId - Indicates the user ID or do not pass user ID. ++ * @param { int } userId - Indicates the user ID or do not pass user ID. + * @returns { Promise } Returns the AppProvisionInfo object. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -3230,16 +3668,17 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700004 - The specified user ID is not found. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getAppProvisionInfo(bundleName: string, userId?: number): Promise; ++ function getAppProvisionInfo(bundleName: string, userId?: int): Promise; + + /** + * Obtains the profile file information of a specified bundle. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED + * @param { string } bundleName - Indicates the bundle name of the application to which the ability belongs. +- * @param { number } userId - Indicates the user ID or do not pass user ID. ++ * @param { int } userId - Indicates the user ID or do not pass user ID. + * @returns { AppProvisionInfo } Returns the AppProvisionInfo object. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -3249,9 +3688,10 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700004 - The specified user ID is not found. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getAppProvisionInfoSync(bundleName: string, userId?: number): AppProvisionInfo; ++ function getAppProvisionInfoSync(bundleName: string, userId?: int): AppProvisionInfo; + + /** + * Obtains the distribution type specified during bundle installation. +@@ -3283,7 +3723,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700001 - The specified bundleName is not found. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAdditionalInfo(bundleName: string): string; + +@@ -3313,7 +3754,7 @@ declare namespace bundleManager { + * @param { ProfileType } profileType - Indicates the type of profile to be obtained. + * @param { string } bundleName - Indicates the name of the bundle to which the profile belongs. + * @param { string } moduleName - Indicates the name of the module to which the profile belongs. +- * @param { number } userId - Indicates the user ID or do not pass user ID. ++ * @param { int } userId - Indicates the user ID or do not pass user ID. + * @returns { string } Returns string in json-format of the designated profile. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -3325,9 +3766,10 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700026 - The specified bundle is disabled. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getJsonProfile(profileType: ProfileType, bundleName: string, moduleName?: string, userId?: number): string; ++ function getJsonProfile(profileType: ProfileType, bundleName: string, moduleName?: string, userId?: int): string; + + /** + * Get extend resources. +@@ -3342,7 +3784,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700303 - Failed to obtain extended resources. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getExtResource(bundleName: string): Promise>; + +@@ -3361,7 +3804,25 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700304 - Failed to enable the dynamic icon. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Enable dynamic icon. ++ * ++ * @permission ohos.permission.ACCESS_DYNAMIC_ICON ++ * @param { string } bundleName - Indicates the bundleName. ++ * @param { string } moduleName - Indicates the moduleName for extend resource. ++ * @returns { Promise } Returns enableDynamicIcon result. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 202 - Permission denied, non-system app called system api. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. ++ * @throws { BusinessError } 17700001 - The specified bundleName is not found. ++ * @throws { BusinessError } 17700002 - The specified moduleName is not found. ++ * @throws { BusinessError } 17700304 - Failed to enable the dynamic icon. ++ * @throws { BusinessError } 17700307 - Dynamic icons cannot take effect due to existing custom themes. ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @systemapi ++ * @since 20 + * @arkts 1.1&1.2 + */ + function enableDynamicIcon(bundleName: string, moduleName: string): Promise; +@@ -3379,7 +3840,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700305 - Failed to disable the dynamic icon. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function disableDynamicIcon(bundleName: string): Promise; + +@@ -3427,7 +3889,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700201 - Failed to verify the abc file. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function verifyAbc(abcPaths: Array, deleteOriginalFiles: boolean, callback: AsyncCallback): void; + +@@ -3457,7 +3920,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700201 - Failed to verify the abc file. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function verifyAbc(abcPaths: Array, deleteOriginalFiles: boolean): Promise; + +@@ -3470,7 +3934,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getRecoverableApplicationInfo(callback: AsyncCallback>): void; + +@@ -3483,7 +3948,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getRecoverableApplicationInfo(): Promise>; + +@@ -3501,7 +3967,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700053 - The caller is not AppGallery. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setAdditionalInfo(bundleName: string, additionalInfo: string): void; + +@@ -3529,7 +3996,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700202 - Failed to delete the abc file. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function deleteAbc(abcPath: string): Promise; + +@@ -3543,7 +4011,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700056 - The scheme of the specified link is not in the querySchemes. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function canOpenLink(link: string): boolean; + +@@ -3556,7 +4025,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAllPreinstalledApplicationInfo(): Promise>; + +@@ -3573,7 +4043,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700059 - The specified developerId is invalid. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAllBundleInfoByDeveloperId(developerId: string): Array; + +@@ -3581,16 +4052,17 @@ declare namespace bundleManager { + * Get a list of developedId by distribution type. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED +- * @param { number } appDistributionType - Indicates the distribution type of the application, and if not passed in, it gets all the developerId. ++ * @param { int } appDistributionType - Indicates the distribution type of the application, and if not passed in, it gets all the developerId. + * @returns { Array } Returns a list of developerId. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getDeveloperIds(appDistributionType?: number): Array; ++ function getDeveloperIds(appDistributionType?: int): Array; + + /** + * Switch uninstall state of a specified application. +@@ -3605,7 +4077,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700060 - The specified application cannot be uninstalled. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function switchUninstallState(bundleName: string, state: boolean): void; + +@@ -3613,23 +4086,24 @@ declare namespace bundleManager { + * Get the SignatureInfo of the application through UID. + * + * @permission ohos.permission.GET_SIGNATURE_INFO +- * @param { number } uid - Indicates the UID of an application. ++ * @param { int } uid - Indicates the UID of an application. + * @returns { SignatureInfo } The result of getting the signature info. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 17700021 - The uid is not found. + * @syscap SystemCapability.BundleManager.BundleFramework.Core +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getSignatureInfo(uid: number): SignatureInfo; ++ function getSignatureInfo(uid: int): SignatureInfo; + + /** + * Get the BundleInfo of the specified MultiIsolation App. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED + * @param { string } bundleName - Indicates the application bundle name to be queried. +- * @param { number } appIndex - Indicates the index of clone app. +- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. +- * @param { number } [userId] - Indicates the user ID, If the user id is not specified, the current user id is used by default. ++ * @param { int } appIndex - Indicates the index of clone app. ++ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. ++ * @param { int } [userId] - Indicates the user ID, If the user id is not specified, the current user id is used by default. + * @returns { Promise } Returns A BundleInfo Of MultiApp Mode. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -3643,15 +4117,15 @@ declare namespace bundleManager { + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getAppCloneBundleInfo(bundleName: string, appIndex: number, bundleFlags: number, userId?: number): Promise; ++ function getAppCloneBundleInfo(bundleName: string, appIndex: int, bundleFlags: int, userId?: int): Promise; + + /** + * Get all BundleInfo of clone app. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED + * @param { string } bundleName - Indicates the application bundle name to be queried. +- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. +- * @param { number } [userId] - Indicates the user ID, If the user id is not specified, the current user id is used by default. ++ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. ++ * @param { int } [userId] - Indicates the user ID, If the user id is not specified, the current user id is used by default. + * @returns { Promise> } Returns BundleInfo Arrays Of MultiApp Mode. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -3661,15 +4135,16 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700026 - The specified bundle and clone apps are all disabled. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getAllAppCloneBundleInfo(bundleName: string, bundleFlags: number, userId?: number): Promise>; ++ function getAllAppCloneBundleInfo(bundleName: string, bundleFlags: int, userId?: int): Promise>; + + /** + * Obtains AppCloneIdentity contains bundleName and appIndex by the given uid. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO +- * @param { number } uid - Indicates the UID of an application. ++ * @param { int } uid - Indicates the UID of an application. + * @returns { Promise } Returns the clone Identity contains bundleName and appIndex. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. +@@ -3678,14 +4153,14 @@ declare namespace bundleManager { + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getAppCloneIdentity(uid: number): Promise; ++ function getAppCloneIdentity(uid: int): Promise; + + /** + * Get all plugin info of host application. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED + * @param { string } hostBundleName - Indicates the host application bundle name to be queried. +- * @param { number } [userId] - Indicates the user ID or do not pass user ID. ++ * @param { int } [userId] - Indicates the user ID or do not pass user ID. + * @returns { Promise> } Returns PluginBundleInfo Arrays. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -3693,13 +4168,14 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700004 - The specified user ID is not found. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getAllPluginInfo(hostBundleName: string, userId?: number): Promise>; ++ function getAllPluginInfo(hostBundleName: string, userId?: int): Promise>; + + /** + * Migrate files from the source paths to the destination path. +- * ++ * + * @permission ohos.permission.MIGRATE_DATA + * @param { Array } sourcePaths - Indicates the source paths to be migrated. + * @param { string } destinationPath - Target path for data migration. +@@ -3715,7 +4191,8 @@ declare namespace bundleManager { + * @throws { BusinessError } 17700086 - System error occurred during copy execution. + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function migrateData(sourcePaths: Array, destinationPath: string): Promise; + +@@ -3732,7 +4209,16 @@ declare namespace bundleManager { + * @typedef { _ApplicationInfo } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Obtains configuration information about an application. ++ * ++ * @typedef { _ApplicationInfo } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + export type ApplicationInfo = _ApplicationInfo; +@@ -3750,7 +4236,16 @@ declare namespace bundleManager { + * @typedef { _ModuleMetadata } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the metadata information about a module. ++ * ++ * @typedef { _ModuleMetadata } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + export type ModuleMetadata = _ModuleMetadata; +@@ -3768,7 +4263,16 @@ declare namespace bundleManager { + * @typedef { _Metadata } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the Metadata. ++ * ++ * @typedef { _Metadata } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + export type Metadata = _Metadata; +@@ -3788,6 +4292,15 @@ declare namespace bundleManager { + * @atomicservice + * @since 11 + */ ++ /** ++ * Obtains configuration information about a bundle. ++ * ++ * @typedef { _BundleInfo.BundleInfo } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ + export type BundleInfo = _BundleInfo.BundleInfo; + + /** +@@ -3795,7 +4308,7 @@ declare namespace bundleManager { + * + * @typedef { _BundleInfo } + * @syscap SystemCapability.BundleManager.BundleFramework.Core +- * @atomicservice ++ * @crossplatform + * @since 20 + * @arkts 1.2 + */ +@@ -3816,6 +4329,15 @@ declare namespace bundleManager { + * @atomicservice + * @since 11 + */ ++ /** ++ * The scene which is used. ++ * ++ * @typedef { _BundleInfo.UsedScene } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ + export type UsedScene = _BundleInfo.UsedScene; + + /** +@@ -3823,7 +4345,7 @@ declare namespace bundleManager { + * + * @typedef { _UsedScene } + * @syscap SystemCapability.BundleManager.BundleFramework.Core +- * @atomicservice ++ * @crossplatform + * @since 20 + * @arkts 1.2 + */ +@@ -3844,6 +4366,15 @@ declare namespace bundleManager { + * @atomicservice + * @since 11 + */ ++ /** ++ * Indicates the required permissions details defined in file config.json. ++ * ++ * @typedef { _BundleInfo.ReqPermissionDetail } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ + export type ReqPermissionDetail = _BundleInfo.ReqPermissionDetail; + + /** +@@ -3851,7 +4382,7 @@ declare namespace bundleManager { + * + * @typedef { _ReqPermissionDetail } + * @syscap SystemCapability.BundleManager.BundleFramework.Core +- * @atomicservice ++ * @crossplatform + * @since 20 + * @arkts 1.2 + */ +@@ -3872,6 +4403,15 @@ declare namespace bundleManager { + * @atomicservice + * @since 11 + */ ++ /** ++ * Indicates the SignatureInfo. ++ * ++ * @typedef { _BundleInfo.SignatureInfo } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ + export type SignatureInfo = _BundleInfo.SignatureInfo; + + /** +@@ -3879,7 +4419,7 @@ declare namespace bundleManager { + * + * @typedef { _SignatureInfo } + * @syscap SystemCapability.BundleManager.BundleFramework.Core +- * @atomicservice ++ * @crossplatform + * @since 20 + * @arkts 1.2 + */ +@@ -3919,6 +4459,15 @@ declare namespace bundleManager { + * @atomicservice + * @since 11 + */ ++ /** ++ * Obtains configuration information about a module. ++ * ++ * @typedef { _HapModuleInfo.HapModuleInfo } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ + export type HapModuleInfo = _HapModuleInfo.HapModuleInfo; + + /** +@@ -3926,6 +4475,7 @@ declare namespace bundleManager { + * + * @typedef { _HapModuleInfo } + * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 +@@ -4003,7 +4553,6 @@ declare namespace bundleManager { + * + * @typedef { _RouterItem} + * @syscap SystemCapability.BundleManager.BundleFramework.Core +- * @atomicservice + * @since 20 + * @arkts 1.2 + */ +@@ -4045,6 +4594,15 @@ declare namespace bundleManager { + * @atomicservice + * @since 11 + */ ++ /** ++ * Obtains configuration information about an ability. ++ * ++ * @typedef { _AbilityInfo.AbilityInfo } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ + export type AbilityInfo = _AbilityInfo.AbilityInfo; + + /** +@@ -4052,6 +4610,7 @@ declare namespace bundleManager { + * + * @typedef { _AbilityInfo } + * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 +@@ -4059,27 +4618,37 @@ declare namespace bundleManager { + export type AbilityInfo = _AbilityInfo; + + /** +- * Contains basic Ability information. Indicates the window size.. ++ * Contains basic Ability information. Indicates the window size. + * + * @typedef { _AbilityInfo.WindowSize } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @since 9 + */ + /** +- * Contains basic Ability information. Indicates the window size.. ++ * Contains basic Ability information. Indicates the window size. + * + * @typedef { _AbilityInfo.WindowSize } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice + * @since 11 + */ ++ /** ++ * Contains basic Ability information. Indicates the window size. ++ * ++ * @typedef { _AbilityInfo.WindowSize } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ + export type WindowSize = _AbilityInfo.WindowSize; + + /** +- * Contains basic Ability information. Indicates the window size.. ++ * Contains basic Ability information. Indicates the window size. + * + * @typedef { _WindowSize } + * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 +@@ -4120,7 +4689,8 @@ declare namespace bundleManager { + * @typedef { _PermissionDef } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export type PermissionDef = _PermissionDef; + +@@ -4148,7 +4718,8 @@ declare namespace bundleManager { + * @typedef { _SharedBundleInfo } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export type SharedBundleInfo = _SharedBundleInfo; + +@@ -4162,6 +4733,17 @@ declare namespace bundleManager { + */ + export type AppProvisionInfo = _AppProvisionInfo.AppProvisionInfo; + ++ /** ++ * Obtains profile file information about a bundle. ++ * ++ * @typedef { _AppProvisionInfo } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @systemapi ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ export type AppProvisionInfo = _AppProvisionInfo; ++ + /** + * Obtains profile file validity about a bundle. + * +@@ -4172,13 +4754,25 @@ declare namespace bundleManager { + */ + export type Validity = _AppProvisionInfo.Validity; + ++ /** ++ * Obtains profile file validity about a bundle. ++ * ++ * @typedef { _Validity } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @systemapi ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ export type Validity = _Validity; ++ + /** + * Obtains information about a recoverable preinstalled application. + * + * @typedef { _RecoverableApplicationInfo } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export type RecoverableApplicationInfo = _RecoverableApplicationInfo; + +@@ -4241,7 +4835,8 @@ declare namespace bundleManager { + * @typedef { _PluginBundleInfo } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export type PluginBundleInfo = _PluginBundleInfo; + +@@ -4251,7 +4846,8 @@ declare namespace bundleManager { + * @typedef { _PluginModuleInfo } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export type PluginModuleInfo = _PluginModuleInfo; + } +diff --git a/api/@ohos.bundle.bundleMonitor.d.ts b/api/@ohos.bundle.bundleMonitor.d.ts +index 889a0cb43..99dc6d7c8 100644 +--- a/api/@ohos.bundle.bundleMonitor.d.ts ++++ b/api/@ohos.bundle.bundleMonitor.d.ts +@@ -54,25 +54,25 @@ declare namespace bundleMonitor { + /** + * The user id + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly userId: number; ++ readonly userId: int; + /** + * The app index of clone app + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly appIndex: number; ++ readonly appIndex: int; + } + + /** +diff --git a/api/@ohos.bundle.bundleResourceManager.d.ts b/api/@ohos.bundle.bundleResourceManager.d.ts +index f9fb98101..0969cb52a 100644 +--- a/api/@ohos.bundle.bundleResourceManager.d.ts ++++ b/api/@ohos.bundle.bundleResourceManager.d.ts +@@ -42,7 +42,7 @@ declare namespace bundleResourceManager { + /** + * Used to query the enumeration value of resource info. Multiple values can be passed in the form. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.BundleFramework.Resource + * @systemapi + * @since arkts {'1.1':'11', '1.2':'20'} +@@ -106,7 +106,7 @@ declare namespace bundleResourceManager { + * + * @permission ohos.permission.GET_BUNDLE_RESOURCES + * @param { string } bundleName - Indicates the bundle name of the application. +- * @param { number } resourceFlags - Indicates the flag used to specify information contained in the BundleResourceInfo object that will be returned. ++ * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo object that will be returned. + * @returns { BundleResourceInfo } Returns the BundleResourceInfo object. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -117,15 +117,15 @@ declare namespace bundleResourceManager { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getBundleResourceInfo(bundleName: string, resourceFlags?: number): BundleResourceInfo; ++ function getBundleResourceInfo(bundleName: string, resourceFlags?: int): BundleResourceInfo; + + /** + * Obtains the BundleResourceInfo of a specified bundle. Default resourceFlag is GET_RESOURCE_INFO_ALL. + * + * @permission ohos.permission.GET_BUNDLE_RESOURCES + * @param { string } bundleName - Indicates the bundle name of the application. +- * @param { number } [resourceFlags] - Indicates the flag used to specify information contained in the BundleResourceInfo object that will be returned. +- * @param { number } [appIndex] - Indicates the index of the bundle. ++ * @param { int } [resourceFlags] {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo object that will be returned. ++ * @param { int } [appIndex] - Indicates the index of the bundle,The default value is 0. + * @returns { BundleResourceInfo } Returns the BundleResourceInfo object. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -137,14 +137,14 @@ declare namespace bundleResourceManager { + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getBundleResourceInfo(bundleName: string, resourceFlags?: number, appIndex?: number): BundleResourceInfo; ++ function getBundleResourceInfo(bundleName: string, resourceFlags?: int, appIndex?: int): BundleResourceInfo; + + /** + * Obtains the LauncherAbilityResourceInfo of a specified bundle. Default resourceFlag is GET_RESOURCE_INFO_ALL. + * + * @permission ohos.permission.GET_BUNDLE_RESOURCES + * @param { string } bundleName - Indicates the bundle name of the application. +- * @param { number } resourceFlags - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo object that will be returned. ++ * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo object that will be returned. + * @returns { Array } Returns a list of LauncherAbilityResourceInfo objects. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -155,16 +155,16 @@ declare namespace bundleResourceManager { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: number): Array; ++ function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: int): Array; + + /** + * Obtains the LauncherAbilityResourceInfo of a specified bundle. Default resourceFlag is GET_RESOURCE_INFO_ALL. + * + * @permission ohos.permission.GET_BUNDLE_RESOURCES + * @param { string } bundleName - Indicates the bundle name of the application. +- * @param { number } [resourceFlags] - Indicates the flag used to specify information ++ * @param { int } [resourceFlags] {@link ResourceFlag} - Indicates the flag used to specify information + *
    contained in the LauncherAbilityResourceInfo object that will be returned. +- * @param { number } [appIndex] - Indicates the index of the bundle. ++ * @param { int } [appIndex] - Indicates the index of the bundle,The default value is 0. + * @returns { Array } Returns a list of LauncherAbilityResourceInfo objects. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -176,13 +176,13 @@ declare namespace bundleResourceManager { + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: number, appIndex?: number): Array; ++ function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: int, appIndex?: int): Array; + + /** + * Obtains BundleResourceInfo of all bundles available in the system. + * + * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST and ohos.permission.GET_BUNDLE_RESOURCES +- * @param { number } resourceFlags - Indicates the flag used to specify information contained in the BundleResourceInfo that will be returned. ++ * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo that will be returned. + * @param { AsyncCallback> } callback - The callback of getting a list of BundleResourceInfo objects. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -192,13 +192,13 @@ declare namespace bundleResourceManager { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getAllBundleResourceInfo(resourceFlags: number, callback: AsyncCallback>): void; ++ function getAllBundleResourceInfo(resourceFlags: int, callback: AsyncCallback>): void; + + /** + * Obtains BundleResourceInfo of all bundles available in the system. + * + * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST and ohos.permission.GET_BUNDLE_RESOURCES +- * @param { number } resourceFlags - Indicates the flag used to specify information contained in the BundleResourceInfo that will be returned. ++ * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo that will be returned. + * @returns { Promise> } Returns a list of BundleResourceInfo objects. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -208,13 +208,13 @@ declare namespace bundleResourceManager { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getAllBundleResourceInfo(resourceFlags: number): Promise>; ++ function getAllBundleResourceInfo(resourceFlags: int): Promise>; + + /** + * Obtains LauncherAbilityResourceInfo of all launcher abilities available in the system. + * + * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST and ohos.permission.GET_BUNDLE_RESOURCES +- * @param { number } resourceFlags - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo that will be returned. ++ * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo that will be returned. + * @param { AsyncCallback> } callback - The callback of getting a list of LauncherAbilityResourceInfo objects. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -224,13 +224,13 @@ declare namespace bundleResourceManager { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getAllLauncherAbilityResourceInfo(resourceFlags: number, callback: AsyncCallback>): void; ++ function getAllLauncherAbilityResourceInfo(resourceFlags: int, callback: AsyncCallback>): void; + + /** + * Obtains LauncherAbilityResourceInfo of all launcher abilities available in the system. + * + * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST and ohos.permission.GET_BUNDLE_RESOURCES +- * @param { number } resourceFlags - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo that will be returned. ++ * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo that will be returned. + * @returns { Promise> } Returns a list of LauncherAbilityResourceInfo objects. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -240,7 +240,7 @@ declare namespace bundleResourceManager { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getAllLauncherAbilityResourceInfo(resourceFlags: number): Promise>; ++ function getAllLauncherAbilityResourceInfo(resourceFlags: int): Promise>; + + /** + * Obtains resource info of a bundle. +diff --git a/api/@ohos.bundle.defaultAppManager.d.ts b/api/@ohos.bundle.defaultAppManager.d.ts +index 7ee73e02f..c402034e9 100644 +--- a/api/@ohos.bundle.defaultAppManager.d.ts ++++ b/api/@ohos.bundle.defaultAppManager.d.ts +@@ -27,78 +27,89 @@ import { ElementName } from './bundleManager/ElementName'; + * + * @namespace defaultAppManager + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace defaultAppManager { + /** + * The constant for application type. + * +- * @enum { number } ++ * @enum { string } + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum ApplicationType { + /** + * Default browser identifier. + * + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BROWSER = 'Web Browser', + /** + * Default image identifier. + * + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + IMAGE = 'Image Gallery', + /** + * Default audio identifier. + * + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AUDIO = 'Audio Player', + /** + * Default video identifier. + * + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + VIDEO = 'Video Player', + /** + * Default PDF identifier. + * + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PDF = 'PDF Viewer', + /** + * Default word identifier. + * + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WORD = 'Word Viewer', + /** + * Default excel identifier. + * + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EXCEL = 'Excel Viewer', + /** + * Default PPT identifier. + * + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PPT = 'PPT Viewer', + /** + * Default email identifier. + * + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EMAIL = 'Email' + } +@@ -111,7 +122,8 @@ declare namespace defaultAppManager { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isDefaultApplication(type: string, callback: AsyncCallback): void; + +@@ -123,7 +135,8 @@ declare namespace defaultAppManager { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isDefaultApplication(type: string): Promise; + +@@ -135,7 +148,8 @@ declare namespace defaultAppManager { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isDefaultApplicationSync(type: string): boolean; + +@@ -144,7 +158,7 @@ declare namespace defaultAppManager { + * + * @permission ohos.permission.GET_DEFAULT_APPLICATION + * @param { string } type - Application type or a file type that conforms to media type format. +- * @param { number } userId - Indicates the id for the user. ++ * @param { int } userId - Indicates the id for the user. + * @param { AsyncCallback } callback - The callback of the BundleInfo object result. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -155,9 +169,10 @@ declare namespace defaultAppManager { + * @throws { BusinessError } 17700025 - The specified type is invalid. + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getDefaultApplication(type: string, userId: number, callback: AsyncCallback): void; ++ function getDefaultApplication(type: string, userId: int, callback: AsyncCallback): void; + + /** + * Get default application based on type. +@@ -173,7 +188,8 @@ declare namespace defaultAppManager { + * @throws { BusinessError } 17700025 - The specified type is invalid. + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getDefaultApplication(type: string, callback: AsyncCallback): void; + +@@ -182,7 +198,7 @@ declare namespace defaultAppManager { + * + * @permission ohos.permission.GET_DEFAULT_APPLICATION + * @param { string } type - Application type or a file type that conforms to media type format. +- * @param { number } userId - Indicates the id for the user. ++ * @param { int } userId - Indicates the id for the user. + * @returns { Promise } Return the BundleInfo object. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -193,16 +209,17 @@ declare namespace defaultAppManager { + * @throws { BusinessError } 17700025 - The specified type is invalid. + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getDefaultApplication(type: string, userId?: number): Promise; ++ function getDefaultApplication(type: string, userId?: int): Promise; + + /** + * Get default application based on type. + * + * @permission ohos.permission.GET_DEFAULT_APPLICATION + * @param { string } type - Application type or a file type that conforms to media type format. +- * @param { number } userId - Indicates the id for the user. ++ * @param { int } userId - Indicates the id for the user. + * @returns { BundleInfo } Return the BundleInfo object. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -213,9 +230,10 @@ declare namespace defaultAppManager { + * @throws { BusinessError } 17700025 - The specified type is invalid. + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getDefaultApplicationSync(type: string, userId?: number): BundleInfo; ++ function getDefaultApplicationSync(type: string, userId?: int): BundleInfo; + + /** + * Set default application based on type. +@@ -223,7 +241,7 @@ declare namespace defaultAppManager { + * @permission ohos.permission.SET_DEFAULT_APPLICATION + * @param { string } type - Application type or a file type that conforms to media type format. + * @param { ElementName } elementName - Uniquely identifies an ability or extensionAbility. +- * @param { number } userId - Indicates the id for the user. ++ * @param { int } userId - Indicates the id for the user. + * @param { AsyncCallback } callback - The callback of setting default application result. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -234,10 +252,11 @@ declare namespace defaultAppManager { + * @throws { BusinessError } 17700028 - The specified ability does not match the type. + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setDefaultApplication(type: string, +- elementName: ElementName, userId: number, callback: AsyncCallback): void; ++ elementName: ElementName, userId: int, callback: AsyncCallback): void; + + /** + * Set default application based on type. +@@ -254,7 +273,8 @@ declare namespace defaultAppManager { + * @throws { BusinessError } 17700028 - The specified ability does not match the type. + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setDefaultApplication(type: string, elementName: ElementName, callback: AsyncCallback): void; + +@@ -264,7 +284,7 @@ declare namespace defaultAppManager { + * @permission ohos.permission.SET_DEFAULT_APPLICATION + * @param { string } type - Application type or a file type that conforms to media type format. + * @param { ElementName } elementName - Uniquely identifies an ability or extensionAbility. +- * @param { number } userId - Indicates the id for the user. ++ * @param { int } userId - Indicates the id for the user. + * @returns { Promise } The result of setting default application. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -275,9 +295,10 @@ declare namespace defaultAppManager { + * @throws { BusinessError } 17700028 - The specified ability does not match the type. + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function setDefaultApplication(type: string, elementName: ElementName, userId?: number): Promise; ++ function setDefaultApplication(type: string, elementName: ElementName, userId?: int): Promise; + + /** + * Set default application based on type. +@@ -285,7 +306,7 @@ declare namespace defaultAppManager { + * @permission ohos.permission.SET_DEFAULT_APPLICATION + * @param { string } type - Application type or a file type that conforms to media type format. + * @param { ElementName } elementName - Uniquely identifies an ability or extensionAbility. +- * @param { number } userId - Indicates the id for the user. ++ * @param { int } userId - Indicates the id for the user. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. +@@ -295,16 +316,17 @@ declare namespace defaultAppManager { + * @throws { BusinessError } 17700028 - The specified ability does not match the type. + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function setDefaultApplicationSync(type: string, elementName: ElementName, userId?: number): void; ++ function setDefaultApplicationSync(type: string, elementName: ElementName, userId?: int): void; + + /** + * Reset default application based on type. + * + * @permission ohos.permission.SET_DEFAULT_APPLICATION + * @param { string } type - Application type or a file type that conforms to media type format. +- * @param { number } userId - Indicates the id for the user. ++ * @param { int } userId - Indicates the id for the user. + * @param { AsyncCallback } callback - The callback of resetting default application result. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -314,9 +336,10 @@ declare namespace defaultAppManager { + * @throws { BusinessError } 17700025 - The specified type is invalid. + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function resetDefaultApplication(type: string, userId: number, callback: AsyncCallback): void; ++ function resetDefaultApplication(type: string, userId: int, callback: AsyncCallback): void; + + /** + * Reset default application based on type. +@@ -331,7 +354,8 @@ declare namespace defaultAppManager { + * @throws { BusinessError } 17700025 - The specified type is invalid. + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function resetDefaultApplication(type: string, callback: AsyncCallback): void; + +@@ -340,7 +364,7 @@ declare namespace defaultAppManager { + * + * @permission ohos.permission.SET_DEFAULT_APPLICATION + * @param { string } type - Application type or a file type that conforms to media type format. +- * @param { number } userId - Indicates the id for the user. ++ * @param { int } userId - Indicates the id for the user. + * @returns { Promise } The result of resetting default application. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -350,16 +374,17 @@ declare namespace defaultAppManager { + * @throws { BusinessError } 17700025 - The specified type is invalid. + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function resetDefaultApplication(type: string, userId?: number): Promise; ++ function resetDefaultApplication(type: string, userId?: int): Promise; + + /** + * Reset default application based on type. + * + * @permission ohos.permission.SET_DEFAULT_APPLICATION + * @param { string } type - Application type or a file type that conforms to media type format. +- * @param { number } userId - Indicates the id for the user. ++ * @param { int } userId - Indicates the id for the user. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. +@@ -368,9 +393,10 @@ declare namespace defaultAppManager { + * @throws { BusinessError } 17700025 - The specified type is invalid. + * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function resetDefaultApplicationSync(type: string, userId?: number): void; ++ function resetDefaultApplicationSync(type: string, userId?: int): void; + } + + export default defaultAppManager; +diff --git a/api/@ohos.bundle.distributedBundleManager.d.ts b/api/@ohos.bundle.distributedBundleManager.d.ts +index bc13c960d..a85231f93 100644 +--- a/api/@ohos.bundle.distributedBundleManager.d.ts ++++ b/api/@ohos.bundle.distributedBundleManager.d.ts +@@ -28,7 +28,8 @@ import { RemoteAbilityInfo as _RemoteAbilityInfo } from './bundleManager/RemoteA + * @namespace distributedBundleManager + * @syscap SystemCapability.BundleManager.DistributedBundleFramework + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace distributedBundleManager { + /** +@@ -47,7 +48,8 @@ declare namespace distributedBundleManager { + * @throws { BusinessError } 17700027 - The distributed service is not running. + * @syscap SystemCapability.BundleManager.DistributedBundleFramework + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getRemoteAbilityInfo(elementName: ElementName, callback: AsyncCallback): void; + +@@ -67,7 +69,8 @@ declare namespace distributedBundleManager { + * @throws { BusinessError } 17700027 - The distributed service is not running. + * @syscap SystemCapability.BundleManager.DistributedBundleFramework + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getRemoteAbilityInfo(elementName: ElementName): Promise; + +@@ -87,7 +90,8 @@ declare namespace distributedBundleManager { + * @throws { BusinessError } 17700027 - The distributed service is not running. + * @syscap SystemCapability.BundleManager.DistributedBundleFramework + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getRemoteAbilityInfo(elementNames: Array, + callback: AsyncCallback>): void; +@@ -108,7 +112,8 @@ declare namespace distributedBundleManager { + * @throws { BusinessError } 17700027 - The distributed service is not running. + * @syscap SystemCapability.BundleManager.DistributedBundleFramework + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getRemoteAbilityInfo(elementNames: Array): Promise>; + +@@ -129,7 +134,8 @@ declare namespace distributedBundleManager { + * @throws { BusinessError } 17700027 - The distributed service is not running. + * @syscap SystemCapability.BundleManager.DistributedBundleFramework + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getRemoteAbilityInfo(elementName: ElementName, + locale: string, callback: AsyncCallback): void; +@@ -151,7 +157,8 @@ declare namespace distributedBundleManager { + * @throws { BusinessError } 17700027 - The distributed service is not running. + * @syscap SystemCapability.BundleManager.DistributedBundleFramework + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getRemoteAbilityInfo(elementName: ElementName, locale: string): Promise; + +@@ -172,7 +179,8 @@ declare namespace distributedBundleManager { + * @throws { BusinessError } 17700027 - The distributed service is not running. + * @syscap SystemCapability.BundleManager.DistributedBundleFramework + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getRemoteAbilityInfo(elementNames: Array, + locale: string, callback: AsyncCallback>): void; +@@ -194,7 +202,8 @@ declare namespace distributedBundleManager { + * @throws { BusinessError } 17700027 - The distributed service is not running. + * @syscap SystemCapability.BundleManager.DistributedBundleFramework + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getRemoteAbilityInfo(elementNames: Array, locale: string): Promise>; + +@@ -204,7 +213,8 @@ declare namespace distributedBundleManager { + * @typedef { _RemoteAbilityInfo } + * @syscap SystemCapability.BundleManager.DistributedBundleFramework + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export type RemoteAbilityInfo = _RemoteAbilityInfo; + } +diff --git a/api/@ohos.bundle.freeInstall.d.ts b/api/@ohos.bundle.freeInstall.d.ts +index 12a62c887..c1814b7b4 100644 +--- a/api/@ohos.bundle.freeInstall.d.ts ++++ b/api/@ohos.bundle.freeInstall.d.ts +@@ -43,7 +43,7 @@ declare namespace freeInstall { + /** + * Used to set the enumeration value of upgrading for free installation. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} +@@ -82,7 +82,7 @@ declare namespace freeInstall { + /** + * Used to query the enumeration value of bundlePackInfo. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.BundleFramework + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} +diff --git a/api/@ohos.bundle.installer.d.ts b/api/@ohos.bundle.installer.d.ts +index 4a42437b1..386909ce9 100644 +--- a/api/@ohos.bundle.installer.d.ts ++++ b/api/@ohos.bundle.installer.d.ts +@@ -1673,7 +1673,7 @@ declare namespace installer { + * @permission ohos.permission.INSTALL_CLONE_BUNDLE + * @param { string } bundleName - Indicates the path where the HAP of the application is stored. + * @param { CreateAppCloneParam } [createAppCloneParam] Indicates the optional params of create clone app. +- * @returns { Promise } Return the appIndex of the clone application. ++ * @returns { Promise } Return the appIndex of the clone application. + * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.INSTALL_CLONE_BUNDLE'. + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. +@@ -1686,7 +1686,7 @@ declare namespace installer { + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- createAppClone(bundleName: string, createAppCloneParam?: CreateAppCloneParam): Promise; ++ createAppClone(bundleName: string, createAppCloneParam?: CreateAppCloneParam): Promise; + + /** + * Destroy clone instance for an application. +@@ -1734,12 +1734,11 @@ declare namespace installer { + * + * @permission ohos.permission.UNINSTALL_CLONE_BUNDLE + * @param { string } bundleName - Indicates the bundleName of clone app. +- * @param { number } appIndex - Indicates the clone application's index. +- * @param { number | DestroyAppCloneParam } [options] - Indicates other parameters required for the uninstallation. ++ * @param { int } appIndex - Indicates the clone application's index. ++ * @param { int | DestroyAppCloneParam } [options] - Indicates other parameters required for the uninstallation. + * @returns { Promise } + * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.UNINSTALL_CLONE_BUNDLE'. + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. + * @throws { BusinessError } 17700001 - The specified bundleName cannot be found or the bundle is not installed by the specified user. + * @throws { BusinessError } 17700004 - The userId is invalid. + * @throws { BusinessError } 17700061 - AppIndex not in valid range. +@@ -1749,7 +1748,7 @@ declare namespace installer { + * @since 20 + * @arkts 1.2 + */ +- destroyAppClone(bundleName: string, appIndex: number, options?: number | DestroyAppCloneParam): Promise; ++ destroyAppClone(bundleName: string, appIndex: int, options?: int | DestroyAppCloneParam): Promise; + + /** + * Install application by bundle name with specified user. +@@ -1773,8 +1772,8 @@ declare namespace installer { + * + * @permission ohos.permission.INSTALL_BUNDLE + * @param { string } bundleName - Indicates the bundle name of application. +- * @param { number } [userId] - userId Indicates the user ID. +- * @returns { Promise } ++ * @param { int } [userId] - userId Indicates the user ID. ++ * @returns { Promise } the promise returned by the function. + * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.INSTALL_BUNDLE'. + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. +@@ -1788,7 +1787,7 @@ declare namespace installer { + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- installPreexistingApp(bundleName: string, userId?: number): Promise; ++ installPreexistingApp(bundleName: string, userId?: int): Promise; + + /** + * Install plugin for host application. +@@ -1797,7 +1796,7 @@ declare namespace installer { + * @param { string } hostBundleName - Indicates the bundle name of host application. + * @param { Array } pluginFilePaths - Indicates the file paths of plugin. + * @param { PluginParam } [pluginParam] - Indicates parameters required for install plugin. +- * @returns { Promise } ++ * @returns { Promise } the promise returned by the function. + * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.INSTALL_PLUGIN_BUNDLE'. + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @throws { BusinessError } 17700001 - The specified hostBundleName cannot be found or the bundle is not installed by the specified user. +@@ -1806,6 +1805,7 @@ declare namespace installer { + * @throws { BusinessError } 17700011 - Failed to install the plugin because the plugin signature fails to be verified. + * @throws { BusinessError } 17700012 - Failed to install the plugin because the HSP path is invalid or the HSP is too large. + * @throws { BusinessError } 17700015 - Failed to install the plugin because they have different configuration information. ++ * @throws { BusinessError } 17700016 - Failed to install the plugin because of insufficient system disk space. + * @throws { BusinessError } 17700017 - Failed to install the plugin since the version of the plugin to install is too early. + * @throws { BusinessError } 17700048 - Failed to install the plugin because the code signature verification is failed. + * @throws { BusinessError } 17700052 - Failed to install the plugin because debug bundle cannot be installed under non-developer mode. +@@ -1989,24 +1989,24 @@ declare namespace installer { + /** + * Indicates the user id + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- userId?: number; ++ userId?: int; + + /** + * Indicates the installation type. The value 0x00 means normal installation, 0x01 means overwrite installation, and 0x10 means installation-free. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- installFlag?: number; ++ installFlag?: int; + + /** + * Indicates whether the param has data +@@ -2033,13 +2033,13 @@ declare namespace installer { + /** + * Indicates the deadline of the crowdtesting bundle + * +- * @type { ?number } ++ * @type { ?long } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- crowdtestDeadline?: number; ++ crowdtestDeadline?: long; + + /** + * Indicates the shared bundle dir paths. +@@ -2132,13 +2132,13 @@ declare namespace installer { + /** + * Indicates the shared version code. If default, indicates that all version sharing bundles are uninstalled + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- versionCode?: number; ++ versionCode?: int; + } + + /** +@@ -2154,23 +2154,23 @@ declare namespace installer { + /** + * Indicates the user id + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- userId?: number; ++ userId?: int; + /** + * Indicates the appIndex of MultiApp + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- appIndex?: number; ++ appIndex?: int; + } + + /** +@@ -2186,13 +2186,13 @@ declare namespace installer { + /** + * Indicates the user id + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- userId?: number; ++ userId?: int; + /** + * Indicates parameters. + * +@@ -2218,13 +2218,13 @@ declare namespace installer { + /** + * Indicates the user id. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- userId?: number; ++ userId?: int; + + /** + * Indicates parameters. +diff --git a/api/@ohos.bundle.launcherBundleManager.d.ts b/api/@ohos.bundle.launcherBundleManager.d.ts +index a58824451..962c25397 100644 +--- a/api/@ohos.bundle.launcherBundleManager.d.ts ++++ b/api/@ohos.bundle.launcherBundleManager.d.ts +@@ -21,9 +21,7 @@ + import { AsyncCallback } from './@ohos.base'; + import { LauncherAbilityInfo as _LauncherAbilityInfo } from './bundleManager/LauncherAbilityInfo'; + import { ShortcutInfo as _ShortcutInfo, ShortcutWant as _ShortcutWant, ParameterItem as _ParameterItem } from './bundleManager/ShortcutInfo'; +-/*** if arkts 1.1 */ +-import { StartOptions } from './@ohos.app.ability.StartOptions'; +-/*** endif */ ++import StartOptions from './@ohos.app.ability.StartOptions'; + + /** + * Launcher bundle manager. +@@ -39,7 +37,7 @@ declare namespace launcherBundleManager { + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED + * @param { string } bundleName - Indicates the application bundle name to be queried. +- * @param { number } userId - Indicates the id for the user. ++ * @param { int } userId - Indicates the id for the user. + * @param { AsyncCallback> } callback -The callback of the LauncherAbilityInfo object result. + * @throws { BusinessError } 201 - Verify permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -53,14 +51,14 @@ declare namespace launcherBundleManager { + * @arkts 1.1&1.2 + */ + function getLauncherAbilityInfo(bundleName: string, +- userId: number, callback: AsyncCallback>): void; ++ userId: int, callback: AsyncCallback>): void; + + /** + * Obtains launcher abilities info based on a given bundleName and userId. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED + * @param { string } bundleName - Indicates the application bundle name to be queried. +- * @param { number } userId - Indicates the id for the user. ++ * @param { int } userId - Indicates the id for the user. + * @returns { Promise> } the LauncherAbilityInfo object. + * @throws { BusinessError } 201 - Verify permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -73,14 +71,14 @@ declare namespace launcherBundleManager { + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getLauncherAbilityInfo(bundleName: string, userId: number): Promise>; ++ function getLauncherAbilityInfo(bundleName: string, userId: int): Promise>; + + /** + * Obtains launcher abilities info based on a given bundleName and userId. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED + * @param { string } bundleName - Indicates the application bundle name to be queried. +- * @param { number } userId - Indicates the id for the user. ++ * @param { int } userId - Indicates the id for the user. + * @returns { Array } the LauncherAbilityInfo object. + * @throws { BusinessError } 201 - Verify permission denied. + * @throws { BusinessError } 801 - Capability not support. +@@ -90,13 +88,13 @@ declare namespace launcherBundleManager { + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getLauncherAbilityInfoSync(bundleName: string, userId: number): Array; ++ function getLauncherAbilityInfoSync(bundleName: string, userId: int): Array; + + /** + * Obtains launcher abilities info based on a given userId. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED +- * @param { number } userId - Indicates the id for the user. ++ * @param { int } userId - Indicates the id for the user. + * @param { AsyncCallback> } callback -The callback of the LauncherAbilityInfo object result. + * @throws { BusinessError } 201 - Verify permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -108,13 +106,13 @@ declare namespace launcherBundleManager { + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getAllLauncherAbilityInfo(userId: number, callback: AsyncCallback>): void; ++ function getAllLauncherAbilityInfo(userId: int, callback: AsyncCallback>): void; + + /** + * Obtains launcher abilities info based on a given userId. + * + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED +- * @param { number } userId - Indicates the id for the user. ++ * @param { int } userId - Indicates the id for the user. + * @returns { Promise> } the LauncherAbilityInfo object. + * @throws { BusinessError } 201 - Verify permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -126,7 +124,7 @@ declare namespace launcherBundleManager { + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getAllLauncherAbilityInfo(userId: number): Promise>; ++ function getAllLauncherAbilityInfo(userId: int): Promise>; + + /** + * Obtains shortcut info based on a given bundleName. +@@ -186,9 +184,9 @@ declare namespace launcherBundleManager { + /** + * Obtains shortcut info based on bundleName and userId. + * +- * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED ++ * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @param { string } bundleName - Indicates the application bundle name to be queried. +- * @param { number } userId - Indicates the user ID. ++ * @param { int } userId - Indicates the user ID. + * @returns { Array } the LauncherShortcutInfo object. + * @throws { BusinessError } 201 - Verify permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -201,7 +199,7 @@ declare namespace launcherBundleManager { + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getShortcutInfoSync(bundleName: string, userId: number): Array; ++ function getShortcutInfoSync(bundleName: string, userId: int): Array; + + /** + * Starts shortcut. +@@ -217,28 +215,11 @@ declare namespace launcherBundleManager { + * @throws { BusinessError } 17700065 - The specified shortcut want in shortcut info is not supported to be started. + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function startShortcut(shortcutInfo: ShortcutInfo, options?: StartOptions): Promise; + +- /** +- * Starts shortcut. +- * +- * @permission ohos.permission.START_SHORTCUT +- * @param { ShortcutInfo } shortcutInfo - Indicates the shortcut info which contains shortcut want. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 201 - Verify permission denied. +- * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. +- * @throws { BusinessError } 801 - Capability not support. +- * @throws { BusinessError } 17700065 - The specified shortcut want in shortcut info is not supported to be started. +- * @syscap SystemCapability.BundleManager.BundleFramework.Launcher +- * @systemapi +- * @since 20 +- * @arkts 1.2 +- */ +- function startShortcut(shortcutInfo: ShortcutInfo): Promise; +- + /** + * Contains basic launcher Ability information, which uniquely identifies an LauncherAbilityInfo. + * +@@ -255,7 +236,14 @@ declare namespace launcherBundleManager { + * @typedef { _ShortcutInfo } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'9', '1.2':'20'} ++ * @since 9 ++ */ ++ /** ++ * Provides information about a shortcut, including the shortcut ID and label. ++ * ++ * @typedef { _ShortcutInfo } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + export type ShortcutInfo = _ShortcutInfo; +@@ -265,7 +253,14 @@ declare namespace launcherBundleManager { + * @typedef { _ShortcutWant } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'9', '1.2':'20'} ++ * @since 9 ++ */ ++ /** ++ * Obtains information about the ability that a shortcut will start. ++ * ++ * @typedef { _ShortcutWant } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + export type ShortcutWant = _ShortcutWant; +@@ -275,7 +270,14 @@ declare namespace launcherBundleManager { + * @typedef { _ParameterItem } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Indicates the custom parameters in shortcut want. ++ * ++ * @typedef { _ParameterItem } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + export type ParameterItem = _ParameterItem; +diff --git a/api/@ohos.bundle.shortcutManager.d.ts b/api/@ohos.bundle.shortcutManager.d.ts +index df987404e..e4dc6ea6d 100644 +--- a/api/@ohos.bundle.shortcutManager.d.ts ++++ b/api/@ohos.bundle.shortcutManager.d.ts +@@ -26,7 +26,14 @@ import { ShortcutInfo as _ShortcutInfo, ShortcutWant as _ShortcutWant, Parameter + * @namespace shortcutManager + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++/** ++ * Desktop shortcut bundle manager. ++ * ++ * @namespace shortcutManager ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + declare namespace shortcutManager { +@@ -35,7 +42,7 @@ declare namespace shortcutManager { + * + * @permission ohos.permission.MANAGE_SHORTCUTS + * @param { ShortcutInfo } shortcutInfo - Indicates the shortcut info which contains shortcut want. +- * @param { number } userId - Indicates the id for the user. ++ * @param { int } userId - Indicates the id for the user. + * @returns { Promise } the promise returned by the function. + * @throws { BusinessError } 201 - Verify permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -50,14 +57,14 @@ declare namespace shortcutManager { + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function addDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: number): Promise; ++ function addDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: int): Promise; + + /** + * Delete desktop shortcut info. + * + * @permission ohos.permission.MANAGE_SHORTCUTS + * @param { ShortcutInfo } shortcutInfo - Indicates the shortcut info which contains shortcut want. +- * @param { number } userId - Indicates the id for the user. ++ * @param { int } userId - Indicates the id for the user. + * @returns { Promise } the promise returned by the function. + * @throws { BusinessError } 201 - Verify permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -68,13 +75,13 @@ declare namespace shortcutManager { + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function deleteDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: number): Promise; ++ function deleteDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: int): Promise; + + /** + * Get all desktop shortcut info. + * + * @permission ohos.permission.MANAGE_SHORTCUTS +- * @param { number } userId - Indicates the id for the user. ++ * @param { int } userId - Indicates the id for the user. + * @returns { Promise> } the LauncherShortcutInfo object. + * @throws { BusinessError } 201 - Verify permission denied. + * @throws { BusinessError } 202 - Permission denied, non-system app called system api. +@@ -85,7 +92,7 @@ declare namespace shortcutManager { + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getAllDesktopShortcutInfo(userId: number): Promise>; ++ function getAllDesktopShortcutInfo(userId: int): Promise>; + + /** + * Provides information about a shortcut, including the shortcut ID and label. +@@ -93,7 +100,14 @@ declare namespace shortcutManager { + * @typedef { _ShortcutInfo } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Provides information about a shortcut, including the shortcut ID and label. ++ * ++ * @typedef { _ShortcutInfo } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + export type ShortcutInfo = _ShortcutInfo; +@@ -103,7 +117,14 @@ declare namespace shortcutManager { + * @typedef { _ShortcutWant } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Obtains information about the ability that a shortcut will start. ++ * ++ * @typedef { _ShortcutWant } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + export type ShortcutWant = _ShortcutWant; +@@ -113,7 +134,14 @@ declare namespace shortcutManager { + * @typedef { _ParameterItem } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Indicates the custom parameters in shortcut want. ++ * ++ * @typedef { _ParameterItem } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + export type ParameterItem = _ParameterItem; +diff --git a/api/@ohos.charger.d.ts b/api/@ohos.charger.d.ts +index 215a92866..1c8ecd419 100644 +--- a/api/@ohos.charger.d.ts ++++ b/api/@ohos.charger.d.ts +@@ -32,7 +32,7 @@ declare namespace charger { + /** + * Indicates the type of the charger plugged-in. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @systemapi + * @since arkts {'1.1':'10', '1.2':'20'} +diff --git a/api/@ohos.cooperate.d.ets b/api/@ohos.cooperate.d.ets +deleted file mode 100644 +index 09ffd038e..000000000 +--- a/api/@ohos.cooperate.d.ets ++++ /dev/null +@@ -1,724 +0,0 @@ +-/* +- * Copyright (c) 2023-2024 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-/** +- * @file +- * @kit DistributedServiceKit +- */ +- +-import { AsyncCallback } from './@ohos.base'; +-import { Callback } from './@ohos.base'; +- +-/** +- * Implements screen hopping operation management. +- * +- * @namespace cooperate +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- */ +-declare namespace cooperate { +- /** +- * Enumerates screen hopping message notifications. +- * +- * @enum { number } +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- * @deprecated since 11 +- * @useinstead cooperate#CooperateState +- */ +- enum CooperateMsg { +- /** +- * Preparing for screen hopping. +- * +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- * @deprecated since 11 +- * @useinstead cooperate.CooperateState#COOPERATE_PREPARE +- */ +- COOPERATE_PREPARE = 0, +- +- /** +- * Canceling the preparation for screen hopping. +- * +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- * @deprecated since 11 +- * @useinstead cooperate.CooperateState#COOPERATE_UNPREPARE +- */ +- COOPERATE_UNPREPARE = 1, +- +- /** +- * Starting screen hopping. +- * +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- * @deprecated since 11 +- * @useinstead cooperate.CooperateState#COOPERATE_ACTIVATE +- */ +- COOPERATE_ACTIVATE = 2, +- +- /** +- * Success in starting screen hopping. +- * +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- * @deprecated since 11 +- * @useinstead cooperate.CooperateState#COOPERATE_ACTIVATE_SUCCESS +- */ +- COOPERATE_ACTIVATE_SUCCESS = 3, +- +- /** +- * Failure to start screen hopping. +- * +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- * @deprecated since 11 +- * @useinstead cooperate.CooperateState#COOPERATE_ACTIVATE_FAILURE +- */ +- COOPERATE_ACTIVATE_FAIL = 4, +- +- /** +- * Success in stopping screen hopping. +- * +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- * @deprecated since 11 +- * @useinstead cooperate.CooperateState#COOPERATE_DEACTIVATE_SUCCESS +- */ +- COOPERATE_DEACTIVATE_SUCCESS = 5, +- +- /** +- * Failure to stop screen hopping. +- * +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- * @deprecated since 11 +- * @useinstead cooperate.CooperateState#COOPERATE_DEACTIVATE_FAILURE +- */ +- COOPERATE_DEACTIVATE_FAIL = 6, +- +- /** +- * Inter-device session disconnected. +- * +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- * @deprecated since 11 +- * @useinstead cooperate.CooperateState#COOPERATE_SESSION_DISCONNECTED +- */ +- COOPERATE_SESSION_DISCONNECTED = 7, +- } +- +- /** +- * Enumerates the screen hopping states. +- * +- * @enum { number } +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- enum CooperateState { +- /** +- * Preparing for screen hopping. +- * +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- COOPERATE_PREPARE = 0, +- +- /** +- * Canceling the preparation for screen hopping. +- * +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- COOPERATE_UNPREPARE = 1, +- +- /** +- * Starting screen hopping. +- * +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- COOPERATE_ACTIVATE = 2, +- +- /** +- * Success in starting screen hopping. +- * +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- COOPERATE_ACTIVATE_SUCCESS = 3, +- +- /** +- * Failure to start screen hopping. +- * +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- COOPERATE_ACTIVATE_FAILURE = 4, +- +- /** +- * Success in stopping screen hopping. +- * +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- COOPERATE_DEACTIVATE_SUCCESS = 5, +- +- /** +- * Failure to stop screen hopping. +- * +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- COOPERATE_DEACTIVATE_FAILURE = 6, +- +- /** +- * Inter-device session disconnected. +- * +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- COOPERATE_SESSION_DISCONNECTED = 7, +- } +- +- /** +- * Defines a screen hopping message. +- * +- * @interface CooperateMessage +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- interface CooperateMessage { +- /** +- * Descriptor of the target device for screen hopping. +- * +- * @type { string } +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- networkId: string; +- +- /** +- * Screen hopping state. +- * +- * @type { CooperateState } +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- state: CooperateState; +- } +- +- /** +- * MouseLocation +- * +- * @typedef MouseLocation +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 12 +- */ +- interface MouseLocation { +- /** +- * The mouse pointer is located at the X coordinate on the screen. +- * +- * @type { number } +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 12 +- */ +- displayX: number; +- +- /** +- * The mouse pointer is located at the Y coordinate on the screen. +- * +- * @type { number } +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 12 +- */ +- displayY: number; +- +- /** +- * Screen width. +- * +- * @type { number } +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 12 +- */ +- displayWidth: number; +- +- /** +- * Screen height. +- * +- * @type { number } +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 12 +- */ +- displayHeight: number; +- } +- +- /** +- * Prepares for screen hopping. +- * +- * @param { AsyncCallback } callback Asynchronous callback used to return the operation result. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- * @deprecated since 11 +- * @useinstead cooperate#prepareCooperate +- */ +- function prepare(callback: AsyncCallback): void; +- +- /** +- * Prepares for screen hopping. +- * +- * @returns { Promise } the promise returned by the function. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error.Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- * @deprecated since 11 +- * @useinstead cooperate#prepareCooperate +- */ +- function prepare(): Promise; +- +- /** +- * Prepares for screen hopping. +- * +- * @permission ohos.permission.COOPERATE_MANAGER +- * @param { AsyncCallback } callback - Asynchronous callback used to return the operation result. +- * @throws {BusinessError} 201 - Permission denied. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- function prepareCooperate(callback: AsyncCallback): void; +- +- /** +- * Prepares for screen hopping. +- * +- * @permission ohos.permission.COOPERATE_MANAGER +- * @returns { Promise } the promise returned by the function. +- * @throws {BusinessError} 201 - Permission denied. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- function prepareCooperate(): Promise; +- +- /** +- * Cancels the preparation for screen hopping. +- * +- * @param { AsyncCallback } callback Asynchronous callback used to return the operation result. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- * @deprecated since 11 +- * @useinstead cooperate#unprepareCooperate +- */ +- function unprepare(callback: AsyncCallback): void; +- +- /** +- * Cancels the preparation for screen hopping. +- * +- * @returns { Promise } the promise returned by the function. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- * @deprecated since 11 +- * @useinstead cooperate#unprepareCooperate +- */ +- function unprepare(): Promise; +- +- /** +- * Cancels the preparation for screen hopping. +- * +- * @permission ohos.permission.COOPERATE_MANAGER +- * @param { AsyncCallback } callback - Asynchronous callback used to return the operation result. +- * @throws {BusinessError} 201 - Permission denied. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- function unprepareCooperate(callback: AsyncCallback): void; +- +- /** +- * Cancels the preparation for screen hopping. +- * +- * @permission ohos.permission.COOPERATE_MANAGER +- * @returns { Promise } the promise returned by the function. +- * @throws {BusinessError} 201 - Permission denied. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- function unprepareCooperate(): Promise; +- +- /** +- * Starts screen hopping. +- * +- * @param { string } targetNetworkId Descriptor of the target device for screen hopping. +- * @param { number } inputDeviceId Identifier of the input device for screen hopping. +- * @param { AsyncCallback } callback Asynchronous callback used to return the operation result. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @throws {BusinessError} 20900001 - Operation failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- * @deprecated since 11 +- * @useinstead cooperate#activateCooperate +- */ +- function activate(targetNetworkId: string, inputDeviceId: number, callback: AsyncCallback): void; +- +- /** +- * Starts screen hopping. +- * +- * @param { string } targetNetworkId Descriptor of the target device for screen hopping. +- * @param { number }inputDeviceId Identifier of the input device for screen hopping. +- * @returns { Promise } the promise returned by the function. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @throws {BusinessError} 20900001 - Operation failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- * @deprecated since 11 +- * @useinstead cooperate#activateCooperate +- */ +- function activate(targetNetworkId: string, inputDeviceId: number): Promise; +- +- /** +- * Starts screen hopping. +- * +- * @permission ohos.permission.COOPERATE_MANAGER +- * @param { string } targetNetworkId - Descriptor of the target device for screen hopping. +- * @param { number } inputDeviceId - Identifier of the input device for screen hopping. +- * @param { AsyncCallback } callback - Asynchronous callback used to return the operation result. +- * @throws {BusinessError} 201 - Permission denied. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @throws {BusinessError} 20900001 - Operation failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- function activateCooperate(targetNetworkId: string, inputDeviceId: number, callback: AsyncCallback): void; +- +- /** +- * Starts screen hopping. +- * +- * @permission ohos.permission.COOPERATE_MANAGER +- * @param { string } targetNetworkId - Descriptor of the target device for screen hopping. +- * @param { number }inputDeviceId - Identifier of the input device for screen hopping. +- * @returns { Promise } the promise returned by the function. +- * @throws {BusinessError} 201 - Permission denied. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @throws {BusinessError} 20900001 - Operation failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- function activateCooperate(targetNetworkId: string, inputDeviceId: number): Promise; +- +- /** +- * Stops screen hopping. +- * +- * @param { boolean } isUnchained Whether the cross-device link is unchained. +- * @param { AsyncCallback } callback Asynchronous callback used to return the operation result. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- * @deprecated since 11 +- * @useinstead cooperate#deactivateCooperate +- */ +- function deactivate(isUnchained: boolean, callback: AsyncCallback): void; +- +- /** +- * Stops screen hopping. +- * +- * @param { boolean } isUnchained Whether the cross-device link is unchained. +- * @returns { Promise } the promise returned by the function. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- * @deprecated since 11 +- * @useinstead cooperate#deactivateCooperate +- */ +- function deactivate(isUnchained: boolean): Promise; +- +- /** +- * Stops screen hopping. +- * +- * @permission ohos.permission.COOPERATE_MANAGER +- * @param { boolean } isUnchained - Whether the cross-device link is unchained. +- * @param { AsyncCallback } callback - Asynchronous callback used to return the operation result. +- * @throws {BusinessError} 201 - Permission denied. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- function deactivateCooperate(isUnchained: boolean, callback: AsyncCallback): void; +- +- /** +- * Stops screen hopping. +- * +- * @permission ohos.permission.COOPERATE_MANAGER +- * @param { boolean } isUnchained - Whether the cross-device link is unchained. +- * @returns { Promise } the promise returned by the function. +- * @throws {BusinessError} 201 - Permission denied. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- function deactivateCooperate(isUnchained: boolean): Promise; +- +- /** +- * Obtains the screen hopping status. +- * +- * @param { string } networkId Descriptor of the target device for screen hopping. +- * @param { AsyncCallback } callback Asynchronous callback used to return the screen hopping status. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- * @deprecated since 11 +- * @useinstead cooperate#getCooperateSwitchState +- */ +- function getCrossingSwitchState(networkId: string, callback: AsyncCallback): void; +- +- /** +- * Obtains the status of the screen hopping switch. +- * +- * @param { string } networkId Descriptor of the target device for screen hopping. +- * @returns { Promise } Returns {@code true} the screen hopping status; +- * returns {@code false} otherwise. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- * @deprecated since 11 +- * @useinstead cooperate#getCooperateSwitchState +- */ +- function getCrossingSwitchState(networkId: string): Promise; +- +- +- /** +- * Obtains the screen hopping status. +- * +- * @permission ohos.permission.COOPERATE_MANAGER +- * @param { string } networkId - Descriptor of the target device for screen hopping. +- * @param { AsyncCallback } callback - Asynchronous callback used to return the screen hopping status. +- * @throws {BusinessError} 201 - Permission denied. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- function getCooperateSwitchState(networkId: string, callback: AsyncCallback): void; +- +- /** +- * Obtains the status of the screen hopping switch. +- * +- * @permission ohos.permission.COOPERATE_MANAGER +- * @param { string } networkId - Descriptor of the target device for screen hopping. +- * @returns { Promise } Returns {@code true} the screen hopping status; +- * returns {@code false} otherwise. +- * @throws {BusinessError} 201 - Permission denied. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- function getCooperateSwitchState(networkId: string): Promise; +- +- /** +- * Enables listening for screen hopping status change events. +- * +- * @param { 'cooperate' } type Change type. +- * @param { Callback<{ networkId: string, msg: CooperateMsg }> } callback Asynchronous callback used to +- *
    return the screen hopping status change event. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- * @deprecated since 11 +- * @useinstead cooperate#on +- */ +- interface CooperateEvent { +- networkId: string; +- msg: CooperateMsg; +- } +- type Callback = (data: T) => void; +- +- function on(type: 'cooperate', callback: Callback): void; +- +- /** +- * Disables listening for screen hopping status change events. +- * +- * @param { 'cooperate' } type Change type. +- * @param { Callback } callback Callback for which listening +- *
    is disabled. If this parameter is not specified, listening will be disabled for all registered callbacks. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 10 +- * @deprecated since 11 +- * @useinstead cooperate#on +- */ +- function off(type: 'cooperate', callback?: Callback): void; +- +- /** +- * Enables listening for screen hopping status change events. +- * +- * @permission ohos.permission.COOPERATE_MANAGER +- * @param { 'cooperateMessage' } type - Change type. +- * @param { Callback } callback - Asynchronous callback used to +- *
    return the screen hopping status change event. +- * @throws {BusinessError} 201 - Permission denied. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- function on(type: 'cooperateMessage', callback: Callback): void; +- +- /** +- * Disables listening for screen hopping status change events. +- * +- * @permission ohos.permission.COOPERATE_MANAGER +- * @param { 'cooperateMessage' } type - Change type. +- * @param { Callback } [callback] - Callback for which listening +- *
    is disabled. If this parameter is not specified, listening will be disabled for all registered callbacks. +- * @throws {BusinessError} 201 - Permission denied. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes:1.Incorrect parameter types.2.Parameter +- *
    verification failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 11 +- */ +- function off(type: 'cooperateMessage', callback?: Callback): void; +- +- /** +- * Enables listening for mouse pointer position information on the specified device. +- * +- * @permission ohos.permission.COOPERATE_MANAGER +- * @param { 'cooperateMouse' } type - Event type, which is **cooperateMouse**. +- * @param { string } networkId - Specified device. +- * @param { Callback } callback - Callback for receiving reported events. +- * @throws {BusinessError} 201 - Permission denied. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 12 +- */ +- function on(type: 'cooperateMouse', networkId: string, callback: Callback): void; +- +- /** +- * Disables listening for mouse pointer position information on the specified device. +- * +- * @permission ohos.permission.COOPERATE_MANAGER +- * @param { 'cooperateMouse' } type - Event type, which is **cooperateMouse**. +- * @param { string } networkId - Specified device. +- * @param { Callback } [callback] - Callback for receiving reported events. +- *
    If no callback is specified, listening will be disabled for all **cooperateMouse** events of the device +- * specified by **networkId**. +- * @throws {BusinessError} 201 - Permission denied. +- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. +- *
    2.Incorrect parameter types.3.Parameter verification failed. +- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate +- * @systemapi Hide this for inner system use. +- * @since 12 +- */ +- function off(type: 'cooperateMouse', networkId: string, callback?: Callback): void; +- +-} +- +-export default cooperate; +diff --git a/api/@ohos.curves.d.ts b/api/@ohos.curves.d.ts +index 54fd46f76..e0f9054ed 100644 +--- a/api/@ohos.curves.d.ts ++++ b/api/@ohos.curves.d.ts +@@ -40,7 +40,17 @@ + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} ++ * @since 11 ++ */ ++/** ++ * Contains interpolator functions such as initialization, third-order Bezier curves, and spring curves. ++ * ++ * @namespace curves ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + declare namespace curves { +@@ -66,10 +76,20 @@ declare namespace curves { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * enum Curve. ++ * ++ * @enum { number } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ +- enum Curve { ++ export enum Curve { + /** + * Linear. Indicates that the animation has the same velocity from start to finish. + * +@@ -89,7 +109,16 @@ declare namespace curves { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Linear. Indicates that the animation has the same velocity from start to finish. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + Linear, +@@ -115,7 +144,17 @@ declare namespace curves { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Ease. Indicates that the animation starts at a low speed, then speeds up, and slows down before the end, ++ * CubicBezier(0.25, 0.1, 0.25, 1.0). ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + Ease, +@@ -138,7 +177,16 @@ declare namespace curves { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * EaseIn. Indicates that the animation starts at a low speed, Cubic Bezier (0.42, 0.0, 1.0, 1.0). ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + EaseIn, +@@ -161,7 +209,16 @@ declare namespace curves { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * EaseOut. Indicates that the animation ends at low speed, CubicBezier (0.0, 0.0, 0.58, 1.0). ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + EaseOut, +@@ -184,7 +241,16 @@ declare namespace curves { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * EaseInOut. Indicates that the animation starts and ends at low speed, CubicBezier (0.42, 0.0, 0.58, 1.0). ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + EaseInOut, +@@ -207,7 +273,16 @@ declare namespace curves { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * FastOutSlowIn. Standard curve, cubic-bezier (0.4, 0.0, 0.2, 1.0). ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + FastOutSlowIn, +@@ -230,7 +305,16 @@ declare namespace curves { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * LinearOutSlowIn. Deceleration curve, cubic-bezier (0.0, 0.0, 0.2, 1.0). ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + LinearOutSlowIn, +@@ -253,7 +337,16 @@ declare namespace curves { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * FastOutLinearIn. Acceleration curve, cubic-bezier (0.4, 0.0, 1.0, 1.0). ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + FastOutLinearIn, +@@ -276,7 +369,16 @@ declare namespace curves { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * ExtremeDeceleration. Abrupt curve, cubic-bezier (0.0, 0.0, 0.0, 1.0). ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + ExtremeDeceleration, +@@ -299,7 +401,16 @@ declare namespace curves { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Sharp. Sharp curves, cubic-bezier (0.33, 0.0, 0.67, 1.0). ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + Sharp, +@@ -322,7 +433,16 @@ declare namespace curves { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Rhythm. Rhythmic curve, cubic-bezier (0.7, 0.0, 0.2, 1.0). ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + Rhythm, +@@ -345,7 +465,16 @@ declare namespace curves { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Smooth. Smooth curves, cubic-bezier (0.4, 0.0, 0.4, 1.0). ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + Smooth, +@@ -368,7 +497,16 @@ declare namespace curves { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Friction. Damping curves, CubicBezier (0.2, 0.0, 0.2, 1.0). ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + Friction, +@@ -396,10 +534,20 @@ declare namespace curves { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Interface for curve object. ++ * ++ * @interface ICurve ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ +- interface ICurve { ++ export interface ICurve { + /** + * Get curve value by fraction. + * +@@ -428,7 +576,19 @@ declare namespace curves { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Get curve value by fraction. ++ * ++ * @param { number } fraction -Indicates the current normalized time parameter. Value range: [0, 1]. ++ * Note: If the value is less than 0, it will be processed as 0. If the value is greater than 1, 1 is used. ++ * @returns { number } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + interpolate(fraction: number): number; +@@ -462,7 +622,7 @@ declare namespace curves { + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- function initCurve(curve?: Curve): ICurve; ++ export function initCurve(curve?: Curve): ICurve; + + /** + * Initializes the interpolator curve when called. +@@ -507,7 +667,7 @@ declare namespace curves { + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- function stepsCurve(count: number, end: boolean): ICurve; ++ export function stepsCurve(count: number, end: boolean): ICurve; + + /** + * Constructs a custom curve when called. +@@ -529,7 +689,7 @@ declare namespace curves { + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- function customCurve(interpolate: (fraction: number) => number): ICurve; ++ export function customCurve(interpolate: (fraction: number) => number): ICurve; + + /** + * Constructs a step curve when called. +@@ -586,7 +746,7 @@ declare namespace curves { + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- function cubicBezierCurve(x1: number, y1: number, x2: number, y2: number): ICurve; ++ export function cubicBezierCurve(x1: number, y1: number, x2: number, y2: number): ICurve; + + /** + * Constructs a third-order Bezier curve when called. +@@ -642,7 +802,7 @@ declare namespace curves { + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- function springCurve(velocity: number, mass: number, stiffness: number, damping: number): ICurve; ++ export function springCurve(velocity: number, mass: number, stiffness: number, damping: number): ICurve; + + /** + * Constructs a spring curve when called. +@@ -704,7 +864,7 @@ declare namespace curves { + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- function springMotion(response?: number, dampingFraction?: number, overlapDuration?: number): ICurve; ++ export function springMotion(response?: number, dampingFraction?: number, overlapDuration?: number): ICurve; + + /** + * Constructs a responsive spring motion when called. +@@ -750,7 +910,7 @@ declare namespace curves { + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- function responsiveSpringMotion(response?: number, dampingFraction?: number, overlapDuration?: number): ICurve; ++ export function responsiveSpringMotion(response?: number, dampingFraction?: number, overlapDuration?: number): ICurve; + + /** + * Constructs an interpolating spring curve when called, the animation duration can not be specified manually, +@@ -790,7 +950,7 @@ declare namespace curves { + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- function interpolatingSpring(velocity: number, mass: number, stiffness: number, damping: number): ICurve; ++ export function interpolatingSpring(velocity: number, mass: number, stiffness: number, damping: number): ICurve; + } + + export default curves; +diff --git a/api/@ohos.data.DataShareResultSet.d.ts b/api/@ohos.data.DataShareResultSet.d.ts +index e49354024..e6778af93 100644 +--- a/api/@ohos.data.DataShareResultSet.d.ts ++++ b/api/@ohos.data.DataShareResultSet.d.ts +@@ -161,7 +161,8 @@ export default interface DataShareResultSet { + * @syscap SystemCapability.DistributedDataManager.DataShare.Core + * @systemapi + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + goToLastRow(): boolean; + +@@ -173,7 +174,8 @@ export default interface DataShareResultSet { + * @syscap SystemCapability.DistributedDataManager.DataShare.Core + * @systemapi + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + goToNextRow(): boolean; + +@@ -254,7 +256,8 @@ export default interface DataShareResultSet { + * @syscap SystemCapability.DistributedDataManager.DataShare.Core + * @systemapi + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getLong(columnIndex: number): number; + +diff --git a/api/@ohos.data.dataShare.d.ts b/api/@ohos.data.dataShare.d.ts +index e7136c1f1..76ea197d7 100644 +--- a/api/@ohos.data.dataShare.d.ts ++++ b/api/@ohos.data.dataShare.d.ts +@@ -67,7 +67,8 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + waitTime?: number; + } +@@ -272,8 +273,8 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since arkts {'1.1':'10', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface RdbDataChangeNode { + /** +@@ -320,8 +321,8 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since arkts {'1.1':'10', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PublishedDataChangeNode { + /** +@@ -454,8 +455,7 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + interface UpdateOperation { + /** +@@ -465,8 +465,7 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + values: ValuesBucket; + +@@ -477,8 +476,7 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + predicates: dataSharePredicates.DataSharePredicates; + } +@@ -730,7 +728,8 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + addTemplate(uri: string, subscriberId: string, template: Template): void; + +@@ -760,7 +759,8 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + delTemplate(uri: string, subscriberId: string): void; + +@@ -794,7 +794,8 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on( + type: 'rdbDataChange', +@@ -833,7 +834,8 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off( + type: 'rdbDataChange', +@@ -872,7 +874,8 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on( + type: 'publishedDataChange', +@@ -911,7 +914,8 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off( + type: 'publishedDataChange', +@@ -950,7 +954,8 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + publish( + data: Array, +@@ -987,7 +992,8 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + publish( + data: Array, +@@ -1025,7 +1031,8 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + publish(data: Array, bundleName: string, version?: number): Promise>; + +@@ -1117,7 +1124,8 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + insert(uri: string, value: ValuesBucket, callback: AsyncCallback): void; + +@@ -1149,7 +1157,8 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + insert(uri: string, value: ValuesBucket): Promise; + +@@ -1181,7 +1190,8 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + delete(uri: string, predicates: dataSharePredicates.DataSharePredicates, callback: AsyncCallback): void; + +@@ -1213,7 +1223,8 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + delete(uri: string, predicates: dataSharePredicates.DataSharePredicates): Promise; + +@@ -1418,7 +1429,8 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + batchInsert(uri: string, values: Array, callback: AsyncCallback): void; + +@@ -1448,7 +1460,8 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + batchInsert(uri: string, values: Array): Promise; + +@@ -1660,7 +1673,8 @@ declare namespace dataShare { + * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + close(): Promise; + } +diff --git a/api/@ohos.data.dataSharePredicates.d.ts b/api/@ohos.data.dataSharePredicates.d.ts +index 1c681b680..ce6158b83 100644 +--- a/api/@ohos.data.dataSharePredicates.d.ts ++++ b/api/@ohos.data.dataSharePredicates.d.ts +@@ -217,7 +217,8 @@ declare namespace dataSharePredicates { + * @syscap SystemCapability.DistributedDataManager.DataShare.Core + * @systemapi + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isNull(field: string): DataSharePredicates; + +@@ -230,7 +231,8 @@ declare namespace dataSharePredicates { + * @syscap SystemCapability.DistributedDataManager.DataShare.Core + * @systemapi + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isNotNull(field: string): DataSharePredicates; + +@@ -292,7 +294,8 @@ declare namespace dataSharePredicates { + * @syscap SystemCapability.DistributedDataManager.DataShare.Core + * @systemapi + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + between(field: string, low: ValueType, high: ValueType): DataSharePredicates; + +@@ -362,7 +365,8 @@ declare namespace dataSharePredicates { + * @syscap SystemCapability.DistributedDataManager.DataShare.Core + * @systemapi + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + lessThanOrEqualTo(field: string, value: ValueType): DataSharePredicates; + +diff --git a/api/@ohos.data.distributedKVStore.d.ets b/api/@ohos.data.distributedKVStore.d.ets +deleted file mode 100644 +index 6c459e422..000000000 +--- a/api/@ohos.data.distributedKVStore.d.ets ++++ /dev/null +@@ -1,3150 +0,0 @@ +-/* +- * Copyright (c) 2022 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-/** +- * @file +- * @kit ArkData +- */ +- +-import { AsyncCallback, Callback } from './@ohos.base'; +-import { ValuesBucket } from './@ohos.data.ValuesBucket'; +-import dataSharePredicates from './@ohos.data.dataSharePredicates'; +-import BaseContext from './application/BaseContext'; +- +-/** +- * Provider interfaces to create a {@link KVManager} instance. +- * +- * @namespace distributedKVStore +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +-declare namespace distributedKVStore { +- /** +- * Provides configuration information to create a {@link KVManager} instance, +- * which includes the caller's package name and ability or hap context. +- * +- * @interface KVManagerConfig +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- export interface KVManagerConfig { +- /** +- * Indicates the bundleName +- * +- * @type { string } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- bundleName: string; +- +- /** +- * Indicates the ability or hap context +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * if swap the area, you should close all the KV store and use the new Context to create the KVManager +- * @since 9 +- */ +- /** +- * Indicates the ability or hap context +- * +- * @type { BaseContext } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * if swap the area, you should close all the KV store and use the new BaseContext to create the KVManager +- * @since 10 +- */ +- context: BaseContext; +- } +- +- /** +- * KVStore constants +- * +- * @interface Constants +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- export interface Constants { +- /** +- * Max key length is 1024. +- * +- * @type { number } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- readonly MAX_KEY_LENGTH: number; +- +- /** +- * Max value length is 4194303. +- * +- * @type { number } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- readonly MAX_VALUE_LENGTH: number; +- +- /** +- * Max device coordinate key length is 896. +- * +- * @type { number } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- readonly MAX_KEY_LENGTH_DEVICE: number; +- +- /** +- * Max store id length is 128. +- * +- * @type { number } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- readonly MAX_STORE_ID_LENGTH: number; +- +- /** +- * Max query length is 512000. +- * +- * @type { number } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- readonly MAX_QUERY_LENGTH: number; +- +- /** +- * Max batch operation size is 128. +- * +- * @type { number } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- readonly MAX_BATCH_SIZE: number; +- } +- +- /** +- * Indicates the {@code ValueType}. +- *

    {@code ValueType} is obtained based on the value. +- * +- * @enum { number } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- export enum ValueType { +- /** +- * Indicates that the value type is string. +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- STRING, +- +- /** +- * Indicates that the value type is int. +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- INTEGER, +- +- /** +- * Indicates that the value type is float. +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- FLOAT, +- +- /** +- * Indicates that the value type is byte array. +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- BYTE_ARRAY, +- +- /** +- * Indicates that the value type is boolean. +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- BOOLEAN, +- +- /** +- * Indicates that the value type is double. +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- DOUBLE +- } +- +- /** +- * Obtains {@code Value} objects stored in a {@link SingleKVStore} or {@link DeviceKVStore} database. +- * +- * @interface Value +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- export interface Value { +- /** +- * Indicates the value type +- * +- * @type { ValueType } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- * @see ValueType +- */ +- type: ValueType; +- +- /** +- * Indicates the value +- * +- * @type { Uint8Array | string | number | boolean } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- value: Uint8Array | string | number | boolean; +- } +- +- /** +- * Provides key-value pairs stored in the distributedKVStore. +- * +- * @interface Entry +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- export interface Entry { +- /** +- * Indicates the key +- * +- * @type { string } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- key: string; +- +- /** +- * Indicates the value +- * +- * @type { Value } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- value: Value; +- } +- +- /** +- * Receive notifications of all data changes, including data insertion, update, and deletion. +- *

    If you have subscribed to {@code SingleKVStore} or {@code DeviceKVStore}, you will receive +- * data change notifications and obtain the changed data from the parameters in callback methods +- * upon data insertion, update or deletion. +- * +- * @interface ChangeNotification +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- export interface ChangeNotification { +- /** +- * Indicates data insertion records. +- * +- * @type { Entry[] } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- insertEntries: Entry[]; +- +- /** +- * Indicates data update records. +- * +- * @type { Entry[] } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- updateEntries: Entry[]; +- +- /** +- * Indicates data deletion records. +- * +- * @type { Entry[] } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- deleteEntries: Entry[]; +- +- /** +- * Indicates the device id which brings the data change. +- * +- * @type { string } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- deviceId: string; +- } +- +- /** +- * Indicates the database synchronization mode. +- * +- * @enum { number } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- export enum SyncMode { +- /** +- * Indicates that data is only pulled from the remote end. +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- PULL_ONLY, +- +- /** +- * Indicates that data is only pushed from the local end. +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- PUSH_ONLY, +- +- /** +- * Indicates that data is pushed from the local end, and then pulled from the remote end. +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- PUSH_PULL +- } +- +- /** +- * Describes the subscription type. +- * +- * @enum { number } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- export enum SubscribeType { +- /** +- * Subscription to local data changes +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- SUBSCRIBE_TYPE_LOCAL, +- +- /** +- * Subscription to remote data changes +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- SUBSCRIBE_TYPE_REMOTE, +- +- /** +- * Subscription to both local and remote data changes +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- SUBSCRIBE_TYPE_ALL +- } +- +- /** +- * Describes the KVStore type. +- * +- * @enum { number } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- export enum KVStoreType { +- /** +- * Device-collaboration database, as specified by {@code DeviceKVStore} +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- DEVICE_COLLABORATION, +- +- /** +- * Single-version database, as specified by {@code SingleKVStore} +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- SINGLE_VERSION +- } +- +- /** +- * Describes the KVStore security level. +- * +- * @enum { number } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- export enum SecurityLevel { +- /** +- * S1: means the db is in the low security level +- * There are some low impact when the data is leaked. +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- S1, +- +- /** +- * S2: means the db is in the middle security level +- * There are some major impact when the data is leaked. +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- S2, +- +- /** +- * S3: means the db is in the high security level +- * There are some severity impact when the data is leaked. +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- S3, +- +- /** +- * S4: means the db is in the critical security level +- * There are some critical impact when the data is leaked. +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- S4 +- } +- +- /** +- * Provides configuration options to create a {@code SingleKVStore} or {@code DeviceKVStore}. +- * +- * @interface Options +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- export interface Options { +- /** +- * Indicates whether to create a database when the database file does not exist +- * +- * @type { ?boolean } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- createIfMissing?: boolean; +- +- /** +- * Indicates whether database files to be encrypted +- * +- * @type { ?boolean } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- encrypt?: boolean; +- +- /** +- * Indicates whether to back up database files +- * +- * @type { ?boolean } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- backup?: boolean; +- +- /** +- * Indicates whether database files are automatically synchronized +- * +- * @permission ohos.permission.DISTRIBUTED_DATASYNC +- * @type { ?boolean } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- autoSync?: boolean; +- +- /** +- * Indicates the database type +- * +- * @type { ?KVStoreType } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- kvStoreType?: KVStoreType; +- +- /** +- * Indicates the database security level +- * +- * @type { SecurityLevel } +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- securityLevel: SecurityLevel; +- +- /** +- * Indicates the database schema +- * +- * @type { ?Schema } +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- schema?: Schema; +- } +- +- /** +- * Represents the database schema. +- * You can set the schema object in options when create or open the database. +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- export class Schema { +- /** +- * A constructor used to create a Schema instance. +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- constructor(); +- +- /** +- * Indicates the root json object. +- * +- * @type { FieldNode } +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- root: FieldNode; +- +- /** +- * Indicates the string array of json. +- * +- * @type { Array } +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- indexes: Array; +- +- /** +- * Indicates the mode of schema. +- * +- * @type { number } +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- mode: number; +- +- /** +- * Indicates the skip size of schema. +- * +- * @type { number } +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- skip: number; +- } +- +- /** +- * Represents a node of a {@link Schema} instance. +- *

    With a {@link Schema} instance, you can define the value fields which stored in the database. +- *

    A FieldNode of the {@link Schema} instance is either a leaf or a non-leaf node. +- *

    The leaf node must have a value; the non-leaf node must have a child {@code FieldNode}. +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- export class FieldNode { +- /** +- * A constructor used to create a FieldNode instance with the specified field. +- * name Indicates the field node name. +- * +- * @param { string } name - It can not be empty. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- constructor(name: string); +- +- /** +- * Adds a child node to this {@code FieldNode}. +- *

    Add a child node to makes this node a non-leaf node and field value will be ignored if it has a child node. +- * +- * @param { FieldNode } child - The field node to append. +- * @returns { boolean } Returns true if the child node is successfully added to this {@code FieldNode} and false otherwise. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- appendChild(child: FieldNode): boolean; +- +- /** +- * Indicates the default value of field node. +- * +- * @type { string } +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- // default: string; // TODO: add this field +- +- /** +- * Indicates the nullable of database field. +- * +- * @type { boolean } +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- nullable: boolean; +- +- /** +- * Indicates the type of value. +- * +- * @type { number } +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- type: number; +- } +- +- /** +- * Provides methods to operate the result set of the {@code SingleKVStore} or {@code DeviceKVStore} database. +- *

    The result set is created by using the {@code getResultSet} method in the {@code SingleKVStore} or +- * {@code DeviceKVStore} class. This interface also provides methods to move the data read +- * position in the result set. +- * +- * @interface KVStoreResultSet +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- export interface KVStoreResultSet { +- /** +- * Obtains the number of lines in a result set. +- * +- * @returns { number } Returns the number of lines. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getCount(): number; +- +- /** +- * Obtains the current read position in a result set. +- * +- * @returns { number } Returns the current read position. The read position starts with 0. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getPosition(): number; +- +- /** +- * Moves the read position to the first line. +- *

    If the result set is empty, false is returned. +- * +- * @returns { boolean } Returns true if the operation succeeds; return false otherwise. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- moveToFirst(): boolean; +- +- /** +- * Moves the read position to the last line. +- *

    If the result set is empty, false is returned. +- * +- * @returns { boolean } Returns true if the operation succeeds; return false otherwise. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- moveToLast(): boolean; +- +- /** +- * Moves the read position to the next line. +- *

    If the result set is empty or the data in the last line is being read, false is returned. +- * +- * @returns { boolean } Returns true if the operation succeeds; return false otherwise. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- moveToNext(): boolean; +- +- /** +- * Moves the read position to the previous line. +- *

    If the result set is empty or the data in the first line is being read, false is returned. +- * +- * @returns { boolean } Returns true if the operation succeeds; return false otherwise. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- moveToPrevious(): boolean; +- +- /** +- * Moves the read position by a relative offset to the current position. +- * +- * @param { number } offset - Indicates the relative offset to the current position. A negative offset indicates moving +- * backwards, and a positive offset indicates moving forwards. For example, if the current position is entry 1 and +- * this offset is 2, the destination position will be entry 3; if the current position is entry 3 and this offset is -2, +- * the destination position will be entry 1. The valid final position after moving forwards starts with 0. If the +- * final position is invalid, false will be returned. +- * @returns { boolean } Returns true if the operation succeeds; return false otherwise. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- move(offset: number): boolean; +- +- /** +- * Moves the read position from 0 to an absolute position. +- * +- * @param { number } position - Indicates the absolute position. +- * @returns { boolean } Returns true if the operation succeeds; return false otherwise. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- moveToPosition(position: number): boolean; +- +- /** +- * Checks whether the read position is the first line. +- * +- * @returns { boolean } Returns true if the read position is the first line; returns false otherwise. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- isFirst(): boolean; +- +- /** +- * Checks whether the read position is the last line. +- * +- * @returns { boolean } Returns true if the read position is the last line; returns false otherwise. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- isLast(): boolean; +- +- /** +- * Checks whether the read position is before the last line. +- * +- * @returns { boolean } Returns true if the read position is before the first line; returns false otherwise. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- isBeforeFirst(): boolean; +- +- /** +- * Checks whether the read position is after the last line. +- * +- * @returns { boolean } Returns true if the read position is after the last line; returns false otherwise. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- isAfterLast(): boolean; +- +- /** +- * Obtains a key-value pair. +- * +- * @returns { Entry } Returns a key-value pair. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getEntry(): Entry; +- } +- +- /** +- * Represents a database query using predicates. +- *

    This class provides a constructor used to create a {@code Query} instance, which is used to query data +- * matching specified conditions in the database. +- *

    This class also provides methods to add predicates to the {@code Query} instance. +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- export class Query { +- /** +- * A constructor used to create a Query instance. +- * +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- constructor(); +- +- /** +- * Resets this {@code Query} object. +- * +- * @returns { Query } Returns the reset {@code Query} object. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- reset(): Query; +- +- /** +- * Constructs a {@code Query} object to query entries with the specified field whose value is equal to the specified long value. +- * +- * @param { string } field - Indicates the field, which cannot contain ^. +- * @param { number | string | boolean } value - Indicates the value to be compared. +- * @returns { Query } Returns the {@coed Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- equalTo(field: string, value: number | string | boolean): Query; +- +- /** +- * Constructs a {@code Query} object to query entries with the specified field whose value is not equal to the specified int value. +- * +- * @param { string } field - Indicates the field, which cannot contain ^. +- * @param { number | string | boolean } value - Indicates the value to be compared. +- * @returns { Query } Returns the {@coed Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- notEqualTo(field: string, value: number | string | boolean): Query; +- +- /** +- * Constructs a {@code Query} object to query entries with the specified field whose value is greater than or equal to the +- * specified int value. +- * +- * @param { string } field - Indicates the field, which cannot contain ^. +- * @param { number | string | boolean } value - Indicates the value to be compared. +- * @returns { Query } Returns the {@coed Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- greaterThan(field: string, value: number | string | boolean): Query; +- +- /** +- * Constructs a {@code Query} object to query entries with the specified field whose value is less than the specified int value. +- * +- * @param { string } field - Indicates the field, which cannot contain ^. +- * @param { number | string } value - Indicates the value to be compared. +- * @returns { Query } Returns the {@coed Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- lessThan(field: string, value: number | string): Query; +- +- /** +- * Constructs a {@code Query} object to query entries with the specified field whose value is greater than or +- * equal to the specified int value. +- * +- * @param { string } field - Indicates the field, which cannot contain ^. +- * @param { number | string } value - Indicates the value to be compared. +- * @returns { Query } Returns the {@coed Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- greaterThanOrEqualTo(field: string, value: number | string): Query; +- +- /** +- * Constructs a {@code Query} object to query entries with the specified field whose value is less than or equal to the +- * specified int value. +- * +- * @param { string } field - Indicates the field, which cannot contain ^. +- * @param { number | string } value - Indicates the value to be compared. +- * @returns { Query } Returns the {@coed Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- lessThanOrEqualTo(field: string, value: number | string): Query; +- +- /** +- * Constructs a {@code Query} object to query entries with the specified field whose value is null. +- * +- * @param { string } field - Indicates the field, which cannot contain ^. +- * @returns { Query } Returns the {@coed Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- isNull(field: string): Query; +- +- /** +- * Constructs a {@code Query} object to query entries with the specified field whose value is within the specified int value list. +- * +- * @param { string } field - Indicates the field, which cannot contain ^. +- * @param { number[] } valueList - Indicates the int value list. +- * @returns { Query } Returns the {@coed Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- inNumber(field: string, valueList: number[]): Query; +- +- /** +- * Constructs a {@code Query} object to query entries with the specified field whose value is within the specified string value list. +- * +- * @param { string } field - Indicates the field, which cannot contain ^. +- * @param { string[] } valueList - Indicates the string value list. +- * @returns { Query } Returns the {@coed Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- inString(field: string, valueList: string[]): Query; +- +- /** +- * Constructs a {@code Query} object to query entries with the specified field whose value is not within the specified int value list. +- * +- * @param { string } field - Indicates the field, which cannot contain ^. +- * @param { number[] } valueList - Indicates the int value list. +- * @returns { Query } Returns the {@coed Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- notInNumber(field: string, valueList: number[]): Query; +- +- /** +- * Constructs a {@code Query} object to query entries with the specified field whose value is not within the specified string value list. +- * +- * @param { string } field - Indicates the field, which cannot contain ^. +- * @param { string[] } valueList - Indicates the string value list. +- * @returns { Query } Returns the {@coed Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- notInString(field: string, valueList: string[]): Query; +- +- /** +- * Constructs a {@code Query} object to query entries with the specified field whose value is similar to the specified string value. +- * +- * @param { string } field - Indicates the field, which cannot contain ^. +- * @param { string } value - Indicates the string value. +- * @returns { Query } Returns the {@coed Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- like(field: string, value: string): Query; +- +- /** +- * Constructs a {@code Query} object to query entries with the specified field whose value is not similar to the specified string value. +- * +- * @param { string } field - Indicates the field, which cannot contain ^. +- * @param { string } value - Indicates the string value. +- * @returns { Query } Returns the {@coed Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- unlike(field: string, value: string): Query; +- +- /** +- * Constructs a {@code Query} object with the and condition. +- *

    Multiple predicates should be connected using the and or or condition. +- * +- * @returns { Query } Returns the {@coed Query} object. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- and(): Query; +- +- /** +- * Constructs a {@code Query} object with the or condition. +- *

    Multiple predicates should be connected using the and or or condition. +- * +- * @returns { Query } Returns the {@coed Query} object. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- or(): Query; +- +- /** +- * Constructs a {@code Query} object to sort the query results in ascending order. +- * +- * @param { string } field - Indicates the field, which cannot contain ^. +- * @returns { Query } Returns the {@coed Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- orderByAsc(field: string): Query; +- +- /** +- * Constructs a {@code Query} object to sort the query results in descending order. +- * +- * @param { string } field - Indicates the field, which cannot contain ^. +- * @returns { Query } Returns the {@coed Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- orderByDesc(field: string): Query; +- +- /** +- * Constructs a {@code Query} object to specify the number of results and the start position. +- * +- * @param { number } total - Indicates the number of results. +- * @param { number } offset - Indicates the start position. +- * @returns { Query } Returns the {@coed Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- limit(total: number, offset: number): Query; +- +- /** +- * Creates a {@code Query} condition with a specified field that is not null. +- * +- * @param { string } field - Indicates the specified field. +- * @returns { Query } Returns the {@coed Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- isNotNull(field: string): Query; +- +- /** +- * Creates a query condition group with a left bracket. +- *

    Multiple query conditions in an {@code Query} object can be grouped. The query conditions in a group can be used as a +- * whole to combine with other query conditions. +- * +- * @returns { Query } Returns the {@coed Query} object. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- beginGroup(): Query; +- +- /** +- * Creates a query condition group with a right bracket. +- *

    Multiple query conditions in an {@code Query} object can be grouped. The query conditions in a group can be used as a +- * whole to combine with other query conditions. +- * +- * @returns { Query } Returns the {@coed Query} object. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- endGroup(): Query; +- +- /** +- * Creates a query condition with a specified key prefix. +- * +- * @param { string } prefix - Indicates the specified key prefix. +- * @returns { Query } Returns the {@coed Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- prefixKey(prefix: string): Query; +- +- /** +- * Sets a specified index that will be preferentially used for query. +- * +- * @param { string } index - Indicates the index to set. +- * @returns { Query } Returns the {@coed Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- setSuggestIndex(index: string): Query; +- +- /** +- * Add device ID key prefix.Used by {@code DeviceKVStore}. +- * +- * @param { string } deviceId - Specify device id to query from, It can not be empty. +- * @returns { Query } Returns the {@code Query} object with device ID prefix added. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- deviceId(deviceId: string): Query; +- +- /** +- * Get a String that represents this {@code Query}. +- *

    The String would be parsed to DB query format. +- * The String length should be no longer than 500kb. +- * +- * @returns { string } String representing this {@code Query}. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getSqlLike(): string; +- } +- +- /** +- * Provides methods related to single-version distributed databases. +- *

    To create a {@code SingleKVStore} database, +- * you can use the {@link data.distributed.common.KVManager#getKVStore​(Options, String)} method +- * with {@code KVStoreType} set to {@code SINGLE_VERSION} for the input parameter {@code Options}. +- * This database synchronizes data to other databases in time sequence. +- * The {@code SingleKVStore} database does not support +- * synchronous transactions, or data search using snapshots. +- * +- * @interface SingleKVStore +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- export interface SingleKVStore { +- /** +- * Writes a key-value pair of the string type into the {@code SingleKVStore} database. +- *

    If you do not want to synchronize this key-value pair to other devices, set the write option in the local database. +- * +- * @param { string } key - Indicates the key. Length must be less than {@code MAX_KEY_LENGTH}. +- * Spaces before and after the key will be cleared. +- * @param { Uint8Array | string | number | boolean } value - Indicates the value to be inserted. +- * @param { AsyncCallback } callback - the callback of put. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- /** +- * Writes a key-value pair of the string type into the {@code SingleKVStore} database. +- *

    If you do not want to synchronize this key-value pair to other devices, set the write option in the local database. +- * +- * @param { string } key - Indicates the key. Length must be less than {@code MAX_KEY_LENGTH}. +- * Spaces before and after the key will be cleared. +- * @param { Uint8Array | string | number | boolean } value - Indicates the value to be inserted. +- * @param { AsyncCallback } callback - the callback of put. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 10 +- */ +- put(key: string, value: Uint8Array | string | number | boolean, callback: AsyncCallback): void; +- +- /** +- * Writes a key-value pair of the string type into the {@code SingleKVStore} database. +- *

    If you do not want to synchronize this key-value pair to other devices, set the write option in the local database. +- * +- * @param { string } key - Indicates the key. Length must be less than {@code MAX_KEY_LENGTH}. +- * Spaces before and after the key will be cleared. +- * @param { Uint8Array | string | number | boolean } value - Indicates the value to be inserted. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- /** +- * Writes a key-value pair of the string type into the {@code SingleKVStore} database. +- *

    If you do not want to synchronize this key-value pair to other devices, set the write option in the local database. +- * +- * @param { string } key - Indicates the key. Length must be less than {@code MAX_KEY_LENGTH}. +- * Spaces before and after the key will be cleared. +- * @param { Uint8Array | string | number | boolean } value - Indicates the value to be inserted. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 10 +- */ +- put(key: string, value: Uint8Array | string | number | boolean): Promise; +- +- /** +- * Inserts key-value pairs into the {@code SingleKVStore} database in batches. +- * +- * @param { Entry[] } entries - Indicates the key-value pairs to be inserted in batches. +- * @param { AsyncCallback } callback - the callback of putBatch. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- /** +- * Inserts key-value pairs into the {@code SingleKVStore} database in batches. +- * +- * @param { Entry[] } entries - Indicates the key-value pairs to be inserted in batches. +- * @param { AsyncCallback } callback - the callback of putBatch. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 10 +- */ +- putBatch(entries: Entry[], callback: AsyncCallback): void; +- +- /** +- * Inserts key-value pairs into the {@code SingleKVStore} database in batches. +- * +- * @param { Entry[] } entries - Indicates the key-value pairs to be inserted in batches. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- /** +- * Inserts key-value pairs into the {@code SingleKVStore} database in batches. +- * +- * @param { Entry[] } entries - Indicates the key-value pairs to be inserted in batches. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 10 +- */ +- putBatch(entries: Entry[]): Promise; +- +- /** +- * Writes values of ValuesBucket type into the {@code SingleKVStore} database. +- * +- * @param { Array } value - Indicates the ValuesBucket array to be inserted. +- * @param { AsyncCallback } callback - the callback of putBatch. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @systemapi +- * @StageModelOnly +- * @since 9 +- */ +- /** +- * Writes values of ValuesBucket type into the {@code SingleKVStore} database. +- * +- * @param { Array } value - Indicates the ValuesBucket array to be inserted. +- * @param { AsyncCallback } callback - the callback of putBatch. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @systemapi +- * @StageModelOnly +- * @since 10 +- */ +- putBatch(value: Array, callback: AsyncCallback): void; +- +- /** +- * Writes values of ValuesBucket type into the {@code SingleKVStore} database. +- * +- * @param { Array } value - Indicates the ValuesBucket array to be inserted. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @systemapi +- * @StageModelOnly +- * @since 9 +- */ +- /** +- * Writes values of ValuesBucket type into the {@code SingleKVStore} database. +- * +- * @param { Array } value - Indicates the ValuesBucket array to be inserted. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @systemapi +- * @StageModelOnly +- * @since 10 +- */ +- putBatch(value: Array): Promise; +- +- /** +- * Deletes the key-value pair based on a specified key. +- * +- * @param { string } key - Indicates the key. Length must be less than {@code MAX_KEY_LENGTH}. +- * Spaces before and after the key will be cleared. +- * @param { AsyncCallback } callback - the callback of delete. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- /** +- * Deletes the key-value pair based on a specified key. +- * +- * @param { string } key - Indicates the key. Length must be less than {@code MAX_KEY_LENGTH}. +- * Spaces before and after the key will be cleared. +- * @param { AsyncCallback } callback - the callback of delete. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 10 +- */ +- delete(key: string, callback: AsyncCallback): void; +- +- /** +- * Deletes the key-value pair based on a specified key. +- * +- * @param { string } key - Indicates the key. Length must be less than {@code MAX_KEY_LENGTH}. +- * Spaces before and after the key will be cleared. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- /** +- * Deletes the key-value pair based on a specified key. +- * +- * @param { string } key - Indicates the key. Length must be less than {@code MAX_KEY_LENGTH}. +- * Spaces before and after the key will be cleared. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 10 +- */ +- delete(key: string): Promise; +- +- /** +- * Deletes the key-value pairs based on the dataSharePredicates. +- * +- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the dataSharePredicates. +- * @param { AsyncCallback } callback - the callback of delete. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider +- * @systemapi +- * @StageModelOnly +- * @since 9 +- */ +- /** +- * Deletes the key-value pairs based on the dataSharePredicates. +- * +- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the dataSharePredicates. +- * @param { AsyncCallback } callback - the callback of delete. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. +- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider +- * @systemapi +- * @StageModelOnly +- * @since 10 +- */ +- delete(predicates: dataSharePredicates.DataSharePredicates, callback: AsyncCallback): void; +- +- /** +- * Deletes the key-value pairs based on the dataSharePredicates. +- * +- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the dataSharePredicates. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider +- * @systemapi +- * @StageModelOnly +- * @since 9 +- */ +- /** +- * Deletes the key-value pairs based on the dataSharePredicates. +- * +- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the dataSharePredicates. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. +- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider +- * @systemapi +- * @StageModelOnly +- * @since 10 +- */ +- delete(predicates: dataSharePredicates.DataSharePredicates): Promise; +- +- /** +- * Deletes key-value pairs in batches from the {@code SingleKVStore} database. +- * +- * @param { string[] } keys - Indicates the key-value pairs to be deleted in batches, It can not be empty. +- * @param { AsyncCallback } callback - the callback of deleteBatch. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- /** +- * Deletes key-value pairs in batches from the {@code SingleKVStore} database. +- * +- * @param { string[] } keys - Indicates the key-value pairs to be deleted in batches, It can not be empty. +- * @param { AsyncCallback } callback - the callback of deleteBatch. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 10 +- */ +- deleteBatch(keys: string[], callback: AsyncCallback): void; +- +- /** +- * Deletes key-value pairs in batches from the {@code SingleKVStore} database. +- * +- * @param { string[] } keys - Indicates the key-value pairs to be deleted in batches, It can not be empty. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- /** +- * Deletes key-value pairs in batches from the {@code SingleKVStore} database. +- * +- * @param { string[] } keys - Indicates the key-value pairs to be deleted in batches, It can not be empty. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 10 +- */ +- deleteBatch(keys: string[]): Promise; +- +- /** +- * Removes data of the specified device from current database. This method is used to remove only the data +- * synchronized from remote devices. This operation does not synchronize data to other databases or affect +- * subsequent data synchronization. +- * +- * @param { string } deviceId - Identifies the device whose data is to be removed and the value cannot be the current device ID. +- * @param { AsyncCallback } callback - the callback of removeDeviceData. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Parameter verification failed. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- removeDeviceData(deviceId: string, callback: AsyncCallback): void; +- +- /** +- * Removes data of the specified device from current database. This method is used to remove only the data +- * synchronized from remote devices. This operation does not synchronize data to other databases or affect +- * subsequent data synchronization. +- * +- * @param { string } deviceId - Identifies the device whose data is to be removed and the value cannot be the current device ID. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Parameter verification failed. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- removeDeviceData(deviceId: string): Promise; +- +- /** +- * Obtains the value of a specified key. +- * +- * @param { string } key - Indicates the key. The length must be less than {@code MAX_KEY_LENGTH}. +- * @param { AsyncCallback } callback - +- * {Uint8Array|string|boolean|number}: the returned value specified by the key. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100004 - Not found. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- get(key: string, callback: AsyncCallback): void; +- +- /** +- * Obtains the value of a specified key. +- * +- * @param { string } key - Indicates the key. The length must be less than {@code MAX_KEY_LENGTH}. +- * @returns { Promise } +- * {Uint8Array|string|boolean|number}: the returned value specified by the key. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100004 - Not found. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- get(key: string): Promise; +- +- /** +- * Obtains all key-value pairs that match a specified key prefix. +- * +- * @param { string } keyPrefix - Indicates the key prefix to match. +- * @param { AsyncCallback } callback - {Entry[]}: the list of all key-value pairs +- * that match the specified key prefix. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getEntries(keyPrefix: string, callback: AsyncCallback): void; +- +- /** +- * Obtains all key-value pairs that match a specified key prefix. +- * +- * @param { string } keyPrefix - Indicates the key prefix to match. +- * @returns { Promise } {Entry[]}: the list of all key-value pairs that match the +- * specified key prefix. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getEntries(keyPrefix: string): Promise; +- +- /** +- * Obtains the list of key-value pairs matching the specified {@code Query} object. +- * +- * @param { Query } query - Indicates the {@code Query} object. +- * @param { AsyncCallback } callback - {Entry[]}: the list of all key-value pairs +- * matching the specified {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getEntries(query: Query, callback: AsyncCallback): void; +- +- /** +- * Obtains the list of key-value pairs matching the specified {@code Query} object. +- * +- * @param { Query } query - Indicates the {@code Query} object. +- * @returns { Promise } {Entry[]}: the list of all key-value pairs matching the +- * specified {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getEntries(query: Query): Promise; +- +- /** +- * Obtains the result set with a specified prefix from a {@code SingleKVStore} database. The {@code KVStoreResultSet} +- * object can be used to query all key-value pairs that meet the search criteria. Each {@code SingleKVStore} +- * instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. If you have created +- * four objects, calling this method will return a failure. Therefore, you are advised to call the closeResultSet +- * method to close unnecessary {@code KVStoreResultSet} objects in a timely manner. +- * +- * @param { string } keyPrefix - Indicates the key prefix to match. +- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified keyPrefix. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- /** +- * Obtains the result set with a specified prefix from a {@code SingleKVStore} database. The {@code KVStoreResultSet} +- * object can be used to query all key-value pairs that meet the search criteria. Each {@code SingleKVStore} +- * instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. If you have created +- * four objects, calling this method will return a failure. Therefore, you are advised to call the closeResultSet +- * method to close unnecessary {@code KVStoreResultSet} objects in a timely manner. +- * +- * @param { string } keyPrefix - Indicates the key prefix to match. +- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified keyPrefix. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100001 - Over max limits. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 10 +- */ +- getResultSet(keyPrefix: string, callback: AsyncCallback): void; +- +- /** +- * Obtains the result set with a specified prefix from a {@code SingleKVStore} database. The {@code KVStoreResultSet} +- * object can be used to query all key-value pairs that meet the search criteria. Each {@code SingleKVStore} +- * instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. If you have created +- * four objects, calling this method will return a failure. Therefore, you are advised to call the closeResultSet +- * method to close unnecessary {@code KVStoreResultSet} objects in a timely manner. +- * +- * @param { string } keyPrefix - Indicates the key prefix to match. +- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified keyPrefix. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- /** +- * Obtains the result set with a specified prefix from a {@code SingleKVStore} database. The {@code KVStoreResultSet} +- * object can be used to query all key-value pairs that meet the search criteria. Each {@code SingleKVStore} +- * instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. If you have created +- * four objects, calling this method will return a failure. Therefore, you are advised to call the closeResultSet +- * method to close unnecessary {@code KVStoreResultSet} objects in a timely manner. +- * +- * @param { string } keyPrefix - Indicates the key prefix to match. +- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified keyPrefix. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100001 - Over max limits. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 10 +- */ +- getResultSet(keyPrefix: string): Promise; +- +- /** +- * Obtains the {@code KVStoreResultSet} object matching the specified {@code Query} object. +- * +- * @param { Query } query - Indicates the {@code Query} object. +- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- /** +- * Obtains the {@code KVStoreResultSet} object matching the specified {@code Query} object. +- * +- * @param { Query } query - Indicates the {@code Query} object. +- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100001 - Over max limits. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 10 +- */ +- getResultSet(query: Query, callback: AsyncCallback): void; +- +- /** +- * Obtains the {@code KVStoreResultSet} object matching the specified {@code Query} object. +- * +- * @param { Query } query - Indicates the {@code Query} object. +- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- /** +- * Obtains the {@code KVStoreResultSet} object matching the specified {@code Query} object. +- * +- * @param { Query } query - Indicates the {@code Query} object. +- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100001 - Over max limits. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 10 +- */ +- getResultSet(query: Query): Promise; +- +- /** +- * Obtains the KVStoreResultSet object matching the specified predicate object. +- * +- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the datasharePredicates. +- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified {@code dataSharePredicates.DataSharePredicates} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider +- * @systemapi +- * @StageModelOnly +- * @since 9 +- */ +- /** +- * Obtains the KVStoreResultSet object matching the specified predicate object. +- * +- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the datasharePredicates. +- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified {@code dataSharePredicates.DataSharePredicates} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. +- * @throws { BusinessError } 15100001 - Over max limits. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider +- * @systemapi +- * @StageModelOnly +- * @since 10 +- */ +- getResultSet(predicates: dataSharePredicates.DataSharePredicates, callback: AsyncCallback): void; +- +- /** +- * Obtains the KVStoreResultSet object matching the specified predicate object. +- * +- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the datasharePredicates. +- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified {@code dataSharePredicates.DataSharePredicates} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider +- * @systemapi +- * @StageModelOnly +- * @since 9 +- */ +- /** +- * Obtains the KVStoreResultSet object matching the specified predicate object. +- * +- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the datasharePredicates. +- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified {@code dataSharePredicates.DataSharePredicates} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. +- * @throws { BusinessError } 15100001 - Over max limits. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider +- * @systemapi +- * @StageModelOnly +- * @since 10 +- */ +- getResultSet(predicates: dataSharePredicates.DataSharePredicates): Promise; +- +- /** +- * Closes a {@code KVStoreResultSet} object returned by getResultSet method. +- * +- * @param { KVStoreResultSet } resultSet - Indicates the {@code KVStoreResultSet} object to close. +- * @param { AsyncCallback } callback - the callback of closeResultSet. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- closeResultSet(resultSet: KVStoreResultSet, callback: AsyncCallback): void; +- +- /** +- * Closes a {@code KVStoreResultSet} object returned by getResultSet method. +- * +- * @param { KVStoreResultSet } resultSet - Indicates the {@code KVStoreResultSet} object to close. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- closeResultSet(resultSet: KVStoreResultSet): Promise; +- +- /** +- * Obtains the number of results matching the specified {@code Query} object. +- * +- * @param { Query } query - Indicates the {@code Query} object. +- * @param { AsyncCallback } callback - {number}: the number of results matching the +- * specified {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getResultSize(query: Query, callback: AsyncCallback): void; +- +- /** +- * Obtains the number of results matching the specified {@code Query} object. +- * +- * @param { Query } query - Indicates the {@code Query} object. +- * @returns { Promise } {number}: the number of results matching the specified +- * {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getResultSize(query: Query): Promise; +- +- /** +- * Backs up a database in the specified filename. +- * +- * @param { string } file - Indicates the database backup filename, It can not be empty and +- * The length must be less than {@code MAX_KEY_LENGTH}. +- * @param { AsyncCallback } callback - the callback of backup. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Parameter verification failed. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- backup(file: string, callback: AsyncCallback): void; +- +- /** +- * Backs up a database in the specified filename. +- * +- * @param { string } file - Indicates the database backup filename, It can not be empty and +- * The length must be less than {@code MAX_KEY_LENGTH}. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Parameter verification failed. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- backup(file: string): Promise; +- +- /** +- * Restores a database from a specified database file. +- * +- * @param { string } file - Indicates the database backup filename, It can not be empty and +- * The length must be less than {@code MAX_KEY_LENGTH}. +- * @param { AsyncCallback } callback - the callback of restore. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Parameter verification failed. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- restore(file: string, callback: AsyncCallback): void; +- +- /** +- * Restores a database from a specified database file. +- * +- * @param { string } file - Indicates the database backup filename, It can not be empty and +- * The length must be less than {@code MAX_KEY_LENGTH}. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Parameter verification failed. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- restore(file: string): Promise; +- +- /** +- * Delete database backup files based on the specified filenames. +- * +- * @param { Array } files - Indicates the backup filenames to be deleted, It can not be empty and +- * The length must be less than {@code MAX_KEY_LENGTH}. +- * @param { AsyncCallback> } callback - {Array<[string, number]>}: +- * the list of backup file and it's corresponding delete result which 0 means delete success +- * and otherwise failed. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- deleteBackup(files: Array, callback: AsyncCallback>): void; +- +- /** +- * Delete database backup files based on the specified filenames. +- * +- * @param { Array } files - Indicates the backup filenames to be deleted, It can not be empty and +- * The length must be less than {@code MAX_KEY_LENGTH}. +- * @returns { Promise> } {Array<[string, number]>}: the list of backup +- * file and it's corresponding delete result which 0 means delete success and otherwise failed. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- deleteBackup(files: Array): Promise>; +- +- /** +- * Starts a transaction operation in the {@code SingleKVStore} database. +- *

    After the database transaction is started, you can submit or roll back the operation. +- * +- * @param { AsyncCallback } callback - the callback of startTransaction. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- /** +- * Starts a transaction operation in the {@code SingleKVStore} database. +- *

    After the database transaction is started, you can submit or roll back the operation. +- * +- * @param { AsyncCallback } callback - the callback of startTransaction. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 10 +- */ +- startTransaction(callback: AsyncCallback): void; +- +- /** +- * Starts a transaction operation in the {@code SingleKVStore} database. +- *

    After the database transaction is started, you can submit or roll back the operation. +- * +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- /** +- * Starts a transaction operation in the {@code SingleKVStore} database. +- *

    After the database transaction is started, you can submit or roll back the operation. +- * +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 10 +- */ +- startTransaction(): Promise; +- +- /** +- * Submits a transaction operation in the {@code SingleKVStore} database. +- * +- * @param { AsyncCallback } callback - the callback of commit. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- commit(callback: AsyncCallback): void; +- +- /** +- * Submits a transaction operation in the {@code SingleKVStore} database. +- * +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- commit(): Promise; +- +- /** +- * Rolls back a transaction operation in the {@code SingleKVStore} database. +- * +- * @param { AsyncCallback } callback - the callback of rollback. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- rollback(callback: AsyncCallback): void; +- +- /** +- * Rolls back a transaction operation in the {@code SingleKVStore} database. +- * +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- rollback(): Promise; +- +- /** +- * Sets whether to enable synchronization. +- * +- * @param { boolean } enabled - Specifies whether to enable synchronization. The value true +- * means to enable synchronization, and false means the opposite. +- * @param { AsyncCallback } callback - the callback of enableSync. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- enableSync(enabled: boolean, callback: AsyncCallback): void; +- +- /** +- * Sets whether to enable synchronization. +- * +- * @param { boolean } enabled - Specifies whether to enable synchronization. The value true +- * means to enable synchronization, and false means the opposite. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- enableSync(enabled: boolean): Promise; +- +- /** +- * Sets synchronization range labels. +- *

    The labels determine the devices with which data will be synchronized. +- * +- * @param { string[] } localLabels - Indicates the synchronization labels of the local device. +- * @param { string[] } remoteSupportLabels - Indicates the labels of the devices with which +- * data will be synchronized. +- * @param { AsyncCallback } callback - the callback of setSyncRange. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- setSyncRange(localLabels: string[], remoteSupportLabels: string[], callback: AsyncCallback): void; +- +- /** +- * Sets synchronization range labels. +- *

    The labels determine the devices with which data will be synchronized. +- * +- * @param { string[] } localLabels - Indicates the synchronization labels of the local device. +- * @param { string[] } remoteSupportLabels - Indicates the labels of the devices with which +- * data will be synchronized. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- setSyncRange(localLabels: string[], remoteSupportLabels: string[]): Promise; +- +- /** +- * Sets the default delay allowed for database synchronization +- * +- * @param { number } defaultAllowedDelayMs - Indicates the default delay allowed for the +- * database synchronization, in milliseconds. +- * @param { AsyncCallback } callback - the callback of setSyncParam. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- setSyncParam(defaultAllowedDelayMs: number, callback: AsyncCallback): void; +- +- /** +- * Sets the default delay allowed for database synchronization +- * +- * @param { number } defaultAllowedDelayMs - Indicates the default delay allowed for the +- * database synchronization, in milliseconds. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- setSyncParam(defaultAllowedDelayMs: number): Promise; +- +- /** +- * Synchronize the database to the specified devices with the specified delay allowed. +- * +- * @permission ohos.permission.DISTRIBUTED_DATASYNC +- * @param { string[] } deviceIds - Indicates the list of devices to which to synchronize the database. +- * @param { SyncMode } mode - Indicates the synchronization mode. The value can be {@code PUSH}, +- * {@code PULL}, or {@code PUSH_PULL}. +- * @param { number } delayMs - Indicates the delay allowed for the synchronization, in milliseconds. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100004 - Not found. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- sync(deviceIds: string[], mode: SyncMode, delayMs?: number): void; +- +- /** +- * Synchronize the database to the specified devices with the specified delay allowed. +- * +- * @permission ohos.permission.DISTRIBUTED_DATASYNC +- * @param { string[] } deviceIds - Indicates the list of devices to which to synchronize the database. +- * @param { Query } query - Indicates the {@code Query} object. +- * @param { SyncMode } mode - Indicates the synchronization mode. The value can be {@code PUSH}, +- * {@code PULL}, or {@code PUSH_PULL}. +- * @param { number } delayMs - Indicates the delay allowed for the synchronization, in milliseconds. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100004 - Not found. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- sync(deviceIds: string[], query: Query, mode: SyncMode, delayMs?: number): void; +- +- /** +- * Register a callback to the database and when data in the distributed database has changed, +- * the callback will be invoked. +- * +- * @param { 'dataChange' } event - Subscribed event name, fixed as 'dataChange', indicates the data change event. +- * @param { SubscribeType } type - Indicates the subscription type, which is defined in {@code SubscribeType}. +- * @param { Callback } listener - {ChangeNotification}: the {@code ChangeNotification} +- * object indicates the data change events in the distributed database. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100001 - Over max limits. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- /** +- * Register a callback to the database and when data in the distributed database has changed, +- * the callback will be invoked. +- * +- * @param { 'dataChange' } event - Subscribed event name, fixed as 'dataChange', indicates the data change event. +- * @param { SubscribeType } type - Indicates the subscription type, which is defined in {@code SubscribeType}. +- * @param { Callback } listener - {ChangeNotification}: the {@code ChangeNotification} +- * object indicates the data change events in the distributed database. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100001 - Over max limits. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 10 +- */ +- on(event: 'dataChange', type: SubscribeType, listener: Callback): void; +- +- /** +- * Register a databases synchronization callback to the database. +- *

    Sync result is returned through asynchronous callback. +- * +- * @param { 'syncComplete' } event - Subscribed event name, fixed as 'syncComplete', indicates the synchronization completion event. +- * @param { Callback> } syncCallback - {Array<[string, number]>}: the +- * deviceId and it's corresponding synchronization result which 0 means synchronization success +- * and otherwise failed. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- on(event: 'syncComplete', syncCallback: Callback>): void; +- +- /** +- * Unsubscribe from the SingleKVStore database based on the specified subscribeType and listener. +- * +- * @param { 'dataChange' } event - The unsubscribe event name, fixed as 'dataChange', indicates the data change event. +- * @param { Callback } listener - {ChangeNotification}: the {@code ChangeNotification} +- * object indicates the data change events in the distributed database. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- off(event: 'dataChange', listener?: Callback): void; +- +- /** +- * Unregister the database synchronization callback. +- * +- * @param { 'syncComplete' } event - The unsubscribe event name, fixed as 'syncComplete', indicates the synchronization completion event. +- * @param { Callback> } syncCallback - {Array<[string, number]>}: the +- * deviceId and it's corresponding synchronization result which 0 means synchronization success +- * and otherwise failed. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- off(event: 'syncComplete', syncCallback?: Callback>): void; +- +- /** +- * Get the security level of the database. +- * +- * @param { AsyncCallback } callback - {SecurityLevel}: the {@code SecurityLevel} +- * object indicates the security level of the database. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getSecurityLevel(callback: AsyncCallback): void; +- +- /** +- * Get the security level of the database. +- * +- * @returns { Promise } {SecurityLevel}: the {@code SecurityLevel} object indicates +- * the security level of the database. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getSecurityLevel(): Promise; +- } +- +- /** +- * Provides methods related to device-collaboration distributed databases. +- *

    To create a {@code DeviceKVStore} database, you can use the {@link data.distributed.common.KVManager.getKVStore(Options, String)} +- * method with {@code KVStoreType} set to {@code DEVICE_COLLABORATION} for the input parameter Options. This database manages distributed +- * data by device, and cannot modify data synchronized from remote devices. When an application writes a key-value pair entry +- * into the database, the system automatically adds the ID of the device running the application to the key. +- * +- * @interface DeviceKVStore +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- export interface DeviceKVStore extends SingleKVStore { +- /** +- * Obtains the value matching the local device ID and specified key. +- * +- * @param { string } key - Indicates the key. The length must be less than {@code MAX_KEY_LENGTH}. +- * @param { AsyncCallback } callback - +- * {Uint8Array|string|boolean|number}: the returned value specified by the local device ID and specified key. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100004 - Not found. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- get(key: string, callback: AsyncCallback): void; +- +- /** +- * Obtains the value matching the local device ID and specified key. +- * +- * @param { string } key - Indicates the key. The length must be less than {@code MAX_KEY_LENGTH}. +- * @returns { Promise } +- * {Uint8Array|string|boolean|number}: the returned value specified by the local device ID and specified key. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100004 - Not found. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- get(key: string): Promise; +- +- /** +- * Obtains the value matching a specified device ID and key. +- * +- * @param { string } deviceId - Indicates the device to be queried. +- * @param { string } key - Indicates the key of the value to be queried. The length must be less than {@code MAX_KEY_LENGTH}. +- * @param { AsyncCallback } callback - +- * {boolean | string | number | Uint8Array}: the returned value specified by the deviceId and key. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100004 - Not found. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- get(deviceId: string, key: string, callback: AsyncCallback): void; +- +- /** +- * Obtains the value matching a specified device ID and key. +- * +- * @param { string } deviceId - Indicates the device to be queried. +- * @param { string } key - Indicates the key of the value to be queried. The length must be less than {@code MAX_KEY_LENGTH}. +- * @returns { Promise } +- * {Uint8Array|string|boolean|number}: the returned value specified by the deviceId and key. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100004 - Not found. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- get(deviceId: string, key: string): Promise; +- +- /** +- * Obtains all key-value pairs that match the local device ID and specified key prefix. +- * +- * @param { string } keyPrefix - Indicates the key prefix to match. +- * @param { AsyncCallback } callback - {Entry[]}: the list of all key-value pairs +- * that match the local device ID and specified key prefix. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getEntries(keyPrefix: string, callback: AsyncCallback): void; +- +- /** +- * Obtains all key-value pairs that match the local device ID and specified key prefix. +- * +- * @param { string } keyPrefix - Indicates the key prefix to match. +- * @returns { Promise } {Entry[]}: the list of all key-value pairs that match the +- * local device ID and specified key prefix. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getEntries(keyPrefix: string): Promise; +- +- /** +- * Obtains all key-value pairs matching a specified device ID and key prefix. +- * +- * @param { string } deviceId - Identifies the device whose data is to be queried. +- * @param { string } keyPrefix - Indicates the key prefix to match. +- * @param { AsyncCallback } callback - {Entry[]}: the list of all key-value pairs +- * that match the specified deviceId and key prefix. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- getEntries(deviceId: string, keyPrefix: string, callback: AsyncCallback): void; +- +- /** +- * Obtains all key-value pairs matching a specified device ID and key prefix. +- * +- * @param { string } deviceId - Identifies the device whose data is to be queried. +- * @param { string } keyPrefix - Indicates the key prefix to match. +- * @returns { Promise } {Entry[]}: the list of all key-value pairs that match the +- * specified deviceId and key prefix. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- getEntries(deviceId: string, keyPrefix: string): Promise; +- +- /** +- * Obtains the list of key-value pairs matching the local device ID and specified {@code Query} object. +- * +- * @param { Query } query - Indicates the {@code Query} object. +- * @param { AsyncCallback } callback - {Entry[]}: the list of all key-value pairs +- * matching the local device ID and specified {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getEntries(query: Query, callback: AsyncCallback): void; +- +- /** +- * Obtains the list of key-value pairs matching the local device ID and specified {@code Query} object. +- * +- * @param { Query } query - Indicates the {@code Query} object. +- * @returns { Promise } {Entry[]}: the list of all key-value pairs matching the local device ID and +- * specified {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getEntries(query: Query): Promise; +- +- /** +- * Obtains the list of key-value pairs matching a specified device ID and {@code Query} object. +- * +- * @param { string } deviceId - Indicates the ID of the device to which the key-value pairs belong. +- * @param { Query } query - Indicates the {@code Query} object. +- * @param { AsyncCallback } callback - {Entry[]}: the list of all key-value pairs +- * matching the specified deviceId and {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- getEntries(deviceId: string, query: Query, callback: AsyncCallback): void; +- +- /** +- * Obtains the list of key-value pairs matching a specified device ID and {@code Query} object. +- * +- * @param { string } deviceId - Indicates the ID of the device to which the key-value pairs belong. +- * @param { Query } query - Indicates the {@code Query} object. +- * @returns { Promise } {Entry[]}: the list of all key-value pairs matching the +- * specified deviceId and {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- getEntries(deviceId: string, query: Query): Promise; +- +- /** +- * Obtains the result set with the local device ID and specified prefix from a {@code DeviceKVStore} database. +- * The {@code KVStoreResultSet} object can be used to query all key-value pairs that meet the search criteria. +- * Each {@code DeviceKVStore} instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. +- * If you have created four objects, calling this method will return a failure. Therefore, you are advised to +- * call the closeResultSet method to close unnecessary {@code KVStoreResultSet} objects in a timely manner. +- * +- * @param { string } keyPrefix - Indicates the key prefix to match. +- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the local device ID and specified keyPrefix. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- /** +- * Obtains the result set with the local device ID and specified prefix from a {@code DeviceKVStore} database. +- * The {@code KVStoreResultSet} object can be used to query all key-value pairs that meet the search criteria. +- * Each {@code DeviceKVStore} instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. +- * If you have created four objects, calling this method will return a failure. Therefore, you are advised to +- * call the closeResultSet method to close unnecessary {@code KVStoreResultSet} objects in a timely manner. +- * +- * @param { string } keyPrefix - Indicates the key prefix to match. +- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the local device ID and specified keyPrefix. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100001 - Over max limits. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 10 +- */ +- getResultSet(keyPrefix: string, callback: AsyncCallback): void; +- +- /** +- * Obtains the result set with the local device ID and specified prefix from a {@code DeviceKVStore} database. +- * The {@code KVStoreResultSet} object can be used to query all key-value pairs that meet the search criteria. +- * Each {@code DeviceKVStore} instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. +- * If you have created four objects, calling this method will return a failure. Therefore, you are advised to +- * call the closeResultSet method to close unnecessary {@code KVStoreResultSet} objects in a timely manner. +- * +- * @param { string } keyPrefix - Indicates the key prefix to match. +- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the local device ID and specified keyPrefix. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- /** +- * Obtains the result set with the local device ID and specified prefix from a {@code DeviceKVStore} database. +- * The {@code KVStoreResultSet} object can be used to query all key-value pairs that meet the search criteria. +- * Each {@code DeviceKVStore} instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. +- * If you have created four objects, calling this method will return a failure. Therefore, you are advised to +- * call the closeResultSet method to close unnecessary {@code KVStoreResultSet} objects in a timely manner. +- * +- * @param { string } keyPrefix - Indicates the key prefix to match. +- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the local device ID and specified keyPrefix. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100001 - Over max limits. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 10 +- */ +- getResultSet(keyPrefix: string): Promise; +- +- /** +- * Obtains the {@code KVStoreResultSet} object matching the specified device ID and key prefix. +- *

    The {@code KVStoreResultSet} object can be used to query all key-value pairs that meet the search criteria. Each {@code DeviceKVStore} +- * instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. If you have created four objects, +- * calling this method will return a failure. Therefore, you are advised to call the closeResultSet method to close unnecessary +- * {@code KVStoreResultSet} objects in a timely manner. +- * +- * @param { string } deviceId - Identifies the device whose data is to be queried. +- * @param { string } keyPrefix - Indicates the key prefix to match. +- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified deviceId and keyPrefix. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- /** +- * Obtains the {@code KVStoreResultSet} object matching the specified device ID and key prefix. +- *

    The {@code KVStoreResultSet} object can be used to query all key-value pairs that meet the search criteria. Each {@code DeviceKVStore} +- * instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. If you have created four objects, +- * calling this method will return a failure. Therefore, you are advised to call the closeResultSet method to close unnecessary +- * {@code KVStoreResultSet} objects in a timely manner. +- * +- * @param { string } deviceId - Identifies the device whose data is to be queried. +- * @param { string } keyPrefix - Indicates the key prefix to match. +- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified deviceId and keyPrefix. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100001 - Over max limits. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 10 +- */ +- getResultSet(deviceId: string, keyPrefix: string, callback: AsyncCallback): void; +- +- /** +- * Obtains the {@code KVStoreResultSet} object matching the specified device ID and key prefix. +- *

    The {@code KVStoreResultSet} object can be used to query all key-value pairs that meet the search criteria. Each {@code DeviceKVStore} +- * instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. If you have created four objects, +- * calling this method will return a failure. Therefore, you are advised to call the closeResultSet method to close unnecessary +- * {@code KVStoreResultSet} objects in a timely manner. +- * +- * @param { string } deviceId - Identifies the device whose data is to be queried. +- * @param { string } keyPrefix - Indicates the key prefix to match. +- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified deviceId and keyPrefix. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- /** +- * Obtains the {@code KVStoreResultSet} object matching the specified device ID and key prefix. +- *

    The {@code KVStoreResultSet} object can be used to query all key-value pairs that meet the search criteria. Each {@code DeviceKVStore} +- * instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. If you have created four objects, +- * calling this method will return a failure. Therefore, you are advised to call the closeResultSet method to close unnecessary +- * {@code KVStoreResultSet} objects in a timely manner. +- * +- * @param { string } deviceId - Identifies the device whose data is to be queried. +- * @param { string } keyPrefix - Indicates the key prefix to match. +- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified deviceId and keyPrefix. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100001 - Over max limits. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 10 +- */ +- getResultSet(deviceId: string, keyPrefix: string): Promise; +- +- /** +- * Obtains the {@code KVStoreResultSet} object matching the local device ID and specified {@code Query} object. +- * +- * @param { Query } query - Indicates the {@code Query} object. +- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the local device ID and specified {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- /** +- * Obtains the {@code KVStoreResultSet} object matching the local device ID and specified {@code Query} object. +- * +- * @param { Query } query - Indicates the {@code Query} object. +- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the local device ID and specified {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100001 - Over max limits. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 10 +- */ +- getResultSet(query: Query, callback: AsyncCallback): void; +- +- /** +- * Obtains the {@code KVStoreResultSet} object matching the local device ID and specified {@code Query} object. +- * +- * @param { Query } query - Indicates the {@code Query} object. +- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the local device ID and specified {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- /** +- * Obtains the {@code KVStoreResultSet} object matching the local device ID and specified {@code Query} object. +- * +- * @param { Query } query - Indicates the {@code Query} object. +- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the local device ID and specified {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100001 - Over max limits. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 10 +- */ +- getResultSet(query: Query): Promise; +- +- /** +- * Obtains the {@code KVStoreResultSet} object matching a specified device ID and {@code Query} object. +- * +- * @param { string } deviceId - Indicates the ID of the device to which the {@code KVStoreResultSet} object belongs. +- * @param { Query } query - Indicates the {@code Query} object. +- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified deviceId and {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- /** +- * Obtains the {@code KVStoreResultSet} object matching a specified device ID and {@code Query} object. +- * +- * @param { string } deviceId - Indicates the ID of the device to which the {@code KVStoreResultSet} object belongs. +- * @param { Query } query - Indicates the {@code Query} object. +- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified deviceId and {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100001 - Over max limits. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 10 +- */ +- getResultSet(deviceId: string, query: Query, callback: AsyncCallback): void; +- +- /** +- * Obtains the {@code KVStoreResultSet} object matching a specified device ID and {@code Query} object. +- * +- * @param { string } deviceId - Indicates the ID of the device to which the {@code KVStoreResultSet} object belongs. +- * @param { Query } query - Indicates the {@code Query} object. +- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified deviceId and {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- /** +- * Obtains the {@code KVStoreResultSet} object matching a specified device ID and {@code Query} object. +- * +- * @param { string } deviceId - Indicates the ID of the device to which the {@code KVStoreResultSet} object belongs. +- * @param { Query } query - Indicates the {@code Query} object. +- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified deviceId and {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100001 - Over max limits. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 10 +- */ +- getResultSet(deviceId: string, query: Query): Promise; +- +- /** +- * Obtains the KVStoreResultSet object matching the local device ID and specified predicate object. +- * +- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the datasharePredicates. +- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the local device ID and specified {@code dataSharePredicates.DataSharePredicates} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider +- * @systemapi +- * @StageModelOnly +- * @since 9 +- */ +- /** +- * Obtains the KVStoreResultSet object matching the local device ID and specified predicate object. +- * +- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the datasharePredicates. +- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the local device ID and specified {@code dataSharePredicates.DataSharePredicates} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. +- * @throws { BusinessError } 15100001 - Over max limits. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider +- * @systemapi +- * @StageModelOnly +- * @since 10 +- */ +- getResultSet(predicates: dataSharePredicates.DataSharePredicates, callback: AsyncCallback): void; +- +- /** +- * Obtains the KVStoreResultSet object matching the local device ID and specified predicate object. +- * +- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the datasharePredicates. +- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the local device ID and specified {@code dataSharePredicates.DataSharePredicates} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider +- * @systemapi +- * @StageModelOnly +- * @since 9 +- */ +- /** +- * Obtains the KVStoreResultSet object matching the local device ID and specified predicate object. +- * +- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the datasharePredicates. +- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the local device ID and specified {@code dataSharePredicates.DataSharePredicates} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. +- * @throws { BusinessError } 15100001 - Over max limits. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider +- * @systemapi +- * @StageModelOnly +- * @since 10 +- */ +- getResultSet(predicates: dataSharePredicates.DataSharePredicates): Promise; +- +- /** +- * Obtains the KVStoreResultSet object matching a specified Device ID and Predicate object. +- * +- * @param { string } deviceId Indicates the ID of the device to which the results belong. +- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the dataSharePredicates. +- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified deviceId and {@code dataSharePredicates.DataSharePredicates} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider +- * @systemapi +- * @StageModelOnly +- * @since 9 +- */ +- /** +- * Obtains the KVStoreResultSet object matching a specified Device ID and Predicate object. +- * +- * @param { string } deviceId Indicates the ID of the device to which the results belong. +- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the dataSharePredicates. +- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified deviceId and {@code dataSharePredicates.DataSharePredicates} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. +- * @throws { BusinessError } 15100001 - Over max limits. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider +- * @systemapi +- * @StageModelOnly +- * @since 10 +- */ +- getResultSet( +- deviceId: string, +- predicates: dataSharePredicates.DataSharePredicates, +- callback: AsyncCallback +- ): void; +- +- /** +- * Obtains the KVStoreResultSet object matching a specified Device ID and Predicate object. +- * +- * @param { string } deviceId Indicates the ID of the device to which the results belong. +- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the dataSharePredicates. +- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified deviceId and {@code dataSharePredicates.DataSharePredicates} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider +- * @systemapi +- * @StageModelOnly +- * @since 9 +- */ +- /** +- * Obtains the KVStoreResultSet object matching a specified Device ID and Predicate object. +- * +- * @param { string } deviceId Indicates the ID of the device to which the results belong. +- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the dataSharePredicates. +- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} +- * object matching the specified deviceId and {@code dataSharePredicates.DataSharePredicates} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. +- * @throws { BusinessError } 15100001 - Over max limits. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider +- * @systemapi +- * @StageModelOnly +- * @since 10 +- */ +- getResultSet(deviceId: string, predicates: dataSharePredicates.DataSharePredicates): Promise; +- +- /** +- * Obtains the number of results matching the local device ID and specified {@code Query} object. +- * +- * @param { Query } query - Indicates the {@code Query} object. +- * @param { AsyncCallback } callback - {number}: the number of results matching the +- * local device ID and specified {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getResultSize(query: Query, callback: AsyncCallback): void; +- +- /** +- * Obtains the number of results matching the local device ID and specified {@code Query} object. +- * +- * @param { Query } query - Indicates the {@code Query} object. +- * @returns { Promise } {number}: the number of results matching the local device ID and specified +- * {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getResultSize(query: Query): Promise; +- +- /** +- * Obtains the number of results matching a specified device ID and {@code Query} object. +- * +- * @param { string } deviceId - Indicates the ID of the device to which the results belong. +- * @param { Query } query - Indicates the {@code Query} object. +- * @param { AsyncCallback } callback - {number}: the number of results matching the +- * specified deviceId and {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- getResultSize(deviceId: string, query: Query, callback: AsyncCallback): void; +- +- /** +- * Obtains the number of results matching a specified device ID and {@code Query} object. +- * +- * @param { string } deviceId - Indicates the ID of the device to which the results belong. +- * @param { Query } query - Indicates the {@code Query} object. +- * @returns { Promise } {number}: the number of results matching the specified +- * deviceId and {@code Query} object. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @throws { BusinessError } 15100005 - Database or result set already closed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- getResultSize(deviceId: string, query: Query): Promise; +- } +- +- /** +- * Creates a {@link KVManager} instance based on the configuration information. +- *

    You must pass {@link KVManagerConfig} to provide configuration information +- * to create a {@link KVManager} instance. +- * +- * @param { KVManagerConfig } config - Indicates the KVStore configuration information, +- * including the package name and context, and package name can not be empty. +- * @returns { KVManager } : the {@code KVManager} instance. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- export function createKVManager(config: KVManagerConfig): KVManager; +- +- /** +- * Provides interfaces to manage a {@code SingleKVStore} database, including obtaining, closing, and deleting the {@code SingleKVStore}. +- * +- * @interface KVManager +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- export interface KVManager { +- /** +- * Creates and obtains a KVStore database by specifying {@code Options} and {@code storeId}. +- * +- * @param { string } storeId - Identifies the KVStore database. The value of this parameter must be unique +- * for the same application, and different applications can share the same value. The storeId can consist +- * of only letters, digits, and underscores (_), and cannot exceed 128 characters. +- * @param { Options } options - Indicates the {@code Options} object used for creating and +- * obtaining the KVStore database. +- * @param { AsyncCallback } callback - {T}: the {@code SingleKVStore} or {@code DeviceKVStore} instance. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @throws { BusinessError } 15100002 - Open existed database with changed options. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getKVStore(storeId: string, options: Options, callback: AsyncCallback): void; +- +- /** +- * Creates and obtains a KVStore database by specifying {@code Options} and {@code storeId}. +- * +- * @param { string } storeId - Identifies the KVStore database. The value of this parameter must be unique +- * for the same application, and different applications can share the same value. The storeId can consist +- * of only letters, digits, and underscores (_), and cannot exceed 128 characters. +- * @param { Options } options - Indicates the {@code Options} object used for creating and +- * obtaining the KVStore database. +- * @returns { Promise } {T}: the {@code SingleKVStore} or {@code DeviceKVStore} instance. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @throws { BusinessError } 15100002 - Open existed database with changed options. +- * @throws { BusinessError } 15100003 - Database corrupted. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getKVStore(storeId: string, options: Options): Promise; +- +- /** +- * Closes the KVStore database. +- *

    Warning: This method is not thread-safe. If you call this method to stop a KVStore database that is running, your +- * thread may crash. +- *

    The KVStore database to close must be an object created by using the {@code getKVStore} method. Before using this +- * method, release the resources created for the database, for example, {@code KVStoreResultSet} for KVStore, otherwise +- * closing the database will fail. +- * +- * @param { string } appId - Identifies the application that the database belong to, and cannot exceed 256 characters. +- * @param { string } storeId - Identifies the KVStore database to close. The storeId can consist of only letters, digits, +- * and underscores (_), and cannot exceed 128 characters. +- * @param { AsyncCallback } callback - the callback of closeKVStore. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- closeKVStore(appId: string, storeId: string, callback: AsyncCallback): void; +- +- /** +- * Closes the KVStore database. +- *

    Warning: This method is not thread-safe. If you call this method to stop a KVStore database that is running, your +- * thread may crash. +- *

    The KVStore database to close must be an object created by using the {@code getKVStore} method. Before using this +- * method, release the resources created for the database, for example, {@code KVStoreResultSet} for KVStore, otherwise +- * closing the database will fail. +- * +- * @param { string } appId - Identifies the application that the database belong to, and cannot exceed 256 characters. +- * @param { string } storeId - Identifies the KVStore database to close. The storeId can consist of only letters, digits, +- * and underscores (_), and cannot exceed 128 characters. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- closeKVStore(appId: string, storeId: string): Promise; +- +- /** +- * Deletes the KVStore database identified by storeId. +- *

    Before using this method, close all KVStore instances in use that are identified by the same storeId. +- *

    You can use this method to delete a KVStore database not in use. After the database is deleted, all its data will be +- * lost. +- * +- * @param { string } appId - Identifies the application that the database belong to, and cannot exceed 256 characters. +- * @param { string } storeId - Identifies the KVStore database to delete. The storeId can consist of only letters, digits, +- * and underscores (_), and cannot exceed 128 characters. +- * @param { AsyncCallback } callback - the callback of deleteKVStore. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Parameter verification failed. +- * @throws { BusinessError } 15100004 - Not found. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- deleteKVStore(appId: string, storeId: string, callback: AsyncCallback): void; +- +- /** +- * Deletes the KVStore database identified by storeId. +- *

    Before using this method, close all KVStore instances in use that are identified by the same storeId. +- *

    You can use this method to delete a KVStore database not in use. After the database is deleted, all its data will be +- * lost. +- * +- * @param { string } appId - Identifies the application that the database belong to, and cannot exceed 256 characters. +- * @param { string } storeId - Identifies the KVStore database to delete. The storeId can consist of only letters, digits, +- * and underscores (_), and cannot exceed 128 characters. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Parameter verification failed. +- * @throws { BusinessError } 15100004 - Not found. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- deleteKVStore(appId: string, storeId: string): Promise; +- +- /** +- * Obtains the storeId of all KVStore databases that are created by using the {@code getKVStore} method and not deleted by +- * calling the {@code deleteKVStore} method. +- * +- * @param { string } appId - Identifies the application that obtains the databases, and cannot exceed 256 characters. +- * @param { AsyncCallback } callback - {string[]}: the storeId of all created KVStore databases. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getAllKVStoreId(appId: string, callback: AsyncCallback): void; +- +- /** +- * Obtains the storeId of all KVStore databases that are created by using the {@code getKVStore} method and not deleted by +- * calling the {@code deleteKVStore} method. +- * +- * @param { string } appId - Identifies the application that obtains the databases, and cannot exceed 256 characters. +- * @returns { Promise } {string[]}: the storeId of all created KVStore databases. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified. +- *
    2.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 +- */ +- getAllKVStoreId(appId: string): Promise; +- +- /** +- * Register a death callback to get notification when the data manager service is terminated. +- *

    If the data manager service is terminated,you need to re-subscribe to data change notifications and synchronization +- * completion notifications, and calling the sync method will return a failure. +- * +- * @param { 'distributedDataServiceDie' } event - Subscribed event name, fixed as 'distributedDataServiceDie', as a service status change events. +- * @param { Callback } deathCallback - callback to be invoked when the data manager service is terminated. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- on(event: 'distributedDataServiceDie', deathCallback: Callback): void; +- +- /** +- * Unregister the death callback. Not notification will be received when the data manager service is terminated. +- *

    The unregistered death callback must be a registered death callback of the database. If no death callback parameter +- * is passed, all database death callbacks will be unregistered. +- * +- * @param { 'distributedDataServiceDie' } event - Unsubscribe event name, fixed as 'distributedDataServiceDie', as a service status change events. +- * @param { Callback } deathCallback - the data manager service is terminated callback which has been registered. +- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; +- *
    2.Incorrect parameters types; +- *
    3.Parameter verification failed. +- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 +- */ +- off(event: 'distributedDataServiceDie', deathCallback?: Callback): void; +- } +-} +- +-export default distributedKVStore; +\ No newline at end of file +diff --git a/api/@ohos.data.distributedKVStore.d.ts b/api/@ohos.data.distributedKVStore.d.ts +index c62187db2..7569b6bcb 100644 +--- a/api/@ohos.data.distributedKVStore.d.ts ++++ b/api/@ohos.data.distributedKVStore.d.ts +@@ -28,7 +28,8 @@ import BaseContext from './application/BaseContext'; + * + * @namespace distributedKVStore + * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace distributedKVStore { + /** +@@ -37,7 +38,8 @@ declare namespace distributedKVStore { + * + * @interface KVManagerConfig + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface KVManagerConfig { + /** +@@ -45,7 +47,8 @@ declare namespace distributedKVStore { + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + bundleName: string; + +@@ -54,7 +57,8 @@ declare namespace distributedKVStore { + * + * @syscap SystemCapability.DistributedDataManager.KVStore.Core + * if swap the area, you should close all the KV store and use the new Context to create the KVManager +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + /** + * Indicates the ability or hap context +@@ -62,7 +66,8 @@ declare namespace distributedKVStore { + * @type { BaseContext } + * @syscap SystemCapability.DistributedDataManager.KVStore.Core + * if swap the area, you should close all the KV store and use the new BaseContext to create the KVManager +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + context: BaseContext; + } +@@ -368,14 +373,16 @@ declare namespace distributedKVStore { + * + * @enum { number } + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum KVStoreType { + /** + * Device-collaboration database, as specified by {@code DeviceKVStore} + * + * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DEVICE_COLLABORATION, + +@@ -383,7 +390,8 @@ declare namespace distributedKVStore { + * Single-version database, as specified by {@code SingleKVStore} + * + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SINGLE_VERSION + } +@@ -393,7 +401,8 @@ declare namespace distributedKVStore { + * + * @enum { number } + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum SecurityLevel { + /** +@@ -401,7 +410,8 @@ declare namespace distributedKVStore { + * There are some low impact when the data is leaked. + * + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + S1, + +@@ -410,7 +420,8 @@ declare namespace distributedKVStore { + * There are some major impact when the data is leaked. + * + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + S2, + +@@ -419,7 +430,8 @@ declare namespace distributedKVStore { + * There are some severity impact when the data is leaked. + * + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + S3, + +@@ -428,7 +440,8 @@ declare namespace distributedKVStore { + * There are some critical impact when the data is leaked. + * + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + S4 + } +@@ -438,7 +451,8 @@ declare namespace distributedKVStore { + * + * @interface Options + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Options { + /** +@@ -446,7 +460,8 @@ declare namespace distributedKVStore { + * + * @type { ?boolean } + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + createIfMissing?: boolean; + +@@ -455,7 +470,8 @@ declare namespace distributedKVStore { + * + * @type { ?boolean } + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + encrypt?: boolean; + +@@ -464,7 +480,8 @@ declare namespace distributedKVStore { + * + * @type { ?boolean } + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + backup?: boolean; + +@@ -474,7 +491,8 @@ declare namespace distributedKVStore { + * @permission ohos.permission.DISTRIBUTED_DATASYNC + * @type { ?boolean } + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + autoSync?: boolean; + +@@ -483,7 +501,8 @@ declare namespace distributedKVStore { + * + * @type { ?KVStoreType } + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + kvStoreType?: KVStoreType; + +@@ -492,7 +511,8 @@ declare namespace distributedKVStore { + * + * @type { SecurityLevel } + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * arkts 1.1&1.2 + */ + securityLevel: SecurityLevel; + +@@ -501,7 +521,8 @@ declare namespace distributedKVStore { + * + * @type { ?Schema } + * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + schema?: Schema; + } +@@ -511,7 +532,8 @@ declare namespace distributedKVStore { + * You can set the schema object in options when create or open the database. + * + * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class Schema { + /** +@@ -566,7 +588,8 @@ declare namespace distributedKVStore { + *

    The leaf node must have a value; the non-leaf node must have a child {@code FieldNode}. + * + * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class FieldNode { + /** +@@ -1163,7 +1186,8 @@ declare namespace distributedKVStore { + * @throws { BusinessError } 15100005 - Database or result set already closed. + * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + put(key: string, value: Uint8Array | string | number | boolean, callback: AsyncCallback): void; + +@@ -1198,7 +1222,8 @@ declare namespace distributedKVStore { + * @throws { BusinessError } 15100005 - Database or result set already closed. + * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + put(key: string, value: Uint8Array | string | number | boolean): Promise; + +@@ -1551,7 +1576,8 @@ declare namespace distributedKVStore { + * @throws { BusinessError } 15100004 - Not found. + * @throws { BusinessError } 15100005 - Database or result set already closed. + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + get(key: string, callback: AsyncCallback): void; + +@@ -1568,7 +1594,8 @@ declare namespace distributedKVStore { + * @throws { BusinessError } 15100004 - Not found. + * @throws { BusinessError } 15100005 - Database or result set already closed. + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + get(key: string): Promise; + +@@ -1898,7 +1925,8 @@ declare namespace distributedKVStore { + *
    2.Parameter verification failed. + * @throws { BusinessError } 15100005 - Database or result set already closed. + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + backup(file: string, callback: AsyncCallback): void; + +@@ -1912,7 +1940,8 @@ declare namespace distributedKVStore { + *
    2.Parameter verification failed. + * @throws { BusinessError } 15100005 - Database or result set already closed. + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + backup(file: string): Promise; + +@@ -2296,7 +2325,8 @@ declare namespace distributedKVStore { + * @throws { BusinessError } 15100004 - Not found. + * @throws { BusinessError } 15100005 - Database or result set already closed. + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + get(key: string, callback: AsyncCallback): void; + +@@ -2313,7 +2343,8 @@ declare namespace distributedKVStore { + * @throws { BusinessError } 15100004 - Not found. + * @throws { BusinessError } 15100005 - Database or result set already closed. + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + get(key: string): Promise; + +@@ -2331,7 +2362,8 @@ declare namespace distributedKVStore { + * @throws { BusinessError } 15100004 - Not found. + * @throws { BusinessError } 15100005 - Database or result set already closed. + * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + get(deviceId: string, key: string, callback: AsyncCallback): void; + +@@ -2349,7 +2381,8 @@ declare namespace distributedKVStore { + * @throws { BusinessError } 15100004 - Not found. + * @throws { BusinessError } 15100005 - Database or result set already closed. + * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + get(deviceId: string, key: string): Promise; + +@@ -2972,7 +3005,8 @@ declare namespace distributedKVStore { + *
    2.Incorrect parameters types; + *
    3.Parameter verification failed. + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function createKVManager(config: KVManagerConfig): KVManager; + +@@ -2981,14 +3015,15 @@ declare namespace distributedKVStore { + * + * @interface KVManager + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface KVManager { + /** + * Creates and obtains a KVStore database by specifying {@code Options} and {@code storeId}. + * + * @param { string } storeId - Identifies the KVStore database. The value of this parameter must be unique +- * for the same application, and different applications can share the same value. The storeId can consist ++ * for the same application, and different applications can share the same value. The storeId can consist + * of only letters, digits, and underscores (_), and cannot exceed 128 characters. + * @param { Options } options - Indicates the {@code Options} object used for creating and + * obtaining the KVStore database. +@@ -2999,7 +3034,8 @@ declare namespace distributedKVStore { + * @throws { BusinessError } 15100002 - Open existed database with changed options. + * @throws { BusinessError } 15100003 - Database corrupted. + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getKVStore(storeId: string, options: Options, callback: AsyncCallback): void; + +@@ -3007,7 +3043,7 @@ declare namespace distributedKVStore { + * Creates and obtains a KVStore database by specifying {@code Options} and {@code storeId}. + * + * @param { string } storeId - Identifies the KVStore database. The value of this parameter must be unique +- * for the same application, and different applications can share the same value. The storeId can consist ++ * for the same application, and different applications can share the same value. The storeId can consist + * of only letters, digits, and underscores (_), and cannot exceed 128 characters. + * @param { Options } options - Indicates the {@code Options} object used for creating and + * obtaining the KVStore database. +@@ -3018,7 +3054,8 @@ declare namespace distributedKVStore { + * @throws { BusinessError } 15100002 - Open existed database with changed options. + * @throws { BusinessError } 15100003 - Database corrupted. + * @syscap SystemCapability.DistributedDataManager.KVStore.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getKVStore(storeId: string, options: Options): Promise; + +@@ -3138,6 +3175,7 @@ declare namespace distributedKVStore { + on(event: 'distributedDataServiceDie', deathCallback: Callback): void; + + /** ++ * Unregister the death callback. Not notification will be received when the data manager service is terminated. + * Unregister the death callback. Not notification will be received when the data manager service is terminated. + *

    The unregistered death callback must be a registered death callback of the database. If no death callback parameter + * is passed, all database death callbacks will be unregistered. +diff --git a/api/@ohos.data.preferences.d.ts b/api/@ohos.data.preferences.d.ts +index e7ef45815..68f281e1f 100644 +--- a/api/@ohos.data.preferences.d.ts ++++ b/api/@ohos.data.preferences.d.ts +@@ -113,7 +113,8 @@ declare namespace preferences { + * @syscap SystemCapability.DistributedDataManager.Preferences.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const MAX_KEY_LENGTH: number; + +@@ -147,7 +148,8 @@ declare namespace preferences { + * @syscap SystemCapability.DistributedDataManager.Preferences.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const MAX_VALUE_LENGTH: number; + +@@ -157,7 +159,8 @@ declare namespace preferences { + * @enum { number } + * @syscap SystemCapability.DistributedDataManager.Preferences.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum StorageType { + /** +@@ -165,7 +168,8 @@ declare namespace preferences { + * + * @syscap SystemCapability.DistributedDataManager.Preferences.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + XML = 0, + +@@ -174,7 +178,8 @@ declare namespace preferences { + * + * @syscap SystemCapability.DistributedDataManager.Preferences.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + GSKV + } +@@ -242,7 +247,8 @@ declare namespace preferences { + * @type { ?(StorageType | null | undefined) } + * @syscap SystemCapability.DistributedDataManager.Preferences.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + storageType?: StorageType | null | undefined; + } +@@ -1802,7 +1808,8 @@ declare namespace preferences { + * @syscap SystemCapability.DistributedDataManager.Preferences.Core + * @crossplatform + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + flushSync(): void; + +@@ -1841,7 +1848,8 @@ declare namespace preferences { + * @syscap SystemCapability.DistributedDataManager.Preferences.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'change', callback: Callback): void; + +@@ -1869,7 +1877,8 @@ declare namespace preferences { + * @throws { BusinessError } 15500019 - Failed to obtain the subscription service. + * @syscap SystemCapability.DistributedDataManager.Preferences.Core + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'multiProcessChange', callback: Callback): void; + +@@ -1885,7 +1894,8 @@ declare namespace preferences { + * @throws { BusinessError } 15500000 - Inner error. + * @syscap SystemCapability.DistributedDataManager.Preferences.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'dataChange', keys: Array, callback: Callback>): void; + +@@ -1924,7 +1934,8 @@ declare namespace preferences { + * @syscap SystemCapability.DistributedDataManager.Preferences.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'change', callback?: Callback): void; + +@@ -1950,7 +1961,8 @@ declare namespace preferences { + * @throws { BusinessError } 15500000 - Inner error. + * @syscap SystemCapability.DistributedDataManager.Preferences.Core + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'multiProcessChange', callback?: Callback): void; + +@@ -1966,7 +1978,8 @@ declare namespace preferences { + * @throws { BusinessError } 15500000 - Inner error. + * @syscap SystemCapability.DistributedDataManager.Preferences.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'dataChange', keys: Array, callback?: Callback>): void; + } +diff --git a/api/@ohos.data.relationalStore.d.ts b/api/@ohos.data.relationalStore.d.ts +index e1d3b94b0..87880840f 100644 +--- a/api/@ohos.data.relationalStore.d.ts ++++ b/api/@ohos.data.relationalStore.d.ts +@@ -1703,7 +1703,8 @@ declare namespace relationalStore { + * @enum { number } + * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core + * @crossplatform +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum ColumnType { + /** +@@ -1711,7 +1712,8 @@ declare namespace relationalStore { + * + * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core + * @crossplatform +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NULL, + +@@ -1722,7 +1724,8 @@ declare namespace relationalStore { + * + * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core + * @crossplatform +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INTEGER, + +@@ -1731,7 +1734,8 @@ declare namespace relationalStore { + * + * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core + * @crossplatform +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + REAL, + +@@ -1740,7 +1744,8 @@ declare namespace relationalStore { + * + * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core + * @crossplatform +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TEXT, + +@@ -1749,7 +1754,8 @@ declare namespace relationalStore { + * + * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core + * @crossplatform +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BLOB, + +@@ -1758,7 +1764,8 @@ declare namespace relationalStore { + * + * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core + * @crossplatform +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ASSET, + +@@ -1767,7 +1774,8 @@ declare namespace relationalStore { + * + * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core + * @crossplatform +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ASSETS, + +@@ -1776,7 +1784,8 @@ declare namespace relationalStore { + * + * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core + * @crossplatform +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FLOAT_VECTOR, + +@@ -1785,7 +1794,8 @@ declare namespace relationalStore { + * + * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core + * @crossplatform +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + UNLIMITED_INT, + } +@@ -2943,7 +2953,8 @@ declare namespace relationalStore { + * @throws { BusinessError } 14800034 - SQLite: Library used incorrectly. + * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core + * @crossplatform +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getColumnType(columnIdentifier: number | string): Promise; + +@@ -2976,7 +2987,8 @@ declare namespace relationalStore { + * @throws { BusinessError } 14800034 - SQLite: Library used incorrectly. + * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core + * @crossplatform +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getColumnTypeSync(columnIdentifier: number | string): ColumnType; + +diff --git a/api/@ohos.data.sendableRelationalStore.d.ets b/api/@ohos.data.sendableRelationalStore.d.ets +index f626f6eb4..b354d0419 100644 +--- a/api/@ohos.data.sendableRelationalStore.d.ets ++++ b/api/@ohos.data.sendableRelationalStore.d.ets +@@ -18,6 +18,7 @@ + * @kit ArkData + */ + ++import collections from '../arkts/@arkts.collections'; + import lang from '../arkts/@arkts.lang'; + import relationalStore from './@ohos.data.relationalStore'; + +@@ -98,31 +99,31 @@ declare namespace sendableRelationalStore { + /** + * Defines multiple assets in a column. + * +- * @typedef { Array } Assets ++ * @typedef { collections.Array } Assets + * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core + * @since 12 + */ +- type Assets = Array; ++ type Assets = collections.Array; + + /** + * Defines the types of the value in a KV pair. + * +- * @typedef { null | number | string | boolean | Uint8Array | Asset | Assets | +- * Float32Array | bigint } ValueType ++ * @typedef { null | number | string | boolean | collections.Uint8Array | Asset | Assets | ++ * collections.Float32Array | bigint } ValueType + * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core + * @since 12 + */ +- type ValueType = null | number | string | boolean | Uint8Array | Asset | Assets | +- Float32Array | bigint; ++ type ValueType = null | number | string | boolean | collections.Uint8Array | Asset | Assets | ++ collections.Float32Array | bigint; + + /** + * Defines the data stored in KV pairs in a ValuesBucket object. + * +- * @typedef { Map } ValuesBucket ++ * @typedef { collections.Map } ValuesBucket + * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core + * @since 12 + */ +- type ValuesBucket = Map; ++ type ValuesBucket = collections.Map; + + /** + * Defines NonSendableBucket for convenience. +@@ -196,4 +197,4 @@ declare namespace sendableRelationalStore { + function toSendableAsset(asset: NonSendableAsset): Asset; + } + +-export default sendableRelationalStore; ++export default sendableRelationalStore; +\ No newline at end of file +diff --git a/api/@ohos.data.unifiedDataChannel.d.ts b/api/@ohos.data.unifiedDataChannel.d.ts +index aec114e79..5ff539649 100644 +--- a/api/@ohos.data.unifiedDataChannel.d.ts ++++ b/api/@ohos.data.unifiedDataChannel.d.ts +@@ -53,24 +53,21 @@ declare namespace unifiedDataChannel { + * @enum { number } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + enum ShareOptions { + /** + * IN_APP indicates that only use in the same app is allowed. + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + IN_APP, + /** + * CROSS_APP indicates that use in any app in this device is allowed. + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + CROSS_APP + } +@@ -83,8 +80,7 @@ declare namespace unifiedDataChannel { + * @returns { UnifiedData } Return the UnifiedData required. + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + type GetDelayData = (type: string) => UnifiedData; + +@@ -111,8 +107,7 @@ declare namespace unifiedDataChannel { + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + class UnifiedDataProperties { + /** +@@ -120,8 +115,7 @@ declare namespace unifiedDataChannel { + * @type { ?Record } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + extras?: Record; + +@@ -130,8 +124,7 @@ declare namespace unifiedDataChannel { + * @type { ?string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + tag?: string; + /** +@@ -140,8 +133,7 @@ declare namespace unifiedDataChannel { + * @readonly + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + readonly timestamp?: Date; + /** +@@ -150,8 +142,7 @@ declare namespace unifiedDataChannel { + * @type { ?ShareOptions } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + shareOptions?: ShareOptions; + +@@ -160,8 +151,7 @@ declare namespace unifiedDataChannel { + * @type { ?GetDelayData } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + getDelayData?: GetDelayData; + } +@@ -441,7 +431,8 @@ declare namespace unifiedDataChannel { + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getType(): string; + +@@ -506,7 +497,8 @@ declare namespace unifiedDataChannel { + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getValue(): ValueType; + +@@ -579,7 +571,8 @@ declare namespace unifiedDataChannel { + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class Text extends UnifiedRecord { + /** +@@ -606,92 +599,85 @@ declare namespace unifiedDataChannel { + * @since 14 + */ + details?: Record; +- } + +- /** +- * Describe the unified plain text data +- * +- * @extends Text +- * @syscap SystemCapability.DistributedDataManager.UDMF.Core +- * @since 10 +- */ +- /** +- * Describe the unified plain text data +- * +- * @extends Text +- * @syscap SystemCapability.DistributedDataManager.UDMF.Core +- * @atomicservice +- * @since 11 +- */ +- /** +- * Describe the unified plain text data +- * +- * @extends Text +- * @syscap SystemCapability.DistributedDataManager.UDMF.Core +- * @crossplatform +- * @atomicservice +- * @since 14 +- */ +- class PlainText extends Text { + /** +- * Indicates the content of text ++ * Indicates the details of unified text + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the content of text ++ * Indicates the details of unified text + * +- * @type { string } ++ * @type { ?Record } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** +- * Indicates the content of text ++ * Indicates the details of unified text + * +- * @type { string } ++ * @type { ?Record } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ +- textContent: string; + /** +- * Indicates the abstract of text ++ * Indicates the details of unified text ++ * ++ * @returns { Record | undefined } the details of unified text ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get details(): Record | undefined; ++ ++ /** ++ * Indicates the details of unified text + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the abstract of text ++ * Indicates the details of unified text + * +- * @type { ?string } ++ * @type { ?Record } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** +- * Indicates the abstract of text ++ * Indicates the details of unified text + * +- * @type { ?string } ++ * @type { ?Record } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ +- abstract?: string; ++ /** ++ * Indicates the details of unified text ++ * ++ * @param { Record } the details of unified text ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set details(value: Record); + } + + /** +- * Describe the unified link data ++ * Describe the unified plain text data + * + * @extends Text + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Describe the unified link data ++ * Describe the unified plain text data + * + * @extends Text + * @syscap SystemCapability.DistributedDataManager.UDMF.Core +@@ -699,23 +685,24 @@ declare namespace unifiedDataChannel { + * @since 11 + */ + /** +- * Describe the unified link data ++ * Describe the unified plain text data + * + * @extends Text + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- class Hyperlink extends Text { ++ class PlainText extends Text { + /** +- * Indicates the url of a link ++ * Indicates the content of text + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the url of a link ++ * Indicates the content of text + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core +@@ -723,7 +710,7 @@ declare namespace unifiedDataChannel { + * @since 11 + */ + /** +- * Indicates the url of a link ++ * Indicates the content of text + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core +@@ -731,66 +718,50 @@ declare namespace unifiedDataChannel { + * @atomicservice + * @since 14 + */ +- url: string; ++ textContent: string; ++ + /** +- * Indicates the description of a link ++ * Indicates the content of text + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the description of a link ++ * Indicates the content of text + * +- * @type { ?string } ++ * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** +- * Indicates the description of a link ++ * Indicates the content of text + * +- * @type { ?string } ++ * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ +- description?: string; +- } ++ /** ++ * Indicates the content of text ++ * ++ * @returns { string } the content of text ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get textContent(): string; + +- /** +- * Describe the unified html data +- * +- * @extends Text +- * @syscap SystemCapability.DistributedDataManager.UDMF.Core +- * @since 10 +- */ +- /** +- * Describe the unified html data +- * +- * @extends Text +- * @syscap SystemCapability.DistributedDataManager.UDMF.Core +- * @atomicservice +- * @since 11 +- */ +- /** +- * Describe the unified html data +- * +- * @extends Text +- * @syscap SystemCapability.DistributedDataManager.UDMF.Core +- * @crossplatform +- * @atomicservice +- * @since 14 +- */ +- class HTML extends Text { + /** +- * Indicates the content of html, with html tags ++ * Indicates the content of text + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the content of html, with html tags ++ * Indicates the content of text + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core +@@ -798,7 +769,7 @@ declare namespace unifiedDataChannel { + * @since 11 + */ + /** +- * Indicates the content of html, with html tags ++ * Indicates the content of text + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core +@@ -806,15 +777,25 @@ declare namespace unifiedDataChannel { + * @atomicservice + * @since 14 + */ +- htmlContent: string; + /** +- * Indicates the plain content of html ++ * Indicates the content of text ++ * ++ * @param { string } the content of text ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set textContent(value: string); ++ ++ /** ++ * Indicates the abstract of text + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the plain content of html ++ * Indicates the abstract of text + * + * @type { ?string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core +@@ -822,7 +803,7 @@ declare namespace unifiedDataChannel { + * @since 11 + */ + /** +- * Indicates the plain content of html ++ * Indicates the abstract of text + * + * @type { ?string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core +@@ -830,68 +811,90 @@ declare namespace unifiedDataChannel { + * @atomicservice + * @since 14 + */ +- plainContent?: string; ++ abstract?: string; ++ ++ /** ++ * Indicates the abstract of text ++ * ++ * @returns { string | undefined } the abstract of text ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get textAbstract(): string | undefined; ++ ++ /** ++ * Indicates the abstract of text ++ * ++ * @param { string } the abstract of text ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set textAbstract(value: string); + } + + /** +- * Describe the unified file data ++ * Describe the unified link data + * +- * @extends UnifiedRecord ++ * @extends Text + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Describe the unified file data ++ * Describe the unified link data + * +- * @extends UnifiedRecord ++ * @extends Text + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** +- * Describe the unified file data ++ * Describe the unified link data + * +- * @extends UnifiedRecord ++ * @extends Text + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- class File extends UnifiedRecord { ++ class Hyperlink extends Text { + /** +- * Indicates the details of unified File ++ * Indicates the url of a link + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the details of unified File ++ * Indicates the url of a link + * +- * @type { ?Record } ++ * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** +- * Indicates the details of unified File ++ * Indicates the url of a link + * +- * @type { ?Record } ++ * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'14', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 14 + */ +- details?: Record; ++ url: string; ++ + /** +- * Indicates the uri of file ++ * Indicates the url of a link + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the uri of file ++ * Indicates the url of a link + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core +@@ -899,52 +902,33 @@ declare namespace unifiedDataChannel { + * @since 11 + */ + /** +- * Indicates the uri of file ++ * Indicates the url of a link + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'14', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 14 + */ +- uri: string; +- } ++ /** ++ * Indicates the url of a link ++ * ++ * @returns { string } the url of a link ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get url(): string; + +- /** +- * Describe the unified image data +- * +- * @extends File +- * @syscap SystemCapability.DistributedDataManager.UDMF.Core +- * @since 10 +- */ +- /** +- * Describe the unified image data +- * +- * @extends File +- * @syscap SystemCapability.DistributedDataManager.UDMF.Core +- * @atomicservice +- * @since 11 +- */ +- /** +- * Describe the unified image data +- * +- * @extends File +- * @syscap SystemCapability.DistributedDataManager.UDMF.Core +- * @crossplatform +- * @atomicservice +- * @since arkts {'1.1':'14', '1.2':'20'} +- * @arkts 1.1&1.2 +- */ +- class Image extends File { + /** +- * Indicates the uri of image ++ * Indicates the url of a link + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the uri of image ++ * Indicates the url of a link + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core +@@ -952,52 +936,153 @@ declare namespace unifiedDataChannel { + * @since 11 + */ + /** +- * Indicates the uri of image ++ * Indicates the url of a link + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'14', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 14 + */ +- imageUri: string; ++ /** ++ * Indicates the url of a link ++ * ++ * @param { string } the url of a link ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set url(value: string); ++ ++ /** ++ * Indicates the description of a link ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the description of a link ++ * ++ * @type { ?string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the description of a link ++ * ++ * @type { ?string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ description?: string; ++ ++ /** ++ * Indicates the description of a link ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the description of a link ++ * ++ * @type { ?string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the description of a link ++ * ++ * @type { ?string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ /** ++ * Indicates the description of a link ++ * ++ * @returns { string | undefined } the description of a link. ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get description(): string | undefined; ++ ++ /** ++ * Indicates the description of a link. ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the description of a link ++ * ++ * @type { ?string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the description of a link ++ * ++ * @type { ?string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ /** ++ * Indicates the description of a link ++ * ++ * @param { string } the description of a link ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set description(value: string); + } + + /** +- * Describe the unified video data ++ * Describe the unified html data + * +- * @extends File ++ * @extends Text + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Describe the unified video data ++ * Describe the unified html data + * +- * @extends File ++ * @extends Text + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** +- * Describe the unified video data ++ * Describe the unified html data + * +- * @extends File ++ * @extends Text + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- class Video extends File { ++ class HTML extends Text { + /** +- * Indicates the uri of video ++ * Indicates the content of html, with html tags + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the uri of video ++ * Indicates the content of html, with html tags + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core +@@ -1005,51 +1090,24 @@ declare namespace unifiedDataChannel { + * @since 11 + */ + /** +- * Indicates the uri of video ++ * Indicates the content of html, with html tags + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'14', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 14 + */ +- videoUri: string; +- } ++ htmlContent: string; + +- /** +- * Describe the unified audio data +- * +- * @extends File +- * @syscap SystemCapability.DistributedDataManager.UDMF.Core +- * @since 10 +- */ +- /** +- * Describe the unified audio data +- * +- * @extends File +- * @syscap SystemCapability.DistributedDataManager.UDMF.Core +- * @atomicservice +- * @since 11 +- */ +- /** +- * Describe the unified audio data +- * +- * @extends File +- * @syscap SystemCapability.DistributedDataManager.UDMF.Core +- * @crossplatform +- * @atomicservice +- * @since 14 +- */ +- class Audio extends File { + /** +- * Indicates the uri of audio ++ * Indicates the content of html, with html tags + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the uri of audio ++ * Indicates the content of html, with html tags + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core +@@ -1057,7 +1115,7 @@ declare namespace unifiedDataChannel { + * @since 11 + */ + /** +- * Indicates the uri of audio ++ * Indicates the content of html, with html tags + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core +@@ -1065,42 +1123,25 @@ declare namespace unifiedDataChannel { + * @atomicservice + * @since 14 + */ +- audioUri: string; +- } ++ /** ++ * Indicates the content of html, with html tags ++ * ++ * @returns { string } the content of html ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get htmlContent(): string; + +- /** +- * Describe the unified folder data +- * +- * @extends File +- * @syscap SystemCapability.DistributedDataManager.UDMF.Core +- * @since 10 +- */ +- /** +- * Describe the unified folder data +- * +- * @extends File +- * @syscap SystemCapability.DistributedDataManager.UDMF.Core +- * @atomicservice +- * @since 11 +- */ +- /** +- * Describe the unified folder data +- * +- * @extends File +- * @syscap SystemCapability.DistributedDataManager.UDMF.Core +- * @crossplatform +- * @atomicservice +- * @since 14 +- */ +- class Folder extends File { + /** +- * Indicates the uri of folder ++ * Indicates the content of html, with html tags + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the uri of folder ++ * Indicates the content of html, with html tags + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core +@@ -1108,7 +1149,7 @@ declare namespace unifiedDataChannel { + * @since 11 + */ + /** +- * Indicates the uri of folder ++ * Indicates the content of html, with html tags + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core +@@ -1116,232 +1157,1607 @@ declare namespace unifiedDataChannel { + * @atomicservice + * @since 14 + */ +- folderUri: string; +- } ++ /** ++ * Indicates the content of html, with html tags ++ * ++ * @param { string } the content of html ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set htmlContent(value: string); + +- /** +- * Describe system defined type data(this kind of data is provided and bound to OpenHarmony, +- * also can be parsed by system provided API) +- * +- * @extends UnifiedRecord +- * @syscap SystemCapability.DistributedDataManager.UDMF.Core +- * @since 10 +- */ +- /** +- * Describe system defined type data(this kind of data is provided and bound to OpenHarmony, +- * also can be parsed by system provided API) +- * +- * @extends UnifiedRecord +- * @syscap SystemCapability.DistributedDataManager.UDMF.Core +- * @atomicservice +- * @since 11 +- */ +- class SystemDefinedRecord extends UnifiedRecord { + /** +- * Indicates the details of system defined data ++ * Indicates the plain content of html + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the details of system defined data ++ * Indicates the plain content of html + * +- * @type { ?Record } ++ * @type { ?string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ +- details?: Record; +- } ++ /** ++ * Indicates the plain content of html ++ * ++ * @type { ?string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ plainContent?: string; + +- /** +- * Describe system defined form data(this kind of data is provided and bound to OpenHarmony, +- * also can be parsed by system provided API) +- * +- * @extends SystemDefinedRecord +- * @syscap SystemCapability.DistributedDataManager.UDMF.Core +- * @since 10 +- */ +- /** +- * Describe system defined form data(this kind of data is provided and bound to OpenHarmony, ++ /** ++ * Indicates the plain content of html ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the plain content of html ++ * ++ * @type { ?string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the plain content of html ++ * ++ * @type { ?string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ /** ++ * Indicates the plain content of html ++ * ++ * @returns { string | undefined } the plain content of html ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get plainContent(): string | undefined; ++ ++ /** ++ * Indicates the plain content of html ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the plain content of html ++ * ++ * @type { ?string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the plain content of html ++ * ++ * @type { ?string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ /** ++ * Indicates the plain content of html ++ * ++ * @param { string } the plain content of html ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set plainContent(value: string); ++ } ++ ++ /** ++ * Describe the unified file data ++ * ++ * @extends UnifiedRecord ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Describe the unified file data ++ * ++ * @extends UnifiedRecord ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Describe the unified file data ++ * ++ * @extends UnifiedRecord ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ class File extends UnifiedRecord { ++ /** ++ * Indicates the details of unified File ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the details of unified File ++ * ++ * @type { ?Record } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the details of unified File ++ * ++ * @type { ?Record } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ details?: Record; ++ ++ /** ++ * Indicates the details of unified File ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the details of unified File ++ * ++ * @type { ?Record } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the details of unified File ++ * ++ * @type { ?Record } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ /** ++ * Indicates the details of unified File ++ * ++ * @returns { Record | undefined } the details of unified File ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get details(): Record | undefined; ++ ++ /** ++ * Indicates the details of unified File ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the details of unified File ++ * ++ * @type { ?Record } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the details of unified File ++ * ++ * @type { ?Record } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ /** ++ * Indicates the details of unified File ++ * ++ * @param { Record } the details of unified File ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set details(value: Record); ++ ++ /** ++ * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ uri: string; ++ ++ /** ++ * Indicates the uri of file ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the uri of file ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the uri of file ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ /** ++ * Indicates the uri of file ++ * ++ * @returns { string } the uri of file ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get uri(): string; ++ ++ /** ++ * Indicates the uri of file ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the uri of file ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the uri of file ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ /** ++ * Indicates the uri of file ++ * ++ * @param { string } the uri of file ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set uri(value: string); ++ } ++ ++ /** ++ * Describe the unified image data ++ * ++ * @extends File ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Describe the unified image data ++ * ++ * @extends File ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Describe the unified image data ++ * ++ * @extends File ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ class Image extends File { ++ /** ++ * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ imageUri: string; ++ ++ /** ++ * Indicates the uri of image ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the uri of image ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the uri of image ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ /** ++ * Indicates the uri of image ++ * ++ * @returns { string } the uri of image ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get imageUri(): string; ++ ++ /** ++ * Indicates the uri of image ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the uri of image ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the uri of image ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ /** ++ * Indicates the uri of image ++ * ++ * @param { string } the uri of image ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set imageUri(value: string); ++ } ++ ++ /** ++ * Describe the unified video data ++ * ++ * @extends File ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Describe the unified video data ++ * ++ * @extends File ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Describe the unified video data ++ * ++ * @extends File ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ class Video extends File { ++ /** ++ * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ videoUri: string; ++ ++ /** ++ * Indicates the uri of video ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the uri of video ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the uri of video ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ /** ++ * Indicates the uri of video ++ * ++ * @returns { string } the uri of video ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get videoUri(): string; ++ ++ /** ++ * Indicates the uri of video ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the uri of video ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the uri of video ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ /** ++ * Indicates the uri of video ++ * ++ * @param { string } the uri of video ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set videoUri(value: string); ++ } ++ ++ /** ++ * Describe the unified audio data ++ * ++ * @extends File ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Describe the unified audio data ++ * ++ * @extends File ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Describe the unified audio data ++ * ++ * @extends File ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ class Audio extends File { ++ /** ++ * URI of the local audio or online audio. The local audio URI can be obtained using the getUriFromPath function. ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * URI of the local audio or online audio. The local audio URI can be obtained using the getUriFromPath function. ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * URI of the local audio or online audio. The local audio URI can be obtained using the getUriFromPath function. ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ audioUri: string; ++ ++ /** ++ * Indicates the uri of audio ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the uri of audio ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the uri of audio ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ /** ++ * Indicates the uri of audio ++ * ++ * @returns { string } the uri of audio ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get audioUri(): string; ++ ++ /** ++ * Indicates the uri of audio ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the uri of audio ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the uri of audio ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ /** ++ * Indicates the uri of audio ++ * ++ * @param { string } the uri of audio ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set audioUri(value: string); ++ } ++ ++ /** ++ * Describe the unified folder data ++ * ++ * @extends File ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Describe the unified folder data ++ * ++ * @extends File ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Describe the unified folder data ++ * ++ * @extends File ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ class Folder extends File { ++ /** ++ * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ folderUri: string; ++ ++ /** ++ * Indicates the uri of folder ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the uri of folder ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the uri of folder ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ /** ++ * Indicates the uri of folder ++ * ++ * @returns { string } the uri of folder ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get folderUri(): string; ++ ++ /** ++ * Indicates the uri of folder ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the uri of folder ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the uri of folder ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 14 ++ */ ++ /** ++ * Indicates the uri of folder ++ * ++ * @param { string } the uri of folder ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set folderUri(value: string); ++ } ++ ++ /** ++ * Describe system defined type data(this kind of data is provided and bound to OpenHarmony, ++ * also can be parsed by system provided API) ++ * ++ * @extends UnifiedRecord ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Describe system defined type data(this kind of data is provided and bound to OpenHarmony, ++ * also can be parsed by system provided API) ++ * ++ * @extends UnifiedRecord ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ class SystemDefinedRecord extends UnifiedRecord { ++ /** ++ * Indicates the details of system defined data ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the details of system defined data ++ * ++ * @type { ?Record } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ details?: Record; ++ ++ /** ++ * Indicates the details of system defined data ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the details of system defined data ++ * ++ * @type { ?Record } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the details of system defined data ++ * ++ * @returns { Record | undefined } the details of system defined data ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get details(): Record | undefined; ++ ++ /** ++ * Indicates the details of system defined data ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the details of system defined data ++ * ++ * @type { ?Record } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the details of system defined data ++ * ++ * @param { Record } the details of system defined data ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set details(value: Record); ++ } ++ ++ /** ++ * Describe system defined form data(this kind of data is provided and bound to OpenHarmony, ++ * also can be parsed by system provided API) ++ * ++ * @extends SystemDefinedRecord ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Describe system defined form data(this kind of data is provided and bound to OpenHarmony, ++ * also can be parsed by system provided API) ++ * ++ * @extends SystemDefinedRecord ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ class SystemDefinedForm extends SystemDefinedRecord { ++ /** ++ * Indicates the id of form ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the id of form ++ * ++ * @type { number } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ formId: number; ++ ++ /** ++ * Indicates the id of form ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the id of form ++ * ++ * @type { number } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the id of form ++ * ++ * @returns { number } the id of form ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get formId(): number; ++ ++ /** ++ * Indicates the id of form ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the id of form ++ * ++ * @type { number } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the id of form ++ * ++ * @param { number } the id of form ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set formId(value: number); ++ ++ /** ++ * Indicates the name of form ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the name of form ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ formName: string; ++ ++ /** ++ * Indicates the name of form ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the name of form ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the name of form ++ * ++ * @returns { string } the name of form ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get formName(): string; ++ ++ /** ++ * Indicates the name of form ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the name of form ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the name of form ++ * ++ * @param { string } the name of form ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set formName(value: string); ++ ++ /** ++ * Indicates the bundle name of form ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the bundle name of form ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ bundleName: string; ++ ++ /** ++ * Indicates the bundle name of form ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the bundle name of form ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the bundle name of form ++ * ++ * @returns { string } the bundle name of form ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get bundleName(): string; ++ ++ /** ++ * Indicates the bundle name of form ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the bundle name of form ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the bundle name of form ++ * ++ * @param { string } the bundle name of form ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set bundleName(value: string); ++ ++ /** ++ * Indicates the ability name of form ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the ability name of form ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ abilityName: string; ++ ++ /** ++ * Indicates the ability name of form ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the ability name of form ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the ability name of form ++ * ++ * @returns { string } the ability name of form ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get abilityName(): string; ++ ++ /** ++ * Indicates the ability name of form ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the ability name of form ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the ability name of form ++ * ++ * @param { string } the ability name of form ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set abilityName(value: string); ++ ++ /** ++ * Indicates the module of form ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the module of form ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ module: string; ++ ++ /** ++ * Indicates the module of form ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the module of form ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the module of form ++ * ++ * @returns { string } the module of form ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get module(): string; ++ ++ /** ++ * Indicates the module of form ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the module of form ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the module of form ++ * ++ * @param { string } the module of form ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set module(value: string); ++ } ++ ++ /** ++ * Describe system defined app item data(this kind of data is provided and bound to OpenHarmony, ++ * also can be parsed by system provided API) ++ * ++ * @extends SystemDefinedRecord ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Describe system defined app item data(this kind of data is provided and bound to OpenHarmony, + * also can be parsed by system provided API) + * + * @extends SystemDefinedRecord + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- class SystemDefinedForm extends SystemDefinedRecord { ++ class SystemDefinedAppItem extends SystemDefinedRecord { ++ /** ++ * Indicates the app id ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the app id ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ appId: string; ++ ++ /** ++ * Indicates the app id ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the app id ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the app id ++ * ++ * @returns { string } the app id ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get appId(): string; ++ ++ /** ++ * Indicates the app id ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the app id ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the app id ++ * ++ * @param { string } the app id ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set appId(value: string); ++ ++ /** ++ * Indicates the app name ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the app name ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ appName: string; ++ ++ /** ++ * Indicates the app name ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the app name ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the app name ++ * ++ * @returns { string } the app name ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get appName(): string; ++ ++ /** ++ * Indicates the app name ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the app name ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the app name ++ * ++ * @param { string } the app name ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set appName(value: string); ++ ++ /** ++ * Indicates the id of app icon ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the id of app icon ++ * ++ * @type { string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ appIconId: string; ++ + /** +- * Indicates the id of form ++ * Indicates the id of app icon + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the id of form ++ * Indicates the id of app icon + * +- * @type { number } ++ * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ +- formId: number; + /** +- * Indicates the name of form ++ * Indicates the id of app icon ++ * ++ * @returns { string } the id of app icon ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get appIconId(): string; ++ ++ /** ++ * Indicates the id of app icon + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the name of form ++ * Indicates the id of app icon + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ +- formName: string; + /** +- * Indicates the bundle name of form ++ * Indicates the id of app icon ++ * ++ * @param { string } the id of app icon ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set appIconId(value: string); ++ ++ /** ++ * Indicates the id of app label + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the bundle name of form ++ * Indicates the id of app label + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ +- bundleName: string; ++ appLabelId: string; ++ + /** +- * Indicates the ability name of form ++ * Indicates the id of app label + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the ability name of form ++ * Indicates the id of app label + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ +- abilityName: string; + /** +- * Indicates the module of form ++ * Indicates the id of app label ++ * ++ * @returns { string } the id of app label ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get appLabelId(): string; ++ ++ /** ++ * Indicates the id of app label + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the module of form ++ * Indicates the id of app label + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ +- module: string; +- } ++ /** ++ * Indicates the id of app label ++ * ++ * @param { string } the id of app label ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set appLabelId(value: string); + +- /** +- * Describe system defined app item data(this kind of data is provided and bound to OpenHarmony, +- * also can be parsed by system provided API) +- * +- * @extends SystemDefinedRecord +- * @syscap SystemCapability.DistributedDataManager.UDMF.Core +- * @since 10 +- */ +- /** +- * Describe system defined app item data(this kind of data is provided and bound to OpenHarmony, +- * also can be parsed by system provided API) +- * +- * @extends SystemDefinedRecord +- * @syscap SystemCapability.DistributedDataManager.UDMF.Core +- * @atomicservice +- * @since 11 +- */ +- class SystemDefinedAppItem extends SystemDefinedRecord { + /** +- * Indicates the app id ++ * Indicates the bundle name of app + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the app id ++ * Indicates the bundle name of app + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ +- appId: string; ++ bundleName: string; ++ + /** +- * Indicates the app name ++ * Indicates the bundle name of app + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the app name ++ * Indicates the bundle name of app + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ +- appName: string; + /** +- * Indicates the id of app icon ++ * Indicates the bundle name of app ++ * ++ * @returns { string } the bundle name of app ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get bundleName(): string; ++ ++ /** ++ * Indicates the bundle name of app + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the id of app icon ++ * Indicates the bundle name of app + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ +- appIconId: string; + /** +- * Indicates the id of app label ++ * Indicates the bundle name of app ++ * ++ * @param { string } the bundle name of app ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set bundleName(value: string); ++ ++ /** ++ * Indicates the ability name of app + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the id of app label ++ * Indicates the ability name of app + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ +- appLabelId: string; ++ abilityName: string; ++ + /** +- * Indicates the bundle name of app ++ * Indicates the ability name of app + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** +- * Indicates the bundle name of app ++ * Indicates the ability name of app + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ +- bundleName: string; ++ /** ++ * Indicates the ability name of app ++ * ++ * @returns { string } the ability name of app ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get abilityName(): string; ++ + /** + * Indicates the ability name of app + * +@@ -1356,7 +2772,15 @@ declare namespace unifiedDataChannel { + * @atomicservice + * @since 11 + */ +- abilityName: string; ++ /** ++ * Indicates the ability name of app ++ * ++ * @param { string } the ability name of app ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set abilityName(value: string); + } + + /** +@@ -1374,7 +2798,8 @@ declare namespace unifiedDataChannel { + * @extends SystemDefinedRecord + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class SystemDefinedPixelMap extends SystemDefinedRecord { + /** +@@ -1392,6 +2817,54 @@ declare namespace unifiedDataChannel { + * @since 11 + */ + rawData: Uint8Array; ++ ++ /** ++ * Indicates the raw data of pixel map ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the raw data of pixel map ++ * ++ * @type { Uint8Array } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the raw data of pixel map ++ * ++ * @returns { Uint8Array } the raw data of pixel map ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get rawData(): Uint8Array; ++ ++ /** ++ * Indicates the raw data of pixel map ++ * ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 10 ++ */ ++ /** ++ * Indicates the raw data of pixel map ++ * ++ * @type { Uint8Array } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 11 ++ */ ++ /** ++ * Indicates the raw data of pixel map ++ * ++ * @param { Uint8Array } the raw data of pixel map ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set rawData(value: Uint8Array); + } + + /** +@@ -1459,7 +2932,8 @@ declare namespace unifiedDataChannel { + * @enum { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum Intention { + /** +@@ -1473,7 +2947,8 @@ declare namespace unifiedDataChannel { + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DATA_HUB = 'DataHub', + +@@ -1509,7 +2984,16 @@ declare namespace unifiedDataChannel { + * @atomicservice + * @since 11 + */ +- type Options = { ++ /** ++ * Describe the optional arguments of data operation ++ * ++ * @typedef { Options } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.1&1.2 ++ */ ++ interface Options { + /** + * Indicates the target Intention + * +@@ -1523,6 +3007,15 @@ declare namespace unifiedDataChannel { + * @atomicservice + * @since 11 + */ ++ /** ++ * Indicates the target Intention ++ * ++ * @type { ?Intention } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.1&1.2 ++ */ + intention?: Intention; + + /** +@@ -1538,8 +3031,17 @@ declare namespace unifiedDataChannel { + * @atomicservice + * @since 11 + */ ++ /** ++ * Indicates the unique identifier of target UnifiedData ++ * ++ * @type { ?string } ++ * @syscap SystemCapability.DistributedDataManager.UDMF.Core ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.1&1.2 ++ */ + key?: string; +- }; ++ } + + /** + * Defines the types of file conflict options when getting data from the UDMF. +@@ -1547,7 +3049,8 @@ declare namespace unifiedDataChannel { + * @enum { number } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum FileConflictOptions { + /** +@@ -1555,7 +3058,8 @@ declare namespace unifiedDataChannel { + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + OVERWRITE, + +@@ -1564,7 +3068,8 @@ declare namespace unifiedDataChannel { + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SKIP + } +@@ -1575,7 +3080,8 @@ declare namespace unifiedDataChannel { + * @enum { number } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum ProgressIndicator { + /** +@@ -1583,7 +3089,8 @@ declare namespace unifiedDataChannel { + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NONE, + +@@ -1592,7 +3099,8 @@ declare namespace unifiedDataChannel { + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DEFAULT + } +@@ -1603,7 +3111,8 @@ declare namespace unifiedDataChannel { + * @enum { number } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum ListenerStatus { + /** +@@ -1611,7 +3120,8 @@ declare namespace unifiedDataChannel { + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FINISHED = 0, + +@@ -1620,7 +3130,8 @@ declare namespace unifiedDataChannel { + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PROCESSING, + +@@ -1629,7 +3140,8 @@ declare namespace unifiedDataChannel { + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CANCELED, + +@@ -1638,7 +3150,8 @@ declare namespace unifiedDataChannel { + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INNER_ERROR = 200, + +@@ -1647,7 +3160,8 @@ declare namespace unifiedDataChannel { + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INVALID_PARAMETERS, + +@@ -1656,7 +3170,8 @@ declare namespace unifiedDataChannel { + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DATA_NOT_FOUND, + +@@ -1665,7 +3180,8 @@ declare namespace unifiedDataChannel { + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SYNC_FAILED, + +@@ -1674,7 +3190,8 @@ declare namespace unifiedDataChannel { + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + COPY_FILE_FAILED, + } +@@ -1685,7 +3202,8 @@ declare namespace unifiedDataChannel { + * @interface ProgressInfo + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ProgressInfo { + /** +@@ -1694,7 +3212,8 @@ declare namespace unifiedDataChannel { + * @type { number } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + progress: number; + +@@ -1704,7 +3223,8 @@ declare namespace unifiedDataChannel { + * @type { ListenerStatus } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + status: ListenerStatus; + } +@@ -1717,7 +3237,8 @@ declare namespace unifiedDataChannel { + * @param { UnifiedData | null } data - Data obtained when the progress reaches 100%. + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type DataProgressListener = (progressInfo: ProgressInfo, data: UnifiedData | null) => void; + +@@ -1727,7 +3248,8 @@ declare namespace unifiedDataChannel { + * @interface GetDataParams + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface GetDataParams { + /** +@@ -1736,7 +3258,8 @@ declare namespace unifiedDataChannel { + * @type { ProgressIndicator } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + progressIndicator: ProgressIndicator; + +@@ -1746,7 +3269,8 @@ declare namespace unifiedDataChannel { + * @type { DataProgressListener } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + dataProgressListener: DataProgressListener; + +@@ -1756,7 +3280,8 @@ declare namespace unifiedDataChannel { + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + destUri?: string; + +@@ -1766,7 +3291,8 @@ declare namespace unifiedDataChannel { + * @type { FileConflictOptions } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + fileConflictOptions?: FileConflictOptions; + } +@@ -1792,7 +3318,8 @@ declare namespace unifiedDataChannel { + *
    2.Incorrect parameters types. + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function insertData(options: Options, data: UnifiedData, callback: AsyncCallback): void; + +@@ -1817,7 +3344,8 @@ declare namespace unifiedDataChannel { + *
    2.Incorrect parameters types. + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function insertData(options: Options, data: UnifiedData): Promise; + +@@ -1890,7 +3418,8 @@ declare namespace unifiedDataChannel { + *
    2.Incorrect parameters types. + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function queryData(options: Options, callback: AsyncCallback>): void; + +@@ -1913,7 +3442,8 @@ declare namespace unifiedDataChannel { + *
    2.Incorrect parameters types. + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function queryData(options: Options): Promise>; + +diff --git a/api/@ohos.deviceInfo.d.ets b/api/@ohos.deviceInfo.d.ets +index 0977a3373..0297a224d 100644 +--- a/api/@ohos.deviceInfo.d.ets ++++ b/api/@ohos.deviceInfo.d.ets +@@ -1,6 +1,6 @@ + /* +- * Copyright (c) 2021 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"), + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * +@@ -12,6 +12,7 @@ + * See the License for the specific language governing permissions and + * limitations under the License. + */ ++ + /** + * @file + * @kit BasicServicesKit +@@ -20,11 +21,11 @@ + /** + * A static class pertaining to the product information. + * +- * @namespace deviceInfo ++ * @class deviceInfo + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform +- * @atomicservice + * @since 20 ++ * @arkts 1.2 + */ + declare class deviceInfo { + +@@ -36,8 +37,8 @@ declare class deviceInfo { + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform +- * @atomicservice + * @since 20 ++ * @arkts 1.2 + */ + static get deviceType(): string; + +@@ -48,6 +49,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get manufacture(): string; + +@@ -58,6 +60,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get brand(): string; + +@@ -68,6 +71,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get marketName(): string; + +@@ -78,6 +82,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get productSeries(): string; + +@@ -88,8 +93,8 @@ declare class deviceInfo { + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform +- * @atomicservice + * @since 20 ++ * @arkts 1.2 + */ + static get productModel(): string; + +@@ -98,8 +103,8 @@ declare class deviceInfo { + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform +- * @atomicservice + * @since 20 ++ * @arkts 1.2 + */ + static get productModelAlias(): string; + +@@ -110,6 +115,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get softwareModel(): string; + +@@ -120,6 +126,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get hardwareModel(): string; + +@@ -130,6 +137,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get hardwareProfile(): string; + +@@ -140,6 +148,7 @@ declare class deviceInfo { + * + * @syscap SystemCapability.Startup.SystemInfo + * @since 20 ++ * @arkts 1.2 + */ + static get serial(): string; + +@@ -150,6 +159,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get bootloaderVersion(): string; + +@@ -160,6 +170,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get abiList(): string; + +@@ -170,6 +181,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get securityPatchTag(): string; + +@@ -180,6 +192,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get displayVersion(): string; + +@@ -190,6 +203,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get incrementalVersion(): string; + +@@ -202,6 +216,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get osReleaseType(): string; + +@@ -212,8 +227,8 @@ declare class deviceInfo { + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform +- * @atomicservice + * @since 20 ++ * @arkts 1.2 + */ + static get osFullName(): string; + +@@ -225,6 +240,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get majorVersion(): int; + +@@ -237,6 +253,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get seniorVersion(): int; + +@@ -248,6 +265,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get featureVersion(): int; + +@@ -259,6 +277,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get buildVersion(): int; + +@@ -269,8 +288,8 @@ declare class deviceInfo { + * + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform +- * @atomicservice + * @since 20 ++ * @arkts 1.2 + */ + static get sdkApiVersion(): int; + +@@ -281,6 +300,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get firstApiVersion(): int; + +@@ -291,6 +311,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get versionId(): string; + +@@ -301,6 +322,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get buildType(): string; + +@@ -311,6 +333,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get buildUser(): string; + +@@ -321,6 +344,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get buildHost(): string; + +@@ -331,6 +355,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get buildTime(): string; + +@@ -341,6 +366,7 @@ declare class deviceInfo { + * @syscap SystemCapability.Startup.SystemInfo + * @crossplatform + * @since 20 ++ * @arkts 1.2 + */ + static get buildRootHash(): string; + +@@ -351,6 +377,7 @@ declare class deviceInfo { + * + * @syscap SystemCapability.Startup.SystemInfo + * @since 20 ++ * @arkts 1.2 + */ + static get udid(): string; + +@@ -363,6 +390,7 @@ declare class deviceInfo { + * + * @syscap SystemCapability.Startup.SystemInfo + * @since 20 ++ * @arkts 1.2 + */ + static get distributionOSName(): string; + +@@ -375,6 +403,7 @@ declare class deviceInfo { + * + * @syscap SystemCapability.Startup.SystemInfo + * @since 20 ++ * @arkts 1.2 + */ + static get distributionOSVersion(): string; + +@@ -387,6 +416,7 @@ declare class deviceInfo { + * + * @syscap SystemCapability.Startup.SystemInfo + * @since 20 ++ * @arkts 1.2 + */ + static get distributionOSApiVersion(): int; + +@@ -397,6 +427,7 @@ declare class deviceInfo { + * + * @syscap SystemCapability.Startup.SystemInfo + * @since 20 ++ * @arkts 1.2 + */ + static get distributionOSApiName(): string; + +@@ -409,6 +440,7 @@ declare class deviceInfo { + * + * @syscap SystemCapability.Startup.SystemInfo + * @since 20 ++ * @arkts 1.2 + */ + static get distributionOSReleaseType(): string; + +@@ -430,6 +462,7 @@ declare class deviceInfo { + * + * @syscap SystemCapability.Startup.SystemInfo + * @since 20 ++ * @arkts 1.2 + */ + static get ODID(): string; + +@@ -439,7 +472,28 @@ declare class deviceInfo { + * @permission ohos.permission.ACCESS_DISK_PHY_INFO + * @syscap SystemCapability.Startup.SystemInfo + * @since 20 ++ * @arkts 1.2 + */ + static get diskSN(): string; ++ ++ /** ++ * Obtains the sdk minor api version ++ * ++ * @syscap SystemCapability.Startup.SystemInfo ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ static get sdkMinorApiVersion(): int; ++ ++ /** ++ * Obtains the sdk patch api version ++ * ++ * @syscap SystemCapability.Startup.SystemInfo ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ static get sdkPatchApiVersion(): int; + } + export default deviceInfo; +diff --git a/api/@ohos.deviceStatus.dragInteraction.d.ts b/api/@ohos.deviceStatus.dragInteraction.d.ts +index 7beaaf44f..c9a2540e6 100644 +--- a/api/@ohos.deviceStatus.dragInteraction.d.ts ++++ b/api/@ohos.deviceStatus.dragInteraction.d.ts +@@ -26,7 +26,8 @@ import { Callback } from './@ohos.base'; + * @namespace dragInteraction + * @syscap SystemCapability.Msdp.DeviceStatus.Drag + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace dragInteraction { + /** +@@ -35,7 +36,8 @@ declare namespace dragInteraction { + * @enum { number } + * @syscap SystemCapability.Msdp.DeviceStatus.Drag + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum DragState { + /** +@@ -43,7 +45,8 @@ declare namespace dragInteraction { + * + * @syscap SystemCapability.Msdp.DeviceStatus.Drag + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MSG_DRAG_STATE_START = 1, + +@@ -52,7 +55,8 @@ declare namespace dragInteraction { + * + * @syscap SystemCapability.Msdp.DeviceStatus.Drag + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MSG_DRAG_STATE_STOP = 2, + +@@ -61,7 +65,8 @@ declare namespace dragInteraction { + * + * @syscap SystemCapability.Msdp.DeviceStatus.Drag + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MSG_DRAG_STATE_CANCEL = 3, + } +@@ -72,7 +77,8 @@ declare namespace dragInteraction { + * @interface Summary + * @syscap SystemCapability.Msdp.DeviceStatus.Drag + * @systemapi Hide this for inner system use. +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Summary { + /** +@@ -81,19 +87,21 @@ declare namespace dragInteraction { + * @type { string } + * @syscap SystemCapability.Msdp.DeviceStatus.Drag + * @systemapi Hide this for inner system use. +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + dataType: string; + + /** + * Data length of the dragged object. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Msdp.DeviceStatus.Drag + * @systemapi Hide this for inner system use. +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- dataSize: number; ++ dataSize: int; + } + + /** +@@ -117,7 +125,8 @@ declare namespace dragInteraction { + *
    2.Incorrect parameter types.3.Parameter verification failed. + * @syscap SystemCapability.Msdp.DeviceStatus.Drag + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'drag', callback: Callback): void; + +@@ -144,7 +153,8 @@ declare namespace dragInteraction { + *
    2.Incorrect parameter types.3.Parameter verification failed. + * @syscap SystemCapability.Msdp.DeviceStatus.Drag + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'drag', callback?: Callback): void; + +@@ -155,7 +165,8 @@ declare namespace dragInteraction { + * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. + * @syscap SystemCapability.Msdp.DeviceStatus.Drag + * @systemapi Hide this for inner system use. +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getDataSummary(): Array

    ; + +diff --git a/api/@ohos.distributedHardware.mechanicManager.d.ts b/api/@ohos.distributedHardware.mechanicManager.d.ts +new file mode 100644 +index 000000000..5703aac77 +--- /dev/null ++++ b/api/@ohos.distributedHardware.mechanicManager.d.ts +@@ -0,0 +1,878 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"), ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++/** ++ * @file ++ * @kit MechanicKit ++ * @arkts 1.1&1.2 ++ */ ++ ++import type { Callback } from './@ohos.base'; ++ ++/** ++ * Provides capabilities for controlling and interacting with mechanical devices connected to this device. ++ * The capabilities cover connection management, control, and monitoring. ++ * ++ * @namespace mechanicManager ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ ++declare namespace mechanicManager { ++ ++ /** ++ * Subscribes to device attachment state change events. ++ * @param { 'attachStateChange' } type Event type. ++ * @param { Callback } callback Callback used to return the state change. ++ * @throws { BusinessError } 33300001 - Service exception. ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ function on(type: 'attachStateChange', callback: Callback): void; ++ ++ /** ++ * Unsubscribes from device attachment state change events. ++ * @param { 'attachStateChange' } type Event type. ++ * @param { Callback } [callback] Callback used to return the state change. ++ * @throws { BusinessError } 33300001 - Service exception. ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ function off(type: 'attachStateChange', callback?: Callback): void; ++ ++ /** ++ * Obtain the list of connected mechanical devices. ++ * @returns { MechInfo[] } List of connected mechanical devices. ++ * @throws { BusinessError } 33300001 - Service exception. ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ function getAttachedMechDevices(): MechInfo[]; ++ ++ /** ++ * Sets a user operation. ++ * @param { Operation } operation Operation type. ++ * @param { string } mac MAC address. ++ * @param { string } params Operation parameters. ++ * @throws { BusinessError } 202 - Not system application. ++ * @throws { BusinessError } 33300001 - Service exception. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ function setUserOperation(operation: Operation, mac: string, params: string): void; ++ ++ /** ++ * Enables or disables camera tracking. ++ * @param { boolean } isEnabled Whether to enable camera tracking. ++ * @throws { BusinessError } 33300001 - Service exception. ++ * @throws { BusinessError } 33300002 - Device not connected. ++ * @throws { BusinessError } 33300003 - Device not supported. ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ ++ function setCameraTrackingEnabled(isEnabled: boolean): void; ++ ++ /** ++ * Checks whether camera tracking is enabled for this mechanical device. ++ * @returns { boolean } Enabled status. The value true means that camera tracking is enabled, and false means ++ * the opposite. ++ * @throws { BusinessError } 33300001 - Service exception. ++ * @throws { BusinessError } 33300002 - Device not connected. ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ ++ function getCameraTrackingEnabled(): boolean; ++ ++ /** ++ * Subscribes to tracking events. ++ * @param { 'trackingStateChange' } type Event type. ++ * @param { Callback } callback Callback used to return the tracking event information. ++ * @throws { BusinessError } 33300001 - Service exception. ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ function on(type: 'trackingStateChange', callback: Callback): void; ++ ++ /** ++ * Unsubscribes from tracking events. ++ * @param { 'trackingStateChange' } type Event type. ++ * @param { Callback } [callback] Callback used to return the tracking event information. ++ * @throws { BusinessError } 33300001 - Service exception. ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ function off(type: 'trackingStateChange', callback?: Callback): void; ++ ++ /** ++ * Sets the camera tracking layout for this mechanical device. ++ * @param { CameraTrackingLayout } trackingLayout Camera tracking layout. ++ * @throws { BusinessError } 202 - Not system application. ++ * @throws { BusinessError } 33300001 - Service exception. ++ * @throws { BusinessError } 33300002 - Device not connected. ++ * @throws { BusinessError } 33300003 - Device not supported. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ ++ function setCameraTrackingLayout(trackingLayout: CameraTrackingLayout): void; ++ ++ /** ++ * Obtains the camera tracking layout of this mechanical device. ++ * @returns { CameraTrackingLayout } Camera tracking layout obtained. ++ * @throws { BusinessError } 33300001 - Service exception. ++ * @throws { BusinessError } 33300002 - Device not connected. ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ function getCameraTrackingLayout(): CameraTrackingLayout; ++ ++ /** ++ * Rotates a mechanical device to the relative angles. ++ * @param { int } mechId ID of the mechanical device. ++ * @param { RotationAngles } angles Relative angles. ++ * @param { int } duration Rotation duration. Unit: millisecond. ++ * @returns { Promise } Promise that return the execution result. ++ * @throws { BusinessError } 202 - Not system application. ++ * @throws { BusinessError } 33300001 - Service exception. ++ * @throws { BusinessError } 33300002 - Device not connected. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ ++ function rotate(mechId: int, angles: RotationAngles, duration: int): Promise; ++ ++ /** ++ * Rotates a mechanical device to the absolute angles. ++ * @param { int } mechId ID of the mechanical device. ++ * @param { EulerAngles } angles Absolute angles. ++ * @param { int } duration Rotation duration. Unit: millisecond. ++ * @returns { Promise } Promise that return the execution result. ++ * @throws { BusinessError } 202 - Not system application. ++ * @throws { BusinessError } 33300001 - Service exception. ++ * @throws { BusinessError } 33300002 - Device not connected. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ ++ function rotateToEulerAngles(mechId: int, angles: EulerAngles, duration: int): Promise; ++ ++ /** ++ * Obtains the maximum continuous rotation duration of a mechanical device. ++ * ++ * @param { int } mechId ID of the mechanical device. ++ * @returns { int } Maximum rotation duration. Unit: millisecond. ++ * @throws { BusinessError } 202 - Not system application. ++ * @throws { BusinessError } 33300001 - Service exception. ++ * @throws { BusinessError } 33300002 - Device not connected. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ function getMaxRotationTime(mechId: int): int; ++ ++ /** ++ * Obtains the maximum rotation speed of a mechanical device. ++ * ++ * @param { int } mechId ID of the mechanical device. ++ * @returns { RotationSpeed } Maximum speed. Only the absolute value of the speed is returned. ++ * @throws { BusinessError } 202 - Not system application. ++ * @throws { BusinessError } 33300001 - Service exception. ++ * @throws { BusinessError } 33300002 - Device not connected. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ function getMaxRotationSpeed(mechId: int): RotationSpeed; ++ ++ /** ++ * Rotates a mechanical device at the specified speed. ++ * @param { int } mechId ID of the mechanical device. ++ * @param { RotationSpeed } speed Rotation speed. ++ * @param { int } duration Rotation duration. Unit: millisecond. ++ * @returns { Promise } Promise that return the execution result. ++ * @throws { BusinessError } 202 - Not system application. ++ * @throws { BusinessError } 33300001 - Service exception. ++ * @throws { BusinessError } 33300002 - Device not connected. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ function rotateBySpeed(mechId: int, speed: RotationSpeed, duration: int): Promise; ++ ++ /** ++ * Stops a mechanical device from moving. ++ * @param { int } mechId ID of the mechanical device. ++ * @returns { Promise } Promise that returns no value. ++ * @throws { BusinessError } 202 - Not system application. ++ * @throws { BusinessError } 33300001 - Service exception. ++ * @throws { BusinessError } 33300002 - Device not connected. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ function stopMoving(mechId: int): Promise; ++ ++ /** ++ * Obtains the current angles of a mechanical device. ++ * @param { int } mechId ID of the mechanical device. ++ * @returns { EulerAngles } Rotation angles. ++ * @throws { BusinessError } 202 - Not system application. ++ * @throws { BusinessError } 33300001 - Service exception. ++ * @throws { BusinessError } 33300002 - Device not connected. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ ++ function getCurrentAngles(mechId: int): EulerAngles; ++ ++ /** ++ * Obtains the maximum rotation angles relative to the reference point for the specified mechanical device. ++ * ++ * @param { int } mechId ID of the mechanical device. ++ * @returns { RotationLimits } Maximum rotation angles. ++ * @throws { BusinessError } 202 - Not system application. ++ * @throws { BusinessError } 33300001 - Service exception. ++ * @throws { BusinessError } 33300002 - Device not connected. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ ++ function getRotationLimits(mechId: int): RotationLimits; ++ ++ /** ++ * Obtains the status of the rotation axes. ++ * @param { int } mechId ID of the mechanical device. ++ * @returns { RotationAxesStatus } Rotation axis status. ++ * @throws { BusinessError } 202 - Not system application. ++ * @throws { BusinessError } 33300001 - Service exception. ++ * @throws { BusinessError } 33300002 - Device not connected. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ function getRotationAxesStatus(mechId: int): RotationAxesStatus; ++ ++ ++ /** ++ * Register a listener for axis state changes. ++ * The status of the rotation axis changes dynamically, which needs to be monitored. ++ * ++ * @param { 'rotationAxesStatusChange' } type - Event type. ++ * @param { Callback } callback - Rotate axis state changes callback. ++ * @throws { BusinessError } 202 - Not system application. ++ * @throws { BusinessError } 33300001 - Service exception. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ function on(type: 'rotationAxesStatusChange', callback: Callback): void; ++ ++ /** ++ * Unregister a listener for axis state changes. ++ * ++ * @param { 'rotationAxesStatusChange' } type - Event type. ++ * @param { Callback } [callback] - Rotate axis state changes callback. ++ * @throws { BusinessError } 202 - Not system application. ++ * @throws { BusinessError } 33300001 - Service exception. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ function off(type: 'rotationAxesStatusChange', callback?: Callback): void; ++ ++ /** ++ * Mechanical device information. ++ * @typedef MechInfo ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ export interface MechInfo { ++ /** ++ * ID of the mechanical device. ++ * @type { int } ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ mechId: int; ++ ++ ++ /** ++ * Type of the mechanical device. ++ * @type { MechDeviceType } ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ mechDeviceType: MechDeviceType; ++ ++ /** ++ * Name of the mechanical device. ++ * @type { string } ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ mechName: string; ++ } ++ ++ ++ /** ++ * The rotion angles, relative to the current position. ++ * @typedef RotationAngles ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ export interface RotationAngles { ++ /** ++ * Yaw angle, ranging from -2π to 2*π, measured in radians. ++ * @type { ?double } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ ++ yaw?: double; ++ ++ /** ++ * Roll angle, ranging from -2π to 2*π, measured in radians. ++ * @type { ?double } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ ++ roll?: double; ++ ++ /** ++ * Pitch angle, ranging from -2π to 2*π, measured in radians. ++ * @type { ?double } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ ++ pitch?: double; ++ } ++ ++ /** ++ * Absolute euler angles relative to the home position. ++ * ++ * @typedef EulerAngles ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ export interface EulerAngles { ++ /** ++ * Yaw angle, ranging from -π to π, measured in radians. ++ * @type { ?double } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ ++ yaw?: double; ++ ++ /** ++ * Roll angle, ranging from -π to π, measured in radians. ++ * @type { ?double } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ ++ roll?: double; ++ ++ /** ++ * Pitch angle, ranging from -π to π, measured in radians. ++ * @type { ?double } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ ++ pitch?: double; ++ } ++ ++ /** ++ * Rotational speed. A negative value indicates a clockwise rotation, and a positive value indicates a ++ * counterclockwise rotation. ++ * @typedef RotationSpeed ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ ++ export interface RotationSpeed { ++ /** ++ * Yaw speed, measured in radians per second. ++ * @type { ?double } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ ++ yawSpeed?: double; ++ ++ /** ++ * Roll speed, measured in radians per second. ++ * @type { ?double } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ ++ rollSpeed?: double; ++ ++ /** ++ * Pitch speed, measured in radians per second. ++ * @type { ?double } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ ++ pitchSpeed?: double; ++ } ++ ++ ++ /** ++ * Rotation angle limits relative to the reference point. ++ * @typedef RotationLimits ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ ++ export interface RotationLimits { ++ /** ++ * Maximum yaw rotation angles in the negative direction, ranging from -2*Math.PI to 0, measured in radians. ++ * If the value is less than or equal to -2*Math.PI, there is no restriction. ++ * @type { double } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ negativeYawMax: double; ++ ++ /** ++ * Maximum yaw rotation angles in the positive direction, ranging from 0 to 2*Math.PI, measured in radians. ++ * If the value is greater than or equal to 2*Math.PI, there is no restriction. ++ * @type { double } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ positiveYawMax: double; ++ ++ /** ++ * Maximum roll rotation angles in the negative direction, ranging from -2*Math.PI to 0, measured in radians. ++ * If the value is less than or equal to -2*Math.PI, there is no restriction. ++ * @type { double } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ negativeRollMax: double; ++ ++ /** ++ * Maximum roll rotation angles in the positive direction, ranging from 0 to 2*Math.PI, measured in radians. ++ * If the value is greater than or equal to 2*Math.PI, there is no restriction. ++ * @type { double } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ positiveRollMax: double; ++ ++ /** ++ * Maximum pitch rotation angles in the negative direction, ranging from -2*Math.PI to 0, measured in radians. ++ * If the value is less than or equal to -2*Math.PI, there is no restriction. ++ * @type { double } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ negativePitchMax: double; ++ ++ /** ++ * Maximum pitch rotation angles in the positive direction, ranging from 0 to 2*Math.PI, measured in radians. ++ * If the value is greater than or equal to 2*Math.PI, there is no restriction. ++ * @type { double } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ positivePitchMax: double; ++ } ++ ++ /** ++ * Rotation axes status ++ * ++ * @typedef RotationAxesStatus ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ export interface RotationAxesStatus { ++ /** ++ * Whether the yaw axis is enabled. ++ * @type { boolean } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ yawEnabled: boolean; ++ ++ /** ++ * Whether the roll axis is enabled. ++ * @type { boolean } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ rollEnabled: boolean; ++ ++ /** ++ * Whether the pitch axis is enabled. ++ * @type { boolean } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ pitchEnabled: boolean; ++ ++ /** ++ * Whether the yaw axis is limited. ++ * @type { ?RotationAxisLimited } RotationAxisLimited ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ yawLimited?: RotationAxisLimited; ++ ++ /** ++ * Whether the roll axis is limited. ++ * @type { ?RotationAxisLimited } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ rollLimited?: RotationAxisLimited; ++ ++ /** ++ * Whether the pitch axis is limited. ++ * @type { ?RotationAxisLimited } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ pitchLimited?: RotationAxisLimited; ++ } ++ ++ /** ++ * Enumerates the rotation axis limit states. ++ * @enum { number } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ export enum RotationAxisLimited { ++ /** ++ * Not limited. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ NOT_LIMITED = 0, ++ ++ /** ++ * Negative limited. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ NEGATIVE_LIMITED = 1, ++ ++ /** ++ * Positive limited. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ POSITIVE_LIMITED = 2, ++ } ++ ++ /** ++ * Rotation axes state change information. ++ * @typedef RotationAxesStateChangeInfo ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ export interface RotationAxesStateChangeInfo { ++ /** ++ * ID of the mechanical device. ++ * @type { int } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ mechId: int; ++ ++ /** ++ * Rotate axis status. ++ * @type { RotationAxesStatus } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ status: RotationAxesStatus, ++ } ++ ++ /** ++ * Tracking event callback info. ++ * ++ * @typedef TrackingEventInfo ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ export interface TrackingEventInfo { ++ /** ++ * Tracking event. ++ * @type { TrackingEvent } Tracking event. ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ event: TrackingEvent; ++ } ++ ++ /** ++ * Callback information about the device attachment state change. ++ * @typedef AttachStateChangeInfo ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ export interface AttachStateChangeInfo { ++ ++ /** ++ * Device attachment state. ++ * @type { AttachState } ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ state: AttachState; ++ ++ /** ++ * Mechanical device information. ++ * @type { MechInfo } ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ mechInfo: MechInfo, ++ } ++ ++ /** ++ * Enumerates the user operations. ++ * @enum { number } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ export enum Operation { ++ /** ++ * Connection operation. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ CONNECT = 0, ++ ++ /** ++ * Disconnection operation. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ DISCONNECT = 1 ++ } ++ ++ /** ++ * Enumerates the tracking events. ++ * @enum { number } ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ ++ export enum TrackingEvent { ++ /** ++ * Camera tracking enabled by user. ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ CAMERA_TRACKING_USER_ENABLED = 0, ++ ++ /** ++ * Camera tracking disabled by user. ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ CAMERA_TRACKING_USER_DISABLED = 1, ++ ++ /** ++ * Camera tracking layout changed. You can call getCameraTrackingLayout to obtain the new layout. ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ CAMERA_TRACKING_LAYOUT_CHANGED = 2, ++ } ++ ++ /** ++ * Rotation execution results. ++ * ++ * @enum { number } ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ export enum Result { ++ /** ++ * Rotation completed. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ COMPLETED = 0, ++ ++ /** ++ * Rotation was interrupted. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ INTERRUPTED = 1, ++ ++ /** ++ * Device reached limitation. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ LIMITED = 2, ++ ++ /** ++ * Rotation time out. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ TIMEOUT = 3, ++ ++ /** ++ * Rotation failed due to system error. ++ * @syscap SystemCapability.Mechanic.Core ++ * @systemapi ++ * @since 20 ++ */ ++ SYSTEM_ERROR = 100 ++ } ++ ++ /** ++ * Enumerates the mechanical device types. ++ * @enum { number } ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ ++ export enum MechDeviceType { ++ /** ++ * Gimbal device. ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ ++ GIMBAL_DEVICE = 0 ++ } ++ ++ /** ++ * Device attach states. ++ * ++ * @enum { number } ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ export enum AttachState { ++ ++ /** ++ * Device attached. ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ ATTACHED = 0, ++ ++ /** ++ * Device detached. ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ DETACHED = 1 ++ } ++ ++ /** ++ * Enumerates the camera tracking layouts. ++ * @enum { number } ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ export enum CameraTrackingLayout { ++ /** ++ * Default layout. ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ DEFAULT = 0, ++ ++ /** ++ * Left-side layout. ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ LEFT = 1, ++ ++ /** ++ * Middle layout. ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ MIDDLE = 2, ++ ++ /** ++ * Right-side layout. ++ * @syscap SystemCapability.Mechanic.Core ++ * @since 20 ++ */ ++ RIGHT = 3 ++ } ++ ++} ++ ++export default mechanicManager; +\ No newline at end of file +diff --git a/api/@ohos.driver.deviceManager.d.ts b/api/@ohos.driver.deviceManager.d.ts +index d2f07bd2e..df0effd0d 100644 +--- a/api/@ohos.driver.deviceManager.d.ts ++++ b/api/@ohos.driver.deviceManager.d.ts +@@ -26,21 +26,23 @@ import type rpc from './@ohos.rpc'; + * + * @namespace deviceManager + * @syscap SystemCapability.Driver.ExternalDevice +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace deviceManager { + /** + * Query the external device list. + * + * @permission ohos.permission.ACCESS_EXTENSIONAL_DEVICE_DRIVER +- * @param { number } busType - The bus type of device to be queried. ++ * @param { int } busType - The bus type of device to be queried. + * @returns { Array> } External device list. + * @throws { BusinessError } 201 - The permission check failed. + * @throws { BusinessError } 22900001 - ExternalDeviceManager service exception or busType parameter error. + * @syscap SystemCapability.Driver.ExternalDevice +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function queryDevices(busType?: number): Array>; ++ function queryDevices(busType?: int): Array>; + + /** + * Bind the device based on the device information returned by queryDevices(). +@@ -161,7 +163,7 @@ declare namespace deviceManager { + * Queries external device information. + * + * @permission ohos.permission.ACCESS_EXTENSIONAL_DEVICE_DRIVER +- * @param { number } deviceId - ID of device to query. ++ * @param { long } deviceId - ID of device to query. + * @returns { Array> } Device information obtained. + * @throws { BusinessError } 201 - The permission check failed. + * @throws { BusinessError } 202 - Permission denied. A non-system application cannot call a system API. +@@ -169,9 +171,10 @@ declare namespace deviceManager { + * @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function queryDeviceInfo(deviceId?: number): Array>; ++ function queryDeviceInfo(deviceId?: long): Array>; + + /** + * Queries driver information. +@@ -185,53 +188,58 @@ declare namespace deviceManager { + * @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function queryDriverInfo(driverUid?: string): Array>; + +- /** +- * Bind the device based on the device information returned by queryDevices(). +- * +- * @permission ohos.permission.ACCESS_DDK_DRIVERS +- * @param { number } deviceId - Device id on the device list returned by queryDevices(). +- * @param { AsyncCallback } onDisconnect - Callback is invoked when device is disconnected after bind +- * success. +- * @returns { Promise } Indicates the bind result including device ID and remote object. +- * @throws { BusinessError } 201 - The permission check failed. +- * @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. +- * @throws { BusinessError } 26300002 - Service not allowed. +- * @syscap SystemCapability.Driver.ExternalDevice +- * @since 18 +- */ +- function bindDriverWithDeviceId(deviceId: number, onDisconnect: AsyncCallback): Promise; ++/** ++* Bind the device based on the device information returned by queryDevices(). ++* ++* @permission ohos.permission.ACCESS_DDK_DRIVERS ++* @param { long } deviceId - Device id on the device list returned by queryDevices(). ++* @param { AsyncCallback } onDisconnect - Callback is invoked when device is disconnected after bind ++* success. ++* @returns { Promise } Indicates the bind result including device ID and remote object. ++* @throws { BusinessError } 201 - The permission check failed. ++* @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. ++* @throws { BusinessError } 26300002 - The driver service does not allow any client to bind. ++* @syscap SystemCapability.Driver.ExternalDevice ++* @since arkts{ '1.1':'19','1.2':'20'} ++* @arkts 1.1&1.2 ++*/ ++ function bindDriverWithDeviceId(deviceId: long, onDisconnect: AsyncCallback): Promise; + +- /** +- * Unbind the device based on the device information returned by queryDevices(). +- * +- * @permission ohos.permission.ACCESS_DDK_DRIVERS +- * @param { number } deviceId - Device id on the device list returned by queryDevices(). +- * @returns { Promise } - Indicates the unbind result invoked when unbind is finished. +- * @throws { BusinessError } 201 - The permission check failed. +- * @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. +- * @throws { BusinessError } 26300003 - There is no binding relationship. +- * @syscap SystemCapability.Driver.ExternalDevice +- * @since 18 +- */ +- function unbindDriverWithDeviceId(deviceId: number): Promise; ++/** ++* Unbind the device based on the device information returned by queryDevices(). ++* ++* @permission ohos.permission.ACCESS_DDK_DRIVERS ++* @param { long } deviceId - Device id on the device list returned by queryDevices(). ++* @returns { Promise } - Indicates the unbind result invoked when unbind is finished. ++* @throws { BusinessError } 201 - The permission check failed. ++* @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. ++* @throws { BusinessError } 26300003 - There is no binding relationship. ++* @syscap SystemCapability.Driver.ExternalDevice ++* @since arkts{ '1.1':'19','1.2':'20'} ++* @arkts 1.1&1.2 ++*/ ++ function unbindDriverWithDeviceId(deviceId: long): Promise; + + /** + * Enumerates the bus types. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Driver.ExternalDevice +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum BusType { + /** + * USB device type + * + * @syscap SystemCapability.Driver.ExternalDevice +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + USB = 1, + } +@@ -241,7 +249,8 @@ declare namespace deviceManager { + * + * @typedef Device + * @syscap SystemCapability.Driver.ExternalDevice +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Device { + /** +@@ -249,25 +258,28 @@ declare namespace deviceManager { + * + * @type { BusType } + * @syscap SystemCapability.Driver.ExternalDevice +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + busType: BusType; + + /** + * Device ID. + * +- * @type { number } ++ * @type { long } + * @syscap SystemCapability.Driver.ExternalDevice +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- deviceId: number; ++ deviceId: long; + + /** + * Description of the device. + * + * @type { string } + * @syscap SystemCapability.Driver.ExternalDevice +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + description: string; + } +@@ -278,26 +290,29 @@ declare namespace deviceManager { + * @typedef USBDevice + * @extends Device + * @syscap SystemCapability.Driver.ExternalDevice +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface USBDevice extends Device { + /** + * Vendor ID. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Driver.ExternalDevice +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- vendorId: number; ++ vendorId: int; + + /** + * Product ID. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Driver.ExternalDevice +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- productId: number; ++ productId: int; + } + + /** +@@ -305,24 +320,27 @@ declare namespace deviceManager { + * + * @typedef RemoteDeviceDriver + * @syscap SystemCapability.Driver.ExternalDevice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface RemoteDeviceDriver { + /** + * Device ID. + * +- * @type { number } ++ * @type { long } + * @syscap SystemCapability.Driver.ExternalDevice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- deviceId: number; ++ deviceId: long; + + /** + * Remote driver object. + * + * @type { rpc.IRemoteObject } + * @syscap SystemCapability.Driver.ExternalDevice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + remote: rpc.IRemoteObject; + } +@@ -333,48 +351,53 @@ declare namespace deviceManager { + * @typedef USBInterfaceDesc + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface USBInterfaceDesc { + /** + * Interface number. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- bInterfaceNumber: number; ++ bInterfaceNumber: int; + + /** + * Interface class code. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- bClass: number; ++ bClass: int; + + /** + * Interface subclass code. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- bSubClass: number; ++ bSubClass: int; + + /** + * Interface protocol. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- bProtocol: number; ++ bProtocol: int; + } + + +@@ -384,18 +407,20 @@ declare namespace deviceManager { + * @typedef DeviceInfo + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface DeviceInfo { + /** + * Device ID. + * +- * @type { number } ++ * @type { long } + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- deviceId: number; ++ deviceId: long; + + /** + * Whether the device has a matched driver. +@@ -403,7 +428,8 @@ declare namespace deviceManager { + * @type { boolean } + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isDriverMatched: boolean; + +@@ -413,7 +439,8 @@ declare namespace deviceManager { + * @type { ?string } + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + driverUid?: string; + } +@@ -425,28 +452,31 @@ declare namespace deviceManager { + * @extends DeviceInfo + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface USBDeviceInfo extends DeviceInfo { + /** + * Vendor ID. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- vendorId: number; ++ vendorId: int; + + /** + * Product ID. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- productId: number; ++ productId: int; + + /** + * List of USB interface descriptors. +@@ -454,7 +484,8 @@ declare namespace deviceManager { + * @type { Array> } + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interfaceDescList: Array>; + } +@@ -465,7 +496,8 @@ declare namespace deviceManager { + * @typedef DriverInfo + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface DriverInfo { + /** +@@ -474,7 +506,8 @@ declare namespace deviceManager { + * @type { BusType } + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + busType: BusType; + +@@ -484,7 +517,8 @@ declare namespace deviceManager { + * @type { string } + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + driverUid: string; + +@@ -494,7 +528,8 @@ declare namespace deviceManager { + * @type { string } + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + driverName: string; + +@@ -504,7 +539,8 @@ declare namespace deviceManager { + * @type { string } + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + driverVersion: string; + +@@ -514,7 +550,8 @@ declare namespace deviceManager { + * @type { string } + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + driverSize: string; + +@@ -524,7 +561,8 @@ declare namespace deviceManager { + * @type { string } + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + description: string; + } +@@ -536,28 +574,31 @@ declare namespace deviceManager { + * @extends DriverInfo + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface USBDriverInfo extends DriverInfo { + /** + * IDs of supported products. + * +- * @type { Array } ++ * @type { Array } + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- productIdList: Array; ++ productIdList: Array; + + /** + * IDs of supported vendors. + * +- * @type { Array } ++ * @type { Array } + * @syscap SystemCapability.Driver.ExternalDevice + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- vendorIdList: Array; ++ vendorIdList: Array; + } + } + +diff --git a/api/@ohos.effectKit.d.ts b/api/@ohos.effectKit.d.ts +index 301e96c28..269b7cfe6 100644 +--- a/api/@ohos.effectKit.d.ts ++++ b/api/@ohos.effectKit.d.ts +@@ -1,776 +1,800 @@ +-/* +-* Copyright (c) 2022 Huawei Device Co., Ltd. +-* Licensed under the Apache License, Version 2.0 (the "License"); +-* you may not use this file except in compliance with the License. +-* You may obtain a copy of the License at +-* +-* http://www.apache.org/licenses/LICENSE-2.0 +-* +-* Unless required by applicable law or agreed to in writing, software +-* distributed under the License is distributed on an "AS IS" BASIS, +-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-* See the License for the specific language governing permissions and +-* limitations under the License. +-*/ +- +-/** +- * @file +- * @kit ArkGraphics2D +- */ +- +-/*** if arkts 1.1 */ +-import { AsyncCallback } from './@ohos.base'; +-import image from './@ohos.multimedia.image'; +-/*** endif */ +-/*** if arkts 1.2 */ +-import image from './@ohos.multimedia.image'; +-/*** endif */ +- +-/** +- * @namespace effectKit +- * @since 9 +- */ +-/** +- * @namespace effectKit +- * @form +- * @atomicservice +- * @since 12 +- */ +-/** +- * @namespace effectKit +- * @crossplatform +- * @form +- * @atomicservice +- * @since arkts {'1.1':'14', '1.2':'20'} +- * @arkts 1.1&1.2 +- */ +- +-declare namespace effectKit { +- +- /** +- * The Filter of FilterChain. +- * @typedef Filter +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 9 +- */ +- /** +- * The Filter of FilterChain. +- * @typedef Filter +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * The Filter of FilterChain. +- * @typedef Filter +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since arkts {'1.1':'14', '1.2':'20'} +- * @arkts 1.1&1.2 +- */ +- interface Filter { +- +- /** +- * A blur effect is added to the image. +- * @param { number } radius - The degree of blur, the value is measured in pixels. +- * @returns { Filter } Filters for the current effect have been added. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 9 +- */ +- /** +- * A blur effect is added to the image. +- * @param { number } radius - The degree of blur, the value is measured in pixels. +- * @returns { Filter } Filters for the current effect have been added. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * A blur effect is added to the image. +- * @param { number } radius - The degree of blur, the value is measured in pixels. +- * @returns { Filter } Filters for the current effect have been added. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since arkts {'1.1':'14', '1.2':'20'} +- * @arkts 1.1&1.2 +- */ +- blur(radius: number): Filter; +- +- /** +- * A blur effect is added to the image. +- * @param { number } radius - The degree of blur, the value is measured in pixels. +- * @param { TileMode } tileMode - The tile mode of blur. +- * @returns { Filter } Filters for the current effect have been added. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 14 +- */ +- blur(radius: number, tileMode: TileMode): Filter; +- +- /** +- * A Brightness effect is added to the image. +- * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. +- * @returns { Filter } Filters for the current effect have been added. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 9 +- */ +- /** +- * A Brightness effect is added to the image. +- * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. +- * @returns { Filter } Filters for the current effect have been added. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * A Brightness effect is added to the image. +- * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. +- * @returns { Filter } Filters for the current effect have been added. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since 14 +- */ +- brightness(bright: number): Filter; +- +- /** +- * A Grayscale effect is added to the image. +- * @returns { Filter } Filters for the current effect have been added. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 9 +- */ +- /** +- * A Grayscale effect is added to the image. +- * @returns { Filter } Filters for the current effect have been added. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * A Grayscale effect is added to the image. +- * @returns { Filter } Filters for the current effect have been added. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since 14 +- */ +- grayscale(): Filter; +- +- /** +- * A invert effect is added to the image. +- * @returns { Filter } Filters for the current effect have been added. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 +- */ +- /** +- * A invert effect is added to the image. +- * @returns { Filter } Filters for the current effect have been added. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @since 14 +- */ +- invert(): Filter; +- +- /** +- * A custom effect is added to the image. +- * +- * @param { Array } colorMatrix - A matrix of 5x4 size for create effect filter. +- * @returns { Filter } Filters for the current effect have been added. +- * @throws { BusinessError } 401 - Input parameter error. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 +- */ +- /** +- * A custom effect is added to the image. +- * +- * @param { Array } colorMatrix - A matrix of 5x4 size for create effect filter. +- * @returns { Filter } Filters for the current effect have been added. +- * @throws { BusinessError } 401 - Input parameter error. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @since 14 +- */ +- setColorMatrix(colorMatrix: Array): Filter; +- +- /** +- * Gets the PixelMap where all filter effects have been added to the image. +- * @returns { image.PixelMap } image.PixelMap. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 9 +- * @deprecated since 11 +- * @useinstead effectKit.Filter#getEffectPixelMap +- */ +- getPixelMap(): image.PixelMap; +- +- /** +- * Gets the PixelMap where all filter effects have been added to the image. +- * @returns { Promise } - returns the PixelMap generated. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 11 +- */ +- /** +- * Gets the PixelMap where all filter effects have been added to the image. +- * @returns { Promise } - returns the PixelMap generated. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * Gets the PixelMap where all filter effects have been added to the image. +- * @returns { Promise } - returns the PixelMap generated. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since arkts {'1.1':'14', '1.2':'20'} +- * @arkts 1.1&1.2 +- */ +- getEffectPixelMap(): Promise; +- } +- +- /** +- * The color picker of an image. +- * @typedef ColorPicker +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 9 +- */ +- /** +- * The color picker of an image. +- * @typedef ColorPicker +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * The color picker of an image. +- * @typedef ColorPicker +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since 14 +- */ +- interface ColorPicker { +- +- /** +- * get main color of an image +- * @returns { Promise } returns the MainColor generated. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 9 +- */ +- /** +- * get main color of an image +- * @returns { Promise } returns the MainColor generated. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * get main color of an image +- * @returns { Promise } returns the MainColor generated. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since 14 +- */ +- getMainColor(): Promise; +- +- /** +- * get main color of an image +- * @returns { Color } Main color picked in the image. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 9 +- */ +- /** +- * get main color of an image +- * @returns { Color } Main color picked in the image. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * get main color of an image +- * @returns { Color } Main color picked in the image. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since 14 +- */ +- getMainColorSync(): Color; +- +- /** +- * Get largest proportion color of an image +- * @returns { Color } Largest proportion color picked in the image. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 10 +- */ +- /** +- * Get largest proportion color of an image +- * @returns { Color } Largest proportion color picked in the image. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * Get largest proportion color of an image +- * @returns { Color } Largest proportion color picked in the image. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since 14 +- */ +- getLargestProportionColor(): Color; +- +- /** +- * Get top proportion color of an image +- * @param { number } colorCount - The number of colors to require, the value is 1 to 10. +- * @returns { Array } An array of feature colors sorted by proportion, with a size equal to +- * the minimum of colorCount and the actual number of extracted feature colors. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * Get top proportion color of an image +- * @param { number } colorCount - The number of colors to require, the value is 1 to 10. +- * @returns { Array } An array of feature colors sorted by proportion, with a size equal to +- * the minimum of colorCount and the actual number of extracted feature colors. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since 14 +- */ +- getTopProportionColors(colorCount: number): Array; +- +- /** +- * Get highest saturation color of an image +- * @returns { Color } Highest saturation color picked in the image. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 10 +- */ +- /** +- * Get highest saturation color of an image +- * @returns { Color } Highest saturation color picked in the image. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * Get highest saturation color of an image +- * @returns { Color } Highest saturation color picked in the image. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since 14 +- */ +- getHighestSaturationColor(): Color; +- +- /** +- * Get average color of an image +- * @returns { Color } Average color calculated in the image. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 10 +- */ +- /** +- * Get average color of an image +- * @returns { Color } Average color calculated in the image. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * Get average color of an image +- * @returns { Color } Average color calculated in the image. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since 14 +- */ +- getAverageColor(): Color; +- +- /** +- * Determine whether the color is black or white or gray +- * @param { number } color - The 32 bit ARGB color to discriminate. +- * @returns { boolean } Result of judging black, white and gray. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 10 +- */ +- /** +- * Determine whether the color is black or white or gray +- * @param { number } color - The 32 bit ARGB color to discriminate. +- * @returns { boolean } Result of judging black, white and gray. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * Determine whether the color is black or white or gray +- * @param { number } color - The 32 bit ARGB color to discriminate. +- * @returns { boolean } Result of judging black, white and gray. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since 14 +- */ +- isBlackOrWhiteOrGrayColor(color: number): boolean; +- } +- +- /** +- * The color param. +- * @typedef Color +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 9 +- */ +- /** +- * The color param. +- * @typedef Color +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * The color param. +- * @typedef Color +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since 14 +- */ +- interface Color { +- +- /** +- * Red +- * @type { number } +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 9 +- */ +- /** +- * Red +- * @type { number } +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * Red +- * @type { number } +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since 14 +- */ +- red: number; +- +- /** +- * Green +- * @type { number } +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 9 +- */ +- /** +- * Green +- * @type { number } +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * Green +- * @type { number } +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since 14 +- */ +- green: number; +- +- /** +- * Blue +- * @type { number } +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 9 +- */ +- /** +- * Blue +- * @type { number } +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * Blue +- * @type { number } +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since 14 +- */ +- blue: number; +- +- /** +- * Alpha +- * @type { number } +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 9 +- */ +- /** +- * Alpha +- * @type { number } +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * Alpha +- * @type { number } +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since 14 +- */ +- alpha: number; +- } +- +- /** +- * Create a FilterChain to add multiple effects to an image. +- * @param { image.PixelMap } source - the source pixelmap. +- * @returns { Filter } Returns the head node of FilterChain. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 9 +- */ +- /** +- * Create a FilterChain to add multiple effects to an image. +- * @param { image.PixelMap } source - the source pixelmap. +- * @returns { Filter } Returns the head node of FilterChain. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * Create a FilterChain to add multiple effects to an image. +- * @param { image.PixelMap } source - the source pixelmap. +- * @returns { Filter } Returns the head node of FilterChain. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since arkts {'1.1':'14', '1.2':'20'} +- * @arkts 1.1&1.2 +- */ +- function createEffect(source: image.PixelMap): Filter; +- +- /** +- * Create a color picker to get color of an image. +- * @param { image.PixelMap } source - the source pixelmap. +- * @returns { Promise } - returns the ColorPicker generated. +- * @throws { BusinessError } 401 - Input parameter error. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 9 +- */ +- /** +- * Create a color picker to get color of an image. +- * @param { image.PixelMap } source - the source pixelmap. +- * @returns { Promise } - returns the ColorPicker generated. +- * @throws { BusinessError } 401 - Input parameter error. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * Create a color picker to get color of an image. +- * @param { image.PixelMap } source - the source pixelmap. +- * @returns { Promise } - returns the ColorPicker generated. +- * @throws { BusinessError } 401 - Input parameter error. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since 14 +- */ +- function createColorPicker(source: image.PixelMap): Promise; +- +- /** +- * Create a color picker to get color of an image. +- * @param { image.PixelMap } source - the source pixelmap. +- * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, +- * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. +- * @returns { Promise } - returns the ColorPicker generated. +- * @throws { BusinessError } 401 - Input parameter error. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 10 +- */ +- /** +- * Create a color picker to get color of an image. +- * @param { image.PixelMap } source - the source pixelmap. +- * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, +- * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. +- * @returns { Promise } - returns the ColorPicker generated. +- * @throws { BusinessError } 401 - Input parameter error. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * Create a color picker to get color of an image. +- * @param { image.PixelMap } source - the source pixelmap. +- * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, +- * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. +- * @returns { Promise } - returns the ColorPicker generated. +- * @throws { BusinessError } 401 - Input parameter error. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since 14 +- */ +- function createColorPicker(source: image.PixelMap, region: Array): Promise; +- +- /** +- * Create a color picker to get color of an image. +- * @param { image.PixelMap } source - the source pixelmap. +- * @param { AsyncCallback } callback - the callback of createColorPicker. +- * @throws { BusinessError } 401 - Input parameter error. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 9 +- */ +- /** +- * Create a color picker to get color of an image. +- * @param { image.PixelMap } source - the source pixelmap. +- * @param { AsyncCallback } callback - the callback of createColorPicker. +- * @throws { BusinessError } 401 - Input parameter error. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * Create a color picker to get color of an image. +- * @param { image.PixelMap } source - the source pixelmap. +- * @param { AsyncCallback } callback - the callback of createColorPicker. +- * @throws { BusinessError } 401 - Input parameter error. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since 14 +- */ +- function createColorPicker(source: image.PixelMap, callback: AsyncCallback): void; +- +- /** +- * Create a color picker to get color of an image. +- * @param { image.PixelMap } source - the source pixelmap. +- * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, +- * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. +- * @param { AsyncCallback } callback - the callback of createColorPicker. +- * @throws { BusinessError } 401 - Input parameter error. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 10 +- */ +- /** +- * Create a color picker to get color of an image. +- * @param { image.PixelMap } source - the source pixelmap. +- * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, +- * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. +- * @param { AsyncCallback } callback - the callback of createColorPicker. +- * @throws { BusinessError } 401 - Input parameter error. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @form +- * @atomicservice +- * @since 12 +- */ +- /** +- * Create a color picker to get color of an image. +- * @param { image.PixelMap } source - the source pixelmap. +- * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, +- * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. +- * @param { AsyncCallback } callback - the callback of createColorPicker. +- * @throws { BusinessError } 401 - Input parameter error. +- * @syscap SystemCapability.Multimedia.Image.Core +- * @crossplatform +- * @form +- * @atomicservice +- * @since 14 +- */ +- function createColorPicker(source: image.PixelMap, region: Array, callback: AsyncCallback): void; +- +- /** +- * TileMode enumeration description +- * +- * @enum { number } +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 14 +- */ +- enum TileMode { +- /** +- * Clamp mode. +- * +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 14 +- */ +- CLAMP = 0, +- +- /** +- * Repeat mode. +- * +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 14 +- */ +- REPEAT = 1, +- +- /** +- * Mirror mode. +- * +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 14 +- */ +- MIRROR = 2, +- +- /** +- * Decal mode. +- * +- * @syscap SystemCapability.Multimedia.Image.Core +- * @since 14 +- */ +- DECAL = 3, +- } +-} +- +-export default effectKit; ++/* ++* Copyright (c) 2022 Huawei Device Co., Ltd. ++* Licensed under the Apache License, Version 2.0 (the "License"); ++* you may not use this file except in compliance with the License. ++* You may obtain a copy of the License at ++* ++* http://www.apache.org/licenses/LICENSE-2.0 ++* ++* Unless required by applicable law or agreed to in writing, software ++* distributed under the License is distributed on an "AS IS" BASIS, ++* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++* See the License for the specific language governing permissions and ++* limitations under the License. ++*/ ++ ++/** ++ * @file ++ * @kit ArkGraphics2D ++ */ ++ ++ ++import { AsyncCallback } from './@ohos.base'; ++import image from './@ohos.multimedia.image'; ++ ++ ++/** ++ * @namespace effectKit ++ * @since 9 ++ */ ++/** ++ * @namespace effectKit ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++/** ++ * @namespace effectKit ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ ++declare namespace effectKit { ++ ++ /** ++ * The Filter of FilterChain. ++ * @typedef Filter ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 9 ++ */ ++ /** ++ * The Filter of FilterChain. ++ * @typedef Filter ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * The Filter of FilterChain. ++ * @typedef Filter ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ interface Filter { ++ ++ /** ++ * A blur effect is added to the image. ++ * @param { number } radius - The degree of blur, the value is measured in pixels. ++ * @returns { Filter } Filters for the current effect have been added. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 9 ++ */ ++ /** ++ * A blur effect is added to the image. ++ * @param { number } radius - The degree of blur, the value is measured in pixels. ++ * @returns { Filter } Filters for the current effect have been added. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * A blur effect is added to the image. ++ * @param { number } radius - The degree of blur, the value is measured in pixels. ++ * @returns { Filter } Filters for the current effect have been added. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ blur(radius: number): Filter; ++ ++ /** ++ * A blur effect is added to the image. ++ * @param { number } radius - The degree of blur, the value is measured in pixels. ++ * @param { TileMode } tileMode - The tile mode of blur. ++ * @returns { Filter } Filters for the current effect have been added. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ blur(radius: number, tileMode: TileMode): Filter; ++ ++ /** ++ * A Brightness effect is added to the image. ++ * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. ++ * @returns { Filter } Filters for the current effect have been added. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 9 ++ */ ++ /** ++ * A Brightness effect is added to the image. ++ * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. ++ * @returns { Filter } Filters for the current effect have been added. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * A Brightness effect is added to the image. ++ * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. ++ * @returns { Filter } Filters for the current effect have been added. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ brightness(bright: number): Filter; ++ ++ /** ++ * A Grayscale effect is added to the image. ++ * @returns { Filter } Filters for the current effect have been added. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 9 ++ */ ++ /** ++ * A Grayscale effect is added to the image. ++ * @returns { Filter } Filters for the current effect have been added. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * A Grayscale effect is added to the image. ++ * @returns { Filter } Filters for the current effect have been added. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ grayscale(): Filter; ++ ++ /** ++ * A invert effect is added to the image. ++ * @returns { Filter } Filters for the current effect have been added. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 12 ++ */ ++ /** ++ * A invert effect is added to the image. ++ * @returns { Filter } Filters for the current effect have been added. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ invert(): Filter; ++ ++ /** ++ * A custom effect is added to the image. ++ * ++ * @param { Array } colorMatrix - A matrix of 5x4 size for create effect filter. ++ * @returns { Filter } Filters for the current effect have been added. ++ * @throws { BusinessError } 401 - Input parameter error. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 12 ++ */ ++ /** ++ * A custom effect is added to the image. ++ * ++ * @param { Array } colorMatrix - A matrix of 5x4 size for create effect filter. ++ * @returns { Filter } Filters for the current effect have been added. ++ * @throws { BusinessError } 401 - Input parameter error. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ setColorMatrix(colorMatrix: Array): Filter; ++ ++ /** ++ * Gets the PixelMap where all filter effects have been added to the image. ++ * @returns { image.PixelMap } image.PixelMap. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 9 ++ * @deprecated since 11 ++ * @useinstead effectKit.Filter#getEffectPixelMap ++ */ ++ getPixelMap(): image.PixelMap; ++ ++ /** ++ * Gets the PixelMap where all filter effects have been added to the image. ++ * @returns { Promise } - returns the PixelMap generated. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 11 ++ */ ++ /** ++ * Gets the PixelMap where all filter effects have been added to the image. ++ * @returns { Promise } - returns the PixelMap generated. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * Gets the PixelMap where all filter effects have been added to the image. ++ * @returns { Promise } - returns the PixelMap generated. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ getEffectPixelMap(): Promise; ++ } ++ ++ /** ++ * The color picker of an image. ++ * @typedef ColorPicker ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 9 ++ */ ++ /** ++ * The color picker of an image. ++ * @typedef ColorPicker ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * The color picker of an image. ++ * @typedef ColorPicker ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ interface ColorPicker { ++ ++ /** ++ * get main color of an image ++ * @returns { Promise } returns the MainColor generated. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 9 ++ */ ++ /** ++ * get main color of an image ++ * @returns { Promise } returns the MainColor generated. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * get main color of an image ++ * @returns { Promise } returns the MainColor generated. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ getMainColor(): Promise; ++ ++ /** ++ * get main color of an image ++ * @returns { Color } Main color picked in the image. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 9 ++ */ ++ /** ++ * get main color of an image ++ * @returns { Color } Main color picked in the image. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * get main color of an image ++ * @returns { Color } Main color picked in the image. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ getMainColorSync(): Color; ++ ++ /** ++ * Get largest proportion color of an image ++ * @returns { Color } Largest proportion color picked in the image. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 10 ++ */ ++ /** ++ * Get largest proportion color of an image ++ * @returns { Color } Largest proportion color picked in the image. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * Get largest proportion color of an image ++ * @returns { Color } Largest proportion color picked in the image. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ getLargestProportionColor(): Color; ++ ++ /** ++ * Get top proportion color of an image ++ * @param { number } colorCount - The number of colors to require, the value is 1 to 10. ++ * @returns { Array } An array of feature colors sorted by proportion, with a size equal to ++ * the minimum of colorCount and the actual number of extracted feature colors. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * Get top proportion color of an image ++ * @param { number } colorCount - The number of colors to require, the value is 1 to 10. ++ * @returns { Array } An array of feature colors sorted by proportion, with a size equal to ++ * the minimum of colorCount and the actual number of extracted feature colors. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ getTopProportionColors(colorCount: number): Array; ++ ++ /** ++ * Get highest saturation color of an image ++ * @returns { Color } Highest saturation color picked in the image. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 10 ++ */ ++ /** ++ * Get highest saturation color of an image ++ * @returns { Color } Highest saturation color picked in the image. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * Get highest saturation color of an image ++ * @returns { Color } Highest saturation color picked in the image. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ getHighestSaturationColor(): Color; ++ ++ /** ++ * Get average color of an image ++ * @returns { Color } Average color calculated in the image. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 10 ++ */ ++ /** ++ * Get average color of an image ++ * @returns { Color } Average color calculated in the image. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * Get average color of an image ++ * @returns { Color } Average color calculated in the image. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ getAverageColor(): Color; ++ ++ /** ++ * Determine whether the color is black or white or gray ++ * @param { number } color - The 32 bit ARGB color to discriminate. ++ * @returns { boolean } Result of judging black, white and gray. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 10 ++ */ ++ /** ++ * Determine whether the color is black or white or gray ++ * @param { number } color - The 32 bit ARGB color to discriminate. ++ * @returns { boolean } Result of judging black, white and gray. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * Determine whether the color is black or white or gray ++ * @param { number } color - The 32 bit ARGB color to discriminate. ++ * @returns { boolean } Result of judging black, white and gray. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ isBlackOrWhiteOrGrayColor(color: number): boolean; ++ } ++ ++ /** ++ * The color param. ++ * @typedef Color ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 9 ++ */ ++ /** ++ * The color param. ++ * @typedef Color ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * The color param. ++ * @typedef Color ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ interface Color { ++ ++ /** ++ * Red ++ * @type { number } ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 9 ++ */ ++ /** ++ * Red ++ * @type { number } ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * Red ++ * @type { number } ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ red: number; ++ ++ /** ++ * Green ++ * @type { number } ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 9 ++ */ ++ /** ++ * Green ++ * @type { number } ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * Green ++ * @type { number } ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ green: number; ++ ++ /** ++ * Blue ++ * @type { number } ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 9 ++ */ ++ /** ++ * Blue ++ * @type { number } ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * Blue ++ * @type { number } ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ blue: number; ++ ++ /** ++ * Alpha ++ * @type { number } ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 9 ++ */ ++ /** ++ * Alpha ++ * @type { number } ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * Alpha ++ * @type { number } ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ alpha: number; ++ } ++ ++ /** ++ * Create a FilterChain to add multiple effects to an image. ++ * @param { image.PixelMap } source - the source pixelmap. ++ * @returns { Filter } Returns the head node of FilterChain. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 9 ++ */ ++ /** ++ * Create a FilterChain to add multiple effects to an image. ++ * @param { image.PixelMap } source - the source pixelmap. ++ * @returns { Filter } Returns the head node of FilterChain. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * Create a FilterChain to add multiple effects to an image. ++ * @param { image.PixelMap } source - the source pixelmap. ++ * @returns { Filter } Returns the head node of FilterChain. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ function createEffect(source: image.PixelMap): Filter; ++ ++ /** ++ * Create a color picker to get color of an image. ++ * @param { image.PixelMap } source - the source pixelmap. ++ * @returns { Promise } - returns the ColorPicker generated. ++ * @throws { BusinessError } 401 - Input parameter error. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 9 ++ */ ++ /** ++ * Create a color picker to get color of an image. ++ * @param { image.PixelMap } source - the source pixelmap. ++ * @returns { Promise } - returns the ColorPicker generated. ++ * @throws { BusinessError } 401 - Input parameter error. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * Create a color picker to get color of an image. ++ * @param { image.PixelMap } source - the source pixelmap. ++ * @returns { Promise } - returns the ColorPicker generated. ++ * @throws { BusinessError } 401 - Input parameter error. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ function createColorPicker(source: image.PixelMap): Promise; ++ ++ /** ++ * Create a color picker to get color of an image. ++ * @param { image.PixelMap } source - the source pixelmap. ++ * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, ++ * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. ++ * @returns { Promise } - returns the ColorPicker generated. ++ * @throws { BusinessError } 401 - Input parameter error. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 10 ++ */ ++ /** ++ * Create a color picker to get color of an image. ++ * @param { image.PixelMap } source - the source pixelmap. ++ * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, ++ * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. ++ * @returns { Promise } - returns the ColorPicker generated. ++ * @throws { BusinessError } 401 - Input parameter error. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * Create a color picker to get color of an image. ++ * @param { image.PixelMap } source - the source pixelmap. ++ * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, ++ * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. ++ * @returns { Promise } - returns the ColorPicker generated. ++ * @throws { BusinessError } 401 - Input parameter error. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ function createColorPicker(source: image.PixelMap, region: Array): Promise; ++ ++ /** ++ * Create a color picker to get color of an image. ++ * @param { image.PixelMap } source - the source pixelmap. ++ * @param { AsyncCallback } callback - the callback of createColorPicker. ++ * @throws { BusinessError } 401 - Input parameter error. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 9 ++ */ ++ /** ++ * Create a color picker to get color of an image. ++ * @param { image.PixelMap } source - the source pixelmap. ++ * @param { AsyncCallback } callback - the callback of createColorPicker. ++ * @throws { BusinessError } 401 - Input parameter error. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * Create a color picker to get color of an image. ++ * @param { image.PixelMap } source - the source pixelmap. ++ * @param { AsyncCallback } callback - the callback of createColorPicker. ++ * @throws { BusinessError } 401 - Input parameter error. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ function createColorPicker(source: image.PixelMap, callback: AsyncCallback): void; ++ ++ /** ++ * Create a color picker to get color of an image. ++ * @param { image.PixelMap } source - the source pixelmap. ++ * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, ++ * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. ++ * @param { AsyncCallback } callback - the callback of createColorPicker. ++ * @throws { BusinessError } 401 - Input parameter error. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since 10 ++ */ ++ /** ++ * Create a color picker to get color of an image. ++ * @param { image.PixelMap } source - the source pixelmap. ++ * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, ++ * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. ++ * @param { AsyncCallback } callback - the callback of createColorPicker. ++ * @throws { BusinessError } 401 - Input parameter error. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @form ++ * @atomicservice ++ * @since 12 ++ */ ++ /** ++ * Create a color picker to get color of an image. ++ * @param { image.PixelMap } source - the source pixelmap. ++ * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, ++ * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. ++ * @param { AsyncCallback } callback - the callback of createColorPicker. ++ * @throws { BusinessError } 401 - Input parameter error. ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ function createColorPicker(source: image.PixelMap, region: Array, callback: AsyncCallback): void; ++ ++ /** ++ * TileMode enumeration description ++ * ++ * @enum { number } ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ enum TileMode { ++ /** ++ * Clamp mode. ++ * ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ CLAMP = 0, ++ ++ /** ++ * Repeat mode. ++ * ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ REPEAT = 1, ++ ++ /** ++ * Mirror mode. ++ * ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ MIRROR = 2, ++ ++ /** ++ * Decal mode. ++ * ++ * @syscap SystemCapability.Multimedia.Image.Core ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ DECAL = 3, ++ } ++} ++ ++export default effectKit; +diff --git a/api/@ohos.enterprise.adminManager.d.ts b/api/@ohos.enterprise.adminManager.d.ts +index 6cae1cec8..08db01378 100644 +--- a/api/@ohos.enterprise.adminManager.d.ts ++++ b/api/@ohos.enterprise.adminManager.d.ts +@@ -27,7 +27,8 @@ import common from '@ohos.app.ability.common'; + * + * @namespace adminManager + * @syscap SystemCapability.Customization.EnterpriseDeviceManager +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace adminManager { + /** +@@ -36,7 +37,8 @@ declare namespace adminManager { + * @typedef EnterpriseInfo + * @syscap SystemCapability.Customization.EnterpriseDeviceManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface EnterpriseInfo { + /** +@@ -45,7 +47,8 @@ declare namespace adminManager { + * @type { string } + * @syscap SystemCapability.Customization.EnterpriseDeviceManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + name: string; + +@@ -55,7 +58,8 @@ declare namespace adminManager { + * @type { string } + * @syscap SystemCapability.Customization.EnterpriseDeviceManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + description: string; + } +@@ -426,7 +430,8 @@ declare namespace adminManager { + * @syscap SystemCapability.Customization.EnterpriseDeviceManager + * @systemapi + * @stagemodelonly +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getEnterpriseInfo(admin: Want, callback: AsyncCallback): void; + +@@ -442,7 +447,8 @@ declare namespace adminManager { + * @syscap SystemCapability.Customization.EnterpriseDeviceManager + * @systemapi + * @stagemodelonly +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getEnterpriseInfo(admin: Want): Promise; + +@@ -664,7 +670,8 @@ declare namespace adminManager { + * @syscap SystemCapability.Customization.EnterpriseDeviceManager + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSuperAdmin(): Promise; + +diff --git a/api/@ohos.enterprise.securityManager.d.ts b/api/@ohos.enterprise.securityManager.d.ts +index db5ccc687..f0cb9d144 100644 +--- a/api/@ohos.enterprise.securityManager.d.ts ++++ b/api/@ohos.enterprise.securityManager.d.ts +@@ -27,7 +27,8 @@ import type image from './@ohos.multimedia.image'; + * @namespace securityManager + * @syscap SystemCapability.Customization.EnterpriseDeviceManager + * @stagemodelonly +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace securityManager { + /** +@@ -273,7 +274,8 @@ declare namespace securityManager { + * @syscap SystemCapability.Customization.EnterpriseDeviceManager + * @systemapi + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getPasswordPolicy(): PasswordPolicy; + +@@ -394,7 +396,8 @@ declare namespace securityManager { + * @typedef PasswordPolicy + * @syscap SystemCapability.Customization.EnterpriseDeviceManager + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface PasswordPolicy { + /** +@@ -403,19 +406,21 @@ declare namespace securityManager { + * @type { ?string } + * @syscap SystemCapability.Customization.EnterpriseDeviceManager + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + complexityRegex?: string; + + /** + * Period of validity + * +- * @type { ?number } ++ * @type { ?long } + * @syscap SystemCapability.Customization.EnterpriseDeviceManager + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- validityPeriod?: number; ++ validityPeriod?: long; + + /** + * Other supplementary description +@@ -423,7 +428,8 @@ declare namespace securityManager { + * @type { ?string } + * @syscap SystemCapability.Customization.EnterpriseDeviceManager + * @stagemodelonly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + additionalDescription?: string; + } +diff --git a/api/@ohos.events.emitter.d.ts b/api/@ohos.events.emitter.d.ts +index a36debc31..978f1ab1e 100644 +--- a/api/@ohos.events.emitter.d.ts ++++ b/api/@ohos.events.emitter.d.ts +@@ -544,10 +544,9 @@ declare namespace emitter { + /** + * Data carried by the event. + * +- * @type { ?object } ++ * @type { ?Record } + * @syscap SystemCapability.Notification.Emitter + * @crossplatform +- * @atomicservice + * @since 20 + * @arkts 1.2 + */ +diff --git a/api/@ohos.file.hash.d.ts b/api/@ohos.file.hash.d.ts +index 60bf4c044..223286ef7 100644 +--- a/api/@ohos.file.hash.d.ts ++++ b/api/@ohos.file.hash.d.ts +@@ -133,7 +133,8 @@ declare namespace hash { + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function createHash(algorithm: string): HashStream; + } +diff --git a/api/@ohos.file.keyManager.d.ets b/api/@ohos.file.keyManager.d.ets +deleted file mode 100644 +index 574722d98..000000000 +--- a/api/@ohos.file.keyManager.d.ets ++++ /dev/null +@@ -1,46 +0,0 @@ +-/* +- * Copyright (c) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-/** +- * @file +- * @kit CoreFileKit +- */ +- +-/** +- * Provides filesystem KeyManager APIs. +- * +- * @namespace keyManager +- * @syscap SystemCapability.FileManagement.StorageService.Encryption +- * @since 20 +- */ +-declare namespace keyManager { +- /** +- * Initiate the deactivation of user key for the specified user when user screen is locked. +- * +- * @permission ohos.permission.STORAGE_MANAGER_CRYPT +- * @param { int } userId +- * @throws { BusinessError } 201 - Permission verification failed. +- * @throws { BusinessError } 202 - The caller is not a system application. +- * @throws { BusinessError } 13600001 - IPC error. +- * @throws { BusinessError } 13600008 - No such object. Possible causes: Cannot find userkey for the specified user. +- * input parameter userId < 100 or userId > 10736. +- * @syscap SystemCapability.FileManagement.StorageService.Encryption +- * @systemapi +- * @since 20 +- */ +- function deactivateUserKeyId(userId: int):void; +- } +- +- export default keyManager; +\ No newline at end of file +diff --git a/api/@ohos.file.keyManager.d.ts b/api/@ohos.file.keyManager.d.ts +index 058ad8dd9..dd72db4b8 100644 +--- a/api/@ohos.file.keyManager.d.ts ++++ b/api/@ohos.file.keyManager.d.ts +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2024 Huawei Device Co., Ltd. ++ * Copyright (c) 2024-2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at +@@ -16,6 +16,7 @@ + /** + * @file + * @kit CoreFileKit ++ * @arkts 1.1&1.2 + */ + + /** +@@ -23,7 +24,7 @@ + * + * @namespace keyManager + * @syscap SystemCapability.FileManagement.StorageService.Encryption +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} + */ + declare namespace keyManager { + /** +@@ -40,7 +41,7 @@ declare namespace keyManager { + * @throws { BusinessError } 13600009 - User ID out of range. Possible causes: input parameter userId < 100 or userId > 10736. + * @syscap SystemCapability.FileManagement.StorageService.Encryption + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} + */ + function deactivateUserKey(userId: number):void; + } +diff --git a/api/@ohos.file.photoAccessHelper.d.ts b/api/@ohos.file.photoAccessHelper.d.ts +index 21877e4f2..1aa25fd03 100644 +--- a/api/@ohos.file.photoAccessHelper.d.ts ++++ b/api/@ohos.file.photoAccessHelper.d.ts +@@ -259,7 +259,8 @@ declare namespace photoAccessHelper { + * @enum { number } ThumbnailVisibility + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum ThumbnailVisibility { + /** +@@ -267,7 +268,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INVISIBLE = 0, + /** +@@ -275,7 +277,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + VISIBLE = 1 + } +@@ -331,7 +334,8 @@ declare namespace photoAccessHelper { + * Asset exists in local device and cloud + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LOCAL_AND_CLOUD = 3 + } +@@ -495,7 +499,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ANALYSIS_SEARCH_INDEX = 16 + } +@@ -615,7 +620,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + COLOR_STYLE_PHOTO = 12 + } +@@ -1053,7 +1059,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class MediaAssetManager { + /** +@@ -1071,7 +1078,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @static + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + static requestImage( + context: Context, +@@ -1119,7 +1127,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @static + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + static requestImageData( + context: Context, +@@ -1161,7 +1170,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @static + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + static requestMovingPhoto( + context: Context, +@@ -1183,7 +1193,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @static + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + static cancelRequest(context: Context, requestId: string): Promise; + +@@ -1222,7 +1233,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @static + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + static requestVideoFile( + context: Context, +@@ -1259,7 +1271,8 @@ declare namespace photoAccessHelper { + * @static + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + static loadMovingPhoto( + context: Context, +@@ -1624,7 +1637,8 @@ declare namespace photoAccessHelper { + *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getThumbnailData(type: ThumbnailType): Promise; + /** +@@ -1754,7 +1768,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getExif(callback: AsyncCallback): void; + /** +@@ -1787,7 +1802,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getExif(): Promise; + /** +@@ -1803,7 +1819,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setPending(pendingState: boolean, callback: AsyncCallback): void; + /** +@@ -1819,7 +1836,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setPending(pendingState: boolean): Promise; + /** +@@ -1834,7 +1852,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isEdited(callback: AsyncCallback): void; + /** +@@ -1849,7 +1868,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isEdited(): Promise; + /** +@@ -1864,7 +1884,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + requestEditData(callback: AsyncCallback): void; + /** +@@ -1879,7 +1900,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + requestEditData(): Promise; + /** +@@ -1894,7 +1916,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getEditData(): Promise; + /** +@@ -1909,7 +1932,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - Internal system error. It is recommended to retry and check the logs. + *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + clone(title: string): Promise; + /** +@@ -1924,7 +1948,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + requestSource(callback: AsyncCallback): void; + /** +@@ -1939,7 +1964,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + requestSource(): Promise; + /** +@@ -1973,7 +1999,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + commitEditedAsset(editData: string, uri: string): Promise; + /** +@@ -2003,7 +2030,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + revertToOriginal(): Promise; + /** +@@ -2051,7 +2079,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + cancelPhotoRequest(requestId: string): void; + /** +@@ -2068,7 +2097,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - Internal system error + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getKeyFrameThumbnail(beginFrameTimeMs: number, type: ThumbnailType): Promise; + } +@@ -2503,7 +2533,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + THUMBNAIL_VISIBLE = 'thumbnail_visible', + /** +@@ -2511,7 +2542,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + IS_CE_AUTO = 'is_auto', + /** +@@ -2519,7 +2551,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + OWNER_ALBUM_ID = 'owner_album_id', + /** +@@ -2527,14 +2560,16 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + IS_RECENT_SHOW = 'is_recent_show', + /** + * Suffix of the asset, read only + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MEDIA_SUFFIX = 'media_suffix' + +@@ -2592,7 +2627,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ALBUM_LPATH = 'lpath', + /** +@@ -2600,7 +2636,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BUNDLE_NAME = 'bundle_name', + /** +@@ -2608,7 +2645,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DATE_MODIFIED = 'date_modified', + } +@@ -2867,7 +2905,8 @@ declare namespace photoAccessHelper { + * @interface PhotoCreationSource + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PhotoCreationSource { + /** +@@ -2876,7 +2915,8 @@ declare namespace photoAccessHelper { + * @type { ?string } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + bundleName?: string; + /** +@@ -2885,7 +2925,8 @@ declare namespace photoAccessHelper { + * @type { ?string } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + appName?: string; + /** +@@ -2894,7 +2935,8 @@ declare namespace photoAccessHelper { + * @type { ?string } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + appId?: string; + /** +@@ -2903,7 +2945,8 @@ declare namespace photoAccessHelper { + * @type { ?number } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + tokenId?: number; + } +@@ -2973,7 +3016,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @crossplatform +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isAfterLast(): boolean; + /** +@@ -3105,7 +3149,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @crossplatform +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getLastObject(callback: AsyncCallback): void; + /** +@@ -3129,7 +3174,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @crossplatform +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getLastObject(): Promise; + /** +@@ -3313,7 +3359,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SOURCE = 2048, + /** +@@ -3704,7 +3751,8 @@ declare namespace photoAccessHelper { + * @readonly + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly lpath?: string; + /** +@@ -3850,7 +3898,8 @@ declare namespace photoAccessHelper { + * @readonly + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly dateAdded?: number; + /** +@@ -3860,7 +3909,8 @@ declare namespace photoAccessHelper { + * @readonly + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly dateModified?: number; + /** +@@ -4696,7 +4746,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - Internal system error + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getDataAnalysisProgress(analysisType: AnalysisType): Promise; + /** +@@ -4969,7 +5020,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail. + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + saveGalleryFormInfo(info: GalleryFormInfo): Promise; + /** +@@ -4985,7 +5037,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail. + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + removeFormInfo(info: FormInfo, callback: AsyncCallback): void; + /** +@@ -5001,7 +5054,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail. + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + removeFormInfo(info: FormInfo): Promise; + /** +@@ -5017,7 +5071,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail. + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + removeGalleryFormInfo(info: GalleryFormInfo): Promise; + /** +@@ -5033,7 +5088,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail. + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + updateGalleryFormInfo(info: GalleryFormInfo): Promise; + /** +@@ -5083,7 +5139,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - Internal system error + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + grantPhotoUrisPermission( + tokenId: number, +@@ -5126,7 +5183,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - Internal system error + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + cancelPhotoUriPermission(tokenId: number, uri: string, photoPermissionType: PhotoPermissionType): Promise; + /** +@@ -5143,7 +5201,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - Internal system error + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + startThumbnailCreationTask(predicate: dataSharePredicates.DataSharePredicates, callback: AsyncCallback): number; + /** +@@ -5175,7 +5234,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - Internal system error + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSharedPhotoAssets(options: FetchOptions): Array; + /** +@@ -5187,7 +5247,8 @@ declare namespace photoAccessHelper { + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14000011 - Internal system error. It is recommended to retry and check the logs. + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSupportedPhotoFormats(photoType: PhotoType): Promise>; + /** +@@ -5203,7 +5264,8 @@ declare namespace photoAccessHelper { + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + startAssetAnalysis(type: AnalysisType, assetUris?: Array): Promise; + /** +@@ -5219,7 +5281,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getAlbumsByIds(albumIds: Array): Promise>; + /** +@@ -5238,7 +5301,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - Internal system error + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + createAssetsForAppWithAlbum(source: PhotoCreationSource, albumUri: string, isAuthorized: boolean, + photoCreationConfigs: Array): Promise>; +@@ -5250,7 +5314,8 @@ declare namespace photoAccessHelper { + * @interface GalleryFormInfo + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface GalleryFormInfo { + /** +@@ -5259,7 +5324,8 @@ declare namespace photoAccessHelper { + * @type { string } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + formId: string; + /** +@@ -5268,7 +5334,8 @@ declare namespace photoAccessHelper { + * @type { ?Array } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + assetUris?: Array; + } +@@ -5434,7 +5501,8 @@ declare namespace photoAccessHelper { + * @type { Array } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + sharedPhotoAssets: Array; + /** +@@ -5443,7 +5511,8 @@ declare namespace photoAccessHelper { + * @type { Array } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + sharedAlbumAssets: Array; + /** +@@ -5452,7 +5521,8 @@ declare namespace photoAccessHelper { + * @type { Array } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + sharedExtraPhotoAssets: Array; + } +@@ -6084,7 +6154,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + constructor(compatibleFormat: string, formatVersion: string); + +@@ -6177,7 +6248,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRIVATE_MOVING_PHOTO_METADATA = 5 + } +@@ -6779,7 +6851,8 @@ declare namespace photoAccessHelper { + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14000011 - Internal system error + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setOrientation(orientation: number): void; + +@@ -6831,7 +6904,8 @@ declare namespace photoAccessHelper { + * @static + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + static deleteLocalAssetsPermanently(context: Context, assets: Array): Promise; + } +@@ -6916,7 +6990,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - System inner fail + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setIsRecentShow(isRencentShow: boolean): void; + } +@@ -7535,7 +7610,8 @@ declare namespace photoAccessHelper { + * @type { number } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + thumbnailModifiedMs?: number; + /** +@@ -7544,7 +7620,8 @@ declare namespace photoAccessHelper { + * @type { ThumbnailVisibility } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + thumbnailVisible: ThumbnailVisibility; + } +@@ -7555,7 +7632,8 @@ declare namespace photoAccessHelper { + * @interface SharedAlbumAsset + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface SharedAlbumAsset { + /** +@@ -7564,7 +7642,8 @@ declare namespace photoAccessHelper { + * @type { number } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + albumId: number; + /** +@@ -7573,7 +7652,8 @@ declare namespace photoAccessHelper { + * @type { AlbumType } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + albumType: AlbumType; + /** +@@ -7582,7 +7662,8 @@ declare namespace photoAccessHelper { + * @type { AlbumSubtype } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + albumSubType: AlbumSubtype; + /** +@@ -7591,7 +7672,8 @@ declare namespace photoAccessHelper { + * @type { string } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + albumName: string; + /** +@@ -7600,7 +7682,8 @@ declare namespace photoAccessHelper { + * @type { string } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + coverUri: string; + /** +@@ -7609,7 +7692,8 @@ declare namespace photoAccessHelper { + * @type { number } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + count: number; + /** +@@ -7618,7 +7702,8 @@ declare namespace photoAccessHelper { + * @type { number } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + imageCount: number; + /** +@@ -7627,7 +7712,8 @@ declare namespace photoAccessHelper { + * @type { number } + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + videoCount: number; + } +@@ -7878,7 +7964,8 @@ declare namespace photoAccessHelper { + * @extends MediaAlbumChangeRequest + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class MediaAnalysisAlbumChangeRequest extends MediaAlbumChangeRequest { + /** +@@ -7890,7 +7977,8 @@ declare namespace photoAccessHelper { + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + constructor(album: Album); + +@@ -7908,7 +7996,8 @@ declare namespace photoAccessHelper { + *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setOrderPosition(assets: Array, position: Array): void; + } +@@ -7918,7 +8007,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class AnalysisAlbum { + /** +@@ -7930,7 +8020,8 @@ declare namespace photoAccessHelper { + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + constructor(album: Album); + /** +@@ -7947,7 +8038,8 @@ declare namespace photoAccessHelper { + *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getOrderPosition(assets: Array): Promise>; + } +@@ -8007,7 +8099,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - Internal system error + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getHighlightResource(resourceUri: string): Promise; + +@@ -8025,7 +8118,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - Internal system error + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setHighlightUserActionData(type: HighlightUserActionType, actionData: number): Promise; + +@@ -8043,7 +8137,8 @@ declare namespace photoAccessHelper { + *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setSubTitle(subTitle: string): Promise; + +@@ -8063,7 +8158,8 @@ declare namespace photoAccessHelper { + * @static + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + static deleteHighlightAlbums(context: Context, albums: Array): Promise; + } +@@ -8271,7 +8367,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - Internal system error + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + submitCloudEnhancementTasks( + photoAssets: Array, +@@ -8343,7 +8440,8 @@ declare namespace photoAccessHelper { + * @throws { BusinessError } 14000011 - Internal system error + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + queryCloudEnhancementTaskState(photoAsset: PhotoAsset): Promise; + +@@ -8435,7 +8533,8 @@ declare namespace photoAccessHelper { + * @enum { number } CloudMediaAssetTaskStatus + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum CloudMediaAssetTaskStatus { + /** +@@ -8443,7 +8542,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DOWNLOADING = 0, + /** +@@ -8451,7 +8551,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PAUSED = 1, + /** +@@ -8459,7 +8560,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + IDLE = 2 + } +@@ -8470,7 +8572,8 @@ declare namespace photoAccessHelper { + * @enum { number } CloudMediaTaskPauseCause + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum CloudMediaTaskPauseCause { + /** +@@ -8478,7 +8581,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NO_PAUSE = 0, + /** +@@ -8486,7 +8590,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TEMPERATURE_LIMIT = 1, + /** +@@ -8494,7 +8599,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ROM_LIMIT = 2, + /** +@@ -8502,7 +8608,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NETWORK_FLOW_LIMIT = 3, + /** +@@ -8510,7 +8617,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WIFI_UNAVAILABLE = 4, + /** +@@ -8518,7 +8626,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + POWER_LIMIT = 5, + /** +@@ -8526,7 +8635,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BACKGROUND_TASK_UNAVAILABLE = 6, + /** +@@ -8534,7 +8644,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FREQUENT_USER_REQUESTS = 7, + /** +@@ -8542,7 +8653,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CLOUD_ERROR = 8, + /** +@@ -8550,7 +8662,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + USER_PAUSED = 9 + } +@@ -8561,7 +8674,8 @@ declare namespace photoAccessHelper { + * @interface CloudMediaAssetStatus + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface CloudMediaAssetStatus { + /** +@@ -8571,7 +8685,8 @@ declare namespace photoAccessHelper { + * @readonly + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly taskStatus: CloudMediaAssetTaskStatus; + /** +@@ -8581,7 +8696,8 @@ declare namespace photoAccessHelper { + * @readonly + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly taskInfo: string; + /** +@@ -8591,7 +8707,8 @@ declare namespace photoAccessHelper { + * @readonly + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly errorCode: CloudMediaTaskPauseCause; + } +@@ -8602,7 +8719,8 @@ declare namespace photoAccessHelper { + * @enum { number } CloudMediaDownloadType + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum CloudMediaDownloadType { + /** +@@ -8610,7 +8728,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DOWNLOAD_FORCE = 0, + /** +@@ -8618,7 +8737,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DOWNLOAD_GENTLE = 1 + } +@@ -8629,7 +8749,8 @@ declare namespace photoAccessHelper { + * @enum { number } CloudMediaRetainType + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum CloudMediaRetainType { + /** +@@ -8637,7 +8758,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RETAIN_FORCE = 0 + } +@@ -8647,7 +8769,8 @@ declare namespace photoAccessHelper { + * + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class CloudMediaAssetManager { + /** +@@ -8663,7 +8786,8 @@ declare namespace photoAccessHelper { + * @static + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + static getCloudMediaAssetManagerInstance(context: Context): CloudMediaAssetManager; + +@@ -8681,7 +8805,8 @@ declare namespace photoAccessHelper { + *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + startDownloadCloudMedia(downloadType: CloudMediaDownloadType): Promise; + +@@ -8696,7 +8821,8 @@ declare namespace photoAccessHelper { + *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + pauseDownloadCloudMedia(): Promise; + +@@ -8711,7 +8837,8 @@ declare namespace photoAccessHelper { + *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + cancelDownloadCloudMedia(): Promise; + +@@ -8729,7 +8856,8 @@ declare namespace photoAccessHelper { + *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + retainCloudMediaAsset(retainType: CloudMediaRetainType): Promise; + +@@ -8744,7 +8872,8 @@ declare namespace photoAccessHelper { + *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. + * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getCloudMediaAssetStatus(): Promise; + } +diff --git a/api/@ohos.file.storageStatistics.d.ets b/api/@ohos.file.storageStatistics.d.ets +deleted file mode 100644 +index 671082770..000000000 +--- a/api/@ohos.file.storageStatistics.d.ets ++++ /dev/null +@@ -1,224 +0,0 @@ +-/* +- * Copyright (C) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-/** +- * @file +- * @kit CoreFileKit +- */ +- +-import { AsyncCallback, Callback } from './@ohos.base'; +- +-/** +- * Provides filesystem statistics APIs. +- * +- * @namespace storageStatistics +- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 20 +- */ +-declare namespace storageStatistics { +- /** +- * Get the free size. +- * +- * @param { AsyncCallback } callback - callback +- * @throws { BusinessError } 13600001 - Permission Denied.Possible causes: +- * May need permission ohos.permission.STORAGE_MANAGER. +- * @throws { BusinessError } 13900042 - Unknown error. +- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 20 +- */ +- function getFreeSize(callback: AsyncCallback): void; +- +- /** +- * Get the free size. +- * +- * @returns { Promise } return Promise +- * @throws { BusinessError } 13600001 - Permission Denied.Possible causes: +- * May need permission ohos.permission.STORAGE_MANAGER. +- * @throws { BusinessError } 13900042 - Unknown error. +- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 20 +- */ +- function getFreeSize(): Promise; +- +- /** +- * Get the total size. +- * +- * @param { AsyncCallback } callback - callback +- * @throws { BusinessError } 13600001 - Permission Denied.Possible causes: +- * May need permission ohos.permission.STORAGE_MANAGER. +- * @throws { BusinessError } 13900042 - Unknown error. +- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 20 +- */ +- function getTotalSize(callback: AsyncCallback): void; +- +- /** +- * Get the total size. +- * +- * @returns { Promise } return Promise +- * @throws { BusinessError } 13600001 - Permission Denied.Possible causes: +- * May need permission ohos.permission.STORAGE_MANAGER. +- * @throws { BusinessError } 13900042 - Unknown error. +- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 20 +- */ +- function getTotalSize(): Promise; +- +- /** +- * Get the current bundle statistics. +- * +- * @param { AsyncCallback } callback - callback +- * @throws { BusinessError } 13600001 - Permission Denied.Possible causes: +- * May need permission ohos.permission.STORAGE_MANAGER. +- * @throws { BusinessError } 13900042 - Unknown error. +- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 20 +- */ +- function getCurrentBundleStats(callback: AsyncCallback): void; +- +- /** +- * Get the current bundle statistics. +- * +- * @returns { Promise } return Promise +- * @throws { BusinessError } 13600001 - Permission Denied.Possible causes: +- * May need permission ohos.permission.STORAGE_MANAGER. +- * @throws { BusinessError } 13900042 - Unknown error. +- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 20 +- */ +- function getCurrentBundleStats(): Promise; +- +- /** +- * Get the user storage statistics. +- * +- * @permission ohos.permission.STORAGE_MANAGER +- * @returns { Promise } return Promise +- * @throws { BusinessError } 201 - Permission verification failed. +- * @throws { BusinessError } 202 - The caller is not a system application. +- * @throws { BusinessError } 13600001 - IPC error. +- * @throws { BusinessError } 13900042 - Unknown error. +- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @systemapi +- * @since 20 +- */ +- function getUserStorageStats(): Promise; +- +- /** +- * Get the user storage statistics. +- * +- * @permission ohos.permission.STORAGE_MANAGER +- * @param { AsyncCallback } callback - callback +- * @throws { BusinessError } 201 - Permission verification failed. +- * @throws { BusinessError } 202 - The caller is not a system application. +- * @throws { BusinessError } 13600001 - IPC error. +- * @throws { BusinessError } 13900042 - Unknown error. +- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @systemapi +- * @since 20 +- */ +- function getUserStorageStats(callback: AsyncCallback): void; +- +- /** +- * Get the user storage statistics. +- * +- * @permission ohos.permission.STORAGE_MANAGER +- * @param { long } userId - The id of the user +- * @returns { Promise } return Promise +- * @throws { BusinessError } 201 - Permission verification failed. +- * @throws { BusinessError } 202 - The caller is not a system application. +- * @throws { BusinessError } 13600001 - IPC error. +- * @throws { BusinessError } 13600009 - User if out of range. +- * @throws { BusinessError } 13900042 - Unknown error. +- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @systemapi +- * @since 20 +- */ +- function getUserStorageStats(userId: long): Promise; +- +- /** +- * Get the user storage statistics. +- * +- * @permission ohos.permission.STORAGE_MANAGER +- * @param { long } userId - The id of the user +- * @param { AsyncCallback } callback - callback +- * @throws { BusinessError } 201 - Permission verification failed. +- * @throws { BusinessError } 202 - The caller is not a system application. +- * @throws { BusinessError } 13600001 - IPC error. +- * @throws { BusinessError } 13600009 - User if out of range. +- * @throws { BusinessError } 13900042 - Unknown error. +- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @systemapi +- * @since 20 +- */ +- function getUserStorageStats(userId: long, callback: AsyncCallback): void; +- +- /** +- * Get the bundle statistics. +- * +- * @interface BundleStats +- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 20 +- */ +- export interface BundleStats { +- /** +- * The size of application installation data. +- * +- * @type { long } +- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 20 +- */ +- appSize: long; +- +- /** +- * The size of application cache data. +- * +- * @type { long } +- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 20 +- */ +- cacheSize: long; +- +- /** +- * The size of application local data, distributed data and database data. +- * +- * @type { long } +- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 20 +- */ +- dataSize: long; +- } +- +- /** +- * Get the user storage statistics. +- * +- * @interface StorageStats +- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @systemapi +- * @since 20 +- */ +- export interface StorageStats { +- /** +- * The total size of device. +- * +- * @type { long } +- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @systemapi +- * @since 20 +- */ +- total: long; +- } +-} +- +-export default storageStatistics; +\ No newline at end of file +diff --git a/api/@ohos.file.storageStatistics.d.ts b/api/@ohos.file.storageStatistics.d.ts +index 0bcb09387..2320239d5 100644 +--- a/api/@ohos.file.storageStatistics.d.ts ++++ b/api/@ohos.file.storageStatistics.d.ts +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2022-2023 Huawei Device Co., Ltd. ++ * Copyright (C) 2022-2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at +@@ -25,7 +25,8 @@ import { AsyncCallback, Callback } from './@ohos.base'; + * + * @namespace storageStatistics + * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 8 ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace storageStatistics { + /** +@@ -112,7 +113,8 @@ parameters are left unspecified; + * + * @interface BundleStats + * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface BundleStats { + /** +@@ -120,7 +122,8 @@ parameters are left unspecified; + * + * @type { number } + * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + appSize: number; + +@@ -129,7 +132,8 @@ parameters are left unspecified; + * + * @type { number } + * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + cacheSize: number; + +@@ -138,7 +142,8 @@ parameters are left unspecified; + * + * @type { number } + * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + dataSize: number; + } +@@ -225,7 +230,8 @@ parameters are left unspecified; + * @throws { BusinessError } 13600001 - IPC error. + * @throws { BusinessError } 13900042 - Unknown error. + * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getCurrentBundleStats(callback: AsyncCallback): void; + +@@ -238,7 +244,8 @@ parameters are left unspecified; + * @throws { BusinessError } 13600001 - IPC error. + * @throws { BusinessError } 13900042 - Unknown error. + * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getCurrentBundleStats(): Promise; + +@@ -282,7 +289,8 @@ parameters are left unspecified; + * @interface StorageStats + * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface StorageStats { + /** +@@ -291,7 +299,8 @@ parameters are left unspecified; + * @type { number } + * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + total: number; + +@@ -360,7 +369,8 @@ parameters are left unspecified; + * @throws { BusinessError } 13900042 - Unknown error. + * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getUserStorageStats(): Promise; + +@@ -378,7 +388,8 @@ parameters are left unspecified; + * @throws { BusinessError } 13900042 - Unknown error. + * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getUserStorageStats(callback: AsyncCallback): void; + +@@ -398,7 +409,8 @@ parameters are left unspecified; + * @throws { BusinessError } 13900042 - Unknown error. + * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getUserStorageStats(userId: number): Promise; + +@@ -418,7 +430,8 @@ parameters are left unspecified; + * @throws { BusinessError } 13900042 - Unknown error. + * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getUserStorageStats(userId: number, callback: AsyncCallback): void; + +@@ -446,7 +459,8 @@ parameters are left unspecified; + * @throws { BusinessError } 13600001 - IPC error. + * @throws { BusinessError } 13900042 - Unknown error. + * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getTotalSize(callback: AsyncCallback): void; + +@@ -472,7 +486,8 @@ parameters are left unspecified; + * @throws { BusinessError } 13600001 - IPC error. + * @throws { BusinessError } 13900042 - Unknown error. + * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getTotalSize(): Promise; + +@@ -526,7 +541,8 @@ parameters are left unspecified; + * @throws { BusinessError } 13600001 - IPC error. + * @throws { BusinessError } 13900042 - Unknown error. + * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getFreeSize(callback: AsyncCallback): void; + +@@ -552,7 +568,8 @@ parameters are left unspecified; + * @throws { BusinessError } 13600001 - IPC error. + * @throws { BusinessError } 13900042 - Unknown error. + * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getFreeSize(): Promise; + +diff --git a/api/@ohos.file.volumeManager.d.ets b/api/@ohos.file.volumeManager.d.ets +deleted file mode 100644 +index 8b9370070..000000000 +--- a/api/@ohos.file.volumeManager.d.ets ++++ /dev/null +@@ -1,127 +0,0 @@ +-/* +- * Copyright (C) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-/** +- * @file +- * @kit CoreFileKit +- */ +- +-import { AsyncCallback, Callback } from './@ohos.base'; +- +-/** +- * Provides volumemanager statistics APIs +- * +- * @namespace volumeManager +- * @syscap SystemCapability.FileManagement.StorageService.Volume +- * @systemapi +- * @since 20 +- */ +-declare namespace volumeManager { +- /** +- * Get All Volumes +- * +- * @interface Volume +- * @syscap SystemCapability.FileManagement.StorageService.Volume +- * @systemapi +- * @since 20 +- */ +- export interface Volume { +- /** +- * Universally unique identifier of volume. +- * +- * @type { string } +- * @syscap SystemCapability.FileManagement.StorageService.Volume +- * @systemapi +- * @since 20 +- */ +- uuid: string; +- +- /** +- * The label of the volume. +- * +- * @type { string } +- * @syscap SystemCapability.FileManagement.StorageService.Volume +- * @systemapi +- * @since 20 +- */ +- description: string; +- } +- +- /** +- * Get the volume by uuid. +- * +- * @permission ohos.permission.STORAGE_MANAGER +- * @param { string } uuid - The uuid of volume +- * @param { AsyncCallback } callback - callback +- * @throws { BusinessError } 201 - Permission verification failed. +- * @throws { BusinessError } 202 - The caller is not a system application. +- * @throws { BusinessError } 13600001 - IPC error. +- * @throws { BusinessError } 13600008 - No such object. +- * @throws { BusinessError } 13900042 - Unknown error. +- * @syscap SystemCapability.FileManagement.StorageService.Volume +- * @systemapi +- * @since 20 +- */ +- function getVolumeByUuid(uuid: string, callback: AsyncCallback): void; +- +- /** +- * Get the volume by uuid. +- * +- * @permission ohos.permission.STORAGE_MANAGER +- * @param { string } uuid - The uuid of volume +- * @returns { Promise } return Promise +- * @throws { BusinessError } 201 - Permission verification failed. +- * @throws { BusinessError } 202 - The caller is not a system application. +- * @throws { BusinessError } 13600001 - IPC error. +- * @throws { BusinessError } 13600008 - No such object. +- * @throws { BusinessError } 13900042 - Unknown error. +- * @syscap SystemCapability.FileManagement.StorageService.Volume +- * @systemapi +- * @since 20 +- */ +- function getVolumeByUuid(uuid: string): Promise; +- +- /** +- * Get All Volumes +- * +- * @permission ohos.permission.STORAGE_MANAGER +- * @param { AsyncCallback> } callback - callback +- * @throws { BusinessError } 201 - Permission verification failed. +- * @throws { BusinessError } 202 - The caller is not a system application. +- * @throws { BusinessError } 13600001 - IPC error. +- * @throws { BusinessError } 13900042 - Unknown error. +- * @syscap SystemCapability.FileManagement.StorageService.Volume +- * @systemapi +- * @since 20 +- */ +- function getAllVolumes(callback: AsyncCallback>): void; +- +- /** +- * Get All Volumes +- * +- * @permission ohos.permission.STORAGE_MANAGER +- * @returns { Promise> } return Promise +- * @throws { BusinessError } 201 - Permission verification failed. +- * @throws { BusinessError } 202 - The caller is not a system application. +- * @throws { BusinessError } 13600001 - IPC error. +- * @throws { BusinessError } 13900042 - Unknown error. +- * @syscap SystemCapability.FileManagement.StorageService.Volume +- * @systemapi +- * @since 20 +- */ +- function getAllVolumes(): Promise>; +-} +- +- export default volumeManager; +\ No newline at end of file +diff --git a/api/@ohos.file.volumeManager.d.ts b/api/@ohos.file.volumeManager.d.ts +index 87377b269..1b90ba7c3 100644 +--- a/api/@ohos.file.volumeManager.d.ts ++++ b/api/@ohos.file.volumeManager.d.ts +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2022-2023 Huawei Device Co., Ltd. ++ * Copyright (C) 2022-2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at +@@ -26,7 +26,8 @@ import { AsyncCallback, Callback } from './@ohos.base'; + * @namespace volumeManager + * @syscap SystemCapability.FileManagement.StorageService.Volume + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace volumeManager { + /** +@@ -35,7 +36,8 @@ declare namespace volumeManager { + * @interface Volume + * @syscap SystemCapability.FileManagement.StorageService.Volume + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface Volume { + /** +@@ -54,7 +56,8 @@ declare namespace volumeManager { + * @type { string } + * @syscap SystemCapability.FileManagement.StorageService.Volume + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + uuid: string; + +@@ -74,7 +77,8 @@ declare namespace volumeManager { + * @type { string } + * @syscap SystemCapability.FileManagement.StorageService.Volume + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + description: string; + +@@ -131,7 +135,8 @@ parameters are left unspecified; + * @throws { BusinessError } 13900042 - Unknown error. + * @syscap SystemCapability.FileManagement.StorageService.Volume + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAllVolumes(callback: AsyncCallback>): void; + +@@ -148,7 +153,8 @@ parameters are left unspecified; + * @throws { BusinessError } 13900042 - Unknown error. + * @syscap SystemCapability.FileManagement.StorageService.Volume + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAllVolumes(): Promise>; + +@@ -260,7 +266,8 @@ parameters are left unspecified; + * @throws { BusinessError } 13900042 - Unknown error. + * @syscap SystemCapability.FileManagement.StorageService.Volume + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getVolumeByUuid(uuid: string, callback: AsyncCallback): void; + +@@ -280,7 +287,8 @@ parameters are left unspecified; + * @throws { BusinessError } 13900042 - Unknown error. + * @syscap SystemCapability.FileManagement.StorageService.Volume + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getVolumeByUuid(uuid: string): Promise; + +diff --git a/api/@ohos.fileshare.d.ets b/api/@ohos.fileshare.d.ets +deleted file mode 100644 +index 49dfdd581..000000000 +--- a/api/@ohos.fileshare.d.ets ++++ /dev/null +@@ -1,160 +0,0 @@ +-/* +- * Copyright (C) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-/** +- * @file +- * @kit CoreFileKit +- */ +- +-import { AsyncCallback, Callback } from './@ohos.base'; +-import type wantConstant from './@ohos.app.ability.wantConstant'; +- +-/** +- * Provides fileshare APIS +- * +- * @namespace fileShare +- * @syscap SystemCapability.FileManagement.AppFileService +- * @since 20 +- */ +-declare namespace fileShare { +- /** +- * Enumerates the uri operate mode types. +- * +- * @enum { int } OperationMode +- * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 20 +- */ +- export enum OperationMode { +- /** +- * Indicates read permissions. +- * +- * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 20 +- */ +- READ_MODE = 0b1, +- +- /** +- * Indicates write permissions. +- * +- * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 20 +- */ +- WRITE_MODE = 0b10, +- } +- +- /** +- * Policy information to manager permissions on a URI. +- * +- * @interface PolicyInfo +- * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 20 +- */ +- export interface PolicyInfo { +- /** +- * Indicates the uri of the policy information. +- * +- * @type { string } +- * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 20 +- */ +- uri: string; +- +- /** +- * Indicates the mode of operation for the URI, example { OperationMode.READ_MODE } or { OperationMode.READ_MODE | OperationMode.WRITE_MODE } +- * +- * @type { int } +- * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 20 +- */ +- operationMode: int; +- } +- +- /** +- * Enable the URI that have been permanently authorized +- * +- * @permission ohos.permission.FILE_ACCESS_PERSIST +- * @param { Array } policies - Policy information to grant permission on URIs. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 201 - Permission verification failed, usually the result returned by VerifyAccessToken. +- * @throws { BusinessError } 801 - Capability not supported. +- * @throws { BusinessError } 13900001 - Operation not permitted. +- * @throws { BusinessError } 13900042 - Out of memory +- * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 20 +- */ +- function activatePermission(policies: Array): Promise; +- +- /** +- * Stop the authorized URI that has been enabled +- * +- * @permission ohos.permission.FILE_ACCESS_PERSIST +- * @param { Array } policies - Policy information to grant permission on URIs. +- * @returns { Promise } the promise returned by the function. +- * @throws { BusinessError } 201 - Permission verification failed, usually the result returned by VerifyAccessToken. +- * @throws { BusinessError } 801 - Capability not supported. +- * @throws { BusinessError } 13900001 - Operation not permitted. +- * @throws { BusinessError } 13900042 - Out of memory +- * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 20 +- */ +- function deactivatePermission(policies: Array): Promise; +- +- /** +- * Provides grant uri permission for app +- * +- * @permission ohos.permission.WRITE_MEDIA +- * @param { string } uri uri +- * @param { string } bundleName bundleName +- * @param { wantConstant.Flags } flag wantConstant.Flags.FLAG_AUTH_READ_URI_PERMISSION +- * or wantConstant.Flags.FLAG_AUTH_WRITE_URI_PERMISSION +- * @param { AsyncCallback } callback +- * @throws { BusinessError } 201 - Permission verification failed +- * @throws { BusinessError } 202 - The caller is not a system application +- * @throws { BusinessError } 401 - The input parameter is invalid.Possible causes: +- * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. +- * @throws { BusinessError } 143000001 - IPC error +- * @syscap SystemCapability.FileManagement.AppFileService +- * @systemapi +- * @since 20 +- */ +- function grantUriPermission( +- uri: string, +- bundleName: string, +- flag: wantConstant.Flags, +- callback: AsyncCallback +- ): void; +- +- /** +- * Provides grant uri permission for app +- * +- * @permission ohos.permission.WRITE_MEDIA +- * @param { string } uri uri +- * @param { string } bundleName bundleName +- * @param { wantConstant.Flags } flag wantConstant.Flags.FLAG_AUTH_READ_URI_PERMISSION +- * or wantConstant.Flags.FLAG_AUTH_WRITE_URI_PERMISSION +- * @returns { Promise } no callback return Promise otherwise return void +- * @throws { BusinessError } 201 - Permission verification failed +- * @throws { BusinessError } 202 - The caller is not a system application +- * @throws { BusinessError } 401 - The input parameter is invalid.Possible causes: +- * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. +- * @throws { BusinessError } 143000001 - IPC error +- * @syscap SystemCapability.FileManagement.AppFileService +- * @systemapi +- * @since 20 +- */ +- function grantUriPermission(uri: string, bundleName: string, flag: wantConstant.Flags): Promise; +-} +- +-export default fileShare; +diff --git a/api/@ohos.fileshare.d.ts b/api/@ohos.fileshare.d.ts +index 728df25c8..2189b2e97 100644 +--- a/api/@ohos.fileshare.d.ts ++++ b/api/@ohos.fileshare.d.ts +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2022-2024 Huawei Device Co., Ltd. ++ * Copyright (C) 2022-2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at +@@ -18,15 +18,21 @@ + * @kit CoreFileKit + */ + ++/*** if arkts 1.1 */ + import type { AsyncCallback, Callback } from './@ohos.base'; + import type wantConstant from './@ohos.ability.wantConstant'; +- ++/*** endif */ ++/*** if arkts 1.2 */ ++import { AsyncCallback, Callback } from './@ohos.base'; ++import type wantConstant from './@ohos.app.ability.wantConstant'; ++/*** endif */ + /** + * Provides fileshare APIS + * + * @namespace fileShare + * @syscap SystemCapability.FileManagement.AppFileService +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace fileShare { + /** +@@ -34,14 +40,16 @@ declare namespace fileShare { + * + * @enum { number } OperationMode + * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum OperationMode { + /** + * Indicates read permissions. + * + * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + READ_MODE = 0b1, + +@@ -49,7 +57,8 @@ declare namespace fileShare { + * Indicates write permissions. + * + * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WRITE_MODE = 0b10, + } +@@ -136,7 +145,8 @@ declare namespace fileShare { + * + * @interface PolicyInfo + * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface PolicyInfo { + /** +@@ -144,7 +154,8 @@ declare namespace fileShare { + * + * @type { string } + * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + uri: string; + +@@ -153,7 +164,8 @@ declare namespace fileShare { + * + * @type { number } + * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + operationMode: number; + } +@@ -163,7 +175,8 @@ declare namespace fileShare { + * + * @interface PathPolicyInfo + * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface PathPolicyInfo { + /** +@@ -171,7 +184,8 @@ declare namespace fileShare { + * + * @type { string } + * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + path: string; + +@@ -180,7 +194,8 @@ declare namespace fileShare { + * + * @type { OperationMode } + * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + operationMode: OperationMode; + } +@@ -190,14 +205,16 @@ declare namespace fileShare { + * + * @enum { number } policyType + * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum PolicyType { + /** + * Indicates that the policy is temporary. + * + * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TEMPORARY_TYPE = 0, + +@@ -205,7 +222,8 @@ declare namespace fileShare { + * Indicates that the policy is persistent. + * + * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PERSISTENT_TYPE = 1, + } +@@ -225,7 +243,8 @@ declare namespace fileShare { + * @throws { BusinessError } 143000001 - IPC error + * @syscap SystemCapability.FileManagement.AppFileService + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function grantUriPermission( + uri: string, +@@ -249,7 +268,8 @@ declare namespace fileShare { + * @throws { BusinessError } 143000001 - IPC error + * @syscap SystemCapability.FileManagement.AppFileService + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function grantUriPermission(uri: string, bundleName: string, flag: wantConstant.Flags): Promise; + +@@ -300,7 +320,8 @@ declare namespace fileShare { + * @throws { BusinessError } 13900001 - Operation not permitted. + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function activatePermission(policies: Array): Promise; + +@@ -317,7 +338,8 @@ declare namespace fileShare { + * @throws { BusinessError } 13900001 - Operation not permitted. + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function deactivatePermission(policies: Array): Promise; + +@@ -341,7 +363,7 @@ declare namespace fileShare { + * Check permissions for the path. + * + * @permission ohos.permission.CHECK_SANDBOX_POLICY +- * @param { number } tokenID - Token ID of the application. ++ * @param { int } tokenID - Token ID of the application. + * @param { Array } policies - Policy information to check on paths. + * @param { PolicyType } policyType - Persistent or temporary type. + * @returns { Promise> } Returns the permission state of paths. +@@ -352,9 +374,10 @@ declare namespace fileShare { + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function checkPathPermission(tokenID: number, policies: Array, policyType: PolicyType): Promise>; ++ function checkPathPermission(tokenID: int, policies: Array, policyType: PolicyType): Promise>; + } + + export default fileShare; +diff --git a/api/@ohos.geoLocationManager.d.ts b/api/@ohos.geoLocationManager.d.ts +index 1ffde8333..0fb15eed0 100644 +--- a/api/@ohos.geoLocationManager.d.ts ++++ b/api/@ohos.geoLocationManager.d.ts +@@ -18,9 +18,6 @@ + * @kit LocationKit + */ + +-/*** if arkts 1.1 */ +-import { int, double } from './@ohos.base'; +-/*** endif */ + import { AsyncCallback, Callback } from './@ohos.base'; + /*** if arkts 1.1 */ + import { WantAgent } from '@ohos.wantAgent'; +@@ -112,7 +109,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301100 - The location switch is off. + * @syscap SystemCapability.Location.Location.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'locationChange', request: LocationRequest | ContinuousLocationRequest, + callback: Callback): void; +@@ -160,7 +158,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @syscap SystemCapability.Location.Location.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'locationChange', callback?: Callback): void; + +@@ -176,7 +175,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @syscap SystemCapability.Location.Location.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'locationError', callback: Callback): void; + +@@ -192,7 +192,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @syscap SystemCapability.Location.Location.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'locationError', callback?: Callback): void; + +@@ -205,7 +206,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.on('locationEnabledChange')} due to limited device capabilities. + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @syscap SystemCapability.Location.Location.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'locationEnabledChange', callback: Callback): void; + +@@ -218,7 +220,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.off('locationEnabledChange')} due to limited device capabilities. + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @syscap SystemCapability.Location.Location.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'locationEnabledChange', callback?: Callback): void; + +@@ -251,7 +254,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @throws { BusinessError } 3301100 - The location switch is off. + * @syscap SystemCapability.Location.Location.Gnss +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'cachedGnssLocationsChange', request: CachedGnssLocationsRequest, callback: Callback>): void; + +@@ -282,7 +286,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @throws { BusinessError } 3301100 - The location switch is off. + * @syscap SystemCapability.Location.Location.Gnss +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'cachedGnssLocationsChange', callback?: Callback>): void; + +@@ -298,7 +303,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @throws { BusinessError } 3301100 - The location switch is off. + * @syscap SystemCapability.Location.Location.Gnss +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'satelliteStatusChange', callback: Callback): void; + +@@ -314,7 +320,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @throws { BusinessError } 3301100 - The location switch is off. + * @syscap SystemCapability.Location.Location.Gnss +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'satelliteStatusChange', callback?: Callback): void; + +@@ -330,7 +337,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @throws { BusinessError } 3301100 - The location switch is off. + * @syscap SystemCapability.Location.Location.Gnss +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'nmeaMessage', callback: Callback): void; + +@@ -346,7 +354,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @throws { BusinessError } 3301100 - The location switch is off. + * @syscap SystemCapability.Location.Location.Gnss +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'nmeaMessage', callback?: Callback): void; + +@@ -396,7 +405,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @throws { BusinessError } 3301500 - Failed to query the area information. + * @syscap SystemCapability.Location.Location.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'countryCodeChange', callback: Callback): void; + +@@ -410,7 +420,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @throws { BusinessError } 3301500 - Failed to query the area information. + * @syscap SystemCapability.Location.Location.Core +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'countryCodeChange', callback?: Callback): void; + +@@ -429,7 +440,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301800 - Failed to start WiFi or Bluetooth scanning. + * @syscap SystemCapability.Location.Location.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'locatingRequiredDataChange', config: LocatingRequiredDataConfig, callback: Callback>): void; + +@@ -445,7 +457,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.off('locatingRequiredDataChange')} due to limited device capabilities. + * @syscap SystemCapability.Location.Location.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'locatingRequiredDataChange', callback?: Callback>): void; + +@@ -460,7 +473,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @syscap SystemCapability.Location.Location.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'locationIconStatusChange', callback: Callback): void; + +@@ -475,7 +489,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @syscap SystemCapability.Location.Location.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'locationIconStatusChange', callback?: Callback): void; + +@@ -491,7 +506,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @throws { BusinessError } 3301100 - The location switch is off. + * @syscap SystemCapability.Location.Location.Core +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'bluetoothScanResultChange', callback: Callback): void; + +@@ -506,7 +522,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.on('locatingRequiredDataChange')} due to limited device capabilities. + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @syscap SystemCapability.Location.Location.Core +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'bluetoothScanResultChange', callback?: Callback): void; + +@@ -669,7 +686,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301200 - Failed to obtain the geographical location. + * @syscap SystemCapability.Location.Location.Core + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getLastLocation(): Location; + +@@ -690,7 +708,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @syscap SystemCapability.Location.Location.Core + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isLocationEnabled(): boolean; + +@@ -734,7 +753,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @syscap SystemCapability.Location.Location.Core + * @systemapi +- * @since 20 ++ * @since arkts {'1.1':'20','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function enableLocation(callback: AsyncCallback): void; + +@@ -762,7 +782,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @syscap SystemCapability.Location.Location.Core + * @systemapi +- * @since 20 ++ * @since arkts {'1.1':'20','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function enableLocation(): Promise; + +@@ -804,7 +825,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @syscap SystemCapability.Location.Location.Core + * @systemapi +- * @since 20 ++ * @since arkts {'1.1':'20','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function disableLocation(): void; + +@@ -849,7 +871,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @throws { BusinessError } 3301300 - Reverse geocoding query failed. + * @syscap SystemCapability.Location.Location.Geocoder +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAddressesFromLocation(request: ReverseGeoCodeRequest, callback: AsyncCallback>): void; + +@@ -863,7 +886,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @throws { BusinessError } 3301300 - Reverse geocoding query failed. + * @syscap SystemCapability.Location.Location.Geocoder +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAddressesFromLocation(request: ReverseGeoCodeRequest): Promise>; + +@@ -1194,7 +1218,8 @@ declare namespace geoLocationManager { + * @throws { BusinessError } 3301000 - The location service is unavailable. + * @syscap SystemCapability.Location.Location.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isLocationPrivacyConfirmed(type: LocationPrivacyType): boolean; + +@@ -1369,7 +1394,8 @@ declare namespace geoLocationManager { + * + * @typedef SatelliteStatusInfo + * @syscap SystemCapability.Location.Location.Gnss +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface SatelliteStatusInfo { + /** +@@ -1377,7 +1403,8 @@ declare namespace geoLocationManager { + * + * @type { number } + * @syscap SystemCapability.Location.Location.Gnss +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + satellitesNumber: number; + +@@ -1386,7 +1413,8 @@ declare namespace geoLocationManager { + * + * @type { Array } + * @syscap SystemCapability.Location.Location.Gnss +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + satelliteIds: Array; + +@@ -1395,7 +1423,8 @@ declare namespace geoLocationManager { + * + * @type { Array } + * @syscap SystemCapability.Location.Location.Gnss +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + carrierToNoiseDensitys: Array; + +@@ -1404,7 +1433,8 @@ declare namespace geoLocationManager { + * + * @type { Array } + * @syscap SystemCapability.Location.Location.Gnss +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + altitudes: Array; + +@@ -1413,7 +1443,8 @@ declare namespace geoLocationManager { + * + * @type { Array } + * @syscap SystemCapability.Location.Location.Gnss +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + azimuths: Array; + +@@ -1422,7 +1453,8 @@ declare namespace geoLocationManager { + * + * @type { Array } + * @syscap SystemCapability.Location.Location.Gnss +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + carrierFrequencies: Array; + +@@ -1431,7 +1463,8 @@ declare namespace geoLocationManager { + * + * @type { ?Array } + * @syscap SystemCapability.Location.Location.Gnss +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + satelliteConstellation?: Array; + +@@ -1440,7 +1473,8 @@ declare namespace geoLocationManager { + * + * @type { ?Array } + * @syscap SystemCapability.Location.Location.Gnss +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + satelliteAdditionalInfo?: Array; + } +@@ -1450,7 +1484,8 @@ declare namespace geoLocationManager { + * + * @typedef CachedGnssLocationsRequest + * @syscap SystemCapability.Location.Location.Gnss +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface CachedGnssLocationsRequest { + /** +@@ -1458,7 +1493,8 @@ declare namespace geoLocationManager { + * + * @type { number } + * @syscap SystemCapability.Location.Location.Gnss +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + reportingPeriodSec: number; + +@@ -1467,7 +1503,8 @@ declare namespace geoLocationManager { + * + * @type { boolean } + * @syscap SystemCapability.Location.Location.Gnss +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + wakeUpCacheQueueFull: boolean; + } +@@ -2118,38 +2155,38 @@ declare namespace geoLocationManager { + /** + * Accuracy requirements for reporting locations. + * +- * @type { ?double } ++ * @type { ?number } + * @syscap SystemCapability.Location.Location.Core + * @since 9 + */ + /** + * Accuracy requirements for reporting locations. + * +- * @type { ?double } ++ * @type { ?number } + * @syscap SystemCapability.Location.Location.Core + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- maxAccuracy?: double; ++ maxAccuracy?: number; + + /** + * Timeout interval of a single location request. + * +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Location.Location.Core + * @since 9 + */ + /** + * Timeout interval of a single location request. + * +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Location.Location.Core + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- timeoutMs?: int; ++ timeoutMs?: number; + } + + /** +@@ -2249,13 +2286,13 @@ declare namespace geoLocationManager { + /** + * Timeout of a single location request, in milliseconds. + * +- * @type { int } ++ * @type { number } + * @syscap SystemCapability.Location.Location.Core + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- locatingTimeoutMs: int; ++ locatingTimeoutMs: number; + } + + /** +@@ -2280,7 +2317,7 @@ declare namespace geoLocationManager { + * A positive value indicates north latitude, + * and a negative value indicates south latitude. + * +- * @type { double } ++ * @type { number } + * @syscap SystemCapability.Location.Location.Core + * @since 9 + */ +@@ -2289,20 +2326,20 @@ declare namespace geoLocationManager { + * A positive value indicates north latitude, + * and a negative value indicates south latitude. + * +- * @type { double } ++ * @type { number } + * @syscap SystemCapability.Location.Location.Core + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- latitude: double; ++ latitude: number; + + /** + * Indicates Longitude information. + * A positive value indicates east longitude , + * and a negative value indicates west longitude. + * +- * @type { double } ++ * @type { number } + * @syscap SystemCapability.Location.Location.Core + * @since 9 + */ +@@ -2311,121 +2348,121 @@ declare namespace geoLocationManager { + * A positive value indicates east longitude , + * and a negative value indicates west longitude. + * +- * @type { double } ++ * @type { number } + * @syscap SystemCapability.Location.Location.Core + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- longitude: double; ++ longitude: number; + + /** + * Indicates location altitude, in meters. + * +- * @type { double } ++ * @type { number } + * @syscap SystemCapability.Location.Location.Core + * @since 9 + */ + /** + * Indicates location altitude, in meters. + * +- * @type { double } ++ * @type { number } + * @syscap SystemCapability.Location.Location.Core + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- altitude: double; ++ altitude: number; + + /** + * Indicates location accuracy, in meters. + * +- * @type { double } ++ * @type { number } + * @syscap SystemCapability.Location.Location.Core + * @since 9 + */ + /** + * Indicates location accuracy, in meters. + * +- * @type { double } ++ * @type { number } + * @syscap SystemCapability.Location.Location.Core + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- accuracy: double; ++ accuracy: number; + + /** + * Indicates speed, in m/s. + * +- * @type { double } ++ * @type { number } + * @syscap SystemCapability.Location.Location.Core + * @since 9 + */ + /** + * Indicates speed, in m/s. + * +- * @type { double } ++ * @type { number } + * @syscap SystemCapability.Location.Location.Core + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- speed: double; ++ speed: number; + + /** + * Indicates location timestamp in the UTC format. + * +- * @type { int } ++ * @type { number } + * @syscap SystemCapability.Location.Location.Core + * @since 9 + */ + /** + * Indicates location timestamp in the UTC format. + * +- * @type { int } ++ * @type { number } + * @syscap SystemCapability.Location.Location.Core + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- timeStamp: int; ++ timeStamp: number; + + /** + * Indicates direction information. + * +- * @type { double } ++ * @type { number } + * @syscap SystemCapability.Location.Location.Core + * @since 9 + */ + /** + * Indicates direction information. + * +- * @type { double } ++ * @type { number } + * @syscap SystemCapability.Location.Location.Core + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- direction: double; ++ direction: number; + + /** + * Indicates location timestamp since boot. + * +- * @type { int } ++ * @type { number } + * @syscap SystemCapability.Location.Location.Core + * @since 9 + */ + /** + * Indicates location timestamp since boot. + * +- * @type { int } ++ * @type { number } + * @syscap SystemCapability.Location.Location.Core + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- timeSinceBoot: int; ++ timeSinceBoot: number; + + /** + * Indicates additional information. +@@ -2459,20 +2496,20 @@ declare namespace geoLocationManager { + /** + * Indicates the amount of additional descriptive information. + * +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Location.Location.Core + * @since 9 + */ + /** + * Indicates the amount of additional descriptive information. + * +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Location.Location.Core + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- additionSize?: int; ++ additionSize?: number; + + /** + * Indicates whether it is an mock location. +@@ -2488,46 +2525,46 @@ declare namespace geoLocationManager { + /** + * Indicates vertical position accuracy in meters. + * +- * @type { ?double } ++ * @type { ?number } + * @syscap SystemCapability.Location.Location.Core + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- altitudeAccuracy?: double; ++ altitudeAccuracy?: number; + + /** + * Indicates speed accuracy in meter per seconds. + * +- * @type { ?double } ++ * @type { ?number } + * @syscap SystemCapability.Location.Location.Core + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- speedAccuracy?: double; ++ speedAccuracy?: number; + + /** + * Indicates direction accuracy in degrees. + * +- * @type { ?double } ++ * @type { ?number } + * @syscap SystemCapability.Location.Location.Core + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- directionAccuracy?: double; ++ directionAccuracy?: number; + + /** + * Time uncertainty Of timeSinceBoot in nanosecond. + * +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Location.Location.Core + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- uncertaintyOfTimeSinceBoot?: int; ++ uncertaintyOfTimeSinceBoot?: number; + + /** + * Indicates the source of the location. +@@ -2812,7 +2849,7 @@ declare namespace geoLocationManager { + /** + * Enum for the source of the location. + * +- * @enum { int } ++ * @enum { number } + * @syscap SystemCapability.Location.Location.Core + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} +@@ -3163,7 +3200,7 @@ declare namespace geoLocationManager { + /** + * Enum for user activity scenario. + * +- * @enum { int } ++ * @enum { number } + * @syscap SystemCapability.Location.Location.Core + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} +@@ -3214,7 +3251,7 @@ declare namespace geoLocationManager { + /** + * Enum for locating priority. + * +- * @enum { int } ++ * @enum { number } + * @syscap SystemCapability.Location.Location.Core + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} +@@ -3245,14 +3282,14 @@ declare namespace geoLocationManager { + /** + * Enum for location priority. + * +- * @enum { int } ++ * @enum { number } + * @syscap SystemCapability.Location.Location.Core + * @since 9 + */ + /** + * Enum for location priority. + * +- * @enum { int } ++ * @enum { number } + * @syscap SystemCapability.Location.Location.Core + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +@@ -3327,14 +3364,14 @@ declare namespace geoLocationManager { + /** + * Enum for location scenario. + * +- * @enum { int } ++ * @enum { number } + * @syscap SystemCapability.Location.Location.Core + * @since 9 + */ + /** + * Enum for location scenario. + * +- * @enum { int } ++ * @enum { number } + * @syscap SystemCapability.Location.Location.Core + * @atomicservice + * @since arkts {'1.1':'11','1.2':'20'} +diff --git a/api/@ohos.graphics.colorSpaceManager.d.ts b/api/@ohos.graphics.colorSpaceManager.d.ts +index 474e97d31..dbb4be075 100644 +--- a/api/@ohos.graphics.colorSpaceManager.d.ts ++++ b/api/@ohos.graphics.colorSpaceManager.d.ts +@@ -461,7 +461,6 @@ declare namespace colorSpaceManager { + */ + LINEAR_SRGB = 24, + +- /*** if arkts 1.1 */ + /** + * PRIMARIES_BT709 | TRANSFUNC_LINEAR + * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core +@@ -473,21 +472,9 @@ declare namespace colorSpaceManager { + * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} + */ + LINEAR_BT709 = LINEAR_SRGB, +- /*** endif */ +- /*** if arkts 1.2 */ +- /** +- * PRIMARIES_BT709 | TRANSFUNC_LINEAR +- * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +- LINEAR_BT709 = 24, +- /*** endif */ + + /** + * PRIMARIES_BT2020 | TRANSFUNC_LINEAR +@@ -504,7 +491,6 @@ declare namespace colorSpaceManager { + */ + LINEAR_BT2020 = 25, + +- /*** if arkts 1.1 */ + /** + * PRIMARIES_SRGB | TRANSFUNC_SRGB | RANGE_FULL + * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core +@@ -516,23 +502,10 @@ declare namespace colorSpaceManager { + * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} + */ + DISPLAY_SRGB = SRGB, +- /*** endif */ +- /*** if arkts 1.2 */ +- /** +- * PRIMARIES_SRGB | TRANSFUNC_SRGB | RANGE_FULL +- * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +- DISPLAY_SRGB = 4, +- /*** endif */ + +- /*** if arkts 1.1 */ + /** + * PRIMARIES_P3_D65 | TRANSFUNC_SRGB | RANGE_FULL + * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core +@@ -544,23 +517,10 @@ declare namespace colorSpaceManager { + * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} + */ + DISPLAY_P3_SRGB = DISPLAY_P3, +- /*** endif */ +- /*** if arkts 1.2 */ +- /** +- * PRIMARIES_P3_D65 | TRANSFUNC_SRGB | RANGE_FULL +- * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +- DISPLAY_P3_SRGB = 3, +- /*** endif */ + +- /*** if arkts 1.1 */ + /** + * PRIMARIES_P3_D65 | TRANSFUNC_HLG | RANGE_FULL + * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core +@@ -572,23 +532,10 @@ declare namespace colorSpaceManager { + * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} + */ + DISPLAY_P3_HLG = P3_HLG, +- /*** endif */ +- /*** if arkts 1.2 */ +- /** +- * PRIMARIES_P3_D65 | TRANSFUNC_HLG | RANGE_FULL +- * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +- DISPLAY_P3_HLG = 11, +- /*** endif */ + +- /*** if arkts 1.1 */ + /** + * PRIMARIES_DISPLAY_P3 | TRANSFUNC_PQ | RANGE_FULL + * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core +@@ -600,21 +547,9 @@ declare namespace colorSpaceManager { + * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} + */ + DISPLAY_P3_PQ = P3_PQ, +- /*** endif */ +- /*** if arkts 1.2 */ +- /** +- * PRIMARIES_DISPLAY_P3 | TRANSFUNC_PQ | RANGE_FULL +- * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +- DISPLAY_P3_PQ = 12, +- /*** endif */ + + /** + * Indicates a customized color space. +diff --git a/api/@ohos.graphics.common2D.d.ets b/api/@ohos.graphics.common2D.d.ets +deleted file mode 100644 +index eb61337df..000000000 +--- a/api/@ohos.graphics.common2D.d.ets ++++ /dev/null +@@ -1,145 +0,0 @@ +-/* +- * Copyright (c) 2023 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-/** +- * @file +- * @kit ArkGraphics2D +- */ +-/** +- * The date structure that provides the basis for graphics. +- * +- * @namespace common2D +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +-declare namespace common2D { +- /** +- * Provide a description in the form of color ARGB. +- * @typedef Color +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- export interface Color { +- /** +- * Alpha component of color, from 0 to 255. +- * @type { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- alpha: number; +- /** +- * Red component of color, from 0 to 255. +- * @type { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- red: number; +- /** +- * Green component of color, from 0 to 255. +- * @type { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- green: number; +- /** +- * Blue component of color, from 0 to 255. +- * @type { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- blue: number; +- } +- +- /** +- * Provides the definition of the rectangle. +- * @typedef Rect +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- export interface Rect { +- /** +- * Left Position of Rectangle. +- * @type { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- left: number; +- /** +- * Top side position of the rectangle +- * @type { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- top: number; +- /** +- * Right Position of Rectangle. +- * @type { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- right: number; +- /** +- * Position of the bottom side of the rectangle. +- * @type { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- bottom: number; +- } +- +- /** +- * Coordinates in the font layout. +- * @typedef Point +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export interface Point { +- /** +- * X-axis coordinate. +- * @type { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- x: number; +- +- /** +- * Y-axis coordinate. +- * @type { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- y: number; +- } +- +- /** +- * Provides the definition of the point in 3D. +- * +- * @typedef Point3d +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export interface Point3d extends Point { +- /** +- * Z-axis coordinate. +- * @type { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- z: number; +- } +- +-} +- +-export default common2D; +\ No newline at end of file +diff --git a/api/@ohos.graphics.common2D.d.ts b/api/@ohos.graphics.common2D.d.ts +index 0ed515ac7..42fe461d2 100644 +--- a/api/@ohos.graphics.common2D.d.ts ++++ b/api/@ohos.graphics.common2D.d.ts +@@ -22,42 +22,48 @@ + * + * @namespace common2D + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace common2D { + /** + * Provide a description in the form of color ARGB. + * @typedef Color + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Color { + /** + * Alpha component of color, from 0 to 255. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + alpha: number; + /** + * Red component of color, from 0 to 255. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + red: number; + /** + * Green component of color, from 0 to 255. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + green: number; + /** + * Blue component of color, from 0 to 255. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + blue: number; + } +@@ -66,35 +72,40 @@ declare namespace common2D { + * Provides the definition of the rectangle. + * @typedef Rect + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Rect { + /** + * Left Position of Rectangle. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + left: number; + /** + * Top side position of the rectangle + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + top: number; + /** + * Right Position of Rectangle. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + right: number; + /** + * Position of the bottom side of the rectangle. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + bottom: number; + } +@@ -103,14 +114,16 @@ declare namespace common2D { + * Coordinates in the font layout. + * @typedef Point + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Point { + /** + * X-axis coordinate. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + x: number; + +@@ -118,7 +131,8 @@ declare namespace common2D { + * Y-axis coordinate. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + y: number; + } +diff --git a/api/@ohos.graphics.drawing.d.ets b/api/@ohos.graphics.drawing.d.ets +deleted file mode 100644 +index 4e139eb54..000000000 +--- a/api/@ohos.graphics.drawing.d.ets ++++ /dev/null +@@ -1,3708 +0,0 @@ +-/* +- * Copyright (c) 2023-2024 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-/** +- * @file +- * @kit ArkGraphics2D +- */ +- +-import type image from './@ohos.multimedia.image'; +-import type common2D from './@ohos.graphics.common2D'; +- +-/** +- * Provides functions such as 2D graphics rendering, text drawing, and image display. +- * +- * @namespace drawing +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +-declare namespace drawing { +- /** +- * Enumerate blending modes for colors. +- * Blend is a operation that use 4 components(red, green, blue, alpha) to generate +- * a new color from two colors(source, destination). +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- export enum BlendMode { +- /** +- * Disable 4 regions(red, green, blue, alpha) +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- CLEAR = 0, +- /** +- * Use components of the source +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- SRC = 1, +- /** +- * Use components of the destination +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- DST = 2, +- /** +- * The source is placed above the destination. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- SRC_OVER = 3, +- /** +- * The Destination is placed above the source. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- DST_OVER = 4, +- /** +- * Use source replaces the destination, and will not exceed the boundaries of the destination +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- SRC_IN = 5, +- /** +- * Use destination, and will not exceed the boundaries of the source +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- DST_IN = 6, +- /** +- * Source is use in outside of the boundaries of the destination. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- SRC_OUT = 7, +- /** +- * Destination is use in outside of the boundaries of the source. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- DST_OUT = 8, +- /** +- * Source which overlaps the destination will replaces the destination. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- SRC_ATOP = 9, +- /** +- * Destination which overlaps the source will replaces the source. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- DST_ATOP = 10, +- /** +- * Combine regions where source and destination do not overlap. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- XOR = 11, +- /** +- * The sum of the source and destination. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- PLUS = 12, +- /** +- * All components are multiplied. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- MODULATE = 13, +- /** +- * Multiply the complement values of the background and source color values, +- * and then complement the result. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- SCREEN = 14, +- /** +- * Multiplies or screens the colors, depending on destination +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- OVERLAY = 15, +- /** +- * Choose a darker background and source color. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- DARKEN = 16, +- /** +- * Choose a lighter background and source color. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- LIGHTEN = 17, +- /** +- * Brightens destination color to reflect the source color. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- COLOR_DODGE = 18, +- /** +- * Darkens destination color to reflect the source color. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- COLOR_BURN = 19, +- /** +- * Multiplies or screens the colors, depending on source +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- HARD_LIGHT = 20, +- /** +- * Lightens or Darkens the colors, depending on the source. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- SOFT_LIGHT = 21, +- /** +- * Subtract the darker of the two colors from the brighter color. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- DIFFERENCE = 22, +- /** +- * Produces an effect similar to difference mode, but with lower contrast. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- EXCLUSION = 23, +- /** +- * Multiply the source color by the destination color and replace the destination. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- MULTIPLY = 24, +- /** +- * Use the hue of the source and the saturation and brightness of the destination. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- HUE = 25, +- /** +- * Use the saturation of the source and the hue and brightness of the destination. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- SATURATION = 26, +- /** +- * Use the hue and saturation of the source and the brightness of the destination. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- COLOR = 27, +- /** +- * Use the brightness of the source and the hue and saturation of the destination. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- LUMINOSITY = 28, +- } +- +- /** +- * Enumerates direction for adding closed contours. +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export enum PathDirection { +- /** +- * Clockwise direction for adding closed contours. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- CLOCKWISE = 0, +- +- /** +- * Counter-clockwise direction for adding closed contours. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- COUNTER_CLOCKWISE = 1, +- } +- +- /** +- * Enumerates fill type of path. +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export enum PathFillType { +- /** +- * Specifies that "inside" is computed by a non-zero sum of signed edge crossings. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- WINDING = 0, +- +- /** +- * Specifies that "inside" is computed by an odd number of edge crossings. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- EVEN_ODD = 1, +- +- /** +- * Same as winding, but draws outside of the path, rather than inside. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- INVERSE_WINDING = 2, +- +- /** +- * Same as evenOdd, but draws outside of the path, rather than inside. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- INVERSE_EVEN_ODD = 3, +- } +- +- /** +- * Enumerate path measure flags for matrix. +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export enum PathMeasureMatrixFlags { +- /** +- * Gets position. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- GET_POSITION_MATRIX = 0, +- /** +- * Gets tangent. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- GET_TANGENT_MATRIX = 1, +- /** +- * Gets both position and tangent. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- GET_POSITION_AND_TANGENT_MATRIX = 2, +- } +- +- /** +- * Provides the definition of the roundRect. +- * +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export class RoundRect { +- /** +- * Creates a simple round rect with the same four corner radii. +- * @param { common2D.Rect } rect - Indicates the Rect object. +- * @param { number } xRadii - Indicates the corner radii on x-axis. +- * @param { number } yRadii - Indicates the corner radii on y-axis. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- constructor(rect: common2D.Rect, xRadii: number, yRadii: number); +- +- /** +- * Sets the radiusX and radiusY for a specific corner position. +- * @param { CornerPos } pos - Indicates the corner radius position. +- * @param { number } x - Indicates the corner radius on x-axis. +- * @param { number } y - Indicates the corner radius on y-axis. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setCorner(pos: CornerPos, x: number, y: number): void; +- +- /** +- * Gets a point with the values of x-axis and y-axis of the selected corner radius. +- * @param { CornerPos } pos - Indicates the corner radius position. +- * @returns { common2D.Point } Returns a point with the values of x-axis and y-axis of the corner radius. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getCorner(pos: CornerPos): common2D.Point; +- +- /** +- * Translates round rect by (dx, dy). +- * @param { number } dx - Indicates the offsets added to rect left and rect right. +- * @param { number } dy - Indicates the offsets added to rect top and rect bottom. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- offset(dx: number, dy: number): void; +- } +- +- /** +- * Enumerates of operations when two paths are combined. +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export enum PathOp { +- /** +- * Difference operation. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- DIFFERENCE = 0, +- +- /** +- * Intersect operation. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- INTERSECT = 1, +- +- /** +- * Union operation. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- UNION = 2, +- +- /** +- * Xor operation. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- XOR = 3, +- +- /** +- * Reverse difference operation. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- REVERSE_DIFFERENCE = 4, +- } +- +- /** +- * Describes a path object. +- * +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- export class Path { +- /** +- * Creates a Path. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- constructor(); +- +- /** +- * Creates a Path from other path. +- * @param { Path } path - the path to copy content from. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- constructor(path: Path); +- +- /** +- * Sets the start point of a path +- * @param { number } x - Indicates the x coordinate of the start point. +- * @param { number } y - Indicates the y coordinate of the start point. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- moveTo(x: number, y: number): void; +- +- /** +- * Draws a line segment from the last point of a path to the target point. +- * @param { number } x - Indicates the x coordinate of the target point. +- * @param { number } y - Indicates the y coordinate of the target point. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- lineTo(x: number, y: number): void; +- +- /** +- * This is done by using angle arc mode. In this mode, a rectangle that encloses an ellipse is specified first, +- * and then a start angle and a sweep angle are specified. +- * The arc is a portion of the ellipse defined by the start angle and the sweep angle. +- * By default, a line segment from the last point of the path to the start point of the arc is also added. +- * @param { number } x1 - Indicates the x coordinate of the upper left corner of the rectangle. +- * @param { number } y1 - Indicates the y coordinate of the upper left corner of the rectangle. +- * @param { number } x2 - Indicates the x coordinate of the lower right corner of the rectangle. +- * @param { number } y2 - Indicates the y coordinate of the lower right corner of the rectangle. +- * @param { number } startDeg - Indicates the start angle, in degrees. +- * @param { number } sweepDeg - Indicates the angle to sweep, in degrees. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- arcTo(x1: number, y1: number, x2: number, y2: number, startDeg: number, sweepDeg: number): void; +- +- /** +- * Draws a quadratic Bezier curve from the last point of a path to the target point. +- * @param { number } ctrlX - Indicates the x coordinate of the control point. +- * @param { number } ctrlY - Indicates the y coordinate of the control point. +- * @param { number } endX - Indicates the x coordinate of the target point. +- * @param { number } endY - Indicates the y coordinate of the target point. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- quadTo(ctrlX: number, ctrlY: number, endX: number, endY: number): void; +- +- /** +- * Draws a conic from the last point of a path to the target point. +- * @param { number } ctrlX - Indicates the x coordinate of the control point. +- * @param { number } ctrlY - Indicates the y coordinate of the control point. +- * @param { number } endX - Indicates the x coordinate of the target point. +- * @param { number } endY - Indicates the y coordinate of the target point. +- * @param { number } weight - Indicates the weight of added conic. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- conicTo(ctrlX: number, ctrlY: number, endX: number, endY: number, weight: number): void; +- +- /** +- * Draws a cubic Bezier curve from the last point of a path to the target point. +- * @param { number } ctrlX1 - Indicates the x coordinate of the first control point. +- * @param { number } ctrlY1 - Indicates the y coordinate of the first control point. +- * @param { number } ctrlX2 - Indicates the x coordinate of the second control point. +- * @param { number } ctrlY2 - Indicates the y coordinate of the second control point. +- * @param { number } endX - Indicates the x coordinate of the target point. +- * @param { number } endY - Indicates the y coordinate of the target point. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- cubicTo(ctrlX1: number, ctrlY1: number, ctrlX2: number, ctrlY2: number, endX: number, endY: number): void; +- +- /** +- * Sets the relative starting point of a path. +- * @param { number } dx - Indicates the x coordinate of the relative starting point. +- * @param { number } dy - Indicates the y coordinate of the relative starting point. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- rMoveTo(dx: number, dy: number): void; +- +- /** +- * Draws a line segment from the last point of a path to the relative target point. +- * @param { number } dx - Indicates the x coordinate of the relative target point. +- * @param { number } dy - Indicates the y coordinate of the relative target point. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- rLineTo(dx: number, dy: number): void; +- +- /** +- * Draws a quadratic bezier curve from the last point of a path to the relative target point. +- * @param { number } dx1 - Indicates the x coordinate of the relative control point. +- * @param { number } dy1 - Indicates the y coordinate of the relative control point. +- * @param { number } dx2 - Indicates the x coordinate of the relative target point. +- * @param { number } dy2 - Indicates the y coordinate of the relative target point. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- rQuadTo(dx1: number, dy1: number, dx2: number, dy2: number): void; +- +- /** +- * Draws a conic from the last point of a path to the relative target point. +- * @param { number } ctrlX - Indicates the x coordinate of the relative control point. +- * @param { number } ctrlY - Indicates the y coordinate of the relative control point. +- * @param { number } endX - Indicates the x coordinate of the relative target point. +- * @param { number } endY - Indicates the y coordinate of the relative target point. +- * @param { number } weight - Indicates the weight of added conic. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- rConicTo(ctrlX: number, ctrlY: number, endX: number, endY: number, weight: number): void; +- +- /** +- * Draws a cubic bezier curve from the last point of a path to the relative target point. +- * @param { number } ctrlX1 - Indicates the x coordinate of the first relative control point. +- * @param { number } ctrlY1 - Indicates the y coordinate of the first relative control point. +- * @param { number } ctrlX2 - Indicates the x coordinate of the second relative control point. +- * @param { number } ctrlY2 - Indicates the y coordinate of the second relative control point. +- * @param { number } endX - Indicates the x coordinate of the relative target point. +- * @param { number } endY - Indicates the y coordinate of the relative target point. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- rCubicTo(ctrlX1: number, ctrlY1: number, ctrlX2: number, ctrlY2: number, endX: number, endY: number): void; +- +- /** +- * Adds contour created from point array, adding (count - 1) line segments. +- * @param { Array } points - Indicates the point array. +- * @param { boolean } close - Indicates Whether to add lines that connect the end and start. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- addPolygon(points: Array, close: boolean): void; +- +- /** +- * Combines two paths. +- * @param { Path } path - Indicates the Path object. +- * @param { PathOp } pathOp - Indicates the operator to apply path. +- * @returns { boolean } boolean - Returns true if constructed path is not empty; returns false otherwise. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- op(path: Path, pathOp: PathOp): boolean; +- +- /** +- * Appends arc to path, as the start of new contour. +- * Arc added is part of ellipse bounded by oval, from startAngle through sweepAngle. +- * @param { common2D.Rect } rect - The bounds of the arc is described by a rect. +- * @param { number } startAngle - Indicates the starting angle of arc in degrees. +- * @param { number } sweepAngle - Indicates the sweep, in degrees. Positive is clockwise. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- addArc(rect: common2D.Rect, startAngle: number, sweepAngle: number): void; +- +- /** +- * Adds a circle to the path, and wound in the specified direction. +- * @param { number } x - Indicates the x coordinate of the center of the circle. +- * @param { number } y - Indicates the y coordinate of the center of the circle. +- * @param { number } radius - Indicates the radius of the circle. +- * @param { PathDirection } pathDirection - The default value is CLOCKWISE. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- addCircle(x: number, y: number, radius: number, pathDirection?: PathDirection): void; +- +- /** +- * Adds a oval to the path, defined by the rect, and wound in the specified direction. +- * @param { common2D.Rect } rect - The bounds of the oval is described by a rect. +- * @param { number } start - Indicates the index of initial point of ellipse. +- * @param { PathDirection } pathDirection - The default value is CLOCKWISE. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- addOval(rect: common2D.Rect, start: number, pathDirection?: PathDirection): void; +- +- /** +- * Adds a new contour to the path, defined by the rect, and wound in the specified direction. +- * @param { common2D.Rect } rect - Indicates the Rect object. +- * @param { PathDirection } pathDirection - The default value is CLOCKWISE. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- addRect(rect: common2D.Rect, pathDirection?: PathDirection): void; +- +- /** +- * Adds a new contour to the path, defined by the round rect, and wound in the specified direction. +- * @param { RoundRect } roundRect - Indicates the RoundRect object. +- * @param { PathDirection } pathDirection - The default value is CLOCKWISE. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- addRoundRect(roundRect: RoundRect, pathDirection?: PathDirection): void; +- +- /** +- * Appends src path to path, transformed by matrix. +- * @param { Path } path - Indicates the Path object. +- * @param { Matrix | null } matrix - Indicates transform applied to path. The default value is null. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- addPath(path: Path, matrix?: Matrix | null): void; +- +- /** +- * Path is replaced by transformed data. +- * @param { Matrix } matrix - Indicates transform applied to path. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- transform(matrix: Matrix): void; +- +- /** +- * Returns the status that point (x, y) is contained by path. +- * @param { number } x - Indicates the x-axis value of containment test. +- * @param { number } y - Indicates the y-axis value of containment test. +- * @returns { boolean } Returns true if the point (x, y) is contained by path; returns false otherwise. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- contains(x: number, y: number): boolean; +- +- /** +- * Sets fill type, the rule used to fill path. +- * @param { PathFillType } pathFillType - Indicates the enum path fill type. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setFillType(pathFillType: PathFillType): void; +- +- /** +- * Gets the smallest bounding box that contains the path. +- * @returns { common2D.Rect } Rect object. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getBounds(): common2D.Rect; +- +- /** +- * Closes a path. A line segment from the start point to the last point of the path is added. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- close(): void; +- +- /** +- * Offsets point array by (dx, dy). Path is replaced by offset data. +- * @param { number } dx - Indicates offset added to dst path x-axis coordinates. +- * @param { number } dy - Indicates offset added to dst path y-axis coordinates. +- * @returns { Path } Returns a new Path object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- offset(dx: number, dy: number): Path; +- +- /** +- * Resets path data. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- reset(): void; +- +- /** +- * Get path length. +- * @param { boolean } forceClosed - Whether to close the Path. +- * @returns { number } Return path length. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getLength(forceClosed: boolean): number; +- +- /** +- * Gets the position and tangent of the distance from the starting position of the path. +- * +- * @param { boolean } forceClosed - Whether to close the path. +- * @param { number } distance - The distance from the start of the path, should be greater than 0 +- * and less than 'GetLength()'. +- * @param { common2D.Point } position - Sets to the position of distance from the starting position of the path. +- * @param { common2D.Point } tangent - Sets to the tangent of distance from the starting position of the path. +- * @returns { boolean } - Returns true if succeeded, otherwise false. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getPositionAndTangent(forceClosed: boolean, distance: number, position: common2D.Point, +- tangent: common2D.Point): boolean; +- +- /** +- * Determines whether the current contour is closed. +- * +- * @returns { boolean } - Returns true if the current contour is closed, otherwise false. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- isClosed(): boolean; +- +- /** +- * Computes the corresponding matrix at the specified distance. +- * +- * @param { boolean } forceClosed - Whether to close the path. +- * @param { number } distance - The distance from the start of the path. +- * @param { Matrix } matrix - Indicates the pointer to an Matrix object. +- * @param { PathMeasureMatrixFlags } flags - Indicates what should be returned in the matrix. +- * @returns { boolean } - Returns false if there is no path, or a zero-length path was specified, +- * in which case matrix is unchanged. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: Mandatory parameters are left unspecified. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getMatrix(forceClosed: boolean, distance: number, matrix: Matrix, flags: PathMeasureMatrixFlags): boolean; +- +- /** +- * Parses the SVG format string that describes the drawing path, and sets the path. +- * +- * @param { string } str - A string in SVG format that describes the drawing path. +- * @returns { boolean } true if build succeeded, otherwise false. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: Mandatory parameters are left unspecified. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- buildFromSvgString(str: string): boolean; +- } +- +- /** +- * Enumerates of scale to fit flags, selects if an array of points are drawn as discrete points, +- * as lines, or as an open polygon. +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export enum PointMode { +- /** +- * Draws each point separately. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- POINTS = 0, +- +- /** +- * Draws each pair of points as a line segment. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- LINES = 1, +- +- /** +- * Draws the array of points as a open polygon. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- POLYGON = 2, +- } +- +- /** +- * Enumerates storage filter mode. +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export enum FilterMode { +- /** +- * Single sample point (nearest neighbor). +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- FILTER_MODE_NEAREST = 0, +- +- /** +- * Interpolate between 2x2 sample points (bilinear interpolation). +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- FILTER_MODE_LINEAR = 1, +- } +- +- /** +- * Enumerates of shadow flags. +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export enum ShadowFlag { +- /** +- * Use no shadow flags. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- NONE = 0, +- +- /** +- * The occluding object is transparent. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- TRANSPARENT_OCCLUDER = 1, +- +- /** +- * No need to analyze shadows. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- GEOMETRIC_ONLY = 2, +- +- /** +- * Use all shadow flags. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- ALL = 3, +- } +- +- /** +- * Provides an interface to the drawing, and samplingOptions used when sampling from the image. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export class SamplingOptions { +- /** +- * Constructor for the samplingOptions. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- constructor(); +- /** +- * Constructor for the samplingOptions with filter mode. +- * @param { FilterMode } filterMode - Storage filter mode. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- constructor(filterMode: FilterMode); +- } +- +- /** +- * Provides an interface to the drawing, and how to clip and transform the drawing. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- export class Canvas { +- /** +- * Constructor for the Canvas. +- * @param { image.PixelMap } pixelmap - PixelMap. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- constructor(pixelmap: image.PixelMap); +- +- /** +- * If rectangle is stroked, use pen to stroke width describes the line thickness, +- * else use brush to fill the rectangle. +- * @param { common2D.Rect } rect - Rectangle to draw. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- drawRect(rect: common2D.Rect): void; +- +- /** +- * If rectangle is stroked, use pen to stroke width describes the line thickness, +- * else use brush to fill the rectangle. +- * @param { number } left - Indicates the left position of the rectangle. +- * @param { number } top - Indicates the top position of the rectangle. +- * @param { number } right - Indicates the right position of the rectangle. +- * @param { number } bottom - Indicates the bottom position of the rectangle. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- drawRect(left: number, top: number, right: number, bottom: number): void; +- +- /** +- * Draws a RoundRect. +- * @param { RoundRect } roundRect - Indicates the RectRound object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- drawRoundRect(roundRect: RoundRect): void; +- +- /** +- * Draws a nested RoundRect. +- * @param { RoundRect } outer - Indicates the outer RectRound object. +- * @param { RoundRect } inner - Indicates the inner RectRound object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- drawNestedRoundRect(outer: RoundRect, inner: RoundRect): void; +- +- /** +- * Fills clipped canvas area with brush. +- * @param { Brush } brush - Indicates the Brush object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- drawBackground(brush: Brush): void; +- +- /** +- * Draws an offset spot shadow and outlining ambient shadow for the given path with circular light. +- * @param { Path } path - Indicates the Path object. +- * @param { common2D.Point3d } planeParams - Represents z offset of the occluder from the canvas based on x and y. +- * @param { common2D.Point3d } devLightPos - Represents the position of the light relative to the canvas. +- * @param { number } lightRadius - The radius of the circular light. +- * @param { common2D.Color } ambientColor - Ambient shadow's color. +- * @param { common2D.Color } spotColor - Spot shadow's color. +- * @param { ShadowFlag } flag - Indicates the flag to control opaque occluder, shadow, and light position. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- drawShadow(path: Path, planeParams: common2D.Point3d, devLightPos: common2D.Point3d, lightRadius: number, +- ambientColor: common2D.Color, spotColor: common2D.Color, flag: ShadowFlag) : void; +- +- /** +- * Draws an offset spot shadow and outlining ambient shadow for the given path with circular light. +- * In this function, the input of the parameter 'ambientColor' and 'spotColor' should be number +- * @param { Path } path - Indicates the Path object. +- * @param { common2D.Point3d } planeParams - Represents z offset of the occluder from the canvas based on x and y. +- * @param { common2D.Point3d } devLightPos - Represents the position of the light relative to the canvas. +- * @param { number } lightRadius - The radius of the circular light. +- * @param { number } ambientColor - Ambient shadow's color represented by ARGB color of hexadecimal format. +- * @param { number } spotColor - Spot shadow's color represented by ARGB color of hexadecimal format. +- * @param { ShadowFlag } flag - Indicates the flag to control opaque occluder, shadow, and light position. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 13 +- */ +- drawShadow(path: Path, planeParams: common2D.Point3d, devLightPos: common2D.Point3d, lightRadius: number, +- ambientColor: number, spotColor: number, flag: ShadowFlag) : void; +- +- /** +- * If radius is zero or less, nothing is drawn. If circle is stroked, use pen to +- * stroke width describes the line thickness, else use brush to fill the circle. +- * @param { number } x - X coordinate of the circle center. +- * @param { number } y - Y coordinate of the circle center. +- * @param { number } radius - The radius of the circle must be greater than 0. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- drawCircle(x: number, y: number, radius: number): void; +- +- /** +- * Draw a pixelmap, with the upper left corner at (left, top). +- * @param { image.PixelMap } pixelmap - PixelMap. +- * @param { number } left - Left side of image. +- * @param { number } top - Top side of image. +- * @throws { BusinessError } 401 - Parameter error. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- /** +- * Draw a pixelmap, with the upper left corner at (left, top). +- * @param { image.PixelMap } pixelmap - PixelMap. +- * @param { number } left - Left side of image. +- * @param { number } top - Top side of image. +- * @param { SamplingOptions } samplingOptions - SamplingOptions used to describe the sampling mode. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- drawImage(pixelmap: image.PixelMap, left: number, top: number, samplingOptions?: SamplingOptions): void; +- +- /** +- * Draws the specified source image onto the canvas, +- * scaled and translated to the destination rectangle. +- * @param { image.PixelMap } pixelmap - The source image. +- * @param { common2D.Rect } dstRect - The area of destination canvas. +- * @param { SamplingOptions } samplingOptions - SamplingOptions used to describe the sampling mode. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- drawImageRect(pixelmap: image.PixelMap, dstRect: common2D.Rect, samplingOptions?: SamplingOptions): void; +- +- /** +- * Draws the specified source rectangle of the image onto the canvas, +- * scaled and translated to the destination rectangle. +- * @param { image.PixelMap } pixelmap - The source image. +- * @param { common2D.Rect } srcRect - The area of source image. +- * @param { common2D.Rect } dstRect - The area of destination canvas. +- * @param { SamplingOptions } samplingOptions - SamplingOptions used to describe the sampling mode. +- * @param { SrcRectConstraint } constraint - Constraint type. The default value is STRICT. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- drawImageRectWithSrc(pixelmap: image.PixelMap, srcRect: common2D.Rect, dstRect: common2D.Rect, +- samplingOptions?: SamplingOptions, constraint?: SrcRectConstraint): void; +- +- /** +- * Fills clip with color color. Mode determines how ARGB is combined with destination. +- * @param { common2D.Color } color - The range of color channels must be [0, 255]. +- * @param { BlendMode } blendMode - Used to combine source color and destination. The default value is SRC_OVER. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- drawColor(color: common2D.Color, blendMode?: BlendMode): void; +- +- /** +- * Fills clip with the specified ARGB color of hexadecimal format. +- * @param { number } color - Number must be ARGB color of hexadecimal format. +- * @param { BlendMode } blendMode - Used to combine source color and destination. The default value is SRC_OVER. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 13 +- */ +- drawColor(color: number, blendMode?: BlendMode): void; +- +- /** +- * Fills the clipped rectangle with the specified ARGB color. +- * @param { number } alpha - Alpha channel of color. The range of alpha must be [0, 255]. +- * @param { number } red - Red channel of color. The range of red must be [0, 255]. +- * @param { number } green - Green channel of color. The range of green must be [0, 255]. +- * @param { number } blue - Blue channel of color. The range of blue must be [0, 255]. +- * @param { BlendMode } blendMode - Used to combine source color and destination. The default value is SRC_OVER. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- drawColor(alpha: number, red: number, green: number, blue: number, blendMode?: BlendMode): void; +- +- /** +- * Draws an oval. +- * @param { common2D.Rect } oval - The bounds of the oval is described by a rect. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- drawOval(oval: common2D.Rect): void; +- +- /** +- * Draws an arc. +- * @param { common2D.Rect } arc - The bounds of the arc is described by a rect. +- * @param { number } startAngle - Indicates the startAngle of the arc. +- * @param { number } sweepAngle - Indicates the sweepAngle of the arc. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- drawArc(arc: common2D.Rect, startAngle: number, sweepAngle: number): void; +- +- /** +- * Draw a point. +- * @param { number } x - X coordinate position of the point. +- * @param { number } y - Y coordinate position of the point. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- drawPoint(x: number, y: number): void; +- +- /** +- * Draws point array as separate point, line segment or open polygon according to given point mode. +- * @param { Array } points - Points array. +- * @param { PointMode } mode - Draws points enum method. The default value is POINTS. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- drawPoints(points: Array, mode?: PointMode): void; +- +- /** +- * Draws a path. +- * @param { Path } path - Path to draw. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- drawPath(path: Path): void; +- +- /** +- * Draws line segment from startPt to endPt. +- * @param { number } x0 - X coordinate of the start point of the line segment. +- * @param { number } y0 - Y coordinate of the start point of the line segment. +- * @param { number } x1 - X coordinate of the end point of the line segment. +- * @param { number } y1 - Y coordinate of the end point of the line segment. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- drawLine(x0: number, y0: number, x1: number, y1: number): void; +- +- /** +- * Draws a single character. +- * @param { string } text - A string containing only a single character. +- * @param { Font } font - Font object. +- * @param { number } x - X coordinate of the single character start point. +- * @param { number } y - Y coordinate of the single character start point. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- drawSingleCharacter(text: string, font: Font, x: number, y: number): void; +- +- /** +- * Draws a textBlob +- * @param { TextBlob } blob - TextBlob to draw. +- * @param { number } x - X coordinate of the text start point. +- * @param { number } y - Y coordinate of the text start point. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- drawTextBlob(blob: TextBlob, x: number, y: number): void; +- +- /** +- * Draws the pixelmap base on the mesh which is evenly distributed across the pixelmap. +- * @param { image.PixelMap } pixelmap - The pixelmap to draw using the mesh. +- * @param { number } meshWidth - The number of columns in the mesh. +- * @param { number } meshHeight - The number of rows in the mesh. +- * @param { Array } vertices - Array of vertices, specifying where the mesh should be drawn. +- * @param { number } vertOffset - Number of vert elements to skip before drawing. +- * @param { Array } colors - Array of colors, specifying a color at each vertex. +- * @param { number } colorOffset - Number of color elements to skip before drawing. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- drawPixelMapMesh(pixelmap: image.PixelMap, meshWidth: number, meshHeight: number, +- vertices: Array, vertOffset: number, colors: Array, colorOffset: number): void; +- +- /** +- * Draws a region. +- * @param { Region } region - Region object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- drawRegion(region: Region): void; +- +- /** +- * Set pen to a canvas. +- * @param { Pen } pen - object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- attachPen(pen: Pen): void; +- +- /** +- * Set brush to a canvas. +- * @param { Brush } brush - Object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- attachBrush(brush: Brush): void; +- +- /** +- * Unset pen to a canvas. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- detachPen(): void; +- +- /** +- * Unset brush to a canvas. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- detachBrush(): void; +- +- /** +- * Saves the current canvas status (canvas matrix) to the top of the stack. +- * @returns { number } Return the number of saved states. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- save(): number; +- +- /** +- * Saves matrix and clip, and allocates a bitmap for subsequent drawing. +- * Calling restore discards changes to matrix and clip, and draws the bitmap. +- * @param { common2D.Rect | null} rect - Optional layer size. The default value is null. +- * @param { Brush | null} brush - Optional brush effect used to draw the layer. The default value is null. +- * @returns { number } Return the number of saved states before this call. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: Mandatory parameters are left unspecified. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- saveLayer(rect?: common2D.Rect | null, brush?: Brush | null): number; +- +- /** +- * Clears a canvas by using a specified color. +- * @param { common2D.Color } color - Indicates the color, which is a 32-bit (ARGB) variable. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- clear(color: common2D.Color): void; +- +- /** +- * Clears a canvas by using a specified color represented by ARGB color of hexadecimal format. +- * @param { number } color - Number must be ARGB color of hexadecimal format. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 13 +- */ +- clear(color: number): void; +- +- /** +- * Restores the canvas status (canvas matrix) saved on the top of the stack. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- restore(): void; +- +- /** +- * Restores the specific number of the canvas status (canvas matrix) saved in the stack. +- * @param { number } count - Depth of state stack to restore. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- restoreToCount(count: number): void; +- +- /** +- * Gets the number of the canvas status (canvas matrix) saved in the stack. +- * @returns { number } Return represent depth of save state stack. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getSaveCount(): number; +- +- /** +- * Gets the width of a canvas. +- * @returns { number } Return the width of a canvas. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getWidth(): number; +- +- /** +- * Gets the height of a canvas. +- * @returns { number } Return the height of a canvas. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getHeight(): number; +- +- /** +- * Gets the bounds of clip of a canvas. +- * @returns { common2D.Rect } Rect object. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getLocalClipBounds(): common2D.Rect; +- +- /** +- * Gets a 3x3 matrix of the transform from local coordinates to 'device'. +- * @returns { Matrix } Matrix object. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getTotalMatrix(): Matrix; +- +- /** +- * Scales by sx on the x-axis and sy on the y-axis. +- * @param { number } sx - Indicates the amount to scale on x-axis. +- * @param { number } sy - Indicates the amount to scale on y-axis. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- scale(sx: number, sy: number): void; +- +- /** +- * Skews by sx on the x-axis and sy on the y-axis. +- * @param { number } sx - Indicates the value skew transformation on x-axis. +- * @param { number } sy - Indicates the value skew transformation on y-axis. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- skew(sx: number, sy: number) : void; +- +- /** +- * Rotates by degrees, positive degrees rotates clockwise. +- * @param { number } degrees - Indicates the amount to rotate, in degrees. +- * @param { number } sx - Indicates the x-axis value of the point to rotate about. +- * @param { number } sy - Indicates the y-axis value of the point to rotate about. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- rotate(degrees: number, sx: number, sy: number) : void; +- +- /** +- * Translates by dx along the x-axis and dy along the y-axis. +- * @param { number } dx - Indicates the distance to translate on x-axis. +- * @param { number } dy - Indicates the distance to translate on y-axis. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- translate(dx: number, dy: number): void; +- +- /** +- * Replaces the clipping area with the intersection or difference of the current clipping area and path, +- * and use a clipping edge that is aliased or anti-aliased. +- * @param { Path } path - To combine with clip. +- * @param { ClipOp } clipOp - Indicates the operation to apply to clip. The default value is intersect. +- * @param { boolean } doAntiAlias - True if clip is to be anti-aliased. The default value is false. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- clipPath(path: Path, clipOp?: ClipOp, doAntiAlias?: boolean): void; +- +- /** +- * Replaces the clipping area with the intersection or difference between the +- * current clipping area and Rect, and use a clipping edge that is aliased or anti-aliased. +- * @param { common2D.Rect } rect - To combine with clipping area. +- * @param { ClipOp } clipOp - Indicates the operation to apply to clip. The default value is intersect. +- * @param { boolean } doAntiAlias - True if clip is to be anti-aliased. The default value is false. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- clipRect(rect: common2D.Rect, clipOp?: ClipOp, doAntiAlias?: boolean): void; +- +- /** +- * Uses the passed matrix to transforming the geometry, then use existing matrix. +- * @param { Matrix } matrix - Declares functions related to the matrix object in the drawing module. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- concatMatrix(matrix: Matrix): void; +- +- /** +- * Replace the clipping area with the intersection or difference of the +- * current clipping area and Region, and use a clipping edge that is aliased or anti-aliased. +- * @param { Region } region - Region object. +- * @param { ClipOp } clipOp - Indicates the operation to apply to clip. The default value is intersect. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- clipRegion(region: Region, clipOp?: ClipOp): void; +- +- /** +- * Replaces the clipping area with the intersection or difference between the +- * current clipping area and RoundRect, and use a clipping edge that is aliased or anti-aliased. +- * @param { RoundRect } roundRect - To combine with clipping area. +- * @param { ClipOp } clipOp - Indicates the operation to apply to clip. The default value is intersect. +- * @param { boolean } doAntiAlias - True if clip is to be anti-aliased. The default value is false. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- clipRoundRect(roundRect: RoundRect, clipOp?: ClipOp, doAntiAlias?: boolean): void; +- +- /** +- * Checks whether the drawable area is empty. +- * @returns { boolean } Returns true if drawable area is empty. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- isClipEmpty(): boolean; +- +- /** +- * Sets matrix of canvas. +- * @param { Matrix } matrix - Declares functions related to the matrix object in the drawing module. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setMatrix(matrix: Matrix): void; +- +- /** +- * Sets matrix of canvas to the identity matrix. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- resetMatrix(): void; +- } +- +- /** +- * Enumerates clip operations. +- * +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export enum ClipOp { +- /** +- * Clips with difference. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- DIFFERENCE = 0, +- /** +- * Clips with intersection. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- INTERSECT = 1, +- } +- +- /** +- * Provide a description of the type and position of the text. +- * @typedef TextBlobRunBuffer +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- export interface TextBlobRunBuffer { +- /** +- * Text model. +- * @type { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- glyph: number; +- /** +- * X-coordinate of the text start point. +- * @type { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- positionX: number; +- /** +- * Y-coordinate of the text start point. +- * @type { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- positionY: number; +- } +- +- /** +- * Encoding type of the description text. +- * +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- export enum TextEncoding { +- /** +- * Use 1 byte to represent UTF-8 or ASCII +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- TEXT_ENCODING_UTF8 = 0, +- /** +- * Use 2 bytes to represent most of unicode +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- TEXT_ENCODING_UTF16 = 1, +- /** +- * Use 4 bytes to represent all unicode. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- TEXT_ENCODING_UTF32 = 2, +- /** +- * Use 2 bytes to represent the glyph index. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- TEXT_ENCODING_GLYPH_ID = 3, +- } +- +- /** +- * Provide a description of the text +- * +- * class TextBlob +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- export class TextBlob { +- /** +- * Create a textblob from a string +- * @param { string } text - Drawn glyph content. +- * @param { Font } font - Specify text size, font, text scale, etc. +- * @param { TextEncoding } encoding - The default value is TEXT_ENCODING_UTF8. +- * @returns { TextBlob } TextBlob object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @static +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- static makeFromString(text: string, font: Font, encoding?: TextEncoding): TextBlob; +- +- /** +- * Create a textblob from a string, each element of which is located at the given positions. +- * @param { string } text - Drawn glyph content. +- * @param { number } len - string length, value must equal to points length. +- * @param { common2D.Point[] } points - Position coordinates of a textblob elements. +- * @param { Font } font - Specify text size, font, text scale, etc. +- * @returns { TextBlob } TextBlob object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @static +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- static makeFromPosText(text: string, len: number, points: common2D.Point[], font: Font): TextBlob; +- +- /** +- * Creating a textblob object based on RunBuffer information +- * @param { Array } pos - The array of TextBlobRunBuffer. +- * @param { Font } font - Font used for this run. +- * @param { common2D.Rect } bounds - Optional run bounding box. The default value is null; +- * @returns { TextBlob } TextBlob object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @static +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- static makeFromRunBuffer(pos: Array, font: Font, bounds?: common2D.Rect): TextBlob; +- +- /** +- * Returns the bounding rectangle shape +- * @returns { common2D.Rect } Rect object. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- bounds(): common2D.Rect; +- +- /** +- * Returns an unique identifier for a textblob. +- * @returns { number } Unique ID. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- uniqueID(): number; +- } +- +- /** +- * The Typeface class specifies the typeface and intrinsic style of a font. +- * +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- export class Typeface { +- /** +- * Get the family name for this typeface. +- * @returns { string } Family name. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- getFamilyName(): string; +- +- /** +- * Generate typeface from file. +- * @param { string } filePath - file path for typeface. +- * @returns { Typeface } Typeface. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- static makeFromFile(filePath: string): Typeface; +- } +- +- /** +- * Enumerates text edging types. +- * +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export enum FontEdging { +- /** +- * Uses anti aliasing, default value. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- ALIAS = 0, +- +- /** +- * Uses sub-pixel anti aliasing. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- ANTI_ALIAS = 1, +- +- /** +- * Uses sub-pixel anti aliasing and enable sub-pixel localization. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- SUBPIXEL_ANTI_ALIAS = 2, +- } +- +- /** +- * Enumerates text hinting types. +- * +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export enum FontHinting { +- /** +- * Not use text hinting. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- NONE = 0, +- +- /** +- * Uses slight text hinting. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- SLIGHT = 1, +- +- /** +- * Uses normal text hinting. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- NORMAL = 2, +- +- /** +- * Uses full text hinting. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- FULL = 3, +- } +- +- /** +- * Font controls options applied when drawing and measuring text. +- * +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- export class Font { +- /** +- * Requests, but does not require, that glyphs respect sub-pixel positioning. +- * @param { boolean } isSubpixel - Setting for sub-pixel positioning. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- enableSubpixel(isSubpixel: boolean): void; +- +- /** +- * Increases stroke width when creating glyph bitmaps to approximate a bold typeface. +- * @param { boolean } isEmbolden - Setting for bold approximation. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- enableEmbolden(isEmbolden: boolean): void; +- +- /** +- * Requests linearly scalable font and glyph metrics. +- * @param { boolean } isLinearMetrics - Setting for linearly scalable font and glyph metrics. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- enableLinearMetrics(isLinearMetrics: boolean): void; +- +- /** +- * Sets text size in points. Has no effect if textSize is not greater than or equal to zero. +- * @param { number } textSize - Typographic height of text. The height of the text must be greater than 0. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- setSize(textSize: number): void; +- +- /** +- * Obtains the text size. +- * @returns { number } Text size. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- getSize(): number; +- +- /** +- * Sets Typeface to font. +- * @param { Typeface } typeface - Font and style used to draw text. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- setTypeface(typeface: Typeface): void; +- +- /** +- * Get Typeface to font. +- * @returns { Typeface } Typeface. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- getTypeface(): Typeface; +- +- /** +- * Get fontMetrics associated with typeface. +- * @returns { FontMetrics } The fontMetrics value returned to the caller. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- getMetrics(): FontMetrics; +- +- /** +- * Measure a single character. +- * @param { string } text - A string containing only a single character. +- * @returns { number } The width of the single character. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- measureSingleCharacter(text: string): number; +- /** +- * Measure the width of text. +- * @param { string } text - Text Symbol Content. +- * @param { TextEncoding } encoding - Encoding format. +- * @returns { number } The width of text. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- measureText(text: string, encoding: TextEncoding): number; +- +- /** +- * Sets text scale on x-axis to font. +- * @param { number } scaleX - Text scaleX. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setScaleX(scaleX: number): void; +- +- /** +- * Sets text skew on x-axis to font. +- * @param { number } skewX - Text skewX. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setSkewX(skewX: number): void; +- +- /** +- * Sets the edging effect to font. +- * @param { FontEdging } edging - Text edging. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setEdging(edging: FontEdging): void; +- +- /** +- * Sets the hinting pattern to font. +- * @param { FontHinting } hinting - Text hinting. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setHinting(hinting: FontHinting): void; +- +- /** +- * Calculates number of glyphs represented by text. +- * @param { string } text - Indicates the character storage encoded with text encoding. +- * @returns { number } Returns the count of text. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- countText(text: string): number; +- +- /** +- * Sets whether the font baselines and pixels alignment when the transformation matrix is ​​axis aligned. +- * @param { boolean } isBaselineSnap - Indicates whether the font baselines and pixels alignment. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setBaselineSnap(isBaselineSnap: boolean): void; +- +- /** +- * Gets whether the font baselines and pixels alignment when the transformation matrix is ​​axis aligned. +- * @returns { boolean } Returns true if the font baselines and pixels alignment; returns false otherwise. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- isBaselineSnap(): boolean; +- +- /** +- * Sets whether to use bitmaps instead of outlines in the object. +- * @param { boolean } isEmbeddedBitmaps - Indicates whether to use bitmaps instead of outlines. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setEmbeddedBitmaps(isEmbeddedBitmaps: boolean): void; +- +- /** +- * Gets whether to use bitmaps instead of outlines in the object. +- * @returns { boolean } if using bitmaps instead of outlines; returns false otherwise. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- isEmbeddedBitmaps(): boolean; +- +- /** +- * Sets whether the font outline is automatically adjusted. +- * @param { boolean } isForceAutoHinting - Indicates whether the font outline is automatically adjusted. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setForceAutoHinting(isForceAutoHinting: boolean): void; +- +- /** +- * Gets whether the font outline is automatically adjusted. +- * @returns { boolean } Returns true if the font outline is automatically adjusted; returns false otherwise. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- isForceAutoHinting(): boolean; +- +- /** +- * Retrieves the advance for each glyph in glyphs. +- * @param { Array } glyphs - Array of glyph indices to be measured. +- * @returns { Array } Returns the width of each character in a string. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getWidths(glyphs: Array): Array; +- +- /** +- * Gets storage for glyph indexes. +- * @param { string } text - Indicates the character storage encoded with text encoding. +- * @param { number } glyphCount - The number of glyph. The default value is the result of calling countText. +- * @returns { Array } Returns the storage for glyph indices. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- textToGlyphs(text: string, glyphCount?: number): Array; +- +- /** +- * Returns true if glyphs may be drawn at sub-pixel offsets. +- * @returns { boolean } True if glyphs may be drawn at sub-pixel offsets. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- isSubpixel(): boolean; +- /** +- * Returns true if font and glyph metrics are requested to be linearly scalable. +- * @returns { boolean } True if font and glyph metrics are requested to be linearly scalable. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- isLinearMetrics(): boolean; +- /** +- * Returns text skew on x-axis. +- * @returns { number } Additional shear on x-axis relative to y-axis. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getSkewX(): number; +- /** +- * Gets whether to increase the stroke width to approximate bold fonts. +- * @returns { boolean } Returns true to increase the stroke width to approximate bold fonts; +- * returns false otherwise. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- isEmbolden(): boolean; +- /** +- * Returns text scale on x-axis. +- * @returns { number } Text horizontal scale. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getScaleX(): number; +- /** +- * Gets font hinting pattern. +- * @returns { FontHinting } Font hinting level. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getHinting(): FontHinting; +- /** +- * Gets font edge pixels pattern. +- * @returns { FontEdging } Edge pixels pattern. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getEdging(): FontEdging; +- /** +- * Create path object of specified Glyph. +- * @param { number } index - the index of Glyphs. +- * @returns { Path } The path object for specified glyph, undefined if not found. +- * Note: Path use y-axis-goes-down system, y axis is inverted to the y-axis-goes-up system. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 14 +- */ +- createPathForGlyph(index: number): Path; +- /** +- * Retrieves the bounding rect for each glyph in glyphs. +- * @param { Array } glyphs - Indicates the array of glyph indices to be measured. +- * @returns { Array } Returns bounds for each glyph relative to (0, 0). +- * Note: 1. Rect use y-axis-goes-down system, y axis is inverted to the y-axis-goes-up system. +- *
    2. Rect use two points(left-bottom & right-top) to describe the bound. +- *
    3. The bound rect will be snap to integral boundaries. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 14 +- */ +- getBounds(glyphs: Array): Array; +- /** +- * Get path of text. +- * @param { string } text - Indicates the character storage encoded with text encoding. +- * @param { number } byteLength - Indicates the byte length of the text. +- * @param { number } x - Indicates X coordinate for the starting position of the text within the drawing area. +- * @param { number } y - Indicates Y coordinate for the starting position of the text within the drawing area. +- * @returns { Path } The path object for Glyph. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 14 +- */ +- getTextPath(text: string, byteLength: number, x: number, y: number): Path; +- } +- +- /** +- * Indicate when certain metrics are valid; the underline or strikeout metrics may be valid and zero. +- * Fonts with embedded bitmaps may not have valid underline or strikeout metrics. +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export enum FontMetricsFlags { +- /** +- * Set if underlineThickness of FontMetrics is valid. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- UNDERLINE_THICKNESS_VALID = 1 << 0, +- +- /** +- * Set if underlinePosition of FontMetrics is valid. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- UNDERLINE_POSITION_VALID = 1 << 1, +- +- /** +- * Set if strikethroughThickness of FontMetrics is valid. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- STRIKETHROUGH_THICKNESS_VALID = 1 << 2, +- +- /** +- * Set if strikethroughPosition of FontMetrics is valid. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- STRIKETHROUGH_POSITION_VALID = 1 << 3, +- +- /** +- * set if top, bottom, xMin, xMax of FontMetrics invalid. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- BOUNDS_INVALID = 1 << 4, +- } +- +- /** +- * The metrics of an Font. +- * @typedef FontMetrics +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- export interface FontMetrics { +- /** +- * Indicating which metrics are valid. +- * @type { ?FontMetricsFlags } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- flags?: FontMetricsFlags; +- +- /** +- * Maximum range above the glyph bounding box. +- * @type { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- top: number; +- /** +- * Distance Retained Above Baseline. +- * @type { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- ascent: number; +- /** +- * The distance that remains below the baseline. +- * @type { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- descent: number; +- /** +- * Maximum range below the glyph bounding box. +- * @type { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- bottom: number; +- /** +- * Line Spacing. +- * @type { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- leading: number; +- /** +- * Average character width, zero if unknown. +- * @type { ?number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- avgCharWidth?: number; +- +- /** +- * Maximum character width, zero if unknown. +- * @type { ?number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- maxCharWidth?: number; +- +- /** +- * Greatest extent to left of origin of any glyph bounding box, typically negative; deprecated with variable fonts. +- * @type { ?number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- xMin?: number; +- +- /** +- * Greatest extent to right of origin of any glyph bounding box, typically positive; +- * deprecated with variable fonts. +- * @type { ?number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- xMax?: number; +- +- /** +- * Height of lower-case 'x', zero if unknown, typically negative. +- * @type { ?number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- xHeight?: number; +- +- /** +- * Height of an upper-case letter, zero if unknown, typically negative. +- * @type { ?number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- capHeight?: number; +- +- /** +- * Underline thickness. +- * @type { ?number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- underlineThickness?: number; +- +- /** +- * Distance from baseline to top of stroke, typically positive. +- * @type { ?number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- underlinePosition?: number; +- +- /** +- * Strikethrough thickness. +- * @type { ?number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- strikethroughThickness?: number; +- +- /** +- * Distance from baseline to bottom of stroke, typically negative. +- * @type { ?number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- strikethroughPosition?: number; +- } +- +- /** +- * Lattice is the class for dividing an image into grids. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export class Lattice { +- /** +- * Divide an image into a rectangular grid. Grid entries on even columns and even rows are fixed; +- * these entries are always drawn at their original size if the destination is large enough. If the destination +- * side is too small to hold the fixed entries, all fixed entries are scaled down to fit. +- * The grid entries not on even columns and rows are scaled to fit the remaining space, if any. +- * @param { Array } xDivs - X coordinate of values used to divide the image. +- * @param { Array } yDivs - Y coordinate of values used to divide the image. +- * @param { number } fXCount - Number of x coordinates. Must be >= 0. +- * @param { number } fYCount - Number of y coordinates. Must be >= 0. +- * @param { common2D.Rect | null } fBounds - Source bounds to draw from. The default value is null. +- * @param { Array | null } fRectTypes - Array of fill types. The default value is null. +- * @param { Array | null } fColors - Array of colors. The default value is null. +- * @returns { Lattice } Lattice object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @static +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- static createImageLattice(xDivs: Array, yDivs: Array, fXCount: number, fYCount: number, +- fBounds?: common2D.Rect | null, fRectTypes?: Array | null, fColors?: Array | null): Lattice; +- } +- +- /** +- * Enumerate rect types. Optional setting per rectangular grid entry to make it transparent, +- * or to fill the grid entry with a color. only used in Lattice. +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export enum RectType { +- /** +- * Draws image into lattice rect. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- DEFAULT = 0, +- +- /** +- * Skips lattice rect by making it transparent. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- TRANSPARENT = 1, +- +- /** +- * Draws one of fColors into lattice rect. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- FIXEDCOLOR = 2 +- } +- +- /** +- * MaskFilter is the class for object that perform transformations on an alpha-channel mask before drawing it. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export class MaskFilter { +- /** +- * Makes a MaskFilter with a blur effect. +- * @param { BlurType } blurType - Indicates the blur type. +- * @param { number } sigma - Indicates the standard deviation of the Gaussian blur to apply. Must be > 0. +- * @returns { MaskFilter } MaskFilter object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @static +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- static createBlurMaskFilter(blurType: BlurType, sigma: number): MaskFilter; +- } +- +- /** +- * Defines a PathEffect, which is used to affects stroked paths. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export class PathEffect { +- /** +- * Makes a dash PathEffect. +- * @param { Array } intervals - Array of ON and OFF distances. Must contain an even number of entries (>=2), +- * with the even indices specifying the "on" intervals, and the odd indices specifying the "off" intervals. +- * @param { number } phase - Offset into the intervals array. +- * @returns { PathEffect } PathEffect object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @static +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- static createDashPathEffect(intervals: Array, phase: number): PathEffect; +- +- /** +- * Makes a corner PathEffect. +- * @param { number } radius - Indicates the radius of the tangent circle at the corners of the path. +- * The radius must be greater than 0. +- * @returns { PathEffect } PathEffect object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @static +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- static createCornerPathEffect(radius: number): PathEffect; +- } +- +- /** +- * Describes a shader effect object. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export class ShaderEffect { +- /** +- * Creates an ShaderEffect object that generates a shader with single color. +- * @param { number } color - Indicates the color used by the shader. +- * @returns { ShaderEffect } Returns the shader with single color ShaderEffect object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- static createColorShader(color: number): ShaderEffect; +- +- /** +- * Creates an ShaderEffect object that generates a linear gradient between the two specified points. +- * @param { common2D.Point } startPt - Indicates the start point for the gradient. +- * @param { common2D.Point } endPt - Indicates the end point for the gradient. +- * @param { Array } colors - Indicates the colors to be distributed between the two points. +- * @param { TileMode } mode - Indicates the tile mode. +- * @param { Array | null } pos - Indicates the relative position of each corresponding color +- *
    in the colors array. The default value is empty for uniform distribution. +- * @param { Matrix | null } matrix - Indicates the Matrix object. The default value is null. +- * @returns { ShaderEffect } Returns a linear gradient ShaderEffect object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- static createLinearGradient(startPt: common2D.Point, endPt: common2D.Point, colors: Array, +- mode: TileMode, pos?: Array | null, matrix?: Matrix | null): ShaderEffect; +- +- /** +- * Creates an ShaderEffect object that generates a radial gradient given the center and radius. +- * @param { common2D.Point } centerPt - Indicates the center of the circle for the gradient. +- * @param { number } radius - Indicates the radius of the circle for this gradient. +- * @param { Array } colors - Indicates the colors to be distributed between the two points. +- * @param { TileMode } mode - Indicates the tile mode. +- * @param { Array | null } pos - Indicates the relative position of each corresponding color +- *
    in the colors array. The default value is empty for uniform distribution. +- * @param { Matrix | null } matrix - Indicates the Matrix object. The default value is null. +- * @returns { ShaderEffect } Returns a radial gradient ShaderEffect object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- static createRadialGradient(centerPt: common2D.Point, radius: number, colors: Array, +- mode: TileMode, pos?: Array | null, matrix?: Matrix | null): ShaderEffect; +- +- /** +- * Creates an ShaderEffect object that generates a sweep gradient given a center. +- * @param { common2D.Point } centerPt - Indicates the center of the circle for the gradient. +- * @param { Array } colors - Indicates the colors to be distributed between the two points. +- * @param { TileMode } mode - Indicates the tile mode. +- * @param { number } startAngle - The starting angle of the gradient. +- * @param { number } endAngle - The ending angle of the gradient. +- * @param { Array | null } pos - Indicates the relative position of each corresponding color +- *
    in the colors array. The default value is empty for uniform distribution. +- * @param { Matrix | null } matrix - Indicates the Matrix object. The default value is null. +- * @returns { ShaderEffect } Returns a sweep gradient ShaderEffect object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- static createSweepGradient(centerPt: common2D.Point, colors: Array, +- mode: TileMode, startAngle: number, endAngle: number, pos?: Array | null, +- matrix?: Matrix | null): ShaderEffect; +- +- /** +- * Creates an ShaderEffect object that generates a conical gradient given two circles. +- * @param { common2D.Point } startPt - Indicates the center of the start circle for the gradient. +- * @param { number } startRadius - Indicates the radius of the start circle for this gradient. +- * @param { common2D.Point } endPt - Indicates the center of the end circle for the gradient. +- * @param { number } endRadius - Indicates the radius of the end circle for this gradient. +- * @param { Array } colors - Indicates the colors to be distributed between the two points. +- * @param { TileMode } mode - Indicates the tile mode. +- * @param { Array | null } pos - Indicates the relative position of each corresponding color +- *
    in the colors array. The default value is empty for uniform distribution. +- * @param { Matrix | null } matrix - Indicates the Matrix object. The default value is null. +- * @returns { ShaderEffect } Returns a conical gradient ShaderEffect object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- static createConicalGradient(startPt: common2D.Point, startRadius: number, endPt: common2D.Point, +- endRadius: number, colors: Array, mode: TileMode, +- pos?: Array | null, matrix?: Matrix | null): ShaderEffect; +- } +- +- /** +- * Enumerates tile modes that describe an image or texture. +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export enum TileMode { +- /** +- * Replicate the edge color if the shader effect draws outside of its original bounds. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- CLAMP = 0, +- +- /** +- * Repeat the shader effect image horizontally and vertically. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- REPEAT = 1, +- +- /** +- * Repeat the shader effect image horizontally and vertically, alternating mirror images +- * so that adjacent images always seam. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- MIRROR = 2, +- +- /** +- * Only draw within the original domain, return transparent-black everywhere else. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- DECAL = 3, +- } +- +- /** +- * Defines a ShadowLayer, which is used to specify the color, blur radius, and offset of the shadow. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export class ShadowLayer { +- /** +- * Makes a new ShadowLayer. +- * +- * @param { number } blurRadius - The blur radius of the shadow. The blur radius must be greater than 0. +- * @param { number } x - The offset point on x-axis. +- * @param { number } y - The offset point on y-axis. +- * @param { common2D.Color } color - The shadow color. The range of color channels must be [0, 255]. +- * @returns { ShadowLayer } ShadowLayer object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @static +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- static create(blurRadius: number, x: number, y: number, color: common2D.Color): ShadowLayer; +- +- /** +- * Makes a new ShadowLayer with the specified ARGB color of hexadecimal format. +- * +- * @param { number } blurRadius - The blur radius of the shadow. The blur radius must be greater than 0. +- * @param { number } x - The offset point on x-axis. +- * @param { number } y - The offset point on y-axis. +- * @param { number } color - The shadow color. Number must be ARGB color of hexadecimal format. +- * @returns { ShadowLayer } ShadowLayer object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @static +- * @syscap SystemCapability.Graphics.Drawing +- * @since 13 +- */ +- static create(blurRadius: number, x: number, y: number, color: number): ShadowLayer; +- } +- +- /** +- * ColorFilters are optional objects in the drawing pipeline. +- * +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- export class ColorFilter { +- /** +- * Makes a color filter with the given color and blend mode. +- * @param { common2D.Color } color - The range of color channels must be [0, 255]. +- * @param { BlendMode } mode - BlendMode. +- * @returns { ColorFilter } Colorfilter object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @static +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- static createBlendModeColorFilter(color: common2D.Color, mode: BlendMode): ColorFilter; +- +- /** +- * Makes a color filter with the given ARGB color of hexadecimal format and blend mode. +- * @param { number } color - Number must be ARGB color of hexadecimal format. +- * @param { BlendMode } mode - BlendMode. +- * @returns { ColorFilter } Colorfilter object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @static +- * @syscap SystemCapability.Graphics.Drawing +- * @since 13 +- */ +- static createBlendModeColorFilter(color: number, mode: BlendMode): ColorFilter; +- +- /** +- * Create a color filter consisting of two filters. +- * @param { ColorFilter } outer - The filter is used next. +- * @param { ColorFilter } inner - The filter is used first. +- * @returns { ColorFilter } Colorfilter object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @static +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- static createComposeColorFilter(outer: ColorFilter, inner: ColorFilter): ColorFilter; +- /** +- * Makes a color filter that converts between linear colors and sRGB colors. +- * @returns { ColorFilter } Colorfilter object. +- * @static +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- static createLinearToSRGBGamma(): ColorFilter; +- /** +- * Makes a color filter that converts between sRGB colors and linear colors. +- * @returns { ColorFilter } Colorfilter object. +- * @static +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- static createSRGBGammaToLinear(): ColorFilter; +- /** +- * Makes a color filter that multiplies the luma of its input into the alpha channel, +- * and sets the red, green, and blue channels to zero. +- * @returns { ColorFilter } Colorfilter. +- * @static +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- static createLumaColorFilter(): ColorFilter; +- /** +- * Makes a color filter with a 5x4 color matrix +- * @param { Array } matrix - Indicates the matrix, which is represented as a number array of length 20. +- * @returns { ColorFilter } Colorfilter object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @static +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- static createMatrixColorFilter(matrix: Array): ColorFilter; +- } +- +- /** +- * ImageFilters are optional objects in the drawing pipeline. +- * +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export class ImageFilter { +- /** +- * Makes an ImageFilter object that blurs its input by the separate X and Y sigmas. +- * @param { number } sigmaX - Indicates the Gaussian sigma value for blurring along the X axis. Must be > 0. +- * @param { number } sigmaY - Indicates the Gaussian sigma value for blurring along the Y axis. Must be > 0. +- * @param { TileMode } tileMode - Indicates the tile mode applied at edges. +- * @param { ImageFilter | null } imageFilter - Indicates the input filter that is blurred, +- * uses source bitmap if this is null. +- * @returns { ImageFilter } ImageFilter object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @static +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- static createBlurImageFilter(sigmaX: number, sigmaY: number, +- tileMode: TileMode, imageFilter?: ImageFilter | null): ImageFilter; +- /** +- * Makes an ImageFilter object that applies the color filter to the input. +- * @param { ColorFilter } colorFilter - Indicates the color filter that transforms the input image. +- * @param { ImageFilter | null } imageFilter - Indicates the input filter, +- * or uses the source bitmap if this is null. +- * @returns { ImageFilter } ImageFilter object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @static +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- static createFromColorFilter(colorFilter: ColorFilter, imageFilter?: ImageFilter | null): ImageFilter; +- } +- /** +- * Enumerate join styles. The join style defines the shape of the joins of a +- * polyline segment drawn by the pen. +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export enum JoinStyle { +- /** +- * Miter corner. If the angle of a polyline is small, its miter length may be inappropriate. +- * In this case, you need to use the miter limit to limit the miter length. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- MITER_JOIN = 0, +- +- /** +- * Round corner. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- ROUND_JOIN = 1, +- +- /** +- * Bevel corner. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- BEVEL_JOIN = 2 +- } +- +- /** +- * Enumerates cap styles of a pen. The cap style defines +- * the style of both ends of a segment drawn by the pen. +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export enum CapStyle { +- /** +- * No cap style. Both ends of the segment are cut off square. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- FLAT_CAP = 0, +- +- /** +- * Square cap style. Both ends have a square, the height of which +- * is half of the width of the segment, with the same width. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- SQUARE_CAP = 1, +- +- /** +- * Round cap style. Both ends have a semicircle centered, the diameter of which +- * is the same as the width of the segment. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- ROUND_CAP = 2 +- } +- +- /** +- * Enumerates blur type. +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export enum BlurType { +- /** +- * Fuzzy inside and outside. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- NORMAL = 0, +- +- /** +- * Solid inside, fuzzy outside. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- SOLID = 1, +- +- /** +- * Nothing inside, fuzzy outside. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- OUTER = 2, +- +- /** +- * Fuzzy inside, nothing outside. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- INNER = 3 +- } +- +- /** +- * Provides settings for strokes during drawing. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- export class Pen { +- /** +- * Constructor for the pen. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- constructor(); +- +- /** +- * Constructor for the pen from an existing pen object pen. +- * @param { Pen } pen - Indicates the Pen object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- constructor(pen: Pen); +- +- /** +- * Sets the stroke miter limit for a polyline drawn by a pen. +- * @param { number } miter - Indicates a variable that describes the miter limit. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setMiterLimit(miter: number): void; +- +- /** +- * Obtains the stroke miter limit of a polyline drawn by a pen. +- * @returns { number } Returns the miter limit. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getMiterLimit(): number; +- +- /** +- * Sets the shaderEffect for a pen. +- * @param { ShaderEffect } shaderEffect - Indicates the ShaderEffect object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setShaderEffect(shaderEffect: ShaderEffect): void; +- +- /** +- * Set the color of the pen. +- * @param { common2D.Color } color - The range of color channels must be [0, 255]. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- setColor(color: common2D.Color): void; +- +- /** +- * Set the specified ARGB color of hexadecimal format to the pen. +- * @param { number } color - Number must be ARGB color of hexadecimal format. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 13 +- */ +- setColor(color: number): void; +- +- /** +- * Set the AGRB color of the pen. +- * @param { number } alpha - Alpha channel of color. The range of alpha must be [0, 255]. +- * @param { number } red - Red channel of color. The range of red must be [0, 255]. +- * @param { number } green - Green channel of color. The range of green must be [0, 255]. +- * @param { number } blue - Blue channel of color. The range of blue must be [0, 255]. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setColor(alpha: number, red: number, green: number, blue: number): void; +- +- /** +- * Obtains the color of a pen. The color is used by the pen to outline a shape. +- * @returns { common2D.Color } Returns a 32-bit (ARGB) variable that describes the color. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getColor(): common2D.Color; +- +- /** +- * Obtains the color of a pen. The color is used by the pen to outline a shape. +- * @returns { number } Returns a 32-bit (ARGB) variable that describes the color of hexadecimal format. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 13 +- */ +- getHexColor(): number; +- +- /** +- * Sets the thickness of the pen used by the paint to outline the shape. +- * +- * @param { number } width - Zero thickness for hairline; greater than zero for pen thickness. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- setStrokeWidth(width: number): void; +- +- /** +- * Obtains the thickness of a pen. This thickness determines the width of the outline of a shape. +- * @returns { number } Returns the thickness. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getWidth(): number; +- +- /** +- * Requests, but does not require, that edge pixels draw opaque or with partial transparency. +- * @param { boolean } aa - Setting for antialiasing. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- setAntiAlias(aa: boolean): void; +- +- /** +- * Checks whether anti-aliasing is enabled for a pen. If anti-aliasing is enabled, +- * edges will be drawn with partial transparency. +- * @returns { boolean } Returns true if the anti-aliasing is enabled; returns false otherwise. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- isAntiAlias(): boolean; +- +- /** +- * Replaces alpha, leaving RGB +- * +- * @param { number } alpha - Alpha channel of color. The range of alpha must be [0, 255]. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- setAlpha(alpha: number): void; +- +- /** +- * Obtains the alpha of a pen. The alpha is used by the pen to outline a shape. +- * @returns { number } Returns a 8-bit variable that describes the alpha. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getAlpha(): number; +- +- /** +- * Sets ColorFilter to pen +- * +- * @param { ColorFilter } filter - ColorFilter to apply to subsequent draw. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- setColorFilter(filter: ColorFilter): void; +- /** +- * Gets ColorFilter of pen +- * @returns { ColorFilter } ColorFilter. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getColorFilter(): ColorFilter; +- /** +- * Sets ImageFilter to pen +- * @param { ImageFilter | null } filter - ImageFilter to apply to subsequent draw. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setImageFilter(filter: ImageFilter | null): void; +- /** +- * Sets MaskFilter to pen. +- * +- * @param { MaskFilter } filter - MaskFilter to apply to subsequent draw. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setMaskFilter(filter: MaskFilter): void; +- +- /** +- * Sets PathEffect to pen. +- * +- * @param { PathEffect } effect - PathEffect to apply to subsequent draw. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setPathEffect(effect: PathEffect): void; +- +- /** +- * Sets ShadowLayer to pen. +- * +- * @param { ShadowLayer } shadowLayer - ShadowLayer to apply to subsequent draw. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setShadowLayer(shadowLayer: ShadowLayer): void; +- +- /** +- * Sets a blender that implements the specified blendmode enum. +- * +- * @param { BlendMode } mode - Blendmode. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- setBlendMode(mode: BlendMode): void; +- +- /** +- * Request color distribution error. +- * +- * @param { boolean } dither - Whether the color is distributed incorrectly. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- setDither(dither: boolean): void; +- +- /** +- * Sets the JoinStyle for a pen. +- * +- * @param { JoinStyle } style - The JoinStyle. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setJoinStyle(style: JoinStyle): void; +- +- /** +- * Obtains the JoinStyle of a pen. +- * +- * @returns { JoinStyle } The JoinStyle. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getJoinStyle(): JoinStyle; +- +- /** +- * Sets the CapStyle for a pen. +- * +- * @param { CapStyle } style - The CapStyle. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setCapStyle(style: CapStyle): void; +- +- /** +- * Obtains the CapStyle of a pen. +- * +- * @returns { CapStyle } The CapStyle. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getCapStyle(): CapStyle; +- +- /** +- * Resets all pen contents to their initial values. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- reset(): void; +- /** +- * Obtains the filled equivalent of the src path. +- * +- * @param { Path } src - The path read to create a filled version. +- * @param { Path } dst - The resulting path (may be the same as src). +- * @returns { boolean } true if the path should be filled, +- * or false if it should be drawn with a hairline (width == 0) +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getFillPath(src: Path, dst: Path): boolean; +- } +- +- /** +- * Provides settings for brush fill when drawing. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- export class Brush { +- /** +- * Constructor for the Brush. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- constructor(); +- +- /** +- * Constructor for the Brush from an existing brush object brush. +- * @param { Brush } brush - Indicates the Brush object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- constructor(brush: Brush); +- +- /** +- * Set the color of the brush. +- * @param { common2D.Color } color - The range of color channels must be [0, 255]. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- setColor(color: common2D.Color): void; +- +- /** +- * Set the specified ARGB color of hexadecimal format to the brush. +- * @param { number } color - Number must be ARGB color of hexadecimal format. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 13 +- */ +- setColor(color: number): void; +- +- /** +- * Set the ARGB color of the brush. +- * @param { number } alpha - Alpha channel of color. The range of alpha must be [0, 255]. +- * @param { number } red - Red channel of color. The range of red must be [0, 255]. +- * @param { number } green - Green channel of color. The range of green must be [0, 255]. +- * @param { number } blue - Blue channel of color. The range of blue must be [0, 255]. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setColor(alpha: number, red: number, green: number, blue: number): void; +- +- /** +- * Obtains the color of a brush. The color is used by the brush to fill in a shape. +- * @returns { common2D.Color } Returns a 32-bit (ARGB) variable that describes the color. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getColor(): common2D.Color; +- +- /** +- * Obtains the color of a brush. The color is used by the brush to fill in a shape. +- * @returns { number } Returns a 32-bit (ARGB) variable that describes the color of hexadecimal format. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 13 +- */ +- getHexColor(): number; +- +- /** +- * Requests, but does not require, that edge pixels draw opaque or with partial transparency. +- * @param { boolean } aa - Setting for antialiasing. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- setAntiAlias(aa: boolean): void; +- +- /** +- * Checks whether anti-aliasing is enabled for a brush. If anti-aliasing is enabled, +- * edges will be drawn with partial transparency. +- * @returns { boolean } Returns true if anti-aliasing is enabled; returns false otherwise. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- isAntiAlias(): boolean; +- +- /** +- * Replaces alpha, leaving RGB +- * @param { number } alpha - Alpha channel of color. The range of alpha must be [0, 255]. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- setAlpha(alpha: number): void; +- +- /** +- * Obtains the alpha of a brush. The alpha is used by the brush to fill in a shape. +- * @returns { number } Returns a 8-bit variable that describes the alpha. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getAlpha(): number; +- +- /** +- * Sets ColorFilter to brush +- * @param { ColorFilter } filter - ColorFilter to apply to subsequent draw. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- setColorFilter(filter: ColorFilter): void; +- +- /** +- * Gets ColorFilter of brush +- * @returns { ColorFilter } ColorFilter. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getColorFilter(): ColorFilter; +- /** +- * Sets ImageFilter to brush +- * @param { ImageFilter | null } filter - ImageFilter to apply to subsequent draw. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setImageFilter(filter: ImageFilter | null): void; +- /** +- * Sets MaskFilter to brush. +- * @param { MaskFilter } filter - MaskFilter to apply to subsequent draw. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setMaskFilter(filter: MaskFilter): void; +- +- /** +- * Sets ShadowLayer to brush. +- * +- * @param { ShadowLayer } shadowLayer - ShadowLayer painting. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setShadowLayer(shadowLayer: ShadowLayer): void; +- +- /** +- * Sets the shaderEffect for a brush. +- * @param { ShaderEffect } shaderEffect - Indicates the ShaderEffect object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setShaderEffect(shaderEffect: ShaderEffect): void; +- +- /** +- * Sets a blender that implements the specified blendmode enum. +- * @param { BlendMode } mode - Blendmode. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 11 +- */ +- setBlendMode(mode: BlendMode): void; +- +- /** +- * Resets all brush contents to their initial values. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- reset(): void; +- } +- +- /** +- * Declares functions related to the matrix object in the drawing module. +- * +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export class Matrix { +- /** +- * Creates an identity matrix. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- constructor(); +- +- /** +- * Sets matrix to rotate by degrees about a pivot point at (px, py). +- * @param { number } degree - Indicates the angle of axes relative to upright axes. +- * @param { number } px - Indicates the pivot on x-axis. +- * @param { number } py - Indicates the pivot on y-axis. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setRotation(degree: number, px: number, py: number): void; +- +- /** +- * Sets matrix to scale by sx and sy, about a pivot point at (px, py). +- * @param { number } sx - Indicates the horizontal scale factor. +- * @param { number } sy - Indicates the vertical scale factor. +- * @param { number } px - Indicates the pivot on x-axis. +- * @param { number } py - Indicates the pivot on y-axis. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setScale(sx: number, sy: number, px: number, py: number): void; +- +- /** +- * Sets matrix to translate by (dx, dy). +- * @param { number } dx - Indicates the horizontal translation. +- * @param { number } dy - Indicates the vertical translation. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setTranslation(dx: number, dy: number): void; +- +- /** +- * Sets the params for a matrix. +- * @param { Array } values - Each value in the array represents the following parameters: +- * values[0] - horizontal scale factor to store. +- * values[1] - horizontal skew factor to store. +- * values[2] - horizontal translation to store. +- * values[3] - vertical skew factor to store. +- * values[4] - vertical scale factor to store. +- * values[5] - vertical translation to store. +- * values[6] - input x-axis values perspective factor to store. +- * values[7] - input y-axis values perspective factor to store. +- * values[8] - perspective scale factor to store. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setMatrix(values: Array): void; +- +- /** +- * Sets matrix total to matrix a multiplied by matrix b. +- * @param { Matrix } matrix - Indicates the Matrix object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- preConcat(matrix: Matrix): void; +- +- /** +- * Returns true if the first matrix equals the second matrix. +- * @param { Matrix } matrix - Indicates the Matrix object. +- * @returns { Boolean } Returns true if the two matrices are equal; returns false otherwise. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- isEqual(matrix: Matrix): Boolean; +- +- /** +- * Sets inverse to reciprocal matrix, returning true if matrix can be inverted. +- * @param { Matrix } matrix - Indicates the Matrix object. +- * @returns { Boolean } Returns true if matrix can be inverted; returns false otherwise. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- invert(matrix: Matrix): Boolean; +- +- /** +- * Returns true if matrix is identity. +- * @returns { Boolean } Returns true if matrix is identity; returns false otherwise. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- isIdentity(): Boolean; +- +- /** +- * Get one matrix value. Index is between the range of 0-8. +- * @param { number } index - one of 0-8 +- * @returns { number } Returns value corresponding to index.Returns 0 if out of range. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getValue(index: number): number; +- /** +- * Sets matrix to matrix multiplied by matrix constructed from rotating by degrees around pivot point (px, py). +- * This can be thought of as rotating around a pivot point after applying matrix. +- * @param { number } degree - Indicates the angle of axes relative to upright axes. +- * @param { number } px - Indicates the pivot on x-axis. +- * @param { number } py - Indicates the pivot on y-axis. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- postRotate(degree: number, px: number, py: number): void; +- /** +- * Sets matrix to matrix multiplied by matrix constructed from scaling by (sx, sy) relative to pivot point (px, py). +- * This can be thought of as scaling relative to a pivot point after applying matrix. +- * @param { number } sx - Indicates the horizontal scale factor. +- * @param { number } sy - Indicates the vertical scale factor. +- * @param { number } px - Indicates the pivot on x-axis. +- * @param { number } py - Indicates the pivot on y-axis. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- postScale(sx: number, sy: number, px: number, py: number): void; +- /** +- * Sets matrix to matrix multiplied by matrix constructed from translation (dx, dy). +- * This can be thought of as moving the point to be mapped after applying matrix. +- * @param { number } dx - Indicates the horizontal translation. +- * @param { number } dy - Indicates the vertical translation. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- postTranslate(dx: number, dy: number): void; +- /** +- * Sets matrix to matrix multiplied by matrix constructed from rotating by degrees around pivot point (px, py). +- * This can be thought of as rotating around a pivot point before applying matrix. +- * @param { number } degree - Indicates the angle of axes relative to upright axes. +- * @param { number } px - Indicates the pivot on x-axis. +- * @param { number } py - Indicates the pivot on y-axis. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- preRotate(degree: number, px: number, py: number): void; +- /** +- * Sets matrix to matrix multiplied by matrix constructed from scaling by (sx, sy) relative to pivot point (px, py). +- * This can be thought of as scaling relative to a pivot point before applying matrix. +- * @param { number } sx - Indicates the horizontal scale factor. +- * @param { number } sy - Indicates the vertical scale factor. +- * @param { number } px - Indicates the pivot on x-axis. +- * @param { number } py - Indicates the pivot on y-axis. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- preScale(sx: number, sy: number, px: number, py: number): void; +- /** +- * Sets matrix to matrix multiplied by matrix constructed from translation (dx, dy). +- * This can be thought of as moving the point to be mapped before applying matrix. +- * @param { number } dx - Indicates the horizontal translation. +- * @param { number } dy - Indicates the vertical translation. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- preTranslate(dx: number, dy: number): void; +- /** +- * Reset matrix to identity. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- reset(): void; +- /** +- * Maps src array of length count to dst array of equal or greater length. +- * This can be thought of as moving the point to be mapped before applying matrix. +- * @param { Array } src - points to transform. +- * @returns { Array } Return mapped points array. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- mapPoints(src: Array): Array; +- /** +- * Return nine scalar values contained by Matrix. +- * @returns { Array } nine scalar values contained by Matrix. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- getAll(): Array; +- /** +- * Sets dst to bounds of src corners mapped by matrix transformation. +- * @param { common2D.Rect } dst - Rect to map from. +- * @param { common2D.Rect } src - Rect to map to. +- * @returns { boolean } Returns true if the mapped src is equal to the dst; returns false is not equal. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- mapRect(dst: common2D.Rect, src: common2D.Rect): boolean; +- /** +- * Sets matrix to scale and translate src rect to dst rect. +- * @param { common2D.Rect } src - Rect to map from. +- * @param { common2D.Rect } dst - Rect to map to. +- * @param { ScaleToFit } scaleToFit - Describes how matrix is constructed to map one rect to another. +- * @returns { boolean } Returns true if dst is empty, and sets matrix to: +- | 0 0 0 | +- | 0 0 0 | +- | 0 0 1 |. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setRectToRect(src: common2D.Rect, dst: common2D.Rect, scaleToFit: ScaleToFit): boolean; +- /** +- * Sets Matrix to map src to dst. Count must be zero or greater, and four or less. +- * @param { Array } src - Point to map from +- * @param { Array } dst - Point to map to +- * @param { number } count - Number of Point in src and dst +- * @returns { boolean } Returns true if Matrix was constructed successfully +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setPolyToPoly(src: Array, dst: Array, count: number): boolean; +- } +- +- /** +- * Describes a scale-to-fit values. +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export enum ScaleToFit { +- /** +- * Scales in x and y to fill destination Rect. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- FILL_SCALE_TO_FIT = 0, +- +- /** +- * Scales and aligns to left and top. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- START_SCALE_TO_FIT = 1, +- +- /** +- * Scales and aligns to center. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- CENTER_SCALE_TO_FIT = 2, +- +- /** +- * Scales and aligns to right and bottom. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- END_SCALE_TO_FIT = 3 +- } +- +- /** +- * Describes a region object. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export class Region { +- /** +- * Determines whether the test point is in the region. +- * @param { number } x - Indicates the x coordinate of the point. The parameter must be an integer. +- * @param { number } y - Indicates the y coordinate of the point. The parameter must be an integer. +- * @returns { boolean } Returns true if (x, y) is inside region; returns false otherwise. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- isPointContained(x: number, y:number): boolean; +- +- /** +- * Determines whether other region is in the region. +- * @param { Region } other - Other region object. +- * @returns { boolean } Returns true if other region is completely inside the region object; +- *
    returns false otherwise. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- isRegionContained(other: Region): boolean; +- +- /** +- * Replaces region with the result of region op region. +- * @param { Region } region - Region object. +- * @param { RegionOp } regionOp - Operation type. +- * @returns { boolean } Returns true if replaced region is not empty; returns false otherwise. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- op(region: Region, regionOp: RegionOp): boolean; +- +- /** +- * Determines whether rect and region does not intersect. +- * @param { number } left - Left position of rectangle. The parameter must be an integer. +- * @param { number } top - Top position of rectangle. The parameter must be an integer. +- * @param { number } right - Right position of rectangle. The parameter must be an integer. +- * @param { number } bottom - Bottom position of rectangle. The parameter must be an integer. +- * @returns { boolean } Returns true if rect and region is not intersect; returns false otherwise. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- quickReject(left: number, top: number, right: number, bottom: number): boolean; +- +- /** +- * Sets the region to match outline of path within clip. +- * @param { Path } path - Providing outline. +- * @param { Region } clip - Region object. +- * @returns { boolean } Returns true if constructed region is not empty; returns false otherwise. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setPath(path: Path, clip: Region): boolean; +- +- /** +- * Sets a rect to region. +- * @param { number } left - Left position of rectangle. The parameter must be an integer. +- * @param { number } top - Top position of rectangle. The parameter must be an integer. +- * @param { number } right - Right position of rectangle. The parameter must be an integer. +- * @param { number } bottom - Bottom position of rectangle. The parameter must be an integer. +- * @returns { boolean } Returns true if constructed region is not empty; returns false otherwise. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- setRect(left: number, top: number, right: number, bottom: number): boolean; +- } +- +- /** +- * Enumerates of operations when two regions are combined. +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export enum RegionOp { +- /** +- * Difference operation. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- DIFFERENCE = 0, +- +- /** +- * Intersect operation. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- INTERSECT = 1, +- +- /** +- * Union operation. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- UNION = 2, +- +- /** +- * Xor operation. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- XOR = 3, +- +- /** +- * Reverse difference operation. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- REVERSE_DIFFERENCE = 4, +- +- /** +- * Replace operation. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- REPLACE = 5 +- } +- +- /** +- * Enumerates of corner radius position. +- * +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export enum CornerPos { +- /** +- * Index of top-left corner radius. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- TOP_LEFT_POS = 0, +- +- /** +- * Index of top-right corner radius. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- TOP_RIGHT_POS = 1, +- +- /** +- * Index of bottom-right corner radius. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- BOTTOM_RIGHT_POS = 2, +- +- /** +- * Index of bottom-left corner radius. +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- BOTTOM_LEFT_POS = 3 +- } +- +- /** +- * Enumeration defines the constraint type. +- * +- * @enum { number } +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- export enum SrcRectConstraint { +- +- /** +- * Using sampling only inside bounds in a slower manner. +- * +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- STRICT = 0, +- +- /** +- * Using sampling outside bounds in a faster manner. +- * +- * @syscap SystemCapability.Graphics.Drawing +- * @since 12 +- */ +- FAST = 1 +- } +-} +- +-export default drawing; +diff --git a/api/@ohos.graphics.drawing.d.ts b/api/@ohos.graphics.drawing.d.ts +index 78e6e1272..42ca6d301 100644 +--- a/api/@ohos.graphics.drawing.d.ts ++++ b/api/@ohos.graphics.drawing.d.ts +@@ -27,7 +27,8 @@ import { Resource } from './global/resource'; + * + * @namespace drawing + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace drawing { + /** +@@ -36,182 +37,212 @@ declare namespace drawing { + * a new color from two colors(source, destination). + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum BlendMode { + /** + * Disable 4 regions(red, green, blue, alpha) + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CLEAR = 0, + /** + * Use components of the source + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SRC = 1, + /** + * Use components of the destination + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DST = 2, + /** + * The source is placed above the destination. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SRC_OVER = 3, + /** + * The Destination is placed above the source. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DST_OVER = 4, + /** + * Use source replaces the destination, and will not exceed the boundaries of the destination + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SRC_IN = 5, + /** + * Use destination, and will not exceed the boundaries of the source + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DST_IN = 6, + /** + * Source is use in outside of the boundaries of the destination. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SRC_OUT = 7, + /** + * Destination is use in outside of the boundaries of the source. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DST_OUT = 8, + /** + * Source which overlaps the destination will replaces the destination. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SRC_ATOP = 9, + /** + * Destination which overlaps the source will replaces the source. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DST_ATOP = 10, + /** + * Combine regions where source and destination do not overlap. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + XOR = 11, + /** + * The sum of the source and destination. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PLUS = 12, + /** + * All components are multiplied. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MODULATE = 13, + /** + * Multiply the complement values of the background and source color values, + * and then complement the result. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SCREEN = 14, + /** + * Multiplies or screens the colors, depending on destination + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + OVERLAY = 15, + /** + * Choose a darker background and source color. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DARKEN = 16, + /** + * Choose a lighter background and source color. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LIGHTEN = 17, + /** + * Brightens destination color to reflect the source color. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + COLOR_DODGE = 18, + /** + * Darkens destination color to reflect the source color. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + COLOR_BURN = 19, + /** + * Multiplies or screens the colors, depending on source + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + HARD_LIGHT = 20, + /** + * Lightens or Darkens the colors, depending on the source. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SOFT_LIGHT = 21, + /** + * Subtract the darker of the two colors from the brighter color. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DIFFERENCE = 22, + /** + * Produces an effect similar to difference mode, but with lower contrast. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EXCLUSION = 23, + /** + * Multiply the source color by the destination color and replace the destination. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MULTIPLY = 24, + /** + * Use the hue of the source and the saturation and brightness of the destination. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + HUE = 25, + /** + * Use the saturation of the source and the hue and brightness of the destination. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SATURATION = 26, + /** + * Use the hue and saturation of the source and the brightness of the destination. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + COLOR = 27, + /** + * Use the brightness of the source and the hue and saturation of the destination. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LUMINOSITY = 28, + } +@@ -305,7 +336,8 @@ declare namespace drawing { + * Provides the definition of the roundRect. + * + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class RoundRect { + /** +@@ -316,7 +348,8 @@ declare namespace drawing { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + constructor(rect: common2D.Rect, xRadii: number, yRadii: number); + +@@ -359,41 +392,47 @@ declare namespace drawing { + * Enumerates of operations when two paths are combined. + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PathOp { + /** + * Difference operation. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DIFFERENCE = 0, + + /** + * Intersect operation. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INTERSECT = 1, + + /** + * Union operation. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + UNION = 2, + + /** + * Xor operation. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + XOR = 3, + + /** + * Reverse difference operation. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + REVERSE_DIFFERENCE = 4, + } +@@ -459,14 +498,16 @@ declare namespace drawing { + * Describes a pathIterator object. + * + * @syscap SystemCapability.Graphics.Drawing +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class PathIterator { + /** + * Creates a pathIterator with path. + * @param { Path } path - the path is used to create PathIterator. + * @syscap SystemCapability.Graphics.Drawing +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + constructor(path: Path); + +@@ -514,13 +555,15 @@ declare namespace drawing { + * Describes a path object. + * + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class Path { + /** + * Creates a Path. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + constructor(); + +@@ -528,7 +571,8 @@ declare namespace drawing { + * Creates a Path from other path. + * @param { Path } path - the path to copy content from. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + constructor(path: Path); + +@@ -568,7 +612,8 @@ declare namespace drawing { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + arcTo(x1: number, y1: number, x2: number, y2: number, startDeg: number, sweepDeg: number): void; + +@@ -834,7 +879,8 @@ declare namespace drawing { + /** + * Resets path data. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + reset(): void; + +@@ -956,20 +1002,23 @@ declare namespace drawing { + * Enumerates storage filter mode. + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum FilterMode { + /** + * Single sample point (nearest neighbor). + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FILTER_MODE_NEAREST = 0, + + /** + * Interpolate between 2x2 sample points (bilinear interpolation). + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FILTER_MODE_LINEAR = 1, + } +@@ -1013,13 +1062,15 @@ declare namespace drawing { + /** + * Provides an interface to the drawing, and samplingOptions used when sampling from the image. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class SamplingOptions { + /** + * Constructor for the samplingOptions. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + constructor(); + /** +@@ -1028,7 +1079,8 @@ declare namespace drawing { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + constructor(filterMode: FilterMode); + } +@@ -1036,7 +1088,8 @@ declare namespace drawing { + /** + * Provides an interface to the drawing, and how to clip and transform the drawing. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class Canvas { + /** +@@ -1045,7 +1098,8 @@ declare namespace drawing { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + constructor(pixelmap: image.PixelMap); + +@@ -1056,7 +1110,8 @@ declare namespace drawing { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + drawRect(rect: common2D.Rect): void; + +@@ -1070,7 +1125,8 @@ declare namespace drawing { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + drawRect(left: number, top: number, right: number, bottom: number): void; + +@@ -1215,7 +1271,8 @@ declare namespace drawing { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + drawImageRect(pixelmap: image.PixelMap, dstRect: common2D.Rect, samplingOptions?: SamplingOptions): void; + +@@ -1388,7 +1445,8 @@ declare namespace drawing { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + drawPixelMapMesh(pixelmap: image.PixelMap, meshWidth: number, meshHeight: number, + vertices: Array, vertOffset: number, colors: Array, colorOffset: number): void; +@@ -1419,7 +1477,8 @@ declare namespace drawing { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + attachBrush(brush: Brush): void; + +@@ -1433,7 +1492,8 @@ declare namespace drawing { + /** + * Unset brush to a canvas. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + detachBrush(): void; + +@@ -1453,7 +1513,8 @@ declare namespace drawing { + * @returns { number } Return the number of saved states before this call. + * @throws { BusinessError } 401 - Parameter error. Possible causes: Mandatory parameters are left unspecified. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + saveLayer(rect?: common2D.Rect | null, brush?: Brush | null): number; + +@@ -1480,7 +1541,8 @@ declare namespace drawing { + /** + * Restores the canvas status (canvas matrix) saved on the top of the stack. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + restore(): void; + +@@ -1564,7 +1626,8 @@ declare namespace drawing { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + rotate(degrees: number, sx: number, sy: number) : void; + +@@ -1693,19 +1756,22 @@ declare namespace drawing { + * + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum ClipOp { + /** + * Clips with difference. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DIFFERENCE = 0, + /** + * Clips with intersection. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INTERSECT = 1, + } +@@ -1846,7 +1912,8 @@ declare namespace drawing { + * The Typeface class specifies the typeface and intrinsic style of a font. + * + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class Typeface { + /** +@@ -1864,7 +1931,8 @@ declare namespace drawing { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + static makeFromFile(filePath: string): Typeface; + +@@ -1951,7 +2019,8 @@ declare namespace drawing { + * Font controls options applied when drawing and measuring text. + * + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class Font { + /** +@@ -1990,7 +2059,8 @@ declare namespace drawing { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setSize(textSize: number): void; + +@@ -2008,7 +2078,8 @@ declare namespace drawing { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setTypeface(typeface: Typeface): void; + +@@ -2024,7 +2095,8 @@ declare namespace drawing { + * Get fontMetrics associated with typeface. + * @returns { FontMetrics } The fontMetrics value returned to the caller. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getMetrics(): FontMetrics; + +@@ -2333,7 +2405,8 @@ declare namespace drawing { + * The metrics of an Font. + * @typedef FontMetrics + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface FontMetrics { + /** +@@ -2348,35 +2421,40 @@ declare namespace drawing { + * Maximum range above the glyph bounding box. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + top: number; + /** + * Distance Retained Above Baseline. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ascent: number; + /** + * The distance that remains below the baseline. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + descent: number; + /** + * Maximum range below the glyph bounding box. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + bottom: number; + /** + * Line Spacing. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + leading: number; + /** +@@ -2463,7 +2541,8 @@ declare namespace drawing { + /** + * Lattice is the class for dividing an image into grids. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class Lattice { + /** +@@ -2483,7 +2562,8 @@ declare namespace drawing { + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @static + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + static createImageLattice(xDivs: Array, yDivs: Array, fXCount: number, fYCount: number, + fBounds?: common2D.Rect | null, fRectTypes?: Array | null, fColors?: Array | null): Lattice; +@@ -2516,27 +2596,31 @@ declare namespace drawing { + * or to fill the grid entry with a color. only used in Lattice. + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum RectType { + /** + * Draws image into lattice rect. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DEFAULT = 0, + + /** + * Skips lattice rect by making it transparent. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TRANSPARENT = 1, + + /** + * Draws one of fColors into lattice rect. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FIXEDCOLOR = 2 + } +@@ -2852,7 +2936,8 @@ declare namespace drawing { + * ColorFilters are optional objects in the drawing pipeline. + * + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class ColorFilter { + /** +@@ -2864,7 +2949,8 @@ declare namespace drawing { + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @static + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + static createBlendModeColorFilter(color: common2D.Color, mode: BlendMode): ColorFilter; + +@@ -2877,7 +2963,8 @@ declare namespace drawing { + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @static + * @syscap SystemCapability.Graphics.Drawing +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + static createBlendModeColorFilter(color: common2D.Color | number, mode: BlendMode): ColorFilter; + +@@ -3072,13 +3159,15 @@ declare namespace drawing { + /** + * Provides settings for strokes during drawing. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class Pen { + /** + * Constructor for the pen. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + constructor(); + +@@ -3088,7 +3177,8 @@ declare namespace drawing { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + constructor(pen: Pen); + +@@ -3293,7 +3383,8 @@ declare namespace drawing { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setBlendMode(mode: BlendMode): void; + +@@ -3351,7 +3442,8 @@ declare namespace drawing { + /** + * Resets all pen contents to their initial values. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + reset(): void; + /** +@@ -3371,13 +3463,15 @@ declare namespace drawing { + /** + * Provides settings for brush fill when drawing. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class Brush { + /** + * Constructor for the Brush. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + constructor(); + +@@ -3387,7 +3481,8 @@ declare namespace drawing { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + constructor(brush: Brush); + +@@ -3540,14 +3635,16 @@ declare namespace drawing { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Graphics.Drawing +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setBlendMode(mode: BlendMode): void; + + /** + * Resets all brush contents to their initial values. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + reset(): void; + } +@@ -3556,13 +3653,15 @@ declare namespace drawing { + * Declares functions related to the matrix object in the drawing module. + * + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class Matrix { + /** + * Creates an identity matrix. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + constructor(); + +@@ -3746,7 +3845,8 @@ declare namespace drawing { + /** + * Reset matrix to identity. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + reset(): void; + /** +@@ -3846,7 +3946,8 @@ declare namespace drawing { + /** + * Describes a region object. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class Region { + /** +@@ -3930,48 +4031,55 @@ declare namespace drawing { + * Enumerates of operations when two regions are combined. + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum RegionOp { + /** + * Difference operation. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DIFFERENCE = 0, + + /** + * Intersect operation. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INTERSECT = 1, + + /** + * Union operation. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + UNION = 2, + + /** + * Xor operation. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + XOR = 3, + + /** + * Reverse difference operation. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + REVERSE_DIFFERENCE = 4, + + /** + * Replace operation. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + REPLACE = 5 + } +diff --git a/api/@ohos.graphics.text.d.ts b/api/@ohos.graphics.text.d.ts +index 5cfa44d68..9f77d04d1 100755 +--- a/api/@ohos.graphics.text.d.ts ++++ b/api/@ohos.graphics.text.d.ts +@@ -16,7 +16,6 @@ + /** + * @file + * @kit ArkGraphics2D +- * @arkts 1.1&1.2 + */ + import type drawing from './@ohos.graphics.drawing'; + import type common2D from './@ohos.graphics.common2D'; +@@ -30,6 +29,7 @@ import { Resource } from './global/resource'; + * @namespace text + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace text { + +@@ -38,12 +38,14 @@ declare namespace text { + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum TextAlign { + /** + * Use the left side of the text as a reference line for alignment. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LEFT = 0, + +@@ -51,6 +53,7 @@ declare namespace text { + * Use the right side of the text as a reference line for alignment. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RIGHT = 1, + +@@ -58,6 +61,7 @@ declare namespace text { + * Use the midpoint line the text as a reference line for alignment. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CENTER = 2, + +@@ -65,6 +69,7 @@ declare namespace text { + * Align the text at the start and end of the line. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + JUSTIFY = 3, + +@@ -72,6 +77,7 @@ declare namespace text { + * Align text from start, based on the direction of text, such as left-to-right or right-to-left. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + START = 4, + +@@ -79,6 +85,7 @@ declare namespace text { + * Align text from end, based on the direction of text, such as left-to-right or right-to-left, opposite to START. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + END = 5, + } +@@ -88,12 +95,14 @@ declare namespace text { + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum TextDirection { + /** + * The text is oriented from right to left. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RTL, + +@@ -101,6 +110,7 @@ declare namespace text { + * The text is oriented from left to right. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LTR, + } +@@ -110,12 +120,14 @@ declare namespace text { + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum BreakStrategy { + /** + * The segmentation strategy is greedy. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + GREEDY, + +@@ -123,6 +135,7 @@ declare namespace text { + * The segmentation strategy is high quality. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + HIGH_QUALITY, + +@@ -130,6 +143,7 @@ declare namespace text { + * The segmentation strategy is balanced. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BALANCED, + } +@@ -139,12 +153,14 @@ declare namespace text { + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum WordBreak { + /** + * Normal word break strategy. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NORMAL, + +@@ -152,6 +168,7 @@ declare namespace text { + * Breaks word by character. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BREAK_ALL, + +@@ -159,6 +176,7 @@ declare namespace text { + * Breaks word by phrase. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BREAK_WORD, + +@@ -166,6 +184,7 @@ declare namespace text { + * Breaks word by hyphen. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BREAK_HYPHEN, + } +@@ -175,6 +194,7 @@ declare namespace text { + * @typedef Decoration + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Decoration { + /** +@@ -182,6 +202,7 @@ declare namespace text { + * @type { ?TextDecorationType } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + textDecoration?: TextDecorationType; + +@@ -190,6 +211,7 @@ declare namespace text { + * @type { ?common2D.Color } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + color?: common2D.Color; + +@@ -198,6 +220,7 @@ declare namespace text { + * @type { ?TextDecorationStyle } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + decorationStyle?: TextDecorationStyle; + +@@ -206,6 +229,7 @@ declare namespace text { + * @type { ?number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + decorationThicknessScale?: number; + } +@@ -215,12 +239,14 @@ declare namespace text { + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum TextDecorationType { + /** + * There are no text decoration. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NONE, + +@@ -228,6 +254,7 @@ declare namespace text { + * There is a decoration line below the text. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + UNDERLINE, + +@@ -235,6 +262,7 @@ declare namespace text { + * There is a decoration line above the text. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + OVERLINE, + +@@ -242,6 +270,7 @@ declare namespace text { + * There is a decoration line through the middle of the text. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LINE_THROUGH, + } +@@ -251,12 +280,14 @@ declare namespace text { + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum TextDecorationStyle { + /** + * Decoration line is solid line. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SOLID, + +@@ -264,6 +295,7 @@ declare namespace text { + * Decoration line is double line. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DOUBLE, + +@@ -271,6 +303,7 @@ declare namespace text { + * Decoration line is dotted line. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DOTTED, + +@@ -278,6 +311,7 @@ declare namespace text { + * Decoration line is dashed line. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DASHED, + +@@ -285,6 +319,7 @@ declare namespace text { + * Decoration line is wavy line. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WAVY, + } +@@ -294,12 +329,14 @@ declare namespace text { + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum FontWeight { + /** + * Thin + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + W100, + +@@ -307,6 +344,7 @@ declare namespace text { + * Extra-light + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + W200, + +@@ -314,6 +352,7 @@ declare namespace text { + * Light + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + W300, + +@@ -321,6 +360,7 @@ declare namespace text { + * Normal/Regular + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + W400, + +@@ -328,6 +368,7 @@ declare namespace text { + * Medium + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + W500, + +@@ -335,6 +376,7 @@ declare namespace text { + * Semi-bold + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + W600, + +@@ -342,6 +384,7 @@ declare namespace text { + * Bold + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + W700, + +@@ -349,6 +392,7 @@ declare namespace text { + * Extra-bold + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + W800, + +@@ -356,6 +400,7 @@ declare namespace text { + * Black + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + W900, + } +@@ -365,12 +410,14 @@ declare namespace text { + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum FontStyle { + /** + * Upright font type. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NORMAL, + +@@ -378,6 +425,7 @@ declare namespace text { + * Slant font. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ITALIC, + +@@ -385,6 +433,7 @@ declare namespace text { + * Oblique font. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + OBLIQUE, + } +@@ -394,12 +443,14 @@ declare namespace text { + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum FontWidth { + /** + * Ultra condensed font width. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ULTRA_CONDENSED = 1, + +@@ -407,6 +458,7 @@ declare namespace text { + * Extra condensed font width. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EXTRA_CONDENSED = 2, + +@@ -414,6 +466,7 @@ declare namespace text { + * Condensed font width. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CONDENSED = 3, + +@@ -421,6 +474,7 @@ declare namespace text { + * Semi condensed font width. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SEMI_CONDENSED = 4, + +@@ -428,6 +482,7 @@ declare namespace text { + * Normal font width. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NORMAL = 5, + +@@ -435,6 +490,7 @@ declare namespace text { + * Semi expanded font width. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SEMI_EXPANDED = 6, + +@@ -442,6 +498,7 @@ declare namespace text { + * Expanded font width. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EXPANDED = 7, + +@@ -449,6 +506,7 @@ declare namespace text { + * Extra expanded font width. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EXTRA_EXPANDED = 8, + +@@ -456,6 +514,7 @@ declare namespace text { + * Ultra expanded font width. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ULTRA_EXPANDED = 9, + } +@@ -465,12 +524,14 @@ declare namespace text { + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum TextHeightBehavior { + /** + * Both ascend of first row and last row style. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ALL = 0x0, + +@@ -478,6 +539,7 @@ declare namespace text { + * Forbidding ascend of first row style. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DISABLE_FIRST_ASCENT = 0x1, + +@@ -485,6 +547,7 @@ declare namespace text { + * Forbidding ascend of last row style. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DISABLE_LAST_ASCENT = 0x2, + +@@ -492,6 +555,7 @@ declare namespace text { + * Neither ascend of first row nor last row style. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DISABLE_ALL = 0x1 | 0x2, + } +@@ -501,6 +565,7 @@ declare namespace text { + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum TextBaseline { + /** +@@ -508,6 +573,7 @@ declare namespace text { + * with the base of lowercase letters. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ALPHABETIC, + +@@ -516,6 +582,7 @@ declare namespace text { + * where the baseline aligns with the center of characters. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + IDEOGRAPHIC, + } +@@ -525,12 +592,14 @@ declare namespace text { + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum EllipsisMode { + /** + * The ellipsis is shown in the start of text. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + START, + +@@ -538,6 +607,7 @@ declare namespace text { + * The ellipsis is shown in the middle of text. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MIDDLE, + +@@ -545,6 +615,7 @@ declare namespace text { + * The ellipsis is shown in the end of text. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + END, + } +@@ -554,6 +625,7 @@ declare namespace text { + * @typedef TextShadow + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface TextShadow { + /** +@@ -561,6 +633,7 @@ declare namespace text { + * @type { ?common2D.Color } The color of text shadow + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + color?: common2D.Color; + /** +@@ -568,6 +641,7 @@ declare namespace text { + * @type { ?common2D.Point } The point of shadow + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + point?: common2D.Point; + /** +@@ -575,6 +649,7 @@ declare namespace text { + * @type { ?number } The value about radius of blur, it type is "double" + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + blurRadius?: number; + } +@@ -584,6 +659,7 @@ declare namespace text { + * @typedef RectStyle + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface RectStyle { + /** +@@ -591,6 +667,7 @@ declare namespace text { + * @type { common2D.Color } The color of rect style + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + color: common2D.Color; + +@@ -599,6 +676,7 @@ declare namespace text { + * @type { number } it is double type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + leftTopRadius: number; + +@@ -607,6 +685,7 @@ declare namespace text { + * @type { number } it is double type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + rightTopRadius: number; + +@@ -615,6 +694,7 @@ declare namespace text { + * @type { number } it is double type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + rightBottomRadius: number; + +@@ -623,6 +703,7 @@ declare namespace text { + * @type { number } it is double type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + leftBottomRadius: number; + } +@@ -632,6 +713,7 @@ declare namespace text { + * @typedef FontFeature + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface FontFeature { + /** +@@ -639,6 +721,7 @@ declare namespace text { + * @type { string } feature name + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + name: string; + /** +@@ -646,6 +729,7 @@ declare namespace text { + * @type { number } feature value + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + value: number; + } +@@ -655,6 +739,7 @@ declare namespace text { + * @typedef FontVariation + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface FontVariation { + /** +@@ -662,6 +747,7 @@ declare namespace text { + * @type { string } variation axis + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + axis: string; + /** +@@ -669,6 +755,7 @@ declare namespace text { + * @type { number } variation value + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + value: number; + } +@@ -678,6 +765,7 @@ declare namespace text { + * @typedef TextStyle + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface TextStyle { + +@@ -686,6 +774,7 @@ declare namespace text { + * @type { ?Decoration } decoration for text + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + decoration?: Decoration; + +@@ -694,6 +783,7 @@ declare namespace text { + * @type { ?common2D.Color } it is uint32_t type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + color?: common2D.Color; + +@@ -702,6 +792,7 @@ declare namespace text { + * @type { ?FontWeight } it is uint32_t type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + fontWeight?: FontWeight; + +@@ -710,6 +801,7 @@ declare namespace text { + * @type { ?FontStyle } it is uint32_t type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + fontStyle?: FontStyle; + +@@ -718,6 +810,7 @@ declare namespace text { + * @type { ?TextBaseline } it is uint32_t type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + baseline?: TextBaseline; + +@@ -726,6 +819,7 @@ declare namespace text { + * @type { ?Array } fontfamily gather + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + fontFamilies?: Array; + +@@ -734,6 +828,7 @@ declare namespace text { + * @type { ?number } it is double type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + fontSize?: number; + +@@ -742,6 +837,7 @@ declare namespace text { + * @type { ?number } it is double type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + letterSpacing?: number; + +@@ -750,6 +846,7 @@ declare namespace text { + * @type { ?number } it is double type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + wordSpacing?: number; + +@@ -758,6 +855,7 @@ declare namespace text { + * @type { ?number } it is double type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + heightScale?: number; + +@@ -766,6 +864,7 @@ declare namespace text { + * @type { ?boolean } it is boolean type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + halfLeading?: boolean; + +@@ -775,6 +874,7 @@ declare namespace text { + * @type { ?boolean } it is boolean type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + heightOnly?: boolean; + +@@ -783,6 +883,7 @@ declare namespace text { + * @type { ?string } it is u16string type data. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ellipsis?: string; + +@@ -791,6 +892,7 @@ declare namespace text { + * @type { ?EllipsisMode } Ellipsis mode. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ellipsisMode?: EllipsisMode; + +@@ -799,6 +901,7 @@ declare namespace text { + * @type { ?string } it is string type data. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + locale?: string; + +@@ -807,6 +910,7 @@ declare namespace text { + * @type { ?number } it is double type data. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + baselineShift?: number; + +@@ -815,6 +919,7 @@ declare namespace text { + * @type { ?Array } A collection of font features. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + fontFeatures?: Array; + +@@ -823,6 +928,7 @@ declare namespace text { + * @type { ?Array } textShadow gather. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + textShadows?: Array; + +@@ -831,6 +937,7 @@ declare namespace text { + * @type { ?RectStyle } rect style for text. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + backgroundRect?: RectStyle; + +@@ -839,6 +946,7 @@ declare namespace text { + * @type { ?Array } A collection of font variations. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + fontVariations?: Array; + } +@@ -847,6 +955,7 @@ declare namespace text { + * Provides the basis for graphics. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class FontCollection { + /** +@@ -854,6 +963,7 @@ declare namespace text { + * @returns { FontCollection } The FontCollection object. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + static getGlobalInstance(): FontCollection; + +@@ -863,6 +973,7 @@ declare namespace text { + * @param { string | Resource } path - the path of the font file. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + loadFontSync(name: string, path: string | Resource): void; + +@@ -875,6 +986,7 @@ declare namespace text { + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + loadFont(name: string, path: string | Resource): Promise; + +@@ -882,6 +994,7 @@ declare namespace text { + * Clear font caches. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + clearCaches(): void; + } +@@ -891,6 +1004,7 @@ declare namespace text { + * @typedef StrutStyle + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface StrutStyle { + /** +@@ -898,6 +1012,7 @@ declare namespace text { + * @type { ?Array } fontfamily gather + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + fontFamilies?: Array; + +@@ -906,6 +1021,7 @@ declare namespace text { + * @type { ?FontStyle } it is uint32_t type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + fontStyle?: FontStyle; + +@@ -914,6 +1030,7 @@ declare namespace text { + * @type { ?FontWidth } it is uint32_t type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + fontWidth?: FontWidth; + +@@ -922,6 +1039,7 @@ declare namespace text { + * @type { ?FontWeight } it is uint32_t type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + fontWeight?: FontWeight; + +@@ -930,6 +1048,7 @@ declare namespace text { + * @type { ?number } it is double type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + fontSize?: number; + +@@ -938,6 +1057,7 @@ declare namespace text { + * @type { ?number } it is double type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + height?: number; + +@@ -946,6 +1066,7 @@ declare namespace text { + * @type { ?number } it is double type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + leading?: number; + +@@ -954,6 +1075,7 @@ declare namespace text { + * @type { ?boolean } it is boolean type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + forceHeight?: boolean; + +@@ -962,6 +1084,7 @@ declare namespace text { + * @type { ?boolean } it is boolean type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enabled?: boolean; + +@@ -970,6 +1093,7 @@ declare namespace text { + * @type { ?boolean } it is boolean type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + heightOverride?: boolean; + +@@ -978,6 +1102,7 @@ declare namespace text { + * @type { ?boolean } it is boolean type data + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + halfLeading?: boolean; + } +@@ -987,6 +1112,7 @@ declare namespace text { + * @typedef ParagraphStyle + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ParagraphStyle { + /** +@@ -994,6 +1120,7 @@ declare namespace text { + * @type { ?TextStyle } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + textStyle?: TextStyle; + +@@ -1002,6 +1129,7 @@ declare namespace text { + * @type { ?TextDirection } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + textDirection?: TextDirection; + +@@ -1010,6 +1138,7 @@ declare namespace text { + * @type { ?TextAlign } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + align?: TextAlign; + +@@ -1018,6 +1147,7 @@ declare namespace text { + * @type { ?WordBreak } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + wordBreak?: WordBreak; + +@@ -1026,6 +1156,7 @@ declare namespace text { + * @type { ?number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + maxLines?: number; + +@@ -1034,6 +1165,7 @@ declare namespace text { + * @type { ?BreakStrategy } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + breakStrategy?: BreakStrategy; + +@@ -1042,6 +1174,7 @@ declare namespace text { + * @type { ?StrutStyle } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + strutStyle?: StrutStyle; + +@@ -1050,6 +1183,7 @@ declare namespace text { + * @type { ?TextHeightBehavior } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + textHeightBehavior?: TextHeightBehavior; + +@@ -1061,6 +1195,7 @@ declare namespace text { + * @type { ?TextTab } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + tab?: TextTab; + } +@@ -1069,13 +1204,13 @@ declare namespace text { + * Where to vertically align the placeholder relative to the surrounding text. + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + enum PlaceholderAlignment { + /** + * Match the baseline of the placeholder with the baseline. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + OFFSET_AT_BASELINE, + +@@ -1083,7 +1218,7 @@ declare namespace text { + * Align the bottom edge of the placeholder with the baseline such that the placeholder + * sits on top of the baseline. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + ABOVE_BASELINE, + +@@ -1091,7 +1226,7 @@ declare namespace text { + * Align the top edge of the placeholder with the baseline specified in such that the placeholder + * hangs below the baseline. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + BELOW_BASELINE, + +@@ -1099,7 +1234,7 @@ declare namespace text { + * Align the top edge of the placeholder with the top edge of the font. When the placeholder is very tall, + * the extra space will hang from the top and extend through the bottom of the line. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + TOP_OF_ROW_BOX, + +@@ -1107,7 +1242,7 @@ declare namespace text { + * Align the bottom edge of the placeholder with the bottom edge of the text. When the placeholder is very tall, + * the extra space will rise from the bottom and extend through the top of the line. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + BOTTOM_OF_ROW_BOX, + +@@ -1115,7 +1250,7 @@ declare namespace text { + * Align the middle of the placeholder with the middle of the text.When the placeholder is very tall, + * the extra space will grow equally from the top and bottom of the line. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + CENTER_OF_ROW_BOX, + } +@@ -1124,14 +1259,14 @@ declare namespace text { + * Provide a description of placeholder scope in creating typography. + * @typedef PlaceholderSpan + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + interface PlaceholderSpan { + /** + * The width of the placeholder. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + width: number; + +@@ -1139,7 +1274,7 @@ declare namespace text { + * The height of the placeholder. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + height: number; + +@@ -1147,7 +1282,7 @@ declare namespace text { + * Alignment mode of placeholder. + * @type { PlaceholderAlignment } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + align: PlaceholderAlignment; + +@@ -1155,7 +1290,7 @@ declare namespace text { + * Baseline of placeholder. + * @type { TextBaseline } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + baseline: TextBaseline; + +@@ -1163,7 +1298,7 @@ declare namespace text { + * Baseline offset of placeholder. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + baselineOffset: number; + } +@@ -1172,14 +1307,14 @@ declare namespace text { + * Provides the definition of the range. + * @typedef Range + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + interface Range { + /** + * Left index. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + start: number; + +@@ -1187,7 +1322,7 @@ declare namespace text { + * Right index. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + end: number; + } +@@ -1196,41 +1331,41 @@ declare namespace text { + * An enumeration of system font types. + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'14','1.2':'20'} ++ * @since 14 + */ + enum SystemFontType { + /** + * All font types. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'14','1.2':'20'} ++ * @since 14 + */ + ALL = 1 << 0, + + /** + * System generic font type. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'14','1.2':'20'} ++ * @since 14 + */ + GENERIC = 1 << 1, + + /** + * Stylish font type. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'14','1.2':'20'} ++ * @since 14 + */ + STYLISH = 1 << 2, + + /** + * Installed font types. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'14','1.2':'20'} ++ * @since 14 + */ + INSTALLED = 1 << 3, + + /** + * Customized font types. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + CUSTOMIZED = 1 << 4, + } +@@ -1239,14 +1374,14 @@ declare namespace text { + * Font descriptor + * @typedef FontDescriptor + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'14','1.2':'20'} ++ * @since 14 + */ + interface FontDescriptor { + /** + * Font file path + * @type { ?string } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'14','1.2':'20'} ++ * @since 14 + */ + path?: string; + +@@ -1254,7 +1389,7 @@ declare namespace text { + * Font postScript name + * @type { ?string } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'14','1.2':'20'} ++ * @since 14 + */ + postScriptName?: string; + +@@ -1262,7 +1397,7 @@ declare namespace text { + * Full font name + * @type { ?string } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'14','1.2':'20'} ++ * @since 14 + */ + fullName?: string; + +@@ -1270,7 +1405,7 @@ declare namespace text { + * Font family name + * @type { ?string } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'14','1.2':'20'} ++ * @since 14 + */ + fontFamily?: string; + +@@ -1278,7 +1413,7 @@ declare namespace text { + * Font subfamily name + * @type { ?string } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'14','1.2':'20'} ++ * @since 14 + */ + fontSubfamily?: string; + +@@ -1286,7 +1421,7 @@ declare namespace text { + * Font weight + * @type { ?FontWeight } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'14','1.2':'20'} ++ * @since 14 + */ + weight?: FontWeight; + +@@ -1294,7 +1429,7 @@ declare namespace text { + * Font width + * @type { ?number } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'14','1.2':'20'} ++ * @since 14 + */ + width?: number; + +@@ -1302,7 +1437,7 @@ declare namespace text { + * Font slant, non-0 means italic. + * @type { ?number } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'14','1.2':'20'} ++ * @since 14 + */ + italic?: number; + +@@ -1310,7 +1445,7 @@ declare namespace text { + * Whether the font is monospaced + * @type { ?boolean } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'14','1.2':'20'} ++ * @since 14 + */ + monoSpace?: boolean; + +@@ -1318,7 +1453,7 @@ declare namespace text { + * Whether to support symbols + * @type { ?boolean } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'14','1.2':'20'} ++ * @since 14 + */ + symbolic?: boolean; + } +@@ -1327,6 +1462,7 @@ declare namespace text { + * A paragraph retains the size and position of each glyph in the text and can be efficiently resized and painted. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class Paragraph { + /** +@@ -1334,6 +1470,7 @@ declare namespace text { + * @param { number } width - Control how wide the text is allowed to be. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + layoutSync(width: number): void; + +@@ -1344,7 +1481,7 @@ declare namespace text { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + layout(width: number): Promise; + +@@ -1355,6 +1492,7 @@ declare namespace text { + * @param { number } y - Represents the Y-axis position on the canvas. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + paint(canvas: drawing.Canvas, x: number, y: number): void; + +@@ -1366,6 +1504,7 @@ declare namespace text { + * @param { number } vOffset - Vertical offset along the path. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + paintOnPath(canvas: drawing.Canvas, path: drawing.Path, hOffset: number, vOffset: number): void; + +@@ -1373,7 +1512,7 @@ declare namespace text { + * Get max width of horizontal space this paragraph occupied. + * @returns { number } Max width of horizontal space. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getMaxWidth(): number; + +@@ -1381,7 +1520,7 @@ declare namespace text { + * Get height of horizontal space this paragraph occupies. + * @returns { number } Height of horizontal space this paragraph occupies. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getHeight(): number; + +@@ -1390,6 +1529,7 @@ declare namespace text { + * @returns { number } The longest line of horizontal space this paragraph occupies. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getLongestLine(): number; + +@@ -1398,7 +1538,7 @@ declare namespace text { + * of indent. + * @returns { number } The longest line with indent of horizontal space this paragraph occupies. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'13','1.2':'20'} ++ * @since 13 + */ + getLongestLineWithIndent(): number; + +@@ -1406,7 +1546,7 @@ declare namespace text { + * Get the min intrinsic width of horizontal space this paragraph occupies. + * @returns { number } The min intrinsic width of horizontal space this paragraph occupies. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getMinIntrinsicWidth(): number; + +@@ -1414,7 +1554,7 @@ declare namespace text { + * Get the max intrinsic width. + * @returns { number } Intrinsic Width. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getMaxIntrinsicWidth(): number; + +@@ -1422,7 +1562,7 @@ declare namespace text { + * Get the alphabetic baseline. + * @returns { number } Alphabetic Baseline. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getAlphabeticBaseline(): number; + +@@ -1430,7 +1570,7 @@ declare namespace text { + * Get the ideographic baseline. + * @returns { number } Ideographic Baseline. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getIdeographicBaseline(): number; + +@@ -1441,7 +1581,7 @@ declare namespace text { + * @param { RectHeightStyle } heightStyle - Height style to set. + * @returns { Array } The rects for range. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getRectsForRange(range: Range, widthStyle: RectWidthStyle, heightStyle: RectHeightStyle): Array; + +@@ -1449,7 +1589,7 @@ declare namespace text { + * Get the rects for placeholders. + * @returns { Array } The rects for placeholders. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getRectsForPlaceholders(): Array; + +@@ -1459,7 +1599,7 @@ declare namespace text { + * @param { number } y - the positionY of typography to set. + * @returns { PositionWithAffinity } TextBlob object. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getGlyphPositionAtCoordinate(x: number, y: number): PositionWithAffinity; + +@@ -1468,7 +1608,7 @@ declare namespace text { + * @param { number } offset - offset value + * @returns { Range } The range value returned to the caller. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getWordBoundary(offset: number): Range; + +@@ -1476,7 +1616,7 @@ declare namespace text { + * Get line count. + * @returns { number } The line count value returned to the caller. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getLineCount(): number; + +@@ -1485,7 +1625,7 @@ declare namespace text { + * @param { number } line - line number + * @returns { number } The line height value returned to the caller. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getLineHeight(line: number): number; + +@@ -1494,7 +1634,7 @@ declare namespace text { + * @param { number } line - line number + * @returns { number } The line width value returned to the caller. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getLineWidth(line: number): number; + +@@ -1502,7 +1642,7 @@ declare namespace text { + * Return whether it exceed the maximum lines of typography. + * @returns { boolean } The true indicates exceeding, the false indicates not exceeding. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + didExceedMaxLines(): boolean; + +@@ -1510,7 +1650,7 @@ declare namespace text { + * Get the text lines of paragraph. + * @returns { Array } the tuple of TextLine. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getTextLines(): Array; + +@@ -1520,7 +1660,7 @@ declare namespace text { + * @param { boolean } includeSpaces - indicates if the whitespaces should be included + * @returns { Range } The range of text. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getActualTextRange(lineNumber: number, includeSpaces: boolean): Range; + +@@ -1529,6 +1669,7 @@ declare namespace text { + * @returns { Array } Array of line metrics. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getLineMetrics(): Array; + +@@ -1538,6 +1679,7 @@ declare namespace text { + * @returns { LineMetrics | undefined } line metrics. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getLineMetrics(lineNumber: number): LineMetrics | undefined; + } +@@ -1545,7 +1687,7 @@ declare namespace text { + /** + * Provides the abilities to typeset by line. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + class LineTypeset { + /** +@@ -1556,7 +1698,7 @@ declare namespace text { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + getLineBreak(startIndex: number, width: number): number; + +@@ -1568,7 +1710,7 @@ declare namespace text { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + createLine(startIndex: number, count: number): TextLine; + } +@@ -1577,14 +1719,14 @@ declare namespace text { + * Box that contain text. + * @typedef TextBox + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + interface TextBox{ + /** + * Rect of text box. + * @type { common2D.Rect } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + rect: common2D.Rect; + +@@ -1592,7 +1734,7 @@ declare namespace text { + * Text direction. + * @type { TextDirection } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + direction: TextDirection; + } +@@ -1601,14 +1743,14 @@ declare namespace text { + * Position and affinity. + * @typedef PositionWithAffinity + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + interface PositionWithAffinity { + /** + * Position of text. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + position: number; + +@@ -1616,7 +1758,7 @@ declare namespace text { + * Affinity of text. + * @type { Affinity } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + affinity: Affinity; + } +@@ -1625,20 +1767,20 @@ declare namespace text { + * Enumerates rect width style. + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + enum RectWidthStyle { + /** + * Tight width. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + TIGHT, + + /** + * Max width. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + MAX, + } +@@ -1647,13 +1789,13 @@ declare namespace text { + * Enumerates rect height style. + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + enum RectHeightStyle { + /** + * Provide tight bounding boxes that fit heights per run. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + TIGHT, + +@@ -1661,35 +1803,35 @@ declare namespace text { + * The height of the boxes will be the maximum height of all runs in the line. All rects in the same + * line will be the same height. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + MAX, + + /** + * The top and bottom of each rect will cover half of the space above and half of the space below the line. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + INCLUDE_LINE_SPACE_MIDDLE, + + /** + * The line spacing will be added to the top of the rect. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + INCLUDE_LINE_SPACE_TOP, + + /** + * The line spacing will be added to the bottom of the rect. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + INCLUDE_LINE_SPACE_BOTTOM, + + /** + * The height of the boxes will be calculated by text strut. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + STRUT, + } +@@ -1700,20 +1842,20 @@ declare namespace text { + * closer to. + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + enum Affinity { + /** + * The position has affinity for the upstream side of the text position. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + + UPSTREAM, + /** + * The position has affinity for the downstream side of the text position. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + DOWNSTREAM, + } +@@ -1722,6 +1864,7 @@ declare namespace text { + * Builds a Paragraph containing text with the given styling information. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class ParagraphBuilder { + /** +@@ -1730,6 +1873,7 @@ declare namespace text { + * @param { FontCollection } fontCollection - Font collection {@link FontCollection} + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + constructor(paragraphStyle: ParagraphStyle, fontCollection: FontCollection); + +@@ -1738,6 +1882,7 @@ declare namespace text { + * @param { TextStyle } textStyle - Text style {@link TextStyle} + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + pushStyle(textStyle: TextStyle): void; + +@@ -1745,6 +1890,7 @@ declare namespace text { + * Remove a style from the stack. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + popStyle(): void; + +@@ -1753,6 +1899,7 @@ declare namespace text { + * @param { string } text - Text string + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + addText(text: string): void; + +@@ -1760,7 +1907,7 @@ declare namespace text { + * Add placeholder. + * @param { PlaceholderSpan } placeholderSpan - Placeholder Span {@link PlaceholderSpan} + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + addPlaceholder(placeholderSpan: PlaceholderSpan): void; + +@@ -1769,6 +1916,7 @@ declare namespace text { + * @returns { Paragraph } The paragraph value returned to the caller. + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + build(): Paragraph; + +@@ -1776,7 +1924,7 @@ declare namespace text { + * Create LineTypeset object. + * @returns { LineTypeset } The LineTypeset value returned to the caller. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + buildLineTypeset(): LineTypeset; + +@@ -1784,7 +1932,7 @@ declare namespace text { + * Add symbolId. + * @param { number } symbolId - Symbol Id + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + addSymbol(symbolId: number): void; + } +@@ -1793,14 +1941,14 @@ declare namespace text { + * Provides the definition of the typographic bounds. + * @typedef TypographicBounds + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + interface TypographicBounds { + /** + * Distance Retained Above Baseline. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + ascent: number; + +@@ -1808,7 +1956,7 @@ declare namespace text { + * The distance that remains below the baseline. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + descent: number; + +@@ -1816,7 +1964,7 @@ declare namespace text { + * Line Spacing. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + leading: number; + +@@ -1824,7 +1972,7 @@ declare namespace text { + * The total width of the typesetting border. + * @type { number } + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + width: number; + } +@@ -1840,21 +1988,21 @@ declare namespace text { + * @returns { boolean } The return value of the user-defined callback function. If false is returned, the traversal + * continues. If true is returned, the traversal stops. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + type CaretOffsetsCallback = (offset: number, index: number, leadingEdge: boolean) => boolean; + + /** + * The structure of text line that provides the basis of paragraph for graphics. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + class TextLine { + /** + * Get the count of glyphs. + * @returns { number } The counts of glyphs. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getGlyphCount(): number; + +@@ -1862,7 +2010,7 @@ declare namespace text { + * Get the range of text line. + * @returns { Range } The range of text. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getTextRange(): Range; + +@@ -1870,7 +2018,7 @@ declare namespace text { + * Get the glyph runs of text line. + * @returns { Array } The tuple of glyph runs of text. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getGlyphRuns(): Array; + +@@ -1880,7 +2028,7 @@ declare namespace text { + * @param { number } x - Represents the X-axis position on the canvas. + * @param { number } y - Represents the Y-axis position on the canvas. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + paint(canvas: drawing.Canvas, x: number, y: number): void; + +@@ -1893,7 +2041,7 @@ declare namespace text { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + createTruncatedLine(width: number, ellipsisMode: EllipsisMode, ellipsis: string): TextLine; + +@@ -1901,7 +2049,7 @@ declare namespace text { + * Gets the text line typographic bounds. + * @returns { TypographicBounds } The text line of typographic bounds. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + getTypographicBounds(): TypographicBounds; + +@@ -1909,7 +2057,7 @@ declare namespace text { + * Gets the text line image bounds. + * @returns { common2D.Rect } Rect of text line. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + getImageBounds(): common2D.Rect; + +@@ -1917,7 +2065,7 @@ declare namespace text { + * Gets the tail space width. + * @returns { number } The tail space width. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + getTrailingSpaceWidth(): number; + +@@ -1928,7 +2076,7 @@ declare namespace text { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + getStringIndexForPosition(point: common2D.Point): number; + +@@ -1939,7 +2087,7 @@ declare namespace text { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + getOffsetForStringIndex(index: number): number; + +@@ -1949,7 +2097,7 @@ declare namespace text { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + enumerateCaretOffsets(callback: CaretOffsetsCallback): void; + +@@ -1964,7 +2112,7 @@ declare namespace text { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + getAlignmentOffset(alignmentFactor: number, alignmentWidth: number): number; + } +@@ -1972,14 +2120,14 @@ declare namespace text { + /** + * Independent rendering of text layout. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + class Run { + /** + * Gets the number of glyph. + * @returns { number } The number of glyph. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getGlyphCount(): number; + +@@ -1987,7 +2135,7 @@ declare namespace text { + * Gets the glyph identifier for each character. + * @returns { Array } Glyph identifier. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getGlyphs(): Array; + +@@ -1999,7 +2147,7 @@ declare namespace text { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + getGlyphs(range: Range): Array; + +@@ -2007,7 +2155,7 @@ declare namespace text { + * Gets the font position offset. + * @returns { Array } The position of the font in the layout. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getPositions(): Array; + +@@ -2019,7 +2167,7 @@ declare namespace text { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + getPositions(range: Range): Array; + +@@ -2027,7 +2175,7 @@ declare namespace text { + * Gets the font position offset array. + * @returns { Array } The position offset of the font in the layout. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getOffsets(): Array; + +@@ -2035,7 +2183,7 @@ declare namespace text { + * Gets the font object instance. + * @returns { drawing.Font } The font object instance. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + getFont(): drawing.Font; + +@@ -2045,7 +2193,7 @@ declare namespace text { + * @param { number } x - Represents the X-axis position on the canvas. + * @param { number } y - Represents the Y-axis position on the canvas. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 + */ + paint(canvas: drawing.Canvas, x: number, y: number): void; + +@@ -2057,7 +2205,7 @@ declare namespace text { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + getStringIndices(range?: Range): Array; + +@@ -2065,7 +2213,7 @@ declare namespace text { + * Gets the run glyph location and length. + * @returns { Range } The run of glyph location and length, Range.start is location, Range.end is length. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + getStringRange(): Range; + +@@ -2073,7 +2221,7 @@ declare namespace text { + * Gets the run typographic bounds. + * @returns { TypographicBounds } The run of typographic bounds. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + getTypographicBounds(): TypographicBounds; + +@@ -2081,7 +2229,7 @@ declare namespace text { + * Gets the run image bounds. + * @returns { common2D.Rect } The run rect bounds. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + getImageBounds(): common2D.Rect; + } +@@ -2091,6 +2239,7 @@ declare namespace text { + * @typedef RunMetrics + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface RunMetrics { + /** +@@ -2098,6 +2247,7 @@ declare namespace text { + * @type { TextStyle } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + textStyle: TextStyle; + +@@ -2106,6 +2256,7 @@ declare namespace text { + * @type { drawing.FontMetrics } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + fontMetrics: drawing.FontMetrics; + } +@@ -2115,6 +2266,7 @@ declare namespace text { + * @typedef LineMetrics + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface LineMetrics { + /** +@@ -2122,6 +2274,7 @@ declare namespace text { + * @type { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + startIndex: number; + +@@ -2130,6 +2283,7 @@ declare namespace text { + * @type { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + endIndex: number; + +@@ -2138,6 +2292,7 @@ declare namespace text { + * @type { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ascent: number; + +@@ -2146,6 +2301,7 @@ declare namespace text { + * @type { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + descent: number; + +@@ -2154,6 +2310,7 @@ declare namespace text { + * @type { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + height: number; + +@@ -2162,6 +2319,7 @@ declare namespace text { + * @type { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + width: number; + +@@ -2170,6 +2328,7 @@ declare namespace text { + * @type { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + left: number; + +@@ -2178,6 +2337,7 @@ declare namespace text { + * @type { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + baseline: number; + +@@ -2186,6 +2346,7 @@ declare namespace text { + * @type { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + lineNumber: number; + +@@ -2194,6 +2355,7 @@ declare namespace text { + * @type { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + topHeight: number; + +@@ -2204,6 +2366,7 @@ declare namespace text { + * @type { Map } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + runMetrics: Map; + } +@@ -2215,7 +2378,7 @@ declare namespace text { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'14','1.2':'20'} ++ * @since 14 + */ + function getSystemFontFullNamesByType(fontType: SystemFontType): Promise>; + +@@ -2228,7 +2391,7 @@ declare namespace text { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'14','1.2':'20'} ++ * @since 14 + */ + function getFontDescriptorByFullName(fullName: string, fontType: SystemFontType): Promise; + +@@ -2241,7 +2404,7 @@ declare namespace text { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Graphics.Drawing +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since 18 + */ + function matchFontDescriptors(desc: FontDescriptor): Promise>; + +@@ -2250,6 +2413,7 @@ declare namespace text { + * @typedef TextTab + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface TextTab { + /** +@@ -2258,6 +2422,7 @@ declare namespace text { + * @type { TextAlign } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + alignment: TextAlign; + +@@ -2266,6 +2431,7 @@ declare namespace text { + * @type { number } + * @syscap SystemCapability.Graphics.Drawing + * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + location: number; + } +diff --git a/api/@ohos.graphics.uiEffect.d.ts b/api/@ohos.graphics.uiEffect.d.ts +index b30a33873..daa434171 100644 +--- a/api/@ohos.graphics.uiEffect.d.ts ++++ b/api/@ohos.graphics.uiEffect.d.ts +@@ -44,7 +44,8 @@ declare namespace uiEffect { + * @returns { Filter } + * @syscap SystemCapability.Graphics.Drawing + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + pixelStretch(stretchSizes: Array, tileMode: TileMode): Filter; + +@@ -54,7 +55,8 @@ declare namespace uiEffect { + * @param { number } blurRadius + * @returns { Filter } + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + blur(blurRadius: number): Filter; + +@@ -71,7 +73,8 @@ declare namespace uiEffect { + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @syscap SystemCapability.Graphics.Drawing + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + waterRipple(progress: number, waveCount: number, x: number, y: number, rippleMode: WaterRippleMode): Filter; + +@@ -85,7 +88,8 @@ declare namespace uiEffect { + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @syscap SystemCapability.Graphics.Drawing + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + flyInFlyOutEffect(degree: number, flyMode: FlyMode): Filter; + +@@ -100,7 +104,8 @@ declare namespace uiEffect { + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @syscap SystemCapability.Graphics.Drawing + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + distort(distortionK: number): Filter; + } +@@ -111,7 +116,8 @@ declare namespace uiEffect { + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum TileMode { + /** +@@ -119,7 +125,8 @@ declare namespace uiEffect { + * + * @syscap SystemCapability.Graphics.Drawing + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CLAMP = 0, + +@@ -128,7 +135,8 @@ declare namespace uiEffect { + * + * @syscap SystemCapability.Graphics.Drawing + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + REPEAT = 1, + +@@ -137,7 +145,8 @@ declare namespace uiEffect { + * + * @syscap SystemCapability.Graphics.Drawing + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MIRROR = 2, + +@@ -146,7 +155,8 @@ declare namespace uiEffect { + * + * @syscap SystemCapability.Graphics.Drawing + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DECAL = 3, + } +@@ -157,7 +167,8 @@ declare namespace uiEffect { + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum WaterRippleMode { + /** +@@ -165,7 +176,8 @@ declare namespace uiEffect { + * + * @syscap SystemCapability.Graphics.Drawing + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SMALL2MEDIUM_RECV = 0, + +@@ -174,7 +186,8 @@ declare namespace uiEffect { + * + * @syscap SystemCapability.Graphics.Drawing + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SMALL2MEDIUM_SEND = 1, + +@@ -183,7 +196,8 @@ declare namespace uiEffect { + * + * @syscap SystemCapability.Graphics.Drawing + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SMALL2SMALL = 2, + +@@ -192,7 +206,8 @@ declare namespace uiEffect { + * + * @syscap SystemCapability.Graphics.Drawing + * @systemapi +- * @since 17 ++ * @since arkts {'1.1':'17', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MINI_RECV = 3, + } +@@ -203,7 +218,8 @@ declare namespace uiEffect { + * @enum { number } + * @syscap SystemCapability.Graphics.Drawing + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum FlyMode { + /** +@@ -211,7 +227,8 @@ declare namespace uiEffect { + * + * @syscap SystemCapability.Graphics.Drawing + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BOTTOM = 0, + +@@ -220,7 +237,8 @@ declare namespace uiEffect { + * + * @syscap SystemCapability.Graphics.Drawing + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TOP = 1, + } +@@ -357,7 +375,8 @@ declare namespace uiEffect { + * Create a Filter to add multiple effects to the component. + * @returns { Filter } Returns the head node of Filter. + * @syscap SystemCapability.Graphics.Drawing +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function createFilter(): Filter; + +diff --git a/api/@ohos.hiSysEvent.d.ets b/api/@ohos.hiSysEvent.d.ets +deleted file mode 100644 +index 4b89b7719..000000000 +--- a/api/@ohos.hiSysEvent.d.ets ++++ /dev/null +@@ -1,559 +0,0 @@ +-/* +- * Copyright (c) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-/** +- * @file +- * @kit PerformanceAnalysisKit +- */ +- +-import { AsyncCallback } from './@ohos.base'; +- +-/** +- * Provides the system event logging function for applications to log the fault, statistical, security, +- * and user behavior events reported during running. Based on event information, +- * you will be able to analyze the running status of applications. +- * +- * @namespace hiSysEvent +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +-declare namespace hiSysEvent { +- /** +- * Enumerate system event types. +- * +- * @enum {number} +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- export enum EventType { +- /** +- * Fault event +- * +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- FAULT = 1, +- +- /** +- * Statistic event +- * +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- STATISTIC = 2, +- +- /** +- * Security event +- * +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- SECURITY = 3, +- +- /** +- * System behavior event +- * +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- BEHAVIOR = 4 +- } +- +- /** +- * Definition of written system event information. +- * +- * @interface SysEventInfo +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- export interface SysEventInfo { +- /** +- * The domain of the event. +- * +- * @type { string } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- domain: string; +- +- /** +- * The name of the event. +- * +- * @type { string } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- name: string; +- +- /** +- * The type of the event. +- * +- * @type { EventType } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- eventType: EventType; +- +- /** +- * The params of the event. +- * +- * @type { object } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 9 +- */ +- /** +- * The params of the event. +- * +- * @type { ?object } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 12 +- */ +- /** +- * The params of the event. +- * +- * @type { ?Record } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- params?: Record; +- } +- +- /** +- * Write system event. +- * +- * @param {SysEventInfo} info - system event information to be written. +- * @returns {Promise} - Return Promise +- * @throws {BusinessError} 401 - Parameter error. Possible causes: +- * 1. Mandatory parameters are left unspecified. +- * 2. Incorrect parameter types. +- * 3. Parameter verification failed. +- * @throws {BusinessError} 11200001 - Invalid event domain. +- * @throws {BusinessError} 11200002 - Invalid event name. +- * @throws {BusinessError} 11200003 - Abnormal environment. +- * @throws {BusinessError} 11200004 - The event length exceeds the limit. +- * @throws {BusinessError} 11200051 - Invalid event parameter. +- * @throws {BusinessError} 11200052 - The size of the event parameter of the string type exceeds the limit. +- * @throws {BusinessError} 11200053 - The number of event parameters exceeds the limit. +- * @throws {BusinessError} 11200054 - The number of event parameters of the array type exceeds the limit. +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- export function write(info: SysEventInfo): Promise; +- +- /** +- * Write system event. +- * +- * @param {SysEventInfo} info - system event information to be written. +- * @param {AsyncCallback} callback - callback function. +- * @throws {BusinessError} 401 - Parameter error. Possible causes: +- * 1. Mandatory parameters are left unspecified. +- * 2. Incorrect parameter types. +- * 3. Parameter verification failed. +- * @throws {BusinessError} 11200001 - Invalid event domain. +- * @throws {BusinessError} 11200002 - Invalid event name. +- * @throws {BusinessError} 11200003 - Abnormal environment. +- * @throws {BusinessError} 11200004 - The event length exceeds the limit. +- * @throws {BusinessError} 11200051 - Invalid event parameter. +- * @throws {BusinessError} 11200052 - The size of the event parameter of the string type exceeds the limit. +- * @throws {BusinessError} 11200053 - The number of event parameters exceeds the limit. +- * @throws {BusinessError} 11200054 - The number of event parameters of the array type exceeds the limit. +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- export function write(info: SysEventInfo, callback: AsyncCallback): void; +- +- /** +- * Enumerate search system event rule type. +- * +- * @enum {number} +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- export enum RuleType { +- /** +- * Whole word match +- * +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- WHOLE_WORD = 1, +- +- /** +- * Prefix match +- * +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- PREFIX = 2, +- +- /** +- * Regular match +- * +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- REGULAR = 3 +- } +- +- /** +- * Definition listener rule for system event information. +- * +- * @interface WatchRule +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- export interface WatchRule { +- /** +- * The domain of the event. +- * +- * @type { string } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- domain: string; +- +- /** +- * The name of the event. +- * +- * @type { string } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- name: string; +- +- /** +- * The tag of the event. +- * +- * @type { string } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- /** +- * The tag of the event. +- * +- * @type { ?string } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- tag?: string; +- +- /** +- * The rule of match system event +- * +- * @type { RuleType } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- ruleType: RuleType; +- } +- +- /** +- * Definition watcher for system event information. +- * +- * @interface Watcher +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- export interface Watcher { +- /** +- * Rule of filter system event +- * +- * @type { WatchRule[] } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- rules: WatchRule[]; +- +- /** +- * Receive system event. +- * +- * @type { function } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- onEvent: (info: SysEventInfo) => void; +- +- /** +- * Hisysevent service shutdown. +- * +- * @type { function } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- onServiceDied: () => void; +- } +- +- /** +- * Definition arguments for query system event information. +- * +- * @interface QueryArg +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- export interface QueryArg { +- /** +- * Begin time +- * +- * @type { number } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- beginTime: number; +- +- /** +- * End time +- * +- * @type { number } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- endTime: number; +- +- /** +- * Max number of receive system event +- * +- * @type { number } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- maxEvents: number; +- +- /** +- * Begin sequence +- * +- * @type { ?number } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- fromSeq?: number; +- +- /** +- * End sequence +- * +- * @type { ?number } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- toSeq?: number; +- } +- +- /** +- * Definition event for query system event information +- * +- * @interface QueryRule +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- export interface QueryRule { +- /** +- * The domain of the event +- * +- * @type { string } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- domain: string; +- +- /** +- * List of event name +- * +- * @type { string[] } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- names: string[]; +- +- /** +- * Extra parameter condition of event +- * +- * @type { ?string } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- condition?: string; +- } +- +- /** +- * Definition query result handler +- * +- * @interface Querier +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- export interface Querier { +- /** +- * Handle query result, the query result will be send in several times. +- * +- * @type { function } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- onQuery: (infos: SysEventInfo[]) => void; +- +- /** +- * Notify querier execute query has finished. +- * +- * @type { function } +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- onComplete: (reason: number, total: number) => void; +- } +- +- /** +- * Add watcher to watch system event +- * +- * @permission ohos.permission.READ_DFX_SYSEVENT +- * @param {Watcher} watcher watch system event +- * @throws {BusinessError} 201 - Permission denied. An attempt was made to read system event forbidden by permission: +- * ohos.permission.READ_DFX_SYSEVENT. +- * @throws {BusinessError} 202 - System API is not allowed called by Non-system application. +- * @throws {BusinessError} 11200101 - The number of watchers exceeds the limit. +- * @throws {BusinessError} 11200102 - The number of watch rules exceeds the limit. +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- export function addWatcher(watcher: Watcher): void; +- +- /** +- * Remove watcher +- * +- * @permission ohos.permission.READ_DFX_SYSEVENT +- * @param {Watcher} watcher watch system event +- * @throws {BusinessError} 201 - Permission denied. An attempt was made to read system event forbidden by permission: +- * ohos.permission.READ_DFX_SYSEVENT. +- * @throws {BusinessError} 202 - System API is not allowed called by Non-system application. +- * @throws {BusinessError} 11200201 - The watcher does not exist. +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- export function removeWatcher(watcher: Watcher): void; +- +- /** +- * Query system event +- * +- * @permission ohos.permission.READ_DFX_SYSEVENT +- * @param {QueryArg} queryArg common arguments of query system event +- * @param {QueryRule[]} rules rule of query system event +- * @param {Querier} querier receive query result +- * @throws {BusinessError} 201 - Permission denied. An attempt was made to read system event forbidden by permission: +- * ohos.permission.READ_DFX_SYSEVENT. +- * @throws {BusinessError} 202 - System API is not allowed called by Non-system application. +- * @throws {BusinessError} 11200301 - The number of query rules exceeds the limit. +- * @throws {BusinessError} 11200302 - Invalid query rule. +- * @throws {BusinessError} 11200303 - The number of concurrent queriers exceeds the limit. +- * @throws {BusinessError} 11200304 - The query frequency exceeds the limit. +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- export function query(queryArg: QueryArg, rules: QueryRule[], querier: Querier): void; +- +- /** +- * Export system event +- * +- * @permission ohos.permission.READ_DFX_SYSEVENT +- * @param {QueryArg} queryArg common arguments of query system event +- * @param {QueryRule[]} rules rule of query system event +- * @returns {number} return hiview receive task time. +- * @throws {BusinessError} 201 - Permission denied. An attempt was made to read system event forbidden by permission: +- * ohos.permission.READ_DFX_SYSEVENT. +- * @throws {BusinessError} 202 - System API is not allowed called by Non-system application. +- * @throws {BusinessError} 11200301 - The number of query rules exceeds the limit. +- * @throws {BusinessError} 11200302 - Invalid query rule. +- * @throws {BusinessError} 11200304 – The query frequency exceeds the limit. +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- export function exportSysEvents(queryArg: QueryArg, rules: QueryRule[]): number; +- +- /** +- * Subscribe system event +- * +- * @permission ohos.permission.READ_DFX_SYSEVENT +- * @param {QueryRule[]} rules rule of subscribe system event +- * @returns {number} return hiview receive task time. +- * @throws {BusinessError} 201 - Permission denied. An attempt was made to read system event forbidden by permission: +- * ohos.permission.READ_DFX_SYSEVENT. +- * @throws {BusinessError} 202 - System API is not allowed called by Non-system application. +- * @throws {BusinessError} 11200301 - The number of query rules exceeds the limit. +- * @throws {BusinessError} 11200302 - Invalid query rule. +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- export function subscribe(rules: QueryRule[]): number; +- +- /** +- * Unsubscribe system event +- * +- * @permission ohos.permission.READ_DFX_SYSEVENT +- * @throws {BusinessError} 201 - Permission denied. An attempt was made to read system event forbidden by permission: +- * ohos.permission.READ_DFX_SYSEVENT. +- * @throws {BusinessError} 202 - System API is not allowed called by Non-system application. +- * @throws {BusinessError} 11200305 – Unsubscription failed. +- * @syscap SystemCapability.HiviewDFX.HiSysEvent +- * @systemapi hide for inner use +- * @since 20 +- */ +- export function unsubscribe(): void; +-} +- +-export default hiSysEvent; +diff --git a/api/@ohos.hiSysEvent.d.ts b/api/@ohos.hiSysEvent.d.ts +index f4401ee2f..2a08c051c 100644 +--- a/api/@ohos.hiSysEvent.d.ts ++++ b/api/@ohos.hiSysEvent.d.ts +@@ -28,7 +28,8 @@ import { AsyncCallback } from './@ohos.base'; + * @namespace hiSysEvent + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace hiSysEvent { + /** +@@ -37,7 +38,8 @@ declare namespace hiSysEvent { + * @enum {number} + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum EventType { + /** +@@ -45,7 +47,8 @@ declare namespace hiSysEvent { + * + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FAULT = 1, + +@@ -54,7 +57,8 @@ declare namespace hiSysEvent { + * + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + STATISTIC = 2, + +@@ -63,7 +67,8 @@ declare namespace hiSysEvent { + * + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SECURITY = 3, + +@@ -72,7 +77,8 @@ declare namespace hiSysEvent { + * + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BEHAVIOR = 4 + } +@@ -83,7 +89,8 @@ declare namespace hiSysEvent { + * @interface SysEventInfo + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface SysEventInfo { + /** +@@ -92,7 +99,8 @@ declare namespace hiSysEvent { + * @type { string } + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + domain: string; + +@@ -102,7 +110,8 @@ declare namespace hiSysEvent { + * @type { string } + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + name: string; + +@@ -112,7 +121,8 @@ declare namespace hiSysEvent { + * @type { EventType } + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + eventType: EventType; + +@@ -130,7 +140,8 @@ declare namespace hiSysEvent { + * @type { ?object } + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + params?: object; + } +@@ -154,7 +165,8 @@ declare namespace hiSysEvent { + * @throws {BusinessError} 11200054 - The number of event parameters of the array type exceeds the limit. + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function write(info: SysEventInfo): Promise; + +@@ -177,7 +189,8 @@ declare namespace hiSysEvent { + * @throws {BusinessError} 11200054 - The number of event parameters of the array type exceeds the limit. + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function write(info: SysEventInfo, callback: AsyncCallback): void; + +@@ -187,7 +200,8 @@ declare namespace hiSysEvent { + * @enum {number} + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum RuleType { + /** +@@ -195,7 +209,8 @@ declare namespace hiSysEvent { + * + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WHOLE_WORD = 1, + +@@ -204,7 +219,8 @@ declare namespace hiSysEvent { + * + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PREFIX = 2, + +@@ -213,7 +229,8 @@ declare namespace hiSysEvent { + * + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + REGULAR = 3 + } +@@ -224,7 +241,8 @@ declare namespace hiSysEvent { + * @interface WatchRule + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface WatchRule { + /** +@@ -233,7 +251,8 @@ declare namespace hiSysEvent { + * @type { string } + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + domain: string; + +@@ -243,7 +262,8 @@ declare namespace hiSysEvent { + * @type { string } + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + name: string; + +@@ -261,7 +281,8 @@ declare namespace hiSysEvent { + * @type { ?string } + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + tag?: string; + +@@ -271,7 +292,8 @@ declare namespace hiSysEvent { + * @type { RuleType } + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ruleType: RuleType; + } +@@ -282,7 +304,8 @@ declare namespace hiSysEvent { + * @interface Watcher + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Watcher { + /** +@@ -291,7 +314,8 @@ declare namespace hiSysEvent { + * @type { WatchRule[] } + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + rules: WatchRule[]; + +@@ -301,7 +325,8 @@ declare namespace hiSysEvent { + * @type { function } + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onEvent: (info: SysEventInfo) => void; + +@@ -311,7 +336,8 @@ declare namespace hiSysEvent { + * @type { function } + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onServiceDied: () => void; + } +@@ -322,7 +348,8 @@ declare namespace hiSysEvent { + * @interface QueryArg + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface QueryArg { + /** +@@ -331,7 +358,8 @@ declare namespace hiSysEvent { + * @type { number } + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + beginTime: number; + +@@ -341,7 +369,8 @@ declare namespace hiSysEvent { + * @type { number } + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + endTime: number; + +@@ -351,7 +380,8 @@ declare namespace hiSysEvent { + * @type { number } + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + maxEvents: number; + +@@ -361,7 +391,8 @@ declare namespace hiSysEvent { + * @type { ?number } + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + fromSeq?: number; + +@@ -371,7 +402,8 @@ declare namespace hiSysEvent { + * @type { ?number } + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + toSeq?: number; + } +@@ -382,7 +414,8 @@ declare namespace hiSysEvent { + * @interface QueryRule + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface QueryRule { + /** +@@ -391,7 +424,8 @@ declare namespace hiSysEvent { + * @type { string } + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + domain: string; + +@@ -401,7 +435,8 @@ declare namespace hiSysEvent { + * @type { string[] } + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + names: string[]; + +@@ -411,7 +446,8 @@ declare namespace hiSysEvent { + * @type { ?string } + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + condition?: string; + } +@@ -422,7 +458,8 @@ declare namespace hiSysEvent { + * @interface Querier + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Querier { + /** +@@ -431,7 +468,8 @@ declare namespace hiSysEvent { + * @type { function } + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onQuery: (infos: SysEventInfo[]) => void; + +@@ -441,7 +479,8 @@ declare namespace hiSysEvent { + * @type { function } + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onComplete: (reason: number, total: number) => void; + } +@@ -461,7 +500,8 @@ declare namespace hiSysEvent { + * @throws {BusinessError} 11200102 - The number of watch rules exceeds the limit. + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function addWatcher(watcher: Watcher): void; + +@@ -479,7 +519,8 @@ declare namespace hiSysEvent { + * @throws {BusinessError} 11200201 - The watcher does not exist. + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function removeWatcher(watcher: Watcher): void; + +@@ -502,7 +543,8 @@ declare namespace hiSysEvent { + * @throws {BusinessError} 11200304 - The query frequency exceeds the limit. + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function query(queryArg: QueryArg, rules: QueryRule[], querier: Querier): void; + +@@ -524,7 +566,8 @@ declare namespace hiSysEvent { + * @throws {BusinessError} 11200304 – The query frequency exceeds the limit. + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function exportSysEvents(queryArg: QueryArg, rules: QueryRule[]): number; + +@@ -544,7 +587,8 @@ declare namespace hiSysEvent { + * @throws {BusinessError} 11200302 - Invalid query rule. + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function subscribe(rules: QueryRule[]): number; + +@@ -561,7 +605,8 @@ declare namespace hiSysEvent { + * @throws {BusinessError} 11200305 – Unsubscription failed. + * @syscap SystemCapability.HiviewDFX.HiSysEvent + * @systemapi hide for inner use +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function unsubscribe(): void; + } +diff --git a/api/@ohos.hiTraceChain.d.ets b/api/@ohos.hiTraceChain.d.ets +deleted file mode 100644 +index 720a7bb6c..000000000 +--- a/api/@ohos.hiTraceChain.d.ets ++++ /dev/null +@@ -1,342 +0,0 @@ +-/* +- * Copyright (c) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-/** +- * @file +- * @kit PerformanceAnalysisKit +- */ +- +-/** +- * Provides APIs to implement call chain tracing throughout a service process. +- * With HiTrace, you can quickly obtain the run log for the call chain of a +- * specified service process and locate faults in cross-device, cross-process, +- * or cross-thread communications. +- * +- * @namespace hiTraceChain +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +-declare namespace hiTraceChain { +- /** +- * Enumerate trace flag +- * +- * @enum { number } +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- export enum HiTraceFlag { +- /** +- * Default value +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- DEFAULT = 0, +- +- /** +- * Trace sync and async call. default: trace sync call only. +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- INCLUDE_ASYNC = 1, +- +- /** +- * Do not create child span. default: create child span. +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- DONOT_CREATE_SPAN = 1 << 1, +- +- /** +- * Output tracepoint info in span. default: do not output tracepoint info. +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- TP_INFO = 1 << 2, +- +- /** +- * Do not output begin and end info. default: output begin and end info. +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- NO_BE_INFO = 1 << 3, +- +- /** +- * Do not add id to log. default: add id to log. +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- DISABLE_LOG = 1 << 4, +- +- /** +- * The trace is triggered by fault. +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- FAILURE_TRIGGER = 1 << 5, +- +- /** +- * Output device-to-device tracepoint info in span only. default: do not output device-to-device tracepoint info. +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- D2D_TP_INFO = 1 << 6 +- } +- +- /** +- * Enumerate trace point type +- * +- * @enum { number } +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- export enum HiTraceTracepointType { +- /** +- * Client send +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- CS = 0, +- +- /** +- * Client receive +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- CR = 1, +- +- /** +- * Server send +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- SS = 2, +- +- /** +- * Server receive +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- SR = 3, +- +- /** +- * General info +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- GENERAL = 4 +- } +- +- /** +- * Enumerate trace communication mode +- * +- * @enum { number } +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- export enum HiTraceCommunicationMode { +- /** +- * Unspecified +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- DEFAULT = 0, +- +- /** +- * Thread-to-thread +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- THREAD = 1, +- +- /** +- * Process-to-process +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- PROCESS = 2, +- +- /** +- * Device-to-device +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- DEVICE = 3 +- } +- +- /** +- * Trace id, for tracing process. +- * +- * @interface HiTraceId +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- export interface HiTraceId { +- /** +- * Chain id. +- * +- * @type { bigint } +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- chainId: bigint; +- +- /** +- * Span id. +- * +- * @type { ?number } +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- spanId?: number; +- +- /** +- * Parent span id. +- * +- * @type { ?number } +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- parentSpanId?: number; +- +- /** +- * Trace flag. +- * +- * @type { ?number } +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- flags?: number; +- } +- +- /** +- * Start tracing a process impl. +- * +- * @param { string } name Process name. +- * @param { number } flags Trace function flag. +- * @returns { HiTraceId } Valid if first call, otherwise invalid. +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- export function begin(name: string, flags?: number): HiTraceId; +- +- /** +- * Stop process tracing and clear trace id of current thread if the given trace +- * id is valid, otherwise do nothing. +- * +- * @param { HiTraceId } id The trace id that need to stop. +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- export function end(id: HiTraceId): void; +- +- /** +- * Get trace id of current thread, and return a invalid trace id if no +- * trace id belong to current thread +- * +- * @returns { HiTraceId } Valid if current thread have a trace id, otherwise invalid. +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- export function getId(): HiTraceId; +- +- /** +- * Set id as trace id of current thread. Do nothing if id is invalid. +- * +- * @param { HiTraceId } id Set id as trace id of current thread. +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- export function setId(id: HiTraceId): void; +- +- /** +- * Clear trace id of current thread and set it invalid. +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- export function clearId(): void; +- +- /** +- * Create a new span id according to the trace id of current thread. +- * +- * @returns { HiTraceId } A valid span trace id. Otherwise trace id of current thread if do not allow create span. +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- export function createSpan(): HiTraceId; +- +- /** +- * Print hitrace info, include trace id info. +- * +- * @param { HiTraceCommunicationMode } mode Trace communication mode. +- * @param { HiTraceTracepointType } type Trace info type. +- * @param { HiTraceId } id Trace id that need to print. +- * @param { string } msg Customized info that need to print. +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- export function tracepoint(mode: HiTraceCommunicationMode, +- type: HiTraceTracepointType, id: HiTraceId, msg?: string): void; +- +- /** +- * Judge whether the trace id is valid or not. +- * +- * @param { HiTraceId } id Trace id that need to judge. +- * @returns { boolean } True for a valid trace id, otherwise false. +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- export function isValid(id: HiTraceId): boolean; +- +- /** +- * Judge whether the trace id has enabled a trace flag or not. +- * +- * @param { HiTraceId } id Trace id that need to judge. +- * @param { HiTraceFlag } flag Trace flag that need to judge. +- * @returns { boolean } true if the trace id has enabled the flag. +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- export function isFlagEnabled(id: HiTraceId, flag: HiTraceFlag): boolean; +- +- /** +- * Enable the designative trace flag for the trace id. +- * +- * @param { HiTraceId } id Trace id that need to enable a flag. +- * @param { HiTraceFlag } flag the designative trace flag that need to be enabled in the trace id. +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- export function enableFlag(id: HiTraceId, flag: HiTraceFlag): void; +-} +- +-export default hiTraceChain; +diff --git a/api/@ohos.hiTraceChain.d.ts b/api/@ohos.hiTraceChain.d.ts +index 0e3c01da1..e10a356cd 100644 +--- a/api/@ohos.hiTraceChain.d.ts ++++ b/api/@ohos.hiTraceChain.d.ts +@@ -26,7 +26,8 @@ + * + * @namespace hiTraceChain + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace hiTraceChain { + /** +@@ -34,14 +35,16 @@ declare namespace hiTraceChain { + * + * @enum { number } + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum HiTraceFlag { + /** + * Default value + * + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DEFAULT = 0, + +@@ -49,7 +52,8 @@ declare namespace hiTraceChain { + * Trace sync and async call. default: trace sync call only. + * + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INCLUDE_ASYNC = 1, + +@@ -57,7 +61,8 @@ declare namespace hiTraceChain { + * Do not create child span. default: create child span. + * + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DONOT_CREATE_SPAN = 1 << 1, + +@@ -65,7 +70,8 @@ declare namespace hiTraceChain { + * Output tracepoint info in span. default: do not output tracepoint info. + * + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TP_INFO = 1 << 2, + +@@ -73,7 +79,8 @@ declare namespace hiTraceChain { + * Do not output begin and end info. default: output begin and end info. + * + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NO_BE_INFO = 1 << 3, + +@@ -81,7 +88,8 @@ declare namespace hiTraceChain { + * Do not add id to log. default: add id to log. + * + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DISABLE_LOG = 1 << 4, + +@@ -89,7 +97,8 @@ declare namespace hiTraceChain { + * The trace is triggered by fault. + * + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FAILURE_TRIGGER = 1 << 5, + +@@ -97,7 +106,8 @@ declare namespace hiTraceChain { + * Output device-to-device tracepoint info in span only. default: do not output device-to-device tracepoint info. + * + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + D2D_TP_INFO = 1 << 6 + } +@@ -107,14 +117,16 @@ declare namespace hiTraceChain { + * + * @enum { number } + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum HiTraceTracepointType { + /** + * Client send + * + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CS = 0, + +@@ -122,7 +134,8 @@ declare namespace hiTraceChain { + * Client receive + * + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CR = 1, + +@@ -130,7 +143,8 @@ declare namespace hiTraceChain { + * Server send + * + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SS = 2, + +@@ -138,7 +152,8 @@ declare namespace hiTraceChain { + * Server receive + * + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SR = 3, + +@@ -146,7 +161,8 @@ declare namespace hiTraceChain { + * General info + * + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + GENERAL = 4 + } +@@ -156,14 +172,16 @@ declare namespace hiTraceChain { + * + * @enum { number } + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum HiTraceCommunicationMode { + /** + * Unspecified + * + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DEFAULT = 0, + +@@ -171,7 +189,8 @@ declare namespace hiTraceChain { + * Thread-to-thread + * + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + THREAD = 1, + +@@ -179,7 +198,8 @@ declare namespace hiTraceChain { + * Process-to-process + * + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PROCESS = 2, + +@@ -187,7 +207,8 @@ declare namespace hiTraceChain { + * Device-to-device + * + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DEVICE = 3 + } +@@ -197,7 +218,8 @@ declare namespace hiTraceChain { + * + * @interface HiTraceId + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface HiTraceId { + /** +@@ -205,7 +227,8 @@ declare namespace hiTraceChain { + * + * @type { bigint } + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + chainId: bigint; + +@@ -214,7 +237,8 @@ declare namespace hiTraceChain { + * + * @type { ?number } + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + spanId?: number; + +@@ -223,7 +247,8 @@ declare namespace hiTraceChain { + * + * @type { ?number } + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + parentSpanId?: number; + +@@ -232,7 +257,8 @@ declare namespace hiTraceChain { + * + * @type { ?number } + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + flags?: number; + } +@@ -244,7 +270,8 @@ declare namespace hiTraceChain { + * @param { number } flags Trace function flag. + * @returns { HiTraceId } Valid if first call, otherwise invalid. + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function begin(name: string, flags?: number): HiTraceId; + +@@ -254,7 +281,8 @@ declare namespace hiTraceChain { + * + * @param { HiTraceId } id The trace id that need to stop. + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function end(id: HiTraceId): void; + +@@ -264,7 +292,8 @@ declare namespace hiTraceChain { + * + * @returns { HiTraceId } Valid if current thread have a trace id, otherwise invalid. + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getId(): HiTraceId; + +@@ -273,7 +302,8 @@ declare namespace hiTraceChain { + * + * @param { HiTraceId } id Set id as trace id of current thread. + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setId(id: HiTraceId): void; + +@@ -281,7 +311,8 @@ declare namespace hiTraceChain { + * Clear trace id of current thread and set it invalid. + * + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function clearId(): void; + +@@ -290,7 +321,8 @@ declare namespace hiTraceChain { + * + * @returns { HiTraceId } A valid span trace id. Otherwise trace id of current thread if do not allow create span. + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function createSpan(): HiTraceId; + +@@ -302,7 +334,8 @@ declare namespace hiTraceChain { + * @param { HiTraceId } id Trace id that need to print. + * @param { string } msg Customized info that need to print. + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function tracepoint(mode: HiTraceCommunicationMode, type: HiTraceTracepointType, id: HiTraceId, msg?: string): void; + +@@ -312,7 +345,8 @@ declare namespace hiTraceChain { + * @param { HiTraceId } id Trace id that need to judge. + * @returns { boolean } True for a valid trace id, otherwise false. + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isValid(id: HiTraceId): boolean; + +@@ -323,7 +357,8 @@ declare namespace hiTraceChain { + * @param { HiTraceFlag } flag Trace flag that need to judge. + * @returns { boolean } true if the trace id has enabled the flag. + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isFlagEnabled(id: HiTraceId, flag: HiTraceFlag): boolean; + +@@ -333,7 +368,8 @@ declare namespace hiTraceChain { + * @param { HiTraceId } id Trace id that need to enable a flag. + * @param { HiTraceFlag } flag the designative trace flag that need to be enabled in the trace id. + * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function enableFlag(id: HiTraceId, flag: HiTraceFlag): void; + } +diff --git a/api/@ohos.hiTraceMeter.d.ets b/api/@ohos.hiTraceMeter.d.ets +deleted file mode 100644 +index 86bab093e..000000000 +--- a/api/@ohos.hiTraceMeter.d.ets ++++ /dev/null +@@ -1,308 +0,0 @@ +-/* +- * Copyright (C) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-/** +- * @file +- * @kit PerformanceAnalysisKit +- */ +- +-/** +- * Provides interfaces to trace a task for performance measure, the logs can be capture by the +- * bytrace cmdline available on the device. +- * +- *

    This interfaces trace the start, end, and value changes of key processes that last for at least 3 ms. +- * +- *

    Example: +- * Track the beginning of a context: +- *

    {@code
    +- * hiTraceMeter.startTrace("checkName", 111);
    +- * }
    +- * Track the end of a context: +- *
    {@code
    +- * hiTraceMeter.finishTrace("checkName", 111);
    +- * }
    +- * To trace the number of layers, which is 3: +- *
    {@code
    +- * hiTraceMeter.traceByValue("curLayer", 3);
    +- * }
    +- * +- *

    Each {@code startTrace} matches one {@code finishTrace}, and they must have the same name +- * and taskId. +- * +- * @namespace hiTraceMeter +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +-/** +- * Provides interfaces to trace a task for performance measure, the logs can be capture by the +- * hitrace cmdline on the device. +- * +- *

    This interfaces trace the start, end, and value changes of key processes that last for at least 3 ms. +- * +- *

    Example: +- * Track the beginning of a context: +- *

    {@code
    +- * hiTraceMeter.startAsyncTrace(hiTraceMeter.HiTraceOutputLevel.COMMERCIAL, "checkName", 111, "test", "key=value");
    +- * }
    +- * Track the end of a context: +- *
    {@code
    +- * hiTraceMeter.finishAsyncTrace(hiTraceMeter.HiTraceOutputLevel.COMMERCIAL, "checkName", 111);
    +- * }
    +- * To trace the number of layers, which is 3: +- *
    {@code
    +- * hiTraceMeter.traceByValue(hiTraceMeter.HiTraceOutputLevel.COMMERCIAL, "curLayer", 3);
    +- * }
    +- * +- *

    Each {@code startTrace} matches one {@code finishTrace}, and they must have the same name +- * and taskId. +- * +- *

    Each {@code startSyncTrace} matches one {@code finishSyncTrace}, and they must have the same +- * level and name. +- * +- *

    Each {@code startAsyncTrace} matches one {@code finishAsyncTrace}, and they must have the same +- * level, name and taskId. +- * +- * @namespace hiTraceMeter +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @atomicservice +- * @since 19 +- */ +-declare namespace hiTraceMeter { +- +- /** +- * Enumerates the HiTrace output levels. The output level threshold system parameter determines +- * the minimum output trace. +- * +- * @enum { number } +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @atomicservice +- * @since 19 +- */ +- export enum HiTraceOutputLevel { +- /** +- * Ouput level only for debug usage. +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @atomicservice +- * @since 19 +- */ +- DEBUG = 0, +- +- /** +- * Output level for log version usage. +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @atomicservice +- * @since 19 +- */ +- INFO = 1, +- +- /** +- * Output level for log version usage, with higher priority than INFO. +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @atomicservice +- * @since 19 +- */ +- CRITICAL = 2, +- +- /** +- * Output level for nolog version usage. +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @atomicservice +- * @since 19 +- */ +- COMMERCIAL = 3, +- +- /** +- * Output level range limit. +- * +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @atomicservice +- * @since 19 +- */ +- MAX = 3 +- } +- +- /** +- * Records a trace marking it as the start of a task, can with the expected completion time between +- * startTrace and finishTrace. +- * +- * This method is invoked at the start of a transaction to indicate that a task has started, whose name +- * is specified by {@code name}, and the taskId is used to distinguish the tasks. It must be followed by +- * {@link #finishTrace}, the name and taskId need to be the same. +- * +- * @param { string } name Indicates the task name. +- * @param { number } taskId The unique id used to distinguish the tasks and match with the id in follow finishTrace. +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- /** +- * Records a trace marking it as the start of a task, can with the expected completion time between +- * startTrace and finishTrace. +- * +- * This method is invoked at the start of a transaction to indicate that a task has started, whose name +- * is specified by {@code name}, and the taskId is used to distinguish the tasks. It must be followed by +- * {@link #finishTrace}, the name and taskId need to be the same. +- * +- * @param { string } name Indicates the task name. +- * @param { number } taskId The unique id used to distinguish the tasks and match with the id in follow finishTrace. +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @atomicservice +- * @since 19 +- */ +- export function startTrace(name: string, taskId: number): void; +- +- /** +- * Records a trace and marks it as the end of a task. +- * +- * This method is invoked at the end of a transaction to indicate that a task has ended, whose name +- * is specified by {@code name}. This method must be invoked after the the startTrace. +- * +- * @param { string } name Indicates the task name. It must be the same with the {@code name} of startTrace. +- * @param { number } taskId The unique id used to distinguish the tasks and must be the same with the . +- * {@code taskId} of startTrace. +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- /** +- * Records a trace and marks it as the end of a task. +- * +- * This method is invoked at the end of a transaction to indicate that a task has ended, whose name +- * is specified by {@code name}. This method must be invoked after {@link #startTrace}. +- * +- * @param { string } name Indicates the task name. It must be the same with the {@code name} of startTrace. +- * @param { number } taskId The unique id used to distinguish the tasks and must be the same with the +- * {@code taskId} of startTrace. +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @atomicservice +- * @since 19 +- */ +- export function finishTrace(name: string, taskId: number): void; +- +- /** +- * Records a trace for generating a count, such as clock pulse and the number of layers. +- * +- * @param { string } name Indicates the name used to identify the count. +- * @param { number } count Indicates the number of the count. +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @since 8 +- */ +- /** +- * Records a trace for generating a count, such as clock pulse and the number of layers. +- * +- * @param { string } name Indicates the name used to identify the count. +- * @param { number } count Indicates the number of the count. +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @atomicservice +- * @since 19 +- */ +- export function traceByValue(name: string, count: number): void; +- +- /** +- * Records a trace marking it as the start of a task. +- * +- * This method is invoked at the start of a transaction to indicate that a task has started, whose name +- * is specified by {@code name}, and the taskId is used to distinguish the tasks. It must be followed by +- * {@link #finishSyncTrace}, called by the same thread with the same level. +- * +- * @param { HiTraceOutputLevel } level Indicates trace output priority level. +- * @param { string } name Indicates the task name. +- * @param { string } customArgs Indicates key=value pair to be output in trace; multiple pairs should use comma +- * as separator. +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @atomicservice +- * @since 19 +- */ +- export function startSyncTrace(level: HiTraceOutputLevel, name: string, customArgs?: string): void; +- +- /** +- * Records a trace and marks it as the end of a task. +- * +- * This method is invoked at the end of a transaction to indicate that the nearest running task tracked by +- * startSyncTrace that has yet to be marked by finishSyncTrace, has ended. +- * This method must be invoked after {@link #startSyncTrace}, called by the same thread with the same level. +- * +- * @param { HiTraceOutputLevel } level Indicates trace output priority level. +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @atomicservice +- * @since 19 +- */ +- export function finishSyncTrace(level: HiTraceOutputLevel): void; +- +- /** +- * Records a trace marking it as the start of a task. +- * +- * This method is invoked at the start of a transaction to indicate that a task has started, whose name +- * is specified by {@code name}, and the taskId is used to distinguish the tasks. It must be followed by a +- * corresponding {@link #finishAsyncTrace}, with the same level, name, and taskId. +- * +- * @param { HiTraceOutputLevel } level Indicates trace output priority level. +- * @param { string } name Indicates the task name. +- * @param { number } taskId The unique id used to distinguish the task and match with the id of the +- * corresponding finishAsyncTrace. +- * @param { string } customCategory Indicates the label to aggregate asynchronous task display. +- * @param { string } customArgs Indicates key=value pair to be output in trace; multiple pairs should use comma +- * as Separator. +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @atomicservice +- * @since 19 +- */ +- export function startAsyncTrace(level: HiTraceOutputLevel, name: string, taskId: number, customCategory: string, +- customArgs?: string): void; +- +- /** +- * Records a trace and marks it as the end of a task. +- * +- * This method is invoked at the end of a transaction to indicate that a task has ended, whose name is specified +- * by {@code name}. This method must be invoked after {@link #startAsyncTrace}, with the same level, name, +- * and taskId. It is not required to be invoked by the same thread calling startAsyncTrace. +- * +- * @param { HiTraceOutputLevel } level Indicates trace output priority level. +- * @param { string } name Indicates the task name. +- * @param { number } taskId The unique id used to distinguish the task and match with the id of the corresponding +- * startAsyncTrace. +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @atomicservice +- * @since 19 +- */ +- export function finishAsyncTrace(level: HiTraceOutputLevel, name: string, taskId: number): void; +- +- /** +- * Records a trace for generating a count, such as clock pulse and the number of layers. +- * +- * @param { HiTraceOutputLevel } level Indicates trace output priority level. +- * @param { string } name Indicates the name used to identify the count. +- * @param { number } count Indicates the number of the count. +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @atomicservice +- * @since 19 +- */ +- export function traceByValue(level: HiTraceOutputLevel, name: string, count: number): void; +- +- /** +- * Return whether the current process is allowed to output trace. +- * +- * @returns { boolean } The status of whether the current process is allowed to output trace. +- * @syscap SystemCapability.HiviewDFX.HiTrace +- * @atomicservice +- * @since 19 +- */ +- export function isTraceEnabled(): boolean; +- +-} +- +-export default hiTraceMeter; +\ No newline at end of file +diff --git a/api/@ohos.hiTraceMeter.d.ts b/api/@ohos.hiTraceMeter.d.ts +index a203466d0..6b1a88c15 100644 +--- a/api/@ohos.hiTraceMeter.d.ts ++++ b/api/@ohos.hiTraceMeter.d.ts +@@ -47,41 +47,95 @@ + */ + /** + * Provides interfaces to trace a task for performance measure, the logs can be capture by the +- * bytrace cmdline available on the device. ++ * hitrace cmdline on the device. + * + *

    This interfaces trace the start, end, and value changes of key processes that last for at least 3 ms. + * + *

    Example: + * Track the beginning of a context: + *

    {@code
    +- * hiTraceMeter.startTrace("checkName", 111);
    ++ * hiTraceMeter.startAsyncTrace(hiTraceMeter.HiTraceOutputLevel.COMMERCIAL, "checkName", 111, "test", "key=value");
    +  * }
    + * Track the end of a context: + *
    {@code
    +- * hiTraceMeter.finishTrace("checkName", 111);
    ++ * hiTraceMeter.finishAsyncTrace(hiTraceMeter.HiTraceOutputLevel.COMMERCIAL, "checkName", 111);
    +  * }
    + * To trace the number of layers, which is 3: + *
    {@code
    +- * hiTraceMeter.traceByValue("curLayer", 3);
    ++ * hiTraceMeter.traceByValue(hiTraceMeter.HiTraceOutputLevel.COMMERCIAL, "curLayer", 3);
    ++ * }
    ++ * ++ *

    Each {@code startTrace} matches one {@code finishTrace}, and they must have the same name ++ * and taskId. ++ * ++ *

    Each {@code startSyncTrace} matches one {@code finishSyncTrace}, and they must have the same ++ * level and name. ++ * ++ *

    Each {@code startAsyncTrace} matches one {@code finishAsyncTrace}, and they must have the same ++ * level, name and taskId. ++ * ++ * @namespace hiTraceMeter ++ * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @atomicservice ++ * @since 19 ++ */ ++/** ++ * Provides interfaces to trace a task for performance measure, the logs can be capture by the ++ * hitrace cmdline on the device. ++ * ++ *

    This interfaces trace the start, end, and value changes of key processes that last for at least 3 ms. ++ * ++ *

    Example: ++ * Track the beginning of a context: ++ *

    {@code
    ++ * hiTraceMeter.startAsyncTrace(hiTraceMeter.HiTraceOutputLevel.COMMERCIAL, "checkName", 111, "test", "key=value");
    ++ * }
    ++ * Track the end of a context: ++ *
    {@code
    ++ * hiTraceMeter.finishAsyncTrace(hiTraceMeter.HiTraceOutputLevel.COMMERCIAL, "checkName", 111);
    ++ * }
    ++ * To trace the number of layers, which is 3: ++ *
    {@code
    ++ * hiTraceMeter.traceByValue(hiTraceMeter.HiTraceOutputLevel.COMMERCIAL, "curLayer", 3);
    +  * }
    + * + *

    Each {@code startTrace} matches one {@code finishTrace}, and they must have the same name + * and taskId. + * ++ *

    Each {@code startSyncTrace} matches one {@code finishSyncTrace}, and they must have the same ++ * level and name. ++ * ++ *

    Each {@code startAsyncTrace} matches one {@code finishAsyncTrace}, and they must have the same ++ * level, name and taskId. ++ * + * @namespace hiTraceMeter + * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @crossplatform + * @atomicservice +- * @since 18 ++ * @since 20 ++ * @arkts 1.1&1.2 + */ + declare namespace hiTraceMeter { + + /** +- * Enumerates the HiTrace output levels. The output level threshold system parameter determines the minimum output trace. ++ * Enumerates the HiTrace output levels. The output level threshold system parameter determines ++ * the minimum output trace. ++ * ++ * @enum { number } ++ * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @atomicservice ++ * @since 19 ++ */ ++ /** ++ * Enumerates the HiTrace output levels. The output level threshold system parameter determines ++ * the minimum output trace. + * + * @enum { number } + * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @crossplatform + * @atomicservice +- * @since 18 ++ * @since 20 ++ * @arkts 1.1&1.2 + */ + enum HiTraceOutputLevel { + /** +@@ -89,34 +143,70 @@ declare namespace hiTraceMeter { + * + * @syscap SystemCapability.HiviewDFX.HiTrace + * @atomicservice +- * @since 18 ++ * @since 19 ++ */ ++ /** ++ * Ouput level only for debug usage. ++ * ++ * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.1&1.2 + */ + DEBUG = 0, + + /** +- * Output level for beta version usage. ++ * Output level for log version usage. ++ * ++ * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @atomicservice ++ * @since 19 ++ */ ++ /** ++ * Output level for log version usage. + * + * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @crossplatform + * @atomicservice +- * @since 18 ++ * @since 20 ++ * @arkts 1.1&1.2 + */ + INFO = 1, + + /** +- * Output level for beta version usage, with higher priority than INFO. ++ * Output level for log version usage, with higher priority than INFO. ++ * ++ * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @atomicservice ++ * @since 19 ++ */ ++ /** ++ * Output level for log version usage, with higher priority than INFO. + * + * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @crossplatform + * @atomicservice +- * @since 18 ++ * @since 20 ++ * @arkts 1.1&1.2 + */ + CRITICAL = 2, + + /** +- * Output level for commercial version usage. ++ * Output level for nolog version usage. ++ * ++ * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @atomicservice ++ * @since 19 ++ */ ++ /** ++ * Output level for nolog version usage. + * + * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @crossplatform + * @atomicservice +- * @since 18 ++ * @since 20 ++ * @arkts 1.1&1.2 + */ + COMMERCIAL = 3, + +@@ -125,7 +215,16 @@ declare namespace hiTraceMeter { + * + * @syscap SystemCapability.HiviewDFX.HiTrace + * @atomicservice +- * @since 18 ++ * @since 19 ++ */ ++ /** ++ * Output level range limit. ++ * ++ * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.1&1.2 + */ + MAX = COMMERCIAL + } +@@ -155,7 +254,23 @@ declare namespace hiTraceMeter { + * @param { number } taskId The unique id used to distinguish the tasks and match with the id in follow finishTrace. + * @syscap SystemCapability.HiviewDFX.HiTrace + * @atomicservice +- * @since 18 ++ * @since 19 ++ */ ++ /** ++ * Records a trace marking it as the start of a task, can with the expected completion time between ++ * startTrace and finishTrace. ++ * ++ * This method is invoked at the start of a transaction to indicate that a task has started, whose name ++ * is specified by {@code name}, and the taskId is used to distinguish the tasks. It must be followed by ++ * {@link #finishTrace}, the name and taskId need to be the same. ++ * ++ * @param { string } name Indicates the task name. ++ * @param { number } taskId The unique id used to distinguish the tasks and match with the id in follow finishTrace. ++ * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.1&1.2 + */ + function startTrace(name: string, taskId: number): void; + +@@ -175,14 +290,29 @@ declare namespace hiTraceMeter { + * Records a trace and marks it as the end of a task. + * + * This method is invoked at the end of a transaction to indicate that a task has ended, whose name +- * is specified by {@code name}. This method must be invoked after the the startTrace. ++ * is specified by {@code name}. This method must be invoked after {@link #startTrace}. + * + * @param { string } name Indicates the task name. It must be the same with the {@code name} of startTrace. +- * @param { number } taskId The unique id used to distinguish the tasks and must be the same with the . ++ * @param { number } taskId The unique id used to distinguish the tasks and must be the same with the + * {@code taskId} of startTrace. + * @syscap SystemCapability.HiviewDFX.HiTrace + * @atomicservice +- * @since 18 ++ * @since 19 ++ */ ++ /** ++ * Records a trace and marks it as the end of a task. ++ * ++ * This method is invoked at the end of a transaction to indicate that a task has ended, whose name ++ * is specified by {@code name}. This method must be invoked after {@link #startTrace}. ++ * ++ * @param { string } name Indicates the task name. It must be the same with the {@code name} of startTrace. ++ * @param { number } taskId The unique id used to distinguish the tasks and must be the same with the ++ * {@code taskId} of startTrace. ++ * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.1&1.2 + */ + function finishTrace(name: string, taskId: number): void; + +@@ -201,7 +331,18 @@ declare namespace hiTraceMeter { + * @param { number } count Indicates the number of the count. + * @syscap SystemCapability.HiviewDFX.HiTrace + * @atomicservice +- * @since 18 ++ * @since 19 ++ */ ++ /** ++ * Records a trace for generating a count, such as clock pulse and the number of layers. ++ * ++ * @param { string } name Indicates the name used to identify the count. ++ * @param { number } count Indicates the number of the count. ++ * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.1&1.2 + */ + function traceByValue(name: string, count: number): void; + +@@ -214,11 +355,28 @@ declare namespace hiTraceMeter { + * + * @param { HiTraceOutputLevel } level Indicates trace output priority level. + * @param { string } name Indicates the task name. +- * @param { string } customArgs Indicates key=value pair to be outputed in trace; multiple pairs should use comma +- * as seperator. ++ * @param { string } [customArgs] Indicates key=value pair to be output in trace; multiple pairs should use comma ++ * as separator. ++ * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @atomicservice ++ * @since 19 ++ */ ++ /** ++ * Records a trace marking it as the start of a task. ++ * ++ * This method is invoked at the start of a transaction to indicate that a task has started, whose name ++ * is specified by {@code name}, and the taskId is used to distinguish the tasks. It must be followed by ++ * {@link #finishSyncTrace}, called by the same thread with the same level. ++ * ++ * @param { HiTraceOutputLevel } level Indicates trace output priority level. ++ * @param { string } name Indicates the task name. ++ * @param { string } [customArgs] Indicates key=value pair to be output in trace; multiple pairs should use comma ++ * as separator. + * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @crossplatform + * @atomicservice +- * @since 18 ++ * @since 20 ++ * @arkts 1.1&1.2 + */ + function startSyncTrace(level: HiTraceOutputLevel, name: string, customArgs?: string): void; + +@@ -227,12 +385,26 @@ declare namespace hiTraceMeter { + * + * This method is invoked at the end of a transaction to indicate that the nearest running task tracked by + * startSyncTrace that has yet to be marked by finishSyncTrace, has ended. +- * This method must be invoked after the the {@link #startSyncTrace}, by the same thread. ++ * This method must be invoked after {@link #startSyncTrace}, called by the same thread with the same level. ++ * ++ * @param { HiTraceOutputLevel } level Indicates trace output priority level. ++ * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @atomicservice ++ * @since 19 ++ */ ++ /** ++ * Records a trace and marks it as the end of a task. ++ * ++ * This method is invoked at the end of a transaction to indicate that the nearest running task tracked by ++ * startSyncTrace that has yet to be marked by finishSyncTrace, has ended. ++ * This method must be invoked after {@link #startSyncTrace}, called by the same thread with the same level. + * + * @param { HiTraceOutputLevel } level Indicates trace output priority level. + * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @crossplatform + * @atomicservice +- * @since 18 ++ * @since 20 ++ * @arkts 1.1&1.2 + */ + function finishSyncTrace(level: HiTraceOutputLevel): void; + +@@ -245,28 +417,69 @@ declare namespace hiTraceMeter { + * + * @param { HiTraceOutputLevel } level Indicates trace output priority level. + * @param { string } name Indicates the task name. +- * @param { number } taskId The unique id used to distinguish the task and match with the id of the corresponding finishAsyncTrace. ++ * @param { number } taskId The unique id used to distinguish the task and match with the id of the ++ * corresponding finishAsyncTrace. + * @param { string } customCategory Indicates the label to aggregate asynchronous task display. +- * @param { string } customArgs Indicates key=value pair to be outputed in trace; multiple pairs should use comma as seperator. ++ * @param { string } [customArgs] Indicates key=value pair to be output in trace; multiple pairs should use comma ++ * as Separator. + * @syscap SystemCapability.HiviewDFX.HiTrace + * @atomicservice +- * @since 18 ++ * @since 19 + */ +- function startAsyncTrace(level: HiTraceOutputLevel, name: string, taskId: number, customCategory: string, customArgs?: string): void; ++ /** ++ * Records a trace marking it as the start of a task. ++ * ++ * This method is invoked at the start of a transaction to indicate that a task has started, whose name ++ * is specified by {@code name}, and the taskId is used to distinguish the tasks. It must be followed by a ++ * corresponding {@link #finishAsyncTrace}, with the same level, name, and taskId. ++ * ++ * @param { HiTraceOutputLevel } level Indicates trace output priority level. ++ * @param { string } name Indicates the task name. ++ * @param { number } taskId The unique id used to distinguish the task and match with the id of the ++ * corresponding finishAsyncTrace. ++ * @param { string } customCategory Indicates the label to aggregate asynchronous task display. ++ * @param { string } [customArgs] Indicates key=value pair to be output in trace; multiple pairs should use comma ++ * as Separator. ++ * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.1&1.2 ++ */ ++ function startAsyncTrace(level: HiTraceOutputLevel, name: string, taskId: number, customCategory: string, ++ customArgs?: string): void; + + /** + * Records a trace and marks it as the end of a task. + * + * This method is invoked at the end of a transaction to indicate that a task has ended, whose name is specified +- * by {@code name}. This method must be invoked after the the {@link #startAsyncTrace}, with the same level, name, and taskId. +- * It is not required to be invoked by the same thread calling startAsyncTrace. ++ * by {@code name}. This method must be invoked after {@link #startAsyncTrace}, with the same level, name, ++ * and taskId. It is not required to be invoked by the same thread calling startAsyncTrace. + * + * @param { HiTraceOutputLevel } level Indicates trace output priority level. + * @param { string } name Indicates the task name. +- * @param { number } taskId The unique id used to distinguish the task and match with the id of the corresponding startAsyncTrace. ++ * @param { number } taskId The unique id used to distinguish the task and match with the id of the corresponding ++ * startAsyncTrace. + * @syscap SystemCapability.HiviewDFX.HiTrace + * @atomicservice +- * @since 18 ++ * @since 19 ++ */ ++ /** ++ * Records a trace and marks it as the end of a task. ++ * ++ * This method is invoked at the end of a transaction to indicate that a task has ended, whose name is specified ++ * by {@code name}. This method must be invoked after {@link #startAsyncTrace}, with the same level, name, ++ * and taskId. It is not required to be invoked by the same thread calling startAsyncTrace. ++ * ++ * @param { HiTraceOutputLevel } level Indicates trace output priority level. ++ * @param { string } name Indicates the task name. ++ * @param { number } taskId The unique id used to distinguish the task and match with the id of the corresponding ++ * startAsyncTrace. ++ * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.1&1.2 + */ + function finishAsyncTrace(level: HiTraceOutputLevel, name: string, taskId: number): void; + +@@ -278,7 +491,19 @@ declare namespace hiTraceMeter { + * @param { number } count Indicates the number of the count. + * @syscap SystemCapability.HiviewDFX.HiTrace + * @atomicservice +- * @since 18 ++ * @since 19 ++ */ ++ /** ++ * Records a trace for generating a count, such as clock pulse and the number of layers. ++ * ++ * @param { HiTraceOutputLevel } level Indicates trace output priority level. ++ * @param { string } name Indicates the name used to identify the count. ++ * @param { number } count Indicates the number of the count. ++ * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.1&1.2 + */ + function traceByValue(level: HiTraceOutputLevel, name: string, count: number): void; + +@@ -288,10 +513,19 @@ declare namespace hiTraceMeter { + * @returns { boolean } The status of whether the current process is allowed to output trace. + * @syscap SystemCapability.HiviewDFX.HiTrace + * @atomicservice +- * @since 18 ++ * @since 19 ++ */ ++ /** ++ * Return whether the current process is allowed to output trace. ++ * ++ * @returns { boolean } The status of whether the current process is allowed to output trace. ++ * @syscap SystemCapability.HiviewDFX.HiTrace ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.1&1.2 + */ + function isTraceEnabled(): boolean; +- + } + + export default hiTraceMeter; +diff --git a/api/@ohos.hichecker.d.ets b/api/@ohos.hichecker.d.ets +deleted file mode 100644 +index cd96d7e8c..000000000 +--- a/api/@ohos.hichecker.d.ets ++++ /dev/null +@@ -1,157 +0,0 @@ +-/* +- * Copyright (c) 2022 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-/** +- * @file +- * @kit PerformanceAnalysisKit +- */ +- +-/** +- * This module provides the capability to check bad code usage. +- * +- * @namespace hichecker +- * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 8 +- */ +-declare namespace hichecker { +- /** +- * The caution rule print log. +- * +- * @constant +- * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 8 +- */ +- const RULE_CAUTION_PRINT_LOG: bigint = 9223372036854775808n; // 1 << 63 +- +- /** +- * The caution rule trigger crash. +- * +- * @constant +- * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 8 +- */ +- const RULE_CAUTION_TRIGGER_CRASH: bigint = 4611686018427387904n; // 1 << 62 +- +- /** +- * The thread rule check slow process. +- * +- * @constant +- * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 8 +- */ +- const RULE_THREAD_CHECK_SLOW_PROCESS: bigint = 1n; +- +- /** +- * The process rule check slow event. +- * +- * @constant +- * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 20 +- */ +- const RULE_CHECK_SLOW_EVENT: bigint = 4294967296n; // 1 << 32 +- +- /** +- * The process rule check ability connection leak. +- * +- * @constant +- * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 8 +- */ +- const RULE_CHECK_ABILITY_CONNECTION_LEAK: bigint = 8589934592n; // 1 << 33 +- +- /** +- * The process rule check ability Arkui performance +- * +- * @constant +- * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 11 +- */ +- const RULE_CHECK_ARKUI_PERFORMANCE: bigint = 17179869184n; // 1 << 34 +- +- /** +- * add one or more rule. +- * +- * @param { bigint } rule +- * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 8 +- * @deprecated since 9 +- * @useinstead ohos.hichecker/hichecker#addCheckRule +- */ +- function addRule(rule: bigint): void; +- +- /** +- * remove one or more rule. +- * +- * @param { bigint } rule +- * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 8 +- * @deprecated since 9 +- * @useinstead ohos.hichecker/hichecker#removeCheckRule +- */ +- function removeRule(rule: bigint): void; +- +- /** +- * get added rule +- * +- * @returns { bigint } all added thread rule and process rule. +- * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 8 +- */ +- function getRule(): bigint; +- +- /** +- * whether the query rule is added +- * +- * @param { bigint } rule +- * @returns { boolean } the result of whether the query rule is added. +- * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 8 +- * @deprecated since 9 +- * @useinstead ohos.hichecker/hichecker#containsCheckRule +- */ +- function contains(rule: bigint): boolean; +- +- /** +- * Add one or more rule. +- * +- * @param { bigint } rule +- * @throws { BusinessError } 401 - the parameter check failed, only one bigint type parameter is needed +- * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 9 +- */ +- function addCheckRule(rule: bigint): void; +- +- /** +- * Remove one or more rule. +- * +- * @param { bigint } rule +- * @throws { BusinessError } 401 - the parameter check failed, only one bigint type parameter is needed +- * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 9 +- */ +- function removeCheckRule(rule: bigint): void; +- +- /** +- * Whether the query rule is added +- * +- * @param { bigint } rule +- * @returns { boolean } the result of whether the query rule is added. +- * @throws { BusinessError } 401 - the parameter check failed, only one bigint type parameter is needed +- * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 9 +- */ +- function containsCheckRule(rule: bigint): boolean; +-} +-export default hichecker; +diff --git a/api/@ohos.hichecker.d.ts b/api/@ohos.hichecker.d.ts +index 22e2a89fd..ca1a68ee5 100644 +--- a/api/@ohos.hichecker.d.ts ++++ b/api/@ohos.hichecker.d.ts +@@ -23,7 +23,8 @@ + * + * @namespace hichecker + * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace hichecker { + /** +@@ -31,45 +32,50 @@ declare namespace hichecker { + * + * @constant + * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- const RULE_CAUTION_PRINT_LOG: 9223372036854775808n; // 1 << 63 ++ const RULE_CAUTION_PRINT_LOG = 9223372036854775808n; // 1 << 63 + + /** + * The caution rule trigger crash. + * + * @constant + * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- const RULE_CAUTION_TRIGGER_CRASH: 4611686018427387904n; // 1 << 62 ++ const RULE_CAUTION_TRIGGER_CRASH = 4611686018427387904n; // 1 << 62 + + /** + * The thread rule check slow process. + * + * @constant + * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- const RULE_THREAD_CHECK_SLOW_PROCESS: 1n; ++ const RULE_THREAD_CHECK_SLOW_PROCESS = 1n; + + /** + * The process rule check ability connection leak. + * + * @constant + * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- const RULE_CHECK_ABILITY_CONNECTION_LEAK: 8589934592n; // 1 << 33 ++ const RULE_CHECK_ABILITY_CONNECTION_LEAK = 8589934592n; // 1 << 33 + + /** + * The process rule check ability Arkui performance + * + * @constant + * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- const RULE_CHECK_ARKUI_PERFORMANCE: 17179869184n; // 1 << 34 ++ const RULE_CHECK_ARKUI_PERFORMANCE = 17179869184n; // 1 << 34 + + /** + * add one or more rule. +@@ -98,7 +104,8 @@ declare namespace hichecker { + * + * @returns { bigint } all added thread rule and process rule. + * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getRule(): bigint; + +@@ -120,7 +127,8 @@ declare namespace hichecker { + * @param { bigint } rule + * @throws { BusinessError } 401 - the parameter check failed, only one bigint type parameter is needed + * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function addCheckRule(rule: bigint): void; + +@@ -130,7 +138,8 @@ declare namespace hichecker { + * @param { bigint } rule + * @throws { BusinessError } 401 - the parameter check failed, only one bigint type parameter is needed + * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function removeCheckRule(rule: bigint): void; + +@@ -141,7 +150,8 @@ declare namespace hichecker { + * @returns { boolean } the result of whether the query rule is added. + * @throws { BusinessError } 401 - the parameter check failed, only one bigint type parameter is needed + * @syscap SystemCapability.HiviewDFX.HiChecker +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function containsCheckRule(rule: bigint): boolean; + } +diff --git a/api/@ohos.hidebug.d.ets b/api/@ohos.hidebug.d.ets +deleted file mode 100644 +index 543c7ded1..000000000 +--- a/api/@ohos.hidebug.d.ets ++++ /dev/null +@@ -1,601 +0,0 @@ +-/* +-* Copyright (C) 2025 Huawei Device Co., Ltd. +-* Licensed under the Apache License, Version 2.0 (the "License"); +-* you may not use this file except in compliance with the License. +-* You may obtain a copy of the License at +-* +-* http://www.apache.org/licenses/LICENSE-2.0 +-* +-* Unless required by applicable law or agreed to in writing, software +-* distributed under the License is distributed on an "AS IS" BASIS, +-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-* See the License for the specific language governing permissions and +-* limitations under the License. +-*/ +- +-/** +- * @file +- * @kit PerformanceAnalysisKit +- */ +- +-/** +- * Provide interfaces related to debugger access and obtaining CPU, +- * memory and other virtual machine information during runtime for JS programs +- * +- * @namespace hidebug +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- +-/** +- * Provide interfaces related to debugger access and obtaining CPU, +- * memory and other virtual machine information during runtime for JS programs +- * +- * @namespace hidebug +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @atomicservice +- * @since 20 +- */ +- +-declare namespace hidebug { +- /** +- * Get total native heap memory size +- * +- * @returns { bigint } Returns total native heap memory size. +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- export function getNativeHeapSize(): bigint; +- +- /** +- * Get Native heap memory allocation size. +- * @returns { bigint } Returns native heap memory allocation size. +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- export function getNativeHeapAllocatedSize(): bigint; +- +- /** +- * Get Native heap memory free size +- * +- * @returns { bigint } Returns native heap memory free size. +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- export function getNativeHeapFreeSize(): bigint; +- +- /** +- * Get the virtual set size memory of the application process +- * +- * @returns { bigint } Returns application process virtual set size memory information. +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- export function getVss(): bigint; +- +- /** +- * Get application process proportional set size memory information +- * +- * @returns { bigint } Returns application process proportional set size memory information. +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- export function getPss(): bigint; +- +- /** +- * Obtains the size of the shared dirty memory of a process. +- * +- * @returns { bigint } Returns the size of the shared dirty memory. +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- export function getSharedDirty(): bigint; +- +- /** +- * Obtains the size of the private dirty memory of a process. +- * @returns { bigint } Returns the size of the private dirty memory. +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- export function getPrivateDirty(): bigint; +- +- /** +- * Obtains the cpu usage percent of a process. +- * +- * @returns { number } Returns the cpu usage of a process. +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- export function getCpuUsage(): number; +- +- /** +- * Get a debugging dump of a system service by service id. +- * It need dump permission. +- * This API can be called only by system application. +- * +- * @permission ohos.permission.DUMP +- * @param { number } serviceid - Indicates the id of the service ability. +- * @param { number } fd - The file descriptor. +- * @param { Array } args - The args list of the system ability dump interface. +- * @throws {BusinessError} 401 - the parameter check failed, Possible causes: +- * 1.the parameter type error +- * 2.the args parameter is not string array +- * @throws {BusinessError} 11400101 - ServiceId invalid. The system ability does not exist. +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- export function getServiceDump(serviceid: number, fd: number, args: Array): void; +- +- /** +- * Obtains the cpu usage of system. +- * +- * @returns { number } Returns the cpu usage of system. +- * @throws { BusinessError } 11400104 - The status of the system CPU usage is abnormal. +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- export function getSystemCpuUsage(): number; +- +- /** +- * Application CPU usage of thread. +- * +- * @interface ThreadCpuUsage +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- export interface ThreadCpuUsage { +- /** +- * Thread id +- * +- * @type { number } +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 +- */ +- threadId: number; +- /** +- * Cpu usage of thread +- * +- * @type { number } +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 +- */ +- cpuUsage: number; +- } +- +- /** +- * Get the CPU usage of all threads in the application. +- * +- * @returns { ThreadCpuUsage[] } Returns the CPU usage of all threads in the application. +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- export function getAppThreadCpuUsage(): ThreadCpuUsage[]; +- +- /** +- * System memory information +- * +- * @interface SystemMemInfo +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- export interface SystemMemInfo { +- /** +- * Total system memory size, in kilobyte +- * +- * @type { bigint } +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- totalMem: bigint; +- /** +- * System free memory size, in kilobyte +- * +- * @type { bigint } +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- freeMem: bigint; +- /** +- * System available memory size, in kilobyte +- * +- * @type { bigint } +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- availableMem: bigint; +- } +- +- /** +- * Obtains the system memory size. +- * +- * @returns { SystemMemInfo } Returns system memory size. +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- export function getSystemMemInfo(): SystemMemInfo; +- +- /** +- * Application process native memory information. +- * +- * @interface NativeMemInfo +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- export interface NativeMemInfo { +- /** +- * Process proportional set size memory, in kilobyte +- * +- * @type { bigint } +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- pss: bigint; +- /** +- * Virtual set size memory, in kilobyte +- * +- * @type { bigint } +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- vss: bigint; +- /** +- * Resident set size, in kilobyte +- * +- * @type { bigint } +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- rss: bigint; +- /** +- * The size of the shared dirty memory, in kilobyte +- * +- * @type { bigint } +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- sharedDirty: bigint; +- /** +- * The size of the private dirty memory, in kilobyte +- * +- * @type { bigint } +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- privateDirty: bigint; +- /** +- * The size of the shared clean memory, in kilobyte +- * +- * @type { bigint } +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- sharedClean: bigint; +- /** +- * The size of the private clean memory, in kilobyte +- * +- * @type { bigint } +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- privateClean: bigint; +- } +- +- /** +- * Obtains the memory information of application process. +- * +- * @returns { NativeMemInfo } Returns the native memory of a process. +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- export function getAppNativeMemInfo(): NativeMemInfo; +- +- /** +- * Enum for trace flag +- * +- * @enum { number } +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- export enum TraceFlag { +- /** +- * Only capture main thread trace +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- MAIN_THREAD = 1, +- /** +- * Capture all thread trace +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- ALL_THREADS = 2 +- } +- +- /** +- * Provide trace tags +- * +- * @namespace tags +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- export namespace tags { +- /** +- * Ability Manager tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const ABILITY_MANAGER: number; +- /** +- * ARKUI development framework tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const ARKUI: number; +- /** +- * ARK tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const ARK: number; +- /** +- * Bluetooth tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const BLUETOOTH: number; +- /** +- * Common library subsystem tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const COMMON_LIBRARY: number; +- /** +- * Distributed hardware device manager tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const DISTRIBUTED_HARDWARE_DEVICE_MANAGER: number; +- /** +- * Distributed audio tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const DISTRIBUTED_AUDIO: number; +- /** +- * Distributed camera tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const DISTRIBUTED_CAMERA: number; +- /** +- * Distributed data manager module tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const DISTRIBUTED_DATA: number; +- /** +- * Distributed hardware framework tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const DISTRIBUTED_HARDWARE_FRAMEWORK: number; +- /** +- * Distributed input tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const DISTRIBUTED_INPUT: number; +- /** +- * Distributed screen tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const DISTRIBUTED_SCREEN: number; +- /** +- * Distributed scheduler tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const DISTRIBUTED_SCHEDULER: number; +- /** +- * FFRT tasks. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const FFRT: number; +- /** +- * File management tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const FILE_MANAGEMENT: number; +- /** +- * Global resource manager tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const GLOBAL_RESOURCE_MANAGER: number; +- /** +- * Graphics module tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const GRAPHICS: number; +- /** +- * HDF subsystem tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const HDF: number; +- /** +- * MISC module tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const MISC: number; +- /** +- * Multimodal input module tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const MULTIMODAL_INPUT: number; +- /** +- * Net tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const NET: number; +- /** +- * Notification module tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const NOTIFICATION: number; +- /** +- * NWeb tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const NWEB: number; +- /** +- * OHOS generic tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const OHOS: number; +- /** +- * Power manager tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const POWER_MANAGER: number; +- /** +- * RPC tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const RPC: number; +- /** +- * SA tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const SAMGR: number; +- /** +- * Window manager tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const WINDOW_MANAGER: number; +- /** +- * Audio module tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const AUDIO: number; +- /** +- * Camera module tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const CAMERA: number; +- /** +- * Image module tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const IMAGE: number; +- /** +- * Media module tag. +- * +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- const MEDIA: number; +- } +- +- /** +- * Start capture application trace. +- * +- * @param { number[] } tags - Tag of trace. +- * @param { TraceFlag } flag - Trace flag. +- * @param { number } limitSize - Max size of trace file, in bytes, the max is 500MB. +- * @returns { string } Returns absolute path of the trace file. +- * @throws { BusinessError } 401 - Invalid argument, Possible causes: +- * 1.The limit parameter is too small +- * 2.The parameter is not within the enumeration type +- * 3.The parameter type error or parameter order error +- * @throws { BusinessError } 11400102 - Capture trace already enabled. +- * @throws { BusinessError } 11400103 - No write permission on the file. +- * @throws { BusinessError } 11400104 - Abnormal trace status. +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- export function startAppTraceCapture(tags: number[], flag: TraceFlag, limitSize: number): string; +- +- /** +- * Stop capture application trace. +- * +- * @throws { BusinessError } 11400104 - The status of the trace is abnormal +- * @throws { BusinessError } 11400105 - No capture trace running +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 20 +- */ +- export function stopAppTraceCapture(): void; +- +- /** +- * Get the graphics memory of application +- * +- * @returns { Promise } Returns the graphics memory of application, in kilobyte. +- * @throws { BusinessError } 11400104 - Failed to get the application memory due to a remote exception. +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @atomicservice +- * @since 20 +- */ +- export function getGraphicsMemory(): Promise; +- +- /** +- * Get the graphics memory of application +- * +- * @returns { number } Returns the graphics memory of application, in kilobyte. +- * @throws { BusinessError } 11400104 - Failed to get the application memory due to a remote exception. +- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @atomicservice +- * @since 20 +- */ +- export function getGraphicsMemorySync(): number; +-} +-export default hidebug; +diff --git a/api/@ohos.hidebug.d.ts b/api/@ohos.hidebug.d.ts +index 329efe1e9..7e2212fa5 100644 +--- a/api/@ohos.hidebug.d.ts ++++ b/api/@ohos.hidebug.d.ts +@@ -28,93 +28,114 @@ + */ + + /** +- * Provide interfaces related to debugger access and obtaining CPU, +- * memory and other virtual machine information during runtime for JS programs ++ * This module provides multiple methods for debugging and profiling applications. With these methods, you can obtain ++ * memory, CPU, GPU, and GC data, collect process trace and profiler data, and dump VM heap snapshots. Since most APIs ++ * of this module are both performance-consuming and time-consuming, and are defined based on the HiDebug module, ++ * you are advised to use these APIs only during the application debugging and profiling phases. If the APIs are ++ * required in other scenarios, evaluate the impact of the APIs on application performance. + * + * @namespace hidebug + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- + declare namespace hidebug { + /** +- * Get total native heap memory size ++ * Obtains the total number of bytes occupied by the total space (the sum of uordblks and fordblks obtained from ++ * mallinfo) held by a process, which is measured by the memory allocator. + * +- * @returns { bigint } Returns total native heap memory size. ++ * @returns { bigint } Returns the total number of bytes occupied by the total space. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getNativeHeapSize(): bigint; + + /** +- * Get Native heap memory allocation size. +- * @returns { bigint } Returns native heap memory allocation size. ++ * Obtains the total number of bytes occupied by the total allocated space (uordblks obtained from mallinfo) held by ++ * a process, which is measured by the memory allocator. ++ * @returns { bigint } Returns the total number of bytes occupied by the total allocated space. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getNativeHeapAllocatedSize(): bigint; + + /** +- * Get Native heap memory free size ++ * Obtains the total number of bytes occupied by the total free space (fordblks obtained from mallinfo) ++ * held by a process, which is measured by the memory allocator. + * +- * @returns { bigint } Returns native heap memory free size. ++ * @returns { bigint } Returns the size of the memory occupied by the free normal blocks held by the process, in bytes. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getNativeHeapFreeSize(): bigint; + + /** +- * Get the virtual set size memory of the application process ++ * Obtains the virtual set size used by the application process. This API is implemented by multiplying the value of ++ * size (number of memory pages) in the /proc/{pid}/statm node by the page size (4 KB per page). + * +- * @returns { bigint } Returns application process virtual set size memory information. ++ * @returns { bigint } Returns the virtual set size used by the application process, in KB. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getVss(): bigint; + + /** +- * Get application process proportional set size memory information ++ * Obtains the size of the physical memory actually used by the application process. This API is implemented by ++ * summing up the values of **Pss** and **SwapPss** in the /proc/{pid}/smaps_rollup** node. + * +- * @returns { bigint } Returns application process proportional set size memory information. ++ * @returns { bigint } Returns the size of the physical memory actually used by the application process, in KB. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getPss(): bigint; + + /** +- * Obtains the size of the shared dirty memory of a process. ++ * Obtains the size of the shared dirty memory of a process. This API is implemented by reading the value of ++ * Shared_Dirty in the /proc/{pid}/smaps_rollup node. + * +- * @returns { bigint } Returns the size of the shared dirty memory. ++ * @returns { bigint } Returns the size of the shared dirty memory of the process, in KB. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSharedDirty(): bigint; + + /** +- * Obtains the size of the private dirty memory of a process. +- * @returns { bigint } Returns the size of the private dirty memory. ++ * Obtains the size of the private dirty memory of a process. This API is implemented by reading the value of ++ * Private_Dirty in the /proc/{pid}/smaps_rollup node. ++ * ++ * @returns { bigint } Returns the size of the private dirty memory of the process, in KB. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getPrivateDirty(): bigint; + + /** +- * Obtains the cpu usage percent of a process. ++ * Obtains the CPU usage of a process. + * +- * @returns { number } Returns the cpu usage of a process. ++ * @returns { number } Returns the CPU usage of the process. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getCpuUsage(): number; + + /** +- * Start CPU Profiling. +- * The input parameter is a user-defined file name, excluding the file suffix. +- * The generated file is in the files folder under the application directory. +- * Such as "/data/accounts/account_0/appdata/[package name]/files/cpuprofiler-xxx.json" + * +- * @param { string } filename - Indicates the user-defined file name, excluding the file suffix. ++ * Starts the VM profiling method. startProfiling(filename: string) and stopProfiling() are called in pairs. ++ * startProfiling(filename: string) always occurs before stopProfiling(). You are advised not to call either of these ++ * methods repeatedly. Otherwise, an exception may occur. The generated file is in the files folder under the ++ * application directory. Such as "/data/accounts/account_0/appdata/[package name]/files/cpuprofiler-xxx.json" ++ * ++ * @param { string } filename - User-defined file name of the sampling data. The .json file is generated ++ * in the files directory of the application based on the specified file name. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug + * @since 8 + * @deprecated since 9 +@@ -123,8 +144,9 @@ declare namespace hidebug { + function startProfiling(filename: string): void; + + /** +- * Stop CPU Profiling. +- * It takes effect only when the CPU profiler is turned on ++ * Stops the VM profiling method. stopProfiling() and startProfiling(filename: string) are called in pairs. ++ * startProfiling(filename: string) always occurs before stopProfiling(). You are advised not to call either of these ++ * methods repeatedly. Otherwise, an exception may occur. It takes effect only when the CPU profiler is turned on. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug + * @since 8 +@@ -134,10 +156,10 @@ declare namespace hidebug { + function stopProfiling(): void; + + /** +- * Dump JS Virtual Machine Heap Snapshot. ++ * Exports the VM heap data and generates a filename.heapsnapshot file. + * The input parameter is a user-defined file name, excluding the file suffix. + * The generated file is in the files folder under the application directory. +- * Such as "/data/accounts/account_0/appdata/[package name]/files/xxx.heapsnapshot" ++ * Such as "/data/accounts/account_0/appdata/[package name]/files/xxx.heapsnapshot". + * + * @param { string } filename - Indicates the user-defined file name, excluding the file suffix. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +@@ -148,72 +170,80 @@ declare namespace hidebug { + function dumpHeapData(filename: string): void; + + /** +- * Start CPU Profiling. +- * The input parameter is a user-defined file name, excluding the file suffix. +- * The generated file is in the files folder under the application directory. ++ * Starts the VM profiling method. startJsCpuProfiling(filename: string) and stopJsCpuProfiling() are called in pairs. ++ * startJsCpuProfiling(filename: string) always occurs before stopJsCpuProfiling(). You are advised not to call either ++ * of these methods repeatedly. Otherwise, an exception may occur. + * +- * @param { string } filename - Indicates the user-defined file name, excluding the file suffix. ++ * @param { string } filename - User-defined heap file name. The .heapsnapshot file is generated in the files ++ * directory of the application based on the specified file name. + * @throws {BusinessError} 401 - the parameter check failed, Parameter type error + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function startJsCpuProfiling(filename: string): void; + + /** +- * Stop CPU Profiling. +- * It takes effect only when the CPU profiler is turned on ++ * Stops the VM profiling method. stopJsCpuProfiling() and startJsCpuProfiling(filename: string) are called in pairs. ++ * startJsCpuProfiling() always occurs before stopJsCpuProfiling(). You are advised not to call either of these ++ * methods repeatedly. Otherwise, an exception may occur. It takes effect only when the CPU profiler is turned on + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function stopJsCpuProfiling(): void; + + /** +- * Dump JS Virtual Machine Heap Snapshot. ++ * Exports the heap data. + * The input parameter is a user-defined file name, excluding the file suffix. + * The generated file is in the files folder under the application directory. + * +- * @param { string } filename - Indicates the user-defined file name, excluding the file suffix. +- * @throws {BusinessError} 401 - the parameter check failed, Parameter type error ++ * @param { string } filename - User-defined file name of the sampling data. The .heapsnapshot file is generated ++ * in the files directory of the application based on the specified file name. ++ * @throws {BusinessError} 401 - the parameter check failed, Parameter type error. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug + * @since 9 + */ + function dumpJsHeapData(filename: string): void; + + /** +- * Get a debugging dump of a system service by service id. ++ * Obtains system service information. + * It need dump permission. + * This API can be called only by system application. + * + * @permission ohos.permission.DUMP +- * @param { number } serviceid - Indicates the id of the service ability. +- * @param { number } fd - The file descriptor. +- * @param { Array } args - The args list of the system ability dump interface. +- * @throws {BusinessError} 401 - the parameter check failed, Possible causes: ++ * @param { number } serviceid - Obtains the system service information based on the specified service ID. ++ * @param { number } fd - File descriptor to which data is written by the API. ++ * @param { Array } args - Parameter list of the Dump API of the system service. ++ * @throws {BusinessError} 401 - the parameter check failed,Possible causes: + * 1.the parameter type error +- * 2.the args parameter is not string array ++ * 2.the args parameter is not string array. + * @throws {BusinessError} 11400101 - ServiceId invalid. The system ability does not exist. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getServiceDump(serviceid: number, fd: number, args: Array): void; + + /** +- * Obtains the cpu usage of system. ++ * Obtains the CPU usage of the system. + * +- * @returns { number } Returns the cpu usage of system. ++ * @returns { number } Returns the CPU usage of the system. + * @throws { BusinessError } 11400104 - The status of the system CPU usage is abnormal. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSystemCpuUsage(): number; + + /** +- * Application CPU usage of thread. ++ * Describes the CPU usage of a thread. + * + * @interface ThreadCpuUsage + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ThreadCpuUsage { + /** +@@ -221,505 +251,585 @@ declare namespace hidebug { + * + * @type { number } + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + threadId: number; + /** +- * Cpu usage of thread ++ * CPU usage of the thread. + * + * @type { number } + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + cpuUsage: number; + } + + /** +- * Get the CPU usage of all threads in the application. ++ * Obtains the CPU usage of application threads. + * +- * @returns { ThreadCpuUsage[] } Returns the CPU usage of all threads in the application. ++ * @returns { ThreadCpuUsage[] } Returns the CPU usage of all threads of the current application process. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAppThreadCpuUsage(): ThreadCpuUsage[]; + + /** +- * System memory information ++ * Describes the system memory information, including the total memory, free memory, and available memory. + * + * @interface SystemMemInfo + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface SystemMemInfo { + /** +- * Total system memory size, in kilobyte ++ * Total memory of the system, in KB. The value of this parameter is obtained by reading the value of ++ * MemTotal in the /proc/meminfo node. + * + * @type { bigint } + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + totalMem: bigint; + /** +- * System free memory size, in kilobyte ++ * Free memory of the system, in KB. The value of this parameter is obtained by reading the value of ++ * MemFree in the /proc/meminfo node. + * + * @type { bigint } + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + freeMem: bigint; + /** +- * System available memory size, in kilobyte ++ * Available memory of the system, in KB. The value of this parameter is obtained by reading the value of ++ * MemAvailable in the /proc/meminfo node. + * + * @type { bigint } + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + availableMem: bigint; + } + + /** +- * Obtains the system memory size. ++ * Obtains system memory information. This API is implemented by reading data from the /proc/meminfo node. + * +- * @returns { SystemMemInfo } Returns system memory size. ++ * @returns { SystemMemInfo } Returns the system memory information. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSystemMemInfo(): SystemMemInfo; + + /** +- * Application process native memory information. ++ * Describes memory information of the application process. + * + * @interface NativeMemInfo + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface NativeMemInfo { + /** +- * Process proportional set size memory, in kilobyte ++ * Size of the occupied physical memory (including the proportionally allocated memory occupied by the shared ++ * library), in KB. The value of this parameter is obtained by summing up the values of Pss and SwapPss in the ++ * /proc/{pid}/smaps_rollup node. + * + * @type { bigint } + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + pss: bigint; + /** +- * Virtual set size memory, in kilobyte ++ * Size of the occupied virtual memory (including the memory occupied by the shared library), in KB. The value of ++ * this parameter is obtained by multiplying the value of size (number of memory pages) in the /proc/{pid}/statm ++ * node by the page size (4 KB per page). + * + * @type { bigint } + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + vss: bigint; + /** +- * Resident set size, in kilobyte ++ * Size of the occupied physical memory (including the memory occupied by the shared library), in KB. ++ * The value of this parameter is obtained by reading the value of Rss in the /proc/{pid}/smaps_rollup node. + * + * @type { bigint } + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + rss: bigint; + /** +- * The size of the shared dirty memory, in kilobyte ++ * Size of the shared dirty memory, in KB. The value of this parameter is obtained by reading the value of ++ * Shared_Dirty in the /proc/{pid}/smaps_rollup node. + * + * @type { bigint } + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + sharedDirty: bigint; + /** +- * The size of the private dirty memory, in kilobyte ++ * Size of the private dirty memory, in KB. The value of this parameter is obtained by reading the value of ++ * Private_Dirty in the /proc/{pid}/smaps_rollup node. + * + * @type { bigint } + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + privateDirty: bigint; + /** +- * The size of the shared clean memory, in kilobyte ++ * Size of the shared clean memory, in KB. The value of this parameter is obtained by reading the value of ++ * Shared_Clean in the /proc/{pid}/smaps_rollup node. + * + * @type { bigint } + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + sharedClean: bigint; + /** +- * The size of the private clean memory, in kilobyte ++ * Size of the private clean memory, in KB. The value of this parameter is obtained by reading the value of ++ * Private_Clean in the /proc/{pid}/smaps_rollup node. + * + * @type { bigint } + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + privateClean: bigint; + } + + /** +- * Obtains the memory information of application process. ++ * Obtains the memory information of the application process. This API is implemented by reading data from the ++ * /proc/{pid}/smaps_rollup and /proc/{pid}/statm node. + * +- * @returns { NativeMemInfo } Returns the native memory of a process. ++ * @returns { NativeMemInfo } Returns the memory information of the application process. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAppNativeMemInfo(): NativeMemInfo; + + /** +- * Application process memory limit ++ * Defines the memory limit of the application process. + * + * @interface MemoryLimit + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MemoryLimit { + /** +- * The limit of the application process's resident set, in kilobyte ++ * Limit on the resident set size, in KB. + * + * @type { bigint } + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + rssLimit: bigint; + /** +- * The limit of the application process's virtual memory, in kilobyte ++ * Limit on the virtual memory size, in KB. + * + * @type { bigint } + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + vssLimit: bigint; + /** +- * The limit of the js vm heap size of current virtual machine, in kilobyte ++ * Limit on the JS VM heap size of the calling thread, in KB. + * + * @type { bigint } + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + vmHeapLimit: bigint; + /** +- * The limit of the total js vm heap size of process, in kilobyte ++ * Size limit of the JS heap memory of the process, in KB. + * + * @type { bigint } + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + vmTotalHeapSize: bigint; + } + + /** +- * Obtains the memory limit of application process. ++ * Obtains the memory limit of an application process. + * +- * @returns { MemoryLimit } Returns memory limit of application. ++ * @returns { MemoryLimit } Returns the memory limit of the application process. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAppMemoryLimit(): MemoryLimit; + + /** +- * The memory information of application virtual machine. ++ * Describes the VM memory information. + * + * @interface VMMemoryInfo + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface VMMemoryInfo { + /** +- * Total size of current virtual machine Heap, in kilobyte ++ * Total heap size of the current VM, in KB. + * + * @type { bigint } + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + totalHeap: bigint; + /** +- * Used size of current virtual machine Heap, in kilobyte ++ * Heap size used by the current VM, in KB. + * + * @type { bigint } + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + heapUsed: bigint; + /** +- * All array object size of current virtual machine, in kilobyte ++ * Size of all array objects of the current VM, in KB. + * + * @type { bigint } + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + allArraySize: bigint; + } + + /** +- * Obtains the memory information of application virtual machine. ++ * Obtains VM memory information. + * +- * @returns { VMMemoryInfo } Returns memory information of application virtual machine. ++ * @returns { VMMemoryInfo } Returns the VM memory information. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAppVMMemoryInfo(): VMMemoryInfo; + + /** +- * Enum for trace flag ++ * Describes types of trace collection threads, including the main thread and all threads. + * + * @enum { number } + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum TraceFlag { + /** +- * Only capture main thread trace ++ * The main thread of the application. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MAIN_THREAD = 1, + /** +- * Capture all thread trace ++ * All threads of the application. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ALL_THREADS = 2 + } + + /** +- * Provide trace tags ++ * Enumerates the tags used in trace collection. + * + * @namespace tags + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + namespace tags { + /** +- * Ability Manager tag. ++ * Ability Manager tag. The corresponding HiTrace command is tagName:ability. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const ABILITY_MANAGER: number; + /** +- * ARKUI development framework tag. ++ * ArkUI development framework. The corresponding HiTrace command is tagName:ace. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const ARKUI: number; + /** +- * ARK tag. ++ * JSVM VM. The corresponding HiTrace command is tagName:ark. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const ARK: number; + /** +- * Bluetooth tag. ++ * Bluetooth. The corresponding HiTrace command is tagName:bluetooth. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const BLUETOOTH: number; + /** +- * Common library subsystem tag. ++ * Common library subsystem. The corresponding HiTrace command is tagName:commonlibrary. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const COMMON_LIBRARY: number; + /** +- * Distributed hardware device manager tag. ++ * Distributed hardware device management. The corresponding HiTrace command is tagName:devicemanager. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const DISTRIBUTED_HARDWARE_DEVICE_MANAGER: number; + /** +- * Distributed audio tag. ++ * Distributed audio. The corresponding HiTrace command is tagName:daudio. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const DISTRIBUTED_AUDIO: number; + /** +- * Distributed camera tag. ++ * Distributed camera. The corresponding HiTrace command is tagName:dcamera. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const DISTRIBUTED_CAMERA: number; + /** +- * Distributed data manager module tag. ++ * Distributed data management. The corresponding HiTrace command is tagName:distributeddatamgr. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const DISTRIBUTED_DATA: number; + /** +- * Distributed hardware framework tag. ++ * Distributed hardware framework. The corresponding HiTrace command is tagName:dhfwk. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const DISTRIBUTED_HARDWARE_FRAMEWORK: number; + /** +- * Distributed input tag. ++ * Distributed input. The corresponding HiTrace command is tagName:dinput. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const DISTRIBUTED_INPUT: number; + /** +- * Distributed screen tag. ++ * Distributed screen. The corresponding HiTrace command is tagName:dscreen. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const DISTRIBUTED_SCREEN: number; + /** +- * Distributed scheduler tag. ++ * Distributed scheduler. The corresponding HiTrace command is tagName:dsched. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const DISTRIBUTED_SCHEDULER: number; + /** +- * FFRT tasks. ++ * FFRT task. The corresponding HiTrace command is tagName:ffrt. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const FFRT: number; + /** +- * File management tag. ++ * File management system. The corresponding HiTrace command is tagName:filemanagement. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const FILE_MANAGEMENT: number; + /** +- * Global resource manager tag. ++ * Global resource management. The corresponding HiTrace command is tagName:gresource. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const GLOBAL_RESOURCE_MANAGER: number; + /** +- * Graphics module tag. ++ * Graphics module. The corresponding HiTrace command is tagName:graphic. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const GRAPHICS: number; + /** +- * HDF subsystem tag. ++ * HDF subsystem. The corresponding HiTrace command is tagName:hdf. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const HDF: number; + /** +- * MISC module tag. ++ * MISC module. The corresponding HiTrace command is tagName:misc. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const MISC: number; + /** +- * Multimodal input module tag. ++ * Multi-modal input module. The corresponding HiTrace command is tagName:multimodalinput. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const MULTIMODAL_INPUT: number; + /** +- * Net tag. ++ * Network. The corresponding HiTrace command is tagName:net. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const NET: number; + /** +- * Notification module tag. ++ * Notification module. The corresponding HiTrace command is tagName:notification. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const NOTIFICATION: number; + /** +- * NWeb tag. ++ * Nweb. The corresponding HiTrace command is tagName:nweb. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const NWEB: number; + /** +- * OHOS generic tag. ++ * OHOS. The corresponding HiTrace command is tagName:ohos. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const OHOS: number; + /** +- * Power manager tag. ++ * Power management. The corresponding HiTrace command is tagName:power. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const POWER_MANAGER: number; + /** +- * RPC tag. ++ * RPC. The corresponding HiTrace command is tagName:rpc. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const RPC: number; + /** +- * SA tag. ++ * System capability management. The corresponding HiTrace command is tagName:samgr. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const SAMGR: number; + /** +- * Window manager tag. ++ * Window management. The corresponding HiTrace command is tagName:window. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const WINDOW_MANAGER: number; + /** +- * Audio module tag. ++ * Audio module. The corresponding HiTrace command is tagName:zaudio. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const AUDIO: number; + /** +- * Camera module tag. ++ * Camera module. The corresponding HiTrace command is tagName:zcamera. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const CAMERA: number; + /** +- * Image module tag. ++ * Image module. The corresponding HiTrace command is tagName:zimage. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const IMAGE: number; + /** +- * Media module tag. ++ * Media module. The corresponding HiTrace command is tagName:zmedia. + * + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const MEDIA: number; + } + + /** +- * Start capture application trace. ++ * Starts automatic trace collection in a specified scope. This API is a supplement to the HiTrace module. ++ * The performance consumption during trace collection increases with the collection scope. Therefore, before ++ * using this API, you are advised to run the hitrace command to capture trace logs and select the key scope ++ * of trace collection to improve the API performance. + * +- * @param { number[] } tags - Tag of trace. +- * @param { TraceFlag } flag - Trace flag. +- * @param { number } limitSize - Max size of trace file, in bytes, the max is 500MB. +- * @returns { string } Returns absolute path of the trace file. ++ * @param { number[] } tags - Scope for trace collection. For details, see tags. ++ * @param { TraceFlag } flag - For details, see TraceFlag. ++ * @param { number } limitSize - Limit on the trace file size, in bytes. The maximum size of a single file is 500 MB. ++ * @returns { string } Returns the path of the trace file. + * @throws { BusinessError } 401 - Invalid argument, Possible causes: + * 1.The limit parameter is too small + * 2.The parameter is not within the enumeration type +@@ -728,54 +838,60 @@ declare namespace hidebug { + * @throws { BusinessError } 11400103 - No write permission on the file. + * @throws { BusinessError } 11400104 - Abnormal trace status. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function startAppTraceCapture(tags: number[], flag: TraceFlag, limitSize: number): string; + + /** +- * Stop capture application trace. ++ * Stops application trace collection. Use startAppTraceCapture() to start collection before calling this API. ++ * If this API is called before trace collection or it is repeatedly called, an exception will occur. + * +- * @throws { BusinessError } 11400104 - The status of the trace is abnormal +- * @throws { BusinessError } 11400105 - No capture trace running ++ * @throws { BusinessError } 11400104 - The status of the trace is abnormal. ++ * @throws { BusinessError } 11400105 - No capture trace running. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function stopAppTraceCapture(): void; + + /** +- * Collection statistics. ++ * Describes the key-value pair used to store GC statistics. This type does not support multi-thread operations. ++ * If this type is operated by multiple threads at the same time in an application, use a lock for it. + * + * @typedef { Record } GcStats + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type GcStats = Record; + + /** +- * Get the garbage collection statistics. ++ * Obtains all system GC statistics. + * +- * @returns { GcStats } Returns garbage collection statistics. ++ * @returns { GcStats } Returns the system GC statistics. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getVMRuntimeStats(): GcStats; + + /** +- * Get the garbage collection statistics by statistical item. ++ * Obtains the specified system GC statistics based on parameters. + * + * @param { string } item - statistical item. +- * @returns { number } Returns garbage collection statistics. ++ * @returns { number } Returns the item of the GC statistics to be obtained. + * @throws { BusinessError } 401 - Possible causes: + * 1. Invalid parameter, a string parameter required. + * 2. Invalid parameter, unknown property. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getVMRuntimeStat(item: string): number; + + /** +- * Set the resource limitation of application.Please note that this function is only valid +- * when the developer options switch of setting is turned on. ++ * Sets the number of FDs, number of threads, JS memory, or native memory limit of the application. + * + * @param { string } type - resource type. It could be pss_memory、js_heap、fd、or thread. + * @param { number } value - For different resource type, values could have different meaning: +@@ -799,48 +915,52 @@ declare namespace hidebug { + function setAppResourceLimit(type: string, value: number, enableDebugLog: boolean): void; + + /** +- * Judge if the application is in debugged state, including either in arkui layer or native layer debugged state. ++ * Obtains the debugging state of an application process. If the Ark or native layer of the application process is in ++ * debugging state, true is returned. Otherwise, false is returned. + * +- * @returns { boolean } true if the application is debugged. ++ * @returns { boolean } true if the application is in the debugging state. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isDebugState(): boolean; + + /** +- * Get the graphics memory of application ++ * Obtains the size of the GPU memory. This API uses a promise to return the result. + * +- * @returns { Promise } Returns the graphics memory of application, in kilobyte. ++ * @returns { Promise } Returns the size of the GPU memory, in KB. + * @throws { BusinessError } 11400104 - Failed to get the application memory due to a remote exception. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getGraphicsMemory(): Promise; + + /** +- * Get the graphics memory of application ++ * Obtains the size of the GPU memory synchronously. + * +- * @returns { number } Returns the graphics memory of application, in kilobyte. ++ * @returns { number } Returns the size of the GPU memory, in KB. + * @throws { BusinessError } 11400104 - Failed to get the application memory due to a remote exception. + * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getGraphicsMemorySync(): number; + + /** +- * Dump the raw heap snapshot of the JavaScript Virtual Machine for the current thread. +- * ++ * Dumps the original heap snapshot of the VM for the current thread. The API uses a promise to return the path of the ++ * .rawheap file. You can use rawheap-translator to convert the generated file into a .heapsnapshot file for parsing. + * The generated file will be stored in a folder within the application directory. However, since this file is usually + * large, the system imposes restrictions on the frequency and number of calls to this function. Consequently, you + * might fail to obtain the dump file due to quota limitations. These failures will persist until the quota is + * regularly refreshed by the system. Therefore, it is advisable to delete the file immediately after you have + * finished processing it. Moreover, it is recommended that you use this function in the gray - release version. + * +- * @param { boolean } needGC - Whether do GC before dump, default is true. +- * @returns { Promise } Returns the full path of raw heap snapshot file. +- * @throws { BusinessError } 401 - Invalid parameter. ++ * @param { boolean } needGC - Whether GC is required when a heap snapshot is dumped. The default value is true. ++ * If this parameter is not specified, GC is triggered before dumping. ++ * @returns { Promise } Returns the path of the generated snapshot file. + * @throws { BusinessError } 11400106 - Quota exceeded. + * @throws { BusinessError } 11400107 - Fork operation failed. + * @throws { BusinessError } 11400108 - Failed to wait for the child process to finish. +diff --git a/api/@ohos.hilog.d.ets b/api/@ohos.hilog.d.ets +deleted file mode 100644 +index 5d72df5cb..000000000 +--- a/api/@ohos.hilog.d.ets ++++ /dev/null +@@ -1,414 +0,0 @@ +-/* +- * Copyright (c) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-/** +- * @file +- * @kit PerformanceAnalysisKit +- */ +- +-/** +-* Provides interfaces to generate system logs. +-* +-* @namespace hilog +-* @syscap SystemCapability.HiviewDFX.HiLog +-* @since 7 +-*/ +-/** +-* Provides interfaces to generate system logs. +-* +-* @namespace hilog +-* @syscap SystemCapability.HiviewDFX.HiLog +-* @crossplatform +-* @since 10 +-*/ +-/** +-* Provides interfaces to generate system logs. +-* +-* @namespace hilog +-* @syscap SystemCapability.HiviewDFX.HiLog +-* @crossplatform +-* @atomicservice +-* @since 11 +-*/ +-declare namespace hilog { +- +- /** +- * Outputs debug-level logs. +- * +- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF +- * if the value exceeds the range, logs cannot be printed. +- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. +- * @param { string } format Indicates the log format string. +- * @param { any[] }args Indicates the log parameters. +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @since 7 +- */ +- /** +- * Outputs debug-level logs. +- * +- * * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF +- * if the value exceeds the range, logs cannot be printed. +- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. +- * @param { string } format Indicates the log format string. +- * @param { any[] }args Indicates the log parameters. +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @since 10 +- */ +- /** +- * Outputs debug-level logs. +- * +- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF +- * if the value exceeds the range, logs cannot be printed. +- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. +- * @param { string } format Indicates the log format string. +- * @param { any[] }args Indicates the log parameters. +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @atomicservice +- * @since 11 +- */ +- export function debug(domain: number, tag: string, format: string, +- ...args: (int | boolean | number | string | bigint | Object | undefined | null)[]): void; +- +- /** +- * Outputs info-level logs. +- * +- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF +- * if the value exceeds the range, logs cannot be printed. +- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. +- * @param { string } format Indicates the log format string. +- * @param { any[] }args Indicates the log parameters. +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @since 7 +- */ +- /** +- * Outputs info-level logs. +- * +- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF +- * if the value exceeds the range, logs cannot be printed. +- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. +- * @param { string } format Indicates the log format string. +- * @param { any[] }args Indicates the log parameters. +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @since 10 +- */ +- /** +- * Outputs info-level logs. +- * +- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF +- * if the value exceeds the range, logs cannot be printed. +- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. +- * @param { string } format Indicates the log format string. +- * @param { any[] }args Indicates the log parameters. +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @atomicservice +- * @since 11 +- */ +- export function info(domain: number, tag: string, format: string, +- ...args: (int | boolean | number | string | bigint | Object | undefined | null)[]): void; +- +- /** +- * Outputs warning-level logs. +- * +- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF +- * if the value exceeds the range, logs cannot be printed. +- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. +- * @param { string } format Indicates the log format string. +- * @param { any[] }args Indicates the log parameters. +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @since 7 +- */ +- /** +- * Outputs warning-level logs. +- * +- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF +- * if the value exceeds the range, logs cannot be printed. +- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. +- * @param { string } format Indicates the log format string. +- * @param { any[] }args Indicates the log parameters. +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @since 10 +- */ +- /** +- * Outputs warning-level logs. +- * +- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF +- * if the value exceeds the range, logs cannot be printed. +- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. +- * @param { string } format Indicates the log format string. +- * @param { any[] }args Indicates the log parameters. +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @atomicservice +- * @since 11 +- */ +- export function warn(domain: number, tag: string, format: string, +- ...args: (int | boolean | number | string | bigint | Object | undefined | null)[]): void; +- +- /** +- * Outputs error-level logs. +- * +- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF +- * if the value exceeds the range, logs cannot be printed. +- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. +- * @param { string } format Indicates the log format string. +- * @param { any[] }args Indicates the log parameters. +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @since 7 +- */ +- /** +- * Outputs error-level logs. +- * +- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF +- * if the value exceeds the range, logs cannot be printed. +- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. +- * @param { string } format Indicates the log format string. +- * @param { any[] }args Indicates the log parameters. +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @since 10 +- */ +- /** +- * Outputs error-level logs. +- * +- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF +- * if the value exceeds the range, logs cannot be printed. +- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. +- * @param { string } format Indicates the log format string. +- * @param { any[] }args Indicates the log parameters. +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @atomicservice +- * @since 11 +- */ +- export function error(domain: number, tag: string, format: string, +- ...args: (int | boolean | number | string | bigint | Object | undefined | null)[]): void; +- +- /** +- * Outputs fatal-level logs. +- * +- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF +- * if the value exceeds the range, logs cannot be printed. +- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. +- * @param { string } format Indicates the log format string. +- * @param { any[] }args Indicates the log parameters. +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @since 7 +- */ +- /** +- * Outputs fatal-level logs. +- * +- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF +- * if the value exceeds the range, logs cannot be printed. +- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. +- * @param { string } format Indicates the log format string. +- * @param { any[] }args Indicates the log parameters. +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @since 10 +- */ +- /** +- * Outputs fatal-level logs. +- * +- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF +- * if the value exceeds the range, logs cannot be printed. +- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. +- * @param { string } format Indicates the log format string. +- * @param { any[] }args Indicates the log parameters. +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @atomicservice +- * @since 11 +- */ +- export function fatal(domain: number, tag: string, format: string, +- ...args: (int | boolean | number | string | bigint | Object | undefined | null)[]): void; +- +- /** +- * Checks whether logs of the specified tag, and level can be printed. +- * +- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF +- * if the value exceeds the range, logs cannot be printed. +- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. +- * @param { LogLevel } level log level +- * @returns { boolean } +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @since 7 +- */ +- /** +- * Checks whether logs of the specified tag, and level can be printed. +- * +- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF +- * if the value exceeds the range, logs cannot be printed. +- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. +- * @param { LogLevel } level log level +- * @returns { boolean } +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @atomicservice +- * @since 11 +- */ +- export function isLoggable(domain: number, tag: string, level: LogLevel): boolean; +- +- /** +- * Sets the lowest log level of the current application process. +- * +- * @param { LogLevel } level log level +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @atomicservice +- * @since 15 +- */ +- export function setMinLogLevel(level: LogLevel): void; +- +- /** +- * Log level define +- * +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @since 7 +- */ +- /** +- * Log level define +- * +- * @enum { number } +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @since 10 +- */ +- /** +- * Log level define +- * +- * @enum { number } +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @atomicservice +- * @since 11 +- */ +- export enum LogLevel { +- /** +- * DEBUG Log level define +- * +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @since 7 +- */ +- /** +- * DEBUG Log level define +- * +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @since 10 +- */ +- /** +- * DEBUG Log level define +- * +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @atomicservice +- * @since 11 +- */ +- DEBUG = 3, +- /** +- * INFO Log level define +- * +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @since 7 +- */ +- /** +- * INFO Log level define +- * +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @since 10 +- */ +- /** +- * INFO Log level define +- * +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @atomicservice +- * @since 11 +- */ +- INFO = 4, +- /** +- * WARN Log level define +- * +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @since 7 +- */ +- /** +- * WARN Log level define +- * +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @since 10 +- */ +- /** +- * WARN Log level define +- * +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @atomicservice +- * @since 11 +- */ +- WARN = 5, +- /** +- * ERROR Log level define +- * +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @since 7 +- */ +- /** +- * ERROR Log level define +- * +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @since 10 +- */ +- /** +- * ERROR Log level define +- * +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @atomicservice +- * @since 11 +- */ +- ERROR = 6, +- /** +- * FATAL Log level define +- * +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @since 7 +- */ +- /** +- * FATAL Log level define +- * +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @since 10 +- */ +- /** +- * FATAL Log level define +- * +- * @syscap SystemCapability.HiviewDFX.HiLog +- * @crossplatform +- * @atomicservice +- * @since 11 +- */ +- FATAL = 7 +- } +-} +- +-export default hilog; +diff --git a/api/@ohos.hilog.d.ts b/api/@ohos.hilog.d.ts +index 34fa026ba..998320202 100644 +--- a/api/@ohos.hilog.d.ts ++++ b/api/@ohos.hilog.d.ts +@@ -16,32 +16,34 @@ + /** + * @file + * @kit PerformanceAnalysisKit ++ * @arkts 1.1&1.2 + */ + + /** +-* Provides interfaces to generate system logs. +-* +-* @namespace hilog +-* @syscap SystemCapability.HiviewDFX.HiLog +-* @since 7 +-*/ ++ * Provides interfaces to generate system logs. ++ * ++ * @namespace hilog ++ * @syscap SystemCapability.HiviewDFX.HiLog ++ * @since 7 ++ */ + /** +-* Provides interfaces to generate system logs. +-* +-* @namespace hilog +-* @syscap SystemCapability.HiviewDFX.HiLog +-* @crossplatform +-* @since 10 +-*/ ++ * Provides interfaces to generate system logs. ++ * ++ * @namespace hilog ++ * @syscap SystemCapability.HiviewDFX.HiLog ++ * @crossplatform ++ * @since 10 ++ */ + /** +-* Provides interfaces to generate system logs. +-* +-* @namespace hilog +-* @syscap SystemCapability.HiviewDFX.HiLog +-* @crossplatform +-* @atomicservice +-* @since 11 +-*/ ++ * Provides interfaces to generate system logs. ++ * ++ * @namespace hilog ++ * @syscap SystemCapability.HiviewDFX.HiLog ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + declare namespace hilog { + + /** +@@ -80,7 +82,21 @@ declare namespace hilog { + * @atomicservice + * @since 11 + */ +- function debug(domain: number, tag: string, format: string, ...args: any[]): void; ++ /** ++ * Outputs debug-level logs. ++ * ++ * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF ++ * if the value exceeds the range, logs cannot be printed. ++ * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. ++ * @param { string } format Indicates the log format string. ++ * @param { (Object | undefined | null)[] }args Indicates the log parameters. ++ * @syscap SystemCapability.HiviewDFX.HiLog ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.1&1.2 ++ */ ++ function debug(domain: number, tag: string, format: string, ...args: (Object | undefined | null)[]): void; + + /** + * Outputs info-level logs. +@@ -118,7 +134,21 @@ declare namespace hilog { + * @atomicservice + * @since 11 + */ +- function info(domain: number, tag: string, format: string, ...args: any[]): void; ++ /** ++ * Outputs info-level logs. ++ * ++ * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF ++ * if the value exceeds the range, logs cannot be printed. ++ * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. ++ * @param { string } format Indicates the log format string. ++ * @param { (Object | undefined | null)[] }args Indicates the log parameters. ++ * @syscap SystemCapability.HiviewDFX.HiLog ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.1&1.2 ++ */ ++ function info(domain: number, tag: string, format: string, ...args: (Object | undefined | null)[]): void; + + /** + * Outputs warning-level logs. +@@ -156,7 +186,21 @@ declare namespace hilog { + * @atomicservice + * @since 11 + */ +- function warn(domain: number, tag: string, format: string, ...args: any[]): void; ++ /** ++ * Outputs warning-level logs. ++ * ++ * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF ++ * if the value exceeds the range, logs cannot be printed. ++ * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. ++ * @param { string } format Indicates the log format string. ++ * @param { (Object | undefined | null)[] }args Indicates the log parameters. ++ * @syscap SystemCapability.HiviewDFX.HiLog ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.1&1.2 ++ */ ++ function warn(domain: number, tag: string, format: string, ...args: (Object | undefined | null)[]): void; + + /** + * Outputs error-level logs. +@@ -194,7 +238,21 @@ declare namespace hilog { + * @atomicservice + * @since 11 + */ +- function error(domain: number, tag: string, format: string, ...args: any[]): void; ++ /** ++ * Outputs error-level logs. ++ * ++ * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF ++ * if the value exceeds the range, logs cannot be printed. ++ * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. ++ * @param { string } format Indicates the log format string. ++ * @param { (Object | undefined | null)[] }args Indicates the log parameters. ++ * @syscap SystemCapability.HiviewDFX.HiLog ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.1&1.2 ++ */ ++ function error(domain: number, tag: string, format: string, ...args: (Object | undefined | null)[]): void; + + /** + * Outputs fatal-level logs. +@@ -232,7 +290,21 @@ declare namespace hilog { + * @atomicservice + * @since 11 + */ +- function fatal(domain: number, tag: string, format: string, ...args: any[]): void; ++ /** ++ * Outputs fatal-level logs. ++ * ++ * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF ++ * if the value exceeds the range, logs cannot be printed. ++ * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. ++ * @param { string } format Indicates the log format string. ++ * @param { (Object | undefined | null)[] }args Indicates the log parameters. ++ * @syscap SystemCapability.HiviewDFX.HiLog ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.1&1.2 ++ */ ++ function fatal(domain: number, tag: string, format: string, ...args: (Object | undefined | null)[]): void; + + /** + * Checks whether logs of the specified tag, and level can be printed. +@@ -255,7 +327,8 @@ declare namespace hilog { + * @returns { boolean } + * @syscap SystemCapability.HiviewDFX.HiLog + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isLoggable(domain: number, tag: string, level: LogLevel): boolean; + +@@ -265,7 +338,8 @@ declare namespace hilog { + * @param { LogLevel } level log level + * @syscap SystemCapability.HiviewDFX.HiLog + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setMinLogLevel(level: LogLevel): void; + +@@ -290,7 +364,8 @@ declare namespace hilog { + * @syscap SystemCapability.HiviewDFX.HiLog + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum LogLevel { + /** +@@ -312,7 +387,8 @@ declare namespace hilog { + * @syscap SystemCapability.HiviewDFX.HiLog + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DEBUG = 3, + /** +@@ -334,7 +410,8 @@ declare namespace hilog { + * @syscap SystemCapability.HiviewDFX.HiLog + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INFO = 4, + /** +@@ -356,7 +433,8 @@ declare namespace hilog { + * @syscap SystemCapability.HiviewDFX.HiLog + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WARN = 5, + /** +@@ -378,7 +456,8 @@ declare namespace hilog { + * @syscap SystemCapability.HiviewDFX.HiLog + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ERROR = 6, + /** +@@ -400,7 +479,8 @@ declare namespace hilog { + * @syscap SystemCapability.HiviewDFX.HiLog + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FATAL = 7 + } +diff --git a/api/@ohos.hiviewdfx.hiAppEvent.d.ets b/api/@ohos.hiviewdfx.hiAppEvent.d.ets +deleted file mode 100644 +index c990aed68..000000000 +--- a/api/@ohos.hiviewdfx.hiAppEvent.d.ets ++++ /dev/null +@@ -1,1395 +0,0 @@ +-/* +- * Copyright (c) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-/** +- * @file +- * @kit PerformanceAnalysisKit +- */ +- +-import { AsyncCallback } from '@ohos.base'; +- +-/** +- * Provides the event logging function for applications to log the fault, statistical, security, +- * and user behavior events reported during running. Based on event information, +- * you will be able to analyze the running status of applications. +- * +- * @namespace hiAppEvent +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +-/** +- * Provides the event logging function for applications to log the fault, statistical, security, +- * and user behavior events reported during running. Based on event information, +- * you will be able to analyze the running status of applications. +- * +- * @namespace hiAppEvent +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +-declare namespace hiAppEvent { +- /** +- * Enumerate application event types. +- * +- * @enum { number } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Enumerate application event types. +- * +- * @enum { number } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export enum EventType { +- /** +- * Fault event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Fault event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- FAULT = 1, +- +- /** +- * Statistic event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Statistic event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- STATISTIC = 2, +- +- /** +- * Security event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Security event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- SECURITY = 3, +- +- /** +- * User behavior event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * User behavior event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- BEHAVIOR = 4 +- } +- +- /** +- * Preset domain. +- * +- * @namespace domain +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export namespace domain { +- /** +- * the domain of operating system. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- const OS: string; +- } +- +- /** +- * Preset event. +- * +- * @namespace event +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Preset event. +- * +- * @namespace event +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 11 +- */ +- export namespace event { +- /** +- * User login event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * User login event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- const USER_LOGIN: string; +- +- /** +- * User logout event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * User logout event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- const USER_LOGOUT: string; +- +- /** +- * Distributed service event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Distributed service event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- const DISTRIBUTED_SERVICE_START: string; +- +- /** +- * crash event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- const APP_CRASH: string; +- +- /** +- * freeze event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- const APP_FREEZE: string; +- +- /** +- * launch event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- const APP_LAUNCH: string; +- +- /** +- * scroll jank event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- const SCROLL_JANK: string; +- +- /** +- * cpu usage high event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- const CPU_USAGE_HIGH: string; +- +- /** +- * battery usage event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- const BATTERY_USAGE: string; +- +- /** +- * resource overlimit event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- const RESOURCE_OVERLIMIT: string; +- +- /** +- * address sanitizer event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- const ADDRESS_SANITIZER: string; +- +- /** +- * main thread jank event. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- const MAIN_THREAD_JANK: string; +- } +- +- /** +- * Preset param. +- * +- * @namespace param +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Preset param. +- * +- * @namespace param +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export namespace param { +- /** +- * User id. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * User id. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- const USER_ID: string; +- +- /** +- * Distributed service name. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Distributed service name. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- const DISTRIBUTED_SERVICE_NAME: string; +- +- /** +- * Distributed service instance id. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Distributed service instance id. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- const DISTRIBUTED_SERVICE_INSTANCE_ID: string; +- } +- +- /** +- * Application event logging configuration interface. +- * +- * @param { ConfigOption } config Application event logging configuration item object. +- * @throws { BusinessError } 401 - Parameter error. +- * @throws { BusinessError } 11103001 - Invalid max storage quota value. +- * @static +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Application event logging configuration interface. +- * +- * @param { ConfigOption } config Application event logging configuration item object. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @throws { BusinessError } 11103001 - Invalid max storage quota value. +- * @static +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export function configure(config: ConfigOption): void; +- +- /** +- * Describe the options for the configuration. +- * +- * @interface ConfigOption +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Describe the options for the configuration. +- * +- * @interface ConfigOption +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export interface ConfigOption { +- /** +- * Configuration item: application event logging switch. +- * +- * @type { ?boolean } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Configuration item: application event logging switch. +- * +- * @type { ?boolean } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- disable?: boolean; +- +- /** +- * Configuration item: event file directory storage quota size. +- * +- * @type { ?string } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Configuration item: event file directory storage quota size. +- * +- * @type { ?string } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- maxStorage?: string; +- } +- +- /** +- * Definition of written application event information. +- * +- * @interface AppEventInfo +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Definition of written application event information. +- * +- * @interface AppEventInfo +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export interface AppEventInfo { +- /** +- * The domain of the event. +- * +- * @type { string } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * The domain of the event. +- * +- * @type { string } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- domain: string; +- +- /** +- * The name of the event. +- * +- * @type { string } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * The name of the event. +- * +- * @type { string } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- name: string; +- +- /** +- * The type of the event. +- * +- * @type { EventType } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * The type of the event. +- * +- * @type { EventType } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- eventType: EventType; +- +- /** +- * The params of the event. +- * +- * @type { Record } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * The params of the event. +- * +- * @type { Record } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- params: Record; +- } +- +- /** +- * Write application event. +- * +- * @param { AppEventInfo } info Application event information to be written. +- * @returns { Promise } Return Promise. +- * @throws { BusinessError } 401 - Parameter error. +- * @throws { BusinessError } 11100001 - Function disabled. +- * @throws { BusinessError } 11101001 - Invalid event domain. +- * @throws { BusinessError } 11101002 - Invalid event name. +- * @throws { BusinessError } 11101003 - Invalid number of event parameters. +- * @throws { BusinessError } 11101004 - Invalid string length of the event parameter. +- * @throws { BusinessError } 11101005 - Invalid event parameter name. +- * @throws { BusinessError } 11101006 - Invalid array length of the event parameter. +- * @static +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Write application event. +- * +- * @param { AppEventInfo } info Application event information to be written. +- * @returns { Promise } Return Promise. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @throws { BusinessError } 11100001 - Function disabled. +- * @throws { BusinessError } 11101001 - Invalid event domain. +- * @throws { BusinessError } 11101002 - Invalid event name. +- * @throws { BusinessError } 11101003 - Invalid number of event parameters. +- * @throws { BusinessError } 11101004 - Invalid string length of the event parameter. +- * @throws { BusinessError } 11101005 - Invalid event parameter name. +- * @throws { BusinessError } 11101006 - Invalid array length of the event parameter. +- * @static +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export function write(info: AppEventInfo): Promise; +- +- /** +- * Write application event. +- * +- * @param { AppEventInfo } info Application event information to be written. +- * @param { AsyncCallback } callback Callback function. +- * @throws { BusinessError } 401 - Parameter error. +- * @throws { BusinessError } 11100001 - Function disabled. +- * @throws { BusinessError } 11101001 - Invalid event domain. +- * @throws { BusinessError } 11101002 - Invalid event name. +- * @throws { BusinessError } 11101003 - Invalid number of event parameters. +- * @throws { BusinessError } 11101004 - Invalid string length of the event parameter. +- * @throws { BusinessError } 11101005 - Invalid event parameter name. +- * @throws { BusinessError } 11101006 - Invalid array length of the event parameter. +- * @static +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Write application event. +- * +- * @param { AppEventInfo } info Application event information to be written. +- * @param { AsyncCallback } callback Callback function. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @throws { BusinessError } 11100001 - Function disabled. +- * @throws { BusinessError } 11101001 - Invalid event domain. +- * @throws { BusinessError } 11101002 - Invalid event name. +- * @throws { BusinessError } 11101003 - Invalid number of event parameters. +- * @throws { BusinessError } 11101004 - Invalid string length of the event parameter. +- * @throws { BusinessError } 11101005 - Invalid event parameter name. +- * @throws { BusinessError } 11101006 - Invalid array length of the event parameter. +- * @static +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export function write(info: AppEventInfo, callback: AsyncCallback): void; +- +- /** +- * Indicates possible parameter types. +- * +- * @typedef {number | string | boolean | Array} +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- type ParamType = number | string | boolean | Array; +- +- /** +- * It is used to set custom parameters for events, including both system-subscribed events and custom events. +- * Existing parameter will be overwritten, and non-existing parameter will be created. +- * +- * @param { Record } params The parameters of the event. +- * @param { string } domain The domain of the event. +- * @param { string } name The name of the event. +- * @returns { Promise } Return Promise. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @throws { BusinessError } 11101007 - The number of parameter keys exceeds the limit. +- * @static +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export function setEventParam(params: Record, domain: string, name?: string): Promise; +- +- /** +- * Set the config for the os event. +- * +- * @param { string } name The name of the os event. +- * @param { Record } config The config info of the os event. +- * @returns { Promise } Return Promise. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3.Parameter verification failed. +- * @static +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export function setEventConfig(name: string, config: Record): Promise; +- +- /** +- * Definition of the read event package. +- * +- * @interface AppEventPackage +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Definition of the read event package. +- * +- * @interface AppEventPackage +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export interface AppEventPackage { +- /** +- * The id of the package. +- * +- * @type { number } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * The id of the package. +- * +- * @type { number } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- packageId: number; +- +- /** +- * The number of events contained in the package. +- * +- * @type { number } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * The number of events contained in the package. +- * +- * @type { number } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- row: number; +- +- /** +- * The total size of events contained in the package. +- * +- * @type { number } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * The total size of events contained in the package. +- * +- * @type { number } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- size: number; +- +- /** +- * The events data contained in the package. +- * +- * @type { string[] } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * The events data contained in the package. +- * +- * @type { string[] } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- data: string[]; +- +- /** +- * The event json format data contained in the package. +- * +- * @type { Array } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- appEventInfos: Array; +- } +- +- /** +- * Definition of event holder object, which is used to read the event data monitored by the watcher. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Definition of event holder object, which is used to read the event data monitored by the watcher. +- * +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export class AppEventPackageHolder { +- /** +- * Constructor for AppEventPackageHolder. +- * +- * @param { string } watcherName Name of the watcher to read. +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Constructor for AppEventPackageHolder. +- * +- * @param { string } watcherName Name of the watcher to read. +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- constructor(watcherName: string); +- +- /** +- * Set the threshold size per read. +- * +- * @param { number } size Threshold size. +- * @throws { BusinessError } 401 - Parameter error. +- * @throws { BusinessError } 11104001 - Invalid size value. +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Set the threshold size per read. +- * +- * @param { number } size Threshold size. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @throws { BusinessError } 11104001 - Invalid size value. +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- setSize(size: number): void; +- +- /** +- * Set the number of rows per read. +- * +- * @param { number } size Row size. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @throws { BusinessError } 11104001 - Invalid size value. +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- setRow(size: number): void; +- +- /** +- * Read the event data monitored by the watcher. +- * +- * @returns { AppEventPackage } The read event package. +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Read the event data monitored by the watcher. +- * +- * @returns { AppEventPackage } The read event package. +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- takeNext(): AppEventPackage; +- } +- +- /** +- * Definition of the condition for triggering callback when the watcher monitors event data. +- * +- * @interface TriggerCondition +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Definition of the condition for triggering callback when the watcher monitors event data. +- * +- * @interface TriggerCondition +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export interface TriggerCondition { +- /** +- * The number of write events that trigger callback. +- * +- * @type { ?number } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * The number of write events that trigger callback. +- * +- * @type { ?number } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- row?: number; +- +- /** +- * The size of write events that trigger callback. +- * +- * @type { ?number } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * The size of write events that trigger callback. +- * +- * @type { ?number } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- size?: number; +- +- /** +- * The interval for triggering callback. +- * +- * @type { ?number } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * The interval for triggering callback. +- * +- * @type { ?number } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- timeOut?: number; +- } +- +- /** +- * Definition of event filter object, which is used to filter events monitored by the watcher. +- * +- * @interface AppEventFilter +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Definition of event filter object, which is used to filter events monitored by the watcher. +- * +- * @interface AppEventFilter +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export interface AppEventFilter { +- /** +- * The name of the event domain to be monitored by the watcher. +- * +- * @type { string } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * The name of the event domain to be monitored by the watcher. +- * +- * @type { string } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- domain: string; +- +- /** +- * The types of the events to be monitored by the watcher. +- * +- * @type { ?EventType[] } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * The types of the events to be monitored by the watcher. +- * +- * @type { ?EventType[] } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- eventTypes?: EventType[]; +- +- /** +- * The names of the events to be monitored by the watcher. +- * +- * @type { ?string[] } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- names?: string[]; +- } +- +- /** +- * Definition of event group. +- * +- * @interface AppEventGroup +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export interface AppEventGroup { +- /** +- * The name of the event. +- * +- * @type { string } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- name: string; +- +- /** +- * The event array which is group by the name. +- * +- * @type { Array } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- appEventInfos: Array; +- } +- +- /** +- * Definition of event watcher object, which is used to monitor written event data. +- * +- * @interface Watcher +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Definition of event watcher object, which is used to monitor written event data. +- * +- * @interface Watcher +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export interface Watcher { +- /** +- * The name of watcher. +- * +- * @type { string } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * The name of watcher. +- * +- * @type { string } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- name: string; +- +- /** +- * The condition for triggering callback. +- * +- * @type { ?TriggerCondition } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * The condition for triggering callback. +- * +- * @type { ?TriggerCondition } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- triggerCondition?: TriggerCondition; +- +- /** +- * The event filters for monitoring events. +- * +- * @type { ?AppEventFilter[] } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * The event filters for monitoring events. +- * +- * @type { ?AppEventFilter[] } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- appEventFilters?: AppEventFilter[]; +- +- /** +- * The callback function of watcher. +- * +- * @type { ?function } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * The callback function of watcher. +- * +- * @type { ?function } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- onTrigger?: (curRow: number, curSize: number, holder: AppEventPackageHolder) => void; +- +- /** +- * The callback function, when watcher receive the event. +- * +- * @type { ?function } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- onReceive?: (domain: string, appEventGroups: Array) => void; +- } +- +- /** +- * Add event watcher. +- * +- * @param { Watcher } watcher Watcher object for monitoring events. +- * @returns { AppEventPackageHolder } Holder object, which is used to read the monitoring data of the watcher. +- * @throws { BusinessError } 401 - Parameter error. +- * @throws { BusinessError } 11102001 - Invalid watcher name. +- * @throws { BusinessError } 11102002 - Invalid filtering event domain. +- * @throws { BusinessError } 11102003 - Invalid row value. +- * @throws { BusinessError } 11102004 - Invalid size value. +- * @throws { BusinessError } 11102005 - Invalid timeout value. +- * @static +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Add event watcher. +- * +- * @param { Watcher } watcher Watcher object for monitoring events. +- * @returns { AppEventPackageHolder } Holder object, which is used to read the monitoring data of the watcher. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @throws { BusinessError } 11102001 - Invalid watcher name. +- * @throws { BusinessError } 11102002 - Invalid filtering event domain. +- * @throws { BusinessError } 11102003 - Invalid row value. +- * @throws { BusinessError } 11102004 - Invalid size value. +- * @throws { BusinessError } 11102005 - Invalid timeout value. +- * @static +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export function addWatcher(watcher: Watcher): AppEventPackageHolder; +- +- /** +- * Remove event watcher. +- * +- * @param { Watcher } watcher Watcher object for monitoring events. +- * @throws { BusinessError } 401 - Parameter error. +- * @throws { BusinessError } 11102001 - Invalid watcher name. +- * @static +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Remove event watcher. +- * +- * @param { Watcher } watcher Watcher object for monitoring events. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @throws { BusinessError } 11102001 - Invalid watcher name. +- * @static +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export function removeWatcher(watcher: Watcher): void; +- +- /** +- * Clear all local logging data of the application. +- * +- * @static +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @since 20 +- */ +- /** +- * Clear all local logging data of the application. +- * +- * @static +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export function clearData(): void; +- +- /** +- * Set user ID. +- * +- * @param { string } name The key of the user ID. +- * @param { string } value The value of the user ID. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @static +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export function setUserId(name: string, value: string): void; +- +- /** +- * Get user ID. +- * +- * @param { string } name The key of the user ID. +- * @returns { string } the user ID value. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @static +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export function getUserId(name: string): string; +- +- /** +- * Set user property. +- * +- * @param { string } name The key of the user property. +- * @param { string } value The value of the user property. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @static +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export function setUserProperty(name: string, value: string): void; +- +- /** +- * Get user property. +- * +- * @param { string } name The key of the user property. +- * @returns { string } the user property value. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @static +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export function getUserProperty(name: string): string; +- +- /** +- * Describe the event config to be reported by processor. +- * +- * @interface AppEventReportConfig +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export interface AppEventReportConfig { +- /** +- * The domain of the event. +- * +- * @type { ?string } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- domain?: string; +- +- /** +- * The name of the event. +- * +- * @type { ?string } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- name?: string; +- +- /** +- * The realtime report event. +- * +- * @type { ?boolean } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- isRealTime?: boolean; +- } +- +- /** +- * Definition of the processor. +- * +- * @interface Processor +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export interface Processor { +- /** +- * The name of the processor. +- * +- * @type { string } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- name: string; +- +- /** +- * The processor enable the developer to debug. +- * +- * @type { ?boolean } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- debugMode?: boolean; +- +- /** +- * The server location which used for the processor to receive the data, defined by the processor. +- * +- * @type { ?string } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- routeInfo?: string; +- +- /** +- * The app ID is provided by the processor. +- * +- * @type { ?string } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- appId?: string; +- +- /** +- * The processor report the event when start. +- * +- * @type { ?boolean } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- onStartReport?: boolean; +- +- /** +- * The processor report the event when the application onBackground. +- * +- * @type { ?boolean } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- onBackgroundReport?: boolean; +- +- /** +- * The processor report the event according to the period. +- * +- * @type { ?number } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- periodReport?: int; +- +- /** +- * The processor report the event according to the batch size. +- * +- * @type { ?number } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- batchReport?: int; +- +- /** +- * The user ID names which the processor can report. +- * +- * @type { ?string[] } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- userIds?: string[]; +- +- /** +- * The user property names which the processor can report. +- * +- * @type { ?string[] } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- userProperties?: string[]; +- +- /** +- * The events which the processor can report. +- * +- * @type { ?AppEventReportConfig[] } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- eventConfigs?: AppEventReportConfig[]; +- +- /** +- * The processor config id. +- * +- * @type { ?number } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- configId?: int; +- +- /** +- * The processor set custom config data. +- * +- * @type { ?Record } +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- customConfigs?: Record; +- } +- +- /** +- * Add the processor, who can report the event. +- * +- * @param { Processor } processor The instance which report the event +- * @returns { number } The processor unique ID. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @static +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export function addProcessor(processor: Processor): number; +- +- /** +- * Remove the processor. +- * +- * @param { number } id The processor unique ID. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types. +- * @static +- * @syscap SystemCapability.HiviewDFX.HiAppEvent +- * @atomicservice +- * @since 20 +- */ +- export function removeProcessor(id: number): void; +-} +- +-export default hiAppEvent; +diff --git a/api/@ohos.hiviewdfx.hiAppEvent.d.ts b/api/@ohos.hiviewdfx.hiAppEvent.d.ts +index 182510902..481980b23 100644 +--- a/api/@ohos.hiviewdfx.hiAppEvent.d.ts ++++ b/api/@ohos.hiviewdfx.hiAppEvent.d.ts +@@ -37,7 +37,8 @@ import type { AsyncCallback } from './@ohos.base'; + * @namespace hiAppEvent + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace hiAppEvent { + /** +@@ -53,7 +54,8 @@ declare namespace hiAppEvent { + * @enum { number } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum EventType { + /** +@@ -67,7 +69,8 @@ declare namespace hiAppEvent { + * + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FAULT = 1, + +@@ -82,7 +85,8 @@ declare namespace hiAppEvent { + * + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + STATISTIC = 2, + +@@ -97,7 +101,8 @@ declare namespace hiAppEvent { + * + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SECURITY = 3, + +@@ -112,7 +117,8 @@ declare namespace hiAppEvent { + * + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BEHAVIOR = 4 + } +@@ -123,7 +129,8 @@ declare namespace hiAppEvent { + * @namespace domain + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + namespace domain { + /** +@@ -131,7 +138,8 @@ declare namespace hiAppEvent { + * + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const OS: string; + } +@@ -149,7 +157,8 @@ declare namespace hiAppEvent { + * @namespace event + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + namespace event { + /** +@@ -163,7 +172,8 @@ declare namespace hiAppEvent { + * + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const USER_LOGIN: string; + +@@ -178,7 +188,8 @@ declare namespace hiAppEvent { + * + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const USER_LOGOUT: string; + +@@ -193,7 +204,8 @@ declare namespace hiAppEvent { + * + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const DISTRIBUTED_SERVICE_START: string; + +@@ -202,7 +214,8 @@ declare namespace hiAppEvent { + * + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const APP_CRASH: string; + +@@ -211,7 +224,8 @@ declare namespace hiAppEvent { + * + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const APP_FREEZE: string; + +@@ -220,7 +234,8 @@ declare namespace hiAppEvent { + * + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const APP_LAUNCH: string; + +@@ -229,7 +244,8 @@ declare namespace hiAppEvent { + * + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const SCROLL_JANK: string; + +@@ -238,7 +254,8 @@ declare namespace hiAppEvent { + * + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const CPU_USAGE_HIGH: string; + +@@ -247,7 +264,8 @@ declare namespace hiAppEvent { + * + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const BATTERY_USAGE: string; + +@@ -256,7 +274,8 @@ declare namespace hiAppEvent { + * + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const RESOURCE_OVERLIMIT: string; + +@@ -265,7 +284,8 @@ declare namespace hiAppEvent { + * + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const ADDRESS_SANITIZER: string; + +@@ -274,7 +294,8 @@ declare namespace hiAppEvent { + * + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const MAIN_THREAD_JANK: string; + } +@@ -292,7 +313,8 @@ declare namespace hiAppEvent { + * @namespace param + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + namespace param { + /** +@@ -306,7 +328,8 @@ declare namespace hiAppEvent { + * + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const USER_ID: string; + +@@ -321,7 +344,8 @@ declare namespace hiAppEvent { + * + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const DISTRIBUTED_SERVICE_NAME: string; + +@@ -336,7 +360,8 @@ declare namespace hiAppEvent { + * + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + const DISTRIBUTED_SERVICE_INSTANCE_ID: string; + } +@@ -361,7 +386,8 @@ declare namespace hiAppEvent { + * @static + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function configure(config: ConfigOption): void; + +@@ -378,7 +404,8 @@ declare namespace hiAppEvent { + * @interface ConfigOption + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ConfigOption { + /** +@@ -394,7 +421,8 @@ declare namespace hiAppEvent { + * @type { ?boolean } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + disable?: boolean; + +@@ -411,7 +439,8 @@ declare namespace hiAppEvent { + * @type { ?string } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + maxStorage?: string; + } +@@ -429,7 +458,8 @@ declare namespace hiAppEvent { + * @interface AppEventInfo + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface AppEventInfo { + /** +@@ -445,7 +475,8 @@ declare namespace hiAppEvent { + * @type { string } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + domain: string; + +@@ -462,7 +493,8 @@ declare namespace hiAppEvent { + * @type { string } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + name: string; + +@@ -479,7 +511,8 @@ declare namespace hiAppEvent { + * @type { EventType } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + eventType: EventType; + +@@ -496,7 +529,8 @@ declare namespace hiAppEvent { + * @type { object } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + params: object; + } +@@ -535,7 +569,8 @@ declare namespace hiAppEvent { + * @static + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function write(info: AppEventInfo): Promise; + +@@ -573,7 +608,8 @@ declare namespace hiAppEvent { + * @static + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function write(info: AppEventInfo, callback: AsyncCallback): void; + +@@ -583,7 +619,8 @@ declare namespace hiAppEvent { + * @typedef {number | string | boolean | Array} + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type ParamType = number | string | boolean | Array; + +@@ -601,7 +638,8 @@ declare namespace hiAppEvent { + * @static + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setEventParam(params: Record, domain: string, name?: string): Promise; + +@@ -616,7 +654,8 @@ declare namespace hiAppEvent { + * @static + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setEventConfig(name: string, config: Record): Promise; + +@@ -633,7 +672,8 @@ declare namespace hiAppEvent { + * @interface AppEventPackage + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface AppEventPackage { + /** +@@ -649,7 +689,8 @@ declare namespace hiAppEvent { + * @type { number } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + packageId: number; + +@@ -666,7 +707,8 @@ declare namespace hiAppEvent { + * @type { number } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + row: number; + +@@ -683,7 +725,8 @@ declare namespace hiAppEvent { + * @type { number } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + size: number; + +@@ -700,7 +743,8 @@ declare namespace hiAppEvent { + * @type { string[] } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + data: string[]; + +@@ -710,7 +754,8 @@ declare namespace hiAppEvent { + * @type { Array } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + appEventInfos: Array; + } +@@ -726,7 +771,8 @@ declare namespace hiAppEvent { + * + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class AppEventPackageHolder { + /** +@@ -742,7 +788,8 @@ declare namespace hiAppEvent { + * @param { string } watcherName Name of the watcher to read. + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + constructor(watcherName: string); + +@@ -764,7 +811,8 @@ declare namespace hiAppEvent { + * @throws { BusinessError } 11104001 - Invalid size value. + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setSize(size: number): void; + +@@ -777,7 +825,8 @@ declare namespace hiAppEvent { + * @throws { BusinessError } 11104001 - Invalid size value. + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setRow(size: number): void; + +@@ -794,7 +843,8 @@ declare namespace hiAppEvent { + * @returns { AppEventPackage } The read event package. + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + takeNext(): AppEventPackage; + } +@@ -812,7 +862,8 @@ declare namespace hiAppEvent { + * @interface TriggerCondition + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface TriggerCondition { + /** +@@ -828,7 +879,8 @@ declare namespace hiAppEvent { + * @type { ?number } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + row?: number; + +@@ -845,7 +897,8 @@ declare namespace hiAppEvent { + * @type { ?number } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + size?: number; + +@@ -862,7 +915,8 @@ declare namespace hiAppEvent { + * @type { ?number } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + timeOut?: number; + } +@@ -880,7 +934,8 @@ declare namespace hiAppEvent { + * @interface AppEventFilter + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface AppEventFilter { + /** +@@ -896,7 +951,8 @@ declare namespace hiAppEvent { + * @type { string } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + domain: string; + +@@ -913,7 +969,8 @@ declare namespace hiAppEvent { + * @type { ?EventType[] } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + eventTypes?: EventType[]; + +@@ -923,7 +980,8 @@ declare namespace hiAppEvent { + * @type { ?string[] } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + names?: string[]; + } +@@ -934,7 +992,8 @@ declare namespace hiAppEvent { + * @interface AppEventGroup + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface AppEventGroup { + /** +@@ -943,7 +1002,8 @@ declare namespace hiAppEvent { + * @type { string } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + name: string; + +@@ -953,7 +1013,8 @@ declare namespace hiAppEvent { + * @type { Array } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + appEventInfos: Array; + } +@@ -971,7 +1032,8 @@ declare namespace hiAppEvent { + * @interface Watcher + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Watcher { + /** +@@ -987,7 +1049,8 @@ declare namespace hiAppEvent { + * @type { string } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + name: string; + +@@ -1004,7 +1067,8 @@ declare namespace hiAppEvent { + * @type { ?TriggerCondition } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + triggerCondition?: TriggerCondition; + +@@ -1021,7 +1085,8 @@ declare namespace hiAppEvent { + * @type { ?AppEventFilter[] } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + appEventFilters?: AppEventFilter[]; + +@@ -1038,7 +1103,8 @@ declare namespace hiAppEvent { + * @type { ?function } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onTrigger?: (curRow: number, curSize: number, holder: AppEventPackageHolder) => void; + +@@ -1048,7 +1114,8 @@ declare namespace hiAppEvent { + * @type { ?function } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onReceive?: (domain: string, appEventGroups: Array) => void; + } +@@ -1083,7 +1150,8 @@ declare namespace hiAppEvent { + * @static + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function addWatcher(watcher: Watcher): AppEventPackageHolder; + +@@ -1107,7 +1175,8 @@ declare namespace hiAppEvent { + * @static + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function removeWatcher(watcher: Watcher): void; + +@@ -1124,7 +1193,8 @@ declare namespace hiAppEvent { + * @static + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function clearData(): void; + +@@ -1138,7 +1208,8 @@ declare namespace hiAppEvent { + * @static + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setUserId(name: string, value: string): void; + +@@ -1152,7 +1223,8 @@ declare namespace hiAppEvent { + * @static + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getUserId(name: string): string; + +@@ -1166,7 +1238,8 @@ declare namespace hiAppEvent { + * @static + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setUserProperty(name: string, value: string): void; + +@@ -1180,7 +1253,8 @@ declare namespace hiAppEvent { + * @static + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getUserProperty(name: string): string; + +@@ -1190,7 +1264,8 @@ declare namespace hiAppEvent { + * @interface AppEventReportConfig + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface AppEventReportConfig { + /** +@@ -1199,7 +1274,8 @@ declare namespace hiAppEvent { + * @type { ?string } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + domain?: string; + +@@ -1209,7 +1285,8 @@ declare namespace hiAppEvent { + * @type { ?string } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + name?: string; + +@@ -1219,7 +1296,8 @@ declare namespace hiAppEvent { + * @type { ?boolean } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isRealTime?: boolean; + } +@@ -1230,7 +1308,8 @@ declare namespace hiAppEvent { + * @interface Processor + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Processor { + /** +@@ -1239,7 +1318,8 @@ declare namespace hiAppEvent { + * @type { string } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + name: string; + +@@ -1249,7 +1329,8 @@ declare namespace hiAppEvent { + * @type { ?boolean } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + debugMode?: boolean; + +@@ -1259,7 +1340,8 @@ declare namespace hiAppEvent { + * @type { ?string } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + routeInfo?: string; + +@@ -1269,7 +1351,8 @@ declare namespace hiAppEvent { + * @type { ?string } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + appId?: string; + +@@ -1279,7 +1362,8 @@ declare namespace hiAppEvent { + * @type { ?boolean } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onStartReport?: boolean; + +@@ -1289,7 +1373,8 @@ declare namespace hiAppEvent { + * @type { ?boolean } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onBackgroundReport?: boolean; + +@@ -1299,7 +1384,8 @@ declare namespace hiAppEvent { + * @type { ?number } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + periodReport?: number; + +@@ -1309,7 +1395,8 @@ declare namespace hiAppEvent { + * @type { ?number } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + batchReport?: number; + +@@ -1319,7 +1406,8 @@ declare namespace hiAppEvent { + * @type { ?string[] } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + userIds?: string[]; + +@@ -1329,7 +1417,8 @@ declare namespace hiAppEvent { + * @type { ?string[] } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + userProperties?: string[]; + +@@ -1339,7 +1428,8 @@ declare namespace hiAppEvent { + * @type { ?AppEventReportConfig[] } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + eventConfigs?: AppEventReportConfig[]; + +@@ -1349,7 +1439,8 @@ declare namespace hiAppEvent { + * @type { ?number } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + configId?: number; + +@@ -1359,7 +1450,8 @@ declare namespace hiAppEvent { + * @type { ?Record } + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + customConfigs?: Record; + } +@@ -1374,7 +1466,8 @@ declare namespace hiAppEvent { + * @static + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function addProcessor(processor: Processor): number; + +@@ -1387,7 +1480,8 @@ declare namespace hiAppEvent { + * @static + * @syscap SystemCapability.HiviewDFX.HiAppEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function removeProcessor(id: number): void; + } +diff --git a/api/@ohos.i18n.d.ts b/api/@ohos.i18n.d.ts +index bf4e0fbbd..79c6acc5d 100644 +--- a/api/@ohos.i18n.d.ts ++++ b/api/@ohos.i18n.d.ts +@@ -3892,11 +3892,11 @@ declare namespace i18n { + * + * @param { intl.NumberFormat | SimpleNumberFormat } numberFormat - Indicates the number format object that used to format number. + * @param { StyledNumberFormatOptions } [ options ] - Indicates the options used to format the number. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Global.I18n + * @atomicservice + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 ++ * @deprecated since 20 + */ + constructor(numberFormat: intl.NumberFormat | SimpleNumberFormat, options?: StyledNumberFormatOptions); + +diff --git a/api/@ohos.inputMethod.d.ts b/api/@ohos.inputMethod.d.ts +index 9edc69070..5577361e8 100644 +--- a/api/@ohos.inputMethod.d.ts ++++ b/api/@ohos.inputMethod.d.ts +@@ -17,7 +17,7 @@ + * @file + * @kit IMEKit + */ +-import type { Callback, AsyncCallback, /*** if arkts 1.1 */int /*** endif */} from './@ohos.base'; ++import type { Callback, AsyncCallback } from './@ohos.base'; + import InputMethodSubtype from './@ohos.InputMethodSubtype'; + /*** if arkts 1.1 */ + import type { ElementName } from './bundleManager/ElementName'; +@@ -1478,13 +1478,13 @@ declare namespace inputMethod { + /** + * The label id of input method + * +- * @type { ?number } ++ * @type { ?double } + * @readonly + * @syscap SystemCapability.MiscServices.InputMethodFramework +- * @since arkts {'1.1':'9', '1.2':'20'} ++ * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly labelId?: number; ++ readonly labelId?: double; + + /** + * The icon of input method +@@ -1500,13 +1500,13 @@ declare namespace inputMethod { + /** + * The icon id of input method + * +- * @type { ?number } ++ * @type { ?double } + * @readonly + * @syscap SystemCapability.MiscServices.InputMethodFramework + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly iconId?: number; ++ readonly iconId?: double; + + /** + * The extra info of input method +@@ -1911,42 +1911,42 @@ declare namespace inputMethod { + /** + * Indicates the left point of the cursor info and must be absolute coordinate of the physical screen. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.MiscServices.InputMethodFramework + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- left: number; ++ left: double; + + /** + * Indicates the top point of the cursor info and must be absolute coordinate of the physical screen. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.MiscServices.InputMethodFramework + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- top: number; ++ top: double; + + /** + * Indicates the width point of the cursor info. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.MiscServices.InputMethodFramework + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- width: number; ++ width: double; + + /** + * Indicates the height point of the cursor info. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.MiscServices.InputMethodFramework + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- height: number; ++ height: double; + } + + /** +@@ -2087,22 +2087,22 @@ declare namespace inputMethod { + /** + * Indicates the width of the input window. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.MiscServices.InputMethodFramework + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- width: number; ++ width: double; + + /** + * Indicates the height of the input window. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.MiscServices.InputMethodFramework + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- height: number; ++ height: double; + } + + /** +diff --git a/api/@ohos.inputMethodList.d.ets b/api/@ohos.inputMethodList.d.ets +index 3d83cd762..81d1fc6fd 100644 +--- a/api/@ohos.inputMethodList.d.ets ++++ b/api/@ohos.inputMethodList.d.ets +@@ -18,9 +18,6 @@ + * @kit IMEKit + */ + +-import { Resource } from './global/resource'; +-import { CustomDialogController } from './arkui/component/customDialogController' +- + /** + * Define pattern options of keyboard. + * +@@ -87,10 +84,8 @@ export interface Pattern { + * @syscap SystemCapability.MiscServices.InputMethodFramework + * @since 11 + */ +-/** +- * @CustomDialog +- */ +-declare interface InputMethodListDialog { ++@CustomDialog ++export declare struct InputMethodListDialog { + /** + * Sets the controller. + * +@@ -107,5 +102,4 @@ declare interface InputMethodListDialog { + * @since 11 + */ + patternOptions?: PatternOptions; +-} +-export InputMethodListDialog; +\ No newline at end of file ++} +\ No newline at end of file +diff --git a/api/@ohos.logLibrary.d.ets b/api/@ohos.logLibrary.d.ets +deleted file mode 100644 +index a1c3f1b3a..000000000 +--- a/api/@ohos.logLibrary.d.ets ++++ /dev/null +@@ -1,192 +0,0 @@ +-/* +- * Copyright (c) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-/** +- * @file +- * @kit PerformanceAnalysisKit +- */ +- +-import type { AsyncCallback } from './@ohos.base'; +- +-/** +- * @namespace logLibrary +- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary +- * @systemapi +- * @since 20 +- */ +-declare namespace logLibrary { +- /** +- * Log file entry +- * +- * @typedef LogEntry +- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary +- * @systemapi +- * @since 20 +- */ +- export interface LogEntry { +- /** +- * Log file name +- * +- * @type { string } +- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary +- * @systemapi +- * @since 20 +- */ +- name: string; +- +- /** +- * File modification time, expressed by the number of seconds elapsed from 1970-01-01 +- * +- * @type { number } +- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary +- * @systemapi +- * @since 20 +- */ +- mtime: number; +- +- /** +- * Log file size, byte +- * +- * @type { number } +- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary +- * @systemapi +- * @since 20 +- */ +- size: number; +- } +- +- /** +- * List all log names of log type +- * +- * @permission ohos.permission.READ_HIVIEW_SYSTEM +- * @param { string } logType - Log type +- * @returns { LogEntry[] } Return LogEntry[] +- * @throws { BusinessError } 201 - Permission denied +- * @throws { BusinessError } 202 - Permission denied, non-system app called system api +- * @throws { BusinessError } 401 - Invalid argument. Possible causes: +- *
    1. Mandatory parameters are left unspecified. +- *
    2. Incorrect parameter types. +- *
    3. Parameter verification failed. +- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary +- * @systemapi +- * @since 20 +- */ +- export function list(logType: string): LogEntry[]; +- +- /** +- * Copy log to dest path +- * +- * @permission ohos.permission.READ_HIVIEW_SYSTEM +- * @param { string } logType - Log type +- * @param { string } logName - Log name +- * @param { string } dest - Log path under hiview sandbox of HAP +- * @returns { Promise } Return Promise +- * @throws { BusinessError } 201 - Permission denied +- * @throws { BusinessError } 202 - Permission denied, non-system app called system api +- * @throws { BusinessError } 401 - Invalid argument. Possible causes: +- *
    1. Mandatory parameters are left unspecified. +- *
    2. Incorrect parameter types. +- *
    3. Parameter verification failed. +- * @throws { BusinessError } 21300001 - Source file does not exists +- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary +- * @systemapi +- * @since 20 +- */ +- export function copy(logType: string, logName: string, dest: string): Promise; +- +- /** +- * Copy log to dest path +- * +- * @permission ohos.permission.READ_HIVIEW_SYSTEM +- * @param { string } logType - Log type +- * @param { string } logName - Log name +- * @param { string } dest - Log path under hiview sandbox of HAP +- * @param { AsyncCallback } callback - After finish copy log will callback +- * @throws { BusinessError } 201 - Permission denied +- * @throws { BusinessError } 202 - Permission denied, non-system app called system api +- * @throws { BusinessError } 401 - Invalid argument. Possible causes: +- *
    1. Mandatory parameters are left unspecified. +- *
    2. Incorrect parameter types. +- *
    3. Parameter verification failed. +- * @throws { BusinessError } 21300001 - Source file does not exists +- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary +- * @systemapi +- * @since 20 +- */ +- export function copy(logType: string, logName: string, dest: string, callback: AsyncCallback): void; +- +- /** +- * Move log to dest path +- * +- * @permission ohos.permission.WRITE_HIVIEW_SYSTEM +- * @param { string } logType - Log type +- * @param { string } logName - Log name +- * @param { string } dest - Log path under hiview sandbox of HAP +- * @returns { Promise } Return Promise +- * @throws { BusinessError } 201 - Permission denied +- * @throws { BusinessError } 202 - Permission denied, non-system app called system api +- * @throws { BusinessError } 401 - Invalid argument. Possible causes: +- *
    1. Mandatory parameters are left unspecified. +- *
    2. Incorrect parameter types. +- *
    3. Parameter verification failed. +- * @throws { BusinessError } 21300001 - Source file does not exists +- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary +- * @systemapi +- * @since 20 +- */ +- export function move(logType: string, logName: string, dest: string): Promise; +- +- /** +- * Move log to dest path +- * +- * @permission ohos.permission.WRITE_HIVIEW_SYSTEM +- * @param { string } logType - Log type +- * @param { string } logName - Log name +- * @param { string } dest - Log path under hiview sandbox of HAP +- * @param { AsyncCallback } callback - After finish move log will callback +- * @throws { BusinessError } 201 - Permission denied +- * @throws { BusinessError } 202 - Permission denied, non-system app called system api +- * @throws { BusinessError } 401 - Invalid argument. Possible causes: +- *
    1. Mandatory parameters are left unspecified. +- *
    2. Incorrect parameter types. +- *
    3. Parameter verification failed. +- * @throws { BusinessError } 21300001 - Source file does not exists +- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary +- * @systemapi +- * @since 20 +- */ +- export function move(logType: string, logName: string, dest: string, callback: AsyncCallback): void; +- +- /** +- * Delete the log based on log name and log type +- * +- * @permission ohos.permission.WRITE_HIVIEW_SYSTEM +- * @param { string } logType - Log type +- * @param { string } logName - Log name +- * @throws { BusinessError } 201 - Permission denied +- * @throws { BusinessError } 202 - Permission denied, non-system app called system api +- * @throws { BusinessError } 401 - Invalid argument. Possible causes: +- *
    1. Mandatory parameters are left unspecified. +- *
    2. Incorrect parameter types. +- *
    3. Parameter verification failed. +- * @throws { BusinessError } 21300001 - Source file does not exists +- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary +- * @systemapi +- * @since 20 +- */ +- export function remove(logType: string, logName: string): void; +-} +- +-export default logLibrary; +diff --git a/api/@ohos.logLibrary.d.ts b/api/@ohos.logLibrary.d.ts +index e73e661af..f6ce0a56b 100644 +--- a/api/@ohos.logLibrary.d.ts ++++ b/api/@ohos.logLibrary.d.ts +@@ -24,7 +24,8 @@ import type { AsyncCallback } from './@ohos.base'; + * @namespace logLibrary + * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace logLibrary { + /** +@@ -33,7 +34,8 @@ declare namespace logLibrary { + * @typedef LogEntry + * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface LogEntry { + /** +@@ -42,7 +44,8 @@ declare namespace logLibrary { + * @type { string } + * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + name: string; + +@@ -52,7 +55,8 @@ declare namespace logLibrary { + * @type { number } + * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + mtime: number; + +@@ -62,7 +66,8 @@ declare namespace logLibrary { + * @type { number } + * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + size: number; + } +@@ -81,7 +86,8 @@ declare namespace logLibrary { + *
    3. Parameter verification failed. + * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function list(logType: string): LogEntry[]; + +@@ -102,7 +108,8 @@ declare namespace logLibrary { + * @throws { BusinessError } 21300001 - Source file does not exists + * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function copy(logType: string, logName: string, dest: string): Promise; + +@@ -123,7 +130,8 @@ declare namespace logLibrary { + * @throws { BusinessError } 21300001 - Source file does not exists + * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function copy(logType: string, logName: string, dest: string, callback: AsyncCallback): void; + +@@ -144,7 +152,8 @@ declare namespace logLibrary { + * @throws { BusinessError } 21300001 - Source file does not exists + * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function move(logType: string, logName: string, dest: string): Promise; + +@@ -165,7 +174,8 @@ declare namespace logLibrary { + * @throws { BusinessError } 21300001 - Source file does not exists + * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function move(logType: string, logName: string, dest: string, callback: AsyncCallback): void; + +@@ -184,7 +194,8 @@ declare namespace logLibrary { + * @throws { BusinessError } 21300001 - Source file does not exists + * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function remove(logType: string, logName: string): void; + } +diff --git a/api/@ohos.matrix4.d.ts b/api/@ohos.matrix4.d.ts +index 697edb1b7..079963f1b 100644 +--- a/api/@ohos.matrix4.d.ts ++++ b/api/@ohos.matrix4.d.ts +@@ -69,7 +69,7 @@ declare namespace matrix4 { + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- interface TranslateOption { ++ export interface TranslateOption { + /** + * Indicates the translation distance of the x-axis, in px. + * +@@ -177,7 +177,7 @@ declare namespace matrix4 { + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- interface ScaleOption { ++ export interface ScaleOption { + /** + * Zoom factor of the x-axis. + * +@@ -339,7 +339,7 @@ declare namespace matrix4 { + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- interface RotateOption { ++ export interface RotateOption { + /** + * Axis of rotation vector x coordinate. + * +@@ -643,7 +643,7 @@ declare namespace matrix4 { + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- interface Matrix4Transit { ++ export interface Matrix4Transit { + /** + * Copy function of Matrix, which can copy a copy of the current matrix object. + * +diff --git a/api/@ohos.multimedia.audio.d.ts b/api/@ohos.multimedia.audio.d.ts +index 6389c9884..4e9a3a755 100644 +--- a/api/@ohos.multimedia.audio.d.ts ++++ b/api/@ohos.multimedia.audio.d.ts +@@ -825,6 +825,20 @@ declare namespace audio { + * @arkts 1.1&1.2 + */ + USB_DEVICE = 25, ++ /** ++ * HDMI device, such as HDMI, ARC, eARC ++ * @syscap SystemCapability.Multimedia.Audio.Device ++ * @since arkts {'1.1':'19','1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ HDMI = 27, ++ /** ++ * Line connected digital output device, such as s/pdif ++ * @syscap SystemCapability.Multimedia.Audio.Device ++ * @since arkts {'1.1':'19','1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ LINE_DIGITAL = 28, + /** + * Distributed virtualization audio device. + * @syscap SystemCapability.Multimedia.Audio.Device +diff --git a/api/@ohos.multimedia.avCastPickerParam.d.ts b/api/@ohos.multimedia.avCastPickerParam.d.ts +index a98cb4282..6cc41b8d7 100644 +--- a/api/@ohos.multimedia.avCastPickerParam.d.ts ++++ b/api/@ohos.multimedia.avCastPickerParam.d.ts +@@ -29,7 +29,8 @@ + * @enum { number } + * @syscap SystemCapability.Multimedia.AVSession.AVCast + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export declare enum AVCastPickerState { + /** +@@ -64,7 +65,8 @@ export declare enum AVCastPickerState { + * @enum { number } + * @syscap SystemCapability.Multimedia.AVSession.AVCast + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export declare enum AVCastPickerStyle { + /** +@@ -89,7 +91,8 @@ export declare enum AVCastPickerStyle { + * @enum { number } + * @syscap SystemCapability.Multimedia.AVSession.AVCast + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export declare enum AVCastPickerColorMode { + /** +diff --git a/api/@ohos.multimedia.avsession.d.ts b/api/@ohos.multimedia.avsession.d.ts +index 3fb8470f7..18cb86367 100644 +--- a/api/@ohos.multimedia.avsession.d.ts ++++ b/api/@ohos.multimedia.avsession.d.ts +@@ -19,7 +19,7 @@ + */ + + import type { ErrorCallback, AsyncCallback, Callback } from './@ohos.base'; +-import { WantAgent } from './@ohos.wantAgent'; ++import { WantAgent } from './@ohos.app.ability.wantAgent'; + import { KeyEvent } from './@ohos.multimodalInput.keyEvent'; + import { ElementName } from './bundleManager/ElementName'; + import image from './@ohos.multimedia.image'; +diff --git a/api/@ohos.multimedia.camera.d.ts b/api/@ohos.multimedia.camera.d.ts +index 12a3abe04..bb136d7cd 100644 +--- a/api/@ohos.multimedia.camera.d.ts ++++ b/api/@ohos.multimedia.camera.d.ts +@@ -53,7 +53,7 @@ declare namespace camera { + /** + * Enum for camera status. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 +@@ -99,7 +99,7 @@ declare namespace camera { + /** + * Enum for fold status. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 +@@ -138,7 +138,8 @@ declare namespace camera { + * + * @typedef Profile + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Profile { + /** +@@ -147,7 +148,8 @@ declare namespace camera { + * @type { CameraFormat } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly format: CameraFormat; + +@@ -157,7 +159,8 @@ declare namespace camera { + * @type { Size } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly size: Size; + } +@@ -167,28 +170,31 @@ declare namespace camera { + * + * @typedef FrameRateRange + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface FrameRateRange { + /** + * Min frame rate. + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly min: number; ++ readonly min: int; + + /** + * Max frame rate. + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly max: number; ++ readonly max: int; + } + + /** +@@ -197,7 +203,8 @@ declare namespace camera { + * @extends Profile + * @typedef VideoProfile + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface VideoProfile extends Profile { + /** +@@ -206,7 +213,8 @@ declare namespace camera { + * @type { FrameRateRange } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly frameRateRange: FrameRateRange; + } +@@ -216,7 +224,8 @@ declare namespace camera { + * + * @typedef CameraOutputCapability + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface CameraOutputCapability { + /** +@@ -225,7 +234,8 @@ declare namespace camera { + * @type { Array } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly previewProfiles: Array; + +@@ -235,7 +245,8 @@ declare namespace camera { + * @type { Array } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly photoProfiles: Array; + +@@ -245,7 +256,8 @@ declare namespace camera { + * @type { Array } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly videoProfiles: Array; + +@@ -256,7 +268,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly depthProfiles: Array; + +@@ -266,7 +279,8 @@ declare namespace camera { + * @type { Array } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly supportedMetadataObjectTypes: Array; + } +@@ -274,16 +288,18 @@ declare namespace camera { + /** + * Enum for camera error code. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum CameraErrorCode { + /** + * Parameter missing or parameter type incorrect. + * + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INVALID_ARGUMENT = 7400101, + +@@ -291,7 +307,8 @@ declare namespace camera { + * Operation not allowed. + * + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + OPERATION_NOT_ALLOWED = 7400102, + +@@ -299,7 +316,8 @@ declare namespace camera { + * Session not config. + * + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SESSION_NOT_CONFIG = 7400103, + +@@ -307,7 +325,8 @@ declare namespace camera { + * Session not running. + * + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SESSION_NOT_RUNNING = 7400104, + +@@ -315,7 +334,8 @@ declare namespace camera { + * Session config locked. + * + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SESSION_CONFIG_LOCKED = 7400105, + +@@ -323,7 +343,8 @@ declare namespace camera { + * Device setting locked. + * + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DEVICE_SETTING_LOCKED = 7400106, + +@@ -331,7 +352,8 @@ declare namespace camera { + * Can not use camera cause of conflict. + * + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CONFLICT_CAMERA = 7400107, + +@@ -339,7 +361,8 @@ declare namespace camera { + * Camera disabled cause of security reason. + * + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DEVICE_DISABLED = 7400108, + +@@ -347,7 +370,8 @@ declare namespace camera { + * Can not use camera cause of preempted. + * + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DEVICE_PREEMPTED = 7400109, + +@@ -355,7 +379,8 @@ declare namespace camera { + * Unresolved conflicts with current configurations. + * + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + UNRESOLVED_CONFLICTS_WITH_CURRENT_CONFIGURATIONS = 7400110, + +@@ -364,7 +389,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DEVICE_FREQUENTLY_SWITCHED = 7400111, + +@@ -373,7 +399,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CAMERA_LENS_RETRACTED = 7400112, + +@@ -381,7 +408,8 @@ declare namespace camera { + * Camera service fatal error. + * + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SERVICE_FATAL_ERROR = 7400201 + } +@@ -389,7 +417,7 @@ declare namespace camera { + /** + * Enum for restore parameter. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi + * @since arkts {'1.1':'11','1.2':'20'} +@@ -440,35 +468,35 @@ declare namespace camera { + /** + * Skin smooth level value for restore. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- skinSmoothLevel: number; ++ skinSmoothLevel: int; + + /** + * Face slender value for restore. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- faceSlender: number; ++ faceSlender: int; + + /** + * Skin tone value for restore. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- skinTone: number; ++ skinTone: int; + } + + /** +@@ -477,7 +505,8 @@ declare namespace camera { + * @typedef PrelaunchConfig + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PrelaunchConfig { + /** +@@ -486,7 +515,8 @@ declare namespace camera { + * @type { CameraDevice } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + cameraDevice: CameraDevice; + +@@ -496,19 +526,21 @@ declare namespace camera { + * @type { ?RestoreParamType } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + restoreParamType?: RestoreParamType; + + /** + * Begin active time. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- activeTime?: number; ++ activeTime?: int; + + /** + * Setting parameter. +@@ -516,7 +548,8 @@ declare namespace camera { + * @type { ?SettingParam } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + settingParam?: SettingParam; + } +@@ -535,7 +568,8 @@ declare namespace camera { + * + * @returns { Array } An array of supported cameras. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSupportedCameras(): Array; + +@@ -557,7 +591,8 @@ declare namespace camera { + * @param { CameraDevice } camera - Camera device. + * @returns { Array } An array of supported scene mode of camera. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSupportedSceneModes(camera: CameraDevice): Array; + +@@ -568,7 +603,8 @@ declare namespace camera { + * @param { SceneMode } mode - Scene mode. + * @returns { CameraOutputCapability } The camera output capability. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSupportedOutputCapability(camera: CameraDevice, mode: SceneMode): CameraOutputCapability; + +@@ -577,7 +613,8 @@ declare namespace camera { + * + * @returns { boolean } Is camera muted. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isCameraMuted(): boolean; + +@@ -596,7 +633,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isCameraMuteSupported(): boolean; + +@@ -623,7 +661,8 @@ declare namespace camera { + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + muteCameraPersistent(mute: boolean, type: PolicyType): void; + +@@ -647,7 +686,8 @@ declare namespace camera { + * @throws { BusinessError } 7400102 - Operation not allowed. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + createCameraInput(camera: CameraDevice): CameraInput; + +@@ -673,7 +713,8 @@ declare namespace camera { + * @throws { BusinessError } 7400102 - Operation not allowed. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + createCameraInput(position: CameraPosition, type: CameraType): CameraInput; + +@@ -696,7 +737,8 @@ declare namespace camera { + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + createPreviewOutput(profile: Profile, surfaceId: string): PreviewOutput; + +@@ -710,7 +752,8 @@ declare namespace camera { + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + createPreviewOutput(surfaceId: string): PreviewOutput; + +@@ -751,7 +794,8 @@ declare namespace camera { + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + createPhotoOutput(profile?: Profile): PhotoOutput; + +@@ -774,7 +818,8 @@ declare namespace camera { + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + createVideoOutput(profile: VideoProfile, surfaceId: string): VideoOutput; + +@@ -788,7 +833,8 @@ declare namespace camera { + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + createVideoOutput(surfaceId: string): VideoOutput; + +@@ -809,7 +855,8 @@ declare namespace camera { + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + createMetadataOutput(metadataObjectTypes: Array): MetadataOutput; + +@@ -822,7 +869,8 @@ declare namespace camera { + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + createDepthDataOutput(profile: DepthProfile): DepthDataOutput; + +@@ -848,7 +896,8 @@ declare namespace camera { + * 3. Parameter verification failed. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + createSession(mode: SceneMode): T; + +@@ -858,7 +907,8 @@ declare namespace camera { + * @param { 'cameraStatus' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the camera status change. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'cameraStatus', callback: AsyncCallback): void; + +@@ -868,7 +918,8 @@ declare namespace camera { + * @param { 'cameraStatus' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the camera status change. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'cameraStatus', callback?: AsyncCallback): void; + +@@ -878,7 +929,8 @@ declare namespace camera { + * @param { 'foldStatusChanged' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the fold status change. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'foldStatusChange', callback: AsyncCallback): void; + +@@ -888,7 +940,8 @@ declare namespace camera { + * @param { 'foldStatusChanged' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the fold status change. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'foldStatusChange', callback?: AsyncCallback): void; + +@@ -909,7 +962,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'cameraMute', callback: AsyncCallback): void; + +@@ -930,7 +984,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'cameraMute', callback?: AsyncCallback): void; + +@@ -955,7 +1010,8 @@ declare namespace camera { + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isPrelaunchSupported(camera: CameraDevice): boolean; + +@@ -983,7 +1039,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setPrelaunchConfig(prelaunchConfig: PrelaunchConfig): void; + +@@ -1028,7 +1085,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + preSwitchCamera(cameraId: string): void; + +@@ -1053,7 +1111,8 @@ declare namespace camera { + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + createDeferredPreviewOutput(profile?: Profile): PreviewOutput; + +@@ -1062,7 +1121,8 @@ declare namespace camera { + * + * @returns { boolean } this value that specifies whether the device has a torch. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isTorchSupported(): boolean; + +@@ -1071,7 +1131,8 @@ declare namespace camera { + * @param { TorchMode } mode - torch mode. + * @returns { boolean } is torch mode supported. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isTorchModeSupported(mode: TorchMode): boolean; + +@@ -1080,7 +1141,8 @@ declare namespace camera { + * + * @returns { TorchMode } torch mode. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getTorchMode(): TorchMode; + +@@ -1100,7 +1162,8 @@ declare namespace camera { + * @throws { BusinessError } 7400102 - Operation not allowed. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setTorchMode(mode: TorchMode): void; + +@@ -1110,7 +1173,8 @@ declare namespace camera { + * @param { 'torchStatusChange' } type - Event type + * @param { AsyncCallback } callback - Callback used to return the torch status change + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'torchStatusChange', callback: AsyncCallback): void; + +@@ -1120,7 +1184,8 @@ declare namespace camera { + * @param { 'torchStatusChange' } type - Event type + * @param { AsyncCallback } callback - Callback used to return the torch status change + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'torchStatusChange', callback?: AsyncCallback): void; + } +@@ -1130,7 +1195,8 @@ declare namespace camera { + * + * @typedef TorchStatusInfo + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface TorchStatusInfo { + /** +@@ -1139,7 +1205,8 @@ declare namespace camera { + * @type { boolean } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly isTorchAvailable: boolean; + +@@ -1149,25 +1216,27 @@ declare namespace camera { + * @type { boolean } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly isTorchActive: boolean; + + /** + * the current torch brightness level. + * +- * @type { number } ++ * @type { double } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly torchLevel: number; ++ readonly torchLevel: double; + } + + /** + * Enum for torch mode. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 +@@ -1206,7 +1275,8 @@ declare namespace camera { + * + * @typedef CameraStatusInfo + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface CameraStatusInfo { + /** +@@ -1214,7 +1284,8 @@ declare namespace camera { + * + * @type { CameraDevice } + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + camera: CameraDevice; + +@@ -1223,7 +1294,8 @@ declare namespace camera { + * + * @type { CameraStatus } + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + status: CameraStatus; + } +@@ -1233,7 +1305,8 @@ declare namespace camera { + * + * @typedef FoldStatusInfo + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface FoldStatusInfo { + /** +@@ -1242,7 +1315,8 @@ declare namespace camera { + * @type { Array } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly supportedCameras: Array; + +@@ -1252,7 +1326,8 @@ declare namespace camera { + * @type { FoldStatus } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly foldStatus: FoldStatus; + } +@@ -1260,14 +1335,14 @@ declare namespace camera { + /** + * Enum for camera position. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since 10 + */ + /** + * Enum for camera position. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} +@@ -1342,7 +1417,7 @@ declare namespace camera { + /** + * Enum for camera type. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 +@@ -1397,7 +1472,7 @@ declare namespace camera { + /** + * Enum for camera connection type. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 +@@ -1434,7 +1509,7 @@ declare namespace camera { + /** + * Enum for remote camera device type. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi + * @since 10 +@@ -1442,7 +1517,7 @@ declare namespace camera { + /** + * Enum for remote camera device type. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 +@@ -1502,7 +1577,8 @@ declare namespace camera { + * + * @typedef CameraDevice + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface CameraDevice { + /** +@@ -1511,7 +1587,8 @@ declare namespace camera { + * @type { string } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly cameraId: string; + +@@ -1521,7 +1598,8 @@ declare namespace camera { + * @type { CameraPosition } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly cameraPosition: CameraPosition; + +@@ -1531,7 +1609,8 @@ declare namespace camera { + * @type { CameraType } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly cameraType: CameraType; + +@@ -1541,7 +1620,8 @@ declare namespace camera { + * @type { ConnectionType } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly connectionType: ConnectionType; + +@@ -1560,7 +1640,8 @@ declare namespace camera { + * @type { string } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly hostDeviceName: string; + +@@ -1579,19 +1660,21 @@ declare namespace camera { + * @type { HostDeviceType } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly hostDeviceType: HostDeviceType; + + /** + * Camera sensor orientation attribute. + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly cameraOrientation: number; ++ readonly cameraOrientation: int; + + /** + * Camera device retractable attribute +@@ -1600,7 +1683,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly isRetractable?: boolean; + } +@@ -1617,22 +1701,22 @@ declare namespace camera { + /** + * Height. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- height: number; ++ height: int; + + /** + * Width. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- width: number; ++ width: int; + } + + /** +@@ -1647,22 +1731,22 @@ declare namespace camera { + /** + * x co-ordinate + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- x: number; ++ x: double; + + /** + * y co-ordinate + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- y: number; ++ y: double; + } + + /** +@@ -1670,7 +1754,8 @@ declare namespace camera { + * + * @interface CameraInput + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface CameraInput { + /** +@@ -1681,7 +1766,8 @@ declare namespace camera { + * @throws { BusinessError } 7400108 - Camera disabled cause of security reason. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + open(callback: AsyncCallback): void; + +@@ -1694,7 +1780,8 @@ declare namespace camera { + * @throws { BusinessError } 7400108 - Camera disabled cause of security reason. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + open(): Promise; + +@@ -1707,7 +1794,8 @@ declare namespace camera { + * @throws { BusinessError } 7400108 - Camera disabled cause of security reason. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + open(isSecureEnabled: boolean): Promise; + +@@ -1717,7 +1805,8 @@ declare namespace camera { + * @param { AsyncCallback } callback - Callback used to return the result. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + close(callback: AsyncCallback): void; + +@@ -1727,23 +1816,25 @@ declare namespace camera { + * @returns { Promise } Promise used to return the result. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + close(): Promise; + + /** + * Delay close camera. + * +- * @param { number } time - delay time for turning off camera. ++ * @param { int } time - delay time for turning off camera. + * @returns { Promise } Promise used to return the result. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- closeDelayed(time: number): Promise; ++ closeDelayed(time: int): Promise; + + /** + * Subscribes to error events. +@@ -1752,7 +1843,8 @@ declare namespace camera { + * @param { CameraDevice } camera - Camera device. + * @param { ErrorCallback } callback - Callback used to get the camera input errors. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', camera: CameraDevice, callback: ErrorCallback): void; + +@@ -1763,7 +1855,8 @@ declare namespace camera { + * @param { CameraDevice } camera - Camera device. + * @param { ErrorCallback } callback - Callback used to get the camera input errors. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', camera: CameraDevice, callback?: ErrorCallback): void; + +@@ -1775,7 +1868,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'cameraOcclusionDetection', callback: AsyncCallback): void; + +@@ -1787,7 +1881,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'cameraOcclusionDetection', callback?: AsyncCallback): void; + +@@ -1803,7 +1898,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + controlAuxiliary(auxiliaryType: AuxiliaryType, auxiliaryStatus: AuxiliaryStatus): Promise; + } +@@ -1811,7 +1907,7 @@ declare namespace camera { + /** + * Enumerates the camera scene modes. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 +@@ -1988,7 +2084,7 @@ declare namespace camera { + /** + * Enum for camera format type. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 +@@ -2082,7 +2178,7 @@ declare namespace camera { + /** + * Enum for flash mode. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 +@@ -2131,7 +2227,8 @@ declare namespace camera { + * @typedef LcdFlashStatus + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface LcdFlashStatus { + /** +@@ -2141,20 +2238,22 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly isLcdFlashNeeded: boolean; + + /** + * Compensate value for lcd flash. + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly lcdCompensation: number; ++ readonly lcdCompensation: int; + } + + /** +@@ -2162,7 +2261,8 @@ declare namespace camera { + * + * @interface FlashQuery + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface FlashQuery { + /** +@@ -2180,7 +2280,8 @@ declare namespace camera { + * @returns { boolean } The flash light support status. + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + hasFlash(): boolean; + +@@ -2201,7 +2302,8 @@ declare namespace camera { + * @returns { boolean } Is the flash mode supported. + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isFlashModeSupported(flashMode: FlashMode): boolean; + +@@ -2213,7 +2315,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isLcdFlashSupported(): boolean; + } +@@ -2224,7 +2327,8 @@ declare namespace camera { + * @extends FlashQuery + * @interface Flash + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Flash extends FlashQuery { + /** +@@ -2233,7 +2337,8 @@ declare namespace camera { + * @returns { FlashMode } The current flash mode. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getFlashMode(): FlashMode; + +@@ -2243,7 +2348,8 @@ declare namespace camera { + * @param { FlashMode } flashMode - Target flash mode. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setFlashMode(flashMode: FlashMode): void; + +@@ -2255,7 +2361,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enableLcdFlash(enabled: boolean): void; + } +@@ -2263,7 +2370,7 @@ declare namespace camera { + /** + * Enum for exposure mode. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 +@@ -2310,10 +2417,11 @@ declare namespace camera { + /** + * Enum for exposure metering mode. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum ExposureMeteringMode { + /** +@@ -2321,7 +2429,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MATRIX = 0, + +@@ -2330,7 +2439,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CENTER = 1, + +@@ -2339,7 +2449,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SPOT = 2 + } +@@ -2349,7 +2460,8 @@ declare namespace camera { + * + * @interface AutoExposureQuery + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface AutoExposureQuery { + /** +@@ -2369,14 +2481,15 @@ declare namespace camera { + * @returns { boolean } Is the exposure mode supported. + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isExposureModeSupported(aeMode: ExposureMode): boolean; + + /** + * Query the exposure compensation range. + * +- * @returns { Array } The array of compensation range. ++ * @returns { Array } The array of compensation range. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @since 11 +@@ -2385,12 +2498,13 @@ declare namespace camera { + * Query the exposure compensation range. + * Move to AutoExposureQuery interface from AutoExposure interface since 12. + * +- * @returns { Array } The array of compensation range. ++ * @returns { Array } The array of compensation range. + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getExposureBiasRange(): Array; ++ getExposureBiasRange(): Array; + + /** + * Checks whether a specified exposure metering mode is supported. +@@ -2402,7 +2516,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isExposureMeteringModeSupported(aeMeteringMode: ExposureMeteringMode): boolean; + } +@@ -2413,7 +2528,8 @@ declare namespace camera { + * @extends AutoExposureQuery + * @interface AutoExposure + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface AutoExposure extends AutoExposureQuery { + /** +@@ -2422,7 +2538,8 @@ declare namespace camera { + * @returns { ExposureMode } The current exposure mode. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getExposureMode(): ExposureMode; + +@@ -2432,7 +2549,8 @@ declare namespace camera { + * @param { ExposureMode } aeMode - Exposure mode + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setExposureMode(aeMode: ExposureMode): void; + +@@ -2442,7 +2560,8 @@ declare namespace camera { + * @returns { Point } The current metering point. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getMeteringPoint(): Point; + +@@ -2452,24 +2571,26 @@ declare namespace camera { + * @param { Point } point - metering point + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setMeteringPoint(point: Point): void; + + /** + * Query the exposure compensation range. + * +- * @returns { Array } The array of compensation range. ++ * @returns { Array } The array of compensation range. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getExposureBiasRange(): Array; ++ getExposureBiasRange(): Array; + + /** + * Set exposure compensation. + * +- * @param { number } exposureBias - Exposure compensation ++ * @param { double } exposureBias - Exposure compensation + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @since 11 +@@ -2477,23 +2598,25 @@ declare namespace camera { + /** + * Set exposure compensation. + * +- * @param { number } exposureBias - Exposure compensation ++ * @param { double } exposureBias - Exposure compensation + * @throws { BusinessError } 7400102 - Operation not allowed. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- setExposureBias(exposureBias: number): void; ++ setExposureBias(exposureBias: double): void; + + /** + * Query the exposure value. + * +- * @returns { number } The exposure value. ++ * @returns { double } The exposure value. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getExposureValue(): number; ++ getExposureValue(): double; + + /** + * Gets current exposure metering mode. +@@ -2503,7 +2626,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getExposureMeteringMode(): ExposureMeteringMode; + +@@ -2516,7 +2640,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setExposureMeteringMode(aeMeteringMode: ExposureMeteringMode): void; + } +@@ -2524,7 +2649,7 @@ declare namespace camera { + /** + * Enum for focus mode. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 +@@ -2570,7 +2695,7 @@ declare namespace camera { + /** + * Enum for focus state. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 +@@ -2607,10 +2732,11 @@ declare namespace camera { + /** + * Enum for focus range type. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum FocusRangeType { + /** +@@ -2618,7 +2744,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AUTO = 0, + +@@ -2627,7 +2754,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NEAR = 1 + } +@@ -2635,10 +2763,11 @@ declare namespace camera { + /** + * Enum for focus driven type. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum FocusDrivenType { + /** +@@ -2646,7 +2775,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AUTO = 0, + +@@ -2655,7 +2785,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FACE = 1 + } +@@ -2663,10 +2794,11 @@ declare namespace camera { + /** + * Enum for focus tracking mode. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum FocusTrackingMode { + /** +@@ -2674,7 +2806,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AUTO = 0 + } +@@ -2685,7 +2818,8 @@ declare namespace camera { + * @typedef FocusTrackingInfo + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface FocusTrackingInfo { + /** +@@ -2694,7 +2828,8 @@ declare namespace camera { + * @type { FocusTrackingMode } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + trackingMode: FocusTrackingMode; + +@@ -2704,7 +2839,8 @@ declare namespace camera { + * @type { Rect } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + trackingRegion: Rect; + } +@@ -2714,7 +2850,8 @@ declare namespace camera { + * + * @interface FocusQuery + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface FocusQuery { + /** +@@ -2734,7 +2871,8 @@ declare namespace camera { + * @returns { boolean } Is the focus mode supported. + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isFocusModeSupported(afMode: FocusMode): boolean; + +@@ -2762,7 +2900,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isFocusRangeTypeSupported(type: FocusRangeType): boolean; + +@@ -2778,7 +2917,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isFocusDrivenTypeSupported(type: FocusDrivenType): boolean; + } +@@ -2789,7 +2929,8 @@ declare namespace camera { + * @extends FocusQuery + * @interface Focus + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Focus extends FocusQuery { + /** +@@ -2798,7 +2939,8 @@ declare namespace camera { + * @returns { FocusMode } The current focus mode. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getFocusMode(): FocusMode; + +@@ -2808,7 +2950,8 @@ declare namespace camera { + * @param { FocusMode } afMode - Target focus mode. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setFocusMode(afMode: FocusMode): void; + +@@ -2818,7 +2961,8 @@ declare namespace camera { + * @param { Point } point - Target focus point. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setFocusPoint(point: Point): void; + +@@ -2828,19 +2972,21 @@ declare namespace camera { + * @returns { Point } The current focus point. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getFocusPoint(): Point; + + /** + * Gets current focal length. + * +- * @returns { number } The current focal point. ++ * @returns { double } The current focal point. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getFocalLength(): number; ++ getFocalLength(): double; + + /** + * Gets current focus assist. +@@ -2863,7 +3009,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setFocusAssist(enabled: boolean): void; + +@@ -2875,7 +3022,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getFocusRange(): FocusRangeType; + +@@ -2892,7 +3040,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setFocusRange(type: FocusRangeType): void; + +@@ -2904,7 +3053,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getFocusDriven(): FocusDrivenType; + +@@ -2921,7 +3071,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setFocusDriven(type: FocusDrivenType): void; + } +@@ -2932,42 +3083,46 @@ declare namespace camera { + * @interface ManualFocus + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ManualFocus { + /** + * Gets current focus distance. + * +- * @returns { number } The current focus distance. ++ * @returns { double } The current focus distance. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getFocusDistance(): number; ++ getFocusDistance(): double; + + /** + * Sets focus distance. + * +- * @param { number } distance - Focus distance ++ * @param { double } distance - Focus distance + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- setFocusDistance(distance: number): void; ++ setFocusDistance(distance: double): void; + } + + /** + * Enumerates the camera white balance modes. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum WhiteBalanceMode { + /** +@@ -2975,7 +3130,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AUTO = 0, + +@@ -2984,7 +3140,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CLOUDY = 1, + +@@ -2993,7 +3150,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INCANDESCENT = 2, + +@@ -3002,7 +3160,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FLUORESCENT = 3, + +@@ -3011,7 +3170,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DAYLIGHT = 4, + +@@ -3020,7 +3180,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MANUAL = 5, + +@@ -3029,7 +3190,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LOCKED = 6 + } +@@ -3040,7 +3202,8 @@ declare namespace camera { + * @interface WhiteBalanceQuery + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface WhiteBalanceQuery { + /** +@@ -3053,21 +3216,23 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isWhiteBalanceModeSupported(mode: WhiteBalanceMode): boolean; + + /** + * Query the white balance mode range. + * +- * @returns { Array } The array of white balance mode range. ++ * @returns { Array } The array of white balance mode range. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getWhiteBalanceRange(): Array; ++ getWhiteBalanceRange(): Array; + } + + /** +@@ -3077,7 +3242,8 @@ declare namespace camera { + * @interface WhiteBalance + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface WhiteBalance extends WhiteBalanceQuery { + /** +@@ -3088,7 +3254,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getWhiteBalanceMode(): WhiteBalanceMode; + +@@ -3101,34 +3268,37 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setWhiteBalanceMode(mode: WhiteBalanceMode): void; + + /** + * Gets current white balance. + * +- * @returns { number } The current white balance. ++ * @returns { int } The current white balance. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getWhiteBalance(): number; ++ getWhiteBalance(): int; + + /** + * Sets white balance. + * +- * @param { number } whiteBalance - White balance. ++ * @param { int } whiteBalance - White balance. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- setWhiteBalance(whiteBalance: number): void; ++ setWhiteBalance(whiteBalance: int): void; + } + + /** +@@ -3137,7 +3307,8 @@ declare namespace camera { + * @interface ManualIsoQuery + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ManualIsoQuery { + /** +@@ -3148,21 +3319,23 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isManualIsoSupported(): boolean; + + /** + * Get the ISO range. + * +- * @returns { Array } The array of ISO range. ++ * @returns { Array } The array of ISO range. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getIsoRange(): Array; ++ getIsoRange(): Array; + } + + /** +@@ -3172,48 +3345,53 @@ declare namespace camera { + * @interface ManualIso + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ManualIso extends ManualIsoQuery { + /** + * Gets current ISO. + * +- * @returns { number } The current ISO. ++ * @returns { int } The current ISO. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getIso(): number; ++ getIso(): int; + + /** + * Sets ISO. + * +- * @param { number } iso - ISO ++ * @param { int } iso - ISO + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- setIso(iso: number): void; ++ setIso(iso: int): void; + } + + /** + * Enum for smooth zoom mode. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum SmoothZoomMode { + /** + * Normal zoom mode. + * + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NORMAL = 0 + } +@@ -3223,17 +3401,19 @@ declare namespace camera { + * + * @typedef SmoothZoomInfo + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface SmoothZoomInfo { + /** + * The duration of smooth zoom. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- duration: number; ++ duration: int; + } + + /** +@@ -3242,30 +3422,33 @@ declare namespace camera { + * @typedef ZoomPointInfo + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ZoomPointInfo { + /** + * The zoom ratio value. + * +- * @type { number } ++ * @type { double } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly zoomRatio: number; ++ readonly zoomRatio: double; + + /** + * The equivalent focal Length. + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly equivalentFocalLength: number; ++ readonly equivalentFocalLength: int; + } + + /** +@@ -3273,13 +3456,14 @@ declare namespace camera { + * + * @interface ZoomQuery + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ZoomQuery { + /** + * Gets all supported zoom ratio range. + * +- * @returns { Array } The zoom ratio range. ++ * @returns { Array } The zoom ratio range. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @since 11 +@@ -3288,12 +3472,13 @@ declare namespace camera { + * Gets all supported zoom ratio range. + * Move to ZoomQuery interface from Zoom since 12. + * +- * @returns { Array } The zoom ratio range. ++ * @returns { Array } The zoom ratio range. + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getZoomRatioRange(): Array; ++ getZoomRatioRange(): Array; + + /** + * Gets all important zoom ratio infos. +@@ -3303,7 +3488,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getZoomPointInfos(): Array; + } +@@ -3314,13 +3500,14 @@ declare namespace camera { + * @extends ZoomQuery + * @interface Zoom + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Zoom extends ZoomQuery { + /** + * Gets zoom ratio. + * +- * @returns { number } The zoom ratio value. ++ * @returns { double } The zoom ratio value. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @since 11 +@@ -3328,34 +3515,37 @@ declare namespace camera { + /** + * Gets zoom ratio. + * +- * @returns { number } The zoom ratio value. ++ * @returns { double } The zoom ratio value. + * @throws { BusinessError } 7400103 - Session not config. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getZoomRatio(): number; ++ getZoomRatio(): double; + + /** + * Sets zoom ratio. + * +- * @param { number } zoomRatio - Target zoom ratio. ++ * @param { double } zoomRatio - Target zoom ratio. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- setZoomRatio(zoomRatio: number): void; ++ setZoomRatio(zoomRatio: double): void; + + /** + * Sets target zoom ratio by smooth method. + * +- * @param { number } targetRatio - Target zoom ratio. ++ * @param { double } targetRatio - Target zoom ratio. + * @param { SmoothZoomMode } mode - Smooth zoom mode. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- setSmoothZoom(targetRatio: number, mode?: SmoothZoomMode): void; ++ setSmoothZoom(targetRatio: double, mode?: SmoothZoomMode): void; + + /** + * Notify device to prepare for zoom. +@@ -3364,7 +3554,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + prepareZoom(): void; + +@@ -3375,7 +3566,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + unprepareZoom(): void; + } +@@ -3383,7 +3575,7 @@ declare namespace camera { + /** + * Enum for video stabilization mode. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 +@@ -3440,7 +3632,8 @@ declare namespace camera { + * + * @interface StabilizationQuery + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface StabilizationQuery { + /** +@@ -3460,7 +3653,8 @@ declare namespace camera { + * @returns { boolean } Is video stabilization mode supported. + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isVideoStabilizationModeSupported(vsMode: VideoStabilizationMode): boolean; + } +@@ -3471,7 +3665,8 @@ declare namespace camera { + * @extends StabilizationQuery + * @interface Stabilization + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Stabilization extends StabilizationQuery { + /** +@@ -3480,7 +3675,8 @@ declare namespace camera { + * @returns { VideoStabilizationMode } The current video stabilization mode. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getActiveVideoStabilizationMode(): VideoStabilizationMode; + +@@ -3490,7 +3686,8 @@ declare namespace camera { + * @param { VideoStabilizationMode } mode - video stabilization mode to set. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setVideoStabilizationMode(mode: VideoStabilizationMode): void; + } +@@ -3498,10 +3695,11 @@ declare namespace camera { + /** + * Enumerates the camera portrait theme types. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PortraitThemeType { + /** +@@ -3509,7 +3707,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NATURAL = 0, + +@@ -3518,7 +3717,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DELICATE = 1, + +@@ -3527,7 +3727,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + STYLISH = 2 + } +@@ -3535,7 +3736,7 @@ declare namespace camera { + /** + * Enumerates the camera beauty effect types. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi + * @since arkts {'1.1':'10','1.2':'20'} +@@ -3589,7 +3790,8 @@ declare namespace camera { + * @interface BeautyQuery + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface BeautyQuery { + /** +@@ -3611,7 +3813,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSupportedBeautyTypes(): Array; + +@@ -3619,7 +3822,7 @@ declare namespace camera { + * Gets the specific beauty effect type range. + * + * @param { BeautyType } type - The type of beauty effect. +- * @returns { Array } The array of the specific beauty effect range. ++ * @returns { Array } The array of the specific beauty effect range. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +@@ -3631,14 +3834,15 @@ declare namespace camera { + * Move to BeautyQuery from Beauty since 12. + * + * @param { BeautyType } type - The type of beauty effect. +- * @returns { Array } The array of the specific beauty effect range. ++ * @returns { Array } The array of the specific beauty effect range. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getSupportedBeautyRange(type: BeautyType): Array; ++ getSupportedBeautyRange(type: BeautyType): Array; + + /** + * Gets supported portrait theme type. +@@ -3648,7 +3852,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSupportedPortraitThemeTypes(): Array; + +@@ -3660,7 +3865,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isPortraitThemeSupported(): boolean; + } +@@ -3672,34 +3878,37 @@ declare namespace camera { + * @interface Beauty + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Beauty extends BeautyQuery { + /** + * Gets the beauty effect in use. + * + * @param { BeautyType } type - The type of beauty effect. +- * @returns { number } the beauty effect in use. ++ * @returns { int } the beauty effect in use. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getBeauty(type: BeautyType): number; ++ getBeauty(type: BeautyType): int; + + /** + * Sets a beauty effect for a camera device. + * + * @param { BeautyType } type - The type of beauty effect. +- * @param { number } value The number of beauty effect. ++ * @param { int } value The number of beauty effect. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- setBeauty(type: BeautyType, value: number): void; ++ setBeauty(type: BeautyType, value: int): void; + + /** + * Sets a portrait theme type for a camera device. +@@ -3710,7 +3919,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setPortraitThemeType(type: PortraitThemeType): void; + } +@@ -3721,7 +3931,8 @@ declare namespace camera { + * @typedef EffectSuggestion + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface EffectSuggestion { + +@@ -3733,7 +3944,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isEffectSuggestionSupported(): boolean; + +@@ -3746,7 +3958,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enableEffectSuggestion(enabled: boolean): void; + +@@ -3758,7 +3971,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSupportedEffectSuggestionTypes(): Array; + +@@ -3772,7 +3986,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setEffectSuggestionStatus(status: Array): void; + +@@ -3786,7 +4001,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + updateEffectSuggestion(type: EffectSuggestionType, enabled: boolean): void; + } +@@ -3794,10 +4010,11 @@ declare namespace camera { + /** + * Enumerates the camera color effect types. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum ColorEffectType { + /** +@@ -3805,7 +4022,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NORMAL = 0, + +@@ -3814,7 +4032,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BRIGHT = 1, + +@@ -3823,7 +4042,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SOFT = 2, + +@@ -3832,7 +4052,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BLACK_WHITE = 3 + } +@@ -3840,10 +4061,11 @@ declare namespace camera { + /** + * Enum for policy type + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PolicyType { + /** +@@ -3851,7 +4073,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRIVACY = 1, + } +@@ -3862,7 +4085,8 @@ declare namespace camera { + * @interface ColorEffectQuery + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ColorEffectQuery { + /** +@@ -3884,7 +4108,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSupportedColorEffects(): Array; + } +@@ -3896,7 +4121,8 @@ declare namespace camera { + * @interface ColorEffect + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ColorEffect extends ColorEffectQuery { + /** +@@ -3907,7 +4133,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getColorEffect(): ColorEffectType; + +@@ -3919,7 +4146,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setColorEffect(type: ColorEffectType): void; + } +@@ -3929,7 +4157,8 @@ declare namespace camera { + * + * @interface ColorManagementQuery + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ColorManagementQuery { + /** +@@ -3938,7 +4167,8 @@ declare namespace camera { + * @returns { Array } The array of the supported color space for the session. + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSupportedColorSpaces(): Array; + } +@@ -3949,7 +4179,8 @@ declare namespace camera { + * @extends ColorManagementQuery + * @interface ColorManagement + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ColorManagement extends ColorManagementQuery { + /** +@@ -3958,7 +4189,8 @@ declare namespace camera { + * @returns { colorSpaceManager.ColorSpace } Current color space. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getActiveColorSpace(): colorSpaceManager.ColorSpace; + +@@ -3971,7 +4203,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setColorSpace(colorSpace: colorSpaceManager.ColorSpace): void; + } +@@ -3981,7 +4214,8 @@ declare namespace camera { + * + * @interface AutoDeviceSwitchQuery + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface AutoDeviceSwitchQuery { + /** +@@ -3990,7 +4224,8 @@ declare namespace camera { + * @returns { boolean } Is auto device switch supported. + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isAutoDeviceSwitchSupported(): boolean; + } +@@ -4001,7 +4236,8 @@ declare namespace camera { + * @extends AutoDeviceSwitchQuery + * @interface AutoDeviceSwitch + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface AutoDeviceSwitch extends AutoDeviceSwitchQuery { + /** +@@ -4015,7 +4251,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enableAutoDeviceSwitch(enabled: boolean): void; + } +@@ -4025,7 +4262,8 @@ declare namespace camera { + * + * @typedef AutoDeviceSwitchStatus + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface AutoDeviceSwitchStatus { + /** +@@ -4034,7 +4272,8 @@ declare namespace camera { + * @type { boolean } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly isDeviceSwitched: boolean; + +@@ -4044,7 +4283,8 @@ declare namespace camera { + * @type { boolean } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly isDeviceCapabilityChanged: boolean; + } +@@ -4055,7 +4295,8 @@ declare namespace camera { + * @interface MacroQuery + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MacroQuery { + /** +@@ -4075,7 +4316,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isMacroSupported(): boolean; + } +@@ -4087,7 +4329,8 @@ declare namespace camera { + * @interface Macro + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Macro extends MacroQuery { + /** +@@ -4109,7 +4352,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enableMacro(enabled: boolean): void; + } +@@ -4117,10 +4361,11 @@ declare namespace camera { + /** + * Enum for usage type used in capture session. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum UsageType { + /** +@@ -4128,7 +4373,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BOKEH = 0 + } +@@ -4138,7 +4384,8 @@ declare namespace camera { + * + * @interface Session + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Session { + /** +@@ -4154,7 +4401,8 @@ declare namespace camera { + * @throws { BusinessError } 7400105 - Session config locked. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + beginConfig(): void; + +@@ -4165,7 +4413,8 @@ declare namespace camera { + * @throws { BusinessError } 7400102 - Operation not allowed. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + commitConfig(callback: AsyncCallback): void; + +@@ -4176,7 +4425,8 @@ declare namespace camera { + * @throws { BusinessError } 7400102 - Operation not allowed. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + commitConfig(): Promise; + +@@ -4187,7 +4437,8 @@ declare namespace camera { + * @param { CameraInput } cameraInput - Target camera input to add. + * @returns { boolean } You can add the input into the session. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + canAddInput(cameraInput: CameraInput): boolean; + +@@ -4212,7 +4463,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + addInput(cameraInput: CameraInput): void; + +@@ -4237,7 +4489,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + removeInput(cameraInput: CameraInput): void; + +@@ -4248,7 +4501,8 @@ declare namespace camera { + * @param { CameraOutput } cameraOutput - Target camera output to add. + * @returns { boolean } You can add the output into the session. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + canAddOutput(cameraOutput: CameraOutput): boolean; + +@@ -4273,7 +4527,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + addOutput(cameraOutput: CameraOutput): void; + +@@ -4298,7 +4553,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + removeOutput(cameraOutput: CameraOutput): void; + +@@ -4319,7 +4575,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + start(callback: AsyncCallback): void; + +@@ -4340,7 +4597,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + start(): Promise; + +@@ -4350,7 +4608,8 @@ declare namespace camera { + * @param { AsyncCallback } callback - Callback used to return the result. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + stop(callback: AsyncCallback): void; + +@@ -4360,7 +4619,8 @@ declare namespace camera { + * @returns { Promise } Promise used to return the result. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + stop(): Promise; + +@@ -4370,7 +4630,8 @@ declare namespace camera { + * @param { AsyncCallback } callback - Callback used to return the result. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + release(callback: AsyncCallback): void; + +@@ -4380,7 +4641,8 @@ declare namespace camera { + * @returns { Promise } Promise used to return the result. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + release(): Promise; + +@@ -4396,7 +4658,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setUsage(usage: UsageType, enabled: boolean): void; + +@@ -4410,7 +4673,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getCameraOutputCapabilities(camera: CameraDevice): Array; + } +@@ -4988,16 +5252,18 @@ declare namespace camera { + * Types of preconfig, which used to configure session conveniently. + * Preconfig type contains common use cases of camera output. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PreconfigType { + /** + * 720P output for preconfig. + * + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRECONFIG_720P = 0, + +@@ -5005,7 +5271,8 @@ declare namespace camera { + * 1080P output for preconfig. + * + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRECONFIG_1080P = 1, + +@@ -5013,7 +5280,8 @@ declare namespace camera { + * 4K output for preconfig. + * + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRECONFIG_4K = 2, + +@@ -5021,7 +5289,8 @@ declare namespace camera { + * high quality output for preconfig. + * + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRECONFIG_HIGH_QUALITY = 3 + } +@@ -5029,16 +5298,18 @@ declare namespace camera { + /** + * The aspect ratios of preconfig, which used to configure session conveniently. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PreconfigRatio { + /** + * Aspect ratio 1:1 for preconfig. + * + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRECONFIG_RATIO_1_1 = 0, + +@@ -5046,7 +5317,8 @@ declare namespace camera { + * Aspect ratio 4:3 for preconfig. + * + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRECONFIG_RATIO_4_3 = 1, + +@@ -5054,7 +5326,8 @@ declare namespace camera { + * Aspect ratio 16:9 for preconfig. + * + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRECONFIG_RATIO_16_9 = 2 + } +@@ -5062,10 +5335,11 @@ declare namespace camera { + /** + * Enum for feature type used in scene detection. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum SceneFeatureType { + /** +@@ -5073,7 +5347,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MOON_CAPTURE_BOOST = 0, + +@@ -5082,7 +5357,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TRIPOD_DETECTION = 1, + +@@ -5091,7 +5367,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LOW_LIGHT_BOOST = 2 + } +@@ -5102,7 +5379,8 @@ declare namespace camera { + * @typedef SceneFeatureDetectionResult + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface SceneFeatureDetectionResult { + /** +@@ -5112,7 +5390,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly featureType: SceneFeatureType; + +@@ -5123,7 +5402,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly detected: boolean; + } +@@ -5131,10 +5411,11 @@ declare namespace camera { + /** + * Enum for tripod status. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum TripodStatus { + /** +@@ -5142,7 +5423,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INVALID = 0, + +@@ -5151,7 +5433,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ACTIVE = 1, + +@@ -5160,7 +5443,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ENTERING = 2, + +@@ -5169,7 +5453,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EXITING = 3, + } +@@ -5181,7 +5466,8 @@ declare namespace camera { + * @interface TripodDetectionResult + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface TripodDetectionResult extends SceneFeatureDetectionResult { + /** +@@ -5191,7 +5477,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly tripodStatus: TripodStatus; + } +@@ -5202,7 +5489,8 @@ declare namespace camera { + * @interface SceneDetectionQuery + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface SceneDetectionQuery { + /** +@@ -5214,7 +5502,8 @@ declare namespace camera { + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isSceneFeatureSupported(type: SceneFeatureType): boolean; + } +@@ -5226,7 +5515,8 @@ declare namespace camera { + * @interface SceneDetection + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface SceneDetection extends SceneDetectionQuery { + /** +@@ -5238,7 +5528,8 @@ declare namespace camera { + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enableSceneFeature(type: SceneFeatureType, enabled: boolean): void; + } +@@ -5259,7 +5550,8 @@ declare namespace camera { + * @interface PhotoSessionForSys + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PhotoSessionForSys extends PhotoSession, Beauty, ColorEffect, ColorManagement, Macro, SceneDetection, EffectSuggestion, DepthFusion { + } +@@ -5277,7 +5569,8 @@ declare namespace camera { + * @extends Session, Flash, AutoExposure, Focus, Zoom, ColorManagement, AutoDeviceSwitch + * @interface PhotoSession + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PhotoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorManagement, AutoDeviceSwitch { + /** +@@ -5290,7 +5583,8 @@ declare namespace camera { + * @returns { boolean } Whether the choosed preconfig type can be used. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + canPreconfig(preconfigType: PreconfigType, preconfigRatio?: PreconfigRatio): boolean; + +@@ -5303,7 +5597,8 @@ declare namespace camera { + * default value {@link PreconfigRatio#PRECONFIG_RATIO_4_3} + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + preconfig(preconfigType: PreconfigType, preconfigRatio?: PreconfigRatio): void; + +@@ -5313,7 +5608,8 @@ declare namespace camera { + * @param { 'error' } type - Event type. + * @param { ErrorCallback } callback - Callback used to get the capture session errors. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -5323,7 +5619,8 @@ declare namespace camera { + * @param { 'error' } type - Event type. + * @param { ErrorCallback } callback - Callback used to get the capture session errors. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + +@@ -5333,7 +5630,8 @@ declare namespace camera { + * @param { 'focusStateChange' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the focus state change. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'focusStateChange', callback: AsyncCallback): void; + +@@ -5343,7 +5641,8 @@ declare namespace camera { + * @param { 'focusStateChange' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the focus state change. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'focusStateChange', callback?: AsyncCallback): void; + +@@ -5353,7 +5652,8 @@ declare namespace camera { + * @param { 'smoothZoomInfoAvailable' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the zoom info. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; + +@@ -5363,7 +5663,8 @@ declare namespace camera { + * @param { 'smoothZoomInfoAvailable' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the zoom info. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; + +@@ -5375,7 +5676,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'macroStatusChanged', callback: AsyncCallback): void; + +@@ -5387,7 +5689,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'macroStatusChanged', callback?: AsyncCallback): void; + +@@ -5400,7 +5703,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'featureDetection', featureType: SceneFeatureType, callback: AsyncCallback): void; + +@@ -5413,7 +5717,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'featureDetection', featureType: SceneFeatureType, callback?: AsyncCallback): void; + +@@ -5424,7 +5729,8 @@ declare namespace camera { + * @param { AsyncCallback } callback - Callback used to return the result. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'effectSuggestionChange', callback: AsyncCallback): void; + +@@ -5435,7 +5741,8 @@ declare namespace camera { + * @param { AsyncCallback } callback - Callback used to return the result. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'effectSuggestionChange', callback?: AsyncCallback): void; + +@@ -5445,7 +5752,8 @@ declare namespace camera { + * @param { 'autoDeviceSwitchStatusChange' } type - Event type. + * @param { AsyncCallback } callback - Callback used to return the result. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'autoDeviceSwitchStatusChange', callback: AsyncCallback): void; + +@@ -5455,7 +5763,8 @@ declare namespace camera { + * @param { 'autoDeviceSwitchStatusChange' } type - Event type. + * @param { AsyncCallback } callback - Callback used to return the result. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'autoDeviceSwitchStatusChange', callback?: AsyncCallback): void; + +@@ -5467,7 +5776,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'lcdFlashStatus', callback: AsyncCallback): void; + +@@ -5479,7 +5789,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'lcdFlashStatus', callback?: AsyncCallback): void; + +@@ -5492,7 +5803,8 @@ declare namespace camera { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. 2.Incorrect parameter types. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSessionFunctions(outputCapability: CameraOutputCapability): Array; + +@@ -5503,7 +5815,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSessionConflictFunctions(): Array; + } +@@ -5524,7 +5837,8 @@ declare namespace camera { + * @interface VideoSessionForSys + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface VideoSessionForSys extends VideoSession, Beauty, ColorEffect, ColorManagement, Macro, Aperture, ColorReservation { + } +@@ -5532,16 +5846,18 @@ declare namespace camera { + /** + * Enum for quality prioritization. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum QualityPrioritization { + /** + * High quality priority. + * + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + HIGH_QUALITY = 0, + +@@ -5549,7 +5865,8 @@ declare namespace camera { + * Power balance priority. + * + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + POWER_BALANCE = 1 + } +@@ -5568,7 +5885,8 @@ declare namespace camera { + * @interface VideoSession + * @extends AutoDeviceSwitch + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface VideoSession extends Session, Flash, AutoExposure, Focus, Zoom, Stabilization, ColorManagement, AutoDeviceSwitch { + /** +@@ -5581,7 +5899,8 @@ declare namespace camera { + * @returns { boolean } Whether the choosed preconfig type can be used. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + canPreconfig(preconfigType: PreconfigType, preconfigRatio?: PreconfigRatio): boolean; + +@@ -5594,7 +5913,8 @@ declare namespace camera { + * default value {@link PreconfigRatio#PRECONFIG_RATIO_16_9}. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + preconfig(preconfigType: PreconfigType, preconfigRatio?: PreconfigRatio): void; + +@@ -5604,7 +5924,8 @@ declare namespace camera { + * @param { 'error' } type - Event type. + * @param { ErrorCallback } callback - Callback used to get the capture session errors. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -5614,7 +5935,8 @@ declare namespace camera { + * @param { 'error' } type - Event type. + * @param { ErrorCallback } callback - Callback used to get the capture session errors. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + +@@ -5624,7 +5946,8 @@ declare namespace camera { + * @param { 'focusStateChange' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the focus state change. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'focusStateChange', callback: AsyncCallback): void; + +@@ -5634,7 +5957,8 @@ declare namespace camera { + * @param { 'focusStateChange' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the focus state change. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'focusStateChange', callback?: AsyncCallback): void; + +@@ -5644,7 +5968,8 @@ declare namespace camera { + * @param { 'smoothZoomInfoAvailable' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the zoom info. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; + +@@ -5654,7 +5979,8 @@ declare namespace camera { + * @param { 'smoothZoomInfoAvailable' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the zoom info. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; + +@@ -5666,7 +5992,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'macroStatusChanged', callback: AsyncCallback): void; + +@@ -5678,7 +6005,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'macroStatusChanged', callback?: AsyncCallback): void; + +@@ -5690,7 +6018,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'lcdFlashStatus', callback: AsyncCallback): void; + +@@ -5702,7 +6031,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'lcdFlashStatus', callback?: AsyncCallback): void; + +@@ -5712,7 +6042,8 @@ declare namespace camera { + * @param { 'autoDeviceSwitchStatusChange' } type - Event type. + * @param { AsyncCallback } callback - Callback used to return the result. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'autoDeviceSwitchStatusChange', callback: AsyncCallback): void; + +@@ -5722,7 +6053,8 @@ declare namespace camera { + * @param { 'autoDeviceSwitchStatusChange' } type - Event type. + * @param { AsyncCallback } callback - Callback used to return the result. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'autoDeviceSwitchStatusChange', callback?: AsyncCallback): void; + +@@ -5734,7 +6066,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'focusTrackingInfoAvailable', callback: Callback): void; + +@@ -5746,7 +6079,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'focusTrackingInfoAvailable', callback?: Callback): void; + +@@ -5759,7 +6093,8 @@ declare namespace camera { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. 2.Incorrect parameter types. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSessionFunctions(outputCapability: CameraOutputCapability): Array; + +@@ -5770,7 +6105,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSessionConflictFunctions(): Array; + +@@ -5785,7 +6121,8 @@ declare namespace camera { + * 3. Parameter verification failed. + * @throws { BusinessError } 7400103 - Session not config. The session has not been committed or configured. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setQualityPrioritization(quality : QualityPrioritization) : void; + +@@ -5797,7 +6134,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'lightStatusChange', callback: AsyncCallback): void; + +@@ -5809,7 +6147,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'lightStatusChange', callback?: AsyncCallback): void; + } +@@ -5817,10 +6156,11 @@ declare namespace camera { + /** + * Enum for the camera light status. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum LightStatus { + /** +@@ -5828,7 +6168,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NORMAL = 0, + +@@ -5837,7 +6178,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INSUFFICIENT = 1 + } +@@ -5845,10 +6187,11 @@ declare namespace camera { + /** + * Enumerates the camera portrait effects. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PortraitEffect { + /** +@@ -5856,7 +6199,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + OFF = 0, + +@@ -5865,7 +6209,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CIRCLES = 1, + +@@ -5874,7 +6219,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + HEART = 2, + +@@ -5883,7 +6229,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ROTATED = 3, + +@@ -5892,7 +6239,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + STUDIO = 4, + +@@ -5901,7 +6249,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + THEATER = 5 + } +@@ -5912,7 +6261,8 @@ declare namespace camera { + * @interface PortraitQuery + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PortraitQuery { + /** +@@ -5944,7 +6294,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSupportedPortraitEffects(): Array; + } +@@ -5956,7 +6307,8 @@ declare namespace camera { + * @interface Portrait + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Portrait extends PortraitQuery { + /** +@@ -5977,7 +6329,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getPortraitEffect(): PortraitEffect; + +@@ -5999,7 +6352,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setPortraitEffect(effect: PortraitEffect): void; + } +@@ -6010,30 +6364,33 @@ declare namespace camera { + * @typedef ZoomRange + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ZoomRange { + /** + * Min zoom value. + * +- * @type { number } ++ * @type { double } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly min: number; ++ readonly min: double; + + /** + * Max zoom value. + * +- * @type { number } ++ * @type { double } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly max: number; ++ readonly max: double; + } + + /** +@@ -6042,7 +6399,8 @@ declare namespace camera { + * @typedef PhysicalAperture + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PhysicalAperture { + /** +@@ -6051,19 +6409,21 @@ declare namespace camera { + * @type { ZoomRange } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + zoomRange: ZoomRange; + + /** + * The supported physical apertures. + * +- * @type { Array } ++ * @type { Array } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- apertures: Array; ++ apertures: Array; + } + + /** +@@ -6072,13 +6432,14 @@ declare namespace camera { + * @interface ApertureQuery + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ApertureQuery { + /** + * Gets the supported virtual apertures. + * +- * @returns { Array } The array of supported virtual apertures. ++ * @returns { Array } The array of supported virtual apertures. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +@@ -6089,14 +6450,15 @@ declare namespace camera { + * Gets the supported virtual apertures. + * Move to ApertureQuery interface from Aperture since 12. + * +- * @returns { Array } The array of supported virtual apertures. ++ * @returns { Array } The array of supported virtual apertures. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getSupportedVirtualApertures(): Array; ++ getSupportedVirtualApertures(): Array; + + /** + * Gets the supported physical apertures. +@@ -6117,7 +6479,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSupportedPhysicalApertures(): Array; + } +@@ -6129,56 +6492,61 @@ declare namespace camera { + * @interface Aperture + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Aperture extends ApertureQuery { + /** + * Gets current virtual aperture value. + * +- * @returns { number } The current virtual aperture value. ++ * @returns { double } The current virtual aperture value. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getVirtualAperture(): number; ++ getVirtualAperture(): double; + + /** + * Sets virtual aperture value. + * +- * @param { number } aperture - virtual aperture value ++ * @param { double } aperture - virtual aperture value + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- setVirtualAperture(aperture: number): void; ++ setVirtualAperture(aperture: double): void; + + /** + * Gets current physical aperture value. + * +- * @returns { number } The current physical aperture value. ++ * @returns { double } The current physical aperture value. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getPhysicalAperture(): number; ++ getPhysicalAperture(): double; + + /** + * Sets physical aperture value. + * +- * @param { number } aperture - physical aperture value ++ * @param { double } aperture - physical aperture value + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- setPhysicalAperture(aperture: number): void; ++ setPhysicalAperture(aperture: double): void; + } + + /** +@@ -6188,7 +6556,8 @@ declare namespace camera { + * @interface PortraitPhotoSession + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PortraitPhotoSession extends Session, Flash, AutoExposure, Focus, Zoom, Beauty, ColorEffect, ColorManagement, Portrait, Aperture { + /** +@@ -6198,7 +6567,8 @@ declare namespace camera { + * @param { ErrorCallback } callback - Callback used to get the capture session errors. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -6209,7 +6579,8 @@ declare namespace camera { + * @param { ErrorCallback } callback - Callback used to get the capture session errors. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + +@@ -6220,7 +6591,8 @@ declare namespace camera { + * @param { AsyncCallback } callback - Callback used to get the focus state change. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'focusStateChange', callback: AsyncCallback): void; + +@@ -6231,7 +6603,8 @@ declare namespace camera { + * @param { AsyncCallback } callback - Callback used to get the focus state change. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'focusStateChange', callback?: AsyncCallback): void; + +@@ -6242,7 +6615,8 @@ declare namespace camera { + * @param { AsyncCallback } callback - Callback used to get the zoom info. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; + +@@ -6253,7 +6627,8 @@ declare namespace camera { + * @param { AsyncCallback } callback - Callback used to get the zoom info. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; + +@@ -6265,7 +6640,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'lcdFlashStatus', callback: AsyncCallback): void; + +@@ -6277,7 +6653,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'lcdFlashStatus', callback?: AsyncCallback): void; + +@@ -6290,7 +6667,8 @@ declare namespace camera { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. 2.Incorrect parameter types. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSessionFunctions(outputCapability: CameraOutputCapability): Array; + +@@ -6301,7 +6679,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSessionConflictFunctions(): Array; + } +@@ -6313,7 +6692,8 @@ declare namespace camera { + * @interface ApertureVideoSession + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ApertureVideoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorEffect, Aperture { + /** +@@ -6324,7 +6704,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -6336,7 +6717,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + +@@ -6348,7 +6730,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'focusStateChange', callback: AsyncCallback): void; + +@@ -6360,7 +6743,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'focusStateChange', callback?: AsyncCallback): void; + +@@ -6372,7 +6756,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; + +@@ -6384,7 +6769,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; + } +@@ -6395,7 +6781,8 @@ declare namespace camera { + * @interface ManualExposureQuery + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ManualExposureQuery { + /** +@@ -6430,13 +6817,14 @@ declare namespace camera { + * @interface ManualExposure + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ManualExposure extends ManualExposureQuery { + /** + * Gets current exposure value. + * +- * @returns { number } The current exposure value. ++ * @returns { int } The current exposure value. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +@@ -6446,20 +6834,21 @@ declare namespace camera { + /** + * Gets current exposure value. + * +- * @returns { number } The current exposure value. ++ * @returns { int } The current exposure value. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getExposure(): number; ++ getExposure(): int; + + /** + * Sets Exposure value. + * +- * @param { number } exposure - Exposure value ++ * @param { int } exposure - Exposure value + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +@@ -6469,15 +6858,16 @@ declare namespace camera { + /** + * Sets Exposure value. + * +- * @param { number } exposure - Exposure value ++ * @param { int } exposure - Exposure value + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400102 - Operation not allowed. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- setExposure(exposure: number): void; ++ setExposure(exposure: int): void; + } + + /** +@@ -6487,7 +6877,8 @@ declare namespace camera { + * @interface NightPhotoSession + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface NightPhotoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorEffect, Beauty, ColorManagement, ManualExposure { + /** +@@ -6497,7 +6888,8 @@ declare namespace camera { + * @param { ErrorCallback } callback - Callback used to get the capture session errors. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -6508,7 +6900,8 @@ declare namespace camera { + * @param { ErrorCallback } callback - Callback used to get the capture session errors. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + +@@ -6519,7 +6912,8 @@ declare namespace camera { + * @param { AsyncCallback } callback - Callback used to get the focus state change. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'focusStateChange', callback: AsyncCallback): void; + +@@ -6530,7 +6924,8 @@ declare namespace camera { + * @param { AsyncCallback } callback - Callback used to get the focus state change. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'focusStateChange', callback?: AsyncCallback): void; + +@@ -6541,7 +6936,8 @@ declare namespace camera { + * @param { AsyncCallback } callback - Callback used to get the zoom info. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; + +@@ -6552,7 +6948,8 @@ declare namespace camera { + * @param { AsyncCallback } callback - Callback used to get the zoom info. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; + +@@ -6564,7 +6961,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'lcdFlashStatus', callback: AsyncCallback): void; + +@@ -6576,7 +6974,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'lcdFlashStatus', callback?: AsyncCallback): void; + } +@@ -6587,19 +6986,21 @@ declare namespace camera { + * @typedef IsoInfo + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface IsoInfo { + /** + * ISO value. + * +- * @type { ?number } ++ * @type { ?int } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly iso?: number; ++ readonly iso?: int; + } + + /** +@@ -6608,19 +7009,21 @@ declare namespace camera { + * @typedef ExposureInfo + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ExposureInfo { + /** + * Exposure time value. + * +- * @type { ?number } ++ * @type { ?int } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly exposureTime?: number; ++ readonly exposureTime?: int; + } + + /** +@@ -6629,19 +7032,21 @@ declare namespace camera { + * @typedef ApertureInfo + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ApertureInfo { + /** + * Aperture value. + * +- * @type { ?number } ++ * @type { ?double } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly aperture?: number; ++ readonly aperture?: double; + } + + /** +@@ -6650,19 +7055,21 @@ declare namespace camera { + * @typedef LuminationInfo + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface LuminationInfo { + /** + * Lumination value. + * +- * @type { ?number } ++ * @type { ?double } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly lumination?: number; ++ readonly lumination?: double; + } + + /** +@@ -6671,7 +7078,8 @@ declare namespace camera { + * @interface ProfessionalPhotoSession + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ProfessionalPhotoSession extends Session, AutoExposure, ManualExposure, Focus, ManualFocus, WhiteBalance, ManualIso, Flash, Zoom, ColorEffect, Aperture { + /** +@@ -6682,7 +7090,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -6694,7 +7103,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + +@@ -6706,7 +7116,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'focusStateChange', callback: AsyncCallback): void; + +@@ -6718,7 +7129,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'focusStateChange', callback?: AsyncCallback): void; + +@@ -6730,7 +7142,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; + +@@ -6742,7 +7155,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; + +@@ -6754,7 +7168,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'isoInfoChange', callback: AsyncCallback): void; + +@@ -6766,7 +7181,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'isoInfoChange', callback?: AsyncCallback): void; + +@@ -6778,7 +7194,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'exposureInfoChange', callback: AsyncCallback): void; + +@@ -6790,7 +7207,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'exposureInfoChange', callback?: AsyncCallback): void; + +@@ -6802,7 +7220,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'apertureInfoChange', callback: AsyncCallback): void; + +@@ -6814,7 +7233,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'apertureInfoChange', callback?: AsyncCallback): void; + +@@ -6826,7 +7246,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'luminationInfoChange', callback: AsyncCallback): void; + +@@ -6838,7 +7259,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'luminationInfoChange', callback?: AsyncCallback): void; + } +@@ -6850,7 +7272,8 @@ declare namespace camera { + * @interface ProfessionalVideoSession + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ProfessionalVideoSession extends Session, AutoExposure, ManualExposure, Focus, ManualFocus, WhiteBalance, ManualIso, Flash, Zoom, ColorEffect, Aperture { + /** +@@ -6861,7 +7284,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -6873,7 +7297,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + +@@ -6885,7 +7310,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'focusStateChange', callback: AsyncCallback): void; + +@@ -6897,7 +7323,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'focusStateChange', callback?: AsyncCallback): void; + +@@ -6909,7 +7336,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; + +@@ -6921,7 +7349,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; + +@@ -6933,7 +7362,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'isoInfoChange', callback: AsyncCallback): void; + +@@ -6945,7 +7375,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'isoInfoChange', callback?: AsyncCallback): void; + +@@ -6957,7 +7388,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'exposureInfoChange', callback: AsyncCallback): void; + +@@ -6969,7 +7401,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'exposureInfoChange', callback?: AsyncCallback): void; + +@@ -6981,7 +7414,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'apertureInfoChange', callback: AsyncCallback): void; + +@@ -6993,7 +7427,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'apertureInfoChange', callback?: AsyncCallback): void; + +@@ -7005,7 +7440,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'luminationInfoChange', callback: AsyncCallback): void; + +@@ -7017,7 +7453,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'luminationInfoChange', callback?: AsyncCallback): void; + } +@@ -7025,10 +7462,11 @@ declare namespace camera { + /** + * Enum for slow motion status. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum SlowMotionStatus { + /** +@@ -7036,7 +7474,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DISABLED = 0, + +@@ -7045,7 +7484,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + READY = 1, + +@@ -7054,7 +7494,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + VIDEO_START = 2, + +@@ -7063,7 +7504,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + VIDEO_DONE = 3, + +@@ -7072,7 +7514,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FINISHED = 4 + } +@@ -7084,7 +7527,8 @@ declare namespace camera { + * @interface SlowMotionVideoSession + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface SlowMotionVideoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorEffect { + /** +@@ -7095,7 +7539,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -7107,7 +7552,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + +@@ -7119,7 +7565,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'focusStateChange', callback: AsyncCallback): void; + +@@ -7131,7 +7578,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'focusStateChange', callback?: AsyncCallback): void; + +@@ -7143,7 +7591,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; + +@@ -7155,7 +7604,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; + +@@ -7167,7 +7617,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isSlowMotionDetectionSupported(): boolean; + +@@ -7180,7 +7631,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setSlowMotionDetectionArea(area: Rect): void; + +@@ -7192,7 +7644,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'slowMotionStatus', callback: AsyncCallback): void; + +@@ -7204,7 +7657,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'slowMotionStatus', callback?: AsyncCallback): void; + } +@@ -7216,7 +7670,8 @@ declare namespace camera { + * @interface HighResolutionPhotoSession + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface HighResolutionPhotoSession extends Session, AutoExposure, Focus { + /** +@@ -7227,7 +7682,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -7239,7 +7695,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + +@@ -7251,7 +7708,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'focusStateChange', callback: AsyncCallback): void; + +@@ -7263,7 +7721,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'focusStateChange', callback?: AsyncCallback): void; + } +@@ -7293,7 +7752,8 @@ declare namespace camera { + * @interface MacroPhotoSession + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MacroPhotoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorEffect, ManualFocus, DepthFusion, ColorManagement { + /** +@@ -7304,7 +7764,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -7316,7 +7777,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + +@@ -7328,7 +7790,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'focusStateChange', callback: AsyncCallback): void; + +@@ -7340,7 +7803,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'focusStateChange', callback?: AsyncCallback): void; + +@@ -7352,7 +7816,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; + +@@ -7364,7 +7829,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; + } +@@ -7385,7 +7851,8 @@ declare namespace camera { + * @interface MacroVideoSession + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MacroVideoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorEffect, ManualFocus, ColorManagement { + /** +@@ -7396,7 +7863,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -7408,7 +7876,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + +@@ -7420,7 +7889,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'focusStateChange', callback: AsyncCallback): void; + +@@ -7432,7 +7902,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'focusStateChange', callback?: AsyncCallback): void; + +@@ -7444,7 +7915,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; + +@@ -7456,7 +7928,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; + } +@@ -7467,7 +7940,8 @@ declare namespace camera { + * @extends Session, Flash, AutoExposure, Focus, Zoom + * @interface SecureSession + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface SecureSession extends Session, Flash, AutoExposure, Focus, Zoom { + /** +@@ -7478,7 +7952,8 @@ declare namespace camera { + * @throws { BusinessError } 7400102 - Operation not allowed. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + addSecureOutput(previewOutput: PreviewOutput): void; + +@@ -7488,7 +7963,8 @@ declare namespace camera { + * @param { 'error' } type - Event type. + * @param { ErrorCallback } callback - Callback used to get the capture session errors. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -7498,7 +7974,8 @@ declare namespace camera { + * @param { 'error' } type - Event type. + * @param { ErrorCallback } callback - Callback used to get the capture session errors. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + +@@ -7508,7 +7985,8 @@ declare namespace camera { + * @param { 'focusStateChange' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the focus state change. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'focusStateChange', callback: AsyncCallback): void; + +@@ -7518,7 +7996,8 @@ declare namespace camera { + * @param { 'focusStateChange' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the focus state change. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'focusStateChange', callback?: AsyncCallback): void; + } +@@ -7530,7 +8009,8 @@ declare namespace camera { + * @interface LightPaintingPhotoSession + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface LightPaintingPhotoSession extends Session, Flash, Focus, Zoom, ColorEffect { + /** +@@ -7541,7 +8021,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -7553,7 +8034,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + +@@ -7565,7 +8047,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'focusStateChange', callback: AsyncCallback): void; + +@@ -7577,7 +8060,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'focusStateChange', callback?: AsyncCallback): void; + +@@ -7589,7 +8073,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; + +@@ -7601,7 +8086,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; + +@@ -7613,7 +8099,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getLightPaintingType(): LightPaintingType; + +@@ -7626,7 +8113,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setLightPaintingType(type: LightPaintingType): void; + +@@ -7638,7 +8126,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSupportedLightPaintingTypes(): Array; + } +@@ -7650,7 +8139,8 @@ declare namespace camera { + * @interface QuickShotPhotoSession + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface QuickShotPhotoSession extends Session, AutoExposure, ColorEffect, ColorManagement, EffectSuggestion, Flash, Focus, Zoom { + /** +@@ -7661,7 +8151,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -7673,7 +8164,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + +@@ -7685,7 +8177,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'effectSuggestionChange', callback: AsyncCallback): void; + +@@ -7697,7 +8190,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'effectSuggestionChange', callback?: AsyncCallback): void; + +@@ -7709,7 +8203,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'focusStateChange', callback: AsyncCallback): void; + +@@ -7721,7 +8216,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'focusStateChange', callback?: AsyncCallback): void; + +@@ -7733,7 +8229,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; + +@@ -7745,7 +8242,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; + } +@@ -7757,7 +8255,8 @@ declare namespace camera { + * @interface PanoramaPhotoSession + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PanoramaPhotoSession extends Session, Focus, AutoExposure, WhiteBalance, ColorEffect { + /** +@@ -7768,7 +8267,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -7780,7 +8280,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + +@@ -7792,7 +8293,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'focusStateChange', callback: AsyncCallback): void; + +@@ -7804,7 +8306,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'focusStateChange', callback?: AsyncCallback): void; + } +@@ -7816,7 +8319,8 @@ declare namespace camera { + * @interface FluorescencePhotoSession + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface FluorescencePhotoSession extends Session, AutoExposure, Focus, Zoom { + /** +@@ -7827,7 +8331,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -7839,7 +8344,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + +@@ -7851,7 +8357,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'focusStateChange', callback: AsyncCallback): void; + +@@ -7863,7 +8370,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'focusStateChange', callback?: AsyncCallback): void; + } +@@ -7875,7 +8383,8 @@ declare namespace camera { + * @interface PhotoFunctions + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PhotoFunctions extends FlashQuery, AutoExposureQuery, ManualExposureQuery, FocusQuery, ZoomQuery, BeautyQuery, ColorEffectQuery, ColorManagementQuery, MacroQuery, SceneDetectionQuery { + } +@@ -7887,7 +8396,8 @@ declare namespace camera { + * @interface VideoFunctions + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface VideoFunctions extends FlashQuery, AutoExposureQuery, ManualExposureQuery, FocusQuery, ZoomQuery, StabilizationQuery, BeautyQuery, ColorEffectQuery, ColorManagementQuery, MacroQuery, SceneDetectionQuery { + } +@@ -7899,7 +8409,8 @@ declare namespace camera { + * @interface PortraitPhotoFunctions + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PortraitPhotoFunctions extends FlashQuery, AutoExposureQuery, FocusQuery, ZoomQuery, BeautyQuery, ColorEffectQuery, ColorManagementQuery, PortraitQuery, ApertureQuery, SceneDetectionQuery { + } +@@ -7911,7 +8422,8 @@ declare namespace camera { + * @interface PhotoConflictFunctions + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PhotoConflictFunctions extends ZoomQuery, MacroQuery { + } +@@ -7923,7 +8435,8 @@ declare namespace camera { + * @interface VideoConflictFunctions + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface VideoConflictFunctions extends ZoomQuery, MacroQuery { + } +@@ -7935,7 +8448,8 @@ declare namespace camera { + * @extends ZoomQuery, PortraitQuery, ApertureQuery + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PortraitPhotoConflictFunctions extends ZoomQuery, PortraitQuery, ApertureQuery { + } +@@ -7945,7 +8459,8 @@ declare namespace camera { + * + * @interface CameraOutput + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface CameraOutput { + /** +@@ -7954,7 +8469,8 @@ declare namespace camera { + * @param { AsyncCallback } callback - Callback used to return the result. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + release(callback: AsyncCallback): void; + +@@ -7964,7 +8480,8 @@ declare namespace camera { + * @returns { Promise } Promise used to return the result. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + release(): Promise; + } +@@ -7983,24 +8500,24 @@ declare namespace camera { + * Status of the sketch stream. + * 0 is stop, and 1 is start. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- status: number; ++ status: int; + + /** + * The zoom ratio of the sketch stream. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- sketchRatio: number; ++ sketchRatio: double; + } + + /** +@@ -8009,7 +8526,8 @@ declare namespace camera { + * @extends CameraOutput + * @interface PreviewOutput + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PreviewOutput extends CameraOutput { + /** +@@ -8064,7 +8582,8 @@ declare namespace camera { + * @param { 'frameStart' } type - Event type. + * @param { AsyncCallback } callback - Callback used to return the result. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'frameStart', callback: AsyncCallback): void; + +@@ -8074,7 +8593,8 @@ declare namespace camera { + * @param { 'frameStart' } type - Event type. + * @param { AsyncCallback } callback - Callback used to return the result. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'frameStart', callback?: AsyncCallback): void; + +@@ -8084,7 +8604,8 @@ declare namespace camera { + * @param { 'frameEnd' } type - Event type. + * @param { AsyncCallback } callback - Callback used to return the result. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'frameEnd', callback: AsyncCallback): void; + +@@ -8094,7 +8615,8 @@ declare namespace camera { + * @param { 'frameEnd' } type - Event type. + * @param { AsyncCallback } callback - Callback used to return the result. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'frameEnd', callback?: AsyncCallback): void; + +@@ -8104,7 +8626,8 @@ declare namespace camera { + * @param { 'error' } type - Event type. + * @param { ErrorCallback } callback - Callback used to get the preview output errors. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -8114,7 +8637,8 @@ declare namespace camera { + * @param { 'error' } type - Event type. + * @param { ErrorCallback } callback - Callback used to get the preview output errors. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + +@@ -8123,28 +8647,31 @@ declare namespace camera { + * + * @returns { Array } The array of supported frame rate range. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getSupportedFrameRates(): Array ++ getSupportedFrameRates(): Array; + + /** + * Set a frame rate range. + * +- * @param { number } minFps - Minimum frame rate per second. +- * @param { number } maxFps - Maximum frame rate per second. ++ * @param { int } minFps - Minimum frame rate per second. ++ * @param { int } maxFps - Maximum frame rate per second. + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @throws { BusinessError } 7400110 - Unresolved conflicts with current configurations. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- setFrameRate(minFps: number, maxFps: number): void ++ setFrameRate(minFps: int, maxFps: int): void; + + /** + * Get active frame rate range which has been set before. + * + * @returns { FrameRateRange } The active frame rate range. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getActiveFrameRate(): FrameRateRange; + +@@ -8154,21 +8681,23 @@ declare namespace camera { + * @returns { Profile } The current preconfig type. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getActiveProfile(): Profile; + + /** + * Gets the preview rotation angle. + * +- * @param { number } displayRotation - The current display rotation angle. ++ * @param { int } displayRotation - The current display rotation angle. + * @returns { ImageRotation } The preview rotation angle. + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getPreviewRotation(displayRotation: number): ImageRotation; ++ getPreviewRotation(displayRotation: int): ImageRotation; + + /** + * Sets the preview rotation angle. +@@ -8178,7 +8707,8 @@ declare namespace camera { + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setPreviewRotation(previewRotation: ImageRotation, isDisplayLocked?: boolean): void; + +@@ -8199,7 +8729,8 @@ declare namespace camera { + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + addDeferredSurface(surfaceId: string): void; + +@@ -8210,21 +8741,23 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isSketchSupported(): boolean; + + /** + * Gets the specific zoom ratio when sketch stream open. + * +- * @returns { number } The specific zoom ratio of sketch. ++ * @returns { double } The specific zoom ratio of sketch. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getSketchRatio(): number; ++ getSketchRatio(): double; + + /** + * Enable sketch for camera. +@@ -8246,7 +8779,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enableSketch(enabled: boolean): void; + +@@ -8270,7 +8804,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + attachSketchSurface(surfaceId: string): void; + +@@ -8282,7 +8817,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'sketchStatusChanged', callback: AsyncCallback): void; + +@@ -8294,7 +8830,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'sketchStatusChanged', callback?: AsyncCallback): void; + } +@@ -8302,10 +8839,11 @@ declare namespace camera { + /** + * Enum for effect suggestion. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum EffectSuggestionType { + /** +@@ -8313,7 +8851,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EFFECT_SUGGESTION_NONE = 0, + /** +@@ -8321,7 +8860,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EFFECT_SUGGESTION_PORTRAIT = 1, + /** +@@ -8329,7 +8869,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EFFECT_SUGGESTION_FOOD = 2, + +@@ -8338,7 +8879,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EFFECT_SUGGESTION_SKY = 3, + +@@ -8347,7 +8889,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EFFECT_SUGGESTION_SUNRISE_SUNSET = 4 + } +@@ -8357,7 +8900,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class EffectSuggestionStatus { + /** +@@ -8366,7 +8910,8 @@ declare namespace camera { + * @type { EffectSuggestionType } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type: EffectSuggestionType; + /** +@@ -8375,7 +8920,8 @@ declare namespace camera { + * @type { boolean } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + status: boolean; + } +@@ -8383,7 +8929,7 @@ declare namespace camera { + /** + * Enumerates the image rotation angles. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 +@@ -8438,38 +8984,38 @@ declare namespace camera { + /** + * Latitude. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- latitude: number; ++ latitude: double; + + /** + * Longitude. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- longitude: number; ++ longitude: double; + + /** + * Altitude. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- altitude: number; ++ altitude: double; + } + + /** + * Enumerates the image quality levels. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 +@@ -8556,7 +9102,7 @@ declare namespace camera { + /** + * Enumerates the delivery image types. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi + * @since arkts {'1.1':'11','1.2':'20'} +@@ -8599,7 +9145,8 @@ declare namespace camera { + * + * @typedef Photo + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Photo { + /** +@@ -8647,7 +9194,8 @@ declare namespace camera { + * @typedef DeferredPhotoProxy + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface DeferredPhotoProxy { + /** +@@ -8676,7 +9224,7 @@ declare namespace camera { + /** + * Enumerates the camera video codec type. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 +@@ -8707,7 +9255,8 @@ declare namespace camera { + * @extends CameraOutput + * @interface PhotoOutput + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PhotoOutput extends CameraOutput { + /** +@@ -8717,7 +9266,8 @@ declare namespace camera { + * @throws { BusinessError } 7400104 - Session not running. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + capture(callback: AsyncCallback): void; + +@@ -8728,7 +9278,8 @@ declare namespace camera { + * @throws { BusinessError } 7400104 - Session not running. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + capture(): Promise; + +@@ -8741,7 +9292,8 @@ declare namespace camera { + * @throws { BusinessError } 7400104 - Session not running. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + capture(setting: PhotoCaptureSetting, callback: AsyncCallback): void; + +@@ -8766,7 +9318,8 @@ declare namespace camera { + * @throws { BusinessError } 7400104 - Session not running. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + capture(setting: PhotoCaptureSetting): Promise; + +@@ -8781,7 +9334,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + burstCapture(setting: PhotoCaptureSetting): Promise; + +@@ -8806,7 +9360,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isRawDeliverySupported(): boolean; + +@@ -8835,7 +9390,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isDeferredImageDeliverySupported(type: DeferredDeliveryImageType): boolean; + +@@ -8850,7 +9406,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isDeferredImageDeliveryEnabled(type: DeferredDeliveryImageType): boolean; + +@@ -8864,7 +9421,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + deferImageDelivery(type: DeferredDeliveryImageType): void; + +@@ -8877,7 +9435,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isDepthDataDeliverySupported(): boolean; + +@@ -8891,7 +9450,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enableDepthDataDelivery(enabled: boolean): void; + +@@ -8901,7 +9461,8 @@ declare namespace camera { + * @returns { Array } An array of supported video codec types for moving photo. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSupportedMovingPhotoVideoCodecTypes(): Array; + +@@ -8911,7 +9472,8 @@ declare namespace camera { + * @param { VideoCodecType } codecType - Codec type for moving photo. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setMovingPhotoVideoCodecType(codecType: VideoCodecType): void; + +@@ -8984,7 +9546,8 @@ declare namespace camera { + * + * @returns { boolean } Is the mirror supported. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isMirrorSupported(): boolean; + +@@ -8996,7 +9559,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enableMirror(enabled: boolean): void; + +@@ -9030,7 +9594,8 @@ declare namespace camera { + * @param { 'captureStartWithInfo' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the capture start info. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'captureStartWithInfo', callback: AsyncCallback): void; + +@@ -9040,7 +9605,8 @@ declare namespace camera { + * @param { 'captureStartWithInfo' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the capture start info. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'captureStartWithInfo', callback?: AsyncCallback): void; + +@@ -9050,7 +9616,8 @@ declare namespace camera { + * @param { 'frameShutter' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the frame shutter information. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'frameShutter', callback: AsyncCallback): void; + +@@ -9060,7 +9627,8 @@ declare namespace camera { + * @param { 'frameShutter' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the frame shutter information. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'frameShutter', callback?: AsyncCallback): void; + +@@ -9070,7 +9638,8 @@ declare namespace camera { + * @param { 'frameShutterEnd' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the frame shutter end information. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'frameShutterEnd', callback: AsyncCallback): void; + +@@ -9080,7 +9649,8 @@ declare namespace camera { + * @param { 'frameShutterEnd' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the frame shutter end information. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'frameShutterEnd', callback?: AsyncCallback): void; + +@@ -9090,7 +9660,8 @@ declare namespace camera { + * @param { 'captureEnd' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the capture end information. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'captureEnd', callback: AsyncCallback): void; + +@@ -9100,7 +9671,8 @@ declare namespace camera { + * @param { 'captureEnd' } type - Event type. + * @param { AsyncCallback } callback - Callback used to get the capture end information. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'captureEnd', callback?: AsyncCallback): void; + +@@ -9110,7 +9682,8 @@ declare namespace camera { + * @param { 'captureReady' } type - Event type. + * @param { AsyncCallback } callback - Callback used to notice capture ready. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'captureReady', callback: AsyncCallback): void; + +@@ -9120,7 +9693,8 @@ declare namespace camera { + * @param { 'captureReady' } type - Event type. + * @param { AsyncCallback } callback - Callback used to notice capture ready. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'captureReady', callback?: AsyncCallback): void; + +@@ -9128,21 +9702,23 @@ declare namespace camera { + * Subscribes estimated capture duration event callback. + * + * @param { 'estimatedCaptureDuration' } type - Event type. +- * @param { AsyncCallback } callback - Callback used to notify the estimated capture duration (in milliseconds). ++ * @param { AsyncCallback } callback - Callback used to notify the estimated capture duration (in milliseconds). + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- on(type: 'estimatedCaptureDuration', callback: AsyncCallback): void; ++ on(type: 'estimatedCaptureDuration', callback: AsyncCallback): void; + + /** + * Unsubscribes from estimated capture duration event callback. + * + * @param { 'estimatedCaptureDuration' } type - Event type. +- * @param { AsyncCallback } callback - Callback used to notify the estimated capture duration (in milliseconds). ++ * @param { AsyncCallback } callback - Callback used to notify the estimated capture duration (in milliseconds). + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- off(type: 'estimatedCaptureDuration', callback?: AsyncCallback): void; ++ off(type: 'estimatedCaptureDuration', callback?: AsyncCallback): void; + + /** + * Subscribes to error events. +@@ -9150,7 +9726,8 @@ declare namespace camera { + * @param { 'error' } type - Event type. + * @param { ErrorCallback } callback - Callback used to get the photo output errors. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -9160,7 +9737,8 @@ declare namespace camera { + * @param { 'error' } type - Event type. + * @param { ErrorCallback } callback - Callback used to get the photo output errors. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + +@@ -9170,7 +9748,8 @@ declare namespace camera { + * @returns { Profile } The current preconfig type. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getActiveProfile(): Profile; + +@@ -9193,7 +9772,8 @@ declare namespace camera { + * @throws { BusinessError } 7400104 - session is not running. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isQuickThumbnailSupported(): boolean; + +@@ -9222,7 +9802,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enableQuickThumbnail(enabled: boolean): void; + +@@ -9259,7 +9840,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isAutoHighQualityPhotoSupported(): boolean; + +@@ -9273,7 +9855,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enableAutoHighQualityPhoto(enabled: boolean): void; + +@@ -9285,7 +9868,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isAutoCloudImageEnhancementSupported(): boolean; + +@@ -9298,7 +9882,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enableAutoCloudImageEnhancement(enabled: boolean): void; + +@@ -9308,7 +9893,8 @@ declare namespace camera { + * @returns { boolean } TRUE if the moving photo is supported. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isMovingPhotoSupported(): boolean; + +@@ -9321,21 +9907,23 @@ declare namespace camera { + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enableMovingPhoto(enabled: boolean): void; + + /** + * Gets the photo rotation angle. + * +- * @param { number } deviceDegree - The current device rotation degree. ++ * @param { int } deviceDegree - The current device rotation degree. + * @returns { ImageRotation } The photo rotation angle. + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getPhotoRotation(deviceDegree: number): ImageRotation; ++ getPhotoRotation(deviceDegree: int): ImageRotation; + + /** + * Confirm if offline processing is supported. +@@ -9345,7 +9933,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isOfflineSupported(): boolean; + +@@ -9357,7 +9946,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enableOffline(): void; + +@@ -9370,7 +9960,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'offlineDeliveryFinished', callback: AsyncCallback): void; + +@@ -9383,7 +9974,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'offlineDeliveryFinished', callback?: AsyncCallback): void + } +@@ -9400,21 +9992,21 @@ declare namespace camera { + /** + * Capture id. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- captureId: number; ++ captureId: int; + /** + * Timestamp for frame. + * +- * @type { number } ++ * @type { long } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- timestamp: number; ++ timestamp: long; + } + + /** +@@ -9429,12 +10021,12 @@ declare namespace camera { + /** + * Capture id. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- captureId: number; ++ captureId: int; + } + + /** +@@ -9449,21 +10041,21 @@ declare namespace camera { + /** + * Capture id. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- captureId: number; ++ captureId: int; + /** + * Time(in milliseconds) is the shutter time for the photo. + * +- * @type { number } ++ * @type { long } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- time: number; ++ time: long; + } + + /** +@@ -9478,21 +10070,21 @@ declare namespace camera { + /** + * Capture id. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- captureId: number; ++ captureId: int; + /** + * Frame count. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- frameCount: number; ++ frameCount: int; + } + + /** +@@ -9501,7 +10093,8 @@ declare namespace camera { + * @typedef DeferredVideoEnhancementInfo + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface DeferredVideoEnhancementInfo { + /** +@@ -9511,7 +10104,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly isDeferredVideoEnhancementAvailable: boolean; + /** +@@ -9521,7 +10115,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly videoId?: string; + } +@@ -9532,7 +10127,8 @@ declare namespace camera { + * @extends CameraOutput + * @interface VideoOutput + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface VideoOutput extends CameraOutput { + /** +@@ -9542,7 +10138,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + start(callback: AsyncCallback): void; + +@@ -9553,7 +10150,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + start(): Promise; + +@@ -9562,7 +10160,8 @@ declare namespace camera { + * + * @param { AsyncCallback } callback - Callback used to return the result. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + stop(callback: AsyncCallback): void; + +@@ -9571,7 +10170,8 @@ declare namespace camera { + * + * @returns { Promise } Promise used to return the result. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + stop(): Promise; + +@@ -9589,7 +10189,8 @@ declare namespace camera { + * + * @returns { boolean } Is video mirror supported. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isMirrorSupported(): boolean; + +@@ -9611,7 +10212,8 @@ declare namespace camera { + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enableMirror(enabled: boolean): void; + +@@ -9620,42 +10222,46 @@ declare namespace camera { + * + * @returns { Array } The array of supported frame rate range. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSupportedFrameRates(): Array + + /** + * Set a frame rate range. + * +- * @param { number } minFps - Minimum frame rate per second. +- * @param { number } maxFps - Maximum frame rate per second. ++ * @param { int } minFps - Minimum frame rate per second. ++ * @param { int } maxFps - Maximum frame rate per second. + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @throws { BusinessError } 7400110 - Unresolved conflicts with current configurations. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- setFrameRate(minFps: number, maxFps: number): void ++ setFrameRate(minFps: int, maxFps: int): void; + + /** + * Get active frame rate range which has been set before. + * + * @returns { FrameRateRange } The active frame rate range. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getActiveFrameRate(): FrameRateRange; + + /** + * Gets the video rotation angle. + * +- * @param { number } deviceDegree - The current device rotation degree. ++ * @param { int } deviceDegree - The current device rotation degree. + * @returns { ImageRotation } The video rotation angle. + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getVideoRotation(deviceDegree: number): ImageRotation; ++ getVideoRotation(deviceDegree: int): ImageRotation; + + /** + * Confirm if auto deferred video enhancement is supported in the specific device. +@@ -9665,7 +10271,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isAutoDeferredVideoEnhancementSupported(): boolean; + +@@ -9677,7 +10284,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isAutoDeferredVideoEnhancementEnabled(): boolean; + +@@ -9690,7 +10298,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enableAutoDeferredVideoEnhancement(enabled: boolean): void; + +@@ -9701,7 +10310,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSupportedRotations(): Array; + +@@ -9712,7 +10322,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isRotationSupported(): boolean; + +@@ -9724,7 +10335,8 @@ declare namespace camera { + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setRotation(rotation: ImageRotation): void; + +@@ -9735,7 +10347,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isAutoVideoFrameRateSupported(): boolean; + +@@ -9748,7 +10361,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enableAutoVideoFrameRate(enabled: boolean): void; + +@@ -9760,7 +10374,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'deferredVideoEnhancementInfo', callback: AsyncCallback): void; + +@@ -9772,7 +10387,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'deferredVideoEnhancementInfo', callback?: AsyncCallback): void; + +@@ -9782,7 +10398,8 @@ declare namespace camera { + * @param { 'frameStart' } type - Event type. + * @param { AsyncCallback } callback - Callback used to return the result. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'frameStart', callback: AsyncCallback): void; + +@@ -9792,7 +10409,8 @@ declare namespace camera { + * @param { 'frameStart' } type - Event type. + * @param { AsyncCallback } callback - Callback used to return the result. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'frameStart', callback?: AsyncCallback): void; + +@@ -9802,7 +10420,8 @@ declare namespace camera { + * @param { 'frameEnd' } type - Event type. + * @param { AsyncCallback } callback - Callback used to return the result. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'frameEnd', callback: AsyncCallback): void; + +@@ -9812,7 +10431,8 @@ declare namespace camera { + * @param { 'frameEnd' } type - Event type. + * @param { AsyncCallback } callback - Callback used to return the result. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'frameEnd', callback?: AsyncCallback): void; + +@@ -9822,7 +10442,8 @@ declare namespace camera { + * @param { 'error' } type - Event type. + * @param { ErrorCallback } callback - Callback used to get the video output errors. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -9832,7 +10453,8 @@ declare namespace camera { + * @param { 'error' } type - Event type. + * @param { ErrorCallback } callback - Callback used to get the video output errors. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + +@@ -9842,7 +10464,8 @@ declare namespace camera { + * @returns { VideoProfile } The current preconfig type. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getActiveProfile(): VideoProfile; + +@@ -9853,7 +10476,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSupportedVideoMetaTypes(): Array; + +@@ -9866,7 +10490,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + attachMetaSurface(surfaceId: string, type: VideoMetaType): void; + } +@@ -9874,17 +10499,19 @@ declare namespace camera { + /** + * Video meta type. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum VideoMetaType { + /** + * Video meta type for storing maker info. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + VIDEO_META_MAKER_INFO = 0, + } +@@ -9892,7 +10519,7 @@ declare namespace camera { + /** + * Metadata object type. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 +@@ -9981,10 +10608,11 @@ declare namespace camera { + /** + * Enum for light painting tabletype. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum LightPaintingType { + /** +@@ -9992,7 +10620,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TRAFFIC_TRAILS = 0, + +@@ -10001,7 +10630,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + STAR_TRAILS = 1, + +@@ -10010,7 +10640,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SILKY_WATER = 2, + +@@ -10019,7 +10650,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LIGHT_GRAFFITI = 3 + } +@@ -10036,48 +10668,49 @@ declare namespace camera { + /** + * X coordinator of top left point. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- topLeftX: number; ++ topLeftX: double; + /** + * Y coordinator of top left point. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- topLeftY: number; ++ topLeftY: double; + /** + * Width of this rectangle. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- width: number; ++ width: double; + /** + * Height of this rectangle. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Camera.Core + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- height: number; ++ height: double; + } + + /** + * Enum for emotion type. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum Emotion { + /** +@@ -10085,7 +10718,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NEUTRAL = 0, + +@@ -10094,7 +10728,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SADNESS = 1, + +@@ -10103,7 +10738,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SMILE = 2, + +@@ -10112,7 +10748,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SURPRISE = 3 + } +@@ -10122,7 +10759,8 @@ declare namespace camera { + * + * @typedef MetadataObject + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MetadataObject { + /** +@@ -10131,47 +10769,52 @@ declare namespace camera { + * @type { MetadataObjectType } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly type: MetadataObjectType; + /** + * Metadata object timestamp in milliseconds. + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly timestamp: number; ++ readonly timestamp: int; + /** + * The axis-aligned bounding box of detected metadata object. + * + * @type { Rect } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly boundingBox: Rect; + /** + * Metadata object id. + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly objectId: number; ++ readonly objectId: int; + /** + * Confidence for the detected type. + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly confidence: number; ++ readonly confidence: int; + } + + /** +@@ -10181,7 +10824,8 @@ declare namespace camera { + * @extends MetadataObject + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MetadataFaceObject extends MetadataObject { + /** +@@ -10191,7 +10835,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly leftEyeBoundingBox: Rect; + +@@ -10202,7 +10847,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly rightEyeBoundingBox: Rect; + +@@ -10213,53 +10859,58 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly emotion: Emotion; + + /** + * Emotion confidence. + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly emotionConfidence: number; ++ readonly emotionConfidence: int; + + /** + * Pitch angle for face. + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly pitchAngle: number; ++ readonly pitchAngle: int; + + /** + * Yaw angle for face. + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly yawAngle: number; ++ readonly yawAngle: int; + + /** + * Roll angle for face. + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly rollAngle: number; ++ readonly rollAngle: int; + } + + /** +@@ -10269,7 +10920,8 @@ declare namespace camera { + * @extends MetadataObject + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MetadataHumanBodyObject extends MetadataObject { + } +@@ -10281,7 +10933,8 @@ declare namespace camera { + * @extends MetadataObject + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MetadataCatFaceObject extends MetadataObject { + /** +@@ -10291,7 +10944,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly leftEyeBoundingBox: Rect; + +@@ -10302,7 +10956,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly rightEyeBoundingBox: Rect; + } +@@ -10314,7 +10969,8 @@ declare namespace camera { + * @extends MetadataObject + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MetadataCatBodyObject extends MetadataObject { + } +@@ -10326,7 +10982,8 @@ declare namespace camera { + * @extends MetadataObject + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MetadataDogFaceObject extends MetadataObject { + /** +@@ -10336,7 +10993,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly leftEyeBoundingBox: Rect; + +@@ -10347,7 +11005,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly rightEyeBoundingBox: Rect; + } +@@ -10359,7 +11018,8 @@ declare namespace camera { + * @extends MetadataObject + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MetadataDogBodyObject extends MetadataObject { + } +@@ -10371,7 +11031,8 @@ declare namespace camera { + * @extends MetadataObject + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MetadataSalientDetectionObject extends MetadataObject { + } +@@ -10383,7 +11044,8 @@ declare namespace camera { + * @typedef MetadataBarcodeObject + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MetadataBarcodeObject extends MetadataObject { + } +@@ -10394,7 +11056,8 @@ declare namespace camera { + * @typedef CameraOcclusionDetectionResult + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface CameraOcclusionDetectionResult { + /** +@@ -10404,7 +11067,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly isCameraOccluded: boolean; + +@@ -10415,7 +11079,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly isCameraLensDirty: boolean; + } +@@ -10426,7 +11091,8 @@ declare namespace camera { + * @extends CameraOutput + * @interface MetadataOutput + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MetadataOutput extends CameraOutput { + /** +@@ -10436,7 +11102,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + start(callback: AsyncCallback): void; + +@@ -10447,7 +11114,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + start(): Promise; + +@@ -10456,7 +11124,8 @@ declare namespace camera { + * + * @param { AsyncCallback } callback - Callback used to return the result. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + stop(callback: AsyncCallback): void; + +@@ -10465,7 +11134,8 @@ declare namespace camera { + * + * @returns { Promise } Promise used to return the result. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + stop(): Promise; + +@@ -10479,7 +11149,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + addMetadataObjectTypes(types: Array): void; + +@@ -10493,7 +11164,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + removeMetadataObjectTypes(types: Array): void; + +@@ -10503,7 +11175,8 @@ declare namespace camera { + * @param { 'metadataObjectsAvailable' } type - Event type. + * @param { AsyncCallback> } callback - Callback used to get the available metadata objects. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'metadataObjectsAvailable', callback: AsyncCallback>): void; + +@@ -10513,7 +11186,8 @@ declare namespace camera { + * @param { 'metadataObjectsAvailable' } type - Event type. + * @param { AsyncCallback> } callback - Callback used to get the available metadata objects. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'metadataObjectsAvailable', callback?: AsyncCallback>): void; + +@@ -10523,7 +11197,8 @@ declare namespace camera { + * @param { 'error' } type - Event type. + * @param { ErrorCallback } callback - Callback used to get the video output errors. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -10533,7 +11208,8 @@ declare namespace camera { + * @param { 'error' } type - Event type. + * @param { ErrorCallback } callback - Callback used to get the video output errors. + * @syscap SystemCapability.Multimedia.Camera.Core +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + } +@@ -10541,10 +11217,11 @@ declare namespace camera { + /** + * Enumerates the timelapse recording state. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum TimeLapseRecordState { + /** +@@ -10552,7 +11229,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + IDLE = 0, + +@@ -10561,7 +11239,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RECORDING = 1 + } +@@ -10569,10 +11248,11 @@ declare namespace camera { + /** + * Enumerates the timelapse preview type. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum TimeLapsePreviewType { + /** +@@ -10580,7 +11260,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DARK = 1, + +@@ -10589,7 +11270,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LIGHT = 2 + } +@@ -10600,7 +11282,8 @@ declare namespace camera { + * @typedef TryAEInfo + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface TryAEInfo { + /** +@@ -10610,7 +11293,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly isTryAEDone: boolean; + +@@ -10621,7 +11305,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly isTryAEHintNeeded?: boolean; + +@@ -10632,20 +11317,22 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly previewType?: TimeLapsePreviewType; + + /** + * Timelapse capture interval. + * +- * @type { ?number } ++ * @type { ?int } + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly captureInterval?: number; ++ readonly captureInterval?: int; + } + + /** +@@ -10655,7 +11342,8 @@ declare namespace camera { + * @interface TimeLapsePhotoSession + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface TimeLapsePhotoSession extends Session, Focus, ManualFocus, AutoExposure, ManualExposure, ManualIso, WhiteBalance, Zoom, ColorEffect { + /** +@@ -10666,7 +11354,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -10678,7 +11367,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + +@@ -10690,7 +11380,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'focusStateChange', callback: AsyncCallback): void; + +@@ -10702,7 +11393,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'focusStateChange', callback?: AsyncCallback): void; + +@@ -10714,7 +11406,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'isoInfoChange', callback: AsyncCallback): void; + +@@ -10726,7 +11419,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'isoInfoChange', callback?: AsyncCallback): void; + +@@ -10738,7 +11432,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'exposureInfoChange', callback: AsyncCallback): void; + +@@ -10750,7 +11445,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'exposureInfoChange', callback?: AsyncCallback): void; + +@@ -10762,7 +11458,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'luminationInfoChange', callback: AsyncCallback): void; + +@@ -10774,7 +11471,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'luminationInfoChange', callback?: AsyncCallback): void; + +@@ -10786,7 +11484,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isTryAENeeded(): boolean; + +@@ -10798,7 +11497,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + startTryAE(): void; + +@@ -10810,7 +11510,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + stopTryAE(): void; + +@@ -10822,7 +11523,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'tryAEInfoChange', callback: AsyncCallback): void; + +@@ -10834,46 +11536,50 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'tryAEInfoChange', callback?: AsyncCallback): void; + + /** + * Gets supported timelapse interval range. + * +- * @returns { Array } Timelapse interval range. ++ * @returns { Array } Timelapse interval range. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getSupportedTimeLapseIntervalRange(): Array; ++ getSupportedTimeLapseIntervalRange(): Array; + + /** + * Gets the timelapse interval in use. + * +- * @returns { number } the timelapse interval in use. ++ * @returns { int } the timelapse interval in use. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getTimeLapseInterval(): number; ++ getTimeLapseInterval(): int; + + /** + * Sets a timelapse interval for a camera device. + * +- * @param { number } interval The timelapse interval. ++ * @param { int } interval The timelapse interval. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- setTimeLapseInterval(interval: number): void; ++ setTimeLapseInterval(interval: int): void; + + /** + * Gets the timelapse recording state in use. +@@ -10896,7 +11602,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setTimeLapseRecordState(state: TimeLapseRecordState): void; + +@@ -10921,7 +11628,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setTimeLapsePreviewType(type: TimeLapsePreviewType): void; + } +@@ -10929,7 +11637,7 @@ declare namespace camera { + /** + * Enum for Depth Data Accuracy. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi + * @since arkts {'1.1':'13','1.2':'20'} +@@ -10960,7 +11668,7 @@ declare namespace camera { + /** + * Enum for Depth Data Quality Level. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi + * @since arkts {'1.1':'13','1.2':'20'} +@@ -11004,7 +11712,8 @@ declare namespace camera { + * @interface DepthProfile + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface DepthProfile { + /** +@@ -11014,7 +11723,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly format: CameraFormat; + +@@ -11025,7 +11735,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly dataAccuracy: DepthDataAccuracy; + +@@ -11036,7 +11747,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly size: Size; + } +@@ -11047,7 +11759,8 @@ declare namespace camera { + * @interface DepthData. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface DepthData { + /** +@@ -11057,7 +11770,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly format: CameraFormat; + +@@ -11079,7 +11793,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly qualityLevel: DepthDataQualityLevel; + +@@ -11090,7 +11805,8 @@ declare namespace camera { + * @readonly + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly dataAccuracy: DepthDataAccuracy; + +@@ -11113,7 +11829,8 @@ declare namespace camera { + * @interface DepthDataOutput + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface DepthDataOutput extends CameraOutput { + /** +@@ -11125,7 +11842,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + start(): Promise; + +@@ -11138,7 +11856,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + stop(): Promise; + +@@ -11150,7 +11869,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'depthDataAvailable', callback: AsyncCallback): void; + +@@ -11162,7 +11882,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'depthDataAvailable', callback?: AsyncCallback): void; + +@@ -11174,7 +11895,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -11186,7 +11908,8 @@ declare namespace camera { + * @throws { BusinessError } 202 - Not System Application. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'error', callback?: ErrorCallback): void; + } +@@ -11197,7 +11920,8 @@ declare namespace camera { + * @interface DepthFusionQuery + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface DepthFusionQuery { + /** +@@ -11208,21 +11932,23 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isDepthFusionSupported(): boolean; + + /** + * Query the depth fusion threshold. + * +- * @returns { Array } The depth fusion threshold. ++ * @returns { Array } The depth fusion threshold. + * @throws { BusinessError } 202 - Not System Application. + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getDepthFusionThreshold(): Array; ++ getDepthFusionThreshold(): Array; + } + + /** +@@ -11232,7 +11958,8 @@ declare namespace camera { + * @interface DepthFusion + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface DepthFusion extends DepthFusionQuery { + /** +@@ -11243,7 +11970,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isDepthFusionEnabled(): boolean; + +@@ -11257,7 +11985,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enableDepthFusion(enabled: boolean): void; + } +@@ -11265,10 +11994,11 @@ declare namespace camera { + /** + * Enum for auxiliary type. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum AuxiliaryType { + /** +@@ -11276,7 +12006,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CONTRACT_LENS = 0 + } +@@ -11284,10 +12015,11 @@ declare namespace camera { + /** + * Enum for auxiliary status. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum AuxiliaryStatus { + /** +@@ -11295,7 +12027,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LOCKED = 0, + +@@ -11304,7 +12037,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ON = 1, + +@@ -11313,7 +12047,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + OFF = 2 + } +@@ -11321,10 +12056,11 @@ declare namespace camera { + /** + * Enum for color reservation type. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum ColorReservationType { + /** +@@ -11332,7 +12068,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NONE = 0, + +@@ -11341,7 +12078,8 @@ declare namespace camera { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PORTRAIT = 1 + } +@@ -11352,7 +12090,8 @@ declare namespace camera { + * @interface ColorReservationQuery + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ColorReservationQuery { + /** +@@ -11363,7 +12102,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSupportedColorReservationTypes(): Array; + } +@@ -11375,7 +12115,8 @@ declare namespace camera { + * @interface ColorReservation + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ColorReservation extends ColorReservationQuery { + /** +@@ -11386,7 +12127,8 @@ declare namespace camera { + * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getColorReservation(): ColorReservationType; + +@@ -11403,7 +12145,8 @@ declare namespace camera { + * @throws { BusinessError } 7400201 - Camera service fatal error. + * @syscap SystemCapability.Multimedia.Camera.Core + * @systemapi +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setColorReservation(type: ColorReservationType): void; + } +diff --git a/api/@ohos.multimedia.cameraPicker.d.ts b/api/@ohos.multimedia.cameraPicker.d.ts +index 0aaf06ab6..e77efbbae 100644 +--- a/api/@ohos.multimedia.cameraPicker.d.ts ++++ b/api/@ohos.multimedia.cameraPicker.d.ts +@@ -30,7 +30,8 @@ import type camera from './@ohos.multimedia.camera'; + * @namespace cameraPicker + * @syscap SystemCapability.Multimedia.Camera.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace cameraPicker { + +@@ -45,7 +46,8 @@ declare namespace cameraPicker { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class PickerProfile { + /** +@@ -61,7 +63,8 @@ declare namespace cameraPicker { + * @type { camera.CameraPosition } + * @syscap SystemCapability.Multimedia.Camera.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + cameraPosition: camera.CameraPosition; + +@@ -78,7 +81,8 @@ declare namespace cameraPicker { + * @type { ?string } + * @syscap SystemCapability.Multimedia.Camera.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + saveUri?: string; + +@@ -92,12 +96,13 @@ declare namespace cameraPicker { + /** + * The max duration of the video. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- videoDuration?: number; ++ videoDuration?: int; + } + + /** +@@ -113,7 +118,8 @@ declare namespace cameraPicker { + * @enum { string } + * @syscap SystemCapability.Multimedia.Camera.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PickerMediaType { + /** +@@ -127,7 +133,8 @@ declare namespace cameraPicker { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PHOTO = 'photo', + +@@ -142,7 +149,8 @@ declare namespace cameraPicker { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + VIDEO = 'video' + } +@@ -158,7 +166,8 @@ declare namespace cameraPicker { + * + * @syscap SystemCapability.Multimedia.Camera.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class PickerResult { + /** +@@ -171,12 +180,13 @@ declare namespace cameraPicker { + /** + * The result code. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Camera.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- resultCode: number; ++ resultCode: int; + + /** + * The result saved uri. +@@ -191,7 +201,8 @@ declare namespace cameraPicker { + * @type { string } + * @syscap SystemCapability.Multimedia.Camera.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + resultUri: string; + +@@ -208,7 +219,8 @@ declare namespace cameraPicker { + * @type { PickerMediaType } + * @syscap SystemCapability.Multimedia.Camera.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + mediaType: PickerMediaType; + } +@@ -232,7 +244,8 @@ declare namespace cameraPicker { + * @returns { Promise } pick result. + * @syscap SystemCapability.Multimedia.Camera.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function pick(context: Context, mediaTypes: Array, pickerProfile: PickerProfile): Promise; + } +diff --git a/api/@ohos.multimedia.drm.d.ts b/api/@ohos.multimedia.drm.d.ts +index e58565cb8..bcd02832a 100644 +--- a/api/@ohos.multimedia.drm.d.ts ++++ b/api/@ohos.multimedia.drm.d.ts +@@ -29,7 +29,8 @@ + * @namespace drm + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace drm { + /** +@@ -43,7 +44,8 @@ declare namespace drm { + * @enum { number } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum DrmErrorCode { + /** +@@ -55,7 +57,8 @@ declare namespace drm { + * All unknown errors. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ERROR_UNKNOWN = 24700101, + /** +@@ -67,7 +70,8 @@ declare namespace drm { + * Meet max MediaKeySystem num limit. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MAX_SYSTEM_NUM_REACHED = 24700103, + /** +@@ -79,7 +83,8 @@ declare namespace drm { + * Meet max MediaKeySession num limit. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MAX_SESSION_NUM_REACHED = 24700104, + /** +@@ -91,7 +96,8 @@ declare namespace drm { + * Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SERVICE_FATAL_ERROR = 24700201 + } +@@ -107,7 +113,8 @@ declare namespace drm { + * @enum { string } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PreDefinedConfigName { + /** +@@ -119,7 +126,8 @@ declare namespace drm { + * Config name vendor + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CONFIG_DEVICE_VENDOR = 'vendor', + /** +@@ -131,7 +139,8 @@ declare namespace drm { + * Config name version + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CONFIG_DEVICE_VERSION = 'version', + /** +@@ -143,7 +152,8 @@ declare namespace drm { + * Config name description + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CONFIG_DEVICE_DESCRIPTION = 'description', + /** +@@ -155,7 +165,8 @@ declare namespace drm { + * Config name algorithms + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CONFIG_DEVICE_ALGORITHMS = 'algorithms', + /** +@@ -167,7 +178,8 @@ declare namespace drm { + * Config name deviceUniqueId + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CONFIG_DEVICE_UNIQUE_ID = 'deviceUniqueId', + /** +@@ -179,7 +191,8 @@ declare namespace drm { + * Config name maxSessionNum + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CONFIG_SESSION_MAX = 'maxSessionNum', + /** +@@ -191,7 +204,8 @@ declare namespace drm { + * Config name currentSessionNum + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CONFIG_SESSION_CURRENT = 'currentSessionNum', + } +@@ -207,7 +221,8 @@ declare namespace drm { + * @enum { number } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum MediaKeyType { + /** +@@ -219,7 +234,8 @@ declare namespace drm { + * Offline media key type. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MEDIA_KEY_TYPE_OFFLINE = 0, + /** +@@ -231,7 +247,8 @@ declare namespace drm { + * Online media key type. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MEDIA_KEY_TYPE_ONLINE, + } +@@ -247,7 +264,8 @@ declare namespace drm { + * @enum { number } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum OfflineMediaKeyStatus { + /** +@@ -259,7 +277,8 @@ declare namespace drm { + * Offline media key status unknown. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + OFFLINE_MEDIA_KEY_STATUS_UNKNOWN = 0, + /** +@@ -271,7 +290,8 @@ declare namespace drm { + * Offline media key status usable. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + OFFLINE_MEDIA_KEY_STATUS_USABLE = 1, + /** +@@ -283,7 +303,8 @@ declare namespace drm { + * Offline media key status inactive. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + OFFLINE_MEDIA_KEY_STATUS_INACTIVE = 2, + } +@@ -299,7 +320,8 @@ declare namespace drm { + * @enum { number } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum CertificateStatus { + /** +@@ -311,7 +333,8 @@ declare namespace drm { + * Device already provisioned. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CERT_STATUS_PROVISIONED = 0, + /** +@@ -323,7 +346,8 @@ declare namespace drm { + * Device not provisioned. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CERT_STATUS_NOT_PROVISIONED, + /** +@@ -335,7 +359,8 @@ declare namespace drm { + * Cert already expired. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CERT_STATUS_EXPIRED, + /** +@@ -347,7 +372,8 @@ declare namespace drm { + * Certs are invalid. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CERT_STATUS_INVALID, + /** +@@ -359,7 +385,8 @@ declare namespace drm { + * Get certs status failed. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CERT_STATUS_UNAVAILABLE, + } +@@ -375,7 +402,8 @@ declare namespace drm { + * @enum { number } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum MediaKeyRequestType { + /** +@@ -387,7 +415,8 @@ declare namespace drm { + * Media key request type unknown. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MEDIA_KEY_REQUEST_TYPE_UNKNOWN = 0, + /** +@@ -399,7 +428,8 @@ declare namespace drm { + * Media key request type initial. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MEDIA_KEY_REQUEST_TYPE_INITIAL = 1, + /** +@@ -411,7 +441,8 @@ declare namespace drm { + * Media key request type renewal. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MEDIA_KEY_REQUEST_TYPE_RENEWAL = 2, + /** +@@ -423,7 +454,8 @@ declare namespace drm { + * Media key request type release. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MEDIA_KEY_REQUEST_TYPE_RELEASE = 3, + /** +@@ -435,7 +467,8 @@ declare namespace drm { + * Media key request type none. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MEDIA_KEY_REQUEST_TYPE_NONE = 4, + /** +@@ -447,7 +480,8 @@ declare namespace drm { + * Media key request type update. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MEDIA_KEY_REQUEST_TYPE_UPDATE = 5, + } +@@ -463,7 +497,8 @@ declare namespace drm { + * @enum { number } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum ContentProtectionLevel { + /** +@@ -475,7 +510,8 @@ declare namespace drm { + * Device decrypt and decode type unknown. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CONTENT_PROTECTION_LEVEL_UNKNOWN = 0, + /** +@@ -487,7 +523,8 @@ declare namespace drm { + * Device using software level. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CONTENT_PROTECTION_LEVEL_SW_CRYPTO, + /** +@@ -499,7 +536,8 @@ declare namespace drm { + * Device using hardware level. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CONTENT_PROTECTION_LEVEL_HW_CRYPTO, + /** +@@ -511,7 +549,8 @@ declare namespace drm { + * Device using enhanced hardware level. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CONTENT_PROTECTION_LEVEL_ENHANCED_HW, + /** +@@ -523,7 +562,8 @@ declare namespace drm { + * Max mode. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CONTENT_PROTECTION_LEVEL_MAX, + } +@@ -539,7 +579,8 @@ declare namespace drm { + * @interface ProvisionRequest + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ProvisionRequest { + /** +@@ -553,7 +594,8 @@ declare namespace drm { + * @type { Uint8Array } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + data: Uint8Array; + /** +@@ -567,7 +609,8 @@ declare namespace drm { + * @type { string } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + defaultURL: string; + } +@@ -583,7 +626,8 @@ declare namespace drm { + * @interface OptionsData + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface OptionsData { + /** +@@ -597,7 +641,8 @@ declare namespace drm { + * @type { string } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + name: string; + /** +@@ -611,7 +656,8 @@ declare namespace drm { + * @type { string } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + value: string; + } +@@ -627,7 +673,8 @@ declare namespace drm { + * @interface MediaKeyRequest + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MediaKeyRequest { + /** +@@ -641,7 +688,8 @@ declare namespace drm { + * @type { MediaKeyRequestType } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + mediaKeyRequestType: MediaKeyRequestType; + /** +@@ -655,7 +703,8 @@ declare namespace drm { + * @type { Uint8Array } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + data: Uint8Array; + /** +@@ -669,7 +718,8 @@ declare namespace drm { + * @type { string } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + defaultURL: string; + } +@@ -685,7 +735,8 @@ declare namespace drm { + * @interface EventInfo + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface EventInfo { + /** +@@ -699,7 +750,8 @@ declare namespace drm { + * @type { Uint8Array } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + info: Uint8Array; + /** +@@ -713,7 +765,8 @@ declare namespace drm { + * @type { string } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + extraInfo: string; + } +@@ -729,7 +782,8 @@ declare namespace drm { + * @interface StatisticKeyValue + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface StatisticKeyValue { + /** +@@ -743,7 +797,8 @@ declare namespace drm { + * @type { string } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + name: string; + /** +@@ -757,7 +812,8 @@ declare namespace drm { + * @type { string } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + value: string; + } +@@ -773,7 +829,8 @@ declare namespace drm { + * @interface MediaKeyStatus + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MediaKeyStatus { + /** +@@ -787,7 +844,8 @@ declare namespace drm { + * @type { string } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + name: string; + /** +@@ -801,7 +859,8 @@ declare namespace drm { + * @type { string } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + value: string; + } +@@ -817,7 +876,8 @@ declare namespace drm { + * @interface KeysInfo + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface KeysInfo { + /** +@@ -831,7 +891,8 @@ declare namespace drm { + * @type { Uint8Array } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + keyId: Uint8Array; + /** +@@ -845,7 +906,8 @@ declare namespace drm { + * @type { string } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + value: string; + } +@@ -861,7 +923,8 @@ declare namespace drm { + * @interface MediaKeySystemInfo + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MediaKeySystemInfo { + /** +@@ -875,7 +938,8 @@ declare namespace drm { + * @type { string } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + uuid: string; + /** +@@ -889,7 +953,8 @@ declare namespace drm { + * @type { Uint8Array } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + pssh: Uint8Array; + } +@@ -905,7 +970,8 @@ declare namespace drm { + * @interface MediaKeySystemDescription + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MediaKeySystemDescription { + /** +@@ -919,7 +985,8 @@ declare namespace drm { + * @type { string } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + name: string; + /** +@@ -933,7 +1000,8 @@ declare namespace drm { + * @type { string } + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + uuid: string; + } +@@ -959,7 +1027,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getMediaKeySystemUuid(name: string): string; + +@@ -978,7 +1047,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getMediaKeySystems(): MediaKeySystemDescription[]; + +@@ -1009,6 +1079,21 @@ declare namespace drm { + */ + function createMediaKeySystem(name: string): MediaKeySystem; + ++ /** ++ * Creates a MediaKeySystem instance. ++ * @param { string } name - Used to point a Digital Right Management solution. ++ * @returns { MediaKeySystem | undefined } The MediaKeySystem instance or undefined. ++ * @throws { BusinessError } 401 - The parameter check failed. Possibly because: ++ * 1.Mandatory parameters are left unspecified. 2.Parameter verification failed. ++ * @throws { BusinessError } 24700101 - All unknown errors. ++ * @throws { BusinessError } 24700103 - Meet max MediaKeySystem num limit. ++ * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. ++ * @syscap SystemCapability.Multimedia.Drm.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ function createMediaKeySystem(name: string): MediaKeySystem | undefined; ++ + /** + * Judge whether a system that specifies name, mimetype and content protection level is supported. + * @param { string } name - Used to point a Digital Right Management solution. +@@ -1036,7 +1121,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isMediaKeySystemSupported(name: string, mimeType: string, level: ContentProtectionLevel): boolean; + +@@ -1065,7 +1151,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isMediaKeySystemSupported(name: string, mimeType: string): boolean; + +@@ -1092,7 +1179,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isMediaKeySystemSupported(name: string): boolean; + +@@ -1109,7 +1197,8 @@ declare namespace drm { + * @interface MediaKeySystem + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MediaKeySystem { + /** +@@ -1135,7 +1224,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getConfigurationString(configName: string): string; + +@@ -1162,7 +1252,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setConfigurationString(configName: string, value: string): void; + +@@ -1187,7 +1278,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getConfigurationByteArray(configName: string): Uint8Array; + +@@ -1214,7 +1306,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setConfigurationByteArray(configName: string, value: Uint8Array): void; + +@@ -1235,7 +1328,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getStatistics(): StatisticKeyValue[]; + +@@ -1254,7 +1348,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getMaxContentProtectionLevel(): ContentProtectionLevel; + +@@ -1273,7 +1368,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + generateKeySystemRequest(): Promise; + +@@ -1300,7 +1396,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + processKeySystemResponse(response: Uint8Array): Promise; + +@@ -1319,7 +1416,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getCertificateStatus(): CertificateStatus; + +@@ -1342,7 +1440,8 @@ declare namespace drm { + * @throws { BusinessError } 24700101 - All unknown errors. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'keySystemRequired', callback: (eventInfo: EventInfo) => void): void; + +@@ -1365,7 +1464,8 @@ declare namespace drm { + * @throws { BusinessError } 24700101 - All unknown errors. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'keySystemRequired', callback?: (eventInfo: EventInfo) => void): void; + +@@ -1398,6 +1498,22 @@ declare namespace drm { + */ + createMediaKeySession(level: ContentProtectionLevel): MediaKeySession; + ++ /** ++ * Create a MediaKeySession instance with level. ++ * @param { ContentProtectionLevel} level - Used to specify the content protection level. ++ * @returns { MediaKeySession | undefined } A MediaKeySession instance or undefined. ++ * @throws { BusinessError } 401 - The parameter check failed. Possibly because: ++ * 1.Mandatory parameters are left unspecified. 2.The param level exceeds reasonable range, ++ * please use value in ContentProtectionLevel. ++ * @throws { BusinessError } 24700101 - All unknown errors. ++ * @throws { BusinessError } 24700104 - Meet max MediaKeySession num limit. ++ * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. ++ * @syscap SystemCapability.Multimedia.Drm.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ createMediaKeySession(level: ContentProtectionLevel): MediaKeySession | undefined; ++ + /** + * Create a MediaKeySession instance. + * @returns { MediaKeySession } A MediaKeySession instance. +@@ -1419,6 +1535,18 @@ declare namespace drm { + */ + createMediaKeySession(): MediaKeySession; + ++ /** ++ * Create a MediaKeySession instance. ++ * @returns { MediaKeySession | undefined } A MediaKeySession instance or undefined ++ * @throws { BusinessError } 24700101 - All unknown errors. ++ * @throws { BusinessError } 24700104 - Meet max MediaKeySession num limit. ++ * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. ++ * @syscap SystemCapability.Multimedia.Drm.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ createMediaKeySession(): MediaKeySession | undefined; ++ + /** + * Get the list of offline MediaKeyIds. + * @returns { Uint8Array[] } The list of offline MediaKeyIds. +@@ -1434,7 +1562,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getOfflineMediaKeyIds(): Uint8Array[]; + +@@ -1461,7 +1590,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getOfflineMediaKeyStatus(mediaKeyId: Uint8Array): OfflineMediaKeyStatus; + +@@ -1484,7 +1614,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + clearOfflineMediaKeys(mediaKeyId: Uint8Array): void; + /** +@@ -1500,7 +1631,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + destroy(): void; + } +@@ -1518,7 +1650,8 @@ declare namespace drm { + * @interface MediaKeySession + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MediaKeySession { + +@@ -1541,7 +1674,7 @@ declare namespace drm { + * Generate the media key request. + * @param { string } mimeType - Media type. + * @param { Uint8Array } initData - PSSH info. +- * @param { number } mediaKeyType - Offline or online. ++ * @param { int } mediaKeyType - Offline or online. + * @param { OptionsData[] } options - Optional data the application set to drm framework. + * @returns { Promise } Promise with MediaKeyRequest used to return the result. + * @throws { BusinessError } 401 -The parameter check failed. Possibly because: +@@ -1551,9 +1684,10 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- generateMediaKeyRequest(mimeType: string, initData: Uint8Array, mediaKeyType: number, options?: OptionsData[]): Promise; ++ generateMediaKeyRequest(mimeType: string, initData: Uint8Array, mediaKeyType: int, options?: OptionsData[]): Promise; + + /** + * Process the response corresponding to the media key request obtained by the application. +@@ -1578,7 +1712,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + processMediaKeyResponse(response: Uint8Array): Promise; + +@@ -1597,7 +1732,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + checkMediaKeyStatus(): MediaKeyStatus[]; + +@@ -1614,7 +1750,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + clearMediaKeys(): void; + +@@ -1643,7 +1780,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + generateOfflineReleaseRequest(mediaKeyId: Uint8Array): Promise; + +@@ -1672,7 +1810,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + processOfflineReleaseResponse(mediaKeyId: Uint8Array, response: Uint8Array): Promise; + +@@ -1699,7 +1838,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + restoreOfflineMediaKeys(mediaKeyId: Uint8Array): Promise; + +@@ -1718,7 +1858,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getContentProtectionLevel(): ContentProtectionLevel; + +@@ -1745,7 +1886,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + requireSecureDecoderModule(mimeType: string): boolean; + +@@ -1770,7 +1912,8 @@ declare namespace drm { + * @throws { BusinessError } 24700101 - All unknown errors. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'keyRequired', callback: (eventInfo: EventInfo) => void): void; + +@@ -1795,7 +1938,8 @@ declare namespace drm { + * @throws { BusinessError } 24700101 - All unknown errors. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'keyRequired', callback?: (eventInfo: EventInfo) => void): void; + +@@ -1820,7 +1964,8 @@ declare namespace drm { + * @throws { BusinessError } 24700101 - All unknown errors. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'keyExpired', callback: (eventInfo: EventInfo) => void): void; + +@@ -1845,7 +1990,8 @@ declare namespace drm { + * @throws { BusinessError } 24700101 - All unknown errors. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'keyExpired', callback?: (eventInfo: EventInfo) => void): void; + +@@ -1870,7 +2016,8 @@ declare namespace drm { + * @throws { BusinessError } 24700101 - All unknown errors. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'vendorDefined', callback: (eventInfo: EventInfo) => void): void; + +@@ -1895,7 +2042,8 @@ declare namespace drm { + * @throws { BusinessError } 24700101 - All unknown errors. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * arkts 1.1&1.2 + */ + off(type: 'vendorDefined', callback?: (eventInfo: EventInfo) => void): void; + +@@ -1920,7 +2068,8 @@ declare namespace drm { + * @throws { BusinessError } 24700101 - All unknown errors. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'expirationUpdate', callback: (eventInfo: EventInfo) => void): void; + +@@ -1945,7 +2094,8 @@ declare namespace drm { + * @throws { BusinessError } 24700101 - All unknown errors. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'expirationUpdate', callback?: (eventInfo: EventInfo) => void): void; + +@@ -1970,7 +2120,8 @@ declare namespace drm { + * @throws { BusinessError } 24700101 - All unknown errors. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'keysChange', callback: (keyInfo: KeysInfo[], newKeyAvailable: boolean) => void): void; + +@@ -1995,7 +2146,8 @@ declare namespace drm { + * @throws { BusinessError } 24700101 - All unknown errors. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'keysChange', callback?: (keyInfo: KeysInfo[], newKeyAvailable: boolean) => void): void; + +@@ -2012,7 +2164,8 @@ declare namespace drm { + * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. + * @syscap SystemCapability.Multimedia.Drm.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + destroy(): void; + +diff --git a/api/@ohos.multimedia.image.d.ts b/api/@ohos.multimedia.image.d.ts +index 8d12a3fcd..8c6ec44f3 100644 +--- a/api/@ohos.multimedia.image.d.ts ++++ b/api/@ohos.multimedia.image.d.ts +@@ -22,9 +22,6 @@ import { AsyncCallback } from './@ohos.base'; + import type colorSpaceManager from './@ohos.graphics.colorSpaceManager'; + import type resourceManager from './@ohos.resourceManager'; + import type rpc from './@ohos.rpc'; +-/*** if arkts 1.1 */ +-import { int, double, float } from './@ohos.base'; +-/*** endif */ + + /** + * @namespace image +@@ -52,14 +49,14 @@ declare namespace image { + /** + * Enumerates pixel map formats. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @since 7 + */ + /** + * Enumerates pixel map formats. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @since 10 +@@ -67,7 +64,7 @@ declare namespace image { + /** + * Enumerates pixel map formats. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @atomicservice +@@ -76,7 +73,7 @@ declare namespace image { + /** + * Enumerates pixel map formats. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form +@@ -473,7 +470,7 @@ declare namespace image { + /** + * Enumerates image resolution quality. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @systemapi + * @since arkts {'1.1':'12','1.2':'20'} +@@ -550,14 +547,14 @@ declare namespace image { + /** + * Height + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @since 6 + */ + /** + * Height + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @since 10 +@@ -565,7 +562,7 @@ declare namespace image { + /** + * Height + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @atomicservice +@@ -587,14 +584,14 @@ declare namespace image { + /** + * Width + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @since 6 + */ + /** + * Width + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @since 10 +@@ -602,7 +599,7 @@ declare namespace image { + /** + * Width + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @atomicservice +@@ -2498,7 +2495,7 @@ declare namespace image { + /** + * Enum for image formats. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 +@@ -2526,14 +2523,14 @@ declare namespace image { + /** + * Enumerates alpha types. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * Enumerates alpha types. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @since 10 +@@ -2541,7 +2538,7 @@ declare namespace image { + /** + * Enumerates alpha types. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @atomicservice +@@ -2550,7 +2547,7 @@ declare namespace image { + /** + * Enumerates alpha types. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form +@@ -2695,7 +2692,7 @@ declare namespace image { + /** + * Enumerates decoding dynamic range. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 +@@ -2732,7 +2729,7 @@ declare namespace image { + /** + * Enumerates packing dynamic range. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 +@@ -2945,7 +2942,7 @@ declare namespace image { + /** + * The component type of image. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Image.ImageReceiver + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 +@@ -2991,7 +2988,7 @@ declare namespace image { + /** + * Enumerates the HDR metadata types that need to be stored in Pixelmap. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 +@@ -3037,7 +3034,7 @@ declare namespace image { + /** + * Value for HDR_METADATA_TYPE. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 +@@ -3083,7 +3080,7 @@ declare namespace image { + /** + * Type of allocator used to allocate memory of a PixelMap. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 +@@ -3193,14 +3190,14 @@ declare namespace image { + /** + * x-coordinate at the upper left corner of the image. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @since 7 + */ + /** + * x-coordinate at the upper left corner of the image. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @since 10 +@@ -3208,7 +3205,7 @@ declare namespace image { + /** + * x-coordinate at the upper left corner of the image. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @atomicservice +@@ -3230,14 +3227,14 @@ declare namespace image { + /** + * y-coordinate at the upper left corner of the image. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @since 7 + */ + /** + * y-coordinate at the upper left corner of the image. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @since 10 +@@ -3245,7 +3242,7 @@ declare namespace image { + /** + * y-coordinate at the upper left corner of the image. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @atomicservice +@@ -3526,14 +3523,14 @@ declare namespace image { + /** + * Indicates image default density. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * Indicates image default density. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @since 10 +@@ -3541,7 +3538,7 @@ declare namespace image { + /** + * Indicates image default density. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @atomicservice +@@ -3563,7 +3560,7 @@ declare namespace image { + /** + * The number of byte per row. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @atomicservice + * @since 11 +@@ -3631,7 +3628,7 @@ declare namespace image { + /** + * Enumerates the strategies for executing the cropping and scaling operations when both desiredSize and desiredRegion are specified. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 +@@ -3712,14 +3709,14 @@ declare namespace image { + /** + * Quality of the target image. The value is an integer ranging from 0 to 100. A larger value indicates better. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.ImagePacker + * @since 6 + */ + /** + * Quality of the target image. The value is an integer ranging from 0 to 100. A larger value indicates better. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.ImagePacker + * @crossplatform + * @since 10 +@@ -3740,7 +3737,7 @@ declare namespace image { + * BufferSize of the target image. + * If this bufferSize is less than or equal to 0, it will be converted to 10MB. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.Multimedia.Image.ImagePacker + * @since 9 + */ +@@ -3748,7 +3745,7 @@ declare namespace image { + * BufferSize of the target image. + * If this bufferSize is less than or equal to 0, it will be converted to 10MB. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.Multimedia.Image.ImagePacker + * @crossplatform + * @since 10 +@@ -3792,46 +3789,51 @@ declare namespace image { + * + * @typedef PackingOptionsForSequence + * @syscap SystemCapability.Multimedia.Image.ImagePacker +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PackingOptionsForSequence { + /** + * Specify the number of frames. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.ImagePacker +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- frameCount: number; ++ frameCount: int; + + /** + * Specify the delay time for each frame of the dynamic image. + * If the length is less than frameCount, the missing parts will be filling with the last value + * +- * @type { Array } ++ * @type { Array } + * @syscap SystemCapability.Multimedia.Image.ImagePacker +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- delayTimeList: Array; ++ delayTimeList: Array; + + /** + * Specify the disposal types of each frame in the image sequence packing. + * +- * @type { ?Array } ++ * @type { ?Array } + * @syscap SystemCapability.Multimedia.Image.ImagePacker +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- disposalTypes?: Array; ++ disposalTypes?: Array; + + /** + * Specify the number of times the loop should, the range is [0, 65535] + * If this loop is equal to 0, it will be infinite loop. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.Multimedia.Image.ImagePacker +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- loopCount?: number; ++ loopCount?: int; + } + + /** +@@ -3969,14 +3971,14 @@ declare namespace image { + /** + * Number of image frames. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.Multimedia.Image.ImageSource + * @since 7 + */ + /** + * Number of image frames. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.Multimedia.Image.ImageSource + * @crossplatform + * @since 10 +@@ -3984,7 +3986,7 @@ declare namespace image { + /** + * Number of image frames. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.Multimedia.Image.ImageSource + * @crossplatform + * @atomicservice +@@ -4006,14 +4008,14 @@ declare namespace image { + /** + * Sampling ratio of the image pixel map. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.Multimedia.Image.ImageSource + * @since 7 + */ + /** + * Sampling ratio of the image pixel map. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.Multimedia.Image.ImageSource + * @crossplatform + * @since 10 +@@ -4021,7 +4023,7 @@ declare namespace image { + /** + * Sampling ratio of the image pixel map. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.Multimedia.Image.ImageSource + * @crossplatform + * @atomicservice +@@ -4043,14 +4045,14 @@ declare namespace image { + /** + * Rotation angle of the image pixel map. The value ranges from 0 to 360. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.Multimedia.Image.ImageSource + * @since 7 + */ + /** + * Rotation angle of the image pixel map. The value ranges from 0 to 360. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.Multimedia.Image.ImageSource + * @crossplatform + * @since 10 +@@ -4058,7 +4060,7 @@ declare namespace image { + /** + * Rotation angle of the image pixel map. The value ranges from 0 to 360. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.Multimedia.Image.ImageSource + * @crossplatform + * @atomicservice +@@ -4232,14 +4234,14 @@ declare namespace image { + /** + * The density for image pixel map. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.Multimedia.Image.ImageSource + * @since 9 + */ + /** + * The density for image pixel map. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.Multimedia.Image.ImageSource + * @crossplatform + * @since 10 +@@ -4247,7 +4249,7 @@ declare namespace image { + /** + * The density for image pixel map. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.Multimedia.Image.ImageSource + * @crossplatform + * @atomicservice +@@ -4634,14 +4636,14 @@ declare namespace image { + /** + * The density for ImageSource. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * The density for ImageSource. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @since 10 +@@ -4649,7 +4651,7 @@ declare namespace image { + /** + * The density for ImageSource. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @atomicservice +@@ -4748,80 +4750,89 @@ declare namespace image { + * + * @typedef HdrStaticMetadata + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface HdrStaticMetadata { + /** + * The X-coordinate of the primary colors. The length of the array is three. Store in the order of r, g, b. + * +- * @type { Array } ++ * @type { Array } + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- displayPrimariesX: Array; ++ displayPrimariesX: Array; + + /** + * The Y-coordinate of the primary colors. The length of the array is three. Store in the order of r, g, b. + * +- * @type { Array } ++ * @type { Array } + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- displayPrimariesY: Array; ++ displayPrimariesY: Array; + + /** + * The X-coordinate of the white point value. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- whitePointX: number; ++ whitePointX: double; + + /** + * The Y-coordinate of the white point value. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- whitePointY: number; ++ whitePointY: double; + + /** + * Max luminance. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- maxLuminance: number; ++ maxLuminance: double; + + /** + * Min luminance. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- minLuminance: number; ++ minLuminance: double; + + /** + * Maximum brightness of displayed content. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- maxContentLightLevel: number; ++ maxContentLightLevel: double; + + /** + * Maximum average brightness of displayed content. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- maxFrameAverageLightLevel: number; ++ maxFrameAverageLightLevel: double; + } + + /** +@@ -4829,53 +4840,59 @@ declare namespace image { + * + * @typedef GainmapChannel + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface GainmapChannel { + /** + * The per-component max gain map values. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- gainmapMax: number; ++ gainmapMax: double; + + /** + * The per-component min gain map values. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- gainmapMin: number; ++ gainmapMin: double; + + /** + * The per-component gamma values. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- gamma: number; ++ gamma: double; + + /** + * The per-component baseline offset. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- baseOffset: number; ++ baseOffset: double; + + /** + * The per-component alternate offset. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- alternateOffset: number; ++ alternateOffset: double; + } + + /** +@@ -4883,69 +4900,77 @@ declare namespace image { + * + * @typedef HdrGainmapMetadata + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface HdrGainmapMetadata { + /** + * The version used by the writer. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- writerVersion: number; ++ writerVersion: int; + + /** + * The minimum version a parser needs to understand. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- miniVersion: number; ++ miniVersion: int; + + /** + * The number of gain map channels, with a value of 1 or 3. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- gainmapChannelCount: number; ++ gainmapChannelCount: int; + + /** + * Indicate whether to use the color space of the base image. + * + * @type { boolean } + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + useBaseColorFlag: boolean; + + /** + * The baseline hdr headroom. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- baseHeadroom: number; ++ baseHeadroom: double; + + /** + * The alternate hdr headroom. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- alternateHeadroom: number; ++ alternateHeadroom: double; + + /** + * The per-channel metadata. + * + * @type { Array } + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + channels: Array; + } +@@ -4955,7 +4980,8 @@ declare namespace image { + * + * @typedef {HdrMetadataType | HdrStaticMetadata | ArrayBuffer | HdrGainmapMetadata} HdrMetadataValue + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type HdrMetadataValue = HdrMetadataType | HdrStaticMetadata | ArrayBuffer | HdrGainmapMetadata; + +@@ -5133,8 +5159,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; + +@@ -5261,7 +5286,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise): void; + +@@ -5778,7 +5807,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; + +@@ -5818,7 +5848,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise): void; + +@@ -5979,7 +6010,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; + +@@ -6023,7 +6055,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise): void; + +@@ -6048,7 +6081,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the operation result. If the operation fails, an error message is returned. + * @throws { BusinessError } 62980137 - Invalid image operation. + * @syscap SystemCapability.Multimedia.Image.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + toSdr(): Promise; + +@@ -6245,14 +6279,15 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise): void; + +@@ -7147,7 +7185,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; + +@@ -7162,7 +7201,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; + +@@ -7353,7 +7393,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; + +@@ -7361,7 +7402,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise + +@@ -7412,7 +7457,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise + +@@ -7424,7 +7470,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } + * @syscap SystemCapability.Multimedia.Image.ImageSource +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + desiredAuxiliaryPictures: Array; + } +@@ -8389,7 +8442,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise> } A Promise instance used to return the array. ++ * @returns { Promise> } A Promise instance used to return the array. + * @throws { BusinessError } 62980096 - The operation failed. + * @throws { BusinessError } 62980110 - The image source data is incorrect. + * @throws { BusinessError } 62980111 - The image source data is incomplete. +@@ -8430,7 +8483,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise> } callback Callback used to return the array. ++ * @param { AsyncCallback> } callback Callback used to return the array. + * @throws { BusinessError } 62980096 - The operation failed. + * @throws { BusinessError } 62980110 - The image source data is incorrect. + * @throws { BusinessError } 62980111 - The image source data is incomplete. +@@ -8471,21 +8524,22 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise> } A Promise instance used to return the array. ++ * @returns { Promise> } A Promise instance used to return the array. + * @throws { BusinessError } 62980096 - The operation failed. + * @throws { BusinessError } 62980101 - The image data is abnormal. + * @throws { BusinessError } 62980137 - Invalid media operation. + * @throws { BusinessError } 62980149 - Invalid MIME type for the image source. + * @syscap SystemCapability.Multimedia.Image.ImageSource + * @crossplatform +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getDisposalTypeList(): Promise>; ++ getDisposalTypeList(): Promise>; + + /** + * Obtains the count of frame in an image. This method uses a promise to return the number. + * +- * @returns { Promise } A Promise instance used to return the number. ++ * @returns { Promise } A Promise instance used to return the number. + * @throws { BusinessError } 62980096 - The operation failed. + * @throws { BusinessError } 62980110 - The image source data is incorrect. + * @throws { BusinessError } 62980111 - The image source data is incomplete. +@@ -8503,7 +8557,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the number. ++ * @returns { Promise } A Promise instance used to return the number. + * @throws { BusinessError } 62980096 - The operation failed. + * @throws { BusinessError } 62980110 - The image source data is incorrect. + * @throws { BusinessError } 62980111 - The image source data is incomplete. +@@ -8516,14 +8570,15 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; ++ getFrameCount(): Promise; + + /** + * Obtains the count of frame in an image. This method uses a callback to return the number. + * +- * @param { AsyncCallback } callback Callback used to return the number. ++ * @param { AsyncCallback } callback Callback used to return the number. + * @throws { BusinessError } 62980096 - The operation failed. + * @throws { BusinessError } 62980110 - The image source data is incorrect. + * @throws { BusinessError } 62980111 - The image source data is incomplete. +@@ -8541,7 +8596,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback used to return the number. ++ * @param { AsyncCallback } callback Callback used to return the number. + * @throws { BusinessError } 62980096 - The operation failed. + * @throws { BusinessError } 62980110 - The image source data is incorrect. + * @throws { BusinessError } 62980111 - The image source data is incomplete. +@@ -8554,9 +8609,10 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise): void; ++ getFrameCount(callback: AsyncCallback): void; + + /** + * Obtains the value of a property in an image with the specified index. This method uses a +@@ -8843,14 +8899,15 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the property value. + * @syscap SystemCapability.Multimedia.Image.ImageSource + * @crossplatform +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- updateData(buf: ArrayBuffer, isFinished: boolean, offset: number, length: number): Promise; ++ updateData(buf: ArrayBuffer, isFinished: boolean, offset: int, length: int): Promise; + + /** + * Update the data in the incremental ImageSource. +@@ -8880,18 +8937,19 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback to return the operation result. + * @syscap SystemCapability.Multimedia.Image.ImageSource + * @crossplatform +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + updateData( + buf: ArrayBuffer, + isFinished: boolean, +- offset: number, +- length: number, ++ offset: int, ++ length: int, + callback: AsyncCallback + ): void; + +@@ -8941,7 +8999,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise + +@@ -9086,7 +9145,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; + +@@ -9184,7 +9244,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; + +@@ -9199,7 +9260,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise, options: PackingOptionsForSequence): Promise; + +@@ -9299,7 +9361,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } pixelmapSequence PixelMaps to be encoded. +- * @param { number } fd File descriptor of the output encoded file. ++ * @param { int } fd File descriptor of the output encoded file. + * @param { PackingOptionsForSequence } options Options for image packing. + * @returns { Promise } void. + * @throws { BusinessError } 401 - Parameter error.Possible causes: 1.Mandatory parameters are left unspecified. +@@ -9307,9 +9369,10 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise, fd: number, options: PackingOptionsForSequence): Promise; ++ packToFileFromPixelmapSequence(pixelmapSequence: Array, fd: int, options: PackingOptionsForSequence): Promise; + + /** + * Releases an ImagePacker instance and uses a callback to return the result. +@@ -9443,13 +9506,13 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback used to return the next image. + * @syscap SystemCapability.Multimedia.Image.ImageReceiver +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readNextImage(callback: AsyncCallback): void; + +@@ -9592,7 +9656,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the next image. + * @syscap SystemCapability.Multimedia.Image.ImageReceiver +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readNextImage(): Promise; + +@@ -9675,7 +9740,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback to return the operation result. + * @syscap SystemCapability.Multimedia.Image.ImageCreator +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + dequeueImage(callback: AsyncCallback): void; + +@@ -9684,29 +9750,32 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the operation result. + * @syscap SystemCapability.Multimedia.Image.ImageCreator +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + dequeueImage(): Promise; + + /** + * Queue buffer to dirty queue and uses a callback to return the result. + * +- * @param { Image } interface ++ * @param { Image } image + * @param { AsyncCallback } callback Callback to return the operation result. + * @syscap SystemCapability.Multimedia.Image.ImageCreator +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- queueImage(interface: Image, callback: AsyncCallback): void; ++ queueImage(image: Image, callback: AsyncCallback): void; + + /** + * Queue buffer to dirty queue and uses a promise to return the result. + * +- * @param { Image } interface ++ * @param { Image } image + * @returns { Promise } A Promise instance used to return the operation result. + * @syscap SystemCapability.Multimedia.Image.ImageCreator +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- queueImage(interface: Image): Promise; ++ queueImage(image: Image): Promise; + + /** + * Subscribe callback when releasing buffer +@@ -9714,7 +9783,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback used to return the operation result. + * @syscap SystemCapability.Multimedia.Image.ImageCreator +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'imageRelease', callback: AsyncCallback): void; + +@@ -9724,7 +9794,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback to be removed. + * @syscap SystemCapability.Multimedia.Image.ImageCreator +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'imageRelease', callback?: AsyncCallback): void; + +diff --git a/api/@ohos.multimedia.media.d.ts b/api/@ohos.multimedia.media.d.ts +index ba9645edc..1a7954a8b 100644 +--- a/api/@ohos.multimedia.media.d.ts ++++ b/api/@ohos.multimedia.media.d.ts +@@ -18,12 +18,12 @@ + * @kit MediaKit + */ + +-import { ErrorCallback, AsyncCallback, Callback, BusinessError } from './@ohos.base'; ++import { ErrorCallback, AsyncCallback, Callback } from './@ohos.base'; + import audio from "./@ohos.multimedia.audio"; + import photoAccessHelper from './@ohos.file.photoAccessHelper'; +-import image from './@ohos.multimedia.image'; +-import { SoundPool as _SoundPool } from './multimedia/soundPool'; +-import { PlayParameters as _PlayParameters } from './multimedia/soundPool'; ++import type image from './@ohos.multimedia.image'; ++import type { SoundPool as _SoundPool } from './multimedia/soundPool'; ++import type { PlayParameters as _PlayParameters } from './multimedia/soundPool'; + import type drm from './@ohos.multimedia.drm'; + + /** +@@ -66,10 +66,20 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + function createAVPlayer(callback: AsyncCallback): void; ++ /** ++ * Creates an AVPlayer instance. ++ * @param { AsyncCallback } callback - used to return AVPlayer instance if the operation is successful; returns null otherwise. ++ * @throws { BusinessError } 5400101 - No memory. Return by callback. ++ * @syscap SystemCapability.Multimedia.Media.AVPlayer ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ function createAVPlayer(callback: AsyncCallback): void; + + /** + * Creates an AVPlayer instance. +@@ -93,10 +103,20 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + function createAVPlayer(): Promise; ++ /** ++ * Creates an AVPlayer instance. ++ * @returns { Promise } A Promise instance used to return AVPlayer instance if the operation is successful; returns null otherwise. ++ * @throws { BusinessError } 5400101 - No memory. Return by promise. ++ * @syscap SystemCapability.Multimedia.Media.AVPlayer ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ function createAVPlayer(): Promise; + + /** + * Creates an AVRecorder instance. +@@ -111,10 +131,19 @@ declare namespace media { + * @throws { BusinessError } 5400101 - No memory. Return by callback. + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @crossplatform +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + function createAVRecorder(callback: AsyncCallback): void; ++ /** ++ * Creates an AVRecorder instance. ++ * @param { AsyncCallback } callback - used to return AVRecorder instance if the operation is successful; returns null otherwise. ++ * @throws { BusinessError } 5400101 - No memory. Return by callback. ++ * @syscap SystemCapability.Multimedia.Media.AVRecorder ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ function createAVRecorder(callback: AsyncCallback): void; + + /** + * Creates an AVRecorder instance. +@@ -130,10 +159,20 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + function createAVRecorder(): Promise; ++ /** ++ * Creates an AVRecorder instance. ++ * @returns { Promise } A Promise instance used to return AVRecorder instance if the operation is successful; returns null otherwise. ++ * @throws { BusinessError } 5400101 - No memory. Return by promise. ++ * @syscap SystemCapability.Multimedia.Media.AVRecorder ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ function createAVRecorder(): Promise; + + /** + * Creates an AudioPlayer instance. +@@ -179,6 +218,20 @@ declare namespace media { + * @since 13 + */ + function createMediaSourceWithUrl(url: string, headers?: Record): MediaSource; ++ /** ++ * Create MediaSource from url. ++ * @param { string } url : The location for the media source. ++ * @param { Record } [headers] : Headers attached to network request while player request data. ++ * @returns { MediaSource | undefined } MediaSource instance if the operation is successful; returns null otherwise. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameter types. 3.Parameter verification failed. ++ * @throws { BusinessError } 5400101 - No memory. ++ * @syscap SystemCapability.Multimedia.Media.Core ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ function createMediaSourceWithUrl(url: string, headers?: Record): MediaSource | undefined; + + /** + * Create media source from media stream array. +@@ -190,6 +243,17 @@ declare namespace media { + * @since 18 + */ + function createMediaSourceWithStreamData(streams: Array): MediaSource; ++ /** ++ * Create media source from media stream array. ++ * @param { Array } streams - The player uses it to get stream source info. ++ * @returns { MediaSource | undefined } MediaSource instance if the operation is successful; returns null otherwise. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. ++ * @syscap SystemCapability.Multimedia.Media.Core ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ function createMediaSourceWithStreamData(streams: Array): MediaSource | undefined; + + /** + * Creates an VideoPlayer instance. +@@ -228,10 +292,21 @@ declare namespace media { + * @throws { BusinessError } 5400101 - No memory. Return by callback. + * @syscap SystemCapability.Multimedia.Media.VideoRecorder + * @systemapi +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + function createVideoRecorder(callback: AsyncCallback): void; ++ /** ++ * The maintenance of this interface has been stopped since version api 9. Please use AVRecorder ++ * Creates an VideoRecorder instance. ++ * @param { AsyncCallback } callback - used to return AudioPlayer instance if the operation is successful; returns null otherwise. ++ * @throws { BusinessError } 202 - Not System App. ++ * @throws { BusinessError } 5400101 - No memory. Return by callback. ++ * @syscap SystemCapability.Multimedia.Media.VideoRecorder ++ * @systemapi ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ function createVideoRecorder(callback: AsyncCallback): void; + + /** + * The maintenance of this interface has been stopped since version api 9. Please use AVRecorder +@@ -250,40 +325,77 @@ declare namespace media { + * @throws { BusinessError } 5400101 - No memory. Return by promise. + * @syscap SystemCapability.Multimedia.Media.VideoRecorder + * @systemapi +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + function createVideoRecorder(): Promise; ++ /** ++ * The maintenance of this interface has been stopped since version api 9. Please use AVRecorder ++ * Creates an VideoRecorder instance. ++ * @returns { Promise } A Promise instance used to return VideoRecorder instance if the operation is successful; returns null otherwise. ++ * @throws { BusinessError } 202 - Not System App. ++ * @throws { BusinessError } 5400101 - No memory. Return by promise. ++ * @syscap SystemCapability.Multimedia.Media.VideoRecorder ++ * @systemapi ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ function createVideoRecorder(): Promise; + + /** + * Creates a soundPool instance. + * +- * @param {int} maxStreams The maximum number of simultaneous streams for this soundPool instance ++ * @param {number} maxStreams The maximum number of simultaneous streams for this soundPool instance + * @param {audio.AudioRendererInfo} audioRenderInfo Audio renderer information + * @param {AsyncCallback} callback Callback used to return soundPool instance if the operation is successful; returns null otherwise. + * @throws { BusinessError } 5400101 - No memory. Return by callback. + * @syscap SystemCapability.Multimedia.Media.SoundPool +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 + */ + function createSoundPool( +- maxStreams: int, ++ maxStreams: number, + audioRenderInfo: audio.AudioRendererInfo, + callback: AsyncCallback + ): void; ++ /** ++ * Creates a soundPool instance. ++ * ++ * @param {number} maxStreams The maximum number of simultaneous streams for this soundPool instance ++ * @param {audio.AudioRendererInfo} audioRenderInfo Audio renderer information ++ * @param {AsyncCallback} callback Callback used to return soundPool instance if the operation is successful; returns null otherwise. ++ * @throws { BusinessError } 5400101 - No memory. Return by callback. ++ * @syscap SystemCapability.Multimedia.Media.SoundPool ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ function createSoundPool( ++ maxStreams: number, ++ audioRenderInfo: audio.AudioRendererInfo, ++ callback: AsyncCallback ++ ): void; + + /** + * Creates a soundPool instance. + * +- * @param {int} maxStreams The maximum number of simultaneous streams for this soundPool instance ++ * @param {number} maxStreams The maximum number of simultaneous streams for this soundPool instance + * @param {audio.AudioRendererInfo} audioRenderInfo Audio renderer information + * @returns {Promise} A Promise instance used to return SoundPool instance if the operation is successful; returns null otherwise. + * @throws { BusinessError } 5400101 - No memory. Return by promise. + * @syscap SystemCapability.Multimedia.Media.SoundPool +- * @since arkts {'1.1':'10','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 10 + */ +- function createSoundPool(maxStreams: int, audioRenderInfo: audio.AudioRendererInfo): Promise; ++ function createSoundPool(maxStreams: number, audioRenderInfo: audio.AudioRendererInfo): Promise; ++ /** ++ * Creates a soundPool instance. ++ * ++ * @param {number} maxStreams The maximum number of simultaneous streams for this soundPool instance ++ * @param {audio.AudioRendererInfo} audioRenderInfo Audio renderer information ++ * @returns {Promise} A Promise instance used to return SoundPool instance if the operation is successful; returns null otherwise. ++ * @throws { BusinessError } 5400101 - No memory. Return by promise. ++ * @syscap SystemCapability.Multimedia.Media.SoundPool ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ function createSoundPool(maxStreams: number, audioRenderInfo: audio.AudioRendererInfo): Promise; + + /** + * Creates an AVScreenCaptureRecorder instance. +@@ -291,10 +403,19 @@ declare namespace media { + * returns null otherwise. + * @throws { BusinessError } 5400101 - No memory. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + function createAVScreenCaptureRecorder(): Promise; ++ /** ++ * Creates an AVScreenCaptureRecorder instance. ++ * @returns { Promise } A Promise instance used to return AVScreenCaptureRecorder instance if the operation is successful; ++ * returns null otherwise. ++ * @throws { BusinessError } 5400101 - No memory. Return by promise. ++ * @syscap SystemCapability.Multimedia.Media.AVScreenCapture ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ function createAVScreenCaptureRecorder(): Promise; + + /** + * Report user choice back to AVScreenCapture server +@@ -307,7 +428,8 @@ declare namespace media { + * @throws { BusinessError } 5400101 - No memory. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function reportAVScreenCaptureUserChoice(sessionId: number, choice: string): Promise; + +@@ -317,10 +439,19 @@ declare namespace media { + * @returns {Promise} A Promise instance used to return AVTranscoder instance if the operation is successful; returns null otherwise. + * @throws { BusinessError } 5400101 - No memory. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVTranscoder +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + function createAVTranscoder(): Promise; ++ /** ++ * Creates a AVTranscoder instance. ++ * ++ * @returns {Promise} A Promise instance used to return AVTranscoder instance if the operation is successful; returns null otherwise. ++ * @throws { BusinessError } 5400101 - No memory. Return by promise. ++ * @syscap SystemCapability.Multimedia.Media.AVTranscoder ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ function createAVTranscoder(): Promise; + + /** + * Get the ScreenCaptureMonitor instance +@@ -331,10 +462,22 @@ declare namespace media { + * @throws { BusinessError } 5400101 - No memory. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture + * @systemapi +- * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 18 + */ + function getScreenCaptureMonitor(): Promise; ++ /** ++ * Get the ScreenCaptureMonitor instance ++ * ++ * @returns { Promise } A Promise instance used to return ScreenCaptureMonitor instance if the operation is successful; ++ * returns null otherwise. ++ * @throws { BusinessError } 202 - Not System App. ++ * @throws { BusinessError } 5400101 - No memory. Return by promise. ++ * @syscap SystemCapability.Multimedia.Media.AVScreenCapture ++ * @systemapi ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ function getScreenCaptureMonitor(): Promise; + + /** + * Manages and plays sound. Before calling an SoundPool method, you must use createSoundPool() +@@ -441,10 +584,20 @@ declare namespace media { + * @throws { BusinessError } 5400101 - No memory. Returned by promise. + * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor + * @crossplatform +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + function createAVMetadataExtractor(): Promise; ++ /** ++ * Creates an AVMetadataExtractor instance. ++ * @returns { Promise } A Promise instance used to return AVMetadataExtractor instance ++ * if the operation is successful; returns null otherwise. ++ * @throws { BusinessError } 5400101 - No memory. Returned by promise. ++ * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ function createAVMetadataExtractor(): Promise; + + /** + * Creates an AVMetadataExtractor instance. +@@ -461,10 +614,20 @@ declare namespace media { + * @throws { BusinessError } 5400101 - No memory. Returned by callback. + * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor + * @crossplatform +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + function createAVMetadataExtractor(callback: AsyncCallback): void; ++ /** ++ * Creates an AVMetadataExtractor instance. ++ * @param { AsyncCallback } callback - Callback used to return AVMetadataExtractor instance ++ * if the operation is successful; returns null otherwise. ++ * @throws { BusinessError } 5400101 - No memory. Returned by callback. ++ * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ function createAVMetadataExtractor(callback: AsyncCallback): void; + + /** + * Creates an AVImageGenerator instance. +@@ -472,10 +635,19 @@ declare namespace media { + * if the operation is successful; returns null otherwise. + * @throws { BusinessError } 5400101 - No memory. Returned by promise. + * @syscap SystemCapability.Multimedia.Media.AVImageGenerator +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + function createAVImageGenerator(): Promise; ++ /** ++ * Creates an AVImageGenerator instance. ++ * @returns { Promise } A Promise instance used to return AVImageGenerator instance ++ * if the operation is successful; returns null otherwise. ++ * @throws { BusinessError } 5400101 - No memory. Returned by promise. ++ * @syscap SystemCapability.Multimedia.Media.AVImageGenerator ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ function createAVImageGenerator(): Promise; + + /** + * Creates an AVImageGenerator instance. +@@ -483,10 +655,19 @@ declare namespace media { + * if the operation is successful; returns null otherwise. + * @throws { BusinessError } 5400101 - No memory. Returned by callback. + * @syscap SystemCapability.Multimedia.Media.AVImageGenerator +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + function createAVImageGenerator(callback: AsyncCallback): void; ++ /** ++ * Creates an AVImageGenerator instance. ++ * @param { AsyncCallback } callback - Callback used to return AVImageGenerator instance ++ * if the operation is successful; returns null otherwise. ++ * @throws { BusinessError } 5400101 - No memory. Returned by callback. ++ * @syscap SystemCapability.Multimedia.Media.AVImageGenerator ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ function createAVImageGenerator(callback: AsyncCallback): void; + + /** + * Fetch media meta data or audio art picture from source. Before calling an AVMetadataExtractor method, +@@ -552,10 +733,20 @@ declare namespace media { + * @throws { BusinessError } 5400106 - Unsupported format. Returned by callback. + * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor + * @crossplatform +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + fetchMetadata(callback: AsyncCallback): void; ++ /** ++ * It will extract the resource to fetch media meta data info. ++ * @param { AsyncCallback } callback - A callback instance used to return when fetchMetadata completed. ++ * @throws { BusinessError } 5400102 - Operation not allowed. Returned by callback. ++ * @throws { BusinessError } 5400106 - Unsupported format. Returned by callback. ++ * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ fetchMetadata(callback: AsyncCallback): void; + + /** + * It will extract the resource to fetch media meta data info. +@@ -572,10 +763,20 @@ declare namespace media { + * @throws { BusinessError } 5400106 - Unsupported format. Returned by promise. + * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor + * @crossplatform +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + fetchMetadata(): Promise; ++ /** ++ * It will extract the resource to fetch media meta data info. ++ * @returns { Promise } A Promise instance used to return when fetchMetadata completed. ++ * @throws { BusinessError } 5400102 - Operation not allowed. Returned by promise. ++ * @throws { BusinessError } 5400106 - Unsupported format. Returned by promise. ++ * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ fetchMetadata(): Promise; + + /** + * It will extract the audio resource to fetch an album cover. +@@ -594,8 +795,7 @@ declare namespace media { + * @throws { BusinessError } 5400106 - Unsupported format. Returned by callback. + * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor + * @crossplatform +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + fetchAlbumCover(callback: AsyncCallback): void; + +@@ -614,8 +814,7 @@ declare namespace media { + * @throws { BusinessError } 5400106 - Unsupported format. Returned by promise. + * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor + * @crossplatform +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + fetchAlbumCover(): Promise; + +@@ -628,7 +827,8 @@ declare namespace media { + * @throws { BusinessError } 5400106 - Unsupported format. Returned by promise. + * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getTimeByFrameIndex(index: number): Promise; + +@@ -641,7 +841,8 @@ declare namespace media { + * @throws { BusinessError } 5400106 - Unsupported format. Returned by promise. + * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getFrameIndexByTime(timeUs: number): Promise; + +@@ -1084,7 +1285,7 @@ declare namespace media { + + /** + * It will fetch a picture at @timeUs from the given video resource. +- * @param { long } timeUs - The time expected to fetch picture from the video resource. ++ * @param { number } timeUs - The time expected to fetch picture from the video resource. + * The unit is microsecond(us). + * @param { AVImageQueryOptions } options - The time options about the relationship + * between the given timeUs and a key frame, see @AVImageQueryOptions . +@@ -1094,16 +1295,15 @@ declare namespace media { + * @throws { BusinessError } 5400102 - Operation not allowed. Returned by callback. + * @throws { BusinessError } 5400106 - Unsupported format. Returned by callback. + * @syscap SystemCapability.Multimedia.Media.AVImageGenerator +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ +- fetchFrameByTime(timeUs: long, options: AVImageQueryOptions, param: PixelMapParams, ++ fetchFrameByTime(timeUs: number, options: AVImageQueryOptions, param: PixelMapParams, + callback: AsyncCallback): void; + + /** + * It will decode the given video resource. Then fetch a picture + * at @timeUs according the given @options and @param . +- * @param { long } timeUs - The time expected to fetch picture from the video resource. ++ * @param { number } timeUs - The time expected to fetch picture from the video resource. + * The unit is microsecond(us). + * @param { AVImageQueryOptions } options - The time options about the relationship + * between the given timeUs and a key frame, see @AVImageQueryOptions . +@@ -1113,10 +1313,9 @@ declare namespace media { + * @throws { BusinessError } 5400102 - Operation not allowed. Returned by promise. + * @throws { BusinessError } 5400106 - Unsupported format. Returned by promise. + * @syscap SystemCapability.Multimedia.Media.AVImageGenerator +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ +- fetchFrameByTime(timeUs: long, options: AVImageQueryOptions, param: PixelMapParams): Promise; ++ fetchFrameByTime(timeUs: number, options: AVImageQueryOptions, param: PixelMapParams): Promise; + + /** + * Release resources used for AVImageGenerator. +@@ -1195,22 +1394,22 @@ declare namespace media { + /** + * Expected pixelmap's width, -1 means to keep consistent with the + * original dimensions of the given video resource. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVImageGenerator + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- width?: int; ++ width?: number; + + /** + * Expected pixelmap's width, -1 means to keep consistent with the + * original dimensions of the given video resource. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVImageGenerator + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- height?: int; ++ height?: number; + + /** + * Expected pixelmap's color format, see {@link PixelFormat}. +@@ -1282,7 +1481,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum AVErrorCode { + /** +@@ -1301,7 +1501,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_OK = 0, + +@@ -1321,7 +1522,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_NO_PERMISSION = 201, + +@@ -1341,7 +1543,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_INVALID_PARAMETER = 401, + +@@ -1361,7 +1564,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_UNSUPPORT_CAPABILITY = 801, + +@@ -1381,7 +1585,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_NO_MEMORY = 5400101, + +@@ -1401,7 +1606,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_OPERATE_NOT_PERMIT = 5400102, + +@@ -1421,7 +1627,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_IO = 5400103, + +@@ -1441,7 +1648,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_TIMEOUT = 5400104, + +@@ -1461,7 +1669,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_SERVICE_DIED = 5400105, + +@@ -1481,7 +1690,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_UNSUPPORT_FORMAT = 5400106, + +@@ -1496,7 +1706,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_AUDIO_INTERRUPTED = 5400107, + /** +@@ -1504,7 +1715,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_IO_HOST_NOT_FOUND = 5411001, + /** +@@ -1512,7 +1724,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_IO_CONNECTION_TIMEOUT = 5411002, + /** +@@ -1520,7 +1733,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_IO_NETWORK_ABNORMAL = 5411003, + /** +@@ -1528,7 +1742,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_IO_NETWORK_UNAVAILABLE = 5411004, + /** +@@ -1536,7 +1751,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_IO_NO_PERMISSION = 5411005, + /** +@@ -1544,7 +1760,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_IO_REQUEST_DENIED = 5411006, + /** +@@ -1552,7 +1769,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_IO_RESOURCE_NOT_FOUND = 5411007, + /** +@@ -1561,7 +1779,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_IO_SSL_CLIENT_CERT_NEEDED = 5411008, + /** +@@ -1570,7 +1789,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_IO_SSL_CONNECTION_FAILED = 5411009, + /** +@@ -1578,7 +1798,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_IO_SSL_SERVER_CERT_UNTRUSTED = 5411010, + /** +@@ -1586,14 +1807,16 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_IO_UNSUPPORTED_REQUEST = 5411011, + /** + * Seek continuous unsupported. + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_SEEK_CONTINUOUS_UNSUPPORTED = 5410002, + +@@ -1601,7 +1824,8 @@ declare namespace media { + * Super-resolution unsupported. + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_SUPER_RESOLUTION_UNSUPPORTED = 5410003, + +@@ -1609,7 +1833,8 @@ declare namespace media { + * No PlaybackStrategy set to enable super-resolution feature. + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVERR_SUPER_RESOLUTION_NOT_ENABLED = 5410004, + } +@@ -1643,14 +1868,14 @@ declare namespace media { + /** + * Define the TrackChange Event callback. + * @typedef { function } OnTrackChangeHandler +- * @param { int } index - index number for change Track. ++ * @param { number } index - index number for change Track. + * @param { boolean } isSelected - Target index number for moving elements. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- type OnTrackChangeHandler = (index: int, isSelected: boolean) => void; ++ type OnTrackChangeHandler = (index: number, isSelected: boolean) => void; + + /** + * Defines the OnStateChange callback. +@@ -1671,28 +1896,28 @@ declare namespace media { + * + * @typedef { function } OnBufferingUpdateHandler + * @param { BufferingInfoType } infoType - define the Buffering info Type. +- * @param { int } value - define the value of buffering info type if exist. ++ * @param { number } value - define the value of buffering info type if exist. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- type OnBufferingUpdateHandler = (infoType: BufferingInfoType, value: int) => void; ++ type OnBufferingUpdateHandler = (infoType: BufferingInfoType, value: number) => void; + + /** + * Defines the OnVideoSizeChangeHandler callback. + * + * @typedef { function } OnVideoSizeChangeHandler +- * @param { int } width - Value of video Width. +- * @param { int } height - Value of video Height. ++ * @param { number } width - Value of video Width. ++ * @param { number } height - Value of video Height. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- type OnVideoSizeChangeHandler = (width: int, height: int) => void; ++ type OnVideoSizeChangeHandler = (width: number, height: number) => void; + + /** + * Defines the OnSuperResolutionChanged callback. +@@ -1718,13 +1943,13 @@ declare namespace media { + interface SeiMessage { + /** + * Payload type of SEI message. +- * @type { int } ++ * @type { number } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 + */ +- payloadType: int; ++ payloadType: number; + + /** + * Payload data of SEI message. +@@ -1742,13 +1967,13 @@ declare namespace media { + * + * @typedef { function } OnSeiMessageHandle + * @param { Array } messages - SEI messages. +- * @param { ?int } playbackPosition - playback position. ++ * @param { ?number } playbackPosition - playback position. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 + */ +- type OnSeiMessageHandle = (messages: Array, playbackPosition?: int) => void; ++ type OnSeiMessageHandle = (messages: Array, playbackPosition?: number) => void; + + /** + * Manages and plays media. Before calling an AVPlayer method, you must use createAVPlayer() +@@ -2111,14 +2336,14 @@ declare namespace media { + + /** + * Jumps to the specified playback position. +- * @param { int } timeMs - Playback position to jump, should be in [0, duration]. ++ * @param { number } timeMs - Playback position to jump, should be in [0, duration]. + * @param { SeekMode } mode - See @SeekMode . + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @since 9 + */ + /** + * Jumps to the specified playback position. +- * @param { int } timeMs - Playback position to jump, should be in [0, duration]. ++ * @param { number } timeMs - Playback position to jump, should be in [0, duration]. + * @param { SeekMode } mode - See @SeekMode . + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice +@@ -2126,7 +2351,7 @@ declare namespace media { + */ + /** + * Jumps to the specified playback position. +- * @param { int } timeMs - Playback position to jump, should be in [0, duration]. ++ * @param { number } timeMs - Playback position to jump, should be in [0, duration]. + * @param { SeekMode } mode - See @SeekMode . + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform +@@ -2134,24 +2359,24 @@ declare namespace media { + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- seek(timeMs: int, mode?: SeekMode): void; ++ seek(timeMs: number, mode?: SeekMode): void; + + /** + * Sets the volume. +- * @param { double } volume - Relative volume. The value ranges from 0.00 to 1.00. The value 1 indicates the maximum volume (100%). ++ * @param { number } volume - Relative volume. The value ranges from 0.00 to 1.00. The value 1 indicates the maximum volume (100%). + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @since 9 + */ + /** + * Sets the volume. +- * @param { double } volume - Relative volume. The value ranges from 0.00 to 1.00. The value 1 indicates the maximum volume (100%). ++ * @param { number } volume - Relative volume. The value ranges from 0.00 to 1.00. The value 1 indicates the maximum volume (100%). + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- setVolume(volume: double): void; ++ setVolume(volume: number): void; + + /** + * Get all track infos in MediaDescription, should be called after data loaded callback. +@@ -2213,7 +2438,8 @@ declare namespace media { + * @throws { BusinessError } 5400102 - Operation not allowed. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSelectedTracks(): Promise>; + +@@ -2226,7 +2452,8 @@ declare namespace media { + * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + selectTrack(index: number, mode?: SwitchMode): Promise; + +@@ -2238,7 +2465,8 @@ declare namespace media { + * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + deselectTrack(index: number): Promise; + +@@ -2252,7 +2480,8 @@ declare namespace media { + * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setMediaSource(src: MediaSource, strategy?: PlaybackStrategy): Promise; + +@@ -2269,7 +2498,8 @@ declare namespace media { + * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + addSubtitleFromFd(fd: number, offset?: number, length?: number): Promise; + +@@ -2282,17 +2512,19 @@ declare namespace media { + * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + addSubtitleFromUrl(url: string): Promise; + + /** + * Get statistic infos of current player. +- * @returns { Promise> } Statistic infos of current player. ++ * @returns { Promise } Statistic infos of current player. + * @syscap SystemCapability.Multimedia.Media.AVPlayer +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getPlaybackInfo(): Promise>; ++ getPlaybackInfo(): Promise; + + /** + * Set playback strategy to AVPlayer. +@@ -2302,7 +2534,8 @@ declare namespace media { + * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setPlaybackStrategy(strategy: PlaybackStrategy): Promise; + +@@ -2315,7 +2548,8 @@ declare namespace media { + * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setMediaMuted(mediaType: MediaType, muted: boolean): Promise; + +@@ -2335,7 +2569,8 @@ declare namespace media { + * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setPlaybackRange(startTimeMs: number, endTimeMs: number, mode?: SeekMode) : Promise; + +@@ -2357,7 +2592,8 @@ declare namespace media { + * @throws { BusinessError } 5400102 - Operation not allowed. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getPlaybackPosition() : number; + +@@ -2373,7 +2609,8 @@ declare namespace media { + * Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setSuperResolution(enabled: boolean) : Promise; + +@@ -2391,7 +2628,8 @@ declare namespace media { + * Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setVideoWindowSize(width: number, height: number) : Promise; + +@@ -2494,8 +2732,7 @@ declare namespace media { + * @type { ?audio.InterruptMode } + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + audioInterruptMode?: audio.InterruptMode; + +@@ -2513,8 +2750,7 @@ declare namespace media { + * @type { ?audio.AudioRendererInfo } + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + audioRendererInfo?: audio.AudioRendererInfo; + +@@ -2539,7 +2775,7 @@ declare namespace media { + */ + /** + * Current playback position. +- * @type { int } ++ * @type { number } + * @readonly + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform +@@ -2547,7 +2783,7 @@ declare namespace media { + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly currentTime: int; ++ readonly currentTime: number; + + /** + * Playback duration, When the data source does not support seek, it returns - 1, such as a live broadcast scenario. +@@ -2562,7 +2798,7 @@ declare namespace media { + */ + /** + * Playback duration, When the data source does not support seek, it returns - 1, such as a live broadcast scenario. +- * @type { int } ++ * @type { number } + * @readonly + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform +@@ -2570,7 +2806,7 @@ declare namespace media { + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly duration: int; ++ readonly duration: number; + + /** + * Playback state. +@@ -2618,7 +2854,7 @@ declare namespace media { + */ + /** + * Video width, valid after prepared. +- * @type { int } ++ * @type { number } + * @readonly + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform +@@ -2626,7 +2862,7 @@ declare namespace media { + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly width: int; ++ readonly width: number; + + /** + * Video height, valid after prepared. +@@ -2635,7 +2871,7 @@ declare namespace media { + */ + /** + * Video height, valid after prepared. +- * @type { int } ++ * @type { number } + * @readonly + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform +@@ -2643,7 +2879,7 @@ declare namespace media { + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly height: int; ++ readonly height: number; + + /** + * Video scale type. By default, the {@link #VIDEO_SCALE_TYPE_FIT} will be used, for more +@@ -2700,7 +2936,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setBitrate(bitrate: number): void; + +@@ -2753,8 +2990,7 @@ declare namespace media { + * @param { Callback> } callback - Callback used to listen for the mediaKeySystemInfoUpdate event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + on(type: 'mediaKeySystemInfoUpdate', callback: Callback>): void; + +@@ -2771,8 +3007,7 @@ declare namespace media { + * @param { Callback> } callback - Callback for event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + off(type: 'mediaKeySystemInfoUpdate', callback?: Callback>): void; + +@@ -2829,21 +3064,21 @@ declare namespace media { + /** + * Register listens for media playback volumeChange event. + * @param { 'volumeChange' } type - Type of the playback event to listen for. +- * @param { Callback } callback - Callback used to listen for the playback volume event. ++ * @param { Callback } callback - Callback used to listen for the playback volume event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @since 9 + */ + /** + * Register listens for media playback volumeChange event. + * @param { 'volumeChange' } type - Type of the playback event to listen for. +- * @param { Callback } callback - Callback used to listen for the playback volume event. ++ * @param { Callback } callback - Callback used to listen for the playback volume event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- on(type: 'volumeChange', callback: Callback): void; ++ on(type: 'volumeChange', callback: Callback): void; + /** + * Unregister listens for media playback volumeChange event. + * @param { 'volumeChange' } type - Type of the playback event to listen for. +@@ -2853,13 +3088,13 @@ declare namespace media { + /** + * Unregister listens for media playback volumeChange event. + * @param { 'volumeChange' } type - Type of the playback event to listen for. +- * @param { Callback } callback - Callback used to listen for the playback volume event. ++ * @param { Callback } callback - Callback used to listen for the playback volume event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- off(type: 'volumeChange', callback?: Callback): void; ++ off(type: 'volumeChange', callback?: Callback): void; + /** + * Register listens for media playback endOfStream event. + * @param { 'endOfStream' } type - Type of the playback event to listen for. +@@ -2897,14 +3132,14 @@ declare namespace media { + /** + * Register listens for media playback seekDone event. + * @param { 'seekDone' } type - Type of the playback event to listen for. +- * @param { Callback } callback - Callback used to listen for the playback seekDone event. ++ * @param { Callback } callback - Callback used to listen for the playback seekDone event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @since 9 + */ + /** + * Register listens for media playback seekDone event. + * @param { 'seekDone' } type - Type of the playback event to listen for. +- * @param { Callback } callback - Callback used to listen for the playback seekDone event. ++ * @param { Callback } callback - Callback used to listen for the playback seekDone event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice + * @since 11 +@@ -2912,14 +3147,14 @@ declare namespace media { + /** + * Register listens for media playback seekDone event. + * @param { 'seekDone' } type - Type of the playback event to listen for. +- * @param { Callback } callback - Callback used to listen for the playback seekDone event. ++ * @param { Callback } callback - Callback used to listen for the playback seekDone event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- on(type: 'seekDone', callback: Callback): void; ++ on(type: 'seekDone', callback: Callback): void; + /** + * Unregister listens for media playback seekDone event. + * @param { 'seekDone' } type - Type of the playback event to listen for. +@@ -2936,32 +3171,32 @@ declare namespace media { + /** + * Unregister listens for media playback seekDone event. + * @param { 'seekDone' } type - Type of the playback event to listen for. +- * @param { Callback } callback - Callback used to listen for the playback seekDone event. ++ * @param { Callback } callback - Callback used to listen for the playback seekDone event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- off(type: 'seekDone', callback?: Callback): void; ++ off(type: 'seekDone', callback?: Callback): void; + /** + * Register listens for media playback speedDone event. + * @param { 'speedDone' } type - Type of the playback event to listen for. +- * @param { Callback } callback - Callback used to listen for the playback speedDone event. ++ * @param { Callback } callback - Callback used to listen for the playback speedDone event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @since 9 + */ + /** + * Register listens for media playback speedDone event. + * @param { 'speedDone' } type - Type of the playback event to listen for. +- * @param { Callback } callback - Callback used to listen for the playback speedDone event. ++ * @param { Callback } callback - Callback used to listen for the playback speedDone event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- on(type: 'speedDone', callback: Callback): void; ++ on(type: 'speedDone', callback: Callback): void; + /** + * Unregister listens for media playback speedDone event. + * @param { 'speedDone' } type - Type of the playback event to listen for. +@@ -2971,30 +3206,30 @@ declare namespace media { + /** + * Unregister listens for media playback speedDone event. + * @param { 'speedDone' } type - Type of the playback event to listen for. +- * @param { Callback } callback - Callback used to listen for the playback speedDone event. ++ * @param { Callback } callback - Callback used to listen for the playback speedDone event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- off(type: 'speedDone', callback?: Callback): void; ++ off(type: 'speedDone', callback?: Callback): void; + /** + * Register listens for media playback setBitrateDone event. + * @param { 'bitrateDone' } type - Type of the playback event to listen for. +- * @param { Callback } callback - Callback used to listen for the playback setBitrateDone event. ++ * @param { Callback } callback - Callback used to listen for the playback setBitrateDone event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @since 9 + */ + /** + * Register listens for media playback setBitrateDone event. + * @param { 'bitrateDone' } type - Type of the playback event to listen for. +- * @param { Callback } callback - Callback used to listen for the playback setBitrateDone event. ++ * @param { Callback } callback - Callback used to listen for the playback setBitrateDone event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- on(type: 'bitrateDone', callback: Callback): void; ++ on(type: 'bitrateDone', callback: Callback): void; + /** + * Unregister listens for media playback setBitrateDone event. + * @param { 'bitrateDone' } type - Type of the playback event to listen for. +@@ -3004,23 +3239,23 @@ declare namespace media { + /** + * Unregister listens for media playback setBitrateDone event. + * @param { 'bitrateDone' } type - Type of the playback event to listen for. +- * @param { Callback } callback - Callback used to listen for the playback setBitrateDone event. ++ * @param { Callback } callback - Callback used to listen for the playback setBitrateDone event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- off(type: 'bitrateDone', callback?: Callback): void; ++ off(type: 'bitrateDone', callback?: Callback): void; + /** + * Register listens for media playback timeUpdate event. + * @param { 'timeUpdate' } type - Type of the playback event to listen for. +- * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. ++ * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @since 9 + */ + /** + * Register listens for media playback timeUpdate event. + * @param { 'timeUpdate' } type - Type of the playback event to listen for. +- * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. ++ * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice + * @since 11 +@@ -3028,14 +3263,14 @@ declare namespace media { + /** + * Register listens for media playback timeUpdate event. + * @param { 'timeUpdate' } type - Type of the playback event to listen for. +- * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. ++ * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- on(type: 'timeUpdate', callback: Callback): void; ++ on(type: 'timeUpdate', callback: Callback): void; + /** + * Unregister listens for media playback timeUpdate event. + * @param { 'timeUpdate' } type - Type of the playback event to listen for. +@@ -3052,32 +3287,32 @@ declare namespace media { + /** + * Unregister listens for media playback timeUpdate event. + * @param { 'timeUpdate' } type - Type of the playback event to listen for. +- * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. ++ * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- off(type: 'timeUpdate', callback?: Callback): void; ++ off(type: 'timeUpdate', callback?: Callback): void; + /** + * Register listens for media playback durationUpdate event. + * @param { 'durationUpdate' } type - Type of the playback event to listen for. +- * @param { Callback } callback - Callback used to listen for the playback durationUpdate event. ++ * @param { Callback } callback - Callback used to listen for the playback durationUpdate event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @since 9 + */ + /** + * Register listens for media playback durationUpdate event. + * @param { 'durationUpdate' } type - Type of the playback event to listen for. +- * @param { Callback } callback - Callback used to listen for the playback durationUpdate event. ++ * @param { Callback } callback - Callback used to listen for the playback durationUpdate event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- on(type: 'durationUpdate', callback: Callback): void; ++ on(type: 'durationUpdate', callback: Callback): void; + /** + * Unregister listens for media playback durationUpdate event. + * @param { 'durationUpdate' } type - Type of the playback event to listen for. +@@ -3087,13 +3322,13 @@ declare namespace media { + /** + * Unregister listens for media playback durationUpdate event. + * @param { 'durationUpdate' } type - Type of the playback event to listen for. +- * @param { Callback } callback - Callback used to listen for the playback durationUpdate event. ++ * @param { Callback } callback - Callback used to listen for the playback durationUpdate event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- off(type: 'durationUpdate', callback?: Callback): void; ++ off(type: 'durationUpdate', callback?: Callback): void; + + /** + * Register listens for video playback buffering events. +@@ -3217,8 +3452,7 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + on(type: 'audioInterrupt', callback: Callback): void; + /** +@@ -3234,8 +3468,7 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + off(type: 'audioInterrupt', callback?: Callback): void; + /** +@@ -3250,14 +3483,14 @@ declare namespace media { + * Register listens for available bitrate list collect completed events for HLS protocol stream playback. + * This event will be reported after the {@link #prepare} called. + * @param { 'availableBitrates' } type - Type of the playback event to listen for. +- * @param { Callback> } callback - Callback used to listen for the playback event return available bitrate list. ++ * @param { Callback> } callback - Callback used to listen for the playback event return available bitrate list. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- on(type: 'availableBitrates', callback: Callback>): void; ++ on(type: 'availableBitrates', callback: Callback>): void; + /** + * Unregister listens for available bitrate list collect completed events for HLS protocol stream playback. + * This event will be reported after the {@link #prepare} called. +@@ -3269,14 +3502,14 @@ declare namespace media { + * Unregister listens for available bitrate list collect completed events for HLS protocol stream playback. + * This event will be reported after the {@link #prepare} called. + * @param { 'availableBitrates' } type - Type of the playback event to listen for. +- * @param { Callback> } callback - Callback used to listen for the playback event return available bitrate list. ++ * @param { Callback> } callback - Callback used to listen for the playback event return available bitrate list. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- off(type: 'availableBitrates', callback?: Callback>): void; ++ off(type: 'availableBitrates', callback?: Callback>): void; + /** + * Register listens for playback error events. + * @param { 'error' } type - Type of the playback error event to listen for. +@@ -3332,7 +3565,7 @@ declare namespace media { + /** + * Register listens for playback error events. + * @param { 'error' } type - Type of the playback error event to listen for. +- * @param { ErrorCallback } callback - Callback used to listen for the playback error event. ++ * @param { ErrorCallback } callback - Callback used to listen for the playback error event. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - The parameter check failed. + * @throws { BusinessError } 801 - Capability not supported. +@@ -3357,9 +3590,8 @@ declare namespace media { + * @atomicservice + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 +- * @permission + */ +- on(type: 'error', callback: ErrorCallback): void; ++ on(type: 'error', callback: ErrorCallback): void; + /** + * Unregister listens for playback error events. + * @param { 'error' } type - Type of the playback error event to listen for. +@@ -3376,14 +3608,14 @@ declare namespace media { + /** + * Unregister listens for playback error events. + * @param { 'error' } type - Type of the playback error event to listen for. +- * @param { ErrorCallback } callback - Callback used to listen for the playback error event. ++ * @param { ErrorCallback } callback - Callback used to listen for the playback error event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- off(type: 'error', callback?: ErrorCallback): void; ++ off(type: 'error', callback?: ErrorCallback): void; + + /** + * Subscribes output device change event callback. +@@ -3404,8 +3636,7 @@ declare namespace media { + *
    2. Incorrect parameter types. 3.Parameter verification failed. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + on(type: 'audioOutputDeviceChangeWithInfo', callback: Callback): void; + +@@ -3426,8 +3657,7 @@ declare namespace media { + *
    2. Incorrect parameter types. 3.Parameter verification failed. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + off(type: 'audioOutputDeviceChangeWithInfo', callback?: Callback): void; + +@@ -3501,41 +3731,41 @@ declare namespace media { + * Subscrips listener for audio playback amplitude update event. + * In each event, an array of amplitude is reported, large index indicates closer to current time. + * @param { 'amplitudeUpdate' } type - Type of the event to listen for. +- * @param { Callback> } callback - Callback used to listen amplitude update event. ++ * @param { Callback> } callback - Callback used to listen amplitude update event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 + */ +- on(type: 'amplitudeUpdate', callback: Callback>): void ++ on(type: 'amplitudeUpdate', callback: Callback>): void + + /** + * UnSubscrips listener for audio playback amplitude update event + * @param { 'amplitudeUpdate' } type - Type of the event to listen for. +- * @param { Callback> } callback - Callback used to listen amplitude update event. ++ * @param { Callback> } callback - Callback used to listen amplitude update event. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 + */ +- off(type: 'amplitudeUpdate', callback?: Callback>): void ++ off(type: 'amplitudeUpdate', callback?: Callback>): void + + /** + * Subscribes listener for video SEI message event, only for live video streaming. + * Call before the {@link #prepare}, repeated invocation overwrites the last subscribed callback and payload types. + * + * @param { 'seiMessageReceived' } type - Type of the playback event to listen for. +- * @param { Array } payloadTypes - The subscribed payload types of the SEI message. ++ * @param { Array } payloadTypes - The subscribed payload types of the SEI message. + * @param { OnSeiMessageHandle } callback - Callback to listen SEI message event with subscribed payload types. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 + */ +- on(type: 'seiMessageReceived', payloadTypes: Array, callback: OnSeiMessageHandle): void; ++ on(type: 'seiMessageReceived', payloadTypes: Array, callback: OnSeiMessageHandle): void; + + /** + * Unsubscribes listener for video SEI message event. + * @param { 'seiMessageReceived' } type - Type of the playback event to listen for. +- * @param { Array } payloadTypes - The payload types of the SEI message. ++ * @param { Array } payloadTypes - The payload types of the SEI message. + * Null means unsubscribe all payload types. + + * @param { OnSeiMessageHandle } callback - Callback to listen SEI message event with subscribed payload types. +@@ -3544,7 +3774,7 @@ declare namespace media { + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 + */ +- off(type: 'seiMessageReceived', payloadTypes?: Array, callback?: OnSeiMessageHandle): void; ++ off(type: 'seiMessageReceived', payloadTypes?: Array, callback?: OnSeiMessageHandle): void; + + /** + * Subscribes listener for super-resolution status changed event. +@@ -3600,41 +3830,47 @@ declare namespace media { + * + * @enum { string } + * @syscap SystemCapability.Multimedia.Media.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PlaybackInfoKey { + /** + * IP address of current network stream. + * @syscap SystemCapability.Multimedia.Media.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SERVER_IP_ADDRESS = 'server_ip_address', + + /** + * Average download rate during playing except for suspend downloading. + * @syscap SystemCapability.Multimedia.Media.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVG_DOWNLOAD_RATE = 'average_download_rate', + + /** + * Current download rate of the last second except for suspend downloading. + * @syscap SystemCapability.Multimedia.Media.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DOWNLOAD_RATE = 'download_rate', + + /** + * Boolean value, true for current is downloading, false for suspend downloading. + * @syscap SystemCapability.Multimedia.Media.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + IS_DOWNLOADING = 'is_downloading', + + /** + * Cached duration in milliseconds. + * @syscap SystemCapability.Multimedia.Media.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BUFFER_DURATION = 'buffer_duration', + } +@@ -3829,7 +4065,8 @@ declare namespace media { + * - client should return immediately. + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type SourceOpenCallback = (request: MediaSourceLoadingRequest) => number; + +@@ -3845,7 +4082,8 @@ declare namespace media { + * @returns { void } - client should return immediately. + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type SourceReadCallback = (uuid: number, requestedOffset: number, requestedLength: number) => void; + +@@ -3856,7 +4094,8 @@ declare namespace media { + * @returns { void } - client should return immediately. + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type SourceCloseCallback = (uuid: number) => void; + +@@ -3865,7 +4104,8 @@ declare namespace media { + * @typedef MediaSourceLoader + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MediaSourceLoader { + /** +@@ -3873,7 +4113,8 @@ declare namespace media { + * @type { SourceOpenCallback } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + open: SourceOpenCallback; + +@@ -3882,7 +4123,8 @@ declare namespace media { + * @type { SourceReadCallback } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + read: SourceReadCallback; + +@@ -3891,7 +4133,8 @@ declare namespace media { + * @type { SourceCloseCallback } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + close: SourceCloseCallback; + } +@@ -3901,14 +4144,16 @@ declare namespace media { + * @enum { number } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum LoadingRequestError { + /** + * If reach the resource end, client should return. + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LOADING_ERROR_SUCCESS = 0, + +@@ -3916,7 +4161,8 @@ declare namespace media { + * If resource not ready for access, client should return. + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LOADING_ERROR_NOT_READY = 1, + +@@ -3924,7 +4170,8 @@ declare namespace media { + * If resource url not exist, client should return. + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LOADING_ERROR_NO_RESOURCE = 2, + +@@ -3932,7 +4179,8 @@ declare namespace media { + * If the uuid of resource handle is valid, client should return. + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LOADING_ERROR_INVAID_HANDLE = 3, + +@@ -3940,7 +4188,8 @@ declare namespace media { + * If client has no right to request the resource, client should return. + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LOADING_ERROR_ACCESS_DENIED = 4, + +@@ -3948,7 +4197,8 @@ declare namespace media { + * If access time out, client should return. + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LOADING_ERROR_ACCESS_TIMEOUT = 5, + +@@ -3956,7 +4206,8 @@ declare namespace media { + * If authorization failed, client should return. + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LOADING_ERROR_AUTHORIZE_FAILED = 6, + } +@@ -3986,7 +4237,8 @@ declare namespace media { + * @type { ?Record } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + header?: Record; + +@@ -3995,14 +4247,28 @@ declare namespace media { + * @param { number } uuid - label the resource handle. + * @param { number } offset - current media data position from start of the source. + * @param { ArrayBuffer } buffer - media data buffer which respond to the player. +- * @returns { int } - accept bytes for current read. The value less than zero means failed. ++ * @returns { number } - accept bytes for current read. The value less than zero means failed. + * - 2, means player need current data any more, the client should stop current read process. + * - 3, means player buffer is full, the client should wait for next read. + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice + * @since 18 + */ +- respondData(uuid: number, offset: number, buffer: ArrayBuffer): int; ++ respondData(uuid: number, offset: number, buffer: ArrayBuffer): number; ++ /** ++ * The interface for application used to send requested data to AVPlayer. ++ * @param { number } uuid - label the resource handle. ++ * @param { number } offset - current media data position from start of the source. ++ * @param { ArrayBuffer } buffer - media data buffer which respond to the player. ++ * @returns { number | undefined } - accept bytes for current read. The value less than zero means failed. ++ * - 2, means player need current data any more, the client should stop current read process. ++ * - 3, means player buffer is full, the client should wait for next read. ++ * @syscap SystemCapability.Multimedia.Media.Core ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ respondData(uuid: number, offset: number, buffer: ArrayBuffer): number | undefined; + + /** + * The interface for application used to send respond header to AVPlayer +@@ -4012,7 +4278,8 @@ declare namespace media { + * @param { ?string } [redirectUrl] - redirect url from the http response if exist. + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + respondHeader(uuid: number, header?: Record, redirectUrl?: string): void; + +@@ -4022,7 +4289,8 @@ declare namespace media { + * @param { LoadingRequestError } state - the request state. + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + finishLoading(uuid: number, state: LoadingRequestError): void; + } +@@ -4048,33 +4316,33 @@ declare namespace media { + + /** + * video width. +- * @type { long } ++ * @type { number } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 + */ +- width: long; ++ width: number; + + /** + * video height. +- * @type { long } ++ * @type { number } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 + */ +- height: long; ++ height: number; + + /** + * biterate of this mediaStream. +- * @type { long } ++ * @type { number } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 + */ +- bitrate: long; ++ bitrate: number; + } + + /** +@@ -4083,7 +4351,8 @@ declare namespace media { + * @typedef MediaSource + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface MediaSource { + /** +@@ -4091,7 +4360,8 @@ declare namespace media { + * @param { AVMimeTypes } mimeType - for MediaSource define. see @ AVMimeTypes. + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setMimeType(mimeType: AVMimeTypes): void; + +@@ -4100,7 +4370,8 @@ declare namespace media { + * @param { MediaSourceLoader } resourceLoader - callback function interface set for player use. + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setMediaResourceLoaderDelegate(resourceLoader: MediaSourceLoader): void; + } +@@ -4110,14 +4381,16 @@ declare namespace media { + * @enum { string } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum AVMimeTypes { + /** + * Indicate current file is index file for hls Media. + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + APPLICATION_M3U8 = 'application/m3u8', + } +@@ -4127,7 +4400,8 @@ declare namespace media { + * @typedef PlaybackStrategy + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PlaybackStrategy { + /** +@@ -4135,7 +4409,8 @@ declare namespace media { + * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + preferredWidth?: number; + /** +@@ -4143,7 +4418,8 @@ declare namespace media { + * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + preferredHeight?: number; + /** +@@ -4151,7 +4427,8 @@ declare namespace media { + * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + preferredBufferDuration?: number; + +@@ -4160,7 +4437,8 @@ declare namespace media { + * @type { ?boolean } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + preferredHdr?: boolean; + +@@ -4168,7 +4446,8 @@ declare namespace media { + * mute the specified media stream when playing. + * @type { ?MediaType } + * @syscap SystemCapability.Multimedia.Media.Core +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + mutedMediaType?: MediaType; + +@@ -4177,7 +4456,8 @@ declare namespace media { + * @type { ?string } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + preferredAudioLanguage?: string; + +@@ -4186,7 +4466,8 @@ declare namespace media { + * @type { ?string } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + preferredSubtitleLanguage?: string; + +@@ -4195,7 +4476,8 @@ declare namespace media { + * @type { ?boolean } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + showFirstFrameOnPrepare?: boolean; + +@@ -4204,7 +4486,8 @@ declare namespace media { + * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + preferredBufferDurationForPlaying?: number; + +@@ -4214,7 +4497,8 @@ declare namespace media { + * @type { ?boolean } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enableSuperResolution?: boolean; + +@@ -4224,7 +4508,8 @@ declare namespace media { + * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + thresholdForAutoQuickPlay?: number + } +@@ -4274,14 +4559,14 @@ declare namespace media { + /** + * The file descriptor of audio or video source from file system. The caller + * is responsible to close the file descriptor. +- * @type { int } ++ * @type { number } + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- fd: int ++ fd: number + + /** + * The offset into the file where the data to be read, in bytes. By default, +@@ -4299,14 +4584,14 @@ declare namespace media { + /** + * The offset into the file where the data to be read, in bytes. By default, + * the offset is zero. +- * @type { ?long } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- offset?: long ++ offset?: number + + /** + * The length in bytes of the data to be read. By default, the length is the +@@ -4324,14 +4609,14 @@ declare namespace media { + /** + * The length in bytes of the data to be read. By default, the length is the + * rest of bytes in the file from the offset. +- * @type { ?long } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- length?: long ++ length?: number + } + + /** +@@ -4379,14 +4664,14 @@ declare namespace media { + /** + * Size of the file, -1 means the file size is unknown, in this case, + * seek and setSpeed can't be executed, loop can't be set, and can't replay. +- * @type { long } ++ * @type { number } + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- fileSize: long; ++ fileSize: number; + /** + * Callback function implemented by users, which is used to fill data. + * buffer - The buffer need to fill. +@@ -4423,7 +4708,7 @@ declare namespace media { + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- callback: (buffer: ArrayBuffer, length: long, pos?: long) => int; ++ callback: (buffer: ArrayBuffer, length: number, pos?: number) => number; + } + + /** +@@ -4439,22 +4724,22 @@ declare namespace media { + interface SubtitleInfo { + /** + * Duration of the text to be displayed, as milliseconds. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- duration?: int; ++ duration?: number; + /** + * Display start time of the text, as milliseconds. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- startTime?: int; ++ startTime?: number; + /** + * Text information of current update event. + * @type { ?string } +@@ -4694,13 +4979,13 @@ declare namespace media { + /** + * Listens for playback error events. + * @param { 'error' } type - Type of the playback error event to listen for. +- * @param { ErrorCallback } callback - Callback used to listen for the playback error event. ++ * @param { ErrorCallback } callback - Callback used to listen for the playback error event. + * @syscap SystemCapability.Multimedia.Media.AudioPlayer + * @since 6 + * @deprecated since 9 + * @useinstead ohos.multimedia.media/media.AVPlayer#event:error + */ +- on(type: 'error', callback: ErrorCallback): void; ++ on(type: 'error', callback: ErrorCallback): void; + } + + /** +@@ -4824,17 +5109,39 @@ declare namespace media { + * @since 11 + */ + getAVRecorderConfig(callback: AsyncCallback): void; ++ /** ++ * Get AVRecorderConfig.it must be called after prepare. ++ * @param { AsyncCallback } callback - Callback used to return the input config in AVRecorderConfig. ++ * @throws { BusinessError } 5400102 - Operate not permit. Return by callback. ++ * @throws { BusinessError } 5400103 - IO error. Return by callback. ++ * @throws { BusinessError } 5400105 - Service died. Return by callback. ++ * @syscap SystemCapability.Multimedia.Media.AVRecorder ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ getAVRecorderConfig(callback: AsyncCallback): void; + + /** + * Get AVRecorderConfig.it must be called after prepare. +- * @returns { Promise } A Promise instance used to return the input config in AVRecorderConfig. ++ * @returns { Promise } A Promise instance used to return the input config in AVRecorderConfig. ++ * @throws { BusinessError } 5400102 - Operate not permit. Return by promise. ++ * @throws { BusinessError } 5400103 - IO error. Return by promise. ++ * @throws { BusinessError } 5400105 - Service died. Return by promise. ++ * @syscap SystemCapability.Multimedia.Media.AVRecorder ++ * @since 11 ++ */ ++ getAVRecorderConfig(): Promise; ++ /** ++ * Get AVRecorderConfig.it must be called after prepare. ++ * @returns { Promise } A Promise instance used to return the input config in AVRecorderConfig. + * @throws { BusinessError } 5400102 - Operate not permit. Return by promise. + * @throws { BusinessError } 5400103 - IO error. Return by promise. + * @throws { BusinessError } 5400105 - Service died. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVRecorder +- * @since 11 ++ * @since 20 ++ * @arkts 1.2 + */ +- getAVRecorderConfig(): Promise; ++ getAVRecorderConfig(): Promise; + + /** + * Get input surface.it must be called between prepare completed and start. +@@ -4843,10 +5150,20 @@ declare namespace media { + * @throws { BusinessError } 5400103 - IO error. Return by callback. + * @throws { BusinessError } 5400105 - Service died. Return by callback. + * @syscap SystemCapability.Multimedia.Media.AVRecorder +- * @since arkts {'1.1':'9','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + getInputSurface(callback: AsyncCallback): void; ++ /** ++ * Get input surface.it must be called between prepare completed and start. ++ * @param { AsyncCallback } callback - Callback used to return the input surface id in string. ++ * @throws { BusinessError } 5400102 - Operate not permit. Return by callback. ++ * @throws { BusinessError } 5400103 - IO error. Return by callback. ++ * @throws { BusinessError } 5400105 - Service died. Return by callback. ++ * @syscap SystemCapability.Multimedia.Media.AVRecorder ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ getInputSurface(callback: AsyncCallback): void; + + /** + * Get input surface. it must be called between prepare completed and start. +@@ -4855,10 +5172,20 @@ declare namespace media { + * @throws { BusinessError } 5400103 - IO error. Return by promise. + * @throws { BusinessError } 5400105 - Service died. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVRecorder +- * @since arkts {'1.1':'9','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + getInputSurface(): Promise; ++ /** ++ * Get input surface. it must be called between prepare completed and start. ++ * @returns { Promise } A Promise instance used to return the input surface id in string. ++ * @throws { BusinessError } 5400102 - Operate not permit. Return by promise. ++ * @throws { BusinessError } 5400103 - IO error. Return by promise. ++ * @throws { BusinessError } 5400105 - Service died. Return by promise. ++ * @syscap SystemCapability.Multimedia.Media.AVRecorder ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ getInputSurface(): Promise; + + /** + * Get input meta surface for specified meta source type. it must be called between prepare completed and start. +@@ -4875,13 +5202,30 @@ declare namespace media { + * @since 12 + */ + getInputMetaSurface(type: MetaSourceType): Promise; ++ /** ++ * Get input meta surface for specified meta source type. it must be called between prepare completed and start. ++ * @param { MetaSourceType } type - Meta source type. ++ * @returns { Promise } A Promise instance used to return the input surface id in string. ++ * @throws { BusinessError } 202 - Called from Non-System applications. Return by promise. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameter types. 3.Parameter verification failed. ++ * @throws { BusinessError } 5400102 - Operate not permit. Return by promise. ++ * @throws { BusinessError } 5400103 - IO error. Return by promise. ++ * @throws { BusinessError } 5400105 - Service died. Return by promise. ++ * @syscap SystemCapability.Multimedia.Media.AVRecorder ++ * @systemapi ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ getInputMetaSurface(type: MetaSourceType): Promise; + + /** + * Check if the avrecorder has watermark capability. + * @returns { Promise } A Promise instance used to return true or false when the function is finished. + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isWatermarkSupported(): Promise; + /** +@@ -4906,7 +5250,8 @@ declare namespace media { + * @throws { BusinessError } 5400103 - IO error. Return by promise. + * @throws { BusinessError } 5400105 - Service died. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVRecorder +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + updateRotation(rotation: number): Promise; + +@@ -4927,7 +5272,8 @@ declare namespace media { + * @throws { BusinessError } 5400105 - Service died. Return by callback. + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @crossplatform +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + start(callback: AsyncCallback): void; + +@@ -4949,7 +5295,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + start(): Promise; + +@@ -5015,7 +5362,8 @@ declare namespace media { + * @throws { BusinessError } 5400105 - Service died. Return by callback. + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @crossplatform +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + resume(callback: AsyncCallback): void; + +@@ -5037,7 +5385,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + resume(): Promise; + +@@ -5191,7 +5540,8 @@ declare namespace media { + * @throws { BusinessError } 5400102 - Operation not allowed. + * @throws { BusinessError } 5400105 - Service died. Return by callback. + * @syscap SystemCapability.Multimedia.Media.AVRecorder +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getAudioCapturerMaxAmplitude(callback: AsyncCallback): void; + +@@ -5201,7 +5551,8 @@ declare namespace media { + * @throws { BusinessError } 5400102 - Operation not allowed. + * @throws { BusinessError } 5400105 - Service died. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVRecorder +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getAudioCapturerMaxAmplitude(): Promise; + +@@ -5211,7 +5562,8 @@ declare namespace media { + * @throws { BusinessError } 5400102 - Operation not allowed. + * @throws { BusinessError } 5400105 - Service died. Return by callback. + * @syscap SystemCapability.Multimedia.Media.AVRecorder +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getAvailableEncoder(callback: AsyncCallback>): void; + +@@ -5221,7 +5573,8 @@ declare namespace media { + * @throws { BusinessError } 5400102 - Operation not allowed. + * @throws { BusinessError } 5400105 - Service died. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVRecorder +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getAvailableEncoder(): Promise>; + +@@ -5249,8 +5602,7 @@ declare namespace media { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. 3.Parameter verification failed. + * @syscap SystemCapability.Multimedia.Media.AVRecorder +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + on(type: 'audioCapturerChange', callback: Callback): void; + +@@ -5324,7 +5676,7 @@ declare namespace media { + /** + * Listens for recording error events. + * @param { 'error' } type - Type of the recording error event to listen for. +- * @param { ErrorCallback } callback - Callback used to listen for the recorder error event. ++ * @param { ErrorCallback } callback - Callback used to listen for the recorder error event. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. 3.Parameter verification failed. +@@ -5341,9 +5693,8 @@ declare namespace media { + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 +- * @permission + */ +- on(type: 'error', callback: ErrorCallback): void; ++ on(type: 'error', callback: ErrorCallback): void; + + /** + * Cancel Listens for recording stateChange events. +@@ -5372,14 +5723,14 @@ declare namespace media { + /** + * Cancel Listens for recording error events. + * @param { 'error' } type - Type of the recording error event to listen for. +- * @param { ErrorCallback } callback - Callback used to listen for the recorder error event. ++ * @param { ErrorCallback } callback - Callback used to listen for the recorder error event. + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- off(type: 'error', callback?: ErrorCallback): void; ++ off(type: 'error', callback?: ErrorCallback): void; + + /** + * Cancel Listens for recording audioCapturerChange events. +@@ -5392,8 +5743,7 @@ declare namespace media { + * @param { 'audioCapturerChange' } type - Type of the audioCapturerChange event to listen for. + * @param { Callback } callback - Callback used to listen device change event. + * @syscap SystemCapability.Multimedia.Media.AVRecorder +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + off(type: 'audioCapturerChange', callback?: Callback): void; + +@@ -5534,13 +5884,13 @@ declare namespace media { + */ + /** + * Latitude. +- * @type { double } ++ * @type { number } + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- latitude: double; ++ latitude: number; + + /** + * Longitude. +@@ -5549,13 +5899,13 @@ declare namespace media { + */ + /** + * Longitude. +- * @type { double } ++ * @type { number } + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- longitude: double; ++ longitude: number; + } + /** + * Set configures of a watermark to AVRecorder. The position starts at top left corner. +@@ -5563,7 +5913,8 @@ declare namespace media { + * @typedef WatermarkConfig + * @syscap SystemCapability.Multimedia.Media.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface WatermarkConfig { + /** +@@ -5571,7 +5922,8 @@ declare namespace media { + * @type { number } + * @syscap SystemCapability.Multimedia.Media.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + top: number; + /** +@@ -5579,7 +5931,8 @@ declare namespace media { + * @type { number } + * @syscap SystemCapability.Multimedia.Media.Core + * @systemapi +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + left: number; + } +@@ -5708,7 +6061,7 @@ declare namespace media { + * @param { AudioRecorderConfig } config - Recording parameters. + * @throws { BusinessError } 201 - permission denied. + * @syscap SystemCapability.Multimedia.Media.AudioRecorder +- * @since 6 ++ * @since 12 + * @deprecated since 9 + * @useinstead ohos.multimedia.media/media.AVRecorder#prepare + */ +@@ -5784,13 +6137,13 @@ declare namespace media { + /** + * Listens for audio recording error events. + * @param { 'error' } type - Type of the audio recording error event to listen for. +- * @param { ErrorCallback } callback - Callback used to listen for the audio recording error event. ++ * @param { ErrorCallback } callback - Callback used to listen for the audio recording error event. + * @syscap SystemCapability.Multimedia.Media.AudioRecorder + * @since 6 + * @deprecated since 9 + * @useinstead ohos.multimedia.media/media.AVRecorder#on + */ +- on(type: 'error', callback: ErrorCallback): void; ++ on(type: 'error', callback: ErrorCallback): void; + } + + /** +@@ -5898,10 +6251,22 @@ declare namespace media { + * @throws { BusinessError } 5400105 - Service died. Return by callback. + * @syscap SystemCapability.Multimedia.Media.VideoRecorder + * @systemapi +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + getInputSurface(callback: AsyncCallback): void; ++ /** ++ * get input surface.it must be called between prepare completed and start. ++ * @param { AsyncCallback } callback - Callback used to return the input surface id in string. ++ * @throws { BusinessError } 202 - Not System App. ++ * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. ++ * @throws { BusinessError } 5400103 - I/O error. Return by callback. ++ * @throws { BusinessError } 5400105 - Service died. Return by callback. ++ * @syscap SystemCapability.Multimedia.Media.VideoRecorder ++ * @systemapi ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ getInputSurface(callback: AsyncCallback): void; + /** + * get input surface. it must be called between prepare completed and start. + * @returns { Promise } A Promise instance used to return the input surface id in string. +@@ -5921,10 +6286,22 @@ declare namespace media { + * @throws { BusinessError } 5400105 - Service died. Return by promise. + * @syscap SystemCapability.Multimedia.Media.VideoRecorder + * @systemapi +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + getInputSurface(): Promise; ++ /** ++ * get input surface. it must be called between prepare completed and start. ++ * @returns { Promise } A Promise instance used to return the input surface id in string. ++ * @throws { BusinessError } 202 - Not System App. ++ * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. ++ * @throws { BusinessError } 5400103 - I/O error. Return by promise. ++ * @throws { BusinessError } 5400105 - Service died. Return by promise. ++ * @syscap SystemCapability.Multimedia.Media.VideoRecorder ++ * @systemapi ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ getInputSurface(): Promise; + /** + * Starts video recording. + * @param { AsyncCallback } callback - A callback instance used to return when start completed. +@@ -5944,7 +6321,8 @@ declare namespace media { + * @throws { BusinessError } 5400105 - Service died. Return by callback. + * @syscap SystemCapability.Multimedia.Media.VideoRecorder + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + start(callback: AsyncCallback): void; + /** +@@ -5966,7 +6344,8 @@ declare namespace media { + * @throws { BusinessError } 5400105 - Service died. Return by promise. + * @syscap SystemCapability.Multimedia.Media.VideoRecorder + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + start(): Promise; + /** +@@ -6034,7 +6413,8 @@ declare namespace media { + * @throws { BusinessError } 5400105 - Service died. Return by callback. + * @syscap SystemCapability.Multimedia.Media.VideoRecorder + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + resume(callback: AsyncCallback): void; + /** +@@ -6056,7 +6436,8 @@ declare namespace media { + * @throws { BusinessError } 5400105 - Service died. Return by promise. + * @syscap SystemCapability.Multimedia.Media.VideoRecorder + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + resume(): Promise; + /** +@@ -6205,7 +6586,6 @@ declare namespace media { + */ + /** + * Listens for video recording error events. +- * @permission + * @param { 'error' } type - Type of the video recording error event to listen for. + * @param { ErrorCallback } callback - Callback used to listen for the video recording error event. + * @throws { BusinessError } 201 - permission denied. +@@ -6214,7 +6594,8 @@ declare namespace media { + * @throws { BusinessError } 5400105 - Service died. Return by callback. + * @syscap SystemCapability.Multimedia.Media.VideoRecorder + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'error', callback: ErrorCallback): void; + +@@ -6769,13 +7150,13 @@ declare namespace media { + /** + * Listens for playback error events. + * @param { 'error' } type - Type of the playback error event to listen for. +- * @param { ErrorCallback } callback - Callback used to listen for the playback error event. ++ * @param { ErrorCallback } callback - Callback used to listen for the playback error event. + * @syscap SystemCapability.Multimedia.Media.VideoPlayer + * @since 8 + * @deprecated since 9 + * @useinstead ohos.multimedia.media/media.AVPlayer#event:error + */ +- on(type: 'error', callback: ErrorCallback): void; ++ on(type: 'error', callback: ErrorCallback): void; + } + + /** +@@ -7266,25 +7647,25 @@ declare namespace media { + interface VideoRecorderProfile { + /** + * Indicates the audio bit rate. +- * @type { int } ++ * @type { number } + * @readonly + * @syscap SystemCapability.Multimedia.Media.VideoRecorder + * @systemapi + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly audioBitrate: int; ++ readonly audioBitrate: number; + + /** + * Indicates the number of audio channels. +- * @type { int } ++ * @type { number } + * @readonly + * @syscap SystemCapability.Multimedia.Media.VideoRecorder + * @systemapi + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly audioChannels: int; ++ readonly audioChannels: number; + + /** + * Indicates the audio encoding format. +@@ -7299,14 +7680,14 @@ declare namespace media { + + /** + * Indicates the audio sampling rate. +- * @type { int } ++ * @type { number } + * @readonly + * @syscap SystemCapability.Multimedia.Media.VideoRecorder + * @systemapi + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly audioSampleRate: int; ++ readonly audioSampleRate: number; + + /** + * Indicates the output file format. +@@ -7321,14 +7702,14 @@ declare namespace media { + + /** + * Indicates the video bit rate. +- * @type { int } ++ * @type { number } + * @readonly + * @syscap SystemCapability.Multimedia.Media.VideoRecorder + * @systemapi + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly videoBitrate: int; ++ readonly videoBitrate: number; + + /** + * Indicates the video encoding format. +@@ -7343,36 +7724,36 @@ declare namespace media { + + /** + * Indicates the video width. +- * @type { int } ++ * @type { number } + * @readonly + * @syscap SystemCapability.Multimedia.Media.VideoRecorder + * @systemapi + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly videoFrameWidth: int; ++ readonly videoFrameWidth: number; + + /** + * Indicates the video height. +- * @type { int } ++ * @type { number } + * @readonly + * @syscap SystemCapability.Multimedia.Media.VideoRecorder + * @systemapi + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly videoFrameHeight: int; ++ readonly videoFrameHeight: number; + + /** + * Indicates the video frame rate. +- * @type { int } ++ * @type { number } + * @readonly + * @syscap SystemCapability.Multimedia.Media.VideoRecorder + * @systemapi + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly videoFrameRate: int; ++ readonly videoFrameRate: number; + } + + /** +@@ -7592,13 +7973,13 @@ declare namespace media { + /** + * Sets the video rotation angle in output file, and for the file to playback. mp4 support. + * the range of rotation angle should be {0, 90, 180, 270}, default is 0. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.VideoRecorder + * @systemapi + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 + */ +- rotation?: int; ++ rotation?: number; + /** + * geographical location information. + * @type { ?Location } +@@ -7684,12 +8065,12 @@ declare namespace media { + + /** + * audio encoder sample rate collection +- * @type { ?Array } ++ * @type { ?Array } + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- sampleRate?: Array; ++ sampleRate?: Array; + } + + /** +@@ -7703,21 +8084,21 @@ declare namespace media { + interface Range { + /** + * lower limit of the range +- * @type { int } ++ * @type { number } + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- min: int; ++ min: number; + + /** + * upper limit of the range +- * @type { int } ++ * @type { number } + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- max: int; ++ max: number; + } + + /** +@@ -7745,14 +8126,14 @@ declare namespace media { + */ + /** + * Indicates the audio bitrate. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- audioBitrate?: int; ++ audioBitrate?: number; + + /** + * Indicates the number of audio channels. +@@ -7761,14 +8142,14 @@ declare namespace media { + */ + /** + * Indicates the number of audio channels. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- audioChannels?: int; ++ audioChannels?: number; + + /** + * Indicates the audio encoding format. +@@ -7793,14 +8174,14 @@ declare namespace media { + */ + /** + * Indicates the audio sampling rate. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- audioSampleRate?: int; ++ audioSampleRate?: number; + + /** + * Indicates the output file format. +@@ -7825,13 +8206,13 @@ declare namespace media { + */ + /** + * Indicates the video bitrate. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @crossplatform + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- videoBitrate?: int; ++ videoBitrate?: number; + + /** + * Indicates the video encoding format. +@@ -7855,13 +8236,13 @@ declare namespace media { + */ + /** + * Indicates the video width. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @crossplatform + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- videoFrameWidth?: int; ++ videoFrameWidth?: number; + + /** + * Indicates the video height. +@@ -7870,13 +8251,13 @@ declare namespace media { + */ + /** + * Indicates the video height. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @crossplatform + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- videoFrameHeight?: int; ++ videoFrameHeight?: number; + + /** + * Indicates the video frame rate. +@@ -7885,13 +8266,13 @@ declare namespace media { + */ + /** + * Indicates the video frame rate. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @crossplatform + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- videoFrameRate?: int; ++ videoFrameRate?: number; + + /** + * Whether to record HDR video. +@@ -7924,7 +8305,7 @@ declare namespace media { + * @type { ?boolean } + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @systemapi +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 + */ + enableStableQualityMode?: boolean +@@ -8014,44 +8395,34 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @crossplatform + * @atomicservice +- * @since 12 +- */ +- /** +- * File output uri, support a kind of uri now. +- * format like: "fd://" + "context". +- * @type { ?string } +- * @syscap SystemCapability.Multimedia.Media.AVRecorder +- * @crossplatform +- * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- url?: string; ++ url: string; + + /** + * Mode of creating recorder file, details see @FileGenerationMode. + * @type { ?FileGenerationMode } + * @syscap SystemCapability.Multimedia.Media.AVRecorder +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + fileGenerationMode?: FileGenerationMode; + /** + * Sets the video rotation angle in output file, and for the file to playback, mp4 support + * the range of rotation angle should be {0, 90, 180, 270}, default is 0. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVRecorder +- * @since arkts {'1.1':'9','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + * @deprecated since 12 + * @useinstead ohos.multimedia.media/media.AVMetadata#videoOrientation + */ +- rotation?: int; ++ rotation?: number; + /** + * Geographical location information. + * @type { ?Location } + * @syscap SystemCapability.Multimedia.Media.AVRecorder +- * @since arkts {'1.1':'9','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + * @deprecated since 12 + * @useinstead ohos.multimedia.media/media.AVMetadata#location + */ +@@ -8060,16 +8431,18 @@ declare namespace media { + * Set global metadata info. Details see @AVMetadata + * @type { ?AVMetadata } + * @syscap SystemCapability.Multimedia.Media.AVRecorder +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + metadata?: AVMetadata; + /** + * Set the longest duration allowed for current recording. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVRecorder +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- maxDuration?: int; ++ maxDuration?: number; + } + + /** +@@ -8226,7 +8599,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum SwitchMode { + /** +@@ -8234,7 +8608,8 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SMOOTH = 0, + /** +@@ -8242,14 +8617,16 @@ declare namespace media { + * @syscap SystemCapability.Multimedia.Media.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SEGMENT = 1, + /** + * switch to the closest frame of the given timestamp. + * @syscap SystemCapability.Multimedia.Media.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CLOSEST = 2, + } +@@ -8430,19 +8807,22 @@ declare namespace media { + * + * @enum { number } + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum AVScreenCaptureRecordPreset { + /** + * Screen record normal type, h264/aac mp4 + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SCREEN_RECORD_PRESET_H264_AAC_MP4 = 0, + /** + * Screen record high efficient type, h265/aac mp4 + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SCREEN_RECORD_PRESET_H265_AAC_MP4 = 1, + } +@@ -8452,19 +8832,22 @@ declare namespace media { + * + * @enum { number } + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum AVScreenCaptureFillMode { + /** + * Keep the scale the same as that of the original image + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRESERVE_ASPECT_RATIO = 0, + /** + * Fit the configured width and height + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SCALE_TO_FILL = 1, + } +@@ -8568,80 +8951,82 @@ declare namespace media { + interface AVScreenCaptureRecordConfig { + /** + * Indicates record file descriptor. +- * @type { int } ++ * @type { number } + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- fd: int; ++ fd: number; + /** + * Indicates video frame width. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- frameWidth?: int; ++ frameWidth?: number; + /** + * Indicates video frame height. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- frameHeight?: int; ++ frameHeight?: number; + /** + * Indicates video bitrate. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- videoBitrate?: int; ++ videoBitrate?: number; + /** + * Indicates audio sample rate. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- audioSampleRate?: int; ++ audioSampleRate?: number; + /** + * Indicates audio channel count. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- audioChannelCount?: int; ++ audioChannelCount?: number; + /** + * Indicates audio bitrate. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- audioBitrate?: int; ++ audioBitrate?: number; + /** + * Indicates AVScreenCaptureRecordPreset, details see @AVScreenCaptureRecordPreset + * @type { ?AVScreenCaptureRecordPreset } + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + preset?: AVScreenCaptureRecordPreset; + /** + * Indicates the screen to be recorded. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 + */ +- displayId?: int; ++ displayId?: number; + /** + * Indicates the fill mode of video, details see @AVScreenCaptureFillMode + * @type { ?AVScreenCaptureFillMode } + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + fillMode?: AVScreenCaptureFillMode; + } +@@ -8665,7 +9050,8 @@ declare namespace media { + * @throws { BusinessError } 5400103 - IO error. Return by promise. + * @throws { BusinessError } 5400105 - Service died. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + init(config: AVScreenCaptureRecordConfig): Promise; + +@@ -8675,7 +9061,8 @@ declare namespace media { + * @throws { BusinessError } 5400103 - IO error. Return by promise. + * @throws { BusinessError } 5400105 - Service died. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + startRecording(): Promise; + +@@ -8685,7 +9072,8 @@ declare namespace media { + * @throws { BusinessError } 5400103 - IO error. Return by promise. + * @throws { BusinessError } 5400105 - Service died. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + stopRecording(): Promise; + +@@ -8696,7 +9084,8 @@ declare namespace media { + * @throws { BusinessError } 5400103 - IO error. Return by promise. + * @throws { BusinessError } 5400105 - Service died. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + skipPrivacyMode(windowIDs: Array): Promise; + +@@ -8707,7 +9096,8 @@ declare namespace media { + * @throws { BusinessError } 5400103 - IO error. Return by promise. + * @throws { BusinessError } 5400105 - Service died. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setMicEnabled(enable: boolean): Promise; + +@@ -8735,16 +9125,15 @@ declare namespace media { + /** + * Listens for AVScreenCaptureRecord info callback. + * @param { 'error' } type - Type of the AVScreenCaptureRecord event to listen for. +- * @param { ErrorCallback } callback - Callback used to listen for the AVScreenCaptureRecord error return. ++ * @param { ErrorCallback } callback - Callback used to listen for the AVScreenCaptureRecord error return. + * @throws { BusinessError } 201 - permission denied. + * @throws { BusinessError } 5400103 - IO error. Return by ErrorCallback. + * @throws { BusinessError } 5400105 - Service died. Return by ErrorCallback. + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 +- * @permission + */ +- on(type: 'error', callback: ErrorCallback): void; ++ on(type: 'error', callback: ErrorCallback): void; + + /** + * Unregister listens for AVScreenCaptureRecord info callback. +@@ -8759,12 +9148,12 @@ declare namespace media { + /** + * Unregister listens for AVScreenCaptureRecord error callback. + * @param { 'error' } type - Type of the AVScreenCaptureRecord event to listen for. +- * @param { ErrorCallback } callback - Callback used to listen for the AVScreenCaptureRecord error return. ++ * @param { ErrorCallback } callback - Callback used to listen for the AVScreenCaptureRecord error return. + * @syscap SystemCapability.Multimedia.Media.AVScreenCapture + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- off(type: 'error', callback?: ErrorCallback): void; ++ off(type: 'error', callback?: ErrorCallback): void; + } + + /** +@@ -8778,12 +9167,12 @@ declare namespace media { + interface AVTranscoderConfig { + /** + * Indicates the audio bitrate. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVTranscoder + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- audioBitrate?: int; ++ audioBitrate?: number; + + /** + * Indicates the audio encoding format. +@@ -8805,12 +9194,12 @@ declare namespace media { + + /** + * Indicates the video bitrate. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVTranscoder + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- videoBitrate?: int; ++ videoBitrate?: number; + + /** + * Indicates the video encoding foramt. +@@ -8823,21 +9212,21 @@ declare namespace media { + + /** + * Indicates the video width. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVTranscoder + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- videoFrameWidth?: int; ++ videoFrameWidth?: number; + + /** + * Indicates the video height. +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.AVTranscoder + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- videoFrameHeight?: int; ++ videoFrameHeight?: number; + } + + /** +@@ -8864,7 +9253,8 @@ declare namespace media { + * Destination media file descriptor. Mainstream media formats are supported. + * @type { number } + * @syscap SystemCapability.Multimedia.Media.AVTranscoder +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + fdDst: number; + +@@ -8889,7 +9279,8 @@ declare namespace media { + * @throws { BusinessError } 5400103 - IO error. Return by promise. + * @throws { BusinessError } 5400105 - Service died. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVTranscoder +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + start(): Promise; + +@@ -8912,7 +9303,8 @@ declare namespace media { + * @throws { BusinessError } 5400103 - IO error. Return by promise. + * @throws { BusinessError } 5400105 - Service died. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVTranscoder +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + resume(): Promise; + +@@ -8923,7 +9315,8 @@ declare namespace media { + * @throws { BusinessError } 5400103 - IO error. Return by promise. + * @throws { BusinessError } 5400105 - Service died. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVTranscoder +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + cancel(): Promise; + +@@ -8951,7 +9344,7 @@ declare namespace media { + /** + * Register listener for trancoding error event. + * @param { 'error' } type - Type of the event to listen for. +- * @param { ErrorCallback } callback - Callback used to listen for the error event. ++ * @param { ErrorCallback } callback - Callback used to listen for the error event. + * @throws { BusinessError } 401 - The parameter check failed. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 5400101 - No memory. +@@ -8964,17 +9357,17 @@ declare namespace media { + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- on(type:'error', callback: ErrorCallback):void; ++ on(type:'error', callback: ErrorCallback):void; + + /** + * Register listener for trancoding progressUpdate event. + * @param { 'progressUpdate' } type - Type of the event to listen for. +- * @param { Callback } callback - Callback used to listen for the progressUpdate event. ++ * @param { Callback } callback - Callback used to listen for the progressUpdate event. + * @syscap SystemCapability.Multimedia.Media.AVTranscoder + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- on(type:'progressUpdate', callback: Callback):void; ++ on(type:'progressUpdate', callback: Callback):void; + + /** + * Unregister listener for trancoding complete event. +@@ -8989,22 +9382,22 @@ declare namespace media { + /** + * Unregister listener for trancoding error event. + * @param { 'error' } type - Type of the event to listen for. +- * @param { ErrorCallback } [callback] - Callback used to listen for the error event. ++ * @param { ErrorCallback } [callback] - Callback used to listen for the error event. + * @syscap SystemCapability.Multimedia.Media.AVTranscoder + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- off(type:'error', callback?: ErrorCallback):void; ++ off(type:'error', callback?: ErrorCallback):void; + + /** + * Unregister listener for trancoding progressUpdate event. + * @param { 'progressUpdate' } type - Type of the event to listen for. +- * @param { Callback } [callback] - Callback used to listen for the progressUpdate event. ++ * @param { Callback } [callback] - Callback used to listen for the progressUpdate event. + * @syscap SystemCapability.Multimedia.Media.AVTranscoder + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ +- off(type:'progressUpdate', callback?: Callback):void; ++ off(type:'progressUpdate', callback?: Callback):void; + } + + /** +diff --git a/api/@ohos.multimodalAwareness.roomLocation.d.ts b/api/@ohos.multimodalAwareness.roomLocation.d.ts +new file mode 100644 +index 000000000..c7742f91c +--- /dev/null ++++ b/api/@ohos.multimodalAwareness.roomLocation.d.ts +@@ -0,0 +1,122 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++/** ++ * @file ++ * @kit MultimodalAwarenessKit ++ */ ++ ++import type { Callback } from './@ohos.base'; ++ ++/** ++ * This module provides the capability to subscribe to report the room location result. ++ * @namespace roomLocation ++ * @syscap SystemCapability.MultimodalAwareness.RoomLocation ++ * @systemapi ++ * @since 20 ++ * @arkts 1.1&1.2 ++ */ ++declare namespace roomLocation { ++ /** ++ * Interface for room location result ++ * @interface RoomLocateResponse ++ * @syscap SystemCapability.MultimodalAwareness.RoomLocation ++ * @systemapi ++ * @since 20 ++ * @arkts 1.1&1.2 ++ */ ++ interface RoomLocateResponse { ++ /** ++ * indicates roomId ++ * @type { string } ++ * @syscap SystemCapability.MultimodalAwareness.RoomLocation ++ * @systemapi ++ * @since 20 ++ * @arkts 1.1&1.2 ++ */ ++ roomId: string; ++ /** ++ * indicates errorCode ++ * @type { int } ++ * @syscap SystemCapability.MultimodalAwareness.RoomLocation ++ * @systemapi ++ * @since 20 ++ * @arkts 1.1&1.2 ++ */ ++ errorCode: int; ++ } ++ ++ /** ++ * Subscribe to room-level location result data. ++ * @param { 'onRoomLocated' } type - Indicates the event type. ++ * @param { Callback } callback - Callback location result data. ++ * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. ++ * @throws { BusinessError } 801 - Capability not supported. Function can not work correctly due to ++ * limited device capabilities. ++ * @throws { BusinessError } 33800001 - Service exception. ++ * @throws { BusinessError } 33800002 - Subscription failed. ++ * @syscap SystemCapability.MultimodalAwareness.RoomLocation ++ * @systemapi ++ * @since 20 ++ * @arkts 1.1&1.2 ++ */ ++ function on(type: 'onRoomLocated', callback: Callback): void; ++ ++ /** ++ * Unsubscribe to room-level location result data. ++ * @param { 'onRoomLocated' } type - Indicates the event type. ++ * @param { Callback } [callback] - Callback location result data. ++ * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. ++ * @throws { BusinessError } 801 - Capability not supported. Function can not work correctly due to ++ * limited device capabilities. ++ * @throws { BusinessError } 33800001 - Service exception. ++ * @throws { BusinessError } 33800003 - Unsubscription failed. ++ * @syscap SystemCapability.MultimodalAwareness.RoomLocation ++ * @systemapi ++ * @since 20 ++ * @arkts 1.1&1.2 ++ */ ++ function off(type: 'onRoomLocated', callback?: Callback): void; ++ ++ /** ++ * Get room-level location result data. ++ * @returns { RoomLocateResponse } - Result of room-level location. ++ * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. ++ * @throws { BusinessError } 801 - Capability not supported. Function can not work correctly due to ++ * limited device capabilities. ++ * @throws { BusinessError } 33800005 - Failed to obtain room-level location information. ++ * @syscap SystemCapability.MultimodalAwareness.RoomLocation ++ * @systemapi ++ * @since 20 ++ * @arkts 1.1&1.2 ++ */ ++ function getRoomLocationResult(): RoomLocateResponse; ++ ++ /** ++ * Set devices informations. ++ * @param { string } deviceInfos - Device informations. ++ * @returns { Promise } - Result of setting information. ++ * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. ++ * @throws { BusinessError } 801 - Capability not supported. Function can not work correctly due to ++ * limited device capabilities. ++ * @throws { BusinessError } 33800004 - Failed to set device information. ++ * @syscap SystemCapability.MultimodalAwareness.RoomLocation ++ * @systemapi ++ * @since 20 ++ * @arkts 1.1&1.2 ++ */ ++ function setDeviceInfos(deviceInfos: string): Promise; ++} ++export default roomLocation; +diff --git a/api/@ohos.multimodalInput.gestureEvent.d.ts b/api/@ohos.multimodalInput.gestureEvent.d.ts +index 254168695..d492d4604 100644 +--- a/api/@ohos.multimodalInput.gestureEvent.d.ts ++++ b/api/@ohos.multimodalInput.gestureEvent.d.ts +@@ -42,12 +42,12 @@ export declare interface Pinch { + + /** + * scale +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- scale: number; ++ scale: double; + } + + /** +@@ -72,12 +72,12 @@ export declare interface Rotate { + /** + * Rotate angle + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- angle: number; ++ angle: double; + } + + /** +@@ -100,21 +100,21 @@ export declare interface ThreeFingersSwipe { + + /** + * Coordinate x +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- x: number; ++ x: int; + + /** + * Coordinate y +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- y: number; ++ y: int; + } + + /** +@@ -137,21 +137,21 @@ export declare interface FourFingersSwipe { + + /** + * Coordinate x +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- x: number; ++ x: int; + + /** + * Coordinate y +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- y: number; ++ y: int; + } + + /** +@@ -176,23 +176,23 @@ export declare interface SwipeInward { + + /** + * Coordinate x +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @systemapi hide for inner use + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- x: number; ++ x: int; + + /** + * Coordinate y +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @systemapi hide for inner use + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- y: number; ++ y: int; + } + + /** +diff --git a/api/@ohos.multimodalInput.inputConsumer.d.ts b/api/@ohos.multimodalInput.inputConsumer.d.ts +index f1365af07..1762f29ca 100644 +--- a/api/@ohos.multimodalInput.inputConsumer.d.ts ++++ b/api/@ohos.multimodalInput.inputConsumer.d.ts +@@ -43,24 +43,24 @@ declare namespace inputConsumer { + /** + * The pre-keys that want to subscribe or unsubscribe. + * +- * @type { Array } ++ * @type { Array } + * @syscap SystemCapability.MultimodalInput.Input.InputConsumer + * @systemapi hide for inner use + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- preKeys: Array; ++ preKeys: Array; + + /** + * The post position key that want to subscribe or unsubscribe. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.InputConsumer + * @systemapi hide for inner use + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- finalKey: number; ++ finalKey: int; + + /** + * The final key press down or up. +@@ -76,13 +76,13 @@ declare namespace inputConsumer { + /** + * Duration of final key press. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.InputConsumer + * @systemapi hide for inner use + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- finalKeyDownDuration: number; ++ finalKeyDownDuration: int; + + /** + * Whether to report repeated key events. By default, the value is true if it is left unspecified. +@@ -101,33 +101,37 @@ declare namespace inputConsumer { + * + * @typedef HotkeyOptions + * @syscap SystemCapability.MultimodalInput.Input.InputConsumer +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface HotkeyOptions { + /** + * Defines modifier keys. One or two modifier keys are supported. + * +- * @type { Array } ++ * @type { Array } + * @syscap SystemCapability.MultimodalInput.Input.InputConsumer +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- preKeys: Array; ++ preKeys: Array; + + /** + * Defines modified keys. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.InputConsumer +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- finalKey: number; ++ finalKey: int; + + /** + * Whether to report repeated key events. By default, the value is true if it is left unspecified. + * + * @type { ?boolean } + * @syscap SystemCapability.MultimodalInput.Input.InputConsumer +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isRepeat?: boolean; + } +@@ -137,34 +141,38 @@ declare namespace inputConsumer { + * + * @typedef KeyPressedConfig + * @syscap SystemCapability.MultimodalInput.Input.InputConsumer +- * @since 16 ++ * @since arkts {'1.1':'16', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface KeyPressedConfig { + /** + * Key value. Currently listening is supported only for KEYCODE_VOLUME_UP and KEYCODE_VOLUME_DOWN keys. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.InputConsumer +- * @since 16 ++ * @since arkts {'1.1':'16', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- key: number; ++ key: int; + + /** + * Key event type. The value 1 indicates key press and the value 2 indicates key release. Currently + * listening is supported only for key press events. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.InputConsumer +- * @since 16 ++ * @since arkts {'1.1':'16', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- action: number; ++ action: int; + + /** + * Whether to report repeated key events. + * + * @type { boolean } + * @syscap SystemCapability.MultimodalInput.Input.InputConsumer +- * @since 16 ++ * @since arkts {'1.1':'16', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isRepeat: boolean; + } +@@ -299,7 +307,8 @@ declare namespace inputConsumer { + * @throws { BusinessError } 4200002 - The hotkey has been used by the system. + * @throws { BusinessError } 4200003 - The hotkey has been subscribed to by another. + * @syscap SystemCapability.MultimodalInput.Input.InputConsumer +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'hotkeyChange', hotkeyOptions: HotkeyOptions, callback: Callback): void; + +@@ -313,7 +322,8 @@ declare namespace inputConsumer { + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.MultimodalInput.Input.InputConsumer +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'hotkeyChange', hotkeyOptions: HotkeyOptions, callback?: Callback): void; + +@@ -328,7 +338,8 @@ declare namespace inputConsumer { + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.MultimodalInput.Input.InputConsumer +- * @since 16 ++ * @since arkts {'1.1':'16', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'keyPressed', options: KeyPressedConfig, callback: Callback): void; + +@@ -341,7 +352,8 @@ declare namespace inputConsumer { + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.MultimodalInput.Input.InputConsumer +- * @since 16 ++ * @since arkts {'1.1':'16', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'keyPressed', callback?: Callback): void; + } +diff --git a/api/@ohos.multimodalInput.inputDevice.d.ts b/api/@ohos.multimodalInput.inputDevice.d.ts +index cd08ee76e..4d9b4ad06 100644 +--- a/api/@ohos.multimodalInput.inputDevice.d.ts ++++ b/api/@ohos.multimodalInput.inputDevice.d.ts +@@ -24,7 +24,6 @@ import type { KeyCode } from './@ohos.multimodalInput.keyCode'; + /*** endif */ + /*** if arkts 1.2 */ + import { Callback, AsyncCallback } from './@ohos.base'; +-import { KeyCode } from './@ohos.multimodalInput.keyCode'; + /*** endif */ + + /** +@@ -175,12 +174,12 @@ declare namespace inputDevice { + /** + * ID of the input device for the reported input device event. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.InputDevice + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- deviceId: number; ++ deviceId: int; + } + + /** +@@ -243,52 +242,52 @@ declare namespace inputDevice { + /** + * Maximum value of the data reported on this axis. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.InputDevice + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- max: number; ++ max: int; + + /** + * Minimum value of the data reported on this axis. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.InputDevice + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- min: number; ++ min: int; + + /** + * Fuzz value of the data reported on this axis. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.InputDevice + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- fuzz: number; ++ fuzz: int; + + /** + * Flat value of the data reported on this axis. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.InputDevice + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- flat: number; ++ flat: int; + + /** + * Resolution value of the data reported on this axis. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.InputDevice + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- resolution: number; ++ resolution: int; + } + + /** +@@ -303,12 +302,12 @@ declare namespace inputDevice { + /** + * Id of the input device. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.InputDevice + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- id: number; ++ id: int; + + /** + * Name of the input device. +@@ -344,42 +343,42 @@ declare namespace inputDevice { + /** + * Bus of the input device. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.InputDevice + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- bus: number; ++ bus: int; + + /** + * Product of the input device. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.InputDevice + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- product: number; ++ product: int; + + /** + * Vendor of the input device. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.InputDevice + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- vendor: number; ++ vendor: int; + + /** + * Version of the input device. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.InputDevice + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- version: number; ++ version: int; + + /** + * Physical path of the input device. +diff --git a/api/@ohos.multimodalInput.inputDeviceCooperate.d.ts b/api/@ohos.multimodalInput.inputDeviceCooperate.d.ts +index b0ae78993..e6270c465 100644 +--- a/api/@ohos.multimodalInput.inputDeviceCooperate.d.ts ++++ b/api/@ohos.multimodalInput.inputDeviceCooperate.d.ts +@@ -28,7 +28,6 @@ import { AsyncCallback } from "./@ohos.base"; + * @since 9 + */ + +- + declare namespace inputDeviceCooperate { + /** + * Enumerates mouse traversal events. +diff --git a/api/@ohos.multimodalInput.inputEvent.d.ts b/api/@ohos.multimodalInput.inputEvent.d.ts +index aff223e52..784ef1f92 100644 +--- a/api/@ohos.multimodalInput.inputEvent.d.ts ++++ b/api/@ohos.multimodalInput.inputEvent.d.ts +@@ -23,8 +23,7 @@ + * + * @interface InputEvent + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * InputEvent +@@ -40,84 +39,79 @@ export declare interface InputEvent { + * Unique event ID generated by the server + * @type { number } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Unique event ID generated by the server +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- id: number; ++ id: int; + + /** + * ID of the device that reports the input event + * @type { number } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * ID of the device that reports the input event +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- deviceId: number; ++ deviceId: int; + + /** + * Occurrence time of the input event + * @type { number } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Occurrence time of the input event +- * @type { number } ++ * @type { long } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- actionTime: number; ++ actionTime: long; + + /** + * ID of the target screen + * @type { number } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * ID of the target screen +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- screenId: number; ++ screenId: int; + + /** + * ID of the target window + * @type { number } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * ID of the target window +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- windowId: number; ++ windowId: int; + } +\ No newline at end of file +diff --git a/api/@ohos.multimodalInput.inputEventClient.d.ts b/api/@ohos.multimodalInput.inputEventClient.d.ts +index fc4b4d181..ed7486904 100644 +--- a/api/@ohos.multimodalInput.inputEventClient.d.ts ++++ b/api/@ohos.multimodalInput.inputEventClient.d.ts +@@ -101,7 +101,8 @@ declare namespace inputEventClient { + * @interface TouchEventData + * @syscap SystemCapability.MultimodalInput.Input.InputSimulator + * @systemapi hide for inner use +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface TouchEventData { + /** +@@ -110,7 +111,8 @@ declare namespace inputEventClient { + * @type { TouchEvent } + * @syscap SystemCapability.MultimodalInput.Input.InputSimulator + * @systemapi hide for inner use +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + touchEvent: TouchEvent; + } +diff --git a/api/@ohos.multimodalInput.inputMonitor.d.ts b/api/@ohos.multimodalInput.inputMonitor.d.ts +index e0ddd4572..cfaff18a1 100644 +--- a/api/@ohos.multimodalInput.inputMonitor.d.ts ++++ b/api/@ohos.multimodalInput.inputMonitor.d.ts +@@ -45,7 +45,8 @@ declare namespace inputMonitor { + * @interface TouchEventReceiver + * @syscap SystemCapability.MultimodalInput.Input.InputMonitor + * @systemapi hide for inner use +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface TouchEventReceiver { + /** +diff --git a/api/@ohos.multimodalInput.intentionCode.d.ets b/api/@ohos.multimodalInput.intentionCode.d.ets +deleted file mode 100644 +index 7625a5d19..000000000 +--- a/api/@ohos.multimodalInput.intentionCode.d.ets ++++ /dev/null +@@ -1,246 +0,0 @@ +-/* +- * Copyright (c) 2023 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS; +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-/** +- * @file +- * @kit InputKit +- */ +- +-/** +- * IntentionCode +- * +- * @enum { number } +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 20 +- */ +-/** +- * IntentionCode +- * +- * @enum { number } +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @atomicservice +- * @since 20 +- */ +-export declare enum IntentionCode { +- /** +- * INTENTION_UNKNOWN +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 20 +- */ +- /** +- * INTENTION_UNKNOWN +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @atomicservice +- * @since 20 +- */ +- INTENTION_UNKNOWN = -1, +- +- /** +- * INTENTION_UP +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 20 +- */ +- /** +- * INTENTION_UP +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @atomicservice +- * @since 20 +- */ +- INTENTION_UP = 1, +- +- /** +- * INTENTION_DOWN +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 20 +- */ +- /** +- * INTENTION_DOWN +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @atomicservice +- * @since 20 +- */ +- INTENTION_DOWN = 2, +- +- /** +- * INTENTION_LEFT +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 20 +- */ +- /** +- * INTENTION_LEFT +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @atomicservice +- * @since 20 +- */ +- INTENTION_LEFT = 3, +- +- /** +- * INTENTION_RIGHT +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 20 +- */ +- /** +- * INTENTION_RIGHT +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @atomicservice +- * @since 20 +- */ +- INTENTION_RIGHT = 4, +- +- /** +- * INTENTION_SELECT +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 20 +- */ +- /** +- * INTENTION_SELECT +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @atomicservice +- * @since 20 +- */ +- INTENTION_SELECT = 5, +- +- /** +- * INTENTION_ESCAPE +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 20 +- */ +- /** +- * INTENTION_ESCAPE +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @atomicservice +- * @since 20 +- */ +- INTENTION_ESCAPE = 6, +- +- /** +- * INTENTION_BACK +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 20 +- */ +- /** +- * INTENTION_BACK +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @atomicservice +- * @since 20 +- */ +- INTENTION_BACK = 7, +- +- /** +- * INTENTION_FORWARD +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 20 +- */ +- /** +- * INTENTION_FORWARD +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @atomicservice +- * @since 20 +- */ +- INTENTION_FORWARD = 8, +- +- /** +- * INTENTION_MENU +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 20 +- */ +- /** +- * INTENTION_MENU +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @atomicservice +- * @since 20 +- */ +- INTENTION_MENU = 9, +- +- /** +- * INTENTION_PAGE_UP +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 20 +- */ +- /** +- * INTENTION_PAGE_UP +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @atomicservice +- * @since 20 +- */ +- INTENTION_PAGE_UP = 11, +- +- /** +- * INTENTION_PAGE_DOWN +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 20 +- */ +- /** +- * INTENTION_PAGE_DOWN +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @atomicservice +- * @since 20 +- */ +- INTENTION_PAGE_DOWN = 12, +- +- /** +- * INTENTION_ZOOM_OUT +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 20 +- */ +- /** +- * INTENTION_ZOOM_OUT +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @atomicservice +- * @since 20 +- */ +- INTENTION_ZOOM_OUT = 13, +- +- /** +- * INTENTION_ZOOM_IN +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 20 +- */ +- /** +- * INTENTION_ZOOM_IN +- * +- * @syscap SystemCapability.MultimodalInput.Input.Core +- * @atomicservice +- * @since 20 +- */ +- INTENTION_ZOOM_IN = 14 +-} +diff --git a/api/@ohos.multimodalInput.intentionCode.d.ts b/api/@ohos.multimodalInput.intentionCode.d.ts +index 79445f8cc..cb47f8ec1 100644 +--- a/api/@ohos.multimodalInput.intentionCode.d.ts ++++ b/api/@ohos.multimodalInput.intentionCode.d.ts +@@ -31,7 +31,8 @@ + * @enum { number } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export declare enum IntentionCode { + /** +@@ -45,7 +46,8 @@ export declare enum IntentionCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INTENTION_UNKNOWN = -1, + +@@ -60,7 +62,8 @@ export declare enum IntentionCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INTENTION_UP = 1, + +@@ -75,7 +78,8 @@ export declare enum IntentionCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INTENTION_DOWN = 2, + +@@ -90,7 +94,8 @@ export declare enum IntentionCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INTENTION_LEFT = 3, + +@@ -105,7 +110,8 @@ export declare enum IntentionCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INTENTION_RIGHT = 4, + +@@ -120,7 +126,8 @@ export declare enum IntentionCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INTENTION_SELECT = 5, + +@@ -135,7 +142,8 @@ export declare enum IntentionCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INTENTION_ESCAPE = 6, + +@@ -150,7 +158,8 @@ export declare enum IntentionCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INTENTION_BACK = 7, + +@@ -165,7 +174,8 @@ export declare enum IntentionCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INTENTION_FORWARD = 8, + +@@ -180,7 +190,8 @@ export declare enum IntentionCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INTENTION_MENU = 9, + +@@ -195,7 +206,8 @@ export declare enum IntentionCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INTENTION_PAGE_UP = 11, + +@@ -210,7 +222,8 @@ export declare enum IntentionCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INTENTION_PAGE_DOWN = 12, + +@@ -225,7 +238,8 @@ export declare enum IntentionCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INTENTION_ZOOM_OUT = 13, + +@@ -240,7 +254,8 @@ export declare enum IntentionCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INTENTION_ZOOM_IN = 14 + } +diff --git a/api/@ohos.multimodalInput.keyCode.d.ts b/api/@ohos.multimodalInput.keyCode.d.ts +index c555f3ff6..6d9a01c1e 100644 +--- a/api/@ohos.multimodalInput.keyCode.d.ts ++++ b/api/@ohos.multimodalInput.keyCode.d.ts +@@ -31,14 +31,16 @@ + * @enum { number } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export declare enum KeyCode { + /** + * KEYCODE_FN + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_FN = 0, + +@@ -46,7 +48,8 @@ export declare enum KeyCode { + * KEYCODE_UNKNOWN + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_UNKNOWN = -1, + +@@ -54,7 +57,8 @@ export declare enum KeyCode { + * KEYCODE_HOME + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_HOME = 1, + +@@ -62,7 +66,8 @@ export declare enum KeyCode { + * KEYCODE_BACK + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BACK = 2, + +@@ -70,7 +75,8 @@ export declare enum KeyCode { + * KEYCODE_SEARCH + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 13 ++ * @since arkts {'1.1':'13', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SEARCH = 9, + +@@ -85,7 +91,8 @@ export declare enum KeyCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MEDIA_PLAY_PAUSE = 10, + +@@ -100,7 +107,8 @@ export declare enum KeyCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MEDIA_STOP = 11, + +@@ -115,7 +123,8 @@ export declare enum KeyCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MEDIA_NEXT = 12, + +@@ -130,7 +139,8 @@ export declare enum KeyCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MEDIA_PREVIOUS = 13, + +@@ -145,7 +155,8 @@ export declare enum KeyCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MEDIA_REWIND = 14, + +@@ -160,7 +171,8 @@ export declare enum KeyCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MEDIA_FAST_FORWARD = 15, + +@@ -168,7 +180,8 @@ export declare enum KeyCode { + * KEYCODE_VOLUME_UP + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_VOLUME_UP = 16, + +@@ -176,7 +189,8 @@ export declare enum KeyCode { + * KEYCODE_VOLUME_DOWN + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_VOLUME_DOWN = 17, + +@@ -184,7 +198,8 @@ export declare enum KeyCode { + * KEYCODE_POWER + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_POWER = 18, + +@@ -192,7 +207,8 @@ export declare enum KeyCode { + * KEYCODE_CAMERA + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_CAMERA = 19, + +@@ -200,7 +216,8 @@ export declare enum KeyCode { + * KEYCODE_VOLUME_MUTE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_VOLUME_MUTE = 22, + +@@ -208,7 +225,8 @@ export declare enum KeyCode { + * KEYCODE_MUTE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MUTE = 23, + +@@ -216,7 +234,8 @@ export declare enum KeyCode { + * KEYCODE_BRIGHTNESS_UP + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BRIGHTNESS_UP = 40, + +@@ -224,7 +243,8 @@ export declare enum KeyCode { + * KEYCODE_BRIGHTNESS_DOWN + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BRIGHTNESS_DOWN = 41, + +@@ -232,7 +252,8 @@ export declare enum KeyCode { + * KEYCODE_0 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_0 = 2000, + +@@ -240,7 +261,8 @@ export declare enum KeyCode { + * KEYCODE_1 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_1 = 2001, + +@@ -248,7 +270,8 @@ export declare enum KeyCode { + * KEYCODE_2 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_2 = 2002, + +@@ -256,7 +279,8 @@ export declare enum KeyCode { + * KEYCODE_3 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_3 = 2003, + +@@ -264,7 +288,8 @@ export declare enum KeyCode { + * KEYCODE_4 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_4 = 2004, + +@@ -272,7 +297,8 @@ export declare enum KeyCode { + * KEYCODE_5 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_5 = 2005, + +@@ -280,7 +306,8 @@ export declare enum KeyCode { + * KEYCODE_6 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_6 = 2006, + +@@ -288,7 +315,8 @@ export declare enum KeyCode { + * KEYCODE_7 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_7 = 2007, + +@@ -296,7 +324,8 @@ export declare enum KeyCode { + * KEYCODE_8 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_8 = 2008, + +@@ -304,7 +333,8 @@ export declare enum KeyCode { + * KEYCODE_9 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_9 = 2009, + +@@ -312,7 +342,8 @@ export declare enum KeyCode { + * KEYCODE_STAR + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_STAR = 2010, + +@@ -320,7 +351,8 @@ export declare enum KeyCode { + * KEYCODE_POUND + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_POUND = 2011, + +@@ -328,7 +360,8 @@ export declare enum KeyCode { + * KEYCODE_DPAD_UP + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_DPAD_UP = 2012, + +@@ -336,7 +369,8 @@ export declare enum KeyCode { + * KEYCODE_DPAD_DOWN + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_DPAD_DOWN = 2013, + +@@ -344,7 +378,8 @@ export declare enum KeyCode { + * KEYCODE_DPAD_LEFT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_DPAD_LEFT = 2014, + +@@ -352,7 +387,8 @@ export declare enum KeyCode { + * KEYCODE_DPAD_RIGHT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_DPAD_RIGHT = 2015, + +@@ -360,7 +396,8 @@ export declare enum KeyCode { + * KEYCODE_DPAD_CENTER + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_DPAD_CENTER = 2016, + +@@ -368,7 +405,8 @@ export declare enum KeyCode { + * KEYCODE_A + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_A = 2017, + +@@ -376,7 +414,8 @@ export declare enum KeyCode { + * KEYCODE_B + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_B = 2018, + +@@ -384,7 +423,8 @@ export declare enum KeyCode { + * KEYCODE_C + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_C = 2019, + +@@ -392,7 +432,8 @@ export declare enum KeyCode { + * KEYCODE_D + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_D = 2020, + +@@ -400,7 +441,8 @@ export declare enum KeyCode { + * KEYCODE_E + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_E = 2021, + +@@ -408,7 +450,8 @@ export declare enum KeyCode { + * KEYCODE_F + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F = 2022, + +@@ -416,7 +459,8 @@ export declare enum KeyCode { + * KEYCODE_G + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_G = 2023, + +@@ -424,7 +468,8 @@ export declare enum KeyCode { + * KEYCODE_H + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_H = 2024, + +@@ -432,7 +477,8 @@ export declare enum KeyCode { + * KEYCODE_I + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_I = 2025, + +@@ -440,7 +486,8 @@ export declare enum KeyCode { + * KEYCODE_J + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_J = 2026, + +@@ -448,7 +495,8 @@ export declare enum KeyCode { + * KEYCODE_K + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_K = 2027, + +@@ -456,7 +504,8 @@ export declare enum KeyCode { + * KEYCODE_L + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_L = 2028, + +@@ -464,7 +513,8 @@ export declare enum KeyCode { + * KEYCODE_M + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_M = 2029, + +@@ -472,7 +522,8 @@ export declare enum KeyCode { + * KEYCODE_N + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_N = 2030, + +@@ -480,7 +531,8 @@ export declare enum KeyCode { + * KEYCODE_O + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_O = 2031, + +@@ -488,7 +540,8 @@ export declare enum KeyCode { + * KEYCODE_P + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_P = 2032, + +@@ -496,7 +549,8 @@ export declare enum KeyCode { + * KEYCODE_Q + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_Q = 2033, + +@@ -504,7 +558,8 @@ export declare enum KeyCode { + * KEYCODE_R + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_R = 2034, + +@@ -512,7 +567,8 @@ export declare enum KeyCode { + * KEYCODE_S + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_S = 2035, + +@@ -520,7 +576,8 @@ export declare enum KeyCode { + * KEYCODE_T + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_T = 2036, + +@@ -528,7 +585,8 @@ export declare enum KeyCode { + * KEYCODE_U + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_U = 2037, + +@@ -536,7 +594,8 @@ export declare enum KeyCode { + * KEYCODE_V + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_V = 2038, + +@@ -544,7 +603,8 @@ export declare enum KeyCode { + * KEYCODE_W + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_W = 2039, + +@@ -552,7 +612,8 @@ export declare enum KeyCode { + * KEYCODE_X + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_X = 2040, + +@@ -560,7 +621,8 @@ export declare enum KeyCode { + * KEYCODE_Y + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_Y = 2041, + +@@ -568,7 +630,8 @@ export declare enum KeyCode { + * KEYCODE_Z + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_Z = 2042, + +@@ -576,7 +639,8 @@ export declare enum KeyCode { + * KEYCODE_COMMA + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_COMMA = 2043, + +@@ -584,7 +648,8 @@ export declare enum KeyCode { + * KEYCODE_PERIOD + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_PERIOD = 2044, + +@@ -592,7 +657,8 @@ export declare enum KeyCode { + * KEYCODE_ALT_LEFT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_ALT_LEFT = 2045, + +@@ -600,7 +666,8 @@ export declare enum KeyCode { + * KEYCODE_ALT_RIGHT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_ALT_RIGHT = 2046, + +@@ -608,7 +675,8 @@ export declare enum KeyCode { + * KEYCODE_SHIFT_LEFT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SHIFT_LEFT = 2047, + +@@ -616,7 +684,8 @@ export declare enum KeyCode { + * KEYCODE_SHIFT_RIGHT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SHIFT_RIGHT = 2048, + +@@ -624,7 +693,8 @@ export declare enum KeyCode { + * KEYCODE_TAB + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_TAB = 2049, + +@@ -632,7 +702,8 @@ export declare enum KeyCode { + * KEYCODE_SPACE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SPACE = 2050, + +@@ -640,7 +711,8 @@ export declare enum KeyCode { + * KEYCODE_SYM + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SYM = 2051, + +@@ -648,7 +720,8 @@ export declare enum KeyCode { + * KEYCODE_EXPLORER + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_EXPLORER = 2052, + +@@ -656,7 +729,8 @@ export declare enum KeyCode { + * KEYCODE_ENVELOPE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_ENVELOPE = 2053, + +@@ -664,7 +738,8 @@ export declare enum KeyCode { + * KEYCODE_ENTER + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_ENTER = 2054, + +@@ -672,7 +747,8 @@ export declare enum KeyCode { + * KEYCODE_DEL + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_DEL = 2055, + +@@ -680,7 +756,8 @@ export declare enum KeyCode { + * KEYCODE_GRAVE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_GRAVE = 2056, + +@@ -688,7 +765,8 @@ export declare enum KeyCode { + * KEYCODE_MINUS + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MINUS = 2057, + +@@ -696,7 +774,8 @@ export declare enum KeyCode { + * KEYCODE_EQUALS + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_EQUALS = 2058, + +@@ -704,7 +783,8 @@ export declare enum KeyCode { + * KEYCODE_LEFT_BRACKET + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_LEFT_BRACKET = 2059, + +@@ -712,7 +792,8 @@ export declare enum KeyCode { + * KEYCODE_RIGHT_BRACKET + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_RIGHT_BRACKET = 2060, + +@@ -720,7 +801,8 @@ export declare enum KeyCode { + * KEYCODE_BACKSLASH + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BACKSLASH = 2061, + +@@ -728,7 +810,8 @@ export declare enum KeyCode { + * KEYCODE_SEMICOLON + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SEMICOLON = 2062, + +@@ -736,7 +819,8 @@ export declare enum KeyCode { + * KEYCODE_APOSTROPHE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_APOSTROPHE = 2063, + +@@ -744,7 +828,8 @@ export declare enum KeyCode { + * KEYCODE_SLASH + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SLASH = 2064, + +@@ -752,7 +837,8 @@ export declare enum KeyCode { + * KEYCODE_AT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_AT = 2065, + +@@ -760,7 +846,8 @@ export declare enum KeyCode { + * KEYCODE_PLUS + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_PLUS = 2066, + +@@ -768,7 +855,8 @@ export declare enum KeyCode { + * KEYCODE_MENU + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MENU = 2067, + +@@ -776,7 +864,8 @@ export declare enum KeyCode { + * KEYCODE_PAGE_UP + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_PAGE_UP = 2068, + +@@ -784,7 +873,8 @@ export declare enum KeyCode { + * KEYCODE_PAGE_DOWN + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_PAGE_DOWN = 2069, + +@@ -792,7 +882,8 @@ export declare enum KeyCode { + * KEYCODE_ESCAPE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_ESCAPE = 2070, + +@@ -800,7 +891,8 @@ export declare enum KeyCode { + * KEYCODE_FORWARD_DEL + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_FORWARD_DEL = 2071, + +@@ -808,7 +900,8 @@ export declare enum KeyCode { + * KEYCODE_CTRL_LEFT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_CTRL_LEFT = 2072, + +@@ -816,7 +909,8 @@ export declare enum KeyCode { + * KEYCODE_CTRL_RIGHT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_CTRL_RIGHT = 2073, + +@@ -824,7 +918,8 @@ export declare enum KeyCode { + * KEYCODE_CAPS_LOCK + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_CAPS_LOCK = 2074, + +@@ -832,7 +927,8 @@ export declare enum KeyCode { + * KEYCODE_SCROLL_LOCK + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SCROLL_LOCK = 2075, + +@@ -840,7 +936,8 @@ export declare enum KeyCode { + * KEYCODE_META_LEFT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_META_LEFT = 2076, + +@@ -848,7 +945,8 @@ export declare enum KeyCode { + * KEYCODE_META_RIGHT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_META_RIGHT = 2077, + +@@ -856,7 +954,8 @@ export declare enum KeyCode { + * KEYCODE_FUNCTION + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_FUNCTION = 2078, + +@@ -864,7 +963,8 @@ export declare enum KeyCode { + * KEYCODE_SYSRQ + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SYSRQ = 2079, + +@@ -872,7 +972,8 @@ export declare enum KeyCode { + * KEYCODE_BREAK + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BREAK = 2080, + +@@ -880,7 +981,8 @@ export declare enum KeyCode { + * KEYCODE_MOVE_HOME + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MOVE_HOME = 2081, + +@@ -888,7 +990,8 @@ export declare enum KeyCode { + * KEYCODE_MOVE_END + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MOVE_END = 2082, + +@@ -896,7 +999,8 @@ export declare enum KeyCode { + * KEYCODE_INSERT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_INSERT = 2083, + +@@ -904,7 +1008,8 @@ export declare enum KeyCode { + * KEYCODE_FORWARD + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_FORWARD = 2084, + +@@ -919,7 +1024,8 @@ export declare enum KeyCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MEDIA_PLAY = 2085, + +@@ -934,7 +1040,8 @@ export declare enum KeyCode { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MEDIA_PAUSE = 2086, + +@@ -942,7 +1049,8 @@ export declare enum KeyCode { + * KEYCODE_MEDIA_CLOSE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MEDIA_CLOSE = 2087, + +@@ -950,7 +1058,8 @@ export declare enum KeyCode { + * KEYCODE_MEDIA_EJECT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MEDIA_EJECT = 2088, + +@@ -958,7 +1067,8 @@ export declare enum KeyCode { + * KEYCODE_MEDIA_RECORD + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MEDIA_RECORD = 2089, + +@@ -966,7 +1076,8 @@ export declare enum KeyCode { + * KEYCODE_F1 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F1 = 2090, + +@@ -974,7 +1085,8 @@ export declare enum KeyCode { + * KEYCODE_F2 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F2 = 2091, + +@@ -982,7 +1094,8 @@ export declare enum KeyCode { + * KEYCODE_F3 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F3 = 2092, + +@@ -990,7 +1103,8 @@ export declare enum KeyCode { + * KEYCODE_F4 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F4 = 2093, + +@@ -998,7 +1112,8 @@ export declare enum KeyCode { + * KEYCODE_F5 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F5 = 2094, + +@@ -1006,7 +1121,8 @@ export declare enum KeyCode { + * KEYCODE_F6 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F6 = 2095, + +@@ -1014,7 +1130,8 @@ export declare enum KeyCode { + * KEYCODE_F7 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F7 = 2096, + +@@ -1022,7 +1139,8 @@ export declare enum KeyCode { + * KEYCODE_F8 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F8 = 2097, + +@@ -1030,7 +1148,8 @@ export declare enum KeyCode { + * KEYCODE_F9 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F9 = 2098, + +@@ -1038,7 +1157,8 @@ export declare enum KeyCode { + * KEYCODE_F10 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F10 = 2099, + +@@ -1046,7 +1166,8 @@ export declare enum KeyCode { + * KEYCODE_F11 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F11 = 2100, + +@@ -1054,7 +1175,8 @@ export declare enum KeyCode { + * KEYCODE_F12 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F12 = 2101, + +@@ -1062,7 +1184,8 @@ export declare enum KeyCode { + * KEYCODE_NUM_LOCK + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUM_LOCK = 2102, + +@@ -1070,7 +1193,8 @@ export declare enum KeyCode { + * KEYCODE_NUMPAD_0 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUMPAD_0 = 2103, + +@@ -1078,7 +1202,8 @@ export declare enum KeyCode { + * KEYCODE_NUMPAD_1 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUMPAD_1 = 2104, + +@@ -1086,7 +1211,8 @@ export declare enum KeyCode { + * KEYCODE_NUMPAD_2 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUMPAD_2 = 2105, + +@@ -1094,7 +1220,8 @@ export declare enum KeyCode { + * KEYCODE_NUMPAD_3 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUMPAD_3 = 2106, + +@@ -1102,7 +1229,8 @@ export declare enum KeyCode { + * KEYCODE_NUMPAD_4 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUMPAD_4 = 2107, + +@@ -1110,7 +1238,8 @@ export declare enum KeyCode { + * KEYCODE_NUMPAD_5 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUMPAD_5 = 2108, + +@@ -1118,7 +1247,8 @@ export declare enum KeyCode { + * KEYCODE_NUMPAD_6 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUMPAD_6 = 2109, + +@@ -1126,7 +1256,8 @@ export declare enum KeyCode { + * KEYCODE_NUMPAD_7 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUMPAD_7 = 2110, + +@@ -1134,7 +1265,8 @@ export declare enum KeyCode { + * KEYCODE_NUMPAD_8 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUMPAD_8 = 2111, + +@@ -1142,7 +1274,8 @@ export declare enum KeyCode { + * KEYCODE_NUMPAD_9 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUMPAD_9 = 2112, + +@@ -1150,7 +1283,8 @@ export declare enum KeyCode { + * KEYCODE_NUMPAD_DIVIDE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUMPAD_DIVIDE = 2113, + +@@ -1158,7 +1292,8 @@ export declare enum KeyCode { + * KEYCODE_NUMPAD_MULTIPLY + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUMPAD_MULTIPLY = 2114, + +@@ -1166,7 +1301,8 @@ export declare enum KeyCode { + * KEYCODE_NUMPAD_SUBTRACT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUMPAD_SUBTRACT = 2115, + +@@ -1174,7 +1310,8 @@ export declare enum KeyCode { + * KEYCODE_NUMPAD_ADD + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUMPAD_ADD = 2116, + +@@ -1182,7 +1319,8 @@ export declare enum KeyCode { + * KEYCODE_NUMPAD_DOT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUMPAD_DOT = 2117, + +@@ -1190,7 +1328,8 @@ export declare enum KeyCode { + * KEYCODE_NUMPAD_COMMA + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUMPAD_COMMA = 2118, + +@@ -1198,7 +1337,8 @@ export declare enum KeyCode { + * KEYCODE_NUMPAD_ENTER + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUMPAD_ENTER = 2119, + +@@ -1206,7 +1346,8 @@ export declare enum KeyCode { + * KEYCODE_NUMPAD_EQUALS + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUMPAD_EQUALS = 2120, + +@@ -1214,7 +1355,8 @@ export declare enum KeyCode { + * KEYCODE_NUMPAD_LEFT_PAREN + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUMPAD_LEFT_PAREN = 2121, + +@@ -1222,7 +1364,8 @@ export declare enum KeyCode { + * KEYCODE_NUMPAD_RIGHT_PAREN + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUMPAD_RIGHT_PAREN = 2122, + +@@ -1230,7 +1373,8 @@ export declare enum KeyCode { + * KEYCODE_VIRTUAL_MULTITASK + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_VIRTUAL_MULTITASK = 2210, + +@@ -1238,7 +1382,8 @@ export declare enum KeyCode { + * KEYCODE_BUTTON_A + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BUTTON_A = 2301, + +@@ -1246,7 +1391,8 @@ export declare enum KeyCode { + * KEYCODE_BUTTON_B + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BUTTON_B = 2302, + +@@ -1254,7 +1400,8 @@ export declare enum KeyCode { + * KEYCODE_BUTTON_X + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BUTTON_X = 2304, + +@@ -1262,7 +1409,8 @@ export declare enum KeyCode { + * KEYCODE_BUTTON_Y + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BUTTON_Y = 2305, + +@@ -1270,7 +1418,8 @@ export declare enum KeyCode { + * KEYCODE_BUTTON_L1 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BUTTON_L1 = 2307, + +@@ -1278,7 +1427,8 @@ export declare enum KeyCode { + * KEYCODE_BUTTON_R1 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BUTTON_R1 = 2308, + +@@ -1286,7 +1436,8 @@ export declare enum KeyCode { + * KEYCODE_BUTTON_L2 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BUTTON_L2 = 2309, + +@@ -1294,7 +1445,8 @@ export declare enum KeyCode { + * KEYCODE_BUTTON_R2 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BUTTON_R2 = 2310, + +@@ -1302,7 +1454,8 @@ export declare enum KeyCode { + * KEYCODE_BUTTON_SELECT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BUTTON_SELECT = 2311, + +@@ -1310,7 +1463,8 @@ export declare enum KeyCode { + * KEYCODE_BUTTON_START + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BUTTON_START = 2312, + +@@ -1318,7 +1472,8 @@ export declare enum KeyCode { + * KEYCODE_BUTTON_MODE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BUTTON_MODE = 2313, + +@@ -1326,7 +1481,8 @@ export declare enum KeyCode { + * KEYCODE_BUTTON_THUMBL + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BUTTON_THUMBL = 2314, + +@@ -1334,7 +1490,8 @@ export declare enum KeyCode { + * KEYCODE_BUTTON_THUMBR + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BUTTON_THUMBR = 2315, + +@@ -1342,7 +1499,8 @@ export declare enum KeyCode { + * KEYCODE_SLEEP + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SLEEP = 2600, + +@@ -1350,7 +1508,8 @@ export declare enum KeyCode { + * KEYCODE_ZENKAKU_HANKAKU + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_ZENKAKU_HANKAKU = 2601, + +@@ -1358,7 +1517,8 @@ export declare enum KeyCode { + * KEYCODE_102ND + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_102ND = 2602, + +@@ -1366,7 +1526,8 @@ export declare enum KeyCode { + * KEYCODE_RO + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_RO = 2603, + +@@ -1374,7 +1535,8 @@ export declare enum KeyCode { + * KEYCODE_KATAKANA + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_KATAKANA = 2604, + +@@ -1382,7 +1544,8 @@ export declare enum KeyCode { + * KEYCODE_HIRAGANA + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_HIRAGANA = 2605, + +@@ -1390,7 +1553,8 @@ export declare enum KeyCode { + * KEYCODE_HENKAN + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_HENKAN = 2606, + +@@ -1398,7 +1562,8 @@ export declare enum KeyCode { + * KEYCODE_KATAKANA_HIRAGANA + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_KATAKANA_HIRAGANA = 2607, + +@@ -1406,7 +1571,8 @@ export declare enum KeyCode { + * KEYCODE_MUHENKAN + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MUHENKAN = 2608, + +@@ -1414,7 +1580,8 @@ export declare enum KeyCode { + * KEYCODE_LINEFEED + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_LINEFEED = 2609, + +@@ -1422,7 +1589,8 @@ export declare enum KeyCode { + * KEYCODE_MACRO + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MACRO = 2610, + +@@ -1430,7 +1598,8 @@ export declare enum KeyCode { + * KEYCODE_NUMPAD_PLUSMINUS + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NUMPAD_PLUSMINUS = 2611, + +@@ -1438,7 +1607,8 @@ export declare enum KeyCode { + * KEYCODE_SCALE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SCALE = 2612, + +@@ -1446,7 +1616,8 @@ export declare enum KeyCode { + * KEYCODE_HANGUEL + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_HANGUEL = 2613, + +@@ -1454,7 +1625,8 @@ export declare enum KeyCode { + * KEYCODE_HANJA + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_HANJA = 2614, + +@@ -1462,7 +1634,8 @@ export declare enum KeyCode { + * KEYCODE_YEN + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_YEN = 2615, + +@@ -1470,7 +1643,8 @@ export declare enum KeyCode { + * KEYCODE_STOP + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_STOP = 2616, + +@@ -1478,7 +1652,8 @@ export declare enum KeyCode { + * KEYCODE_AGAIN + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_AGAIN = 2617, + +@@ -1486,7 +1661,8 @@ export declare enum KeyCode { + * KEYCODE_PROPS + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_PROPS = 2618, + +@@ -1494,7 +1670,8 @@ export declare enum KeyCode { + * KEYCODE_UNDO + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_UNDO = 2619, + +@@ -1502,7 +1679,8 @@ export declare enum KeyCode { + * KEYCODE_COPY + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_COPY = 2620, + +@@ -1510,7 +1688,8 @@ export declare enum KeyCode { + * KEYCODE_OPEN + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_OPEN = 2621, + +@@ -1518,7 +1697,8 @@ export declare enum KeyCode { + * KEYCODE_PASTE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_PASTE = 2622, + +@@ -1526,7 +1706,8 @@ export declare enum KeyCode { + * KEYCODE_FIND + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_FIND = 2623, + +@@ -1534,7 +1715,8 @@ export declare enum KeyCode { + * KEYCODE_CUT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_CUT = 2624, + +@@ -1542,7 +1724,8 @@ export declare enum KeyCode { + * KEYCODE_HELP + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_HELP = 2625, + +@@ -1550,7 +1733,8 @@ export declare enum KeyCode { + * KEYCODE_CALC + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_CALC = 2626, + +@@ -1558,7 +1742,8 @@ export declare enum KeyCode { + * KEYCODE_FILE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_FILE = 2627, + +@@ -1566,7 +1751,8 @@ export declare enum KeyCode { + * KEYCODE_BOOKMARKS + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BOOKMARKS = 2628, + +@@ -1574,7 +1760,8 @@ export declare enum KeyCode { + * KEYCODE_NEXT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NEXT = 2629, + +@@ -1582,7 +1769,8 @@ export declare enum KeyCode { + * KEYCODE_PLAYPAUSE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_PLAYPAUSE = 2630, + +@@ -1590,7 +1778,8 @@ export declare enum KeyCode { + * KEYCODE_PREVIOUS + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_PREVIOUS = 2631, + +@@ -1598,7 +1787,8 @@ export declare enum KeyCode { + * KEYCODE_STOPCD + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_STOPCD = 2632, + +@@ -1606,7 +1796,8 @@ export declare enum KeyCode { + * KEYCODE_CONFIG + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_CONFIG = 2634, + +@@ -1614,7 +1805,8 @@ export declare enum KeyCode { + * KEYCODE_REFRESH + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_REFRESH = 2635, + +@@ -1622,7 +1814,8 @@ export declare enum KeyCode { + * KEYCODE_EXIT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_EXIT = 2636, + +@@ -1630,7 +1823,8 @@ export declare enum KeyCode { + * KEYCODE_EDIT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_EDIT = 2637, + +@@ -1638,7 +1832,8 @@ export declare enum KeyCode { + * KEYCODE_SCROLLUP + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SCROLLUP = 2638, + +@@ -1646,7 +1841,8 @@ export declare enum KeyCode { + * KEYCODE_SCROLLDOWN + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SCROLLDOWN = 2639, + +@@ -1654,7 +1850,8 @@ export declare enum KeyCode { + * KEYCODE_NEW + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NEW = 2640, + +@@ -1662,7 +1859,8 @@ export declare enum KeyCode { + * KEYCODE_REDO + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_REDO = 2641, + +@@ -1670,7 +1868,8 @@ export declare enum KeyCode { + * KEYCODE_CLOSE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_CLOSE = 2642, + +@@ -1678,7 +1877,8 @@ export declare enum KeyCode { + * KEYCODE_PLAY + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_PLAY = 2643, + +@@ -1686,7 +1886,8 @@ export declare enum KeyCode { + * KEYCODE_BASSBOOST + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BASSBOOST = 2644, + +@@ -1694,7 +1895,8 @@ export declare enum KeyCode { + * KEYCODE_PRINT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_PRINT = 2645, + +@@ -1702,7 +1904,8 @@ export declare enum KeyCode { + * KEYCODE_CHAT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_CHAT = 2646, + +@@ -1710,7 +1913,8 @@ export declare enum KeyCode { + * KEYCODE_FINANCE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_FINANCE = 2647, + +@@ -1718,7 +1922,8 @@ export declare enum KeyCode { + * KEYCODE_CANCEL + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_CANCEL = 2648, + +@@ -1726,7 +1931,8 @@ export declare enum KeyCode { + * KEYCODE_KBDILLUM_TOGGLE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_KBDILLUM_TOGGLE = 2649, + +@@ -1734,7 +1940,8 @@ export declare enum KeyCode { + * KEYCODE_KBDILLUM_DOWN + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_KBDILLUM_DOWN = 2650, + +@@ -1742,7 +1949,8 @@ export declare enum KeyCode { + * KEYCODE_KBDILLUM_UP + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_KBDILLUM_UP = 2651, + +@@ -1750,7 +1958,8 @@ export declare enum KeyCode { + * KEYCODE_SEND + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SEND = 2652, + +@@ -1758,7 +1967,8 @@ export declare enum KeyCode { + * KEYCODE_REPLY + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_REPLY = 2653, + +@@ -1766,7 +1976,8 @@ export declare enum KeyCode { + * KEYCODE_FORWARDMAIL + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_FORWARDMAIL = 2654, + +@@ -1774,7 +1985,8 @@ export declare enum KeyCode { + * KEYCODE_SAVE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SAVE = 2655, + +@@ -1782,7 +1994,8 @@ export declare enum KeyCode { + * KEYCODE_DOCUMENTS + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_DOCUMENTS = 2656, + +@@ -1790,7 +2003,8 @@ export declare enum KeyCode { + * KEYCODE_VIDEO_NEXT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_VIDEO_NEXT = 2657, + +@@ -1798,7 +2012,8 @@ export declare enum KeyCode { + * KEYCODE_VIDEO_PREV + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_VIDEO_PREV = 2658, + +@@ -1806,7 +2021,8 @@ export declare enum KeyCode { + * KEYCODE_BRIGHTNESS_CYCLE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BRIGHTNESS_CYCLE = 2659, + +@@ -1814,7 +2030,8 @@ export declare enum KeyCode { + * KEYCODE_BRIGHTNESS_ZERO + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BRIGHTNESS_ZERO = 2660, + +@@ -1822,7 +2039,8 @@ export declare enum KeyCode { + * KEYCODE_DISPLAY_OFF + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_DISPLAY_OFF = 2661, + +@@ -1830,7 +2048,8 @@ export declare enum KeyCode { + * KEYCODE_BTN_MISC + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BTN_MISC = 2662, + +@@ -1838,7 +2057,8 @@ export declare enum KeyCode { + * KEYCODE_GOTO + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_GOTO = 2663, + +@@ -1846,7 +2066,8 @@ export declare enum KeyCode { + * KEYCODE_INFO + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_INFO = 2664, + +@@ -1854,7 +2075,8 @@ export declare enum KeyCode { + * KEYCODE_PROGRAM + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_PROGRAM = 2665, + +@@ -1862,7 +2084,8 @@ export declare enum KeyCode { + * KEYCODE_PVR + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_PVR = 2666, + +@@ -1870,7 +2093,8 @@ export declare enum KeyCode { + * KEYCODE_SUBTITLE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SUBTITLE = 2667, + +@@ -1878,7 +2102,8 @@ export declare enum KeyCode { + * KEYCODE_FULL_SCREEN + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_FULL_SCREEN = 2668, + +@@ -1886,7 +2111,8 @@ export declare enum KeyCode { + * KEYCODE_KEYBOARD + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_KEYBOARD = 2669, + +@@ -1894,7 +2120,8 @@ export declare enum KeyCode { + * KEYCODE_ASPECT_RATIO + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_ASPECT_RATIO = 2670, + +@@ -1902,7 +2129,8 @@ export declare enum KeyCode { + * KEYCODE_PC + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_PC = 2671, + +@@ -1910,7 +2138,8 @@ export declare enum KeyCode { + * KEYCODE_TV + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_TV = 2672, + +@@ -1918,7 +2147,8 @@ export declare enum KeyCode { + * KEYCODE_TV2 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_TV2 = 2673, + +@@ -1926,7 +2156,8 @@ export declare enum KeyCode { + * KEYCODE_VCR + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_VCR = 2674, + +@@ -1934,7 +2165,8 @@ export declare enum KeyCode { + * KEYCODE_VCR2 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_VCR2 = 2675, + +@@ -1942,7 +2174,8 @@ export declare enum KeyCode { + * KEYCODE_SAT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SAT = 2676, + +@@ -1950,7 +2183,8 @@ export declare enum KeyCode { + * KEYCODE_CD + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_CD = 2677, + +@@ -1958,7 +2192,8 @@ export declare enum KeyCode { + * KEYCODE_TAPE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_TAPE = 2678, + +@@ -1966,7 +2201,8 @@ export declare enum KeyCode { + * KEYCODE_TUNER + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_TUNER = 2679, + +@@ -1974,7 +2210,8 @@ export declare enum KeyCode { + * KEYCODE_PLAYER + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_PLAYER = 2680, + +@@ -1982,7 +2219,8 @@ export declare enum KeyCode { + * KEYCODE_DVD + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_DVD = 2681, + +@@ -1990,7 +2228,8 @@ export declare enum KeyCode { + * KEYCODE_AUDIO + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_AUDIO = 2682, + +@@ -1998,7 +2237,8 @@ export declare enum KeyCode { + * KEYCODE_VIDEO + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_VIDEO = 2683, + +@@ -2006,7 +2246,8 @@ export declare enum KeyCode { + * KEYCODE_MEMO + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MEMO = 2684, + +@@ -2014,7 +2255,8 @@ export declare enum KeyCode { + * KEYCODE_CALENDAR + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_CALENDAR = 2685, + +@@ -2022,7 +2264,8 @@ export declare enum KeyCode { + * KEYCODE_RED + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_RED = 2686, + +@@ -2030,7 +2273,8 @@ export declare enum KeyCode { + * KEYCODE_GREEN + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_GREEN = 2687, + +@@ -2038,7 +2282,8 @@ export declare enum KeyCode { + * KEYCODE_YELLOW + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_YELLOW = 2688, + +@@ -2046,7 +2291,8 @@ export declare enum KeyCode { + * KEYCODE_BLUE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BLUE = 2689, + +@@ -2054,7 +2300,8 @@ export declare enum KeyCode { + * KEYCODE_CHANNELUP + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_CHANNELUP = 2690, + +@@ -2062,7 +2309,8 @@ export declare enum KeyCode { + * KEYCODE_CHANNELDOWN + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_CHANNELDOWN = 2691, + +@@ -2070,7 +2318,8 @@ export declare enum KeyCode { + * KEYCODE_LAST + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_LAST = 2692, + +@@ -2078,7 +2327,8 @@ export declare enum KeyCode { + * KEYCODE_RESTART + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_RESTART = 2693, + +@@ -2086,7 +2336,8 @@ export declare enum KeyCode { + * KEYCODE_SLOW + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SLOW = 2694, + +@@ -2094,7 +2345,8 @@ export declare enum KeyCode { + * KEYCODE_SHUFFLE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SHUFFLE = 2695, + +@@ -2102,7 +2354,8 @@ export declare enum KeyCode { + * KEYCODE_VIDEOPHONE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_VIDEOPHONE = 2696, + +@@ -2110,7 +2363,8 @@ export declare enum KeyCode { + * KEYCODE_GAMES + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_GAMES = 2697, + +@@ -2118,7 +2372,8 @@ export declare enum KeyCode { + * KEYCODE_ZOOMIN + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_ZOOMIN = 2698, + +@@ -2126,7 +2381,8 @@ export declare enum KeyCode { + * KEYCODE_ZOOMOUT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_ZOOMOUT = 2699, + +@@ -2134,7 +2390,8 @@ export declare enum KeyCode { + * KEYCODE_ZOOMRESET + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_ZOOMRESET = 2700, + +@@ -2142,7 +2399,8 @@ export declare enum KeyCode { + * KEYCODE_WORDPROCESSOR + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_WORDPROCESSOR = 2701, + +@@ -2150,7 +2408,8 @@ export declare enum KeyCode { + * KEYCODE_EDITOR + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_EDITOR = 2702, + +@@ -2158,7 +2417,8 @@ export declare enum KeyCode { + * KEYCODE_SPREADSHEET + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SPREADSHEET = 2703, + +@@ -2166,7 +2426,8 @@ export declare enum KeyCode { + * KEYCODE_GRAPHICSEDITOR + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_GRAPHICSEDITOR = 2704, + +@@ -2174,7 +2435,8 @@ export declare enum KeyCode { + * KEYCODE_PRESENTATION + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_PRESENTATION = 2705, + +@@ -2182,7 +2444,8 @@ export declare enum KeyCode { + * KEYCODE_DATABASE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_DATABASE = 2706, + +@@ -2190,7 +2453,8 @@ export declare enum KeyCode { + * KEYCODE_NEWS + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_NEWS = 2707, + +@@ -2198,7 +2462,8 @@ export declare enum KeyCode { + * KEYCODE_VOICEMAIL + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_VOICEMAIL = 2708, + +@@ -2206,7 +2471,8 @@ export declare enum KeyCode { + * KEYCODE_ADDRESSBOOK + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_ADDRESSBOOK = 2709, + +@@ -2214,7 +2480,8 @@ export declare enum KeyCode { + * KEYCODE_MESSENGER + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MESSENGER = 2710, + +@@ -2222,7 +2489,8 @@ export declare enum KeyCode { + * KEYCODE_BRIGHTNESS_TOGGLE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BRIGHTNESS_TOGGLE = 2711, + +@@ -2230,7 +2498,8 @@ export declare enum KeyCode { + * KEYCODE_SPELLCHECK + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SPELLCHECK = 2712, + +@@ -2238,7 +2507,8 @@ export declare enum KeyCode { + * KEYCODE_COFFEE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_COFFEE = 2713, + +@@ -2246,7 +2516,8 @@ export declare enum KeyCode { + * KEYCODE_MEDIA_REPEAT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MEDIA_REPEAT = 2714, + +@@ -2254,7 +2525,8 @@ export declare enum KeyCode { + * KEYCODE_IMAGES + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_IMAGES = 2715, + +@@ -2262,7 +2534,8 @@ export declare enum KeyCode { + * KEYCODE_BUTTONCONFIG + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BUTTONCONFIG = 2716, + +@@ -2270,7 +2543,8 @@ export declare enum KeyCode { + * KEYCODE_TASKMANAGER + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_TASKMANAGER = 2717, + +@@ -2278,7 +2552,8 @@ export declare enum KeyCode { + * KEYCODE_JOURNAL + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_JOURNAL = 2718, + +@@ -2286,7 +2561,8 @@ export declare enum KeyCode { + * KEYCODE_CONTROLPANEL + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_CONTROLPANEL = 2719, + +@@ -2294,7 +2570,8 @@ export declare enum KeyCode { + * KEYCODE_APPSELECT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_APPSELECT = 2720, + +@@ -2302,7 +2579,8 @@ export declare enum KeyCode { + * KEYCODE_SCREENSAVER + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SCREENSAVER = 2721, + +@@ -2310,7 +2588,8 @@ export declare enum KeyCode { + * KEYCODE_ASSISTANT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_ASSISTANT = 2722, + +@@ -2318,7 +2597,8 @@ export declare enum KeyCode { + * KEYCODE_KBD_LAYOUT_NEXT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_KBD_LAYOUT_NEXT = 2723, + +@@ -2326,7 +2606,8 @@ export declare enum KeyCode { + * KEYCODE_BRIGHTNESS_MIN + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BRIGHTNESS_MIN = 2724, + +@@ -2334,7 +2615,8 @@ export declare enum KeyCode { + * KEYCODE_BRIGHTNESS_MAX + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BRIGHTNESS_MAX = 2725, + +@@ -2342,7 +2624,8 @@ export declare enum KeyCode { + * KEYCODE_KBDINPUTASSIST_PREV + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_KBDINPUTASSIST_PREV = 2726, + +@@ -2350,7 +2633,8 @@ export declare enum KeyCode { + * KEYCODE_KBDINPUTASSIST_NEXT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_KBDINPUTASSIST_NEXT = 2727, + +@@ -2358,7 +2642,8 @@ export declare enum KeyCode { + * KEYCODE_KBDINPUTASSIST_PREVGROUP + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_KBDINPUTASSIST_PREVGROUP = 2728, + +@@ -2366,7 +2651,8 @@ export declare enum KeyCode { + * KEYCODE_KBDINPUTASSIST_NEXTGROUP + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_KBDINPUTASSIST_NEXTGROUP = 2729, + +@@ -2374,7 +2660,8 @@ export declare enum KeyCode { + * KEYCODE_KBDINPUTASSIST_ACCEPT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_KBDINPUTASSIST_ACCEPT = 2730, + +@@ -2382,7 +2669,8 @@ export declare enum KeyCode { + * KEYCODE_KBDINPUTASSIST_CANCEL + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_KBDINPUTASSIST_CANCEL = 2731, + +@@ -2390,7 +2678,8 @@ export declare enum KeyCode { + * KEYCODE_FRONT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_FRONT = 2800, + +@@ -2398,7 +2687,8 @@ export declare enum KeyCode { + * KEYCODE_SETUP + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SETUP = 2801, + +@@ -2406,7 +2696,8 @@ export declare enum KeyCode { + * KEYCODE_WAKEUP + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_WAKEUP = 2802, + +@@ -2414,7 +2705,8 @@ export declare enum KeyCode { + * KEYCODE_SENDFILE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SENDFILE = 2803, + +@@ -2422,7 +2714,8 @@ export declare enum KeyCode { + * KEYCODE_DELETEFILE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_DELETEFILE = 2804, + +@@ -2430,7 +2723,8 @@ export declare enum KeyCode { + * KEYCODE_XFER + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_XFER = 2805, + +@@ -2438,7 +2732,8 @@ export declare enum KeyCode { + * KEYCODE_PROG1 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_PROG1 = 2806, + +@@ -2446,7 +2741,8 @@ export declare enum KeyCode { + * KEYCODE_PROG2 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_PROG2 = 2807, + +@@ -2454,7 +2750,8 @@ export declare enum KeyCode { + * KEYCODE_MSDOS + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MSDOS = 2808, + +@@ -2462,7 +2759,8 @@ export declare enum KeyCode { + * KEYCODE_SCREENLOCK + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SCREENLOCK = 2809, + +@@ -2470,7 +2768,8 @@ export declare enum KeyCode { + * KEYCODE_DIRECTION_ROTATE_DISPLAY + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_DIRECTION_ROTATE_DISPLAY = 2810, + +@@ -2478,7 +2777,8 @@ export declare enum KeyCode { + * KEYCODE_CYCLEWINDOWS + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_CYCLEWINDOWS = 2811, + +@@ -2486,7 +2786,8 @@ export declare enum KeyCode { + * KEYCODE_COMPUTER + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_COMPUTER = 2812, + +@@ -2494,7 +2795,8 @@ export declare enum KeyCode { + * KEYCODE_EJECTCLOSECD + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_EJECTCLOSECD = 2813, + +@@ -2502,7 +2804,8 @@ export declare enum KeyCode { + * KEYCODE_ISO + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_ISO = 2814, + +@@ -2510,7 +2813,8 @@ export declare enum KeyCode { + * KEYCODE_MOVE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_MOVE = 2815, + +@@ -2518,7 +2822,8 @@ export declare enum KeyCode { + * KEYCODE_F13 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F13 = 2816, + +@@ -2526,7 +2831,8 @@ export declare enum KeyCode { + * KEYCODE_F14 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F14 = 2817, + +@@ -2534,7 +2840,8 @@ export declare enum KeyCode { + * KEYCODE_F15 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F15 = 2818, + +@@ -2542,7 +2849,8 @@ export declare enum KeyCode { + * KEYCODE_F16 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F16 = 2819, + +@@ -2550,7 +2858,8 @@ export declare enum KeyCode { + * KEYCODE_F17 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F17 = 2820, + +@@ -2558,7 +2867,8 @@ export declare enum KeyCode { + * KEYCODE_F18 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F18 = 2821, + +@@ -2566,7 +2876,8 @@ export declare enum KeyCode { + * KEYCODE_F19 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F19 = 2822, + +@@ -2574,7 +2885,8 @@ export declare enum KeyCode { + * KEYCODE_F20 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F20 = 2823, + +@@ -2582,7 +2894,8 @@ export declare enum KeyCode { + * KEYCODE_F21 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F21 = 2824, + +@@ -2590,7 +2903,8 @@ export declare enum KeyCode { + * KEYCODE_F22 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F22 = 2825, + +@@ -2598,7 +2912,8 @@ export declare enum KeyCode { + * KEYCODE_F23 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F23 = 2826, + +@@ -2606,7 +2921,8 @@ export declare enum KeyCode { + * KEYCODE_F24 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_F24 = 2827, + +@@ -2614,7 +2930,8 @@ export declare enum KeyCode { + * KEYCODE_PROG3 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_PROG3 = 2828, + +@@ -2622,7 +2939,8 @@ export declare enum KeyCode { + * KEYCODE_PROG4 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_PROG4 = 2829, + +@@ -2630,7 +2948,8 @@ export declare enum KeyCode { + * KEYCODE_DASHBOARD + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_DASHBOARD = 2830, + +@@ -2638,7 +2957,8 @@ export declare enum KeyCode { + * KEYCODE_SUSPEND + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SUSPEND = 2831, + +@@ -2646,7 +2966,8 @@ export declare enum KeyCode { + * KEYCODE_HP + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_HP = 2832, + +@@ -2654,7 +2975,8 @@ export declare enum KeyCode { + * KEYCODE_SOUND + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SOUND = 2833, + +@@ -2662,7 +2984,8 @@ export declare enum KeyCode { + * KEYCODE_QUESTION + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_QUESTION = 2834, + +@@ -2670,7 +2993,8 @@ export declare enum KeyCode { + * KEYCODE_CONNECT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_CONNECT = 2836, + +@@ -2678,7 +3002,8 @@ export declare enum KeyCode { + * KEYCODE_SPORT + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SPORT = 2837, + +@@ -2686,7 +3011,8 @@ export declare enum KeyCode { + * KEYCODE_SHOP + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SHOP = 2838, + +@@ -2694,7 +3020,8 @@ export declare enum KeyCode { + * KEYCODE_ALTERASE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_ALTERASE = 2839, + +@@ -2702,7 +3029,8 @@ export declare enum KeyCode { + * KEYCODE_SWITCHVIDEOMODE + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_SWITCHVIDEOMODE = 2841, + +@@ -2710,7 +3038,8 @@ export declare enum KeyCode { + * KEYCODE_BATTERY + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BATTERY = 2842, + +@@ -2718,7 +3047,8 @@ export declare enum KeyCode { + * KEYCODE_BLUETOOTH + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BLUETOOTH = 2843, + +@@ -2726,7 +3056,8 @@ export declare enum KeyCode { + * KEYCODE_WLAN + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_WLAN = 2844, + +@@ -2734,7 +3065,8 @@ export declare enum KeyCode { + * KEYCODE_UWB + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_UWB = 2845, + +@@ -2742,7 +3074,8 @@ export declare enum KeyCode { + * KEYCODE_WWAN_WIMAX + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_WWAN_WIMAX = 2846, + +@@ -2750,7 +3083,8 @@ export declare enum KeyCode { + * KEYCODE_RFKILL + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_RFKILL = 2847, + +@@ -2758,7 +3092,8 @@ export declare enum KeyCode { + * KEYCODE_CHANNEL + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_CHANNEL = 3001, + +@@ -2766,7 +3101,8 @@ export declare enum KeyCode { + * KEYCODE_BTN_0 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BTN_0 = 3100, + +@@ -2774,7 +3110,8 @@ export declare enum KeyCode { + * KEYCODE_BTN_1 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BTN_1 = 3101, + +@@ -2782,7 +3119,8 @@ export declare enum KeyCode { + * KEYCODE_BTN_2 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BTN_2 = 3102, + +@@ -2790,7 +3128,8 @@ export declare enum KeyCode { + * KEYCODE_BTN_3 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BTN_3 = 3103, + +@@ -2798,7 +3137,8 @@ export declare enum KeyCode { + * KEYCODE_BTN_4 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BTN_4 = 3104, + +@@ -2806,7 +3146,8 @@ export declare enum KeyCode { + * KEYCODE_BTN_5 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BTN_5 = 3105, + +@@ -2814,7 +3155,8 @@ export declare enum KeyCode { + * KEYCODE_BTN_6 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BTN_6 = 3106, + +@@ -2822,7 +3164,8 @@ export declare enum KeyCode { + * KEYCODE_BTN_7 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BTN_7 = 3107, + +@@ -2830,7 +3173,8 @@ export declare enum KeyCode { + * KEYCODE_BTN_8 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BTN_8 = 3108, + +@@ -2838,7 +3182,8 @@ export declare enum KeyCode { + * KEYCODE_BTN_9 + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_BTN_9 = 3109, + +@@ -2846,7 +3191,8 @@ export declare enum KeyCode { + * KEYCODE_DAGGER_CLICK + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_DAGGER_CLICK = 3211, + +@@ -2854,7 +3200,8 @@ export declare enum KeyCode { + * KEYCODE_DAGGER_DOUBLE_CLICK + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_DAGGER_DOUBLE_CLICK = 3212, + +@@ -2862,7 +3209,8 @@ export declare enum KeyCode { + * KEYCODE_DAGGER_LONG_PRESS + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYCODE_DAGGER_LONG_PRESS = 3213 + } +diff --git a/api/@ohos.multimodalInput.keyEvent.d.ts b/api/@ohos.multimodalInput.keyEvent.d.ts +index a0a510af1..6d192e104 100644 +--- a/api/@ohos.multimodalInput.keyEvent.d.ts ++++ b/api/@ohos.multimodalInput.keyEvent.d.ts +@@ -18,22 +18,15 @@ + * @kit InputKit + */ + +-/*** if arkts 1.1 */ +-import type { InputEvent } from './@ohos.multimodalInput.inputEvent'; +-import type { KeyCode } from './@ohos.multimodalInput.keyCode'; +-/*** endif */ +-/*** if arkts 1.2 */ + import { InputEvent } from './@ohos.multimodalInput.inputEvent'; +-import { KeyCode } from './@ohos.multimodalInput.keyCode'; +-/*** endif */ ++import type { KeyCode } from './@ohos.multimodalInput.keyCode'; + + /** + * Action + * + * @enum { number } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Action +@@ -49,8 +42,7 @@ export declare enum Action { + * Cancel key + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Cancel key +@@ -66,8 +58,7 @@ export declare enum Action { + * Down key + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Down key +@@ -83,8 +74,7 @@ export declare enum Action { + * Up key + * + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Up key +@@ -102,8 +92,7 @@ export declare enum Action { + * + * @interface Key + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Key +@@ -119,8 +108,7 @@ export declare interface Key { + * Key code + * @type { KeyCode } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Key code +@@ -136,35 +124,33 @@ export declare interface Key { + * Time when the key is pressed + * @type { number } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Time when the key is pressed +- * @type { number } ++ * @type { long } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- pressedTime: number; ++ pressedTime: long; + + /** + * Device to which the key belongs + * @type { number } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Device to which the key belongs +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- deviceId: number; ++ deviceId: int; + } + + /** +@@ -172,8 +158,7 @@ export declare interface Key { + * + * @interface KeyEvent + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * KeyEvent +@@ -190,8 +175,7 @@ export declare interface KeyEvent extends InputEvent { + * Key action + * @type { Action } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Key action +@@ -207,8 +191,7 @@ export declare interface KeyEvent extends InputEvent { + * Key that has changed + * @type { Key } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Key that has changed +@@ -224,25 +207,23 @@ export declare interface KeyEvent extends InputEvent { + * Unicode character corresponding to the key + * @type { number } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Unicode character corresponding to the key +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- unicodeChar: number; ++ unicodeChar: int; + + /** + * List of pressed keys + * @type { Key[] } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * List of pressed keys +@@ -258,8 +239,7 @@ export declare interface KeyEvent extends InputEvent { + * Whether ctrlKey is being pressed + * @type { boolean } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Whether ctrlKey is being pressed +@@ -275,8 +255,7 @@ export declare interface KeyEvent extends InputEvent { + * Whether altKey is being pressed + * @type { boolean } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Whether altKey is being pressed +@@ -292,8 +271,7 @@ export declare interface KeyEvent extends InputEvent { + * Whether shiftKey is being pressed + * @type { boolean } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Whether shiftKey is being pressed +@@ -309,8 +287,7 @@ export declare interface KeyEvent extends InputEvent { + * Whether logoKey is being pressed + * @type { boolean } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Whether logoKey is being pressed +@@ -326,8 +303,7 @@ export declare interface KeyEvent extends InputEvent { + * Whether fnKey is being pressed + * @type { boolean } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Whether fnKey is being pressed +@@ -343,8 +319,7 @@ export declare interface KeyEvent extends InputEvent { + * Whether capsLock is active + * @type { boolean } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Whether capsLock is active +@@ -360,8 +335,7 @@ export declare interface KeyEvent extends InputEvent { + * Whether numLock is active + * @type { boolean } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Whether numLock is active +@@ -377,8 +351,7 @@ export declare interface KeyEvent extends InputEvent { + * Whether scrollLock is active + * @type { boolean } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + /** + * Whether scrollLock is active +diff --git a/api/@ohos.multimodalInput.mouseEvent.d.ts b/api/@ohos.multimodalInput.mouseEvent.d.ts +index df39f2793..3ad44af0f 100644 +--- a/api/@ohos.multimodalInput.mouseEvent.d.ts ++++ b/api/@ohos.multimodalInput.mouseEvent.d.ts +@@ -24,7 +24,6 @@ import type { KeyCode } from './@ohos.multimodalInput.keyCode'; + /*** endif */ + /*** if arkts 1.2 */ + import { InputEvent } from './@ohos.multimodalInput.inputEvent'; +-import { KeyCode } from './@ohos.multimodalInput.keyCode'; + /*** endif */ + + /** +@@ -257,12 +256,12 @@ export declare interface AxisValue { + + /** + * Axis value +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- value: number; ++ value: int; + } + + /** +@@ -332,58 +331,58 @@ export declare interface MouseEvent extends InputEvent { + + /** + * X coordinate of the mouse pointer on the screen +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- screenX: number; ++ screenX: int; + + /** + * Y coordinate of the mouse pointer on the screen +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- screenY: number; ++ screenY: int; + + /** + * X coordinate of the mouse pointer in the window +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- windowX: number; ++ windowX: int; + + /** + * Y coordinate of the mouse pointer in the window +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- windowY: number; ++ windowY: int; + + /** + * X axis offset relative to the previous reported mouse pointer position. When the mouse pointer is at + * the edge of the screen, the value may be less than the difference of the X coordinate reported twice. +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- rawDeltaX: number; ++ rawDeltaX: int; + + /** + * Y axis offset relative to the previous reported mouse pointer position +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- rawDeltaY: number; ++ rawDeltaY: int; + + /** + * Button that is currently pressed or released +@@ -416,8 +415,7 @@ export declare interface MouseEvent extends InputEvent { + * List of pressed keys + * @type { KeyCode[] } + * @syscap SystemCapability.MultimodalInput.Input.Core +- * @since arkts {'1.1':'9', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + pressedKeys: KeyCode[]; + +diff --git a/api/@ohos.multimodalInput.pointer.d.ts b/api/@ohos.multimodalInput.pointer.d.ts +index ea3dfc42f..2951c0bf2 100644 +--- a/api/@ohos.multimodalInput.pointer.d.ts ++++ b/api/@ohos.multimodalInput.pointer.d.ts +@@ -489,21 +489,24 @@ declare namespace pointer { + * + * @enum { number } + * @syscap SystemCapability.MultimodalInput.Input.Pointer +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PrimaryButton { + /** + * Left mouse button + * + * @syscap SystemCapability.MultimodalInput.Input.Pointer +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LEFT = 0, + /** + * Right mouse button + * + * @syscap SystemCapability.MultimodalInput.Input.Pointer +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RIGHT = 1 + } +@@ -513,28 +516,32 @@ declare namespace pointer { + * + * @enum { number } + * @syscap SystemCapability.MultimodalInput.Input.Pointer +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum RightClickType { + /** + * Touchpad right button + * + * @syscap SystemCapability.MultimodalInput.Input.Pointer +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TOUCHPAD_RIGHT_BUTTON = 1, + /** + * Touchpad left button + * + * @syscap SystemCapability.MultimodalInput.Input.Pointer +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TOUCHPAD_LEFT_BUTTON = 2, + /** + * Touchpad two fingers tap + * + * @syscap SystemCapability.MultimodalInput.Input.Pointer +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TOUCHPAD_TWO_FINGER_TAP = 3, + } +@@ -575,14 +582,16 @@ declare namespace pointer { + * + * @interface CursorConfig + * @syscap SystemCapability.MultimodalInput.Input.Pointer +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface CursorConfig { + /** + * followSystem - Whether to adjust the cursor size based on the system settings. + * @type { boolean } + * @syscap SystemCapability.MultimodalInput.Input.Pointer +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + followSystem : boolean; + } +@@ -707,7 +716,7 @@ declare namespace pointer { + /** + * Sets the pointer style. + * +- * @param { number } windowId - Window ID. ++ * @param { int } windowId - Window ID. + * @param { PointerStyle } pointerStyle - Pointer style. + * @param { AsyncCallback } callback - Callback used to return the result. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +@@ -716,12 +725,12 @@ declare namespace pointer { + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function setPointerStyle(windowId: number, pointerStyle: PointerStyle, callback: AsyncCallback): void; ++ function setPointerStyle(windowId: int, pointerStyle: PointerStyle, callback: AsyncCallback): void; + + /** + * Sets the pointer style. + * +- * @param { number } windowId - Window ID. ++ * @param { int } windowId - Window ID. + * @param { PointerStyle } pointerStyle - Pointer style. + * @returns { Promise } Returns the result through a promise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +@@ -730,19 +739,20 @@ declare namespace pointer { + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function setPointerStyle(windowId: number, pointerStyle: PointerStyle): Promise; ++ function setPointerStyle(windowId: int, pointerStyle: PointerStyle): Promise; + + /** + * Sets the pointer style through sync mode. + * +- * @param { number } windowId - Window ID. ++ * @param { int } windowId - Window ID. + * @param { PointerStyle } pointerStyle - Pointer style. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.MultimodalInput.Input.Pointer +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function setPointerStyleSync(windowId: number, pointerStyle: PointerStyle): void; ++ function setPointerStyleSync(windowId: int, pointerStyle: PointerStyle): void; + + /** + * Queries the pointer style. +@@ -771,14 +781,15 @@ declare namespace pointer { + /** + * Queries the pointer style through sync mode. + * +- * @param { number } windowId - Window ID. ++ * @param { int } windowId - Window ID. + * @returns { PointerStyle } Returns the pointerStyle. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.MultimodalInput.Input.Pointer +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getPointerStyleSync(windowId: number): PointerStyle; ++ function getPointerStyleSync(windowId: int): PointerStyle; + + /** + * Sets whether the pointer icon is visible. +diff --git a/api/@ohos.multimodalInput.shortKey.d.ts b/api/@ohos.multimodalInput.shortKey.d.ts +index 8aa54864f..133f86c94 100644 +--- a/api/@ohos.multimodalInput.shortKey.d.ts ++++ b/api/@ohos.multimodalInput.shortKey.d.ts +@@ -66,7 +66,8 @@ export default shortKey; + * @enum { number } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export declare enum FingerprintAction { + /** +@@ -74,7 +75,8 @@ export declare enum FingerprintAction { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DOWN = 0, + +@@ -83,7 +85,8 @@ export declare enum FingerprintAction { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + UP = 1, + +@@ -92,7 +95,8 @@ export declare enum FingerprintAction { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SLIDE = 2, + +@@ -101,7 +105,8 @@ export declare enum FingerprintAction { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RETOUCH = 3, + +@@ -110,7 +115,8 @@ export declare enum FingerprintAction { + * + * @syscap SystemCapability.MultimodalInput.Input.Core + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CLICK = 4, + } +@@ -121,7 +127,8 @@ export declare enum FingerprintAction { + * @interface FingerprintEvent + * @syscap SystemCapability.MultimodalInput.Input.Core + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export declare interface FingerprintEvent { + /** +@@ -130,7 +137,8 @@ export declare interface FingerprintEvent { + * @type { FingerprintAction } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + action: FingerprintAction; + +@@ -144,12 +152,13 @@ export declare interface FingerprintEvent { + * and the horizontal rightward direction stands for the positive direction of the X axis. + * This way, a rectangular coordinate system is constructed. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- distanceX: number; ++ distanceX: double; + + /** + * This value indicates the sliding percentage of the fingerprint key on the Y axis, +@@ -161,10 +170,11 @@ export declare interface FingerprintEvent { + * and the horizontal rightward direction stands for the positive direction of the X axis. + * This way, a rectangular coordinate system is constructed. + * +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- distanceY: number; ++ distanceY: double; + } +\ No newline at end of file +diff --git a/api/@ohos.multimodalInput.touchEvent.d.ts b/api/@ohos.multimodalInput.touchEvent.d.ts +index 1ecef64be..83b125be8 100644 +--- a/api/@ohos.multimodalInput.touchEvent.d.ts ++++ b/api/@ohos.multimodalInput.touchEvent.d.ts +@@ -232,156 +232,156 @@ export declare enum FixedMode { + export declare interface Touch { + /** + * Pointer identifier +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- id: number; ++ id: int; + + /** + * Time stamp when touch is pressed +- * @type { number } ++ * @type { long } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- pressedTime: number; ++ pressedTime: long; + + /** + * X coordinate of the touch position on the screen +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- screenX: number; ++ screenX: int; + + /** + * Y coordinate of the touch position on the screen +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- screenY: number; ++ screenY: int; + + /** + * X coordinate of the touch position in the window +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- windowX: number; ++ windowX: int; + + /** + * Y coordinate of the touch position in the window +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- windowY: number; ++ windowY: int; + + /** + * Pressure value. The value range is [0.0, 1.0]. The value 0.0 indicates that the pressure is not supported. +- * @type { number } ++ * @type { double } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- pressure: number; ++ pressure: double; + + /** + * Width of the contact area when touch is pressed +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- width: number; ++ width: int; + + /** + * Height of the contact area when touch is pressed +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- height: number; ++ height: int; + + /** + * Angle relative to the YZ plane. The value range is [-90, 90]. A positive value indicates a rightward tilt. +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- tiltX: number; ++ tiltX: int; + + /** + * Angle relative to the XZ plane. The value range is [-90, 90]. A positive value indicates a downward tilt. +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- tiltY: number; ++ tiltY: int; + + /** + * Center point X of the tool area +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- toolX: number; ++ toolX: int; + + /** + * Center point Y of the tool area +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- toolY: number; ++ toolY: int; + + /** + * Width of the tool area +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- toolWidth: number; ++ toolWidth: int; + + /** + * Height of the tool area +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- toolHeight: number; ++ toolHeight: int; + + /** + * X coordinate of the input device +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- rawX: number; ++ rawX: int; + + /** + * Y coordinate of the input device +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- rawY: number; ++ rawY: int; + + /** + * Tool type +@@ -394,23 +394,23 @@ export declare interface Touch { + + /** + * fixedDisplayX - Corrected value of the screen x coordinate. +- * @type { number } ++ * @type { ?int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @systemapi Hide this for inner system use. + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- fixedDisplayX?: number; ++ fixedDisplayX?: int; + + /** + * fixedDisplayY - Corrected value of the screen y coordinate. +- * @type { number } ++ * @type { ?int } + * @syscap SystemCapability.MultimodalInput.Input.Core + * @systemapi Hide this for inner system use. + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- fixedDisplayY?: number; ++ fixedDisplayY?: int; + } + + /** +diff --git a/api/@ohos.net.connection.d.ts b/api/@ohos.net.connection.d.ts +index e9e78d4ce..b0271a90c 100644 +--- a/api/@ohos.net.connection.d.ts ++++ b/api/@ohos.net.connection.d.ts +@@ -1158,7 +1158,8 @@ declare namespace connection { + * @syscap SystemCapability.Communication.NetManager.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'netAvailable', callback: Callback): void; + +@@ -1174,7 +1175,8 @@ declare namespace connection { + * @param { 'netBlockStatusChange' } type - Indicates Event name. + * @param { Callback } callback - the callback used to return the result. + * @syscap SystemCapability.Communication.NetManager.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'netBlockStatusChange', callback: Callback): void; + +@@ -1200,7 +1202,8 @@ declare namespace connection { + * @syscap SystemCapability.Communication.NetManager.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'netCapabilitiesChange', callback: Callback): void; + +@@ -1216,7 +1219,8 @@ declare namespace connection { + * @param { 'netConnectionPropertiesChange' } type - Indicates Event name. + * @param { Callback } callback - the callback used to return the result. + * @syscap SystemCapability.Communication.NetManager.Core +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'netConnectionPropertiesChange', callback: Callback): void; + +@@ -1242,7 +1246,8 @@ declare namespace connection { + * @syscap SystemCapability.Communication.NetManager.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'netLost', callback: Callback): void; + +@@ -1268,7 +1273,8 @@ declare namespace connection { + * @syscap SystemCapability.Communication.NetManager.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'netUnavailable', callback: Callback): void; + +@@ -1312,7 +1318,8 @@ declare namespace connection { + * @syscap SystemCapability.Communication.NetManager.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + register(callback: AsyncCallback): void; + +@@ -1362,7 +1369,8 @@ declare namespace connection { + * @syscap SystemCapability.Communication.NetManager.Core + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + unregister(callback: AsyncCallback): void; + } +diff --git a/api/@ohos.net.sharing.d.ts b/api/@ohos.net.sharing.d.ts +index 45267f19c..52b5ce3e0 100644 +--- a/api/@ohos.net.sharing.d.ts ++++ b/api/@ohos.net.sharing.d.ts +@@ -410,7 +410,8 @@ declare namespace sharing { + * @throws { BusinessError } 401 - Parameter error. + * @syscap SystemCapability.Communication.NetManager.NetSharing + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'sharingStateChange', callback: Callback): void; + +@@ -424,7 +425,8 @@ declare namespace sharing { + * @throws { BusinessError } 401 - Parameter error. + * @syscap SystemCapability.Communication.NetManager.NetSharing + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'sharingStateChange', callback?: Callback): void; + +@@ -450,7 +452,8 @@ declare namespace sharing { + * @throws { BusinessError } 401 - Parameter error. + * @syscap SystemCapability.Communication.NetManager.NetSharing + * @systemapi Hide this for inner system use. +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'interfaceSharingStateChange', callback: Callback): void; + +@@ -476,7 +479,8 @@ declare namespace sharing { + * @throws { BusinessError } 401 - Parameter error. + * @syscap SystemCapability.Communication.NetManager.NetSharing + * @systemapi Hide this for inner system use. +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'interfaceSharingStateChange', callback?: Callback): void; + +@@ -490,7 +494,8 @@ declare namespace sharing { + * @throws { BusinessError } 401 - Parameter error. + * @syscap SystemCapability.Communication.NetManager.NetSharing + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'sharingUpstreamChange', callback: Callback): void; + +@@ -504,7 +509,8 @@ declare namespace sharing { + * @throws { BusinessError } 401 - Parameter error. + * @syscap SystemCapability.Communication.NetManager.NetSharing + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'sharingUpstreamChange', callback?: Callback): void; + +diff --git a/api/@ohos.nfc.tag.d.ts b/api/@ohos.nfc.tag.d.ts +index 8c6d5ad85..24c7724ae 100644 +--- a/api/@ohos.nfc.tag.d.ts ++++ b/api/@ohos.nfc.tag.d.ts +@@ -29,7 +29,9 @@ import { + } from './tag/nfctech'; + import { NdefMessage as _NdefMessage } from './tag/nfctech'; + import { TagSession as _TagSession } from './tag/tagSession'; ++/*** if arkts 1.1 */ + import type { PacMap } from './ability/dataAbilityHelper'; ++/*** endif */ + import type rpc from './@ohos.rpc'; + import type { AsyncCallback } from './@ohos.base'; + import Want from './@ohos.app.ability.Want'; +@@ -1370,8 +1372,7 @@ declare namespace tag { + * @type { PacMap[] } + * @syscap SystemCapability.Communication.NFC.Tag + * @systemapi hide for inner use. +- * @since arkts {'1.1':'9','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 9 + */ + extrasData: PacMap[]; + +diff --git a/api/@ohos.notificationManager.d.ts b/api/@ohos.notificationManager.d.ts +index 69ab2bbeb..ee9e5e9c8 100644 +--- a/api/@ohos.notificationManager.d.ts ++++ b/api/@ohos.notificationManager.d.ts +@@ -423,7 +423,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 2300007 - Network unreachable. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function publishAsBundle( + request: NotificationRequest, +@@ -458,7 +459,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 2300007 - Network unreachable. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function publishAsBundle(request: NotificationRequest, representativeBundle: string, userId: number): Promise; + +@@ -487,7 +489,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 2300007 - Network unreachable. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function publishAsBundle(representativeBundle: BundleOption, request: NotificationRequest): Promise; + +@@ -601,7 +604,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function cancelAsBundle( + id: number, +@@ -630,7 +634,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function cancelAsBundle(id: number, representativeBundle: string, userId: number): Promise; + +@@ -654,7 +659,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function cancelAsBundle(representativeBundle: BundleOption, id: number): Promise; + +@@ -726,7 +732,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600012 - No memory space. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function addSlot(slot: NotificationSlot, callback: AsyncCallback): void; + +@@ -746,7 +753,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600012 - No memory space. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function addSlot(slot: NotificationSlot): Promise; + +@@ -762,7 +770,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @throws { BusinessError } 1600012 - No memory space. + * @syscap SystemCapability.Notification.Notification +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function addSlot(type: SlotType, callback: AsyncCallback): void; + +@@ -778,7 +787,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @throws { BusinessError } 1600012 - No memory space. + * @syscap SystemCapability.Notification.Notification +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function addSlot(type: SlotType): Promise; + +@@ -798,7 +808,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600012 - No memory space. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function addSlots(slots: Array, callback: AsyncCallback): void; + +@@ -818,7 +829,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600012 - No memory space. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function addSlots(slots: Array): Promise; + +@@ -833,7 +845,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSlot(slotType: SlotType, callback: AsyncCallback): void; + +@@ -848,7 +861,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSlot(slotType: SlotType): Promise; + +@@ -863,7 +877,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSlots(callback: AsyncCallback>): void; + +@@ -875,7 +890,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSlots(): Promise>; + +@@ -891,7 +907,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAllNotificationEnabledBundles(): Promise>; + +@@ -906,7 +923,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function removeSlot(slotType: SlotType, callback: AsyncCallback): void; + +@@ -921,7 +939,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function removeSlot(slotType: SlotType): Promise; + +@@ -935,7 +954,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function removeAllSlots(callback: AsyncCallback): void; + +@@ -947,7 +967,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function removeAllSlots(): Promise; + +@@ -1137,7 +1158,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isNotificationEnabledSync(): boolean; + +@@ -1384,7 +1406,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setSlotByBundle(bundle: BundleOption, slot: NotificationSlot, callback: AsyncCallback): void; + +@@ -1425,7 +1448,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setSlotByBundle(bundle: BundleOption, slot: NotificationSlot): Promise; + +@@ -1508,7 +1532,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSlotByBundle(bundle: BundleOption, slotType: SlotType): Promise; + +@@ -1587,7 +1612,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSlotNumByBundle(bundle: BundleOption, callback: AsyncCallback): void; + +@@ -1626,7 +1652,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSlotNumByBundle(bundle: BundleOption): Promise; + +@@ -1678,7 +1705,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getActiveNotificationCount(callback: AsyncCallback): void; + +@@ -1736,7 +1764,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getActiveNotificationByFilter(filter: NotificationFilter, callback: AsyncCallback): void; + +@@ -1753,7 +1782,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getActiveNotificationByFilter(filter: NotificationFilter): Promise; + +@@ -1768,7 +1798,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function cancelGroup(groupName: string, callback: AsyncCallback): void; + +@@ -1783,7 +1814,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function cancelGroup(groupName: string): Promise; + +@@ -1804,7 +1836,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function removeGroupByBundle(bundle: BundleOption, groupName: string, callback: AsyncCallback): void; + +@@ -1825,7 +1858,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function removeGroupByBundle(bundle: BundleOption, groupName: string): Promise; + +@@ -1864,7 +1898,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600012 - No memory space. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setDoNotDisturbDate(date: DoNotDisturbDate, callback: AsyncCallback): void; + +@@ -1903,7 +1938,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600012 - No memory space. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setDoNotDisturbDate(date: DoNotDisturbDate): Promise; + +@@ -1946,7 +1982,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600012 - No memory space. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setDoNotDisturbDate(date: DoNotDisturbDate, userId: number, callback: AsyncCallback): void; + +@@ -1989,7 +2026,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600012 - No memory space. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setDoNotDisturbDate(date: DoNotDisturbDate, userId: number): Promise; + +@@ -2026,7 +2064,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600012 - No memory space. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getDoNotDisturbDate(callback: AsyncCallback): void; + +@@ -2059,7 +2098,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600012 - No memory space. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getDoNotDisturbDate(): Promise; + +@@ -2100,7 +2140,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600012 - No memory space. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getDoNotDisturbDate(userId: number, callback: AsyncCallback): void; + +@@ -2141,7 +2182,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600012 - No memory space. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getDoNotDisturbDate(userId: number): Promise; + +@@ -2160,7 +2202,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isSupportDoNotDisturbMode(callback: AsyncCallback): void; + +@@ -2176,7 +2219,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isSupportDoNotDisturbMode(): Promise; + +@@ -2191,7 +2235,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isSupportTemplate(templateName: string, callback: AsyncCallback): void; + +@@ -2206,7 +2251,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isSupportTemplate(templateName: string): Promise; + +@@ -2429,7 +2475,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600010 - Distributed operation failed. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setDistributedEnable(enable: boolean, callback: AsyncCallback): void; + +@@ -2468,7 +2515,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600010 - Distributed operation failed. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setDistributedEnable(enable: boolean): Promise; + +@@ -2484,7 +2532,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @throws { BusinessError } 1600010 - Distributed operation failed. + * @syscap SystemCapability.Notification.Notification +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isDistributedEnabled(callback: AsyncCallback): void; + +@@ -2497,7 +2546,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @throws { BusinessError } 1600010 - Distributed operation failed. + * @syscap SystemCapability.Notification.Notification +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isDistributedEnabled(): Promise; + +@@ -2540,7 +2590,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setDistributedEnableByBundle(bundle: BundleOption, enable: boolean, callback: AsyncCallback): void; + +@@ -2583,7 +2634,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setDistributedEnableByBundle(bundle: BundleOption, enable: boolean): Promise; + +@@ -2630,7 +2682,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setDistributedEnabledByBundle(bundle: BundleOption, deviceType: string, enable: boolean): Promise; + +@@ -2673,7 +2726,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isDistributedEnabledByBundle(bundle: BundleOption, callback: AsyncCallback): void; + +@@ -2714,7 +2768,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isDistributedEnabledByBundle(bundle: BundleOption): Promise; + +@@ -2759,7 +2814,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isDistributedEnabledByBundle(bundle: BundleOption, deviceType: string): Promise; + +@@ -2804,7 +2860,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setSmartReminderEnabled(deviceType: string, enable: boolean): Promise; + +@@ -2847,7 +2904,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isSmartReminderEnabled(deviceType: string): Promise; + +@@ -2882,7 +2940,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getDeviceRemindType(callback: AsyncCallback): void; + +@@ -2913,7 +2972,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getDeviceRemindType(): Promise; + +@@ -3235,7 +3295,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600008 - The user does not exist. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setSyncNotificationEnabledWithoutApp(userId: number, enable: boolean, callback: AsyncCallback): void; + +@@ -3276,7 +3337,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600008 - The user does not exist. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setSyncNotificationEnabledWithoutApp(userId: number, enable: boolean): Promise; + +@@ -3296,7 +3358,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600008 - The user does not exist. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSyncNotificationEnabledWithoutApp(userId: number, callback: AsyncCallback): void; + +@@ -3316,7 +3379,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600008 - The user does not exist. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSyncNotificationEnabledWithoutApp(userId: number): Promise; + +@@ -3363,7 +3427,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600012 - No memory space. + * @syscap SystemCapability.Notification.Notification + * @crossplatform +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setBadgeNumber(badgeNumber: number, callback: AsyncCallback): void; + +@@ -3410,7 +3475,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600012 - No memory space. + * @syscap SystemCapability.Notification.Notification + * @crossplatform +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setBadgeNumber(badgeNumber: number): Promise; + +@@ -3451,7 +3517,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setBadgeNumberByBundle(bundle: BundleOption, badgeNumber: number): Promise; + +@@ -3482,7 +3549,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600001 - Internal error. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'checkNotification', callback: (checkInfo: NotificationCheckInfo) => NotificationCheckResult): void; + +@@ -3521,7 +3589,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'checkNotification', checkRequest: NotificationCheckRequest, + callback: (checkInfo: NotificationCheckInfo) => Promise): void; +@@ -3553,7 +3622,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600001 - Internal error. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off( + type: 'checkNotification', +@@ -3839,7 +3909,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setAdditionalConfig(key: string, value: string): Promise; + +@@ -3866,7 +3937,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600018 - the notification settings window is already displayed. + * @syscap SystemCapability.Notification.NotificationSettings + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function openNotificationSettings(context: UIAbilityContext): Promise; + +@@ -3905,7 +3977,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600019 - The do-not-disturb profile does not exist. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getDoNotDisturbProfile(id: number): Promise; + +@@ -3922,7 +3995,8 @@ declare namespace notificationManager { + *
    2. Incorrect parameter types. 3. Parameter verification failed. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setTargetDeviceStatus(deviceType: string, status: number): Promise; + +@@ -3941,7 +4015,8 @@ declare namespace notificationManager { + * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function disableNotificationFeature(disabled:boolean, bundleList: Array): Promise; + +@@ -3959,8 +4034,9 @@ declare namespace notificationManager { + *
    2. Incorrect parameter types. 3. Parameter verification failed. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 +- */ ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + function setDistributedEnabledBySlot(slot: SlotType, deviceType: string, enabled: boolean): Promise; + + /** +@@ -3976,8 +4052,9 @@ declare namespace notificationManager { + *
    2. Incorrect parameter types. 3. Parameter verification failed. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 18 +- */ ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + function isDistributedEnabledBySlot(slot: SlotType, deviceType: string): Promise; + + /** +@@ -4019,7 +4096,8 @@ declare namespace notificationManager { + * @type { ?function } + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onResponse?: (notificationId: number, buttonOptions: ButtonOptions) => void; + } +diff --git a/api/@ohos.notificationSubscribe.d.ts b/api/@ohos.notificationSubscribe.d.ts +index 501740853..e6dd76a4d 100644 +--- a/api/@ohos.notificationSubscribe.d.ts ++++ b/api/@ohos.notificationSubscribe.d.ts +@@ -138,7 +138,8 @@ declare namespace notificationSubscribe { + * @throws { BusinessError } 1600012 - No memory space. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function subscribeSelf(subscriber: NotificationSubscriber): Promise; + +@@ -386,7 +387,8 @@ declare namespace notificationSubscribe { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function removeAll(bundle: BundleOption, callback: AsyncCallback): void; + +@@ -404,7 +406,8 @@ declare namespace notificationSubscribe { + * @throws { BusinessError } 1600003 - Failed to connect to the service. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function removeAll(callback: AsyncCallback): void; + +@@ -424,7 +427,8 @@ declare namespace notificationSubscribe { + * @throws { BusinessError } 1600008 - The user does not exist. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function removeAll(userId: number, callback: AsyncCallback): void; + +@@ -444,7 +448,8 @@ declare namespace notificationSubscribe { + * @throws { BusinessError } 1600008 - The user does not exist. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function removeAll(userId: number): Promise; + +@@ -464,7 +469,8 @@ declare namespace notificationSubscribe { + * @throws { BusinessError } 17700001 - The specified bundle name was not found. + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function removeAll(bundle?: BundleOption): Promise; + +diff --git a/api/@ohos.pasteboard.d.ts b/api/@ohos.pasteboard.d.ts +index 9abc116e9..ddd320d4b 100644 +--- a/api/@ohos.pasteboard.d.ts ++++ b/api/@ohos.pasteboard.d.ts +@@ -21,9 +21,7 @@ + import { AsyncCallback } from './@ohos.base'; + import Want from './@ohos.app.ability.Want'; + import image from './@ohos.multimedia.image'; +-/*** if arkts 1.1 */ + import unifiedDataChannel from './@ohos.data.unifiedDataChannel'; +-/*** endif */ + + /** + * systemPasteboard +@@ -36,7 +34,7 @@ import unifiedDataChannel from './@ohos.data.unifiedDataChannel'; + * @namespace pasteboard + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + declare namespace pasteboard { +@@ -65,11 +63,10 @@ declare namespace pasteboard { + * @constant + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + const MIMETYPE_TEXT_HTML = 'text/html'; +- + /** + * Indicates MIME types of wants. + * @constant +@@ -81,11 +78,9 @@ declare namespace pasteboard { + * @constant + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + const MIMETYPE_TEXT_WANT = 'text/want'; +- + /** + * Indicates MIME types of plain text. + * @constant +@@ -97,11 +92,10 @@ declare namespace pasteboard { + * @constant + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + const MIMETYPE_TEXT_PLAIN = 'text/plain'; +- + /** + * Indicates MIME types of URIs. + * @constant +@@ -113,11 +107,10 @@ declare namespace pasteboard { + * @constant + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + const MIMETYPE_TEXT_URI = 'text/uri'; +- + /** + * Indicates MIME type of PixelMap. + * @constant +@@ -129,8 +122,7 @@ declare namespace pasteboard { + * @constant + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + const MIMETYPE_PIXELMAP = 'pixelMap'; + +@@ -145,7 +137,7 @@ declare namespace pasteboard { + * @typedef { string | image.PixelMap | Want | ArrayBuffer } + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + type ValueType = string | image.PixelMap | Want | ArrayBuffer; +@@ -206,7 +198,7 @@ declare namespace pasteboard { + * @since 9 + */ + /** +- * Creates a PasteData object with MIME type and value. ++ * Creates a PasteData object of the specified type. + * @param { string } mimeType - indicates MIME type of value, its size cannot be greater than 1024 bytes. + * @param { ValueType } value - indicates the content that is set to PasteData. + * @returns { PasteData } a new PasteData object which contains mimeType and value. +@@ -215,7 +207,7 @@ declare namespace pasteboard { + * 3. Parameter verification failed. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + function createData(mimeType: string, value: ValueType): PasteData; +@@ -228,7 +220,7 @@ declare namespace pasteboard { + * 2. Incorrect parameters types; + * 3. Parameter verification failed. + * @syscap SystemCapability.MiscServices.Pasteboard +- * @since arkts {'1.1':'14', '1.2':'20'} ++ * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 + */ + function createData(data: Record): PasteData; +@@ -289,10 +281,10 @@ declare namespace pasteboard { + * @since 9 + */ + /** +- * Creates a record object with MIME type and value. ++ * Creates a PasteDataRecord object of the specified type. + * @param { string } mimeType - indicates MIME type of value, its size cannot be greater than 1024 bytes. +- * @param { ValueType } value - content to be saved. +- * @returns { PasteDataRecord } a new PasteDataRecord object which contains mimeType and value. ++ * @param { ValueType } value - Data content of the specified type. ++ * @returns { PasteDataRecord } A new paste data record of a specified type. + * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameters types; + * 3. Parameter verification failed. +@@ -313,7 +305,7 @@ declare namespace pasteboard { + * @returns { SystemPasteboard } The system clipboard object + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + function getSystemPasteboard(): SystemPasteboard; +@@ -329,7 +321,7 @@ declare namespace pasteboard { + * @enum { number } + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + enum ShareOption { +@@ -339,10 +331,10 @@ declare namespace pasteboard { + * @since 9 + */ + /** +- * INAPP indicates that only paste in the same app is allowed. ++ * INAPP indicates that only intra-application pasting is allowed. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + INAPP, +@@ -352,10 +344,10 @@ declare namespace pasteboard { + * @since 9 + */ + /** +- * LOCALDEVICE indicates that paste in any app in this device is allowed. ++ * LOCALDEVICE indicates that paste is allowed in any application. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + LOCALDEVICE, +@@ -365,11 +357,10 @@ declare namespace pasteboard { + * @since 9 + */ + /** +- * CROSSDEVICE indicates that paste in any app across devices is allowed. ++ * CROSSDEVICE indicates that paste is allowed in any application across devices. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + * @deprecated since 12 + */ + CROSSDEVICE +@@ -379,29 +370,28 @@ declare namespace pasteboard { + * Enumerates the patterns allowed in the system pasteboard. + * @enum { number } + * @syscap SystemCapability.MiscServices.Pasteboard +- * @since arkts {'1.1':'13', '1.2':'20'} ++ * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 + */ + enum Pattern { + /** + * URL pattern. + * @syscap SystemCapability.MiscServices.Pasteboard +- * @since arkts {'1.1':'13', '1.2':'20'} ++ * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 + */ + URL = 0, + /** + * Number pattern. + * @syscap SystemCapability.MiscServices.Pasteboard +- * @since arkts {'1.1':'13', '1.2':'20'} ++ * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 + */ + NUMBER = 1, + /** + * Email address pattern. + * @syscap SystemCapability.MiscServices.Pasteboard +- * @since arkts {'1.1':'13', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 13 + */ + EMAIL_ADDRESS = 2, + } +@@ -414,11 +404,12 @@ declare namespace pasteboard { + * @since 7 + */ + /** +- * Paste data property. ++ * Defines the properties of all data records on the pasteboard, including the timestamp, data type, pasteable range, ++ * and additional data. The defined properties can be applied to the pasteboard only with the setProperty method. + * @interface PasteDataProperty + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + interface PasteDataProperty { +@@ -465,7 +456,7 @@ declare namespace pasteboard { + * @type { string } + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + tag: string; +@@ -478,14 +469,14 @@ declare namespace pasteboard { + */ + /** + * a timestamp, which indicates when data is written to the system pasteboard. +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly timestamp: number; ++ readonly timestamp: long; + /** + * Checks whether PasteData is set for local access only. + * @type { boolean } +@@ -513,7 +504,7 @@ declare namespace pasteboard { + * @type { ShareOption } + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + shareOption: ShareOption; +@@ -530,7 +521,7 @@ declare namespace pasteboard { + * @interface PasteDataRecord + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + interface PasteDataRecord { +@@ -573,7 +564,7 @@ declare namespace pasteboard { + * @type { string } + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + mimeType: string; +@@ -588,7 +579,7 @@ declare namespace pasteboard { + * @type { string } + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + plainText: string; +@@ -603,7 +594,7 @@ declare namespace pasteboard { + * @type { string } + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + uri: string; +@@ -618,7 +609,8 @@ declare namespace pasteboard { + * @type { image.PixelMap } + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + pixelMap: image.PixelMap; + /** +@@ -670,7 +662,8 @@ declare namespace pasteboard { + * @returns { string } the string returned by the function. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + toPlainText(): string; + +@@ -706,7 +699,8 @@ declare namespace pasteboard { + * 2. Incorrect parameters types; + * 3. Parameter verification failed. + * @syscap SystemCapability.MiscServices.Pasteboard +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getData(type: string): Promise; + } +@@ -722,7 +716,7 @@ declare namespace pasteboard { + * @interface PasteData + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + interface PasteData { +@@ -757,7 +751,7 @@ declare namespace pasteboard { + * @param { PasteDataRecord } record - The content of a new record. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + addRecord(record: PasteDataRecord): void; +@@ -812,7 +806,7 @@ declare namespace pasteboard { + * 3. Parameter verification failed. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + addRecord(mimeType: string, value: ValueType): void; +@@ -828,7 +822,8 @@ declare namespace pasteboard { + * @returns { Array } type of array + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getMimeTypes(): Array; + +@@ -843,7 +838,8 @@ declare namespace pasteboard { + * @returns { string } type of htmltext + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getPrimaryHtml(): string; + +@@ -858,7 +854,8 @@ declare namespace pasteboard { + * @returns { Want } type of want + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getPrimaryWant(): Want; + +@@ -873,7 +870,8 @@ declare namespace pasteboard { + * @returns { string } type of mimetype + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getPrimaryMimeType(): string; + +@@ -888,7 +886,8 @@ declare namespace pasteboard { + * @returns { string } type of text + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getPrimaryText(): string; + +@@ -903,7 +902,8 @@ declare namespace pasteboard { + * @returns { string } type of uri + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getPrimaryUri(): string; + +@@ -933,7 +933,7 @@ declare namespace pasteboard { + * @returns { PasteDataProperty } PasteDataProperty type of PasteDataProperty + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + getProperty(): PasteDataProperty; +@@ -953,7 +953,7 @@ declare namespace pasteboard { + * 2. Incorrect parameters types. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + setProperty(property: PasteDataProperty): void; +@@ -983,17 +983,17 @@ declare namespace pasteboard { + */ + /** + * Gets record by index in PasteData. +- * @param { number } index - indicates the record index in PasteData. ++ * @param { int } index - indicates the record index in PasteData. + * @returns { PasteDataRecord } the record in PasteData with index. + * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameters types. + * @throws { BusinessError } 12900001 - The index is out of the record. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- getRecord(index: number): PasteDataRecord; ++ getRecord(index: int): PasteDataRecord; + + /** + * the number of records in a PasteData object. +@@ -1003,13 +1003,13 @@ declare namespace pasteboard { + */ + /** + * the number of records in a PasteData object. +- * @returns { number } The number of the clipboard contents ++ * @returns { int } The number of the clipboard contents + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +- getRecordCount(): number; ++ getRecordCount(): int; + + /** + * the user-defined tag of a PasteData object. +@@ -1022,7 +1022,8 @@ declare namespace pasteboard { + * @returns { string } type of tag + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getTag(): string; + +@@ -1097,7 +1098,7 @@ declare namespace pasteboard { + /** + * Replaces a specified record with a new one. + * @param { number } index - indicates the record index in PasteData. +- * @param { PasteDataRecord } record - the content of a new record. ++ * @param { PasteDataRecord } record - the content of the replaced record. + * @returns { boolean } The query returns True on success, or False on failure. + * @syscap SystemCapability.MiscServices.Pasteboard + * @since 7 +@@ -1119,7 +1120,7 @@ declare namespace pasteboard { + /** + * Replaces a specified record with a new one. + * @param { number } index - indicates the record index in PasteData. +- * @param { PasteDataRecord } record - the content of a new record. ++ * @param { PasteDataRecord } record - the content of the replaced record. + * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameters types. + * @throws { BusinessError } 12900001 - The index is out of the record. +@@ -1149,16 +1150,14 @@ declare namespace pasteboard { + * @enum { number } + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'15', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + enum FileConflictOptions { + /** + * OVERWRITE overwrite when destUri has file with same name. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'15', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + OVERWRITE, + +@@ -1166,8 +1165,7 @@ declare namespace pasteboard { + * SKIP skip when destUri has file with same name. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'15', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + SKIP + } +@@ -1177,16 +1175,14 @@ declare namespace pasteboard { + * @enum { number } + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'15', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + enum ProgressIndicator { + /** + * NONE getting data without system default progress indicator. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'15', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + NONE, + +@@ -1194,8 +1190,7 @@ declare namespace pasteboard { + * DEFALUT getting data with system default progress indicator. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'15', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + DEFAULT + } +@@ -1205,8 +1200,7 @@ declare namespace pasteboard { + * @interface ProgressInfo + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'15', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + interface ProgressInfo { + /** +@@ -1214,8 +1208,7 @@ declare namespace pasteboard { + * @type { number } + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'15', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + progress: number; + } +@@ -1225,8 +1218,7 @@ declare namespace pasteboard { + * @typedef { function } ProgressListener + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'15', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + type ProgressListener = (progress: ProgressInfo) => void; + +@@ -1235,16 +1227,14 @@ declare namespace pasteboard { + * @class ProgressSignal + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'15', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + export class ProgressSignal { + /** + * Cancel the paste in progress. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'15', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + cancel(): void; + } +@@ -1254,8 +1244,7 @@ declare namespace pasteboard { + * @interface GetDataParams + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'15', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + interface GetDataParams { + /** +@@ -1264,8 +1253,7 @@ declare namespace pasteboard { + * @default - + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'15', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + destUri?: string; + +@@ -1275,8 +1263,7 @@ declare namespace pasteboard { + * @default FileConflictOptions.OVERWRITE + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'15', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + fileConflictOptions?: FileConflictOptions; + +@@ -1285,8 +1272,7 @@ declare namespace pasteboard { + * @type { ProgressIndicator } + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'15', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + progressIndicator: ProgressIndicator; + +@@ -1296,8 +1282,7 @@ declare namespace pasteboard { + * @default - + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'15', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + progressListener?: ProgressListener; + +@@ -1307,8 +1292,7 @@ declare namespace pasteboard { + * @default - + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'15', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 15 + */ + progressSignal?: ProgressSignal; + } +@@ -1324,7 +1308,7 @@ declare namespace pasteboard { + * @interface SystemPasteboard + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + interface SystemPasteboard { +@@ -1335,7 +1319,8 @@ declare namespace pasteboard { + * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameters types. + * @syscap SystemCapability.MiscServices.Pasteboard +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'update', callback: () => void): void; + +@@ -1347,14 +1332,15 @@ declare namespace pasteboard { + * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameters types. + * @syscap SystemCapability.MiscServices.Pasteboard +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'update', callback?: () => void): void; + + /** + * Checks whether the data is remote. + * @returns { boolean } True is remote data, else false. +- * @throws { BusinessError } 12900005 - Request timed out. ++ * @throws { BusinessError } 12900005 - Excessive processing time for internal data. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice + * @since 11 +@@ -1362,12 +1348,12 @@ declare namespace pasteboard { + isRemoteData(): boolean; + + /** +- * Gets source of data. +- * @returns { string } data source. +- * @throws { BusinessError } 12900005 - Request timed out. ++ * Obtains the application bundle name of the data source. ++ * @returns { string } Application bundle name of the data source. ++ * @throws { BusinessError } 12900005 - Excessive processing time for internal data. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + getDataSource(): string; +@@ -1378,10 +1364,10 @@ declare namespace pasteboard { + * @returns { boolean } if having mimeType in PasteData returns true, else returns false. + * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameters types. +- * @throws { BusinessError } 12900005 - Request timed out. ++ * @throws { BusinessError } 12900005 - Excessive processing time for internal data. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + hasDataType(mimeType: string): boolean; +@@ -1423,7 +1409,7 @@ declare namespace pasteboard { + * 2. Incorrect parameters types. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + clearData(callback: AsyncCallback): void; +@@ -1439,17 +1425,18 @@ declare namespace pasteboard { + * @returns { Promise } the promise returned by the clearData. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + clearData(): Promise; + + /** + * Clears the pasteboard. +- * @throws { BusinessError } 12900005 - Request timed out. ++ * @throws { BusinessError } 12900005 - Excessive processing time for internal data. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + clearDataSync(): void; + +@@ -1480,7 +1467,7 @@ declare namespace pasteboard { + * @param { AsyncCallback } callback - the callback of getData. + * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameters types. +- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. ++ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. + * @syscap SystemCapability.MiscServices.Pasteboard + * @since 9 + */ +@@ -1489,7 +1476,7 @@ declare namespace pasteboard { + * @param { AsyncCallback } callback - the callback of getData. + * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameters types. +- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. ++ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice + * @since 11 +@@ -1502,24 +1489,25 @@ declare namespace pasteboard { + * permission required to call the API. + * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameters types. +- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. ++ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getData(callback: AsyncCallback): void; + + /** + * Gets pastedata from the system pasteboard. + * @returns { Promise } the promise returned by the getData. +- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. ++ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. + * @syscap SystemCapability.MiscServices.Pasteboard + * @since 9 + */ + /** + * Gets pastedata from the system pasteboard. + * @returns { Promise } the promise returned by the getData. +- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. ++ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice + * @since 11 +@@ -1530,17 +1518,18 @@ declare namespace pasteboard { + * @returns { Promise } the promise returned by the getData. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the + * permission required to call the API. +- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. ++ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getData(): Promise; + + /** + * Gets pasteData from the system pasteboard. + * @returns { PasteData } a new PasteData. +- * @throws { BusinessError } 12900005 - Request timed out. ++ * @throws { BusinessError } 12900005 - Excessive processing time for internal data. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice + * @since 11 +@@ -1551,10 +1540,10 @@ declare namespace pasteboard { + * @returns { PasteData } a new PasteData. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the + * permission required to call the API. +- * @throws { BusinessError } 12900005 - Request timed out. ++ * @throws { BusinessError } 12900005 - Excessive processing time for internal data. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ + getDataSync(): PasteData; +@@ -1596,7 +1585,8 @@ declare namespace pasteboard { + * 2. Incorrect parameters types. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + hasData(callback: AsyncCallback): void; + +@@ -1611,17 +1601,19 @@ declare namespace pasteboard { + * @returns { Promise } the promise returned by the function. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + hasData(): Promise; + + /** + * Checks whether there is content in the system pasteboard. + * @returns { boolean } True exists, false does not exist. +- * @throws { BusinessError } 12900005 - Request timed out. ++ * @throws { BusinessError } 12900005 - Excessive processing time for internal data. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + hasDataSync(): boolean; + +@@ -1655,8 +1647,8 @@ declare namespace pasteboard { + * @param { AsyncCallback } callback - the callback of setData. + * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified. + * 2. Incorrect parameters types. +- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. +- * @throws { BusinessError } 12900004 - Replication is prohibited. ++ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. ++ * @throws { BusinessError } 27787278 - Replication is prohibited. + * @syscap SystemCapability.MiscServices.Pasteboard + * @since 9 + */ +@@ -1666,11 +1658,11 @@ declare namespace pasteboard { + * @param { AsyncCallback } callback - the callback of setData. + * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameters types. +- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. +- * @throws { BusinessError } 12900004 - Replication is prohibited. ++ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. ++ * @throws { BusinessError } 27787278 - Replication is prohibited. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + setData(data: PasteData, callback: AsyncCallback): void; +@@ -1681,8 +1673,8 @@ declare namespace pasteboard { + * @returns { Promise } the promise returned by the function. + * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameters types. +- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. +- * @throws { BusinessError } 12900004 - Replication is prohibited. ++ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. ++ * @throws { BusinessError } 27787278 - Replication is prohibited. + * @syscap SystemCapability.MiscServices.Pasteboard + * @since 9 + */ +@@ -1692,11 +1684,11 @@ declare namespace pasteboard { + * @returns { Promise } the promise returned by the function. + * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameters types. +- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. +- * @throws { BusinessError } 12900004 - Replication is prohibited. ++ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. ++ * @throws { BusinessError } 27787278 - Replication is prohibited. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ + setData(data: PasteData): Promise; +@@ -1706,7 +1698,7 @@ declare namespace pasteboard { + * @param { PasteData } data - PasteData will be written to the clipboard. + * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameters types. +- * @throws { BusinessError } 12900005 - Request timed out. ++ * @throws { BusinessError } 12900005 - Excessive processing time for internal data. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice + * @since 11 +@@ -1719,7 +1711,7 @@ declare namespace pasteboard { + * @returns { Promise } the promise returned by the getData. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the + * permission required to call the API. +- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. ++ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice + * @since 12 +@@ -1732,7 +1724,7 @@ declare namespace pasteboard { + * @returns { unifiedDataChannel.UnifiedData } a new UnifiedData. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the + * permission required to call the API. +- * @throws { BusinessError } 12900005 - Request timed out. ++ * @throws { BusinessError } 12900005 - Excessive processing time for internal data. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice + * @since 12 +@@ -1745,8 +1737,8 @@ declare namespace pasteboard { + * @returns { Promise } the promise returned by the function. + * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameters types. +- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. +- * @throws { BusinessError } 12900004 - Replication is prohibited. ++ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. ++ * @throws { BusinessError } 27787278 - Replication is prohibited. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice + * @since 12 +@@ -1758,7 +1750,7 @@ declare namespace pasteboard { + * @param { unifiedDataChannel.UnifiedData } data - Unified data will be written to the pasteboard. + * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameters types. +- * @throws { BusinessError } 12900005 - Request timed out. ++ * @throws { BusinessError } 12900005 - Excessive processing time for internal data. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice + * @since 12 +@@ -1832,7 +1824,8 @@ declare namespace pasteboard { + * @returns { Promise> } Promise used to return the MIME types. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getMimeTypes(): Promise>; + +@@ -1856,10 +1849,10 @@ declare namespace pasteboard { + * permission required to call the API. + * @throws { BusinessError } 401 - Parameter error. + * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. +- * @throws { BusinessError } 12900007 - Copy file failed. ++ * @throws { BusinessError } 12900007 - Invalid destUri or file system error. + * @throws { BusinessError } 12900008 - Failed to start progress. + * @throws { BusinessError } 12900009 - Progress exits abnormally. +- * @throws { BusinessError } 12900010 - Get pasteData error. ++ * @throws { BusinessError } 12900010 - System error occurred during paste execution. + * @syscap SystemCapability.MiscServices.Pasteboard + * @atomicservice + * @since 15 +diff --git a/api/@ohos.pluginComponent.d.ts b/api/@ohos.pluginComponent.d.ts +index f05f6efee..eeed7375e 100644 +--- a/api/@ohos.pluginComponent.d.ts ++++ b/api/@ohos.pluginComponent.d.ts +@@ -109,7 +109,7 @@ declare namespace pluginComponentManager { + * @atomicservice + * @since 12 + */ +- type KVObject = { [key: string]: number | string | boolean | [] | KVObject } ++ type KVObject = { [key: string]: number | string | boolean | [] | KVObject }; + + /** + * Defines KVObject +@@ -120,7 +120,7 @@ declare namespace pluginComponentManager { + * @since 20 + * @arkts 1.2 + */ +- type KVObject = Record ++ type KVObject = Record; + + /** + * Plugin component push parameters. +diff --git a/api/@ohos.power.d.ts b/api/@ohos.power.d.ts +index 0c92755ea..58792b6ee 100644 +--- a/api/@ohos.power.d.ts ++++ b/api/@ohos.power.d.ts +@@ -19,9 +19,6 @@ + */ + + import { AsyncCallback, BusinessError } from './@ohos.base'; +-/*** if arkts 1.1 */ +-import { int } from './@ohos.base'; +-/*** endif */ + + /** + * Provides interfaces to manage power. +@@ -142,7 +139,7 @@ declare namespace power { + * @throws { BusinessError } 4900101 - Failed to connect to the service. + * @syscap SystemCapability.PowerManager.PowerManager.Core + * @systemapi +- * @since arkts {'1.1':'18', '1.2':'20'} ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function wakeup(detail: string): void; +@@ -179,7 +176,7 @@ declare namespace power { + * @throws { BusinessError } 4900101 - Failed to connect to the service. + * @syscap SystemCapability.PowerManager.PowerManager.Core + * @systemapi +- * @since arkts {'1.1':'18', '1.2':'20'} ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function suspend(isImmediate?: boolean): void; +@@ -264,7 +261,7 @@ declare namespace power { + * @throws { BusinessError } 4900101 - Failed to connect to the service. + * @syscap SystemCapability.PowerManager.PowerManager.Core + * @systemapi +- * @since arkts {'1.1':'18', '1.2':'20'} ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function hibernate(clearMemory: boolean): void; +@@ -280,21 +277,6 @@ declare namespace power { + * @systemapi + * @since 12 + */ +- /** +- * Sets the timeout duration(ms) for turning off the screen with permission. +- * +- * @permission ohos.permission.POWER_MANAGER +- * @param { number } timeout - Indicates duration(ms) for turning off the screen. The value -1 means restore the default value. +- * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. +- * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. +- * @throws { BusinessError } 4900101 - Failed to connect to the service. +- * @syscap SystemCapability.PowerManager.PowerManager.Core +- * @systemapi +- * @since 19 +- */ +- function setScreenOffTime(timeout: number): void; +- + /** + * Sets the timeout duration(ms) for turning off the screen with permission. + * +@@ -306,8 +288,8 @@ declare namespace power { + * @throws { BusinessError } 4900101 - Failed to connect to the service. + * @syscap SystemCapability.PowerManager.PowerManager.Core + * @systemapi +- * @since 20 +- * @arkts 1.2 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setScreenOffTime(timeout: long): void; + +diff --git a/api/@ohos.print.d.ts b/api/@ohos.print.d.ts +index f78f22a71..284eb649e 100644 +--- a/api/@ohos.print.d.ts ++++ b/api/@ohos.print.d.ts +@@ -26,7 +26,8 @@ import type Context from './application/Context'; + * + * @namespace print + * @syscap SystemCapability.Print.PrintFramework +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace print { + +@@ -34,7 +35,8 @@ declare namespace print { + * PrintTask provide event callback. + * @interface PrintTask + * @syscap SystemCapability.Print.PrintFramework +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PrintTask { + /** +@@ -45,7 +47,8 @@ declare namespace print { + * @throws { BusinessError } 201 - the application does not have permission to call this function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'block', callback: Callback): void; + +@@ -57,7 +60,8 @@ declare namespace print { + * @throws { BusinessError } 201 - the application does not have permission to call this function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'succeed', callback: Callback): void; + +@@ -69,7 +73,8 @@ declare namespace print { + * @throws { BusinessError } 201 - the application does not have permission to call this function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'fail', callback: Callback): void; + +@@ -81,7 +86,8 @@ declare namespace print { + * @throws { BusinessError } 201 - the application does not have permission to call this function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'cancel', callback: Callback): void; + +@@ -93,7 +99,8 @@ declare namespace print { + * @throws { BusinessError } 201 - the application does not have permission to call this function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'block', callback?: Callback): void; + +@@ -105,7 +112,8 @@ declare namespace print { + * @throws { BusinessError } 201 - the application does not have permission to call this function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'succeed', callback?: Callback): void; + +@@ -117,7 +125,8 @@ declare namespace print { + * @throws { BusinessError } 201 - the application does not have permission to call this function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'fail', callback?: Callback): void; + +@@ -129,7 +138,8 @@ declare namespace print { + * @throws { BusinessError } 201 - the application does not have permission to call this function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'cancel', callback?: Callback): void; + } +@@ -138,7 +148,8 @@ declare namespace print { + * Third-party application implement this interface to render files to be printed. + * @interface PrintDocumentAdapter + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PrintDocumentAdapter { + +@@ -153,7 +164,8 @@ declare namespace print { + * @throws { BusinessError } 201 - the application does not have permission to call this function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onStartLayoutWrite(jobId: string, oldAttrs: PrintAttributes, newAttrs: PrintAttributes, fd: number, + writeResultCallback: (jobId: string, writeResult: PrintFileCreationState) => void): void; +@@ -166,7 +178,8 @@ declare namespace print { + * @throws { BusinessError } 201 - the application does not have permission to call this function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onJobStateChanged(jobId: string, state: PrintDocumentAdapterState): void; + } +@@ -179,7 +192,8 @@ declare namespace print { + * @throws { BusinessError } 201 - the application does not have permission to call this function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function print(files: Array, callback: AsyncCallback): void; + +@@ -191,7 +205,8 @@ declare namespace print { + * @throws { BusinessError } 201 - the application does not have permission to call this function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function print(files: Array): Promise; + +@@ -204,7 +219,8 @@ declare namespace print { + * @throws { BusinessError } 201 - the application does not have permission to call this function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function print(files: Array, context: Context, callback: AsyncCallback): void; + +@@ -217,7 +233,8 @@ declare namespace print { + * @throws { BusinessError } 201 - the application does not have permission to call this function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function print(files: Array, context: Context): Promise; + +@@ -232,7 +249,8 @@ declare namespace print { + * @throws { BusinessError } 201 - the application does not have permission to call this function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function print(jobName: string, printAdapter: PrintDocumentAdapter, printAttributes: PrintAttributes, + context: Context): Promise; +@@ -241,14 +259,16 @@ declare namespace print { + * defines print attributes. + * @typedef PrintAttributes + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PrintAttributes { + /** + * Copies of document list. + * @type { ?number } + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + copyNumber?: number; + +@@ -256,7 +276,8 @@ declare namespace print { + * Range size to be printed. + * @type { ?PrintPageRange } + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + pageRange?: PrintPageRange; + +@@ -264,7 +285,8 @@ declare namespace print { + * Page size. + * @type { ?(PrintPageSize | PrintPageType) } + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + pageSize?: PrintPageSize | PrintPageType; + +@@ -272,7 +294,8 @@ declare namespace print { + * Print direction. + * @type { ?PrintDirectionMode } + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + directionMode?: PrintDirectionMode; + +@@ -280,7 +303,8 @@ declare namespace print { + * Color mode. + * @type { ?PrintColorMode } + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + colorMode?: PrintColorMode; + +@@ -288,7 +312,8 @@ declare namespace print { + * Duplex mode. + * @type { ?PrintDuplexMode } + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + duplexMode?: PrintDuplexMode; + } +@@ -297,14 +322,16 @@ declare namespace print { + * defines print page range. + * @typedef PrintPageRange + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PrintPageRange { + /** + * Start page of sequence. + * @type { ?number } + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + startPage?: number; + +@@ -312,7 +339,8 @@ declare namespace print { + * End page of sequence. + * @type { ?number } + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + endPage?: number; + +@@ -320,7 +348,8 @@ declare namespace print { + * Discrete page of sequence. + * @type { ?Array } + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + pages?: Array; + } +@@ -330,7 +359,8 @@ declare namespace print { + * @typedef PrintMargin + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PrintMargin { + /** +@@ -338,7 +368,8 @@ declare namespace print { + * @type { ?number } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + top?: number; + +@@ -347,7 +378,8 @@ declare namespace print { + * @type { ?number } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + bottom?: number; + +@@ -356,7 +388,8 @@ declare namespace print { + * @type { ?number } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + left?: number; + +@@ -365,7 +398,8 @@ declare namespace print { + * @type { ?number } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + right?: number; + } +@@ -375,7 +409,8 @@ declare namespace print { + * @typedef PrinterRange + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PrinterRange { + /** +@@ -383,7 +418,8 @@ declare namespace print { + * @type { ?number } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + startPage?: number; + +@@ -392,7 +428,8 @@ declare namespace print { + * @type { ?number } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + endPage?: number; + +@@ -401,7 +438,8 @@ declare namespace print { + * @type { ?Array } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + pages?: Array; + } +@@ -411,7 +449,8 @@ declare namespace print { + * @typedef PreviewAttribute + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PreviewAttribute { + /** +@@ -419,7 +458,8 @@ declare namespace print { + * @type { PrinterRange } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + previewRange: PrinterRange; + +@@ -428,7 +468,8 @@ declare namespace print { + * @type { ?number } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + result?: number; + } +@@ -438,7 +479,8 @@ declare namespace print { + * @typedef PrintResolution + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PrintResolution { + /** +@@ -446,7 +488,8 @@ declare namespace print { + * @type { string } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + id: string; + +@@ -455,7 +498,8 @@ declare namespace print { + * @type { number } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + horizontalDpi: number; + +@@ -464,7 +508,8 @@ declare namespace print { + * @type { number } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + verticalDpi: number; + } +@@ -473,14 +518,16 @@ declare namespace print { + * defines print page size. + * @typedef PrintPageSize + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PrintPageSize { + /** + * Page size id. + * @type { string } + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + id: string; + +@@ -488,7 +535,8 @@ declare namespace print { + * Page size name. + * @type { string } + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + name: string; + +@@ -496,7 +544,8 @@ declare namespace print { + * Unit: millimeter width. + * @type { number } + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + width: number; + +@@ -504,7 +553,8 @@ declare namespace print { + * Unit: millimeter height. + * @type { number } + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + height: number; + } +@@ -514,7 +564,8 @@ declare namespace print { + * @typedef PrinterCapability + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PrinterCapability { + /** +@@ -522,7 +573,8 @@ declare namespace print { + * @type { number } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + colorMode: number; + +@@ -531,7 +583,8 @@ declare namespace print { + * @type { number } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + duplexMode: number; + +@@ -540,7 +593,8 @@ declare namespace print { + * @type { Array } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + pageSize: Array; + +@@ -549,7 +603,8 @@ declare namespace print { + * @type { ?Array } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + resolution?: Array; + +@@ -558,7 +613,8 @@ declare namespace print { + * @type { ?PrintMargin } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + minMargin?: PrintMargin; + +@@ -567,7 +623,8 @@ declare namespace print { + * @type { ?Object } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + options?: Object; + } +@@ -577,7 +634,8 @@ declare namespace print { + * @typedef PrinterInfo + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PrinterInfo { + /** +@@ -585,7 +643,8 @@ declare namespace print { + * @type { string } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + printerId: string; + +@@ -594,7 +653,8 @@ declare namespace print { + * @type { string } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + printerName: string; + +@@ -603,7 +663,8 @@ declare namespace print { + * @type { PrinterState } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + printerState: PrinterState; + +@@ -612,7 +673,8 @@ declare namespace print { + * @type { ?number } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + printerIcon?: number; + +@@ -621,7 +683,8 @@ declare namespace print { + * @type { ?string } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + description?: string; + +@@ -630,7 +693,8 @@ declare namespace print { + * @type { ?PrinterCapability } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + capability?: PrinterCapability; + +@@ -639,7 +703,8 @@ declare namespace print { + * @type { ?Object } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + options?: Object; + } +@@ -649,7 +714,8 @@ declare namespace print { + * @typedef PrintJob + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PrintJob { + /** +@@ -657,7 +723,8 @@ declare namespace print { + * @type { Array } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + fdList: Array; + +@@ -666,7 +733,8 @@ declare namespace print { + * @type { string } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + jobId: string; + +@@ -675,7 +743,8 @@ declare namespace print { + * @type { string } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + printerId: string; + +@@ -684,7 +753,8 @@ declare namespace print { + * @type { PrintJobState } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + jobState: PrintJobState; + +@@ -693,7 +763,8 @@ declare namespace print { + * @type { PrintJobSubState } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + jobSubstate: PrintJobSubState; + +@@ -702,7 +773,8 @@ declare namespace print { + * @type { number } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + copyNumber: number; + +@@ -711,7 +783,8 @@ declare namespace print { + * @type { PrinterRange } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + pageRange: PrinterRange; + +@@ -720,7 +793,8 @@ declare namespace print { + * @type { boolean } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isSequential: boolean; + +@@ -729,7 +803,8 @@ declare namespace print { + * @type { PrintPageSize } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + pageSize: PrintPageSize; + +@@ -738,7 +813,8 @@ declare namespace print { + * @type { boolean } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isLandscape: boolean; + +@@ -747,7 +823,8 @@ declare namespace print { + * @type { number } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + colorMode: number; + +@@ -756,7 +833,8 @@ declare namespace print { + * @type { number } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + duplexMode: number; + +@@ -765,7 +843,8 @@ declare namespace print { + * @type { ?PrintMargin } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + margin?: PrintMargin; + +@@ -774,7 +853,8 @@ declare namespace print { + * @type { ?PreviewAttribute } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + preview?: PreviewAttribute; + +@@ -783,7 +863,8 @@ declare namespace print { + * @type { ?Object } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + options?: Object; + } +@@ -792,27 +873,31 @@ declare namespace print { + * Enumeration of Print Direction Mode. + * @enum { number } PrintDirectionMode + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PrintDirectionMode { + /** + * Automatically select direction. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DIRECTION_MODE_AUTO = 0, + + /** + * Print portrait. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DIRECTION_MODE_PORTRAIT = 1, + + /** + * Print landscape. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DIRECTION_MODE_LANDSCAPE = 2, + } +@@ -821,20 +906,23 @@ declare namespace print { + * Enumeration of Print Color Mode. + * @enum { number } PrintColorMode + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PrintColorMode { + /** + * Print monochrome. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + COLOR_MODE_MONOCHROME = 0, + + /** + * Color printing. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + COLOR_MODE_COLOR = 1, + } +@@ -843,27 +931,31 @@ declare namespace print { + * Enumeration of Print Duplex Mode. + * @enum { number } PrintDuplexMode + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PrintDuplexMode { + /** + * Single side printing. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DUPLEX_MODE_NONE = 0, + + /** + * Long-edge flip-up duplex printing. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DUPLEX_MODE_LONG_EDGE = 1, + + /** + * Short-edge flip-up duplex printing. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DUPLEX_MODE_SHORT_EDGE = 2, + } +@@ -872,90 +964,103 @@ declare namespace print { + * Enumeration of Print Page Type. + * @enum { number } PrintPageType + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PrintPageType { + /** + * A3 page. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PAGE_ISO_A3 = 0, + + /** + * A4 page. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PAGE_ISO_A4 = 1, + + /** + * A5 page. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PAGE_ISO_A5 = 2, + + /** + * B5 page. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PAGE_JIS_B5 = 3, + + /** + * C5 page. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PAGE_ISO_C5 = 4, + + /** + * DL Envelope. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PAGE_ISO_DL = 5, + + /** + * Letter. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PAGE_LETTER = 6, + + /** + * Legal. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PAGE_LEGAL = 7, + + /** + * Photo 4x6. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PAGE_PHOTO_4X6 = 8, + + /** + * Photo 5x7. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PAGE_PHOTO_5X7 = 9, + + /** + * Envelope INT DL. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PAGE_INT_DL_ENVELOPE = 10, + + /** + * Tabloid B. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PAGE_B_TABLOID = 11, + } +@@ -964,41 +1069,47 @@ declare namespace print { + * Enumeration of Print Document Adapter State. + * @enum { number } PrintDocumentAdapterState + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PrintDocumentAdapterState { + /** + * Preview failed. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PREVIEW_DESTROY = 0, + + /** + * Print state is succeed. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_TASK_SUCCEED = 1, + + /** + * Print state is fail. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_TASK_FAIL = 2, + + /** + * Print state is cancel. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_TASK_CANCEL = 3, + + /** + * Print state is block. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_TASK_BLOCK = 4, + } +@@ -1007,27 +1118,31 @@ declare namespace print { + * Enumeration of Print File Creation State. + * @enum { number } PrintFileCreationState + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PrintFileCreationState { + /** + * Print file created success. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_FILE_CREATED = 0, + + /** + * Print file created fail. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_FILE_CREATION_FAILED = 1, + + /** + * Print file created success but unrendered. + * @syscap SystemCapability.Print.PrintFramework +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_FILE_CREATED_UNRENDERED = 2, + } +@@ -1036,48 +1151,55 @@ declare namespace print { + * Enumeration of Printer State. + * @enum { number } PrinterState + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PrinterState { + /** + * New printers arrival. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINTER_ADDED = 0, + + /** + * Printer lost. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINTER_REMOVED = 1, + + /** + * Printer update. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINTER_CAPABILITY_UPDATED = 2, + + /** + * Printer has been connected. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINTER_CONNECTED = 3, + + /** + * Printer has been disconnected. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINTER_DISCONNECTED = 4, + + /** + * Printer is working. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINTER_RUNNING = 5, + } +@@ -1086,41 +1208,47 @@ declare namespace print { + * Enumeration of Print Job State. + * @enum { number } PrintJobState + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PrintJobState { + /** + * Initial state of print job. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_PREPARE = 0, + + /** + * Deliver print job to the printer. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_QUEUED = 1, + + /** + * Executing print job. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_RUNNING = 2, + + /** + * Print job has been blocked. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCKED = 3, + + /** + * Print job completed. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_COMPLETED = 4, + } +@@ -1129,202 +1257,231 @@ declare namespace print { + * Enumeration of Print Job Sub State. + * @enum { number } PrintJobSubState + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PrintJobSubState { + /** + * Print job succeed. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_COMPLETED_SUCCESS = 0, + + /** + * Print job fail. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_COMPLETED_FAILED = 1, + + /** + * Print job has been cancelled. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_COMPLETED_CANCELLED = 2, + + /** + * Print job has been corrupted. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_COMPLETED_FILE_CORRUPTED = 3, + + /** + * Print is offline. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_OFFLINE = 4, + + /** + * Print is occupied by other process. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_BUSY = 5, + + /** + * Print job has been cancelled. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_CANCELLED = 6, + + /** + * Print out of paper. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_OUT_OF_PAPER = 7, + + /** + * Print out of ink. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_OUT_OF_INK = 8, + + /** + * Print out of toner. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_OUT_OF_TONER = 9, + + /** + * Print paper jam. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_JAMMED = 10, + + /** + * Print cover open. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_DOOR_OPEN = 11, + + /** + * Print service request. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_SERVICE_REQUEST = 12, + + /** + * Print low on ink. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_LOW_ON_INK = 13, + + /** + * Print low on toner. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_LOW_ON_TONER = 14, + + /** + * Print really low on ink. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_REALLY_LOW_ON_INK = 15, + + /** + * Print bad certification. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_BAD_CERTIFICATE = 16, + + /** + * Print an error occurred when printing the account. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_ACCOUNT_ERROR = 18, + + /** + * Print the printing permission is abnormal. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_PRINT_PERMISSION_ERROR = 19, + + /** + * Print color printing permission exception. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_PRINT_COLOR_PERMISSION_ERROR = 20, + + /** + * Print the device is not connected to the network. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_NETWORK_ERROR = 21, + + /** + * Print unable to connect to the server. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_SERVER_CONNECTION_ERROR = 22, + + /** + * Print large file exception. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_LARGE_FILE_ERROR = 23, + + /** + * Print file parsing exception. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_FILE_PARSING_ERROR = 24, + + /** + * Print the file conversion is too slow. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_SLOW_FILE_CONVERSION = 25, + + /** + * Print uploading file. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_RUNNING_UPLOADING_FILES = 26, + + /** + * Print converting files. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_RUNNING_CONVERTING_FILES = 27, + + /** + * Print unknown issue. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINT_JOB_BLOCK_UNKNOWN = 99, + } +@@ -1333,76 +1490,87 @@ declare namespace print { + * Enumeration of Print error Code. + * @enum { number } PrintErrorCode + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PrintErrorCode { + /** + * No error. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + E_PRINT_NONE = 0, + + /** + * No permission. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + E_PRINT_NO_PERMISSION = 201, + + /** + * Invalid parameter. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + E_PRINT_INVALID_PARAMETER = 401, + + /** + * Generic failure of print. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + E_PRINT_GENERIC_FAILURE = 13100001, + + /** + * RPC failure. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + E_PRINT_RPC_FAILURE = 13100002, + + /** + * Failure of print service. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + E_PRINT_SERVER_FAILURE = 13100003, + + /** + * Invalid print extension. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + E_PRINT_INVALID_EXTENSION = 13100004, + + /** + * Invalid printer. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + E_PRINT_INVALID_PRINTER = 13100005, + + /** + * Invalid print job. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + E_PRINT_INVALID_PRINT_JOB = 13100006, + + /** + * File i/o error. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + E_PRINT_FILE_IO = 13100007, + } +@@ -1411,27 +1579,31 @@ declare namespace print { + * Enumeration of application event. + * @enum { number } ApplicationEvent + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum ApplicationEvent { + /** + * Application created. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + APPLICATION_CREATED = 0, + + /** + * Application closed for printing started. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + APPLICATION_CLOSED_FOR_STARTED = 1, + + /** + * Application closed for printing canceled. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + APPLICATION_CLOSED_FOR_CANCELED = 2, + } +@@ -1441,7 +1613,8 @@ declare namespace print { + * @typedef PrinterExtensionInfo + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PrinterExtensionInfo { + /** +@@ -1449,7 +1622,8 @@ declare namespace print { + * @type { string } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + extensionId: string; + +@@ -1458,7 +1632,8 @@ declare namespace print { + * @type { string } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + vendorId: string; + +@@ -1467,7 +1642,8 @@ declare namespace print { + * @type { string } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + vendorName: string; + +@@ -1476,7 +1652,8 @@ declare namespace print { + * @type { number } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + vendorIcon: number; + +@@ -1485,7 +1662,8 @@ declare namespace print { + * @type { string } + * @syscap SystemCapability.Print.PrintFramework + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + version: string; + } +@@ -1498,7 +1676,8 @@ declare namespace print { + * @throws { BusinessError } 202 - not system application + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function queryAllPrinterExtensionInfos(callback: AsyncCallback>): void; + +@@ -1510,7 +1689,8 @@ declare namespace print { + * @throws { BusinessError } 202 - not system application + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function queryAllPrinterExtensionInfos(): Promise>; + +@@ -1525,7 +1705,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function startDiscoverPrinter(extensionList: Array, callback: AsyncCallback): void; + +@@ -1540,7 +1721,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function startDiscoverPrinter(extensionList: Array): Promise; + +@@ -1552,7 +1734,8 @@ declare namespace print { + * @throws { BusinessError } 202 - not system application + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function stopDiscoverPrinter(callback: AsyncCallback): void; + +@@ -1564,7 +1747,8 @@ declare namespace print { + * @throws { BusinessError } 202 - not system application + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function stopDiscoverPrinter(): Promise; + +@@ -1578,7 +1762,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function connectPrinter(printerId: string, callback: AsyncCallback): void; + +@@ -1592,7 +1777,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function connectPrinter(printerId: string): Promise; + +@@ -1606,7 +1792,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function disconnectPrinter(printerId: string, callback: AsyncCallback): void; + +@@ -1620,7 +1807,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function disconnectPrinter(printerId: string): Promise; + +@@ -1634,7 +1822,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function queryPrinterCapability(printerId: string, callback: AsyncCallback): void; + +@@ -1648,7 +1837,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function queryPrinterCapability(printerId: string): Promise; + +@@ -1662,7 +1852,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function startPrintJob(jobInfo: PrintJob, callback: AsyncCallback): void; + +@@ -1676,7 +1867,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function startPrintJob(jobInfo: PrintJob): Promise; + +@@ -1690,7 +1882,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function cancelPrintJob(jobId: string, callback: AsyncCallback): void; + +@@ -1704,7 +1897,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function cancelPrintJob(jobId: string): Promise; + +@@ -1718,7 +1912,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function requestPrintPreview(jobInfo: PrintJob, callback: Callback): void; + +@@ -1732,7 +1927,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function requestPrintPreview(jobInfo: PrintJob): Promise; + +@@ -1746,7 +1942,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'printerStateChange', callback: (state: PrinterState, info: PrinterInfo) => void): void; + +@@ -1760,7 +1957,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'printerStateChange', callback?: Callback): void; + +@@ -1774,7 +1972,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'jobStateChange', callback: (state: PrintJobState, job: PrintJob) => void): void; + +@@ -1788,7 +1987,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'jobStateChange', callback?: Callback): void; + +@@ -1802,7 +2002,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'extInfoChange', callback: (extensionId: string, info: string) => void): void; + +@@ -1816,7 +2017,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'extInfoChange', callback?: Callback): void; + +@@ -1830,7 +2032,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function addPrinters(printers: Array, callback: AsyncCallback): void; + +@@ -1844,7 +2047,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function addPrinters(printers: Array): Promise; + +@@ -1858,7 +2062,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function removePrinters(printerIds: Array, callback: AsyncCallback): void; + +@@ -1872,7 +2077,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function removePrinters(printerIds: Array): Promise; + +@@ -1886,7 +2092,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function updatePrinters(printers: Array, callback: AsyncCallback): void; + +@@ -1900,7 +2107,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function updatePrinters(printers: Array): Promise; + +@@ -1915,7 +2123,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function updatePrinterState(printerId: string, state: PrinterState, callback: AsyncCallback): void; + +@@ -1930,7 +2139,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function updatePrinterState(printerId: string, state: PrinterState): Promise; + +@@ -1946,7 +2156,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function updatePrintJobState(jobId: string, state: PrintJobState, subState: PrintJobSubState, callback: AsyncCallback): void; + +@@ -1962,7 +2173,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function updatePrintJobState(jobId: string, state: PrintJobState, subState: PrintJobSubState): Promise; + +@@ -1976,7 +2188,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function updateExtensionInfo(info: string, callback: AsyncCallback): void; + +@@ -1990,7 +2203,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function updateExtensionInfo(info: string): Promise; + +@@ -2002,7 +2216,8 @@ declare namespace print { + * @throws { BusinessError } 202 - not system application + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + * @deprecated since 11 + * @useinstead print#queryPrintJobList + */ +@@ -2016,7 +2231,8 @@ declare namespace print { + * @throws { BusinessError } 202 - not system application + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + * @deprecated since 11 + * @useinstead print#queryPrintJobList + */ +@@ -2030,7 +2246,8 @@ declare namespace print { + * @throws { BusinessError } 202 - not system application + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function queryPrintJobList(callback: AsyncCallback>): void; + +@@ -2042,7 +2259,8 @@ declare namespace print { + * @throws { BusinessError } 202 - not system application + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function queryPrintJobList(): Promise>; + +@@ -2056,7 +2274,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function queryPrintJobById(jobId: string, callback: AsyncCallback): void; + +@@ -2070,7 +2289,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function queryPrintJobById(jobId: string): Promise; + +@@ -2086,7 +2306,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function startGettingPrintFile(jobId: string, printAttributes: PrintAttributes, fd: number, + onFileStateChanged: Callback): void; +@@ -2102,7 +2323,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function notifyPrintService(jobId: string, type: 'spooler_closed_for_cancelled' | 'spooler_closed_for_started', callback: AsyncCallback): void; + +@@ -2117,7 +2339,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 11 ++ * @since arkts {'1.1':'11','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function notifyPrintService(jobId: string, type: 'spooler_closed_for_cancelled' | 'spooler_closed_for_started'): Promise; + +@@ -2129,7 +2352,8 @@ declare namespace print { + * @throws { BusinessError } 202 - not system application + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAddedPrinters(): Promise>; + +@@ -2143,7 +2367,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getPrinterInfoById(printerId: string): Promise; + +@@ -2157,7 +2382,8 @@ declare namespace print { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function notifyPrintServiceEvent(event: ApplicationEvent): Promise; + +@@ -2169,7 +2395,8 @@ declare namespace print { + * @throws { BusinessError } 201 - the application does not have permission to call this function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function addPrinterToDiscovery(printerInformation: PrinterInformation): Promise; + +@@ -2181,7 +2408,8 @@ declare namespace print { + * @throws { BusinessError } 201 - the application does not have permission to call this function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function updatePrinterInDiscovery(printerInformation: PrinterInformation): Promise; + +@@ -2193,7 +2421,8 @@ declare namespace print { + * @throws { BusinessError } 201 - the application does not have permission to call this function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function removePrinterFromDiscovery(printerId: string): Promise; + +@@ -2205,7 +2434,8 @@ declare namespace print { + * @throws { BusinessError } 201 - the application does not have permission to call this function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getPrinterInformationById(printerId: string): Promise; + +@@ -2213,14 +2443,16 @@ declare namespace print { + * defines printer information. + * @typedef PrinterInformation + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PrinterInformation { + /** + * Printer id. + * @type { string } + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + printerId: string; + +@@ -2228,7 +2460,8 @@ declare namespace print { + * Printer name. + * @type { string } + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + printerName: string; + +@@ -2236,7 +2469,8 @@ declare namespace print { + * Current printer status. + * @type { PrinterStatus } + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + printerStatus: PrinterStatus; + +@@ -2244,7 +2478,8 @@ declare namespace print { + * Printer description. + * @type { ?string } + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + description?: string; + +@@ -2252,7 +2487,8 @@ declare namespace print { + * Printer capabilities. + * @type { ?PrinterCapabilities } + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + capability?: PrinterCapabilities; + +@@ -2260,7 +2496,8 @@ declare namespace print { + * Printer uri. + * @type { ?string } + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + uri?: string; + +@@ -2268,7 +2505,8 @@ declare namespace print { + * Printer make. + * @type { ?string } + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + printerMake?: string; + +@@ -2276,7 +2514,8 @@ declare namespace print { + * Detail information in json format. + * @type { ?string } + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + options?: string; + } +@@ -2285,14 +2524,16 @@ declare namespace print { + * defines printer capabilities. + * @typedef PrinterCapabilities + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PrinterCapabilities { + /** + * The page size list supported by the printer. + * @type { Array } + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + supportedPageSizes: Array; + +@@ -2300,7 +2541,8 @@ declare namespace print { + * Array of supported color mode. + * @type { Array } + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + supportedColorModes: Array; + +@@ -2308,7 +2550,8 @@ declare namespace print { + * Array of supported duplex mode. + * @type { Array } + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + supportedDuplexModes: Array; + +@@ -2316,7 +2559,8 @@ declare namespace print { + * Array of supported print media types. + * @type { ?Array } + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + supportedMediaTypes?: Array; + +@@ -2324,7 +2568,8 @@ declare namespace print { + * Array of supported print quality. + * @type { ?Array } + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + supportedQualities?: Array; + +@@ -2332,7 +2577,8 @@ declare namespace print { + * Array of supported print orientation. + * @type { ?Array } + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + supportedOrientations?: Array; + +@@ -2340,7 +2586,8 @@ declare namespace print { + * Advanced capability in json format. + * @type { ?string } + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + options?: string; + } +@@ -2349,27 +2596,31 @@ declare namespace print { + * Enumeration of Print Quality. + * @enum { number } PrintQuality + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PrintQuality { + /** + * Draft quality mode. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + QUALITY_DRAFT = 3, + + /** + * Normal quality mode. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + QUALITY_NORMAL = 4, + + /** + * High quality mode. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + QUALITY_HIGH = 5, + } +@@ -2378,41 +2629,47 @@ declare namespace print { + * Enumeration of Print OrientationMode. + * @enum { number } PrintOrientationMode + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PrintOrientationMode { + /** + * Portrait mode. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ORIENTATION_MODE_PORTRAIT = 0, + + /** + * Landscape mode. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ORIENTATION_MODE_LANDSCAPE= 1, + + /** + * Reverse landscape mode. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ORIENTATION_MODE_REVERSE_LANDSCAPE = 2, + + /** + * Reverse portrait mode. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ORIENTATION_MODE_REVERSE_PORTRAIT = 3, + + /** + * Not specified. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ORIENTATION_MODE_NONE = 4, + } +@@ -2421,27 +2678,31 @@ declare namespace print { + * Enumeration of Printer Status. + * @enum { number } PrinterStatus + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum PrinterStatus { + /** + * Printer idle. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINTER_IDLE = 0, + + /** + * Printer busy. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINTER_BUSY = 1, + + /** + * Printer not available. + * @syscap SystemCapability.Print.PrintFramework +- * @since 14 ++ * @since arkts {'1.1':'14','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PRINTER_UNAVAILABLE = 2, + } +diff --git a/api/@ohos.privacyManager.d.ts b/api/@ohos.privacyManager.d.ts +index 43e9ff36d..747ccfd6d 100644 +--- a/api/@ohos.privacyManager.d.ts ++++ b/api/@ohos.privacyManager.d.ts +@@ -20,9 +20,6 @@ + + import { AsyncCallback, Callback } from './@ohos.base'; + import { Permissions } from './permissions'; +-/*** if arkts 1.1 */ +-import { int } from '@ohos.base'; +-/*** endif */ + + /** + * @namespace privacyManager +@@ -45,7 +42,7 @@ declare namespace privacyManager { + * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. + * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, the permissionName exceeds 256 characters, or the count value is invalid. + * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. +- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. ++ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. + * @throws { BusinessError } 12100007 - The service is abnormal. + * @throws { BusinessError } 12100008 - Out of memory. + * @syscap SystemCapability.Security.AccessToken +@@ -68,7 +65,7 @@ declare namespace privacyManager { + * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, the permissionName exceeds 256 characters, the count value is invalid, + * or usedType in AddPermissionUsedRecordOptions is invalid. + * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. +- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. ++ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. + * @throws { BusinessError } 12100007 - The service is abnormal. + * @throws { BusinessError } 12100008 - Out of memory. + * @syscap SystemCapability.Security.AccessToken +@@ -98,7 +95,7 @@ declare namespace privacyManager { + * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. + * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, the permissionName exceeds 256 characters, or the count value is invalid. + * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. +- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. ++ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. + * @throws { BusinessError } 12100007 - The service is abnormal. + * @throws { BusinessError } 12100008 - Out of memory. + * @syscap SystemCapability.Security.AccessToken +@@ -125,12 +122,13 @@ declare namespace privacyManager { + * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. + * @throws { BusinessError } 12100001 - Invalid parameter. The value of flag in request is invalid. + * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. +- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. ++ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. + * @throws { BusinessError } 12100007 - The service is abnormal. + * @throws { BusinessError } 12100008 - Out of memory. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getPermissionUsedRecord(request: PermissionUsedRequest): Promise; + +@@ -145,12 +143,13 @@ declare namespace privacyManager { + * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. + * @throws { BusinessError } 12100001 - Invalid parameter. The value of flag in request is invalid. + * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. +- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. ++ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. + * @throws { BusinessError } 12100007 - The service is abnormal. + * @throws { BusinessError } 12100008 - Out of memory. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getPermissionUsedRecord( + request: PermissionUsedRequest, +@@ -161,7 +160,7 @@ declare namespace privacyManager { + * Start using sensitive permission. + * + * @permission ohos.permission.PERMISSION_USED_STATS +- * @param { number } tokenID - Token ID of the application. ++ * @param { int } tokenID - Token ID of the application. + * @param { Permissions } permissionName - Name of the permission to be started. + * @returns { Promise } Promise that returns no value. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. +@@ -169,44 +168,46 @@ declare namespace privacyManager { + * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. + * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, the permissionName exceeds 256 characters, or the count value is invalid. + * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. +- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. ++ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. + * @throws { BusinessError } 12100004 - The API is used repeatedly with the same input. + * It means the application specified by the tokenID has been using the specified permission. + * @throws { BusinessError } 12100007 - The service is abnormal. + * @throws { BusinessError } 12100008 - Out of memory. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function startUsingPermission(tokenID: number, permissionName: Permissions): Promise; ++ function startUsingPermission(tokenID: int, permissionName: Permissions): Promise; + + /** + * Start using sensitive permission. + * + * @permission ohos.permission.PERMISSION_USED_STATS +- * @param { number } tokenID - Token ID of the application. ++ * @param { int } tokenID - Token ID of the application. + * @param { Permissions } permissionName - Name of the permission to be started. +- * @param { number } pid - Pid of the application, default -1. +- * @param { PermissionUsedType } usedType - Used type of the permission accessed, default NORMAL_TYPE. ++ * @param { int } [pid] - Pid of the application, default -1. ++ * @param { PermissionUsedType } [usedType] - Used type of the permission accessed, default NORMAL_TYPE. + * @returns { Promise } Promise that returns no value. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.PERMISSION_USED_STATS". + * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. + * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, the permissionName exceeds 256 characters, or the count value is invalid. + * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. +- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. ++ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. + * @throws { BusinessError } 12100004 - The API is used repeatedly with the same input. + * It means the application specified by the tokenID has been using the specified permission. + * @throws { BusinessError } 12100007 - The service is abnormal. + * @throws { BusinessError } 12100008 - Out of memory. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function startUsingPermission( +- tokenID: number, ++ tokenID: int, + permissionName: Permissions, +- pid?: number, ++ pid?: int, + usedType?: PermissionUsedType + ): Promise; + +@@ -214,7 +215,7 @@ declare namespace privacyManager { + * Start using sensitive permission. + * + * @permission ohos.permission.PERMISSION_USED_STATS +- * @param { number } tokenID - Token ID of the application. ++ * @param { int } tokenID - Token ID of the application. + * @param { Permissions } permissionName - Name of the permission to be started. + * @param { AsyncCallback } callback - Asynchronous callback interface. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. +@@ -222,22 +223,23 @@ declare namespace privacyManager { + * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. + * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, the permissionName exceeds 256 characters, or the count value is invalid. + * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. +- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. ++ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. + * @throws { BusinessError } 12100004 - The API is used repeatedly with the same input. + * It means the application specified by the tokenID has been using the specified permission. + * @throws { BusinessError } 12100007 - The service is abnormal. + * @throws { BusinessError } 12100008 - Out of memory. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function startUsingPermission(tokenID: number, permissionName: Permissions, callback: AsyncCallback): void; ++ function startUsingPermission(tokenID: int, permissionName: Permissions, callback: AsyncCallback): void; + + /** + * Stop using sensitive permission. + * + * @permission ohos.permission.PERMISSION_USED_STATS +- * @param { number } tokenID - Token ID of the application. ++ * @param { int } tokenID - Token ID of the application. + * @param { Permissions } permissionName - Name of the permission to be stopped. + * @returns { Promise } Promise that returns no value. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. +@@ -245,48 +247,50 @@ declare namespace privacyManager { + * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. + * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, the permissionName exceeds 256 characters, or the count value is invalid. + * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. +- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. ++ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. + * @throws { BusinessError } 12100004 - The API is not used in pair with 'startUsingPermission'. + * @throws { BusinessError } 12100007 - The service is abnormal. + * @throws { BusinessError } 12100008 - Out of memory. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function stopUsingPermission(tokenID: number, permissionName: Permissions): Promise; ++ function stopUsingPermission(tokenID: int, permissionName: Permissions): Promise; + + /** + * Stop using sensitive permission. + * + * @permission ohos.permission.PERMISSION_USED_STATS +- * @param { number } tokenID - Token ID of the application. ++ * @param { int } tokenID - Token ID of the application. + * @param { Permissions } permissionName - Name of the permission to be stopped. +- * @param { number } pid - Pid of the application, default -1. ++ * @param { int } [pid] - Pid of the application, default -1. + * @returns { Promise } Promise that returns no value. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.PERMISSION_USED_STATS". + * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. + * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, the permissionName exceeds 256 characters, or the count value is invalid. + * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. +- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. ++ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. + * @throws { BusinessError } 12100004 - The API is not used in pair with 'startUsingPermission'. + * @throws { BusinessError } 12100007 - The service is abnormal. + * @throws { BusinessError } 12100008 - Out of memory. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function stopUsingPermission( +- tokenID: number, ++ tokenID: int, + permissionName: Permissions, +- pid?: number ++ pid?: int + ): Promise; + + /** + * Stop using sensitive permission. + * + * @permission ohos.permission.PERMISSION_USED_STATS +- * @param { number } tokenID - Token ID of the application. ++ * @param { int } tokenID - Token ID of the application. + * @param { Permissions } permissionName - Name of the permission to be stopped. + * @param { AsyncCallback } callback - Asynchronous callback interface. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. +@@ -294,15 +298,16 @@ declare namespace privacyManager { + * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. + * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, the permissionName exceeds 256 characters, or the count value is invalid. + * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. +- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. ++ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. + * @throws { BusinessError } 12100004 - The API is not used in pair with 'startUsingPermission'. + * @throws { BusinessError } 12100007 - The service is abnormal. + * @throws { BusinessError } 12100008 - Out of memory. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function stopUsingPermission(tokenID: number, permissionName: Permissions, callback: AsyncCallback): void; ++ function stopUsingPermission(tokenID: int, permissionName: Permissions, callback: AsyncCallback): void; + + /** + * Subscribes to the change of active state of the specified permission. +@@ -336,7 +341,7 @@ declare namespace privacyManager { + * @permission ohos.permission.PERMISSION_USED_STATS + * @param { 'activeStateChange' } type - Event type. This parameter cannot change. + * @param { Array } permissionList - Indicates the permission list, which are specified. This parameter cannot be null or empty. +- * @param { Callback } callback - Callback for listening permission change. ++ * @param { Callback } [callback] - Callback for listening permission change. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.PERMISSION_USED_STATS". + * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. +@@ -359,7 +364,7 @@ declare namespace privacyManager { + * Obtains the used type of the permission accessed. + * + * @permission ohos.permission.PERMISSION_USED_STATS +- * @param { number } tokenId - Token ID of the application. By default, all token IDs of the device are returned. ++ * @param { int } tokenId - Token ID of the application. By default, all token IDs of the device are returned. + * @param { Permissions } permissionName - Name of the permission to query. By default, all permissions of the device are returned. + * @returns { Promise> } Promise used to return the information obtained. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Incorrect parameter types. +@@ -370,9 +375,10 @@ declare namespace privacyManager { + * @throws { BusinessError } 12100003 - The input permissionName does not exist. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getPermissionUsedTypeInfos(tokenId?: number, permissionName?: Permissions): Promise>; ++ function getPermissionUsedTypeInfos(tokenId?: int, permissionName?: Permissions): Promise>; + + /** + * Sets the toggle state of permission access records for the current user. +@@ -387,7 +393,8 @@ declare namespace privacyManager { + * @throws { BusinessError } 12100009 - Common inner error. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setPermissionUsedRecordToggleStatus(status: boolean): Promise; + +@@ -401,7 +408,8 @@ declare namespace privacyManager { + * @throws { BusinessError } 12100007 - The service is abnormal. + * @syscap SystemCapability.Security.AccessToken + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getPermissionUsedRecordToggleStatus(): Promise; + +@@ -622,26 +630,26 @@ declare namespace privacyManager { + /** + * The begin time, in milliseconds + * +- * @type { ?int } ++ * @type { ?long } + * @default 0 + * @syscap SystemCapability.Security.AccessToken + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- beginTime?: int; ++ beginTime?: long; + + /** + * The end time, in milliseconds + * +- * @type { ?int } ++ * @type { ?long } + * @default 0 + * @syscap SystemCapability.Security.AccessToken + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- endTime?: int; ++ endTime?: long; + + /** + * The permission usage flag +@@ -668,24 +676,24 @@ declare namespace privacyManager { + /** + * The begin time, in milliseconds + * +- * @type { int } ++ * @type { long } + * @syscap SystemCapability.Security.AccessToken + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- beginTime: int; ++ beginTime: long; + + /** + * The end time, in milliseconds + * +- * @type { int } ++ * @type { long } + * @syscap SystemCapability.Security.AccessToken + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- endTime: int; ++ endTime: long; + + /** + * The list of permission used records of bundle +@@ -811,35 +819,35 @@ declare namespace privacyManager { + /** + * The last access time, in milliseconds + * +- * @type { int } ++ * @type { long } + * @syscap SystemCapability.Security.AccessToken + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- lastAccessTime: int; ++ lastAccessTime: long; + + /** + * The last reject time, in milliseconds + * +- * @type { int } ++ * @type { long } + * @syscap SystemCapability.Security.AccessToken + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- lastRejectTime: int; ++ lastRejectTime: long; + + /** + * The last access duration, in milliseconds + * +- * @type { int } ++ * @type { long } + * @syscap SystemCapability.Security.AccessToken + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- lastAccessDuration: int; ++ lastAccessDuration: long; + + /** + * The list of access records of details +@@ -899,13 +907,13 @@ declare namespace privacyManager { + /** + * Timestamp, in milliseconds + * +- * @type { int } ++ * @type { long } + * @syscap SystemCapability.Security.AccessToken + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- timestamp: int; ++ timestamp: long; + + /** + * The value of successCount or failCount passed in to addPermissionUsedRecord. +@@ -921,13 +929,13 @@ declare namespace privacyManager { + /** + * Access duration, in milliseconds + * +- * @type { int } ++ * @type { long } + * @syscap SystemCapability.Security.AccessToken + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- accessDuration: int; ++ accessDuration: long; + + /** + * Used type of the permission accessed. +diff --git a/api/@ohos.promptAction.d.ts b/api/@ohos.promptAction.d.ts +index b70ac894f..21fac37c3 100644 +--- a/api/@ohos.promptAction.d.ts ++++ b/api/@ohos.promptAction.d.ts +@@ -29,6 +29,7 @@ import { BlurStyle, ShadowOptions, ShadowStyle, HoverModeAreaType, Rectangle, Tr + BackgroundBlurStyleOptions, BackgroundEffectOptions } from './arkui/component/common'; + import { CustomBuilder } from './arkui/component/builder'; + import { DialogAlignment } from './arkui/component/alertDialog'; ++import { DismissDialogAction } from './arkui/component/actionSheet'; + import { BorderStyle,Alignment } from './arkui/component/enums'; + import { Resource } from './global/resource'; + import { LengthMetrics } from './arkui/Graphics'; +@@ -2403,8 +2404,7 @@ declare namespace promptAction { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + export declare interface DismissDialogAction { + /** +@@ -2414,8 +2414,7 @@ export declare interface DismissDialogAction { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + dismiss: Callback; + +@@ -2426,8 +2425,7 @@ export declare interface DismissDialogAction { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + reason: DismissReason; + } +diff --git a/api/@ohos.resourceManager.d.ts b/api/@ohos.resourceManager.d.ts +index 16299a3c4..483da08c7 100644 +--- a/api/@ohos.resourceManager.d.ts ++++ b/api/@ohos.resourceManager.d.ts +@@ -2448,7 +2448,6 @@ declare namespace resourceManager { + * @param { number } resId - Indicates the resource ID. + * @param { (string | number)[] } args - Indicates the formatting string resource parameters. + * @returns { string } The character string corresponding to the resource ID. +- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. + * @throws { BusinessError } 9001001 - Invalid resource ID. + * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. + * @throws { BusinessError } 9001006 - The resource is referenced cyclically. +@@ -2548,13 +2547,11 @@ declare namespace resourceManager { + * @param { Resource } resource - Indicates the resource object. + * @param { (string | number)[] } args - Indicates the formatting string resource parameters. + * @returns { string } The character string corresponding to the resource object. +- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. + * @throws { BusinessError } 9001001 - Invalid resource ID. + * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. + * @throws { BusinessError } 9001006 - The resource is referenced cyclically. + * @throws { BusinessError } 9001007 - Failed to format the resource obtained based on the resource ID. + * @syscap SystemCapability.Global.ResourceManager +- * @stagemodelonly + * @crossplatform + * @atomicservice + * @since 20 +@@ -2643,7 +2640,6 @@ declare namespace resourceManager { + * @param { string } resName - Indicates the resource name. + * @param { (string | number)[] } args - Indicates the formatting string resource parameters. + * @returns { string } The character string corresponding to the resource name. +- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. + * @throws { BusinessError } 9001003 - Invalid resource name. + * @throws { BusinessError } 9001004 - No matching resource is found based on the resource name. + * @throws { BusinessError } 9001006 - The resource is referenced cyclically. +@@ -3219,7 +3215,6 @@ declare namespace resourceManager { + * @param { Array } args - Indicates the formatting string resource parameters. + * @returns { string } The singular-plural character string represented by the ID string + * corresponding to the specified number. +- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. + * @throws { BusinessError } 9001001 - Invalid resource ID. + * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. + * @throws { BusinessError } 9001006 - The resource is referenced cyclically. +@@ -3240,7 +3235,6 @@ declare namespace resourceManager { + * @param { (string | number)[] } args - Indicates the formatting string resource parameters. + * @returns { string } The singular-plural character string represented by the ID string + * corresponding to the specified number. +- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. + * @throws { BusinessError } 9001001 - Invalid resource ID. + * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. + * @throws { BusinessError } 9001006 - The resource is referenced cyclically. +@@ -3262,7 +3256,6 @@ declare namespace resourceManager { + * @param { Array } args - Indicates the formatting string resource parameters. + * @returns { string } The singular-plural character string represented by the ID string + * corresponding to the specified number. +- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. + * @throws { BusinessError } 9001001 - Invalid resource ID. + * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. + * @throws { BusinessError } 9001006 - The resource is referenced cyclically. +@@ -3284,13 +3277,11 @@ declare namespace resourceManager { + * @param { (string | number)[] } args - Indicates the formatting string resource parameters. + * @returns { string } The singular-plural character string represented by the ID string + * corresponding to the specified number. +- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. + * @throws { BusinessError } 9001001 - Invalid resource ID. + * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. + * @throws { BusinessError } 9001006 - The resource is referenced cyclically. + * @throws { BusinessError } 9001007 - Failed to format the resource obtained based on the resource ID. + * @syscap SystemCapability.Global.ResourceManager +- * @stagemodelonly + * @crossplatform + * @atomicservice + * @since 20 +@@ -3307,7 +3298,6 @@ declare namespace resourceManager { + * @param { Array } args - Indicates the formatting string resource parameters. + * @returns { string } The singular-plural character string represented by the name string + * corresponding to the specified number. +- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. + * @throws { BusinessError } 9001003 - Invalid resource name. + * @throws { BusinessError } 9001004 - No matching resource is found based on the resource name. + * @throws { BusinessError } 9001006 - The resource is referenced cyclically. +@@ -3328,7 +3318,6 @@ declare namespace resourceManager { + * @param { (string | number)[] } args - Indicates the formatting string resource parameters. + * @returns { string } The singular-plural character string represented by the name string + * corresponding to the specified number. +- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. + * @throws { BusinessError } 9001003 - Invalid resource name. + * @throws { BusinessError } 9001004 - No matching resource is found based on the resource name. + * @throws { BusinessError } 9001006 - The resource is referenced cyclically. +@@ -3350,7 +3339,6 @@ declare namespace resourceManager { + * @param { Array } args - Indicates the formatting string resource parameters. + * @returns { string } The singular-plural character string represented by the ID string + * corresponding to the specified number. +- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. + * @throws { BusinessError } 9001001 - Invalid resource ID. + * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. + * @throws { BusinessError } 9001006 - The resource is referenced cyclically. +@@ -3371,7 +3359,6 @@ declare namespace resourceManager { + * @param { (string | number)[] } args - Indicates the formatting string resource parameters. + * @returns { string } The singular-plural character string represented by the ID string + * corresponding to the specified number. +- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. + * @throws { BusinessError } 9001001 - Invalid resource ID. + * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. + * @throws { BusinessError } 9001006 - The resource is referenced cyclically. +@@ -3393,7 +3380,6 @@ declare namespace resourceManager { + * @param { Array } args - Indicates the formatting string resource parameters. + * @returns { string } The singular-plural character string represented by the ID string + * corresponding to the specified number. +- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. + * @throws { BusinessError } 9001001 - Invalid resource ID. + * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. + * @throws { BusinessError } 9001006 - The resource is referenced cyclically. +@@ -3415,13 +3401,11 @@ declare namespace resourceManager { + * @param { (string | number)[] } args - Indicates the formatting string resource parameters. + * @returns { string } The singular-plural character string represented by the ID string + * corresponding to the specified number. +- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. + * @throws { BusinessError } 9001001 - Invalid resource ID. + * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. + * @throws { BusinessError } 9001006 - The resource is referenced cyclically. + * @throws { BusinessError } 9001007 - Failed to format the resource obtained based on the resource ID. + * @syscap SystemCapability.Global.ResourceManager +- * @stagemodelonly + * @crossplatform + * @atomicservice + * @since 20 +@@ -3438,7 +3422,6 @@ declare namespace resourceManager { + * @param { Array } args - Indicates the formatting string resource parameters. + * @returns { string } The singular-plural character string represented by the name string + * corresponding to the specified number. +- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. + * @throws { BusinessError } 9001003 - Invalid resource name. + * @throws { BusinessError } 9001004 - No matching resource is found based on the resource name. + * @throws { BusinessError } 9001006 - The resource is referenced cyclically. +@@ -3459,7 +3442,6 @@ declare namespace resourceManager { + * @param { (string | number)[] } args - Indicates the formatting string resource parameters. + * @returns { string } The singular-plural character string represented by the name string + * corresponding to the specified number. +- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. + * @throws { BusinessError } 9001003 - Invalid resource name. + * @throws { BusinessError } 9001004 - No matching resource is found based on the resource name. + * @throws { BusinessError } 9001006 - The resource is referenced cyclically. +diff --git a/api/@ohos.resourceschedule.backgroundProcessManager.d.ts b/api/@ohos.resourceschedule.backgroundProcessManager.d.ts +index 8e8c321e1..cf7bd44fb 100644 +--- a/api/@ohos.resourceschedule.backgroundProcessManager.d.ts ++++ b/api/@ohos.resourceschedule.backgroundProcessManager.d.ts +@@ -16,6 +16,7 @@ + /** + * @file + * @kit BackgroundTasksKit ++ * @arkts 1.1&1.2 + */ + + /** +@@ -23,22 +24,25 @@ + * + * @namespace backgroundProcessManager + * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager +- * @since 15 ++ * @since arkts{ '1.1':'17','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace backgroundProcessManager { + /** + * Describes the level of BackgroundProcessManager priority. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager +- * @since 15 ++ * @since arkts{ '1.1':'17','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum ProcessPriority { + /** + * Means the process has stopped working and in the background + * + * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager +- * @since 15 ++ * @since arkts{ '1.1':'17','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PROCESS_BACKGROUND = 1, + +@@ -46,7 +50,8 @@ declare namespace backgroundProcessManager { + * Means the process is working in the background + * + * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager +- * @since 15 ++ * @since arkts{ '1.1':'17','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PROCESS_INACTIVE = 2, + } +@@ -54,26 +59,26 @@ declare namespace backgroundProcessManager { + /** + * Set the priority of process. + * +- * @param { number } pid - Indicates the pid of the process to be set. ++ * @param { int } pid - Indicates the pid of the process to be set. + * @param { ProcessPriority } priority - Indicates the priority to set. Specific priority can be referenced ProcessPriority + * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: priority is out of range. +- * @throws { BusinessError } 31800001 - remote error. Possible causes: remote is not work. + * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager +- * @since 15 ++ * @since arkts{ '1.1':'17','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function setProcessPriority(pid: number, priority: ProcessPriority): Promise; ++ function setProcessPriority(pid: int, priority: ProcessPriority): Promise; + + /** + * Reset the priority of process. + * +- * @param { number } pid - Indicates the pid of the process to be reset. ++ * @param { int } pid - Indicates the pid of the process to be reset. + * @returns { Promise } The promise returned by the function. +- * @throws { BusinessError } 31800001 - remote error. Possible causes: remote is not work. + * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager +- * @since 15 ++ * @since arkts{ '1.1':'17','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function resetProcessPriority(pid: number): Promise; ++ function resetProcessPriority(pid: int): Promise; + } + + export default backgroundProcessManager; +diff --git a/api/@ohos.resourceschedule.backgroundTaskManager.d.ts b/api/@ohos.resourceschedule.backgroundTaskManager.d.ts +index 30b520de7..32ce9417a 100644 +--- a/api/@ohos.resourceschedule.backgroundTaskManager.d.ts ++++ b/api/@ohos.resourceschedule.backgroundTaskManager.d.ts +@@ -19,7 +19,12 @@ + */ + + import { AsyncCallback, Callback } from './@ohos.base'; +-import { WantAgent } from './@ohos.wantAgent'; ++/*** if arkts 1.1 */ ++import { WantAgent } from '@ohos.wantAgent'; ++/*** endif */ ++/*** if arkts 1.2 */ ++import { WantAgent } from '@ohos.app.ability.wantAgent'; ++/*** endif */ + import Context from './application/BaseContext'; + import type notificationManager from './@ohos.notificationManager'; + +@@ -36,7 +41,8 @@ import type notificationManager from './@ohos.notificationManager'; + * @namespace backgroundTaskManager + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace backgroundTaskManager { + /** +@@ -44,7 +50,8 @@ declare namespace backgroundTaskManager { + * + * @interface DelaySuspendInfo + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface DelaySuspendInfo { + /** +@@ -52,7 +59,8 @@ declare namespace backgroundTaskManager { + * + * @type { number } + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + requestId: number; + /** +@@ -60,7 +68,8 @@ declare namespace backgroundTaskManager { + * + * @type { number } + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + actualDelayTime: number; + } +@@ -71,7 +80,8 @@ declare namespace backgroundTaskManager { + * @interface ContinuousTaskNotification + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ContinuousTaskNotification { + /** +@@ -80,7 +90,8 @@ declare namespace backgroundTaskManager { + * @type { notificationManager.SlotType } + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + slotType: notificationManager.SlotType; + /** +@@ -89,7 +100,8 @@ declare namespace backgroundTaskManager { + * @type { notificationManager.ContentType } + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + contentType: notificationManager.ContentType; + /** +@@ -98,14 +110,16 @@ declare namespace backgroundTaskManager { + * @type { number } + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + notificationId: number; + /** + * The continuous task id. + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + continuousTaskId?: number; + } +@@ -115,7 +129,8 @@ declare namespace backgroundTaskManager { + * + * @interface ContinuousTaskCancelInfo + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface ContinuousTaskCancelInfo { + /** +@@ -123,7 +138,8 @@ declare namespace backgroundTaskManager { + * + * @type { ContinuousTaskCancelReason } + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + reason: ContinuousTaskCancelReason; + +@@ -132,7 +148,8 @@ declare namespace backgroundTaskManager { + * + * @type { number } + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + id: number; + } +@@ -150,7 +167,8 @@ declare namespace backgroundTaskManager { + * @throws { BusinessError } 9900001 - Caller information verification failed for a transient task. + * @throws { BusinessError } 9900002 - Transient task verification failed. + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function cancelSuspendDelay(requestId: number): void; + +@@ -168,7 +186,8 @@ declare namespace backgroundTaskManager { + * @throws { BusinessError } 9900001 - Caller information verification failed for a transient task. + * @throws { BusinessError } 9900002 - Transient task verification failed. + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getRemainingDelayTime(requestId: number, callback: AsyncCallback): void; + +@@ -186,7 +205,8 @@ declare namespace backgroundTaskManager { + * @throws { BusinessError } 9900001 - Caller information verification failed for a transient task. + * @throws { BusinessError } 9900002 - Transient task verification failed. + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getRemainingDelayTime(requestId: number): Promise; + +@@ -205,7 +225,8 @@ declare namespace backgroundTaskManager { + * @throws { BusinessError } 9900001 - Caller information verification failed for a transient task. + * @throws { BusinessError } 9900002 - Transient task verification failed. + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function requestSuspendDelay(reason: string, callback: Callback): DelaySuspendInfo; + +@@ -254,7 +275,8 @@ declare namespace backgroundTaskManager { + * @throws { BusinessError } 9800007 - Continuous task storage failed. + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function startBackgroundRunning(context: Context, bgMode: BackgroundMode, wantAgent: WantAgent, callback: AsyncCallback): void; + +@@ -303,7 +325,8 @@ declare namespace backgroundTaskManager { + * @throws { BusinessError } 9800007 - Continuous task storage failed. + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function startBackgroundRunning(context: Context, bgMode: BackgroundMode, wantAgent: WantAgent): Promise; + +@@ -328,7 +351,8 @@ declare namespace backgroundTaskManager { + * @throws { BusinessError } 9800007 - Continuous task storage failed. + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function startBackgroundRunning(context: Context, bgModes: string[], wantAgent: WantAgent): Promise; + +@@ -351,7 +375,8 @@ declare namespace backgroundTaskManager { + * @throws { BusinessError } 9800007 - Continuous task storage failed. + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function updateBackgroundRunning(context: Context, bgModes: string[]): Promise; + +@@ -388,7 +413,8 @@ declare namespace backgroundTaskManager { + * @throws { BusinessError } 9800007 - Continuous task storage failed. + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function stopBackgroundRunning(context: Context, callback: AsyncCallback): void; + +@@ -425,7 +451,8 @@ declare namespace backgroundTaskManager { + * @throws { BusinessError } 9800007 - Continuous task storage failed. + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function stopBackgroundRunning(context: Context): Promise; + +@@ -444,7 +471,8 @@ declare namespace backgroundTaskManager { + * @throws { BusinessError } 18700001 - Caller information verification failed for an energy resource request. + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function applyEfficiencyResources(request: EfficiencyResourcesRequest): void; + +@@ -461,7 +489,8 @@ declare namespace backgroundTaskManager { + * @throws { BusinessError } 18700001 - Caller information verification failed for an energy resource request. + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function resetAllEfficiencyResources(): void; + +@@ -475,7 +504,8 @@ declare namespace backgroundTaskManager { + * @throws { BusinessError } 401 - Parameter error. Possible cause: 1. Callback parameter error; + *
    2. Register a exist callback type; 3. Parameter verification failed. + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function on(type: 'continuousTaskCancel', callback: Callback): void; + +@@ -489,7 +519,8 @@ declare namespace backgroundTaskManager { + * @throws { BusinessError } 401 - Parameter error. Possible cause: 1. Callback parameter error; + *
    2. Unregister type has not register; 3. Parameter verification failed. + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function off(type: 'continuousTaskCancel', callback?: Callback): void; + +@@ -506,14 +537,16 @@ declare namespace backgroundTaskManager { + * @enum { number } + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum BackgroundMode { + /** + * data transfer mode + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DATA_TRANSFER = 1, + +@@ -521,14 +554,16 @@ declare namespace backgroundTaskManager { + * audio playback mode + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + /** + * audio playback mode + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AUDIO_PLAYBACK = 2, + +@@ -536,7 +571,8 @@ declare namespace backgroundTaskManager { + * audio recording mode + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AUDIO_RECORDING = 3, + +@@ -544,7 +580,8 @@ declare namespace backgroundTaskManager { + * location mode + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LOCATION = 4, + +@@ -552,7 +589,8 @@ declare namespace backgroundTaskManager { + * bluetooth interaction mode + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BLUETOOTH_INTERACTION = 5, + +@@ -567,7 +605,8 @@ declare namespace backgroundTaskManager { + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MULTI_DEVICE_CONNECTION = 6, + +@@ -576,7 +615,8 @@ declare namespace backgroundTaskManager { + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WIFI_INTERACTION = 7, + +@@ -584,7 +624,8 @@ declare namespace backgroundTaskManager { + * Voice over Internet Phone mode + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + VOIP = 8, + +@@ -593,7 +634,8 @@ declare namespace backgroundTaskManager { + * only supported in particular device + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TASK_KEEPING = 9, + } +@@ -604,7 +646,8 @@ declare namespace backgroundTaskManager { + * @enum { number } + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum ResourceType { + /** +@@ -612,7 +655,8 @@ declare namespace backgroundTaskManager { + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CPU = 1, + +@@ -621,7 +665,8 @@ declare namespace backgroundTaskManager { + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + COMMON_EVENT = 1 << 1, + +@@ -630,7 +675,8 @@ declare namespace backgroundTaskManager { + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TIMER = 1 << 2, + +@@ -639,7 +685,8 @@ declare namespace backgroundTaskManager { + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WORK_SCHEDULER = 1 << 3, + +@@ -648,7 +695,8 @@ declare namespace backgroundTaskManager { + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BLUETOOTH = 1 << 4, + +@@ -657,7 +705,8 @@ declare namespace backgroundTaskManager { + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + GPS = 1 << 5, + +@@ -666,7 +715,8 @@ declare namespace backgroundTaskManager { + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AUDIO = 1 << 6, + +@@ -675,7 +725,8 @@ declare namespace backgroundTaskManager { + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RUNNING_LOCK = 1 << 7, + +@@ -684,7 +735,8 @@ declare namespace backgroundTaskManager { + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SENSOR = 1 << 8 + } +@@ -695,7 +747,8 @@ declare namespace backgroundTaskManager { + * @interface EfficiencyResourcesRequest + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface EfficiencyResourcesRequest { + /** +@@ -704,7 +757,8 @@ declare namespace backgroundTaskManager { + * @type { number } + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + resourceTypes: number; + +@@ -714,7 +768,8 @@ declare namespace backgroundTaskManager { + * @type { boolean } + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isApply: boolean; + +@@ -724,7 +779,8 @@ declare namespace backgroundTaskManager { + * @type { number } + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + timeOut: number; + +@@ -734,7 +790,8 @@ declare namespace backgroundTaskManager { + * @type { ?boolean } + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isPersist?: boolean; + +@@ -744,7 +801,8 @@ declare namespace backgroundTaskManager { + * @type { ?boolean } + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isProcess?: boolean; + +@@ -754,7 +812,8 @@ declare namespace backgroundTaskManager { + * @type { string } + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + reason: string; + } +@@ -764,28 +823,32 @@ declare namespace backgroundTaskManager { + * + * @enum { number } + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum ContinuousTaskCancelReason { + /** + * User cancel. + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + USER_CANCEL = 1, + /** + * System cancel. + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SYSTEM_CANCEL = 2, + /** + * User remove notification. + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + USER_CANCEL_REMOVE_NOTIFICATION = 3, + +@@ -793,7 +856,8 @@ declare namespace backgroundTaskManager { + * Low network speed when request data transfer mode. + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SYSTEM_CANCEL_DATA_TRANSFER_LOW_SPEED = 4, + +@@ -801,7 +865,8 @@ declare namespace backgroundTaskManager { + * Not use avsession when request audio playback mode. + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SYSTEM_CANCEL_AUDIO_PLAYBACK_NOT_USE_AVSESSION = 5, + +@@ -809,7 +874,8 @@ declare namespace backgroundTaskManager { + * Audio is not running when request audio playback mode. + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SYSTEM_CANCEL_AUDIO_PLAYBACK_NOT_RUNNING = 6, + +@@ -817,7 +883,8 @@ declare namespace backgroundTaskManager { + * Audio is not running when request audio recording mode. + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SYSTEM_CANCEL_AUDIO_RECORDING_NOT_RUNNING = 7, + +@@ -825,7 +892,8 @@ declare namespace backgroundTaskManager { + * Not use location when request location mode. + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SYSTEM_CANCEL_NOT_USE_LOCATION = 8, + +@@ -833,7 +901,8 @@ declare namespace backgroundTaskManager { + * Not use bluetooth when request bluetooth interaction mode. + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SYSTEM_CANCEL_NOT_USE_BLUETOOTH = 9, + +@@ -841,7 +910,8 @@ declare namespace backgroundTaskManager { + * Not use multi device when request multi-device connection mode. + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SYSTEM_CANCEL_NOT_USE_MULTI_DEVICE = 10, + +@@ -849,7 +919,8 @@ declare namespace backgroundTaskManager { + * Use some mode illegally. + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 15 ++ * @since arkts {'1.1':'15','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SYSTEM_CANCEL_USE_ILLEGALLY = 11, + } +@@ -859,14 +930,16 @@ declare namespace backgroundTaskManager { + * + * @enum { number } + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum BackgroundSubMode { + /** + * bluetooth car key mode + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CAR_KEY = 1 + } +@@ -876,14 +949,16 @@ declare namespace backgroundTaskManager { + * + * @enum { string } + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum BackgroundModeType { + /** + * subMode type + * + * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SUB_MODE = 'subMode' + } +diff --git a/api/@ohos.resourceschedule.systemload.d.ts b/api/@ohos.resourceschedule.systemload.d.ts +index 53ff2a57c..ea6bf44d8 100644 +--- a/api/@ohos.resourceschedule.systemload.d.ts ++++ b/api/@ohos.resourceschedule.systemload.d.ts +@@ -25,7 +25,8 @@ import type { Callback } from './@ohos.base'; + * + * @namespace systemLoad + * @syscap SystemCapability.ResourceSchedule.SystemLoad +- * @since 12 ++ * @since arkts{ '1.1':'12', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + declare namespace systemLoad { + /** +@@ -33,63 +34,72 @@ declare namespace systemLoad { + * + * @enum {number} + * @syscap SystemCapability.ResourceSchedule.SystemLoad +- * @since 12 ++ * @since arkts{ '1.1':'12', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + export enum SystemLoadLevel { + /** + * level low + * + * @syscap SystemCapability.ResourceSchedule.SystemLoad +- * @since 12 ++ * @since arkts{ '1.1':'12', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + LOW = 0, + /** + * level NORMAL + * + * @syscap SystemCapability.ResourceSchedule.SystemLoad +- * @since 12 ++ * @since arkts{ '1.1':'12', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + NORMAL = 1, + /** + * level MEDIUM + * + * @syscap SystemCapability.ResourceSchedule.SystemLoad +- * @since 12 ++ * @since arkts{ '1.1':'12', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + MEDIUM = 2, + /** + * level HIGH + * + * @syscap SystemCapability.ResourceSchedule.SystemLoad +- * @since 12 ++ * @since arkts{ '1.1':'12', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + HIGH = 3, + /** + * level OVERHEATED + * + * @syscap SystemCapability.ResourceSchedule.SystemLoad +- * @since 12 ++ * @since arkts{ '1.1':'12', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + OVERHEATED = 4, + /** + * level WARNING + * + * @syscap SystemCapability.ResourceSchedule.SystemLoad +- * @since 12 ++ * @since arkts{ '1.1':'12', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + WARNING = 5, + /** + * level EMERGENCY + * + * @syscap SystemCapability.ResourceSchedule.SystemLoad +- * @since 12 ++ * @since arkts{ '1.1':'12', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + EMERGENCY = 6, + /** + * level ESCAPE + * + * @syscap SystemCapability.ResourceSchedule.SystemLoad +- * @since 12 ++ * @since arkts{ '1.1':'12', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + ESCAPE = 7 + } +@@ -101,7 +111,8 @@ declare namespace systemLoad { + * @throws { BusinessError } 401 - Parameter error. Possible cause: 1. Callback parameter error; + *
    2. Register a exist callback type; 3. Parameter verification failed. + * @syscap SystemCapability.ResourceSchedule.SystemLoad +- * @since 12 ++ * @since arkts{ '1.1':'12', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function on(type: 'systemLoadChange', callback: Callback): void; + +@@ -112,7 +123,8 @@ declare namespace systemLoad { + * @throws { BusinessError } 401 - Parameter error. Possible cause: 1. Callback parameter error; + *
    2. Unregister type has not register; 3. Parameter verification failed. + * @syscap SystemCapability.ResourceSchedule.SystemLoad +- * @since 12 ++ * @since arkts{ '1.1':'12', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function off(type: 'systemLoadChange', callback?: Callback): void; + +@@ -120,7 +132,8 @@ declare namespace systemLoad { + * @returns { Promise } The promise form returns the SystemLoadLevel result + * Queries the current system level + * @syscap SystemCapability.ResourceSchedule.SystemLoad +- * @since 12 ++ * @since arkts{ '1.1':'12', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function getLevel(): Promise; + } +diff --git a/api/@ohos.resourceschedule.usageStatistics.d.ts b/api/@ohos.resourceschedule.usageStatistics.d.ts +index 216c70f3b..c00b522ae 100644 +--- a/api/@ohos.resourceschedule.usageStatistics.d.ts ++++ b/api/@ohos.resourceschedule.usageStatistics.d.ts +@@ -31,14 +31,16 @@ import { AsyncCallback, Callback } from './@ohos.base'; + * + * @namespace usageStatistics + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + declare namespace usageStatistics { + /** + * @interface BundleStatsInfo + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + interface BundleStatsInfo { + /** +@@ -46,7 +48,8 @@ declare namespace usageStatistics { + * @type { number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + id: number; + +@@ -55,7 +58,8 @@ declare namespace usageStatistics { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + abilityInFgTotalTime?: number; + +@@ -64,7 +68,8 @@ declare namespace usageStatistics { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + abilityPrevAccessTime?: number; + +@@ -73,7 +78,8 @@ declare namespace usageStatistics { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + abilityPrevSeenTime?: number; + +@@ -82,7 +88,8 @@ declare namespace usageStatistics { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + abilitySeenTotalTime?: number; + +@@ -91,7 +98,8 @@ declare namespace usageStatistics { + * @type { ?string } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + bundleName?: string; + +@@ -100,7 +108,8 @@ declare namespace usageStatistics { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + fgAbilityAccessTotalTime?: number; + +@@ -109,7 +118,8 @@ declare namespace usageStatistics { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + fgAbilityPrevAccessTime?: number; + +@@ -119,7 +129,8 @@ declare namespace usageStatistics { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + infosBeginTime?: number; + +@@ -129,7 +140,8 @@ declare namespace usageStatistics { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + infosEndTime?: number; + +@@ -138,7 +150,8 @@ declare namespace usageStatistics { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 15 ++ * @since arkts{ '1.1':'15', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + appIndex?: number; + } +@@ -147,7 +160,8 @@ declare namespace usageStatistics { + * @interface HapFormInfo + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + interface HapFormInfo { + /** +@@ -155,7 +169,8 @@ declare namespace usageStatistics { + * @type { string } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + formName: string; + +@@ -164,7 +179,8 @@ declare namespace usageStatistics { + * @type { number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + formDimension: number; + +@@ -173,7 +189,8 @@ declare namespace usageStatistics { + * @type { number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + formId: number; + +@@ -182,7 +199,8 @@ declare namespace usageStatistics { + * @type { number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + formLastUsedTime: number; + +@@ -191,7 +209,8 @@ declare namespace usageStatistics { + * @type { number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + count: number; + } +@@ -200,7 +219,8 @@ declare namespace usageStatistics { + * @interface HapModuleInfo + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + interface HapModuleInfo { + /** +@@ -208,7 +228,8 @@ declare namespace usageStatistics { + * @type { ?string } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + deviceId?: string; + +@@ -217,7 +238,8 @@ declare namespace usageStatistics { + * @type { string } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + bundleName: string; + +@@ -226,7 +248,8 @@ declare namespace usageStatistics { + * @type { string } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + moduleName: string; + +@@ -235,7 +258,8 @@ declare namespace usageStatistics { + * @type { ?string } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + abilityName?: string; + +@@ -244,7 +268,8 @@ declare namespace usageStatistics { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + appLabelId?: number; + +@@ -253,7 +278,8 @@ declare namespace usageStatistics { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + labelId?: number; + +@@ -262,7 +288,8 @@ declare namespace usageStatistics { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + descriptionId?: number; + +@@ -271,7 +298,8 @@ declare namespace usageStatistics { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + abilityLableId?: number; + +@@ -280,7 +308,8 @@ declare namespace usageStatistics { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + abilityDescriptionId?: number; + +@@ -289,7 +318,8 @@ declare namespace usageStatistics { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + abilityIconId?: number; + +@@ -298,7 +328,8 @@ declare namespace usageStatistics { + * @type { number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + launchedCount: number; + +@@ -307,7 +338,8 @@ declare namespace usageStatistics { + * @type { number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + lastModuleUsedTime: number; + +@@ -316,7 +348,8 @@ declare namespace usageStatistics { + * @type { Array } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + formRecords: Array; + } +@@ -325,7 +358,8 @@ declare namespace usageStatistics { + * @interface DeviceEventStats + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + interface DeviceEventStats { + /** +@@ -333,7 +367,8 @@ declare namespace usageStatistics { + * @type { string } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + name: string; + +@@ -342,7 +377,8 @@ declare namespace usageStatistics { + * @type { number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + eventId: number; + +@@ -351,7 +387,8 @@ declare namespace usageStatistics { + * @type { number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + count: number; + } +@@ -360,7 +397,8 @@ declare namespace usageStatistics { + * @interface BundleEvents + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + interface BundleEvents { + /** +@@ -368,7 +406,8 @@ declare namespace usageStatistics { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + appGroup?: number; + +@@ -377,7 +416,8 @@ declare namespace usageStatistics { + * @type { ?string } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + bundleName?: string; + +@@ -386,7 +426,8 @@ declare namespace usageStatistics { + * @type { ?string } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + indexOfLink?: string; + +@@ -395,7 +436,8 @@ declare namespace usageStatistics { + * @type { ?string } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + nameOfClass?: string; + +@@ -404,7 +446,8 @@ declare namespace usageStatistics { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + eventOccurredTime?: number; + +@@ -413,7 +456,8 @@ declare namespace usageStatistics { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + eventId?: number; + } +@@ -422,7 +466,8 @@ declare namespace usageStatistics { + * @interface AppGroupCallbackInfo + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + interface AppGroupCallbackInfo { + /** +@@ -430,7 +475,8 @@ declare namespace usageStatistics { + * @type { number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + appOldGroup: number; + +@@ -439,7 +485,8 @@ declare namespace usageStatistics { + * @type { number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + appNewGroup: number; + +@@ -448,7 +495,8 @@ declare namespace usageStatistics { + * @type { number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + userId: number; + +@@ -457,7 +505,8 @@ declare namespace usageStatistics { + * @type { number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + changeReason: number; + +@@ -466,7 +515,8 @@ declare namespace usageStatistics { + * @type { string } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + bundleName: string; + } +@@ -491,7 +541,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10000006 - Failed to get the application information. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function isIdleState(bundleName: string, callback: AsyncCallback): void; + +@@ -515,7 +566,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10000006 - Failed to get the application information. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function isIdleState(bundleName: string): Promise; + +@@ -539,7 +591,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10000006 - Failed to get the application information. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts{ '1.1':'10', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function isIdleStateSync(bundleName: string): boolean; + +@@ -564,7 +617,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10100002 - Failed to get the application group information. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryAppGroup(callback: AsyncCallback): void; + +@@ -589,7 +643,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10100002 - Failed to get the application group information. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryAppGroup(): Promise; + +@@ -613,7 +668,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10100002 - Failed to get the application group information. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts{ '1.1':'10', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryAppGroupSync(): number; + +@@ -639,7 +695,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10100002 - Failed to get the application group information. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryAppGroup(bundleName: string, callback: AsyncCallback): void; + +@@ -665,7 +722,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10100002 - Failed to get the application group information. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryAppGroup(bundleName: string): Promise; + +@@ -690,7 +748,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10100002 - Failed to get the application group information. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts{ '1.1':'10', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryAppGroupSync(bundleName: string): number; + +@@ -698,7 +757,8 @@ declare namespace usageStatistics { + * @typedef { Record } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + type BundleStatsMap = Record; + +@@ -723,7 +783,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10000007 - Failed to get the system time. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryBundleStatsInfos(begin: number, end: number, callback: AsyncCallback): void; + +@@ -748,7 +809,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10000007 - Failed to get the system time. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryBundleStatsInfos(begin: number, end: number): Promise; + +@@ -756,7 +818,8 @@ declare namespace usageStatistics { + * @typedef { Record> } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 15 ++ * @since arkts{ '1.1':'15', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + type AppStatsMap = Record>; + +@@ -781,7 +844,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10000007 - Failed to get the system time. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 15 ++ * @since arkts{ '1.1':'15', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryAppStatsInfos(begin: number, end: number): Promise; + +@@ -805,7 +869,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10000007 - Failed to get the system time. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 15 ++ * @since arkts{ '1.1':'15', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryLastUseTime(appInfo: Record>): Promise; + +@@ -815,7 +880,8 @@ declare namespace usageStatistics { + * @enum { number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + export enum IntervalType { + /** +@@ -823,7 +889,8 @@ declare namespace usageStatistics { + * + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + BY_OPTIMIZED = 0, + +@@ -832,7 +899,8 @@ declare namespace usageStatistics { + * + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + BY_DAILY = 1, + +@@ -841,7 +909,8 @@ declare namespace usageStatistics { + * + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + BY_WEEKLY = 2, + +@@ -850,7 +919,8 @@ declare namespace usageStatistics { + * + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + BY_MONTHLY = 3, + +@@ -859,7 +929,8 @@ declare namespace usageStatistics { + * + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + BY_ANNUALLY = 4 + } +@@ -887,7 +958,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10000007 - Failed to get the system time. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryBundleStatsInfoByInterval( + byInterval: IntervalType, +@@ -919,7 +991,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10000007 - Failed to get the system time. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryBundleStatsInfoByInterval( + byInterval: IntervalType, +@@ -948,7 +1021,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10000007 - Failed to get the system time. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryBundleEvents(begin: number, end: number, callback: AsyncCallback>): void; + +@@ -973,7 +1047,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10000007 - Failed to get the system time. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryBundleEvents(begin: number, end: number): Promise>; + +@@ -996,7 +1071,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10000007 - Failed to get the system time. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryCurrentBundleEvents(begin: number, end: number, callback: AsyncCallback>): void; + +@@ -1019,7 +1095,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10000007 - Failed to get the system time. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryCurrentBundleEvents(begin: number, end: number): Promise>; + +@@ -1043,7 +1120,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10000007 - Failed to get the system time. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryModuleUsageRecords(maxNum: number, callback: AsyncCallback>): void; + +@@ -1067,7 +1145,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10000007 - Failed to get the system time. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryModuleUsageRecords(maxNum: number): Promise>; + +@@ -1090,7 +1169,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10000007 - Failed to get the system time. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryModuleUsageRecords(callback: AsyncCallback>): void; + +@@ -1113,7 +1193,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10000007 - Failed to get the system time. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryModuleUsageRecords(): Promise>; + +@@ -1123,7 +1204,8 @@ declare namespace usageStatistics { + * @enum { number } + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + export enum GroupType { + /** +@@ -1131,7 +1213,8 @@ declare namespace usageStatistics { + * + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + ALIVE_GROUP = 10, + +@@ -1140,7 +1223,8 @@ declare namespace usageStatistics { + * + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + DAILY_GROUP = 20, + +@@ -1149,7 +1233,8 @@ declare namespace usageStatistics { + * + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + FIXED_GROUP = 30, + +@@ -1158,7 +1243,8 @@ declare namespace usageStatistics { + * + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + RARE_GROUP = 40, + +@@ -1167,7 +1253,8 @@ declare namespace usageStatistics { + * + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + LIMITED_GROUP = 50, + +@@ -1176,7 +1263,8 @@ declare namespace usageStatistics { + * + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + NEVER_GROUP = 60 + } +@@ -1201,7 +1289,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10100001 - Repeated operation on the application group. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function setAppGroup(bundleName: string, newGroup: GroupType, callback: AsyncCallback): void; + +@@ -1225,7 +1314,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10100001 - Repeated operation on the application group. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function setAppGroup(bundleName: string, newGroup: GroupType): Promise; + +@@ -1248,7 +1338,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10100001 - Repeated operation on the application group. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function registerAppGroupCallBack(groupCallback: Callback, callback: AsyncCallback): void; + +@@ -1271,7 +1362,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10100001 - Repeated operation on the application group. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function registerAppGroupCallBack(groupCallback: Callback): Promise; + +@@ -1292,7 +1384,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10100001 - Repeated operation on the application group. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function unregisterAppGroupCallBack(callback: AsyncCallback): void; + +@@ -1313,7 +1406,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10100001 - Repeated operation on the application group. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function unregisterAppGroupCallBack(): Promise; + +@@ -1338,7 +1432,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10000007 - Failed to get the system time. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryDeviceEventStats(begin: number, end: number, callback: AsyncCallback>): void; + +@@ -1363,7 +1458,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10000007 - Failed to get the system time. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryDeviceEventStats(begin: number, end: number): Promise>; + +@@ -1388,7 +1484,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10000007 - Failed to get the system time. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryNotificationEventStats( + begin: number, +@@ -1417,7 +1514,8 @@ declare namespace usageStatistics { + * @throws { BusinessError } 10000007 - Failed to get the system time. + * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts{ '1.1':'9', '1.2':'20' } ++ * @arkts 1.1&1.2 + */ + function queryNotificationEventStats(begin: number, end: number): Promise>; + } +diff --git a/api/@ohos.resourceschedule.workScheduler.d.ts b/api/@ohos.resourceschedule.workScheduler.d.ts +index 32cbeaa68..9a6bc075f 100644 +--- a/api/@ohos.resourceschedule.workScheduler.d.ts ++++ b/api/@ohos.resourceschedule.workScheduler.d.ts +@@ -26,7 +26,8 @@ import { AsyncCallback } from './@ohos.base'; + * @namespace workScheduler + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace workScheduler { + /** +@@ -35,7 +36,8 @@ declare namespace workScheduler { + * @interface WorkInfo + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface WorkInfo { + /** +@@ -44,7 +46,8 @@ declare namespace workScheduler { + * @type { number } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + workId: number; + /** +@@ -53,7 +56,8 @@ declare namespace workScheduler { + * @type { string } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + bundleName: string; + /** +@@ -62,7 +66,8 @@ declare namespace workScheduler { + * @type { string } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + abilityName: string; + /** +@@ -71,7 +76,8 @@ declare namespace workScheduler { + * @type { ?boolean } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isPersisted?: boolean; + /** +@@ -80,7 +86,8 @@ declare namespace workScheduler { + * @type { ?NetworkType } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + networkType?: NetworkType; + /** +@@ -89,7 +96,8 @@ declare namespace workScheduler { + * @type { ?boolean } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isCharging?: boolean; + /** +@@ -98,7 +106,8 @@ declare namespace workScheduler { + * @type { ?ChargingType } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + chargerType?: ChargingType; + /** +@@ -107,7 +116,8 @@ declare namespace workScheduler { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + batteryLevel?: number; + /** +@@ -116,7 +126,8 @@ declare namespace workScheduler { + * @type { ?BatteryStatus } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + batteryStatus?: BatteryStatus; + /** +@@ -125,7 +136,8 @@ declare namespace workScheduler { + * @type { ?StorageRequest } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + storageRequest?: StorageRequest; + /** +@@ -134,7 +146,8 @@ declare namespace workScheduler { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + repeatCycleTime?: number; + /** +@@ -143,7 +156,8 @@ declare namespace workScheduler { + * @type { ?boolean } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isRepeat?: boolean; + /** +@@ -152,7 +166,8 @@ declare namespace workScheduler { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + repeatCount?: number; + /** +@@ -161,7 +176,8 @@ declare namespace workScheduler { + * @type { ?boolean } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isDeepIdle?: boolean; + /** +@@ -170,7 +186,8 @@ declare namespace workScheduler { + * @type { ?number } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + idleWaitTime?: number; + /** +@@ -179,7 +196,8 @@ declare namespace workScheduler { + * @type { ?Record } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + parameters?: Record; + } +@@ -198,7 +216,8 @@ declare namespace workScheduler { + * @throws { BusinessError } 9700005 - Calling startWork failed. + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function startWork(work: WorkInfo): void; + +@@ -215,7 +234,8 @@ declare namespace workScheduler { + * @throws { BusinessError } 9700004 - Check on workInfo failed. + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function stopWork(work: WorkInfo, needCancel?: boolean): void; + +@@ -231,7 +251,8 @@ declare namespace workScheduler { + * @throws { BusinessError } 9700004 - Check on workInfo failed. + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getWorkStatus(workId: number, callback: AsyncCallback): void; + +@@ -247,7 +268,8 @@ declare namespace workScheduler { + * @throws { BusinessError } 9700004 - Check on workInfo failed. + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getWorkStatus(workId: number): Promise; + +@@ -279,7 +301,8 @@ declare namespace workScheduler { + * @throws { BusinessError } 9700003 - System service operation failed. + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function obtainAllWorks(callback: AsyncCallback>): void; + +@@ -294,7 +317,8 @@ declare namespace workScheduler { + * @throws { BusinessError } 9700003 - System service operation failed. + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function obtainAllWorks(): Promise>; + +@@ -308,7 +332,8 @@ declare namespace workScheduler { + * @throws { BusinessError } 9700003 - System service operation failed. + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function stopAndClearWorks(): void; + +@@ -342,7 +367,8 @@ declare namespace workScheduler { + * @throws { BusinessError } 9700004 - Check on workInfo failed. + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isLastWorkTimeOut(workId: number, callback: AsyncCallback): void; + +@@ -358,7 +384,8 @@ declare namespace workScheduler { + * @throws { BusinessError } 9700004 - Check on workInfo failed. + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isLastWorkTimeOut(workId: number): Promise; + +@@ -368,7 +395,8 @@ declare namespace workScheduler { + * @enum { number } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + * @name NetworkType + */ + export enum NetworkType { +@@ -377,7 +405,8 @@ declare namespace workScheduler { + * + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NETWORK_TYPE_ANY = 0, + /** +@@ -385,7 +414,8 @@ declare namespace workScheduler { + * + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NETWORK_TYPE_MOBILE, + /** +@@ -393,7 +423,8 @@ declare namespace workScheduler { + * + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NETWORK_TYPE_WIFI, + /** +@@ -401,7 +432,8 @@ declare namespace workScheduler { + * + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NETWORK_TYPE_BLUETOOTH, + /** +@@ -409,7 +441,8 @@ declare namespace workScheduler { + * + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NETWORK_TYPE_WIFI_P2P, + /** +@@ -417,7 +450,8 @@ declare namespace workScheduler { + * + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NETWORK_TYPE_ETHERNET + } +@@ -428,7 +462,8 @@ declare namespace workScheduler { + * @enum { number } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + * @name ChargingType + */ + export enum ChargingType { +@@ -437,7 +472,8 @@ declare namespace workScheduler { + * + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CHARGING_PLUGGED_ANY = 0, + /** +@@ -445,7 +481,8 @@ declare namespace workScheduler { + * + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CHARGING_PLUGGED_AC, + /** +@@ -453,7 +490,8 @@ declare namespace workScheduler { + * + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CHARGING_PLUGGED_USB, + /** +@@ -461,7 +499,8 @@ declare namespace workScheduler { + * + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CHARGING_PLUGGED_WIRELESS + } +@@ -472,7 +511,8 @@ declare namespace workScheduler { + * @enum { number } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + * @name BatteryStatus + */ + export enum BatteryStatus { +@@ -481,7 +521,8 @@ declare namespace workScheduler { + * + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BATTERY_STATUS_LOW = 0, + /** +@@ -489,7 +530,8 @@ declare namespace workScheduler { + * + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BATTERY_STATUS_OKAY, + /** +@@ -497,7 +539,8 @@ declare namespace workScheduler { + * + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BATTERY_STATUS_LOW_OR_OKAY + } +@@ -508,7 +551,8 @@ declare namespace workScheduler { + * @enum { number } + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + * @name StorageRequest + */ + export enum StorageRequest { +@@ -517,7 +561,8 @@ declare namespace workScheduler { + * + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + STORAGE_LEVEL_LOW = 0, + /** +@@ -525,7 +570,8 @@ declare namespace workScheduler { + * + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + STORAGE_LEVEL_OKAY, + /** +@@ -533,7 +579,8 @@ declare namespace workScheduler { + * + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + STORAGE_LEVEL_LOW_OR_OKAY + } +diff --git a/api/@ohos.rpc.d.ts b/api/@ohos.rpc.d.ts +index b71d77986..a2e0f9c09 100644 +--- a/api/@ohos.rpc.d.ts ++++ b/api/@ohos.rpc.d.ts +@@ -18,9 +18,7 @@ + * @kit IPCKit + */ + +-/*** if arkts 1.1 */ + import type { AsyncCallback } from './@ohos.base'; +-/*** endif */ + + /** + * This module provides inter process communication capability. +@@ -1181,7 +1179,8 @@ declare namespace rpc { + * + * @returns { MessageSequence } Return the object created. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + static create(): MessageSequence; + +@@ -1189,7 +1188,8 @@ declare namespace rpc { + * Reclaim the {@link MessageSequence} object. + * + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + reclaim(): void; + +@@ -1203,7 +1203,8 @@ declare namespace rpc { + * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. + * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + writeRemoteObject(object: IRemoteObject): void; + +@@ -1214,7 +1215,8 @@ declare namespace rpc { + * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. + * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readRemoteObject(): IRemoteObject; + +@@ -1229,7 +1231,8 @@ declare namespace rpc { + * 4.The number of bytes copied to the buffer is different from the length of the obtained string. + * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + writeInterfaceToken(token: string): void; + +@@ -1256,11 +1259,12 @@ declare namespace rpc { + /** + * Obtains the storage capacity (in bytes) of the {@link MessageSequence} object. + * +- * @returns { number } Return the storage capacity of the {@link MessageSequence} object. ++ * @returns { int } Return the storage capacity of the {@link MessageSequence} object. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getCapacity(): number; ++ getCapacity(): int; + + /** + * Sets the size of data (in bytes) contained in the {@link MessageSequence} object. +@@ -1282,16 +1286,17 @@ declare namespace rpc { + *

    {@code false} is returned if the capacity set in this method is less than + * the size of data contained in the {@link MessageSequence}. + * +- * @param { number } size - Indicates the storage capacity of the {@link MessageSequence} object. ++ * @param { int } size - Indicates the storage capacity of the {@link MessageSequence} object. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.The number of parameters is incorrect; + * 2.The parameter type does not match. + * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. + * @throws { BusinessError } 1900011 - Memory allocation failed. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- setCapacity(size: number): void; ++ setCapacity(size: int): void; + + /** + * Obtains the writable data space (in bytes) in the {@link MessageSequence} object. +@@ -1369,7 +1374,8 @@ declare namespace rpc { + * + * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + writeNoException(): void; + +@@ -1381,7 +1387,8 @@ declare namespace rpc { + * + * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readException(): void; + +@@ -1414,28 +1421,30 @@ declare namespace rpc { + /** + * Writes an integer value into the {@link MessageSequence} object. + * +- * @param { number } val - Indicates the integer value to write. ++ * @param { int } val - Indicates the integer value to write. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.The number of parameters is incorrect; + * 2.The parameter type does not match. + * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- writeInt(val: number): void; ++ writeInt(val: int): void; + + /** + * Writes a long integer value into the {@link MessageSequence} object. + * +- * @param { number } val - Indicates the long integer value to write. ++ * @param { long } val - Indicates the long integer value to write. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.The number of parameters is incorrect; + * 2.The parameter type does not match. + * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- writeLong(val: number): void; ++ writeLong(val: long): void; + + /** + * Writes a floating point value into the {@link MessageSequence} object. +@@ -1472,7 +1481,8 @@ declare namespace rpc { + * 2.The parameter type does not match. + * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + writeBoolean(val: boolean): void; + +@@ -1514,14 +1524,15 @@ declare namespace rpc { + * 2.The parameter type does not match. + * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + writeParcelable(val: Parcelable): void; + + /** + * Writes a byte array into the {@link MessageSequence} object. + * +- * @param { number[] } byteArray - Indicates the byte array to write. ++ * @param { int[] } byteArray - Indicates the byte array to write. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.The parameter is an empty array; + * 2.The number of parameters is incorrect; +@@ -1530,9 +1541,10 @@ declare namespace rpc { + * 5.The type of the element in the array is incorrect. + * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- writeByteArray(byteArray: number[]): void; ++ writeByteArray(byteArray: int[]): void; + + /** + * Writes a short integer array into the {@link MessageSequence} object. +@@ -1557,7 +1569,7 @@ declare namespace rpc { + * Ensure that the data type and size comply with the interface definition. + * Otherwise,data may be truncated. + * +- * @param { number[] } intArray - Indicates the integer array to write. ++ * @param { int[] } intArray - Indicates the integer array to write. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.The parameter is an empty array; + * 2.The number of parameters is incorrect; +@@ -1566,9 +1578,10 @@ declare namespace rpc { + * 5.The type of the element in the array is incorrect. + * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- writeIntArray(intArray: number[]): void; ++ writeIntArray(intArray: int[]): void; + + /** + * Writes a long integer array into the {@link MessageSequence} object. +@@ -1611,7 +1624,7 @@ declare namespace rpc { + * Ensure that the data type and size comply with the interface definition. + * Otherwise,data may be truncated. + * +- * @param { number[] } doubleArray - Indicates the double-precision floating point array to write. ++ * @param { double[] } doubleArray - Indicates the double-precision floating point array to write. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.The parameter is an empty array; + * 2.The number of parameters is incorrect; +@@ -1620,9 +1633,10 @@ declare namespace rpc { + * 5.The type of the element in the array is incorrect. + * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- writeDoubleArray(doubleArray: number[]): void; ++ writeDoubleArray(doubleArray: double[]): void; + + /** + * Writes a boolean array into the {@link MessageSequence} object. +@@ -1637,7 +1651,8 @@ declare namespace rpc { + * 4.The element does not exist in the array. + * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + writeBooleanArray(booleanArray: boolean[]): void; + +@@ -1672,7 +1687,8 @@ declare namespace rpc { + * 5.The number of bytes copied to the buffer is different from the length of the obtained string. + * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + writeStringArray(stringArray: string[]): void; + +@@ -1687,7 +1703,8 @@ declare namespace rpc { + * 4.The element does not exist in the array. + * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + writeParcelableArray(parcelableArray: Parcelable[]): void; + +@@ -1730,22 +1747,24 @@ declare namespace rpc { + /** + * Reads an integer value from the {@link MessageSequence} object. + * +- * @returns { number } Return an integer value. ++ * @returns { int } Return an integer value. + * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readInt(): number; ++ readInt(): int; + + /** + * Reads a long integer value from the {@link MessageSequence} object. + * +- * @returns { number } Return a long integer value. ++ * @returns { long } Return a long integer value. + * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readLong(): number; ++ readLong(): long; + + /** + * Reads a floating point value from the {@link MessageSequence} object. +@@ -1773,7 +1792,8 @@ declare namespace rpc { + * @returns { boolean } Return a boolean value. + * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readBoolean(): boolean; + +@@ -1808,7 +1828,8 @@ declare namespace rpc { + * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. + * @throws { BusinessError } 1900012 - Failed to call the JS callback function. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readParcelable(dataIn: Parcelable): void; + +@@ -1863,26 +1884,28 @@ declare namespace rpc { + /** + * Reads an integer array from the {@link MessageSequence} object. + * +- * @param { number[] } dataIn - Indicates the integer array to read. ++ * @param { int[] } dataIn - Indicates the integer array to read. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.The parameter is an empty array; + * 2.The number of parameters is incorrect; + * 3.The parameter type does not match. + * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readIntArray(dataIn: number[]): void; ++ readIntArray(dataIn: int[]): void; + + /** + * Reads an integer array from the {@link MessageSequence} object. + * +- * @returns { number[] } Return an integer array. ++ * @returns { int[] } Return an integer array. + * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readIntArray(): number[]; ++ readIntArray(): int[]; + + /** + * Reads a long integer array from the {@link MessageSequence} object. +@@ -1935,26 +1958,28 @@ declare namespace rpc { + /** + * Reads a double-precision floating point array from the {@link MessageSequence} object. + * +- * @param { number[] } dataIn - Indicates the double-precision floating point array to read. ++ * @param { double[] } dataIn - Indicates the double-precision floating point array to read. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.The parameter is an empty array; + * 2.The number of parameters is incorrect; + * 3.The parameter type does not match. + * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readDoubleArray(dataIn: number[]): void; ++ readDoubleArray(dataIn: double[]): void; + + /** + * Reads a double-precision floating point array from the {@link MessageSequence} object. + * +- * @returns { number[] } Return a double-precision floating point array. ++ * @returns { double[] } Return a double-precision floating point array. + * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readDoubleArray(): number[]; ++ readDoubleArray(): double[]; + + /** + * Reads a boolean array from the {@link MessageSequence} object. +@@ -1966,7 +1991,8 @@ declare namespace rpc { + * 3.The parameter type does not match. + * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readBooleanArray(dataIn: boolean[]): void; + +@@ -1976,7 +2002,8 @@ declare namespace rpc { + * @returns { boolean[] } Return a boolean array. + * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readBooleanArray(): boolean[]; + +@@ -2014,7 +2041,8 @@ declare namespace rpc { + * 3.The parameter type does not match. + * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readStringArray(dataIn: string[]): void; + +@@ -2024,7 +2052,8 @@ declare namespace rpc { + * @returns { string[] } Return a string array. + * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readStringArray(): string[]; + +@@ -2041,7 +2070,8 @@ declare namespace rpc { + * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. + * @throws { BusinessError } 1900012 - Failed to call the JS callback function. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readParcelableArray(parcelableArray: Parcelable[]): void; + +@@ -2074,14 +2104,16 @@ declare namespace rpc { + /** + * Closes the specified file descriptor. + * +- * @param { number } fd - File descriptor to be closed. ++ * @param { int } fd - File descriptor to be closed. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.The number of parameters is incorrect; + * 2.The parameter type does not match. ++ * @static + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static closeFileDescriptor(fd: number): void; ++ static closeFileDescriptor(fd: int): void; + + /** + * Duplicates the specified file descriptor. +@@ -2110,25 +2142,27 @@ declare namespace rpc { + /** + * Writes a file descriptor to this {@link MessageSequence} object. + * +- * @param { number } fd - File descriptor to wrote. ++ * @param { int } fd - File descriptor to wrote. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.The number of parameters is incorrect; + * 2.The parameter type does not match. + * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- writeFileDescriptor(fd: number): void; ++ writeFileDescriptor(fd: int): void; + + /** + * Reads a file descriptor from this {@link MessageSequence} object. + * +- * @returns { number } Return a file descriptor obtained. ++ * @returns { int } Return a file descriptor obtained. + * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readFileDescriptor(): number; ++ readFileDescriptor(): int; + + /** + * Writes an anonymous shared memory object to this {@link MessageSequence} object. +@@ -2139,7 +2173,8 @@ declare namespace rpc { + * 2.The parameter is not an instance of the Ashmem object. + * @throws { BusinessError } 1900003 - Failed to write data to the shared memory. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + writeAshmem(ashmem: Ashmem): void; + +@@ -2149,7 +2184,8 @@ declare namespace rpc { + * @returns { Ashmem } Return the anonymous share object obtained. + * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readAshmem(): Ashmem; + +@@ -2189,7 +2225,7 @@ declare namespace rpc { + * Writes raw data to this {@link MessageSequence} object. + * + * @param { ArrayBuffer } rawData - Raw data to wrote. +- * @param { number } size - Size of the raw data, in bytes. ++ * @param { int } size - Size of the raw data, in bytes. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.The number of parameters is incorrect; + * 2.The parameter type does not match; +@@ -2199,9 +2235,10 @@ declare namespace rpc { + * 6.The transferred size is greater than the byte length of ArrayBuffer. + * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- writeRawDataBuffer(rawData: ArrayBuffer, size: number): void; ++ writeRawDataBuffer(rawData: ArrayBuffer, size: int): void; + + /** + * Reads raw data from this {@link MessageSequence} object. +@@ -2222,16 +2259,17 @@ declare namespace rpc { + /** + * Reads raw data from this {@link MessageSequence} object. + * +- * @param { number } size - Size of the raw data to read. ++ * @param { int } size - Size of the raw data to read. + * @returns { ArrayBuffer } Return the raw data obtained, in bytes. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.The number of parameters is incorrect; + * 2.The parameter type does not match. + * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readRawDataBuffer(size: number): ArrayBuffer; ++ readRawDataBuffer(size: int): ArrayBuffer; + + /** + * Writes the data in an ArrayBuffer object into this {@Link MessageSequence} object. +@@ -2321,7 +2359,8 @@ declare namespace rpc { + * object will be marshalled. + * @returns { boolean } Return {@code true} if the marshalling is successful; return {@code false} otherwise. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + marshalling(dataOut: MessageSequence): boolean; + +@@ -2332,7 +2371,8 @@ declare namespace rpc { + * which the {@code Parcelable} object has been marshalled. + * @returns { boolean } Return {@code true} if the unmarshalling is successful; return {@code false} otherwise. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + unmarshalling(dataIn: MessageSequence): boolean; + } +@@ -2399,26 +2439,29 @@ declare namespace rpc { + * + * @typedef RequestResult + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface RequestResult { + /** + * Error code. 0 indicates successful, otherwise it is failed. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- errCode: number; ++ errCode: int; + + /** + * Message code. It is same as the code in {@link SendRequest} method. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- code: number; ++ code: int; + + /** + * MessageSequence object sent to the peer process. +@@ -2426,7 +2469,8 @@ declare namespace rpc { + * + * @type { MessageSequence } + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + data: MessageSequence; + +@@ -2436,7 +2480,8 @@ declare namespace rpc { + * + * @type { MessageSequence } + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + reply: MessageSequence; + } +@@ -2538,7 +2583,7 @@ declare namespace rpc { + * a promise will be fulfilled when the response to sendMessageRequest is returned, + * and the reply message contains the returned information. + * +- * @param { number } code - Message code called by the request, which is determined by the client and server. ++ * @param { int } code - Message code called by the request, which is determined by the client and server. + * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. + * @param {MessageSequence } data - {@link MessageSequence} object holding the data to send. + * @param {MessageSequence } reply - {@link MessageSequence} object that receives the response. +@@ -2549,10 +2594,11 @@ declare namespace rpc { + * 2.The parameter type does not match; + * 3.Failed to obtain the passed object instance. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + sendMessageRequest( +- code: number, ++ code: int, + data: MessageSequence, + reply: MessageSequence, + options: MessageOption +@@ -2591,7 +2637,7 @@ declare namespace rpc { + * a callback will be invoked when the response to sendMessageRequest is returned, + * and the reply message contains the returned information. + * +- * @param {number } code - Message code called by the request, which is determined by the client and server. ++ * @param {int } code - Message code called by the request, which is determined by the client and server. + * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. + * @param { MessageSequence } data - {@link MessageSequence} object holding the data to send. + * @param { MessageSequence } reply - {@link MessageSequence} object that receives the response. +@@ -2602,10 +2648,11 @@ declare namespace rpc { + * 2.The parameter type does not match; + * 3.Failed to obtain the passed object instance. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + sendMessageRequest( +- code: number, ++ code: int, + data: MessageSequence, + reply: MessageSequence, + options: MessageOption, +@@ -2630,7 +2677,7 @@ declare namespace rpc { + * Register a callback used to receive notifications of the death of a remote object. + * + * @param { DeathRecipient } recipient - Indicates the callback to be registered. +- * @param { number } flags - Indicates the flag of the death notification. ++ * @param { int } flags - Indicates the flag of the death notification. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.The number of parameters is incorrect; + * 2.The parameter type does not match; +@@ -2638,9 +2685,10 @@ declare namespace rpc { + * @throws { BusinessError } 1900005 - Operation allowed only for the proxy object. + * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- registerDeathRecipient(recipient: DeathRecipient, flags: number): void; ++ registerDeathRecipient(recipient: DeathRecipient, flags: int): void; + + /** + * Unregister a callback used to receive notifications of the death of a remote object. +@@ -2660,7 +2708,7 @@ declare namespace rpc { + * Unregister a callback used to receive notifications of the death of a remote object. + * + * @param { DeathRecipient } recipient - Indicates the callback to be unregister. +- * @param { number } flags - Indicates the flag of the death notification. ++ * @param { int } flags - Indicates the flag of the death notification. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.The number of parameters is incorrect; + * 2.The parameter type does not match; +@@ -2668,9 +2716,10 @@ declare namespace rpc { + * @throws { BusinessError } 1900005 - Operation allowed only for the proxy object. + * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- unregisterDeathRecipient(recipient: DeathRecipient, flags: number): void; ++ unregisterDeathRecipient(recipient: DeathRecipient, flags: int): void; + + /** + * Obtains the interface descriptor of an object. +@@ -2701,7 +2750,8 @@ declare namespace rpc { + * + * @returns { boolean } Return {@code true} if the object is dead; return {@code false} otherwise. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isObjectDead(): boolean; + } +@@ -2716,7 +2766,8 @@ declare namespace rpc { + * + * @typedef IRemoteBroker + * @syscap SystemCapability.Communication.IPC.Core +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface IRemoteBroker { + /** +@@ -2725,7 +2776,8 @@ declare namespace rpc { + * @returns { IRemoteObject } Return the RemoteObject if the caller is a RemoteObject; return the IRemoteObject, + * that is, the holder of this RemoteProxy object, if the caller is a RemoteProxy object. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + asObject(): IRemoteObject; + } +@@ -2747,14 +2799,16 @@ declare namespace rpc { + * + * @typedef DeathRecipient + * @syscap SystemCapability.Communication.IPC.Core +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface DeathRecipient { + /** + * Called to perform subsequent operations when a death notification of the remote object is received. + * + * @syscap SystemCapability.Communication.IPC.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onRemoteDied(): void; + } +@@ -2774,24 +2828,26 @@ declare namespace rpc { + /** + * Indicates synchronous call. + * +- * @type { number } ++ * @type { int } + * @default 0 + * @static + * @syscap SystemCapability.Communication.IPC.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static TF_SYNC: number; ++ static TF_SYNC: int; + + /** + * Indicates asynchronous call. + * +- * @type { number } ++ * @type { int } + * @default 1 + * @static + * @syscap SystemCapability.Communication.IPC.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static TF_ASYNC: number; ++ static TF_ASYNC: int; + + /** + * Indicates the sendRequest API for returning the file descriptor. +@@ -2815,24 +2871,25 @@ declare namespace rpc { + /** + * Indicates the wait time for RPC, in seconds. It is NOT used in IPC case. + * +- * @type { number } ++ * @type { int } + * @default 8 + * @static + * @syscap SystemCapability.Communication.IPC.Core +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static TF_WAIT_TIME: number; ++ static TF_WAIT_TIME: int; + + /** + * A constructor used to create a MessageOption instance. + * +- * @param { number } syncFlags - Specifies whether the SendRequest is called synchronously (default) or asynchronously. +- * @param { number } waitTime - Maximum wait time for a RPC call. The default value is TF_WAIT_TIME. ++ * @param { int } syncFlags - Specifies whether the SendRequest is called synchronously (default) or asynchronously. ++ * @param { int } waitTime - Maximum wait time for a RPC call. The default value is TF_WAIT_TIME. + * @syscap SystemCapability.Communication.IPC.Core + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- constructor(syncFlags?: number, waitTime?: number); ++ constructor(syncFlags?: int, waitTime?: int); + + /** + * A constructor used to create a MessageOption instance. +@@ -2877,18 +2934,20 @@ declare namespace rpc { + * @returns { boolean } Return {@code true} if the asynchronous call succeeds; + * return {@code false} if the synchronous call succeeds. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isAsync(): boolean; + + /** + * Sets the SendRequest call flag, which can be synchronous or asynchronous. + * +- * @param { boolean } async - Indicates the call flag, which can be synchronous or asynchronous. ++ * @param { boolean } isAsync - Indicates the call flag, which can be synchronous or asynchronous. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- setAsync(async: boolean): void; ++ setAsync(isAsync: boolean): void; + + /** + * Obtains the maximum wait time for this RPC call. +@@ -2989,7 +3048,7 @@ declare namespace rpc { + *

    This method is implemented by the remote service provider. You need to override this method with + * your own service logic when you are using IPC. + * +- * @param { number } code - Indicates the service request code sent from the peer end. ++ * @param { int } code - Indicates the service request code sent from the peer end. + * @param { MessageSequence } data - Indicates the {@link MessageParcel} object sent from the peer end. + * @param { MessageSequence } reply - Indicates the response message object sent from the remote service. + * The local service writes the response data to the {@link MessageParcel} object. +@@ -3003,7 +3062,7 @@ declare namespace rpc { + * @arkts 1.1&1.2 + */ + onRemoteMessageRequest( +- code: number, ++ code: int, + data: MessageSequence, + reply: MessageSequence, + options: MessageOption +@@ -3075,7 +3134,7 @@ declare namespace rpc { + * a promise will be fulfilled when the response to sendMessageRequest is returned, + * and the reply message contains the returned information. + * +- * @param { number } code - Message code called by the request, which is determined by the client and server. ++ * @param { int } code - Message code called by the request, which is determined by the client and server. + * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. + * @param { MessageSequence } data - {@link MessageSequence} object holding the data to send. + * @param { MessageSequence } reply - {@link MessageSequence} object that receives the response. +@@ -3086,10 +3145,11 @@ declare namespace rpc { + * 2.The parameter type does not match; + * 3.Failed to obtain the passed object instance. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + sendMessageRequest( +- code: number, ++ code: int, + data: MessageSequence, + reply: MessageSequence, + options: MessageOption +@@ -3128,7 +3188,7 @@ declare namespace rpc { + * a callback will be invoked when the response to sendMessageRequest is returned, + * and the reply message contains the returned information. + * +- * @param { number } code - Message code called by the request, which is determined by the client and server. ++ * @param { int } code - Message code called by the request, which is determined by the client and server. + * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. + * @param { MessageSequence } data - {@link MessageSequence} object holding the data to send. + * @param { MessageSequence } reply - {@link MessageSequence} object that receives the response. +@@ -3139,10 +3199,11 @@ declare namespace rpc { + * 2.The parameter type does not match; + * 3.Failed to obtain the passed object instance. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + sendMessageRequest( +- code: number, ++ code: int, + data: MessageSequence, + reply: MessageSequence, + options: MessageOption, +@@ -3152,20 +3213,22 @@ declare namespace rpc { + /** + * Obtains the PID of the {@link RemoteProxy} object. + * +- * @returns { number } Return the PID of the {@link RemoteProxy} object. ++ * @returns { int } Return the PID of the {@link RemoteProxy} object. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getCallingPid(): number; ++ getCallingPid(): int; + + /** + * Obtains the UID of the {@link RemoteProxy} object. + * +- * @returns { number } Return the UID of the {@link RemoteProxy} object. ++ * @returns { int } Return the UID of the {@link RemoteProxy} object. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getCallingUid(): number; ++ getCallingUid(): int; + + /** + * Modifies the description of the current {@code RemoteObject}. +@@ -3310,7 +3373,7 @@ declare namespace rpc { + * Register a callback used to receive death notifications of a remote object. + * + * @param { DeathRecipient } recipient - Indicates the callback to be registered. +- * @param { number } flags - Indicates the flag of the death notification. This is a reserved parameter. ++ * @param { int } flags - Indicates the flag of the death notification. This is a reserved parameter. + * Set it to {@code 0}. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.The number of parameters is incorrect; +@@ -3318,9 +3381,10 @@ declare namespace rpc { + * 3.The callback used to receive remote object death notifications is empty. + * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- registerDeathRecipient(recipient: DeathRecipient, flags: number): void; ++ registerDeathRecipient(recipient: DeathRecipient, flags: int): void; + + /** + * Unregister a callback used to receive death notifications of a remote object. +@@ -3341,7 +3405,7 @@ declare namespace rpc { + * Unregister a callback used to receive death notifications of a remote object. + * + * @param { DeathRecipient } recipient - Indicates the callback to be unregister. +- * @param { number } flags - Indicates the flag of the death notification. This is a reserved parameter. ++ * @param { int } flags - Indicates the flag of the death notification. This is a reserved parameter. + * Set it to {@code 0}. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.The number of parameters is incorrect; +@@ -3349,9 +3413,10 @@ declare namespace rpc { + * 3.The callback used to receive remote object death notifications is empty. + * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- unregisterDeathRecipient(recipient: DeathRecipient, flags: number): void; ++ unregisterDeathRecipient(recipient: DeathRecipient, flags: int): void; + + /** + * Queries the interface descriptor of remote object. +@@ -3424,7 +3489,7 @@ declare namespace rpc { + * a promise will be fulfilled when the response to sendMessageRequest is returned, + * and the reply message contains the returned information. + * +- * @param { number } code - Message code called by the request, which is determined by the client and server. ++ * @param { int } code - Message code called by the request, which is determined by the client and server. + * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. + * @param { MessageSequence } data - {@link MessageSequence} object holding the data to send. + * @param { MessageSequence } reply - {@link MessageSequence} object that receives the response. +@@ -3435,10 +3500,11 @@ declare namespace rpc { + * 2.The parameter type does not match; + * 3.Failed to obtain the passed object instance. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + sendMessageRequest( +- code: number, ++ code: int, + data: MessageSequence, + reply: MessageSequence, + options: MessageOption +@@ -3477,7 +3543,7 @@ declare namespace rpc { + * a callback will be invoked when the response to sendRequest is returned, + * and the reply message contains the returned information. + * +- * @param { number } code - Message code called by the request, which is determined by the client and server. ++ * @param { int } code - Message code called by the request, which is determined by the client and server. + * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. + * @param { MessageSequence } data - {@link MessageSequence} object holding the data to send. + * @param { MessageSequence } reply - {@link MessageSequence} object that receives the response. +@@ -3488,10 +3554,11 @@ declare namespace rpc { + * 2.The parameter type does not match; + * 3.Failed to obtain the passed object instance. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + sendMessageRequest( +- code: number, ++ code: int, + data: MessageSequence, + reply: MessageSequence, + options: MessageOption, +@@ -3503,7 +3570,8 @@ declare namespace rpc { + * + * @returns { boolean } Return {@code true} if the {@code RemoteObject} is dead; return {@code false} otherwise. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isObjectDead(): boolean; + } +@@ -3517,7 +3585,8 @@ declare namespace rpc { + * peer device IDs, and checking whether the API call is on the same device. + * + * @syscap SystemCapability.Communication.IPC.Core +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class IPCSkeleton { + /** +@@ -3526,7 +3595,8 @@ declare namespace rpc { + * + * @returns { IRemoteObject } Return an {@link IRemoteObject} reference of the registered service. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + static getContextObject(): IRemoteObject; + +@@ -3538,11 +3608,13 @@ declare namespace rpc { + * {@code 0} is returned; if this method is called from the {@link RemoteObject} object, + * the PID of the corresponding {@link RemoteProxy} object is returned. + * +- * @returns { number } Return the PID of the proxy. ++ * @returns { int } Return the PID of the proxy. ++ * @static + * @syscap SystemCapability.Communication.IPC.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static getCallingPid(): number; ++ static getCallingPid(): int; + + /** + * Obtains the UID of a proxy. +@@ -3552,21 +3624,25 @@ declare namespace rpc { + * {@code 0} is returned; if this method is called from the {@link RemoteObject} object, + * the UID of the corresponding {@link RemoteProxy} object is returned. + * +- * @returns { number } Return the UID of the proxy. ++ * @returns { int } Return the UID of the proxy. ++ * @static + * @syscap SystemCapability.Communication.IPC.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static getCallingUid(): number; ++ static getCallingUid(): int; + + /** + * Obtains the TOKENID. + *

    This method is static. + * +- * @returns { number } Return the TOKENID. ++ * @returns { long } Return the TOKENID. ++ * @static + * @syscap SystemCapability.Communication.IPC.Core +- * @since 8 ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static getCallingTokenId(): number; ++ static getCallingTokenId(): long; + + /** + * Obtains the ID of the device where the peer process resides. +@@ -3675,7 +3751,8 @@ declare namespace rpc { + * obtaining the Ashmem size, and setting Ashmem protection. + * + * @syscap SystemCapability.Communication.IPC.Core +- * @since 8 ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + class Ashmem { + /** +@@ -3739,17 +3816,19 @@ declare namespace rpc { + * Creates an Ashmem object with the specified name and size. + * + * @param { string } name - Name of the Ashmem object to create. +- * @param { number } size - Size (in bytes) of the Ashmem object to create. ++ * @param { int } size - Size (in bytes) of the Ashmem object to create. + * @returns { Ashmem } Return the Ashmem object if it is created successfully; return null otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.The number of parameters is incorrect; + * 2.The parameter type does not match; + * 3.The Ashmem name passed is empty; + * 4.The Ashmem size passed is less than or equal to 0. ++ * @static + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static create(name: string, size: number): Ashmem; ++ static create(name: string, size: int): Ashmem; + + /** + * Creates an Ashmem object by copying the file descriptor (FD) of an existing Ashmem object. +@@ -3775,7 +3854,8 @@ declare namespace rpc { + * 2.The passed parameter is not an Ahmem object; + * 3.The ashmem instance for obtaining packaging is empty. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + static create(ashmem: Ashmem): Ashmem; + +@@ -3798,11 +3878,12 @@ declare namespace rpc { + /** + * Obtains the mapped memory size of this Ashmem object. + * +- * @returns { number } Memory size mapped. ++ * @returns { int } Memory size mapped. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 8 ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- getAshmemSize(): number; ++ getAshmemSize(): int; + + /** + * Creates the shared file mapping on the virtual address space of this process. +@@ -3848,7 +3929,8 @@ declare namespace rpc { + * + * @throws { BusinessError } 1900001 - Failed to call mmap. + * @syscap SystemCapability.Communication.IPC.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + mapReadWriteAshmem(): void; + +diff --git a/api/@ohos.runningLock.d.ts b/api/@ohos.runningLock.d.ts +index ebbeb5d2d..7e540367b 100644 +--- a/api/@ohos.runningLock.d.ts ++++ b/api/@ohos.runningLock.d.ts +@@ -19,9 +19,6 @@ + */ + + import { AsyncCallback, BusinessError } from './@ohos.base'; +-/*** if arkts 1.1 */ +-import { int } from './@ohos.base'; +-/*** endif */ + + /** + * Provides a mechanism to prevent the system from hibernating so that the applications can run in the background or +@@ -131,7 +128,7 @@ declare namespace runningLock { + * {@link BACKGROUND} ensures that applications can run in the background. + * {@link PROXIMITY_SCREEN_CONTROL} determines whether to turn on or off the screen based on the proximity sensor. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.PowerManager.PowerManager.Core + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 +@@ -155,7 +152,7 @@ declare namespace runningLock { + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- PROXIMITY_SCREEN_CONTROL ++ PROXIMITY_SCREEN_CONTROL = 2 + } + + /** +@@ -194,7 +191,8 @@ declare namespace runningLock { + * 2. Parameter verification failed. + * @throws { BusinessError } 4900101 - Failed to connect to the service. + * @syscap SystemCapability.PowerManager.PowerManager.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isSupported(type: RunningLockType): boolean; + +diff --git a/api/@ohos.security.cert.d.ts b/api/@ohos.security.cert.d.ts +index adf096ddd..80579c7ef 100644 +--- a/api/@ohos.security.cert.d.ts ++++ b/api/@ohos.security.cert.d.ts +@@ -17,9 +17,6 @@ + * @file + * @kit DeviceCertificateKit + */ +-/*** if arkts 1.1 */ +-import { int, long } from './@ohos.base'; +-/*** endif */ + import type { AsyncCallback } from './@ohos.base'; + import cryptoFramework from './@ohos.security.cryptoFramework'; + +@@ -430,7 +427,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface DataArray { + /** +@@ -455,7 +453,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + data: Array; + } +@@ -575,7 +574,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum CertItemType { + /** +@@ -597,7 +597,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CERT_ITEM_TYPE_TBS = 0, + +@@ -620,7 +621,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CERT_ITEM_TYPE_PUBLIC_KEY = 1, + +@@ -643,7 +645,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CERT_ITEM_TYPE_ISSUER_UNIQUE_ID = 2, + +@@ -666,7 +669,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CERT_ITEM_TYPE_SUBJECT_UNIQUE_ID = 3, + +@@ -689,7 +693,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CERT_ITEM_TYPE_EXTENSIONS = 4 + } +@@ -716,7 +721,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum ExtensionOidType { + /** +@@ -738,7 +744,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EXTENSION_OID_TYPE_ALL = 0, + +@@ -761,7 +768,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EXTENSION_OID_TYPE_CRITICAL = 1, + +@@ -784,7 +792,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EXTENSION_OID_TYPE_UNCRITICAL = 2 + } +@@ -811,7 +820,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum ExtensionEntryType { + /** +@@ -833,7 +843,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EXTENSION_ENTRY_TYPE_ENTRY = 0, + +@@ -856,7 +867,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EXTENSION_ENTRY_TYPE_ENTRY_CRITICAL = 1, + +@@ -879,7 +891,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EXTENSION_ENTRY_TYPE_ENTRY_VALUE = 2 + } +@@ -1077,7 +1090,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum EncodingType { + /** +@@ -1086,7 +1100,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ENCODING_UTF8 = 0 + } +@@ -1352,7 +1367,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + checkValidityWithDate(date: string): void; + +@@ -1378,7 +1394,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getVersion(): int; + +@@ -1418,7 +1435,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getCertSerialNumber(): bigint; + +@@ -1453,7 +1471,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getIssuerName(): DataBlob; + +@@ -1492,7 +1511,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSubjectName(encodingType?: EncodingType): DataBlob; + +@@ -1527,7 +1547,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getNotBeforeTime(): string; + +@@ -1562,7 +1583,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getNotAfterTime(): string; + +@@ -1597,7 +1619,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSignature(): DataBlob; + +@@ -1632,7 +1655,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSignatureAlgName(): string; + +@@ -1667,7 +1691,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSignatureAlgOid(): string; + +@@ -1705,7 +1730,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSignatureAlgParams(): DataBlob; + +@@ -1737,7 +1763,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getKeyUsage(): DataBlob; + +@@ -1772,7 +1799,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getExtKeyUsage(): DataArray; + +@@ -1798,7 +1826,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getBasicConstraints(): int; + +@@ -1833,7 +1862,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSubjectAltNames(): DataArray; + +@@ -1868,7 +1898,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getIssuerAltNames(): DataArray; + +@@ -1912,7 +1943,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getItem(itemType: CertItemType): DataBlob; + +@@ -1941,7 +1973,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + match(param: X509CertMatchParameters): boolean; + +@@ -1955,7 +1988,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getCRLDistributionPoint(): DataArray; + +@@ -1969,7 +2003,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getIssuerX500DistinguishedName(): X500DistinguishedName; + +@@ -1983,7 +2018,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSubjectX500DistinguishedName(): X500DistinguishedName; + +@@ -1997,7 +2033,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + toString(): string; + +@@ -2011,7 +2048,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + hashCode(): Uint8Array; + +@@ -2025,7 +2063,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getExtensionsObject(): CertExtension; + } +@@ -2142,7 +2181,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface CertExtension { + /** +@@ -2176,7 +2216,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getEncoded(): EncodingBlob; + +@@ -2220,7 +2261,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getOidList(valueType: ExtensionOidType): DataArray; + +@@ -2267,7 +2309,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getEntry(valueType: ExtensionEntryType, oid: DataBlob): DataBlob; + +@@ -2308,7 +2351,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + checkCA(): int; + +@@ -2333,7 +2377,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + hasUnsupportedCriticalExtension(): boolean; + } +@@ -2378,7 +2423,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function createCertExtension(inStream: EncodingBlob, callback: AsyncCallback): void; + +@@ -2422,7 +2468,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function createCertExtension(inStream: EncodingBlob): Promise; + +@@ -2523,7 +2570,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface X509CRLEntry { + /** +@@ -2551,7 +2599,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getEncoded(callback: AsyncCallback): void; + +@@ -2580,7 +2629,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getEncoded(): Promise; + +@@ -2605,7 +2655,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSerialNumber(): bigint; + +@@ -2632,7 +2683,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getCertIssuer(): DataBlob; + +@@ -2657,7 +2709,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getRevocationDate(): string; + +@@ -2682,7 +2735,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getExtensions(): DataBlob; + +@@ -2707,7 +2761,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + hasExtensions(): boolean; + +@@ -2721,7 +2776,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getCertIssuerX500DistinguishedName(): X500DistinguishedName; + +@@ -2735,7 +2791,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + toString(): string; + +@@ -2749,7 +2806,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + hashCode(): Uint8Array; + +@@ -2763,7 +2821,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getExtensionsObject(): CertExtension; + } +@@ -3101,7 +3160,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface X509CRL { + /** +@@ -3125,7 +3185,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isRevoked(cert: X509Cert): boolean; + +@@ -3144,7 +3205,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getType(): string; + +@@ -3173,7 +3235,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getEncoded(callback: AsyncCallback): void; + +@@ -3202,7 +3265,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getEncoded(): Promise; + +@@ -3229,7 +3293,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + verify(key: cryptoFramework.PubKey, callback: AsyncCallback): void; + +@@ -3256,7 +3321,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + verify(key: cryptoFramework.PubKey): Promise; + +@@ -3275,7 +3341,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getVersion(): int; + +@@ -3300,7 +3367,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getIssuerName(): DataBlob; + +@@ -3325,7 +3393,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getLastUpdate(): string; + +@@ -3350,7 +3419,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getNextUpdate(): string; + +@@ -3379,7 +3449,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getRevokedCert(serialNumber: bigint): X509CRLEntry; + +@@ -3408,7 +3479,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getRevokedCertWithCert(cert: X509Cert): X509CRLEntry; + +@@ -3435,7 +3507,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getRevokedCerts(callback: AsyncCallback>): void; + +@@ -3462,7 +3535,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getRevokedCerts(): Promise>; + +@@ -3487,7 +3561,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getTBSInfo(): DataBlob; + +@@ -3512,7 +3587,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSignature(): DataBlob; + +@@ -3537,7 +3613,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSignatureAlgName(): string; + +@@ -3562,7 +3639,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSignatureAlgOid(): string; + +@@ -3589,7 +3667,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSignatureAlgParams(): DataBlob; + +@@ -3614,7 +3693,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getExtensions(): DataBlob; + +@@ -3643,7 +3723,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + match(param: X509CRLMatchParameters): boolean; + +@@ -3657,7 +3738,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getIssuerX500DistinguishedName(): X500DistinguishedName; + +@@ -3671,7 +3753,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + toString(): string; + +@@ -3685,7 +3768,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + hashCode(): Uint8Array; + +@@ -3699,7 +3783,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getExtensionsObject(): CertExtension; + } +@@ -3731,7 +3816,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function createX509CRL(inStream: EncodingBlob, callback: AsyncCallback): void; + +@@ -3762,7 +3848,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function createX509CRL(inStream: EncodingBlob): Promise; + +@@ -4004,7 +4091,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum GeneralNameType { + /** +@@ -4013,7 +4101,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + GENERAL_NAME_TYPE_OTHER_NAME = 0, + +@@ -4023,7 +4112,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + GENERAL_NAME_TYPE_RFC822_NAME = 1, + +@@ -4033,7 +4123,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + GENERAL_NAME_TYPE_DNS_NAME = 2, + +@@ -4043,7 +4134,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + GENERAL_NAME_TYPE_X400_ADDRESS = 3, + +@@ -4053,7 +4145,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + GENERAL_NAME_TYPE_DIRECTORY_NAME = 4, + +@@ -4063,7 +4156,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + GENERAL_NAME_TYPE_EDI_PARTY_NAME = 5, + +@@ -4073,7 +4167,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + GENERAL_NAME_TYPE_UNIFORM_RESOURCE_ID = 6, + +@@ -4083,7 +4178,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + GENERAL_NAME_TYPE_IP_ADDRESS = 7, + +@@ -4093,7 +4189,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + GENERAL_NAME_TYPE_REGISTERED_ID = 8 + } +@@ -4105,7 +4202,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface GeneralName { + /** +@@ -4115,7 +4213,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type: GeneralNameType; + +@@ -4126,7 +4225,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + name?: Uint8Array; + } +@@ -4146,7 +4246,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface X509CertMatchParameters { + /** +@@ -4159,7 +4260,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + subjectAlternativeNames?: Array; + +@@ -4173,7 +4275,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + matchAllSubjectAltNames?: boolean; + +@@ -4187,7 +4290,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + authorityKeyIdentifier?: Uint8Array; + +@@ -4202,7 +4306,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + minPathLenConstraint?: int; + +@@ -4227,7 +4332,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + x509Cert?: X509Cert; + +@@ -4252,7 +4358,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + validDate?: string; + +@@ -4277,7 +4384,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + issuer?: Uint8Array; + +@@ -4292,7 +4400,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + extendedKeyUsage?: Array; + +@@ -4307,7 +4416,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + nameConstraints?: Uint8Array; + +@@ -4322,7 +4432,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + certPolicy?: Array; + +@@ -4337,7 +4448,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + privateKeyValid?: string; + +@@ -4364,7 +4476,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + keyUsage?: Array; + +@@ -4389,7 +4502,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + serialNumber?: bigint; + +@@ -4414,7 +4528,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + subject?: Uint8Array; + +@@ -4428,7 +4543,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + subjectKeyIdentifier?: Uint8Array; + +@@ -4453,7 +4569,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + publicKey?: DataBlob; + +@@ -4478,7 +4595,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + publicKeyAlgID?: string; + } +@@ -4498,7 +4616,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface X509CRLMatchParameters { + /** +@@ -4522,7 +4641,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + issuer?: Array; + +@@ -4547,7 +4667,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + x509Cert?: X509Cert; + +@@ -4561,7 +4682,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + updateDateTime?: string; + +@@ -4575,7 +4697,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + maxCRL?: bigint; + +@@ -4589,7 +4712,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + minCRL?: bigint; + } +@@ -4609,7 +4733,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface CertCRLCollection { + /** +@@ -4637,7 +4762,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + selectCerts(param: X509CertMatchParameters): Promise>; + +@@ -4666,7 +4792,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + selectCerts(param: X509CertMatchParameters, callback: AsyncCallback>): void; + +@@ -4695,7 +4822,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + selectCRLs(param: X509CRLMatchParameters): Promise>; + +@@ -4724,7 +4852,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + selectCRLs(param: X509CRLMatchParameters, callback: AsyncCallback>): void; + } +@@ -4754,7 +4883,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function createCertCRLCollection(certs: Array, crls?: Array): CertCRLCollection; + +@@ -4773,7 +4903,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface X509CertChain { + /** +@@ -4799,7 +4930,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getCertList(): Array; + +@@ -4842,7 +4974,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + validate(param: CertChainValidationParameters): Promise; + +@@ -4885,7 +5018,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + validate(param: CertChainValidationParameters, callback: AsyncCallback): void; + +@@ -4899,7 +5033,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + toString(): string; + +@@ -4913,7 +5048,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + hashCode(): Uint8Array; + } +@@ -4945,7 +5081,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function createX509CertChain(inStream: EncodingBlob): Promise; + +@@ -4976,7 +5113,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function createX509CertChain(inStream: EncodingBlob, callback: AsyncCallback): void; + +@@ -5005,7 +5143,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function createX509CertChain(certs: Array): X509CertChain; + +@@ -5028,7 +5167,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function buildX509CertChain(param: CertChainBuildParameters): Promise; + +@@ -5039,7 +5179,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum EncodingBaseFormat { + /** +@@ -5048,7 +5189,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PEM = 0, + +@@ -5058,7 +5200,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DER = 1 + } +@@ -5070,7 +5213,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Pkcs12Data { + /** +@@ -5080,7 +5224,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + privateKey?: string | Uint8Array; + +@@ -5091,7 +5236,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + cert?: X509Cert; + +@@ -5102,7 +5248,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + otherCerts?: Array; + } +@@ -5114,7 +5261,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Pkcs12ParsingConfig { + /** +@@ -5124,7 +5272,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + password: string; + +@@ -5136,7 +5285,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + needsPrivateKey?: boolean; + +@@ -5148,7 +5298,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + privateKeyFormat?: EncodingBaseFormat; + +@@ -5160,7 +5311,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + needsCert?: boolean; + +@@ -5172,7 +5324,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + needsOtherCerts?: boolean; + } +@@ -5192,7 +5345,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function parsePkcs12(data: Uint8Array, config: Pkcs12ParsingConfig): Pkcs12Data; + +@@ -5216,7 +5370,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function createTrustAnchorsWithKeyStore(keystore: Uint8Array, pwd: string): Promise>; + +@@ -5239,7 +5394,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function createX500DistinguishedName(nameStr: string): Promise; + +@@ -5262,7 +5418,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function createX500DistinguishedName(nameDer: Uint8Array): Promise; + +@@ -5273,7 +5430,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface X500DistinguishedName { + /** +@@ -5286,7 +5444,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getName(): string; + +@@ -5303,7 +5462,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getName(type: string): Array; + +@@ -5317,7 +5477,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getEncoded(): EncodingBlob; + } +@@ -5337,7 +5498,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface X509TrustAnchor { + /** +@@ -5355,7 +5517,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CACert?: X509Cert; + +@@ -5374,7 +5537,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CAPubKey?: Uint8Array; + +@@ -5393,7 +5557,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CASubject?: Uint8Array; + +@@ -5404,7 +5569,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + nameConstraints?: Uint8Array; + } +@@ -5416,7 +5582,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum RevocationCheckOptions { + /** +@@ -5425,7 +5592,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + REVOCATION_CHECK_OPTION_PREFER_OCSP = 0, + +@@ -5435,7 +5603,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + REVOCATION_CHECK_OPTION_ACCESS_NETWORK, + +@@ -5447,7 +5616,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + REVOCATION_CHECK_OPTION_FALLBACK_NO_PREFER, + +@@ -5459,7 +5629,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + REVOCATION_CHECK_OPTION_FALLBACK_LOCAL + } +@@ -5471,7 +5642,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum ValidationPolicyType { + /** +@@ -5480,7 +5652,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + VALIDATION_POLICY_TYPE_X509 = 0, + +@@ -5490,7 +5663,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + VALIDATION_POLICY_TYPE_SSL + } +@@ -5502,7 +5676,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum KeyUsageType { + /** +@@ -5511,7 +5686,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYUSAGE_DIGITAL_SIGNATURE = 0, + +@@ -5521,7 +5697,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYUSAGE_NON_REPUDIATION, + +@@ -5531,7 +5708,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYUSAGE_KEY_ENCIPHERMENT, + +@@ -5541,7 +5719,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYUSAGE_DATA_ENCIPHERMENT, + +@@ -5551,7 +5730,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYUSAGE_KEY_AGREEMENT, + +@@ -5561,7 +5741,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYUSAGE_KEY_CERT_SIGN, + +@@ -5571,7 +5752,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYUSAGE_CRL_SIGN, + +@@ -5581,7 +5763,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYUSAGE_ENCIPHER_ONLY, + +@@ -5591,7 +5774,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + KEYUSAGE_DECIPHER_ONLY + } +@@ -5603,7 +5787,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface RevocationCheckParameter { + /** +@@ -5613,7 +5798,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ocspRequestExtension?: Array; + +@@ -5624,7 +5810,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ocspResponderURI?: string; + +@@ -5635,7 +5822,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ocspResponderCert?: X509Cert; + +@@ -5646,7 +5834,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ocspResponses?: Uint8Array; + +@@ -5657,7 +5846,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + crlDownloadURI?: string; + +@@ -5668,7 +5858,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + options?: Array; + +@@ -5680,7 +5871,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ocspDigest?: string; + } +@@ -5700,7 +5892,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface CertChainValidationParameters { + /** +@@ -5718,7 +5911,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + date?: string; + +@@ -5737,7 +5931,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + trustAnchors: Array; + +@@ -5756,7 +5951,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + certCRLs?: Array; + +@@ -5767,7 +5963,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + revocationCheckParam?: RevocationCheckParameter; + +@@ -5778,7 +5975,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + policy?: ValidationPolicyType; + +@@ -5789,7 +5987,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + sslHostname?: string; + +@@ -5800,7 +5999,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + keyUsage?: Array; + } +@@ -5820,7 +6020,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface CertChainValidationResult { + /** +@@ -5840,7 +6041,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly trustAnchor: X509TrustAnchor; + +@@ -5861,7 +6063,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly entityCert: X509Cert; + } +@@ -5873,7 +6076,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface CertChainBuildParameters { + /** +@@ -5883,7 +6087,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + certMatchParameters: X509CertMatchParameters; + +@@ -5894,7 +6099,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + maxLength?: int; + +@@ -5905,7 +6111,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + validationParameters: CertChainValidationParameters; + } +@@ -5917,7 +6124,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface CertChainBuildResult { + /** +@@ -5928,7 +6136,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly certChain: X509CertChain; + +@@ -5940,7 +6149,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly validationResult: CertChainValidationResult; + } +@@ -5952,7 +6162,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum CmsContentType { + /** +@@ -5961,7 +6172,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SIGNED_DATA = 0 + } +@@ -5973,7 +6185,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum CmsContentDataFormat { + /** +@@ -5982,7 +6195,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BINARY = 0, + +@@ -5992,7 +6206,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TEXT = 1 + } +@@ -6004,7 +6219,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum CmsFormat { + /** +@@ -6013,7 +6229,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PEM = 0, + +@@ -6023,7 +6240,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DER = 1 + } +@@ -6035,7 +6253,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface PrivateKeyInfo { + /** +@@ -6045,7 +6264,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + key: string | Uint8Array; + +@@ -6056,7 +6276,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + password?: string; + } +@@ -6068,7 +6289,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface CmsSignerConfig { + /** +@@ -6078,7 +6300,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + mdName: string; + +@@ -6090,7 +6313,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + addCert?: boolean; + +@@ -6102,7 +6326,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + addAttr?: boolean; + +@@ -6114,7 +6339,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + addSmimeCapAttr?: boolean; + } +@@ -6126,7 +6352,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface CmsGeneratorOptions { + /** +@@ -6137,7 +6364,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + contentDataFormat?: CmsContentDataFormat; + +@@ -6149,7 +6377,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + outFormat?: CmsFormat; + +@@ -6161,7 +6390,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isDetached?: boolean; + } +@@ -6173,7 +6403,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface CmsGenerator { + /** +@@ -6191,7 +6422,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + addSigner(cert: X509Cert, keyInfo: PrivateKeyInfo, config: CmsSignerConfig): void; + +@@ -6207,7 +6439,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + addCert(cert: X509Cert): void; + +@@ -6225,7 +6458,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + doFinal(data: Uint8Array, options?: CmsGeneratorOptions): Promise; + +@@ -6243,7 +6477,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + doFinalSync(data: Uint8Array, options?: CmsGeneratorOptions): Uint8Array | string; + } +@@ -6261,7 +6496,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function createCmsGenerator(contentType: CmsContentType): CmsGenerator; + +@@ -6272,7 +6508,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface CsrAttribute { + /** +@@ -6282,7 +6519,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type: string; + +@@ -6293,7 +6531,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + value: string; + } +@@ -6305,7 +6544,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface CsrGenerationConfig { + /** +@@ -6315,7 +6555,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + subject: X500DistinguishedName; + +@@ -6326,7 +6567,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + mdName: string; + +@@ -6337,7 +6579,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + attributes?: Array; + +@@ -6349,7 +6592,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + outFormat?: EncodingBaseFormat; + } +@@ -6369,7 +6613,8 @@ declare namespace cert { + * @syscap SystemCapability.Security.Cert + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function generateCsr(keyInfo: PrivateKeyInfo, config: CsrGenerationConfig): string | Uint8Array; + } +diff --git a/api/@ohos.security.certManager.d.ts b/api/@ohos.security.certManager.d.ts +index 278e77f5c..a2ed59800 100644 +--- a/api/@ohos.security.certManager.d.ts ++++ b/api/@ohos.security.certManager.d.ts +@@ -25,22 +25,25 @@ import type { AsyncCallback } from './@ohos.base'; + * + * @namespace certificateManager + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace certificateManager { + /** + * Enum for result code + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum CMErrorCode { + /** + * Indicates that the application has no permission to call the API. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_ERROR_NO_PERMISSION = 201, + +@@ -49,7 +52,8 @@ declare namespace certificateManager { + * + * @syscap SystemCapability.Security.CertificateManager + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_ERROR_NOT_SYSTEM_APP = 202, + +@@ -57,7 +61,8 @@ declare namespace certificateManager { + * Indicates that the input parameters are invalid. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_ERROR_INVALID_PARAMS = 401, + +@@ -65,7 +70,8 @@ declare namespace certificateManager { + * Indicates that internal error. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_ERROR_GENERIC = 17500001, + +@@ -73,7 +79,8 @@ declare namespace certificateManager { + * Indicates that the certificate does not exist. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_ERROR_NO_FOUND = 17500002, + +@@ -81,7 +88,8 @@ declare namespace certificateManager { + * Indicates that the keystore is in an invalid format or the keystore password is incorrect. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_ERROR_INCORRECT_FORMAT = 17500003, + +@@ -89,7 +97,8 @@ declare namespace certificateManager { + * Indicates that the number of certificates or credentials reaches the maximum allowed. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_ERROR_MAX_CERT_COUNT_REACHED = 17500004, + +@@ -97,7 +106,8 @@ declare namespace certificateManager { + * Indicates that the application is not authorized by the user. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_ERROR_NO_AUTHORIZATION = 17500005, + +@@ -105,7 +115,8 @@ declare namespace certificateManager { + * Indicates that the device enters advanced security mode. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_ERROR_DEVICE_ENTER_ADVSECMODE = 17500007 + } +@@ -115,7 +126,8 @@ declare namespace certificateManager { + * + * @typedef CertInfo + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface CertInfo { + /** +@@ -123,7 +135,8 @@ declare namespace certificateManager { + * + * @type { string } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + uri: string; + +@@ -132,7 +145,8 @@ declare namespace certificateManager { + * + * @type { string } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + certAlias: string; + +@@ -141,7 +155,8 @@ declare namespace certificateManager { + * + * @type { boolean } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + state: boolean; + +@@ -150,7 +165,8 @@ declare namespace certificateManager { + * + * @type { string } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + issuerName: string; + +@@ -159,7 +175,8 @@ declare namespace certificateManager { + * + * @type { string } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + subjectName: string; + +@@ -168,7 +185,8 @@ declare namespace certificateManager { + * + * @type { string } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + serial: string; + +@@ -177,7 +195,8 @@ declare namespace certificateManager { + * + * @type { string } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + notBefore: string; + +@@ -186,7 +205,8 @@ declare namespace certificateManager { + * + * @type { string } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + notAfter: string; + +@@ -195,7 +215,8 @@ declare namespace certificateManager { + * + * @type { string } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + fingerprintSha256: string; + +@@ -204,7 +225,8 @@ declare namespace certificateManager { + * + * @type { Uint8Array } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + cert: Uint8Array; + } +@@ -214,7 +236,8 @@ declare namespace certificateManager { + * + * @typedef CertAbstract + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface CertAbstract { + /** +@@ -222,7 +245,8 @@ declare namespace certificateManager { + * + * @type { string } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + uri: string; + +@@ -231,7 +255,8 @@ declare namespace certificateManager { + * + * @type { string } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + certAlias: string; + +@@ -240,7 +265,8 @@ declare namespace certificateManager { + * + * @type { boolean } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + state: boolean; + +@@ -249,7 +275,8 @@ declare namespace certificateManager { + * + * @type { string } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + subjectName: string; + } +@@ -259,7 +286,8 @@ declare namespace certificateManager { + * + * @typedef Credential + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface Credential { + /** +@@ -267,7 +295,8 @@ declare namespace certificateManager { + * + * @type { string } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type: string; + +@@ -276,7 +305,8 @@ declare namespace certificateManager { + * + * @type { string } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + alias: string; + +@@ -285,34 +315,38 @@ declare namespace certificateManager { + * + * @type { string } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + keyUri: string; + + /** + * Indicates the number of certificates included in the credential. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- certNum: number; ++ certNum: int; + + /** + * Indicates the number of key included in the credential. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- keyNum: number; ++ keyNum: int; + + /** + * Indicates the credential binary data. + * + * @type { Uint8Array } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + credentialData: Uint8Array; + } +@@ -322,7 +356,8 @@ declare namespace certificateManager { + * + * @typedef CredentialAbstract + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface CredentialAbstract { + /** +@@ -330,7 +365,8 @@ declare namespace certificateManager { + * + * @type { string } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type: string; + +@@ -339,7 +375,8 @@ declare namespace certificateManager { + * + * @type { string } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + alias: string; + +@@ -348,7 +385,8 @@ declare namespace certificateManager { + * + * @type { string } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + keyUri: string; + } +@@ -358,7 +396,8 @@ declare namespace certificateManager { + * + * @typedef CMResult + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface CMResult { + /** +@@ -366,7 +405,8 @@ declare namespace certificateManager { + * + * @type { ?Array } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + certList?: Array; + +@@ -375,7 +415,8 @@ declare namespace certificateManager { + * + * @type { ?CertInfo } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + certInfo?: CertInfo; + +@@ -384,7 +425,8 @@ declare namespace certificateManager { + * + * @type { ?Array } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + credentialList?: Array; + +@@ -393,7 +435,8 @@ declare namespace certificateManager { + * + * @type { ?Credential } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + credential?: Credential; + +@@ -402,7 +445,8 @@ declare namespace certificateManager { + * + * @type { ?Array } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + appUidList?: Array; + +@@ -411,7 +455,8 @@ declare namespace certificateManager { + * + * @type { ?string } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + uri?: string; + +@@ -420,7 +465,8 @@ declare namespace certificateManager { + * + * @type { ?Uint8Array } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + outData?: Uint8Array; + } +@@ -428,16 +474,18 @@ declare namespace certificateManager { + /** + * Enum for Key Purpose + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum CmKeyPurpose { + /** + * Indicates that key for signature. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_KEY_PURPOSE_SIGN = 4, + +@@ -445,7 +493,8 @@ declare namespace certificateManager { + * Indicates that key for verify. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_KEY_PURPOSE_VERIFY = 8 + } +@@ -453,16 +502,18 @@ declare namespace certificateManager { + /** + * Enum for Key Digest + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum CmKeyDigest { + /** + * Indicates that key digest is none. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_DIGEST_NONE = 0, + +@@ -470,7 +521,8 @@ declare namespace certificateManager { + * Indicates that key digest is md5. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_DIGEST_MD5 = 1, + +@@ -478,7 +530,8 @@ declare namespace certificateManager { + * Indicates that key digest is sha1. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_DIGEST_SHA1 = 2, + +@@ -486,7 +539,8 @@ declare namespace certificateManager { + * Indicates that key digest is sha224. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_DIGEST_SHA224 = 3, + +@@ -494,7 +548,8 @@ declare namespace certificateManager { + * Indicates that key digest is sha256. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_DIGEST_SHA256 = 4, + +@@ -502,7 +557,8 @@ declare namespace certificateManager { + * Indicates that key digest is sha384. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_DIGEST_SHA384 = 5, + +@@ -510,7 +566,8 @@ declare namespace certificateManager { + * Indicates that key digest is sha512. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_DIGEST_SHA512 = 6, + +@@ -518,7 +575,8 @@ declare namespace certificateManager { + * Indicates that key digest is SM3. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_DIGEST_SM3 = 7 + } +@@ -526,16 +584,18 @@ declare namespace certificateManager { + /** + * Enum for Key Padding + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum CmKeyPadding { + /** + * Indicates that key padding is none. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_PADDING_NONE = 0, + +@@ -543,7 +603,8 @@ declare namespace certificateManager { + * Indicates that key padding is PSS. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_PADDING_PSS = 1, + +@@ -551,7 +612,8 @@ declare namespace certificateManager { + * Indicates that key padding is PKCS1_V1_5. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CM_PADDING_PKCS1_V1_5 = 2 + } +@@ -561,7 +623,8 @@ declare namespace certificateManager { + * + * @typedef CMSignatureSpec + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface CMSignatureSpec { + /** +@@ -569,7 +632,8 @@ declare namespace certificateManager { + * + * @type { CmKeyPurpose } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + purpose: CmKeyPurpose; + +@@ -578,7 +642,8 @@ declare namespace certificateManager { + * + * @type { ?CmKeyPadding } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + padding?: CmKeyPadding; + +@@ -587,7 +652,8 @@ declare namespace certificateManager { + * + * @type { ?CmKeyDigest } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + digest?: CmKeyDigest; + } +@@ -597,7 +663,8 @@ declare namespace certificateManager { + * + * @typedef CMHandle + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface CMHandle { + /** +@@ -605,7 +672,8 @@ declare namespace certificateManager { + * + * @type { Uint8Array } + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + handle: Uint8Array; + } +@@ -641,7 +709,8 @@ declare namespace certificateManager { + * @throws { BusinessError } 17500003 - The keystore is in an invalid format or the keystore password is incorrect. + * @throws { BusinessError } 17500004 - The number of certificates or credentials reaches the maximum allowed. + * @syscap SystemCapability.Security.CertificateManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function installPrivateCertificate( + keystore: Uint8Array, +@@ -681,7 +750,8 @@ declare namespace certificateManager { + * @throws { BusinessError } 17500003 - The keystore is in an invalid format or the keystore password is incorrect. + * @throws { BusinessError } 17500004 - The number of certificates or credentials reaches the maximum allowed. + * @syscap SystemCapability.Security.CertificateManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function installPrivateCertificate(keystore: Uint8Array, keystorePwd: string, certAlias: string): Promise; + +@@ -697,7 +767,8 @@ declare namespace certificateManager { + * @throws { BusinessError } 17500001 - Internal error. + * @throws { BusinessError } 17500002 - The certificate does not exist. + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function uninstallPrivateCertificate(keyUri: string, callback: AsyncCallback): void; + +@@ -713,7 +784,8 @@ declare namespace certificateManager { + * @throws { BusinessError } 17500001 - Internal error. + * @throws { BusinessError } 17500002 - The certificate does not exist. + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function uninstallPrivateCertificate(keyUri: string): Promise; + +@@ -729,7 +801,8 @@ declare namespace certificateManager { + * @throws { BusinessError } 17500001 - Internal error. + * @syscap SystemCapability.Security.CertificateManager + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAllAppPrivateCertificates(callback: AsyncCallback): void; + +@@ -743,7 +816,8 @@ declare namespace certificateManager { + * @throws { BusinessError } 17500001 - Internal error. + * @syscap SystemCapability.Security.CertificateManager + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAllAppPrivateCertificates(): Promise; + +@@ -759,7 +833,8 @@ declare namespace certificateManager { + * @throws { BusinessError } 17500001 - Internal error. + * @throws { BusinessError } 17500002 - The certificate does not exist. + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getPrivateCertificate(keyUri: string, callback: AsyncCallback): void; + +@@ -775,7 +850,8 @@ declare namespace certificateManager { + * @throws { BusinessError } 17500001 - Internal error. + * @throws { BusinessError } 17500002 - The certificate does not exist. + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getPrivateCertificate(keyUri: string): Promise; + +@@ -808,7 +884,8 @@ declare namespace certificateManager { + * @throws { BusinessError } 17500002 - The certificate does not exist. + * @throws { BusinessError } 17500005 - The application is not authorized by the user. + * @syscap SystemCapability.Security.CertificateManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function init(authUri: string, spec: CMSignatureSpec, callback: AsyncCallback): void; + +@@ -841,7 +918,8 @@ declare namespace certificateManager { + * @throws { BusinessError } 17500002 - The certificate does not exist. + * @throws { BusinessError } 17500005 - The application is not authorized by the user. + * @syscap SystemCapability.Security.CertificateManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function init(authUri: string, spec: CMSignatureSpec): Promise; + +@@ -857,7 +935,8 @@ declare namespace certificateManager { + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17500001 - Internal error. + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function update(handle: Uint8Array, data: Uint8Array, callback: AsyncCallback): void; + +@@ -873,7 +952,8 @@ declare namespace certificateManager { + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17500001 - Internal error. + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function update(handle: Uint8Array, data: Uint8Array): Promise; + +@@ -888,7 +968,8 @@ declare namespace certificateManager { + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17500001 - Internal error. + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function finish(handle: Uint8Array, callback: AsyncCallback): void; + +@@ -904,7 +985,8 @@ declare namespace certificateManager { + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17500001 - Internal error. + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function finish(handle: Uint8Array, signature: Uint8Array, callback: AsyncCallback): void; + +@@ -920,7 +1002,8 @@ declare namespace certificateManager { + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17500001 - Internal error. + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function finish(handle: Uint8Array, signature?: Uint8Array): Promise; + +@@ -935,7 +1018,8 @@ declare namespace certificateManager { + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17500001 - Internal error. + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function abort(handle: Uint8Array, callback: AsyncCallback): void; + +@@ -950,7 +1034,8 @@ declare namespace certificateManager { + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17500001 - Internal error. + * @syscap SystemCapability.Security.CertificateManager +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function abort(handle: Uint8Array): Promise; + +@@ -967,7 +1052,8 @@ declare namespace certificateManager { + * @throws { BusinessError } 17500002 - The certificate does not exist. + * @throws { BusinessError } 17500005 - The application is not authorized by the user. + * @syscap SystemCapability.Security.CertificateManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getPublicCertificate(keyUri: string): Promise; + +@@ -982,7 +1068,8 @@ declare namespace certificateManager { + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17500001 - Internal error. + * @syscap SystemCapability.Security.CertificateManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isAuthorizedApp(keyUri: string): Promise; + +@@ -994,7 +1081,8 @@ declare namespace certificateManager { + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. + * @throws { BusinessError } 17500001 - Internal error. + * @syscap SystemCapability.Security.CertificateManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAllUserTrustedCertificates(): Promise; + +@@ -1009,7 +1097,8 @@ declare namespace certificateManager { + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17500001 - Internal error. + * @syscap SystemCapability.Security.CertificateManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAllUserTrustedCertificates(scope: CertScope): Promise; + +@@ -1025,7 +1114,8 @@ declare namespace certificateManager { + * @throws { BusinessError } 17500001 - Internal error. + * @throws { BusinessError } 17500002 - The certificate does not exist. + * @syscap SystemCapability.Security.CertificateManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getUserTrustedCertificate(certUri: string): Promise; + +@@ -1039,7 +1129,8 @@ declare namespace certificateManager { + * @throws { BusinessError } 17500001 - Internal error. + * @syscap SystemCapability.Security.CertificateManager + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAllSystemAppCertificates(): Promise; + +@@ -1051,23 +1142,26 @@ declare namespace certificateManager { + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. + * @throws { BusinessError } 17500001 - Internal error. + * @syscap SystemCapability.Security.CertificateManager +- * @since 13 ++ * @since arkts {'1.1':'13', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getPrivateCertificates(): Promise; + + /** + * Enum for certificate type managed by Certificate Manager. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Security.CertificateManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum CertType { + /** + * Indicates that ca certificate that installed by HarmonyOS system. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CA_CERT_SYSTEM = 0, + +@@ -1075,7 +1169,8 @@ declare namespace certificateManager { + * Indicates that ca certificate that installed by user. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CA_CERT_USER = 1 + } +@@ -1083,9 +1178,10 @@ declare namespace certificateManager { + /** + * Enum for the scope of user ca certificate. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Security.CertificateManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum CertScope { + +@@ -1093,7 +1189,8 @@ declare namespace certificateManager { + * Indicates that the user ca certificate for a current user. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CURRENT_USER = 1, + +@@ -1101,7 +1198,8 @@ declare namespace certificateManager { + * Indicates that the user ca certificate for all users. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + GLOBAL_USER = 2 + } +@@ -1111,7 +1209,8 @@ declare namespace certificateManager { + * + * @typedef CertStoreProperty + * @syscap SystemCapability.Security.CertificateManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface CertStoreProperty { + /** +@@ -1119,7 +1218,8 @@ declare namespace certificateManager { + * + * @type { CertType } + * @syscap SystemCapability.Security.CertificateManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + certType: CertType; + +@@ -1128,7 +1228,8 @@ declare namespace certificateManager { + * + * @type { ?CertScope } + * @syscap SystemCapability.Security.CertificateManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + certScope?: CertScope; + } +@@ -1142,7 +1243,8 @@ declare namespace certificateManager { + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17500001 - Internal error. + * @syscap SystemCapability.Security.CertificateManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getCertificateStorePath(property: CertStoreProperty): string; + +@@ -1161,7 +1263,8 @@ declare namespace certificateManager { + * @throws { BusinessError } 17500004 - Indicates that the number of certificates reaches the maximum allowed. + * @throws { BusinessError } 17500007 - Indicates that the device enters advanced security mode. In this mode, the user CA certificate cannot be installed. + * @syscap SystemCapability.Security.CertificateManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function installUserTrustedCertificateSync(cert: Uint8Array, certScope: CertScope) : CMResult; + +@@ -1176,7 +1279,8 @@ declare namespace certificateManager { + * @throws { BusinessError } 17500001 - Internal error. + * @throws { BusinessError } 17500002 - Indicates that the certificate does not exist. + * @syscap SystemCapability.Security.CertificateManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function uninstallUserTrustedCertificateSync(certUri: string) : void; + +@@ -1196,23 +1300,26 @@ declare namespace certificateManager { + * @throws { BusinessError } 17500003 - The keystore is in an invalid format or the keystore password is incorrect. + * @throws { BusinessError } 17500004 - The number of certificates or credentials reaches the maximum allowed. + * @syscap SystemCapability.Security.CertificateManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function installPrivateCertificate(keystore: Uint8Array, keystorePwd: string, certAlias: string, level: AuthStorageLevel): Promise; + + /** + * Enum for storage authentication level + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Security.CertificateManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum AuthStorageLevel { + /** + * Indicates that the file can be accessed after the device is started. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EL1 = 1, + +@@ -1220,7 +1327,8 @@ declare namespace certificateManager { + * Indicates that the file can be accessed after the device is unlocked for the first time. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EL2 = 2, + +@@ -1228,7 +1336,8 @@ declare namespace certificateManager { + * Indicates that the file can be accessed when the device is unlocked. + * + * @syscap SystemCapability.Security.CertificateManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + EL4 = 4, + } +diff --git a/api/@ohos.security.certManagerDialog.d.ts b/api/@ohos.security.certManagerDialog.d.ts +index 445f047e9..b3de7c203 100644 +--- a/api/@ohos.security.certManagerDialog.d.ts ++++ b/api/@ohos.security.certManagerDialog.d.ts +@@ -26,16 +26,18 @@ import type common from '@ohos.app.ability.common'; + * @namespace certificateManagerDialog + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 13 ++ * @since arkts {'1.1':'13', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace certificateManagerDialog { + /** + * Enum for result code + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 13 ++ * @since arkts {'1.1':'13', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum CertificateDialogErrorCode { + +@@ -44,7 +46,8 @@ declare namespace certificateManagerDialog { + * + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 13 ++ * @since arkts {'1.1':'13', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ERROR_GENERIC = 29700001, + +@@ -53,7 +56,8 @@ declare namespace certificateManagerDialog { + * + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ERROR_OPERATION_CANCELED = 29700002, + +@@ -62,7 +66,8 @@ declare namespace certificateManagerDialog { + * + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ERROR_OPERATION_FAILED = 29700003, + +@@ -71,7 +76,8 @@ declare namespace certificateManagerDialog { + * + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ERROR_DEVICE_NOT_SUPPORTED = 29700004, + +@@ -80,7 +86,8 @@ declare namespace certificateManagerDialog { + * + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ERROR_NOT_COMPLY_SECURITY_POLICY = 29700005, + } +@@ -89,10 +96,11 @@ declare namespace certificateManagerDialog { + /** + * Enum for page type of certificate manager dialog + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 13 ++ * @since arkts {'1.1':'13', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum CertificateDialogPageType { + /** +@@ -100,7 +108,8 @@ declare namespace certificateManagerDialog { + * + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 13 ++ * @since arkts {'1.1':'13', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PAGE_MAIN = 1, + +@@ -109,7 +118,8 @@ declare namespace certificateManagerDialog { + * + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 13 ++ * @since arkts {'1.1':'13', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PAGE_CA_CERTIFICATE = 2, + +@@ -118,7 +128,8 @@ declare namespace certificateManagerDialog { + * + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 13 ++ * @since arkts {'1.1':'13', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PAGE_CREDENTIAL = 3, + +@@ -127,7 +138,8 @@ declare namespace certificateManagerDialog { + * + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 13 ++ * @since arkts {'1.1':'13', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PAGE_INSTALL_CERTIFICATE = 4 + } +@@ -145,7 +157,8 @@ declare namespace certificateManagerDialog { + * @throws { BusinessError } 29700001 - Internal error. + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 13 ++ * @since arkts {'1.1':'13', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function openCertificateManagerDialog(context: common.Context, pageType: CertificateDialogPageType): Promise; + +@@ -154,10 +167,11 @@ declare namespace certificateManagerDialog { + /** + * Enum for certificate type + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum CertificateType { + /** +@@ -165,7 +179,8 @@ declare namespace certificateManagerDialog { + * + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CA_CERT = 1 + } +@@ -173,10 +188,11 @@ declare namespace certificateManagerDialog { + /** + * Enum for certificate scope + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum CertificateScope { + /** +@@ -184,7 +200,8 @@ declare namespace certificateManagerDialog { + * + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NOT_SPECIFIED = 0, + +@@ -193,7 +210,8 @@ declare namespace certificateManagerDialog { + * + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CURRENT_USER = 1, + +@@ -202,7 +220,8 @@ declare namespace certificateManagerDialog { + * + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + GLOBAL_USER = 2, + } +@@ -246,7 +265,8 @@ declare namespace certificateManagerDialog { + * @throws { BusinessError } 29700005 - The operation does not comply with the device security policy, such as the device does not allow users to manage the ca certificate of the global user. + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function openInstallCertificateDialog(context: common.Context, certType: CertificateType, certScope: CertificateScope, cert: Uint8Array): Promise; + +@@ -268,7 +288,8 @@ declare namespace certificateManagerDialog { + * @throws { BusinessError } 29700005 - The operation does not comply with the device security policy, such as the device does not allow users to manage the ca certificate of the global user. + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function openUninstallCertificateDialog(context: common.Context, certType: CertificateType, certUri: string): Promise; + +@@ -278,7 +299,8 @@ declare namespace certificateManagerDialog { + * @typedef CertificateDialogProperty + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface CertificateDialogProperty { + /** +@@ -287,7 +309,8 @@ declare namespace certificateManagerDialog { + * @type { boolean } + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + showInstallButton: boolean; + } +@@ -308,7 +331,8 @@ declare namespace certificateManagerDialog { + * @throws { BusinessError } 29700004 - The API is not supported on this device. + * @syscap SystemCapability.Security.CertificateManagerDialog + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function openCertificateDetailDialog(context: common.Context, cert: Uint8Array, property: CertificateDialogProperty): Promise; + } +diff --git a/api/@ohos.security.cryptoFramework.d.ts b/api/@ohos.security.cryptoFramework.d.ts +index 116a4fbfa..b1670ad96 100644 +--- a/api/@ohos.security.cryptoFramework.d.ts ++++ b/api/@ohos.security.cryptoFramework.d.ts +@@ -17,9 +17,6 @@ + * @file + * @kit CryptoArchitectureKit + */ +-/*** if arkts 1.1 */ +-import { int, long } from './@ohos.base'; +-/*** endif */ + import type { AsyncCallback } from './@ohos.base'; + + /** +diff --git a/api/@ohos.sensor.d.ets b/api/@ohos.sensor.d.ets +index 0963965dc..b1f72f705 100644 +--- a/api/@ohos.sensor.d.ets ++++ b/api/@ohos.sensor.d.ets +@@ -28,163 +28,2088 @@ import { AsyncCallback, Callback } from './@ohos.base'; + * @since 20 + */ + declare namespace sensor { ++ /** ++ * Enum for obtain the type of sensor. ++ * @enum { number } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ enum SensorId { ++ /** ++ * Acceleration sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ ACCELEROMETER = 1, ++ ++ /** ++ * Gyroscope sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ GYROSCOPE = 2, ++ ++ /** ++ * Ambient light sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ AMBIENT_LIGHT = 5, ++ ++ /** ++ * Magnetic field sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ MAGNETIC_FIELD = 6, ++ ++ /** ++ * Barometric pressure sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ BAROMETER = 8, ++ ++ /** ++ * Hall effect sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ HALL = 10, ++ ++ /** ++ * Proximity sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ PROXIMITY = 12, ++ ++ /** ++ * Humidity sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ HUMIDITY = 13, ++ ++ /** ++ * Color sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ COLOR = 14, ++ ++ /** ++ * Sar sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ SAR = 15, ++ ++ /** ++ * Orientation sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ /** ++ * Orientation sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ ORIENTATION = 256, ++ ++ /** ++ * Gravity sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ GRAVITY = 257, ++ ++ /** ++ * Linear acceleration sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ LINEAR_ACCELEROMETER = 258, ++ ++ /** ++ * Rotation vector sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ ROTATION_VECTOR = 259, ++ ++ /** ++ * Ambient temperature sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ AMBIENT_TEMPERATURE = 260, ++ ++ /** ++ * Uncalibrated magnetic field sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ MAGNETIC_FIELD_UNCALIBRATED = 261, ++ ++ /** ++ * Uncalibrated gyroscope sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ GYROSCOPE_UNCALIBRATED = 263, ++ ++ /** ++ * Significant motion sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ SIGNIFICANT_MOTION = 264, ++ ++ /** ++ * Pedometer detection sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ PEDOMETER_DETECTION = 265, ++ ++ /** ++ * Pedometer sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ PEDOMETER = 266, ++ ++ /** ++ * Heart rate sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ HEART_RATE = 278, ++ ++ /** ++ * Wear detection sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ WEAR_DETECTION = 280, ++ ++ /** ++ * Uncalibrated acceleration sensor. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ ACCELEROMETER_UNCALIBRATED = 281 ++ } ++ + /** + * Subscribe to orientation sensor data. +- * @param { SensorId.ORIENTATION } type - Indicate the sensor type to listen for, {@code SensorId.ORIENTATION}. ++ * @param { 'orientationChange' } type - Indicate the sensor type to listen for, {@code SensorId.ORIENTATION}. + * @param { Callback } callback - callback orientation data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor +- * @atomicservice ++ * @atomicservice ++ * @since 20 ++ */ ++ function on(type: 'orientationChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to color sensor data. ++ * @param { 'colorChange' } type - Indicate the sensor type to listen for, {@code SensorId.COLOR}. ++ * @param { Callback } callback - callback color data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function on(type: 'colorChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to SAR sensor data. ++ * @param { 'sarChange' } type - Indicate the sensor type to listen for, {@code SensorId.SAR}. ++ * @param { Callback } callback - callback sar data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function on(type: 'sarChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to accelerometer sensor data. ++ * @permission ohos.permission.ACCELEROMETER ++ * @param { 'accelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.ACCELEROMETER}. ++ * @param { Callback } callback - callback accelerometer data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ function on(type: 'accelerometerChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to uncalibrated accelerometer sensor data. ++ * @permission ohos.permission.ACCELEROMETER ++ * @param { 'accelerometerUncalibratedChange' } type - Indicate the sensor type to listen for,{@code SensorId.ACCELEROMETER_UNCALIBRATED}. ++ * @param { Callback } callback - callback uncalibrated accelerometer data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function on(type: 'accelerometerUncalibratedChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to ambient light sensor data. ++ * @param { 'ambientLightChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_LIGHT}. ++ * @param { Callback } callback - callback ambient light data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function on(type: 'ambientLightChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to ambient temperature sensor data. ++ * @param { 'ambientTemperatureChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_TEMPERATURE}. ++ * @param { Callback } callback - callback ambient temperature data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function on(type: 'ambientTemperatureChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to barometer sensor data. ++ * @param { 'barometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.BAROMETER}. ++ * @param { Callback } callback - callback barometer data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function on(type: 'barometerChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to gravity sensor data. ++ * @param { 'gravityChange' } type - Indicate the sensor type to listen for, {@code SensorId.GRAVITY}. ++ * @param { Callback } callback - callback gravity data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function on(type: 'gravityChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to gyroscope sensor data. ++ * @permission ohos.permission.GYROSCOPE ++ * @param { 'gyroscopeChange' } type - Indicate the sensor type to listen for, {@code SensorId.GYROSCOPE}. ++ * @param { Callback } callback - callback gyroscope data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ function on(type: 'gyroscopeChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to uncalibrated gyroscope sensor data. ++ * @permission ohos.permission.GYROSCOPE ++ * @param { 'gyroscopeUncalibratedChange' } type - Indicate the sensor type to listen for, {@code SensorId.GYROSCOPE_UNCALIBRATED}. ++ * @param { Callback } callback - callback uncalibrated gyroscope data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function on(type: 'gyroscopeUncalibratedChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to hall sensor data. ++ * @param { 'hallChange' } type - Indicate the sensor type to listen for, {@code SensorId.HALL}. ++ * @param { Callback } callback - callback hall data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function on(type: 'hallChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to heart rate sensor data. ++ * @permission ohos.permission.READ_HEALTH_DATA ++ * @param { 'heartRateChange' } type - Indicate the sensor type to listen for, {@code SensorId.HEART_RATE}. ++ * @param { Callback } callback - callback heart rate data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function on(type: 'heartRateChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to humidity sensor data. ++ * @param { 'humidityChange' } type - Indicate the sensor type to listen for, {@code SensorId.HUMIDITY}. ++ * @param { Callback } callback - callback humidity data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function on(type: 'humidityChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to linear acceleration sensor data. ++ * @permission ohos.permission.ACCELEROMETER ++ * @param { 'linearAccelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.LINEAR_ACCELEROMETER}. ++ * @param { Callback } callback - callback linear accelerometer data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function on(type: 'linearAccelerometerChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to magnetic field sensor data. ++ * @param { 'magneticFieldChange' } type - Indicate the sensor type to listen for, {@code SensorId.MAGNETIC_FIELD}. ++ * @param { Callback } callback - callback magnetic field data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function on(type: 'magneticFieldChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to uncalibrated magnetic field sensor data. ++ * @param { 'magneticFieldUncalibratedChange' } type - Indicate the sensor type to listen for, ++ * {@code SensorId.MAGNETIC_FIELD_UNCALIBRATED}. ++ * @param { Callback } callback - callback uncalibrated magnetic field data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function on(type: 'magneticFieldUncalibratedChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to pedometer sensor data. ++ * @permission ohos.permission.ACTIVITY_MOTION ++ * @param { 'pedometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER}. ++ * @param { Callback } callback - callback pedometer data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function on(type: 'pedometerChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to pedometer detection sensor data. ++ * @permission ohos.permission.ACTIVITY_MOTION ++ * @param { 'pedometerDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER_DETECTION}. ++ * @param { Callback } callback - callback pedometer detection data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function on(type: 'pedometerDetectionChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to proximity sensor data. ++ * @param { 'proximityChange' } type - Indicate the sensor type to listen for, {@code SensorId.PROXIMITY}. ++ * @param { Callback } callback - callback proximity data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function on(type: 'proximityChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to rotation vector sensor data. ++ * @param { 'rotationVectorChange' } type - Indicate the sensor type to listen for, {@code SensorId.ROTATION_VECTOR}. ++ * @param { Callback } callback - callback rotation vector data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function on(type: 'rotationVectorChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to significant motion sensor data. ++ * @param { 'significantMotionChange' } type - Indicate the sensor type to listen for, {@code SensorId.SIGNIFICANT_MOTION}. ++ * @param { Callback } callback - callback significant motion data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function on(type: 'significantMotionChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to wear detection sensor data. ++ * @param { 'wearDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.WEAR_DETECTION}. ++ * @param { Callback } callback - callback wear detection data. ++ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function on(type: 'wearDetectionChange', callback: Callback, options?: Options): void; ++ ++ /** ++ * Subscribe to orientation sensor data once. ++ * @param { 'orientationChange' } type - Indicate the sensor type to listen for, {@code SensorId.ORIENTATION}. ++ * @param { Callback } callback - callback orientation data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function once(type: 'orientationChange', callback: Callback): void; ++ ++ /** ++ * Subscribe to accelerometer sensor data once. ++ * @permission ohos.permission.ACCELEROMETER ++ * @param { 'accelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.ACCELEROMETER}. ++ * @param { Callback } callback - callback accelerometer data. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function once(type: 'accelerometerChange', callback: Callback): void; ++ ++ /** ++ * Subscribe to uncalibrated accelerometer sensor data once. ++ * @permission ohos.permission.ACCELEROMETER ++ * @param { 'accelerometerUncalibratedChange' } type - Indicate the sensor type to listen for,{@code SensorId.ACCELEROMETER_UNCALIBRATED}. ++ * @param { Callback } callback - callback uncalibrated accelerometer data. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function once(type: 'accelerometerUncalibratedChange', callback: Callback): void; ++ ++ /** ++ * Subscribe to ambient light sensor data once. ++ * @param { 'ambientLightChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_LIGHT}. ++ * @param { Callback } callback - callback ambient light data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function once(type: 'ambientLightChange', callback: Callback): void; ++ ++ /** ++ * Subscribe to ambient temperature sensor data once. ++ * @param { 'ambientTemperatureChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_TEMPERATURE}. ++ * @param { Callback } callback - callback ambient temperature data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function once(type: 'ambientTemperatureChange', callback: Callback): void; ++ ++ /** ++ * Subscribe to barometer sensor data once. ++ * @param { 'barometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.BAROMETER}. ++ * @param { Callback } callback - callback barometer data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function once(type: 'barometerChange', callback: Callback): void; ++ ++ /** ++ * Subscribe to gravity sensor data once. ++ * @param { 'gravityChange' } type - Indicate the sensor type to listen for, {@code SensorId.GRAVITY}. ++ * @param { Callback } callback - callback gravity data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function once(type: 'gravityChange', callback: Callback): void; ++ ++ /** ++ * Subscribe to gyroscope sensor data once. ++ * @permission ohos.permission.GYROSCOPE ++ * @param { 'gyroscopeChange' } type - Indicate the sensor type to listen for, {@code SensorId.GYROSCOPE}. ++ * @param { Callback } callback - callback gyroscope data. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function once(type: 'gyroscopeChange', callback: Callback): void; ++ ++ /** ++ * Subscribe to uncalibrated gyroscope sensor data once. ++ * @permission ohos.permission.GYROSCOPE ++ * @param { 'gyroscopeUncalibratedChange' } type - Indicate the sensor type to listen for,{@code SensorId.GYROSCOPE_UNCALIBRATED}. ++ * @param { Callback } callback - callback uncalibrated gyroscope data. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function once(type: 'gyroscopeUncalibratedChange', callback: Callback): void; ++ ++ /** ++ * Subscribe to hall sensor data once. ++ * @param { 'hallChange' } type - Indicate the sensor type to listen for, {@code SensorId.HALL}. ++ * @param { Callback } callback - callback hall data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function once(type: 'hallChange', callback: Callback): void; ++ ++ /** ++ * Subscribe to heart rate sensor data once. ++ * @permission ohos.permission.READ_HEALTH_DATA ++ * @param { 'heartRateChange' } type - Indicate the sensor type to listen for, {@code SensorId.HEART_RATE}. ++ * @param { Callback } callback - callback heart rate data. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function once(type: 'heartRateChange', callback: Callback): void; ++ ++ /** ++ * Subscribe to humidity sensor data once. ++ * @param { 'humidityChange' } type - Indicate the sensor type to listen for, {@code SensorId.HUMIDITY}. ++ * @param { Callback } callback - callback humidity data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function once(type: 'humidityChange', callback: Callback): void; ++ ++ /** ++ * Subscribe to linear acceleration sensor data once. ++ * @permission ohos.permission.ACCELEROMETER ++ * @param { 'linearAccelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.LINEAR_ACCELEROMETER}. ++ * @param { Callback } callback - callback linear accelerometer data. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function once(type: 'linearAccelerometerChange', callback: Callback): void; ++ ++ /** ++ * Subscribe to magnetic field sensor data once. ++ * @param { 'magneticFieldChange' } type - Indicate the sensor type to listen for, {@code SensorId.MAGNETIC_FIELD}. ++ * @param { Callback } callback - callback magnetic field data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function once(type: 'magneticFieldChange', callback: Callback): void; ++ ++ /** ++ * Subscribe to uncalibrated magnetic field sensor data once. ++ * @param { 'magneticFieldUncalibratedChange' } type - Indicate the sensor type to listen for, ++ * {@code SensorId.MAGNETIC_FIELD_UNCALIBRATED}. ++ * @param { Callback } callback - callback uncalibrated magnetic field data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function once(type: 'magneticFieldUncalibratedChange', callback: Callback): void; ++ ++ /** ++ * Subscribe to pedometer sensor data once. ++ * @permission ohos.permission.ACTIVITY_MOTION ++ * @param { 'pedometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER}. ++ * @param { Callback } callback - callback pedometer data. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function once(type: 'pedometerChange', callback: Callback): void; ++ ++ /** ++ * Subscribe to pedometer detection sensor data once. ++ * @permission ohos.permission.ACTIVITY_MOTION ++ * @param { 'pedometerDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER_DETECTION}. ++ * @param { Callback } callback - callback pedometer detection data. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function once(type: 'pedometerDetectionChange', callback: Callback): void; ++ ++ /** ++ * Subscribe to proximity sensor data once. ++ * @param { 'proximityChange' } type - Indicate the sensor type to listen for, {@code SensorId.PROXIMITY}. ++ * @param { Callback } callback - callback proximity data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function once(type: 'proximityChange', callback: Callback): void; ++ ++ /** ++ * Subscribe to rotation vector sensor data once. ++ * @param { 'rotationVectorChange' } type - Indicate the sensor type to listen for, {@code SensorId.ROTATION_VECTOR}. ++ * @param { Callback } callback - callback rotation vector data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function once(type: 'rotationVectorChange', callback: Callback): void; ++ ++ /** ++ * Subscribe to significant motion sensor data once. ++ * @param { 'significantMotionChange' } type - Indicate the sensor type to listen for, {@code SensorId.SIGNIFICANT_MOTION}. ++ * @param { Callback } callback - callback significant motion data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function once(type: 'significantMotionChange', callback: Callback): void; ++ ++ /** ++ * Subscribe to wear detection sensor data once. ++ * @param { 'wearDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.WEAR_DETECTION}. ++ * @param { Callback } callback - callback wear detection data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function once(type: 'wearDetectionChange', callback: Callback): void; ++ ++ /** ++ * Unsubscribe to orientation sensor data. ++ * @param { 'orientationChange' } type - Indicate the sensor type to listen for, {@code SensorId.ORIENTATION}. ++ * @param { Callback } callback - callback orientation data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ function off(type: 'orientationChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to color sensor data. ++ * @param { 'colorChange' } type - Indicate the sensor type to listen for, {@code SensorId.COLOR}. ++ * @param { Callback } callback - callback color data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function off(type: 'colorChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to sar sensor data. ++ * @param { 'sarChange' } type - Indicate the sensor type to listen for, {@code SensorId.SAR}. ++ * @param { Callback } callback - callback sar data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function off(type: 'sarChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to accelerometer sensor data. ++ * @permission ohos.permission.ACCELEROMETER ++ * @param { 'accelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.ACCELEROMETER}. ++ * @param { Callback } callback - callback accelerometer data. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ function off(type: 'accelerometerChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to uncalibrated accelerometer sensor data. ++ * @permission ohos.permission.ACCELEROMETER ++ * @param { 'accelerometerUncalibratedChange' } type - Indicate the sensor type to listen for, ++ * {@code SensorId.ACCELEROMETER_UNCALIBRATED}. ++ * @param { Callback } callback - callback uncalibrated accelerometer data. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function off(type: 'accelerometerUncalibratedChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to ambient light sensor data. ++ * @param { 'ambientLightChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_LIGHT}. ++ * @param { Callback } callback - callback ambient light data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function off(type: 'ambientLightChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to ambient temperature sensor data. ++ * @param { 'ambientTemperatureChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_TEMPERATURE}. ++ * @param { Callback } callback - callback ambient temperature data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function off(type: 'ambientTemperatureChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to barometer sensor data. ++ * @param { 'barometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.BAROMETER}. ++ * @param { Callback } callback - callback barometer data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function off(type: 'barometerChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to gravity sensor data. ++ * @param { 'gravityChange' } type - Indicate the sensor type to listen for, {@code SensorId.GRAVITY}. ++ * @param { Callback } callback - callback gravity data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function off(type: 'gravityChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to gyroscope sensor data. ++ * @permission ohos.permission.GYROSCOPE ++ * @param { 'gyroscopeChange' } type - Indicate the sensor type to listen for, {@code SensorId.GYROSCOPE}. ++ * @param { Callback } callback - callback gyroscope data. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ function off(type: 'gyroscopeChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to uncalibrated gyroscope sensor data. ++ * @permission ohos.permission.GYROSCOPE ++ * @param { 'gyroscopeUncalibratedChange' } type - Indicate the sensor type to listen for, {@code SensorId.GYROSCOPE_UNCALIBRATED}. ++ * @param { Callback } callback - callback uncalibrated gyroscope data. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function off(type: 'gyroscopeUncalibratedChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to hall sensor data. ++ * @param { 'hallChange' } type - Indicate the sensor type to listen for, {@code SensorId.HALL}. ++ * @param { Callback } callback - callback hall data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function off(type: 'hallChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to heart rate sensor data. ++ * @permission ohos.permission.READ_HEALTH_DATA ++ * @param { 'heartRateChange' } type - Indicate the sensor type to listen for, {@code SensorId.HEART_RATE}. ++ * @param { Callback } callback - callback heart rate data. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function off(type: 'heartRateChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to humidity sensor data. ++ * @param { 'humidityChange' } type - Indicate the sensor type to listen for, {@code SensorId.HUMIDITY}. ++ * @param { Callback } callback - callback humidity data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function off(type: 'humidityChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to linear acceleration sensor data. ++ * @permission ohos.permission.ACCELEROMETER ++ * @param { 'linearAccelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.LINEAR_ACCELEROMETER}. ++ * @param { Callback } callback - callback linear accelerometer data. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function off(type: 'linearAccelerometerChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to magnetic field sensor data. ++ * @param { 'magneticFieldChange' } type - Indicate the sensor type to listen for, {@code SensorId.MAGNETIC_FIELD}. ++ * @param { Callback } callback - callback magnetic field data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function off(type: 'magneticFieldChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to uncalibrated magnetic field sensor data. ++ * @param { 'magneticFieldUncalibratedChange' } type - Indicate the sensor type to listen for, ++ * {@code SensorId.MAGNETIC_FIELD_UNCALIBRATED}. ++ * @param { Callback } callback - callback uncalibrated magnetic field data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function off(type: 'magneticFieldUncalibratedChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to pedometer sensor data. ++ * @permission ohos.permission.ACTIVITY_MOTION ++ * @param { 'pedometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER}. ++ * @param { Callback } callback - callback pedometer data. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function off(type: 'pedometerChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to pedometer detection sensor data. ++ * @permission ohos.permission.ACTIVITY_MOTION ++ * @param { 'pedometerDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER_DETECTION}. ++ * @param { Callback } callback - callback pedometer detection data. ++ * @throws { BusinessError } 201 - Permission denied. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function off(type: 'pedometerDetectionChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to proximity sensor data. ++ * @param { 'proximityChange' } type - Indicate the sensor type to listen for, {@code SensorId.PROXIMITY}. ++ * @param { Callback } callback - callback proximity data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function off(type: 'proximityChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to rotation vector sensor data. ++ * @param { 'rotationVectorChange' } type - Indicate the sensor type to listen for, {@code SensorId.ROTATION_VECTOR}. ++ * @param { Callback } callback - callback rotation vector data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function off(type: 'rotationVectorChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to significant motion sensor data. ++ * @param { 'significantMotionChange' } type - Indicate the sensor type to listen for, {@code SensorId.SIGNIFICANT_MOTION}. ++ * @param { Callback } callback - callback significant motion data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function off(type: 'significantMotionChange', callback?: Callback): void; ++ ++ /** ++ * Unsubscribe to wear detection sensor data. ++ * @param { 'wearDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.WEAR_DETECTION}. ++ * @param { Callback } callback - callback wear detection data. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function off(type: 'wearDetectionChange', callback?: Callback): void; ++ ++ /** ++ * Subscribe to the sensor's optional parameters. ++ * @typedef Options ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ interface Options { ++ /** ++ * Sensor event reporting event interval. ++ * @type { ?(number | SensorFrequency) } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ interval?: long | SensorFrequency; ++ } ++ ++ /** ++ * The sensor reporting frequency is divided into three modes. ++ * @typedef {'game' | 'ui' | 'normal'} ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ type SensorFrequency = 'game' | 'ui' | 'normal'; ++ ++ /** ++ * Enumerates the accuracy levels of data reported by a sensor. ++ * @enum { int } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ enum SensorAccuracy { ++ /** ++ * The sensor data is unreliable. It is possible that the sensor does not contact with the device to measure. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ ACCURACY_UNRELIABLE = 0, ++ ++ /** ++ * The sensor data is at a low accuracy level. The data must be calibrated based on the environment before being used. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ ACCURACY_LOW = 1, ++ ++ /** ++ * The sensor data is at a medium accuracy level. You are advised to calibrate the data based on the environment ++ *
    before using it. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ ACCURACY_MEDIUM = 2, ++ ++ /** ++ * The sensor data is at a high accuracy level. The data can be used directly. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ ACCURACY_HIGH = 3 ++ } ++ ++ /** ++ * The basic data structure of the sensor event. ++ * @typedef Response ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ interface Response { ++ /** ++ * The timestamp of the reported sensor data. ++ * @type { long } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ timestamp: long; ++ ++ /** ++ * The accuracy levels of data reported by a sensor. ++ * @type { SensorAccuracy } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ accuracy: SensorAccuracy; ++ } ++ ++ /** ++ * Orientation sensor event data. ++ * @typedef OrientationResponse ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ interface OrientationResponse extends Response { ++ /** ++ * The device rotates at an angle around the Z axis. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ alpha: float; ++ ++ /** ++ * The device rotates at an angle around the X axis. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ beta: float; ++ ++ /** ++ * The device rotates at an angle around the Y axis. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ gamma: float; ++ } ++ ++ /** ++ * Indicates sensor information. ++ * @typedef Sensor ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ interface Sensor { ++ /** ++ * Sensor name. ++ * @type { string } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ sensorName:string; ++ ++ /** ++ * Sensor vendor. ++ * @type { string } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ vendorName:string; ++ ++ /** ++ * Sensor firmware version. ++ * @type { string } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ firmwareVersion:string; ++ ++ /** ++ * Sensor hardware version. ++ * @type { string } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ hardwareVersion:string; ++ ++ /** ++ * Sensor type ID, {@code SensorType}. ++ * @type { int } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ sensorId:int; ++ ++ /** ++ * Maximum measurement range of the sensor. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ maxRange:float; ++ ++ /** ++ * Minimum sample period allowed, in ns. ++ * @type { long } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ minSamplePeriod:long; ++ ++ /** ++ * Maximum sample period allowed, in ns. ++ * @type { long } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ maxSamplePeriod:long; ++ ++ /** ++ * Sensor accuracy. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ precision:float; ++ ++ /** ++ * Sensor power. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ power:float; ++ } ++ ++ /** ++ * Obtains all sensor information on the device. ++ * @param { AsyncCallback> } callback - callback sensor list. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function getSensorList(callback: AsyncCallback>): void; ++ ++ /** ++ * Obtains all sensor information on the device. ++ * @returns { Promise> } Promise used to return the result. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function getSensorList(): Promise>; ++ ++ /** ++ * Indicates geomagnetic field data. ++ * @typedef GeomagneticResponse ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ interface GeomagneticResponse { ++ /** ++ * Geomagnetic x-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ x: float; ++ ++ /** ++ * Geomagnetic y-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ y: float; ++ ++ /** ++ * Geomagnetic z-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ z: float; ++ ++ /** ++ * The Angle between the earth's magnetic field lines and the horizontal plane. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ geomagneticDip: float; ++ ++ /** ++ * The Angle of magnetic north and true north on a horizontal plane. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ deflectionAngle: float; ++ ++ /** ++ * The horizontal strength of the geomagnetic field. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ levelIntensity: float; ++ ++ /** ++ * The total strength of the geomagnetic field. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ totalIntensity: float; ++ } ++ ++ /** ++ * Convert rotation vector to rotation matrix. ++ * @param { Array } rotationVector - rotationVector Indicates the rotation vector. ++ * @param { AsyncCallback> } callback - callback rotation matrix. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function getRotationMatrix(rotationVector: Array, callback: AsyncCallback>): void; ++ ++ /** ++ * Convert rotation vector to rotation matrix. ++ * @param { Array } rotationVector - rotationVector Indicates the rotation vector. ++ * @returns { Promise> } Promise used to return the result. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function getRotationMatrix(rotationVector: Array): Promise>; ++ ++ /** ++ * Indicates the axis of the new coordinate system that coincides with the XY axis of the original coordinate system. ++ * @typedef CoordinatesOptions ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ interface CoordinatesOptions { ++ /** Indicates the axis of the new coordinate system that coincides with the X axis of the original coordinate system. ++ * @type { int } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ x: int; ++ ++ /** Indicates the axis of the new coordinate system that coincides with the Y axis of the original coordinate system. ++ * @type { int } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ y: int; ++ } ++ ++ /** ++ * Computes the device's orientation based on the rotation matrix. ++ * @param { Array } rotationMatrix - rotationMatrix Indicates the rotation matrix. ++ * @param { AsyncCallback> } callback - callback the angle of rotation around the z, x, y axis. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function getOrientation(rotationMatrix: Array, callback: AsyncCallback>): void; ++ ++ /** ++ * Computes the device's orientation based on the rotation matrix. ++ * @param { Array } rotationMatrix - rotationMatrix Indicates the rotation matrix. ++ * @returns { Promise> } Promise used to return the result. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function getOrientation(rotationMatrix: Array): Promise>; ++ ++ /** ++ * Indicates the response of rotation matrix. ++ * @typedef RotationMatrixResponse ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ interface RotationMatrixResponse { ++ /** ++ * rotation matrix. ++ * @type { Array } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ rotation: Array; ++ ++ /** ++ * inclination matrix. ++ * @type { Array } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ inclination: Array ++ } ++ ++ /** ++ * Calculate rotation matrix based on gravity vector and geomagnetic vector. ++ * @param { Array } gravity - gravity Indicates the gravity vector. ++ * @param { Array } geomagnetic - geomagnetic Indicates the geomagnetic vector. ++ * @param { AsyncCallback } callback - callback rotation matrix and inclination matrix. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function getRotationMatrix(gravity: Array, geomagnetic: Array, callback: AsyncCallback): void; ++ ++ /** ++ * Calculate rotation matrix based on gravity vector and geomagnetic vector. ++ * @param { Array } gravity - gravity Indicates the gravity vector. ++ * @param { Array } geomagnetic - geomagnetic Indicates the geomagnetic vector. ++ * @returns { Promise } Promise used to return the result. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; ++ *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 14500101 - Service exception. ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ function getRotationMatrix(gravity: Array, geomagnetic: Array): Promise; ++ ++ /** ++ * Acceleration sensor event data. ++ * @typedef AccelerometerResponse ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ interface AccelerometerResponse extends Response { ++ /** ++ * Acceleration x-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ x: float; ++ ++ /** ++ * Acceleration y-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ y: float; ++ ++ /** ++ * Acceleration z-axis component ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ z: float; ++ } ++ ++ /** ++ * Linear acceleration sensor event data. ++ * @typedef LinearAccelerometerResponse ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ interface LinearAccelerometerResponse extends Response { ++ /** ++ * Linear acceleration x-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ x: float; ++ ++ /** ++ * Linear acceleration y-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ y: float; ++ ++ /** ++ * Linear acceleration z-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ z: float; ++ } ++ ++ /** ++ * Acceleration uncalibrated sensor event data. ++ * @typedef AccelerometerUncalibratedResponse ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ interface AccelerometerUncalibratedResponse extends Response { ++ /** ++ * Acceleration uncalibrated x-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ x: float; ++ ++ /** ++ * Acceleration uncalibrated y-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ y: float; ++ ++ /** ++ * Acceleration uncalibrated z-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ z: float; ++ ++ /** ++ * Acceleration uncalibrated x-axis offset. ++ * ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ biasX: float; ++ ++ /** ++ * Acceleration uncalibrated y-axis offset. ++ * ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ biasY: float; ++ ++ /** ++ * Acceleration uncalibrated z-axis offset. ++ * ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ biasZ: float; ++ } ++ ++ /** ++ * Gravity sensor event data. ++ * @typedef GravityResponse ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ interface GravityResponse extends Response { ++ /** ++ * Gravity x-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ x: float; ++ ++ /** ++ * Gravity y-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ y: float; ++ ++ /** ++ * Gravity z-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ z: float; ++ } ++ ++ /** ++ * Rotation vector sensor event data. ++ * @typedef RotationVectorResponse ++ * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ +- function on(type: 'ORIENTATION', callback: Callback, +- options?: Options): void; ++ interface RotationVectorResponse extends Response { ++ /** ++ * Rotation vector x-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ x: float; ++ ++ /** ++ * Rotation vector y-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ y: float; ++ ++ /** ++ * Rotation vector z-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ z: float; ++ ++ /** ++ * Scalar quantity. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ w: float; ++ } + + /** +- * Unsubscribe to orientation sensor data. +- * @param { SensorId.ORIENTATION } type - Indicate the sensor type to listen for, {@code SensorId.ORIENTATION}. +- * @param { Callback } callback - callback orientation data. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; +- *
    2. Incorrect parameter types; 3. Parameter verification failed. ++ * Gyroscope sensor event data. ++ * @typedef GyroscopeResponse + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ +- function off(type: 'ORIENTATION', callback?: Callback): void; ++ interface GyroscopeResponse extends Response { ++ /** ++ * Gyroscope x-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ x: float; ++ ++ /** ++ * Gyroscope y-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ y: float; ++ ++ /** ++ * Gyroscope z-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @atomicservice ++ * @since 20 ++ */ ++ z: float; ++ } + + /** +- * Subscribe to the sensor's optional parameters. +- * @typedef Options ++ * Gyroscope uncalibrated sensor event data. ++ * @typedef GyroscopeUncalibratedResponse + * @syscap SystemCapability.Sensors.Sensor +- * @atomicservice + * @since 20 + */ +- interface Options { ++ interface GyroscopeUncalibratedResponse extends Response { + /** +- * Sensor event reporting event interval. +- * @type { ?(number | SensorFrequency) } ++ * Gyroscope uncalibrated x-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ x: float; ++ ++ /** ++ * Gyroscope uncalibrated y-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ y: float; ++ ++ /** ++ * Gyroscope uncalibrated z-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ z: float; ++ ++ /** ++ * Gyroscope uncalibrated x-axis offset. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ biasX: float; ++ ++ /** ++ * Gyroscope uncalibrated y-axis offset. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ biasY: float; ++ ++ /** ++ * Gyroscope uncalibrated z-axis offset. ++ * @type { float } + * @syscap SystemCapability.Sensors.Sensor +- * @atomicservice + * @since 20 + */ +- interval?: number | SensorFrequency; ++ biasZ: float; + } + + /** +- * The sensor reporting frequency is divided into three modes. +- * @typedef {'game' | 'ui' | 'normal'} ++ * Significant motion sensor event data. ++ * @typedef SignificantMotionResponse + * @syscap SystemCapability.Sensors.Sensor +- * @atomicservice + * @since 20 + */ +- type SensorFrequency = 'game' | 'ui' | 'normal'; ++ interface SignificantMotionResponse extends Response { ++ /** ++ * The degree of significant motion. ++ * Whether the device has a significant motion. ++ * The value 1 means that the device has a significant motion, and 0 means the opposite. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ scalar: float; ++ } + + /** +- * Enumerates the accuracy levels of data reported by a sensor. +- * @enum { number } ++ * Proximity sensor event data. ++ * @typedef ProximityResponse + * @syscap SystemCapability.Sensors.Sensor +- * @atomicservice + * @since 20 + */ +- enum SensorAccuracy { ++ interface ProximityResponse extends Response { + /** +- * The sensor data is unreliable. It is possible that the sensor does not contact with the device to measure. ++ * Indicates the degree of proximity, event 0 indicates proximity, and greater than 0 indicates distance. ++ * @type { float } + * @syscap SystemCapability.Sensors.Sensor +- * @atomicservice + * @since 20 + */ +- ACCURACY_UNRELIABLE = 0, ++ distance: float; ++ } + ++ /** ++ * Light sensor event data. ++ * @typedef LightResponse ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ interface LightResponse extends Response { + /** +- * The sensor data is at a low accuracy level. The data must be calibrated based on the environment before being used. ++ * Indicates light intensity, in lux. ++ * @type { float } + * @syscap SystemCapability.Sensors.Sensor +- * @atomicservice + * @since 20 + */ +- ACCURACY_LOW = 1, ++ intensity: float; + + /** +- * The sensor data is at a medium accuracy level. You are advised to calibrate the data based on the environment +- *
    before using it. ++ * Indicates color temperature, in kelvin. ++ * @type { ?float } + * @syscap SystemCapability.Sensors.Sensor +- * @atomicservice + * @since 20 + */ +- ACCURACY_MEDIUM = 2, ++ colorTemperature?: float; + + /** +- * The sensor data is at a high accuracy level. The data can be used directly. ++ * Indicates infrared luminance, in cd/m2. ++ * @type { ?float } + * @syscap SystemCapability.Sensors.Sensor +- * @atomicservice + * @since 20 + */ +- ACCURACY_HIGH = 3 ++ infraredLuminance?: float; + } + + /** +- * The basic data structure of the sensor event. +- * @typedef Response ++ * Hall sensor event data. ++ * @typedef HallResponse + * @syscap SystemCapability.Sensors.Sensor +- * @atomicservice + * @since 20 + */ +- interface Response { ++ interface HallResponse extends Response { + /** +- * The timestamp of the reported sensor data. +- * @type { number } ++ * Indicates hall status, 0 indicates open, and greater than 0 indicates suction. ++ * @type { float } + * @syscap SystemCapability.Sensors.Sensor +- * @atomicservice + * @since 20 + */ +- timestamp: number; ++ status: float; ++ } + ++ /** ++ * Magnetic field sensor event data. ++ * @typedef MagneticFieldResponse ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ interface MagneticFieldResponse extends Response { + /** +- * The accuracy levels of data reported by a sensor. +- * @type { SensorAccuracy } ++ * Magnetic field x-axis component. ++ * @type { float } + * @syscap SystemCapability.Sensors.Sensor +- * @atomicservice + * @since 20 + */ +- accuracy: SensorAccuracy; ++ x: float; ++ ++ /** ++ * Magnetic field y-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ y: float; ++ ++ /** ++ * Magnetic field z-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ z: float; + } + + /** +- * Orientation sensor event data. +- * @typedef OrientationResponse ++ * Magnetic field uncalibrated sensor event data. ++ * @typedef MagneticFieldUncalibratedResponse + * @syscap SystemCapability.Sensors.Sensor +- * @atomicservice + * @since 20 + */ +- interface OrientationResponse extends Response { ++ interface MagneticFieldUncalibratedResponse extends Response { + /** +- * The device rotates at an angle around the Z axis. +- * @type { number } ++ * Magnetic field uncalibrated x-axis component. ++ * @type { float } + * @syscap SystemCapability.Sensors.Sensor +- * @atomicservice + * @since 20 + */ +- alpha: number; ++ x: float; + + /** +- * The device rotates at an angle around the X axis. +- * @type { number } ++ * Magnetic field uncalibrated y-axis component. ++ * @type { float } + * @syscap SystemCapability.Sensors.Sensor +- * @atomicservice + * @since 20 + */ +- beta: number; ++ y: float; + + /** +- * The device rotates at an angle around the Y axis. +- * @type { number } ++ * Magnetic field uncalibrated z-axis component. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ z: float; ++ ++ /** ++ * Magnetic field uncalibrated x-axis offset. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ biasX: float; ++ ++ /** ++ * Magnetic field uncalibrated y-axis offset. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ biasY: float; ++ ++ /** ++ * Magnetic field uncalibrated z-axis offset. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ biasZ: float; ++ } ++ ++ /** ++ * Pedometer sensor event data. ++ * @typedef PedometerResponse ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ interface PedometerResponse extends Response { ++ /** ++ * Indicates the number of steps. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ steps: float; ++ } ++ ++ /** ++ * Humidity sensor event data. ++ * @typedef HumidityResponse ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ interface HumidityResponse extends Response { ++ /** ++ * Indicates the number of humidity. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ humidity: float; ++ } ++ ++ /** ++ * Pedometer detection sensor event data. ++ * @typedef PedometerDetectionResponse ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ interface PedometerDetectionResponse extends Response { ++ /** ++ * Indicates the pedometer detection status, 1 indicates that a walking action has occurred, ++ * and 0 indicates that no movement has occurred. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ scalar: float; ++ } ++ ++ /** ++ * Ambient temperature sensor event data. ++ * @typedef AmbientTemperatureResponse ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ interface AmbientTemperatureResponse extends Response { ++ /** ++ * Indicates ambient temperature, in celsius. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ temperature: float; ++ } ++ ++ /** ++ * Barometer sensor event data. ++ * @typedef BarometerResponse ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ interface BarometerResponse extends Response { ++ /** ++ * Indicates the number of barometer, in hpa. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ pressure: float; ++ } ++ ++ /** ++ * Heart rate sensor event data. ++ * @typedef HeartRateResponse ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ interface HeartRateResponse extends Response { ++ /** ++ * Indicates the number of heart rate. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ heartRate: float; ++ } ++ ++ /** ++ * Wear detection sensor event data. ++ * @typedef WearDetectionResponse ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ interface WearDetectionResponse extends Response { ++ /** ++ * Indicates the status of wear detection, 1 for wearing, 0 for wearing not. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ value: float; ++ } ++ ++ /** ++ * Color sensor event data. ++ * @typedef ColorResponse ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ interface ColorResponse extends Response { ++ /** ++ * Indicates the intensity of light, in lux. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ lightIntensity: float; ++ /** ++ * Indicates the color temperature, in kelvin. ++ * @type { float } ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ colorTemperature: float; ++ } ++ ++ /** ++ * Sar sensor event data. ++ * @typedef SarResponse ++ * @syscap SystemCapability.Sensors.Sensor ++ * @since 20 ++ */ ++ interface SarResponse extends Response { ++ /** ++ * Indicates the specific absorption rate, in W/kg. ++ * @type { float } + * @syscap SystemCapability.Sensors.Sensor +- * @atomicservice + * @since 20 + */ +- gamma: number; ++ absorptionRatio: float; + } + } + +diff --git a/api/@ohos.systemCapability.d.ts b/api/@ohos.systemCapability.d.ts +index 67f5b06f9..553873d7f 100644 +--- a/api/@ohos.systemCapability.d.ts ++++ b/api/@ohos.systemCapability.d.ts +@@ -16,6 +16,7 @@ + /** + * @file + * @kit BasicServicesKit ++ * @arkts 1.1&1.2 + */ + + import { AsyncCallback, Callback } from './@ohos.base'; +diff --git a/api/@ohos.telephony.data.d.ts b/api/@ohos.telephony.data.d.ts +index 259f288bc..22a14f899 100644 +--- a/api/@ohos.telephony.data.d.ts ++++ b/api/@ohos.telephony.data.d.ts +@@ -25,7 +25,8 @@ import type { AsyncCallback } from './@ohos.base'; + * + * @namespace data + * @syscap SystemCapability.Telephony.CellularData +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace data { + /** +@@ -51,7 +52,8 @@ declare namespace data { + * + * @returns { number } Returns default cellular data slot id. + * @syscap SystemCapability.Telephony.CellularData +- * @since 9 ++ * @since arkts {'1.1':'9','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getDefaultCellularDataSlotIdSync(): number; + +@@ -134,7 +136,8 @@ declare namespace data { + *

  • {@code DataConnectState#DATA_STATE_SUSPENDED} + * + * @syscap SystemCapability.Telephony.CellularData +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getCellularDataState(callback: AsyncCallback): void; + +@@ -150,7 +153,8 @@ declare namespace data { + *
  • {@code DataConnectState#DATA_STATE_SUSPENDED} + * + * @syscap SystemCapability.Telephony.CellularData +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getCellularDataState(): Promise; + +@@ -168,7 +172,8 @@ declare namespace data { + * @throws { BusinessError } 8300003 - System internal error. + * @throws { BusinessError } 8300999 - Unknown error. + * @syscap SystemCapability.Telephony.CellularData +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isCellularDataEnabled(callback: AsyncCallback): void; + +@@ -183,7 +188,8 @@ declare namespace data { + * @throws { BusinessError } 8300003 - System internal error. + * @throws { BusinessError } 8300999 - Unknown error. + * @syscap SystemCapability.Telephony.CellularData +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isCellularDataEnabled(): Promise; + +@@ -217,7 +223,8 @@ declare namespace data { + * @throws { BusinessError } 8300999 - Unknown error. + * @syscap SystemCapability.Telephony.CellularData + * @systemapi Hide this for inner system use. +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function enableCellularData(callback: AsyncCallback): void; + +@@ -233,7 +240,8 @@ declare namespace data { + * @throws { BusinessError } 8300999 - Unknown error. + * @syscap SystemCapability.Telephony.CellularData + * @systemapi Hide this for inner system use. +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function enableCellularData(): Promise; + +@@ -252,7 +260,8 @@ declare namespace data { + * @throws { BusinessError } 8300999 - Unknown error. + * @syscap SystemCapability.Telephony.CellularData + * @systemapi Hide this for inner system use. +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function disableCellularData(callback: AsyncCallback): void; + +@@ -268,7 +277,8 @@ declare namespace data { + * @throws { BusinessError } 8300999 - Unknown error. + * @syscap SystemCapability.Telephony.CellularData + * @systemapi Hide this for inner system use. +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function disableCellularData(): Promise; + +@@ -540,14 +550,16 @@ declare namespace data { + * + * @enum { number } + * @syscap SystemCapability.Telephony.CellularData +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum DataFlowType { + /** + * Indicates that there is no uplink or downlink data. + * + * @syscap SystemCapability.Telephony.CellularData +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DATA_FLOW_TYPE_NONE = 0, + +@@ -555,7 +567,8 @@ declare namespace data { + * Indicates that there is only downlink data. + * + * @syscap SystemCapability.Telephony.CellularData +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DATA_FLOW_TYPE_DOWN = 1, + +@@ -563,7 +576,8 @@ declare namespace data { + * Indicates that there is only uplink data. + * + * @syscap SystemCapability.Telephony.CellularData +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DATA_FLOW_TYPE_UP = 2, + +@@ -571,7 +585,8 @@ declare namespace data { + * Indicates that there is uplink and downlink data. + * + * @syscap SystemCapability.Telephony.CellularData +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DATA_FLOW_TYPE_UP_DOWN = 3, + +@@ -579,7 +594,8 @@ declare namespace data { + * Indicates that there is no uplink or downlink data, and the bottom-layer link is in the dormant state. + * + * @syscap SystemCapability.Telephony.CellularData +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DATA_FLOW_TYPE_DORMANT = 4 + } +@@ -589,14 +605,16 @@ declare namespace data { + * + * @enum { number } + * @syscap SystemCapability.Telephony.CellularData +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum DataConnectState { + /** + * Indicates that a cellular data link is unknown. + * + * @syscap SystemCapability.Telephony.CellularData +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DATA_STATE_UNKNOWN = -1, + +@@ -604,7 +622,8 @@ declare namespace data { + * Indicates that a cellular data link is disconnected. + * + * @syscap SystemCapability.Telephony.CellularData +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DATA_STATE_DISCONNECTED = 0, + +@@ -612,7 +631,8 @@ declare namespace data { + * Indicates that a cellular data link is being connected. + * + * @syscap SystemCapability.Telephony.CellularData +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DATA_STATE_CONNECTING = 1, + +@@ -620,7 +640,8 @@ declare namespace data { + * Indicates that a cellular data link is connected. + * + * @syscap SystemCapability.Telephony.CellularData +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DATA_STATE_CONNECTED = 2, + +@@ -628,7 +649,8 @@ declare namespace data { + * Indicates that a cellular data link is suspended. + * + * @syscap SystemCapability.Telephony.CellularData +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DATA_STATE_SUSPENDED = 3 + } +diff --git a/api/@ohos.telephony.esim.d.ts b/api/@ohos.telephony.esim.d.ts +index 26ac5e8a5..33d6143cf 100644 +--- a/api/@ohos.telephony.esim.d.ts ++++ b/api/@ohos.telephony.esim.d.ts +@@ -26,7 +26,8 @@ import type { AsyncCallback } from './@ohos.base'; + * + * @namespace eSIM + * @syscap SystemCapability.Telephony.CoreService.Esim +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace eSIM { + /** +@@ -312,7 +313,8 @@ declare namespace eSIM { + * @throws { BusinessError } 3120002 - System internal error. + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function resetMemory(slotId: number, options?:ResetOption): Promise; + +@@ -868,7 +870,8 @@ declare namespace eSIM { + * @enum { number } + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum ResetOption { + /** +@@ -876,7 +879,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DELETE_OPERATIONAL_PROFILES = 1, + +@@ -885,7 +889,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DELETE_FIELD_LOADED_TEST_PROFILES = 1 << 1, + +@@ -894,7 +899,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESET_DEFAULT_SMDP_ADDRESS = 1 << 2, + } +@@ -960,7 +966,8 @@ declare namespace eSIM { + * @enum { number } + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum ResultCode { + /** +@@ -968,7 +975,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_SOLVABLE_ERRORS = -2, + +@@ -977,7 +985,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_MUST_DISABLE_PROFILE = -1, + +@@ -986,7 +995,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_OK = 0, + +@@ -995,7 +1005,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_GET_EID_FAILED = 201, + +@@ -1004,7 +1015,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_ACTIVATION_CODE_CHANGED = 203, + +@@ -1013,7 +1025,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_ACTIVATION_CODE_INVALID = 204, + +@@ -1022,7 +1035,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_SMDP_ADDRESS_INVALID = 205, + +@@ -1031,7 +1045,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_EUICC_INFO_INVALID = 206, + +@@ -1040,7 +1055,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_TLS_HANDSHAKE_FAILED = 207, + +@@ -1049,7 +1065,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_CERTIFICATE_IO_ERROR = 208, + +@@ -1058,7 +1075,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_CERTIFICATE_RESPONSE_TIMEOUT = 209, + +@@ -1067,7 +1085,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_AUTHENTICATION_FAILED = 210, + +@@ -1076,7 +1095,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_RESPONSE_HTTP_FAILED = 211, + +@@ -1085,7 +1105,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_CONFIRMATION_CODE_INCORRECT = 212, + +@@ -1094,7 +1115,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_EXCEEDED_CONFIRMATION_CODE_TRY_LIMIT = 213, + +@@ -1103,7 +1125,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_NO_PROFILE_ON_SERVER = 214, + +@@ -1112,7 +1135,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_TRANSACTION_ID_INVALID = 215, + +@@ -1121,7 +1145,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_SERVER_ADDRESS_INVALID = 216, + +@@ -1130,7 +1155,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_GET_BOUND_PROFILE_PACKAGE_FAILED = 217, + +@@ -1139,7 +1165,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_USER_CANCEL_DOWNLOAD = 218, + +@@ -1148,7 +1175,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_SERVER_UNAVAILABLE = 220, + +@@ -1157,7 +1185,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_PROFILE_NON_DELETE = 223, + +@@ -1166,7 +1195,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_SMDP_ADDRESS_INCORRECT = 226, + +@@ -1175,7 +1205,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_ANALYZE_AUTHENTICATION_SERVER_RESPONSE_FAILED = 228, + +@@ -1184,7 +1215,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_ANALYZE_AUTHENTICATION_CLIENT_RESPONSE_FAILED = 229, + +@@ -1193,7 +1225,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_ANALYZE_AUTHENTICATION_CLIENT_MATCHING_ID_REFUSED = 231, + +@@ -1202,7 +1235,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_PROFILE_TYPE_ERROR_AUTHENTICATION_STOPPED = 233, + +@@ -1211,7 +1245,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_CARRIER_SERVER_REFUSED_ERRORS = 249, + +@@ -1220,7 +1255,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_CERTIFICATE_INVALID = 251, + +@@ -1229,7 +1265,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_OUT_OF_MEMORY = 263, + +@@ -1238,7 +1275,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_PPR_FORBIDDEN = 268, + +@@ -1247,7 +1285,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_NOTHING_TO_DELETE = 270, + +@@ -1256,7 +1295,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_PPR_NOT_MATCH = 276, + +@@ -1265,7 +1305,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_CAT_BUSY = 283, + +@@ -1274,7 +1315,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_PROFILE_EID_INVALID = 284, + +@@ -1283,7 +1325,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_DOWNLOAD_TIMEOUT = 287, + +@@ -1292,7 +1335,8 @@ declare namespace eSIM { + * + * @syscap SystemCapability.Telephony.CoreService.Esim + * @systemapi Hide this for inner system use. +- * @since 16 ++ * @since arkts {'1.1':'16','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RESULT_SGP_22_OTHER = 400, + } +diff --git a/api/@ohos.telephony.sim.d.ts b/api/@ohos.telephony.sim.d.ts +index 37f1d31d0..c57d6880f 100644 +--- a/api/@ohos.telephony.sim.d.ts ++++ b/api/@ohos.telephony.sim.d.ts +@@ -26,7 +26,8 @@ import type { AsyncCallback } from './@ohos.base'; + * + * @namespace sim + * @syscap SystemCapability.Telephony.CoreService +- * @since 6 ++ * @since arkts {'1.1':'6','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace sim { + /** +@@ -38,7 +39,8 @@ declare namespace sim { + * whether the SIM card in a specified slot is activated. + * Returns {@code true} if the SIM card is activated; returns {@code false} otherwise. + * @syscap SystemCapability.Telephony.CoreService +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isSimActive(slotId: number, callback: AsyncCallback): void; + +@@ -49,7 +51,8 @@ declare namespace sim { + * ranging from {@code 0} to the maximum card slot index number supported by the device. + * @returns { Promise } Returns {@code true} if the SIM card is activated; returns {@code false} otherwise. + * @syscap SystemCapability.Telephony.CoreService +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isSimActive(slotId: number): Promise; + +@@ -60,7 +63,8 @@ declare namespace sim { + * ranging from 0 to the maximum card slots supported by the device. + * @returns { boolean } Returns {@code true} if the SIM card is activated; returns {@code false} otherwise. + * @syscap SystemCapability.Telephony.CoreService +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isSimActiveSync(slotId: number): boolean; + +@@ -73,7 +77,8 @@ declare namespace sim { + * returns {@code 1} if card 2 is used as the default card slot for the voice service; + * returns {@code -1} if no card is available for the voice service. + * @syscap SystemCapability.Telephony.CoreService +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getDefaultVoiceSlotId(callback: AsyncCallback): void; + +@@ -84,7 +89,8 @@ declare namespace sim { + * returns {@code 1} if card 2 is used as the default card slot for the voice service; + * returns {@code -1} if no card is available for the voice service. + * @syscap SystemCapability.Telephony.CoreService +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getDefaultVoiceSlotId(): Promise; + +@@ -141,7 +147,8 @@ declare namespace sim { + * @throws { BusinessError } 8300004 - No SIM card found. + * @throws { BusinessError } 8300999 - Unknown error. + * @syscap SystemCapability.Telephony.CoreService +- * @since 6 ++ * @since arkts {'1.1':'6','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getISOCountryCodeForSim(slotId: number, callback: AsyncCallback): void; + +@@ -160,7 +167,8 @@ declare namespace sim { + * @throws { BusinessError } 8300004 - No SIM card found. + * @throws { BusinessError } 8300999 - Unknown error. + * @syscap SystemCapability.Telephony.CoreService +- * @since 6 ++ * @since arkts {'1.1':'6','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getISOCountryCodeForSim(slotId: number): Promise; + +@@ -313,7 +321,8 @@ declare namespace sim { + * @throws { BusinessError } 8300003 - System internal error. + * @throws { BusinessError } 8300999 - Unknown error. + * @syscap SystemCapability.Telephony.CoreService +- * @since 6 ++ * @since arkts {'1.1':'6','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSimState(slotId: number, callback: AsyncCallback): void; + +@@ -338,7 +347,8 @@ declare namespace sim { + * @throws { BusinessError } 8300003 - System internal error. + * @throws { BusinessError } 8300999 - Unknown error. + * @syscap SystemCapability.Telephony.CoreService +- * @since 6 ++ * @since arkts {'1.1':'6','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSimState(slotId: number): Promise; + +@@ -357,7 +367,8 @@ declare namespace sim { + *
  • {@code SimState#SIM_STATE_LOADED} + * + * @syscap SystemCapability.Telephony.CoreService +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSimStateSync(slotId: number): SimState; + +@@ -704,7 +715,8 @@ declare namespace sim { + * + * @returns { number } Returns the maximum number of SIM card slots. + * @syscap SystemCapability.Telephony.CoreService +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getMaxSimCount(): number; + +@@ -788,7 +800,8 @@ declare namespace sim { + * @throws { BusinessError } 8300003 - System internal error. + * @throws { BusinessError } 8300999 - Unknown error. + * @syscap SystemCapability.Telephony.CoreService +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function hasSimCard(slotId: number, callback: AsyncCallback): void; + +@@ -805,7 +818,8 @@ declare namespace sim { + * @throws { BusinessError } 8300003 - System internal error. + * @throws { BusinessError } 8300999 - Unknown error. + * @syscap SystemCapability.Telephony.CoreService +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function hasSimCard(slotId: number): Promise; + +@@ -838,7 +852,8 @@ declare namespace sim { + * @throws { BusinessError } 8300999 - Unknown error. + * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. + * @syscap SystemCapability.Telephony.CoreService +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSimAccountInfo(slotId: number, callback: AsyncCallback): void; + +@@ -859,7 +874,8 @@ declare namespace sim { + * @throws { BusinessError } 8300999 - Unknown error. + * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. + * @syscap SystemCapability.Telephony.CoreService +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSimAccountInfo(slotId: number): Promise; + +@@ -878,7 +894,8 @@ declare namespace sim { + * @throws { BusinessError } 8300004 - No SIM card found. + * @throws { BusinessError } 8300999 - Unknown error. + * @syscap SystemCapability.Telephony.CoreService +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getActiveSimAccountInfoList(callback: AsyncCallback>): void; + +@@ -893,7 +910,8 @@ declare namespace sim { + * @throws { BusinessError } 8300004 - No SIM card found. + * @throws { BusinessError } 8300999 - Unknown error. + * @syscap SystemCapability.Telephony.CoreService +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getActiveSimAccountInfoList(): Promise>; + +@@ -1230,7 +1248,8 @@ declare namespace sim { + * @throws { BusinessError } 8300999 - Unknown error. + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getOperatorConfigs(slotId: number, callback: AsyncCallback>): void; + +@@ -1252,7 +1271,8 @@ declare namespace sim { + * @throws { BusinessError } 8300999 - Unknown error. + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getOperatorConfigs(slotId: number): Promise>; + +@@ -1277,7 +1297,8 @@ declare namespace sim { + * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function unlockPin(slotId: number, pin: string, callback: AsyncCallback): void; + +@@ -1302,7 +1323,8 @@ declare namespace sim { + * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function unlockPin(slotId: number, pin: string): Promise; + +@@ -1328,7 +1350,8 @@ declare namespace sim { + * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function unlockPuk(slotId: number, newPin: string, puk: string, callback: AsyncCallback): void; + +@@ -1354,7 +1377,8 @@ declare namespace sim { + * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function unlockPuk(slotId: number, newPin: string, puk: string): Promise; + +@@ -1833,7 +1857,8 @@ declare namespace sim { + * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getLockState(slotId: number, lockType: LockType, callback: AsyncCallback): void; + +@@ -1857,7 +1882,8 @@ declare namespace sim { + * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getLockState(slotId: number, lockType: LockType): Promise; + +@@ -2223,7 +2249,8 @@ declare namespace sim { + * @interface OperatorConfig + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface OperatorConfig { + /** +@@ -2232,7 +2259,8 @@ declare namespace sim { + * @type { string } + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + field: string; + +@@ -2242,7 +2270,8 @@ declare namespace sim { + * @type { string } + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + value: string; + } +@@ -2252,7 +2281,8 @@ declare namespace sim { + * + * @interface IccAccountInfo + * @syscap SystemCapability.Telephony.CoreService +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface IccAccountInfo { + /** +@@ -2260,7 +2290,8 @@ declare namespace sim { + * + * @type { number } + * @syscap SystemCapability.Telephony.CoreService +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + simId: number; + +@@ -2270,7 +2301,8 @@ declare namespace sim { + * + * @type { number } + * @syscap SystemCapability.Telephony.CoreService +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + slotIndex: number; + +@@ -2279,7 +2311,8 @@ declare namespace sim { + * + * @type { boolean } + * @syscap SystemCapability.Telephony.CoreService +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isEsim: boolean; + +@@ -2288,7 +2321,8 @@ declare namespace sim { + * + * @type { boolean } + * @syscap SystemCapability.Telephony.CoreService +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isActive: boolean; + +@@ -2297,7 +2331,8 @@ declare namespace sim { + * + * @type { string } + * @syscap SystemCapability.Telephony.CoreService +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + iccId: string; + +@@ -2306,7 +2341,8 @@ declare namespace sim { + * + * @type { string } + * @syscap SystemCapability.Telephony.CoreService +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + showName: string; + +@@ -2315,7 +2351,8 @@ declare namespace sim { + * + * @type { string } + * @syscap SystemCapability.Telephony.CoreService +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + showNumber: string; + } +@@ -2326,7 +2363,8 @@ declare namespace sim { + * @interface LockStatusResponse + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface LockStatusResponse { + /** +@@ -2335,7 +2373,8 @@ declare namespace sim { + * @type { number } + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + result: number; + +@@ -2345,7 +2384,8 @@ declare namespace sim { + * @type { ?number } + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. +- * @since 7 ++ * @since arkts {'1.1':'7','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + remain?: number; + } +@@ -2476,7 +2516,8 @@ declare namespace sim { + * @enum { number } + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum LockType { + /** +@@ -2484,7 +2525,8 @@ declare namespace sim { + * + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PIN_LOCK = 1, + +@@ -2493,7 +2535,8 @@ declare namespace sim { + * + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FDN_LOCK = 2, + } +@@ -2591,7 +2634,8 @@ declare namespace sim { + * + * @enum { number } + * @syscap SystemCapability.Telephony.CoreService +- * @since 6 ++ * @since arkts {'1.1':'6','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum SimState { + /** +@@ -2599,7 +2643,8 @@ declare namespace sim { + * obtained. + * + * @syscap SystemCapability.Telephony.CoreService +- * @since 6 ++ * @since arkts {'1.1':'6','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SIM_STATE_UNKNOWN, + +@@ -2608,7 +2653,8 @@ declare namespace sim { + * no SIM card is inserted into the card slot. + * + * @syscap SystemCapability.Telephony.CoreService +- * @since 6 ++ * @since arkts {'1.1':'6','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SIM_STATE_NOT_PRESENT, + +@@ -2618,7 +2664,8 @@ declare namespace sim { + * unblocking key (PUK) or network. + * + * @syscap SystemCapability.Telephony.CoreService +- * @since 6 ++ * @since arkts {'1.1':'6','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SIM_STATE_LOCKED, + +@@ -2627,7 +2674,8 @@ declare namespace sim { + * the SIM card is in position but cannot work properly. + * + * @syscap SystemCapability.Telephony.CoreService +- * @since 6 ++ * @since arkts {'1.1':'6','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SIM_STATE_NOT_READY, + +@@ -2636,7 +2684,8 @@ declare namespace sim { + * SIM card is in position and is working properly. + * + * @syscap SystemCapability.Telephony.CoreService +- * @since 6 ++ * @since arkts {'1.1':'6','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SIM_STATE_READY, + +@@ -2645,7 +2694,8 @@ declare namespace sim { + * SIM card is in position and is working properly. + * + * @syscap SystemCapability.Telephony.CoreService +- * @since 6 ++ * @since arkts {'1.1':'6','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SIM_STATE_LOADED + } +@@ -2656,7 +2706,8 @@ declare namespace sim { + * @enum { number } + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum LockState { + /** +@@ -2664,7 +2715,8 @@ declare namespace sim { + * + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LOCK_OFF = 0, + +@@ -2673,7 +2725,8 @@ declare namespace sim { + * + * @syscap SystemCapability.Telephony.CoreService + * @systemapi Hide this for inner system use. +- * @since 8 ++ * @since arkts {'1.1':'8','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LOCK_ON = 1, + } +diff --git a/api/@ohos.thermal.d.ts b/api/@ohos.thermal.d.ts +index 74059dff5..fadd6ea48 100644 +--- a/api/@ohos.thermal.d.ts ++++ b/api/@ohos.thermal.d.ts +@@ -35,7 +35,7 @@ declare namespace thermal { + /** + * Enumerates the {@link ThermalLevel} types. + * +- * @enum {number} ++ * @enum {int} + * @syscap SystemCapability.PowerManager.ThermalManager + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 +diff --git a/api/@ohos.transfer.d.ets b/api/@ohos.transfer.d.ets +index b07994d16..9f401a850 100644 +--- a/api/@ohos.transfer.d.ets ++++ b/api/@ohos.transfer.d.ets +@@ -47,6 +47,7 @@ declare namespace transfer { + * @param { Any } input The 1.0 object that needs to be converted + * @param { string } inputName name registered by the subsystem. + * @returns { Object } Object ++ * @throws { BusinessError } 10200067 - Transfer Error. The input name is not supported! + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +@@ -60,6 +61,7 @@ declare namespace transfer { + * @param { Object } input The 1.2 object that needs to be converted + * @param { string } inputName name registered by the subsystem. + * @returns { Any } Object ++ * @throws { BusinessError } 10200067 - Transfer Error. The input name is not supported! + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +diff --git a/api/@ohos.uri.d.ts b/api/@ohos.uri.d.ts +index 4073c2867..0567d481b 100644 +--- a/api/@ohos.uri.d.ts ++++ b/api/@ohos.uri.d.ts +@@ -1162,7 +1162,7 @@ declare namespace uri { + * @since 20 + * @arkts 1.2 + */ +- set encodedSSP(input: string | null) ++ set encodedSSP(input: string | null); + } + } + export default uri; +diff --git a/api/@ohos.usbManager.d.ts b/api/@ohos.usbManager.d.ts +index f5d0c0274..f4fc45df4 100644 +--- a/api/@ohos.usbManager.d.ts ++++ b/api/@ohos.usbManager.d.ts +@@ -73,7 +73,8 @@ declare namespace usbManager { + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function connectDevice(device: USBDevice): Readonly; + +@@ -98,7 +99,8 @@ declare namespace usbManager { + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function hasRight(deviceName: string): boolean; + +@@ -125,7 +127,8 @@ declare namespace usbManager { + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function requestRight(deviceName: string): Promise; + +@@ -152,7 +155,8 @@ declare namespace usbManager { + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function removeRight(deviceName: string): boolean; + +@@ -314,7 +318,8 @@ declare namespace usbManager { + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function addDeviceAccessRight(tokenId: string, deviceName: string): boolean; + +@@ -337,7 +342,7 @@ declare namespace usbManager { + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { string } funcs - descriptor of the supported function list. It cannot be empty. +- * @returns { number } the numeric mask combination of the function list. ++ * @returns { int } the numeric mask combination of the function list. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: +@@ -346,9 +351,10 @@ declare namespace usbManager { + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getFunctionsFromString(funcs: string): number; ++ function getFunctionsFromString(funcs: string): int; + + /** + * Converts the numeric mask combination of a given USB function list to a string descriptor. +@@ -378,7 +384,8 @@ declare namespace usbManager { + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getStringFromFunctions(funcs: FunctionType): string; + +@@ -414,7 +421,8 @@ declare namespace usbManager { + * @throws { BusinessError } 14400006 - Unsupported operation. The function is not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function setDeviceFunctions(funcs: FunctionType): Promise; + +@@ -438,7 +446,8 @@ declare namespace usbManager { + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getDeviceFunctions(): FunctionType; + +@@ -464,7 +473,8 @@ declare namespace usbManager { + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getPortList(): Array; + +@@ -486,7 +496,7 @@ declare namespace usbManager { + * Gets the mask combination for the supported mode list of the specified USBPort. + * + * @permission ohos.permission.MANAGE_USB_CONFIG +- * @param { number } portId - unique ID of the port. It cannot be empty. ++ * @param { int } portId - unique ID of the port. It cannot be empty. + * @returns { PortModeType } the mask combination for the supported mode list in PortModeType. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. +@@ -496,9 +506,10 @@ declare namespace usbManager { + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getPortSupportModes(portId: number): PortModeType; ++ function getPortSupportModes(portId: int): PortModeType; + + /** + * Sets the role types supported by the specified USBPort, which can be powerRole (for charging) and dataRole (for data transfer). +@@ -521,7 +532,7 @@ declare namespace usbManager { + * Sets the role types supported by the specified USBPort, which can be powerRole (for charging) and dataRole (for data transfer). + * + * @permission ohos.permission.MANAGE_USB_CONFIG +- * @param { number } portId - unique ID of the port. It cannot be empty. ++ * @param { int } portId - unique ID of the port. It cannot be empty. + * @param { PowerRoleType } powerRole - charging role. It cannot be empty. + * @param { DataRoleType } dataRole - data role. It cannot be empty. + * @returns { Promise } the promise returned by the function. +@@ -534,9 +545,10 @@ declare namespace usbManager { + * @throws { BusinessError } 14400003 - Unsupported operation. The current device does not support port role switching. + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function setPortRoleTypes(portId: number, powerRole: PowerRoleType, dataRole: DataRoleType): Promise; ++ function setPortRoleTypes(portId: int, powerRole: PowerRoleType, dataRole: DataRoleType): Promise; + + /** + * Adds USB accessory access right. +@@ -560,7 +572,7 @@ declare namespace usbManager { + * Adds USB accessory access right. + * + * @permission ohos.permission.MANAGE_USB_CONFIG +- * @param { number } tokenId - refers to application that require access permissions. It cannot be empty. ++ * @param { int } tokenId - refers to application that require access permissions. It cannot be empty. + * @param { USBAccessory } accessory - USB accessory. It cannot be empty. + * @throws { BusinessError } 201 - The permission check failed. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. +@@ -573,9 +585,10 @@ declare namespace usbManager { + * @throws { BusinessError } 14400005 - Database operation exception. + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function addAccessoryRight(tokenId: number, accessory: USBAccessory): void; ++ function addAccessoryRight(tokenId: int, accessory: USBAccessory): void; + + /* usb pipe functions begin */ + /** +@@ -597,15 +610,16 @@ declare namespace usbManager { + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @param { USBInterface } iface - USB interface, which is used to determine the interface to claim. It cannot be empty. + * @param { boolean } [force] - optional parameter that determines whether to forcibly claim the USB interface. +- * @returns { number } returns **0** if the USB interface is successfully claimed; returns an error code otherwise. ++ * @returns { int } returns **0** if the USB interface is successfully claimed; returns an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function claimInterface(pipe: USBDevicePipe, iface: USBInterface, force?: boolean): number; ++ function claimInterface(pipe: USBDevicePipe, iface: USBInterface, force?: boolean): int; + + /** + * Releases a USB interface. +@@ -624,15 +638,16 @@ declare namespace usbManager { + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @param { USBInterface } iface - USB interface, which is used to determine the interface to release. It cannot be empty. +- * @returns { number } returns **0** if the USB interface is successfully released; returns an error code otherwise. ++ * @returns { int } returns **0** if the USB interface is successfully released; returns an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function releaseInterface(pipe: USBDevicePipe, iface: USBInterface): number; ++ function releaseInterface(pipe: USBDevicePipe, iface: USBInterface): int; + + /** + * Sets the device configuration. +@@ -651,15 +666,16 @@ declare namespace usbManager { + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @param { USBConfiguration } config - device configuration. It cannot be empty. +- * @returns { number } returns **0** if the device configuration is successfully set; returns an error code otherwise. ++ * @returns { int } returns **0** if the device configuration is successfully set; returns an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function setConfiguration(pipe: USBDevicePipe, config: USBConfiguration): number; ++ function setConfiguration(pipe: USBDevicePipe, config: USBConfiguration): int; + + /** + * Sets a USB interface. +@@ -678,15 +694,16 @@ declare namespace usbManager { + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @param { USBInterface } iface - USB interface, which is used to determine the interface to set. It cannot be empty. +- * @returns { number } returns **0** if the USB interface is successfully set; return an error code otherwise. ++ * @returns { int } returns **0** if the USB interface is successfully set; return an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function setInterface(pipe: USBDevicePipe, iface: USBInterface): number; ++ function setInterface(pipe: USBDevicePipe, iface: USBInterface): int; + + /** + * Obtains the raw USB descriptor. +@@ -709,7 +726,8 @@ declare namespace usbManager { + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getRawDescriptor(pipe: USBDevicePipe): Uint8Array; + +@@ -728,15 +746,16 @@ declare namespace usbManager { + * Obtains the file descriptor. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. +- * @returns { number } returns the file descriptor of the USB device. ++ * @returns { int } returns the file descriptor of the USB device. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getFileDescriptor(pipe: USBDevicePipe): number; ++ function getFileDescriptor(pipe: USBDevicePipe): int; + + /** + * Performs control transfer. +@@ -775,17 +794,18 @@ declare namespace usbManager { + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. + * @param { USBDeviceRequestParams } requestparam - control transfer parameters. It cannot be empty. +- * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. +- * @returns { Promise } returns the size of the transmitted or received data block if the control transfer is successful; ++ * @param { int } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. ++ * @returns { Promise } returns the size of the transmitted or received data block if the control transfer is successful; + * return -1 if an exception occurs. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function usbControlTransfer(pipe: USBDevicePipe, requestparam: USBDeviceRequestParams, timeout?: number): Promise; ++ function usbControlTransfer(pipe: USBDevicePipe, requestparam: USBDeviceRequestParams, timeout?: int): Promise; + + /** + * Performs bulk transfer. +@@ -808,22 +828,23 @@ declare namespace usbManager { + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. + * @param { USBEndpoint } endpoint - USB endpoint, which is used to determine the USB port for data transfer. It cannot be empty. + * @param { Uint8Array } buffer - buffer for writing or reading data. It cannot be empty. +- * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. +- * @returns { Promise } the size of the transmitted or received data block if the control transfer is successful; ++ * @param { int } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. ++ * @returns { Promise } the size of the transmitted or received data block if the control transfer is successful; + * return -1 if an exception occurs. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function bulkTransfer( + pipe: USBDevicePipe, + endpoint: USBEndpoint, + buffer: Uint8Array, +- timeout?: number +- ): Promise; ++ timeout?: int ++ ): Promise; + + /** + * Closes a USB device pipe. +@@ -840,15 +861,16 @@ declare namespace usbManager { + * Closes a USB device pipe. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. +- * @returns { number } returns **0** if the USB device pipe is closed successfully; return an error code otherwise. ++ * @returns { int } returns **0** if the USB device pipe is closed successfully; return an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function closePipe(pipe: USBDevicePipe): number; ++ function closePipe(pipe: USBDevicePipe): int; + + /** + * Checks whether the application has the right to access the USB accessory. +@@ -879,7 +901,8 @@ declare namespace usbManager { + * @throws { BusinessError } 14400005 - Database operation exception. + * @throws { BusinessError } 14401001 - The target USBAccessory not matched. + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function hasAccessoryRight(accessory: USBAccessory): boolean; + +@@ -912,7 +935,8 @@ declare namespace usbManager { + * @throws { BusinessError } 14400005 - Database operation exception. + * @throws { BusinessError } 14401001 - The target USBAccessory not matched. + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function requestAccessoryRight(accessory: USBAccessory): Promise; + +@@ -943,7 +967,8 @@ declare namespace usbManager { + * @throws { BusinessError } 14400005 - Database operation exception. + * @throws { BusinessError } 14401001 - The target USBAccessory not matched. + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function cancelAccessoryRight(accessory: USBAccessory): void; + +@@ -964,7 +989,8 @@ declare namespace usbManager { + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getAccessoryList(): Array>; + +@@ -1001,7 +1027,8 @@ declare namespace usbManager { + * @throws { BusinessError } 14401002 - Failed to open the native accessory node. + * @throws { BusinessError } 14401003 - Cannot reopen the accessory. + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function openAccessory(accessory: USBAccessory): USBAccessoryHandle; + +@@ -1028,7 +1055,8 @@ declare namespace usbManager { + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function closeAccessory(accessoryHandle: USBAccessoryHandle): void; + +@@ -1044,42 +1072,42 @@ declare namespace usbManager { + /** + * Endpoint address + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- address: number; ++ address: int; + + /** + * Endpoint attributes + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- attributes: number; ++ attributes: int; + + /** + * Endpoint interval + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- interval: number; ++ interval: int; + + /** + * Maximum size of data packets on the endpoint + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- maxPacketSize: number; ++ maxPacketSize: int; + + /** + * Endpoint direction +@@ -1113,22 +1141,22 @@ declare namespace usbManager { + /** + * Endpoint type + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- type: number; ++ type: int; + + /** + * Unique ID defined by USBInterface.id, which indicates the interface to which the endpoint belongs + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- interfaceId: number; ++ interfaceId: int; + } + + /** +@@ -1143,52 +1171,52 @@ declare namespace usbManager { + /** + * Unique ID of the USB interface + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- id: number; ++ id: int; + + /** + * Interface protocol + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- protocol: number; ++ protocol: int; + + /** + * Device type + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- clazz: number; ++ clazz: int; + + /** + * Device subclass + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- subClass: number; ++ subClass: int; + + /** + * Alternation between descriptors of the same USB interface + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- alternateSetting: number; ++ alternateSetting: int; + + /** + * Interface name +@@ -1223,32 +1251,32 @@ declare namespace usbManager { + /** + * Unique ID of the USB configuration + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- id: number; ++ id: int; + + /** + * Configuration attributes + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- attributes: number; ++ attributes: int; + + /** + * Maximum power consumption, in mA + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- maxPower: number; ++ maxPower: int; + + /** + * Configuration name, which can be left empty +@@ -1303,22 +1331,22 @@ declare namespace usbManager { + /** + * Bus address + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- busNum: number; ++ busNum: int; + + /** + * Device address + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- devAddress: number; ++ devAddress: int; + + /** + * Device SN +@@ -1373,52 +1401,52 @@ declare namespace usbManager { + /** + * Vendor ID + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- vendorId: number; ++ vendorId: int; + + /** + * Product ID + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- productId: number; ++ productId: int; + + /** + * Device class + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- clazz: number; ++ clazz: int; + + /** + * Device subclass + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- subClass: number; ++ subClass: int; + + /** + * Device protocol code + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- protocol: number; ++ protocol: int; + + /** + * Device configuration descriptor information +@@ -1436,35 +1464,39 @@ declare namespace usbManager { + * + * @typedef USBDevicePipe + * @syscap SystemCapability.USB.USBManager +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface USBDevicePipe { + /** + * Bus address. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- busNum: number; ++ busNum: int; + + /** + * Device address + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- devAddress: number; ++ devAddress: int; + } + + /** + * Enumerates power role types. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum PowerRoleType { + /** +@@ -1472,7 +1504,8 @@ declare namespace usbManager { + * + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NONE = 0, + +@@ -1481,7 +1514,8 @@ declare namespace usbManager { + * + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SOURCE = 1, + +@@ -1490,7 +1524,8 @@ declare namespace usbManager { + * + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SINK = 2 + } +@@ -1498,10 +1533,11 @@ declare namespace usbManager { + /** + * Enumerates data role types. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum DataRoleType { + /** +@@ -1509,7 +1545,8 @@ declare namespace usbManager { + * + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NONE = 0, + +@@ -1518,7 +1555,8 @@ declare namespace usbManager { + * + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + HOST = 1, + +@@ -1527,7 +1565,8 @@ declare namespace usbManager { + * + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DEVICE = 2 + } +@@ -1535,10 +1574,11 @@ declare namespace usbManager { + /** + * Enumerates port mode types + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum PortModeType { + /** +@@ -1546,7 +1586,8 @@ declare namespace usbManager { + * + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NONE = 0, + +@@ -1555,7 +1596,8 @@ declare namespace usbManager { + * + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + UFP = 1, + +@@ -1564,7 +1606,8 @@ declare namespace usbManager { + * + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DFP = 2, + +@@ -1573,7 +1616,8 @@ declare namespace usbManager { + * + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DRP = 3, + +@@ -1582,7 +1626,8 @@ declare namespace usbManager { + * + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NUM_MODES = 4 + } +@@ -1593,38 +1638,42 @@ declare namespace usbManager { + * @typedef USBPortStatus + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface USBPortStatus { + /** + * USB mode + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- currentMode: number; ++ currentMode: int; + + /** + * Power role + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- currentPowerRole: number; ++ currentPowerRole: int; + + /** + * Data role + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- currentDataRole: number; ++ currentDataRole: int; + } + + /** +@@ -1633,18 +1682,20 @@ declare namespace usbManager { + * @typedef USBPort + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface USBPort { + /** + * Unique ID of the USB port + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- id: number; ++ id: int; + + /** + * Mask combination for the supported mode list of the USB port +@@ -1652,7 +1703,8 @@ declare namespace usbManager { + * @type { PortModeType } + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + supportedModes: PortModeType; + +@@ -1662,7 +1714,8 @@ declare namespace usbManager { + * @type { USBPortStatus } + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + status: USBPortStatus; + } +@@ -1743,60 +1796,67 @@ declare namespace usbManager { + * + * @typedef USBDeviceRequestParams + * @syscap SystemCapability.USB.USBManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface USBDeviceRequestParams { + /** + * Bit map request type + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- bmRequestType: number; ++ bmRequestType: int; + + /** + * Byte request + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- bRequest: number; ++ bRequest: int; + + /** + * Request parameter word value + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- wValue: number; ++ wValue: int; + + /** + * Word index of the parameter value + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- wIndex: number; ++ wIndex: int; + + /** + * Word length of the parameter value + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- wLength: number; ++ wLength: int; + + /** + * Data written to or read from the buffer + * + * @type { Uint8Array } + * @syscap SystemCapability.USB.USBManager +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + data: Uint8Array; + } +@@ -1804,16 +1864,18 @@ declare namespace usbManager { + /** + * Enumerates USB request target types. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.USB.USBManager +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum USBRequestTargetType { + /** + * USB device + * + * @syscap SystemCapability.USB.USBManager +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + USB_REQUEST_TARGET_DEVICE = 0, + +@@ -1821,7 +1883,8 @@ declare namespace usbManager { + * USB interface + * + * @syscap SystemCapability.USB.USBManager +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + USB_REQUEST_TARGET_INTERFACE = 1, + +@@ -1829,7 +1892,8 @@ declare namespace usbManager { + * Endpoint + * + * @syscap SystemCapability.USB.USBManager +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + USB_REQUEST_TARGET_ENDPOINT = 2, + +@@ -1837,7 +1901,8 @@ declare namespace usbManager { + * Others + * + * @syscap SystemCapability.USB.USBManager +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + USB_REQUEST_TARGET_OTHER = 3 + } +@@ -1845,16 +1910,18 @@ declare namespace usbManager { + /** + * Enumerates control request types. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.USB.USBManager +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum USBControlRequestType { + /** + * Standard + * + * @syscap SystemCapability.USB.USBManager +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + USB_REQUEST_TYPE_STANDARD = 0, + +@@ -1862,7 +1929,8 @@ declare namespace usbManager { + * Class + * + * @syscap SystemCapability.USB.USBManager +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + USB_REQUEST_TYPE_CLASS = 1, + +@@ -1870,7 +1938,8 @@ declare namespace usbManager { + * Vendor + * + * @syscap SystemCapability.USB.USBManager +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + USB_REQUEST_TYPE_VENDOR = 2 + } +@@ -1878,7 +1947,7 @@ declare namespace usbManager { + /** + * Enumerates request directions. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 +@@ -1906,10 +1975,11 @@ declare namespace usbManager { + /** + * Enumerates function modes. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum FunctionType { + /** +@@ -1917,7 +1987,8 @@ declare namespace usbManager { + * + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NONE = 0, + +@@ -1926,7 +1997,8 @@ declare namespace usbManager { + * + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ACM = 1, + +@@ -1935,7 +2007,8 @@ declare namespace usbManager { + * + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ECM = 2, + +@@ -1944,7 +2017,8 @@ declare namespace usbManager { + * + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + HDC = 4, + +@@ -1953,7 +2027,8 @@ declare namespace usbManager { + * + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MTP = 8, + +@@ -1962,7 +2037,8 @@ declare namespace usbManager { + * + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PTP = 16, + +@@ -1971,7 +2047,8 @@ declare namespace usbManager { + * + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RNDIS = 32, + +@@ -1980,7 +2057,8 @@ declare namespace usbManager { + * + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + MIDI = 64, + +@@ -1989,7 +2067,8 @@ declare namespace usbManager { + * + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AUDIO_SOURCE = 128, + +@@ -1998,7 +2077,8 @@ declare namespace usbManager { + * + * @syscap SystemCapability.USB.USBManager + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NCM = 256 + } +@@ -2008,7 +2088,8 @@ declare namespace usbManager { + * + * @typedef USBAccessory + * @syscap SystemCapability.USB.USBManager +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface USBAccessory { + /** +@@ -2016,7 +2097,8 @@ declare namespace usbManager { + * + * @type { string } + * @syscap SystemCapability.USB.USBManager +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + manufacturer: string; + +@@ -2025,7 +2107,8 @@ declare namespace usbManager { + * + * @type { string } + * @syscap SystemCapability.USB.USBManager +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + product: string; + +@@ -2034,7 +2117,8 @@ declare namespace usbManager { + * + * @type { string } + * @syscap SystemCapability.USB.USBManager +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + description: string; + +@@ -2043,7 +2127,8 @@ declare namespace usbManager { + * + * @type { string } + * @syscap SystemCapability.USB.USBManager +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + version: string; + +@@ -2052,7 +2137,8 @@ declare namespace usbManager { + * + * @type { string } + * @syscap SystemCapability.USB.USBManager +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + serialNumber: string; + } +@@ -2062,32 +2148,36 @@ declare namespace usbManager { + * + * @typedef USBAccessoryHandle + * @syscap SystemCapability.USB.USBManager +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface USBAccessoryHandle { + /** + * The file descriptor of the accessory.The valid USBAccessoryHandle.accessoryFd is a positive value. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- accessoryFd: number; ++ accessoryFd: int; + } + + /** + * Usb transfer flag. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum UsbTransferFlags { + /** + * Report short frames as errors + * + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + USB_TRANSFER_SHORT_NOT_OK = 0, + +@@ -2095,7 +2185,8 @@ declare namespace usbManager { + * Automatically free transfer buffer + * + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + USB_TRANSFER_FREE_BUFFER = 1, + +@@ -2103,7 +2194,8 @@ declare namespace usbManager { + * Automatically free transfer after callback returns + * + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + USB_TRANSFER_FREE_TRANSFER = 2, + +@@ -2111,7 +2203,8 @@ declare namespace usbManager { + * Transmissions that are multiples of wMaxPacketSize will add an additional zero packet. + * + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + USB_TRANSFER_ADD_ZERO_PACKET = 3 + } +@@ -2119,16 +2212,18 @@ declare namespace usbManager { + /** + * Usb transfer status. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum UsbTransferStatus { + /** + * Transfer completed + * + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TRANSFER_COMPLETED = 0, + +@@ -2136,7 +2231,8 @@ declare namespace usbManager { + * Transfer failed + * + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TRANSFER_ERROR = 1, + +@@ -2144,7 +2240,8 @@ declare namespace usbManager { + * Transfer timed out + * + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TRANSFER_TIMED_OUT = 2, + +@@ -2152,7 +2249,8 @@ declare namespace usbManager { + * Transfer was canceled + * + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TRANSFER_CANCELED = 3, + +@@ -2161,7 +2259,8 @@ declare namespace usbManager { + * stalled). For control endpoints: control request not supported. + * + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TRANSFER_STALL = 4, + +@@ -2169,7 +2268,8 @@ declare namespace usbManager { + * Device was disconnected + * + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TRANSFER_NO_DEVICE = 5, + +@@ -2177,7 +2277,8 @@ declare namespace usbManager { + * Device sent more data than requested + * + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TRANSFER_OVERFLOW = 6 + } +@@ -2185,16 +2286,18 @@ declare namespace usbManager { + /** + * USB DATA transfer type. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum UsbEndpointTransferType { + /** + * Isochronous endpoint + * + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TRANSFER_TYPE_ISOCHRONOUS = 0x1, + +@@ -2202,7 +2305,8 @@ declare namespace usbManager { + * Bulk endpoint + * + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TRANSFER_TYPE_BULK = 0x2, + +@@ -2210,7 +2314,8 @@ declare namespace usbManager { + * Interrupt endpoint + * + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TRANSFER_TYPE_INTERRUPT = 0x3 + } +@@ -2220,33 +2325,37 @@ declare namespace usbManager { + * + * @typedef UsbIsoPacketDescriptor + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface UsbIsoPacketDescriptor { + /** + * Length of data to request in this packet + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- length: number; ++ length: int; + + /** + * Amount of data that was actually transferred + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- actualLength: number; ++ actualLength: int; + + /** + * Status code for this packet + * + * @type { UsbTransferStatus } + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + status: UsbTransferStatus; + } +@@ -2256,25 +2365,28 @@ declare namespace usbManager { + * + * @typedef SubmitTransferCallback + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface SubmitTransferCallback { + /** + * Actual length of data that was transferred. Read-only, and only for + * use within transfer callback function. Not valid for isochronous endpoint transfers. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- actualLength: number; ++ actualLength: int; + + /** + * The status of the transfer. Read-only, and only for use within transfer callback function. + * + * @type { UsbTransferStatus } + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + status: UsbTransferStatus; + +@@ -2283,7 +2395,8 @@ declare namespace usbManager { + * + * @type { Array> } + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isoPacketDescs: Array>; + } +@@ -2294,7 +2407,8 @@ declare namespace usbManager { + * + * @typedef UsbDataTransferParams + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface UsbDataTransferParams { + /** +@@ -2302,7 +2416,8 @@ declare namespace usbManager { + * + * @type { USBDevicePipe } + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + devPipe: USBDevicePipe; + +@@ -2311,52 +2426,58 @@ declare namespace usbManager { + * + * @type { UsbTransferFlags } + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + flags: UsbTransferFlags; + + /** + * Address of the endpoint where this transfer will be sent. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- endpoint: number; ++ endpoint: int; + + /** + * Type of the transfer + * + * @type { UsbEndpointTransferType } + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type: UsbEndpointTransferType; + + /** + * Timeout for this transfer in milliseconds. A value of 0 indicates no timeout. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- timeout: number; ++ timeout: int; + + /** + * Length of the data buffer. Must be non-negative. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- length: number; ++ length: int; + + /** + * Callback function. This will be invoked when the transfer completes, fails, or is canceled. + * + * @type { AsyncCallback } + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + callback: AsyncCallback; + +@@ -2366,7 +2487,8 @@ declare namespace usbManager { + * + * @type { Uint8Array } + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + userData: Uint8Array; + +@@ -2375,18 +2497,20 @@ declare namespace usbManager { + * + * @type { Uint8Array } + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + buffer: Uint8Array; + + /** + * Count of isochronous packets. Only used for I/O with isochronous endpoints. Must be non-negative. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- isoPacketCount: number; ++ isoPacketCount: int; + } + + /** +@@ -2401,7 +2525,8 @@ declare namespace usbManager { + * @throws { BusinessError } 14400009 - Insufficient memory. + * @throws { BusinessError } 14400012 - Transmission I/O error. + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function usbSubmitTransfer(transfer: UsbDataTransferParams): void; + +@@ -2416,7 +2541,8 @@ declare namespace usbManager { + *
    1.Unrecognized discard error code. + * @throws { BusinessError } 14400011 - The transfer is not in progress, or is already complete or cancelled. + * @syscap SystemCapability.USB.USBManager +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function usbCancelTransfer(transfer: UsbDataTransferParams): void; + +@@ -2437,6 +2563,7 @@ declare namespace usbManager { + *
    2.The call chain used to obtain the input parameters is not resonable. + * @syscap SystemCapability.USB.USBManager + * @since 20 ++ * @arkts 1.1&1.2 + */ + function resetUsbDevice(pipe: USBDevicePipe): boolean; + } +diff --git a/api/@ohos.usbManager.serial.d.ts b/api/@ohos.usbManager.serial.d.ts +index 937fe88b3..838f6c3b5 100644 +--- a/api/@ohos.usbManager.serial.d.ts ++++ b/api/@ohos.usbManager.serial.d.ts +@@ -22,7 +22,8 @@ + * Provides APIs for managing USB-to-virtual serial ports and implementing USB-to-virtual serial port communication. + * @namespace serialManager + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace serialManager { + +@@ -30,224 +31,230 @@ declare namespace serialManager { + * Obtains the serial port device list. + * @returns { Readonly[]} Returns the list of serial port devices obtained. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getPortList(): Readonly[]; + + /** + * Checks whether a serial port device has the access right. The system applications have the access right by default. +- * @param { number} portId ID of the target device. For details, see SerialPort.portId. ++ * @param { int} portId ID of the target device. For details, see SerialPort.portId. + * @returns {boolean} Returns true if the device has the right; returns false otherwise. +- * @throws { BusinessError } 401 Parameter error. Possible causes: +- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14400005 Database operation exception. + * @throws { BusinessError } 31400001 Serial port management exception. + * @throws { BusinessError } 31400003 Device does not exist. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts{ '1.1':'19','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function hasSerialRight(portId: number): boolean; ++ function hasSerialRight(portId: int): boolean; + + /** + * Requests the right for accessing a serial port device from the user. The system applications do not need to call this API. +- * @param { number} portId ID of the target device. For details, see SerialPort.portId. +- * @returns { Promise} Promise used to return the result. +- * The value true means the user allows the access; +- * the value false means the opposite. +- * @throws { BusinessError } 401 Parameter error. Possible causes: +- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. ++ * @param { int} portId ID of the target device. For details, see SerialPort.portId. ++ * @returns { Promise} Promise used to return the result. The value true means the user allows the access; the value false means the opposite. ++ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14400005 Database operation exception. + * @throws { BusinessError } 31400001 Serial port management exception. + * @throws { BusinessError } 31400003 Device does not exist. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts{ '1.1':'19','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function requestSerialRight(portId: number): Promise; ++ function requestSerialRight(portId: int): Promise; + + /** + * Adds the access right for a serial port device. + * @permission ohos.permission.MANAGE_USB_CONFIG +- * @param { number } tokenId Token ID of the target application. +- * @param { number} portId ID of the target device. For details, see SerialPort.portId. ++ * @param { int } tokenId Token ID of the target application. ++ * @param { int} portId ID of the target device. For details, see SerialPort.portId. + * @throws { BusinessError } 201 Permission verification failed. The application does not have the permission required to call the API. + * @throws { BusinessError } 202 Permission verification failed. A non-system application calls a system API. +- * @throws { BusinessError } 401 Parameter error. Possible causes: +- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14400005 Database operation exception. + * @throws { BusinessError } 31400001 Serial port management exception. + * @throws { BusinessError } 31400003 Device does not exist. + * @syscap SystemCapability.USB.USBManager.Serial + * @systemapi +- * @since 19 ++ * @since arkts{ '1.1':'19','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function addSerialRight(tokenId: number, portId: number): void; ++ function addSerialRight(tokenId: int, portId: int): void; + + /** + * Cancels the access right for a serial port device. This API will not cancel the default access right of system applications. +- * @param { number} portId ID of the target device. For details, see SerialPort.portId. +- * @throws { BusinessError } 401 Parameter error. Possible causes: +- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. ++ * @param { int} portId ID of the target device. For details, see SerialPort.portId. ++ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14400005 Database operation exception. + * @throws { BusinessError } 31400001 Serial port management exception. + * @throws { BusinessError } 31400002 Access denied. Call requestSerialRight to request user authorization first. + * @throws { BusinessError } 31400003 Device does not exist. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts{ '1.1':'19','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function cancelSerialRight(portId: number): void; ++ function cancelSerialRight(portId: int): void; + + /** + * Opens a serial port device. +- * @param { number} portId ID of the target device. For details, see SerialPort.portId. +- * @throws { BusinessError } 401 Parameter error. Possible causes: +- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. ++ * @param { int} portId ID of the target device. For details, see SerialPort.portId. ++ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 31400001 Serial port management exception. + * @throws { BusinessError } 31400002 Access denied. Call requestSerialRight to request user authorization first. + * @throws { BusinessError } 31400003 Device does not exist. + * @throws { BusinessError } 31400004 The serial port device is occupied. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts{ '1.1':'19','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function open(portId: number): void; ++ function open(portId: int): void; + + /** + * Closes a serial port device. +- * @param { number} portId ID of the target device. For details, see SerialPort.portId. +- * @throws { BusinessError } 401 Parameter error. Possible causes: +- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. ++ * @param { int} portId ID of the target device. For details, see SerialPort.portId. ++ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 31400001 Serial port management exception. + * @throws { BusinessError } 31400003 Device does not exist. + * @throws { BusinessError } 31400005 The serial port device is not opened. Call the open API first. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts{ '1.1':'19','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function close(portId: number): void; ++ function close(portId: int): void; + + /** + * Obtains the communication parameters of a serial port device. +- * @param { number} portId ID of the target device. For details, see SerialPort.portId. ++ * @param { int} portId ID of the target device. For details, see SerialPort.portId. + * @returns { Readonly} Communication parameters obtained, which are read-only. +- * @throws { BusinessError } 401 Parameter error. Possible causes: +- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 31400001 Serial port management exception. + * @throws { BusinessError } 31400003 Device does not exist. + * @throws { BusinessError } 31400005 The serial port device is not opened. Call the open API first. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts{ '1.1':'19','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function getAttribute(portId: number): Readonly; ++ function getAttribute(portId: int): Readonly; + + /** + * Sets the communication parameters for a serial port device. +- * @param { number} portId ID of the target device. For details, see SerialPort.portId. ++ * @param { int} portId ID of the target device. For details, see SerialPort.portId. + * @param { SerialAttribute} attribute Communication parameters to set. +- * @throws { BusinessError } 401 Parameter error. Possible causes: +- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. ++ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 31400001 Serial port management exception. + * @throws { BusinessError } 31400003 Device does not exist. + * @throws { BusinessError } 31400005 The serial port device is not opened. Call the open API first. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts{ '1.1':'19','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function setAttribute(portId: number, attribute: SerialAttribute): void; ++ function setAttribute(portId: int, attribute: SerialAttribute): void; + + /** + * Reads data from a serial port device. This API uses a promise to return the result. +- * @param { number} portId ID of the target device. For details, see SerialPort.portId. ++ * @param { int} portId ID of the target device. For details, see SerialPort.portId. + * @param { Uint8Array } buffer Buffer for storing the data read, with a maximum length of 8192 bytes. +- * @param { number } timeout Timeout duration for reading data. The value is a non-negative number. +- * The default value 0 indicates that there is no time limit for data reading. +- * @returns { Promise } Promise used to return the length of the data read. +- * @throws { BusinessError } 401 Parameter error. Possible causes: +- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. ++ * @param { int } timeout Timeout duration for reading data. The value is a non-negative number. The default value 0 indicates that there is no time limit for data reading. ++ * @returns { Promise } Promise used to return the length of the data read. ++ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 31400001 Serial port management exception. + * @throws { BusinessError } 31400003 Device does not exist. + * @throws { BusinessError } 31400005 The serial port device is not opened. Call the open API first. + * @throws { BusinessError } 31400006 Data transfer timed out. +- * @throws { BusinessError } 31400007 I/O exception. ++ * @throws { BusinessError } 31400007 I/O exception. Possible causes: ++ *
    1. The transfer was canceled. ++ *
    2. The device offered more data. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts{ '1.1':'19','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function read(portId: number, buffer: Uint8Array, timeout?: number): Promise; ++ function read(portId: int, buffer: Uint8Array, timeout?: int): Promise; + + /** + * Reads data from a serial port device. This API returns the result synchronously. +- * @param { number} portId ID of the target device. For details, see SerialPort.portId. ++ * @param { int} portId ID of the target device. For details, see SerialPort.portId. + * @param { Uint8Array } buffer Buffer for storing the data read, with a maximum length of 8192 bytes. +- * @param { number } timeout Timeout duration for reading data. The value is a non-negative number. +- * The default value 0 indicates that there is no time limit for data reading. +- * @returns {number} Length of the data read. +- * @throws { BusinessError } 401 Parameter error. Possible causes: +- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. ++ * @param { int } timeout Timeout duration for reading data. The value is a non-negative number. The default value 0 indicates that there is no time limit for data reading. ++ * @returns { int } Length of the data read. ++ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 31400001 Serial port management exception. + * @throws { BusinessError } 31400003 Device does not exist. + * @throws { BusinessError } 31400005 The serial port device is not opened. Call the open API first. + * @throws { BusinessError } 31400006 Data transfer timed out. +- * @throws { BusinessError } 31400007 I/O exception. ++ * @throws { BusinessError } 31400007 I/O exception. Possible causes: ++ *
    1. The transfer was canceled. ++ *
    2. The device offered more data. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts{ '1.1':'19','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function readSync(portId: number, buffer: Uint8Array, timeout?: number): number; ++ function readSync(portId: int, buffer: Uint8Array, timeout?: int): int; + + /** + * Writes data to a serial port device. This API uses a promise to return the result. +- * @param { number} portId ID of the target device. For details, see SerialPort.portId. ++ * @param { int} portId ID of the target device. For details, see SerialPort.portId. + * @param { Uint8Array } buffer Buffer for storing the data written, with a maximum length of 128 KB. +- * @param { number } timeout Timeout duration for writing data. The value is a non-negative number. +- * The default value 0 indicates that there is no time limit for data writing. +- * @returns { Promise } Promise used to return the length of the data written. +- * @throws { BusinessError } 401 Parameter error. Possible causes: +- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. ++ * @param { int } timeout Timeout duration for writing data. The value is a non-negative number. The default value 0 indicates that there is no time limit for data writing. ++ * @returns { Promise } Promise used to return the length of the data written. ++ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 31400001 Serial port management exception. + * @throws { BusinessError } 31400003 Device does not exist. + * @throws { BusinessError } 31400005 The serial port device is not opened. Call the open API first. + * @throws { BusinessError } 31400006 Data transfer timed out. +- * @throws { BusinessError } 31400007 I/O exception. ++ * @throws { BusinessError } 31400007 I/O exception. Possible causes: ++ *
    1. The transfer was canceled. ++ *
    2. The device offered more data. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts{ '1.1':'19','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function write(portId: number, buffer: Uint8Array, timeout?: number): Promise; ++ function write(portId: int, buffer: Uint8Array, timeout?: int): Promise; + + /** + * Writes data to a serial port device. This API returns the result synchronously. +- * @param { number} portId ID of the target device. For details, see SerialPort.portId. ++ * @param { int} portId ID of the target device. For details, see SerialPort.portId. + * @param { Uint8Array } buffer Buffer for storing the data written, with a maximum length of 128 KB. +- * @param { number } timeout Timeout duration for writing data. The value is a non-negative number. +- * The default value 0 indicates that there is no time limit for data writing. +- * @returns { number } Length of the data written. +- * @throws { BusinessError } 401 Parameter error. Possible causes: +- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. ++ * @param { int } timeout Timeout duration for writing data. The value is a non-negative number. The default value 0 indicates that there is no time limit for data writing. ++ * @returns { int } Length of the data written. ++ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 31400001 Serial port management exception. + * @throws { BusinessError } 31400003 Device does not exist. + * @throws { BusinessError } 31400005 The serial port device is not opened. Call the open API first. + * @throws { BusinessError } 31400006 Data transfer timed out. +- * @throws { BusinessError } 31400007 I/O exception. ++ * @throws { BusinessError } 31400007 I/O exception. Possible causes: ++ *
    1. The transfer was canceled. ++ *
    2. The device offered more data. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts{ '1.1':'19','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- function writeSync(portId: number, buffer: Uint8Array, timeout?: number): number; ++ function writeSync(portId: int, buffer: Uint8Array, timeout?: int): int; + + /** + * Represents a serial port device. + * @typedef SerialPort + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface SerialPort { + + /** + * Serial port device ID. +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- portId: number; ++ portId: int; + + /** + * Serial port device name. + * @type { string } + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + deviceName: string; + } +@@ -255,7 +262,8 @@ declare namespace serialManager { + * Represents the communication parameters of a serial port device. + * @typedef SerialAttribute + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface SerialAttribute { + +@@ -263,7 +271,8 @@ declare namespace serialManager { + * Baud rate. + * @type { BaudRates } + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + baudRate: BaudRates; + +@@ -272,7 +281,8 @@ declare namespace serialManager { + * @type { DataBits } + * @default DATABIT_8 + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + dataBits?: DataBits; + +@@ -281,7 +291,8 @@ declare namespace serialManager { + * @type { Parity } + * @default NONE + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + parity?: Parity; + +@@ -290,43 +301,49 @@ declare namespace serialManager { + * @type { StopBits } + * @default STOPBIT_1 + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + stopBits?: StopBits; + } + /** + * Enumerates the baud rates of a serial port device, in bit/s. +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum BaudRates { + + /** + * The baud rate is 50 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_50 = 50, + + /** + * The baud rate is 75 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_75 = 75, + + /** + * The baud rate is 110 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_110 = 110, + + /** + * The baud rate is 134 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_134 = 134, + +@@ -334,300 +351,326 @@ declare namespace serialManager { + * The baud rate is 150 bit/s. + * + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_150 = 150, + + /** + * The baud rate is 200 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_200 = 200, + + /** + * The baud rate is 300 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_300 = 300, + + /** + * The baud rate is 600 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_600 = 600, + + /** + * The baud rate is 1200 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_1200 = 1200, + + /** + * The baud rate is 1800 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_1800 = 1800, + + /** + * The baud rate is 2400 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_2400 = 2400, + + /** + * The baud rate is 4800 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_4800 = 4800, + + /** + * The baud rate is 9600 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_9600 = 9600, + + /** + * The baud rate is 19200 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_19200 = 19200, + + /** + * The baud rate is 38400 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_38400 = 38400, + + /** + * The baud rate is 57600 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_57600 = 57600, + + /** + * The baud rate is 115200 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_115200 = 115200, + + /** + * The baud rate is 230400 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_230400 = 230400, + + /** + * The baud rate is 460800 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_460800 = 460800, + + /** + * The baud rate is 500000 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_500000 = 500000, + + /** + * The baud rate is 576000 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_576000 = 576000, + + /** + * The baud rate is 921600 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_921600 = 921600, + + /** + * The baud rate is 1000000 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_1000000 = 1000000, + + /** + * The baud rate is 1152000 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_1152000 = 1152000, + + /** + * The baud rate is 1500000 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_1500000 = 1500000, + + /** + * The baud rate is 2000000 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_2000000 = 2000000, + + /** + * The baud rate is 2500000 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_2500000 = 2500000, + + /** + * The baud rate is 3000000 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_3000000 = 3000000, + + /** + * The baud rate is 3500000 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_3500000 = 3500000, + + /** + * The baud rate is 4000000 bit/s. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BAUDRATE_4000000 = 4000000 + } + /** + * Enumerates the data bits of a serial port device. +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum DataBits { + + /** + * The number of data bits is 8. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DATABIT_8 = 8, + + /** + * The number of data bits is 7. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DATABIT_7 = 7, + + /** + * The number of data bits is 6. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DATABIT_6 = 6, + + /** + * The number of data bits is 5. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- DATABIT_5 = 5, +- +- /** +- * The number of data bits is 4. +- * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 +- */ +- DATABIT_4 = 4 ++ DATABIT_5 = 5 + } + /** + * Enumerates the parity bits of a serial port device. +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum Parity { + + /** + * No parity. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PARITY_NONE = 0, + + /** + * Odd parity. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PARITY_ODD = 1, + + /** + * Even parity. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PARITY_EVEN = 2, + + /** + * Mark parity, whose parity bit is always 1. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PARITY_MARK = 3, + + /** + * Space parity, whose parity bit is always 0. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PARITY_SPACE = 4 + } + /** + * Enumerates the stop bits for serial port communication. +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum StopBits { + + /** + * The number of stop bits is 1. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + STOPBIT_1 = 0, + +- /** +- * The number of stop bits is 1.5. +- * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 +- */ +- STOPBIT_1P5 = 1, +- + /** + * The number of stop bits is 2. + * @syscap SystemCapability.USB.USBManager.Serial +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- STOPBIT_2 = 2 ++ STOPBIT_2 = 1 + } + } + +-export default serialManager; +\ No newline at end of file ++export default serialManager; +diff --git a/api/@ohos.util.ArrayList.d.ts b/api/@ohos.util.ArrayList.d.ts +index f8853a190..e09649fdc 100644 +--- a/api/@ohos.util.ArrayList.d.ts ++++ b/api/@ohos.util.ArrayList.d.ts +@@ -484,14 +484,14 @@ declare class ArrayList { + /** + * Replaces each element of this arrayList with the result of applying the operator to that element. + * +- * @param { ArrayListCbFn1 } callbackFn - A callback function to execute for each element. ++ * @param { ArrayListReplaceCb } callbackFn - A callback function to execute for each element. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +- replaceAllElements(callbackFn: ArrayListCbFn1): void; ++ replaceAllElements(callbackFn: ArrayListReplaceCb): void; + + /** + * Executes a provided function once for each value in the arraylist object. +@@ -549,14 +549,14 @@ declare class ArrayList { + /** + * Iterates over elements in a generic ArrayList and executes a callback function for each element. + * +- * @param { ArrayListCbFn } callbackFn - A callback function to execute for each element. ++ * @param { ArrayListForEachCb } callbackFn - A callback function to execute for each element. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +- forEach(callbackFn: ArrayListCbFn): void; ++ forEach(callbackFn: ArrayListForEachCb): void; + + /** + * Sorts this arraylist according to the order induced by the specified comparator,without comparator this parameter, +@@ -815,37 +815,13 @@ declare class ArrayList { + * @throws { BusinessError } 401 - Parameter error. + * @throws { BusinessError } 10200001 - The value of index is out of range. + * @syscap SystemCapability.Utils.Lang ++ * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + [index: number]: T; + +- /** +- * Returns the item at that index. +- * +- * @param { number } index - The zero-based index of the desired code unit. +- * @returns { T } The element in the arrayList matching the given index. +- * @throws { BusinessError } 10200001 - The value of index is out of range. +- * @syscap SystemCapability.Utils.Lang +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +- $_get(index: number): T; +- +- /** +- * Set the value of item at that index. +- * +- * @param { number } index - The index of the element to set. +- * @param { T } value - The value to set at the specified index. +- * @throws { BusinessError } 10200001 - The value of index is out of range. +- * @syscap SystemCapability.Utils.Lang +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +- $_set(index: number, value: T): void; +- + /** + * If the newCapacity provided by the user is greater than or equal to length, + * change the capacity of the arraylist to newCapacity, otherwise the capacity will not be changed +@@ -958,7 +934,7 @@ declare class ArrayList { + /** + * The type of ArrayList callback function. + * +- * @typedef { function } ArrayListCbFn ++ * @typedef { function } ArrayListForEachCb + * @param { T } value - The current element being processed + * @param { number } index - The index of the current element + * @param { ArrayList } arrlist - The ArrayList instance being traversed +@@ -968,12 +944,12 @@ declare class ArrayList { + * @since 20 + * @arkts 1.2 + */ +- type ArrayListCbFn = (value: T, index: number, arrlist: ArrayList) => void; ++ export type ArrayListForEachCb = (value: T, index: number, arrlist: ArrayList) => void; + + /** + * The type of ArrayList callback function. + * +- * @typedef { function } ArrayListCbFn ++ * @typedef { function } ArrayListReplaceCb + * @param { T } value - The current element being processed + * @param { number } index - The index of the current element + * @param { ArrayList } arrlist - The ArrayList instance being traversed +@@ -983,6 +959,6 @@ declare class ArrayList { + * @since 20 + * @arkts 1.2 + */ +- type ArrayListCbFn1 = (value: T, index?: number, arrlist?: ArrayList) => T; ++ export type ArrayListReplaceCb = (value: T, index: number, arrlist: ArrayList) => T; + + export default ArrayList; +diff --git a/api/@ohos.util.Deque.d.ts b/api/@ohos.util.Deque.d.ts +index 8e4758b12..ddf7fcb85 100644 +--- a/api/@ohos.util.Deque.d.ts ++++ b/api/@ohos.util.Deque.d.ts +@@ -419,39 +419,29 @@ declare class Deque { + /** + * Iterates over elements in a generic Deque (double-ended queue) and executes a callback function for each element. + * +- * @param { DequeCbFnforEach } callbackFn - A callback function to execute for each element. ++ * @param { DequeForEachCb } callbackFn - A callback function to execute for each element. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +- forEach(callbackFn: DequeCbFnforEach): void; +- /** +- * Returns the byte at the specified index. +- * +- * @param { number } index - The zero-based index of the desired code unit. +- * @returns { T } The element in the deque matching the given index. +- * @syscap SystemCapability.Utils.Lang +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +- $_get(index: number): T; ++ forEach(callbackFn: DequeForEachCb): void; + +- /** +- * Sets the byte at the specified index. +- * +- * @param { number } index – The index of the element to set. +- * @param { T } value – The value to set at the specified index. ++ /** ++ * Returns the item at that index. ++ * ++ * @param { number } index - The zero-based index of the desired code unit. ++ * Throws error if index < 0 or index >= deque.length. ++ * @returns { T } The element in the deque matching the given index. ++ * @throws { BusinessError } 10200001 - The value of index is out of range. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +- $_set(index: number, value: T): void; ++ [index: number]: T; + + /** + * returns an iterator.Each item of the iterator is a Javascript Object +@@ -498,7 +488,7 @@ declare class Deque { + /** + * The type of Deque forEach callback function. + * +- * @typedef { function } DequeCbFnforEach ++ * @typedef { function } DequeForEachCb + * @param { T } value - The current element being processed + * @param { number } index - The index of the current element + * @param { Deque } deque - The Deque instance being traversed +@@ -508,6 +498,6 @@ declare class Deque { + * @since 20 + * @arkts 1.2 + */ +- type DequeCbFnforEach = (value: T, index: number, deque: Deque) => void; ++ export type DequeForEachCb = (value: T, index: number, deque: Deque) => void; + + export default Deque; +diff --git a/api/@ohos.util.HashMap.d.ts b/api/@ohos.util.HashMap.d.ts +index 7ade3272f..d7d500dc1 100644 +--- a/api/@ohos.util.HashMap.d.ts ++++ b/api/@ohos.util.HashMap.d.ts +@@ -639,6 +639,6 @@ declare class HashMap { + * @since 20 + * @arkts 1.2 + */ +- type HashMapCbFn = (value: V, key: K, map: HashMap) => void; ++ export type HashMapCbFn = (value: V, key: K, map: HashMap) => void; + + export default HashMap; +diff --git a/api/@ohos.util.HashSet.d.ts b/api/@ohos.util.HashSet.d.ts +index 654a6e7c8..6607d94f1 100644 +--- a/api/@ohos.util.HashSet.d.ts ++++ b/api/@ohos.util.HashSet.d.ts +@@ -468,6 +468,6 @@ declare class HashSet { + * @since 20 + * @arkts 1.2 + */ +-type HashSetCbFn = (value: T, key: T, set: HashSet) => void; ++export type HashSetCbFn = (value: T, key: T, set: HashSet) => void; + + export default HashSet; +diff --git a/api/@ohos.util.LightWeightMap.d.ts b/api/@ohos.util.LightWeightMap.d.ts +index 20cca18d6..3433c11fc 100644 +--- a/api/@ohos.util.LightWeightMap.d.ts ++++ b/api/@ohos.util.LightWeightMap.d.ts +@@ -459,10 +459,22 @@ declare class LightWeightMap { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + getKeyAt(index: number): K; ++ /** ++ * Obtains the key at the location identified by index in an LightWeightMap container ++ * ++ * @param { number } index - index index Target subscript for search ++ * @returns { K | undefined } the key of key-value pairs or undefined ++ * @throws { BusinessError } 10200001 - The value of index is out of range. ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ getKeyAt(index: number): K | undefined; + /** + * Obtains a ES6 iterator that contains all the keys of an LightWeightMap container + * +@@ -911,10 +923,22 @@ declare class LightWeightMap { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + getValueAt(index: number): V; ++ /** ++ * Obtains the value identified by index in an LightWeightMap container ++ * ++ * @param { number } index - index index Target subscript for search ++ * @returns { V | undefined } the value of key-value pairs or undefined ++ * @throws { BusinessError } 10200001 - The value of index is out of range. ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ getValueAt(index: number): V | undefined; + /** + * Returns an iterator of the values contained in this map + * +@@ -959,6 +983,6 @@ declare class LightWeightMap { + * @since 20 + * @arkts 1.2 + */ +- type LightWeightMapCbFn = (value: V, key: K, map: LightWeightMap) => void; ++ export type LightWeightMapCbFn = (value: V, key: K, map: LightWeightMap) => void; + + export default LightWeightMap; +diff --git a/api/@ohos.util.LightWeightSet.d.ts b/api/@ohos.util.LightWeightSet.d.ts +index 612b677db..cd20907d0 100644 +--- a/api/@ohos.util.LightWeightSet.d.ts ++++ b/api/@ohos.util.LightWeightSet.d.ts +@@ -787,6 +787,6 @@ declare class LightWeightSet { + * @since 20 + * @arkts 1.2 + */ +-type LightWeightSetForEachCb = (value: T, key: T, set: LightWeightSet) => void ++export type LightWeightSetForEachCb = (value: T, key: T, set: LightWeightSet) => void + + export default LightWeightSet; +diff --git a/api/@ohos.util.LinkedList.d.ts b/api/@ohos.util.LinkedList.d.ts +index 8e05f2190..33c16b088 100644 +--- a/api/@ohos.util.LinkedList.d.ts ++++ b/api/@ohos.util.LinkedList.d.ts +@@ -1036,6 +1036,6 @@ declare class LinkedList { + * @since 20 + * @arkts 1.2 + */ +-type LinkedListForEachCb = (value: T, index: number, linkedList: LinkedList) => void ++export type LinkedListForEachCb = (value: T, index: number, linkedList: LinkedList) => void + + export default LinkedList; +diff --git a/api/@ohos.util.List.d.ts b/api/@ohos.util.List.d.ts +index 5967f7ce6..fa7ee0b4d 100644 +--- a/api/@ohos.util.List.d.ts ++++ b/api/@ohos.util.List.d.ts +@@ -947,32 +947,22 @@ declare class List { + * @arkts 1.1&1.2 + */ + isEmpty(): boolean; +- /** +- * Returns the item at that index +- * +- * @param { number } index - the zero-based index of the desired code unit. +- * @returns { T | undefined } the element in the list matching the given index, +- * or undefined if the index is out of range. +- * @syscap SystemCapability.Utils.Lang +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +- $_get(index: number): T | undefined; + + /** +- * Set the value of item at that index. +- * +- * @param { number } index – the index of the element to set. +- * @param { T } value – the value to set at the specified index ++ * Returns the item at that index. ++ * ++ * @param { number } index - The zero-based index of the desired code unit. ++ * Throws error if index < 0 or index >= list.length. ++ * @returns { T } The element in the list matching the given index. ++ * @throws { BusinessError } 10200001 - The value of index is out of range. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +- $_set(index: number, value: T): void; ++ [index: number]: T; ++ + /** + * returns an iterator.Each item of the iterator is a Javascript Object + * +@@ -1029,7 +1019,7 @@ declare class List { + * @since 20 + * @arkts 1.2 + */ +-type ListForEachCb = (value: T, index: number, list: List) => void ++export type ListForEachCb = (value: T, index: number, list: List) => void + + /** + * The type of List callback function. +@@ -1044,6 +1034,6 @@ type ListForEachCb = (value: T, index: number, list: List) => void + * @since 20 + * @arkts 1.2 + */ +-type ListReplaceCb = (value: T, index: number, list: List) => T ++export type ListReplaceCb = (value: T, index: number, list: List) => T + + export default List; +diff --git a/api/@ohos.util.PlainArray.d.ts b/api/@ohos.util.PlainArray.d.ts +index 6b28d6ba1..d6c40f936 100644 +--- a/api/@ohos.util.PlainArray.d.ts ++++ b/api/@ohos.util.PlainArray.d.ts +@@ -439,10 +439,22 @@ declare class PlainArray { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + getKeyAt(index: number): number; ++ /** ++ * Queries the key at a specified index ++ * ++ * @param { number } index - index index Target subscript for search ++ * @returns { number | undefined } the key of key-value pairs, or undefined if the index is out of range. ++ * @throws { BusinessError } 10200011 - The getKeyAt method cannot be bound. ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ getKeyAt(index: number): number | undefined; + /** + * Remove the key-value pair based on a specified key if it exists and return the value + * +@@ -838,6 +850,6 @@ declare class PlainArray { + * @since 20 + * @arkts 1.2 + */ +-type PlainArrayForEachCb = (value: T, key: number, PlainArray: PlainArray) => void ++export type PlainArrayForEachCb = (value: T, key: number, PlainArray: PlainArray) => void + + export default PlainArray; +diff --git a/api/@ohos.util.Queue.d.ts b/api/@ohos.util.Queue.d.ts +index abdba11d4..90724be60 100644 +--- a/api/@ohos.util.Queue.d.ts ++++ b/api/@ohos.util.Queue.d.ts +@@ -349,6 +349,6 @@ declare class Queue { + * @since 20 + * @arkts 1.2 + */ +-type QueueForEachCb = (value: T, index: number, queue: Queue) => void ++export type QueueForEachCb = (value: T, index: number, queue: Queue) => void + + export default Queue; +diff --git a/api/@ohos.util.Stack.d.ts b/api/@ohos.util.Stack.d.ts +index 340ed2c85..1e76aa057 100644 +--- a/api/@ohos.util.Stack.d.ts ++++ b/api/@ohos.util.Stack.d.ts +@@ -412,6 +412,6 @@ declare class Stack { + * @since 20 + * @arkts 1.2 + */ +-type StackForEachCb = (value: T, index: number, stack: Stack) => void ++export type StackForEachCb = (value: T, index: number, stack: Stack) => void + + export default Stack; +diff --git a/api/@ohos.util.TreeMap.d.ts b/api/@ohos.util.TreeMap.d.ts +index ad93707e3..abd92fe67 100644 +--- a/api/@ohos.util.TreeMap.d.ts ++++ b/api/@ohos.util.TreeMap.d.ts +@@ -871,7 +871,7 @@ declare class TreeMap { + * @since 20 + * @arkts 1.2 + */ +-type TreeMapForEachCb = (value: V, key: K, map: TreeMap) => void ++export type TreeMapForEachCb = (value: V, key: K, map: TreeMap) => void + + /** + * The type of TreeMap comparator. +@@ -885,6 +885,6 @@ type TreeMapForEachCb = (value: V, key: K, map: TreeMap) => void + * @since 20 + * @arkts 1.2 + */ +-type TreeMapComparator = (firstValue: K, secondValue: K) => number ++export type TreeMapComparator = (firstValue: K, secondValue: K) => number + + export default TreeMap; +diff --git a/api/@ohos.util.TreeSet.d.ts b/api/@ohos.util.TreeSet.d.ts +index d09e7b054..234c1885d 100644 +--- a/api/@ohos.util.TreeSet.d.ts ++++ b/api/@ohos.util.TreeSet.d.ts +@@ -765,7 +765,7 @@ declare class TreeSet { + * @since 20 + * @arkts 1.2 + */ +-type TreeSetForEachCb = (value: T, key: T, set: TreeSet) => void ++export type TreeSetForEachCb = (value: T, key: T, set: TreeSet) => void + + /** + * The type of TreeSet comparator. +@@ -779,6 +779,6 @@ type TreeSetForEachCb = (value: T, key: T, set: TreeSet) => void + * @since 20 + * @arkts 1.2 + */ +-type TreeSetComparator = (firstValue: T, secondValue: T) => number ++export type TreeSetComparator = (firstValue: T, secondValue: T) => number + + export default TreeSet; +diff --git a/api/@ohos.util.d.ets b/api/@ohos.util.d.ets +index 72a794baa..522478ab1 100644 +--- a/api/@ohos.util.d.ets ++++ b/api/@ohos.util.d.ets +@@ -143,7 +143,7 @@ declare namespace util { + * @atomicservice + * @since 20 + */ +- encodeSync(src: Uint8Array, options: Type = Type.BASIC): Uint8Array; ++ encodeSync(src: Uint8Array, options?: Type): Uint8Array; + + /** + * Encodes the specified byte array into a String using the Base64 encoding scheme. +@@ -159,12 +159,12 @@ declare namespace util { + * @atomicservice + * @since 20 + */ +- encodeToStringSync(src: Uint8Array, options: Type = Type.BASIC): string; ++ encodeToStringSync(src: Uint8Array, options?: Type): string; + + /** + * Decodes a Base64 encoded String or input u8 array into a newly-allocated u8 array using the Base64 encoding scheme. + * +- * @param { string } src - A string value ++ * @param { string } src - A Uint8Array value or a string value + * @param { Type } [options] - one of the Type enumeration + * @returns { Uint8Array } Return the decoded Uint8Array. + * @throws { BusinessError } 401 - Parameter error. Possible causes: +@@ -175,23 +175,7 @@ declare namespace util { + * @atomicservice + * @since 20 + */ +- decodeSync(src: string, options: Type = Type.BASIC): Uint8Array; +- +- /** +- * Decodes a Base64 encoded String or input u8 array into a newly-allocated u8 array using the Base64 encoding scheme. +- * +- * @param { Uint8Array } src - A Uint8Array value +- * @param { Type } [options] - one of the Type enumeration +- * @returns { Uint8Array } Return the decoded Uint8Array. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: +- * 1.Mandatory parameters are left unspecified; +- * 2.Incorrect parameter types. +- * @syscap SystemCapability.Utils.Lang +- * @crossplatform +- * @atomicservice +- * @since 20 +- */ +- decodeSync(src: Uint8Array, options: Type = Type.BASIC): Uint8Array; ++ decodeSync(src: Uint8Array | string, options?: Type): Uint8Array; + + /** + * Asynchronously encodes all bytes in the specified u8 array into the newly allocated u8 array using the Base64 encoding scheme. +@@ -207,7 +191,7 @@ declare namespace util { + * @atomicservice + * @since 20 + */ +- encode(src: Uint8Array, options: Type = Type.BASIC): Promise; ++ encode(src: Uint8Array, options?: Type): Promise; + + /** + * Asynchronously encodes the specified byte array into a String using the Base64 encoding scheme. +@@ -223,30 +207,13 @@ declare namespace util { + * @atomicservice + * @since 20 + */ +- encodeToString(src: Uint8Array, options: Type = Type.BASIC): Promise; +- +- /** +- * Use the Base64 encoding scheme to asynchronously decode a Base64-encoded string or +- * input u8 array into a newly allocated u8 array. +- * +- * @param { Uint8Array } src - A Uint8Array value +- * @param { Type } [options] - one of the Type enumeration +- * @returns { Promise } Return the decoded asynchronous Uint8Array. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: +- * 1.Mandatory parameters are left unspecified; +- * 2.Incorrect parameter types. +- * @syscap SystemCapability.Utils.Lang +- * @crossplatform +- * @atomicservice +- * @since 20 +- */ +- decode(src: Uint8Array, options: Type = Type.BASIC): Promise; ++ encodeToString(src: Uint8Array, options?: Type): Promise; + + /** + * Use the Base64 encoding scheme to asynchronously decode a Base64-encoded string or + * input u8 array into a newly allocated u8 array. + * +- * @param { string } src - A string value ++ * @param { Uint8Array | string } src - A Uint8Array value or a string value + * @param { Type } [options] - one of the Type enumeration + * @returns { Promise } Return the decoded asynchronous Uint8Array. + * @throws { BusinessError } 401 - Parameter error. Possible causes: +@@ -257,7 +224,7 @@ declare namespace util { + * @atomicservice + * @since 20 + */ +- decode(src: string, options: Type = Type.BASIC): Promise; ++ decode(src: Uint8Array | string, options?: Type): Promise; + } + + /** +@@ -966,7 +933,8 @@ declare namespace util { + * Compares two objects for equality. + * + * @param { Object } obj - An object +- * @returns { boolean } Returns true if the given object is the same as the current object; Otherwise, false is returned. ++ * @returns { boolean } Returns true if the given object is the same as the current object; ++ * Otherwise, false is returned. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +@@ -1048,7 +1016,8 @@ declare namespace util { + /** + * Checks whether the current RationalNumber object represents the value 0. + * +- * @returns { boolean } If the value represented by the current object is 0, true is returned. Otherwise, false is returned. ++ * @returns { boolean } If the value represented by the current object is 0, true is returned. ++ * Otherwise, false is returned. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +@@ -1179,7 +1148,8 @@ declare namespace util { + * Check whether the entered value is of arraybuffer type. + * + * @param { Object } value - A arraybuffer value +- * @returns { boolean } Returns true if the value is a built-in ArrayBuffer instance. This does not include SharedArrayBuffer instances. ++ * @returns { boolean } Returns true if the value is a built-in ArrayBuffer instance. ++ * This does not include SharedArrayBuffer instances. + * Usually, it is desirable to test for both; See isAnyArrayBuffer() for that. + * @syscap SystemCapability.Utils.Lang + * @crossplatform +@@ -1442,6 +1412,19 @@ declare namespace util { + isWeakSet(value: Object): boolean; + } + ++ /** ++ * Takes a function following the common error-first callback style, i.e taking an (err, value) => ++ * callback as the last argument, and return a function that returns promises. ++ * ++ * @param { Function } original - Asynchronous Function ++ * @returns { Function } Return a function that returns promises ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ function promisify(original: Function): (...args: FixedArray) => Promise; ++ + /** + * Get the hash code of an object. + * +@@ -1453,5 +1436,30 @@ declare namespace util { + * @since 20 + */ + function getHash(object: object): number; ++ ++ /** ++ * Generate a random RFC 4122 version 4 binary UUID using a cryptographically secure random number generator. ++ * ++ * @param { boolean } [entropyCache] - Whether to generate the UUID with using the cache. Default: true. ++ * @returns { Uint8Array | undefined } Return a Uint8Array representing this UUID, or undefined on failure. ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ function generateRandomBinaryUUID(entropyCache?: boolean): Uint8Array | undefined; ++ ++ /** ++ * Parse a UUID from the string standard representation as described in the RFC 4122 version 4. ++ * ++ * @param { string } uuid - String that specifies a UUID ++ * @returns { Uint8Array } Return a Uint8Array representing this UUID. Throw SyntaxError if parsing fails. ++ * @throws { BusinessError } 10200002 - Invalid uuid string. ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ function parseUUID(uuid: string): Uint8Array; + } + export default util; +diff --git a/api/@ohos.util.stream.d.ts b/api/@ohos.util.stream.d.ts +index 0903242cb..226fdfb29 100644 +--- a/api/@ohos.util.stream.d.ts ++++ b/api/@ohos.util.stream.d.ts +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2024 Huawei Device Co., Ltd. ++ * Copyright (c) 2024-2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at +@@ -12,40 +12,66 @@ + * See the License for the specific language governing permissions and + * limitations under the License. + */ +- +- /** ++ ++/** + * @file + * @kit ArkTS + */ +- import { Callback } from './@ohos.base'; +- import emitter from './@ohos.events.emitter'; +- +- /** +- * The stream module provides a comprehensive set of stream processing capabilities, including four types of streams: +- * - Writable: streams designed for writing data to. +- * - Readable: streams designed for reading data from. +- * - Duplex: streams that are both readable and writable. +- * - Transform: a specialized type of duplex stream that can modify or transform data as it's being written and read. +- * +- * @namespace stream +- * @syscap SystemCapability.Utils.Lang +- * @crossplatform +- * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 +- */ ++ ++/*** if arkts 1.1 */ ++import { Callback } from './@ohos.base'; ++import emitter from './@ohos.events.emitter'; ++/*** endif */ ++/*** if arkts 1.2 */ ++import buffer from '@ohos.buffer'; ++/*** endif */ ++ ++/** ++ * The stream module provides a comprehensive set of stream processing capabilities, including four types of streams: ++ * - Writable: streams designed for writing data to. ++ * - Readable: streams designed for reading data from. ++ * - Duplex: streams that are both readable and writable. ++ * - Transform: a specialized type of duplex stream that can modify or transform data as it's being written and read. ++ * ++ * @namespace stream ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + declare namespace stream { + /** +- * The type of stream callback function. ++ * Return readable options. + * +- * @typedef { function } StreamCb +- * @returns { void } - The function return void ++ * @interface ReadableOptions + * @syscap SystemCapability.Utils.Lang ++ * @crossplatform + * @atomicservice +- * @since 20 +- * @arkts 1.2 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- type StreamCb = () => void; ++ interface ReadableOptions { ++ /** ++ * Specifies the encoding format of the data. If this parameter is provided, ++ * the readable stream decodes the data into a string in the specified encoding format. Default: utf8. ++ * If an invalid string is entered, a 401 exception is thrown in the Readable constructor. ++ * Supported encoding formats: utf-8, ibm866, iso-8859-2, iso-8859-3, iso-8859-4, iso-8859-5, iso-8859-6, ++ * iso-8859-7, iso-8859-8, iso-8859-8-i, iso-8859-10, iso-8859-13, iso-8859-14, iso-8859-15, koi8-r, koi8-u, ++ * macintosh, windows-874, windows-1250, windows-1251, windows-1252, windows-1253, windows-1254, windows-1255, ++ * windows-1256, windows-1257, windows-1258, x-mac-cyrillic, gbk, gb18030, big5, euc-jp, iso-2022-jp, shift_jis, ++ * euc-kr, utf-16be, utf-16le. ++ * ++ * @type { ?string } ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ encoding?: string; ++ } ++ + /** + * Streams to which data can be written. + * +@@ -66,6 +92,7 @@ declare namespace stream { + * @arkts 1.1&1.2 + */ + constructor(); ++ + /** + * writes a chunk to Writable and invokes callback when the chunk is flushed. The return value indicates + * whether the internal buffer of the Writable reaches the hightWaterMark. If true is returned, the buffer +@@ -87,31 +114,11 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + write(chunk?: string | Uint8Array, encoding?: string, callback?: Function): boolean; + +- /** +- * writes a chunk to Writable and invokes callback when the chunk is flushed. The return value indicates +- * whether the internal buffer of the Writable reaches the hightWaterMark. If true is returned, the buffer +- * does not reach the hightWaterMark. If false is returned, the buffer has been reached. The write function +- * should be called after the drain event is triggered. If the write function is called continuously, +- * the chunk is still added to the buffer until the memory overflows +- * +- * @param { string | Uint8Array } [chunk] - Data to be written. +- * @param { string } [encoding] - Encoding type. +- * @param { StreamCb } [callback] - Callback after writing. +- * @returns { boolean } Write success returns true, write failure returns false. +- * @throws { BusinessError } 10200035 - The doWrite method has not been implemented. +- * @throws { BusinessError } 10200036 - The stream has been ended. +- * @syscap SystemCapability.Utils.Lang +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +- write(chunk?: string | Uint8Array, encoding?: string, callback?: StreamCb): boolean; +- + /** + * Write the last chunk to Writable. + * +@@ -127,26 +134,11 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + end(chunk?: string | Uint8Array, encoding?: string, callback?: Function): Writable; + +- /** +- * Write the last chunk to Writable. +- * +- * @param { string | Uint8Array } [chunk] - Data to be written. +- * @param { string } [encoding] - Encoding type. +- * @param { StreamCb } [callback] - Callback after writing. +- * @returns { Writable } Returns the Writable object. +- * @throws { BusinessError } 10200035 - The doWrite method has not been implemented. +- * @syscap SystemCapability.Utils.Lang +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +- end(chunk?: string | Uint8Array, encoding?: string, callback?: StreamCb): Writable; +- + /** + * Set the default encoding mode. + * +@@ -163,6 +155,7 @@ declare namespace stream { + * @arkts 1.1&1.2 + */ + setDefaultEncoding(encoding?: string): boolean; ++ + /** + * After the call, all Write operations will be forced to write to the buffer instead of being flushed. + * +@@ -174,6 +167,7 @@ declare namespace stream { + * @arkts 1.1&1.2 + */ + cork(): boolean; ++ + /** + * After calling, flush all buffers. + * +@@ -185,6 +179,7 @@ declare namespace stream { + * @arkts 1.1&1.2 + */ + uncork(): boolean; ++ + /** + * Registering Event Messages. + * +@@ -197,30 +192,28 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + on(event: string, callback: Callback): void; ++ + /** +- * Cancel event message. ++ * Registering Event Messages. + * + * @param { string } event - Register Event. +- * @param { Callback } callback - event callbacks. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: +- * 1.Mandatory parameters are left unspecified; +- * 2.Incorrect parameter types. ++ * @param { Function } callback - event callbacks. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 20 ++ * @arkts 1.2 + */ +- off(event: string, callback?: Callback): void; ++ on(event: string, callback: Function): void; ++ + /** +- * This method is invoked by the Writable method during initialization and must not be invoked directly. +- * After the resource is initialized in the doInitialize method, the callback () method is invoked. ++ * Cancel event message. + * +- * @param { Function } callback - Callback when the stream has completed the initial. ++ * @param { string } event - Register Event. ++ * @param { Callback } callback - event callbacks. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified; + * 2.Incorrect parameter types. +@@ -229,52 +222,56 @@ declare namespace stream { + * @atomicservice + * @since 12 + */ +- doInitialize(callback: Function): void; ++ off(event: string, callback?: Callback): void; + + /** +- * This method is invoked by the Writable method during initialization and must not be invoked directly. +- * After the resource is initialized in the doInitialize method, the callback () method is invoked. ++ * Cancel event message. + * +- * @param { StreamCb } callback - Callback when the stream has completed the initial. ++ * @param { string } event - Register Event. ++ * @param { Function } [callback] - event callbacks. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +- doInitialize(callback: StreamCb): void; ++ off(event: string, callback?: Function): void; + + /** +- * Implemented by subclass inheritance. The implementation logic of flushing chunks in the buffer must not be +- * directly called. The call is controlled by Writable.write. ++ * This method is invoked by the Writable method during initialization and must not be invoked directly. ++ * After the resource is initialized in the doInitialize method, the callback () method is invoked. + * +- * @param { string | Uint8Array } [chunk] - Data to be written. +- * @param { string } [encoding] - Encoding type. +- * @param { Function } [callback] - Callback after writing. ++ * @param { Function } callback - Callback when the stream has completed the initial. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified; +- * 2.Incorrect parameter types; +- * 3.Parameter verification failed. ++ * 2.Incorrect parameter types. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- doWrite(chunk: string | Uint8Array, encoding: string, callback: Function): void; ++ doInitialize(callback: Function): void; ++ + /** + * Implemented by subclass inheritance. The implementation logic of flushing chunks in the buffer must not be + * directly called. The call is controlled by Writable.write. + * + * @param { string | Uint8Array } [chunk] - Data to be written. + * @param { string } [encoding] - Encoding type. +- * @param { StreamCb } [callback] - Callback after writing. ++ * @param { Function } [callback] - Callback after writing. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: ++ * 1.Mandatory parameters are left unspecified; ++ * 2.Incorrect parameter types; ++ * 3.Parameter verification failed. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 20 +- * @arkts 1.2 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- doWrite(chunk: string | Uint8Array, encoding: string, callback: StreamCb): void; ++ doWrite(chunk: string | Uint8Array, encoding: string, callback: Function): void; ++ + /** + * The implementation logic of flushing chunks in the buffer in batches should not be actively called. + * The call is controlled by Writable.write. +@@ -288,35 +285,35 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + doWritev(chunks: string[] | Uint8Array[], callback: Function): void; ++ + /** +- * The implementation logic of flushing chunks in the buffer in batches should not be actively called. +- * The call is controlled by Writable.write. ++ * Returns boolean indicating whether it is in ObjectMode. + * +- * @param { string[] | Uint8Array[] } [chunks] - Data to be written. +- * @param { StreamCb } [callback] - Callback after writing. ++ * @type { boolean } ++ * @readonly + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 20 +- * @arkts 1.2 ++ * @since 12 + */ +- doWritev(chunks: string[] | Uint8Array[], callback: StreamCb): void; ++ readonly writableObjectMode: boolean; + + /** + * Returns boolean indicating whether it is in ObjectMode. + * + * @type { boolean } +- * @readonly + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 20 ++ * @arkts 1.2 + */ +- readonly writableObjectMode: boolean; ++ get writableObjectMode(): boolean; ++ + /** + * Value of highWatermark. + * +@@ -325,10 +322,22 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + readonly writableHighWatermark: number; ++ ++ /** ++ * Value of highWatermark. ++ * ++ * @type { number } ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get writableHighWatermark(): number; ++ + /** + * Is true if it is safe to call writable.write(), which means the stream has not been destroyed, error or end. + * +@@ -337,10 +346,22 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + readonly writable: boolean; ++ ++ /** ++ * Is true if it is safe to call writable.write(), which means the stream has not been destroyed, error or end. ++ * ++ * @type { boolean } ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get writable(): boolean; ++ + /** + * Size of data that can be flushed, in bytes or objects. + * +@@ -349,10 +370,22 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + readonly writableLength: number; ++ ++ /** ++ * Size of data that can be flushed, in bytes or objects. ++ * ++ * @type { number } ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get writableLength(): number; ++ + /** + * Number of times writable.uncork() needs to be called in order to fully uncork the stream. + * +@@ -361,10 +394,22 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + readonly writableCorked: number; ++ ++ /** ++ * Number of times writable.uncork() needs to be called in order to fully uncork the stream. ++ * ++ * @type { number } ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get writableCorked(): number; ++ + /** + * Whether Writable.end has been called. + * +@@ -373,10 +418,22 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + readonly writableEnded: boolean; ++ ++ /** ++ * Whether Writable.end has been called. ++ * ++ * @type { boolean } ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get writableEnded(): boolean; ++ + /** + * Whether Writable.end has been called and all buffers have been flushed. + * +@@ -385,25 +442,35 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + readonly writableFinished: boolean; ++ ++ /** ++ * Whether Writable.end has been called and all buffers have been flushed. ++ * ++ * @type { boolean } ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get writableFinished(): boolean; + } ++ + /** +- * Transform stream is a Duplex stream where the output is computed in some way from the input. +- * Transform implementations must implement the doTransform() method and may also implement the doFlush() method. ++ * The stream from which data can be read. + * +- * @extends Duplex + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- class Transform extends Duplex { ++ class Readable { + /** +- * The Transform constructor. ++ * The Readable constructor. + * + * @syscap SystemCapability.Utils.Lang + * @crossplatform +@@ -412,14 +479,11 @@ declare namespace stream { + * @arkts 1.1&1.2 + */ + constructor(); ++ + /** +- * Convert the input data. After the conversion, Transform.push can be called to send the input to the read stream. +- * Transform.push should not be called Transform.write to call. ++ * The Readable constructor. + * +- * @param { string } chunk - Input data to be converted. +- * @param { string } encoding - If the chunk is a string, then this is the encoding type. If chunk is a buffer, +- * then this is the special value 'buffer'. Ignore it in that case. +- * @param { Function } callback - Callback after conversion. ++ * @param { ReadableOptions } options - Provide options. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified; + * 2.Incorrect parameter types; +@@ -427,129 +491,35 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- doTransform(chunk: string, encoding: string, callback: Function): void; ++ constructor(options: ReadableOptions); + + /** +- * Convert the input data. After the conversion, Transform.push can be called to send the input to the read stream. +- * Transform.push should not be called Transform.write to call. +- * +- * @param { string } chunk - Input data to be converted. +- * @param { string } encoding - If the chunk is a string, then this is the encoding type. If chunk is a buffer, +- * then this is the special value 'buffer'. Ignore it in that case. +- * @param { StreamCb } callback - Callback after conversion. +- * @syscap SystemCapability.Utils.Lang +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +- doTransform(chunk: string, encoding: string, callback: StreamCb): void; +- +- /** +- * After all data is flushed to the write stream, you can use the Transform.doFlush writes some extra data, must +- * not be called directly, only called by Writable after flushing all data. ++ * Reads a buffer of a specified size from the buffer. If the available buffer is sufficient, the result ++ * of the specified size is returned. Otherwise, if Readable has ended, all remaining buffers are returned. + * +- * @param { Function } callback - Callback after flush completion. ++ * @param { number } size - Expected length of the data to be read. ++ * @returns { string | null } If no data is available to read, null is returned. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified; + * 2.Incorrect parameter types; + * 3.Parameter verification failed. ++ * @throws { BusinessError } 10200038 - The doRead method has not been implemented. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 12 + */ +- doFlush(callback: Function): void; +- +- /** +- * After all data is flushed to the write stream, you can use the Transform.doFlush writes some extra data, must +- * not be called directly, only called by Writable after flushing all data. +- * +- * @param { StreamCb } callback - Callback after flush completion. +- * @syscap SystemCapability.Utils.Lang +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +- doFlush(callback: StreamCb): void; +- +- } +- +- /** +- * Return readable options. +- * +- * @interface ReadableOptions +- * @syscap SystemCapability.Utils.Lang +- * @crossplatform +- * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 +- */ +- interface ReadableOptions { +- /** +- * Specifies the encoding format of the data. If this parameter is provided, +- * the readable stream decodes the data into a string in the specified encoding format. Default: utf8. +- * If an invalid string is entered, a 401 exception is thrown in the Readable constructor. +- * Supported encoding formats: utf-8, ibm866, iso-8859-2, iso-8859-3, iso-8859-4, iso-8859-5, iso-8859-6, +- * iso-8859-7, iso-8859-8, iso-8859-8-i, iso-8859-10, iso-8859-13, iso-8859-14, iso-8859-15, koi8-r, koi8-u, +- * macintosh, windows-874, windows-1250, windows-1251, windows-1252, windows-1253, windows-1254, windows-1255, +- * windows-1256, windows-1257, windows-1258, x-mac-cyrillic, gbk, gb18030, big5, euc-jp, iso-2022-jp, shift_jis, +- * euc-kr, utf-16be, utf-16le. +- * +- * @type { ?string } +- * @syscap SystemCapability.Utils.Lang +- * @crossplatform +- * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 +- */ +- encoding?: string; +- } ++ read(size?: number): string | null; + +- /** +- * The stream from which data can be read. +- * +- * @syscap SystemCapability.Utils.Lang +- * @crossplatform +- * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 +- */ +- class Readable { +- /** +- * The Readable constructor. +- * +- * @syscap SystemCapability.Utils.Lang +- * @crossplatform +- * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 +- */ +- constructor(); +- /** +- * The Readable constructor. +- * +- * @param { ReadableOptions } options - Provide options. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: +- * 1.Mandatory parameters are left unspecified; +- * 2.Incorrect parameter types; +- * 3.Parameter verification failed. +- * @syscap SystemCapability.Utils.Lang +- * @crossplatform +- * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 +- */ +- constructor(options: ReadableOptions); + /** + * Reads a buffer of a specified size from the buffer. If the available buffer is sufficient, the result + * of the specified size is returned. Otherwise, if Readable has ended, all remaining buffers are returned. + * +- * @param { number } size - Expected length of the data to be read. +- * @returns { string | null } If no data is available to read, null is returned. ++ * @param { number } [size] - Expected length of the data to be read. ++ * @returns { buffer.Buffer | string | null } If no data is available to read, null is returned. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified; + * 2.Incorrect parameter types; +@@ -558,10 +528,11 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 20 ++ * @arkts 1.2 + */ +- read(size?: number): string | null; ++ read(size?: number): buffer.Buffer | string | null; ++ + /** + * Switch Readable to Streaming Mode. + * +@@ -573,6 +544,7 @@ declare namespace stream { + * @arkts 1.1&1.2 + */ + resume(): Readable; ++ + /** + * Toggle Readable to Suspend Mode. + * +@@ -584,6 +556,7 @@ declare namespace stream { + * @arkts 1.1&1.2 + */ + pause(): Readable; ++ + /** + * Sets the encoding format of the input binary data.Default: utf8. + * +@@ -599,6 +572,7 @@ declare namespace stream { + * @arkts 1.1&1.2 + */ + setEncoding(encoding?: string): boolean; ++ + /** + * Query whether it is in pause state. + * +@@ -610,6 +584,7 @@ declare namespace stream { + * @arkts 1.1&1.2 + */ + isPaused(): boolean; ++ + /** + * Concatenated a Writable to a Readable and switches the Readable to stream mode. + * +@@ -627,6 +602,7 @@ declare namespace stream { + * @arkts 1.1&1.2 + */ + pipe(destination: Writable, options?: Object): Writable; ++ + /** + * Disconnect Writable from Readable. + * +@@ -643,6 +619,7 @@ declare namespace stream { + * @arkts 1.1&1.2 + */ + unpipe(destination?: Writable): Readable; ++ + /** + * Registering Event Messages. + * +@@ -654,10 +631,23 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + on(event: string, callback: Callback): void; ++ ++ /** ++ * Registering Event Messages. ++ * ++ * @param { string } event - Registering Events. ++ * @param { Function } callback - Event callback. ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ on(event: string, callback: Function): void; ++ + /** + * Cancel event message. + * +@@ -669,38 +659,39 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + off(event: string, callback?: Callback): void; ++ + /** +- * It may be implemented by child classes, and if so, will be called by the Readable class methods only. +- * It must not be called directly. ++ * Cancel event message. + * +- * @param { Function } callback - Callback when the stream has completed the initial. +- * @throws { BusinessError } 401 - Parameter error. Possible causes: +- * 1.Mandatory parameters are left unspecified; +- * 2.Incorrect parameter types; +- * 3.Parameter verification failed. ++ * @param { string } event - Registering Events. ++ * @param { Function } [callback] - Event callback. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since 20 ++ * @arkts 1.2 + */ +- doInitialize(callback: Function): void; ++ off(event: string, callback?: Function): void; + + /** + * It may be implemented by child classes, and if so, will be called by the Readable class methods only. + * It must not be called directly. + * +- * @param { StreamCb } callback - Callback when the stream has completed the initial. ++ * @param { Function } callback - Callback when the stream has completed the initial. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: ++ * 1.Mandatory parameters are left unspecified; ++ * 2.Incorrect parameter types; ++ * 3.Parameter verification failed. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 20 +- * @arkts 1.2 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- doInitialize(callback: StreamCb): void; ++ doInitialize(callback: Function): void; + + /** + * The specific implementation of data production. It must not be actively called. +@@ -719,6 +710,7 @@ declare namespace stream { + * @arkts 1.1&1.2 + */ + doRead(size: number): void; ++ + /** + * Adds the generated data to the buffer. The return value indicates whether the data in the buffer has not + * reached the highWaterMark (similar to Writable.write). If the chunk is null, all data has been generated. +@@ -737,6 +729,7 @@ declare namespace stream { + * @arkts 1.1&1.2 + */ + push(chunk: Uint8Array | string | null, encoding?: string): boolean; ++ + /** + * Returns boolean indicating whether it is in ObjectMode. + * +@@ -745,10 +738,22 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + readonly readableObjectMode: boolean; ++ ++ /** ++ * Returns boolean indicating whether it is in ObjectMode. ++ * ++ * @type { boolean } ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get readableObjectMode(): boolean; ++ + /** + * Is true if it is safe to call readable.read(), which means + * the stream has not been destroyed or emitted 'error' or 'end'. +@@ -758,10 +763,23 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + readonly readable: boolean; ++ ++ /** ++ * Is true if it is safe to call readable.read(), which means ++ * the stream has not been destroyed or emitted 'error' or 'end'. ++ * ++ * @type { boolean } ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get readable(): boolean; ++ + /** + * Returns the value of highWatermark passed when creating this Readable. + * +@@ -770,10 +788,22 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + readonly readableHighWatermark: number; ++ ++ /** ++ * Returns the value of highWatermark passed when creating this Readable. ++ * ++ * @type { number } ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get readableHighWatermark(): number; ++ + /** + * This property reflects the current state of the readable stream null/true/false. + * +@@ -782,10 +812,22 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + readonly readableFlowing: boolean | null; ++ ++ /** ++ * This property reflects the current state of the readable stream null/true/false. ++ * ++ * @type { boolean | null } ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get readableFlowing(): boolean | null; ++ + /** + * Size of the data that can be read, in bytes or objects. + * +@@ -794,10 +836,22 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + readonly readableLength: number; ++ ++ /** ++ * Size of the data that can be read, in bytes or objects. ++ * ++ * @type { number } ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get readableLength(): number; ++ + /** + * Getter for the property encoding of a given Readable stream. The encoding property can be set using the + * readable.setEncoding() method. +@@ -807,10 +861,23 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + readonly readableEncoding: string | null; ++ ++ /** ++ * Getter for the property encoding of a given Readable stream. The encoding property can be set using the ++ * readable.setEncoding() method. ++ * ++ * @type { string | null } ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get readableEncoding(): string | null; ++ + /** + * Whether all data has been generated. + * +@@ -819,11 +886,23 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + readonly readableEnded: boolean; ++ ++ /** ++ * Whether all data has been generated. ++ * ++ * @type { boolean } ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get readableEnded(): boolean; + } ++ + /** + * Duplex streams are streams that implement both the Readable streams and Writable streams interfaces. + * +@@ -836,7 +915,7 @@ declare namespace stream { + */ + class Duplex extends Readable { + /** +- * The Duplex constructor. ++ * The Duplex constructor. + * + * @syscap SystemCapability.Utils.Lang + * @crossplatform +@@ -845,6 +924,7 @@ declare namespace stream { + * @arkts 1.1&1.2 + */ + constructor(); ++ + /** + * writes a chunk to Writable and invokes callback when the chunk is flushed. The return value indicates + * whether the internal buffer of the Writable reaches the hightWaterMark. If true is returned, the buffer +@@ -866,32 +946,11 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + write(chunk?: string | Uint8Array, encoding?: string, callback?: Function): boolean; + +- /** +- * writes a chunk to Writable and invokes callback when the chunk is flushed. The return value indicates +- * whether the internal buffer of the Writable reaches the hightWaterMark. If true is returned, the buffer +- * does not reach the hightWaterMark. If false is returned, the buffer has been reached. The write function +- * should be called after the drain event is triggered. If the write function is called continuously, +- * the chunk is still added to the buffer until the memory overflows +- * +- * @param { string | Uint8Array } [chunk] - Data to be written. +- * @param { string } [encoding] - Encoding type. +- * @param { StreamCb } [callback] - Callback after writing. +- * @returns { boolean } Write success returns true, write failure returns false. +- * @throws { BusinessError } 10200036 - The stream has been ended. +- * @throws { BusinessError } 10200037 - The callback is invoked multiple times consecutively. +- * @throws { BusinessError } 10200039 - The doTransform method has not been implemented for a class that inherits from Transform. +- * @syscap SystemCapability.Utils.Lang +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +- write(chunk?: string | Uint8Array, encoding?: string, callback?: StreamCb): boolean; +- + /** + * Write the last chunk to Writable. + * +@@ -907,26 +966,11 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + end(chunk?: string | Uint8Array, encoding?: string, callback?: Function): Writable; + +- /** +- * Write the last chunk to Writable. +- * +- * @param { string | Uint8Array } [chunk] - Data to be written. +- * @param { string } [encoding] - Encoding type. +- * @param { StreamCb } [callback] - Callback after writing. +- * @returns { Writable } Returns the Writable object. +- * @throws { BusinessError } 10200039 - The doTransform method has not been implemented for a class that inherits from Transform. +- * @syscap SystemCapability.Utils.Lang +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +- end(chunk?: string | Uint8Array, encoding?: string, callback?: StreamCb): Writable; +- + /** + * Set the default encoding mode. + * +@@ -943,6 +987,7 @@ declare namespace stream { + * @arkts 1.1&1.2 + */ + setDefaultEncoding(encoding?: string): boolean; ++ + /** + * After the call, all Write operations will be forced to write to the buffer instead of being flushed. + * +@@ -954,6 +999,7 @@ declare namespace stream { + * @arkts 1.1&1.2 + */ + cork(): boolean; ++ + /** + * After calling, flush all buffers. + * +@@ -965,6 +1011,7 @@ declare namespace stream { + * @arkts 1.1&1.2 + */ + uncork(): boolean; ++ + /** + * Implemented by subclass inheritance. The implementation logic of flushing chunks in the buffer must not be + * directly called. The call is controlled by Writable.write. +@@ -979,25 +1026,11 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + doWrite(chunk: string | Uint8Array, encoding: string, callback: Function): void; + +- /** +- * Implemented by subclass inheritance. The implementation logic of flushing chunks in the buffer must not be +- * directly called. The call is controlled by Writable.write. +- * +- * @param { string | Uint8Array } [chunk] - Data to be written. +- * @param { string } [encoding] - Encoding type. +- * @param { StreamCb } [callback] - Callback after writing. +- * @syscap SystemCapability.Utils.Lang +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +- doWrite(chunk: string | Uint8Array, encoding: string, callback: StreamCb): void; +- + /** + * The implementation logic of flushing chunks in the buffer in batches should not be actively called. + * The call is controlled by Writable.write. +@@ -1011,36 +1044,35 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + doWritev(chunks: string[] | Uint8Array[], callback: Function): void; + + /** +- * The implementation logic of flushing chunks in the buffer in batches should not be actively called. +- * The call is controlled by Writable.write. ++ * Returns boolean indicating whether it is in ObjectMode. + * +- * @param { string[] | Uint8Array[] } [chunks] - Data to be written. +- * @param { StreamCb } [callback] - Callback after writing. ++ * @type { boolean } ++ * @readonly + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 20 +- * @arkts 1.2 ++ * @since 12 + */ +- doWritev(chunks: string[] | Uint8Array[], callback: StreamCb): void; ++ readonly writableObjectMode: boolean; + + /** + * Returns boolean indicating whether it is in ObjectMode. + * + * @type { boolean } +- * @readonly + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 20 ++ * @arkts 1.2 + */ +- readonly writableObjectMode: boolean; ++ get writableObjectMode(): boolean; ++ + /** + * Value of highWatermark. + * +@@ -1049,10 +1081,22 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + readonly writableHighWatermark: number; ++ ++ /** ++ * Value of highWatermark. ++ * ++ * @type { number } ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get writableHighWatermark(): number; ++ + /** + * Is true if it is safe to call writable.write(), which means the stream has not been destroyed, error or end. + * +@@ -1061,10 +1105,22 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + readonly writable: boolean; ++ ++ /** ++ * Is true if it is safe to call writable.write(), which means the stream has not been destroyed, error or end. ++ * ++ * @type { boolean } ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get writable(): boolean; ++ + /** + * Size of data that can be flushed, in bytes or objects. + * +@@ -1073,10 +1129,22 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + readonly writableLength: number; ++ ++ /** ++ * Size of data that can be flushed, in bytes or objects. ++ * ++ * @type { number } ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get writableLength(): number; ++ + /** + * Number of times writable.uncork() needs to be called in order to fully uncork the stream. + * +@@ -1085,10 +1153,22 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + readonly writableCorked: number; ++ ++ /** ++ * Number of times writable.uncork() needs to be called in order to fully uncork the stream. ++ * ++ * @type { number } ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get writableCorked(): number; ++ + /** + * Whether Writable.end has been called. + * +@@ -1097,10 +1177,22 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + readonly writableEnded: boolean; ++ ++ /** ++ * Whether Writable.end has been called. ++ * ++ * @type { boolean } ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get writableEnded(): boolean; ++ + /** + * Whether Writable.end has been called and all buffers have been flushed. + * +@@ -1109,10 +1201,82 @@ declare namespace stream { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice ++ * @since 12 ++ */ ++ readonly writableFinished: boolean; ++ ++ /** ++ * Whether Writable.end has been called and all buffers have been flushed. ++ * ++ * @type { boolean } ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get writableFinished(): boolean; ++ } ++ ++ /** ++ * Transform stream is a Duplex stream where the output is computed in some way from the input. ++ * Transform implementations must implement the doTransform() method and may also implement the doFlush() method. ++ * ++ * @extends Duplex ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ class Transform extends Duplex { ++ /** ++ * The Transform constructor. ++ * ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly writableFinished: boolean; ++ constructor(); ++ ++ /** ++ * Convert the input data. After the conversion, Transform.push can be called to send the input to the read stream. ++ * Transform.push should not be called Transform.write to call. ++ * ++ * @param { string } chunk - Input data to be converted. ++ * @param { string } encoding - If the chunk is a string, then this is the encoding type. If chunk is a buffer, ++ * then this is the special value 'buffer'. Ignore it in that case. ++ * @param { Function } callback - Callback after conversion. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: ++ * 1.Mandatory parameters are left unspecified; ++ * 2.Incorrect parameter types; ++ * 3.Parameter verification failed. ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ doTransform(chunk: string, encoding: string, callback: Function): void; ++ ++ /** ++ * After all data is flushed to the write stream, you can use the Transform.doFlush writes some extra data, must ++ * not be called directly, only called by Writable after flushing all data. ++ * ++ * @param { Function } callback - Callback after flush completion. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: ++ * 1.Mandatory parameters are left unspecified; ++ * 2.Incorrect parameter types; ++ * 3.Parameter verification failed. ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ doFlush(callback: Function): void; + } + } + export default stream; +\ No newline at end of file +diff --git a/api/@ohos.web.webview.d.ts b/api/@ohos.web.webview.d.ts +index 7de05c6f6..de0be74a2 100644 +--- a/api/@ohos.web.webview.d.ts ++++ b/api/@ohos.web.webview.d.ts +@@ -25,9 +25,8 @@ import { AsyncCallback, BusinessError } from './@ohos.base'; + import { Callback } from './@ohos.base'; + import type cert from './@ohos.security.cert'; + import type image from './@ohos.multimedia.image'; +-/*** if arkts 1.1 */ + import type print from './@ohos.print'; +-/*** endif */ ++ + import { WebNetErrorList } from './@ohos.web.netErrorList'; + + /** +@@ -3076,14 +3075,14 @@ declare namespace webview { + */ + /** + * Current index in BackForwardList. +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Web.Webview.Core + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- currentIndex: number; ++ currentIndex: int; + + /** + * Size of in BackForwardList. +@@ -3092,19 +3091,19 @@ declare namespace webview { + */ + /** + * Size of in BackForwardList. +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.Web.Webview.Core + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- size: number; ++ size: int; + + /** + * Get history entry at given index. + * +- * @param { number } index Index of back forward list entry. ++ * @param { int } index Index of back forward list entry. + * @returns { HistoryItem } HistoryItem at given index in back forward list. + * @throws { BusinessError } 401 - Invalid input parameter. + * @syscap SystemCapability.Web.Webview.Core +@@ -3113,7 +3112,7 @@ declare namespace webview { + /** + * Get history entry at given index. + * +- * @param { number } index Index of back forward list entry. ++ * @param { int } index Index of back forward list entry. + * @returns { HistoryItem } HistoryItem at given index in back forward list. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. 3.Parameter verification failed. +@@ -3123,7 +3122,7 @@ declare namespace webview { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- getItemAtIndex(index: number): HistoryItem; ++ getItemAtIndex(index: int): HistoryItem; + } + + /** +@@ -4105,7 +4104,7 @@ declare namespace webview { + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice + * @since 11 +- * @deprecated since 16 ++ * @deprecated since 18 + * @useinstead ohos.web.webview.WebviewController#getLastHitTest + */ + getHitTest(): WebHitTestType; +@@ -4302,7 +4301,7 @@ declare namespace webview { + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice + * @since 11 +- * @deprecated since 16 ++ * @deprecated since 18 + * @useinstead ohos.web.webview.WebviewController#getLastHitTest + */ + getHitTestValue(): HitTestValue; +@@ -4581,7 +4580,28 @@ declare namespace webview { + * The WebviewController must be associated with a Web component. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Registers the JavaScript object and method list. ++ * ++ * @param { object } object - Application side JavaScript objects participating in registration. ++ * @param { string } name - The name of the registered object, which is consistent with the ++ * object name called in the window. ++ * @param { Array } methodList - The method of the application side JavaScript object participating ++ * in the registration. ++ * @param { Array } [asyncMethodList] - The async method of the application side JavaScript object ++ * participating in the registration. ++ * @param { string } [permission] - permission configuration defining web page URLs that can access JavaScriptProxy methods. ++ * The configuration can be defined at two levels, object level and method level. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameter types. 3.Parameter verification failed. ++ * @throws { BusinessError } 17100001 - Init error. ++ * The WebviewController must be associated with a Web component. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + registerJavaScriptProxy(object: object, name: string, methodList: Array, +@@ -4609,7 +4629,21 @@ declare namespace webview { + * @throws { BusinessError } 17100008 - Failed to delete JavaScriptProxy because it does not exist. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Deletes a registered JavaScript object with given name. ++ * ++ * @param { string } name - The name of a registered JavaScript object to be deleted. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameter types. 3.Parameter verification failed. ++ * @throws { BusinessError } 17100001 - Init error. ++ * The WebviewController must be associated with a Web component. ++ * @throws { BusinessError } 17100008 - Failed to delete JavaScriptProxy because it does not exist. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + deleteJavaScriptRegister(name: string): void; +@@ -5516,7 +5550,8 @@ declare namespace webview { + * @param { string } url - Which url to preresolve/preconnect. + * @param { boolean } preconnectable - Indicates whether to preconnect. + * @param { number } numSockets - If preconnectable is true, this parameter indicates the number of sockets to be preconnected. +- * @throws { BusinessError } 17100002 - Invalid url. ++ * @throws { BusinessError } 17100002 - URL error. The webpage corresponding to the URL is invalid, or the URL ++ * length exceeds 2048. + * @throws { BusinessError } 171000013 - The number of preconnect sockets is invalid. + * @syscap SystemCapability.Web.Webview.Core + * @since 10 +@@ -5526,7 +5561,8 @@ declare namespace webview { + * @param { string } url - Which url to preresolve/preconnect. + * @param { boolean } preconnectable - Indicates whether to preconnect. + * @param { number } numSockets - If preconnectable is true, this parameter indicates the number of sockets to be preconnected. +- * @throws { BusinessError } 17100002 - Invalid url. ++ * @throws { BusinessError } 17100002 - URL error. The webpage corresponding to the URL is invalid, or the URL ++ * length exceeds 2048. + * @throws { BusinessError } 171000013 - The number of preconnect sockets is invalid. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +@@ -5681,7 +5717,8 @@ declare namespace webview { + * @throws { BusinessError } 17100001 - Init error. + * The WebviewController must be associated with a Web component. + * @syscap SystemCapability.Web.Webview.Core +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + createWebPrintDocumentAdapter(jobName: string): print.PrintDocumentAdapter; + +@@ -5958,7 +5995,20 @@ declare namespace webview { + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Enable the ability to use Intelligent Tracking Prevention; default is disabled. ++ * ++ * @param { boolean } enable {@code true} enable Intelligent Tracking Prevention; {@code false} otherwise. ++ * @throws { BusinessError } 17100001 - Init error. ++ * The WebviewController must be associated with a Web component. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameter types. ++ * @throws { BusinessError } 801 - Capability not supported. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + enableIntelligentTrackingPrevention(enable: boolean): void; +@@ -5971,7 +6021,18 @@ declare namespace webview { + * The WebviewController must be associated with a Web component. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Get whether Intelligent Tracking Prevention is enabled. ++ * ++ * @returns { boolean } True if enable the Intelligent Tracking Prevention; else false. ++ * @throws { BusinessError } 17100001 - Init error. ++ * The WebviewController must be associated with a Web component. ++ * @throws { BusinessError } 801 - Capability not supported. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + isIntelligentTrackingPreventionEnabled(): boolean; +@@ -5984,7 +6045,18 @@ declare namespace webview { + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Add bypassing hosts for Intelligent Tracking Prevention. ++ * ++ * @param { Array } hostList - Hosts that bypass the Intelligent Tracking Prevention. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameter types. ++ * @throws { BusinessError } 801 - Capability not supported. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + static addIntelligentTrackingPreventionBypassingList(hostList: Array): void; +@@ -5997,7 +6069,18 @@ declare namespace webview { + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Remove bypassing hosts for Intelligent Tracking Prevention. ++ * ++ * @param { Array } hostList - Hosts needs to remove from bypass list. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameter types. ++ * @throws { BusinessError } 801 - Capability not supported. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + static removeIntelligentTrackingPreventionBypassingList(hostList: Array): void; +@@ -6007,7 +6090,15 @@ declare namespace webview { + * + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Clear bypassing hosts for Intelligent Tracking Prevention. ++ * ++ * @throws { BusinessError } 801 - Capability not supported. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + static clearIntelligentTrackingPreventionBypassingList(): void; +@@ -6028,7 +6119,8 @@ declare namespace webview { + * @param { CreateNativeMediaPlayerCallback } callback - Called everytime when web pages try to play media. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onCreateNativeMediaPlayer(callback: CreateNativeMediaPlayerCallback): void; + +@@ -6210,7 +6302,20 @@ declare namespace webview { + * The WebviewController must be associated with a Web component. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Enable the ability to block Ads, disabled by default. ++ * ++ * @param { boolean } enable {@code true} Enable Ads block; {@code false} otherwise. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. ++ *
    2. Parameter string is too long. 3.Parameter verification failed. ++ * @throws { BusinessError } 17100001 - Init error. ++ * The WebviewController must be associated with a Web component. ++ * @throws { BusinessError } 801 - Capability not supported. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + enableAdsBlock(enable: boolean): void; +@@ -6221,7 +6326,16 @@ declare namespace webview { + * @returns { boolean } True if the ability of AdsBlock is enabled; else false. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Get whether Ads block is enabled. ++ * ++ * @returns { boolean } True if the ability of AdsBlock is enabled; else false. ++ * @throws { BusinessError } 801 - Capability not supported. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + isAdsBlockEnabled(): boolean; +@@ -6232,7 +6346,16 @@ declare namespace webview { + * @returns { boolean } True if the ability of AdsBlock is enabled for current Webpage; else false. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Get whether Ads block is enabled for current Webpage. ++ * ++ * @returns { boolean } True if the ability of AdsBlock is enabled for current Webpage; else false. ++ * @throws { BusinessError } 801 - Capability not supported. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + isAdsBlockEnabledForCurPage(): boolean; +@@ -8256,6 +8379,27 @@ declare namespace webview { + AUTO_CLEANUP + } + ++ /** ++ * The function of reusme media play. ++ * ++ * @typedef { function } ResumePlayerFn ++ * @syscap SystemCapability.Web.Webview.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ type ResumePlayerFn = () => void; ++ ++ /** ++ * The function of suspend media play. ++ * ++ * @typedef { function } SuspendPlayerFn ++ * @param { SuspendType } type - The scenario for suspending the media player. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ type SuspendPlayerFn = (type: SuspendType) => void; ++ + /** + * The bridge between web core and native media player. + * Apps should implements this interface, and pass an instance to web core. +@@ -8264,7 +8408,8 @@ declare namespace webview { + * @typedef NativeMediaPlayerBridge + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface NativeMediaPlayerBridge { + /** +@@ -8276,7 +8421,8 @@ declare namespace webview { + * @param { number } height - The height of video tag. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + updateRect(x: number, y: number, width: number, height: number): void + +@@ -8285,7 +8431,8 @@ declare namespace webview { + * + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + play(): void + +@@ -8294,7 +8441,8 @@ declare namespace webview { + * + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + pause(): void + +@@ -8306,7 +8454,8 @@ declare namespace webview { + * @param { number } targetTime - The target time (in seconds) to FF/BF to. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + seek(targetTime: number): void + +@@ -8318,7 +8467,8 @@ declare namespace webview { + * @param { number } volume - The volume of native media player. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setVolume(volume: number): void + +@@ -8328,7 +8478,8 @@ declare namespace webview { + * @param { boolean } muted - Should mute native media player. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setMuted(muted: boolean): void + +@@ -8340,7 +8491,8 @@ declare namespace webview { + * @param { number } playbackRate - The playback rate of native media player. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setPlaybackRate(playbackRate: number): void + +@@ -8349,7 +8501,8 @@ declare namespace webview { + * + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + release(): void + +@@ -8358,7 +8511,8 @@ declare namespace webview { + * + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enterFullscreen(): void + +@@ -8367,7 +8521,8 @@ declare namespace webview { + * + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + exitFullscreen(): void + +@@ -8379,6 +8534,16 @@ declare namespace webview { + */ + resumePlayer?(): void + ++ /** ++ * Resume the native media player. ++ * ++ * @type { ?ResumePlayerFn } ++ * @syscap SystemCapability.Web.Webview.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ resumePlayer?: ResumePlayerFn; ++ + /** + * Suspend to release native media player, not the NativeMediaPlayerBridge. The + * embedder should save the status of player when release the native media player +@@ -8389,6 +8554,18 @@ declare namespace webview { + * @since 12 + */ + suspendPlayer?(type: SuspendType): void ++ ++ /** ++ * Suspend to release native media player, not the NativeMediaPlayerBridge. The ++ * embedder should save the status of player when release the native media player ++ * through NativeMediaPlayerBridge. ++ * ++ * @type { ?SuspendPlayerFn } ++ * @syscap SystemCapability.Web.Webview.Core ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ suspendPlayer?: SuspendPlayerFn; + } + + /** +@@ -8713,7 +8890,8 @@ declare namespace webview { + * @returns { NativeMediaPlayerBridge } Returns whether the app takes over the media. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type CreateNativeMediaPlayerCallback = + (handler: NativeMediaPlayerHandler, mediaInfo: MediaInfo) => NativeMediaPlayerBridge; +@@ -8734,7 +8912,18 @@ declare namespace webview { + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * set Ads Block ruleset file, containing easylist rules. ++ * @param {string} rulesFile - absolute file path contains app customized ads block rules. ++ * @param {boolean} replace - (@code true)replace internal rules;(@code false) add to internal rules. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameter types. ++ * @throws { BusinessError } 801 - Capability not supported. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + static setAdsBlockRules(rulesFile: string, replace: boolean): void; +@@ -8747,7 +8936,18 @@ declare namespace webview { + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Add items to Ads Block Disallow list. ++ * @param { Array } domainSuffixes - list of domain suffix, if web page url matches someone in the list, ++ * Ads Block will be disallowed for the web page. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameter types. ++ * @throws { BusinessError } 801 - Capability not supported. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + static addAdsBlockDisallowedList(domainSuffixes: Array): void; +@@ -8763,7 +8963,21 @@ declare namespace webview { + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Add items to Ads Block Allow list. ++ * By default, ads block is allowed for all pages unless they are added to the ++ * disallow list. The priority of allowlist is higher than the disallowlist. It is ++ * used to re-enable ads block on the page that matches disallow list. ++ * @param { Array } domainSuffixes - list of domain suffix, if web page url matches someone in the list, ++ * Ads Block will be allowed for the web page. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameter types. ++ * @throws { BusinessError } 801 - Capability not supported. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + static addAdsBlockAllowedList(domainSuffixes: Array): void; +@@ -8775,7 +8989,17 @@ declare namespace webview { + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * remove items from Ads Block Disallowed list. ++ * @param { Array } domainSuffixes - list of domain suffix needed be removed from disallow list ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameter types. ++ * @throws { BusinessError } 801 - Capability not supported. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + static removeAdsBlockDisallowedList(domainSuffixes: Array): void; +@@ -8787,7 +9011,17 @@ declare namespace webview { + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * remove items from Ads Block Allowed list. ++ * @param { Array } domainSuffixes - list of domain suffix needed be removed from allow list ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameter types. ++ * @throws { BusinessError } 801 - Capability not supported. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + static removeAdsBlockAllowedList(domainSuffixes: Array): void; +@@ -8796,7 +9030,14 @@ declare namespace webview { + * clear Ads Block Disallowed list. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * clear Ads Block Disallowed list. ++ * @throws { BusinessError } 801 - Capability not supported. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + static clearAdsBlockDisallowedList(): void; +@@ -8805,7 +9046,14 @@ declare namespace webview { + * clear Ads Block Allowed list. + * @syscap SystemCapability.Web.Webview.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * clear Ads Block Allowed list. ++ * @throws { BusinessError } 801 - Capability not supported. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + static clearAdsBlockAllowedList(): void; +@@ -8891,37 +9139,69 @@ declare namespace webview { + * Enum type supplied to {@link insertProxyRule} for indicating the scheme filter for proxy. + * @enum { number } + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'15', '1.2':'20'} ++ * @since 15 ++ */ ++ /** ++ * Enum type supplied to {@link insertProxyRule} for indicating the scheme filter for proxy. ++ * @enum { number } ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + enum ProxySchemeFilter { + /** + * This indicates all the schemes will use the proxy. + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'15', '1.2':'20'} ++ * @since 15 ++ */ ++ /** ++ * This indicates all the schemes will use the proxy. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + MATCH_ALL_SCHEMES = 0, + /** + * This indicates only the HTTP requests will use the proxy. + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'15', '1.2':'20'} ++ * @since 15 ++ */ ++ /** ++ * This indicates only the HTTP requests will use the proxy. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + MATCH_HTTP = 1, + /** + * This indicates only the HTTPS requests will use the proxy. + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'15', '1.2':'20'} ++ * @since 15 ++ */ ++ /** ++ * This indicates only the HTTPS requests will use the proxy. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + MATCH_HTTPS = 2, + } + /** + * The ProxyConfig used by applyProxyOverride. +- * ++ * + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'15', '1.2':'20'} ++ * @since 15 ++ */ ++ /** ++ * The ProxyConfig used by applyProxyOverride. ++ * ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + class ProxyConfig { +@@ -8929,23 +9209,45 @@ declare namespace webview { + * Insert a bypass rule that indicates URLs that should skip the override proxy and connect the server directly instead. + * These maybe URLs or IP addresses and wildcards are supported. e.g. "*.example.com" means that requests to + * "https://www.example.com" and "http://test.example.com" will connect the server directly. +- * ++ * + * @param { string } bypassRule - The bypass rule. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'15', '1.2':'20'} ++ * @since 15 ++ */ ++ /** ++ * Insert a bypass rule that indicates URLs that should skip the override proxy and connect the server directly instead. ++ * These maybe URLs or IP addresses and wildcards are supported. e.g. "*.example.com" means that requests to ++ * "https://www.example.com" and "http://test.example.com" will connect the server directly. ++ * ++ * @param { string } bypassRule - The bypass rule. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameter types. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + insertBypassRule(bypassRule: string): void; + /** + * Insert a proxy rule that indicates URLs that match the schemeFilter will connect the server directly. +- * ++ * + * @param { ProxySchemeFilter } schemeFilter - The scheme filter for this rule. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'15', '1.2':'20'} ++ * @since 15 ++ */ ++ /** ++ * Insert a proxy rule that indicates URLs that match the schemeFilter will connect the server directly. ++ * ++ * @param { ProxySchemeFilter } schemeFilter - The scheme filter for this rule. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameter types. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + insertDirectRule(schemeFilter?: ProxySchemeFilter): void; +@@ -8970,7 +9272,31 @@ declare namespace webview { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'15', '1.2':'20'} ++ * @since 15 ++ */ ++ /** ++ * Insert a proxy rule which indicates that requests matching the schemeFilter should use an override proxy, all requests will ++ * use the proxy rule if schemeFilter is null. ++ * ++ * The format for proxy is [scheme://]host[:port]. Scheme is optional and must be HTTP, HTTPS, or SOCKS if present. Scheme defaults to HTTP. ++ * Host is an IPv6 literal with brackets, an IPv4 literal or one or more labels seperated by a period. Port number is optional and defaults ++ * to 80 for HTTP, 443 for HTTPS and 1080 for SOCKS. ++ * ++ * e.g. example.com host: example.com ++ * https://example.com scheme: https host: example.com ++ * example.com:8888 host: example.com port: 8888 ++ * https://example.com:8888 scheme:https host: example.com port:8888 ++ * 192.168.1.1 host: 192.168.1.1 ++ * 192.168.1.1:8888 host:192.168.1.1 port: 8888 ++ * [10:20:30:40:50:60:70:80] ++ * ++ * @param { string } proxyRule - The proxy rule. ++ * @param { ProxySchemeFilter } schemeFilter - The scheme filter for this rule. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameter types. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + insertProxyRule(proxyRule: string, schemeFilter?: ProxySchemeFilter): void; +@@ -8979,7 +9305,15 @@ declare namespace webview { + * Examples: "abc", "local", "some-domain". + * + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'15', '1.2':'20'} ++ * @since 15 ++ */ ++ /** ++ * Hostnames without a period in them (and that are not IP literals) will skip the proxy and connect the server directly. ++ * Examples: "abc", "local", "some-domain". ++ * ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + bypassHostnamesWithoutPeriod(): void; +@@ -8989,7 +9323,16 @@ declare namespace webview { + * Call this function to override the default behavior and force localhost and link-local URLs to be sent through the proxy. + * + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'15', '1.2':'20'} ++ * @since 15 ++ */ ++ /** ++ * By default, certain hostnames implicitly bypass the proxy if they are link-local IPs, or localhost addresses. For instance ++ * hostnames matching any of (non-exhaustive list): localhost *.localhost [::1] 127.0.0.1/8 169.254/16 [FE80::]/10 ++ * Call this function to override the default behavior and force localhost and link-local URLs to be sent through the proxy. ++ * ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + clearImplicitRules(): void; +@@ -9003,7 +9346,20 @@ declare namespace webview { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'15', '1.2':'20'} ++ * @since 15 ++ */ ++ /** ++ * Reverse the bypass rules. ++ * ++ * If false all URLs will use proxy settings except URLs match the bypass rules. ++ * If true only URLs in the bypass list will use proxy, and all other URLs will be connected to directly. ++ * ++ * @param { boolean } reverse - If reverse the bypass rule. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameter types. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + enableReverseBypass(reverse: boolean): void; +@@ -9012,7 +9368,15 @@ declare namespace webview { + * + * @returns { Array } The bypass rules. + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'15', '1.2':'20'} ++ * @since 15 ++ */ ++ /** ++ * Returns the bypass rules. ++ * ++ * @returns { Array } The bypass rules. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + getBypassRules(): Array; +@@ -9021,7 +9385,15 @@ declare namespace webview { + * + * @returns { Array } The proxy rules. + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'15', '1.2':'20'} ++ * @since 15 ++ */ ++ /** ++ * Returns the proxy rules. ++ * ++ * @returns { Array } The proxy rules. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + getProxyRules(): Array; +@@ -9030,7 +9402,15 @@ declare namespace webview { + * + * @returns { boolean } If reverse bypass enabled. + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'15', '1.2':'20'} ++ * @since 15 ++ */ ++ /** ++ * Returns if reverse bypass rules. ++ * ++ * @returns { boolean } If reverse bypass enabled. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + isReverseBypassEnabled(): boolean; +@@ -9040,7 +9420,14 @@ declare namespace webview { + * The ProxyRule used by insertProxyRule. + * + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'15', '1.2':'20'} ++ * @since 15 ++ */ ++ /** ++ * The ProxyRule used by insertProxyRule. ++ * ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + class ProxyRule { +@@ -9049,7 +9436,15 @@ declare namespace webview { + * + * @returns { ProxySchemeFilter } The scheme filter used for this rule. + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'15', '1.2':'20'} ++ * @since 15 ++ */ ++ /** ++ * Returns the scheme filter used for this rule. ++ * ++ * @returns { ProxySchemeFilter } The scheme filter used for this rule. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + getSchemeFilter(): ProxySchemeFilter; +@@ -9058,7 +9453,15 @@ declare namespace webview { + * + * @returns { string } The proxy URL. + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'15', '1.2':'20'} ++ * @since 15 ++ */ ++ /** ++ * Returns the proxy URL. ++ * ++ * @returns { string } The proxy URL. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + getUrl(): string; +@@ -9069,7 +9472,15 @@ declare namespace webview { + * + * @typedef { function } + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'18', '1.2':'20'} ++ * @since 15 ++ */ ++ /** ++ * The callback for proxy changed. ++ * ++ * @typedef { function } ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + type OnProxyConfigChangeCallback = () => void; +@@ -9078,7 +9489,14 @@ declare namespace webview { + * This class is used for set proxy for ArkWeb. + * + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'15', '1.2':'20'} ++ * @since 15 ++ */ ++ /** ++ * This class is used for set proxy for ArkWeb. ++ * ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + class ProxyController { +@@ -9093,7 +9511,21 @@ declare namespace webview { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'15', '1.2':'20'} ++ * @since 15 ++ */ ++ /** ++ * Sets ProxyConfig which will be used by all Webs in the app. URLs that match patterns in the bypass list will connect the server directly. ++ * Instead, the request will use the proxy specified by the config. Requests are not guaranteed to use the new proxy immediately; wait for ++ * the listener before loading a page. This listener will be called on the UI thread. ++ * Note: calling applyProxyOverride will cause any existing system wide setting to be ignored. ++ * ++ * @param { ProxyConfig } proxyConfig - The proxy config. ++ * @param { OnProxyConfigChangeCallback } callback - Called when the proxy has been changed. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameter types. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + static applyProxyOverride(proxyConfig: ProxyConfig, callback: OnProxyConfigChangeCallback): void; +@@ -9105,7 +9537,18 @@ declare namespace webview { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @syscap SystemCapability.Web.Webview.Core +- * @since arkts {'1.1':'15', '1.2':'20'} ++ * @since 15 ++ */ ++ /** ++ * Remove the proxy config. Requests are not guaranteed to not use the proxy; wait for the listener before loading a page. This listener ++ * will be called on the UI thread. ++ * ++ * @param { OnProxyConfigChangeCallback } callback - Called when the proxy has been changed. ++ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. ++ *
    2. Incorrect parameter types. ++ * @syscap SystemCapability.Web.Webview.Core ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 + */ + static removeProxyOverride(callback: OnProxyConfigChangeCallback): void; +diff --git a/api/@ohos.wifi.d.ts b/api/@ohos.wifi.d.ts +index bc98aa0fb..e38024591 100644 +--- a/api/@ohos.wifi.d.ts ++++ b/api/@ohos.wifi.d.ts +@@ -23,7 +23,8 @@ import { AsyncCallback, Callback } from './@ohos.base'; + /** + * Provides methods to operate or manage Wi-Fi. + * @namespace wifi +- * @since 6 ++ * @since arkts {'1.1':'6', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + declare namespace wifi { + /** +diff --git a/api/@ohos.wifiManager.d.ts b/api/@ohos.wifiManager.d.ts +index 76816bcb2..2dbe81d96 100644 +--- a/api/@ohos.wifiManager.d.ts ++++ b/api/@ohos.wifiManager.d.ts +@@ -50,7 +50,8 @@ declare namespace wifiManager { + * @throws {BusinessError} 2501000 - Operation failed. + * @throws {BusinessError} 2501003 - Operation failed because the service is being closed. + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function enableWifi(): void; + +@@ -64,7 +65,8 @@ declare namespace wifiManager { + * @throws {BusinessError} 2501004 - Operation failed because the service is being opened. + * @syscap SystemCapability.Communication.WiFi.STA + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function disableWifi(): void; + +@@ -78,7 +80,8 @@ declare namespace wifiManager { + * @throws {BusinessError} 2501004 - Operation failed because the service is being opened. + * @syscap SystemCapability.Communication.WiFi.STA + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function enableSemiWifi(): void; + +@@ -179,7 +182,8 @@ declare namespace wifiManager { + * @throws {BusinessError} 2501000 - Operation failed. + * @syscap SystemCapability.Communication.WiFi.STA + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getWifiDetailState(): WifiDetailState; + +@@ -233,7 +237,8 @@ declare namespace wifiManager { + * @throws {BusinessError} 2501000 - Operation failed. + * @syscap SystemCapability.Communication.WiFi.STA + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getScanInfoList(): Array; + +@@ -571,7 +576,8 @@ declare namespace wifiManager { + * @throws {BusinessError} 801 - Capability not supported. + * @throws {BusinessError} 2501000 - Operation failed. + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getSignalLevel(rssi: number, band: number): number; + +@@ -598,7 +604,8 @@ declare namespace wifiManager { + * @syscap SystemCapability.Communication.WiFi.STA + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getLinkedInfo(): Promise; + +@@ -642,7 +649,8 @@ declare namespace wifiManager { + * @throws {BusinessError} 2501001 - Wi-Fi STA disabled. + * @syscap SystemCapability.Communication.WiFi.STA + * @crossplatform +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getLinkedInfo(callback: AsyncCallback): void; + +@@ -656,7 +664,8 @@ declare namespace wifiManager { + * @throws {BusinessError} 2501001 - Wi-Fi STA disabled. + * @syscap SystemCapability.Communication.WiFi.STA + * @crossplatform +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getLinkedInfoSync(): WifiLinkedInfo; + +@@ -681,7 +690,8 @@ declare namespace wifiManager { + * @syscap SystemCapability.Communication.WiFi.STA + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isConnected(): boolean; + +@@ -738,7 +748,8 @@ declare namespace wifiManager { + * @throws {BusinessError} 801 - Capability not supported. + * @throws {BusinessError} 2501000 - Operation failed. + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getIpInfo(): IpInfo; + +@@ -751,7 +762,8 @@ declare namespace wifiManager { + * @throws {BusinessError} 801 - Capability not supported. + * @throws {BusinessError} 2501000 - Operation failed. + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getIpv6Info(): Ipv6Info; + +@@ -959,7 +971,8 @@ declare namespace wifiManager { + * @throws {BusinessError} 2501000 - Operation failed. + * @throws {BusinessError} 2501001 - Wi-Fi STA disabled. + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isMeteredHotspot(): boolean; + +@@ -1049,7 +1062,8 @@ declare namespace wifiManager { + * @throws {BusinessError} 2601000 - Operation failed. + * @syscap SystemCapability.Communication.WiFi.AP.Core + * @systemapi Hide this for inner system use. +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function isOpenSoftApAllowed(): boolean; + +@@ -1133,7 +1147,8 @@ declare namespace wifiManager { + * @throws {BusinessError} 2601000 - Operation failed. + * @syscap SystemCapability.Communication.WiFi.AP.Core + * @systemapi Hide this for inner system use. +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + function getStations(): Array; + +@@ -2177,7 +2192,8 @@ declare namespace wifiManager { + * @enum { number } + * @syscap SystemCapability.Communication.WiFi.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum DeviceAddressType { + /** +@@ -2190,7 +2206,8 @@ declare namespace wifiManager { + * random device address + * @syscap SystemCapability.Communication.WiFi.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + RANDOM_DEVICE_ADDRESS, + +@@ -2204,7 +2221,8 @@ declare namespace wifiManager { + * real device address + * @syscap SystemCapability.Communication.WiFi.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + REAL_DEVICE_ADDRESS, + } +@@ -2367,14 +2385,16 @@ declare namespace wifiManager { + * @enum { number } WifiDetailState + * @syscap SystemCapability.Communication.WiFi.STA + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum WifiDetailState { + /** + * state is unknown + * @syscap SystemCapability.Communication.WiFi.STA + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + UNKNOWN = -1, + +@@ -2382,7 +2402,8 @@ declare namespace wifiManager { + * wifi is closed + * @syscap SystemCapability.Communication.WiFi.STA + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INACTIVE = 0, + +@@ -2390,7 +2411,8 @@ declare namespace wifiManager { + * wifi is opened + * @syscap SystemCapability.Communication.WiFi.STA + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ACTIVATED = 1, + +@@ -2398,7 +2420,8 @@ declare namespace wifiManager { + * wifi is opening + * @syscap SystemCapability.Communication.WiFi.STA + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ACTIVATING = 2, + +@@ -2406,7 +2429,8 @@ declare namespace wifiManager { + * wifi is closing + * @syscap SystemCapability.Communication.WiFi.STA + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DEACTIVATING = 3, + +@@ -2414,7 +2438,8 @@ declare namespace wifiManager { + * wifi sta is entering semi active + * @syscap SystemCapability.Communication.WiFi.STA + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SEMI_ACTIVATING = 4, + +@@ -2422,7 +2447,8 @@ declare namespace wifiManager { + * wifi sta is semi active + * @syscap SystemCapability.Communication.WiFi.STA + * @systemapi Hide this for inner system use. +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SEMI_ACTIVE = 5, + } +@@ -2464,41 +2490,47 @@ declare namespace wifiManager { + * Wi-Fi Category. + * @enum { number } + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum WifiCategory { + /** + * Default. + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DEFAULT = 1, + + /** + * Wifi6. + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WIFI6 = 2, + + /** + * Wifi6+. + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WIFI6_PLUS = 3, + + /** + * Wifi7. + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WIFI7 = 4, + + /** + * Wifi7+. + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WIFI7_PLUS = 5 + } +@@ -2740,7 +2772,8 @@ declare namespace wifiManager { + * @typedef WifiDeviceConfig + * @syscap SystemCapability.Communication.WiFi.STA + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface WifiDeviceConfig { + /** +@@ -2754,7 +2787,8 @@ declare namespace wifiManager { + * @type { string } + * @syscap SystemCapability.Communication.WiFi.STA + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ssid: string; + +@@ -2769,7 +2803,8 @@ declare namespace wifiManager { + * @type { ?string } + * @syscap SystemCapability.Communication.WiFi.STA + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + bssid?: string; + +@@ -2799,7 +2834,8 @@ declare namespace wifiManager { + * @type { string } + * @syscap SystemCapability.Communication.WiFi.STA + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + preSharedKey: string; + +@@ -2823,7 +2859,8 @@ declare namespace wifiManager { + * @type { WifiSecurityType } + * @syscap SystemCapability.Communication.WiFi.STA + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + securityType: WifiSecurityType; + +@@ -3111,7 +3148,8 @@ declare namespace wifiManager { + * @typedef WifiScanInfo + * @syscap SystemCapability.Communication.WiFi.STA + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface WifiScanInfo { + /** +@@ -3125,7 +3163,8 @@ declare namespace wifiManager { + * @type { string } + * @syscap SystemCapability.Communication.WiFi.STA + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ssid: string; + +@@ -3140,7 +3179,8 @@ declare namespace wifiManager { + * @type { string } + * @syscap SystemCapability.Communication.WiFi.STA + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + bssid: string; + +@@ -3178,7 +3218,8 @@ declare namespace wifiManager { + * @type { WifiSecurityType } + * @syscap SystemCapability.Communication.WiFi.STA + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + securityType: WifiSecurityType; + +@@ -3193,7 +3234,8 @@ declare namespace wifiManager { + * @type { number } + * @syscap SystemCapability.Communication.WiFi.STA + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + rssi: number; + +@@ -3201,7 +3243,8 @@ declare namespace wifiManager { + * Frequency band, 1: 2.4G, 2: 5G + * @type { number } + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + band: number; + +@@ -3264,7 +3307,8 @@ declare namespace wifiManager { + * Supported wifi category + * @type { WifiCategory } + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + supportedWifiCategory: WifiCategory; + +@@ -3288,14 +3332,16 @@ declare namespace wifiManager { + * @enum { number } + * @syscap SystemCapability.Communication.WiFi.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum WifiSecurityType { + /** + * Invalid security type + * + * @syscap SystemCapability.Communication.WiFi.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WIFI_SEC_TYPE_INVALID = 0, + +@@ -3310,7 +3356,8 @@ declare namespace wifiManager { + * + * @syscap SystemCapability.Communication.WiFi.Core + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WIFI_SEC_TYPE_OPEN = 1, + +@@ -3318,7 +3365,8 @@ declare namespace wifiManager { + * Wired Equivalent Privacy (WEP) + * + * @syscap SystemCapability.Communication.WiFi.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WIFI_SEC_TYPE_WEP = 2, + +@@ -3326,7 +3374,8 @@ declare namespace wifiManager { + * Pre-shared key (PSK) + * + * @syscap SystemCapability.Communication.WiFi.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WIFI_SEC_TYPE_PSK = 3, + +@@ -3334,7 +3383,8 @@ declare namespace wifiManager { + * Simultaneous Authentication of Equals (SAE) + * + * @syscap SystemCapability.Communication.WiFi.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WIFI_SEC_TYPE_SAE = 4, + +@@ -3342,7 +3392,8 @@ declare namespace wifiManager { + * EAP authentication. + * + * @syscap SystemCapability.Communication.WiFi.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WIFI_SEC_TYPE_EAP = 5, + +@@ -3350,7 +3401,8 @@ declare namespace wifiManager { + * SUITE_B_192 192 bit level. + * + * @syscap SystemCapability.Communication.WiFi.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WIFI_SEC_TYPE_EAP_SUITE_B = 6, + +@@ -3358,7 +3410,8 @@ declare namespace wifiManager { + * Opportunistic Wireless Encryption. + * + * @syscap SystemCapability.Communication.WiFi.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WIFI_SEC_TYPE_OWE = 7, + +@@ -3366,7 +3419,8 @@ declare namespace wifiManager { + * WAPI certificate to be specified. + * + * @syscap SystemCapability.Communication.WiFi.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WIFI_SEC_TYPE_WAPI_CERT = 8, + +@@ -3374,7 +3428,8 @@ declare namespace wifiManager { + * WAPI pre-shared key to be specified. + * + * @syscap SystemCapability.Communication.WiFi.Core +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + WIFI_SEC_TYPE_WAPI_PSK = 9 + } +@@ -3527,7 +3582,8 @@ declare namespace wifiManager { + * @typedef WifiLinkedInfo + * @syscap SystemCapability.Communication.WiFi.STA + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + + interface WifiLinkedInfo { +@@ -3542,7 +3598,8 @@ declare namespace wifiManager { + * @type { string } + * @syscap SystemCapability.Communication.WiFi.STA + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ssid: string; + +@@ -3557,7 +3614,8 @@ declare namespace wifiManager { + * @type { string } + * @syscap SystemCapability.Communication.WiFi.STA + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + bssid: string; + +@@ -3581,7 +3639,8 @@ declare namespace wifiManager { + * @type { number } + * @syscap SystemCapability.Communication.WiFi.STA + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + rssi: number; + +@@ -3589,7 +3648,8 @@ declare namespace wifiManager { + * The frequency band of a Wi-Fi access point. + * @type { number } + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + band: number; + +@@ -3686,7 +3746,8 @@ declare namespace wifiManager { + * The Wi-Fi MAC address of a device. + * @type { string } + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + macAddress: string; + +@@ -3711,7 +3772,8 @@ declare namespace wifiManager { + * The state of this Wi-Fi connection. + * @type { ConnState } + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + connState: ConnState; + +@@ -3735,7 +3797,8 @@ declare namespace wifiManager { + * Supported wifi category + * @type { WifiCategory } + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + supportedWifiCategory: WifiCategory; + +@@ -3760,14 +3823,16 @@ declare namespace wifiManager { + * Wi-Fi IP information. + * @typedef IpInfo + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface IpInfo { + /** + * The IP address of the Wi-Fi connection + * @type { number } + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ipAddress: number; + +@@ -3824,14 +3889,16 @@ declare namespace wifiManager { + * Wi-Fi IPv6 information. + * @typedef Ipv6Info + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface Ipv6Info { + /** + * The link IPv6 address of the Wi-Fi connection + * @type { string } + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + linkIpv6Address: string; + +@@ -3905,7 +3972,8 @@ declare namespace wifiManager { + * @typedef HotspotConfig + * @syscap SystemCapability.Communication.WiFi.AP.Core + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface HotspotConfig { + /** +@@ -3913,7 +3981,8 @@ declare namespace wifiManager { + * @type { string } + * @syscap SystemCapability.Communication.WiFi.AP.Core + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ssid: string; + +@@ -3922,7 +3991,8 @@ declare namespace wifiManager { + * @type { WifiSecurityType } + * @syscap SystemCapability.Communication.WiFi.AP.Core + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + securityType: WifiSecurityType; + +@@ -3931,7 +4001,8 @@ declare namespace wifiManager { + * @type { number } + * @syscap SystemCapability.Communication.WiFi.AP.Core + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + band: number; + +@@ -3949,7 +4020,8 @@ declare namespace wifiManager { + * @type { string } + * @syscap SystemCapability.Communication.WiFi.AP.Core + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + preSharedKey: string; + +@@ -3977,7 +4049,8 @@ declare namespace wifiManager { + * @typedef StationInfo + * @syscap SystemCapability.Communication.WiFi.AP.Core + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface StationInfo { + /** +@@ -3994,7 +4067,8 @@ declare namespace wifiManager { + * @type { string } + * @syscap SystemCapability.Communication.WiFi.AP.Core + * @systemapi Hide this for inner system use. +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + macAddress: string; + +@@ -4162,14 +4236,16 @@ declare namespace wifiManager { + * + * @enum { number } + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum ConnState { + /** + * The device is searching for an available AP. + * + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + SCANNING, + +@@ -4177,7 +4253,8 @@ declare namespace wifiManager { + * The Wi-Fi connection is being set up. + * + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CONNECTING, + +@@ -4185,7 +4262,8 @@ declare namespace wifiManager { + * The Wi-Fi connection is being authenticated. + * + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AUTHENTICATING, + +@@ -4193,7 +4271,8 @@ declare namespace wifiManager { + * The IP address of the Wi-Fi connection is being obtained. + * + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + OBTAINING_IPADDR, + +@@ -4201,7 +4280,8 @@ declare namespace wifiManager { + * The Wi-Fi connection has been set up. + * + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CONNECTED, + +@@ -4209,7 +4289,8 @@ declare namespace wifiManager { + * The Wi-Fi connection is being torn down. + * + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DISCONNECTING, + +@@ -4217,7 +4298,8 @@ declare namespace wifiManager { + * The Wi-Fi connection has been torn down. + * + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DISCONNECTED, + +@@ -4225,7 +4307,8 @@ declare namespace wifiManager { + * Failed to set up the Wi-Fi connection. + * + * @syscap SystemCapability.Communication.WiFi.STA +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + UNKNOWN + } +@@ -4235,14 +4318,16 @@ declare namespace wifiManager { + * + * @typedef WifiP2pDevice + * @syscap SystemCapability.Communication.WiFi.P2P +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface WifiP2pDevice { + /** + * Device name + * @type { string } + * @syscap SystemCapability.Communication.WiFi.P2P +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + deviceName: string; + +@@ -4250,7 +4335,8 @@ declare namespace wifiManager { + * Device mac address + * @type { string } + * @syscap SystemCapability.Communication.WiFi.P2P +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + deviceAddress: string; + +@@ -4258,7 +4344,8 @@ declare namespace wifiManager { + * Device mac address type + * @type { ?DeviceAddressType } + * @syscap SystemCapability.Communication.WiFi.P2P +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + deviceAddressType?: DeviceAddressType; + +@@ -4266,7 +4353,8 @@ declare namespace wifiManager { + * Primary device type + * @type { string } + * @syscap SystemCapability.Communication.WiFi.P2P +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + primaryDeviceType: string; + +@@ -4274,7 +4362,8 @@ declare namespace wifiManager { + * Device status + * @type { P2pDeviceStatus } + * @syscap SystemCapability.Communication.WiFi.P2P +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + deviceStatus: P2pDeviceStatus; + +@@ -4282,7 +4371,8 @@ declare namespace wifiManager { + * Device group capabilities + * @type { number } + * @syscap SystemCapability.Communication.WiFi.P2P +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + groupCapabilities: number; + } +@@ -4431,20 +4521,23 @@ declare namespace wifiManager { + * + * @enum { number } + * @syscap SystemCapability.Communication.WiFi.P2P +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum P2pConnectState { + /** + * p2p is disconnected + * @syscap SystemCapability.Communication.WiFi.P2P +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DISCONNECTED = 0, + + /** + * p2p is connected + * @syscap SystemCapability.Communication.WiFi.P2P +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CONNECTED = 1 + } +@@ -4454,14 +4547,16 @@ declare namespace wifiManager { + * + * @typedef WifiP2pLinkedInfo + * @syscap SystemCapability.Communication.WiFi.P2P +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + interface WifiP2pLinkedInfo { + /** + * Connection status + * @type { P2pConnectState } + * @syscap SystemCapability.Communication.WiFi.P2P +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + connectState: P2pConnectState; + +@@ -4469,7 +4564,8 @@ declare namespace wifiManager { + * Indicates whether it is group owner + * @type { boolean } + * @syscap SystemCapability.Communication.WiFi.P2P +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isGroupOwner: boolean; + +@@ -4477,7 +4573,8 @@ declare namespace wifiManager { + * Group owner address + * @type { string } + * @syscap SystemCapability.Communication.WiFi.P2P +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + groupOwnerAddr: string; + } +@@ -4487,41 +4584,47 @@ declare namespace wifiManager { + * + * @enum { number } + * @syscap SystemCapability.Communication.WiFi.P2P +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + enum P2pDeviceStatus { + /** + * Indicate p2p device is connected. + * @syscap SystemCapability.Communication.WiFi.P2P +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CONNECTED = 0, + + /** + * Indicate p2p device is invited. + * @syscap SystemCapability.Communication.WiFi.P2P +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + INVITED = 1, + + /** + * Indicate p2p device is failed. + * @syscap SystemCapability.Communication.WiFi.P2P +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FAILED = 2, + + /** + * Indicate p2p device is available. + * @syscap SystemCapability.Communication.WiFi.P2P +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + AVAILABLE = 3, + + /** + * Indicate p2p device is unavailable. + * @syscap SystemCapability.Communication.WiFi.P2P +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + UNAVAILABLE = 4 + } +diff --git a/api/@ohos.window.d.ts b/api/@ohos.window.d.ts +index 1710a7c23..41f83ca05 100644 +--- a/api/@ohos.window.d.ts ++++ b/api/@ohos.window.d.ts +@@ -33,7 +33,6 @@ import bundleManager from './@ohos.bundle.bundleManager'; + import { LocalStorage } from '@ohos.arkui.stateManagement'; + import { UIContext } from '@ohos.arkui.UIContext'; + import { ColorMetrics } from '@ohos.arkui.node'; +-import { Callback } from './@ohos.base'; + /*** endif */ + + /*** if arkts 1.1 */ +@@ -59,6 +58,18 @@ declare interface Callback { + } + /*** endif */ + ++/*** if arkts 1.2 */ ++/** ++ * Defines the window callback. ++ * ++ * @typedef {function} ++ * @syscap SystemCapability.Window.SessionManager ++ * @atomicservice ++ * @since 20 ++ */ ++type Callback = (data: T) => V; ++/*** endif */ ++ + /** + * Window manager. + * +@@ -1771,7 +1782,8 @@ declare namespace window { + * @type { ?colorMode } + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + colorMode?: ConfigurationConstant.ColorMode; + +@@ -1781,7 +1793,8 @@ declare namespace window { + * @type { ?number } + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + buttonBackgroundSize? : number; + +@@ -1791,7 +1804,8 @@ declare namespace window { + * @type { ?number } + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + spacingBetweenButtons? : number; + +@@ -1801,7 +1815,8 @@ declare namespace window { + * @type { ?number } + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + closeButtonRightMargin? : number; + } +@@ -6459,7 +6474,8 @@ declare namespace window { + * @throws { BusinessError } 1300004 - Unauthorized operation. + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'windowWillClose', callback: Callback>): void; + +@@ -6475,7 +6491,8 @@ declare namespace window { + * @throws { BusinessError } 1300004 - Unauthorized operation. + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'windowWillClose', callback?: Callback>): void; + +@@ -8314,7 +8331,8 @@ declare namespace window { + * @throws { BusinessError } 1300003 - This window manager service works abnormally. + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + minimize(callback: AsyncCallback): void; + +@@ -8337,7 +8355,8 @@ declare namespace window { + * @throws { BusinessError } 1300003 - This window manager service works abnormally. + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + minimize(): Promise; + +@@ -8746,7 +8765,8 @@ declare namespace window { + * @throws { BusinessError } 1300004 - Unauthorized operation. + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setDecorButtonStyle(dectorStyle: DecorButtonStyle): void; + +@@ -8834,7 +8854,8 @@ declare namespace window { + * @throws { BusinessError } 1300004 - Unauthorized operation. + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setWindowTitleButtonVisible(isMaximizeButtonVisible: boolean, isMinimizeButtonVisible: boolean, isCloseButtonVisible?: boolean): void; + +@@ -8873,7 +8894,8 @@ declare namespace window { + * @throws { BusinessError } 1300004 - Unauthorized operation. + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + startMoving(): Promise; + +@@ -8892,7 +8914,8 @@ declare namespace window { + * @throws { BusinessError } 1300004 - Unauthorized operation. + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + startMoving(offsetX: number, offsetY: number): Promise; + +@@ -8965,7 +8988,8 @@ declare namespace window { + * @throws { BusinessError } 1300002 - This window state is abnormal. + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(type: 'windowTitleButtonRectChange', callback: Callback): void; + +@@ -8992,41 +9016,11 @@ declare namespace window { + * @throws { BusinessError } 1300002 - This window state is abnormal. + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(type: 'windowTitleButtonRectChange', callback?: Callback): void; + +- /** +- * Register the callback of title buttons visible change. +- * +- * @param { 'windowTitleButtonVisibleChange' } type - The value is fixed at 'windowTitleButtonVisibleChange', indicating the title buttons visible change event. +- * @param { Callback } callback - Callback used to return the current title buttons visibility. +- * @throws { BusinessError } 401 - Parameter error. Possible cause: 1. Mandatory parameters are left unspecified; +- * 2. Incorrect parameter types; +- * 3. Parameter verification failed. +- * @throws { BusinessError } 801 - Capability not supported. Failed to call the API due to limited device capabilities. +- * @throws { BusinessError } 1300002 - This window state is abnormal. +- * @syscap SystemCapability.Window.SessionManager +- * @atomicservice +- * @since 18 +- */ +- on(type: 'windowTitleButtonVisibleChange', callback: Callback): void; +- +- /** +- * Unregister the callback of title buttons visible change. +- * +- * @param { 'windowTitleButtonVisibleChange' } type - The value is fixed at 'windowTitleButtonVisibleChange', indicating the title buttons visible change event. +- * @param { Callback } callback - Callback used to return the current title buttons visibility. +- * @throws { BusinessError } 401 - Parameter error. Possible cause: 1. Incorrect parameter types; +- * 2. Parameter verification failed. +- * @throws { BusinessError } 801 - Capability not supported. Failed to call the API due to limited device capabilities. +- * @throws { BusinessError } 1300002 - This window state is abnormal. +- * @syscap SystemCapability.Window.SessionManager +- * @atomicservice +- * @since 18 +- */ +- off(type: 'windowTitleButtonVisibleChange', callback?: Callback): void; +- + /** + * Set the window mask of window + * +@@ -9133,7 +9127,8 @@ declare namespace window { + * @throws { BusinessError } 1300002 - This window state is abnormal. + * @syscap SystemCapability.Window.SessionManager + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getWindowStatus(): WindowStatusType; + +@@ -10192,7 +10187,8 @@ declare namespace window { + * @syscap SystemCapability.Window.SessionManager + * @stagemodelonly + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(eventType: 'windowStageClose', callback: Callback): void; + +@@ -10209,7 +10205,8 @@ declare namespace window { + * @syscap SystemCapability.Window.SessionManager + * @stagemodelonly + * @atomicservice +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(eventType: 'windowStageClose', callback?: Callback): void; + +diff --git a/api/@ohos.zlib.d.ts b/api/@ohos.zlib.d.ts +index 9cffb4b8d..fbbf04617 100644 +--- a/api/@ohos.zlib.d.ts ++++ b/api/@ohos.zlib.d.ts +@@ -73,7 +73,7 @@ declare namespace zlib { + /** + * CompressLevel + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.Zlib + * @crossplatform + * @atomicservice +@@ -157,7 +157,7 @@ declare namespace zlib { + /** + * CompressStrategy + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.Zlib + * @crossplatform + * @atomicservice +@@ -250,7 +250,7 @@ declare namespace zlib { + /** + * ParallelStrategy + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.Zlib + * @crossplatform + * @atomicservice +@@ -287,7 +287,7 @@ declare namespace zlib { + /** + * MemLevel + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.Zlib + * @crossplatform + * @atomicservice +@@ -348,7 +348,7 @@ declare namespace zlib { + /** + * CompressFlushMode + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 +@@ -415,7 +415,7 @@ declare namespace zlib { + /** + * Return codes for the compression/decompression functions. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 +@@ -450,7 +450,7 @@ declare namespace zlib { + /** + * The deflate compression method (the only one supported in this version). + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 +@@ -469,7 +469,7 @@ declare namespace zlib { + /** + * Define the reference point for offset. + * +- * @enum { number } ++ * @enum { int } + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 +@@ -598,22 +598,22 @@ declare namespace zlib { + /** + * Number of bytes available at nextIn. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- availableIn?: number; ++ availableIn?: int; + + /** + * Total number of input bytes read so far. + * +- * @type { ?number } ++ * @type { ?long } + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- totalIn?: number; ++ totalIn?: long; + + /** + * Next output byte will go here. +@@ -628,42 +628,42 @@ declare namespace zlib { + /** + * Remaining free space at nextOut. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- availableOut?: number; ++ availableOut?: int; + + /** + * Total number of bytes output so far. + * +- * @type { ?number } ++ * @type { ?long } + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- totalOut?: number; ++ totalOut?: long; + + /** + * Best guess about the data type. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- dataType?: number; ++ dataType?: int; + + /** + * Adler-32 or CRC-32 value of the uncompressed data. + * +- * @type { ?number } ++ * @type { ?long } + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- adler?: number; ++ adler?: long; + } + + /** +@@ -688,32 +688,32 @@ declare namespace zlib { + /** + * Operating system. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- os?: number; ++ os?: int; + + /** + * Modification time. + * +- * @type { ?number } ++ * @type { ?long } + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- time?: number; ++ time?: long; + + /** + * Extra flags. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- xflags?: number; ++ xflags?: int; + + /** + * Extra field. +@@ -728,12 +728,12 @@ declare namespace zlib { + /** + * Extra field length. + * +- * @type { ?number } ++ * @type { ?int } + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- extraLen?: number; ++ extraLen?: int; + + /** + * Zero-terminated file name. +@@ -798,12 +798,12 @@ declare namespace zlib { + /** + * Total sizeof the destination buffer. + * +- * @type { number } ++ * @type { long } + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- destLen: number ++ destLen: long + } + + /** +@@ -828,12 +828,12 @@ declare namespace zlib { + /** + * Return dictionary length. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- dictionaryLength: number ++ dictionaryLength: int + } + + /** +@@ -858,22 +858,22 @@ declare namespace zlib { + /** + * Total sizeof the destination buffer. + * +- * @type { number } ++ * @type { long } + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- destLength: number ++ destLength: long + + /** + * Total sizeof the sourceLen. + * +- * @type { number } ++ * @type { long } + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- sourceLength: number ++ sourceLength: long + } + + /** +@@ -898,22 +898,22 @@ declare namespace zlib { + /** + * The number of bytes of output that have been generated. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- pending: number ++ pending: int + + /** + * The number of bits of output that have been generated. + * +- * @type { number } ++ * @type { int } + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- bits: number ++ bits: int + } + + /** +@@ -967,13 +967,13 @@ declare namespace zlib { + * @typedef { function } + * @param { object } outDesc - Object passed to output function. Object dependency requirement implementation. + * @param { ArrayBuffer } buf - Used to store data to be written. +- * @param { number } length - Write the length of the output buffer. +- * @returns { number } Return the number of bytes output. ++ * @param { int } length - Write the length of the output buffer. ++ * @returns { int } Return the number of bytes output. + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- type InflateBackOutputCallback = (outDesc: object, buf: ArrayBuffer, length: number) => number; ++ type InflateBackOutputCallback = (outDesc: object, buf: ArrayBuffer, length: int) => int; + + /** + * Compress the specified file. +@@ -1209,7 +1209,7 @@ declare namespace zlib { + * Get the original size of the compressed zip file, the size is the meta data stored in zip file. + * + * @param { string } compressedFile - Indicates the path of the compressed file. +- * @returns { Promise } Returns the original size of the compressed file. ++ * @returns { Promise } Returns the original size of the compressed file. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. + * @throws { BusinessError } 900001 - The input source file is invalid. + * @throws { BusinessError } 900003 - The input source file is not in ZIP format or is damaged. +@@ -1219,7 +1219,7 @@ declare namespace zlib { + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- function getOriginalSize(compressedFile: string): Promise; ++ function getOriginalSize(compressedFile: string): Promise; + + /** + * Asynchronous creation of verification objects. +@@ -1296,9 +1296,9 @@ declare namespace zlib { + /** + * Update a running Adler-32 checksum with the bytes buf. + * +- * @param { number } adler - Initial value of Adler32 checksum. ++ * @param { long } adler - Initial value of Adler32 checksum. + * @param { ArrayBuffer } buf - Calculate checksum data buffer. +- * @returns { Promise } Return the updated checksum. ++ * @returns { Promise } Return the updated checksum. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.BundleManager.Zlib +@@ -1306,15 +1306,15 @@ declare namespace zlib { + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- adler32(adler: number, buf: ArrayBuffer): Promise; ++ adler32(adler: long, buf: ArrayBuffer): Promise; + + /** + * Combine two Adler-32 checksum into one. + * +- * @param { number } adler1 - The first Adler32 checksum. +- * @param { number } adler2 - The second Adler32 checksum. +- * @param { number } len2 - The length of the data block associated with the second Adler32 checksum. +- * @returns { Promise } Returns the Adler-32 checksum. ++ * @param { long } adler1 - The first Adler32 checksum. ++ * @param { long } adler2 - The second Adler32 checksum. ++ * @param { long } len2 - The length of the data block associated with the second Adler32 checksum. ++ * @returns { Promise } Returns the Adler-32 checksum. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.BundleManager.Zlib +@@ -1322,14 +1322,14 @@ declare namespace zlib { + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- adler32Combine(adler1: number, adler2: number, len2: number): Promise; ++ adler32Combine(adler1: long, adler2: long, len2: long): Promise; + + /** + * Update a running CRC-32 with the bytes buf. + * +- * @param { number } crc - Initial value of CRC-32 checksum. ++ * @param { long } crc - Initial value of CRC-32 checksum. + * @param { ArrayBuffer } buf - Calculate checksum data buffer. +- * @returns { Promise } Return the updated CRC-32. ++ * @returns { Promise } Return the updated CRC-32. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.BundleManager.Zlib +@@ -1337,15 +1337,15 @@ declare namespace zlib { + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- crc32(crc: number, buf: ArrayBuffer): Promise; ++ crc32(crc: long, buf: ArrayBuffer): Promise; + + /** + * Combine two CRC-32 check values into one. + * +- * @param { number } crc1 - The first CRC-32 checksum. +- * @param { number } crc2 - The second CRC-32 checksum. +- * @param { number } len2 - The length of the data block associated with the second CRC-32 checksum. +- * @returns { Promise } Returns the CRC-32 check value. ++ * @param { long } crc1 - The first CRC-32 checksum. ++ * @param { long } crc2 - The second CRC-32 checksum. ++ * @param { long } len2 - The length of the data block associated with the second CRC-32 checksum. ++ * @returns { Promise } Returns the CRC-32 check value. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.BundleManager.Zlib +@@ -1353,42 +1353,42 @@ declare namespace zlib { + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- crc32Combine(crc1: number, crc2: number, len2: number): Promise; ++ crc32Combine(crc1: long, crc2: long, len2: long): Promise; + + /** + * Update a running CRC-64 with the bytes buf. + * +- * @param { number } crc - Initial value of CRC-64 checksum. ++ * @param { long } crc - Initial value of CRC-64 checksum. + * @param { ArrayBuffer } buf - Calculate checksum data buffer. +- * @returns { Promise } Return the updated CRC-64. ++ * @returns { Promise } Return the updated CRC-64. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- crc64(crc: number, buf: ArrayBuffer): Promise; ++ crc64(crc: long, buf: ArrayBuffer): Promise; + + /** + * Get CRC-32 table. + * +- * @returns { Promise> } Return a array to the CRC-32 table. ++ * @returns { Promise> } Return a array to the CRC-32 table. + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- getCrcTable(): Promise>; ++ getCrcTable(): Promise>; + + /** + * Get CRC-64 table. + * +- * @returns { Promise> } Return a array to the CRC-64 table. ++ * @returns { Promise> } Return a array to the CRC-64 table. + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- getCrc64Table(): Promise>; ++ getCrc64Table(): Promise>; + } + + /** +@@ -1423,7 +1423,7 @@ declare namespace zlib { + /** + * Return flags indicating compile-time options. + * +- * @returns { Promise } Return flags indicating compile-time options. ++ * @returns { Promise } Return flags indicating compile-time options. + * Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: + * 1.0: size of uInt. + * 3.2: size of uLong. +@@ -1456,14 +1456,14 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- zlibCompileFlags(): Promise; ++ zlibCompileFlags(): Promise; + + /** + * Compresses the source buffer into the destination buffer. + * + * @param { ArrayBuffer } dest - Destination buffer. + * @param { ArrayBuffer } source - Source data buffer. +- * @param { number } sourceLen - Source data length. ++ * @param { long } sourceLen - Source data length. + * @returns { Promise } Return ReturnStatus and total sizeof the destination buffer. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. +@@ -1472,7 +1472,7 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- compress(dest: ArrayBuffer, source: ArrayBuffer, sourceLen?: number): Promise; ++ compress(dest: ArrayBuffer, source: ArrayBuffer, sourceLen?: long): Promise; + + /** + * Compresses the source buffer into the destination buffer. +@@ -1480,7 +1480,7 @@ declare namespace zlib { + * @param { ArrayBuffer } dest - Destination buffer. + * @param { ArrayBuffer } source - Source data buffer. + * @param { CompressLevel } level - Compression level. +- * @param { number } sourceLen - Source data length. ++ * @param { long } sourceLen - Source data length. + * @returns { Promise } Return ReturnStatus and total sizeof the destination buffer. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. +@@ -1490,27 +1490,27 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- compress2(dest: ArrayBuffer, source: ArrayBuffer, level: CompressLevel, sourceLen?: number,): Promise; ++ compress2(dest: ArrayBuffer, source: ArrayBuffer, level: CompressLevel, sourceLen?: long,): Promise; + + /** + * Calculate the upper limit of the return compression size. + * +- * @param { number } sourceLen - The length of the source data. +- * @returns { Promise } Returns an upper bound on the compressed size after. ++ * @param { int } sourceLen - The length of the source data. ++ * @returns { Promise } Returns an upper bound on the compressed size after. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- compressBound(sourceLen: number): Promise; ++ compressBound(sourceLen: int): Promise; + + /** + * Decompress the compressed data into its original uncompressed form. + * + * @param { ArrayBuffer } dest - Destination buffer. + * @param { ArrayBuffer } source - Source data buffer. +- * @param { number } sourceLen - Source data length. ++ * @param { long } sourceLen - Source data length. + * @returns { Promise } Return ReturnStatus and total sizeof the destination buffer. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. +@@ -1520,14 +1520,14 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- uncompress(dest:ArrayBuffer, source: ArrayBuffer, sourceLen?: number): Promise; ++ uncompress(dest:ArrayBuffer, source: ArrayBuffer, sourceLen?: long): Promise; + + /** + * Decompress the compressed data into its original uncompressed form. + * + * @param { ArrayBuffer } dest - Destination buffer. + * @param { ArrayBuffer } source - Source data buffer. +- * @param { number } sourceLen - Source data length. ++ * @param { long } sourceLen - Source data length. + * @returns { Promise } Return ReturnStatus and total sizeof the destination buffer and total sizeof the sourceLen. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. +@@ -1537,13 +1537,13 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- uncompress2(dest: ArrayBuffer, source: ArrayBuffer, sourceLen?: number): Promise; ++ uncompress2(dest: ArrayBuffer, source: ArrayBuffer, sourceLen?: long): Promise; + + /** + * Verify the checksum inside the structure of compressed stream z_stream. + * + * @param { ZStream } strm - Object to structure z_stream. +- * @param { number } check - Expected checksum. ++ * @param { int } check - Expected checksum. + * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. +@@ -1552,7 +1552,7 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- inflateValidate(strm: ZStream, check: number): Promise; ++ inflateValidate(strm: ZStream, check: int): Promise; + + /** + * Find a synchronization point for the current decompressed stream. +@@ -1618,7 +1618,7 @@ declare namespace zlib { + * This function is equivalent to inflateEnd followed by inflateInit, but does not free and reallocate the internal decompression state. + * + * @param { ZStream } strm - Object to structure z_stream. +- * @param { number } windowBits - Parameter is interpreted the same as it is for inflateInit2. ++ * @param { int } windowBits - Parameter is interpreted the same as it is for inflateInit2. + * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. +@@ -1627,7 +1627,7 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- inflateReset2(strm: ZStream, windowBits: number): Promise; ++ inflateReset2(strm: ZStream, windowBits: int): Promise; + + /** + * This function is equivalent to inflateEnd followed by inflateInit, but does not free and reallocate the internal decompression state. +@@ -1647,8 +1647,8 @@ declare namespace zlib { + * This function inserts bits in the inflate input stream. + * + * @param { ZStream } strm - Object to structure z_stream. +- * @param { number } bits - The provided bits. +- * @param { number } value - The provided value. ++ * @param { int } bits - The provided bits. ++ * @param { int } value - The provided value. + * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. +@@ -1657,26 +1657,26 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- inflatePrime(strm: ZStream, bits: number, value: number): Promise; ++ inflatePrime(strm: ZStream, bits: int, value: int): Promise; + + /** + * Is used to mark locations in the input data for random access. + * + * @param { ZStream } strm - Object to structure z_stream. +- * @returns { Promise } Return the internal marker position of the current decompressed stream. ++ * @returns { Promise } Return the internal marker position of the current decompressed stream. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- inflateMark(strm: ZStream): Promise; ++ inflateMark(strm: ZStream): Promise; + + /** + * Initializes the internal stream state for decompression. + * + * @param { ZStream } strm - Object to structure z_stream. +- * @param { number } windowBits - Is the base two logarithm of the maximum window size. ++ * @param { int } windowBits - Is the base two logarithm of the maximum window size. + * It should be in the range 8..15 for this version of the library. The default value is 15 if inflateInit is used instead. + * windowBits must be greater than or equal to the windowBits value provided to deflateInit2() while compressing, + * or it must be equal to 15 if deflateInit2() was not used. If a compressed stream with a larger window size is given as input, +@@ -1702,7 +1702,7 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- inflateInit2(strm: ZStream, windowBits: number): Promise; ++ inflateInit2(strm: ZStream, windowBits: int): Promise; + + /** + * Initializes the internal stream state for decompression. +@@ -1779,20 +1779,20 @@ declare namespace zlib { + * Obtain the number of Huffman encoding trees that have been used in the current decompression stream during the inflate process. + * + * @param { ZStream } strm - Object to structure z_stream. +- * @returns { Promise } Return the number of used Huffman encoding trees. ++ * @returns { Promise } Return the number of used Huffman encoding trees. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- inflateCodesUsed(strm: ZStream): Promise; ++ inflateCodesUsed(strm: ZStream): Promise; + + /** + * Initialize the internal stream state for decompression using inflateBack() calls. + * + * @param { ZStream } strm - Object to structure z_stream. +- * @param { number } windowBits - Parameter is interpreted the same as it is for inflateInit2. The value range is between 8~15. ++ * @param { long } windowBits - Parameter is interpreted the same as it is for inflateInit2. The value range is between 8~15. + * @param { ArrayBuffer } window - The preset sliding window buffer. + * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; +@@ -1802,7 +1802,7 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- inflateBackInit(strm: ZStream, windowBits: number, window: ArrayBuffer): Promise; ++ inflateBackInit(strm: ZStream, windowBits: long, window: ArrayBuffer): Promise; + + /** + * All memory allocated by inflateBackInit() is freed. +@@ -1873,7 +1873,7 @@ declare namespace zlib { + * @param { ZStream } strm - Object to structure z_stream. + * @param { CompressLevel } level - Compression level. + * @param { CompressMethod } method - The compression method. +- * @param { number } windowBits - Parameter is interpreted the same as it is for inflateInit2. ++ * @param { int } windowBits - Parameter is interpreted the same as it is for inflateInit2. + * @param { MemLevel } memLevel - The memory usage level. + * @param { CompressStrategy } strategy - The compression strategy. + * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. +@@ -1884,7 +1884,7 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- deflateInit2(strm: ZStream, level: CompressLevel, method: CompressMethod, windowBits: number, ++ deflateInit2(strm: ZStream, level: CompressLevel, method: CompressMethod, windowBits: int, + memLevel: MemLevel, strategy: CompressStrategy): Promise; + + /** +@@ -1921,15 +1921,15 @@ declare namespace zlib { + * Calculate an upper bound on the compressed size. + * + * @param { ZStream } strm - Object to structure z_stream. +- * @param { number } sourceLength - The length of uncompressed data. +- * @returns { Promise } Return an upper bound on the compressed size. ++ * @param { long } sourceLength - The length of uncompressed data. ++ * @returns { Promise } Return an upper bound on the compressed size. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- deflateBound(strm: ZStream, sourceLength: number): Promise; ++ deflateBound(strm: ZStream, sourceLength: long): Promise; + + /** + * Provides gzip header information for when a gzip stream is requested by deflateInit2(). +@@ -1994,10 +1994,10 @@ declare namespace zlib { + * Fine tune deflate's internal compression parameters. + * + * @param { ZStream } strm - Object to structure z_stream. +- * @param { number } goodLength - Good matching length threshold. +- * @param { number } maxLazy - Maximum lazy matching times. +- * @param { number } niceLength - Good Lazy Length Threshold. +- * @param { number } maxChain - Maximum chain length. ++ * @param { int } goodLength - Good matching length threshold. ++ * @param { int } maxLazy - Maximum lazy matching times. ++ * @param { int } niceLength - Good Lazy Length Threshold. ++ * @param { int } maxChain - Maximum chain length. + * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. +@@ -2006,7 +2006,7 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- deflateTune(strm: ZStream, goodLength: number, maxLazy: number, niceLength: number, maxChain: number): Promise; ++ deflateTune(strm: ZStream, goodLength: int, maxLazy: int, niceLength: int, maxChain: int): Promise; + + /** + * This function is equivalent to deflateEnd followed by deflateInit, but does not free and reallocate the internal compression state. +@@ -2070,8 +2070,8 @@ declare namespace zlib { + * Inserts bits in the deflate output stream. + * + * @param { ZStream } strm - Object to structure z_stream. +- * @param { number } bits - The number of bits to be inserted. The value range is between 0~16. +- * @param { number } value - The bit value corresponding to the number of bits. ++ * @param { int } bits - The number of bits to be inserted. The value range is between 0~16. ++ * @param { int } value - The bit value corresponding to the number of bits. + * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. +@@ -2080,7 +2080,7 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- deflatePrime(strm: ZStream, bits: number, value: number): Promise; ++ deflatePrime(strm: ZStream, bits: int, value: int): Promise; + } + + /** +@@ -2096,7 +2096,7 @@ declare namespace zlib { + /** + * Associate a gzFile with the file descriptor fd. + * +- * @param { number } fd - The file descriptor. Usually this is obtained through system calls to 'open' or other methods. ++ * @param { int } fd - The file descriptor. Usually this is obtained through system calls to 'open' or other methods. + * @param { string } mode - Used to specify access mode. + * @returns { Promise } + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; +@@ -2106,13 +2106,13 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- gzdopen(fd: number, mode: string): Promise; ++ gzdopen(fd: int, mode: string): Promise; + + /** + * Set the internal buffer size used by this library's functions for file to size. + * +- * @param { number } size - The internal buffer size to be set. +- * @returns { Promise } Returns 0 on success. ++ * @param { long } size - The internal buffer size to be set. ++ * @returns { Promise } Returns 0 on success. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17800009 - Internal structure error. +@@ -2120,7 +2120,7 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- gzbuffer(size: number): Promise; ++ gzbuffer(size: long): Promise; + + /** + * Open the gzip (.gz) file at path for reading and decompressing, or compressing and writing. +@@ -2140,22 +2140,22 @@ declare namespace zlib { + /** + * Check if the reading position of the gzip compressed file has reached the end of the file. + * +- * @returns { Promise } Return 1 (true) if the end-of-file indicator for file has been set while reading. ++ * @returns { Promise } Return 1 (true) if the end-of-file indicator for file has been set while reading. + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- gzeof(): Promise; ++ gzeof(): Promise; + + /** + * Check if the specified gzip file handle file directly accesses the original uncompressed data. + * +- * @returns { Promise } returns 1 (true) if transparent writing was requested. ++ * @returns { Promise } returns 1 (true) if transparent writing was requested. + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- gzdirect(): Promise; ++ gzdirect(): Promise; + + /** + * Flush all pending output for file, if necessary, close file and deallocate the (de)compression state. +@@ -2193,13 +2193,13 @@ declare namespace zlib { + /** + * Read and decompress one byte from file. + * +- * @returns { Promise } Return the ASCII code of a character. ++ * @returns { Promise } Return the ASCII code of a character. + * @throws { BusinessError } 17800009 - Internal structure error. + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- gzgetc(): Promise; ++ gzgetc(): Promise; + + /** + * Flush all pending output to file. +@@ -2219,9 +2219,9 @@ declare namespace zlib { + * Compress and write nitems items of size size from buf to file. + * + * @param { ArrayBuffer } buf - The buffer to write data to. +- * @param { number } size - The number of bytes in a single data block. +- * @param { number } nitems - Number of data blocks to be written. +- * @returns { Promise } Return the number of full items written of size size. ++ * @param { long } size - The number of bytes in a single data block. ++ * @param { long } nitems - Number of data blocks to be written. ++ * @returns { Promise } Return the number of full items written of size size. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17800009 - Internal structure error. +@@ -2229,15 +2229,15 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- gzfwrite(buf: ArrayBuffer, size: number, nitems: number): Promise; ++ gzfwrite(buf: ArrayBuffer, size: long, nitems: long): Promise; + + /** + * Read and decompress data from gzip compressed files. + * + * @param { ArrayBuffer } buf - Target buffer for storing read results. +- * @param { number } size - The number of bytes in a single data block. +- * @param { number } nitems - Number of data blocks to be read. +- * @returns { Promise } Return the number of full items read of size size. ++ * @param { long } size - The number of bytes in a single data block. ++ * @param { long } nitems - Number of data blocks to be read. ++ * @returns { Promise } Return the number of full items read of size size. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17800009 - Internal structure error. +@@ -2245,7 +2245,7 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- gzfread(buf: ArrayBuffer, size: number, nitems: number): Promise; ++ gzfread(buf: ArrayBuffer, size: long, nitems: long): Promise; + + /** + * Same as gzclose(), gzclosew() only for use when writing or appending. +@@ -2274,8 +2274,8 @@ declare namespace zlib { + * Compress and write the len uncompressed bytes at buf to file. + * + * @param { ArrayBuffer } buf - Object to the data buffer to be written. +- * @param { number } len - The len uncompressed bytes. +- * @returns { Promise } Return the number of uncompressed bytes written. ++ * @param { long } len - The len uncompressed bytes. ++ * @returns { Promise } Return the number of uncompressed bytes written. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17800009 - Internal structure error. +@@ -2283,13 +2283,13 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- gzwrite(buf: ArrayBuffer, len: number): Promise; ++ gzwrite(buf: ArrayBuffer, len: long): Promise; + + /** + * Push c back onto the stream for file to be read as the first character on the next read. + * +- * @param { number } c - To fall back to the character before the input stream. +- * @returns { Promise } Return the character pushed. ++ * @param { int } c - To fall back to the character before the input stream. ++ * @returns { Promise } Return the character pushed. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17800009 - Internal structure error. +@@ -2297,18 +2297,18 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- gzungetc(c: number): Promise; ++ gzungetc(c: int): Promise; + + /** + * Return the starting position for the next gzread or gzwrite on file. + * +- * @returns { Promise } Return the starting position for the next gzread or gzwrite on file. ++ * @returns { Promise } Return the starting position for the next gzread or gzwrite on file. + * @throws { BusinessError } 17800009 - Internal structure error. + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- gztell(): Promise; ++ gztell(): Promise; + + /** + * Dynamically update the compression level and strategy for file. +@@ -2328,9 +2328,9 @@ declare namespace zlib { + /** + * Set the starting position to offset relative to whence for the next gzread or gzwrite on file. + * +- * @param { number } offset - Specify the new offset to move to. ++ * @param { long } offset - Specify the new offset to move to. + * @param { OffsetReferencePoint } whence - Define the reference point for offset. +- * @returns { Promise } Return the resulting offset location as measured in bytes from the beginning of the uncompressed stream. ++ * @returns { Promise } Return the resulting offset location as measured in bytes from the beginning of the uncompressed stream. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17800009 - Internal structure error. +@@ -2338,7 +2338,7 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- gzseek(offset: number, whence: OffsetReferencePoint): Promise; ++ gzseek(offset: long, whence: OffsetReferencePoint): Promise; + + /** + * Rewind file. This function is supported only for reading. +@@ -2355,7 +2355,7 @@ declare namespace zlib { + * Read and decompress up to len uncompressed bytes from file into buf. + * + * @param { ArrayBuffer } buf - User provided buffer address. +- * @returns { Promise } Return the number of uncompressed bytes actually read, less than len for end of file. ++ * @returns { Promise } Return the number of uncompressed bytes actually read, less than len for end of file. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17800009 - Internal structure error. +@@ -2363,13 +2363,13 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- gzread(buf: ArrayBuffer): Promise; ++ gzread(buf: ArrayBuffer): Promise; + + /** + * Compress and write the given null-terminated string s to file, excluding the terminating null character. + * + * @param { string } str - Format descriptors and plain text. +- * @returns { Promise } Return the number of characters written. ++ * @returns { Promise } Return the number of characters written. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17800009 - Internal structure error. +@@ -2377,13 +2377,13 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- gzputs(str: string): Promise; ++ gzputs(str: string): Promise; + + /** + * Compress and write c, converted to an unsigned char, into file. + * +- * @param { number } char - Write ASCII values for characters. +- * @returns { Promise } Return the value that was written. ++ * @param { int } ch - Write ASCII values for characters. ++ * @returns { Promise } Return the value that was written. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17800009 - Internal structure error. +@@ -2391,14 +2391,14 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- gzputc(char: number): Promise; ++ gzputc(ch: int): Promise; + + /** + * Convert, format, compress, and write the arguments to file under control of the string format, as in fprintf. + * + * @param { string } format - Format descriptors and plain text. + * @param { Array } args - Variable argument lists. +- * @returns { Promise } Return the number of uncompressed bytes actually written. ++ * @returns { Promise } Return the number of uncompressed bytes actually written. + * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; + * 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 17800004 - ZStream error. +@@ -2407,18 +2407,18 @@ declare namespace zlib { + * @atomicservice + * @since 12 + */ +- gzprintf(format: string, ...args: Array): Promise; ++ gzprintf(format: string, ...args: Array): Promise; + + /** + * Return the current compressed (actual) read or write offset of file. + * +- * @returns { Promise } Return the current compressed (actual) read or write offset of file. ++ * @returns { Promise } Return the current compressed (actual) read or write offset of file. + * @throws { BusinessError } 17800009 - Internal structure error. + * @syscap SystemCapability.BundleManager.Zlib + * @atomicservice + * @since 12 + */ +- gzoffset(): Promise; ++ gzoffset(): Promise; + + /** + * Read and decompress bytes from file into buf, until len-1 characters are read, or until a newline character is read and transferred to buf, +diff --git a/api/@system.notification.d.ts b/api/@system.notification.d.ts +index 1a7bc665c..0f4704a85 100644 +--- a/api/@system.notification.d.ts ++++ b/api/@system.notification.d.ts +@@ -21,8 +21,8 @@ + /** + * @typedef ActionResult + * @syscap SystemCapability.Notification.Notification +- * @since arkts {'1.1':'3', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 3 ++ * @deprecated since 7 + */ + export interface ActionResult { + /** +@@ -30,8 +30,8 @@ export interface ActionResult { + * + * @type { string } + * @syscap SystemCapability.Notification.Notification +- * @since arkts {'1.1':'3', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 3 ++ * @deprecated since 7 + */ + bundleName: string; + +@@ -40,8 +40,8 @@ export interface ActionResult { + * + * @type { string } + * @syscap SystemCapability.Notification.Notification +- * @since arkts {'1.1':'3', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 3 ++ * @deprecated since 7 + */ + abilityName: string; + +@@ -54,8 +54,8 @@ export interface ActionResult { + * + * @type { string } + * @syscap SystemCapability.Notification.Notification +- * @since arkts {'1.1':'3', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 3 ++ * @deprecated since 7 + */ + uri: string; + } +@@ -63,8 +63,8 @@ export interface ActionResult { + /** + * @typedef ShowNotificationOptions + * @syscap SystemCapability.Notification.Notification +- * @since arkts {'1.1':'3', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 3 ++ * @deprecated since 7 + */ + export interface ShowNotificationOptions { + /** +@@ -72,8 +72,8 @@ export interface ShowNotificationOptions { + * + * @type { ?string } + * @syscap SystemCapability.Notification.Notification +- * @since arkts {'1.1':'3', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 3 ++ * @deprecated since 7 + */ + contentTitle?: string; + +@@ -82,8 +82,8 @@ export interface ShowNotificationOptions { + * + * @type { ?string } + * @syscap SystemCapability.Notification.Notification +- * @since arkts {'1.1':'3', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 3 ++ * @deprecated since 7 + */ + contentText?: string; + +@@ -92,16 +92,19 @@ export interface ShowNotificationOptions { + * + * @type { ?ActionResult } + * @syscap SystemCapability.Notification.Notification +- * @since arkts {'1.1':'3', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 3 ++ * @deprecated since 7 + */ + clickAction?: ActionResult; + } + + /** ++ * Manages notifications. ++ * + * @syscap SystemCapability.Notification.Notification +- * @since arkts {'1.1':'3', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 3 ++ * @deprecated since 7 ++ * @useinstead ohos.notification/notification + */ + declare class Notification { + /** +@@ -110,6 +113,7 @@ declare class Notification { + * @param { ShowNotificationOptions } [options] - Options. + * @syscap SystemCapability.Notification.Notification + * @since 3 ++ * @deprecated since 7 + */ + static show(options?: ShowNotificationOptions): void; + } +diff --git a/api/@system.prompt.d.ts b/api/@system.prompt.d.ts +index 1fd665e50..fd5d186c3 100644 +--- a/api/@system.prompt.d.ts ++++ b/api/@system.prompt.d.ts +@@ -503,7 +503,7 @@ export interface ShowActionMenuOptions { + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 + */ +-export default class Prompt { ++declare class Prompt { + /** + * Displays the notification text. + * +@@ -517,8 +517,7 @@ export default class Prompt { + * @param { ShowToastOptions } options - Options. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice +- * @since arkts {'1.1':'11','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + static showToast(options: ShowToastOptions): void; + +@@ -558,3 +557,5 @@ export default class Prompt { + */ + static showActionMenu(options: ShowActionMenuOptions): void; + } ++ ++export default Prompt; +\ No newline at end of file +diff --git a/api/ability/connectOptions.d.ts b/api/ability/connectOptions.d.ts +index de9b99940..f3235571e 100644 +--- a/api/ability/connectOptions.d.ts ++++ b/api/ability/connectOptions.d.ts +@@ -45,7 +45,8 @@ export interface ConnectOptions { + * @param { ElementName } elementName - The ohos.bundleManager.ElementName object of the service ability + * @param { rpc.IRemoteObject } remote - The remote object instance + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onConnect(elementName: ElementName, remote: rpc.IRemoteObject): void; + +@@ -61,7 +62,8 @@ export interface ConnectOptions { + * + * @param { ElementName } elementName - The ohos.bundleManager.ElementName object of the service ability + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onDisconnect(elementName: ElementName): void; + +@@ -70,7 +72,8 @@ export interface ConnectOptions { + * + * @param { number } code - The error code of the failed. + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onFailed(code: number): void; + } +diff --git a/api/application/AbilityDelegator.d.ts b/api/application/AbilityDelegator.d.ts +index aab8f7b34..532b10238 100644 +--- a/api/application/AbilityDelegator.d.ts ++++ b/api/application/AbilityDelegator.d.ts +@@ -18,10 +18,8 @@ + * @kit AbilityKit + */ + +-/*** if arkts 1.1 */ + import AbilityStage from '../@ohos.app.ability.AbilityStage'; + import { AbilityStageMonitor } from './AbilityStageMonitor'; +-/*** endif */ + import { AsyncCallback } from '../@ohos.base'; + import UIAbility from '../@ohos.app.ability.UIAbility'; + import { AbilityMonitor } from './AbilityMonitor'; +@@ -146,7 +144,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + addAbilityMonitorSync(monitor: AbilityMonitor): void; + +@@ -181,7 +180,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + addAbilityStageMonitor(monitor: AbilityStageMonitor, callback: AsyncCallback): void; + +@@ -216,7 +216,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + addAbilityStageMonitor(monitor: AbilityStageMonitor): Promise; + +@@ -239,7 +240,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + addAbilityStageMonitorSync(monitor: AbilityStageMonitor): void; + +@@ -274,7 +276,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + removeAbilityMonitor(monitor: AbilityMonitor, callback: AsyncCallback): void; + +@@ -309,7 +312,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + removeAbilityMonitor(monitor: AbilityMonitor): Promise; + +@@ -332,7 +336,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + removeAbilityMonitorSync(monitor: AbilityMonitor): void; + +@@ -367,7 +372,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + removeAbilityStageMonitor(monitor: AbilityStageMonitor, callback: AsyncCallback): void; + +@@ -402,7 +408,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + removeAbilityStageMonitor(monitor: AbilityStageMonitor): Promise; + +@@ -425,7 +432,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + removeAbilityStageMonitorSync(monitor: AbilityStageMonitor): void; + +@@ -460,7 +468,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + waitAbilityMonitor(monitor: AbilityMonitor, callback: AsyncCallback): void; + +@@ -498,7 +507,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + waitAbilityMonitor(monitor: AbilityMonitor, timeout: number, callback: AsyncCallback): void; + +@@ -536,7 +546,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + waitAbilityMonitor(monitor: AbilityMonitor, timeout?: number): Promise; + +@@ -571,7 +582,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + waitAbilityStageMonitor(monitor: AbilityStageMonitor, callback: AsyncCallback): void; + +@@ -609,7 +621,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + waitAbilityStageMonitor(monitor: AbilityStageMonitor, timeout: number, callback: AsyncCallback): void; + +@@ -647,7 +660,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + waitAbilityStageMonitor(monitor: AbilityStageMonitor, timeout?: number): Promise; + +@@ -706,7 +720,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getAbilityState(ability: UIAbility): number; + +@@ -956,7 +971,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + doAbilityForeground(ability: UIAbility, callback: AsyncCallback): void; + +@@ -991,7 +1007,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + doAbilityForeground(ability: UIAbility): Promise; + +@@ -1026,7 +1043,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + doAbilityBackground(ability: UIAbility, callback: AsyncCallback): void; + +@@ -1061,7 +1079,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + doAbilityBackground(ability: UIAbility): Promise; + +@@ -1093,7 +1112,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + print(msg: string, callback: AsyncCallback): void; + +@@ -1125,7 +1145,8 @@ export interface AbilityDelegator { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + print(msg: string): Promise; + +diff --git a/api/application/AbilityRunningInfo.d.ts b/api/application/AbilityRunningInfo.d.ts +index d19e8366d..26f2e1656 100644 +--- a/api/application/AbilityRunningInfo.d.ts ++++ b/api/application/AbilityRunningInfo.d.ts +@@ -26,7 +26,8 @@ import abilityManager from '../@ohos.app.ability.abilityManager'; + * + * @typedef AbilityRunningInfo + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface AbilityRunningInfo { + /** +@@ -43,7 +44,8 @@ export interface AbilityRunningInfo { + * @type { ElementName } + * @default the ohos.bundleManager.ElementName object of the ability. + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ability: ElementName; + +@@ -53,7 +55,8 @@ export interface AbilityRunningInfo { + * @type { number } + * @default process id + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + pid: number; + +@@ -63,7 +66,8 @@ export interface AbilityRunningInfo { + * @type { number } + * @default user id + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + uid: number; + +@@ -73,7 +77,8 @@ export interface AbilityRunningInfo { + * @type { string } + * @default the name of the process + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + processName: string; + +@@ -83,7 +88,8 @@ export interface AbilityRunningInfo { + * @type { number } + * @default ability start time + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + startTime: number; + +@@ -93,7 +99,8 @@ export interface AbilityRunningInfo { + * @type { abilityManager.AbilityState } + * @default Enumerates state of the ability state info + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + abilityState: abilityManager.AbilityState; + } +diff --git a/api/application/AbilityStageMonitor.d.ts b/api/application/AbilityStageMonitor.d.ts +index a74f23dd1..3ae864014 100644 +--- a/api/application/AbilityStageMonitor.d.ts ++++ b/api/application/AbilityStageMonitor.d.ts +@@ -43,7 +43,8 @@ + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface AbilityStageMonitor { + /** +@@ -68,7 +69,8 @@ export interface AbilityStageMonitor { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + moduleName: string; + +@@ -94,9 +96,12 @@ export interface AbilityStageMonitor { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + srcEntrance: string; + } + +-export default AbilityStageMonitor; +\ No newline at end of file ++/*** if arkts 1.1 */ ++export default AbilityStageMonitor; ++/*** endif */ +\ No newline at end of file +diff --git a/api/application/ApplicationContext.d.ts b/api/application/ApplicationContext.d.ts +index 8ccb17f1c..7825ee431 100644 +--- a/api/application/ApplicationContext.d.ts ++++ b/api/application/ApplicationContext.d.ts +@@ -615,7 +615,8 @@ declare class ApplicationContext extends Context { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getCurrentAppCloneIndex(): number; + +@@ -639,7 +640,8 @@ declare class ApplicationContext extends Context { + * @throws { BusinessError } 16000078 - The multi-instance is not supported. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getCurrentInstanceKey(): string; + +@@ -652,7 +654,8 @@ declare class ApplicationContext extends Context { + * @throws { BusinessError } 16000078 - The multi-instance is not supported. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getAllRunningInstanceKeys(): Promise>; + } +diff --git a/api/application/ApplicationStateObserver.d.ts b/api/application/ApplicationStateObserver.d.ts +index 378543e43..f275299b0 100644 +--- a/api/application/ApplicationStateObserver.d.ts ++++ b/api/application/ApplicationStateObserver.d.ts +@@ -20,13 +20,10 @@ + + + import AppStateData from './AppStateData'; +-import AbilityStateData from './AbilityStateData'; + /*** if arkts 1.1 */ ++import AbilityStateData from './AbilityStateData'; + import * as _ProcessData from './ProcessData'; + /*** endif */ +-/*** if arkts 1.2 */ +-import processData from './ProcessData'; +-/*** endif */ + + /** + * The application state observer. +@@ -108,13 +105,4 @@ declare class ApplicationStateObserver { + */ + export type ProcessData = _ProcessData.default; + +-/** +- * The process data. +- * @typedef { processData } +- * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since 20 +- * @arkts 1.2 +- */ +-export type ProcessData = processData; +- + export default ApplicationStateObserver; +\ No newline at end of file +diff --git a/api/application/AutoFillType.d.ts b/api/application/AutoFillType.d.ts +index 8a5d9eb3b..ec2bc6591 100644 +--- a/api/application/AutoFillType.d.ts ++++ b/api/application/AutoFillType.d.ts +@@ -25,7 +25,8 @@ + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export enum AutoFillType { + /** +@@ -34,7 +35,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + UNSPECIFIED = 0, + +@@ -44,7 +46,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PASSWORD = 1, + +@@ -54,7 +57,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + USER_NAME = 2, + +@@ -64,7 +68,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NEW_PASSWORD = 3, + +@@ -74,7 +79,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FULL_STREET_ADDRESS = 4, + +@@ -84,7 +90,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + HOUSE_NUMBER = 5, + +@@ -94,7 +101,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DISTRICT_ADDRESS = 6, + +@@ -104,7 +112,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + CITY_ADDRESS = 7, + +@@ -114,7 +123,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PROVINCE_ADDRESS = 8, + +@@ -124,7 +134,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + COUNTRY_ADDRESS = 9, + +@@ -134,7 +145,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PERSON_FULL_NAME = 10, + +@@ -144,7 +156,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PERSON_LAST_NAME = 11, + +@@ -154,7 +167,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PERSON_FIRST_NAME = 12, + +@@ -164,7 +178,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PHONE_NUMBER = 13, + +@@ -174,7 +189,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PHONE_COUNTRY_CODE = 14, + +@@ -184,7 +200,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FULL_PHONE_NUMBER = 15, + +@@ -204,7 +221,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + BANK_CARD_NUMBER = 17, + +@@ -214,7 +232,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ID_CARD_NUMBER = 18, + +@@ -224,7 +243,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + NICKNAME = 24, + +@@ -234,7 +254,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + DETAIL_INFO_WITHOUT_STREET = 25, + +@@ -244,7 +265,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @StageModelOnly +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FORMAT_ADDRESS = 26, + +@@ -254,7 +276,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + PASSPORT_NUMBER = 27, + +@@ -264,7 +287,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + VALIDITY = 28, + +@@ -274,7 +298,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ISSUE_AT = 29, + +@@ -284,7 +309,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ORGANIZATION = 30, + +@@ -294,7 +320,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + TAX_ID = 31, + +@@ -304,7 +331,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ADDRESS_CITY_AND_STATE = 32, + +@@ -314,7 +342,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + FLIGHT_NUMBER = 33, + +@@ -324,7 +353,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LICENSE_NUMBER = 34, + +@@ -334,7 +364,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LICENSE_FILE_NUMBER = 35, + +@@ -344,7 +375,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LICENSE_PLATE = 36, + +@@ -354,7 +386,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ENGINE_NUMBER = 37, + +@@ -364,7 +397,8 @@ export enum AutoFillType { + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @systemapi + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + LICENSE_CHASSIS_NUMBER = 38 + } +\ No newline at end of file +diff --git a/api/application/Context.d.ts b/api/application/Context.d.ts +index 08e7ede8a..5c45e1b95 100644 +--- a/api/application/Context.d.ts ++++ b/api/application/Context.d.ts +@@ -293,7 +293,8 @@ declare class Context extends BaseContext { + * @stagemodelonly + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + bundleCodeDir: string; + +@@ -312,7 +313,8 @@ declare 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 + */ + distributedFilesDir: string; + +@@ -324,7 +326,8 @@ declare class Context extends BaseContext { + * @stagemodelonly + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + resourceDir: string; + +@@ -335,7 +338,8 @@ declare class Context extends BaseContext { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + cloudFileDir: string; + +@@ -384,11 +388,34 @@ declare class Context extends BaseContext { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 11 + */ + area: contextConstant.AreaMode; + ++ /** ++ * Get file area. ++ * ++ * @return { contextConstant.AreaMode } ++ * @syscap SystemCapability.Ability.AbilityRuntime.Core ++ * @stagemodelonly ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get area(): contextConstant.AreaMode; ++ ++ /** ++ * Set file area. ++ * ++ * @param { contextConstant.AreaMode } ++ * @syscap SystemCapability.Ability.AbilityRuntime.Core ++ * @stagemodelonly ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ set area(mode: contextConstant.AreaMode); ++ + /** + * Indicates process name. + * +@@ -397,7 +424,8 @@ declare class Context extends BaseContext { + * @stagemodelonly + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + processName: string; + +@@ -541,7 +569,8 @@ declare 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 + */ + getGroupDir(dataGroupID: string, callback: AsyncCallback): void; + +@@ -566,7 +595,8 @@ declare 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 + */ + getGroupDir(dataGroupID: string): Promise; + +@@ -597,7 +627,8 @@ declare class Context extends BaseContext { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + createAreaModeContext(areaMode: contextConstant.AreaMode): Context; + +@@ -611,7 +642,8 @@ declare class Context extends BaseContext { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @atomicservice +- * @since 15 ++ * @since arkts {'1.1':'15', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + createDisplayContext(displayId: number): Context; + } +diff --git a/api/application/DriverExtensionContext.d.ts b/api/application/DriverExtensionContext.d.ts +index 6a87f00f8..6c64f808f 100644 +--- a/api/application/DriverExtensionContext.d.ts ++++ b/api/application/DriverExtensionContext.d.ts +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2023 Huawei Device Co., Ltd. ++ * Copyright (c) 2023-2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"), + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at +@@ -27,16 +27,26 @@ import ExtensionContext from './ExtensionContext'; + * @extends ExtensionContext + * @syscap SystemCapability.Driver.ExternalDevice + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +-export default class DriverExtensionContext extends ExtensionContext { +- +- ++declare class DriverExtensionContext extends ExtensionContext { + /** + * update the state of driver extension. + * @syscap SystemCapability.Driver.ExternalDevice + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + updateDriverState(): void; +-} +\ No newline at end of file ++} ++/** ++ * Define a DriverExtensionContext. ++ * ++ * @typedef { DriverExtensionContext } ++ * @syscap SystemCapability.Driver.ExternalDevice ++ * @stagemodelonly ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++export default DriverExtensionContext; +diff --git a/api/application/ErrorObserver.d.ts b/api/application/ErrorObserver.d.ts +index acc0b8c03..24ee69262 100644 +--- a/api/application/ErrorObserver.d.ts ++++ b/api/application/ErrorObserver.d.ts +@@ -31,6 +31,15 @@ + * @atomicservice + * @since 11 + */ ++/** ++ * The observer will be called by system when an error occurs. ++ * ++ * @syscap SystemCapability.Ability.AbilityRuntime.Core ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + export default class ErrorObserver { + /** + * Will be called when the js runtime throws an exception which doesn't caught by user. +@@ -47,6 +56,16 @@ export default class ErrorObserver { + * @atomicservice + * @since 11 + */ ++ /** ++ * Will be called when the js runtime throws an exception which doesn't caught by user. ++ * ++ * @param { string } errMsg - the message and error stacktrace about the exception. ++ * @syscap SystemCapability.Ability.AbilityRuntime.Core ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + onUnhandledException(errMsg: string): void; + + /** +@@ -64,5 +83,15 @@ export default class ErrorObserver { + * @atomicservice + * @since 11 + */ ++ /** ++ * Will be called when the js runtime throws an exception which doesn't caught by user. ++ * ++ * @param { Error } errObject - the error object about the exception. ++ * @syscap SystemCapability.Ability.AbilityRuntime.Core ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + onException?(errObject: Error): void; + } +diff --git a/api/application/EventHub.d.ts b/api/application/EventHub.d.ts +index 09738ce0f..7dc88272b 100644 +--- a/api/application/EventHub.d.ts ++++ b/api/application/EventHub.d.ts +@@ -80,7 +80,8 @@ declare class EventHub { + * @stagemodelonly + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts{ '1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + on(event: string, callback: Function): void; + +@@ -118,7 +119,8 @@ declare class EventHub { + * @stagemodelonly + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts{ '1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + off(event: string, callback?: Function): void; + +@@ -159,6 +161,19 @@ declare class EventHub { + * @since 12 + */ + emit(event: string, ...args: Object[]): void; ++ ++ /** ++ * Trigger the event callbacks. ++ * ++ * @param { string } event - Indicates the event. ++ * @param { (Object|null|undefined)[] } args - Indicates the callback arguments. ++ * @syscap SystemCapability.Ability.AbilityRuntime.Core ++ * @stagemodelonly ++ * @crossplatform ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ emit(event: string, ...args: (Object|null|undefined)[]): void; + } + + export default EventHub; +\ No newline at end of file +diff --git a/api/application/ExtensionRunningInfo.d.ts b/api/application/ExtensionRunningInfo.d.ts +index 6c23c5536..7b6bdaaf4 100644 +--- a/api/application/ExtensionRunningInfo.d.ts ++++ b/api/application/ExtensionRunningInfo.d.ts +@@ -27,7 +27,8 @@ import bundle from '../@ohos.bundle.bundleManager'; + * @typedef ExtensionRunningInfo + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface ExtensionRunningInfo { + /** +@@ -35,7 +36,8 @@ export interface ExtensionRunningInfo { + * @default Indicates the extension of the extension info + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + extension: ElementName; + +@@ -44,7 +46,8 @@ export interface ExtensionRunningInfo { + * @default process id + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + pid: number; + +@@ -53,7 +56,8 @@ export interface ExtensionRunningInfo { + * @default user id + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + uid: number; + +@@ -62,7 +66,8 @@ export interface ExtensionRunningInfo { + * @default the name of the process + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + processName: string; + +@@ -71,7 +76,8 @@ export interface ExtensionRunningInfo { + * @default ability start time + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + startTime: number; + +@@ -80,7 +86,8 @@ export interface ExtensionRunningInfo { + * @default All package names under the current process + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + clientPackage: Array; + +@@ -89,7 +96,8 @@ export interface ExtensionRunningInfo { + * @default Enumerates types of the extension info + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + type: bundle.ExtensionAbilityType; + } +diff --git a/api/application/FormEditExtensionContext.d.ts b/api/application/FormEditExtensionContext.d.ts +index ff4e8be5e..c236f8d1a 100644 +--- a/api/application/FormEditExtensionContext.d.ts ++++ b/api/application/FormEditExtensionContext.d.ts +@@ -38,8 +38,6 @@ export default class FormEditExtensionContext extends UIExtensionContext { + * @param { Want } want - Including second extension ability name. + * @returns { Promise } Returns the result of start second form editor extension ability. + * @throws { BusinessError } 202 - The application is not a system application. +- * @throws { BusinessError } 401 - Params error. Possible causes: +- * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. + * @throws { BusinessError } 16500050 - An IPC connection error happened. + * @throws { BusinessError } 16500100 - Failed to obtain the configuration information. + * @throws { BusinessError } 16501000 - An internal functional error occurred. +diff --git a/api/application/LoopObserver.d.ts b/api/application/LoopObserver.d.ts +index 24f582f9d..9e3161620 100644 +--- a/api/application/LoopObserver.d.ts ++++ b/api/application/LoopObserver.d.ts +@@ -26,6 +26,16 @@ + * @atomicservice + * @since 12 + */ ++/** ++ * The observer will be called by system when application main thread loop ++ * execute timeout ++ * @interface LoopObserver ++ * @syscap SystemCapability.Ability.AbilityRuntime.Core ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + export interface LoopObserver { + /** + * Will be called when the application main thread loop execute timeout. +@@ -35,5 +45,15 @@ export interface LoopObserver { + * @atomicservice + * @since 12 + */ ++ /** ++ * Will be called when the application main thread loop execute timeout. ++ * ++ * @param { number } timeout - the actual executing time of loop event. ++ * @syscap SystemCapability.Ability.AbilityRuntime.Core ++ * @crossplatform ++ * @atomicservice ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ + onLoopTimeOut?(timeout: number): void; + } +diff --git a/api/application/ProcessData.d.ts b/api/application/ProcessData.d.ts +index 4a811f5dc..eb9818d60 100644 +--- a/api/application/ProcessData.d.ts ++++ b/api/application/ProcessData.d.ts +@@ -31,8 +31,7 @@ declare class ProcessData { + * + * @type { string } + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since arkts {'1.1':'14', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 14 + */ + bundleName: string; + +@@ -41,8 +40,7 @@ declare class ProcessData { + * + * @type { number } + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since arkts {'1.1':'14', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 14 + */ + pid: number; + +@@ -51,8 +49,7 @@ declare class ProcessData { + * + * @type { number } + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since arkts {'1.1':'14', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 14 + */ + uid: number; + +@@ -61,8 +58,7 @@ declare class ProcessData { + * + * @type { number } + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since arkts {'1.1':'14', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 14 + */ + state: number; + +@@ -71,8 +67,7 @@ declare class ProcessData { + * + * @type { boolean } + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since arkts {'1.1':'14', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 14 + */ + isContinuousTask: boolean; + +@@ -81,8 +76,7 @@ declare class ProcessData { + * + * @type { boolean } + * @syscap SystemCapability.Ability.AbilityRuntime.Core +- * @since arkts {'1.1':'14', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 14 + */ + isKeepAlive: boolean; + } +diff --git a/api/application/ProcessInformation.d.ts b/api/application/ProcessInformation.d.ts +index 4ffb3aabb..8a7320f66 100644 +--- a/api/application/ProcessInformation.d.ts ++++ b/api/application/ProcessInformation.d.ts +@@ -17,8 +17,12 @@ + * @file + * @kit AbilityKit + */ +- ++/*** if arkts 1.1 */ ++import type appManager from '../@ohos.app.ability.appManager'; ++/*** endif */ ++/*** if arkts 1.2 */ + import appManager from '../@ohos.app.ability.appManager'; ++/*** endif */ + import bundleManager from '../@ohos.bundle.bundleManager'; + + /** +diff --git a/api/application/RunningAppClone.d.ts b/api/application/RunningAppClone.d.ts +index b85dcbade..261cb1d15 100644 +--- a/api/application/RunningAppClone.d.ts ++++ b/api/application/RunningAppClone.d.ts +@@ -24,7 +24,8 @@ + * @typedef RunningAppClone + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface RunningAppClone { + /** +@@ -33,7 +34,8 @@ export interface RunningAppClone { + * @type { number } + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + appCloneIndex: number; + +@@ -43,7 +45,8 @@ export interface RunningAppClone { + * @type { number } + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + uid: number; + +@@ -53,7 +56,8 @@ export interface RunningAppClone { + * @type { Array } + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + pids: Array; + } +\ No newline at end of file +diff --git a/api/application/RunningMultiAppInfo.d.ts b/api/application/RunningMultiAppInfo.d.ts +index 780f16fec..f5732fa40 100644 +--- a/api/application/RunningMultiAppInfo.d.ts ++++ b/api/application/RunningMultiAppInfo.d.ts +@@ -18,10 +18,8 @@ + * @kit AbilityKit + */ + +-/*** if arkts 1.1 */ + import { MultiAppMode } from './MultiAppMode'; + import { RunningAppClone } from './RunningAppClone'; +-/*** endif */ + import { RunningMultiInstanceInfo } from './RunningMultiInstanceInfo'; + + /** +@@ -53,7 +51,8 @@ export interface RunningMultiAppInfo { + * @type { MultiAppMode } + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + mode: MultiAppMode; + +@@ -74,7 +73,8 @@ export interface RunningMultiAppInfo { + * @type { ?Array } + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + runningAppClones?: Array; + } +\ No newline at end of file +diff --git a/api/application/RunningMultiInstanceInfo.d.ts b/api/application/RunningMultiInstanceInfo.d.ts +index 1645db405..c64921df6 100644 +--- a/api/application/RunningMultiInstanceInfo.d.ts ++++ b/api/application/RunningMultiInstanceInfo.d.ts +@@ -45,7 +45,8 @@ export interface RunningMultiInstanceInfo { + * @type { number } + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + uid: number; + +@@ -55,7 +56,8 @@ export interface RunningMultiInstanceInfo { + * @type { Array } + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + pids: Array; + } +\ No newline at end of file +diff --git a/api/application/ServiceExtensionContext.d.ts b/api/application/ServiceExtensionContext.d.ts +index 30b639fa6..30e64a1ff 100644 +--- a/api/application/ServiceExtensionContext.d.ts ++++ b/api/application/ServiceExtensionContext.d.ts +@@ -1614,7 +1614,8 @@ declare class ServiceExtensionContext extends ExtensionContext { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi + * @stagemodelonly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + stopServiceExtensionAbility(want: Want, callback: AsyncCallback): void; + +@@ -1662,7 +1663,8 @@ declare class ServiceExtensionContext extends ExtensionContext { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi + * @stagemodelonly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + stopServiceExtensionAbility(want: Want): Promise; + +diff --git a/api/application/UIAbilityContext.d.ts b/api/application/UIAbilityContext.d.ts +index 14016ac66..2c4f3ce3f 100644 +--- a/api/application/UIAbilityContext.d.ts ++++ b/api/application/UIAbilityContext.d.ts +@@ -30,16 +30,18 @@ import { ConnectOptions } from '../ability/connectOptions'; + import { HapModuleInfo } from '../bundleManager/HapModuleInfo'; + import OpenLinkOptions from '../@ohos.app.ability.OpenLinkOptions'; + import { Caller } from '../@ohos.app.ability.UIAbility'; ++import type ConfigurationConstant from '../@ohos.app.ability.ConfigurationConstant'; + /*** if arkts 1.1 */ + import image from '../@ohos.multimedia.image'; + import dialogRequest from '../@ohos.app.ability.dialogRequest'; + import AbilityConstant from '../@ohos.app.ability.AbilityConstant'; + import type AtomicServiceOptions from '../@ohos.app.ability.AtomicServiceOptions'; +-import type ConfigurationConstant from '../@ohos.app.ability.ConfigurationConstant'; + import type UIServiceProxy from './UIServiceProxy'; + import type UIServiceExtensionConnectCallback from './UIServiceExtensionConnectCallback'; + /*** endif */ +- ++/*** if arkts 1.2 */ ++import { LocalStorage } from '@ohos.arkui.stateManagement'; ++/*** endif */ + /** + * The context of an ability. It allows access to ability-specific resources. + * +@@ -3560,7 +3562,8 @@ declare class UIAbilityContext extends Context { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @atomicservice +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + backToCallerAbilityWithResult(abilityResult: AbilityResult, requestCode: string): Promise; + +@@ -3604,7 +3607,8 @@ declare class UIAbilityContext extends Context { + * @throws { BusinessError } 16000055 - Installation-free timed out. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + connectServiceExtensionAbility(want: Want, options: ConnectOptions): number; + +@@ -3670,7 +3674,8 @@ declare class UIAbilityContext extends Context { + * @throws { BusinessError } 16000050 - Internal error. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + disconnectServiceExtensionAbility(connection: number, callback: AsyncCallback): void; + +@@ -3684,7 +3689,8 @@ declare class UIAbilityContext extends Context { + * @throws { BusinessError } 16000050 - Internal error. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + disconnectServiceExtensionAbility(connection: number): Promise; + +@@ -3711,7 +3717,8 @@ declare class UIAbilityContext extends Context { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setMissionLabel(label: string, callback: AsyncCallback): void; + +@@ -3738,7 +3745,8 @@ declare class UIAbilityContext extends Context { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setMissionLabel(label: string): Promise; + +@@ -3875,7 +3883,8 @@ declare class UIAbilityContext extends Context { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + restoreWindowStage(localStorage: LocalStorage): void; + +@@ -4499,8 +4508,7 @@ declare class UIAbilityContext extends Context { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + startAbilityByType(type: string, wantParam: Record, + abilityStartCallback: AbilityStartCallback, callback: AsyncCallback): void; +@@ -4541,8 +4549,7 @@ declare class UIAbilityContext extends Context { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + startAbilityByType(type: string, wantParam: Record, + abilityStartCallback: AbilityStartCallback): Promise; +@@ -4817,7 +4824,8 @@ declare class UIAbilityContext extends Context { + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setColorMode(colorMode: ConfigurationConstant.ColorMode): void; + } +diff --git a/api/application/UIExtensionContext.d.ts b/api/application/UIExtensionContext.d.ts +index c2a8a7ac9..b49c53b66 100755 +--- a/api/application/UIExtensionContext.d.ts ++++ b/api/application/UIExtensionContext.d.ts +@@ -21,7 +21,6 @@ + /*** if arkts 1.1 */ + import type { AbilityResult } from '../ability/abilityResult'; + import type { ConnectOptions } from '../ability/connectOptions'; +-import type ConfigurationConstant from '../@ohos.app.ability.ConfigurationConstant'; + import type AtomicServiceOptions from '../@ohos.app.ability.AtomicServiceOptions'; + import OpenLinkOptions from '../@ohos.app.ability.OpenLinkOptions'; + import type UIServiceProxy from './UIServiceProxy'; +@@ -31,6 +30,7 @@ import type UIServiceExtensionConnectCallback from './UIServiceExtensionConnectC + import { ConnectOptions } from '../ability/connectOptions'; + import { AbilityResult } from '../ability/abilityResult'; + /*** endif */ ++import type ConfigurationConstant from '../@ohos.app.ability.ConfigurationConstant'; + import type { AsyncCallback } from '../@ohos.base'; + import ExtensionContext from './ExtensionContext'; + import type Want from '../@ohos.app.ability.Want'; +@@ -528,7 +528,8 @@ declare class UIExtensionContext extends ExtensionContext { + * @throws { BusinessError } 16200001 - The caller has been released. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + startAbilityForResult(want: Want, callback: AsyncCallback): void; + +@@ -637,7 +638,8 @@ declare class UIExtensionContext extends ExtensionContext { + * @throws { BusinessError } 16200001 - The caller has been released. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + startAbilityForResult(want: Want, options: StartOptions, callback: AsyncCallback): void; + +@@ -752,7 +754,8 @@ declare class UIExtensionContext extends ExtensionContext { + * @throws { BusinessError } 16200001 - The caller has been released. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly +- * @since 14 ++ * @since arkts {'1.1':'14', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + startAbilityForResult(want: Want, options?: StartOptions): Promise; + +@@ -840,7 +843,8 @@ declare class UIExtensionContext extends ExtensionContext { + * @throws { BusinessError } 16000070 - The extension cannot start the service. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + connectServiceExtensionAbility(want: Want, options: ConnectOptions): number; + +@@ -854,7 +858,8 @@ declare class UIExtensionContext extends ExtensionContext { + * @throws { BusinessError } 16000050 - Internal error. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + disconnectServiceExtensionAbility(connection: number, callback: AsyncCallback): void; + +@@ -868,7 +873,8 @@ declare class UIExtensionContext extends ExtensionContext { + * @throws { BusinessError } 16000050 - Internal error. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + disconnectServiceExtensionAbility(connection: number): Promise; + +@@ -880,7 +886,8 @@ declare class UIExtensionContext extends ExtensionContext { + * @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 + */ + reportDrawnCompleted(callback: AsyncCallback): void; + +@@ -1113,7 +1120,8 @@ declare class UIExtensionContext extends ExtensionContext { + * @throws { BusinessError } 16000011 - The context does not exist. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setColorMode(colorMode: ConfigurationConstant.ColorMode): void; + } +diff --git a/api/application/ViewData.d.ts b/api/application/ViewData.d.ts +index 010ded1ba..e12e73372 100644 +--- a/api/application/ViewData.d.ts ++++ b/api/application/ViewData.d.ts +@@ -17,10 +17,8 @@ + * @file + * @kit AbilityKit + */ +- +-import PageNodeInfo from './PageNodeInfo'; +-import AutoFillRect from './AutoFillRect'; +- ++import type PageNodeInfo from './PageNodeInfo'; ++import type AutoFillRect from './AutoFillRect'; + /** + * View data for automatic filling. + * +diff --git a/api/application/WorkSchedulerExtensionContext.d.ts b/api/application/WorkSchedulerExtensionContext.d.ts +index 094e08daf..e998f96c0 100644 +--- a/api/application/WorkSchedulerExtensionContext.d.ts ++++ b/api/application/WorkSchedulerExtensionContext.d.ts +@@ -28,7 +28,8 @@ import type Want from '../@ohos.app.ability.Want'; + * @extends ExtensionContext + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @StageModelOnly +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export default class WorkSchedulerExtensionContext extends ExtensionContext { + /** +@@ -58,7 +59,8 @@ export default class WorkSchedulerExtensionContext extends ExtensionContext { + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @systemapi + * @stagemodelonly +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + startServiceExtensionAbility(want: Want): Promise; + +@@ -86,7 +88,8 @@ export default class WorkSchedulerExtensionContext extends ExtensionContext { + * @syscap SystemCapability.ResourceSchedule.WorkScheduler + * @systemapi + * @stagemodelonly +- * @since 13 ++ * @since arkts {'1.1':'13','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + stopServiceExtensionAbility(want: Want): Promise; + } +diff --git a/api/arkui/AttributeUpdater.d.ts b/api/arkui/AttributeUpdater.d.ts +index c67d24245..749b995ed 100644 +--- a/api/arkui/AttributeUpdater.d.ts ++++ b/api/arkui/AttributeUpdater.d.ts +@@ -28,7 +28,7 @@ + * @atomicservice + * @since 12 + */ +-export type Initializer = () => T; ++declare type Initializer = () => T; + + /** + * Defines a modifier which can update attributes to native side. +diff --git a/api/arkui/BuilderNode.d.ts b/api/arkui/BuilderNode.d.ts +index 768c24322..0f2af0027 100644 +--- a/api/arkui/BuilderNode.d.ts ++++ b/api/arkui/BuilderNode.d.ts +@@ -22,7 +22,8 @@ import { UIContext } from '../@ohos.arkui.UIContext'; + import { FrameNode } from './FrameNode'; + import { Size } from './Graphics'; + /*** if arkts 1.2 */ +-import { WrappedBuilder, TouchEvent} from './component/common'; ++import { TouchEvent } from './component/common'; ++import { WrappedBuilder, CustomBuilder, CustomBuilderT } from './component/builder'; + /*** endif */ + + /** +@@ -204,16 +205,7 @@ export interface BuildOptions { + * @atomicservice + * @since 12 + */ +-/** +- * Defines BuilderNode. +- * +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.1&1.2 +- */ +-export declare class BuilderNode { ++export class BuilderNode { + /** + * Constructor. + * +@@ -231,8 +223,7 @@ export declare class BuilderNode { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + constructor(uiContext: UIContext, options?: RenderOptions); + +@@ -253,8 +244,7 @@ export declare class BuilderNode { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + build(builder: WrappedBuilder, arg?: Object): void; + +@@ -267,8 +257,7 @@ export declare class BuilderNode { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + build(builder: WrappedBuilder, arg: Object, options: BuildOptions): void; + +@@ -287,8 +276,7 @@ export declare class BuilderNode { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + update(arg: Object): void; + +@@ -307,8 +295,7 @@ export declare class BuilderNode { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + getFrameNode(): FrameNode | null; + +@@ -329,8 +316,7 @@ export declare class BuilderNode { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + postTouchEvent(event: TouchEvent): boolean; + +@@ -340,8 +326,7 @@ export declare class BuilderNode { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + dispose(): void; + +@@ -352,8 +337,7 @@ export declare class BuilderNode { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + reuse(param?: Object): void; + +@@ -363,8 +347,7 @@ export declare class BuilderNode { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 + */ + recycle(): void; + +@@ -374,8 +357,152 @@ export declare class BuilderNode { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 12 ++ */ ++ updateConfiguration(): void; ++} ++ ++/** ++ * Defines BuilderNode. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++export declare class BuilderNode { ++ /** ++ * Constructor. ++ * ++ * @param { UIContext } uiContext - uiContext used to create the BuilderNode ++ * @param { RenderOptions } [options] - Render options of the Builder Node ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ constructor(uiContext: UIContext, options?: RenderOptions); ++ ++ /** ++ * Build the BuilderNode with the builder. ++ * ++ * @param { WrappedBuilder } builder - Defined the builder will be called to build the node. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ build(builder: WrappedBuilder): void; ++ ++ /** ++ * Build the BuilderNode with the builder. ++ * ++ * @param { WrappedBuilder> } builder - Defined the builder will be called to build the node. ++ * @param { T } arg - Defined the args will be used in the builder. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ build(builder: WrappedBuilder>, arg: T): void; ++ ++ /** ++ * Build the BuilderNode with the builder.Support the type that WrappedBuilder contains builder used different params. ++ * ++ * @param { WrappedBuilder> } builder - Defined the builder will be called to build the node. ++ * @param { T } arg - Defined the args will be used in the builder. ++ * @param { BuildOptions } options - Defined the options will be used when build. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ build(builder: WrappedBuilder>, arg: T, options: BuildOptions): void; ++ ++ /** ++ * Update the BuilderNode based on the provided parameters. ++ * ++ * @param { T } arg - Parameters used to update the BuilderNode, which must match the types required by the builder bound to the BuilderNode. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ update(arg: T): void; ++ ++ /** ++ * Get the FrameNode in BuilderNode. ++ * ++ * @returns { FrameNode | null } - Returns a FrameNode inside the BuilderNode, or null if not contained. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ getFrameNode(): FrameNode | null; ++ ++ /** ++ * Dispatch touchEvent to targetNode. ++ * ++ * @param { TouchEvent } event - The touchEvent which will be sent to the targetNode. ++ * @returns { boolean } - Returns true if the TouchEvent has been successfully posted to the targetNode, false otherwise. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ postTouchEvent(event: TouchEvent): boolean; ++ ++ /** ++ * Dispose the BuilderNode immediately. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ dispose(): void; ++ ++ /** ++ * Reuse the BuilderNode based on the provided parameters. ++ * ++ * @param { Record } [param] - Parameters for reusing BuilderNode. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ reuse(param?: Record): void; ++ ++ /** ++ * Recycle the BuilderNode. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ recycle(): void; ++ ++ /** ++ * Notify BuilderNode to update the configuration to trigger a reload of the BuilderNode. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 + */ +- updateConfiguration(): void; ++ updateConfiguration(): void; + } +diff --git a/api/arkui/ComponentContent.d.ts b/api/arkui/ComponentContent.d.ts +index 88fe8a0b2..9d0396417 100644 +--- a/api/arkui/ComponentContent.d.ts ++++ b/api/arkui/ComponentContent.d.ts +@@ -29,7 +29,7 @@ import { WrappedBuilder } from 'wrappedBuilderObject'; + import { BuildOptions } from './BuilderNode'; + import { Content } from './Content'; + import { UIContext } from '../@ohos.arkui.UIContext'; +-import { WrappedBuilder } from './component/common'; ++import { WrappedBuilder, CustomBuilder, CustomBuilderT } from './component/builder'; + /*** endif */ + + /** +@@ -41,7 +41,7 @@ import { WrappedBuilder } from './component/common'; + * @atomicservice + * @since 12 + */ +-export class ComponentContent extends Content{ ++export class ComponentContent extends Content { + /** + * Constructor. + * +@@ -135,7 +135,6 @@ export class ComponentContent extends Content{ + updateConfiguration(): void; + } + +-/*** if arkts 1.2 */ + /** + * Defines ComponentContent. + * +@@ -146,25 +145,25 @@ export class ComponentContent extends Content{ + * @since 20 + * @arkts 1.2 + */ +-export declare class ComponentContent extends Content { ++export declare class ComponentContent extends Content { + /** + * Constructor. + * + * @param { UIContext } uiContext - uiContext used to create the ComponentContent +- * @param { WrappedBuilder> } builder - Defined the builder will be called to build ComponentContent. ++ * @param { WrappedBuilder } builder - Defined the builder will be called to build ComponentContent. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +- constructor(uiContext: UIContext, builder: WrappedBuilder>); ++ constructor(uiContext: UIContext, builder: WrappedBuilder); + + /** + * Constructor. + * + * @param { UIContext } uiContext - uiContext used to create the ComponentContent +- * @param { WrappedBuilder> } builder - Defined the builder will be called to build ComponentContent. ++ * @param { WrappedBuilder> } builder - Defined the builder will be called to build ComponentContent. + * @param { T } args - Parameters used to update the ComponentContent. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform +@@ -172,13 +171,13 @@ export declare class ComponentContent extends Content + * @since 20 + * @arkts 1.2 + */ +- constructor(uiContext: UIContext, builder: WrappedBuilder>, args: T); ++ constructor(uiContext: UIContext, builder: WrappedBuilder>, args: T); + + /** + * Constructor. + * + * @param { UIContext } uiContext - uiContext used to create the ComponentContent +- * @param { WrappedBuilder> } builder - Defined the builder will be called to build ComponentContent. ++ * @param { WrappedBuilder> } builder - Defined the builder will be called to build ComponentContent. + * @param { T } args - Parameters used to update the ComponentContent. + * @param { BuildOptions } options - Defined the options will be used when build. + * @syscap SystemCapability.ArkUI.ArkUI.Full +@@ -187,8 +186,7 @@ export declare class ComponentContent extends Content + * @since 20 + * @arkts 1.2 + */ +- constructor(uiContext: UIContext, builder: WrappedBuilder>, args: T, options: BuildOptions); +- ++ constructor(uiContext: UIContext, builder: WrappedBuilder>, args: T, options: BuildOptions); + + /** + * Update the ComponentContent based on the provided parameters. +@@ -205,14 +203,14 @@ export declare class ComponentContent extends Content + /** + * Reuse the ComponentContent based on the provided parameters. + * +- * @param { Object } [param] - Parameters for reusing ComponentContent. ++ * @param { Record } [param] - Parameters for reusing ComponentContent. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +- reuse(param?: Object): void; ++ reuse(param?: Record): void; + + /** + * Recycle the ComponentContent. +@@ -247,4 +245,3 @@ export declare class ComponentContent extends Content + */ + updateConfiguration(): void; + } +-/*** endif */ +\ No newline at end of file +diff --git a/api/arkui/FrameNode.d.ts b/api/arkui/FrameNode.d.ts +index cbc125790..2fc0e0f33 100644 +--- a/api/arkui/FrameNode.d.ts ++++ b/api/arkui/FrameNode.d.ts +@@ -37,8 +37,7 @@ import { ListOptions, ListAttribute } from './component/list' + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts { '1.1':'12','1.2':'20' } +- * @arkts 1.1&1.2 ++ * @since 12 + */ + /** + * Layout constraint, include the max size, the min size and the reference size for children to calculate percent. +@@ -969,15 +968,14 @@ export declare abstract class TypedFrameNode extends FrameNode { + /** + * Get attribute instance of FrameNode to set attributes. + * +- * @type { T } +- * @readonly ++ * @returns { T } - Returns the attribute instance of FrameNode. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +- readonly attribute: T; ++ get attribute(): T; + } + + /** +@@ -2029,8 +2027,7 @@ export declare namespace typeNode { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts { '1.1':'12','1.2':'20' } +- * @arkts 1.1&1.2 ++ * @since 12 + */ + /** + * Used for lazy loading of typeNode. +diff --git a/api/arkui/Graphics.d.ts b/api/arkui/Graphics.d.ts +index fe6833011..c10e0a424 100644 +--- a/api/arkui/Graphics.d.ts ++++ b/api/arkui/Graphics.d.ts +@@ -679,10 +679,19 @@ export interface Edges { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'12','1.2':'20'} ++ * @since 12 ++ */ ++/** ++ * Defines the Length Unit. ++ * ++ * @enum { number } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ +-declare enum LengthUnit { ++export declare enum LengthUnit { + /** + * Logical pixel used in Ace1.0. It's based on frontend design width. + * For example, when a frontend with 750px design width running on a +diff --git a/api/arkui/NodeController.d.ts b/api/arkui/NodeController.d.ts +index 98fda7d36..f43c7de24 100644 +--- a/api/arkui/NodeController.d.ts ++++ b/api/arkui/NodeController.d.ts +@@ -181,7 +181,8 @@ export declare abstract class NodeController { + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice +- * @since 12 ++ * @since arkts{'1.1':'12','1.2':'20'} ++ * @arkts 1.1&1.2 + */ + rebuild(): void; + +diff --git a/api/arkui/stateManagement/decorators/decoratorLink.d.ets b/api/arkui/component/animation.d.ets +similarity index 60% +rename from api/arkui/stateManagement/decorators/decoratorLink.d.ets +rename to api/arkui/component/animation.d.ets +index 5d65d77da..fba0dc459 100644 +--- a/api/arkui/stateManagement/decorators/decoratorLink.d.ets ++++ b/api/arkui/component/animation.d.ets +@@ -18,12 +18,5 @@ + * @arkts 1.2 + */ + +-import { DecoratedV1VariableBase, IDecoratedMutableVariable } from '../base/decoratorBase'; +-import { WatchFuncType } from './decoratorWatch'; +- +-export declare class LinkDecoratedVariable extends DecoratedV1VariableBase +- implements IDecoratedMutableVariable { +- public constructor(varName: string, source: DecoratedV1VariableBase, watchFunc?: WatchFuncType) +- public get(): T +- public set(newValue: T): void +-} +\ No newline at end of file ++@Retention({policy: "SOURCE"}) ++export declare @interface AnimatableExtend {} +diff --git a/api/arkui/component/builder.d.ets b/api/arkui/component/builder.d.ets +old mode 100644 +new mode 100755 +index 9f1bb60f0..fcebce52e +--- a/api/arkui/component/builder.d.ets ++++ b/api/arkui/component/builder.d.ets +@@ -17,30 +17,96 @@ + * @kit ArkUI + * @arkts 1.2 + */ +- ++ + import { memo, ComponentBuilder, __memo_context_type, __memo_id_type } from "../stateManagement/runtime"; + ++/** ++ * Defines Builder Annotation. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface Builder {} ++ ++/** ++ * Defines BuilderParam Annotation. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface BuilderParam {} ++ + /** + * Defines the CustomBuilder Type. + * +- * @typedef { @memo (() => void) } CustomBuilder ++ * @typedef { @Builder (() => void) } CustomBuilder + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + */ +-export type CustomBuilder = @memo (() => void); ++export type CustomBuilder = @Builder (() => void); + ++/** ++ * Defines the CustomBuilder Type. ++ * ++ * @typedef { @Builder ((t:T) => void) } CustomBuilderT ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @form ++ * @atomicservice ++ * @since 20 ++ */ ++export type CustomBuilderT = @Builder ((t: T) => void); + + /** + * Defines the PageMapBuilder Type. + * +- * @typedef { @memo ((name: string, param: Object | null | undefined) => void) } PageMapBuilder ++ * @typedef { @Builder ((name: string, param: Object | null | undefined) => void) } PageMapBuilder + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + */ +-export type PageMapBuilder = @memo ((name: string, param: Object | null | undefined) => void) +\ No newline at end of file ++export type PageMapBuilder = @Builder ((name: string, param: Object | null | undefined) => void) ++ ++/** ++ * Defining wrapBuilder function. ++ * @param { function } builder ++ * @returns { WrappedBuilder } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare function wrapBuilder(builder: T): WrappedBuilder; ++ ++/** ++ * Defines the WrappedBuilder class. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare class WrappedBuilder { ++ ++ /** ++ * @type { function } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ @Builder public builder: T; ++ ++ /** ++ * @param { function } builder ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ public constructor(builder: T); ++} +diff --git a/api/arkui/component/customComponent.d.ets b/api/arkui/component/customComponent.d.ets +index 62cd26fdf..cfd065cf4 100755 +--- a/api/arkui/component/customComponent.d.ets ++++ b/api/arkui/component/customComponent.d.ets +@@ -18,73 +18,381 @@ + * @arkts 1.2 + */ + +- +- + import { memo, ComponentBuilder, __memo_context_type, __memo_id_type } from "../stateManagement/runtime"; ++import { ExtendableComponent } from './extendableComponent'; ++import { GeometryInfo, Layoutable, Measurable, SizeResult } from './common' ++import { ConstraintSizeOptions } from './units' ++import { Builder } from './builder' ++import { LocalStorage } from './../stateManagement/storage/localStorage'; + +-import { UIContext } from './../../../api/@ohos.arkui.UIContext' +-import { WatchFuncType } from '../stateManagement/decorators/decoratorWatch' +-import { ProvideDecoratedVariable } from '../stateManagement/decorators/decoratorProvide' +-import { ConsumeDecoratedVariable } from '../stateManagement/decorators/decoratorConsume' ++/** ++ * Defines Entry Annotation. ++ * ++ * Entry is an Annotation and it supports parameters. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export @interface Entry { ++ /** ++ * Named route name. ++ * ++ * @type { string } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @atomicservice ++ * @since 20 ++ */ ++ routeName: string = ""; + ++ /** ++ * Name of the function which returns LocalStorage instance. ++ * ++ * @type { string } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @atomicservice ++ * @since 20 ++ */ ++ storage: string = ""; + ++ /** ++ * Determines whether to use the LocalStorage instance object returned by UIContext.getSharedLocalStorage() interface. ++ * ++ * @type { boolean } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ useSharedStorage: boolean = false; ++} + ++/** ++ * Defining Component Annotation ++ * ++ * Component is an Annotation to define a custom component using state management V1. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ + @Retention({policy: "SOURCE"}) +-export declare @interface Component { +- freezeWhenInactive: boolean = false; +-} ++export @interface Component {} ++ ++/** ++ * Defining ComponentV2 Annotation ++ * ++ * ComponentV2 is an Annotation to define a custom component using state management V2. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export @interface ComponentV2 {} + ++/** ++ * Defining Reusable Annotation that is used to decorate @Component. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ + @Retention({policy: "SOURCE"}) +-export declare @interface Builder {} ++export @interface Reusable {} + ++/** ++ * Defining ReusableV2 Annotation that is used to decorate @ComponentV2. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ + @Retention({policy: "SOURCE"}) +-export declare @interface BuilderParam {} ++export @interface ReusableV2 {} + ++/** ++ * Defining CustomLayout Annotation that is used to decorate @Component and @ComponentV2. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ + @Retention({policy: "SOURCE"}) +-export declare @interface Entry { +- routeName: string = ""; +- storage: string = ""; +- useSharedStorage: boolean = false; +-} ++export @interface CustomLayout {} + ++/** ++ * Defining CustomDialog Annotation ++ * ++ * CustomDialog is an Annotation to define a custom dialog. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ + @Retention({policy: "SOURCE"}) +-export declare @interface Reusable {} ++export @interface CustomDialog {} + +-export interface CustomBuild { +- @memo +- build(): void; ++/** ++ * Definition of base custom dialog class. ++ * ++ * @extends ExtendableComponent ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++export declare abstract class BaseCustomDialog, T_Options> extends ExtendableComponent { ++ /** ++ * Constructor to use to create a custom dialog instance. ++ * @param {boolean} [useSharedStorage] - determine whether to use the LocalStorage instance object returned by UIContext.getSharedLocalStorage() interface. ++ * @param {LocalStorage} [storage] - localStorage instance. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ constructor(useSharedStorage?: boolean, storage?: LocalStorage); ++ ++ /** ++ * Define the constructor of custom dialog ++ * ++ * @param { () => T } factory - factory to create instance of custom dialog ++ * @param { T_Options } initializers - initial data for all the fields in custom dialog ++ * @param { @Builder () => void } content - tail closure for custom dialog ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ @ComponentBuilder ++ static $_instantiate( ++ factory: () => T, ++ initializers?: T_Options, ++ @Builder content?: () => void ++ ): T ++} ++ ++/** ++ * Definition of base custom component, which is base class of custom component. ++ * ++ * @extends ExtendableComponent ++ * @implements CommonAttribute ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++export declare abstract class BaseCustomComponent extends ExtendableComponent { ++ /** ++ * aboutToRecycle Method. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ aboutToRecycle(): void; + } + +-export interface CustomLayout { ++/** ++ * Definition of custom component class. ++ * ++ * @extends BaseCustomComponent ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++export declare abstract class CustomComponent, T_Options> extends BaseCustomComponent { ++ /** ++ * Constructor to use to create a customComponent instance. ++ * @param {boolean} [useSharedStorage] - determine whether to use the LocalStorage instance object returned by UIContext.getSharedLocalStorage() interface. ++ * @param {LocalStorage} [storage] - localStorage instance. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ constructor(useSharedStorage?: boolean, storage?: LocalStorage); ++ ++ /** ++ * Define the constructor of custom component ++ * ++ * @param { () => T } factory - factory to create instance of custom component ++ * @param { T_Options } initializers - initial data for all the fields in custom component ++ * @param { string } reuseId - reuse id for reusable. Only valid if custom component decorated with @Reusable ++ * @param { @Builder () => void } content - tail closure for custom component ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ @ComponentBuilder ++ static $_instantiate( ++ factory: () => T, ++ initializers?: T_Options, ++ reuseId?: string, ++ @Builder content?: () => void ++ ): T + ++ /** ++ * aboutToReuse Method ++ * ++ * @param { Record } params - Custom component init params. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ aboutToReuse(params: Record): void; + } + +-export declare abstract class CustomComponent, T_Options> { +- public addProvidedVar(varName: string, providedPropName: string, initValue: T, allowOverride: boolean = false, watchFunc?: WatchFuncType): ProvideDecoratedVariable; +- public initConsume(varName: string, providedPropName: string, watchFunc?: WatchFuncType): ConsumeDecoratedVariable; +- @memo ++/** ++ * Definition of V2 custom component class. ++ * ++ * @extends BaseCustomComponent ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++export declare abstract class CustomComponentV2, T_Options> extends BaseCustomComponent { ++ /** ++ * Define the constructor of custom component ++ * ++ * @param { () => T } factory - factory to create instance of custom component ++ * @param { T_Options } initializers - initial data for all the fields in custom component ++ * @param { string } reuseId - reuse id for reusable. Only valid if custom component decorated with @Reusable ++ * @param { @Builder () => void } content - tail closure for custom component ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ + @ComponentBuilder +- static $_instantiate, S_Options>( +- factory: () => S, +- initializers?: S_Options, +- @memo +- content?: () => void, +- reuseKey?: string +- ): S; +- +- // Life cycle for custom component +- aboutToAppear(): void +- aboutToDisappear(): void +- onDidBuild(): void +- +- onPageShow(): void +- onPageHide(): void +- onBackPress(): boolean +- getUIContext(): UIContext +- +- @memo +- build(): void; +- +- aboutToReuse(): void +- aboutToRecycle(): void +-} +\ No newline at end of file ++ static $_instantiate( ++ factory: () => T, ++ initializers?: T_Options, ++ reuseId?: string, ++ @Builder content?: () => void ++ ): T ++ ++ /** ++ * aboutToReuse Method ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ aboutToReuse(): void; ++} ++ ++/** ++ * Defining interface of PageLifeCycle for custom component, when decorate with @Entry. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++export interface PageLifeCycle { ++ /** ++ * onPageShow Method. ++ * ++ * The page is triggered once each time it is displayed, including scenarios such as the routing process and the application entering the foreground ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ onPageShow(): void {} ++ ++ /** ++ * onPageHide Method. ++ * ++ * It is triggered once each time the page is hidden, including scenarios such as the routing process and the application entering the background ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ onPageHide(): void {} ++ ++ /** ++ * onBackPress Method. ++ * ++ * Triggered when the user clicks the back button ++ * ++ * @returns { boolean } true means that the page itself processes the return logic. ++ * false means that the default return logic is used. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ onBackPress(): boolean { return false } ++ ++ /** ++ * PageTransition Method. ++ * Implement Animation when enter this page or move to other pages. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ pageTransition(): void {} ++ ++ /** ++ * Triggered when the Entry custom component has been pushed with singleton mode. ++ * ++ * @param { object | undefined | null } param - New parameters pushed with singleton mode. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ onNewParam(param: object | undefined | null): void {} ++} ++ ++/** ++ * Defining interface of LayoutCallback for custom component, when decorate with @Layoutable. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++export interface LayoutCallback { ++ /** ++ * Custom component override this method to layout each of its sub components. ++ * ++ * @param { GeometryInfo } selfLayoutInfo ++ * @param { Array } children ++ * @param { ConstraintSizeOptions } constraint ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ onPlaceChildren(selfLayoutInfo: GeometryInfo, children: Array, constraint: ConstraintSizeOptions): void {} ++ ++ /** ++ * Custom component override this method to measure each of its sub components. ++ * @param { GeometryInfo } selfLayoutInfo ++ * @param { Array } children - indicate the measure child ++ * @param { ConstraintSizeOptions } constraint - indicate child constraint size ++ * @returns { SizeResult } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ onMeasureSize(selfLayoutInfo: GeometryInfo, children: Array, constraint: ConstraintSizeOptions): SizeResult { ++ return {width: 0, height: 0} as SizeResult ++ } ++} +diff --git a/api/arkui/component/extendableComponent.d.ets b/api/arkui/component/extendableComponent.d.ets +new file mode 100644 +index 000000000..ae28068b4 +--- /dev/null ++++ b/api/arkui/component/extendableComponent.d.ets +@@ -0,0 +1,113 @@ ++/* ++ * Copyright (C) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++/** ++ * @file ++ * @kit ArkUI ++ * @arkts 1.2 ++ */ ++ ++import { UIContext } from '@ohos.arkui.UIContext' ++import { Builder } from './builder' ++ ++/** ++ * Defining interface of LifeCycle for custom component and custom dialog ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++export interface LifeCycle { ++ /** ++ * aboutToAppear Method. ++ * ++ * The aboutToAppear function is executed after a new instance of the custom component is created, ++ * before its build() function is executed. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ aboutToAppear(): void {} ++ ++ /** ++ * aboutToDisappear Method. ++ * ++ * The aboutToDisappear function executes before a custom component is destroyed. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ aboutToDisappear(): void {} ++ ++ /** ++ * The callback method after the custom component is built. ++ * ++ * Triggered when the custom component has been built. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ onDidBuild(): void {} ++ ++ /** ++ * Customize the build process of the custom component. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ @Builder ++ build(): void ++} ++ ++/** ++ * Definition of extendable component, which is base class of custom component and custom dialog. ++ * ++ * @implements LifeCycle ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++export declare abstract class ExtendableComponent implements LifeCycle { ++ /** ++ * Get current UIContext. ++ * ++ * @returns { UIContext } The UIContext that the custom component belongs to. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ getUIContext(): UIContext ++ ++ /** ++ * Get uniqueId of the custom component. ++ * ++ * @returns { int } - The uniqueId of the custom component. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ */ ++ getUniqueId(): int ++} +\ No newline at end of file +diff --git a/api/arkui/component/interop.d.ets b/api/arkui/component/interop.d.ets +index b7d49b051..a576e7f18 100644 +--- a/api/arkui/component/interop.d.ets ++++ b/api/arkui/component/interop.d.ets +@@ -1,10 +1,10 @@ + /* +- * Copyright (C) 2025 Huawei Device Co., Ltd. ++ * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * +- * http://www.apache.org/licenses/LICENSE-2.0 ++ * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, +@@ -18,16 +18,98 @@ + * @arkts 1.2 + */ + ++import { Builder } from './builder'; ++import { ExtendableComponent } from './extendableComponent'; ++import { IDecoratedV1Variable } from '../stateManagement/decorator'; + +-import { memo, __memo_context_type, __memo_id_type } from '../stateManagement/runtime'; ++/** ++ * Defines the info of compatible custom component. ++ * ++ * @typedef CompatibleComponentInfo ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export interface CompatibleComponentInfo { ++ /** ++ * the name of compatible custom component ++ * ++ * @type { string } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ name: string; + +-export interface InteropComponent { +- name: string, +- component: Object ++ /** ++ * the compatible custom component ++ * ++ * @type { ESValue } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ component: ESValue; + } + +-@memo +-export declare function ArkUICompatible( +- init: () => InteropComponent, +- update: (elmtId: number, instance: ESObject) => void +-): void +\ No newline at end of file ++/** ++ * Defines the callback for initializing compatible custom component. ++ * ++ * @typedef { function } CompatibleInitCallback ++ * @returns { CompatibleComponentInfo } the info of compatible custom component ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export type CompatibleInitCallback = () => CompatibleComponentInfo; ++ ++/** ++ * Defines the callback for updating compatible custom component. ++ * ++ * @typedef { function } CompatibleUpdateCallback ++ * @param { ESValue } component - the compatible custom component ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export type CompatibleUpdateCallback = (component: ESValue) => void; ++ ++/** ++ * Obtains the compatible custom component. ++ * ++ * @param { CompatibleInitCallback } init - the callback for initializing compatible custom component ++ * @param { CompatibleUpdateCallback } update - the callback for updating compatible custom component ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Builder ++export declare function compatibleComponent( ++ init: CompatibleInitCallback, ++ update: CompatibleUpdateCallback ++): void; ++ ++/** ++ * Binds the callback for obtaining the provide's compatible state with compatible custom component. ++ * ++ * @param { ExtendableComponent } component - the custom component ++ * @param { ESValue } createCompatibleState - the callback for creating compatible state ++ * @param { ESValue } setCallback - set the callback for binding the provide's compatible state ++ * @param { ESValue } [compatibleComponent] - the compatible custom component ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare function bindCompatibleProvideCallback( ++ component: ExtendableComponent, ++ createCompatibleState: ESValue, ++ setCallback: ESValue, ++ compatibleComponent?: ESValue ++): void; ++ ++/** ++ * Obtains the compatible state. ++ * ++ * @param { IDecoratedV1Variable } state - the source state ++ * @param { ESValue } createCompatibleState - the callback for creating compatible state ++ * @returns { ESValue } the compatible state ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare function getCompatibleState( ++ state: IDecoratedV1Variable, ++ createCompatibleState: ESValue ++): ESValue; +diff --git a/api/arkui/component/repeat.d.ets b/api/arkui/component/repeat.d.ets +index fcbbca917..0d9490370 100755 +--- a/api/arkui/component/repeat.d.ets ++++ b/api/arkui/component/repeat.d.ets +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2024-2025 Huawei Device Co., Ltd. ++ * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at +@@ -12,23 +12,21 @@ + * See the License for the specific language governing permissions and + * limitations under the License. + */ ++ + /** + * @file + * @kit ArkUI + * @arkts 1.2 + */ + +- +-import { memo, ComponentBuilder, __memo_context_type, __memo_id_type } from './../stateManagement/runtime' ++import { Builder } from './builder'; ++import { ComponentBuilder } from './../stateManagement/runtime'; + + /** + * Indicates the type of Repeat's Data Source. + * + * @typedef { Array | ReadonlyArray | Readonly> } + * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @form +- * @atomicservice + * @since 20 + */ + type RepeatArray = Array | ReadonlyArray | Readonly>; +@@ -37,11 +35,9 @@ type RepeatArray = Array | ReadonlyArray | Readonly>; + * + * @typedef {function} TemplateTypedFunc + * @param { T } item - data item. +- * @param {number} index - data index number in array. ++ * @param { number } index - data index number in array. + * @returns { string } template type. + * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice + * @since 20 + */ + type TemplateTypedFunc = (item: T, index: number) => string; +@@ -51,11 +47,9 @@ type TemplateTypedFunc = (item: T, index: number) => string; + * @typedef {function} RepeatItemBuilder + * @param { RepeatItem } repeatItem - the repeat item builder function. + * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice + * @since 20 + */ +-@memo ++@Builder + type RepeatItemBuilder = (repeatItem: RepeatItem) => void; + + /** +@@ -63,86 +57,109 @@ type RepeatItemBuilder = (repeatItem: RepeatItem) => void; + * + * @interface RepeatItem + * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @form +- * @atomicservice + * @since 20 + */ + export interface RepeatItem { +- /** +- * The origin data. +- * +- * @type { T } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @form +- * @atomicservice +- * @since 20 +- */ +- item: T; +- /** +- * index of each item. +- * +- * @type { number } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @form +- * @atomicservice +- * @since 20 +- */ +- index: number; ++ /** ++ * The origin data. ++ * ++ * @type { T } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ item: T; ++ /** ++ * index of each item. ++ * ++ * @type { number } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ index: number; + } + ++/** ++ * Function that is used to do lazy loading. ++ * ++ * @typedef {function} OnLazyLoadingFunc ++ * @param { number } index - data index. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++type OnLazyLoadingFunc = (index: number) => void; ++ ++/** ++ * Define key generator function. ++ * ++ * @typedef {function} KeyGeneratorFunc ++ * @param { T } item - data item. ++ * @param { number } index - data index number in array. ++ * @returns { string } key value. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++type KeyGeneratorFunc = (item: T, index: number) => string; ++ ++/** ++ * Function that is used to get total count. ++ * ++ * @typedef {function} OnTotalCountFunc ++ * @returns { number } Returns the total data count ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++type OnTotalCountFunc = () => number; ++ + /** + * Define the options of repeat virtualScroll to implement reuse and lazy loading. + * + * @interface VirtualScrollOptions + * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice + * @since 20 + */ + export interface VirtualScrollOptions { +- /** +- * Total data count. +- * +- * @type { ?number } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 20 +- */ +- totalCount?: number; +- /** +- * Reuse or not. +- * +- * @type { ?boolean } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 20 +- */ +- reusable?: boolean; +- /** +- * Data lazy loading +- * +- * @param { number } index +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 20 +- */ +- onLazyLoading?: (index: number) => void; +- /** +- * The function of total data count. +- * +- * @returns { number } Returns the total data count. +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 20 +- */ +- onTotalCount?: () => number; ++ /** ++ * Total data count. ++ * ++ * @type { ?number } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ totalCount?: number; ++ /** ++ * Reuse or not. ++ * ++ * @type { ?boolean } ++ * @default true ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ reusable?: boolean; ++ /** ++ * Data lazy loading ++ * ++ * @type { ?OnLazyLoadingFunc } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ onLazyLoading?: OnLazyLoadingFunc; ++ /** ++ * The function of total data count. ++ * ++ * @type { ?OnTotalCountFunc } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ onTotalCount?: OnTotalCountFunc; ++ /** ++ * Indicates whether to activate virtual scroll mode. ++ * ++ * @type { ?boolean } ++ * @default false ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ disableVirtualScroll?: boolean; + } + + /** +@@ -150,111 +167,84 @@ export interface VirtualScrollOptions { + * + * @interface TemplateOptions + * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice + * @since 20 + */ + export interface TemplateOptions { +- /** +- * The cached number of each template. +- * +- * @type { ?number } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 20 +- */ +- cachedCount?: number; ++ /** ++ * The cached number of each template. ++ * ++ * @type { ?number } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ cachedCount?: number; + } + + /** + * Defines the Repeat component attribute functions. + * ++ * @typedef RepeatAttribute + * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @form +- * @atomicservice + * @since 20 + */ +-export interface UIRepeatAttribute { +- /** +- * Executes itemGenerator of each item. +- * +- * @param { RepeatItemBuilder } itemGenerator +- * @returns { UIRepeatAttribute } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @form +- * @atomicservice +- * @since 20 +- */ +- @memo +- each(itemGenerator: RepeatItemBuilder): this; +- /** +- * Obtains key of each item. +- * +- * @param { function } keyGenerator +- * @returns { UIRepeatAttribute } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @form +- * @atomicservice +- * @since 20 +- */ +- @memo +- key(keyGenerator: (item: T, index: number) => string): this; +- /** +- * Enable UI lazy loading when scroll up or down. +- * +- * @param { VirtualScrollOptions } virtualScrollOptions that defines the options of repeat virtual scroll to implement reuse and lazy loading. +- * @returns { UIRepeatAttribute } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 20 +- */ +- @memo +- virtualScroll(virtualScrollOptions?: VirtualScrollOptions): this; +- /** +- * Type builder function to render specific type of data item. +- * +- * @param { string } type that defines the template id. +- * @param { RepeatItemBuilder } itemBuilder that defines UI builder function. +- * @param { TemplateOptions } templateOptions that defines a builder template option parameter. +- * @returns { UIRepeatAttribute } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 20 +- */ +- @memo +- template(type: string, itemBuilder: RepeatItemBuilder, templateOptions?: TemplateOptions): this; +- /** +- * Typed function to render specific type of data item. +- * +- * @param { TemplateTypedFunc } typedFunc that define template typed function. +- * @returns { UIRepeatAttribute } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 20 +- */ +- @memo +- templateId(typedFunc: TemplateTypedFunc): this; ++export interface RepeatAttribute { ++ /** ++ * Executes itemGenerator of each item. ++ * ++ * @param { RepeatItemBuilder } itemGenerator ++ * @returns { this } RepeatAttribute instance ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ each(itemGenerator: RepeatItemBuilder): this; ++ /** ++ * Obtains key of each item. ++ * ++ * @param { KeyGeneratorFunc } keyGenerator ++ * @returns { this } RepeatAttribute instance ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ key(keyGenerator: KeyGeneratorFunc): this; ++ /** ++ * Enable UI lazy loading when scroll up or down. ++ * ++ * @param { VirtualScrollOptions } [virtualScrollOptions] that defines the options of repeat virtual scroll to ++ * implement reuse and lazy loading. ++ * @returns { this } RepeatAttribute instance ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ virtualScroll(virtualScrollOptions?: VirtualScrollOptions): this; ++ /** ++ * Type builder function to render specific type of data item. ++ * ++ * @param { string } type that defines the template id. ++ * @param { RepeatItemBuilder } itemBuilder that defines UI builder function. ++ * @param { TemplateOptions } [templateOptions] that defines a builder template option parameter. ++ * @returns { this } RepeatAttribute instance ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ template(type: string, itemBuilder: RepeatItemBuilder, templateOptions?: TemplateOptions): this; ++ /** ++ * Typed function to render specific type of data item. ++ * ++ * @param { TemplateTypedFunc } typedFunc that define template typed function. ++ * @returns { this } RepeatAttribute instance ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ templateId(typedFunc: TemplateTypedFunc): this; + } + + /** + * Indicates the type of Repeat. + * +- * @typedef { function } RepeatInterface + * @param { RepeatArray } arr - The Data Source +- * @returns { UIRepeatAttribute } ++ * @returns { RepeatAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @form +- * @atomicservice + * @since 20 + */ +-@memo + @ComponentBuilder +-export declare function Repeat(arr: RepeatArray): UIRepeatAttribute +\ No newline at end of file ++export declare function Repeat(arr: RepeatArray): RepeatAttribute; +\ No newline at end of file +diff --git a/api/arkui/component/resources.d.ets b/api/arkui/component/resources.d.ets +index 2a749e6b5..68448421a 100755 +--- a/api/arkui/component/resources.d.ets ++++ b/api/arkui/component/resources.d.ets +@@ -35,6 +35,24 @@ import { Resource } from './../../../api/global/resource' + */ + export declare function _r(bundleName: string, moduleName: string, name: string, ...params: Object[]): Resource; + ++/** ++ * Obtain the resource in resources, used by plugin. ++ * ++ * @param { number } id - Indicates the id of resource. ++ * @param { number } type - Indicates the type of resource. ++ * @param { string } bundleName - Indicates the name of bundle. ++ * @param { string } moduleName - Indicates the name of module. ++ * @param { Object[] } params - Custom parameters. ++ * @returns { Resource } Returns the resource instance. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++export declare function _r( ++ id: number, type: number, bundleName: string, moduleName: string, ...params: Object[]): Resource; ++ + /** + * Obtain the resource in resources/rawfile, used by plugin. + * +@@ -48,3 +66,21 @@ export declare function _r(bundleName: string, moduleName: string, name: string, + * @arkts 1.2 + */ + export declare function _rawfile(bundleName: string, moduleName: string, name: string): Resource; ++ ++/** ++ * Obtain the resource in resources/rawfile, used by plugin. ++ * ++ * @param { number } id - Indicates the id of resource. ++ * @param { number } type - Indicates the type of resource. ++ * @param { string } bundleName - Indicates the name of bundle. ++ * @param { string } moduleName - Indicates the name of module. ++ * @param { Object[] } params - Custom parameters. ++ * @returns { Resource } Returns the resource instance. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++export declare function _rawfile( ++ id: number, type: number, bundleName: string, moduleName: string, ...params: Object[]): Resource; +diff --git a/api/arkui/stateManagement/base/decoratorBase.d.ets b/api/arkui/stateManagement/base/decoratorBase.d.ets +deleted file mode 100644 +index 47f8b147f..000000000 +--- a/api/arkui/stateManagement/base/decoratorBase.d.ets ++++ /dev/null +@@ -1,50 +0,0 @@ +-/* +- * Copyright (C) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +-/** +- * @file +- * @kit ArkUI +- * @arkts 1.2 +- */ +- +-import { WatchFuncType } from '../decorators/decoratorWatch'; +- +-export declare interface IDecoratedImmutableVariable { +- get(): T +-} +- +-export declare interface IDecoratedMutableVariable { +- get(): T +- set(newValue: T): void +-} +- +-export declare interface IDecoratedUpdatableVariable { +- update(newValue: T): void +-} +- +-export declare interface AbstractProperty extends IDecoratedMutableVariable { +- info(): string; +-} +- +-export declare interface SubscribedAbstractProperty extends AbstractProperty { +- aboutToBeDeleted(): void; +-} +- +-export declare class DecoratedVariableBase { +- public constructor(decorator: string, varName: string) +-} +- +-export declare class DecoratedV1VariableBase extends DecoratedVariableBase { +- public constructor(decorator: string, varName: string, initValue:T, watchFunc?: WatchFuncType) +-} +\ No newline at end of file +diff --git a/api/arkui/stateManagement/base/mutableStateMeta.d.ets b/api/arkui/stateManagement/base/mutableStateMeta.d.ets +deleted file mode 100644 +index 6aee33a1b..000000000 +--- a/api/arkui/stateManagement/base/mutableStateMeta.d.ets ++++ /dev/null +@@ -1,35 +0,0 @@ +-/* +- * Copyright (C) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +-/** +- * @file +- * @kit ArkUI +- * @arkts 1.2 +- */ +- +-export declare class MutableStateMetaBase { +- public constructor(decorator: string) +-} +- +-export declare class MutableStateMeta extends MutableStateMetaBase { +- public addRef(): void +- public fireChange(): void +- public constructor(decorator: string) +-} +- +-export declare class MutableKeyedStateMeta extends MutableStateMetaBase { +- public addRef(key: string): void +- public fireChange(key: string): void +- public constructor(decorator: string) +-} +\ No newline at end of file +diff --git a/api/arkui/stateManagement/common.d.ets b/api/arkui/stateManagement/common.d.ets +deleted file mode 100644 +index 2f4798536..000000000 +--- a/api/arkui/stateManagement/common.d.ets ++++ /dev/null +@@ -1,81 +0,0 @@ +-/* +- * Copyright (C) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +-/** +- * @file +- * @kit ArkUI +- * @arkts 1.2 +- */ +- +-@Retention({policy: "SOURCE"}) +-export declare @interface State {}; +- +-@Retention({policy: "SOURCE"}) +-export declare @interface Prop {}; +- +-@Retention({policy: "SOURCE"}) +-export declare @interface Link {}; +- +-@Retention({policy: "SOURCE"}) +-export declare @interface Observed {}; +- +-@Retention({policy: "SOURCE"}) +-export declare @interface Track {}; +- +-@Retention({policy: "SOURCE"}) +-export declare @interface ObjectLink {}; +- +-@Retention({policy: "SOURCE"}) +-export declare @interface StorageProp { +- property: string; +-}; +- +-@Retention({policy: "SOURCE"}) +-export declare @interface StorageLink { +- property: string; +-}; +- +-@Retention({policy: "SOURCE"}) +-export declare @interface LocalStorageProp { +- property: string; +-}; +- +-@Retention({policy: "SOURCE"}) +-export declare @interface LocalStorageLink { +- property: string; +-}; +- +-@Retention({policy: "SOURCE"}) +-export declare @interface Provide { +- alias: string = ""; +- allowOverride: boolean = false; +-}; +- +-@Retention({policy: "SOURCE"}) +-export declare @interface Consume { +- alias: string = ""; +-}; +- +-@Retention({policy: "SOURCE"}) +-export declare @interface Watch { +- callback: string; +-}; +- +-@Retention({policy: "SOURCE"}) +-export declare @interface Require {}; +- +-export declare class UIUtils { +- static getTarget(source: T): T; +- static makeObserved(source: T): T; +-} +diff --git a/api/arkui/stateManagement/decorator.d.ets b/api/arkui/stateManagement/decorator.d.ets +new file mode 100644 +index 000000000..4acc119c9 +--- /dev/null ++++ b/api/arkui/stateManagement/decorator.d.ets +@@ -0,0 +1,850 @@ ++/* ++ * Copyright (C) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++/** ++ * @file ++ * @kit ArkUI ++ * @arkts 1.2 ++ */ ++ ++import { ExtendableComponent } from '../component/extendableComponent'; ++ ++/** ++ * Defining State annotation ++ * State variable that holds the state property and is used to render the owning custom component. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface State {}; ++ ++/** ++ * Defining Prop annotation ++ * Prop is an annotation which is mutable, and its changes will not be synchronized to the parent component. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface Prop {}; ++ ++/** ++ * Defining PropRef annotation ++ * PropRef is an annotation which is mutable. ++ * Any object property modifications made through PropRef are visible in the ++ * parent component, which is different from Prop. ++ * In order to prevent this, need to take a deep copy of the parent data. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface PropRef {}; ++ ++/** ++ * Defining Link annotation ++ * Link decorated variable creates two-way synchronization with a variable of its parent component. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface Link {}; ++ ++/** ++ * Defining Observed annotation ++ * Observed is used to decorate a class. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface Observed {}; ++ ++/** ++ * Defining Track annotation ++ * Track is a decorator used to decorate properties of class objects. ++ * Any changes to the properties decorated by Track will trigger only updates to the UI associated with those properties. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface Track {}; ++ ++/** ++ * Defining ObjectLink annotation ++ * ObjectLink is used to observe property changes in nested class objects. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface ObjectLink {}; ++ ++/** ++ * Defining StorageProp annotation ++ * StorageProp a one-way data synchronization is established from the attribute with the given key in AppStorage to the variable. ++ * A local change can be made, but it will not be synchronized to AppStorage. ++ * An update to the attribute with the given key in AppStorage will overwrite local changes. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface StorageProp { ++ property: string; ++}; ++ ++/** ++ * Defining StoragePropRef annotation ++ * StoragePropRef is an annotation which is mutable. ++ * Any object property modifications made through StoragePropRef are visible in the ++ * AppStorage, which is different from StorageProp. ++ * In order to prevent this, need to take a deep copy of AppStorage instance data. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface StoragePropRef { ++ /** ++ * The give property in AppStorage. ++ * ++ * @type { string } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ property: string; ++}; ++ ++/** ++ * Defining StorageLink annotation ++ * StorageLink is used to create a two-way data synchronization between the variable ++ * it decorates and the attribute with the given key in AppStorage. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface StorageLink { ++ /** ++ * The give property in AppStorage. ++ * ++ * @type { string } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ property: string; ++}; ++ ++/** ++ * Defining LocalStorageProp annotation ++ * LocalStorageProp is a one-way data synchronization is established from the attribute with the given key in ++ * LocalStorage to the variable. This means that, local changes ++ * (if any) will not be synchronized to LocalStorage, and an update to the attribute with the given key in LocalStorage. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface LocalStorageProp { ++ /** ++ * The give property in LocalStorage. ++ * ++ * @type { string } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ property: string; ++}; ++ ++/** ++ * Defining LocalStoragePropRef annotation ++ * LocalStoragePropRef is an annotation which is mutable. ++ * Any object property modifications made through LocalStoragePropRef are visible in the ++ * LocalStorage, which is different from LocalStorageProp. ++ * In order to prevent this, need to take a deep copy of LocalStorage data. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface LocalStoragePropRef { ++ /** ++ * The give property in AppStorage. ++ * ++ * @type { string } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ property: string; ++}; ++ ++/** ++ * Defining LocalStorageLink annotation ++ * LocalStorageLink is used to create a two-way data synchronization with the attribute ++ * in LocalStorage. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface LocalStorageLink { ++ /** ++ * The give property in LocalStorage. ++ * ++ * @type { string } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ property: string; ++}; ++ ++/** ++ * Defining Provide annotation ++ * Provide is used for two-way data synchronization with descendant components when ++ * state data needs to be transferred between multiple levels. An @Provide decorated state ++ * variable exists in the ancestor component and is said to be "provided" to descendent components. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface Provide { ++ /** ++ * The alias name. ++ * ++ * @type { string } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ alias: string = ""; ++ /** ++ * allowOverride is used to override an existing @Provide decorated variable. ++ * ++ * @type { boolean } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ allowOverride: boolean = false; ++}; ++ ++/** ++ * Defining Consume annotation ++ * Consume is used to access the provided state variable for a descendent component ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface Consume { ++ /** ++ * The alias name. ++ * ++ * @type { string } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ alias: string = ""; ++}; ++ ++/** ++ * Defining Watch annotation ++ * Watch is used to listen for state variables. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface Watch { ++ /** ++ * The callback function name. ++ * ++ * @type { string } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ callback: string; ++}; ++ ++/** ++ * Defining Require annotation ++ * Require is a decorator for declaring that parameters – regular variables. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface Require {}; ++ ++/** ++ * Defining Local annotation ++ * Local is the internal state of a component, which enables the variables in the ++ * custom component to observe changes. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface Local {}; ++ ++/** ++ * Defining Param annotation ++ * Param indicates the state passed in from the external, ensuring that ++ * data can be synchronized between the parent and child components. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface Param {}; ++ ++/** ++ * Defining Once annotation ++ * Once annotation accepts values passed in only during variable initialization ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface Once {}; ++ ++/** ++ * Defining Event annotation ++ * Event is used to decorate the callback method is a standard, indicating that the ++ * child component needs to pass in the callback for updating the data source. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface Event {}; ++ ++/** ++ * Defining Provider annotation ++ * Provider is used for two-way data synchronization with descendant components when ++ * state data needs to be transferred between multiple levels. An @Provider decorated state ++ * variable exists in the ancestor component and is said to be "provider" to descendent components. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface Provider { ++ /** ++ * The alias name. ++ * ++ * @type { string } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ alias: string = ""; ++}; ++ ++/** ++ * Defining Consumer annotation ++ * Consumer is used to access the provided state variable for a descendent component ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface Consumer { ++ /** ++ * The alias name. ++ * ++ * @type { string } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ alias: string = ""; ++}; ++ ++/** ++ * Defining ObservedV2 annotation ++ * ObservedV2 is used to decorate with class. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface ObservedV2 {}; ++ ++/** ++ * Defining Trace annotation ++ * Trace is used to directly observe the property changes of nested objects ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface Trace {}; ++ ++/** ++ * Defining Computed annotation ++ * Computed is a method decorator that decorates the getter method. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface Computed {}; ++ ++/** ++ * Defining Monitor annotation ++ * Monitor provides the capability of listening for state variables of V2. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++@Retention({policy: "SOURCE"}) ++export declare @interface Monitor { ++ /** ++ * Listened property name. ++ * ++ * @type { string[] } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ path: string[]; ++}; ++ ++/** ++ * Define IMonitor interface ++ * ++ * @interface IMonitor ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++declare interface IMonitor { ++ /** ++ * Array of changed paths(keys) ++ * ++ * @type { Array } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ dirty: Array; ++ /** ++ * Return the pair of the value before the most recent change and current value for given path. ++ * If path does not exist, return undefined; If path is not specified, return the value pair corresponding to the first path in dirty. ++ * ++ * @param { string } [path] Listened property name ++ * @returns { IMonitorValue | undefined } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ value(path?: string): IMonitorValue | undefined; ++} ++ ++/** ++ * Define IMonitorValue interface ++ * ++ * @interface IMonitorValue ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++declare interface IMonitorValue { ++ /** ++ * Get the previous value. ++ * ++ * @type { T } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ before: T; ++ /** ++ * Get current value. ++ * ++ * @type { T } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ now: T; ++ /** ++ * Monitored path input by the user. ++ * ++ * @type { string } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ path: string; ++} ++ ++/** ++ * Define decorated variable interface. ++ * ++ * @interface IDecoratedVariable ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare interface IDecoratedVariable { ++ /** ++ * Decorated variable name. ++ * ++ * @type { string } ++ * @readonly ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ readonly varName: string; ++} ++ ++/** ++ * Define V1 decorated variable interface. ++ * ++ * @extends IDecoratedVariable ++ * @interface IDecoratedVariable ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare interface IDecoratedV1Variable extends IDecoratedVariable { ++ /** ++ * Registers the watch callback function with the data source. ++ * ++ * @param { IDecoratedV1Variable } decoratedVar ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ registerWatchToSource(decoratedVar: IDecoratedV1Variable): void; ++} ++ ++/** ++ * Define decorated immutable variable interface. ++ * ++ * @interface IDecoratedImmutableVariable ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare interface IDecoratedImmutableVariable { ++ /** ++ * Get the state variable. ++ * ++ * @returns { T } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ get(): T; ++} ++ ++/** ++ * Define decorated mutable variable interface. ++ * ++ * @interface IDecoratedMutableVariable ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare interface IDecoratedMutableVariable { ++ /** ++ * Get the state variable. ++ * ++ * @returns { T } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ get(): T; ++ /** ++ * Set the state variable with a new Value. ++ * ++ * @param { T } newValue ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ set(newValue: T): void; ++} ++ ++/** ++ * Define decorated updatable variable interface. ++ * ++ * @interface IDecoratedUpdatableVariable ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare interface IDecoratedUpdatableVariable { ++ /** ++ * Update the state variable with a new Value. ++ * ++ * @param { T } newValue ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ update(newValue: T): void; ++} ++ ++/** ++ * Define state decoration variable interface. ++ * ++ * @extends IDecoratedMutableVariable, IDecoratedV1Variable ++ * @interface IStateDecoratedVariable ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare interface IStateDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} ++ ++export declare interface IPropDecoratedVariable extends IDecoratedMutableVariable, ++ IDecoratedUpdatableVariable, IDecoratedV1Variable { ++} ++ ++/** ++ * Define PropRef decoration variable interface. ++ * ++ * @extends IDecoratedMutableVariable, IDecoratedUpdatableVariable, IDecoratedV1Variable ++ * @interface IPropRefDecoratedVariable ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare interface IPropRefDecoratedVariable extends IDecoratedMutableVariable, ++ IDecoratedUpdatableVariable, IDecoratedV1Variable {} ++ ++/** ++ * Define LocalStoragePropRef decoration variable interface. ++ * ++ * @extends IDecoratedMutableVariable, IDecoratedV1Variable ++ * @interface ILocalStoragePropRefDecoratedVariable ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare interface ILocalStoragePropRefDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} ++ ++/** ++ * Define Link decoration variable interface. ++ * ++ * @extends IDecoratedMutableVariable, IDecoratedV1Variable ++ * @interface ILinkDecoratedVariable ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare interface ILinkDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} ++ ++/** ++ * Define Provide decoration variable interface. ++ * ++ * @extends IDecoratedMutableVariable, IDecoratedV1Variable ++ * @interface IProvideDecoratedVariable ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare interface IProvideDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} ++ ++/** ++ * Define Consume decoration variable interface. ++ * ++ * @extends IDecoratedMutableVariable, IDecoratedV1Variable ++ * @interface IConsumeDecoratedVariable ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare interface IConsumeDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} ++ ++/** ++ * Define ObjectLink decoration variable interface. ++ * ++ * @extends IDecoratedImmutableVariable, IDecoratedUpdatableVariable, IDecoratedV1Variable ++ * @interface IObjectLinkDecoratedVariable ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare interface IObjectLinkDecoratedVariable extends IDecoratedImmutableVariable, ++ IDecoratedUpdatableVariable, IDecoratedV1Variable {} ++ ++/** ++ * Define StorageLink decoration variable interface. ++ * ++ * @extends IDecoratedMutableVariable, IDecoratedV1Variable ++ * @interface IStorageLinkDecoratedVariable ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare interface IStorageLinkDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} ++ ++/** ++ * Define StorageProp decoration variable interface. ++ * ++ * @extends IDecoratedMutableVariable, IDecoratedV1Variable ++ * @interface IStoragePropDecoratedVariable ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare interface IStoragePropDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable { ++} ++ ++/** ++ * Define StoragePropRef decoration variable interface. ++ * ++ * @extends IDecoratedMutableVariable, IDecoratedV1Variable ++ * @interface IStoragePropRefDecoratedVariable ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare interface IStoragePropRefDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} ++ ++/** ++ * Define LocalStorageLink decoration variable interface. ++ * ++ * @extends IDecoratedMutableVariable, IDecoratedV1Variable ++ * @interface ILocalStorageLinkDecoratedVariable ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare interface ILocalStorageLinkDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} ++ ++/** ++ * Define Link source type. ++ * ++ * @typedef { IStateDecoratedVariable | ILinkDecoratedVariable | IObjectLinkDecoratedVariable | ++ IPropDecoratedVariable | IStorageLinkDecoratedVariable | ILocalStorageLinkDecoratedVariable | IStoragePropRefDecoratedVariable | ++ IProvideDecoratedVariable | IConsumeDecoratedVariable } LinkSourceType ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export type LinkSourceType = IStateDecoratedVariable | ILinkDecoratedVariable | IObjectLinkDecoratedVariable | ++ IPropDecoratedVariable | IStorageLinkDecoratedVariable | ILocalStorageLinkDecoratedVariable | IStoragePropRefDecoratedVariable | ++ IProvideDecoratedVariable | IConsumeDecoratedVariable; ++ ++ ++/** ++ * Define mutable state meta interface. ++ * ++ * @interface IMutableStateMeta ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare interface IMutableStateMeta { ++ /** ++ * Collect the dependancy for UI component with state variable ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ addRef(): void; ++ /** ++ * Notify UI component to update when state variable is changed ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ fireChange(): void; ++} ++ ++export declare interface IMutableKeyedStateMeta { ++ addRef(key: string): void; ++ addRef(index: int): void; ++ fireChange(key: string): void; ++ fireChange(index: int): void; ++} ++ ++export declare interface IObserve { ++ readonly renderingComponent: number; ++ readonly renderingId: RenderIdType; ++ shouldAddRef(iObjectsRenderId: RenderIdType): boolean; ++} ++ ++export declare const OBSERVE: IObserve; ++ ++export type RenderIdType = int; ++ ++export declare interface IObservedObject extends IWatchSubscriberRegister { ++ setV1RenderId(renderId: RenderIdType): void; ++} ++ ++export declare const STATE_MGMT_FACTORY: IStateMgmtFactory; ++ ++export declare interface IStateMgmtFactory { ++ makeMutableStateMeta(): IMutableStateMeta; ++ makeSubscribedWatches(): ISubscribedWatches; ++ makeState(owningView: ExtendableComponent, varName: string, initValue: T, ++ watchFunc?: WatchFuncType): IStateDecoratedVariable; ++ makeProp(owningView: ExtendableComponent, varName: string, initValue: T, ++ watchFunc?: WatchFuncType): IPropDecoratedVariable; ++ makeLink(owningView: ExtendableComponent, varName: string, source: LinkSourceType, ++ watchFunc?: WatchFuncType): ILinkDecoratedVariable; ++ makeProvide(owningView: ExtendableComponent, varName: string, provideAlias: string, ++ initValue: T, allowOverride: boolean, wathcFunc?: WatchFuncType): IProvideDecoratedVariable; ++ makeConsume(owningView: ExtendableComponent, varName: string, ++ provideAlias: string, watchFunc?: WatchFuncType): IConsumeDecoratedVariable; ++ makeObjectLink(owningView: ExtendableComponent, varName: string, ++ initValue: T, wathcFunc?: WatchFuncType): IObjectLinkDecoratedVariable; ++ ++ /** ++ * Create a PropRef variable instance. ++ * ++ * @param { ExtendableComponent } owningView - custom component. ++ * @param { string } varName - state variable name. ++ * @param { T } initValue - state variable initValue. ++ * @param { WatchFuncType } [watchFunc] - watch type ++ * @returns { IPropRefDecoratedVariable } PropRef instance ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ makePropRef(owningView: ExtendableComponent, varName: string, initValue: T, ++ watchFunc?: WatchFuncType): IPropRefDecoratedVariable; ++ ++ /** ++ * Create a StorageLink variable instance. ++ * ++ * @param { ExtendableComponent } owningView - custom component. ++ * @param { string } propName - property name. ++ * @param { string } varName - state variable name. ++ * @param { T } initValue - init value. ++ * @param { Type } ttype - value type. ++ * @param { WatchFuncType } [watchFunc] - watch type ++ * @returns { IStorageLinkDecoratedVariable } StorageLink instance ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ makeStorageLink(owningView: ExtendableComponent, propName: string, ++ varName: string, initValue: T, ttype: Type, watchFunc?: WatchFuncType): IStorageLinkDecoratedVariable; ++ /** ++ * Create a StoragePropRef variable instance. ++ * ++ * @param { ExtendableComponent } owningView - custom component. ++ * @param { string } propName - property name. ++ * @param { string } varName - state variable name. ++ * @param { T } initValue - init value. ++ * @param { Type } ttype - value type. ++ * @param { WatchFuncType } [watchFunc] - watch type ++ * @returns { IStoragePropRefDecoratedVariable } StoragePropRef instance ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ makeStoragePropRef(owningView: ExtendableComponent, propName: string, ++ varName: string, initValue: T, ttype: Type, watchFunc?: WatchFuncType): IStoragePropRefDecoratedVariable; ++ /** ++ * Create a LocalStoragePropRef variable instance. ++ * ++ * @param { ExtendableComponent } owningView - custom component. ++ * @param { string } propName - property name. ++ * @param { string } varName - state variable name. ++ * @param { T } initValue - init value. ++ * @param { Type } ttype - value type. ++ * @param { WatchFuncType } [watchFunc] - watch type ++ * @returns { ILocalStoragePropRefDecoratedVariable } LocalStoragePropRef instance ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ makeLocalStoragePropRef(owningView: ExtendableComponent, propName: string, ++ varName: string, initValue: T, ttype: Type, watchFunc?: WatchFuncType): ILocalStoragePropRefDecoratedVariable; ++ ++ /** ++ * Create a LocalStorageLink variable instance. ++ * ++ * @param { ExtendableComponent } owningView - custom component. ++ * @param { string } propName - property name. ++ * @param { string } varName - state variable name. ++ * @param { T } initValue - init value. ++ * @param { Type } ttype - value type ++ * @param { WatchFuncType } [watchFunc] - watch type ++ * @returns { ILocalStorageLinkDecoratedVariable } LocalStorageLink instance ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ makeLocalStorageLink(owningView: ExtendableComponent, propName: string, ++ varName: string, initValue: T, ttype: Type, watchFunc?: WatchFuncType): ILocalStorageLinkDecoratedVariable; ++} ++ ++export type WatchFuncType = ((propertyName: string) => void); ++ ++export type WatchIdType = int; ++ ++export declare interface IWatchSubscriberRegister { ++ addWatchSubscriber(watchId: WatchIdType): void; ++ removeWatchSubscriber(watchId: WatchIdType): boolean; ++} ++ ++export declare interface ISubscribedWatches extends IWatchSubscriberRegister { ++ executeOnSubscribingWatches(propertyName: string): void; ++} ++ ++export declare interface AbstractProperty extends IDecoratedMutableVariable { ++ info(): string; ++} ++ ++export declare interface SubscribedAbstractProperty extends AbstractProperty { ++ aboutToBeDeleted(): void; ++} +\ No newline at end of file +diff --git a/api/arkui/stateManagement/decorators/decoratorConsume.d.ets b/api/arkui/stateManagement/decorators/decoratorConsume.d.ets +deleted file mode 100644 +index bedeb8b5d..000000000 +--- a/api/arkui/stateManagement/decorators/decoratorConsume.d.ets ++++ /dev/null +@@ -1,35 +0,0 @@ +-/* +- * Copyright (C) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +-/** +- * @file +- * @kit ArkUI +- * @arkts 1.2 +- */ +- +-import { DecoratedV1VariableBase, IDecoratedMutableVariable } from '../base/decoratorBase'; +-import { ProvideDecoratedVariable } from './decoratorProvide' +-import { WatchIdType, WatchFuncType } from './decoratorWatch'; +- +-export declare class ConsumeDecoratedVariable extends DecoratedV1VariableBase +- implements IDecoratedMutableVariable { +- public constructor( +- varName: string, +- provideAlias: string, +- source: ProvideDecoratedVariable, +- watchFunc?: WatchFuncType +- ) +- public get(): T +- public set(newValue: T): void +-} +\ No newline at end of file +diff --git a/api/arkui/stateManagement/decorators/decoratorObjectLink.d.ets b/api/arkui/stateManagement/decorators/decoratorObjectLink.d.ets +deleted file mode 100644 +index c94321977..000000000 +--- a/api/arkui/stateManagement/decorators/decoratorObjectLink.d.ets ++++ /dev/null +@@ -1,29 +0,0 @@ +-/* +- * Copyright (C) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +-/** +- * @file +- * @kit ArkUI +- * @arkts 1.2 +- */ +- +-import { DecoratedV1VariableBase, IDecoratedImmutableVariable, IDecoratedUpdatableVariable } from '../base/decoratorBase'; +-import { WatchFuncType } from './decoratorWatch'; +- +-export declare class ObjectLinkDecoratedVariable extends DecoratedV1VariableBase +- implements IDecoratedImmutableVariable, IDecoratedUpdatableVariable { +- public constructor(varName: string, parentInitValue: T, watchFunc?: WatchFuncType) +- public get(): T +- public update(newValue: T): void +-} +\ No newline at end of file +diff --git a/api/arkui/stateManagement/decorators/decoratorProp.d.ets b/api/arkui/stateManagement/decorators/decoratorProp.d.ets +deleted file mode 100644 +index 89eb7968b..000000000 +--- a/api/arkui/stateManagement/decorators/decoratorProp.d.ets ++++ /dev/null +@@ -1,30 +0,0 @@ +-/* +- * Copyright (C) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +-/** +- * @file +- * @kit ArkUI +- * @arkts 1.2 +- */ +- +-import { DecoratedV1VariableBase, IDecoratedMutableVariable, IDecoratedUpdatableVariable } from '../base/decoratorBase'; +-import { WatchFuncType } from './decoratorWatch'; +- +-export declare class PropDecoratedVariable extends DecoratedV1VariableBase +- implements IDecoratedMutableVariable, IDecoratedUpdatableVariable { +- public constructor(varName: string, sourceValue: T, watchFunc?: WatchFuncType) +- public get(): T +- public set(newValue: T): void +- public update(newValue: T): void +-} +\ No newline at end of file +diff --git a/api/arkui/stateManagement/decorators/decoratorState.d.ets b/api/arkui/stateManagement/decorators/decoratorState.d.ets +deleted file mode 100644 +index 5992f62fc..000000000 +--- a/api/arkui/stateManagement/decorators/decoratorState.d.ets ++++ /dev/null +@@ -1,35 +0,0 @@ +-/* +- * Copyright (C) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +-/** +- * @file +- * @kit ArkUI +- * @arkts 1.2 +- */ +- +-import { DecoratedV1VariableBase, IDecoratedMutableVariable } from '../base/decoratorBase'; +-import { PropDecoratedVariable } from './decoratorProp'; +-import { WatchIdType, WatchFuncType } from './decoratorWatch'; +- +-export declare interface __MkPropReturnType { +- prop: PropDecoratedVariable; +- watchId: WatchIdType; +-} +- +-export declare class StateDecoratedVariable extends DecoratedV1VariableBase +- implements IDecoratedMutableVariable { +- public constructor(varName: string, initValue: T, watchFunc?: WatchFuncType) +- public get(): T +- public set(newValue: T): void +-} +\ No newline at end of file +diff --git a/api/arkui/stateManagement/decorators/decoratorStorageLink.d.ets b/api/arkui/stateManagement/decorators/decoratorStorageLink.d.ets +deleted file mode 100644 +index 45821e860..000000000 +--- a/api/arkui/stateManagement/decorators/decoratorStorageLink.d.ets ++++ /dev/null +@@ -1,31 +0,0 @@ +-/* +- * Copyright (C) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-/** +- * @file +- * @kit ArkUI +- * @arkts 1.2 +- */ +- +-import { DecoratedV1VariableBase, IDecoratedMutableVariable } from '../base/decoratorBase'; +-import { WatchFuncType } from './decoratorWatch'; +- +-export declare class StorageLinkDecoratedVariable extends DecoratedV1VariableBase +- implements IDecoratedMutableVariable { +- public constructor(propName: string, varName: string, localValue: T, watchFunc?: WatchFuncType) +- public getInfo(): string +- public get(): T +- public set(newValue: T): void +-} +\ No newline at end of file +diff --git a/api/arkui/stateManagement/decorators/decoratorStorageProp.d.ets b/api/arkui/stateManagement/decorators/decoratorStorageProp.d.ets +deleted file mode 100644 +index 574844395..000000000 +--- a/api/arkui/stateManagement/decorators/decoratorStorageProp.d.ets ++++ /dev/null +@@ -1,30 +0,0 @@ +-/* +- * Copyright (C) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +-/** +- * @file +- * @kit ArkUI +- * @arkts 1.2 +- */ +- +-import { DecoratedV1VariableBase, IDecoratedMutableVariable } from '../base/decoratorBase'; +-import { WatchFuncType } from './decoratorWatch'; +- +-export declare class StoragePropDecoratedVariable extends DecoratedV1VariableBase +- implements IDecoratedMutableVariable { +- public constructor(propName: string, varName:string, localVal: T, watchFunc?: WatchFuncType) +- public getInfo(): string +- public get(): T +- public set(newValue: T): void +-} +\ No newline at end of file +diff --git a/api/arkui/stateManagement/decorators/decoratorWatch.d.ets b/api/arkui/stateManagement/decorators/decoratorWatch.d.ets +deleted file mode 100644 +index 9607eb38c..000000000 +--- a/api/arkui/stateManagement/decorators/decoratorWatch.d.ets ++++ /dev/null +@@ -1,40 +0,0 @@ +-/* +- * Copyright (C) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +-/** +- * @file +- * @kit ArkUI +- * @arkts 1.2 +- */ +-import { int32 } from '@koalaui.runtime.common'; +- +-export type WatchFuncType = ((propertyName: string) => void); +- +-export type WatchIdType = int32; +- +-export declare class WatchFunc { +- public constructor(func: WatchFuncType) +-} +- +-export declare interface IWatchTrigger { +- addWatchSubscriber(watchId: WatchIdType): void +- removeWatchSubscriber(watchId: WatchIdType): boolean +- executeOnSubscribingWatches(propertyName: string): void +-} +- +-export declare class SubscribedWatches implements IWatchTrigger { +- public addWatchSubscriber(id: WatchIdType): void +- public removeWatchSubscriber(id: WatchIdType): boolean +- public executeOnSubscribingWatches(propertyName: string): void +-} +\ No newline at end of file +diff --git a/api/arkui/stateManagement/storage.d.ets b/api/arkui/stateManagement/storage.d.ets +deleted file mode 100644 +index d9db07a64..000000000 +--- a/api/arkui/stateManagement/storage.d.ets ++++ /dev/null +@@ -1,339 +0,0 @@ +-/* +- * Copyright (C) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +-/** +- * @file +- * @kit ArkUI +- * @arkts 1.2 +- */ +- +-export interface StorageProperty { +- key: string; +- defaultValue: number | string | boolean | Object; +-} +- +-export type PersistPropsOptions = StorageProperty; +- +-interface AbstractProperty { +- info(): string; +- get(): T; +- set(newValue: T): void; +-} +- +-interface SubscribedAbstractProperty extends AbstractProperty { +- aboutToBeDeleted(): void; +-} +- +-declare class LocalStorage { +- static getShared(): LocalStorage | undefined; +- +- constructor(initializingProperties?: StorageProperty[]); +- +- has(propName: string): boolean; +- +- keys(): IterableIterator; +- +- size(): int; +- +- get(propName: string): T | undefined; +- +- set(propName: string, newValue: T): boolean; +- +- setOrCreate(propName: string, newValue?: T): boolean; +- +- ref(propName: string): AbstractProperty | undefined; +- +- setAndRef(propName: string, defaultValue: T): AbstractProperty; +- +- link(propName: string): SubscribedAbstractProperty | undefined; +- +- setAndLink(propName: string, defaultValue: T): SubscribedAbstractProperty; +- +- prop(propName: string): SubscribedAbstractProperty | undefined; +- +- setAndProp(propName: string, defaultValue: T): SubscribedAbstractProperty; +- +- delete(propName: string): boolean; +- +- clear(): boolean; +-} +- +-declare class AppStorage { +- static has(propName: string): boolean; +- +- static keys(): IterableIterator; +- +- static size(): int; +- +- static get(propName: string): T | undefined; +- +- static set(propName: string, newValue: T): boolean; +- +- static setOrCreate(propName: string, newValue?: T): boolean; +- +- static ref(propName: string): AbstractProperty | undefined; +- +- static setAndRef(propName: string, defaultValue: T): AbstractProperty; +- +- static link(propName: string): SubscribedAbstractProperty | undefined; +- +- static setAndLink(propName: string, defaultValue: T): SubscribedAbstractProperty; +- +- static prop(propName: string): SubscribedAbstractProperty | undefined; +- +- static setAndProp(propName: string, defaultValue: T): SubscribedAbstractProperty; +- +- static delete(propName: string): boolean; +- +- static clear(): boolean; +-} +- +-export declare class PersistentStorage { +- +- static persistProp(key: string, defaultValue: T): void; +- +- static deleteProp(key: string): void; +- +- static persistProps(props: PersistPropsOptions[]): void; +- +- static keys(): Array; +-} +- +-export interface EnvPropsOptions { +- key: string; +- defaultValue: number | string | boolean; +-} +- +-export declare class Environment { +- static envProp(key: string, value: S): boolean; +- +- static envProps(props: EnvPropsOptions[]): void; +- +- static keys(): Array; +-} +- +- +-/** +- * Function that returns default creator. +- * +- * @typedef { function } StorageDefaultCreator +- * @returns { T } default creator +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 12 +- */ +-export type StorageDefaultCreator = () => T; +- +-/** +- * Define class constructor with arbitrary parameters. +- * @interface TypeConstructorWithArgs +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 12 +- */ +-// #ToDO: fix +-export interface TypeConstructorWithArgs { +- /** +- * @param { any } args the arguments of the constructor. +- * @returns { T } return class instance. +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 12 +- */ +- // new(...args: Array): T; +-} +- +-/** +- * AppStorageV2 is for UI state of app-wide access, has same life cycle as the app, +- * and saves database content only in memory. +- * +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 12 +- */ +-export declare class AppStorageV2 { +- /** +- * If the value for the given key is already available, return the value. +- * If not, add the key with value generated by calling defaultFunc and return it to caller. +- * +- * @param { TypeConstructorWithArgs } type class type of the stored value. +- * @param { string | StorageDefaultCreator } [keyOrDefaultCreator] alias name of the key, +- * or the function generating the default value. +- * @param { StorageDefaultCreator } [defaultCreator] the function generating the default value +- * @returns { T | undefined } the value of the existed key or the default value +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 12 +- */ +- static connect( +- type: TypeConstructorWithArgs, +- keyOrDefaultCreator?: string | StorageDefaultCreator, +- defaultCreator?: StorageDefaultCreator +- ): T | undefined; +- +- /** +- * Removes data with the given key or given class type. +- * +- * @param { string | TypeConstructorWithArgs } keyOrType key or class type removing +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 12 +- */ +- static remove(keyOrType: string | TypeConstructorWithArgs): void; +- /** +- * Return the array of all keys. +- * +- * @returns { Array } the array of all keys +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 12 +- */ +- static keys(): Array; +-} +- +-/** +- * Function that returns reason type when error. +- * +- * @typedef { function } PersistenceErrorCallback +- * @param { string } key persisted key when error +- * @param { 'quota' | 'serialization' | 'unknown' } reason reason type when error +- * @param { string } message more message when error +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 12 +- */ +-export type PersistenceErrorCallback = (key: string, reason: 'quota' | 'serialization' | 'unknown', message: string) => void; +- +-/** +- * PersistenceV2 is for UI state of app-wide access, available on app re-start, +- * and saves database content in disk. +- * +- * @extends AppStorageV2 +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 12 +- */ +-export declare class PersistenceV2 extends AppStorageV2 { +- /** +- * Used to manually persist data changes to disks. +- * +- * @param { string | TypeConstructorWithArgs } keyOrType key or class type need to persist. +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 12 +- */ +- static save(keyOrType: string | TypeConstructorWithArgs): void; +- +- /** +- * Be called when persisting has encountered an error. +- * +- * @param { PersistenceErrorCallback | undefined } callback called when error +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 12 +- */ +- static notifyOnError(callback: PersistenceErrorCallback | undefined): void; +-} +- +-/** +- * Define TypeConstructor type. +- * +- * @interface TypeConstructor +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 12 +- */ +-export interface TypeConstructor { +- /** +- * @returns { T } +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 12 +- */ +- // new(): T; +-} +- +-/** +- * Function that returns PropertyDecorator. +- * +- * @typedef { function } TypeDecorator +- * @param { TypeConstructor } type type info +- * @returns { PropertyDecorator } Type decorator +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 12 +- */ +-// export type TypeDecorator = (type: TypeConstructor) => PropertyDecorator; +- +- +-/** +- * Define Type PropertyDecorator, adds type information to an object. +- * +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 12 +- */ +-// export declare const Type: TypeDecorator; +- +-/** +- * UIUtils is a state management tool class for operating the observed data. +- * +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 12 +- */ +-export declare class UIUtils { +- /** +- * Get raw object from the Object wrapped with an ObservedObject. +- * If input parameter is a regular Object without ObservedObject, return Object itself. +- * +- * @param { T } source input source Object data. +- * @returns { T } raw object from the Object wrapped with an ObservedObject. +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 12 +- */ +- static getTarget(source: T): T; +- +- /** +- * Make non-observed data into observed data. +- * Support non-observed class, JSON.parse Object and Sendable class. +- * +- * @param { T } source input source object data. +- * @returns { T } proxy object from the source object data. +- * @syscap SystemCapability.ArkUI.ArkUI.Full +- * @crossplatform +- * @atomicservice +- * @since 12 +- */ +- static makeObserved(source: T): T; +- +-} +\ No newline at end of file +diff --git a/api/arkui/stateManagement/base/iObservedObject.d.ets b/api/arkui/stateManagement/storage/appStorage.d.ets +similarity index 70% +rename from api/arkui/stateManagement/base/iObservedObject.d.ets +rename to api/arkui/stateManagement/storage/appStorage.d.ets +index 0ea4c2fe5..4a3bf1b8f 100644 +--- a/api/arkui/stateManagement/base/iObservedObject.d.ets ++++ b/api/arkui/stateManagement/storage/appStorage.d.ets +@@ -17,12 +17,7 @@ + * @kit ArkUI + * @arkts 1.2 + */ +-import { int32 } from '@koalaui.runtime.common'; + +-export declare interface IObservedObject { +- _permissibleAddRefDepth: int32; +-} ++import { LocalStorage } from './localStorage'; + +-export declare function castToIObservedObject(obj: T): T | undefined; +- +-export declare function setObservationDepth(obj: T, depth: int32): void; +\ No newline at end of file ++export const AppStorage: LocalStorage = new LocalStorage(); +diff --git a/api/arkui/stateManagement/storage/environment.d.ets b/api/arkui/stateManagement/storage/environment.d.ets +new file mode 100644 +index 000000000..0a5fef29d +--- /dev/null ++++ b/api/arkui/stateManagement/storage/environment.d.ets +@@ -0,0 +1,91 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"), ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++/** ++ * @file ++ * @kit ArkUI ++ * @arkts 1.2 ++ */ ++ ++/** ++ * EnvProps object ++ * ++ * @interface EnvPropsOptions ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare interface EnvPropsOptions { ++ ++ /** ++ * Property name of Environment variable ++ * ++ * @type { string } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ key: string; ++ ++ /** ++ * DefaultValue is the default value if cannot get the environment property value ++ * ++ * @type { number | string | boolean } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ defaultValue: number | string | boolean; ++} ++ ++/** ++ * Defines the Environment interface. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare class Environment { ++ /** ++ * Creates a new property in AppStorage. The UI framework implementation takes care of updating ++ * its value whenever the named device environment property changes. Recommended use is at app startup. ++ * The function call fails and returns false if a property with given name exists in AppStorage already. ++ * It is wrong API use to access a property with given name in AppStorage before calling Environment.envProp. ++ * ++ * @param { string } key - environment property ++ * @param { T } value - is the default value if cannot get the environment property value ++ * @returns { boolean } false if method failed ++ * @static ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ static envProp(key: string, value: T): boolean; ++ ++ /** ++ * Called when multiple property values are added to Environment. ++ * ++ * @param { EnvPropsOptions[] } props environment parameter ++ * @static ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ static envProps(props: EnvPropsOptions[]): void; ++ ++ /** ++ * returns an Array of all environment property keys ++ * ++ * @returns { Array } all environment property keys ++ * @static ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ static keys(): Array; ++} +\ No newline at end of file +diff --git a/api/arkui/stateManagement/storage/localStorage.d.ets b/api/arkui/stateManagement/storage/localStorage.d.ets +new file mode 100644 +index 000000000..4ddea45ee +--- /dev/null ++++ b/api/arkui/stateManagement/storage/localStorage.d.ets +@@ -0,0 +1,197 @@ ++/* ++ * Copyright (C) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++/** ++ * @file ++ * @kit ArkUI ++ * @arkts 1.2 ++ */ ++ ++import { IStorageProperties, AbstractProperty, SubscribedAbstractProperty } from './storageProperty'; ++ ++/** ++ * LocalStorage ++ * Class implements a Map of ObservableObjectBase UI state variables. ++ * Instances can be created to manage UI state within a limited "local" ++ * access, and life cycle as defined by the app. ++ * AppStorage singleton is sub-class of LocalStorage for ++ * UI state of app-wide access and same life cycle as the app. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare class LocalStorage { ++ /** ++ * Construct new instance of LocalStorage ++ * initialize with all properties and their values that Object.keys(params) returns ++ * Property values must not be undefined. ++ * ++ * @param { Record } [initializingProperties] - Record ++ * containing keys and values. ++ * see set() for valid values ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ public constructor(initializingProperties?: Record); ++ /** ++ * Obtain a handler or an alias to LocalStorage property with given name. ++ * ++ * @param { string } propName LocalStorage property name ++ * @param {Type} ttype - data type ++ * @returns { AbstractProperty | undefined } AbstractProperty object if property with given name exists ++ * return undefined otherwise. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ public ref(propName: string, ttype: Type): AbstractProperty | undefined; ++ /** ++ * Obtain a handler or an alias to LocalStorage property with given name. ++ * ++ * If property does not exist in LocalStorage, create it with given default value. ++ * ++ * @param { string } propName LocalStorage property name ++ * @param { T } defaultValue If property does not exist in LocalStorage, ++ * create it with given default value. ++ * @param {Type} ttype - data type ++ * @returns { AbstractProperty } AbstractProperty object ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ public setAndRef(propName: string, defaultValue: T, ttype: Type): AbstractProperty; ++ /** ++ * Create and return a two-way sync "(link") to named property ++ * ++ * @param { string } propName - name of source property in LocalStorage ++ * @param { Type } ttype - data type ++ * @returns { SubscribedAbstractProperty | undefined } instance of SubscribedAbstractProperty ++ * return undefined if named property does not already exist in LocalStorage ++ * Apps can use SDK functions of base class SubscribedPropertyAbstract ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @crossplatform ++ * @since 20 ++ */ ++ public link(propName: string, ttype: Type): SubscribedAbstractProperty | undefined; ++ ++ /** ++ * Like see link(), but will create and initialize a new source property in LocalStorage if missing ++ * ++ * @param { string } propName - name of source property in LocalStorage ++ * @param { T } defaultValue - value to be used for initializing new property in LocalStorage ++ * default value must be of type T, can be undefined or null. ++ * @param { Type } ttype - data type ++ * @returns { SubscribedAbstractProperty } instance of SubscribedAbstractProperty ++ * Apps can use SDK functions of base class SubscribedAbstractProperty ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ public setAndLink(propName: string, defaultValue: T, ttype: Type): SubscribedAbstractProperty; ++ ++ /** ++ * Check if LocalStorage has a property with given name ++ * return true if property with given name exists ++ * same as ES6 Map.prototype.has() ++ * ++ * @param { string } propName - searched property ++ * @param { Type } [ttype] - data type ++ * @returns { boolean } true if property with such name exists in LocalStorage ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ public has(propName: string, ttype?: Type): boolean; ++ /** ++ * Returns value of given property ++ * return undefined if no property with this name ++ * ++ * @param { string } propName - property name ++ * @param {Type} ttype - data type ++ * @returns { T | undefined } property value if found or undefined ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ public get(propName: string, ttype: Type): T | undefined; ++ /** ++ * Set value of given property in LocalStorage ++ * Method sets nothing and returns false if property with this name does not exist in LocalStorage ++ * newValue can be undefined or null from API 20. ++ * ++ * @param { string } propName ++ * @param { T } newValue - must be of type T, can be undefined or null ++ * @returns { boolean } true on success, i.e. when above conditions are satisfied, otherwise false ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ public set(propName: string, newValue: T): boolean; ++ /** ++ * Set value of given property, if it exists, see set() . ++ * Add property if no property with given name and initialize with given value. ++ * newValue can be undefined or null from API 12 ++ * ++ * @param { string } propName ++ * @param { T } newValue - must be of type T, can be undefined or null ++ * @param { Type } ttype - data type ++ * @returns { boolean } true on success, i.e. when above conditions are satisfied, otherwise false ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ public setOrCreate(propName: string, newValue: T, ttype: Type): boolean; ++ /** ++ * Provide names of all properties in LocalStorage ++ * same as ES6 Map.prototype.keys() ++ * ++ * @returns { IterableIterator } return a Map Iterator ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ public keys(): IterableIterator; ++ /** ++ * Returns number of properties in LocalStorage ++ * same as Map.prototype.size() ++ * ++ * @returns { number } return number of properties ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ public size(): number; ++ /** ++ * Delete property from StorageBase ++ * Use with caution: ++ * Before deleting a prop from LocalStorage all its subscribers need to ++ * unsubscribe from the property. ++ * This method fails and returns false if given property still has subscribers ++ * Another reason for failing is unknown property. ++ * Developer advise: ++ * Subscribers are created with see link(), see prop() ++ * and also via @LocalStorageLink and @LocalStorageProp state variable decorators. ++ * That means as long as their is a @Component instance that uses such decorated variable ++ * or a sync relationship with a SubscribedAbstractProperty variable the property can nit ++ * (and also should not!) be deleted from LocalStorage. ++ * ++ * @param { string } propName ++ * @returns { boolean } false if method failed ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ public delete(propName: string): boolean; ++ /** ++ * Delete all properties from the LocalStorage instance ++ * Precondition is that there are no subscribers. ++ * method returns false and deletes no properties if there is any property ++ * that still has subscribers ++ * ++ * @returns { boolean } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ public clear(): boolean; ++} +\ No newline at end of file +diff --git a/api/arkui/stateManagement/storage/persistentStorage.d.ets b/api/arkui/stateManagement/storage/persistentStorage.d.ets +new file mode 100644 +index 000000000..fcb91d1ec +--- /dev/null ++++ b/api/arkui/stateManagement/storage/persistentStorage.d.ets +@@ -0,0 +1,89 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"), ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++/** ++ * @file ++ * @kit ArkUI ++ * @arkts 1.2 ++ */ ++ ++/** ++ * Defines the PersistentStorage interface. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare class PersistentStorage { ++ /** ++ * Add property 'key' to AppStorage properties whose current value will be ++ * persistent. ++ * If AppStorage does not include this property it will be added and initializes ++ * with given value ++ * ++ * @param { string } key - property name ++ * @param { Type } ttype - persist value type ++ * @param { T } defaultValue - If AppStorage does not include this property it will be initialized with this value ++ * @param { ToJSONType } [toJson] - serialization function ++ * @param { FromJSONType } [fromJson] - deserialization function ++ * @returns { boolean } ++ * @static ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ static persistProp(key: string, ttype: Type, defaultValue: T, ++ toJson?: ToJSONType, fromJson?: FromJSONType): boolean; ++ ++ /** ++ * Reverse of @see persistProp ++ * ++ * @param { string } key - no longer persist the property named key ++ * @static ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ static deleteProp(key: string): void; ++ ++ /** ++ * Inform persisted AppStorage property names ++ * ++ * @returns { Array } array of AppStorage keys ++ * @static ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ static keys(): Array; ++} ++ ++/** ++ * Define toJson type function. ++ * ++ * @typedef { function } ToJSONType ++ * @param { T } value toJson value ++ * @returns { jsonx.JsonElement } Json stringify element object ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare type ToJSONType = (value: T) => jsonx.JsonElement; ++ ++/** ++ * Define fromJson type function. ++ * ++ * @typedef { function } FromJSONType ++ * @param { jsonx.JsonElement } element json element ++ * @returns { T } deserialization result ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare type FromJSONType = (element: jsonx.JsonElement) => T; +\ No newline at end of file +diff --git a/api/arkui/stateManagement/storage/storageProperty.d.ets b/api/arkui/stateManagement/storage/storageProperty.d.ets +new file mode 100644 +index 000000000..191374a7e +--- /dev/null ++++ b/api/arkui/stateManagement/storage/storageProperty.d.ets +@@ -0,0 +1,144 @@ ++/* ++ * Copyright (C) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++/** ++ * @file ++ * @kit ArkUI ++ * @arkts 1.2 ++ */ ++ ++/** ++ * Defines the callback that is called when state variable with value is change ++ * @typedef { function } OnChangeType ++ * @param {string} propertyName - property name ++ * @param {T} newValue - the new value of state variable ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export type OnChangeType = (propertyName: string, newValue: T) => void; ++ ++/** ++ * Define AbstractProperty interface. ++ * ++ * AbstractProperty can be understood as a handler or an alias ++ * to a property inside LocalStorage / AppStorage singleton ++ * allows to read the value with @see get and to change the ++ * value with @see set. ++ * ++ * @interface AbstractProperty ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export interface AbstractProperty { ++ /** ++ * Returns the name of the referenced property ++ * ++ * @returns { string } name of the referenced property ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ info(): string { return ""; }; ++ ++ /** ++ * Returns the type of the referenced property ++ * ++ * @returns { Type } type of the referenced property ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ ttype(): Type { return Type.of(undefined); }; ++ ++ /** ++ * Reads value of the referenced AppStorage/LocalStorage property. ++ * ++ * @returns { T } value of the referenced AppStorage/LocalStorage property. ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ get(): T { return undefined; }; ++ ++ /** ++ * Assign a new value to the referenced property ++ * ++ * @param {T} newValue - a new value of the referenced property ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ set(newValue: T): void {}; ++ /** ++ * Register callback function to be called on value change of the referenced property ++ * calling with value undefined clear the callback. ++ * ++ * @param {OnChangeType | undefined} onChangeFunc - register callback function ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ onChange(onChangeFunc: OnChangeType | undefined): void {}; ++} ++ ++/** ++ * SubscribedAbstractProperty is the return value of ++ * - AppStorage static functions Link(), Prop(), SetAndLink(), and SetAndProp() ++ * - LocalStorage member methods link(), prop(), setAndLink(), and setAndProp() ++ * 'T' can be boolean, string, number or custom class. ++ * Main functions ++ * see get() reads the linked AppStorage/LocalStorage property value, ++ * see set(newValue) write a new value to the synched AppStorage/LocalStorage property ++ * see aboutToBeDeleted() ends the sync relationship with the AppStorage/LocalStorage property ++ * The app must call this function before the SubscribedAbstractProperty object ++ * goes out of scope. ++ * ++ * @extends AbstractProperty ++ * @interface SubscribedAbstractProperty ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export interface SubscribedAbstractProperty extends AbstractProperty { ++ /** ++ * An app needs to call this function before the instance of SubscribedAbstractProperty ++ * goes out of scope / is subject to garbage collection. Its purpose is to unregister the ++ * variable from the two-way/one-way sync relationship that AppStorage/LocalStorage.link()/prop() ++ * and related functions create. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ aboutToBeDeleted(): void {}; ++} ++ ++/** ++ * Define IStorageProperties interface ++ * ++ * @interface IStorageProperties ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export interface IStorageProperties { ++ /** ++ * Storage value. ++ * ++ * @type { NullishType } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ value: NullishType; ++ /** ++ * Storage variable ttype. ++ * ++ * @type { Type } ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ ttype: Type; ++} +\ No newline at end of file +diff --git a/api/arkui/stateManagement/storages/appStorage.d.ets b/api/arkui/stateManagement/storages/appStorage.d.ets +deleted file mode 100644 +index b5d4066fe..000000000 +--- a/api/arkui/stateManagement/storages/appStorage.d.ets ++++ /dev/null +@@ -1,39 +0,0 @@ +-/* +- * Copyright (C) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +-/** +- * @file +- * @kit ArkUI +- * @arkts 1.2 +- */ +- +-import { LocalStorage } from './localStorage'; +-import { AbstractProperty, SubscribedAbstractProperty } from '../base/decoratorBase'; +- +-export declare class AppStorage extends LocalStorage { +- public static ref(propName: string): AbstractProperty | undefined; +- public static setAndRef(propName: string, defaultValue: T): AbstractProperty; +- public static link(propName: string): SubscribedAbstractProperty | undefined; +- public static setAndLink(propName: string, defaultValue: T): SubscribedAbstractProperty; +- public static prop(propName: string): SubscribedAbstractProperty | undefined; +- public static setAndProp(propName: string, defaultValue: T): SubscribedAbstractProperty; +- public static has(propName: string): boolean; +- public static get(propName: string): T | undefined; +- public static set(propName: string, newValue: T): boolean; +- public static setOrCreate(propName: string, newValue: T): void; +- public static keys(): IterableIterator; +- public static size(): number; +- public static delete(propName: string): boolean; +- public static clear(): boolean; +-} +\ No newline at end of file +diff --git a/api/arkui/stateManagement/storages/localStorage.d.ets b/api/arkui/stateManagement/storages/localStorage.d.ets +deleted file mode 100644 +index 96f279061..000000000 +--- a/api/arkui/stateManagement/storages/localStorage.d.ets ++++ /dev/null +@@ -1,40 +0,0 @@ +-/* +- * Copyright (C) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +-/** +- * @file +- * @kit ArkUI +- * @arkts 1.2 +- */ +- +-import { AbstractProperty, SubscribedAbstractProperty } from '../base/decoratorBase'; +- +-export declare class LocalStorage { +- public constructor(initializingProperties?: Object); +- public static getShared(): LocalStorage | undefined; +- public ref(propName: string): AbstractProperty | undefined; +- public setAndRef(propName: string, defaultValue: T): AbstractProperty; +- public link(propName: string): SubscribedAbstractProperty | undefined; +- public setAndLink(propName: string, defaultValue: T): SubscribedAbstractProperty; +- public prop(propName: string): SubscribedAbstractProperty | undefined; +- public setAndProp(propName: string, defaultValue: T): SubscribedAbstractProperty; +- public has(propName: string): boolean; +- public get(propName: string): T | undefined; +- public set(propName: string, newValue: T): boolean; +- public setOrCreate(propName: string, newValue: T): boolean; +- public keys(): IterableIterator; +- public size(): number; +- public delete(propName: string): boolean; +- public clear(): boolean; +-} +\ No newline at end of file +diff --git a/api/arkui/stateManagement/utils.d.ets b/api/arkui/stateManagement/utils.d.ets +new file mode 100644 +index 000000000..a764b6d31 +--- /dev/null ++++ b/api/arkui/stateManagement/utils.d.ets +@@ -0,0 +1,51 @@ ++/* ++ * Copyright (C) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++/** ++ * @file ++ * @kit ArkUI ++ * @arkts 1.2 ++ */ ++ ++/** ++ * UIUtils is a state management tool class for operating the observed data. ++ * ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++export declare class UIUtils { ++ /** ++ * Get raw object from the Object, like builtin type, objectLiteral. ++ * If input parameter is a regular Object without proxy, return Object itself. ++ * ++ * @param { T } source input source Object data. ++ * @returns { T } raw object. ++ * @static ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ static getTarget(source: T): T; ++ ++ /** ++ * Make non-observed data into observed data. ++ * Support builtin type and objectLiteral. ++ * ++ * @param { T } source input source object data. ++ * @returns { T } proxy object from the source object data. ++ * @static ++ * @syscap SystemCapability.ArkUI.ArkUI.Full ++ * @since 20 ++ */ ++ static makeObserved(source: T): T; ++} +\ No newline at end of file +diff --git a/api/bundleManager/AbilityInfo.d.ts b/api/bundleManager/AbilityInfo.d.ts +index d380d7c95..19e7675b4 100644 +--- a/api/bundleManager/AbilityInfo.d.ts ++++ b/api/bundleManager/AbilityInfo.d.ts +@@ -80,7 +80,7 @@ export interface AbilityInfo { + readonly bundleName: string; + + /** +- * Indicates the name of the .hap package to which the capability belongs ++ * Indicates the module name of the package to which the capability belongs + * + * @type { string } + * @readonly +@@ -88,7 +88,7 @@ export interface AbilityInfo { + * @since 9 + */ + /** +- * Indicates the name of the .hap package to which the capability belongs ++ * Indicates the module name of the package to which the capability belongs + * + * @type { string } + * @readonly +@@ -97,7 +97,7 @@ export interface AbilityInfo { + * @since 10 + */ + /** +- * Indicates the name of the .hap package to which the capability belongs ++ * Indicates the module name of the package to which the capability belongs + * + * @type { string } + * @readonly +@@ -189,7 +189,7 @@ export interface AbilityInfo { + /** + * Indicates the label id of the ability + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform +@@ -197,7 +197,7 @@ export interface AbilityInfo { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly labelId: number; ++ readonly labelId: long; + + /** + * Indicates the ability +@@ -249,7 +249,7 @@ export interface AbilityInfo { + /** + * Indicates the description id of the ability + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform +@@ -257,7 +257,7 @@ export interface AbilityInfo { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly descriptionId: number; ++ readonly descriptionId: long; + + /** + * Indicates the icon of the ability +@@ -309,7 +309,7 @@ export interface AbilityInfo { + /** + * Indicates the icon id of the ability + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform +@@ -317,7 +317,7 @@ export interface AbilityInfo { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly iconId: number; ++ readonly iconId: long; + + /** + * Process of ability, if user do not set it, the value equal application process +@@ -334,7 +334,17 @@ export interface AbilityInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Process of ability, if user do not set it, the value equal application process ++ * ++ * @type { string } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly process: string; +@@ -354,7 +364,17 @@ export interface AbilityInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates whether this ability can be called by other abilities ++ * ++ * @type { boolean } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly exported: boolean; +@@ -385,7 +405,17 @@ export interface AbilityInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Enumerates ability display orientations ++ * ++ * @type { bundleManager.DisplayOrientation } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly orientation: bundleManager.DisplayOrientation; +@@ -435,7 +465,17 @@ export interface AbilityInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * The permissions that others need to launch this ability ++ * ++ * @type { Array } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly permissions: Array; +@@ -488,7 +528,17 @@ export interface AbilityInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * The device types that this ability can run on ++ * ++ * @type { Array } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly deviceTypes: Array; +@@ -568,7 +618,17 @@ export interface AbilityInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates whether the ability is enabled ++ * ++ * @type { boolean } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly enabled: boolean; +@@ -588,7 +648,17 @@ export interface AbilityInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates which window mode is supported ++ * ++ * @type { Array } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly supportWindowModes: Array; +@@ -608,7 +678,17 @@ export interface AbilityInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates window size ++ * ++ * @type { WindowSize } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly windowSize: WindowSize; +@@ -640,25 +720,25 @@ export interface AbilityInfo { + /** + * Indicates the appIndex of application, only work in clone app mode + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly appIndex: number; ++ readonly appIndex: int; + + /** + * Indicates the orientation id of the ability + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly orientationId: number; ++ readonly orientationId: long; + } + + /** +@@ -674,7 +754,16 @@ export interface AbilityInfo { + * @typedef WindowSize + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++/** ++ * Indicates the window size. ++ * ++ * @typedef WindowSize ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + export interface WindowSize { +@@ -693,10 +782,20 @@ export interface WindowSize { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates maximum ratio of width over height of window under free window status. ++ * ++ * @type { double } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ +- readonly maxWindowRatio: number; ++ readonly maxWindowRatio: double; + + /** + * Indicates minimum ratio of width over height of window under free window status. +@@ -713,10 +812,20 @@ export interface WindowSize { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates minimum ratio of width over height of window under free window status. ++ * ++ * @type { double } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ +- readonly minWindowRatio: number; ++ readonly minWindowRatio: double; + + /** + * Indicates maximum width of window under free window status. +@@ -733,10 +842,20 @@ export interface WindowSize { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates maximum width of window under free window status. ++ * ++ * @type { long } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ +- readonly maxWindowWidth: number; ++ readonly maxWindowWidth: long; + + /** + * Indicates minimum width of window under free window status. +@@ -753,10 +872,20 @@ export interface WindowSize { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates minimum width of window under free window status. ++ * ++ * @type { long } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ +- readonly minWindowWidth: number; ++ readonly minWindowWidth: long; + + /** + * Indicates maximum height of window under free window status. +@@ -773,10 +902,20 @@ export interface WindowSize { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates maximum height of window under free window status. ++ * ++ * @type { long } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ +- readonly maxWindowHeight: number; ++ readonly maxWindowHeight: long; + + /** + * Indicates minimum height of window under free window status. +@@ -793,8 +932,18 @@ export interface WindowSize { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates minimum height of window under free window status. ++ * ++ * @type { long } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ +- readonly minWindowHeight: number; ++ readonly minWindowHeight: long; + } +diff --git a/api/bundleManager/AppProvisionInfo.d.ts b/api/bundleManager/AppProvisionInfo.d.ts +index 43351d697..fde167d36 100644 +--- a/api/bundleManager/AppProvisionInfo.d.ts ++++ b/api/bundleManager/AppProvisionInfo.d.ts +@@ -24,19 +24,21 @@ + * @typedef AppProvisionInfo + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface AppProvisionInfo { + /** + * Indicates the version code of the profile file. + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly versionCode: number; ++ readonly versionCode: long; + + /** + * Indicates the version name of the profile file. +@@ -45,7 +47,8 @@ export interface AppProvisionInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly versionName: string; + +@@ -56,7 +59,8 @@ export interface AppProvisionInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly uuid: string; + +@@ -67,7 +71,8 @@ export interface AppProvisionInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly type: string; + +@@ -78,7 +83,8 @@ export interface AppProvisionInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly appDistributionType: string; + +@@ -89,7 +95,8 @@ export interface AppProvisionInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly validity: Validity; + +@@ -100,7 +107,8 @@ export interface AppProvisionInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly developerId: string; + +@@ -111,7 +119,8 @@ export interface AppProvisionInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly certificate: string; + +@@ -122,7 +131,8 @@ export interface AppProvisionInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly apl: string; + +@@ -133,7 +143,8 @@ export interface AppProvisionInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly issuer: string; + +@@ -146,7 +157,8 @@ export interface AppProvisionInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly appIdentifier: string; + +@@ -157,7 +169,8 @@ export interface AppProvisionInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly organization: string; + } +@@ -168,28 +181,31 @@ export interface AppProvisionInfo { + * @typedef Validity + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface Validity { + /** + * Indicates the earliest validity of the profile file. + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly notBefore: number; ++ readonly notBefore: long; + + /** + * Indicates the latest validity of the profile file. + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly notAfter: number; ++ readonly notAfter: long; + } +diff --git a/api/bundleManager/ApplicationInfo.d.ts b/api/bundleManager/ApplicationInfo.d.ts +index e0e84c3d2..0ca6bfa0d 100644 +--- a/api/bundleManager/ApplicationInfo.d.ts ++++ b/api/bundleManager/ApplicationInfo.d.ts +@@ -128,7 +128,7 @@ export interface ApplicationInfo { + /** + * Indicates the description id of the application + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform +@@ -136,7 +136,7 @@ export interface ApplicationInfo { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly descriptionId: number; ++ readonly descriptionId: long; + + /** + * Indicates whether or not this application may be instantiated +@@ -153,7 +153,17 @@ export interface ApplicationInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates whether or not this application may be instantiated ++ * ++ * @type { boolean } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly enabled: boolean; +@@ -208,7 +218,7 @@ export interface ApplicationInfo { + /** + * Indicates the label id of the application + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform +@@ -216,7 +226,7 @@ export interface ApplicationInfo { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly labelId: number; ++ readonly labelId: long; + + /** + * Indicates the icon of the application +@@ -268,7 +278,7 @@ export interface ApplicationInfo { + /** + * Indicates the icon id of the application + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform +@@ -276,7 +286,7 @@ export interface ApplicationInfo { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly iconId: number; ++ readonly iconId: long; + + /** + * Process of application, if user do not set it ,the value equal bundleName +@@ -293,7 +303,17 @@ export interface ApplicationInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Process of application, if user do not set it ,the value equal bundleName ++ * ++ * @type { string } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly process: string; +@@ -313,7 +333,17 @@ export interface ApplicationInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the permissions required for accessing the application. ++ * ++ * @type { Array } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly permissions: Array; +@@ -375,7 +405,17 @@ export interface ApplicationInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the metadata of the application ++ * ++ * @type { Array } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly metadataArray: Array; +@@ -395,7 +435,17 @@ export interface ApplicationInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates whether or not this application may be removable ++ * ++ * @type { boolean } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly removable: boolean; +@@ -415,10 +465,20 @@ export interface ApplicationInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the access token of the application ++ * ++ * @type { long } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ +- readonly accessTokenId: number; ++ readonly accessTokenId: long; + + /** + * Indicates the uid of the application +@@ -435,10 +495,20 @@ export interface ApplicationInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the uid of the application ++ * ++ * @type { int } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ +- readonly uid: number; ++ readonly uid: int; + + /** + * Indicates icon resource of the application +@@ -455,7 +525,17 @@ export interface ApplicationInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates icon resource of the application ++ * ++ * @type { Resource } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly iconResource: Resource; +@@ -475,7 +555,17 @@ export interface ApplicationInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates label resource of the application ++ * ++ * @type { Resource } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly labelResource: Resource; +@@ -495,7 +585,17 @@ export interface ApplicationInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates description resource of the application ++ * ++ * @type { Resource } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly descriptionResource: Resource; +@@ -515,7 +615,17 @@ export interface ApplicationInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the appDistributionType of the application ++ * ++ * @type { string } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly appDistributionType: string; +@@ -535,7 +645,17 @@ export interface ApplicationInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the appProvisionType of the application ++ * ++ * @type { string } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly appProvisionType: string; +@@ -555,7 +675,17 @@ export interface ApplicationInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates whether the application is a system application ++ * ++ * @type { boolean } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly systemApp: boolean; +@@ -595,7 +725,17 @@ export interface ApplicationInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates whether the application is in debug mode. ++ * ++ * @type { boolean } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly debug: boolean; +@@ -607,7 +747,17 @@ export interface ApplicationInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates whether the application data is unclearable, that is, whether the application data cannot be cleared. ++ * ++ * @type { boolean } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly dataUnclearable: boolean; +@@ -618,7 +768,16 @@ export interface ApplicationInfo { + * @type { string } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Indicates native library path. ++ * ++ * @type { string } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly nativeLibraryPath: string; +@@ -637,13 +796,13 @@ export interface ApplicationInfo { + /** + * Indicates the index of the bundle + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly appIndex: number; ++ readonly appIndex: int; + + /** + * Indicates sources to install the app +@@ -664,7 +823,17 @@ export interface ApplicationInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Indicates the release type of the app ++ * ++ * @type { string } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly releaseType: string; +@@ -684,14 +853,14 @@ export interface ApplicationInfo { + /** + * Indicates the flags of the application. + * +- * @type { ?number } ++ * @type { ?int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly flags?: number; ++ readonly flags?: int; + } + + /** +@@ -707,7 +876,16 @@ export interface ApplicationInfo { + * @typedef ModuleMetadata + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++/** ++ * Indicates the ModuleMetadata ++ * ++ * @typedef ModuleMetadata ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + export interface ModuleMetadata { +@@ -726,7 +904,17 @@ export interface ModuleMetadata { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the name of this hap module ++ * ++ * @type { string } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly moduleName: string; +@@ -746,7 +934,17 @@ export interface ModuleMetadata { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the metadata of this hap module ++ * ++ * @type { Array } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly metadata: Array; +@@ -775,13 +973,13 @@ export interface MultiAppMode { + /** + * Indicates the max count of the bundle + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly maxCount: number; ++ readonly maxCount: int; + } + + /** +@@ -822,24 +1020,24 @@ export interface PreinstalledApplicationInfo { + /** + * Indicates the icon id of the application + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly iconId: number; ++ readonly iconId: long; + + /** + * Indicates the label id of the application + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly labelId: number; ++ readonly labelId: long; + } +\ No newline at end of file +diff --git a/api/bundleManager/BundleInfo.d.ts b/api/bundleManager/BundleInfo.d.ts +index 14e62627c..39159d0df 100644 +--- a/api/bundleManager/BundleInfo.d.ts ++++ b/api/bundleManager/BundleInfo.d.ts +@@ -35,7 +35,16 @@ import bundleManager from './../@ohos.bundle.bundleManager'; + * @typedef BundleInfo + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++/** ++ * Obtains configuration information about a bundle ++ * ++ * @typedef BundleInfo ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + export interface BundleInfo { +@@ -54,7 +63,17 @@ export interface BundleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the name of this bundle ++ * ++ * @type { string } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly name: string; +@@ -74,7 +93,17 @@ export interface BundleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the bundle vendor ++ * ++ * @type { string } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly vendor: string; +@@ -94,10 +123,20 @@ export interface BundleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the version code of the bundle ++ * ++ * @type { long } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ +- readonly versionCode: number; ++ readonly versionCode: long; + + /** + * Indicates the version name of the bundle +@@ -114,7 +153,17 @@ export interface BundleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the version name of the bundle ++ * ++ * @type { string } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly versionName: string; +@@ -134,10 +183,20 @@ export interface BundleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the **minimum ** version compatible with the bundle ++ * ++ * @type { int } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ +- readonly minCompatibleVersionCode: number; ++ readonly minCompatibleVersionCode: int; + + /** + * Indicates the target version number of the bundle +@@ -154,10 +213,20 @@ export interface BundleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the target version number of the bundle ++ * ++ * @type { int } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ +- readonly targetVersion: number; ++ readonly targetVersion: int; + + /** + * Obtains configuration information about an application +@@ -174,7 +243,17 @@ export interface BundleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Obtains configuration information about an application ++ * ++ * @type { ApplicationInfo } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly appInfo: ApplicationInfo; +@@ -194,7 +273,17 @@ export interface BundleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Obtains configuration information about a module ++ * ++ * @type { Array } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly hapModulesInfo: Array; +@@ -214,7 +303,17 @@ export interface BundleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the required permissions details defined in the bundle ++ * ++ * @type { Array } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly reqPermissionDetails: Array; +@@ -234,7 +333,17 @@ export interface BundleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the grant state of required permissions ++ * ++ * @type { Array } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly permissionGrantStates: Array; +@@ -254,7 +363,17 @@ export interface BundleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the SignatureInfo of the bundle ++ * ++ * @type { SignatureInfo } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly signatureInfo: SignatureInfo; +@@ -270,14 +389,14 @@ export interface BundleInfo { + /** + * Indicates the hap install time + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly installTime: number; ++ readonly installTime: long; + + /** + * Indicates the hap update time +@@ -290,14 +409,14 @@ export interface BundleInfo { + /** + * Indicates the hap update time + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly updateTime: number; ++ readonly updateTime: long; + + /** + * Indicates the router information of the application +@@ -314,25 +433,25 @@ export interface BundleInfo { + /** + * Indicates the appIndex of application, only work in appClone mode + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly appIndex: number; ++ readonly appIndex: int; + + /** + * Indicates the hap first install time + * +- * @type { ?number } ++ * @type { ?long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly firstInstallTime?: number; ++ readonly firstInstallTime?: long; + } + + /** +@@ -348,7 +467,16 @@ export interface BundleInfo { + * @typedef ReqPermissionDetail + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++/** ++ * Indicates the required permissions details defined in configuration file ++ * ++ * @typedef ReqPermissionDetail ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + export interface ReqPermissionDetail { +@@ -365,7 +493,16 @@ export interface ReqPermissionDetail { + * @type { string } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the name of this required permissions ++ * ++ * @type { string } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + name: string; +@@ -401,7 +538,16 @@ export interface ReqPermissionDetail { + * @type { string } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the reason of this required permissions ++ * ++ * @type { string } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + reason: string; +@@ -419,10 +565,19 @@ export interface ReqPermissionDetail { + * @type { number } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the reason id of this required permissions ++ * ++ * @type { long } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ +- reasonId: number; ++ reasonId: long; + + /** + * Indicates the used scene of this required permissions +@@ -437,7 +592,16 @@ export interface ReqPermissionDetail { + * @type { UsedScene } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the used scene of this required permissions ++ * ++ * @type { UsedScene } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + usedScene: UsedScene; +@@ -456,7 +620,16 @@ export interface ReqPermissionDetail { + * @typedef UsedScene + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++/** ++ * The scene which is used ++ * ++ * @typedef UsedScene ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + export interface UsedScene { +@@ -473,7 +646,16 @@ export interface UsedScene { + * @type { Array } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the abilities that need the permission ++ * ++ * @type { Array } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + abilities: Array; +@@ -491,7 +673,16 @@ export interface UsedScene { + * @type { string } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the time when the permission is used ++ * ++ * @type { string } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + when: string; +@@ -510,7 +701,16 @@ export interface UsedScene { + * @typedef SignatureInfo + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++/** ++ * Indicates SignatureInfo ++ * ++ * @typedef SignatureInfo ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + export interface SignatureInfo { +@@ -531,7 +731,18 @@ export interface SignatureInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the ID of the application to which this bundle belongs ++ * The application ID uniquely identifies an application. It is determined by the bundle name and signature ++ * ++ * @type { string } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly appId: string; +@@ -551,7 +762,17 @@ export interface SignatureInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the fingerprint of the certificate ++ * ++ * @type { string } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly fingerprint: string; +@@ -605,11 +826,11 @@ export interface AppCloneIdentity { + /** + * Indicates the index of clone app. + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly appIndex: number; ++ readonly appIndex: int; + } +diff --git a/api/bundleManager/BundlePackInfo.d.ts b/api/bundleManager/BundlePackInfo.d.ts +index e8ea4a275..60ea30db7 100644 +--- a/api/bundleManager/BundlePackInfo.d.ts ++++ b/api/bundleManager/BundlePackInfo.d.ts +@@ -479,14 +479,14 @@ export interface AbilityFormInfo { + /** + * Indicates the update duration + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly updateDuration: number; ++ readonly updateDuration: int; + + /** + * Indicates the ability support dimensions +@@ -526,14 +526,14 @@ export interface Version { + /** + * Indicates the min compatible code of this version + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly minCompatibleVersionCode: number; ++ readonly minCompatibleVersionCode: int; + + /** + * Indicates the name of this version +@@ -550,14 +550,14 @@ export interface Version { + /** + * Indicates the code of this version + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly code: number; ++ readonly code: int; + } + + /** +@@ -585,24 +585,24 @@ export interface ApiVersion { + /** + * Indicates the compatible version code of the api + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly compatible: number; ++ readonly compatible: int; + + /** + * Indicates the target version code of the api + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly target: number; ++ readonly target: int; + } +diff --git a/api/bundleManager/BundleResourceInfo.d.ts b/api/bundleManager/BundleResourceInfo.d.ts +index 6952f3d65..3c597f579 100644 +--- a/api/bundleManager/BundleResourceInfo.d.ts ++++ b/api/bundleManager/BundleResourceInfo.d.ts +@@ -18,9 +18,7 @@ + * @kit AbilityKit + */ + +-/*** if arkts 1.1 */ + import { DrawableDescriptor } from './../@ohos.arkui.drawableDescriptor'; +-/*** endif */ + + /** + * Obtains resource information about a bundle +@@ -75,19 +73,20 @@ export interface BundleResourceInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Resource + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly drawableDescriptor: DrawableDescriptor; + + /** + * Indicates the index of the bundle + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Resource + * @systemapi + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly appIndex: number; ++ readonly appIndex: int; + } +diff --git a/api/bundleManager/ExtensionAbilityInfo.d.ts b/api/bundleManager/ExtensionAbilityInfo.d.ts +index d86329417..c4fb184a0 100644 +--- a/api/bundleManager/ExtensionAbilityInfo.d.ts ++++ b/api/bundleManager/ExtensionAbilityInfo.d.ts +@@ -111,14 +111,14 @@ export interface ExtensionAbilityInfo { + /** + * Indicates the label id of the extension ability info + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly labelId: number; ++ readonly labelId: long; + + /** + * Indicates the description id of the extension ability info +@@ -131,14 +131,14 @@ export interface ExtensionAbilityInfo { + /** + * Indicates the description id of the extension ability info + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly descriptionId: number; ++ readonly descriptionId: long; + + /** + * Indicates the icon id of the extension ability info +@@ -151,14 +151,14 @@ export interface ExtensionAbilityInfo { + /** + * Indicates the icon id of the extension ability info + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly iconId: number; ++ readonly iconId: long; + + /** + * Indicates whether this ability can be called by other abilities +@@ -347,11 +347,11 @@ export interface ExtensionAbilityInfo { + /** + * Indicates the appIndex of extension ability, only work in clone app mode + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly appIndex: number; ++ readonly appIndex: int; + } +diff --git a/api/bundleManager/HapModuleInfo.d.ts b/api/bundleManager/HapModuleInfo.d.ts +index e662cfcf4..d9f0e8db6 100644 +--- a/api/bundleManager/HapModuleInfo.d.ts ++++ b/api/bundleManager/HapModuleInfo.d.ts +@@ -129,7 +129,7 @@ export interface HapModuleInfo { + /** + * Indicates the icon id of this hap module + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform +@@ -137,7 +137,7 @@ export interface HapModuleInfo { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly iconId: number; ++ readonly iconId: long; + + /** + * Indicates the label of this hap module +@@ -189,7 +189,7 @@ export interface HapModuleInfo { + /** + * Indicates the label id of this hap module + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform +@@ -197,7 +197,7 @@ export interface HapModuleInfo { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly labelId: number; ++ readonly labelId: long; + + /** + * Describes the hap module +@@ -249,7 +249,7 @@ export interface HapModuleInfo { + /** + * Indicates the description of this hap module + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform +@@ -257,7 +257,7 @@ export interface HapModuleInfo { + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly descriptionId: number; ++ readonly descriptionId: long; + + /** + * Indicates main elementName of the hap module +@@ -384,7 +384,17 @@ export interface HapModuleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * The device types that this hap module can run on ++ * ++ * @type { Array } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly deviceTypes: Array; +@@ -404,7 +414,17 @@ export interface HapModuleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates whether free installation of the hap module is supported ++ * ++ * @type { boolean } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly installationFree: boolean; +@@ -424,7 +444,17 @@ export interface HapModuleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the hash value of the hap module ++ * ++ * @type { string } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly hashValue: string; +@@ -444,7 +474,17 @@ export interface HapModuleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice +- * @since arkts {'1.1':'11', '1.2':'20'} ++ * @since 11 ++ */ ++ /** ++ * Indicates the type of the module ++ * ++ * @type { bundleManager.ModuleType } ++ * @readonly ++ * @syscap SystemCapability.BundleManager.BundleFramework.Core ++ * @crossplatform ++ * @atomicservice ++ * @since 20 + * @arkts 1.1&1.2 + */ + readonly type: bundleManager.ModuleType; +@@ -524,7 +564,7 @@ export interface HapModuleInfo { + */ + readonly nativeLibraryPath: string; + +- /** ++ /** + * Indicates the code path + * + * @type { string } +@@ -534,7 +574,7 @@ export interface HapModuleInfo { + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly codePath: string; ++ readonly codePath: string; + } + + /** +@@ -605,14 +645,14 @@ export interface Dependency { + /** + * Indicates the version code of the dependency + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly versionCode: number; ++ readonly versionCode: long; + } + + /** +diff --git a/api/bundleManager/LauncherAbilityInfo.d.ts b/api/bundleManager/LauncherAbilityInfo.d.ts +index de21df51c..22b5bb431 100644 +--- a/api/bundleManager/LauncherAbilityInfo.d.ts ++++ b/api/bundleManager/LauncherAbilityInfo.d.ts +@@ -55,44 +55,44 @@ export interface LauncherAbilityInfo { + /** + * Obtains labelId about an launcher ability. + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly labelId: number; ++ readonly labelId: long; + + /** + * Obtains iconId about an launcher ability. + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly iconId: number; ++ readonly iconId: long; + + /** + * Obtains userId about an launcher ability. + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly userId: number; ++ readonly userId: int; + + /** + * Obtains installTime about an launcher ability. + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly installTime: number; ++ readonly installTime: long; + } +diff --git a/api/bundleManager/LauncherAbilityResourceInfo.d.ts b/api/bundleManager/LauncherAbilityResourceInfo.d.ts +index bd303e501..930c593c6 100644 +--- a/api/bundleManager/LauncherAbilityResourceInfo.d.ts ++++ b/api/bundleManager/LauncherAbilityResourceInfo.d.ts +@@ -18,9 +18,7 @@ + * @kit AbilityKit + */ + +-/*** if arkts 1.1 */ + import { DrawableDescriptor } from './../@ohos.arkui.drawableDescriptor'; +-/*** endif */ + + /** + * Obtains resource information about a launcher ability +@@ -99,19 +97,20 @@ export interface LauncherAbilityResourceInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Resource + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly drawableDescriptor: DrawableDescriptor; + + /** + * Indicates the index of the bundle + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Resource + * @systemapi + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly appIndex: number; ++ readonly appIndex: int; + } +diff --git a/api/bundleManager/Metadata.d.ts b/api/bundleManager/Metadata.d.ts +index da2d1b139..e049546ef 100644 +--- a/api/bundleManager/Metadata.d.ts ++++ b/api/bundleManager/Metadata.d.ts +@@ -129,12 +129,12 @@ export interface Metadata { + /** + * Indicates the value id of the metadata + * +- * @type { ?number } ++ * @type { ?long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly valueId?: number; ++ readonly valueId?: long; + } +diff --git a/api/bundleManager/OverlayModuleInfo.d.ts b/api/bundleManager/OverlayModuleInfo.d.ts +index aa2b660c7..1c9f68037 100644 +--- a/api/bundleManager/OverlayModuleInfo.d.ts ++++ b/api/bundleManager/OverlayModuleInfo.d.ts +@@ -63,22 +63,22 @@ export interface OverlayModuleInfo { + /** + * Indicates the priority of the overlay module + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly priority: number; ++ readonly priority: int; + + /** + * Indicates the state of the overlay module + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly state: number; ++ readonly state: int; + } +diff --git a/api/bundleManager/PermissionDef.d.ts b/api/bundleManager/PermissionDef.d.ts +index 6d6634bea..8b7847b0b 100644 +--- a/api/bundleManager/PermissionDef.d.ts ++++ b/api/bundleManager/PermissionDef.d.ts +@@ -24,7 +24,8 @@ + * @typedef PermissionDef + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface PermissionDef { + /** +@@ -34,40 +35,44 @@ export interface PermissionDef { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly permissionName: string; + + /** + * Indicates the grant mode of this permission + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly grantMode: number; ++ readonly grantMode: int; + + /** + * Indicates the labelId of this permission + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly labelId: number; ++ readonly labelId: long; + + /** + * Indicates the descriptionId of this permission + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly descriptionId: number; ++ readonly descriptionId: long; + } +diff --git a/api/bundleManager/PluginBundleInfo.d.ts b/api/bundleManager/PluginBundleInfo.d.ts +index d3bc13ecb..c92159c05 100644 +--- a/api/bundleManager/PluginBundleInfo.d.ts ++++ b/api/bundleManager/PluginBundleInfo.d.ts +@@ -24,7 +24,8 @@ + * @typedef PluginBundleInfo + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface PluginBundleInfo { + /** +@@ -34,20 +35,22 @@ export interface PluginBundleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly label: string; + + /** + * Indicates the label id of the plugin + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly labelId: number; ++ readonly labelId: long; + + /** + * Indicates the icon of the plugin +@@ -56,20 +59,22 @@ export interface PluginBundleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly icon: string; + + /** + * Indicates the icon id of the plugin + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly iconId: number; ++ readonly iconId: long; + + /** + * Indicates the name of the plugin +@@ -78,20 +83,22 @@ export interface PluginBundleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly pluginBundleName: string; + + /** + * Indicates the version code of the plugin + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly versionCode: number; ++ readonly versionCode: long; + + /** + * Indicates the version name of the plugin +@@ -100,7 +107,8 @@ export interface PluginBundleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly versionName: string; + +@@ -111,7 +119,8 @@ export interface PluginBundleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly pluginModuleInfos: Array; + } +@@ -122,7 +131,8 @@ export interface PluginBundleInfo { + * @typedef PluginModuleInfo + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface PluginModuleInfo { + /** +@@ -132,20 +142,22 @@ export interface PluginModuleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly moduleName: string; + + /** + * Indicates the description of the plugin + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly descriptionId: number; ++ readonly descriptionId: long; + + /** + * Describes the plugin +@@ -154,7 +166,8 @@ export interface PluginModuleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 19 ++ * @since arkts {'1.1':'19', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly description: string; + } +\ No newline at end of file +diff --git a/api/bundleManager/RecoverableApplicationInfo.d.ts b/api/bundleManager/RecoverableApplicationInfo.d.ts +index 62b36b0ea..144d48471 100644 +--- a/api/bundleManager/RecoverableApplicationInfo.d.ts ++++ b/api/bundleManager/RecoverableApplicationInfo.d.ts +@@ -26,7 +26,8 @@ import bundleManager from './../@ohos.bundle.bundleManager'; + * @typedef RecoverableApplicationInfo + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface RecoverableApplicationInfo { + /** +@@ -36,7 +37,8 @@ export interface RecoverableApplicationInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly bundleName: string; + +@@ -47,31 +49,34 @@ export interface RecoverableApplicationInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly moduleName: string; + + /** + * Indicates the label id + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly labelId: number; ++ readonly labelId: long; + + /** + * Indicates the icon id + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly iconId: number; ++ readonly iconId: long; + + /** + * Indicates whether the application is a system application +@@ -80,7 +85,8 @@ export interface RecoverableApplicationInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly systemApp: boolean; + +@@ -91,7 +97,8 @@ export interface RecoverableApplicationInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly bundleType: bundleManager.BundleType; + +@@ -102,7 +109,8 @@ export interface RecoverableApplicationInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly codePaths: Array; + } +diff --git a/api/bundleManager/RemoteAbilityInfo.d.ts b/api/bundleManager/RemoteAbilityInfo.d.ts +index efd294bc3..217b88d04 100644 +--- a/api/bundleManager/RemoteAbilityInfo.d.ts ++++ b/api/bundleManager/RemoteAbilityInfo.d.ts +@@ -26,7 +26,8 @@ import { ElementName } from './ElementName'; + * @typedef RemoteAbilityInfo + * @syscap SystemCapability.BundleManager.DistributedBundleFramework + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface RemoteAbilityInfo { + /** +@@ -36,7 +37,8 @@ export interface RemoteAbilityInfo { + * @readonly + * @syscap SystemCapability.BundleManager.DistributedBundleFramework + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly elementName: ElementName; + +@@ -47,7 +49,8 @@ export interface RemoteAbilityInfo { + * @readonly + * @syscap SystemCapability.BundleManager.DistributedBundleFramework + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly label: string; + +@@ -58,7 +61,8 @@ export interface RemoteAbilityInfo { + * @readonly + * @syscap SystemCapability.BundleManager.DistributedBundleFramework + * @systemapi +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly icon: string; + } +diff --git a/api/bundleManager/SharedBundleInfo.d.ts b/api/bundleManager/SharedBundleInfo.d.ts +index 3e8078810..e5ce19fff 100644 +--- a/api/bundleManager/SharedBundleInfo.d.ts ++++ b/api/bundleManager/SharedBundleInfo.d.ts +@@ -27,7 +27,8 @@ import bundleManager from '../@ohos.bundle.bundleManager'; + * @typedef SharedBundleInfo + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface SharedBundleInfo { + /** +@@ -37,7 +38,8 @@ export interface SharedBundleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly name: string; + +@@ -48,7 +50,8 @@ export interface SharedBundleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly compatiblePolicy: bundleManager.CompatiblePolicy; + +@@ -59,7 +62,8 @@ export interface SharedBundleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly sharedModuleInfo: Array; + } +@@ -70,7 +74,8 @@ export interface SharedBundleInfo { + * @typedef SharedModuleInfo + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface SharedModuleInfo { + /** +@@ -80,20 +85,22 @@ export interface SharedModuleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly name: string; + + /** + * Indicates the version code of the shared module + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly versionCode: number; ++ readonly versionCode: long; + + /** + * Indicates the version name of the shared module +@@ -102,7 +109,8 @@ export interface SharedModuleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly versionName: string; + +@@ -113,18 +121,20 @@ export interface SharedModuleInfo { + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + readonly description: string; + + /** + * Indicates the description of this shared module + * +- * @type { number } ++ * @type { long } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- readonly descriptionId: number; ++ readonly descriptionId: long; + } +diff --git a/api/bundleManager/ShortcutInfo.d.ts b/api/bundleManager/ShortcutInfo.d.ts +index 9654cd59f..f36d271a2 100644 +--- a/api/bundleManager/ShortcutInfo.d.ts ++++ b/api/bundleManager/ShortcutInfo.d.ts +@@ -24,7 +24,14 @@ + * @typedef ShortcutInfo + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'9', '1.2':'20'} ++ * @since 9 ++ */ ++/** ++ * Provides information about a shortcut, including the shortcut ID and label. ++ * ++ * @typedef ShortcutInfo ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + export interface ShortcutInfo { +@@ -43,7 +50,14 @@ export interface ShortcutInfo { + * @type { string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Indicates the ID of the application to which this shortcut belongs ++ * ++ * @type { string } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + id: string; +@@ -63,7 +77,14 @@ export interface ShortcutInfo { + * @type { string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Indicates the name of the bundle containing the shortcut ++ * ++ * @type { string } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + bundleName: string; +@@ -83,7 +104,14 @@ export interface ShortcutInfo { + * @type { ?string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Indicates the moduleName of the shortcut ++ * ++ * @type { ?string } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + moduleName?: string; +@@ -103,7 +131,14 @@ export interface ShortcutInfo { + * @type { ?string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Indicates the host ability of the shortcut ++ * ++ * @type { ?string } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + hostAbility?: string; +@@ -123,7 +158,14 @@ export interface ShortcutInfo { + * @type { ?string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Indicates the icon of the shortcut ++ * ++ * @type { ?string } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + icon?: string; +@@ -143,10 +185,17 @@ export interface ShortcutInfo { + * @type { ?number } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Indicates the icon id of the shortcut ++ * ++ * @type { ?long } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ +- iconId?: number; ++ iconId?: long; + + /** + * Indicates the label of the shortcut +@@ -163,7 +212,14 @@ export interface ShortcutInfo { + * @type { ?string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Indicates the label of the shortcut ++ * ++ * @type { ?string } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + label?: string; +@@ -183,10 +239,17 @@ export interface ShortcutInfo { + * @type { ?number } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Indicates the label id of the shortcut ++ * ++ * @type { ?long } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ +- labelId?: number; ++ labelId?: long; + + /** + * Indicates the wants of the shortcut +@@ -203,7 +266,14 @@ export interface ShortcutInfo { + * @type { ?Array } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Indicates the wants of the shortcut ++ * ++ * @type { ?Array } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + wants?: Array; +@@ -214,10 +284,17 @@ export interface ShortcutInfo { + * @type { number } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Indicates the index of application clone. ++ * ++ * @type { int } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ +- appIndex: number; ++ appIndex: int; + + /** + * Indicates the source type of shortcut. +@@ -225,10 +302,17 @@ export interface ShortcutInfo { + * @type { number } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Indicates the source type of shortcut. ++ * ++ * @type { int } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ +- sourceType: number; ++ sourceType: int; + } + + /** +@@ -237,7 +321,14 @@ export interface ShortcutInfo { + * @typedef ShortcutWant + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'9', '1.2':'20'} ++ * @since 9 ++ */ ++/** ++ * Obtains information about the ability that a shortcut will start. ++ * ++ * @typedef ShortcutWant ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + export interface ShortcutWant { +@@ -256,7 +347,14 @@ export interface ShortcutWant { + * @type { string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Indicates the target bundle of the shortcut want ++ * ++ * @type { string } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + targetBundle: string; +@@ -276,7 +374,14 @@ export interface ShortcutWant { + * @type { ?string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Indicates the target module of the shortcut want ++ * ++ * @type { ?string } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + targetModule?: string; +@@ -296,7 +401,14 @@ export interface ShortcutWant { + * @type { string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Indicates the target ability of the shortcut want ++ * ++ * @type { string } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + targetAbility: string; +@@ -307,7 +419,14 @@ export interface ShortcutWant { + * @type { ?Array } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Indicates the parameters of the shortcut want ++ * ++ * @type { ?Array } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + parameters?: Array; +@@ -319,7 +438,14 @@ export interface ShortcutWant { + * @typedef ParameterItem + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++/** ++ * Obtains information about the ability that a shortcut will start. ++ * ++ * @typedef ParameterItem ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + export interface ParameterItem { +@@ -329,7 +455,14 @@ export interface ParameterItem { + * @type { string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Indicates the key of the parameter item. ++ * ++ * @type { string } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + key: string; +@@ -340,7 +473,14 @@ export interface ParameterItem { + * @type { string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @systemapi +- * @since arkts {'1.1':'12', '1.2':'20'} ++ * @since 12 ++ */ ++ /** ++ * Indicates the value of the parameter item. ++ * ++ * @type { string } ++ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher ++ * @since 20 + * @arkts 1.1&1.2 + */ + value: string; +diff --git a/api/bundleManager/Skill.d.ts b/api/bundleManager/Skill.d.ts +index 7e09ec678..ddaedcf47 100644 +--- a/api/bundleManager/Skill.d.ts ++++ b/api/bundleManager/Skill.d.ts +@@ -114,14 +114,14 @@ export interface SkillUri { + /** + * Indicates the port of the skillUri + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly port: number; ++ readonly port: int; + + /** + * Indicates the path of the skillUri +@@ -186,14 +186,14 @@ export interface SkillUri { + /** + * Indicates the maxFileSupported of the skillUri + * +- * @type { number } ++ * @type { int } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- readonly maxFileSupported: number; ++ readonly maxFileSupported: int; + + /** + * Indicates the linkFeature of the skillUri +diff --git a/api/commonEvent/commonEventData.d.ts b/api/commonEvent/commonEventData.d.ts +index 7b8710b26..24833aee3 100644 +--- a/api/commonEvent/commonEventData.d.ts ++++ b/api/commonEvent/commonEventData.d.ts +@@ -140,9 +140,8 @@ export interface CommonEventData { + /** + * The description of the parameters in a common event. + * +- * @type { ?object } ++ * @type { ?Record } + * @syscap SystemCapability.Notification.CommonEvent +- * @atomicservice + * @since 20 + * @arkts 1.2 + */ +diff --git a/api/commonEvent/commonEventPublishData.d.ts b/api/commonEvent/commonEventPublishData.d.ts +index 40d88120e..6b71b21ca 100644 +--- a/api/commonEvent/commonEventPublishData.d.ts ++++ b/api/commonEvent/commonEventPublishData.d.ts +@@ -169,9 +169,8 @@ export interface CommonEventPublishData { + /** + * The description of the parameters in a common event. + * +- * @type { ?object } ++ * @type { ?Record } + * @syscap SystemCapability.Notification.CommonEvent +- * @atomicservice + * @since 20 + * @arkts 1.2 + */ +diff --git a/api/commonEvent/commonEventSubscriber.d.ts b/api/commonEvent/commonEventSubscriber.d.ts +index 321161fc2..89e27ea03 100644 +--- a/api/commonEvent/commonEventSubscriber.d.ts ++++ b/api/commonEvent/commonEventSubscriber.d.ts +@@ -22,6 +22,10 @@ + import { AsyncCallback } from './../@ohos.base'; + import { CommonEventSubscribeInfo } from './commonEventSubscribeInfo'; + /*** endif */ ++/*** if arkts 1.2 */ ++import { AsyncCallback } from './../@ohos.base'; ++import { CommonEventSubscribeInfo } from './commonEventSubscribeInfo'; ++/*** endif */ + + /** + * the subscriber of common event +@@ -57,7 +61,8 @@ export interface CommonEventSubscriber { + *
    2. Incorrect parameter types. 3. Parameter verification failed. + * @syscap SystemCapability.Notification.CommonEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getCode(callback: AsyncCallback): void; + +@@ -74,7 +79,8 @@ export interface CommonEventSubscriber { + * @returns { Promise } Returns code of this common event + * @syscap SystemCapability.Notification.CommonEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getCode(): Promise; + +@@ -91,7 +97,8 @@ export interface CommonEventSubscriber { + * @returns { number } Returns code of this common event + * @syscap SystemCapability.Notification.CommonEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getCodeSync(): number; + +@@ -114,7 +121,8 @@ export interface CommonEventSubscriber { + *
    2. Incorrect parameter types. 3. Parameter verification failed. + * @syscap SystemCapability.Notification.CommonEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setCode(code: number, callback: AsyncCallback): void; + +@@ -137,7 +145,8 @@ export interface CommonEventSubscriber { + *
    2. Incorrect parameter types. 3. Parameter verification failed. + * @syscap SystemCapability.Notification.CommonEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setCode(code: number): Promise; + +@@ -158,7 +167,8 @@ export interface CommonEventSubscriber { + *
    2. Incorrect parameter types. 3. Parameter verification failed. + * @syscap SystemCapability.Notification.CommonEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setCodeSync(code: number): void; + +@@ -179,7 +189,8 @@ export interface CommonEventSubscriber { + *
    2. Incorrect parameter types. 3. Parameter verification failed. + * @syscap SystemCapability.Notification.CommonEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getData(callback: AsyncCallback): void; + +@@ -196,7 +207,8 @@ export interface CommonEventSubscriber { + * @returns { Promise } Returns data of this common event + * @syscap SystemCapability.Notification.CommonEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getData(): Promise; + +@@ -213,7 +225,8 @@ export interface CommonEventSubscriber { + * @returns { string } Returns data of this common event + * @syscap SystemCapability.Notification.CommonEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getDataSync(): string; + +@@ -236,7 +249,8 @@ export interface CommonEventSubscriber { + *
    2. Incorrect parameter types. 3. Parameter verification failed. + * @syscap SystemCapability.Notification.CommonEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setData(data: string, callback: AsyncCallback): void; + +@@ -259,7 +273,8 @@ export interface CommonEventSubscriber { + *
    2. Incorrect parameter types. 3. Parameter verification failed. + * @syscap SystemCapability.Notification.CommonEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setData(data: string): Promise; + +@@ -280,7 +295,8 @@ export interface CommonEventSubscriber { + *
    2. Incorrect parameter types. 3. Parameter verification failed. + * @syscap SystemCapability.Notification.CommonEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setDataSync(data: string): void; + +@@ -305,7 +321,8 @@ export interface CommonEventSubscriber { + *
    2. Incorrect parameter types. 3. Parameter verification failed. + * @syscap SystemCapability.Notification.CommonEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setCodeAndData(code: number, data: string, callback: AsyncCallback): void; + +@@ -330,7 +347,8 @@ export interface CommonEventSubscriber { + *
    2. Incorrect parameter types. 3. Parameter verification failed. + * @syscap SystemCapability.Notification.CommonEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setCodeAndData(code: number, data: string): Promise; + +@@ -353,7 +371,8 @@ export interface CommonEventSubscriber { + *
    2. Incorrect parameter types. 3. Parameter verification failed. + * @syscap SystemCapability.Notification.CommonEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + setCodeAndDataSync(code: number, data: string): void; + +@@ -364,7 +383,8 @@ export interface CommonEventSubscriber { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. 3. Parameter verification failed. + * @syscap SystemCapability.Notification.CommonEvent +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isOrderedCommonEvent(callback: AsyncCallback): void; + +@@ -373,7 +393,8 @@ export interface CommonEventSubscriber { + * + * @returns { Promise } Returns true if this common event is ordered, false otherwise + * @syscap SystemCapability.Notification.CommonEvent +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isOrderedCommonEvent(): Promise; + +@@ -382,7 +403,8 @@ export interface CommonEventSubscriber { + * + * @returns { boolean } Returns true if this common event is ordered, false otherwise + * @syscap SystemCapability.Notification.CommonEvent +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isOrderedCommonEventSync(): boolean; + +@@ -393,7 +415,8 @@ export interface CommonEventSubscriber { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. 3. Parameter verification failed. + * @syscap SystemCapability.Notification.CommonEvent +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isStickyCommonEvent(callback: AsyncCallback): void; + +@@ -402,7 +425,8 @@ export interface CommonEventSubscriber { + * + * @returns { Promise } Returns true if this common event is sticky, false otherwise + * @syscap SystemCapability.Notification.CommonEvent +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isStickyCommonEvent(): Promise; + +@@ -411,7 +435,8 @@ export interface CommonEventSubscriber { + * + * @returns { boolean } Returns true if this common event is sticky, false otherwise + * @syscap SystemCapability.Notification.CommonEvent +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + isStickyCommonEventSync(): boolean; + +@@ -422,7 +447,8 @@ export interface CommonEventSubscriber { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. 3. Parameter verification failed. + * @syscap SystemCapability.Notification.CommonEvent +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + abortCommonEvent(callback: AsyncCallback): void; + +@@ -431,7 +457,8 @@ export interface CommonEventSubscriber { + * + * @returns { Promise } The promise returned by the function. + * @syscap SystemCapability.Notification.CommonEvent +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + abortCommonEvent(): Promise; + +@@ -439,7 +466,8 @@ export interface CommonEventSubscriber { + * Abort the current ordered common event. + * + * @syscap SystemCapability.Notification.CommonEvent +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + abortCommonEventSync(): void; + +@@ -450,7 +478,8 @@ export interface CommonEventSubscriber { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. 3. Parameter verification failed. + * @syscap SystemCapability.Notification.CommonEvent +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + clearAbortCommonEvent(callback: AsyncCallback): void; + +@@ -459,7 +488,8 @@ export interface CommonEventSubscriber { + * + * @returns { Promise } The promise returned by the function. + * @syscap SystemCapability.Notification.CommonEvent +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + clearAbortCommonEvent(): Promise; + +@@ -467,7 +497,8 @@ export interface CommonEventSubscriber { + * Clears the abort state of the current ordered common event + * + * @syscap SystemCapability.Notification.CommonEvent +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + clearAbortCommonEventSync(): void; + +@@ -478,7 +509,8 @@ export interface CommonEventSubscriber { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. 3. Parameter verification failed. + * @syscap SystemCapability.Notification.CommonEvent +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getAbortCommonEvent(callback: AsyncCallback): void; + +@@ -487,7 +519,8 @@ export interface CommonEventSubscriber { + * + * @returns { Promise } Returns true if this common event is aborted, false otherwise + * @syscap SystemCapability.Notification.CommonEvent +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getAbortCommonEvent(): Promise; + +@@ -496,7 +529,8 @@ export interface CommonEventSubscriber { + * + * @returns { boolean } Returns true if this common event is aborted, false otherwise + * @syscap SystemCapability.Notification.CommonEvent +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getAbortCommonEventSync(): boolean; + +@@ -518,7 +552,8 @@ export interface CommonEventSubscriber { + * @syscap SystemCapability.Notification.CommonEvent + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSubscribeInfo(callback: AsyncCallback): void; + +@@ -536,7 +571,8 @@ export interface CommonEventSubscriber { + * @syscap SystemCapability.Notification.CommonEvent + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSubscribeInfo(): Promise; + +@@ -553,7 +589,8 @@ export interface CommonEventSubscriber { + * @returns { CommonEventSubscribeInfo } Returns the commonEvent subscribe information + * @syscap SystemCapability.Notification.CommonEvent + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + getSubscribeInfoSync(): CommonEventSubscribeInfo; + +@@ -564,7 +601,8 @@ export interface CommonEventSubscriber { + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. 3. Parameter verification failed. + * @syscap SystemCapability.Notification.CommonEvent +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + finishCommonEvent(callback: AsyncCallback): void; + +@@ -573,7 +611,8 @@ export interface CommonEventSubscriber { + * + * @returns { Promise } The promise returned by the function. + * @syscap SystemCapability.Notification.CommonEvent +- * @since 9 ++ * @since arkts {'1.1':'9', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + finishCommonEvent(): Promise; + } +diff --git a/api/device-define/tablet.json b/api/device-define/tablet.json +index 153f694bf..aab906b49 100644 +--- a/api/device-define/tablet.json ++++ b/api/device-define/tablet.json +@@ -223,6 +223,7 @@ + "SystemCapability.Multimedia.Image.ImageCreator", + "SystemCapability.Graphic.Graphic2D.WebGL2", + "SystemCapability.Ability.AppStartup", +- "SystemCapability.Ability.AppExtension.PhotoEditorExtension" ++ "SystemCapability.Ability.AppExtension.PhotoEditorExtension", ++ "SystemCapability.MultimodalAwareness.RoomLocation" + ] + } +diff --git a/api/device-define/wearable.json b/api/device-define/wearable.json +index 3bcd44cee..d0337769e 100644 +--- a/api/device-define/wearable.json ++++ b/api/device-define/wearable.json +@@ -198,6 +198,7 @@ + "SystemCapability.Communication.WiFi.AP.Extension", + "SystemCapability.Location.Location.Core", + "SystemCapability.Location.Location.Gnss", +- "SystemCapability.Test.UiTest" ++ "SystemCapability.Test.UiTest", ++ "SystemCapability.MultimodalAwareness.RoomLocation" + ] + } +diff --git a/api/global/rawFileDescriptor.d.ts b/api/global/rawFileDescriptor.d.ts +index 76d4c8959..8a85921c4 100644 +--- a/api/global/rawFileDescriptor.d.ts ++++ b/api/global/rawFileDescriptor.d.ts +@@ -16,7 +16,6 @@ + /** + * @file + * @kit LocalizationKit +- * @arkts 1.1&1.2 + */ + + /** +@@ -42,6 +41,7 @@ + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export interface RawFileDescriptor { + /** +@@ -65,6 +65,7 @@ export interface RawFileDescriptor { + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + fd: number; + +@@ -89,6 +90,7 @@ export interface RawFileDescriptor { + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + offset: number; + +@@ -113,6 +115,7 @@ export interface RawFileDescriptor { + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + length: number; + } +\ No newline at end of file +diff --git a/api/global/resource.d.ts b/api/global/resource.d.ts +index 6ebfe1cd8..15b2ce8e9 100644 +--- a/api/global/resource.d.ts ++++ b/api/global/resource.d.ts +@@ -98,7 +98,7 @@ export interface Resource { + * + * @type { ?any[] } + * @syscap SystemCapability.Global.ResourceManager +- * @since 7 ++ * @since 9 + */ + /** + * Set params. +@@ -128,7 +128,7 @@ export interface Resource { + * + * @type { ?number } + * @syscap SystemCapability.Global.ResourceManager +- * @since 7 ++ * @since 9 + */ + /** + * Set type. +diff --git a/api/multimedia/soundPool.d.ts b/api/multimedia/soundPool.d.ts +index 3ffd0b117..b657a7347 100644 +--- a/api/multimedia/soundPool.d.ts ++++ b/api/multimedia/soundPool.d.ts +@@ -18,7 +18,7 @@ + * @kit MediaKit + */ + +-import { ErrorCallback, AsyncCallback, Callback, BusinessError } from '../@ohos.base'; ++import { ErrorCallback, AsyncCallback, Callback } from '../@ohos.base'; + import type audio from '../@ohos.multimedia.audio'; + + /** +@@ -32,21 +32,21 @@ export interface PlayParameters { + /** + * loop mode (0 = no loop, -1 = loop forever) + * +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.SoundPool + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- loop?: int; ++ loop?: number; + /** + * playback rate + * +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.SoundPool + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- rate?: int; ++ rate?: number; + /** + * left volume value(range = 0.0 to 1.0),current leftVolume = rightVolume + * +@@ -68,12 +68,12 @@ export interface PlayParameters { + /** + * stream priority (0 = lowest priority) + * +- * @type { ?int } ++ * @type { ?number } + * @syscap SystemCapability.Multimedia.Media.SoundPool + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- priority?: int; ++ priority?: number; + /** + * Flag indicating that the sound effect and audio can be played in parallel. + * +@@ -94,12 +94,12 @@ export interface PlayParameters { + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +-export interface SoundPool { ++export declare interface SoundPool { + /** + * Load the sound from the specified path. + * + * @param {string} uri The path to the audio file +- * @param {AsyncCallback} callback Callback a sound ID. This value can be used to play or unload the sound. ++ * @param {AsyncCallback} callback Callback a sound ID. This value can be used to play or unload the sound. + * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. + * @throws { BusinessError } 5400103 - I/O error. Return by callback. + * @throws { BusinessError } 5400105 - Service died. Return by callback. +@@ -107,12 +107,12 @@ export interface SoundPool { + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- load(uri: string, callback: AsyncCallback): void; ++ load(uri: string, callback: AsyncCallback): void; + /** + * Load the sound from the specified path. + * + * @param {string} uri The path to the audio file +- * @returns {Promise} Promise a sound ID. This value can be used to play or unload the sound. ++ * @returns {Promise} Promise a sound ID. This value can be used to play or unload the sound. + * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. + * @throws { BusinessError } 5400103 - I/O error. Return by promise. + * @throws { BusinessError } 5400105 - Service died. Return by promise. +@@ -120,14 +120,14 @@ export interface SoundPool { + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- load(uri: string): Promise; ++ load(uri: string): Promise; + /** + * Load the sound from a FileDescriptor. + * +- * @param {int} fd A FileDescriptor object ++ * @param {number} fd A FileDescriptor object + * @param {number} offset Offset to the start of the sound + * @param {number} length Length of the sound +- * @param {AsyncCallback} callback Callback a sound ID. This value can be used to play or unload the sound. ++ * @param {AsyncCallback} callback Callback a sound ID. This value can be used to play or unload the sound. + * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. + * @throws { BusinessError } 5400103 - I/O error. Return by callback. + * @throws { BusinessError } 5400105 - Service died. Return by callback. +@@ -135,14 +135,14 @@ export interface SoundPool { + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- load(fd: int, offset: number, length: number, callback: AsyncCallback): void; ++ load(fd: number, offset: number, length: number, callback: AsyncCallback): void; + /** + * Load the sound from a FileDescriptor. + * +- * @param {int} fd A FileDescriptor object ++ * @param {number} fd A FileDescriptor object + * @param {number} offset Offset to the start of the sound + * @param {number} length Length of the sound +- * @returns {Promise} Promise a sound ID. This value can be used to play or unload the sound. ++ * @returns {Promise} Promise a sound ID. This value can be used to play or unload the sound. + * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. + * @throws { BusinessError } 5400103 - I/O error. Return by promise. + * @throws { BusinessError } 5400105 - Service died. Return by promise. +@@ -150,13 +150,13 @@ export interface SoundPool { + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- load(fd: int, offset: number, length: number): Promise; ++ load(fd: number, offset: number, length: number): Promise; + /** + * Play a sound from a sound ID. + * +- * @param {int} soundID Returned by the load() ++ * @param {number} soundID Returned by the load() + * @param {PlayParameters} params Player parameters +- * @param {AsyncCallback} callback Callback used to return a non-zero streamID if successful, zero if it fails. ++ * @param {AsyncCallback} callback Callback used to return a non-zero streamID if successful, zero if it fails. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. 3.Parameter verification failed. Return by callback. + * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. +@@ -165,12 +165,12 @@ export interface SoundPool { + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- play(soundID: int, params: PlayParameters, callback: AsyncCallback): void; ++ play(soundID: number, params: PlayParameters, callback: AsyncCallback): void; + /** + * Play a sound from a sound ID. + * +- * @param {int} soundID Returned by the load() +- * @param {AsyncCallback} callback Callback used to return a non-zero streamID if successful, zero if it fails. ++ * @param {number} soundID Returned by the load() ++ * @param {AsyncCallback} callback Callback used to return a non-zero streamID if successful, zero if it fails. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. 3.Parameter verification failed. Return by callback. + * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. +@@ -179,13 +179,13 @@ export interface SoundPool { + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- play(soundID: int, callback: AsyncCallback): void; ++ play(soundID: number, callback: AsyncCallback): void; + /** + * Play a sound from a sound ID. + * +- * @param {int} soundID Returned by the load() ++ * @param {number} soundID Returned by the load() + * @param {PlayParameters} [params] Player parameters +- * @returns {Promise} Promise used to return a non-zero streamID if successful, zero if it fails. ++ * @returns {Promise} Promise used to return a non-zero streamID if successful, zero if it fails. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. 3.Parameter verification failed. Return by promise. + * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. +@@ -194,11 +194,11 @@ export interface SoundPool { + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- play(soundID: int, params?: PlayParameters): Promise; ++ play(soundID: number, params?: PlayParameters): Promise; + /** + * Stop a stream which is playing. + * +- * @param {int} streamID Returned by the play() ++ * @param {number} streamID Returned by the play() + * @param {AsyncCallback} callback Callback used to return the result. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. 3.Parameter verification failed. Return by callback. +@@ -208,11 +208,11 @@ export interface SoundPool { + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- stop(streamID: int, callback: AsyncCallback): void; ++ stop(streamID: number, callback: AsyncCallback): void; + /** + * Stop a stream which is playing. + * +- * @param {int} streamID Returned by the play() ++ * @param {number} streamID Returned by the play() + * @returns {Promise} Promise used to return the result. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. 3.Parameter verification failed. Return by promise. +@@ -222,67 +222,71 @@ export interface SoundPool { + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- stop(streamID: int): Promise; ++ stop(streamID: number): Promise; + /** + * Set loop mode. + * +- * @param {int} streamID Returned by the play() +- * @param {int} loop Loop mode (0 = no loop, -1 = loop forever) ++ * @param {number} streamID Returned by the play() ++ * @param {number} loop Loop mode (0 = no loop, -1 = loop forever) + * @param {AsyncCallback} callback Callback used to return the result. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. 3.Parameter verification failed. Return by callback. + * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. + * @throws { BusinessError } 5400105 - Service died. Return by callback. + * @syscap SystemCapability.Multimedia.Media.SoundPool +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- setLoop(streamID: int, loop: int, callback: AsyncCallback): void; ++ setLoop(streamID: number, loop: number, callback: AsyncCallback): void; + /** + * Set loop mode. + * +- * @param {int} streamID Returned by the play() +- * @param {int} loop Loop mode (0 = no loop, -1 = loop forever) ++ * @param {number} streamID Returned by the play() ++ * @param {number} loop Loop mode (0 = no loop, -1 = loop forever) + * @returns {Promise} Promise used to return the result. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. 3.Parameter verification failed. Return by promise. + * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. + * @throws { BusinessError } 5400105 - Service died. Return by promise. + * @syscap SystemCapability.Multimedia.Media.SoundPool +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- setLoop(streamID: int, loop: int): Promise; ++ setLoop(streamID: number, loop: number): Promise; + /** + * Set stream priority. + * +- * @param {int} streamID Returned by the play() +- * @param {int} priority Stream priority (0 = lowest priority) ++ * @param {number} streamID Returned by the play() ++ * @param {number} priority Stream priority (0 = lowest priority) + * @param {AsyncCallback} callback Callback used to return the result. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. 3.Parameter verification failed. Return by callback. + * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. + * @throws { BusinessError } 5400105 - Service died. Return by callback. + * @syscap SystemCapability.Multimedia.Media.SoundPool +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- setPriority(streamID: int, priority: int, callback: AsyncCallback): void; ++ setPriority(streamID: number, priority: number, callback: AsyncCallback): void; + /** + * Set stream priority. + * +- * @param {int} streamID Returned by the play() +- * @param {int} priority Stream priority (0 = lowest priority) ++ * @param {number} streamID Returned by the play() ++ * @param {number} priority Stream priority (0 = lowest priority) + * @returns {Promise} Promise used to return the result. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. 3.Parameter verification failed. Return by promise. + * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. + * @throws { BusinessError } 5400105 - Service died. Return by promise. + * @syscap SystemCapability.Multimedia.Media.SoundPool +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- setPriority(streamID: int, priority: int): Promise; ++ setPriority(streamID: number, priority: number): Promise; + /** + * Set playback rate. + * +- * @param {int} streamID Returned by the play() ++ * @param {number} streamID Returned by the play() + * @param {audio.AudioRendererRate} rate Playback rate + * @param {AsyncCallback} callback Callback used to return the result. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. +@@ -292,11 +296,11 @@ export interface SoundPool { + * @syscap SystemCapability.Multimedia.Media.SoundPool + * @since 10 + */ +- setRate(streamID: int, rate: audio.AudioRendererRate, callback: AsyncCallback): void; ++ setRate(streamID: number, rate: audio.AudioRendererRate, callback: AsyncCallback): void; + /** + * Set playback rate. + * +- * @param {int} streamID Returned by the play() ++ * @param {number} streamID Returned by the play() + * @param {audio.AudioRendererRate} rate Playback rate + * @returns {Promise} Promise used to return the result. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. +@@ -306,11 +310,11 @@ export interface SoundPool { + * @syscap SystemCapability.Multimedia.Media.SoundPool + * @since 10 + */ +- setRate(streamID: int, rate: audio.AudioRendererRate): Promise; ++ setRate(streamID: number, rate: audio.AudioRendererRate): Promise; + /** + * Set stream volume. + * +- * @param {int} streamID Returned by the play() ++ * @param {number} streamID Returned by the play() + * @param {number} leftVolume Volume value(range = 0.0 to 1.0),current leftVolume = rightVolume + * @param {number} rightVolume Volume value(range = 0.0 to 1.0),current leftVolume = rightVolume + * @param {AsyncCallback} callback Callback used to return the result. +@@ -319,13 +323,14 @@ export interface SoundPool { + * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. + * @throws { BusinessError } 5400105 - Service died. Return by callback. + * @syscap SystemCapability.Multimedia.Media.SoundPool +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- setVolume(streamID: int, leftVolume: number, rightVolume: number, callback: AsyncCallback): void; ++ setVolume(streamID: number, leftVolume: number, rightVolume: number, callback: AsyncCallback): void; + /** + * Set stream volume. + * +- * @param {int} streamID Returned by the play() ++ * @param {number} streamID Returned by the play() + * @param {number} leftVolume Volume value(range = 0.0 to 1.0),current leftVolume = rightVolume + * @param {number} rightVolume Volume value(range = 0.0 to 1.0),current leftVolume = rightVolume + * @returns {Promise} Promise used to return the result. +@@ -334,13 +339,14 @@ export interface SoundPool { + * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. + * @throws { BusinessError } 5400105 - Service died. Return by promise. + * @syscap SystemCapability.Multimedia.Media.SoundPool +- * @since 10 ++ * @since arkts {'1.1':'10','1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- setVolume(streamID: int, leftVolume: number, rightVolume: number): Promise; ++ setVolume(streamID: number, leftVolume: number, rightVolume: number): Promise; + /** + * Unload a sound from a sound ID. + * +- * @param {int} soundID Returned by the load() ++ * @param {number} soundID Returned by the load() + * @param {AsyncCallback} callback Callback used to return the result. + * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. + * @throws { BusinessError } 5400103 - I/O error. Return by callback. +@@ -349,11 +355,11 @@ export interface SoundPool { + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- unload(soundID: int, callback: AsyncCallback): void; ++ unload(soundID: number, callback: AsyncCallback): void; + /** + * Unload a sound from a sound ID. + * +- * @param {int} soundID Returned by the load() ++ * @param {number} soundID Returned by the load() + * @returns {Promise} Promise used to return the result. + * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. + * @throws { BusinessError } 5400103 - I/O error. Return by promise. +@@ -362,7 +368,7 @@ export interface SoundPool { + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +- unload(soundID: int): Promise; ++ unload(soundID: number): Promise; + /** + * Releases the soundPool. This method uses an asynchronous callback to return the result. + * +@@ -392,7 +398,7 @@ export interface SoundPool { + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +-// on(type: 'loadComplete', callback: Callback): void; ++ on(type: 'loadComplete', callback: Callback): void; + /** + * Cancel Listens for load result event. + * +@@ -401,30 +407,29 @@ export interface SoundPool { + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +-// off(type: 'loadComplete'): void; ++ off(type: 'loadComplete'): void; + /** + * Register the listener for playing finished event. The conditions which this event is called + * are the same as {@link #playFinished}, additionally, this event can callback the streamId of finishing playing. + * If this event and the {@link #playFinished} event are registered at the same time, + * only this event will be called, and the {@link #playFinished} event will not be called. + * +- * @param {'playFinishedWithStreamId' | 'playFinished' | 'error' | 'loadComplete'} type name of the play finished event to listen for. +- * @param {Callback | Callback | ErrorCallback} callback Callback used to listen which stream id has finished playback. +- * @syscap SystemCapability.Multimedia.Media.SoundPool +- * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 +- */ +- on(type: 'playFinishedWithStreamId' | 'playFinished' | 'error' | 'loadComplete', +- callback: Callback | Callback | ErrorCallback): void; +- /** +- * Cancel listening for playing finished event. +- * +- * @param {'playFinishedWithStreamId' | 'loadComplete' | 'playFinished' | 'error'} type name of the play finished event to listen for. ++ * @param {'playFinishedWithStreamId'} type name of the play finished event to listen for. ++ * @param {Callback} callback Callback used to listen which stream id has finished playback. + * @syscap SystemCapability.Multimedia.Media.SoundPool + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 + */ +- off(type: 'playFinishedWithStreamId' | 'loadComplete' | 'playFinished' | 'error'): void; ++ on(type: 'playFinishedWithStreamId', callback: Callback): void; ++ /** ++ * Cancel listening for playing finished event. ++ * ++ * @param {'playFinishedWithStreamId'} type name of the play finished event to listen for. ++ * @syscap SystemCapability.Multimedia.Media.SoundPool ++ * @since arkts {'1.1':'18','1.2':'20'} ++ * @arkts 1.1&1.2 ++ */ ++ off(type: 'playFinishedWithStreamId'): void; + /** + * Register listens for play finish event. + * +@@ -434,7 +439,7 @@ export interface SoundPool { + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +-// on(type: 'playFinished', callback: Callback): void; ++ on(type: 'playFinished', callback: Callback): void; + /** + * Cancel Listens for play finish event. + * +@@ -443,7 +448,7 @@ export interface SoundPool { + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +-// off(type: 'playFinished'): void; ++ off(type: 'playFinished'): void; + /** + * Register listens for sound play error events. + * +@@ -453,7 +458,7 @@ export interface SoundPool { + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +-// on(type: 'error', callback: ErrorCallback): void; ++ on(type: 'error', callback: ErrorCallback): void; + /** + * Cancel Listens for sound play error events. + * +@@ -462,6 +467,6 @@ export interface SoundPool { + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 + */ +-// off(type: 'error'): void; ++ off(type: 'error'): void; + } + +diff --git a/api/notification/notificationSubscriber.d.ts b/api/notification/notificationSubscriber.d.ts +index 65252b0a3..7fa0bd560 100644 +--- a/api/notification/notificationSubscriber.d.ts ++++ b/api/notification/notificationSubscriber.d.ts +@@ -24,6 +24,9 @@ import { NotificationSortingMap } from './notificationSortingMap'; + import notification from '../@ohos.notification'; + import type notificationManager from '../@ohos.notificationManager'; + /*** endif */ ++/*** if arkts 1.2 */ ++import type notificationManager from '../@ohos.notificationManager'; ++/*** endif */ + + /** + * Provides methods that will be called back when the subscriber receives a new notification or +@@ -42,7 +45,8 @@ export interface NotificationSubscriber { + * @type { ?function } + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onConsume?: (data: SubscribeCallbackData) => void; + +@@ -52,7 +56,8 @@ export interface NotificationSubscriber { + * @type { ?function } + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onCancel?: (data: SubscribeCallbackData) => void; + +@@ -62,7 +67,8 @@ export interface NotificationSubscriber { + * @type { ?function } + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onUpdate?: (data: NotificationSortingMap) => void; + +@@ -72,7 +78,8 @@ export interface NotificationSubscriber { + * @type { ?function } + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onConnect?: () => void; + +@@ -82,7 +89,8 @@ export interface NotificationSubscriber { + * @type { ?function } + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onDisconnect?: () => void; + +@@ -92,7 +100,8 @@ export interface NotificationSubscriber { + * @type { ?function } + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 7 ++ * @since arkts {'1.1':'7', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onDestroy?: () => void; + +@@ -114,7 +123,8 @@ export interface NotificationSubscriber { + * @type { ?function } + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onDoNotDisturbChanged?: (mode: notificationManager.DoNotDisturbDate) => void; + +@@ -124,7 +134,8 @@ export interface NotificationSubscriber { + * @type { ?function } + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 8 ++ * @since arkts {'1.1':'8', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onEnabledNotificationChanged?: (callbackData: EnabledNotificationCallbackData) => void; + +@@ -134,7 +145,8 @@ export interface NotificationSubscriber { + * @type { ?function } + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 10 ++ * @since arkts {'1.1':'10', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onBadgeChanged?: (data: BadgeNumberCallbackData) => void; + +@@ -144,7 +156,8 @@ export interface NotificationSubscriber { + * @type { ?BadgeEnabledChangedCallback } + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 12 ++ * @since arkts {'1.1':'12', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onBadgeEnabledChanged?: BadgeEnabledChangedCallback; + +@@ -154,7 +167,8 @@ export interface NotificationSubscriber { + * @type { ?function } + * @syscap SystemCapability.Notification.Notification + * @systemapi +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + onBatchCancel?: (data: Array) => void; + } +@@ -369,19 +383,11 @@ export interface BadgeEnabledChangedCallback { + } + + /** +- * Defines the callback of BadgeEnabledChanged. +- * @typedef BadgeEnabledChangedCallback ++ * Defines the BadgeEnabledChanged callback. ++ * @param { EnabledNotificationCallbackData } data + * @syscap SystemCapability.Notification.Notification ++ * @systemapi + * @since 20 + * @arkts 1.2 + */ +- +- /** +- * Defines the BadgeEnabledChanged callback. +- * @param { EnabledNotificationCallbackData } data +- * @syscap SystemCapability.Notification.Notification +- * @systemapi +- * @since 20 +- * @arkts 1.2 +- */ + export type BadgeEnabledChangedCallback = (data: EnabledNotificationCallbackData) => void; +diff --git a/api/permissions.d.ts b/api/permissions.d.ts +index a2aea7151..a18d38e1e 100644 +--- a/api/permissions.d.ts ++++ b/api/permissions.d.ts +@@ -16,7 +16,6 @@ + /** + * @file Defines all permissions. + * @kit AbilityKit +- * @arkts 1.1&1.2 + */ + + /** +@@ -33,5 +32,6 @@ + * @syscap SystemCapability.Security.AccessToken + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + export type Permissions = string; +diff --git a/api/security/PermissionRequestResult.d.ts b/api/security/PermissionRequestResult.d.ts +index 05d2bceac..16ff14dba 100644 +--- a/api/security/PermissionRequestResult.d.ts ++++ b/api/security/PermissionRequestResult.d.ts +@@ -18,9 +18,6 @@ + * @kit AbilityKit + */ + +-/*** if arkts 1.1 */ +-import { int } from '@ohos.base'; +-/*** endif */ + /** + * The result of requestPermissionsFromUser with asynchronous callback. + * +@@ -46,7 +43,7 @@ import { int } from '@ohos.base'; + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ +-export default class PermissionRequestResult { ++declare class PermissionRequestResult { + /** + * The permissions passed in by the user. + * +@@ -72,28 +69,16 @@ export default class PermissionRequestResult { + * @stagemodelonly + * @crossplatform + * @atomicservice +- * @since 11 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + permissions: Array; + +- /** +- * The permissions passed in by the user. +- * +- * @type { Array } +- * @syscap SystemCapability.Security.AccessToken +- * @stagemodelonly +- * @crossplatform +- * @atomicservice +- * @since 20 +- * @arkts 1.2 +- */ +- permissions: Array = new Array(); +- + /** + * The results for the corresponding request permissions. The value 0 indicates that a + * permission is granted, the value -1 indicates not, and the value 2 indicates the request is invalid. + * +- * @type { Array } ++ * @type { Array } + * @syscap SystemCapability.Security.AccessToken + * @stagemodelonly + * @since 9 +@@ -102,25 +87,12 @@ export default class PermissionRequestResult { + * The results for the corresponding request permissions. The value 0 indicates that a + * permission is granted, the value -1 indicates not, and the value 2 indicates the request is invalid. + * +- * @type { Array } ++ * @type { Array } + * @syscap SystemCapability.Security.AccessToken + * @stagemodelonly + * @crossplatform + * @since 10 + */ +- /** +- * The results for the corresponding request permissions. The value 0 indicates that a +- * permission is granted, the value -1 indicates not, and the value 2 indicates the request is invalid. +- * +- * @type { Array } +- * @syscap SystemCapability.Security.AccessToken +- * @stagemodelonly +- * @crossplatform +- * @atomicservice +- * @since 11 +- */ +- authResults: Array; +- + /** + * The results for the corresponding request permissions. The value 0 indicates that a + * permission is granted, the value -1 indicates not, and the value 2 indicates the request is invalid. +@@ -130,10 +102,10 @@ export default class PermissionRequestResult { + * @stagemodelonly + * @crossplatform + * @atomicservice +- * @since 20 +- * @arkts 1.2 ++ * @since arkts {'1.1':'11', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- authResults: Array = new Array(); ++ authResults: Array; + + /** + * Specifies whether a dialog box is shown for each requested permission. +@@ -168,3 +140,5 @@ export default class PermissionRequestResult { + */ + errorReasons?: Array; + } ++ ++export default PermissionRequestResult; +diff --git a/arkts/@arkts.collections.d.ets b/arkts/@arkts.collections.d.ets +index 05198598d..cea44257c 100644 +--- a/arkts/@arkts.collections.d.ets ++++ b/arkts/@arkts.collections.d.ets +@@ -16,10 +16,11 @@ + /** + * @file Defines the collections for ArkTS + * @kit ArkTS +- * @arkts 1.1 + */ + ++/*** if arkts 1.1 */ + import lang from './@arkts.lang' ++/*** endif */ + + /** + * ArkTS collections. +@@ -37,7 +38,7 @@ import lang from './@arkts.lang' + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1 & 1.2 ++ * @arkts 1.1&1.2 + */ + declare namespace collections { + /** +@@ -11993,30 +11994,22 @@ declare namespace collections { + * @arkts 1.2 + */ + values(): IterableIterator; ++ + /** + * Returns the item at that index. + * + * @param { number } index - The zero-based index of the desired code unit. +- * @returns { number } The element in the bitVector matching the given index. ++ * Throws error if index < 0 or index >= bitVector.length. ++ * @returns { number } The element in the bitVector matching the given index. ++ * @throws { BusinessError } 10200001 - The value of index is out of range. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +- $_get(index: number): number; +- /** +- * Set the value of item at that index. +- * +- * @param { number } index - The index of the element to set. +- * @param { number } value - The value to set at the specified index. +- * @syscap SystemCapability.Utils.Lang +- * @atomicservice +- * @crossplatform +- * @since 20 +- * @arkts 1.2 +- */ +- $_set(index: number, value: number): void; ++ [index: number]: number; ++ + } + + /** +diff --git a/arkts/@arkts.math.Decimal.d.ets b/arkts/@arkts.math.Decimal.d.ets +index de5982cf7..a5f61722a 100644 +--- a/arkts/@arkts.math.Decimal.d.ets ++++ b/arkts/@arkts.math.Decimal.d.ets +@@ -38,6 +38,7 @@ type Rounding = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8; + /** + * The type uesd to set rounding + * ++ * @typedef { number } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +@@ -66,6 +67,7 @@ type Modulo = Rounding | 9; + /** + * The type uesd to set modulo + * ++ * @typedef { number } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +@@ -84,13 +86,14 @@ type Modulo = number; + /** + * The type uesd to denote decimal value + * ++ * @typedef { string | number | Decimal } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +-type DecimalValue = string | number | Decimal; ++type Value = string | number | Decimal; + + /** + * Provides configuration for decimal. +@@ -107,7 +110,7 @@ type DecimalValue = string | number | Decimal; + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + interface DecimalConfig { +@@ -128,7 +131,7 @@ interface DecimalConfig { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + precision?: number; +@@ -153,7 +156,7 @@ interface DecimalConfig { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + rounding?: Rounding; +@@ -174,7 +177,7 @@ interface DecimalConfig { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toExpNeg?: number; +@@ -195,7 +198,7 @@ interface DecimalConfig { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toExpPos?: number; +@@ -216,7 +219,7 @@ interface DecimalConfig { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + minE?: number; +@@ -237,7 +240,7 @@ interface DecimalConfig { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + maxE?: number; +@@ -258,7 +261,7 @@ interface DecimalConfig { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + crypto?: boolean; +@@ -279,7 +282,7 @@ interface DecimalConfig { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + modulo?: Modulo; +@@ -300,7 +303,7 @@ interface DecimalConfig { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + defaults?: boolean; +@@ -319,7 +322,7 @@ interface DecimalConfig { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + declare class Decimal { +@@ -355,7 +358,7 @@ declare class Decimal { + * @since 20 + * @arkts 1.2 + */ +- readonly d: Array | null; ++ get d(): Array | null; + + /** + * The number of decimal exponent. +@@ -374,11 +377,23 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 18 + */ + readonly e: number; + ++ /** ++ * The number of decimal exponent. ++ * ++ * @type { number } ++ * @readonly ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get e(): number; ++ + /** + * The number of decimal sign. + * +@@ -396,15 +411,27 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} +- * @arkts 1.1&1.2 ++ * @since 18 + */ + readonly s: number; + ++ /** ++ * The number of decimal sign. ++ * ++ * @type { number } ++ * @readonly ++ * @syscap SystemCapability.Utils.Lang ++ * @crossplatform ++ * @atomicservice ++ * @since 20 ++ * @arkts 1.2 ++ */ ++ get s(): number; ++ + /** + * Return a new Decimal whose value is the absolute value of this Decimal. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; + * 2. Parameter verification failed. +@@ -415,17 +442,17 @@ declare class Decimal { + /** + * Return a new Decimal whose value is the absolute value of this Decimal. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; + * 2. Parameter verification failed. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- constructor(n: DecimalValue); ++ constructor(n: Value); + + /** + * Return a new Decimal whose value is the absolute value of this Decimal. +@@ -442,7 +469,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + abs(): Decimal; +@@ -464,7 +491,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + floor(): Decimal; +@@ -486,7 +513,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + ceil(): Decimal; +@@ -506,7 +533,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + trunc(): Decimal; +@@ -515,8 +542,8 @@ declare class Decimal { + * Return a new Decimal whose value is the value of this Decimal clamped to the range + * delineated by `min` and `max`. + * +- * @param { DecimalValue } min {number | string | Decimal} +- * @param { DecimalValue } max {number | string | Decimal} ++ * @param { Value } min {number | string | Decimal} ++ * @param { Value } max {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -530,8 +557,8 @@ declare class Decimal { + * Return a new Decimal whose value is the value of this Decimal clamped to the range + * delineated by `min` and `max`. + * +- * @param { DecimalValue } min {number | string | Decimal} +- * @param { DecimalValue } max {number | string | Decimal} ++ * @param { Value } min {number | string | Decimal} ++ * @param { Value } max {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -540,16 +567,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- clamp(min: DecimalValue, max: DecimalValue): Decimal; ++ clamp(min: Value, max: Value): Decimal; + + /** + * Return a new Decimal whose value is the value of this Decimal plus `n`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -562,7 +589,7 @@ declare class Decimal { + * Return a new Decimal whose value is the value of this Decimal plus `n`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -570,16 +597,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- add(n: DecimalValue): Decimal; ++ add(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the value of this Decimal minus `n`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -592,7 +619,7 @@ declare class Decimal { + * Return a new Decimal whose value is the value of this Decimal minus `n`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -600,15 +627,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- sub(n: DecimalValue): Decimal; ++ sub(n: Value): Decimal; + + /** + * Return a new Decimal whose value is this Decimal times `n`, rounded to `precision` significant + * digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -621,7 +649,7 @@ declare class Decimal { + * Return a new Decimal whose value is this Decimal times `n`, rounded to `precision` significant + * digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -629,16 +657,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- mul(n: DecimalValue): Decimal; ++ mul(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the value of this Decimal divided by `n`, rounded to + * `precision` significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -651,7 +679,7 @@ declare class Decimal { + * Return a new Decimal whose value is the value of this Decimal divided by `n`, rounded to + * `precision` significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -659,15 +687,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- div(n: DecimalValue): Decimal; ++ div(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the value of this Decimal modulo `n`, rounded to + * `precision` significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal }the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -680,7 +709,7 @@ declare class Decimal { + * Return a new Decimal whose value is the value of this Decimal modulo `n`, rounded to + * `precision` significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal }the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -688,9 +717,10 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- mod(n: DecimalValue): Decimal; ++ mod(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the square root of this Decimal, rounded to `precision` +@@ -709,7 +739,8 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + sqrt(): Decimal; + +@@ -730,7 +761,8 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + cbrt(): Decimal; + +@@ -738,7 +770,7 @@ declare class Decimal { + * Return a new Decimal whose value is the value of this Decimal raised to the power `n`, rounded + * to `precision` significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -752,7 +784,7 @@ declare class Decimal { + * Return a new Decimal whose value is the value of this Decimal raised to the power `n`, rounded + * to `precision` significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -761,9 +793,10 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- pow(n: DecimalValue): Decimal; ++ pow(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the natural exponential of the value of this Decimal, +@@ -786,7 +819,8 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + exp(): Decimal; + +@@ -794,7 +828,7 @@ declare class Decimal { + * Return the logarithm of the value of this Decimal to the specified base, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -808,7 +842,7 @@ declare class Decimal { + * Return the logarithm of the value of this Decimal to the specified base, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -817,9 +851,10 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- log(n: DecimalValue): Decimal; ++ log(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the natural logarithm of the value of this Decimal, +@@ -840,7 +875,8 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + ln(): Decimal; + +@@ -859,7 +895,8 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + cos(): Decimal; + +@@ -878,7 +915,8 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + sin(): Decimal; + +@@ -897,7 +935,8 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + tan(): Decimal; + +@@ -918,7 +957,8 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + cosh(): Decimal; + +@@ -937,7 +977,8 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + sinh(): Decimal; + +@@ -956,7 +997,8 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + tanh(): Decimal; + +@@ -977,7 +1019,8 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + acos(): Decimal; + +@@ -1000,7 +1043,8 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + asin(): Decimal; + +@@ -1021,7 +1065,8 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + atan(): Decimal; + +@@ -1044,7 +1089,8 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + acosh(): Decimal; + +@@ -1067,7 +1113,8 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + asinh(): Decimal; + +@@ -1090,7 +1137,8 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + atanh(): Decimal; + +@@ -1101,7 +1149,7 @@ declare class Decimal { + * 0 if they have the same value, + * NaN if the value of either Decimal is NaN. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { number } the number type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -1117,7 +1165,7 @@ declare class Decimal { + * 0 if they have the same value, + * NaN if the value of either Decimal is NaN. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { number } the number type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -1125,15 +1173,15 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- comparedTo(n: DecimalValue): number; ++ comparedTo(n: Value): number; + + /** + * Return true if the value of this Decimal is equal to the value of `n`, otherwise return false. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { boolean } the boolean type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -1145,7 +1193,7 @@ declare class Decimal { + /** + * Return true if the value of this Decimal is equal to the value of `n`, otherwise return false. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { boolean } the boolean type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -1153,15 +1201,15 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- equals(n: DecimalValue): boolean; ++ equals(n: Value): boolean; + + /** + * Return true if the value of this Decimal is greater than the value of `n`, otherwise return false. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { boolean } the boolean type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -1173,7 +1221,7 @@ declare class Decimal { + /** + * Return true if the value of this Decimal is greater than the value of `n`, otherwise return false. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { boolean } the boolean type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -1181,16 +1229,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- greaterThan(n: DecimalValue): boolean; ++ greaterThan(n: Value): boolean; + + /** + * Return true if the value of this Decimal is greater than or equal to the value of `n`, + * otherwise return false. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { boolean } the boolean type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -1203,7 +1251,7 @@ declare class Decimal { + * Return true if the value of this Decimal is greater than or equal to the value of `n`, + * otherwise return false. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { boolean } the boolean type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -1211,15 +1259,15 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- greaterThanOrEqualTo(n: DecimalValue): boolean; ++ greaterThanOrEqualTo(n: Value): boolean; + + /** + * Return true if the value of this Decimal is less than `n`, otherwise return false. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { boolean } the boolean type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -1231,7 +1279,7 @@ declare class Decimal { + /** + * Return true if the value of this Decimal is less than `n`, otherwise return false. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { boolean } the boolean type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -1239,15 +1287,15 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- lessThan(n: DecimalValue): boolean; ++ lessThan(n: Value): boolean; + + /** + * Return true if the value of this Decimal is less than or equal to `n`, otherwise return false. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { boolean } the boolean type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -1259,7 +1307,7 @@ declare class Decimal { + /** + * Return true if the value of this Decimal is less than or equal to `n`, otherwise return false. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { boolean } the boolean type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -1267,10 +1315,10 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- lessThanOrEqualTo(n: DecimalValue): boolean; ++ lessThanOrEqualTo(n: Value): boolean; + + /** + * Return true if the value of this Decimal is a finite number, otherwise return false. +@@ -1287,7 +1335,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + isFinite(): boolean; +@@ -1307,7 +1355,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + isInteger(): boolean; +@@ -1327,7 +1375,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + isNaN(): boolean; +@@ -1347,7 +1395,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + isNegative(): boolean; +@@ -1367,7 +1415,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + isPositive(): boolean; +@@ -1387,7 +1435,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + isZero(): boolean; +@@ -1396,7 +1444,7 @@ declare class Decimal { + * Return a new Decimal whose value is the integer part of dividing the value of this Decimal + * by the value of `n`, rounded to `precision` significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -1409,7 +1457,7 @@ declare class Decimal { + * Return a new Decimal whose value is the integer part of dividing the value of this Decimal + * by the value of `n`, rounded to `precision` significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -1417,9 +1465,10 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- dividedToIntegerBy(n: DecimalValue): Decimal; ++ dividedToIntegerBy(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the value of this Decimal negated, i.e. as if multiplied by -1. +@@ -1436,7 +1485,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + negate(): Decimal; +@@ -1456,7 +1505,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toBinary(): string; +@@ -1482,7 +1531,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toBinary(significantDigits: number): string; +@@ -1510,7 +1559,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toBinary(significantDigits: number, rounding: Rounding): string; +@@ -1530,7 +1579,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toOctal(): string; +@@ -1554,7 +1603,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toOctal(significantDigits: number): string; +@@ -1582,7 +1631,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toOctal(significantDigits: number, rounding: Rounding): string; +@@ -1602,7 +1651,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toHexadecimal(): string; +@@ -1626,7 +1675,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toHexadecimal(significantDigits: number): string; +@@ -1654,7 +1703,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toHexadecimal(significantDigits: number, rounding: Rounding): string; +@@ -1674,7 +1723,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toDecimalPlaces(): Decimal; +@@ -1700,7 +1749,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toDecimalPlaces(decimalPlaces: number): Decimal; +@@ -1728,7 +1777,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toDecimalPlaces(decimalPlaces: number, rounding: Rounding): Decimal; +@@ -1748,7 +1797,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toExponential(): string; +@@ -1774,7 +1823,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toExponential(decimalPlaces: number): string; +@@ -1802,7 +1851,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toExponential(decimalPlaces: number, rounding: Rounding): string; +@@ -1822,7 +1871,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toFixed(): string; +@@ -1846,7 +1895,7 @@ declare class Decimal { + * @throws { BusinessError } 10200001 - The value of `decimalPlaces` is out of range. + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toFixed(decimalPlaces: number): string; +@@ -1874,7 +1923,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toFixed(decimalPlaces: number, rounding: Rounding): string; +@@ -1896,7 +1945,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toFraction(): Decimal[]; +@@ -1906,7 +1955,7 @@ declare class Decimal { + * numerator and an integer denominator. The denominator will be a positive non-zero value + * less than or equal to `max_denominator`. + * +- * @param { DecimalValue } maxDenominator {number | string | Decimal} ++ * @param { Value } maxDenominator {number | string | Decimal} + * @returns { Decimal[] } the Decimal[] type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -1920,7 +1969,7 @@ declare class Decimal { + * numerator and an integer denominator. The denominator will be a positive non-zero value + * less than or equal to `max_denominator`. + * +- * @param { DecimalValue } maxDenominator {number | string | Decimal} ++ * @param { Value } maxDenominator {number | string | Decimal} + * @returns { Decimal[] } the Decimal[] type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -1928,15 +1977,15 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- toFraction(maxDenominator: DecimalValue): Decimal[]; ++ toFraction(maxDenominator: Value): Decimal[]; + + /** + * Returns a new Decimal whose value is the nearest multiple of `n`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -1948,7 +1997,7 @@ declare class Decimal { + /** + * Returns a new Decimal whose value is the nearest multiple of `n`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -1956,16 +2005,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- toNearest(n: DecimalValue): Decimal; ++ toNearest(n: Value): Decimal; + + /** + * Returns a new Decimal whose value is the nearest multiple of `n` in the direction of rounding + * mode `rounding`, to the value of this Decimal. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @param { Rounding } rounding Rounding mode. Integer, 0 to 8 inclusive. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: +@@ -1980,7 +2029,7 @@ declare class Decimal { + * Returns a new Decimal whose value is the nearest multiple of `n` in the direction of rounding + * mode `rounding`, to the value of this Decimal. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @param { Rounding } rounding Rounding mode. Integer, 0 to 8 inclusive. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: +@@ -1990,10 +2039,10 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- toNearest(n: DecimalValue, rounding: Rounding): Decimal; ++ toNearest(n: Value, rounding: Rounding): Decimal; + + /** + * Return a string representing the value of this Decimal. +@@ -2010,7 +2059,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toPrecision(): string; +@@ -2034,7 +2083,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toPrecision(significantDigits: number): string; +@@ -2062,7 +2111,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toPrecision(significantDigits: number, rounding: Rounding): string; +@@ -2082,7 +2131,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toSignificantDigits(): Decimal; +@@ -2108,7 +2157,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toSignificantDigits(significantDigits: number): Decimal; +@@ -2136,7 +2185,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toSignificantDigits(significantDigits: number, rounding: Rounding): Decimal; +@@ -2156,7 +2205,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toNumber(): number; +@@ -2180,7 +2229,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + toString(): string; +@@ -2202,7 +2251,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + valueOf(): string; +@@ -2222,7 +2271,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + decimalPlaces(): number; +@@ -2242,7 +2291,8 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + precision(): number; + +@@ -2269,14 +2319,15 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + precision(includeZeros: boolean | number): number; + + /** + * Return a new Decimal whose value is the absolute value of `n`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2289,7 +2340,7 @@ declare class Decimal { + /** + * Return a new Decimal whose value is the absolute value of `n`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2298,15 +2349,15 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- static abs(n: DecimalValue): Decimal; ++ static abs(n: Value): Decimal; + + /** + * Return a new Decimal whose value is `n` round to an integer using `ROUND_FLOOR`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2319,7 +2370,7 @@ declare class Decimal { + /** + * Return a new Decimal whose value is `n` round to an integer using `ROUND_FLOOR`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2328,15 +2379,15 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- static floor(n: DecimalValue): Decimal; ++ static floor(n: Value): Decimal; + + /** + * Return a new Decimal whose value is `n` rounded to an integer using `ROUND_CEIL`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2349,7 +2400,7 @@ declare class Decimal { + /** + * Return a new Decimal whose value is `n` rounded to an integer using `ROUND_CEIL`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2358,15 +2409,15 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- static ceil(n: DecimalValue): Decimal; ++ static ceil(n: Value): Decimal; + + /** + * Return a new Decimal whose value is `n` truncated to an integer. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2379,7 +2430,7 @@ declare class Decimal { + /** + * Return a new Decimal whose value is `n` truncated to an integer. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2388,17 +2439,17 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- static trunc(n: DecimalValue): Decimal; ++ static trunc(n: Value): Decimal; + + /** + * Return a new Decimal whose value is `n` clamped to the range delineated by `min` and `max`. + * +- * @param { DecimalValue } n {number | string | Decimal} +- * @param { DecimalValue } min {number | string | Decimal} +- * @param { DecimalValue } max {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} ++ * @param { Value } min {number | string | Decimal} ++ * @param { Value } max {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2412,9 +2463,9 @@ declare class Decimal { + /** + * Return a new Decimal whose value is `n` clamped to the range delineated by `min` and `max`. + * +- * @param { DecimalValue } n {number | string | Decimal} +- * @param { DecimalValue } min {number | string | Decimal} +- * @param { DecimalValue } max {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} ++ * @param { Value } min {number | string | Decimal} ++ * @param { Value } max {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2424,17 +2475,17 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- static clamp(n: DecimalValue, min: DecimalValue, max: DecimalValue): Decimal; ++ static clamp(n: Value, min: Value, max: Value): Decimal; + + /** + * Return a new Decimal whose value is the sum of `x` and `y`, rounded to `precision` significant + * digits using rounding mode `rounding`. + * +- * @param { DecimalValue } x {number | string | Decimal} +- * @param { DecimalValue } y {number | string | Decimal} ++ * @param { Value } x {number | string | Decimal} ++ * @param { Value } y {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2448,8 +2499,8 @@ declare class Decimal { + * Return a new Decimal whose value is the sum of `x` and `y`, rounded to `precision` significant + * digits using rounding mode `rounding`. + * +- * @param { DecimalValue } x {number | string | Decimal} +- * @param { DecimalValue } y {number | string | Decimal} ++ * @param { Value } x {number | string | Decimal} ++ * @param { Value } y {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2458,10 +2509,10 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- static add(x: DecimalValue, y: DecimalValue): Decimal; ++ static add(x: Value, y: Value): Decimal; + + /** + * Return a new Decimal whose value is the sum of the arguments, rounded to `precision` +@@ -2469,7 +2520,7 @@ declare class Decimal { + * + * Only the result is rounded, not the intermediate calculations. + * +- * @param { DecimalValue[] } n {number | string | Decimal} ++ * @param { Value[] } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2485,7 +2536,7 @@ declare class Decimal { + * + * Only the result is rounded, not the intermediate calculations. + * +- * @param { DecimalValue[] } n {number | string | Decimal} ++ * @param { Value[] } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2494,17 +2545,17 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- static sum(...n: DecimalValue[]): Decimal; ++ static sum(...n: Value[]): Decimal; + + /** + * Return a new Decimal whose value is `x` minus `y`, rounded to `precision` significant digits + * using rounding mode `rounding`. + * +- * @param { DecimalValue } x {number | string | Decimal} +- * @param { DecimalValue } y {number | string | Decimal} ++ * @param { Value } x {number | string | Decimal} ++ * @param { Value } y {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2518,8 +2569,8 @@ declare class Decimal { + * Return a new Decimal whose value is `x` minus `y`, rounded to `precision` significant digits + * using rounding mode `rounding`. + * +- * @param { DecimalValue } x {number | string | Decimal} +- * @param { DecimalValue } y {number | string | Decimal} ++ * @param { Value } x {number | string | Decimal} ++ * @param { Value } y {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2528,17 +2579,17 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- static sub(x: DecimalValue, y: DecimalValue): Decimal; ++ static sub(x: Value, y: Value): Decimal; + + /** + * Return a new Decimal whose value is `x` multiplied by `y`, rounded to `precision` significant + * digits using rounding mode `rounding`. + * +- * @param { DecimalValue } x {number | string | Decimal} +- * @param { DecimalValue } y {number | string | Decimal} ++ * @param { Value } x {number | string | Decimal} ++ * @param { Value } y {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2552,8 +2603,8 @@ declare class Decimal { + * Return a new Decimal whose value is `x` multiplied by `y`, rounded to `precision` significant + * digits using rounding mode `rounding`. + * +- * @param { DecimalValue } x {number | string | Decimal} +- * @param { DecimalValue } y {number | string | Decimal} ++ * @param { Value } x {number | string | Decimal} ++ * @param { Value } y {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2562,17 +2613,17 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- static mul(x: DecimalValue, y: DecimalValue): Decimal; ++ static mul(x: Value, y: Value): Decimal; + + /** + * Return a new Decimal whose value is `x` divided by `y`, rounded to `precision` significant + * digits using rounding mode `rounding`. + * +- * @param { DecimalValue } x {number | string | Decimal} +- * @param { DecimalValue } y {number | string | Decimal} ++ * @param { Value } x {number | string | Decimal} ++ * @param { Value } y {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2586,8 +2637,8 @@ declare class Decimal { + * Return a new Decimal whose value is `x` divided by `y`, rounded to `precision` significant + * digits using rounding mode `rounding`. + * +- * @param { DecimalValue } x {number | string | Decimal} +- * @param { DecimalValue } y {number | string | Decimal} ++ * @param { Value } x {number | string | Decimal} ++ * @param { Value } y {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2596,16 +2647,17 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static div(x: DecimalValue, y: DecimalValue): Decimal; ++ static div(x: Value, y: Value): Decimal; + + /** + * Return a new Decimal whose value is `x` modulo `y`, rounded to `precision` significant digits + * using rounding mode `rounding`. + * +- * @param { DecimalValue } x {number | string | Decimal} +- * @param { DecimalValue } y {number | string | Decimal} ++ * @param { Value } x {number | string | Decimal} ++ * @param { Value } y {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2619,8 +2671,8 @@ declare class Decimal { + * Return a new Decimal whose value is `x` modulo `y`, rounded to `precision` significant digits + * using rounding mode `rounding`. + * +- * @param { DecimalValue } x {number | string | Decimal} +- * @param { DecimalValue } y {number | string | Decimal} ++ * @param { Value } x {number | string | Decimal} ++ * @param { Value } y {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2629,15 +2681,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static mod(x: DecimalValue, y: DecimalValue): Decimal; ++ static mod(x: Value, y: Value): Decimal; + + /** + * Return a new Decimal whose value is the square root of `n`, rounded to `precision` significant + * digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2651,7 +2704,7 @@ declare class Decimal { + * Return a new Decimal whose value is the square root of `n`, rounded to `precision` significant + * digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2660,15 +2713,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static sqrt(n: DecimalValue): Decimal; ++ static sqrt(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the cube root of `n`, rounded to `precision` significant + * digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2682,7 +2736,7 @@ declare class Decimal { + * Return a new Decimal whose value is the cube root of `n`, rounded to `precision` significant + * digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2691,16 +2745,17 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static cbrt(n: DecimalValue): Decimal; ++ static cbrt(n: Value): Decimal; + + /** + * Return a new Decimal whose value is `base` raised to the power `exponent`, rounded to precision + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } base {number | string | Decimal} The base. +- * @param { DecimalValue } exponent {number | string | Decimal} The exponent. ++ * @param { Value } base {number | string | Decimal} The base. ++ * @param { Value } exponent {number | string | Decimal} The exponent. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2715,8 +2770,8 @@ declare class Decimal { + * Return a new Decimal whose value is `base` raised to the power `exponent`, rounded to precision + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } base {number | string | Decimal} The base. +- * @param { DecimalValue } exponent {number | string | Decimal} The exponent. ++ * @param { Value } base {number | string | Decimal} The base. ++ * @param { Value } exponent {number | string | Decimal} The exponent. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2726,15 +2781,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static pow(base: DecimalValue, exponent: DecimalValue): Decimal; ++ static pow(base: Value, exponent: Value): Decimal; + + /** + * Return a new Decimal whose value is the natural exponential of `n`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2749,7 +2805,7 @@ declare class Decimal { + * Return a new Decimal whose value is the natural exponential of `n`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2759,16 +2815,17 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static exp(n: DecimalValue): Decimal; ++ static exp(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the log of `n` to the base `base`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} +- * @param { DecimalValue } base {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} ++ * @param { Value } base {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2783,8 +2840,8 @@ declare class Decimal { + * Return a new Decimal whose value is the log of `n` to the base `base`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} +- * @param { DecimalValue } base {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} ++ * @param { Value } base {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2794,15 +2851,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static log(n: DecimalValue, base: DecimalValue): Decimal; ++ static log(n: Value, base: Value): Decimal; + + /** + * Return a new Decimal whose value is the natural logarithm of `n`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2817,7 +2875,7 @@ declare class Decimal { + * Return a new Decimal whose value is the natural logarithm of `n`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2827,15 +2885,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static ln(n: DecimalValue): Decimal; ++ static ln(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the base 2 logarithm of `n`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2850,7 +2909,7 @@ declare class Decimal { + * Return a new Decimal whose value is the base 2 logarithm of `n`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2860,15 +2919,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static log2(n: DecimalValue): Decimal; ++ static log2(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the base 10 logarithm of `n`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2883,7 +2943,7 @@ declare class Decimal { + * Return a new Decimal whose value is the base 10 logarithm of `n`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2893,15 +2953,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static log10(n: DecimalValue): Decimal; ++ static log10(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the cosine of `n`, rounded to `precision` significant + * digits using rounding mode `rounding` + * +- * @param { DecimalValue } n {number | string | Decimal} A value in radians. ++ * @param { Value } n {number | string | Decimal} A value in radians. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2915,7 +2976,7 @@ declare class Decimal { + * Return a new Decimal whose value is the cosine of `n`, rounded to `precision` significant + * digits using rounding mode `rounding` + * +- * @param { DecimalValue } n {number | string | Decimal} A value in radians. ++ * @param { Value } n {number | string | Decimal} A value in radians. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2924,15 +2985,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static cos(n: DecimalValue): Decimal; ++ static cos(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the sine of `n`, rounded to `precision` significant digits + * using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} A value in radians. ++ * @param { Value } n {number | string | Decimal} A value in radians. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2946,7 +3008,7 @@ declare class Decimal { + * Return a new Decimal whose value is the sine of `n`, rounded to `precision` significant digits + * using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} A value in radians. ++ * @param { Value } n {number | string | Decimal} A value in radians. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2955,15 +3017,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static sin(n: DecimalValue): Decimal; ++ static sin(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the tangent of `n`, rounded to `precision` significant + * digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} A value in radians. ++ * @param { Value } n {number | string | Decimal} A value in radians. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2977,7 +3040,7 @@ declare class Decimal { + * Return a new Decimal whose value is the tangent of `n`, rounded to `precision` significant + * digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} A value in radians. ++ * @param { Value } n {number | string | Decimal} A value in radians. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -2986,15 +3049,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static tan(n: DecimalValue): Decimal; ++ static tan(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the hyperbolic cosine of `n`, rounded to precision + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} A value in radians. ++ * @param { Value } n {number | string | Decimal} A value in radians. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3008,7 +3072,7 @@ declare class Decimal { + * Return a new Decimal whose value is the hyperbolic cosine of `n`, rounded to precision + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} A value in radians. ++ * @param { Value } n {number | string | Decimal} A value in radians. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3017,15 +3081,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static cosh(n: DecimalValue): Decimal; ++ static cosh(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the hyperbolic sine of `n`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3039,7 +3104,7 @@ declare class Decimal { + * Return a new Decimal whose value is the hyperbolic sine of `n`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3048,15 +3113,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static sinh(n: DecimalValue): Decimal; ++ static sinh(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the hyperbolic tangent of `n`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} A value in radians. ++ * @param { Value } n {number | string | Decimal} A value in radians. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3070,7 +3136,7 @@ declare class Decimal { + * Return a new Decimal whose value is the hyperbolic tangent of `n`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} A value in radians. ++ * @param { Value } n {number | string | Decimal} A value in radians. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3079,14 +3145,15 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static tanh(n: DecimalValue): Decimal; ++ static tanh(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the arccosine in radians of `n`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3100,7 +3167,7 @@ declare class Decimal { + /** + * Return a new Decimal whose value is the arccosine in radians of `n`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3110,15 +3177,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static acos(n: DecimalValue): Decimal; ++ static acos(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the arcsine in radians of `n`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3133,7 +3201,7 @@ declare class Decimal { + * Return a new Decimal whose value is the arcsine in radians of `n`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3143,15 +3211,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static asin(n: DecimalValue): Decimal; ++ static asin(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the arctangent in radians of `n`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3166,7 +3235,7 @@ declare class Decimal { + * Return a new Decimal whose value is the arctangent in radians of `n`, rounded to `precision` + * significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3176,15 +3245,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static atan(n: DecimalValue): Decimal; ++ static atan(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the inverse of the hyperbolic cosine of `n`, rounded to + * `precision` significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3199,7 +3269,7 @@ declare class Decimal { + * Return a new Decimal whose value is the inverse of the hyperbolic cosine of `n`, rounded to + * `precision` significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3209,15 +3279,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static acosh(n: DecimalValue): Decimal; ++ static acosh(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the inverse of the hyperbolic sine of `n`, rounded to + * `precision` significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} A value in radians. ++ * @param { Value } n {number | string | Decimal} A value in radians. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3232,7 +3303,7 @@ declare class Decimal { + * Return a new Decimal whose value is the inverse of the hyperbolic sine of `n`, rounded to + * `precision` significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} A value in radians. ++ * @param { Value } n {number | string | Decimal} A value in radians. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3242,15 +3313,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static asinh(n: DecimalValue): Decimal; ++ static asinh(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the inverse of the hyperbolic tangent of `n`, rounded to + * `precision` significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} A value in radians. ++ * @param { Value } n {number | string | Decimal} A value in radians. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3265,7 +3337,7 @@ declare class Decimal { + * Return a new Decimal whose value is the inverse of the hyperbolic tangent of `n`, rounded to + * `precision` significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} A value in radians. ++ * @param { Value } n {number | string | Decimal} A value in radians. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3275,16 +3347,17 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static atanh(n: DecimalValue): Decimal; ++ static atanh(n: Value): Decimal; + + /** + * Return a new Decimal whose value is the arctangent in radians of `y/x` in the range -pi to pi + * (inclusive), rounded to `precision` significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } y {number | string | Decimal} The y-coordinate. +- * @param { DecimalValue } x {number | string | Decimal} The x-coordinate. ++ * @param { Value } y {number | string | Decimal} The y-coordinate. ++ * @param { Value } x {number | string | Decimal} The x-coordinate. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3299,8 +3372,8 @@ declare class Decimal { + * Return a new Decimal whose value is the arctangent in radians of `y/x` in the range -pi to pi + * (inclusive), rounded to `precision` significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue } y {number | string | Decimal} The y-coordinate. +- * @param { DecimalValue } x {number | string | Decimal} The x-coordinate. ++ * @param { Value } y {number | string | Decimal} The y-coordinate. ++ * @param { Value } x {number | string | Decimal} The x-coordinate. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3310,15 +3383,16 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ +- static atan2(y: DecimalValue, x: DecimalValue): Decimal; ++ static atan2(y: Value, x: Value): Decimal; + + /** + * Return a new Decimal whose value is the square root of the sum of the squares of the arguments, + * rounded to `precision` significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue[] } n {number | string | Decimal} Decimal ++ * @param { Value[] } n {number | string | Decimal} Decimal + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3332,7 +3406,7 @@ declare class Decimal { + * Return a new Decimal whose value is the square root of the sum of the squares of the arguments, + * rounded to `precision` significant digits using rounding mode `rounding`. + * +- * @param { DecimalValue[] } n {number | string | Decimal} Decimal ++ * @param { Value[] } n {number | string | Decimal} Decimal + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3341,15 +3415,15 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- static hypot(...n: DecimalValue[]): Decimal; ++ static hypot(...n: Value[]): Decimal; + + /** + * Return a new Decimal whose value is the maximum of the arguments. + * +- * @param { DecimalValue[] } n {number | string | Decimal} ++ * @param { Value[] } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3362,7 +3436,7 @@ declare class Decimal { + /** + * Return a new Decimal whose value is the maximum of the arguments. + * +- * @param { DecimalValue[] } n {number | string | Decimal} ++ * @param { Value[] } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3371,15 +3445,15 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- static max(...n: DecimalValue[]): Decimal; ++ static max(...n: Value[]): Decimal; + + /** + * Return a new Decimal whose value is the minimum of the arguments. + * +- * @param { DecimalValue[] } n {number | string | Decimal} ++ * @param { Value[] } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3392,7 +3466,7 @@ declare class Decimal { + /** + * Return a new Decimal whose value is the minimum of the arguments. + * +- * @param { DecimalValue[] } n {number | string | Decimal} ++ * @param { Value[] } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3401,10 +3475,10 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- static min(...n: DecimalValue[]): Decimal; ++ static min(...n: Value[]): Decimal; + + /** + * Returns a new Decimal with a random value equal to or greater than 0 and less than 1. +@@ -3425,7 +3499,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + static random(): Decimal; +@@ -3434,7 +3508,7 @@ declare class Decimal { + * Returns a new Decimal with a random value equal to or greater than 0 and less than 1, and with + * `significantDigits` significant digits (or less if trailing zeros are produced). + * +- * @param { DecimalValue } significantDigits {number} Significant digits. Integer, 0 to MAX_DIGITS inclusive. ++ * @param { Value } significantDigits {number} Significant digits. Integer, 0 to MAX_DIGITS inclusive. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3449,7 +3523,7 @@ declare class Decimal { + * Returns a new Decimal with a random value equal to or greater than 0 and less than 1, and with + * `significantDigits` significant digits (or less if trailing zeros are produced). + * +- * @param { DecimalValue } significantDigits {number} Significant digits. Integer, 0 to MAX_DIGITS inclusive. ++ * @param { Value } significantDigits {number} Significant digits. Integer, 0 to MAX_DIGITS inclusive. + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3459,7 +3533,7 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + static random(significantDigits: number): Decimal; +@@ -3472,7 +3546,7 @@ declare class Decimal { + * -0 if x is -0, + * NaN otherwise + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3490,8 +3564,8 @@ declare class Decimal { + * -0 if x is -0, + * NaN otherwise + * +- * @param { DecimalValue } n {number | string | Decimal} +- * @returns { Decimal } the Decimal type ++ * @param { Value } n {number | string | Decimal} ++ * @returns { number } the number type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; + * 2. Parameter verification failed. +@@ -3499,15 +3573,15 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- static sign(n: DecimalValue): number; ++ static sign(n: Value): number; + + /** + * Return a new Decimal whose value is `n` rounded to an integer using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3520,7 +3594,7 @@ declare class Decimal { + /** + * Return a new Decimal whose value is `n` rounded to an integer using rounding mode `rounding`. + * +- * @param { DecimalValue } n {number | string | Decimal} ++ * @param { Value } n {number | string | Decimal} + * @returns { Decimal } the Decimal type + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1. Incorrect parameter types; +@@ -3529,10 +3603,10 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since arkts {'1.1':'18','1.2':'20'} ++ * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ +- static round(n: DecimalValue): Decimal; ++ static round(n: Value): Decimal; + + /** + * Configures the 'global' settings for this particular Decimal constructor. +@@ -3581,7 +3655,8 @@ declare class Decimal { + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice +- * @since 18 ++ * @since arkts {'1.1':'18', '1.2':'20'} ++ * @arkts 1.1&1.2 + */ + static set(config: DecimalConfig): void; + +@@ -3609,6 +3684,7 @@ declare class Decimal { + /** + * Rounds away from zero + * ++ * @type { number } + * @readonly + * @static + * @syscap SystemCapability.Utils.Lang +@@ -3643,6 +3719,7 @@ declare class Decimal { + /** + * Rounds towards zero + * ++ * @type { number } + * @readonly + * @static + * @syscap SystemCapability.Utils.Lang +@@ -3677,6 +3754,7 @@ declare class Decimal { + /** + * Rounds towards Infinity + * ++ * @type { number } + * @readonly + * @static + * @syscap SystemCapability.Utils.Lang +@@ -3711,6 +3789,7 @@ declare class Decimal { + /** + * Rounds towards -Infinity + * ++ * @type { number } + * @readonly + * @static + * @syscap SystemCapability.Utils.Lang +@@ -3745,6 +3824,7 @@ declare class Decimal { + /** + * Rounds towards nearest neighbour. If equidistant, rounds away from zero + * ++ * @type { number } + * @readonly + * @static + * @syscap SystemCapability.Utils.Lang +@@ -3779,6 +3859,7 @@ declare class Decimal { + /** + * Rounds towards nearest neighbour. If equidistant, rounds towards zero + * ++ * @type { number } + * @readonly + * @static + * @syscap SystemCapability.Utils.Lang +@@ -3813,6 +3894,7 @@ declare class Decimal { + /** + * Rounds towards nearest neighbour. If equidistant, rounds towards even neighbour + * ++ * @type { number } + * @readonly + * @static + * @syscap SystemCapability.Utils.Lang +@@ -3847,6 +3929,7 @@ declare class Decimal { + /** + * Rounds towards nearest neighbour. If equidistant, rounds towards Infinity + * ++ * @type { number } + * @readonly + * @static + * @syscap SystemCapability.Utils.Lang +@@ -3881,6 +3964,7 @@ declare class Decimal { + /** + * Rounds towards nearest neighbour. If equidistant, rounds towards -Infinity + * ++ * @type { number } + * @readonly + * @static + * @syscap SystemCapability.Utils.Lang +@@ -3915,6 +3999,7 @@ declare class Decimal { + /** + * Not a rounding mode, see modulo + * ++ * @type { number } + * @readonly + * @static + * @syscap SystemCapability.Utils.Lang +diff --git a/arkui_transformer.py b/arkui_transformer.py +index 0d00f1b74..0f6919fd6 100755 +--- a/arkui_transformer.py ++++ b/arkui_transformer.py +@@ -30,6 +30,10 @@ def compile_package(options): + nodejs = os.path.abspath(options.node_js) + input_dir = os.path.abspath(options.input) + output = os.path.abspath(options.output) ++ config_path = '' ++ if (len(options.config_path) > 0): ++ config_path = os.path.abspath(options.config_path) ++ + custom_env = { + 'PATH': f"{os.path.dirname(os.path.abspath(options.node_js))}:{os.environ.get('PATH')}", + 'NODE_HOME': os.path.dirname(os.path.abspath(options.node_js)), +@@ -38,7 +42,10 @@ def compile_package(options): + process = subprocess.run([npm, "run", "compile:arkui"], env=custom_env, cwd=tool_path, shell=False) + + if os.path.exists(package_path): +- p = subprocess.run([nodejs, package_path, "--input-dir", input_dir, "--target-dir", output], cwd=tool_path, shell=False) ++ if (len(config_path) > 0): ++ p = subprocess.run([nodejs, package_path, "--input-dir", input_dir, "--target-dir", output, "--config-path", config_path], cwd=tool_path, shell=False) ++ else: ++ p = subprocess.run([nodejs, package_path, "--input-dir", input_dir, "--target-dir", output], cwd=tool_path, shell=False) + else: + print("arkui_transformer: tool path does not exist") + +@@ -49,6 +56,7 @@ def main(): + parser = argparse.ArgumentParser() + parser.add_argument('--input', required=True) + parser.add_argument('--output', required=True) ++ parser.add_argument('--config_path', required=False, default='') + parser.add_argument('--source_root_dir', required=True) + parser.add_argument('--npm-path', required=True) + parser.add_argument('--node-js', required=True) +diff --git a/build-tools/arkui_transformer/config/arkui_config.json b/build-tools/arkui_transformer/config/arkui_config.json +index bb1069ea5..890f2d737 100644 +--- a/build-tools/arkui_transformer/config/arkui_config.json ++++ b/build-tools/arkui_transformer/config/arkui_config.json +@@ -54,7 +54,6 @@ + "Menu", + "MenuItem", + "MenuItemGroup", +- "Metaball", + "MovingPhotoView", + "NavDestination", + "NavRouter", +@@ -130,8 +129,6 @@ + "ContainerSpan", + "ArcSwiper", + "ArcScrollBar", +- "ArcAlphabetIndexer", +- "HdsNavigation", +- "HdsNavDestination" ++ "ArcAlphabetIndexer" + ] + } +\ No newline at end of file +diff --git a/build-tools/arkui_transformer/config/arkui_m3_white_list.json b/build-tools/arkui_transformer/config/arkui_m3_white_list.json +deleted file mode 100644 +index ea4926b92..000000000 +--- a/build-tools/arkui_transformer/config/arkui_m3_white_list.json ++++ /dev/null +@@ -1,4 +0,0 @@ +-{ +- "useM3": [ +- ] +-} +\ No newline at end of file +diff --git a/build-tools/arkui_transformer/package-lock.json b/build-tools/arkui_transformer/package-lock.json +new file mode 100644 +index 000000000..6709ce648 +--- /dev/null ++++ b/build-tools/arkui_transformer/package-lock.json +@@ -0,0 +1,306 @@ ++{ ++ "name": "arkui_transformer", ++ "version": "1.0.0", ++ "lockfileVersion": 3, ++ "requires": true, ++ "packages": { ++ "": { ++ "name": "arkui_transformer", ++ "version": "1.0.0", ++ "license": "ISC", ++ "dependencies": { ++ "@types/node": "^18.0.0", ++ "commander": "^10.0.0", ++ "typescript": "^4.9.5" ++ }, ++ "devDependencies": { ++ "@rollup/plugin-node-resolve": "^16.0.1", ++ "@rollup/plugin-typescript": "^12.1.2", ++ "rollup": "^3.29.5", ++ "tslib": "^2.8.1" ++ } ++ }, ++ "node_modules/@rollup/plugin-node-resolve": { ++ "version": "16.0.1", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.1.tgz", ++ "integrity": "sha512-tk5YCxJWIG81umIvNkSod2qK5KyQW19qcBF/B78n1bjtOON6gzKoVeSzAE8yHCZEDmqkHKkxplExA8KzdJLJpA==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "@rollup/pluginutils": "^5.0.1", ++ "@types/resolve": "1.20.2", ++ "deepmerge": "^4.2.2", ++ "is-module": "^1.0.0", ++ "resolve": "^1.22.1" ++ }, ++ "engines": { ++ "node": ">=14.0.0" ++ }, ++ "peerDependencies": { ++ "rollup": "^2.78.0||^3.0.0||^4.0.0" ++ }, ++ "peerDependenciesMeta": { ++ "rollup": { ++ "optional": true ++ } ++ } ++ }, ++ "node_modules/@rollup/plugin-typescript": { ++ "version": "12.1.2", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/@rollup/plugin-typescript/-/plugin-typescript-12.1.2.tgz", ++ "integrity": "sha512-cdtSp154H5sv637uMr1a8OTWB0L1SWDSm1rDGiyfcGcvQ6cuTs4MDk2BVEBGysUWago4OJN4EQZqOTl/QY3Jgg==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "@rollup/pluginutils": "^5.1.0", ++ "resolve": "^1.22.1" ++ }, ++ "engines": { ++ "node": ">=14.0.0" ++ }, ++ "peerDependencies": { ++ "rollup": "^2.14.0||^3.0.0||^4.0.0", ++ "tslib": "*", ++ "typescript": ">=3.7.0" ++ }, ++ "peerDependenciesMeta": { ++ "rollup": { ++ "optional": true ++ }, ++ "tslib": { ++ "optional": true ++ } ++ } ++ }, ++ "node_modules/@rollup/pluginutils": { ++ "version": "5.1.4", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/@rollup/pluginutils/-/pluginutils-5.1.4.tgz", ++ "integrity": "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "@types/estree": "^1.0.0", ++ "estree-walker": "^2.0.2", ++ "picomatch": "^4.0.2" ++ }, ++ "engines": { ++ "node": ">=14.0.0" ++ }, ++ "peerDependencies": { ++ "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" ++ }, ++ "peerDependenciesMeta": { ++ "rollup": { ++ "optional": true ++ } ++ } ++ }, ++ "node_modules/@types/estree": { ++ "version": "1.0.7", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/@types/estree/-/estree-1.0.7.tgz", ++ "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", ++ "dev": true, ++ "license": "MIT" ++ }, ++ "node_modules/@types/node": { ++ "version": "18.19.110", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/@types/node/-/node-18.19.110.tgz", ++ "integrity": "sha512-WW2o4gTmREtSnqKty9nhqF/vA0GKd0V/rbC0OyjSk9Bz6bzlsXKT+i7WDdS/a0z74rfT2PO4dArVCSnapNLA5Q==", ++ "license": "MIT", ++ "dependencies": { ++ "undici-types": "~5.26.4" ++ } ++ }, ++ "node_modules/@types/resolve": { ++ "version": "1.20.2", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/@types/resolve/-/resolve-1.20.2.tgz", ++ "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==", ++ "dev": true, ++ "license": "MIT" ++ }, ++ "node_modules/commander": { ++ "version": "10.0.1", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/commander/-/commander-10.0.1.tgz", ++ "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", ++ "license": "MIT", ++ "engines": { ++ "node": ">=14" ++ } ++ }, ++ "node_modules/deepmerge": { ++ "version": "4.3.1", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/deepmerge/-/deepmerge-4.3.1.tgz", ++ "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", ++ "dev": true, ++ "license": "MIT", ++ "engines": { ++ "node": ">=0.10.0" ++ } ++ }, ++ "node_modules/estree-walker": { ++ "version": "2.0.2", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/estree-walker/-/estree-walker-2.0.2.tgz", ++ "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", ++ "dev": true, ++ "license": "MIT" ++ }, ++ "node_modules/fsevents": { ++ "version": "2.3.3", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/fsevents/-/fsevents-2.3.3.tgz", ++ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", ++ "dev": true, ++ "hasInstallScript": true, ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "darwin" ++ ], ++ "engines": { ++ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" ++ } ++ }, ++ "node_modules/function-bind": { ++ "version": "1.1.2", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/function-bind/-/function-bind-1.1.2.tgz", ++ "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", ++ "dev": true, ++ "license": "MIT", ++ "funding": { ++ "url": "https://github.com/sponsors/ljharb" ++ } ++ }, ++ "node_modules/hasown": { ++ "version": "2.0.2", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/hasown/-/hasown-2.0.2.tgz", ++ "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "function-bind": "^1.1.2" ++ }, ++ "engines": { ++ "node": ">= 0.4" ++ } ++ }, ++ "node_modules/is-core-module": { ++ "version": "2.16.1", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/is-core-module/-/is-core-module-2.16.1.tgz", ++ "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "hasown": "^2.0.2" ++ }, ++ "engines": { ++ "node": ">= 0.4" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/ljharb" ++ } ++ }, ++ "node_modules/is-module": { ++ "version": "1.0.0", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/is-module/-/is-module-1.0.0.tgz", ++ "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==", ++ "dev": true, ++ "license": "MIT" ++ }, ++ "node_modules/path-parse": { ++ "version": "1.0.7", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/path-parse/-/path-parse-1.0.7.tgz", ++ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", ++ "dev": true, ++ "license": "MIT" ++ }, ++ "node_modules/picomatch": { ++ "version": "4.0.2", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/picomatch/-/picomatch-4.0.2.tgz", ++ "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", ++ "dev": true, ++ "license": "MIT", ++ "engines": { ++ "node": ">=12" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/jonschlinkert" ++ } ++ }, ++ "node_modules/resolve": { ++ "version": "1.22.10", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/resolve/-/resolve-1.22.10.tgz", ++ "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "is-core-module": "^2.16.0", ++ "path-parse": "^1.0.7", ++ "supports-preserve-symlinks-flag": "^1.0.0" ++ }, ++ "bin": { ++ "resolve": "bin/resolve" ++ }, ++ "engines": { ++ "node": ">= 0.4" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/ljharb" ++ } ++ }, ++ "node_modules/rollup": { ++ "version": "3.29.5", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/rollup/-/rollup-3.29.5.tgz", ++ "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==", ++ "dev": true, ++ "license": "MIT", ++ "bin": { ++ "rollup": "dist/bin/rollup" ++ }, ++ "engines": { ++ "node": ">=14.18.0", ++ "npm": ">=8.0.0" ++ }, ++ "optionalDependencies": { ++ "fsevents": "~2.3.2" ++ } ++ }, ++ "node_modules/supports-preserve-symlinks-flag": { ++ "version": "1.0.0", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", ++ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", ++ "dev": true, ++ "license": "MIT", ++ "engines": { ++ "node": ">= 0.4" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/ljharb" ++ } ++ }, ++ "node_modules/tslib": { ++ "version": "2.8.1", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/tslib/-/tslib-2.8.1.tgz", ++ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", ++ "dev": true, ++ "license": "0BSD" ++ }, ++ "node_modules/typescript": { ++ "version": "4.9.5", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/typescript/-/typescript-4.9.5.tgz", ++ "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", ++ "license": "Apache-2.0", ++ "bin": { ++ "tsc": "bin/tsc", ++ "tsserver": "bin/tsserver" ++ }, ++ "engines": { ++ "node": ">=4.2.0" ++ } ++ }, ++ "node_modules/undici-types": { ++ "version": "5.26.5", ++ "resolved": "https://repo.huaweicloud.com/repository/npm/undici-types/-/undici-types-5.26.5.tgz", ++ "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", ++ "license": "MIT" ++ } ++ } ++} +diff --git a/build-tools/arkui_transformer/pattern/arkts_component_decl.pattern b/build-tools/arkui_transformer/pattern/arkts_component_decl.pattern +index ae4a5689f..c4b09a33d 100644 +--- a/build-tools/arkui_transformer/pattern/arkts_component_decl.pattern ++++ b/build-tools/arkui_transformer/pattern/arkts_component_decl.pattern +@@ -5,4 +5,4 @@ export declare function %COMPONENT_NAME%( + %FUNCTION_PARAMETERS% + @memo + content_?: () => void, +-): UI%COMPONENT_NAME%Attribute +\ No newline at end of file ++): %COMPONENT_NAME%Attribute +\ No newline at end of file +diff --git a/build-tools/arkui_transformer/pattern/arkts_component_decl_m3.pattern b/build-tools/arkui_transformer/pattern/arkts_component_decl_m3.pattern +deleted file mode 100644 +index c4b09a33d..000000000 +--- a/build-tools/arkui_transformer/pattern/arkts_component_decl_m3.pattern ++++ /dev/null +@@ -1,8 +0,0 @@ +-%COMPONENT_COMMENT% +-@memo +-@ComponentBuilder +-export declare function %COMPONENT_NAME%( +- %FUNCTION_PARAMETERS% +- @memo +- content_?: () => void, +-): %COMPONENT_NAME%Attribute +\ No newline at end of file +diff --git a/build-tools/arkui_transformer/src/add_import.ts b/build-tools/arkui_transformer/src/add_import.ts +index daf313dd4..83a69d9b3 100644 +--- a/build-tools/arkui_transformer/src/add_import.ts ++++ b/build-tools/arkui_transformer/src/add_import.ts +@@ -68,15 +68,9 @@ function handleImportDeclaration(node: ts.ImportDeclaration): [ts.Node, boolean] + if (importClause && ts.isImportClause(importClause) && importClause.namedBindings && ts.isNamedImports(importClause.namedBindings)) { + const namedImports = importClause.namedBindings.elements; + const existingImports = namedImports.map((element) => element.name.text); +- existingImports.forEach((element) => { +- if (uiconfig.isUIHeritage(element)) { +- uiconfig.useMemoM3 || uiprefixImports.add(`UI${element}`) +- } +- }) + if (moduleText.includes("common")) { + uiprefixImports.add('AttributeModifier'); + uiprefixImports.add('CommonMethod'); +- uiconfig.useMemoM3 || uiprefixImports.add('UICommonMethod'); + } + + const addedImports = Array.from(uiprefixImports).filter((im) => !existingImports.includes(im)); +@@ -146,9 +140,6 @@ function createTargetImport(sourceFile: ts.SourceFile, context: ts.Transformatio + ts.factory.createNamedImports([ + ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("AttributeModifier")), + ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("CommonMethod")), +- ...(uiconfig.useMemoM3 !== true ? [ +- ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("UICommonMethod")) +- ] : []) + ]) + ), + ts.factory.createStringLiteral("./common"), +diff --git a/build-tools/arkui_transformer/src/arkui_config_util.ts b/build-tools/arkui_transformer/src/arkui_config_util.ts +index a293a73c6..5feba8166 100644 +--- a/build-tools/arkui_transformer/src/arkui_config_util.ts ++++ b/build-tools/arkui_transformer/src/arkui_config_util.ts +@@ -13,85 +13,95 @@ + * limitations under the License. + */ + +-import { OptionValues } from "commander" +-import * as fs from "fs" ++import { OptionValues } from 'commander'; ++import * as fs from 'fs'; + +-import path from "path" ++import path from 'path'; + + export interface ArkUIConfig { +- components: Array ++ components: Array; + } + + interface NoneUIConfig { +- files: Array +-} +- +-interface UseM3Config { +- useM3: Array ++ files: Array; + } + + export class ArkUIConfigUtil { +- static instance: ArkUIConfigUtil = new ArkUIConfigUtil ++ static instance: ArkUIConfigUtil = new ArkUIConfigUtil(); + constructor() { +- this.config = JSON.parse(fs.readFileSync("./config/arkui_config.json", 'utf-8')) ++ this.config = JSON.parse(fs.readFileSync('./config/arkui_config.json', 'utf-8')); + this.config.components.forEach(c => { +- this.componentSet.add(c) +- }) +- this.noneUIconfig = JSON.parse(fs.readFileSync("./config/none_arkui_files.json", 'utf-8')) ++ this.componentSet.add(c); ++ }); ++ this.noneUIconfig = JSON.parse(fs.readFileSync('./config/none_arkui_files.json', 'utf-8')); + this.noneUIconfig.files.forEach(f => { +- this.noneUIFielSet.add(f) +- }) +- const useM3Config: UseM3Config = JSON.parse(fs.readFileSync("./config/arkui_m3_white_list.json", 'utf-8')) +- this._useM3Files = useM3Config.useM3 ++ this.noneUIFileSet.add(f); ++ }); + } + // ui components +- private config: ArkUIConfig ++ private config: ArkUIConfig; + // None ui files +- private noneUIconfig: NoneUIConfig +- private noneUIFielSet: Set = new Set ++ private noneUIconfig: NoneUIConfig; ++ private noneUIFileSet: Set = new Set(); + // Full set of component, should be manually mantained by config file +- private componentSet: Set = new Set ++ private componentSet: Set = new Set(); + // Component superclass set, generated by traversing the declartion AST +- private componentSuperclassSet: Set = new Set ++ private componentSuperclassSet: Set = new Set(); + // All class/interface name related to component attribute heritage +- private componentHeritage: Set = new Set ++ private componentHeritage: Set = new Set(); + // All implement relationship of component heritage +- private componentHerirageRelation: Map = new Map ++ private componentHerirageRelation: Map = new Map(); + // All component filename +- private componentFiles: Set = new Set +- private file2Attrbiute: Map = new Map +- private shouldNotHaveAttributeModifier: Set = new Set +- private _useMemoM3: boolean = false +- private _useM3Files: Array = [] +- get useMemoM3(): boolean { +- return this._useMemoM3 ++ private componentFiles: Set = new Set(); ++ private file2Attrbiute: Map = new Map(); ++ private shouldNotHaveAttributeModifier: Set = new Set(); ++ private _useMemoM3: boolean = false; ++ private _configPath: string = ''; ++ get isHdsComponent(): boolean { ++ return this._configPath.length > 0; + } +- +- set useMemoM3(value: boolean) { +- this._useMemoM3 = value +- } +- +- withM3File(file: string): boolean { +- if (this._useMemoM3) { +- return true; +- } +- return this._useM3Files.includes(path.basename(file)) ++ get useMemoM3(): boolean { ++ return this._useMemoM3; + } +- + public loadConfig(config: OptionValues): void { + if (config.useMemoM3) { +- this._useMemoM3 = true ++ this._useMemoM3 = true; ++ } ++ ++ if (config.configPath != undefined && config.configPath != '') { ++ this._configPath = config.configPath; ++ // exception process: avoid non-existing given path ++ try { ++ this.config = JSON.parse(fs.readFileSync(this._configPath + '/hds_uicomponents.json', 'utf-8')); ++ this.componentSet.clear(); ++ this.config.components.forEach(c => { ++ this.componentSet.add(c); ++ }); ++ this.noneUIconfig = JSON.parse(fs.readFileSync(this._configPath + '/hds_non_uicomponents.json', 'utf-8')); ++ this.noneUIFileSet.clear(); ++ this.noneUIconfig.files.forEach(f => { ++ this.noneUIFileSet.add(f); ++ }); ++ } catch (error) { ++ this._configPath = ''; ++ console.log('Load given hds_uicomponents file failed!', error); ++ } + } + } + private getPureName(name: string): string { +- return path.basename(name).replaceAll(".d.ts", "").replaceAll(".d.ets", "").replaceAll("_","").toLowerCase() ++ return path ++ .basename(name) ++ .replace(/\.d\.e?ts/g, '') ++ .replace(/_/g, '') ++ .toLowerCase(); + } + + public isRelatedToComponent(name: string): boolean { +- return this.componentSet.has(name) || this.componentSuperclassSet.has(name) ++ return this.componentSet.has(name) || this.componentSuperclassSet.has(name); + } + public isComponent(name: string, subfix: string): boolean { +- return this.componentSet.has(name.replaceAll(subfix, "")) ++ const regSubfix = new RegExp(subfix, 'g'); ++ return this.componentSet.has(name.replace(regSubfix, '')); + } + public addComponentSuperclass(name: string): void { + if (!this.isComponent(name, 'Attribute')) { +@@ -99,36 +109,39 @@ export class ArkUIConfigUtil { + } + } + public addComponentAttributeHeritage(name: string[]): void { +- let prev: string | undefined = undefined ++ let prev: string | undefined = undefined; + name.forEach(n => { + if (prev) { +- this.componentHerirageRelation.set(prev, n) ++ this.componentHerirageRelation.set(prev, n); + } +- prev = n +- this.componentHeritage.add(n) +- }) ++ prev = n; ++ this.componentHeritage.add(n); ++ }); + if (name.length == 1) { +- this.shouldNotHaveAttributeModifier.add(name[0]) ++ this.shouldNotHaveAttributeModifier.add(name[0]); + } + } + public getComponentSuperclass(name: string): string | undefined { +- return this.componentHerirageRelation.get(name) ++ return this.componentHerirageRelation.get(name); + } + public isUIHeritage(name: string): boolean { +- return this.componentHeritage.has(name) ++ return this.componentHeritage.has(name); + } + public notUIFile(name: string): boolean { +- return this.noneUIFielSet.has(this.getPureName(name)) ++ return this.noneUIFileSet.has(this.getPureName(name)); + } + public addComponentFile(name: string): void { +- this.componentFiles.add(this.getPureName(name)) ++ this.componentFiles.add(this.getPureName(name)); + } + public isComponentFile(name: string): boolean { +- return this.componentFiles.has(this.getPureName(name)) ++ return this.componentFiles.has(this.getPureName(name)); + } + public shouldHaveAttributeModifier(name: string): boolean { +- return !this.shouldNotHaveAttributeModifier.has(name) && this.isComponent(name, 'Attribute') ++ if (this.isHdsComponent) { ++ return false; ++ } ++ return !this.shouldNotHaveAttributeModifier.has(name) && this.isComponent(name, 'Attribute'); + } + } + +-export default ArkUIConfigUtil.instance ++export default ArkUIConfigUtil.instance; +diff --git a/build-tools/arkui_transformer/src/arkui_transformer.ts b/build-tools/arkui_transformer/src/arkui_transformer.ts +index 65a17e6bf..30802ad34 100644 +--- a/build-tools/arkui_transformer/src/arkui_transformer.ts ++++ b/build-tools/arkui_transformer/src/arkui_transformer.ts +@@ -14,6 +14,7 @@ + */ + + import { program } from "commander" ++import { exit } from "process" + import * as ts from 'typescript'; + import * as path from 'path'; + import * as fs from 'fs'; +@@ -29,8 +30,14 @@ function getFiles(dir: string, fileFilter: (f: string) => boolean): string[] { + for (const entry of dirents) { + const fullPath = path.join(dir, entry.name) + if (entry.isFile() && fileFilter(fullPath) && !uiconfig.notUIFile(fullPath)) { +- result.push(fullPath) +- uiconfig.addComponentFile(fullPath) ++ let addFile: boolean = true ++ if (uiconfig.isHdsComponent) { ++ addFile = entry.name.startsWith("@hms.hds.") ++ } ++ if (addFile) { ++ result.push(fullPath) ++ uiconfig.addComponentFile(fullPath) ++ } + } + } + return result +@@ -46,58 +53,90 @@ function convertFiles(files: string[]): string[] { + return result + } + ++function getTransformationResult(sourceFile: ts.SourceFile, program: ts.Program, componentFile: ComponentFile): ts.TransformationResult { ++ if (uiconfig.isHdsComponent) { ++ return ts.transform(sourceFile, [interfaceTransformer(program, componentFile), exportAllTransformer()]); ++ } ++ return ts.transform(sourceFile, [interfaceTransformer(program, componentFile), exportAllTransformer(), addImportTransformer()]); ++} ++ + function printResult(source: string, file: ComponentFile) { + const outPath = path.join(options.targetDir, file.outFileName) + fs.mkdirSync(path.dirname(outPath), { recursive: true }); + fs.writeFileSync(outPath, source.concat(file.concactSource)) + } + +-function withM3Config(f: string, func: () => void) { +- if (uiconfig.withM3File(f)) { +- uiconfig.useMemoM3 = true; +- func() +- uiconfig.useMemoM3 = false; +- return; +- } +- func() +-} +- + function main() { +- uiconfig.loadConfig(options) +- const files = getFiles(options.inputDir, f => f.endsWith(".d.ets")) +- const convertedFile = convertFiles(files) +- const program = ts.createProgram(convertedFile, { allowJs: true }) +- const componentFileMap = new Map() +- convertedFile.forEach(f => { +- const sourceFile = program.getSourceFile(f)! +- const componentFile = new ComponentFile(f, sourceFile) +- componentFileMap.set(f, componentFile) +- ts.transform(sourceFile, [componentInterfaceCollector(program, componentFile)]) +- }) ++ uiconfig.loadConfig(options); ++ const files = getFiles(options.inputDir, f => f.endsWith(".d.ets")); ++ const program = ts.createProgram(files, { allowJs: true }); + const { printFile } = ts.createPrinter({ removeComments: false }); +- convertedFile.forEach(f => { +- withM3Config(f, () => { +- try { +- const sourceFile = program.getSourceFile(f)!; ++ const componentFileMap = new Map(); ++ const componentFileCallback = (f: string) => { ++ return (context: ts.TransformationContext) => { ++ return (sourceFile: ts.SourceFile) => { ++ const componentFile = new ComponentFile(f, sourceFile); ++ componentFileMap.set(f, componentFile); ++ ts.transform(sourceFile, [componentInterfaceCollector(program, componentFile)]); ++ return sourceFile; ++ } ++ } ++ } ++ ++ const transformerCallback = (f: string) => { ++ return (context: ts.TransformationContext) => { ++ return (sourceFile: ts.SourceFile) => { + const componentFile = componentFileMap.get(f)!; +- const result = ts.transform(sourceFile, [interfaceTransformer(program, componentFile), exportAllTransformer(), addImportTransformer()]); ++ const result = getTransformationResult(sourceFile, program, componentFile); + const transformedFile = ts.createSourceFile(f, printFile(result.transformed[0]), ts.ScriptTarget.Latest, true); +- const addMemoResult = ts.transform(transformedFile, [addMemoTransformer(componentFile)]); +- const transformedSource = ts.createPrinter().printFile(addMemoResult.transformed[0]); +- printResult(transformedSource, componentFile) +- fs.unlinkSync(f) +- } catch (e) { +- console.log("Error transforming file:", f, e); ++ const transformedSource = ts.createPrinter().printFile(transformedFile); ++ printResult(transformedSource, componentFile); ++ return ts.createSourceFile("", "", ts.ScriptTarget.Latest, true); + } +- }) ++ } ++ } ++ ++ // Step1 collect all component dependencies ++ files.forEach(f => { ++ try { ++ const content = fs.readFileSync(f, 'utf-8'); ++ ts.transpileModule(content, { ++ compilerOptions: { ++ target: ts.ScriptTarget.ES2017, ++ }, ++ fileName: f, ++ transformers: { before: [componentFileCallback(f)] } ++ }) ++ } catch (e) { ++ console.log("Error collecting file: ", f, e); ++ exit(1) ++ } ++ }) ++ ++ // Step2 make transformation ++ files.forEach(f => { ++ try { ++ const content = fs.readFileSync(f, 'utf-8'); ++ ts.transpileModule(content, { ++ compilerOptions: { ++ target: ts.ScriptTarget.ES2017, ++ }, ++ fileName: f, ++ transformers: { before: [transformerCallback(f)] } ++ }) ++ } catch (e) { ++ console.log("Error transforming file: ", f, e); ++ exit(1) ++ } + }) + } + + const options = program + .option('--input-dir ', "Path of where d.ets exist") + .option('--target-dir ', "Path to generate d.ets file") ++ .option('--config-path ', "Path to folder with config files") + .option('--use-memo-m3', "Generate code with m3 @memo annotations and functions with @ComponentBuilder", false) + .parse() + .opts() + +-main() +\ No newline at end of file ++main() +diff --git a/build-tools/arkui_transformer/src/component_file.ts b/build-tools/arkui_transformer/src/component_file.ts +index 56bc9e62c..6e2defbf4 100644 +--- a/build-tools/arkui_transformer/src/component_file.ts ++++ b/build-tools/arkui_transformer/src/component_file.ts +@@ -17,8 +17,8 @@ import * as ts from 'typescript'; + import * as path from 'path'; + + export class ComponentFile { +- public componentName: string +- public outFileName: string ++ public componentName: string; ++ public outFileName: string; + + static snake2Camel(name: string, low: boolean = false): string { + if (!name.includes('_')) { +@@ -37,15 +37,15 @@ export class ComponentFile { + } + + public appendAttribute(str: string) { +- this.attributeSource.push(str) ++ this.attributeSource.push(str); + } + + public appendFunction(str: string) { +- this.functionSource = str ++ this.functionSource += str; + } + + get concactSource() { +- return [...this.attributeSource, this.functionSource].join('\n') ++ return [...this.attributeSource, this.functionSource].join('\n'); + } + + constructor( +@@ -54,8 +54,8 @@ export class ComponentFile { + public attributeSource: string[] = [], + public functionSource: string = '', + ) { +- const pureName = path.basename(this.fileName).replaceAll(".d.ts", ""); +- this.componentName = ComponentFile.snake2Camel(pureName) +- this.outFileName = ComponentFile.snake2Camel(pureName, true).concat(".d.ets") ++ const pureName = path.basename(this.fileName).replace(/\.d\.e?ts/g, ""); ++ this.componentName = ComponentFile.snake2Camel(pureName); ++ this.outFileName = ComponentFile.snake2Camel(pureName, true).concat(".d.ets"); + } + } +\ No newline at end of file +diff --git a/build-tools/arkui_transformer/src/interface_converter.ts b/build-tools/arkui_transformer/src/interface_converter.ts +index 983db2f3c..affa082b2 100644 +--- a/build-tools/arkui_transformer/src/interface_converter.ts ++++ b/build-tools/arkui_transformer/src/interface_converter.ts +@@ -17,12 +17,12 @@ import * as ts from 'typescript'; + import * as fs from 'fs'; + import * as path from 'path'; + import { assert } from 'console'; +-import uiconfig from './arkui_config_util' ++import uiconfig from './arkui_config_util'; + import { ComponentFile } from './component_file'; +-import { analyzeBaseClasses, isComponentHerirage, getBaseClassName, removeDuplicateMethods, mergeUniqueOrdered } from './lib/attribute_utils' ++import { analyzeBaseClasses, isComponentHerirage, getBaseClassName, removeDuplicateMethods, mergeUniqueOrdered } from './lib/attribute_utils'; + + function readLangTemplate(): string { +- return uiconfig.useMemoM3 ? fs.readFileSync('./pattern/arkts_component_decl_m3.pattern', 'utf8') : fs.readFileSync('./pattern/arkts_component_decl.pattern', 'utf8') ++ return fs.readFileSync('./pattern/arkts_component_decl.pattern', 'utf8'); + } + + function extractSignatureComment( +@@ -34,19 +34,19 @@ function extractSignatureComment( + + + const commentText = sourceFile.text +- .slice(jsDoc.getStart(sourceFile), jsDoc.getEnd()) ++ .slice(jsDoc.getStart(sourceFile), jsDoc.getEnd()); + + return commentText.split('\n').map((l, index) => { + if (index == 0) { + return l.trimStart(); + } +- return ' ' + l.trimStart() +- }).join('\n') ++ return ' ' + l.trimStart(); ++ }).join('\n'); + } + + interface ComponnetFunctionInfo { + sig: string[], +- comment: string ++ comment: string; + } + + interface ComponentPram { +@@ -57,13 +57,13 @@ interface ComponentPram { + + function getAllInterfaceCallSignature(node: ts.InterfaceDeclaration, originalCode: ts.SourceFile, mergeCallSig: boolean = false): Array { + const signatureParams: Array = []; +- const comments: string[] = [] +- const paramList: Array = [] ++ const comments: string[] = []; ++ const paramList: Array = []; + + node.members.forEach(member => { + if (ts.isCallSignatureDeclaration(member)) { + const currentSignature: string[] = []; +- const currentParam: ComponentPram[] = [] ++ const currentParam: ComponentPram[] = []; + const comment = extractSignatureComment(member, originalCode); + comments.push(comment); + +@@ -71,38 +71,38 @@ function getAllInterfaceCallSignature(node: ts.InterfaceDeclaration, originalCod + currentSignature.push(param.getText(originalCode)); + currentParam.push({ name: (param.name as ts.Identifier).escapedText as string, type: [param.type!.getText(originalCode)], isOptional: !!param.questionToken }); + }); +- signatureParams.push(currentSignature) +- paramList.push(currentParam) ++ signatureParams.push(currentSignature); ++ paramList.push(currentParam); + } + }); + +- const result: Array = new Array ++ const result: Array = new Array; + + if (mergeCallSig) { +- const mergedParamList: Array = [] ++ const mergedParamList: Array = []; + paramList.forEach((params, _) => { + params.forEach((param, index) => { + if (!mergedParamList[index]) { +- mergedParamList.push(param) ++ mergedParamList.push(param); + if (index > 0) { + (mergedParamList[index] as ComponentPram).isOptional = true; + } + } else { +- mergedParamList[index] = { name: param.name, type: mergeUniqueOrdered(mergedParamList[index].type, param.type), isOptional: mergedParamList[index].isOptional || param.isOptional } ++ mergedParamList[index] = { name: param.name, type: mergeUniqueOrdered(mergedParamList[index].type, param.type), isOptional: mergedParamList[index].isOptional || param.isOptional }; + } +- }) +- }) ++ }); ++ }); + const mergedSignature: string[] = []; + mergedParamList.forEach((param, index) => { +- mergedSignature.push(`${param.name}${param.isOptional ? '?' : ''}: ${param.type.join(' | ')}`) +- }) ++ mergedSignature.push(`${param.name}${param.isOptional ? '?' : ''}: ${param.type.join(' | ')}`); ++ }); + result.push({ + sig: mergedSignature, + comment: '' +- }) ++ }); + } else { + for (let i = 0; i < signatureParams.length; i++) { +- result.push({ sig: signatureParams[i], comment: comments[i] }) ++ result.push({ sig: signatureParams[i], comment: comments[i] }); + } + } + return result; +@@ -110,15 +110,17 @@ function getAllInterfaceCallSignature(node: ts.InterfaceDeclaration, originalCod + + function handleComponentInterface(node: ts.InterfaceDeclaration, file: ComponentFile) { + const result = getAllInterfaceCallSignature(node, file.sourceFile, !uiconfig.useMemoM3); +- const declPattern = readLangTemplate() +- const declComponentFunction: string[] = [] ++ const declPattern = readLangTemplate(); ++ const declComponentFunction: string[] = []; ++ const attributeName = node.name!.escapedText as string; ++ const componentName = attributeName.replace(/Interface/g, ''); + result.forEach(p => { + declComponentFunction.push(declPattern +- .replaceAll("%COMPONENT_NAME%", file.componentName) +- .replaceAll("%FUNCTION_PARAMETERS%", p.sig?.map(it => `${it}, `).join("") ?? "") +- .replaceAll("%COMPONENT_COMMENT%", p.comment)) +- }) +- return declComponentFunction.join('\n') ++ .replace(/%COMPONENT_NAME%/g, componentName) ++ .replace(/%FUNCTION_PARAMETERS%/g, p.sig?.map(it => `${it}, `).join("") ?? "") ++ .replace(/%COMPONENT_COMMENT%/g, p.comment)); ++ }); ++ return declComponentFunction.join('\n'); + } + + function updateMethodDoc(node: ts.MethodDeclaration): ts.MethodDeclaration { +@@ -127,7 +129,7 @@ function updateMethodDoc(node: ts.MethodDeclaration): ts.MethodDeclaration { + const paramNameType: Map = new Map(); + node.parameters.forEach(param => { + paramNameType.set((param.name as ts.Identifier).escapedText!, param.type!); +- }) ++ }); + const jsDoc = node.jsDoc as ts.JSDoc[]; + const updatedJsDoc = jsDoc.map((doc) => { + const updatedTags = (doc.tags || []).map((tag: ts.JSDocTag) => { +@@ -137,10 +139,10 @@ function updateMethodDoc(node: ts.MethodDeclaration): ts.MethodDeclaration { + tag.tagName, + ts.factory.createJSDocTypeExpression(returnType), + tag.comment +- ) ++ ); + } + if (tag.tagName.escapedText === 'param') { +- const paramTag = tag as ts.JSDocParameterTag ++ const paramTag = tag as ts.JSDocParameterTag; + return ts.factory.updateJSDocParameterTag( + paramTag, + paramTag.tagName, +@@ -149,15 +151,15 @@ function updateMethodDoc(node: ts.MethodDeclaration): ts.MethodDeclaration { + ts.factory.createJSDocTypeExpression(paramNameType.get((paramTag.name as ts.Identifier).escapedText!)!), + paramTag.isNameFirst, + paramTag.comment +- ) ++ ); + } +- return tag +- }) ++ return tag; ++ }); + return ts.factory.updateJSDocComment(doc, doc.comment, updatedTags); + }); +- (node as any).jsDoc = updatedJsDoc ++ (node as any).jsDoc = updatedJsDoc; + } +- return node ++ return node; + } + + function handleOptionalType(paramType: ts.TypeNode, wrapUndefined: boolean = true): ts.TypeNode { +@@ -174,7 +176,7 @@ function handleOptionalType(paramType: ts.TypeNode, wrapUndefined: boolean = tru + ...(ts.isUnionTypeNode(type) ? type.types : [type]), + ts.factory.createKeywordTypeNode(ts.SyntaxKind.UndefinedKeyword), + ]); +- } ++ }; + + // Check if the parameter type is Optional + if (typeName === 'Optional' && paramType.typeArguments?.length === 1) { +@@ -203,7 +205,7 @@ function handleAttributeMember(node: ts.MethodDeclaration): ts.MethodSignature { + } else if (ts.isUnionTypeNode(paramType)) { + const removeOptionalTypes = paramType.types.map(type => { + return handleOptionalType(type, false); +- }) ++ }); + // Check if the union type already includes undefined + const hasUndefined = removeOptionalTypes.some( + type => type.kind === ts.SyntaxKind.UndefinedKeyword +@@ -258,7 +260,7 @@ function handleAttributeMember(node: ts.MethodDeclaration): ts.MethodSignature { + returnType + ); + +- return methodSignature ++ return methodSignature; + } + + function handleHeritageClause(node: ts.NodeArray | undefined): ts.HeritageClause[] { +@@ -282,7 +284,7 @@ function handleHeritageClause(node: ts.NodeArray | undefined) + const newClause = ts.factory.createHeritageClause(ts.SyntaxKind.ExtendsKeyword, types); + heritageClauses.push(newClause); + }); +- return heritageClauses ++ return heritageClauses; + } + + function handleAttributeModifier(node: ts.ClassDeclaration, members: ts.MethodSignature[]) { +@@ -291,8 +293,8 @@ function handleAttributeModifier(node: ts.ClassDeclaration, members: ts.MethodSi + if ((m.name as ts.Identifier).escapedText === 'attributeModifier') { + members.splice(members.indexOf(m), 1); + } +- }) +- return ++ }); ++ return; + } + members.push( + ts.factory.createMethodSignature( +@@ -326,7 +328,7 @@ function handleAttributeModifier(node: ts.ClassDeclaration, members: ts.MethodSi + )], + ts.factory.createThisTypeNode() + ) +- ) ++ ); + } + + function transformComponentAttribute(node: ts.ClassDeclaration): ts.Node[] { +@@ -337,16 +339,16 @@ function transformComponentAttribute(node: ts.ClassDeclaration): ts.Node[] { + return handleAttributeMember(member); + }).filter((member): member is ts.MethodSignature => member !== undefined); + +- const filetredMethos = removeDuplicateMethods(members) ++ const filetredMethos = removeDuplicateMethods(members); + + if (uiconfig.shouldHaveAttributeModifier(node.name!.escapedText as string)) { +- handleAttributeModifier(node, filetredMethos) ++ handleAttributeModifier(node, filetredMethos); + } + + const exportModifier = ts.factory.createModifier(ts.SyntaxKind.ExportKeyword); + const delcareModifier = ts.factory.createModifier(ts.SyntaxKind.DeclareKeyword); + +- const heritageClauses = handleHeritageClause(node.heritageClauses) ++ const heritageClauses = handleHeritageClause(node.heritageClauses); + + const noneUIAttribute = ts.factory.createInterfaceDeclaration( + [exportModifier, delcareModifier], +@@ -355,7 +357,7 @@ function transformComponentAttribute(node: ts.ClassDeclaration): ts.Node[] { + heritageClauses, + filetredMethos + ); +- return [noneUIAttribute] ++ return [noneUIAttribute]; + } + + function getLeadingSpace(line: string): string { +@@ -385,10 +387,10 @@ function addAttributeMemo(node: ts.ClassDeclaration, componentFile: ComponentFil + + const functionSet: Set = new Set(); + node.members.forEach(m => { +- functionSet.add((m.name! as ts.Identifier).escapedText!) +- }) ++ functionSet.add((m.name! as ts.Identifier).escapedText!); ++ }); + +- const updatedCode: string[] = [] ++ const updatedCode: string[] = []; + originalCode.forEach(l => { + const name = extractMethodName(l); + if (!name) { +@@ -396,53 +398,53 @@ function addAttributeMemo(node: ts.ClassDeclaration, componentFile: ComponentFil + return; + } + if (functionSet.has(name)) { +- updatedCode.push(getLeadingSpace(l) + "@memo") ++ updatedCode.push(getLeadingSpace(l) + "@memo"); + } + updatedCode.push(l); +- }) +- const attributeName = node.name!.escapedText! +- const superInterface = getBaseClassName(node) ++ }); ++ const attributeName = node.name!.escapedText!; ++ const superInterface = getBaseClassName(node); + componentFile.appendAttribute(updatedCode.join('\n') + .replace(`export declare interface ${attributeName}`, `export declare interface UI${attributeName}`) + .replace(`extends ${superInterface}`, `extends UI${superInterface}`) +- ) ++ ); + } + + function isComponentAttribute(node: ts.Node) { + if (!(ts.isClassDeclaration(node) && node.name?.escapedText)) { + return false; + } +- return uiconfig.isComponent(node.name.escapedText, 'Attribute') ++ return uiconfig.isComponent(node.name.escapedText, 'Attribute'); + } + + function isComponentInterface(node: ts.Node) { + if (!(ts.isInterfaceDeclaration(node) && node.name?.escapedText)) { + return false; + } +- return uiconfig.isComponent(node.name.escapedText, 'Interface') ++ return uiconfig.isComponent(node.name.escapedText, 'Interface'); + } + + export function addMemoTransformer(componentFile: ComponentFile): ts.TransformerFactory { + return (context) => { + const visit: ts.Visitor = (node) => { +- if (isComponentHerirage(node) && !uiconfig.useMemoM3) { +- addAttributeMemo(node as ts.ClassDeclaration, componentFile) ++ if (isComponentHerirage(node)) { ++ addAttributeMemo(node as ts.ClassDeclaration, componentFile); + } + return ts.visitEachChild(node, visit, context); +- } +- return (sourceFile) => { componentFile.sourceFile = sourceFile; return ts.visitNode(sourceFile, visit) }; +- } ++ }; ++ return (sourceFile) => { componentFile.sourceFile = sourceFile; return ts.visitNode(sourceFile, visit); }; ++ }; + } + + export function interfaceTransformer(program: ts.Program, componentFile: ComponentFile): ts.TransformerFactory { + return (context) => { + const visit: ts.Visitor = (node) => { + if (isComponentInterface(node)) { +- componentFile.appendFunction(handleComponentInterface(node as ts.InterfaceDeclaration, componentFile)) ++ componentFile.appendFunction(handleComponentInterface(node as ts.InterfaceDeclaration, componentFile)); + return undefined; + } + if (isComponentHerirage(node)) { +- return transformComponentAttribute(node as ts.ClassDeclaration) ++ return transformComponentAttribute(node as ts.ClassDeclaration); + } + return ts.visitEachChild(node, visit, context); + }; +@@ -455,10 +457,10 @@ export function componentInterfaceCollector(program: ts.Program, componentFile: + return (context) => { + const visit: ts.Visitor = (node) => { + if (isComponentAttribute(node)) { +- const attributeName = (node as ts.ClassDeclaration).name!.escapedText as string +- componentFile.componentName = attributeName.replaceAll('Attribute', ''); ++ const attributeName = (node as ts.ClassDeclaration).name!.escapedText as string; ++ componentFile.componentName = attributeName.replace(/Attribute/g, ''); + const baseTypes = analyzeBaseClasses(node as ts.ClassDeclaration, componentFile.sourceFile, program); +- uiconfig.addComponentAttributeHeritage([attributeName, ...baseTypes]) ++ uiconfig.addComponentAttributeHeritage([attributeName, ...baseTypes]); + } + return ts.visitEachChild(node, visit, context); + }; +diff --git a/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/index.ts b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/index.ts +new file mode 100644 +index 000000000..00f377561 +--- /dev/null ++++ b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/index.ts +@@ -0,0 +1,17 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++export * from './utils/api_check_wrapper_typedef'; ++export * from './utils/api_check_wrapper_enums'; +\ No newline at end of file +diff --git a/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/src/api_check_wrapper.ts b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/src/api_check_wrapper.ts +new file mode 100644 +index 000000000..e69de29bb +diff --git a/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_enums.ts b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_enums.ts +new file mode 100644 +index 000000000..78e1f83cb +--- /dev/null ++++ b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_enums.ts +@@ -0,0 +1,19 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++export enum DiagnosticCategory { ++ Warning = 0, ++ Error = 1 ++} +\ No newline at end of file +diff --git a/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_typedef.ts b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_typedef.ts +new file mode 100644 +index 000000000..7fc25348f +--- /dev/null ++++ b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_typedef.ts +@@ -0,0 +1,113 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++import { DiagnosticCategory } from "./api_check_wrapper_enums"; ++import * as arkts from '@koalaui/libarkts'; ++ ++/** ++ * ApiCheckWrapper服务,绑定校验规则 ++ */ ++export interface ApiCheckWrapperServiceHost { ++ getJsDocNodeCheckedConfig: (currentFileName: string, symbolSourceFilePath: string) => JsDocNodeCheckConfig; ++ // getJsDocNodeConditionCheckedResult: (jsDocFileCheckedInfo: FileCheckModuleInfo, jsDocs: JSDoc[]) => ConditionCheckResult; ++ getFileCheckedModuleInfo: (containFilePath: string) => FileCheckModuleInfo; ++ pushLogInfo: (apiName: string, currentFilePath: string, currentAddress: CurrentAddress, logLevel: DiagnosticCategory, logMessage: string) => void; ++ collectImportInfo: (moduleName: string[], modulePath: string, currentFilePath: string) => void; ++} ++ ++export interface JsDocNodeCheckConfig { ++ nodeNeedCheck: boolean; ++ checkConfig: JsDocNodeCheckConfigItem[]; ++} ++ ++export interface JsDocNodeCheckConfigItem { ++ tagName: string[]; ++ message: string; ++ type: DiagnosticCategory; ++ tagNameShouldExisted: boolean; ++ checkValidCallback?: (jsDocs: JSDoc[], config: JsDocNodeCheckConfigItem) => boolean; ++} ++ ++/** ++ * JSDoc类型 ++ */ ++export interface JSDoc { ++ description: string; ++ tags: JSDocTag[]; ++} ++ ++/** ++ * JSDoc标签类型 ++ */ ++export interface JSDocTag { ++ /** ++ * 标签名 ++ */ ++ tag: string; ++ /** ++ * 参数名称 ++ */ ++ name: string; ++ /** ++ * 默认值 ++ */ ++ default?: string; ++ /** ++ * 类型 ++ */ ++ type: string; ++ /** ++ * 是否可选 ++ */ ++ optional: boolean; ++ /** ++ * 描述 ++ */ ++ description: string; ++} ++ ++export interface CurrentAddress { ++ line: number; ++ column: number; ++} ++ ++export interface FileCheckModuleInfo { ++ currentFileName: string; ++ fileNeedCheck: boolean; ++} ++ ++export interface ConditionCheckResult { ++ valid: boolean; ++ type?: DiagnosticCategory; ++ message?: string; ++} ++ ++export interface ASTDeclaration extends arkts.AstNode { ++ kind: number; ++ pos: number; ++ end: number; ++ parent?: ASTDeclaration; ++ jsDoc?: JSDoc[]; ++} ++ ++export interface ASTIdentifier extends arkts.AstNode { ++ kind: number; ++ text: string; ++} ++ ++export interface ASTSourceFile extends arkts.AstNode { ++ fileName: string; ++ text: string; ++} +\ No newline at end of file +diff --git a/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_utils.ts b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_utils.ts +new file mode 100644 +index 000000000..556a4a036 +--- /dev/null ++++ b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_utils.ts +@@ -0,0 +1,41 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++import { Block, parse, Spec } from 'comment-parser'; ++import { JSDoc, JSDocTag } from './api_check_wrapper_typedef'; ++ ++export function parseCommand2JSDoc(comment: string): JSDoc[] { ++ const jsDocs: JSDoc[] = []; ++ const commentBlock: Block[] = parse(comment); ++ commentBlock.forEach((block: Block) => { ++ const tags: JSDocTag[] = []; ++ const blockTags: Spec[] = block.tags; ++ blockTags.forEach((blockTag: Spec) => { ++ tags.push({ ++ tag: blockTag.tag, ++ name: blockTag.name, ++ default: blockTag.default, ++ type: blockTag.type, ++ optional: blockTag.optional, ++ description: blockTag.description ++ }); ++ }); ++ jsDocs.push({ ++ description: block.description, ++ tags: tags ++ }); ++ }); ++ return jsDocs; ++} +\ No newline at end of file +diff --git a/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/ts_wrapper_node_util.ts b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/ts_wrapper_node_util.ts +new file mode 100644 +index 000000000..e69de29bb +diff --git a/api/arkui/stateManagement/decorators/decoratorProvide.d.ets b/build-tools/compiler-plugins/api-check-plugin-static/babel.config.js +similarity index 51% +rename from api/arkui/stateManagement/decorators/decoratorProvide.d.ets +rename to build-tools/compiler-plugins/api-check-plugin-static/babel.config.js +index eea12b024..6d04bc928 100644 +--- a/api/arkui/stateManagement/decorators/decoratorProvide.d.ets ++++ b/build-tools/compiler-plugins/api-check-plugin-static/babel.config.js +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2025 Huawei Device Co., Ltd. ++ * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at +@@ -12,18 +12,29 @@ + * See the License for the specific language governing permissions and + * limitations under the License. + */ +-/** +- * @file +- * @kit ArkUI +- * @arkts 1.2 +- */ + +-import { DecoratedV1VariableBase, IDecoratedMutableVariable } from '../base/decoratorBase'; +-import { WatchIdType, WatchFuncType } from './decoratorWatch'; ++module.exports = function(api) { ++ api.cache(true); ++ ++ const presets = ['@babel/typescript']; ++ const plugins = [ ++ '@babel/plugin-transform-modules-commonjs', ++ '@babel/plugin-proposal-class-properties', ++ [ ++ '@babel/plugin-transform-arrow-functions', ++ { ++ spec: true ++ } ++ ] ++ ]; ++ const ignore = [ ++ '**/test/**', ++ '**/node_modules/**' ++ ]; + +-export declare class ProvideDecoratedVariable extends DecoratedV1VariableBase +- implements IDecoratedMutableVariable { +- public constructor(varName: string, provideAlias: string, initValue: T, watchFunc?: WatchFuncType) +- public get(): T +- public set(newValue: T): void +-} +\ No newline at end of file ++ return { ++ presets, ++ plugins, ++ ignore ++ }; ++}; +diff --git a/build-tools/compiler-plugins/api-check-plugin-static/index.ts b/build-tools/compiler-plugins/api-check-plugin-static/index.ts +new file mode 100644 +index 000000000..9ebab635e +--- /dev/null ++++ b/build-tools/compiler-plugins/api-check-plugin-static/index.ts +@@ -0,0 +1,72 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++import { Plugins, PluginContext } from '../common/plugin-context'; ++import { GlobalObject, ProjectConfig } from './utils/api_check_plugin_typedef'; ++import { createOrCleanProjectConfig, updateProjectConfig, initProjectConfig } from './utils/api_check_plugin_utils'; ++import { ApiCheckWrapperServiceHost } from './api-check-wrapper'; ++import { getApiCheckWrapperServiceHost } from './src/api_check_config'; ++import { checkApiExpression, WrapperApi } from './api-check-wrapper/src/api_check_wrapper'; ++ ++/** ++ * 导出projectConfig作为全局变量 ++ */ ++export const globalObject: GlobalObject = { ++ projectConfig: createOrCleanProjectConfig() ++} ++ ++/** ++ * 预留apiCheckProjectConfig对象 ++ */ ++export class apiCheckProjectConfig { ++ constructor(projectConfig: ProjectConfig | undefined) { ++ if (projectConfig) { ++ updateProjectConfig(projectConfig); ++ initProjectConfig(); ++ } ++ } ++} ++ ++/** ++ * 入口方法 ++ * @returns {Plugins} ++ */ ++export function apiCheckPlugin(): Plugins { ++ return { ++ name: 'api-check-plugins', ++ checked: apiCheckCallback, ++ clean() { ++ console.log("API_CHECK_PLUGIN CLEAN") ++ WrapperApi.arktsGlobal.clearContext(); ++ } ++ }; ++} ++ ++/** ++ * 入口回调 ++ * @param {this} ++ */ ++function apiCheckCallback(this: PluginContext): void { ++ console.log('[API_CHECK_PLUGIN] AFTER CHECKED ENTER'); ++ const currentProjectConfig: ProjectConfig | undefined = this.getProjectConfig() as ProjectConfig | undefined; ++ if (currentProjectConfig) { ++ updateProjectConfig(currentProjectConfig); ++ initProjectConfig(); ++ } ++ const ContextPtr = this.getContextPtr(); ++ const apiCheckHost: ApiCheckWrapperServiceHost = getApiCheckWrapperServiceHost(); ++ checkApiExpression(apiCheckHost, ContextPtr); ++ console.log('[API_CHECK_PLUGIN] AFTER CHECKED EXIT'); ++} +\ No newline at end of file +diff --git a/build-tools/compiler-plugins/api-check-plugin-static/package.json b/build-tools/compiler-plugins/api-check-plugin-static/package.json +new file mode 100644 +index 000000000..cedbccb1a +--- /dev/null ++++ b/build-tools/compiler-plugins/api-check-plugin-static/package.json +@@ -0,0 +1,24 @@ ++{ ++ "name": "api-check-plugin-static", ++ "version": "1.0.0", ++ "description": "", ++ "main": "compiler-plugins/api-check-plugin-static/index.ts", ++ "scripts": { ++ "test": "echo \"Error: no test specified\" && exit 1", ++ "compile:plugins": "./node_modules/.bin/babel ./ --out-dir ./lib --extensions .ts" ++ }, ++ "author": "", ++ "license": "ISC", ++ "dependencies": { ++ "comment-parser": "1.3.1", ++ "fs": "^0.0.1-security", ++ "path": "^0.12.7", ++ "@babel/cli": "7.20.7", ++ "@babel/core": "7.20.12", ++ "@babel/plugin-proposal-class-properties": "7.18.6", ++ "@babel/preset-env": "7.20.2", ++ "@babel/preset-typescript": "7.18.6", ++ "@babel/runtime": "7.20.13", ++ "typescript": "npm:ohos-typescript@4.9.5-r5" ++ } ++} +diff --git a/build-tools/compiler-plugins/api-check-plugin-static/src/api_check_config.ts b/build-tools/compiler-plugins/api-check-plugin-static/src/api_check_config.ts +new file mode 100644 +index 000000000..104c9f50f +--- /dev/null ++++ b/build-tools/compiler-plugins/api-check-plugin-static/src/api_check_config.ts +@@ -0,0 +1,172 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++import path from 'path'; ++import { ++ PERMISSION_TAG_CHECK_NAME, ++ PERMISSION_TAG_CHECK_ERROR, ++ SYSTEM_API_TAG_CHECK_NAME, ++ SYSTEM_API_TAG_CHECK_WARNING, ++ TEST_TAG_CHECK_NAME, ++ TEST_TAG_CHECK_ERROR, ++ SYSCAP_TAG_CHECK_NAME, ++ SYSCAP_TAG_CHECK_WARNING, ++ FORM_TAG_CHECK_NAME, ++ FORM_TAG_CHECK_ERROR, ++ FIND_MODULE_WARNING, ++ CROSSPLATFORM_TAG_CHECK_NAME, ++ CROSSPLATFORM_TAG_CHECK_ERROR, ++ DEPRECATED_TAG_CHECK_NAME, ++ DEPRECATED_TAG_CHECK_WARNING, ++ FA_TAG_CHECK_NAME, ++ FA_TAG_HUMP_CHECK_NAME, ++ FA_TAG_CHECK_ERROR, ++ ATOMICSERVICE_BUNDLE_TYPE, ++ ATOMICSERVICE_TAG_CHECK_NAME, ++ ATOMICSERVICE_TAG_CHECK_ERROR, ++ ATOMICSERVICE_TAG_CHECK_VERSION, ++ SINCE_TAG_NAME, ++ SINCE_TAG_CHECK_ERROR, ++ STAGE_TAG_CHECK_NAME, ++ STAGE_TAG_HUMP_CHECK_NAME, ++ STAGE_TAG_CHECK_ERROR, ++ STAGE_COMPILE_MODE ++} from '../utils/api_check_plugin_define'; ++import { globalObject } from '../index'; ++import { ++ checkPermissionTag, ++ checkSinceTag, ++ checkSyscapTag, ++ getJsDocNodeCheckConfigItem, ++ isCardFile, ++ pushLog, ++ collectInfo ++} from '../utils/api_check_plugin_utils'; ++import { ++ ApiCheckWrapperServiceHost, ++ CurrentAddress, ++ DiagnosticCategory, ++ JsDocNodeCheckConfig, ++ JsDocNodeCheckConfigItem ++} from '../api-check-wrapper'; ++ ++const jsDocNodeCheckConfigCache: Map> = ++ new Map>(); ++ ++/** ++ * 根据ProjectConfig对象存入JsDoc校验规则 ++ * ++ * @param {string} fileName - 原始node文件路径 ++ * @param {string} sourceFileName - 目标api文件路径 ++ * @returns {JsDocNodeCheckConfig} - 返回校验规则对象 ++ */ ++function getJsDocNodeCheckConfig(fileName: string, sourceFileName: string): JsDocNodeCheckConfig { ++ let byFileName: Map | undefined = jsDocNodeCheckConfigCache.get(fileName); ++ if (byFileName === undefined) { ++ byFileName = new Map(); ++ jsDocNodeCheckConfigCache.set(fileName, byFileName); ++ } ++ let result: JsDocNodeCheckConfig | undefined = byFileName.get(sourceFileName); ++ if (result !== undefined) { ++ return result; ++ } ++ // 预留check条件 ++ let needCheckResult: boolean = true; ++ const checkConfigArray: JsDocNodeCheckConfigItem[] = []; ++ const apiName: string = path.basename(fileName); ++ const sourceBaseName: string = path.basename(sourceFileName); ++ if (/(?= ATOMICSERVICE_TAG_CHECK_VERSION) { ++ checkConfigArray.push(getJsDocNodeCheckConfigItem([ATOMICSERVICE_TAG_CHECK_NAME], ATOMICSERVICE_TAG_CHECK_ERROR, ++ DiagnosticCategory.Error, true)); ++ } ++ } ++ result = { ++ nodeNeedCheck: needCheckResult, ++ checkConfig: checkConfigArray ++ }; ++ byFileName.set(sourceFileName, result); ++ return result; ++} ++ ++ ++/** ++ * 返回apiHost ++ * @returns {ApiCheckWrapperServiceHost} - apiHost ++ */ ++export function getApiCheckWrapperServiceHost(): ApiCheckWrapperServiceHost { ++ return { ++ getJsDocNodeCheckedConfig: (currentFileName: string, symbolSourceFilePath: string) => { ++ return getJsDocNodeCheckConfig(currentFileName, symbolSourceFilePath); ++ }, ++ getFileCheckedModuleInfo: (containFilePath: string) => { ++ return { ++ fileNeedCheck: true, ++ currentFileName: containFilePath ++ }; ++ }, ++ pushLogInfo: (apiName: string, currentFilePath: string, currentAddress: CurrentAddress, ++ logLevel: DiagnosticCategory, logMessage: string) => { ++ return pushLog(apiName, currentFilePath, currentAddress, logLevel, logMessage); ++ }, ++ collectImportInfo: (moduleName: string[], modulePath: string, currentFilePath: string) => { ++ collectInfo(moduleName, modulePath, currentFilePath); ++ } ++ }; ++} +\ No newline at end of file +diff --git a/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_define.ts b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_define.ts +new file mode 100644 +index 000000000..061091846 +--- /dev/null ++++ b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_define.ts +@@ -0,0 +1,103 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++export const PERMISSION_TAG_CHECK_NAME: string = 'permission'; ++ ++export const PERMISSION_TAG_CHECK_ERROR: string = "To use this API, you need to apply for the permissions: $DT"; ++ ++export const SYSTEM_API_TAG_CHECK_NAME: string = 'systemapi'; ++ ++export const SYSTEM_API_TAG_CHECK_WARNING: string = "'{0}' is system api"; ++ ++export const TEST_TAG_CHECK_NAME: string = 'test'; ++ ++export const TEST_TAG_CHECK_ERROR: string = "'{0}' can only be used for testing directories "; ++ ++export const SYSCAP_TAG_CHECK_NAME: string = 'syscap'; ++ ++export const SYSCAP_TAG_CHECK_WARNING: string = "The system capacity of this api '{0}' is not supported on all devices"; ++ ++export const SYSCAP_TAG_CONDITION_CHECK_WARNING: string = ++ 'The API is not supported on all devices. Use the canIUse condition to determine whether the API is supported.'; ++ ++export const CANIUSE_FUNCTION_NAME: string = 'canIUse'; ++ ++export const VERSION_CHECK_FUNCTION_NAME: string = 'isApiVersionGreaterOrEqual'; ++ ++export const RUNTIME_OS_OH: string = 'OpenHarmony'; ++ ++export const FORM_TAG_CHECK_NAME: string = 'form'; ++ ++export const FORM_TAG_CHECK_ERROR: string = "'{0}' can't support form application."; ++ ++export const CROSSPLATFORM_TAG_CHECK_NAME: string = 'crossplatform'; ++ ++export const CROSSPLATFORM_TAG_CHECK_ERROR: string = "'{0}' can't support crossplatform application."; ++ ++export const DEPRECATED_TAG_CHECK_NAME: string = 'deprecated'; ++ ++export const DEPRECATED_TAG_CHECK_WARNING: string = "'{0}' has been deprecated."; ++ ++export const FA_TAG_CHECK_NAME: string = 'famodelonly'; ++ ++export const FA_TAG_HUMP_CHECK_NAME: string = 'FAModelOnly'; ++ ++export const FA_TAG_CHECK_ERROR: string = 'This API is used only in FA Mode, but the current Mode is Stage.'; ++ ++export const STAGE_TAG_CHECK_NAME: string = 'stagemodelonly'; ++ ++export const STAGE_TAG_HUMP_CHECK_NAME: string = 'StageModelOnly'; ++ ++export const STAGE_TAG_CHECK_ERROR: string = 'This API is used only in Stage Mode, but the current Mode is FA.'; ++ ++export const STAGE_COMPILE_MODE: string = 'moduleJson'; ++ ++export const ATOMICSERVICE_BUNDLE_TYPE: string = 'atomicService'; ++ ++export const ATOMICSERVICE_TAG_CHECK_NAME: string = 'atomicservice'; ++ ++export const ATOMICSERVICE_TAG_CHECK_ERROR: string = "'{0}' can't support atomicservice application."; ++ ++export const SINCE_TAG_NAME: string = 'since'; ++ ++export const SINCE_TAG_CHECK_ERROR: string = ++ "The '{0}' API is supported since SDK version $SINCE1. However, the current compatible SDK version is $SINCE2."; ++ ++export const ATOMICSERVICE_TAG_CHECK_VERSION: number = 11; ++ ++export const FIND_MODULE_WARNING: string = "Cannot find name '{0}'."; ++ ++export const CONSTANT_STEP_0: number = 0; ++ ++export const CONSTANT_STEP_1: number = 1; ++ ++export const CONSTANT_STEP_2: number = 2; ++ ++export const CONSTANT_STEP_3: number = 3; ++ ++export const GLOBAL_DECLARE_WHITE_LIST: Set = new Set(['Context', 'PointerStyle', 'PixelMap', 'UnifiedData', ++ 'Summary', 'UniformDataType', 'IntentionCode', 'NavDestinationInfo', 'UIContext', 'Resource', 'WebviewController']); ++ ++export const MESSAGE_CONFIG_COLOR_RED: string = '\u001b[31m'; ++ ++export const MESSAGE_CONFIG_COLOR_RESET: string = '\u001b[39m'; ++ ++export const MESSAGE_CONFIG_COLOR_ERROR: string = 'color:#f5a623'; ++ ++export const MESSAGE_CONFIG_COLOR_WARNING: string = 'color:#d0021b'; ++ ++export const MESSAGE_CONFIG_HEADER_ERROR: string = 'ERROR: ArkTS:ERROR File: '; ++ ++export const MESSAGE_CONFIG_HEADER_WARNING: string = 'WARN: ArkTS:WARN File: '; +\ No newline at end of file +diff --git a/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_enums.ts b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_enums.ts +new file mode 100644 +index 000000000..1208ff3c6 +--- /dev/null ++++ b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_enums.ts +@@ -0,0 +1,23 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++export enum PermissionValidTokenState { ++ Init, ++ LeftParenthesis, ++ RightParenthesis, ++ PermissionChar, ++ And, ++ Or, ++} +\ No newline at end of file +diff --git a/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_typedef.ts b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_typedef.ts +new file mode 100644 +index 000000000..9231f06d9 +--- /dev/null ++++ b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_typedef.ts +@@ -0,0 +1,123 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++import { JSDoc, JsDocNodeCheckConfigItem } from "../api-check-wrapper"; ++import { PermissionValidTokenState } from "./api_check_plugin_enums"; ++ ++// 定义 JSON 数据结构接口 ++export interface WindowConfig { ++ designWidth: number; ++ autoDesignWidth: boolean; ++} ++ ++export interface FormConfig { ++ name: string; ++ displayName: string; ++ description: string; ++ src: string; // 目标字段 ++ uiSyntax: string; ++ window: WindowConfig; ++ colorMode: string; ++ isDynamic: boolean; ++ isDefault: boolean; ++ updateEnabled: boolean; ++ scheduledUpdateTime: string; ++ updateDuration: number; ++ defaultDimension: string; ++ supportDimensions: string[]; ++} ++ ++export interface ConfigSchema { ++ forms: FormConfig[]; ++} ++ ++/** ++ * 工程编译配置 ++ */ ++export interface ProjectConfig { ++ bundleName: string; ++ moduleName: string; ++ cachePath: string; ++ aceModuleJsonPath: string; ++ compileMode: string; ++ permissions: ConfigPermission; ++ requestPermissions: string[]; ++ definePermissions: string[]; ++ projectRootPath: string; ++ isCrossplatform: boolean; ++ ignoreCrossplatformCheck: boolean; ++ bundleType: string; ++ compileSdkVersion: number; ++ compatibleSdkVersion: number; ++ projectPath: string; ++ aceProfilePath: string; ++ cardPageSet: string[]; ++ compileSdkPath: string; ++ systemModules: string[]; ++ allModulesPaths: string[]; ++ sdkConfigs: SdkConfig[]; ++ externalApiPaths: string; ++ externalSdkPaths: string[]; ++ sdkConfigPrefix: string; ++ deviceTypes: string[]; ++ deviceTypesMessage: string; ++ runtimeOS: string; ++ syscapIntersectionSet: Set; ++ syscapUnionSet: Set; ++ permissionsArray: string[]; ++ buildSdkPath: string; ++ nativeDependencies: string[]; ++ aceSoPath: string; ++} ++ ++export interface CheckValidCallbackInterface { ++ (jsDocTag: JSDoc[], config: JsDocNodeCheckConfigItem): boolean; ++} ++ ++export interface SyscapConfig { ++ sysCaps: string[] ++} ++ ++export interface SdkConfig { ++ prefix: string; ++ apiPath: string[]; ++} ++ ++export interface GlobalObject { ++ projectConfig: ProjectConfig ++} ++ ++export interface PermissionVaildCalcInfo { ++ valid: boolean; ++ currentToken: PermissionValidTokenState; ++ finish: boolean; ++ currentPermissionMatch: boolean; ++} ++ ++export interface PermissionValidCalcGroup { ++ subQueue: string[]; ++ includeParenthesis: boolean; ++} ++ ++export interface PermissionModule { ++ modulePath: string; ++ testPermissions: string[]; ++ permissions: string[]; ++} ++ ++export interface ConfigPermission { ++ requestPermissions: Array<{ name: string }>; ++ definePermissions: Array<{ name: string }>; ++} +\ No newline at end of file +diff --git a/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_utils.ts b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_utils.ts +new file mode 100644 +index 000000000..ea074944e +--- /dev/null ++++ b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_utils.ts +@@ -0,0 +1,903 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++import fs from 'fs'; ++import path from 'path'; ++import { globalObject } from '../index'; ++import { ++ CheckValidCallbackInterface, ++ ConfigPermission, ++ ConfigSchema, ++ PermissionValidCalcGroup, ++ PermissionVaildCalcInfo, ++ ProjectConfig, ++ SdkConfig, ++ SyscapConfig ++} from './api_check_plugin_typedef'; ++import { ++ MESSAGE_CONFIG_COLOR_ERROR, ++ MESSAGE_CONFIG_COLOR_RED, ++ MESSAGE_CONFIG_COLOR_RESET, ++ MESSAGE_CONFIG_COLOR_WARNING, ++ MESSAGE_CONFIG_HEADER_ERROR, ++ MESSAGE_CONFIG_HEADER_WARNING, ++ PERMISSION_TAG_CHECK_ERROR, ++ PERMISSION_TAG_CHECK_NAME, ++ RUNTIME_OS_OH, ++ SINCE_TAG_CHECK_ERROR, ++ SINCE_TAG_NAME, ++ STAGE_COMPILE_MODE, ++ SYSCAP_TAG_CHECK_NAME ++} from './api_check_plugin_define'; ++import { ++ CurrentAddress, ++ DiagnosticCategory, ++ JSDoc, ++ JsDocNodeCheckConfigItem, ++ JSDocTag ++} from '../api-check-wrapper'; ++import { PermissionValidTokenState } from './api_check_plugin_enums'; ++ ++/** ++ * 从 JSON 文件中提取所有 src 字段到数组 ++ * @param filePath JSON 文件的绝对路径 ++ * @returns 包含所有 src 字段的字符串数组 ++ * @throws 文件不存在、JSON 解析错误或数据结构不符时抛出异常 ++ */ ++export function extractSrcPaths(filePath: string): string[] { ++ // 1. 验证路径格式和存在性 ++ if (!path.isAbsolute(filePath)) { ++ throw new Error(`路径必须是绝对路径: ${filePath}`); ++ } ++ ++ if (!fs.existsSync(filePath)) { ++ throw new Error(`文件不存在: ${filePath}`); ++ } ++ ++ try { ++ // 2. 读取并解析 JSON 文件 ++ const rawData = fs.readFileSync(filePath, 'utf-8'); ++ const config: ConfigSchema = JSON.parse(rawData); ++ ++ // 3. 验证数据结构 ++ if (!config.forms || !Array.isArray(config.forms)) { ++ throw new Error('JSON 缺少 forms 数组'); ++ } ++ ++ // 4. 提取所有 src 字段 ++ const srcPaths: string[] = []; ++ for (const form of config.forms) { ++ if (form.src && typeof form.src === 'string') { ++ let src = form.src.replace(/^\.\/ets/, ''); ++ srcPaths.push(globalObject.projectConfig?.projectPath + src); ++ } else { ++ console.warn(`跳过无效 src 字段的表单项: ${form.name}`); ++ } ++ } ++ ++ // 5. 返回结果数组 ++ return srcPaths; ++ } catch (error) { ++ // 6. 增强错误信息 ++ if (error instanceof SyntaxError) { ++ throw new SyntaxError(`JSON 解析错误: ${error.message}`); ++ } ++ throw new Error(`处理失败: ${error instanceof Error ? error.message : String(error)}`); ++ } ++} ++ ++export function isCardFile(file: string): boolean { ++ if (globalObject.projectConfig.cardPageSet.includes(file)) { ++ return true; ++ } ++ return false; ++} ++ ++/** ++ * 校验since标签,当前api版本是否小于等于compatibleSdkVersion ++ * ++ * @param { JSDoc[] } jsDocs ++ * @param config ++ * @returns ++ */ ++export function checkSinceTag(jsDocs: JSDoc[], config: JsDocNodeCheckConfigItem): boolean { ++ if (jsDocs && jsDocs.length > 0) { ++ const minorJSDocVersion: number = getJSDocMinorVersion(jsDocs); ++ const compatibleSdkVersion: number = globalObject.projectConfig.compatibleSdkVersion; ++ if (minorJSDocVersion > compatibleSdkVersion) { ++ config.message = SINCE_TAG_CHECK_ERROR.replace('$SINCE1', minorJSDocVersion.toString()) ++ .replace('$SINCE2', compatibleSdkVersion.toString()); ++ return true; ++ } ++ } ++ return false; ++} ++ ++/** ++ * 获取版本号最小的JSDoc ++ * @param { JSDoc[] } jsDocs ++ * @returns { number } ++ */ ++function getJSDocMinorVersion(jsDocs: JSDoc[]): number { ++ let minorVersion: number = 0; ++ if (jsDocs && jsDocs.length > 0) { ++ for (let i = 0; i < jsDocs.length; i++) { ++ const jsdoc: JSDoc = jsDocs[i]; ++ if (jsdoc.tags && jsdoc.tags.length > 0) { ++ for (let j = 0; j < jsdoc.tags.length; j++) { ++ const tag: JSDocTag = jsdoc.tags[j]; ++ if (tag.name === SINCE_TAG_NAME) { ++ const currentVersion: number = Number.parseInt(tag.name); ++ if (minorVersion === 0 || ++ !Number.isNaN(currentVersion) && currentVersion > minorVersion) { ++ minorVersion = currentVersion; ++ } ++ break; ++ } ++ } ++ } ++ } ++ } ++ return minorVersion; ++} ++ ++/** ++ * 获取最新版本的JSDoc ++ * @param { JSDoc[] } jsDocs ++ * @returns { JSDoc } ++ */ ++function getCurrentJSDoc(jsDocs: JSDoc[]): JSDoc { ++ let minorVersion: number = 0; ++ let currentJsDoc: JSDoc = jsDocs[0]; ++ if (jsDocs && jsDocs.length > 0) { ++ for (let i = 0; i < jsDocs.length; i++) { ++ const jsdoc: JSDoc = jsDocs[i]; ++ if (jsdoc.tags && jsdoc.tags.length > 0) { ++ for (let j = 0; j < jsdoc.tags.length; j++) { ++ const tag: JSDocTag = jsdoc.tags[j]; ++ if (tag.name === SINCE_TAG_NAME) { ++ const currentVersion: number = Number.parseInt(tag.name); ++ if (!Number.isNaN(currentVersion) && minorVersion > currentVersion) { ++ minorVersion = currentVersion; ++ currentJsDoc = jsdoc; ++ } ++ break; ++ } ++ } ++ } ++ } ++ } ++ return currentJsDoc; ++} ++ ++/** ++ * 获取最新版本的JSDoc ++ * @param { JSDoc } jsDoc ++ * @param { string } tagName ++ * @returns { JSDocTag | undefined } ++ */ ++function getJSDocTag(jsDoc: JSDoc, tagName: string): JSDocTag | undefined { ++ const jsDocTag: JSDocTag | undefined = jsDoc.tags.find((item: JSDocTag) => { ++ return item.name === tagName; ++ }); ++ return jsDocTag; ++} ++ ++/** ++ * STER1. Parse the permission information configured on the API ++ * STEP2. Recursive queue to obtain whether the current permission configuration supports it ++ */ ++function validPermission(comment: string, permissionsArray: string[]): boolean { ++ const permissionsItem: string[] = getSplitsArrayWithDesignatedCharAndStr(comment ?? '', ' ') ++ .filter((item) => { ++ return item !== ''; ++ }); ++ const permissionsQueue: string[] = []; ++ permissionsItem.forEach((item: string) => { ++ //STEP1.1 Parse'(' ++ const leftParenthesisItem: string[] = getSplitsArrayWithDesignatedCharAndArrayStr([item], '('); ++ //STEP1.2 Parse')' ++ const rightParenthesisItem: string[] = getSplitsArrayWithDesignatedCharAndArrayStr(leftParenthesisItem, ')'); ++ permissionsQueue.push(...rightParenthesisItem); ++ }); ++ //STEP2 ++ const calcValidResult: PermissionVaildCalcInfo = { ++ valid: false, ++ currentToken: PermissionValidTokenState.Init, ++ finish: false, ++ currentPermissionMatch: true, ++ }; ++ validPermissionRecursion(permissionsQueue, permissionsArray, calcValidResult); ++ return calcValidResult.valid; ++} ++ ++function validPermissionRecursion(permissionsQueue: string[], permissions: string[], ++ calcValidResult: PermissionVaildCalcInfo): void { ++ if (permissionsQueue.some(item => ['(', ')'].includes(item))) { ++ const groups: PermissionValidCalcGroup[] = groupWithParenthesis(permissionsQueue); ++ const groupJoin: string[] = getGroupItemPermission(groups, calcValidResult, permissions); ++ getPermissionVaildAtoms(groupJoin, calcValidResult, permissions ?? []); ++ } else { ++ getPermissionVaildAtoms(permissionsQueue, calcValidResult, permissions ?? []); ++ } ++} ++ ++function getSplitsArrayWithDesignatedCharAndStr(permission: string, designatedChar: string): string[] { ++ return permission.split(designatedChar).map(item => item.trim()); ++} ++ ++function getGroupItemPermission( ++ groups: PermissionValidCalcGroup[], ++ calcValidResult: PermissionVaildCalcInfo, ++ permissions: string[]): string[] { ++ const groupJoin: string[] = []; ++ groups.forEach((groupItem: PermissionValidCalcGroup) => { ++ if (groupItem.includeParenthesis) { ++ const calcValidResultItem: PermissionVaildCalcInfo = { ++ ...calcValidResult, ++ }; ++ const subStack: string[] = groupItem.subQueue.slice(1, groupItem.subQueue.length - 1); ++ validPermissionRecursion(subStack, permissions, calcValidResultItem); ++ if (calcValidResultItem.valid) { ++ groupJoin.push(''); ++ } else { ++ groupJoin.push('NA'); ++ } ++ } else { ++ groupJoin.push(...groupItem.subQueue); ++ } ++ }); ++ return groupJoin; ++} ++ ++function groupWithParenthesis(stack: string[]): PermissionValidCalcGroup[] { ++ let currentLeftParenthesisCount: number = 0; ++ const groups: PermissionValidCalcGroup[] = []; ++ let currentGroupItem: PermissionValidCalcGroup = { ++ subQueue: [], ++ includeParenthesis: false, ++ }; ++ stack.forEach((item: string, index: number) => { ++ if (item === '(') { ++ if (currentLeftParenthesisCount === 0) { ++ groups.push(currentGroupItem); ++ currentGroupItem = { ++ subQueue: [item], ++ includeParenthesis: true ++ }; ++ } else { ++ currentGroupItem.subQueue.push(item); ++ } ++ currentLeftParenthesisCount++; ++ } else if (item === ')') { ++ currentLeftParenthesisCount--; ++ currentGroupItem.subQueue.push(item); ++ if (currentLeftParenthesisCount === 0) { ++ groups.push(currentGroupItem); ++ currentGroupItem = { ++ subQueue: [], ++ includeParenthesis: false, ++ }; ++ } ++ } else { ++ currentGroupItem.subQueue.push(item); ++ if (index === stack.length - 1) { ++ groups.push(currentGroupItem); ++ } ++ } ++ }); ++ return groups; ++} ++ ++function getPermissionVaildAtoms(atomStacks: string[], calcValidResult: PermissionVaildCalcInfo, ++ configPermissions: string[]): void { ++ if (calcValidResult.finish) { ++ return; ++ } ++ if (atomStacks[0] === 'and') { ++ calcValidResult.currentToken = PermissionValidTokenState.And; ++ } else if (atomStacks[0] === 'or') { ++ calcValidResult.currentToken = PermissionValidTokenState.Or; ++ } else { ++ if (calcValidResult.currentToken === PermissionValidTokenState.Or) { ++ if (inValidOrExpression( ++ atomStacks, ++ calcValidResult, ++ configPermissions ++ )) { ++ calcValidResult.currentPermissionMatch = false; ++ } ++ } else if (calcValidResult.currentToken === PermissionValidTokenState.And) { ++ if (inValidAndExpression( ++ atomStacks, ++ calcValidResult, ++ configPermissions ++ )) { ++ calcValidResult.currentPermissionMatch = false; ++ } ++ } else { ++ calcValidResult.currentPermissionMatch = ++ validPermissionItem(atomStacks[0], configPermissions); ++ } ++ } ++ if (atomStacks.length > 1) { ++ getPermissionVaildAtoms( ++ atomStacks.slice(1), ++ calcValidResult, ++ configPermissions ++ ); ++ } else { ++ calcValidResult.valid = calcValidResult.currentPermissionMatch; ++ calcValidResult.finish = true; ++ } ++} ++ ++function inValidOrExpression( ++ atomStacks: string[], ++ calcValidResult: PermissionVaildCalcInfo, ++ configPermissions: string[]): boolean { ++ if ( ++ !calcValidResult.currentPermissionMatch && ++ !validPermissionItem(atomStacks[0], configPermissions) ++ ) { ++ calcValidResult.valid = false; ++ return true; ++ } ++ calcValidResult.currentPermissionMatch = true; ++ return false; ++} ++ ++function inValidAndExpression( ++ atomStacks: string[], ++ calcValidResult: PermissionVaildCalcInfo, ++ configPermissions: string[]): boolean { ++ if ( ++ !calcValidResult.currentPermissionMatch || ++ !validPermissionItem(atomStacks[0], configPermissions) ++ ) { ++ calcValidResult.valid = false; ++ return true; ++ } ++ calcValidResult.currentPermissionMatch = ++ validPermissionItem(atomStacks[0], configPermissions); ++ return false; ++} ++ ++function validPermissionItem(atomStackItem: string, configPermissions: string[]): boolean { ++ return atomStackItem === '' || configPermissions.includes(atomStackItem); ++} ++ ++function getSplitsArrayWithDesignatedCharAndArrayStr( ++ leftParenthesisItems: string[], ++ designatedChar: string ++): string[] { ++ const rightParenthesisItems: string[] = []; ++ leftParenthesisItems.forEach((leftParenthesisItem: string) => { ++ if (leftParenthesisItem.includes(designatedChar)) { ++ const rightParenthesis: string[] = ++ getSplitsArrayWithDesignatedCharAndStr( ++ leftParenthesisItem, ++ designatedChar ++ ); ++ rightParenthesis.forEach((item: string) => { ++ if (item === '') { ++ rightParenthesisItems.push(designatedChar); ++ } else { ++ rightParenthesisItems.push(item); ++ } ++ }); ++ } else { ++ rightParenthesisItems.push(leftParenthesisItem); ++ } ++ }); ++ return rightParenthesisItems; ++} ++ ++/** ++* get jsDocNodeCheckConfigItem object ++* ++* @param {string[]} tagName - tag name ++* @param {string} message - error message ++* @param {DiagnosticCategory} type - error type ++* @param {boolean} tagNameShouldExisted - tag is required ++* @param {CheckValidCallbackInterface} checkValidCallback ++* @returns {JsDocNodeCheckConfigItem} ++*/ ++export function getJsDocNodeCheckConfigItem(tagName: string[], message: string, type: DiagnosticCategory, ++ tagNameShouldExisted: boolean, checkValidCallback?: CheckValidCallbackInterface): JsDocNodeCheckConfigItem { ++ return { ++ tagName: tagName, ++ message: message, ++ type: type, ++ tagNameShouldExisted: tagNameShouldExisted, ++ checkValidCallback: checkValidCallback ++ }; ++} ++ ++/** ++ * 创建/清空工程配置 ++ * @param { ProjectConfig } projectConfig ++ * @returns { ProjectConfig } ++ */ ++export function createOrCleanProjectConfig(): ProjectConfig { ++ return { ++ bundleName: '', ++ moduleName: '', ++ cachePath: '', ++ aceModuleJsonPath: '', ++ compileMode: '', ++ permissions: { ++ requestPermissions: [], ++ definePermissions: [] ++ }, ++ requestPermissions: [], ++ definePermissions: [], ++ projectRootPath: '', ++ isCrossplatform: false, ++ ignoreCrossplatformCheck: false, ++ bundleType: '', ++ compileSdkVersion: 0, ++ compatibleSdkVersion: 0, ++ projectPath: '', ++ aceProfilePath: '', ++ cardPageSet: [], ++ compileSdkPath: '', ++ systemModules: [], ++ allModulesPaths: [], ++ sdkConfigs: [], ++ externalApiPaths: '', ++ externalSdkPaths: [], ++ sdkConfigPrefix: '', ++ deviceTypes: [], ++ deviceTypesMessage: '', ++ runtimeOS: '', ++ syscapIntersectionSet: new Set([]), ++ syscapUnionSet: new Set([]), ++ permissionsArray: [], ++ buildSdkPath: '', ++ nativeDependencies: [], ++ aceSoPath: '' ++ }; ++} ++ ++/** ++ * 初始化工程配置 ++ * @param { ProjectConfig } projectConfig ++ */ ++export function initProjectConfig(): void { ++ // 绑定cardPageSet ++ readCardPageSet(); ++ // 绑定systemModules ++ readSystemModules(); ++ // 绑定syscap ++ readSyscapInfo(); ++ // 绑定permission ++ readPermissions(); ++} ++ ++/** ++ * read permissionInfo to this.share.projectConfig ++ */ ++export function readPermissions(): void { ++ const permission: ConfigPermission = globalObject.projectConfig.permissions; ++ if (permission.requestPermissions) { ++ globalObject.projectConfig.requestPermissions = getPermissionFromConfig(permission.requestPermissions); ++ } ++ if (permission.definePermissions) { ++ globalObject.projectConfig.definePermissions = getPermissionFromConfig(permission.definePermissions); ++ } ++ globalObject.projectConfig.permissionsArray = ++ [...globalObject.projectConfig.requestPermissions, ...globalObject.projectConfig.definePermissions]; ++} ++ ++function getPermissionFromConfig(array: Array<{ name: string }>): string[] { ++ return array.map((item: { name: string }) => { ++ return String(item.name); ++ }); ++} ++ ++function readSystemModules() { ++ const apiDirPath = path.resolve(globalObject.projectConfig.buildSdkPath, './api'); ++ const arktsDirPath = path.resolve(globalObject.projectConfig.buildSdkPath, './arkts'); ++ const kitsDirPath = path.resolve(globalObject.projectConfig.buildSdkPath, './kits'); ++ const systemModulePathArray = [apiDirPath, arktsDirPath, kitsDirPath]; ++ ++ systemModulePathArray.forEach(systemModulesPath => { ++ if (fs.existsSync(systemModulesPath)) { ++ const modulePaths = []; ++ readFile(systemModulesPath, modulePaths); ++ globalObject.projectConfig.systemModules.push(...fs.readdirSync(systemModulesPath)); ++ modulePaths.filter(filePath => { ++ const dirName = path.dirname(filePath); ++ return !(dirName === apiDirPath || dirName === arktsDirPath || dirName === kitsDirPath); ++ }).map((filePath: string) => { ++ return filePath ++ .replace(apiDirPath, '') ++ .replace(arktsDirPath, '') ++ .replace(kitsDirPath, '') ++ .replace(/(^\\)|(.d.e?ts$)/g, '') ++ .replace(/\\/g, '/'); ++ }); ++ globalObject.projectConfig.allModulesPaths.push(...modulePaths); ++ } ++ }); ++ const defaultSdkConfigs: SdkConfig[] = [ ++ { ++ 'apiPath': systemModulePathArray, ++ 'prefix': '@ohos' ++ }, { ++ 'apiPath': systemModulePathArray, ++ 'prefix': '@system' ++ }, { ++ 'apiPath': systemModulePathArray, ++ 'prefix': '@arkts' ++ } ++ ]; ++ const externalApiPathStr = globalObject.projectConfig.externalApiPaths || ''; ++ const externalApiPaths = externalApiPathStr.split(path.delimiter); ++ globalObject.projectConfig.externalSdkPaths = [...externalApiPaths]; ++ const extendSdkConfigs: SdkConfig[] = []; ++ collectExternalModules(externalApiPaths, extendSdkConfigs); ++ globalObject.projectConfig.sdkConfigs = [...defaultSdkConfigs, ...extendSdkConfigs]; ++} ++ ++function collectExternalModules(sdkPaths: string[], extendSdkConfigs: SdkConfig[]): void { ++ for (let i = 0; i < sdkPaths.length; i++) { ++ const sdkPath = sdkPaths[i]; ++ const sdkConfigPath = path.resolve(sdkPath, 'sdkConfig.json'); ++ if (!fs.existsSync(sdkConfigPath)) { ++ continue; ++ } ++ const sdkConfig: SdkConfig = JSON.parse(fs.readFileSync(sdkConfigPath, 'utf-8')); ++ if (!sdkConfig.apiPath) { ++ continue; ++ } ++ let externalApiPathArray: string[] = []; ++ if (Array.isArray(sdkConfig.apiPath)) { ++ externalApiPathArray = sdkConfig.apiPath; ++ } else { ++ externalApiPathArray.push(sdkConfig.apiPath); ++ } ++ const resolveApiPathArray: string[] = []; ++ externalApiPathArray.forEach((element: string) => { ++ const resolvePath: string = path.resolve(sdkPath, element); ++ resolveApiPathArray.push(resolvePath); ++ if (fs.existsSync(resolvePath)) { ++ const extrenalModulePaths = []; ++ globalObject.projectConfig.systemModules.push(...fs.readdirSync(resolvePath)); ++ readFile(resolvePath, extrenalModulePaths); ++ globalObject.projectConfig.allModulesPaths.push(...extrenalModulePaths); ++ } ++ }); ++ globalObject.projectConfig.sdkConfigPrefix += `|${sdkConfig.prefix.replace(/^@/, '')}`; ++ sdkConfig.apiPath = resolveApiPathArray; ++ extendSdkConfigs.push(sdkConfig); ++ } ++} ++ ++/** ++ * 根据配置读取卡片列表 ++ */ ++function readCardPageSet(): void { ++ if (globalObject.projectConfig.aceModuleJsonPath && fs.existsSync(globalObject.projectConfig.aceModuleJsonPath)) { ++ globalObject.projectConfig.compileMode = STAGE_COMPILE_MODE; ++ const moduleJson: any = JSON.parse(fs.readFileSync(globalObject.projectConfig.aceModuleJsonPath).toString()); ++ const extensionAbilities: any = moduleJson?.module?.extensionAbilities; ++ if (extensionAbilities && extensionAbilities.length > 0) { ++ setCardPages(extensionAbilities); ++ } ++ } ++} ++ ++function setCardPages(extensionAbilities: any) { ++ if (extensionAbilities && extensionAbilities.length > 0) { ++ extensionAbilities.forEach((extensionAbility: any) => { ++ if (extensionAbility.type === 'form' && extensionAbility.metadata) { ++ extensionAbility.metadata.forEach((metadata: any) => { ++ if (metadata.resource) { ++ readCardResource(metadata.resource); ++ } ++ }); ++ } ++ }); ++ } ++} ++ ++function readCardResource(resource: string) { ++ const cardJsonFileName: string = `${resource.replace(/\$profile\:/, '')}.json`; ++ const modulePagePath: string = path.resolve(globalObject.projectConfig.aceProfilePath, cardJsonFileName); ++ if (fs.existsSync(modulePagePath)) { ++ const cardConfig: any = JSON.parse(fs.readFileSync(modulePagePath, 'utf-8')); ++ if (cardConfig.forms) { ++ cardConfig.forms.forEach((form: any) => { ++ readCardForm(form); ++ }); ++ } ++ } ++} ++ ++function readCardForm(form: any) { ++ if ((form.type && form.type === 'eTS') || (form.uiSyntax && form.uiSyntax === 'arkts')) { ++ const cardPath = path.resolve(globalObject.projectConfig.projectPath, '..', form.src); ++ if (cardPath && fs.existsSync(cardPath) && !globalObject.projectConfig.cardPageSet.includes(cardPath)) { ++ globalObject.projectConfig.cardPageSet.push(cardPath); ++ } ++ } ++} ++ ++/** ++ * 更新工程配置 ++ * @param { ProjectConfig } targetProjectConfig ++ * @param { ProjectConfig } newProjectConfig ++ */ ++export function updateProjectConfig(newProjectConfig: ProjectConfig): void { ++ Object.assign(globalObject.projectConfig, { ++ bundleName: newProjectConfig.bundleName, ++ moduleName: newProjectConfig.moduleName, ++ cachePath: newProjectConfig.cachePath, ++ requestPermissions: newProjectConfig.requestPermissions, ++ projectRootPath: newProjectConfig.projectRootPath, ++ isCrossplatform: newProjectConfig.isCrossplatform, ++ ignoreCrossplatformCheck: newProjectConfig.ignoreCrossplatformCheck, ++ bundleType: newProjectConfig.bundleType, ++ compileSdkVersion: newProjectConfig.compileSdkVersion, ++ compatibleSdkVersion: newProjectConfig.compatibleSdkVersion, ++ projectPath: newProjectConfig.projectPath, ++ aceProfilePath: newProjectConfig.aceProfilePath, ++ buildSdkPath: newProjectConfig.buildSdkPath ++ }); ++} ++ ++export function readFile(dir: string, utFiles: string[]): void { ++ try { ++ const files: string[] = fs.readdirSync(dir); ++ files.forEach((element) => { ++ const filePath: string = path.join(dir, element); ++ const status: fs.Stats = fs.statSync(filePath); ++ if (status.isDirectory()) { ++ readFile(filePath, utFiles); ++ } else { ++ utFiles.push(filePath); ++ } ++ }); ++ } catch (e) { ++ console.error(MESSAGE_CONFIG_COLOR_RED, 'ArkTS ERROR: ' + e, MESSAGE_CONFIG_COLOR_RESET); ++ } ++} ++ ++/** ++* Determine the necessity of permission check ++* ++* @param { JSDoc[] } jsDocs ++* @param { JsDocNodeCheckConfigItem } config ++* @returns { boolean } ++*/ ++export function checkPermissionTag(jsDocs: JSDoc[], config: JsDocNodeCheckConfigItem): boolean { ++ const currentJSDoc: JSDoc = getCurrentJSDoc(jsDocs); ++ const jsDocTag: JSDocTag | undefined = getJSDocTag(currentJSDoc, PERMISSION_TAG_CHECK_NAME); ++ if (!jsDocTag) { ++ return false; ++ } ++ const permissionExpression: string = jsDocTag.name + ' ' + jsDocTag.description; ++ config.message = PERMISSION_TAG_CHECK_ERROR.replace('$DT', permissionExpression); ++ return permissionExpression !== '' && !validPermission(permissionExpression, globalObject.projectConfig.permissionsArray); ++} ++ ++/** ++ * Confirm compliance since ++ * Only major version can be passed in, such as "19"; ++ * major and minor version can be passed in, such as "19.1"; major minor and patch ++ * patch version can be passed in, such as "19.1.2" ++ * the major version be from 1-999 ++ * the minor version be from 0-999 ++ * the patch version be from 0-999 ++ * ++ * @param {string} since ++ * @return {boolean} ++ */ ++function isCompliantSince(since: string): boolean { ++ return /^(?!0\d)[1-9]\d{0,2}(?:\.[1-9]\d{0,2}|\.0){0,2}$\d{0,2}$/.test(since); ++} ++ ++/** ++ * compare point version ++ * @param { string } firstVersion ++ * @param { string } secondVersion ++ * @returns { number } ++ */ ++function comparePointVersion(firstVersion: string, secondVersion: string): number { ++ const firstPointVersion = firstVersion.split('.'); ++ const secondPointVersion = secondVersion.split('.'); ++ for (let i = 0; i < 3; i++) { ++ const part1 = parseInt(firstPointVersion[i] || '0', 10); ++ const part2 = parseInt(secondPointVersion[i] || '0', 10); ++ if (part1 < part2) { ++ return -1; ++ } ++ if (part1 > part2) { ++ return 1; ++ } ++ } ++ return 0; ++} ++ ++/** ++ * Determine the necessity of syscap check. ++ * @param { JSDoc[] } jsDocs ++ * @param { JsDocNodeCheckConfigItem } config ++ * @returns { boolean } ++ */ ++export function checkSyscapTag(jsDocs: JSDoc[], config: JsDocNodeCheckConfigItem): boolean { ++ let currentSyscapValue: string = ''; ++ if (jsDocs && jsDocs.length > 0) { ++ const jsDoc: JSDoc = getCurrentJSDoc(jsDocs); ++ for (let i = 0; i < jsDoc.tags.length; i++) { ++ const jsDocTag: JSDocTag = jsDoc.tags[i]; ++ if (jsDocTag && jsDocTag.name === SYSCAP_TAG_CHECK_NAME) { ++ currentSyscapValue = jsDocTag.comment; ++ break; ++ } ++ } ++ } ++ return globalObject.projectConfig.syscapIntersectionSet && !globalObject.projectConfig.syscapIntersectionSet.has(currentSyscapValue); ++} ++ ++/** ++ * read syscapInfo to projectConfig ++ */ ++export function readSyscapInfo(): void { ++ globalObject.projectConfig.deviceTypesMessage = globalObject.projectConfig.deviceTypes.join(','); ++ const deviceDir: string = path.resolve(__dirname, '../../../../../api/device-define/'); ++ const deviceInfoMap: Map = new Map(); ++ const syscaps: Array = []; ++ let allSyscaps: string[] = []; ++ globalObject.projectConfig.deviceTypes.forEach((deviceType: string) => { ++ collectOhSyscapInfos(deviceType, deviceDir, deviceInfoMap); ++ }); ++ if (globalObject.projectConfig.runtimeOS !== RUNTIME_OS_OH) { ++ collectExternalSyscapInfos(globalObject.projectConfig.externalSdkPaths, globalObject.projectConfig.deviceTypes, ++ deviceInfoMap); ++ } ++ deviceInfoMap.forEach((value: string[]) => { ++ syscaps.push(value); ++ allSyscaps = allSyscaps.concat(value); ++ }); ++ const intersectNoRepeatTwice = (arrs: Array) => { ++ return arrs.reduce(function (prev: string[], cur: string[]) { ++ return Array.from(new Set(cur.filter((item: string) => { ++ return prev.includes(item); ++ }))); ++ }); ++ }; ++ let syscapIntersection: string[] = []; ++ if (globalObject.projectConfig.deviceTypes.length === 1 || syscaps.length === 1) { ++ syscapIntersection = syscaps[0]; ++ } else if (syscaps.length > 1) { ++ syscapIntersection = intersectNoRepeatTwice(syscaps); ++ } ++ globalObject.projectConfig.syscapIntersectionSet = new Set(syscapIntersection); ++ globalObject.projectConfig.syscapUnionSet = new Set(allSyscaps); ++} ++ ++function collectOhSyscapInfos(deviceType: string, deviceDir: string, deviceInfoMap: Map) { ++ let syscapFilePath: string = ''; ++ if (deviceType === 'phone') { ++ syscapFilePath = path.resolve(deviceDir, 'default.json'); ++ } else { ++ syscapFilePath = path.resolve(deviceDir, deviceType + '.json'); ++ } ++ if (fs.existsSync(syscapFilePath)) { ++ const content: SyscapConfig = JSON.parse(fs.readFileSync(syscapFilePath, 'utf-8')); ++ if (deviceInfoMap.get(deviceType)) { ++ deviceInfoMap.set(deviceType, (deviceInfoMap.get(deviceType) as string[]).concat(content.sysCaps)); ++ } else { ++ deviceInfoMap.set(deviceType, content.sysCaps); ++ } ++ } ++} ++ ++function collectExternalSyscapInfos( ++ externalApiPaths: string[], ++ deviceTypes: string[], ++ deviceInfoMap: Map ++) { ++ const externalDeviceDirs: string[] = []; ++ externalApiPaths.forEach((externalApiPath: string) => { ++ const externalDeviceDir: string = path.resolve(externalApiPath, './api/device-define'); ++ if (fs.existsSync(externalDeviceDir)) { ++ externalDeviceDirs.push(externalDeviceDir); ++ } ++ }); ++ externalDeviceDirs.forEach((externalDeviceDir: string) => { ++ deviceTypes.forEach((deviceType: string) => { ++ let syscapFilePath: string = ''; ++ const files: string[] = fs.readdirSync(externalDeviceDir); ++ files.forEach((fileName: string) => { ++ if (fileName.startsWith(deviceType)) { ++ syscapFilePath = path.resolve(externalDeviceDir, fileName); ++ if (fs.existsSync(syscapFilePath)) { ++ const content: SyscapConfig = JSON.parse(fs.readFileSync(syscapFilePath, 'utf-8')); ++ if (deviceInfoMap.get(deviceType)) { ++ deviceInfoMap.set(deviceType, (deviceInfoMap.get(deviceType) as string[]).concat(content.sysCaps)); ++ } else { ++ deviceInfoMap.set(deviceType, content.sysCaps); ++ } ++ } ++ } ++ }); ++ }); ++ }); ++} ++ ++export function pushLog(apiName: string, currentFilePath: string, currentAddress: CurrentAddress, ++ logLevel: DiagnosticCategory, logMessage: string) { ++ // 组装文件全路径 ++ const fileFullPath: string = currentFilePath + `(${currentAddress.column}:${currentAddress.line}).`; ++ // 替换api名称 ++ logMessage = logMessage.replace('{0}', apiName); ++ // 打印日志信息 ++ printMessage(fileFullPath, logMessage, logLevel); ++} ++ ++/** ++ * 日志打印 ++ * @param fileInfo ++ * @param message ++ * @param level ++ */ ++function printMessage(fileInfo: string, message: string, level: DiagnosticCategory) { ++ let messageHead: string = MESSAGE_CONFIG_HEADER_WARNING; ++ let messageColor: string = MESSAGE_CONFIG_COLOR_WARNING; ++ if (level === DiagnosticCategory.Error) { ++ messageHead = MESSAGE_CONFIG_HEADER_ERROR; ++ messageColor = MESSAGE_CONFIG_COLOR_ERROR; ++ } ++ // TODO: 待工具链日志输出方式确认后同步适配 ++ console.log(`%c${messageHead}${fileInfo}\n ${message}`, messageColor); ++} ++ ++export function collectInfo(moduleName: string[], modulePath: string, currentFilePath: string) { ++ // 收集so模块依赖 ++ if (/lib(\S+)\.so/g.test(modulePath) && !globalObject.projectConfig.nativeDependencies.includes(currentFilePath)) { ++ globalObject.projectConfig.nativeDependencies.push(currentFilePath); ++ } ++} ++ ++export function writeUseOSFiles(useOSFiles: string[]): void { ++ let info: string = useOSFiles.join('\n'); ++ if (!fs.existsSync(globalObject.projectConfig.aceSoPath)) { ++ const parent: string = path.resolve(globalObject.projectConfig.aceSoPath, '..'); ++ if (!(fs.existsSync(parent) && !fs.statSync(parent).isFile())) { ++ mkDir(parent); ++ } ++ } else { ++ const currentUseOSFiles: string[] = fs.readFileSync(globalObject.projectConfig.aceSoPath, 'utf-8').split('\n'); ++ useOSFiles.forEach((filePath: string) => { ++ if (!currentUseOSFiles.includes(filePath)) { ++ currentUseOSFiles.push(filePath); ++ } ++ }); ++ info = currentUseOSFiles.join('\n'); ++ } ++ fs.writeFileSync(globalObject.projectConfig.aceSoPath, info); ++} ++ ++function mkDir(path_: string): void { ++ const parent: string = path.join(path_, '..'); ++ if (!(fs.existsSync(parent) && !fs.statSync(parent).isFile())) { ++ mkDir(parent); ++ } ++ fs.mkdirSync(path_); ++} +\ No newline at end of file +diff --git a/build-tools/declgen.js b/build-tools/declgen.js +new file mode 100644 +index 000000000..c2f54541f +--- /dev/null ++++ b/build-tools/declgen.js +@@ -0,0 +1,97 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++const fs = require('fs'); ++const path = require('path'); ++const commander = require('commander'); ++const { generateInteropDecls } = require('declgen/build/src/generateInteropDecls'); ++let inputFileDir = ''; ++let outputFileDir = ''; ++const CONFIG = JSON.parse( ++ fs.readFileSync(path.join(__dirname, 'remove_declgen.json'), 'utf8') ++); ++ ++function main() { ++ const program = new commander.Command(); ++ program.name('intToNumber').version('0.0.1'); ++ program ++ .option('--input ', 'input path') ++ .option('--output ', 'output path') ++ .action((opts) => { ++ if (!opts.input || !opts.output) { ++ console.error( ++ 'Error: Must provide --input and --output parameters' ++ ); ++ process.exit(1); ++ } ++ // 将相对路径解析为绝对路径 ++ inputFileDir = path.resolve(opts.input); ++ outputFileDir = path.resolve(opts.output); ++ // 检查输入目录是否存在 ++ if (!fs.existsSync(inputFileDir)) { ++ console.error( ++ `Error: Input directory does not exist: ${inputFileDir}` ++ ); ++ process.exit(1); ++ } ++ runDeclgen(inputFileDir, outputFileDir); ++ }); ++ program.parse(process.argv); ++} ++ ++function runDeclgen(inputDir, outputDir) { ++ const inputFiles = []; ++ readFile(inputDir + '/api', inputFiles); ++ readFile(inputDir + '/arkts', inputFiles); ++ readFile(inputDir + '/kits', inputFiles); ++ const config = { ++ inputDirs: [], ++ inputFiles: inputFiles, ++ outDir: outputDir, ++ rootDir: inputDir ++ }; ++ generateInteropDecls(config); ++} ++ ++/** ++ ++读取目录下所有文件 ++@param {string} inputDir 文件目录 ++@param {Array} utFiles 所有文件 ++*/ ++function readFile(inputDir, utFiles) { ++ try { ++ const files = fs.readdirSync(inputDir); ++ files.forEach((element) => { ++ if (element === 'build-tools') { ++ return; ++ } ++ const filePath = path.join(inputDir, element); ++ const status = fs.statSync(filePath); ++ const relativePath = path.normalize( ++ path.relative(inputFileDir, filePath) ++ ); ++ if (status.isDirectory()) { ++ readFile(filePath, utFiles); ++ } else if (!CONFIG.removeFile.includes(relativePath.replace(/\//g, '\\'))) { ++ utFiles.push(filePath); ++ } ++ }); ++ } catch (e) { ++ console.error('Error reading files: ' + e.message); ++ } ++} ++ ++main(); +\ No newline at end of file +diff --git a/build-tools/delete_systemapi_plugin.js b/build-tools/delete_systemapi_plugin.js +index 9b5224036..d4fe9c661 100644 +--- a/build-tools/delete_systemapi_plugin.js ++++ b/build-tools/delete_systemapi_plugin.js +@@ -184,7 +184,7 @@ function processKitImportDeclaration(statement, needDeleteExportName) { + } + const importPath = statement.moduleSpecifier.text.replace('../', ''); + if (kitFileNeedDeleteMap === undefined || !kitFileNeedDeleteMap.has(importPath)) { +- const hasFilePath = hasFileByImportPath(importPath, inputDir); ++ const hasFilePath = hasFileByImportPath(inputDir, importPath); + if (hasFilePath) { + return statement; + } +@@ -233,20 +233,35 @@ function processKitImportDeclaration(statement, needDeleteExportName) { + + /** + * 判断文件路径对应的文件是否存在 +- * @param {string} importPath kit文件import + * @param {string} apiDir 引用接口所在目录 ++ * @param {string} importPath kit文件import + * @returns {boolean} importPath是否存在 + */ +-function hasFileByImportPath(importPath, apiDir) { ++function hasFileByImportPath(apiDir, importPath) { + let fileDir = path.resolve(apiDir); + if (importPath.startsWith('@arkts')) { + fileDir = path.resolve(inputDir, '../arkts'); + } +- return isExistArkUIFile(path.resolve(inputDir, 'arkui', 'component'), importPath) || +- isExistImportFile(fileDir, importPath); ++ return isExistImportFile(fileDir, importPath) || ++ isExistArkUIFile(path.resolve(inputDir, 'arkui', 'component'), importPath); + } + ++ ++/** ++ * Arkui import路径特殊处理 ++ * @param {string} resolvedPath 引用接口所在目录 ++ * @param {string} importPath kit文件import ++ * @returns {boolean} importPath是否存在 ++ */ + function isExistArkUIFile(resolvedPath, importPath) { ++ // TODO arkui 特殊处理import ++ if (importPath.startsWith('@ohos.arkui.')) { ++ resolvedPath = path.resolve(inputDir); ++ } ++ if (importPath.startsWith('arkui.component.') || importPath.startsWith('arkui.stateManagement.')) { ++ resolvedPath = path.resolve(inputDir); ++ importPath = importPath.replace(/\./g, '/'); ++ } + const filePath = path.resolve(resolvedPath, importPath); + if ( + filePath.includes(path.resolve(inputDir, '@internal', 'component', 'ets')) || +@@ -303,28 +318,40 @@ function tsTransform(utFiles, callback) { + } + return; + } +- if (/\.json/.test(url) || apiBaseName === 'index-full.d.ts' || !/\@systemapi/.test(content) && apiBaseName !== '@ohos.arkui.component.d.ets') { +- // 特殊类型文件处理 ++ let isTransformer = /\.d\.ts/.test(apiBaseName) || /\.d\.ets/.test(apiBaseName); ++ if (/\.json/.test(url) || apiBaseName === 'index-full.d.ts') { ++ isTransformer = false; ++ } ++ if (etsType === 'ets2') { ++ if (!/\@systemapi/.test(content) && apiBaseName !== '@ohos.arkui.component.d.ets') { ++ isTransformer = false; ++ } ++ } ++ if (/\.static\.d\.ets$/.test(apiBaseName)) { ++ writeFile(url.substring(0, url.length - 12) + 'd.ets', content); ++ return; ++ } ++ if (!isTransformer) { + writeFile(url, content); +- } else if (/\.d\.ts/.test(apiBaseName) || /\.d\.ets/.test(apiBaseName)) { +- // dts文件处理 +- const fileName = processFileName(url); +- let references = content.match(PATT.GET_REFERENCE); +- if (references) { +- referencesMap.set(url, { references: references }); +- for (let index = 0; index < references.length; index++) { +- const item = references[index]; +- content = content.replace(item, ''); +- } ++ return; ++ } ++ // dts文件处理 ++ const fileName = processFileName(url); ++ let references = content.match(PATT.GET_REFERENCE); ++ if (references) { ++ referencesMap.set(url, { references: references }); ++ for (let index = 0; index < references.length; index++) { ++ const item = references[index]; ++ content = content.replace(item, ''); + } +- ts.transpileModule(content, { +- compilerOptions: { +- target: ts.ScriptTarget.ES2017, +- }, +- fileName: fileName, +- transformers: { before: [callback(url)] }, +- }); + } ++ ts.transpileModule(content, { ++ compilerOptions: { ++ target: ts.ScriptTarget.ES2017, ++ }, ++ fileName: fileName, ++ transformers: { before: [callback(url)] }, ++ }); + }); + } + /** +@@ -604,7 +631,7 @@ function formatAllNodesImportDeclaration(node, statement, url, currReferencesMod + } + const importSpecifier = statement.moduleSpecifier.getText().replace(/[\'\"]/g, ''); + const fileDir = path.dirname(url); +- let hasImportSpecifierFile = hasFileByImportPath(importSpecifier, fileDir); ++ let hasImportSpecifierFile = hasFileByImportPath(fileDir, importSpecifier); + let hasImportSpecifierInModules = globalModules.has(importSpecifier); + if ((hasImportSpecifierFile || hasImportSpecifierInModules) && clauseSet.size > 0) { + let currModule = []; +diff --git a/build-tools/handleApiFiles.js b/build-tools/handleApiFiles.js +index 64ab86c91..7c8758a55 100755 +--- a/build-tools/handleApiFiles.js ++++ b/build-tools/handleApiFiles.js +@@ -20,6 +20,7 @@ const commander = require('commander'); + // 处理的目录类型 + let dirType = ''; + const deleteApiSet = new Set(); ++const importNameSet = new Set(); + + // 处理的目录类型,ets代表处理的是1.1目录,ets2代表处理的是1.2目录里有@arkts 1.1&1.2标签的文件, + // noTagInEts2代表处理的是1.2目录里无标签的文件 +@@ -29,6 +30,15 @@ const DirType = { + 'typeThree': 'noTagInEts2', + }; + ++const NotNullFilePath = [ ++ 'api', ++ 'api/@internal/ets', ++ 'api/@internal/component/ets', ++ 'api/arkui/component', ++ 'arkts', ++ 'kits', ++]; ++ + const NOT_COPY_DIR = ['build-tools', '.git', '.gitee']; + + function isEtsFile(path) { +@@ -39,6 +49,10 @@ function isTsFile(path) { + return path.endsWith('d.ts'); + } + ++function isStaticFile(path) { ++ return path.endsWith('static.d.ets'); ++} ++ + function hasEtsFile(path) { + // 为StateManagement.d.ts设定白名单,在1.2打包的时候在Linux上有大小写不同的重名,碰到直接返回true + if (path.includes('StateManagement.d.ts')) { +@@ -102,6 +116,20 @@ function handleApiFiles(rootPath, type, output) { + console.log('error===>', error); + } + } ++ if (type === DirType.typeTwo) { ++ NotNullFilePath.forEach((dir) => { ++ const outDir = path.join(output, dir); ++ if (!fs.existsSync(outDir)) { ++ fs.mkdirSync(outDir, { recursive: true }); ++ writeFile(path.join(outDir, '.keep'), ' '); ++ return; ++ } ++ const fileNames = fs.readdirSync(outDir); ++ if (fileNames.length === 0) { ++ writeFile(path.join(outDir, '.keep'), ' '); ++ } ++ }); ++ } + } + + +@@ -118,9 +146,19 @@ function handleApiFileByType(apiRelativePath, rootPath, type, output) { + const fullPath = path.join(rootPath, apiRelativePath); + const isEndWithEts = isEtsFile(apiRelativePath); + const isEndWithTs = isTsFile(apiRelativePath); ++ const isEndWithStatic = isStaticFile(apiRelativePath); + const outputPath = output ? path.join(output, apiRelativePath) : fullPath; + const fileContent = fs.readFileSync(fullPath, 'utf-8'); + ++ if (isEndWithStatic) { ++ if (type === 'ets2') { ++ writeFile(outputPath, fileContent); ++ return; ++ } else { ++ return; ++ } ++ } ++ + if (!isEndWithEts && !isEndWithTs) { + writeFile(outputPath, fileContent); + return; +@@ -272,7 +310,7 @@ function handleNoTagFileInFirstType(sourceFile, outputPath, fileContent) { + * @returns + */ + function deleteArktsTag(fileContent) { +- const arktsTagRegx = /\*\s*@arkts\s+1.1&1.2\s*(\r|\n)\s*|\*\s*@arkts\s*1.2s*(\r|\n)\s*/g; ++ const arktsTagRegx = /\*\s*@arkts\s+1.1&1.2\s*(\r|\n)\s*|\*\s*@arkts\s*1.2s*(\r|\n)\s*|\*\s*@arkts\s*1.1s*(\r|\n)\s*/g; + fileContent = fileContent.replace(arktsTagRegx, (substring, p1) => { + return ''; + }); +@@ -583,24 +621,36 @@ function deleteApi(sourceFile) { + */ + const transformExportApi = (context) => { + return (rootNode) => { +- const visit = (node) => { ++ const importOrExportNodeVisitor = (node) => { ++ if (ts.isImportClause(node) && node.name && ts.isIdentifier(node.name) || ++ ts.isImportSpecifier(node) && node.name && ts.isIdentifier(node.name)) { ++ importNameSet.add(node.name?.getText()); ++ } + // 剩下未被删除的API中,如果还有与被删除API名字一样的API,就将其从set集合中删掉 + if (apiNodeTypeArr.includes(node.kind) && deleteApiSet.has(node.name?.getText())) { + deleteApiSet.delete(node.name?.getText()); + } ++ // 非目标节点:继续遍历子节点 ++ return ts.visitEachChild(node, importOrExportNodeVisitor, context); ++ }; ++ ts.visitNode(rootNode, importOrExportNodeVisitor); ++ ++ const allNodeVisitor = (node) => { + // 判断是否为要删除的变量声明 +- if (ts.isExportAssignment(node) && deleteApiSet.has(node.expression.escapedText.toString())) { ++ if (ts.isExportAssignment(node) && deleteApiSet.has(node.expression.escapedText.toString()) && ++ !importNameSet.has(node.expression.escapedText.toString())) { + return undefined; + } + +- if (ts.isExportSpecifier(node) && deleteApiSet.has(node.name.escapedText.toString())) { ++ if (ts.isExportSpecifier(node) && deleteApiSet.has(node.name.escapedText.toString()) && ++ !importNameSet.has(node.name.escapedText.toString())) { + return undefined; + } + + // 非目标节点:继续遍历子节点 +- return ts.visitEachChild(node, visit, context); ++ return ts.visitEachChild(node, allNodeVisitor, context); + }; +- return ts.visitNode(rootNode, visit); ++ return ts.visitNode(rootNode, allNodeVisitor); + }; + }; + +diff --git a/build-tools/intToNumber.js b/build-tools/intToNumber.js +new file mode 100644 +index 000000000..37c448abb +--- /dev/null ++++ b/build-tools/intToNumber.js +@@ -0,0 +1,490 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++const ts = require('typescript'); ++const fs = require('fs'); ++const path = require('path'); ++const commander = require('commander'); ++ ++const typeArray = ['long', 'double', 'int']; ++ ++let inputDir = ''; ++let outputDir = ''; ++let jsDocContent = ''; ++let tagDataList = []; ++ ++function main() { ++ const program = new commander.Command(); ++ program ++ .name('intToNumber') ++ .version('0.0.1'); ++ program ++ .option('--path ', 'input path') ++ .option('--output ', 'output path') ++ .action((opts) => { ++ if (!opts.path || !opts.output) { ++ console.error('Error: Must provide --path and --output parameters'); ++ process.exit(1); ++ } ++ ++ // 将相对路径解析为绝对路径 ++ inputDir = path.resolve(opts.path); ++ outputDir = path.resolve(opts.output); ++ ++ // 检查输入目录是否存在 ++ if (!fs.existsSync(inputDir)) { ++ console.error(`Error: Input directory does not exist: ${inputDir}`); ++ process.exit(1); ++ } ++ ++ const apiUtFiles1 = []; ++ readFile(inputDir + '/api', apiUtFiles1); ++ readFile(inputDir + '/arkts', apiUtFiles1); ++ tsTransform(apiUtFiles1, recursionAstCallback); ++ const apiUtFiles2 = []; ++ readFile(outputDir + '/api', apiUtFiles2); ++ readFile(outputDir + '/arkts', apiUtFiles2); ++ tsTransform(apiUtFiles2, recursionAstCallback2); ++ ++ const jsDocUtFiles1 = []; ++ readFile(outputDir + '/api', jsDocUtFiles1); ++ readFile(outputDir + '/arkts', jsDocUtFiles1); ++ tsTransform(jsDocUtFiles1, parseJSDocCallback); ++ const jsDocUtFiles2 = []; ++ readFile(outputDir + '/api', jsDocUtFiles2); ++ readFile(outputDir + '/arkts', jsDocUtFiles2); ++ tsTransform(jsDocUtFiles2, parseJSDocCallback2); ++ }); ++ program.parse(process.argv); ++} ++ ++/** ++ * 读取目录下所有文件 ++ * @param {string} dir 文件目录 ++ * @param {Array} utFiles 所有文件 ++ */ ++function readFile(dir, utFiles) { ++ try { ++ const files = fs.readdirSync(dir); ++ files.forEach((element) => { ++ if (element === 'build-tools') { ++ return; ++ } ++ const filePath = path.join(dir, element); ++ const status = fs.statSync(filePath); ++ if (status.isDirectory()) { ++ readFile(filePath, utFiles); ++ } else { ++ utFiles.push(filePath); ++ } ++ }); ++ } catch (e) { ++ console.error('Error reading files: ' + e.message); ++ } ++} ++ ++ ++/** ++ * 遍历所有文件进行处理 ++ * @param {Array} utFiles 所有文件 ++ * @param {recursionAstCallback} callback 回调函数 ++ */ ++function tsTransform(utFiles, callback) { ++ utFiles.forEach((url) => { ++ let content = fs.readFileSync(url, 'utf-8'); ++ jsDocContent = content; ++ const apiBaseName = path.basename(url); ++ tagDataList = []; ++ if (/\.d\.ts/.test(apiBaseName) || /\.d\.ets/.test(apiBaseName)) { ++ const fileName = processFileName(url); ++ ts.transpileModule(content, { ++ compilerOptions: { ++ target: ts.ScriptTarget.ES2017, ++ }, ++ fileName: fileName, ++ transformers: { before: [callback(url)] } ++ }); ++ } else { ++ const outputPath = replaceInputDirWithOutputDir(url, inputDir, outputDir); ++ ensureDirectoryExists(outputPath); ++ fs.writeFileSync(outputPath, content); ++ } ++ }); ++} ++ ++/** ++ * 统一处理文件名称,修改后缀等 ++ * @param {string} filePath 文件路径 ++ * @returns {string} filename 文件名称 ++ */ ++function processFileName(filePath) { ++ return path ++ .basename(filePath) ++ .replace(/\.d\.ts$/g, '.ts') ++ .replace(/\.d\.ets$/g, '.ets'); ++} ++ ++/** ++ * 每个文件处理签回调函数第一个 ++ * @callback recursionAstCallback ++ * @param {string} url 文件路径 ++ * @returns {Function} ++ */ ++function recursionAstCallback(url) { ++ return (context) => { ++ return (sourceFile) => { ++ node = processVisitEachChild1(context, sourceFile); ++ const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed }); ++ const result = printer.printNode(ts.EmitHint.Unspecified, node, sourceFile); ++ const outputPath = replaceInputDirWithOutputDir(url, inputDir, outputDir); ++ ensureDirectoryExists(outputPath); ++ fs.writeFileSync(outputPath, result); ++ return ts.factory.createSourceFile([], ts.SyntaxKind.EndOfFileToken, ts.NodeFlags.None); ++ }; ++ }; ++} ++ ++/** ++ * 每个文件处理签回调函数第一个 ++ * @callback recursionAstCallback ++ * @param {string} url 文件路径 ++ * @returns {Function} ++ */ ++function recursionAstCallback2(url) { ++ return (context) => { ++ return (sourceFile) => { ++ node = processVisitEachChild2(context, sourceFile); ++ const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed }); ++ const result = printer.printNode(ts.EmitHint.Unspecified, node, sourceFile); ++ fs.writeFileSync(url, result); ++ return ts.factory.createSourceFile([], ts.SyntaxKind.EndOfFileToken, ts.NodeFlags.None); ++ }; ++ }; ++} ++ ++/** ++ * 每个文件处理签回调函数第一个 ++ * @callback parseJSDocCallback ++ * @param {string} url 文件路径 ++ * @returns {Function} ++ */ ++function parseJSDocCallback(url) { ++ return (context) => { ++ return (sourceFile) => { ++ node = parseJSDocVisitEachChild1(context, sourceFile); ++ changeContent(tagDataList); ++ fs.writeFileSync(url, jsDocContent); ++ return ts.factory.createSourceFile([], ts.SyntaxKind.EndOfFileToken, ts.NodeFlags.None); ++ }; ++ }; ++} ++ ++/** ++ * 每个文件处理签回调函数第一个 ++ * @callback parseJSDocCallback ++ * @param {string} url 文件路径 ++ * @returns {Function} ++ */ ++function parseJSDocCallback2(url) { ++ return (context) => { ++ return (sourceFile) => { ++ const contents = fs.readFileSync(url, 'utf-8'); ++ node = parseJSDocVisitEachChild2(context, sourceFile, contents); ++ changeContent(tagDataList); ++ fs.writeFileSync(url, jsDocContent); ++ return ts.factory.createSourceFile([], ts.SyntaxKind.EndOfFileToken, ts.NodeFlags.None); ++ }; ++ }; ++} ++ ++/** ++ * 遍历处理tsnode节点 ++ * @param {context} 解下过后的内容 ++ * @param {node} 解下过后的节点 ++ * @returns ts.node ++ */ ++function parseJSDocVisitEachChild1(context, node) { ++ return ts.visitEachChild(node, processAllNodes, context); ++ function processAllNodes(node) { ++ if (node.jsDoc) { ++ processAllNodesJSDoc(node.jsDoc); ++ } ++ return ts.visitEachChild(node, processAllNodes, context); ++ } ++ function jsDocNodeForeach(tags) { ++ tags.forEach(tag => { ++ if (!tag.typeExpression) { ++ return; ++ } ++ const typeExpr = tag.typeExpression; ++ const newTypeExpr = parseTypeExpr(typeExpr); ++ applJSDocTransformations(typeExpr.type, newTypeExpr, tagDataList); ++ }); ++ } ++ function processAllNodesJSDoc(jsDocNode) { ++ jsDocNode.forEach(doc => { ++ if (!doc.tags) { ++ return; ++ } ++ if (/(long|double|int)/g.test(doc.getText())) { ++ jsDocNodeForeach(doc.tags); ++ } ++ }); ++ } ++ function parseTypeExpr(typeExpr) { ++ let newTypeExpr = typeExpr; ++ if (typeExpr.type.kind === ts.SyntaxKind.JSDocNullableType) { ++ newTypeExpr = judgeKind(typeExpr.type); ++ } else { ++ newTypeExpr = parseTypeExpression(typeExpr.type); ++ } ++ return newTypeExpr; ++ } ++ function judgeKind(typeExprType) { ++ if (typeExprType.type.kind && typeExprType.type.kind === ts.SyntaxKind.ParenthesizedType) { ++ return parseTypeExpression(typeExprType.type.type); ++ } else { ++ return parseTypeExpression(typeExprType.type); ++ } ++ } ++ function parseTypeExpression(node) { ++ if (ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && typeArray.includes(node.typeName.getText())) { ++ node = ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword); ++ } ++ return ts.visitEachChild(node, parseTypeExpression, context); ++ } ++} ++ ++/** ++ * ++ * @param {typeExpr} 原始typeExpr ++ * @param {newTypeExpr} 新typeExpr ++ * @param {content} 文本内容 ++ */ ++function applJSDocTransformations(typeExpr, newTypeExpr, tagDataList) { ++ const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed }); ++ const finalContent = printer.printNode(ts.EmitHint.Unspecified, newTypeExpr); ++ if (finalContent.includes('number')) { ++ const data = { ++ pos: typeExpr.pos, ++ end: typeExpr.end, ++ convertedText: finalContent ++ }; ++ tagDataList.push(data); ++ } ++} ++ ++/** ++ * ++ * @param {typeExpr} 原始typeExpr ++ * @param {newTypeExpr} 新typeExpr ++ * @param {content} 文本内容 ++ */ ++function changeContent(tagDataList) { ++ tagDataList.sort((a, b) => b.pos - a.pos); ++ for (const data of tagDataList) { ++ const before = jsDocContent.substring(0, data.pos); ++ const after = jsDocContent.substring(data.end); ++ jsDocContent = before + ` ${data.convertedText}` + after; ++ } ++} ++ ++/** ++ * 遍历处理tsnode节点 ++ * @param {context} 解下过后的内容 ++ * @param {node} 解下过后的节点 ++ * @returns ts.node ++ */ ++function parseJSDocVisitEachChild2(context, node) { ++ return ts.visitEachChild(node, processAllNodes, context); ++ function processAllNodes(node) { ++ if (node.jsDoc) { ++ removeChangeData(node.jsDoc); ++ } ++ return ts.visitEachChild(node, processAllNodes, context); ++ } ++ function jsDocNodeForeach(tags) { ++ tags.forEach(tag => { ++ if (!tag.typeExpression) { ++ return; ++ } ++ writeDataToFile(tag); ++ }); ++ } ++ function removeChangeData(node) { ++ node.forEach(doc => { ++ if (!doc.tags) { ++ return; ++ } ++ jsDocNodeForeach(doc.tags); ++ }); ++ } ++ function writeDataToFile(tag) { ++ const typeExpr = tag.typeExpression; ++ const newTypeExpr = parseTypeExpression(typeExpr.type); ++ applJSDocTransformations(typeExpr.type, newTypeExpr, tagDataList); ++ } ++ function parseTypeExpression(node) { ++ if (ts.isUnionTypeNode(node)) { ++ const types = node.types; ++ const newTypes1 = []; ++ let newTypes2 = []; ++ types.forEach(type => { ++ newTypes1.push(collectNewTypes(type)); ++ }); ++ newTypes1.forEach(type => { ++ newTypes2 = duplicateRemoval(type); ++ }); ++ node = ts.factory.updateUnionTypeNode(node, newTypes2); ++ } ++ return ts.visitEachChild(node, parseTypeExpression, context); ++ } ++} ++ ++ ++/** ++ * @param {type} 需要去重的节点 ++ */ ++function collectNewTypes(type) { ++ if (ts.isTypeReferenceNode(type) && ts.isIdentifier(type.typeName) && typeArray.includes(type.typeName.getText())) { ++ return ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword); ++ } else { ++ return type; ++ } ++} ++ ++ ++/** ++ * ++ * @param {type} 解析过后的节点 ++ * @returns ++ */ ++function duplicateRemoval(type) { ++ let newTypes2 = []; ++ let hasNumberKeyWorld = false; ++ if (type.kind === ts.SyntaxKind.NumberKeyword) { ++ if (!hasNumberKeyWorld) { ++ newTypes2.push(type); ++ hasNumberKeyWorld = true; ++ } ++ } else { ++ newTypes2.push(type); ++ } ++ return newTypes2; ++} ++ ++/** ++ * 遍历处理tsnode节点 ++ * @param {context} 解下过后的内容 ++ * @param {node} 解下过后的节点 ++ * @returns ts.node ++ */ ++function processVisitEachChild1(context, node) { ++ return ts.visitEachChild(node, processAllNodes, context); ++ function processAllNodes(node) { ++ if (ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && typeArray.includes(node.typeName.getText())) { ++ node = ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword); ++ } ++ if (ts.isStructDeclaration(node)) { ++ node = processStructDeclaration(node); ++ } ++ return ts.visitEachChild(node, processAllNodes, context); ++ }; ++} ++ ++/** ++ * 处理struct子节点 ++ */ ++function processStructDeclaration(node) { ++ const newMembers = []; ++ node.members.forEach((member, index) => { ++ if (index >= 1) { ++ newMembers.push(member); ++ } ++ }); ++ node = ts.factory.updateStructDeclaration( ++ node, ++ node.modifiers, ++ node.name, ++ node.typeParameters, ++ node.heritageClauses, ++ newMembers ++ ); ++ return node; ++} ++ ++ ++/** ++ * 遍历处理tsnode节点去重 ++ * @param {context} 解下过后的内容 ++ * @param {node} 解下过后的节点 ++ * @returns ts.node ++ */ ++function processVisitEachChild2(context, node) { ++ const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed }); ++ return ts.visitEachChild(node, processAllNodes, context); ++ function processAllNodes(node) { ++ if (ts.isUnionTypeNode(node)) { ++ node = apiDuplicateRemoval(node); ++ } ++ if (ts.isStructDeclaration(node)) { ++ node = processStructDeclaration(node); ++ } ++ return ts.visitEachChild(node, processAllNodes, context); ++ }; ++ ++ function apiDuplicateRemoval(node) { ++ const types = node.types; ++ const newTypes = []; ++ const newTypesText = new Set([]); ++ types.forEach(type => { ++ const text = printer.printNode(ts.EmitHint.Unspecified, type); ++ if (!newTypesText.has(text)) { ++ newTypes.push(type); ++ newTypesText.add(text); ++ } ++ }); ++ node = ts.factory.updateUnionTypeNode(node, newTypes); ++ return node; ++ } ++} ++ ++/** ++ * 将输入路径替换为输出路径 ++ * @param {string} inputFilePath 输入文件的绝对路径 ++ * @param {string} inputDir 输入目录的绝对路径 ++ * @param {string} outputDir 输出目录的绝对路径 ++ * @returns {string} 输出文件的绝对路径 ++ */ ++function replaceInputDirWithOutputDir(inputFilePath, inputDir, outputDir) { ++ return inputFilePath.replace(inputDir, outputDir); ++} ++ ++/** ++ * 确保目录结构存在,如果不存在则创建 ++ * @param {string} filePath 文件路径 ++ */ ++function ensureDirectoryExists(filePath) { ++ try { ++ const dir = path.dirname(filePath); ++ if (!fs.existsSync(dir)) { ++ fs.mkdirSync(dir, { recursive: true }); ++ } ++ } catch (error) { ++ console.error(`Error creating directory: ${error.message}`); ++ } ++} ++ ++main(); +\ No newline at end of file +diff --git a/build-tools/package-lock.json b/build-tools/package-lock.json +deleted file mode 100644 +index 516ab7e28..000000000 +--- a/build-tools/package-lock.json ++++ /dev/null +@@ -1,53 +0,0 @@ +-{ +- "name": "delete", +- "version": "1.0.0", +- "lockfileVersion": 1, +- "requires": true, +- "dependencies": { +- "fs": { +- "version": "0.0.1-security", +- "resolved": "https://repo.huaweicloud.com/repository/npm/fs/-/fs-0.0.1-security.tgz", +- "integrity": "sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w==" +- }, +- "inherits": { +- "version": "2.0.3", +- "resolved": "https://repo.huaweicloud.com/repository/npm/inherits/-/inherits-2.0.3.tgz", +- "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==" +- }, +- "json5": { +- "version": "2.2.3", +- "resolved": "https://repo.huaweicloud.com/repository/npm/json5/-/json5-2.2.3.tgz", +- "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" +- }, +- "path": { +- "version": "0.12.7", +- "resolved": "https://repo.huaweicloud.com/repository/npm/path/-/path-0.12.7.tgz", +- "integrity": "sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==", +- "requires": { +- "process": "^0.11.1", +- "util": "^0.10.3" +- } +- }, +- "process": { +- "version": "0.11.10", +- "resolved": "https://repo.huaweicloud.com/repository/npm/process/-/process-0.11.10.tgz", +- "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==" +- }, +- "typescript": { +- "version": "npm:ohos-typescript@4.2.3-r5", +- "resolved": "https://repo.huaweicloud.com/repository/npm/ohos-typescript/-/ohos-typescript-4.2.3-r5.tgz", +- "integrity": "sha512-9l72RIvrz8RMpU8j1uK7cIL5/gpNR11nelIFOmMDDOA3LJf70NlMgVIXOIg7MjCgjPb+U9PDwYBpalvb+rd2LA==", +- "requires": { +- "json5": "^2.2.3" +- } +- }, +- "util": { +- "version": "0.10.4", +- "resolved": "https://repo.huaweicloud.com/repository/npm/util/-/util-0.10.4.tgz", +- "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", +- "requires": { +- "inherits": "2.0.3" +- } +- } +- } +-} +diff --git a/build-tools/package.json b/build-tools/package.json +index 130a68730..2cbaa3b9a 100644 +--- a/build-tools/package.json ++++ b/build-tools/package.json +@@ -5,7 +5,7 @@ + "main": "delete_systemapi_plugin.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", +- "postinstall": "cd arkui_transformer && npm install" ++ "postinstall": "cd arkui_transformer && npm install && cd ../compiler-plugins/api-check-plugin-static && npm install" + }, + "author": "", + "license": "ISC", +@@ -13,6 +13,12 @@ + "commander": "^13.1.0", + "fs": "^0.0.1-security", + "path": "^0.12.7", +- "typescript": "npm:ohos-typescript@4.9.5-r5" ++ "typescript": "npm:ohos-typescript@4.9.5-r5", ++ "@babel/cli": "7.20.7", ++ "@babel/core": "7.20.12", ++ "@babel/plugin-proposal-class-properties": "7.18.6", ++ "@babel/preset-env": "7.20.2", ++ "@babel/preset-typescript": "7.18.6", ++ "@babel/runtime": "7.20.13" + } + } +diff --git a/build-tools/package_tools/.gitignore b/build-tools/package_tools/.gitignore +new file mode 100644 +index 000000000..938479ff0 +--- /dev/null ++++ b/build-tools/package_tools/.gitignore +@@ -0,0 +1,3 @@ ++package-lock.json ++node_modules/ ++package/ +\ No newline at end of file +diff --git a/build-tools/package_tools/main.ts b/build-tools/package_tools/main.ts +new file mode 100644 +index 000000000..07b263e20 +--- /dev/null ++++ b/build-tools/package_tools/main.ts +@@ -0,0 +1,28 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++// import { Command } from "commander"; ++// import { PackagingType } from "./model/Enums"; ++// import { makePackagingOption } from "./utils/utils"; ++import { packagingEntry } from "./src/PackagingEntry"; ++ ++function main(type: string, inputDir: string, outputDir?: string): void { ++ // const program: Command = makePackagingOption('package_tools', '1.0.0', packagingEntry); ++ // program.parse(process.argv); ++ packagingEntry(type, inputDir, outputDir); ++} ++ ++// node package_tools.js type inputDir outputDir ++main(process.argv[2], process.argv[3], process.argv[4]); +\ No newline at end of file +diff --git a/build-tools/package_tools/model/Constants.ts b/build-tools/package_tools/model/Constants.ts +new file mode 100644 +index 000000000..5e61c2d4a +--- /dev/null ++++ b/build-tools/package_tools/model/Constants.ts +@@ -0,0 +1,62 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++import ts from "typescript"; ++import { OperateType } from "./Enums"; ++ ++export const OPERATE_MESSAGE_MAP: Map = new Map([ ++ [OperateType.DELETE_FILE, 'delete file message, reson $2'] ++ // TODO ++]) ++ ++export class fileDir { ++ // 处理的目录类型,ets代表处理的是1.1目录,ets2代表处理的是1.2目录里有@arkts 1.1&1.2标签的文件, ++ // noTagInEts2代表处理的是1.2目录里无标签的文件 ++ // static readonly DirType = { ++ // 'typeOne': 'ets', ++ // 'typeTwo': 'ets2', ++ // 'typeThree': 'noTagInEts2', ++ // }; ++ ++ // 1.2SDK兼容行打包方案过滤文件 ++ static readonly API_NO_TAGS_FILTER_LIST = [ ++ '@arkts.collections.d.ets', ++ '@arkts.lang.d.ets', ++ '@arkts.utils.d.ets' ++ ]; ++ ++ // 无需处理的文件路径 ++ static readonly NOT_COPY_DIR = ['build-tools', '.git', '.gitee']; ++ ++ // 所有API的节点类型 ++ static readonly apiNodeTypeArr = [ ++ ts.SyntaxKind.VariableStatement, ++ ts.SyntaxKind.MethodDeclaration, ++ ts.SyntaxKind.MethodSignature, ++ ts.SyntaxKind.FunctionDeclaration, ++ ts.SyntaxKind.Constructor, ++ ts.SyntaxKind.ConstructSignature, ++ ts.SyntaxKind.CallSignature, ++ ts.SyntaxKind.PropertyDeclaration, ++ ts.SyntaxKind.PropertySignature, ++ ts.SyntaxKind.EnumMember, ++ ts.SyntaxKind.EnumDeclaration, ++ ts.SyntaxKind.TypeAliasDeclaration, ++ ts.SyntaxKind.ClassDeclaration, ++ ts.SyntaxKind.InterfaceDeclaration, ++ ts.SyntaxKind.ModuleDeclaration, ++ ts.SyntaxKind.StructDeclaration ++ ]; ++} +\ No newline at end of file +diff --git a/build-tools/package_tools/model/Enums.ts b/build-tools/package_tools/model/Enums.ts +new file mode 100644 +index 000000000..6f78ccc91 +--- /dev/null ++++ b/build-tools/package_tools/model/Enums.ts +@@ -0,0 +1,43 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++export enum PackagingType { ++ ETS = 'ets', ++ ETS2 = 'ets2', ++ NO_TAG_IN_ETS2 = 'noTagInEts2' ++} ++ ++export enum PackagingModelType { ++ ETS = 'ets', ++ ETS2 = 'ets2', ++ BOTH = 'both' ++} ++ ++export enum LogType { ++ INFO = 'info', ++ ERROR = 'error' ++} ++ ++export enum OperateType { ++ DELETE_FILE = 'delete_file', ++ COPY_FILE = 'copy_file', ++ DELETE_IF_STATEMENT = 'delete_if_statement', ++ ADD_USE_STATIC = 'add_use_static', ++ DELETE_ARKTS_TAG = 'delete_arkts_tag', ++ UPDATE_SINCE_TAG = 'update_since_tag', ++ DELETE_HISTORY_JSDOC = 'delete_history_jsdoc', ++ DELETE_DEPRECATED_API = 'delete_deprecated_api' ++ // TODO ++} +\ No newline at end of file +diff --git a/build-tools/package_tools/model/FileModify.ts b/build-tools/package_tools/model/FileModify.ts +new file mode 100644 +index 000000000..d8f7cc610 +--- /dev/null ++++ b/build-tools/package_tools/model/FileModify.ts +@@ -0,0 +1,321 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++import fs from 'fs'; ++import path from 'path'; ++import ts from 'typescript'; ++import { PackagingType } from '../model/Enums'; ++import { packagingEntry } from '../src/PackagingEntry'; ++ ++export class getFile { ++ /** ++ * 判断文件是否为空 ++ * @param {*} node ++ */ ++ public static isEmptyFile(node: ts.Node) { ++ let isEmpty = true; ++ if (ts.isSourceFile(node) && node.statements) { ++ const needExportName = new Set(); ++ for (let i = 0; i < node.statements.length; i++) { ++ const statement = node.statements[i]; ++ if (ts.isExportDeclaration(statement) && statement.moduleSpecifier) { ++ isEmpty = false; ++ break; ++ } ++ if (this.judgeExportHasImport(statement, needExportName)) { ++ continue; ++ } ++ isEmpty = false; ++ break; ++ } ++ } ++ return isEmpty; ++ } ++ ++ /** ++ * 判断import节点和export节点。 ++ * 当前文本如果还有其他节点则不能删除, ++ * 如果只有import和export则判断是否export导出import节点 ++ * ++ * @param {*} statement ++ * @param {*} needExportName ++ * @returns ++ */ ++ public static judgeExportHasImport(statement: ts.Statement, needExportName: Set) { ++ if (ts.isImportDeclaration(statement)) { ++ this.processImportDeclaration(statement, needExportName); ++ return true; ++ } else if (ts.isExportAssignment(statement) && ++ !needExportName.has(statement.expression.getText().toString())) { ++ return true; ++ } else if (ts.isExportDeclaration(statement)) { ++ return !statement.exportClause?.elements.some((element) => { ++ const exportName = element.propertyName ? ++ element.propertyName.escapedText.toString() : ++ element.name.escapedText.toString(); ++ return needExportName.has(exportName); ++ }); ++ } ++ return false; ++ } ++ ++ /** ++ * ++ * @param { string } apiPath 需要处理的api文件所在路径 ++ * @param { string } rootPath ets文件夹路径 ++ * @returns { Set } 需要处理的api文件的相对于ets目录的路径 ++ */ ++ public static getApiFileName(apiPath: string, rootPath: string, allApiFilePathSet: Set) { ++ const apiFilePathSet = new Set(); ++ const fileNames = fs.readdirSync(apiPath); ++ ++ fileNames.forEach(fileName => { ++ const apiFilePath = path.join(apiPath, fileName).replace(/\\/g, '/'); ++ const stat = fs.statSync(apiFilePath); ++ ++ if (stat.isDirectory()) { ++ this.getApiFileName(apiFilePath, rootPath, allApiFilePathSet); ++ } else { ++ const apiRelativePath = apiFilePath.replace(rootPath, ''); ++ allApiFilePathSet.add(apiRelativePath); ++ } ++ }); ++ ++ return apiFilePathSet; ++ } ++ ++ public static processImportDeclaration(statement: ts.Statement, needExportName: Set) { ++ const importClause = statement.importClause; ++ if (!ts.isImportClause(importClause)) { ++ return; ++ } ++ if (importClause.name) { ++ needExportName.add(importClause.name.escapedText.toString()); ++ } ++ const namedBindings = importClause.namedBindings; ++ if (namedBindings !== undefined && ts.isNamedImports(namedBindings)) { ++ const elements = namedBindings.elements; ++ elements.forEach((element) => { ++ const exportName = element.propertyName ? ++ element.propertyName.escapedText.toString() : ++ element.name.escapedText.toString(); ++ needExportName.add(exportName); ++ }); ++ } ++ } ++ ++ /** ++ * ++ * @param { string } path 需要处理的api文件所在路径 ++ * @returns { boolean } 文件是否是ets类型 ++ */ ++ public static isEtsFile(path: string) { ++ return path.endsWith('d.ets'); ++ } ++ ++ /** ++ * ++ * @param { string } path 需要处理的api文件所在路径 ++ * @returns { boolean } 文件是否是ts类型 ++ */ ++ public static isTsFile(path: string) { ++ return path.endsWith('d.ts'); ++ } ++ ++ /** ++ * ++ * @param { string } path 需要处理的api文件所在路径 ++ * @returns { boolean } 验证是否存在ets类型文件 ++ */ ++ public static hasEtsFile(path: string) { ++ // 为StateManagement.d.ts设定白名单,在1.2打包的时候在Linux上有大小写不同的重名,碰到直接返回true ++ // TODO:白名单提出去 ++ if (path.includes('StateManagement.d.ts')) { ++ console.log('StateManagement.d.ts is in white list, return true. path = ', path); ++ return true; ++ } else { ++ return fs.existsSync(path.replace(/\.d\.[e]?ts$/g, '.d.ets')); ++ } ++ } ++ ++ /** ++ * ++ * @param { string } path 需要处理的api文件所在路径 ++ * @returns { boolean } 验证是否存在ts类型文件 ++ */ ++ public static hasTsFile(path: string) { ++ return fs.existsSync(path.replace(/\.d\.[e]?ts$/g, '.d.ts')); ++ } ++ ++ /** ++ * 判断新生成的文件内容有没有版权头 ++ * ++ * @param {*} fileText 新生成的文件内容 ++ * @returns ++ */ ++ public static hasCopyright(fileText: string) { ++ return /http(\:|\?:)\/\/www(\.|\/)apache\.org\/licenses\/LICENSE\-2\.0 | Copyright\s*\(c\)/gi.test(fileText); ++ } ++ ++ /** ++ * 判断node节点中是否有famodelonly/deprecated/arkts <=1.1标签 ++ * ++ * @param {*} node ++ * @returns ++ */ ++ public static judgeIsDeleteApi(node: ts.Node, dirType: string) { ++ const notesContent = node.getFullText().replace(node.getText(), '').replace(/[\s]/g, ''); ++ const notesArr = notesContent.split(/\/\*\*/); ++ const notesStr = notesArr[notesArr.length - 1]; ++ const sinceArr = notesStr.match(/@since\d+/); ++ let sinceVersion = 20; ++ ++ if (dirType === PackagingType.ETS) { ++ return /@arkts1.2/g.test(notesStr); ++ } ++ ++ if (sinceArr) { ++ sinceVersion = Number(sinceArr[0].replace('@since', '')); ++ } ++ ++ if (dirType === PackagingType.ETS2) { ++ return (/@deprecated/g.test(notesStr) && sinceVersion < 20) || /@arkts<=1.1/g.test(notesStr); ++ } ++ ++ if (dirType === PackagingType.NO_TAG_IN_ETS2) { ++ return !/@arkts1.2|@arkts1.1&1.2/g.test(notesStr); ++ } ++ ++ return false; ++ } ++ ++ ++ /** ++ * @param firstNode 获取的第一个node节点 ++ * @returns fileJSDoc ++ */ ++ public static getFileJsdoc(firstNode: ts.Node) { ++ const firstNodeJSDoc = firstNode.getFullText().replace(firstNode.getText(), ''); ++ const jsdocs = firstNodeJSDoc.split('*/'); ++ let fileJSDoc = ''; ++ for (let i = 0; i < jsdocs.length; i++) { ++ const jsdoc = jsdocs[i]; ++ if (/\@file/.test(jsdoc)) { ++ fileJSDoc = jsdoc; ++ break; ++ } ++ } ++ return fileJSDoc; ++ } ++} ++ ++export class writeFile { ++ /** ++ * ++ * @param { string } path 输出文件的路径 ++ * @param { string } path 需要文件内容 ++ */ ++ public static rewriteFileType(outputPath: string, fileContent: string) { ++ const outputDir = path.dirname(outputPath); ++ let newPath = outputPath; ++ let dirType = ''; ++ if (!fs.existsSync(outputDir)) { ++ fs.mkdirSync(outputDir, { recursive: true }); ++ } ++ ++ if (dirType !== PackagingType.ETS && getFile.isTsFile(outputPath)) { ++ newPath = outputPath.replace('.d.ts', '.d.ets'); ++ } ++ fs.writeFileSync(newPath, fileContent); ++ } ++ ++ /** ++ * 添加use static字符串 ++ * ++ * @param {*} fileContent 文件内容 ++ * @param {*} copyrightMessage 版权头内容 ++ * @returns ++ */ ++ public static addStaticString(fileContent: string, copyrightMessage: string) { ++ const hasStaticMessage = /use\s+static/g.test(fileContent); ++ const regex = /\/\*\r?\n\s*\*\s*Copyright[\s\S]*?limitations under the License\.\r?\n\s*\*\//g; ++ const staticMessage = 'use static'; ++ let newContent = fileContent; ++ if (!hasStaticMessage) { ++ const newfileJsdoc = `${copyrightMessage}'${staticMessage}'\r\n`; ++ newContent = newContent.replace(regex, newfileJsdoc); ++ } ++ return newContent; ++ } ++ ++ /** ++ * 拼接上被删除的文件注释 ++ * ++ * @param {*} deletionContent ++ * @param {*} sourceFile ++ * @param {*} dirType ++ * @returns ++ */ ++ public static joinFileJsdoc(deletionContent: string, sourceFile: ts.Node, dirType: string) { ++ const fileJsdoc = sourceFile.getFullText().replace(sourceFile.getText(), ''); ++ const copyrightMessage = getFile.hasCopyright(fileJsdoc.split('*/')[0]) ? fileJsdoc.split('*/')[0] + '*/\r\n' : ''; ++ const regx = /@kit | @file/g; ++ let kitMessage = ''; ++ ++ if (regx.test(fileJsdoc)) { ++ kitMessage = fileJsdoc.split('*/')[1] + '*/\r\n'; ++ } ++ let newContent = deletionContent; ++ const isHasCopyright = getFile.hasCopyright(deletionContent); ++ ++ if (!isHasCopyright && !regx.test(deletionContent)) { ++ newContent = copyrightMessage + kitMessage + deletionContent; ++ } else if (!isHasCopyright) { ++ newContent = copyrightMessage + deletionContent; ++ } else if (isHasCopyright && !/@kit | @file/g.test(deletionContent)) { ++ const joinFileJsdoc = copyrightMessage + kitMessage; ++ newContent = deletionContent.replace(copyrightMessage, joinFileJsdoc); ++ } ++ ++ if (dirType !== PackagingType.ETS) { ++ // TODO:添加use static字符串 ++ } ++ return newContent; ++ } ++} ++ ++export class deleteFile { ++ /** ++ * 删除指定的arkts标签 ++ * ++ * @param {*} fileContent 文件内容 ++ * @param {*} regx 删除的正则表达式 ++ * @returns ++ */ ++ public static deleteArktsTag(fileContent: string) { ++ const arktsTagRegx = /\*\s*@arkts\s+1.1&1.2\s*(\r|\n)\s*|\*\s*@arkts\s*1.2s*(\r|\n)\s*/g; ++ fileContent = fileContent.replace(arktsTagRegx, (substring, p1) => { ++ return ''; ++ }); ++ return fileContent; ++ } ++ ++ public static deleteSameNameFile(fullPath: string) { ++ try { ++ fs.unlinkSync(fullPath); ++ } catch (error) { ++ console.error('delete file failed: ', error); ++ } ++ } ++} +\ No newline at end of file +diff --git a/build-tools/package_tools/model/LogModel.ts b/build-tools/package_tools/model/LogModel.ts +new file mode 100644 +index 000000000..598a7cccf +--- /dev/null ++++ b/build-tools/package_tools/model/LogModel.ts +@@ -0,0 +1,126 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++import path from 'path'; ++import fs from 'fs'; ++import { LogType, OperateType, PackagingType } from './Enums'; ++ ++export interface Position { ++ line: number; ++ column: number; ++} ++ ++interface LogBaseInterface { ++ print(): void; ++} ++ ++export class LogModel implements LogBaseInterface { ++ // 文件全路径 ++ private filePath: string; ++ // 文件名 ++ private fileName: string; ++ // 打包类型 ++ private packagingType: PackagingType; ++ // 位置信息 ++ private position: Position; ++ // 打包日志 ++ private packagingLog: PackagingBaseLog; ++ ++ constructor(filePath: string, fileName: string, packagingType: PackagingType, position: Position, packagingLog: PackagingBaseLog) { ++ this.filePath = filePath; ++ this.fileName = fileName; ++ this.packagingType = packagingType; ++ this.position = position; ++ this.packagingLog = packagingLog; ++ } ++ ++ print(): void { ++ ++ } ++} ++ ++export interface LogParameters { ++ filePath: string; ++ packagingType: PackagingType; ++ position: Position; ++ apiPath: string; ++ logType: LogType; ++ operateType?: OperateType; ++ errcode?: number; ++ errorMessage?: string; ++} ++ ++abstract class PackagingBaseLog { ++ // API路径 ++ private apiPath: string; ++ // 日志类型 ++ private logType: LogType; ++ // 日志信息 ++ private message?: string; ++ // 日志实例 ++ private logModel?: LogModel; ++ ++ constructor(apiPath: string, logType: LogType) { ++ this.apiPath = apiPath; ++ this.logType = logType; ++ } ++ ++ abstract getMessage(msg: string): string; ++ ++ static emitLog(logParam: LogParameters): void { ++ // TODO 日志唯一入口,构建LogModel实例化对象,并push到全局对象中(process.env/globalObject ++ const fileName: string = path.basename(logParam.filePath) ++ const logModelObject: LogModel = new LogModel(logParam.filePath, fileName, logParam.packagingType, logParam.position, this) ++ } ++ ++ updateMessage(msg: string): void { ++ // TODO ++ } ++ ++ abstract getPackagingLogInstance(logParam: LogParameters): PackagingBaseLog; ++} ++ ++export class PackagingError extends PackagingBaseLog { ++ private errcode: number; ++ private errorMessage: string; ++ ++ constructor(errcode: number, errorMessage: string, apiPath: string, logType: LogType) { ++ super(apiPath, logType); ++ this.errcode = errcode; ++ this.errorMessage = this.getMessage(errorMessage); ++ super.updateMessage(this.errorMessage); ++ } ++ getMessage(message: string): string { ++ // TODO 实现组装operateMessage的方法 ++ return '' ++ } ++} ++ ++export class PackagingLog extends PackagingBaseLog { ++ // 操作类型 ++ private type: OperateType; ++ private operateMessage: string; ++ ++ constructor(type: OperateType, operateMessage: string, apiPath: string, logType: LogType) { ++ super(apiPath, logType); ++ this.type = type; ++ this.operateMessage = this.getMessage(operateMessage); ++ super.updateMessage(this.operateMessage); ++ } ++ getMessage(message: string): string { ++ // TODO 实现组装operateMessage的方法 ++ return '' ++ } ++} +\ No newline at end of file +diff --git a/build-tools/package_tools/model/PackagingModel.ts b/build-tools/package_tools/model/PackagingModel.ts +new file mode 100644 +index 000000000..4c55aaa5f +--- /dev/null ++++ b/build-tools/package_tools/model/PackagingModel.ts +@@ -0,0 +1,55 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++import { PackagingModelType } from "./Enums"; ++ ++export class PackagingModel { ++ private apiName: string; ++ private type: PackagingModelType; ++ private etsPath: string; ++ private ets2Path: string; ++ ++ constructor(apiName: string, type: PackagingModelType, etsPath: string = '', ets2Path: string = '') { ++ this.apiName = apiName; ++ this.type = type; ++ this.etsPath = etsPath; ++ this.ets2Path = ets2Path; ++ } ++ ++ setApiName(apiName: string): void { ++ this.apiName = apiName; ++ } ++ getApiName(): string { ++ return this.apiName; ++ } ++ setType(type: PackagingModelType): void { ++ this.type = type; ++ } ++ getType(): PackagingModelType { ++ return this.type; ++ } ++ setEtsPath(etsPath: string): void { ++ this.etsPath = etsPath; ++ } ++ getEtsPath(): string { ++ return this.etsPath; ++ } ++ setEts2Path(ets2Path: string): void { ++ this.ets2Path = ets2Path; ++ } ++ getEts2Path(): string { ++ return this.ets2Path; ++ } ++} +\ No newline at end of file +diff --git a/build-tools/package_tools/package.json b/build-tools/package_tools/package.json +new file mode 100644 +index 000000000..403172045 +--- /dev/null ++++ b/build-tools/package_tools/package.json +@@ -0,0 +1,23 @@ ++{ ++ "name": "package_tools", ++ "version": "1.0.0", ++ "description": "packagind tools for SDK1.2", ++ "main": "main.ts", ++ "scripts": { ++ "test": "echo \"Error: no test specified\" && exit 1", ++ "pack": "webpack --mode=production" ++ }, ++ "author": "", ++ "license": "ISC", ++ "dependencies": { ++ "@types/node": "^22.13.14", ++ "commander": "^13.1.0", ++ "fs": "^0.0.1-security", ++ "path": "^0.12.7", ++ "terser-webpack-plugin": "^5.3.14", ++ "ts-loader": "^9.5.2", ++ "typescript": "npm:ohos-typescript@4.9.5-r5", ++ "webpack": "^5.98.0", ++ "webpack-cli": "^6.0.1" ++ } ++} +\ No newline at end of file +diff --git a/build-tools/package_tools/src/PackagingEntry.ts b/build-tools/package_tools/src/PackagingEntry.ts +new file mode 100644 +index 000000000..9dfe844c1 +--- /dev/null ++++ b/build-tools/package_tools/src/PackagingEntry.ts +@@ -0,0 +1,80 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++import fs from 'fs'; ++import path from 'path'; ++import { PackagingType } from "../model/Enums"; ++import { PackagingModel } from "../model/PackagingModel"; ++import { getApiFileName } from "../utils/utils"; ++ ++export function packagingEntry(type: string, inputDir: string, outputDir?: string): void { ++ // 获取全量API路径 ++ const allApiFileSet: Set = collectApiFiles(inputDir); ++ ++ // 获取数据类集合 ++ const packagingData: PackagingModel[] = collectPackagingModels(allApiFileSet, type); ++ ++ // 处理API文件 ++ outputDir = outputDir ?? inputDir; ++ handleApiFileByType(packagingData, type, outputDir); ++} ++ ++ ++/** ++ * 获取全路径集合 ++ * ++ * @param {string} rootPath ++ */ ++function collectApiFiles(rootPath: string): Set { ++ const allApiFilePathSet: Set = new Set(); ++ const fileNames: string[] = fs.readdirSync(rootPath); ++ const apiRootPath = rootPath.replace(/\\/g, '/'); ++ fileNames.forEach(fileName => { ++ const apiPath: string = path.join(apiRootPath, fileName); ++ const stat: fs.Stats = fs.statSync(apiPath); ++ if (stat.isDirectory()) { ++ getApiFileName(apiPath, apiRootPath, allApiFilePathSet); ++ } else { ++ allApiFilePathSet.add(fileName); ++ } ++ }); ++ // 此处应收集文件全路径集合,不应分rootdir与realpath ++ return allApiFilePathSet; ++} ++ ++/** ++ * 获取数据类 ++ * ++ * @param {Set} allApiFiles ++ * @param {PackagingType} type ++ */ ++function collectPackagingModels(allApiFiles: Set, type: string): PackagingModel[] { ++ const packagingData: PackagingModel[] = []; ++ for (const apiFiles of allApiFiles) { ++ // TODO new PackagingModel() ++ } ++ return packagingData; ++} ++ ++/** ++ * 根据传入的type值去处理文件 ++ * ++ * @param {PackagingModel[]} packagingData ++ * @param {PackagingType} type ++ * @param {string} outputDir ++ */ ++function handleApiFileByType(packagingData: PackagingModel[], type: string, outputDir: string): void { ++ // TODO 当outputDir未传入时,默认修改入口路径 ++} +\ No newline at end of file +diff --git a/build-tools/package_tools/src/handleApiMainPage.ts b/build-tools/package_tools/src/handleApiMainPage.ts +new file mode 100644 +index 000000000..e82c768b8 +--- /dev/null ++++ b/build-tools/package_tools/src/handleApiMainPage.ts +@@ -0,0 +1,499 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++import { fileDir } from '../model/Constants'; ++import { PackagingType } from '../model/Enums'; ++import { deleteFile, getFile, writeFile } from '../model/FileModify'; ++ ++import fs from 'fs'; ++import path from 'path'; ++import commander from 'commander'; ++import ts from 'typescript'; ++ ++// 处理的目录类型 ++const deleteApiSet: Set = new Set(); ++let dirType: string = ''; ++ ++/** ++ * 配置参数 ++ */ ++export function start() { ++ const program = new commander.Command(); ++ program ++ .name('handleApiFile') ++ .version('0.0.1'); ++ program ++ .option('--path ', 'path name') ++ .option('--type ', 'handle type') ++ .option('--output [string]', 'output path') ++ .action((opts) => { ++ dirType = opts.type; ++ handleApiFiles(opts.path, opts.type, opts.output); ++ }); ++ program.parse(process.argv); ++} ++ ++/** ++ * 处理API文件的入口函数 ++ * ++ * @param {*} rootPath ++ * @param {*} type ++ */ ++function handleApiFiles(rootPath: string, type: string, output: string) { ++ const allApiFilePathSet: Set = new Set(); ++ const fileNames = fs.readdirSync(rootPath); ++ const apiRootPath = rootPath.replace(/\\/g, '/'); ++ fileNames.forEach(fileName => { ++ const apiPath = path.join(apiRootPath, fileName); ++ const stat = fs.statSync(apiPath); ++ if (fileDir.NOT_COPY_DIR.includes(fileName)) { ++ return; ++ } ++ ++ if (stat.isDirectory()) { ++ getFile.getApiFileName(apiPath, apiRootPath, allApiFilePathSet); ++ } else { ++ allApiFilePathSet.add(fileName); ++ } ++ ++ }); ++ ++ for (const apiRelativePath of allApiFilePathSet) { ++ try { ++ handleApiFileByType(apiRelativePath as string, rootPath, type, output); ++ } catch (error) { ++ console.log('error===>', error); ++ } ++ } ++} ++ ++/** ++ * 根据传入的type值去处理文件 ++ * ++ * @param {*} apiRelativePath ++ * @param {*} allApiFilePathSet ++ * @param {*} rootPath ++ * @param {*} type ++ * @returns ++ */ ++function handleApiFileByType(apiRelativePath: string, rootPath: string, type: string, output: string) { ++ const fullPath = path.join(rootPath, apiRelativePath); ++ const isEndWithEts = getFile.isEtsFile(apiRelativePath); ++ const isEndWithTs = getFile.isTsFile(apiRelativePath); ++ const outputPath = output ? path.join(output, apiRelativePath) : fullPath; ++ const fileContent = fs.readFileSync(fullPath, 'utf-8'); ++ ++ if (!isEndWithEts && !isEndWithTs) { ++ writeFile.rewriteFileType(outputPath, fileContent); ++ return; ++ } ++ if (type === 'ets2' && !(getFile.hasEtsFile(fullPath) && isEndWithTs)) { ++ handleFileInSecondType(apiRelativePath, fullPath, type, output); ++ } else if (type === 'ets' && !(getFile.hasTsFile(fullPath) && isEndWithEts)) { ++ handleFileInFirstType(apiRelativePath, fullPath, type, output); ++ } ++} ++ ++/** ++ * 处理文件过滤 if arkts 1.1|1.2|1.1&1.2 定义 ++ * ++ * @param {*} type ++ * @param {*} fileContent ++ * @returns ++ */ ++function handleArktsDefinition(type: string, fileContent: string) { ++ let regx = /\/\*\*\* if arkts 1\.1 \*\/\s*([\s\S]*?)\s*\/\*\*\* endif \*\//g; ++ let regx2 = /\/\*\*\* if arkts 1\.2 \*\/\s*([\s\S]*?)\s*\/\*\*\* endif \*\//g; ++ let regx3 = /\/\*\*\* if arkts 1\.1\&1\.2 \*\/\s*([\s\S]*?)\s*\/\*\*\* endif \*\//g; ++ fileContent = fileContent.replace(regx, (substring, p1) => { ++ return type === 'ets' ? p1 : ''; ++ }); ++ fileContent = fileContent.replace(regx2, (substring, p1) => { ++ if (type === 'ets2') { ++ return p1.replace(/(\s*)(\*\s\@since)/g, '$1* @arkts 1.2$1$2'); ++ } else { ++ return ''; ++ } ++ }); ++ fileContent = fileContent.replace(regx3, (substring, p1) => { ++ if (type === 'ets') { ++ return p1; ++ } else { ++ return p1.replace(/(\s*)(\*\s\@since)/g, '$1* @arkts 1.2$1$2'); ++ } ++ }); ++ return fileContent; ++} ++ ++/** ++ * 保留每个api最新一段jsdoc ++ * ++ * @param {*} fileContent ++ * @returns ++ */ ++function saveLatestJsDoc(fileContent: string) { ++ let regx = /(\/\*[\s\S]*?\*\*\/)/g; ++ ++ fileContent = fileContent.split('').reverse().join(''); ++ let preset = 0; ++ fileContent = fileContent.replace(regx, (substring, p1, offset, str) => { ++ if (!/ecnis@\s*\*/g.test(substring)) { ++ return substring; ++ } ++ const preStr = str.substring(preset, offset); ++ preset = offset + substring.length; ++ if (/\S/g.test(preStr)) { ++ return substring; ++ } ++ return ''; ++ }); ++ fileContent = fileContent.split('').reverse().join(''); ++ return fileContent; ++} ++ ++/** ++ * 处理ets目录 ++ * ++ * @param {string} apiRelativePath ++ * @param {string} fullPath ++ * @returns ++ */ ++function handleFileInFirstType(apiRelativePath: string, fullPath: string, type: string, output: string) { ++ const outputPath = output ? path.join(output, apiRelativePath) : fullPath; ++ let fileContent = fs.readFileSync(fullPath, 'utf-8'); ++ //删除使用/*** if arkts 1.2 */ ++ fileContent = handleArktsDefinition(type, fileContent); ++ ++ const sourceFile = ts.createSourceFile(path.basename(apiRelativePath), fileContent, ts.ScriptTarget.ES2017, true); ++ const secondRegx = /(?:@arkts1.2only|@arkts\s+>=\s*1.2|@arkts\s*1.2)/; ++ const thirdRegx = /(?:\*\s*@arkts\s+1.1&1.2\s*(\r|\n)\s*)/; ++ if (sourceFile.statements.length === 0) { ++ // reference文件识别不到首段jsdoc,全文匹配1.2标签,有的话直接删除 ++ if (secondRegx.test(sourceFile.getFullText())) { ++ return; ++ } ++ // 标有@arkts 1.1&1.2的声明文件,处理since版本号,删除@arkts 1.1&1.2标签 ++ if (thirdRegx.test(sourceFile.getFullText())) { ++ fileContent = handleSinceInFirstType(deleteFile.deleteArktsTag(fileContent)); ++ writeFile.rewriteFileType(outputPath, fileContent); ++ return; ++ } ++ ++ handleNoTagFileInFirstType(sourceFile, outputPath, fileContent); ++ return; ++ } ++ const firstNode = sourceFile.statements.find(statement => { ++ return !ts.isExpressionStatement(statement); ++ }); ++ ++ ++ if (firstNode) { ++ const firstJsdocText = getFile.getFileJsdoc(firstNode); ++ // 标有1.2标签的声明文件,不拷贝 ++ if (secondRegx.test(firstJsdocText)) { ++ return; ++ } ++ // 标有@arkts 1.1&1.2的声明文件,处理since版本号,删除@arkts 1.1&1.2标签 ++ if (thirdRegx.test(firstJsdocText)) { ++ fileContent = handleSinceInFirstType(deleteFile.deleteArktsTag(fileContent)); ++ writeFile.rewriteFileType(outputPath, fileContent); ++ return; ++ } ++ } ++ ++ handleNoTagFileInFirstType(sourceFile, outputPath, fileContent); ++} ++ ++/** ++ * 处理1.1目录中无arkts标签的文件 ++ * @param {*} sourceFile ++ * @param {*} outputPath ++ * @returns ++ */ ++function handleNoTagFileInFirstType(sourceFile: ts.SourceFile, outputPath: string, fileContent: string) { ++ if (path.basename(outputPath) === 'index-full.d.ts') { ++ writeFile.rewriteFileType(outputPath, fileContent); ++ return; ++ } ++ fileContent = deleteApi(sourceFile); ++ ++ if (fileContent === '') { ++ return; ++ } ++ fileContent = deleteFile.deleteArktsTag(fileContent); ++ fileContent = writeFile.joinFileJsdoc(fileContent, sourceFile, dirType); ++ ++ fileContent = handleSinceInFirstType(fileContent); ++ writeFile.rewriteFileType(outputPath, fileContent); ++} ++ ++ ++/** ++ * 生成1.1目录里文件时,需要去掉since标签里的1.2版本号 ++ * ++ * @param {*} sourceFile ++ * @param {*} fullPath ++ */ ++function handleSinceInFirstType(fileContent: string) { ++ const regx = /@since\s+arkts\s*(\{.*\})/g; ++ fileContent = fileContent.replace(regx, (substring, p1) => { ++ return '@since ' + JSON.parse(p1.replace(/'/g, '"'))['1.1']; ++ }); ++ return fileContent; ++} ++ ++/** ++ * 处理ets2目录 ++ * ++ * @param {string} fullPath 文件完整路径 ++ * @returns ++ */ ++function handleFileInSecondType(apiRelativePath: string, fullPath: string, type: string, output: string) { ++ const secondRegx = /(?:@arkts1.2only|@arkts\s+>=\s*1.2|@arkts\s*1.2)/; ++ const thirdRegx = /(?:\*\s*@arkts\s+1.1&1.2\s*(\r|\n)\s*)/; ++ const arktsRegx = /\/\*\*\* if arkts (1.1&)?1.2 \*\/\s*([\s\S]*?)\s*\/\*\*\* endif \*\//g; ++ let fileContent = fs.readFileSync(fullPath, 'utf-8'); ++ let sourceFile = ts.createSourceFile(path.basename(fullPath), fileContent, ts.ScriptTarget.ES2017, true); ++ const outputPath = output ? path.join(output, apiRelativePath) : fullPath; ++ if (!secondRegx.test(fileContent) && !thirdRegx.test(fileContent) && arktsRegx.test(fileContent)) { ++ saveApiByArktsDefinition(sourceFile, fileContent, outputPath); ++ return; ++ } ++ //删除使用/*** if arkts 1.2 */ ++ fileContent = handleArktsDefinition(type, fileContent); ++ sourceFile = ts.createSourceFile(path.basename(fullPath), fileContent, ts.ScriptTarget.ES2017, true); ++ const regx = /(?:@arkts1.1only|@arkts\s+<=\s+1.1)/; ++ if (sourceFile.statements.length === 0) { ++ // 有1.2标签的文件,删除标记 ++ if (secondRegx.test(sourceFile.getFullText())) { ++ writeFile.rewriteFileType(outputPath, deleteFile.deleteArktsTag(fileContent)); ++ return; ++ } ++ // 处理标有@arkts 1.1&1.2的声明文件 ++ if (thirdRegx.test(sourceFile.getFullText())) { ++ handlehasTagFile(sourceFile, outputPath); ++ return; ++ } ++ // 处理既没有@arkts 1.2,也没有@arkts 1.1&1.2的声明文件 ++ handleNoTagFileInSecondType(sourceFile, outputPath); ++ return; ++ } ++ ++ const firstNode = sourceFile.statements.find(statement => { ++ return !ts.isExpressionStatement(statement); ++ }); ++ ++ if (firstNode) { ++ const firstJsdocText = getFile.getFileJsdoc(firstNode); ++ if (regx.test(firstJsdocText)) { ++ return; ++ } ++ // 有1.2标签的文件,删除标记 ++ if (secondRegx.test(firstJsdocText)) { ++ writeFile.rewriteFileType(outputPath, deleteFile.deleteArktsTag(fileContent)); ++ return; ++ } ++ // 处理标有@arkts 1.1&1.2的声明文件 ++ if (thirdRegx.test(firstJsdocText)) { ++ handlehasTagFile(sourceFile, outputPath); ++ return; ++ } ++ } ++ ++ // 处理既没有@arkts 1.2,也没有@arkts 1.1&1.2的声明文件 ++ handleNoTagFileInSecondType(sourceFile, outputPath); ++} ++ ++/** ++ * 处理有@arkts 1.1&1.2标签的文件 ++ * @param {*} outputPath ++ */ ++function handlehasTagFile(sourceFile: ts.SourceFile, outputPath: string) { ++ dirType = PackagingType.ETS2; ++ let newContent = getDeletionContent(sourceFile); ++ if (newContent === '') { ++ return; ++ } ++ // 保留最后一段注释 ++ newContent = saveLatestJsDoc(newContent); ++ writeFile.rewriteFileType(outputPath, deleteFile.deleteArktsTag(newContent)); ++} ++ ++/** ++ * 处理1.2目录中无arkts标签的文件 ++ * @param {*} sourceFile ++ * @param {*} outputPath ++ * @returns ++ */ ++function handleNoTagFileInSecondType(sourceFile: ts.SourceFile, outputPath: string) { ++ dirType = PackagingType.NO_TAG_IN_ETS2; ++ const arktsTagRegx = /\*\s*@arkts\s+1.1&1.2\s*(\r|\n)\s*|@arkts\s*1.2/g; ++ const fileContent = sourceFile.getFullText(); ++ // API未标@arkts 1.2或@arkts 1.1&1.2标签,删除文件 ++ if (!arktsTagRegx.test(fileContent)) { ++ if (!fileDir.API_NO_TAGS_FILTER_LIST.includes(path.basename(outputPath))) { ++ writeFile.rewriteFileType(outputPath, writeFile.joinFileJsdoc(fileContent, sourceFile, dirType)); ++ } ++ // TODO:api未标标签,删除文件 ++ return; ++ } ++ let newContent = getDeletionContent(sourceFile); ++ if (newContent === '') { ++ return; ++ } ++ // 保留最后一段注释 ++ newContent = saveLatestJsDoc(newContent); ++ newContent = deleteFile.deleteArktsTag(newContent); ++ writeFile.rewriteFileType(outputPath, newContent); ++} ++ ++/** ++ * 生成1.2目录里文件时,需要去掉since标签里的dynamic版本号 ++ * ++ * @param {*} fileContent ++ * @returns ++ */ ++function handleSinceInSecondType(fileContent: string) { ++ const regx = /@since\s+arkts\s*(\{.*\})/g; ++ fileContent = fileContent.replace(regx, (substring, p1) => { ++ return '@since ' + JSON.parse(p1.replace(/'/g, '"'))['1.2']; ++ }); ++ return fileContent; ++} ++ ++ ++function getDeletionContent(sourceFile: ts.SourceFile) { ++ const deletionContent = deleteApi(sourceFile); ++ if (deletionContent === '') { ++ return ''; ++ } ++ let newContent = writeFile.joinFileJsdoc(deletionContent, sourceFile, dirType); ++ ++ // 处理since版本 ++ newContent = handleSinceInSecondType(newContent); ++ return newContent; ++} ++ ++function collectDeletionApiName(node: ts.Node) { ++ if (!ts.isImportClause(node)) { ++ deleteApiSet.add((node as ts.ImportClause).name?.getText()); ++ return; ++ } ++ if (ts.isImportDeclaration(node) && (node as ts.ImportDeclaration).importClause?.name) { ++ deleteApiSet.add((node as ts.ImportDeclaration).importClause?.name?.escapedText.toString()); ++ return; ++ } ++ const namedBindings = node.namedBindings; ++ if (namedBindings !== undefined && ts.isNamedImports(namedBindings)) { ++ const elements = namedBindings.elements; ++ elements.forEach((element) => { ++ const exportName = element.propertyName ? ++ element.propertyName.escapedText.toString() : ++ element.name.escapedText.toString(); ++ deleteApiSet.add(exportName); ++ }); ++ } ++} ++ ++/** ++ * 删除API ++ * @param {*} sourceFile ++ * @returns ++ */ ++function deleteApi(sourceFile: ts.SourceFile) { ++ let result = ts.transform(sourceFile, [transformer]); ++ const newSourceFile = result.transformed[0]; ++ if (getFile.isEmptyFile(newSourceFile)) { ++ return ''; ++ } ++ ++ // 打印结果 ++ const printer = ts.createPrinter(); ++ let fileContent = printer.printFile(newSourceFile as ts.SourceFile); ++ result = ts.transform(newSourceFile, [transformExportApi]); ++ fileContent = printer.printFile(result.transformed[0] as ts.SourceFile); ++ deleteApiSet.clear(); ++ return fileContent.replace(/export\s*(?:type\s*)?\{\s*\}\s*(;)?/g, ''); ++} ++ ++// 创建 Transformer ++const transformer = (context: ts.TransformationContext) => { ++ return (rootNode: ts.Node) => { ++ const visit = (node: ts.Node) => { ++ //struct节点下面会自动生成constructor节点, 置为undefined ++ if (node.kind === ts.SyntaxKind.Constructor && node.parent.kind === ts.SyntaxKind.StructDeclaration) { ++ return undefined; ++ } ++ // 判断是否为要删除的变量声明 ++ if (fileDir.apiNodeTypeArr.includes(node.kind) && getFile.judgeIsDeleteApi(node, dirType)) { ++ collectDeletionApiName(node); ++ // 删除该节点 ++ return undefined; ++ } ++ ++ // 非目标节点:继续遍历子节点 ++ return ts.visitEachChild(node, visit, context); ++ }; ++ return ts.visitNode(rootNode, visit); ++ }; ++}; ++ ++/** ++ * 没有arkts标签,但有if arkts 1.2和1.1&1.2的情况 ++ * @param {*} sourceFile ++ * @param {*} fileContent ++ * @param {*} outputPath ++ */ ++function saveApiByArktsDefinition(sourceFile: ts.SourceFile, fileContent: string, outputPath: string) { ++ const regx = /\/\*\*\* if arkts (1.1&)?1.2 \*\/\s*([\s\S]*?)\s*\/\*\*\* endif \*\//g; ++ const regex = /\/\*\r?\n\s*\*\s*Copyright[\s\S]*?limitations under the License\.\r?\n\s*\*\//g; ++ const copyrightMessage = fileContent.match(regex)?.[0]; ++ const firstNode = sourceFile.statements.find(statement => { ++ return !ts.isExpressionStatement(statement); ++ }); ++ let fileJsdoc = firstNode ? getFile.getFileJsdoc(firstNode) + '*/\n' : ''; ++ let newContent = copyrightMessage + fileJsdoc + Array.from(fileContent.matchAll(regx), match => match[2]).join('\n'); ++ ++ writeFile.rewriteFileType(outputPath, saveLatestJsDoc(newContent)); ++} ++ ++ ++/** ++ * api被删除后,对应的export api也需要被删除 ++ * @param {*} context ++ * @returns ++ */ ++const transformExportApi = (context: ts.TransformationContext) => { ++ return (rootNode: ts.Node) => { ++ const visit = (node: ts.Node) => { ++ //struct节点下面会自动生成constructor节点, 置为undefined ++ if (node.kind === ts.SyntaxKind.Constructor && node.parent.kind === ts.SyntaxKind.StructDeclaration) { ++ return undefined; ++ } ++ // 判断是否为要删除的变量声明 ++ if (ts.isExportAssignment(node) && deleteApiSet.has(node.expression.getText().toString())) { ++ return undefined; ++ } ++ ++ if (ts.isExportSpecifier(node) && deleteApiSet.has(node.name.escapedText.toString())) { ++ return undefined; ++ } ++ ++ // 非目标节点:继续遍历子节点 ++ return ts.visitEachChild(node, visit, context); ++ }; ++ return ts.visitNode(rootNode, visit); ++ }; ++}; +\ No newline at end of file +diff --git a/build-tools/package_tools/tsconfig.json b/build-tools/package_tools/tsconfig.json +new file mode 100644 +index 000000000..ef92221cf +--- /dev/null ++++ b/build-tools/package_tools/tsconfig.json +@@ -0,0 +1,96 @@ ++{ ++ "compilerOptions": { ++ /* Visit https://aka.ms/tsconfig.json to read more about this file */ ++ /* Projects */ ++ // "incremental": true, /* Enable incremental compilation */ ++ // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ ++ // "tsBuildInfoFile": "./", /* Specify the folder for .tsbuildinfo incremental compilation files. */ ++ // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects */ ++ // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ ++ // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ ++ /* Language and Environment */ ++ "target": "es2020", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ ++ "lib": [ ++ "es2015", ++ "es2020" ++ ], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ ++ // "jsx": "preserve", /* Specify what JSX code is generated. */ ++ "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */ ++ // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ ++ // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h' */ ++ // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ ++ // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx*`.` */ ++ // "reactNamespace": "", /* Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit. */ ++ // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ ++ // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ ++ /* Modules */ ++ "module": "commonjs", /* Specify what module code is generated. */ ++ // "rootDir": "./", /* Specify the root folder within your source files. */ ++ // "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */ ++ // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ ++ // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ ++ // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ ++ // "typeRoots": [], /* Specify multiple folders that act like `./node_modules/@types`. */ ++ // "types": [], /* Specify type package names to be included without being referenced in a source file. */ ++ // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ ++ "resolveJsonModule": true, /* Enable importing .json files */ ++ // "noResolve": true, /* Disallow `import`s, `require`s or ``s from expanding the number of files TypeScript should add to a project. */ ++ /* JavaScript Support */ ++ // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */ ++ // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ ++ // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`. */ ++ /* Emit */ ++ // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ ++ // "declarationMap": true, /* Create sourcemaps for d.ts files. */ ++ // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ ++ // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ ++ // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */ ++ // "outDir": "./", /* Specify an output folder for all emitted files. */ ++ // "removeComments": true, /* Disable emitting comments. */ ++ // "noEmit": true, /* Disable emitting files from a compilation. */ ++ // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ ++ // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types */ ++ // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ ++ // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ ++ // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ ++ // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ ++ // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ ++ // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ ++ // "newLine": "crlf", /* Set the newline character for emitting files. */ ++ // "stripInternal": true, /* Disable emitting declarations that have `@internal` in their JSDoc comments. */ ++ // "noEmitHelpers": true, /* Disable generating custom helper functions like `__extends` in compiled output. */ ++ // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ ++ // "preserveConstEnums": true, /* Disable erasing `const enum` declarations in generated code. */ ++ // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ ++ // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ ++ /* Interop Constraints */ ++ // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ ++ // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ ++ "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */ ++ // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ ++ "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */ ++ /* Type Checking */ ++ "strict": true, /* Enable all strict type-checking options. */ ++ // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied `any` type.. */ ++ // "strictNullChecks": true, /* When type checking, take into account `null` and `undefined`. */ ++ // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ ++ // "strictBindCallApply": true, /* Check that the arguments for `bind`, `call`, and `apply` methods match the original function. */ ++ // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ ++ // "noImplicitThis": true, /* Enable error reporting when `this` is given the type `any`. */ ++ // "useUnknownInCatchVariables": true, /* Type catch clause variables as 'unknown' instead of 'any'. */ ++ // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ ++ // "noUnusedLocals": true, /* Enable error reporting when a local variables aren't read. */ ++ // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read */ ++ // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ ++ // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ ++ // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ ++ // "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */ ++ // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ ++ // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type */ ++ // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ ++ // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ ++ /* Completeness */ ++ // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ ++ // "skipLibCheck": true /* Skip type checking all .d.ts files. */ ++ } ++} +\ No newline at end of file +diff --git a/build-tools/package_tools/utils/Log.ts b/build-tools/package_tools/utils/Log.ts +new file mode 100644 +index 000000000..bf5736961 +--- /dev/null ++++ b/build-tools/package_tools/utils/Log.ts +@@ -0,0 +1,16 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++// TODO 补充日志分析接口 +\ No newline at end of file +diff --git a/build-tools/package_tools/utils/Utils.ts b/build-tools/package_tools/utils/Utils.ts +new file mode 100644 +index 000000000..3a92a6245 +--- /dev/null ++++ b/build-tools/package_tools/utils/Utils.ts +@@ -0,0 +1,66 @@ ++/* ++ * Copyright (c) 2025 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++import { Command } from 'commander'; ++import fs from 'fs'; ++import path from 'path'; ++import { OperateType } from '../model/Enums'; ++import { OPERATE_MESSAGE_MAP } from '../model/Constants'; ++ ++export function makePackagingOption(name: string, version: string, customCallback: Function): Command { ++ const program: Command = new Command(); ++ program ++ .name(name) ++ .version(version); ++ program ++ .option('--path ', 'path name') ++ .option('--type ', 'handle type') ++ .action((opts) => { ++ customCallback(opts.path, opts.type); ++ }); ++ return program; ++} ++ ++/** ++ * ++ * @param { string } apiPath 需要处理的api文件所在路径 ++ * @param { string } rootPath ets文件夹路径 ++ * @returns { Set } 需要处理的api文件的相对于ets目录的路径 ++ */ ++export function getApiFileName(apiPath: string, rootPath: string, allApiFilePathSet: Set) { ++ const apiFilePathSet: Set = new Set(); ++ const fileNames: string[] = fs.readdirSync(apiPath); ++ ++ fileNames.forEach((fileName: string) => { ++ const apiFilePath: string = path.join(apiPath, fileName).replace(/\\/g, '/'); ++ const stat: fs.Stats = fs.statSync(apiFilePath); ++ ++ if (stat.isDirectory()) { ++ getApiFileName(apiFilePath, rootPath, allApiFilePathSet); ++ } else { ++ const apiRelativePath: string = apiFilePath.replace(rootPath, ''); ++ allApiFilePathSet.add(apiRelativePath); ++ } ++ }); ++ return apiFilePathSet; ++} ++ ++export function getOperateMessage(operateType: OperateType, ...supplys: string[]): string { ++ const operateMessage: string | undefined = OPERATE_MESSAGE_MAP.get(operateType); ++ supplys.forEach((supply: string, index: number) => { ++ // TODO 替换$2 ++ }); ++ return operateMessage ?? ''; ++} +\ No newline at end of file +diff --git a/build-tools/package_tools/webpack.config.js b/build-tools/package_tools/webpack.config.js +new file mode 100644 +index 000000000..ddc7bcf8d +--- /dev/null ++++ b/build-tools/package_tools/webpack.config.js +@@ -0,0 +1,61 @@ ++/* ++ * Copyright (c) 2023 Huawei Device Co., Ltd. ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++const path = require('path'); ++const TerserPlugin = require('terser-webpack-plugin'); ++const packageInfo = require('./package.json'); ++ ++module.exports = (env, argv) => { ++ const config = { ++ name: 'package_tools', ++ target: 'node', ++ mode: 'none', ++ entry: './main.ts', ++ module: { ++ rules: [ ++ { ++ test: /\.ts$/, ++ include: path.resolve(__dirname, './'), ++ exclude: [/node_modules/, /test/], ++ loader: 'ts-loader', ++ options: { ++ onlyCompileBundledFiles: true, ++ }, ++ }, ++ { ++ test: /build\.json$/, ++ use: [ ++ { ++ loader: path.resolve(__dirname, 'loader/flavor.js'), ++ }, ++ ], ++ }, ++ ], ++ }, ++ resolve: { ++ extensions: ['.js', '.ts', '.json'], ++ }, ++ output: { ++ filename: `${packageInfo.name}.js`, ++ path: path.resolve(__dirname, './package'), ++ }, ++ optimization: { ++ minimize: true, ++ minimizer: [new TerserPlugin({ extractComments: false })], ++ }, ++ plugins: [] ++ }; ++ return config; ++}; +diff --git a/build-tools/remove_declgen.json b/build-tools/remove_declgen.json +new file mode 100644 +index 000000000..a14b25c42 +--- /dev/null ++++ b/build-tools/remove_declgen.json +@@ -0,0 +1,6 @@ ++{ ++ "removeFile": [ ++ "api\\@internal\\component\\ets\\ability_component.d.ts", ++ "api\\@internal\\component\\ets\\action_sheet.d.ts" ++ ] ++} +\ No newline at end of file +diff --git a/build_api_check_plugin.py b/build_api_check_plugin.py +new file mode 100755 +index 000000000..4f833e598 +--- /dev/null ++++ b/build_api_check_plugin.py +@@ -0,0 +1,74 @@ ++#!/usr/bin/env python ++# -*- coding: utf-8 -*- ++# Copyright (c) 2025 Huawei Device Co., Ltd. ++# Licensed under the Apache License, Version 2.0 (the "License"); ++# you may not use this file except in compliance with the License. ++# You may obtain a copy of the License at ++# ++# http://www.apache.org/licenses/LICENSE-2.0 ++# ++# Unless required by applicable law or agreed to in writing, software ++# distributed under the License is distributed on an "AS IS" BASIS, ++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++# See the License for the specific language governing permissions and ++# limitations under the License. ++ ++import argparse ++import os ++import shutil ++import subprocess ++import sys ++import tarfile ++ ++ ++def copy_files(source_path, dest_path, is_file=False): ++ try: ++ if is_file: ++ os.makedirs(os.path.dirname(dest_path), exist_ok=True) ++ shutil.copy(source_path, dest_path) ++ else: ++ shutil.copytree(source_path, dest_path, dirs_exist_ok=True, ++ symlinks=True) ++ except Exception as err: ++ raise Exception("Copy files failed. Error: " + str(err)) from err ++ ++ ++def run_cmd(cmd, execution_path=None): ++ proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, ++ stdin=subprocess.PIPE, ++ stderr=subprocess.PIPE, ++ cwd=execution_path) ++ stdout, stderr = proc.communicate(timeout=1000) ++ if proc.returncode != 0: ++ raise Exception(stderr.decode()) ++ ++ ++def build(options): ++ build_cmd = [options.npm, 'run', 'compile:plugins'] ++ run_cmd(build_cmd, options.source_path) ++ ++ ++def copy_output(options): ++ copy_files(os.path.join(options.source_path, './lib'), ++ os.path.join(options.output_path, 'api-check-plugin')) ++ ++ ++def parse_args(): ++ parser = argparse.ArgumentParser() ++ parser.add_argument('--npm', help='path to a npm exetuable') ++ parser.add_argument('--source_path', help='path to api_check_plugin source') ++ parser.add_argument('--output_path', help='path to output') ++ ++ options = parser.parse_args() ++ return options ++ ++ ++def main(): ++ options = parse_args() ++ ++ build(options) ++ copy_output(options) ++ ++ ++if __name__ == '__main__': ++ sys.exit(main()) +\ No newline at end of file +diff --git a/bundle.json b/bundle.json +index 678960db8..31acbd8ca 100644 +--- a/bundle.json ++++ b/bundle.json +@@ -26,7 +26,7 @@ + "rom": "0KB", + "ram": "0KB", + "deps": { +- "components": [], ++ "components": ["runtime_core"], + "third_party": [] + }, + "build": { +diff --git a/kits/@kit.AbilityKit.d.ts b/kits/@kit.AbilityKit.d.ts +index 943347b17..3e5c9de4b 100644 +--- a/kits/@kit.AbilityKit.d.ts ++++ b/kits/@kit.AbilityKit.d.ts +@@ -136,17 +136,23 @@ import { + } from '@ohos.app.ability.UIAbility'; + import wantAgent from '@ohos.app.ability.wantAgent'; + import { WantAgent } from '@ohos.app.ability.wantAgent'; ++import appControl from '@ohos.bundle.appControl'; + import bundleManager from '@ohos.bundle.bundleManager'; + import bundleMonitor from '@ohos.bundle.bundleMonitor'; + import bundleResourceManager from '@ohos.bundle.bundleResourceManager'; ++import defaultAppManager from '@ohos.bundle.defaultAppManager'; ++import distributedBundleManager from '@ohos.bundle.distributedBundleManager'; ++import freeInstall from '@ohos.bundle.freeInstall'; + import installer from '@ohos.bundle.installer'; + import launcherBundleManager from '@ohos.bundle.launcherBundleManager'; ++import overlay from '@ohos.bundle.overlay'; + import shortcutManager from '@ohos.bundle.shortcutManager'; + + export { + common, ConfigurationConstant, Configuration, Want, StartOptions, contextConstant, AbilityConstant, + UIExtensionContentSession, wantConstant, UIAbility, Callee, Caller, OnReleaseCallback, AbilityStage, + UIExtensionAbility, uriPermissionManager, ServiceExtensionAbility, wantAgent, WantAgent, +- bundleManager, bundleMonitor, bundleResourceManager, installer, launcherBundleManager, shortcutManager ++ appControl, bundleManager, bundleMonitor, bundleResourceManager, defaultAppManager, distributedBundleManager, ++ freeInstall, installer, launcherBundleManager, overlay, shortcutManager + }; + /*** endif */ +diff --git a/kits/@kit.ArkTS.d.ets b/kits/@kit.ArkTS.d.ets +index b33621b96..a495996fb 100644 +--- a/kits/@kit.ArkTS.d.ets ++++ b/kits/@kit.ArkTS.d.ets +@@ -38,8 +38,11 @@ import PlainArray from '@ohos.util.PlainArray'; + import Stack from '@ohos.util.Stack'; + import TreeMap from '@ohos.util.TreeMap'; + import TreeSet from '@ohos.util.TreeSet'; ++import xml from '@ohos.xml'; ++import collections from '@arkts.collections'; ++import Decimal from '@arkts.math.Decimal'; + + export { + ArrayList, Deque, HashMap, HashSet, LightWeightMap, LightWeightSet, LinkedList, List, +- PlainArray, Queue, Stack, TreeMap, TreeSet, buffer, uri, url, util, JSON, stream ++ PlainArray, Queue, Stack, TreeMap, TreeSet, buffer, uri, url, util, JSON, stream, xml, collections, Decimal + }; +diff --git a/kits/@kit.ArkUI.d.ets b/kits/@kit.ArkUI.d.ets +index 1d7094b31..c5a5329bc 100644 +--- a/kits/@kit.ArkUI.d.ets ++++ b/kits/@kit.ArkUI.d.ets +@@ -23,4 +23,5 @@ import promptAction from '@ohos.promptAction'; + import { ComponentContent } from '@ohos.arkui.node'; + export { promptAction, ComponentContent }; + export * from '@ohos.arkui.component'; +-export * from '@ohos.arkui.stateManagement'; +\ No newline at end of file ++export * from '@ohos.arkui.stateManagement'; ++export { GETINSPECTORBYKEY as getInspectorByKey, GETINSPECTORTREE as getInspectorTree , SENDEVENTBYKEY as sendEventByKey } from '@ohos.arkui.inspector'; +\ No newline at end of file +diff --git a/kits/@kit.ArkUI.d.ts b/kits/@kit.ArkUI.d.ts +index c24c9a524..4d6a2e908 100644 +--- a/kits/@kit.ArkUI.d.ts ++++ b/kits/@kit.ArkUI.d.ts +@@ -51,19 +51,22 @@ import { + import { ComposeTitleBar, ComposeTitleBarMenuItem } from '@ohos.arkui.advanced.ComposeTitleBar'; + import { CounterComponent, CounterOptions, CounterType, DateData } from '@ohos.arkui.advanced.Counter'; + import { +- AlertDialog, ButtonOptions, ConfirmDialog, LoadingDialog, SelectDialog, TipsDialog, CustomContentDialog, PopoverDialog, PopoverOptions, ++ AlertDialog, ButtonOptions, ConfirmDialog, LoadingDialog, SelectDialog, TipsDialog, CustomContentDialog, PopoverDialog, PopoverOptions + } from '@ohos.arkui.advanced.Dialog'; + import { + AlertDialogV2, AdvancedDialogV2Button, AdvancedDialogV2ButtonOptions, AdvancedDialogV2ButtonAction, AdvancedDialogV2OnCheckedChange, +- ConfirmDialogV2, LoadingDialogV2, SelectDialogV2, TipsDialogV2, CustomContentDialogV2, PopoverDialogV2, PopoverDialogV2OnVisibleChange, PopoverDialogV2Options, ++ ConfirmDialogV2, LoadingDialogV2, SelectDialogV2, TipsDialogV2, CustomContentDialogV2, PopoverDialogV2, ++ PopoverDialogV2OnVisibleChange, PopoverDialogV2Options + } from '@ohos.arkui.advanced.DialogV2'; + import { +- EditableLeftIconType, EditableTitleBar, EditableTitleBarMenuItem, EditableTitleBarItem, EditableTitleBarOptions, ++ EditableLeftIconType, EditableTitleBar, EditableTitleBarMenuItem, EditableTitleBarItem, EditableTitleBarOptions + } from '@ohos.arkui.advanced.EditableTitleBar'; + import { MarginType, PromptOptions, ExceptionPrompt } from '@ohos.arkui.advanced.ExceptionPrompt'; + import { Filter, FilterParams, FilterResult, FilterType } from '@ohos.arkui.advanced.Filter'; + import { AddFormMenuItem, FormMenuItemStyle, AddFormOptions } from '@ohos.arkui.advanced.FormMenu'; +-import { GridObjectSortComponentType, GridObjectSortComponentItem, GridObjectSortComponentOptions, GridObjectSortComponent } from '@ohos.arkui.advanced.GridObjectSortComponent'; ++import { GridObjectSortComponentType, GridObjectSortComponentItem, GridObjectSortComponentOptions, ++ GridObjectSortComponent ++} from '@ohos.arkui.advanced.GridObjectSortComponent'; + import { + Popup, PopupButtonOptions, PopupIconOptions, PopupOptions, PopupTextOptions + } from '@ohos.arkui.advanced.Popup'; +@@ -95,19 +98,25 @@ import { InterstitialDialogAction, IconStyle, TitlePosition, BottomOffset } from + import componentSnapshot from '@ohos.arkui.componentSnapshot'; + import componentUtils from '@ohos.arkui.componentUtils'; + import dragController from '@ohos.arkui.dragController'; +-import { DrawableDescriptor, LayeredDrawableDescriptor, PixelMapDrawableDescriptor, AnimationOptions, AnimatedDrawableDescriptor } from '@ohos.arkui.drawableDescriptor'; ++import { DrawableDescriptor, LayeredDrawableDescriptor, PixelMapDrawableDescriptor, AnimationOptions, ++ AnimatedDrawableDescriptor ++} from '@ohos.arkui.drawableDescriptor'; + import inspector from '@ohos.arkui.inspector'; + import { +- NodeRenderType, RenderOptions, BuilderNode, BuildOptions, NodeController, FrameNode, DrawContext, Size, Offset, Position, Pivot, Scale, Translation, Matrix4, Rotation, +- Frame, RenderNode, XComponentNode, LengthMetrics, LengthMetricsUnit, LengthUnit, ColorMetrics, LayoutConstraint, ComponentContent, NodeContent, Content, typeNode, ShapeMask, ShapeClip, ++ NodeRenderType, RenderOptions, BuilderNode, BuildOptions, NodeController, FrameNode, DrawContext, Size, Offset, ++ Position, Pivot, Scale, Translation, Matrix4, Rotation, ++ Frame, RenderNode, XComponentNode, LengthMetrics, LengthMetricsUnit, LengthUnit, ColorMetrics, LayoutConstraint, ++ ComponentContent, NodeContent, Content, typeNode, ShapeMask, ShapeClip, + NodeAdapter, Rect, RoundRect, edgeColors, edgeWidths, borderStyles, borderRadiuses, ExpandMode + } from '@ohos.arkui.node'; + import uiObserver from '@ohos.arkui.observer'; + import performanceMonitor from '@ohos.arkui.performanceMonitor'; + import { RectShape, CircleShape, EllipseShape, PathShape } from '@ohos.arkui.shape'; + import { +- AtomicServiceBar, ComponentUtils, ContextMenuController, CursorController, DragController, Font, KeyboardAvoidMode, MediaQuery, OverlayManager, PromptAction, Router, +- UIContext, UIInspector, UIObserver, PageInfo, SwiperDynamicSyncScene, SwiperDynamicSyncSceneType, MarqueeDynamicSyncScene, MarqueeDynamicSyncSceneType, FrameCallback, ++ AtomicServiceBar, ComponentUtils, ContextMenuController, CursorController, DragController, Font, ++ KeyboardAvoidMode, MediaQuery, OverlayManager, PromptAction, Router, ++ UIContext, UIInspector, UIObserver, PageInfo, SwiperDynamicSyncScene, SwiperDynamicSyncSceneType, ++ MarqueeDynamicSyncScene, MarqueeDynamicSyncSceneType, FrameCallback, + MeasureUtils, OverlayManagerOptions, TargetInfo + } from '@ohos.arkui.UIContext'; + import curves from '@ohos.curves'; +@@ -175,7 +184,7 @@ import { + PolygonModifier, PolylineModifier, RectModifier, ShapeModifier, AlphabetIndexerModifier, + HyperlinkModifier, MenuModifier, MenuItemModifier, PanelModifier, SymbolGlyphModifier, AttributeUpdater, + ContainerSpanModifier, SymbolSpanModifier, ParticleModifier +-} from "@ohos.arkui.modifier"; ++} from '@ohos.arkui.modifier'; + import { + DownloadFileButton, + DownloadLayoutDirection, +@@ -245,7 +254,8 @@ export { + LabelOptions, LayeredDrawableDescriptor, LoadingDialog, LocaleResponse, MarginType, Matrix4, MeasureOptions, MeasureText, + MediaQuery, MediaQueryEvent, MediaQueryList, NodeController, NodeParam, NodeRenderType, Offset, OperateButton, OperateCheck, OperateIcon, + OperateItem, OperationOption, OperationType, OverlayManager, PathShape, PiPWindow, Pivot, Popup, PopupButtonOptions, PopupIconOptions, PopupOptions, +- PopupTextOptions, Position, PrefixIconOptions, ProgressButton, ProgressButtonV2, ProgressButtonV2Color, ProgressButtonV2ColorOptions, Prompt, PromptAction, PromptOptions, RectShape, RenderNode, RenderOptions, BuildOptions, ++ PopupTextOptions, Position, PrefixIconOptions, ProgressButton, ProgressButtonV2, ProgressButtonV2Color, ++ ProgressButtonV2ColorOptions, Prompt, PromptAction, PromptOptions, RectShape, RenderNode, RenderOptions, BuildOptions, + RequestFullWindowOptions, Rotation, Router, RouterOptions, RouterState, Scale, ScreenOnVisibleOptions, SegmentButton, SegmentButtonItemOptionsArray, + SegmentButtonOptions, SelectDialog, SelectOptions, SelectTitleBar, SelectTitleBarMenuItem, SelectionMenu, + SelectionMenuOptions, ShapeMask, ShapeClip, ShowActionMenuOptions, ShowDialogOptions, ShowDialogSuccessResponse, +@@ -257,8 +267,10 @@ export { + ToolBarV2ItemState, ToolBarV2SymbolGlyph, ToolBarV2SymbolGlyphOptions, ToolBarV2ItemText, ToolBarV2ItemTextOptions, ToolBarV2ItemIconType, + ToolBarV2ItemImage, ToolBarV2ItemImageOptions, ToolBarV2, ToolBarV2Item, ToolBarV2ItemOptions, ToolBarV2Modifier, ToolBarV2ItemAction, + TreeListenerManager, TreeView, UIContext, UIInspector, UIObserver, PageInfo, WindowExtensionAbility, WindowExtensionContext, XComponentNode, +- LengthMetrics, LengthMetricsUnit, LengthUnit, ColorMetrics, LayoutConstraint, ComponentContent, NodeContent, Content, componentSnapshot, componentUtils, curves, display, dragController, dragInteraction, +- font, inspector, matrix4, mediaquery, performanceMonitor, pluginComponentManager, PluginComponentTemplate, prompt, promptAction, LevelMode, ImmersiveMode, LevelOrder, router, ++ LengthMetrics, LengthMetricsUnit, LengthUnit, ColorMetrics, LayoutConstraint, ComponentContent, NodeContent, Content, ++ componentSnapshot, componentUtils, curves, display, dragController, dragInteraction, ++ font, inspector, matrix4, mediaquery, performanceMonitor, pluginComponentManager, PluginComponentTemplate, prompt, promptAction, ++ LevelMode, ImmersiveMode, LevelOrder, router, + AtomicServiceWeb, OnMessageEvent, OnErrorReceiveEvent, OnHttpErrorReceiveEvent, OnPageBeginEvent, OnPageEndEvent, + AtomicServiceWebController, OnLoadInterceptEvent, OnProgressChangeEvent, OnLoadInterceptCallback, WebHeader, + screen, screenshot, uiAppearance, uiExtensionHost, uiObserver, window, windowAnimationManager, CustomContentDialog, PopoverDialog, PopoverOptions, +@@ -268,8 +280,8 @@ export { + ExtraRegionPosition, ExpandedRegionLayoutOptions, HoverModeRegionLayoutOptions, FoldedRegionLayoutOptions, PresetSplitRatio, FoldSplitContainer, + HoverModeStatus, OnHoverStatusChangeHandler, + AppStorageV2, PersistenceV2, Type, UIUtils, ConnectOptions, typeNode, +- IDataSourcePrefetching, IPrefetcher, BasicPrefetcher, SwiperDynamicSyncScene, SwiperDynamicSyncSceneType, MarqueeDynamicSyncScene, MarqueeDynamicSyncSceneType, +- uiExtension, FullScreenLaunchComponent, MeasureUtils, ++ IDataSourcePrefetching, IPrefetcher, BasicPrefetcher, SwiperDynamicSyncScene, SwiperDynamicSyncSceneType, ++ MarqueeDynamicSyncScene, MarqueeDynamicSyncSceneType, uiExtension, FullScreenLaunchComponent, MeasureUtils, + CommonModifier, ColumnModifier, ColumnSplitModifier, RowModifier, RowSplitModifier, SideBarContainerModifier, + BlankModifier, DividerModifier, GridColModifier, GridRowModifier, NavDestinationModifier, NavigatorModifier, + StackModifier, NavigationModifier, NavRouterModifier, StepperItemModifier, TabsModifier, GridModifier, +@@ -283,7 +295,8 @@ export { + PolygonModifier, PolylineModifier, RectModifier, ShapeModifier, AlphabetIndexerModifier, FormComponentModifier, + HyperlinkModifier, MenuModifier, MenuItemModifier, PanelModifier, SymbolGlyphModifier, AttributeUpdater, SymbolSpanModifier, + ContainerSpanModifier, SegmentButtonTextItem, SegmentButtonIconItem, SegmentButtonIconTextItem, DimensionNoPercentage, +- CommonSegmentButtonOptions, ItemRestriction, SegmentButtonItemTuple, SegmentButtonItemArray, SegmentButtonItemOptionsConstructorOptions, SegmentButtonItemOptions, ++ CommonSegmentButtonOptions, ItemRestriction, SegmentButtonItemTuple, SegmentButtonItemArray, ++ SegmentButtonItemOptionsConstructorOptions, SegmentButtonItemOptions, + PixelMapDrawableDescriptor, AnimationOptions, AnimatedDrawableDescriptor, NodeAdapter, DownloadFileButton, + DownloadLayoutDirection, DownloadIconStyle, DownloadDescription, DownloadContentOptions, DownloadStyleOptions, + Rect, RoundRect, edgeColors, edgeWidths, borderStyles, borderRadiuses, ParticleModifier, +@@ -295,8 +308,10 @@ export { + ArcSlider, ArcSliderOptions, ArcSliderOptionsConstructorOptions, ArcSliderLayoutOptions, + ArcSliderLayoutOptionsConstructorOptions, ArcSliderStyleOptions, ArcSliderStyleOptionsConstructorOptions, + ArcSliderValueOptions, ArcSliderValueOptionsConstructorOptions, +- SegmentButtonV2ItemOptions, OnSelectedIndexChange, OnSelectedIndexesChange, SegmentButtonV2Item, SegmentButtonV2Items, TabSegmentButtonV2, CapsuleSegmentButtonV2, MultiCapsuleSegmentButtonV2, ++ SegmentButtonV2ItemOptions, OnSelectedIndexChange, OnSelectedIndexesChange, SegmentButtonV2Item, ++ SegmentButtonV2Items, TabSegmentButtonV2, CapsuleSegmentButtonV2, MultiCapsuleSegmentButtonV2, + AlertDialogV2, AdvancedDialogV2Button, AdvancedDialogV2ButtonOptions, AdvancedDialogV2ButtonAction, AdvancedDialogV2OnCheckedChange, +- ConfirmDialogV2, LoadingDialogV2, SelectDialogV2, TipsDialogV2, CustomContentDialogV2, PopoverDialogV2, PopoverDialogV2OnVisibleChange, PopoverDialogV2Options, ExpandMode, ++ ConfirmDialogV2, LoadingDialogV2, SelectDialogV2, TipsDialogV2, CustomContentDialogV2, PopoverDialogV2, ++ PopoverDialogV2OnVisibleChange, PopoverDialogV2Options, ExpandMode, + HalfScreenLaunchComponent, ArcSliderPosition, ArcSwiper, ArcSwiperAttribute, ArcDotIndicator, ArcDirection, ArcSwiperController, TargetInfo, + }; +diff --git a/kits/@kit.BasicServicesKit.d.ts b/kits/@kit.BasicServicesKit.d.ts +index c5f1ca0a1..4d80e2a50 100644 +--- a/kits/@kit.BasicServicesKit.d.ts ++++ b/kits/@kit.BasicServicesKit.d.ts +@@ -83,3 +83,11 @@ export { + systemTimer, thermal, update, usb, usbManager, serialManager, wallpaper, zlib, commonEventManager, emitter, StaticSubscriberExtensionAbility, + StaticSubscriberExtensionContext, systemLoad, intelligentVoice + }; ++ ++/*** if arkts 1.2 */ ++import zlib from '@ohos.zlib'; ++ ++export { ++ zlib ++}; ++/*** endif */ +diff --git a/kits/@kit.ImageKit.d.ts b/kits/@kit.ImageKit.d.ts +index eb73247fb..b7bbca490 100644 +--- a/kits/@kit.ImageKit.d.ts ++++ b/kits/@kit.ImageKit.d.ts +@@ -18,7 +18,15 @@ + * @kit ImageKit + */ + ++/*** if arkts 1.1 */ + import image from '@ohos.multimedia.image'; + import sendableImage from '@ohos.multimedia.sendableImage'; + + export { image, sendableImage }; ++/*** endif */ ++ ++/*** if arkts 1.2 */ ++import image from '@ohos.multimedia.image'; ++ ++export { image }; ++/*** endif */ +\ No newline at end of file +diff --git a/api/arkui/stateManagement/base/backingValue.d.ets b/kits/@kit.MechanicKit.d.ts +similarity index 78% +rename from api/arkui/stateManagement/base/backingValue.d.ets +rename to kits/@kit.MechanicKit.d.ts +index 0a915e71f..8f70c78e1 100644 +--- a/api/arkui/stateManagement/base/backingValue.d.ets ++++ b/kits/@kit.MechanicKit.d.ts +@@ -1,6 +1,6 @@ + /* + * Copyright (c) 2025 Huawei Device Co., Ltd. +- * Licensed under the Apache License, Version 2.0 (the "License"); ++ * Licensed under the Apache License, Version 2.0 (the "License"), + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * +@@ -12,14 +12,12 @@ + * See the License for the specific language governing permissions and + * limitations under the License. + */ ++ + /** + * @file +- * @kit ArkUI +- * @arkts 1.2 ++ * @kit MechanicKit + */ + +- export declare class BackingValue { +- public constructor(initValue: T) +- public get value(): T +- public set value(newVale: T) +- } +\ No newline at end of file ++import mechanicManager from '@ohos.distributedHardware.mechanicManager'; ++ ++export { mechanicManager }; +\ No newline at end of file +diff --git a/kits/@kit.MultimodalAwarenessKit.d.ts b/kits/@kit.MultimodalAwarenessKit.d.ts +index 783b130d2..7c28449ac 100644 +--- a/kits/@kit.MultimodalAwarenessKit.d.ts ++++ b/kits/@kit.MultimodalAwarenessKit.d.ts +@@ -18,7 +18,8 @@ + * @kit MultimodalAwarenessKit + */ + +-import stationary from '@ohos.stationary'; + import motion from '@ohos.multimodalAwareness.motion'; ++import roomLocation from '@ohos.multimodalAwareness.roomLocation'; ++import stationary from '@ohos.stationary'; + +-export { stationary, motion }; ++export { motion, roomLocation, stationary }; +diff --git a/kits/@kit.NetworkKit.d.ts b/kits/@kit.NetworkKit.d.ts +index 20fd60361..52c8c0139 100644 +--- a/kits/@kit.NetworkKit.d.ts ++++ b/kits/@kit.NetworkKit.d.ts +@@ -19,29 +19,29 @@ + */ + /*** if arkts 1.1&1.2 */ + import connection from '@ohos.net.connection'; ++import http from '@ohos.net.http'; ++import sharing from '@ohos.net.sharing'; ++import webSocket from '@ohos.net.webSocket'; ++import statistics from '@ohos.net.statistics'; ++import networkSecurity from '@ohos.net.networkSecurity'; + export { +- connection ++ connection, http, sharing, webSocket, statistics, networkSecurity + }; + /*** endif */ + + /*** if arkts 1.1*/ + import ethernet from '@ohos.net.ethernet'; +-import http from '@ohos.net.http'; + import mdns from '@ohos.net.mdns'; + import policy from '@ohos.net.policy'; +-import sharing from '@ohos.net.sharing'; + import socket from '@ohos.net.socket'; +-import statistics from '@ohos.net.statistics'; + import vpn from '@ohos.net.vpn'; +-import webSocket from '@ohos.net.webSocket'; + import vpnExtension from '@ohos.net.vpnExtension'; +-import networkSecurity from '@ohos.net.networkSecurity'; + import VpnExtensionAbility, { VpnExtensionContext } from '@ohos.app.ability.VpnExtensionAbility'; + import netFirewall from '@ohos.net.netFirewall'; + + export { +- ethernet, http, mdns, policy, sharing, webSocket, +- socket, statistics, vpn, vpnExtension, networkSecurity, ++ ethernet, mdns, policy, ++ socket, vpn, vpnExtension, + VpnExtensionAbility, VpnExtensionContext, netFirewall + }; + /*** endif */ +diff --git a/kits/@kit.PerformanceAnalysisKit.d.ts b/kits/@kit.PerformanceAnalysisKit.d.ts +index 2d9730b26..0e52f38c1 100644 +--- a/kits/@kit.PerformanceAnalysisKit.d.ts ++++ b/kits/@kit.PerformanceAnalysisKit.d.ts +@@ -18,6 +18,7 @@ + * @kit PerformanceAnalysisKit + */ + ++/*** if arkts 1.1&1.2 */ + import FaultLogger from '@ohos.faultLogger'; + import hiAppEvent from '@ohos.hiviewdfx.hiAppEvent'; + import hichecker from '@ohos.hichecker'; +@@ -33,3 +34,4 @@ export { + FaultLogger, hiAppEvent, hiSysEvent, hiTraceChain, hiTraceMeter, hichecker, hidebug, hilog, + logLibrary, jsLeakWatcher + }; ++/*** endif */ +diff --git a/process_internal.py b/process_internal.py +index f34172db4..3b794a5e7 100755 +--- a/process_internal.py ++++ b/process_internal.py +@@ -15,6 +15,7 @@ + + import os + import sys ++import shutil + import optparse + import json + +@@ -64,7 +65,7 @@ def copy_files(options): + + + def format_path(filepath, base_dir): +- return os.path.relpath(filepath, base_dir) ++ return os.path.abspath(filepath) + + + def parse_args(args): +@@ -76,6 +77,7 @@ def parse_args(args): + parser.add_option('--project-dir', help='current project dir path') + parser.add_option('--ispublic', help='whether or not sdk build public') + parser.add_option('--name', help='module label name') ++ parser.add_option('--output', help='output path') + options, _ = parser.parse_args(args) + options.input = os.path.realpath(options.input) + return options +@@ -84,8 +86,11 @@ def parse_args(args): + def main(argv): + '''main函数入口''' + options = parse_args(argv) ++ if not os.path.exists(options.output): ++ os.makedirs(options.output) + result = copy_files(options) +- print(json.dumps(result)) ++ for file_path in result: ++ shutil.copy(file_path, options.output) + return 0 + + +diff --git a/process_internal.pydeps b/process_internal.pydeps +new file mode 100644 +index 000000000..f1dd75ee8 +--- /dev/null ++++ b/process_internal.pydeps +@@ -0,0 +1,3 @@ ++# Generated by running: ++# build/print_python_deps.py --root interface/sdk-js --output interface/sdk-js/process_internal.pydeps interface/sdk-js/process_internal.py ++process_internal.py +diff --git a/remove_list.json b/remove_list.json +index 5e26b0ee8..49dc0656e 100644 +--- a/remove_list.json ++++ b/remove_list.json +@@ -6,9 +6,7 @@ + ] + }, + "ets_component": { +- "global_remove": [ +- "inspector.d.ts" +- ], ++ "global_remove": [], + "sdk_build_public_remove": [ + "ability_component.d.ts", + "animator.d.ts", +@@ -30,4 +28,4 @@ + "featureability.d.ts" + ] + } +-} ++} +\ No newline at end of file +diff --git a/run_compile_declgen.py b/run_compile_declgen.py +new file mode 100755 +index 000000000..52b72297a +--- /dev/null ++++ b/run_compile_declgen.py +@@ -0,0 +1,93 @@ ++#!/usr/bin/env python ++# -*- coding: utf-8 -*- ++# Copyright (c) 2025 Huawei Device Co., Ltd. ++# Licensed under the Apache License, Version 2.0 (the "License"); ++# you may not use this file except in compliance with the License. ++# You may obtain a copy of the License at ++# ++# http://www.apache.org/licenses/LICENSE-2.0 ++# ++# Unless required by applicable law or agreed to in writing, software ++# distributed under the License is distributed on an "AS IS" BASIS, ++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++# See the License for the specific language governing permissions and ++# limitations under the License. ++ ++import os ++import sys ++import subprocess ++import argparse ++import shutil ++import tarfile ++from pathlib import Path ++ ++PACKAGE_PATH = "interface/sdk-js/build-tools/declgen.js" ++TOOL_WAREHOURSE = 'interface/sdk-js/build-tools' ++ ++ ++def ensure_dir_exists(target_path): ++ path = Path(target_path).absolute() ++ if not path.exists(): ++ print(f"compile_declgen out_path not exit and creating:{path}") ++ path.mkdir(parents=True, exist_ok=True) ++ return str(path) ++ else: ++ print(f"compile_declgen out_path already exit:{path}") ++ return str(path) ++ ++ ++def traverse_function(source_root_dir: str, input_path: str, node_js: str): ++ source_root_dir = os.path.abspath(source_root_dir) ++ input_dir = os.path.abspath(os.path.join(input_path, 'ets1.1/sdk-js')) ++ out_path = os.path.abspath(os.path.join(input_path, 'ets1.1interop')) ++ package_path = os.path.abspath(os.path.join(source_root_dir, PACKAGE_PATH)) ++ nodejs = os.path.abspath(node_js) ++ output_dir = ensure_dir_exists(out_path) ++ if os.path.exists(package_path): ++ try: ++ result = subprocess.run([nodejs, package_path, "--input", input_dir, "--output", output_dir], cwd=source_root_dir, shell=False) ++ print('run_compile_declgen success:', result) ++ except subprocess.CalledProcessError as e: ++ print(f"run_compile_declgen node failed: {str(e.stderr)}") ++ else: ++ print("run_compile_declgen: tool path does not exist") ++ ++ ++def extract(package_path, dest_path, package_name, current_os): ++ # 解压tar.gz包到目录 ++ dest_package_path = os.path.join(dest_path, package_name) ++ temp_package_path = os.path.join(dest_path, current_os + package_name) ++ if (os.path.exists(dest_package_path) or os.path.exists(temp_package_path)): ++ return ++ os.makedirs(temp_package_path, exist_ok=True) ++ try: ++ with tarfile.open(package_path, 'r:gz') as tar: ++ tar.extractall(path=temp_package_path) ++ except tarfile.TarError as e: ++ print(f'Error extracting files: {e}') ++ package_path = os.path.join(temp_package_path, 'package') ++ if not (os.path.exists(dest_package_path)): ++ shutil.copytree(package_path, dest_package_path, symlinks=True, dirs_exist_ok=True) ++ shutil.rmtree(temp_package_path, ignore_errors=True) ++ ++ ++def run(args): ++ parser = argparse.ArgumentParser() ++ parser.add_argument('--root-build-dir', required=True) ++ parser.add_argument('--current-os-dir', required=True) ++ parser.add_argument('--output-interface-sdk', required=True) ++ parser.add_argument('--tool-dir', required=True) ++ parser.add_argument('--node-js', required=True) ++ options = parser.parse_args() ++ source_path = options.root_build_dir ++ current_os = options.current_os_dir ++ sdk_path = options.output_interface_sdk ++ node_path = options.node_js ++ declgen_path = options.tool_dir ++ node_modules_path = os.path.join(source_path, TOOL_WAREHOURSE, "node_modules") ++ extract(declgen_path, node_modules_path, 'declgen', current_os) ++ traverse_function(source_path, sdk_path, node_path) ++ ++ ++if __name__ == "__main__": ++ sys.exit(run(sys.argv[1:])) -- Gitee From d7ea7a68ab69d238cc34b7e64080809ebd163cc5 Mon Sep 17 00:00:00 2001 From: sunjie Date: Sat, 12 Jul 2025 09:57:32 +0800 Subject: [PATCH 072/746] =?UTF-8?q?resMgr=E5=9B=9E=E5=90=880328=E5=88=B007?= =?UTF-8?q?02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: sunjie --- api/@ohos.resourceManager.d.ts | 435 ++++++++++++++++++++------------- 1 file changed, 262 insertions(+), 173 deletions(-) diff --git a/api/@ohos.resourceManager.d.ts b/api/@ohos.resourceManager.d.ts index b01f284d57..6cda47e802 100644 --- a/api/@ohos.resourceManager.d.ts +++ b/api/@ohos.resourceManager.d.ts @@ -22,8 +22,6 @@ import { RawFileDescriptor as _RawFileDescriptor } from './global/rawFileDescriptor'; import { Resource as _Resource } from './global/resource'; import { AsyncCallback as _AsyncCallback } from './@ohos.base'; -/*** endif */ -/*** if arkts 1.1 */ import { DrawableDescriptor } from './@ohos.arkui.drawableDescriptor'; /*** endif */ @@ -75,7 +73,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum Direction { /** @@ -97,7 +96,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DIRECTION_VERTICAL = 0, @@ -120,7 +120,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DIRECTION_HORIZONTAL = 1 } @@ -147,7 +148,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum DeviceType { /** @@ -169,7 +171,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DEVICE_TYPE_PHONE = 0x00, @@ -191,7 +194,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DEVICE_TYPE_TABLET = 0x01, @@ -213,7 +217,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DEVICE_TYPE_CAR = 0x02, @@ -235,7 +240,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DEVICE_TYPE_PC = 0x03, @@ -257,7 +263,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DEVICE_TYPE_TV = 0x04, @@ -279,7 +286,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DEVICE_TYPE_WEARABLE = 0x06, @@ -289,7 +297,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DEVICE_TYPE_2IN1 = 0x07 } @@ -316,7 +325,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum ScreenDensity { /** @@ -338,7 +348,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SCREEN_SDPI = 120, @@ -361,7 +372,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SCREEN_MDPI = 160, @@ -384,7 +396,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SCREEN_LDPI = 240, @@ -407,7 +420,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SCREEN_XLDPI = 320, @@ -430,7 +444,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SCREEN_XXLDPI = 480, @@ -453,7 +468,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SCREEN_XXXLDPI = 640 } @@ -465,7 +481,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum ColorMode { @@ -475,7 +492,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ DARK = 0, @@ -485,7 +503,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ LIGHT = 1 } @@ -509,7 +528,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export class Configuration { /** @@ -540,7 +560,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ direction: Direction; @@ -572,7 +593,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ locale: string; @@ -583,7 +605,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ deviceType: DeviceType; @@ -594,7 +617,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ screenDensity: ScreenDensity; @@ -605,7 +629,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ colorMode: ColorMode; @@ -616,7 +641,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ mcc: number; @@ -627,7 +653,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ mnc: number; } @@ -651,7 +678,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export class DeviceCapability { /** @@ -682,7 +710,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ screenDensity: ScreenDensity; @@ -714,7 +743,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ deviceType: DeviceType; } @@ -931,8 +961,9 @@ declare namespace resourceManager { * @stagemodelonly * @crossplatform * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getStringValue */ getStringValue(resource: Resource, callback: _AsyncCallback): void; @@ -976,8 +1007,9 @@ declare namespace resourceManager { * @stagemodelonly * @crossplatform * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getStringValue */ getStringValue(resource: Resource): Promise; @@ -1046,6 +1078,8 @@ declare namespace resourceManager { * @crossplatform * @atomicservice * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getStringArrayValue */ getStringArrayValue(resource: Resource, callback: _AsyncCallback>): void; @@ -1090,6 +1124,8 @@ declare namespace resourceManager { * @crossplatform * @atomicservice * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getStringArrayValue */ getStringArrayValue(resource: Resource): Promise>; @@ -1155,6 +1191,8 @@ declare namespace resourceManager { * @crossplatform * @atomicservice * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getMediaContent */ getMediaContent(resource: Resource, callback: _AsyncCallback): void; @@ -1189,6 +1227,8 @@ declare namespace resourceManager { * @crossplatform * @atomicservice * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getMediaContent */ getMediaContent(resource: Resource, density: number, callback: _AsyncCallback): void; @@ -1230,6 +1270,8 @@ declare namespace resourceManager { * @crossplatform * @atomicservice * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getMediaContent */ getMediaContent(resource: Resource): Promise; @@ -1264,6 +1306,8 @@ declare namespace resourceManager { * @crossplatform * @atomicservice * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getMediaContent */ getMediaContent(resource: Resource, density: number): Promise; @@ -1333,6 +1377,8 @@ declare namespace resourceManager { * @crossplatform * @atomicservice * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getMediaContentBase64 */ getMediaContentBase64(resource: Resource, callback: _AsyncCallback): void; @@ -1367,6 +1413,8 @@ declare namespace resourceManager { * @crossplatform * @atomicservice * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getMediaContentBase64 */ getMediaContentBase64(resource: Resource, density: number, callback: _AsyncCallback): void; @@ -1408,6 +1456,8 @@ declare namespace resourceManager { * @crossplatform * @atomicservice * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getMediaContentBase64 */ getMediaContentBase64(resource: Resource): Promise; @@ -1440,6 +1490,8 @@ declare namespace resourceManager { * @crossplatform * @atomicservice * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getMediaContentBase64 */ getMediaContentBase64(resource: Resource, density: number): Promise; @@ -1465,7 +1517,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getDeviceCapability(callback: _AsyncCallback): void; @@ -1491,7 +1544,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getDeviceCapability(): Promise; @@ -1520,7 +1574,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getConfiguration(callback: _AsyncCallback): void; @@ -1546,7 +1601,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getConfiguration(): Promise; @@ -1799,7 +1855,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getStringByName(resName: string, callback: _AsyncCallback): void; @@ -1840,7 +1897,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getStringByName(resName: string): Promise; @@ -1881,7 +1939,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getStringArrayByName(resName: string, callback: _AsyncCallback>): void; @@ -1922,7 +1981,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getStringArrayByName(resName: string): Promise>; @@ -1960,7 +2020,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMediaByName(resName: string, callback: _AsyncCallback): void; @@ -1992,7 +2053,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMediaByName(resName: string, density: number, callback: _AsyncCallback): void; @@ -2030,7 +2092,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMediaByName(resName: string): Promise; @@ -2062,7 +2125,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMediaByName(resName: string, density: number): Promise; @@ -2103,7 +2167,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMediaBase64ByName(resName: string, callback: _AsyncCallback): void; @@ -2135,7 +2200,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMediaBase64ByName(resName: string, density: number, callback: _AsyncCallback): void; @@ -2173,7 +2239,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMediaBase64ByName(resName: string): Promise; @@ -2203,7 +2270,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMediaBase64ByName(resName: string, density: number): Promise; @@ -2392,7 +2460,6 @@ declare namespace resourceManager { * @param { number } resId - Indicates the resource ID. * @param { (string | number)[] } args - Indicates the formatting string resource parameters. * @returns { string } The character string corresponding to the resource ID. - * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. * @throws { BusinessError } 9001001 - Invalid resource ID. * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. * @throws { BusinessError } 9001006 - The resource is referenced cyclically. @@ -2402,6 +2469,7 @@ declare namespace resourceManager { * @atomicservice * @since 20 * @arkts 1.2 + */ getStringSync(resId: number, ...args: (string | number)[]): string; @@ -2445,8 +2513,9 @@ declare namespace resourceManager { * @stagemodelonly * @crossplatform * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getStringSync */ getStringSync(resource: Resource): string; @@ -2484,26 +2553,6 @@ declare namespace resourceManager { * @since 11 */ getStringSync(resource: Resource, ...args: Array): string; - - /** - * Obtains string resources associated with a specified resource object. - * - * @param { Resource } resource - Indicates the resource object. - * @param { (string | number)[] } args - Indicates the formatting string resource parameters. - * @returns { string } The character string corresponding to the resource object. - * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. - * @throws { BusinessError } 9001001 - Invalid resource ID. - * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. - * @throws { BusinessError } 9001006 - The resource is referenced cyclically. - * @throws { BusinessError } 9001007 - Failed to format the resource obtained based on the resource ID. - * @syscap SystemCapability.Global.ResourceManager - * @stagemodelonly - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - getStringSync(resource: Resource, ...args: (string | number)[]): string; /** * Obtains string resources associated with a specified resource name. @@ -2542,7 +2591,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getStringByNameSync(resName: string): string; @@ -2579,6 +2629,24 @@ declare namespace resourceManager { */ getStringByNameSync(resName: string, ...args: Array): string; + /** + * Obtains string resources associated with a specified resource name. + * + * @param { string } resName - Indicates the resource name. + * @param { (string | number)[] } args - Indicates the formatting string resource parameters. + * @returns { string } The character string corresponding to the resource name. + * @throws { BusinessError } 9001003 - Invalid resource name. + * @throws { BusinessError } 9001004 - No matching resource is found based on the resource name. + * @throws { BusinessError } 9001006 - The resource is referenced cyclically. + * @throws { BusinessError } 9001008 - Failed to format the resource obtained based on the resource Name. + * @syscap SystemCapability.Global.ResourceManager + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + getStringByNameSync(resName: string, ...args: (string | number)[]): string; + /** * Obtains the boolean result with a specified resource ID. * @@ -2616,7 +2684,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getBoolean(resId: number): boolean; @@ -2661,6 +2730,8 @@ declare namespace resourceManager { * @crossplatform * @atomicservice * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getBoolean */ getBoolean(resource: Resource): boolean; @@ -2701,7 +2772,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getBooleanByName(resName: string): boolean; @@ -2787,8 +2859,9 @@ declare namespace resourceManager { * @stagemodelonly * @crossplatform * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getNumber */ getNumber(resource: Resource): number; @@ -2829,7 +2902,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getNumberByName(resName: string): number; @@ -2978,7 +3052,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getStringArrayValue(resId: number, callback: _AsyncCallback>): void; @@ -3019,7 +3094,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getStringArrayValue(resId: number): Promise>; @@ -3189,28 +3265,6 @@ declare namespace resourceManager { */ getIntPluralStringValueSync(resource: Resource, num: number, ...args: Array): string; - /** - * Obtains the singular-plural character string represented by the resource object string corresponding to the - * specified number. - * - * @param { Resource } resource - Indicates the resource object. - * @param { number } num - An integer used to get the correct string for the current plural rules. - * @param { (string | number)[] } args - Indicates the formatting string resource parameters. - * @returns { string } The singular-plural character string represented by the ID string - * corresponding to the specified number. - * @throws { BusinessError } 9001001 - Invalid resource ID. - * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. - * @throws { BusinessError } 9001006 - The resource is referenced cyclically. - * @throws { BusinessError } 9001007 - Failed to format the resource obtained based on the resource ID. - * @syscap SystemCapability.Global.ResourceManager - * @stagemodelonly - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - getIntPluralStringValueSync(resource: Resource, num: number, ...args: (string | number)[]): string; - /** * Obtains the singular-plural character string represented by the name string corresponding to * the specified number. @@ -3314,28 +3368,6 @@ declare namespace resourceManager { */ getDoublePluralStringValueSync(resource: Resource, num: number, ...args: Array): string; - /** - * Obtains the singular-plural character string represented by the resource object string corresponding to the - * specified number. - * - * @param { Resource } resource - Indicates the resource object. - * @param { number } num - A double parameter used to get the correct string for the current plural rules. - * @param { (string | number)[] } args - Indicates the formatting string resource parameters. - * @returns { string } The singular-plural character string represented by the ID string - * corresponding to the specified number. - * @throws { BusinessError } 9001001 - Invalid resource ID. - * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. - * @throws { BusinessError } 9001006 - The resource is referenced cyclically. - * @throws { BusinessError } 9001007 - Failed to format the resource obtained based on the resource ID. - * @syscap SystemCapability.Global.ResourceManager - * @stagemodelonly - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - getDoublePluralStringValueSync(resource: Resource, num: number, ...args: (string | number)[]): string; - /** * Obtains the singular-plural character string represented by the name string corresponding to * the specified number. @@ -3411,7 +3443,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMediaContent(resId: number, callback: _AsyncCallback): void; @@ -3443,7 +3476,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMediaContent(resId: number, density: number, callback: _AsyncCallback): void; @@ -3481,7 +3515,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMediaContent(resId: number): Promise; @@ -3511,7 +3546,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMediaContent(resId: number, density: number): Promise; @@ -3552,7 +3588,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMediaContentBase64(resId: number, callback: _AsyncCallback): void; @@ -3584,7 +3621,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMediaContentBase64(resId: number, density: number, callback: _AsyncCallback): void; @@ -3622,7 +3660,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMediaContentBase64(resId: number): Promise; @@ -3652,7 +3691,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMediaContentBase64(resId: number, density: number): Promise; @@ -3759,7 +3799,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getRawFd(path: string, callback: _AsyncCallback): void; @@ -3794,7 +3835,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getRawFd(path: string): Promise; @@ -3829,7 +3871,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ closeRawFd(path: string, callback: _AsyncCallback): void; @@ -3864,7 +3907,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ closeRawFd(path: string): Promise; @@ -3912,7 +3956,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ getDrawableDescriptor(resId: number, density?: number, type?: number): DrawableDescriptor; @@ -3960,7 +4005,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ getDrawableDescriptorByName(resName: string, density?: number, type?: number): DrawableDescriptor; @@ -4012,6 +4058,8 @@ declare namespace resourceManager { * @crossplatform * @atomicservice * @since 12 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getDrawableDescriptor */ getDrawableDescriptor(resource: Resource, density?: number, type?: number): DrawableDescriptor; @@ -4035,7 +4083,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getRawFileList(path: string, callback: _AsyncCallback>): void; @@ -4059,7 +4108,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getRawFileList(path: string): Promise>; @@ -4089,7 +4139,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getColor(resId: number, callback: _AsyncCallback): void; @@ -4117,7 +4168,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getColor(resId: number): Promise; @@ -4150,6 +4202,8 @@ declare namespace resourceManager { * @crossplatform * @atomicservice * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getColor */ getColor(resource: Resource, callback: _AsyncCallback): void; @@ -4180,6 +4234,8 @@ declare namespace resourceManager { * @crossplatform * @atomicservice * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getColor */ getColor(resource: Resource): Promise; @@ -4209,7 +4265,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getColorByName(resName: string, callback: _AsyncCallback): void; @@ -4237,7 +4294,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getColorByName(resName: string): Promise; @@ -4296,8 +4354,9 @@ declare namespace resourceManager { * @stagemodelonly * @crossplatform * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getColorSync */ getColorSync(resource: Resource) : number; @@ -4325,7 +4384,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getColorByNameSync(resName: string) : number; @@ -4347,7 +4407,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ addResource(path: string) : void; @@ -4369,7 +4430,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ removeResource(path: string) : void; @@ -4393,7 +4455,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getRawFdSync(path: string): RawFileDescriptor; @@ -4415,7 +4478,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ closeRawFdSync(path: string): void; @@ -4439,7 +4503,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getRawFileListSync(path: string): Array; @@ -4494,7 +4559,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMediaContentSync(resId: number, density?: number): Uint8Array; @@ -4527,6 +4593,8 @@ declare namespace resourceManager { * @crossplatform * @atomicservice * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getMediaContentSync */ getMediaContentSync(resource: Resource, density?: number): Uint8Array; @@ -4556,7 +4624,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMediaContentBase64Sync(resId: number, density?: number): string; @@ -4589,6 +4658,8 @@ declare namespace resourceManager { * @crossplatform * @atomicservice * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getMediaContentBase64Sync */ getMediaContentBase64Sync(resource: Resource, density?: number): string; @@ -4690,7 +4761,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getStringArrayValueSync(resId: number): Array; @@ -4721,6 +4793,8 @@ declare namespace resourceManager { * @crossplatform * @atomicservice * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getStringArrayValueSync */ getStringArrayValueSync(resource: Resource): Array; @@ -4786,7 +4860,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMediaByNameSync(resName: string, density?: number): Uint8Array; @@ -4816,7 +4891,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMediaBase64ByNameSync(resName: string, density?: number): string; @@ -4844,7 +4920,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getStringArrayByNameSync(resName: string): Array; @@ -4862,7 +4939,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getConfigurationSync(): Configuration; @@ -4880,7 +4958,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getDeviceCapabilitySync(): DeviceCapability; @@ -4894,7 +4973,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getLocales(includeSystem?: boolean): Array; @@ -4910,7 +4990,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getSymbol(resId: number) : number; @@ -4928,6 +5009,8 @@ declare namespace resourceManager { * @crossplatform * @atomicservice * @since 11 + * @deprecated since 20 + * @useinstead ohos.resourceManager.getSymbol */ getSymbol(resource: Resource) : number; @@ -4943,7 +5026,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getSymbolByName(resName: string) : number; @@ -4957,7 +5041,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ isRawDir(path: string): boolean; @@ -4970,7 +5055,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ getOverrideResourceManager(configuration?: Configuration): ResourceManager; @@ -4981,7 +5067,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ getOverrideConfiguration(): Configuration; @@ -4993,7 +5080,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ updateOverrideConfiguration(configuration: Configuration): void; } @@ -5018,7 +5106,8 @@ declare namespace resourceManager { * @syscap SystemCapability.Global.ResourceManager * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export type RawFileDescriptor = _RawFileDescriptor; -- Gitee From fe18033438d4ec6b397e855c10146c079cb58043 Mon Sep 17 00:00:00 2001 From: Michael Wang Date: Sat, 12 Jul 2025 10:56:23 +0800 Subject: [PATCH 073/746] =?UTF-8?q?ANS=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=A7=BB=E6=A4=8D0702?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Wang --- api/@ohos.notificationManager.d.ts | 664 ++++++++++++------ api/@ohos.notificationSubscribe.d.ts | 109 ++- api/notification/NotificationCommonDef.d.ts | 9 +- .../notificationActionButton.d.ts | 28 +- api/notification/notificationContent.d.ts | 226 ++++-- api/notification/notificationFlags.d.ts | 24 +- api/notification/notificationRequest.d.ts | 220 ++++-- api/notification/notificationSlot.d.ts | 58 +- api/notification/notificationSorting.d.ts | 12 +- api/notification/notificationSortingMap.d.ts | 11 +- .../notificationSubscribeInfo.d.ts | 18 +- api/notification/notificationSubscriber.d.ts | 95 ++- api/notification/notificationTemplate.d.ts | 9 +- api/notification/notificationUserInput.d.ts | 6 +- 14 files changed, 1017 insertions(+), 472 deletions(-) diff --git a/api/@ohos.notificationManager.d.ts b/api/@ohos.notificationManager.d.ts index 0e42bac075..ac61fddd8a 100644 --- a/api/@ohos.notificationManager.d.ts +++ b/api/@ohos.notificationManager.d.ts @@ -18,17 +18,13 @@ * @kit NotificationKit */ -import { AsyncCallback } from './@ohos.base'; import { BundleOption as _BundleOption } from './notification/NotificationCommonDef'; import { NotificationActionButton as _NotificationActionButton } from './notification/notificationActionButton'; import { NotificationBasicContent as _NotificationBasicContent } from './notification/notificationContent'; import { NotificationContent as _NotificationContent } from './notification/notificationContent'; import { NotificationLongTextContent as _NotificationLongTextContent } from './notification/notificationContent'; -import type { NotificationLiveViewContent as _NotificationLiveViewContent } from './notification/notificationContent'; import { NotificationMultiLineContent as _NotificationMultiLineContent } from './notification/notificationContent'; import { NotificationPictureContent as _NotificationPictureContent } from './notification/notificationContent'; -import type { LiveViewStatus as _LiveViewStatus } from './notification/notificationContent'; -import type { LiveViewTypes as _LiveViewTypes } from './notification/notificationContent'; import { NotificationSystemLiveViewContent as _NotificationSystemLiveViewContent } from './notification/notificationContent'; import { NotificationCapsule as _NotificationCapsule } from './notification/notificationContent'; import { NotificationButton as _NotificationButton } from './notification/notificationContent'; @@ -39,13 +35,29 @@ import { NotificationFlagStatus as _NotificationFlagStatus } from './notificatio import { NotificationRequest as _NotificationRequest } from './notification/notificationRequest'; import { UnifiedGroupInfo as _UnifiedGroupInfo } from './notification/notificationRequest'; import { DistributedOptions as _DistributedOptions } from './notification/notificationRequest'; -import type { NotificationFilter as _NotificationFilter } from './notification/notificationRequest'; -import type { NotificationCheckRequest as _NotificationCheckRequest } from './notification/notificationRequest'; import { NotificationSlot as _NotificationSlot } from './notification/notificationSlot'; import { NotificationSorting as _NotificationSorting } from './notification/notificationSorting'; import { NotificationTemplate as _NotificationTemplate } from './notification/notificationTemplate'; import { NotificationUserInput as _NotificationUserInput } from './notification/notificationUserInput'; + +/*** if arkts 1.1 */ +import { AsyncCallback } from './@ohos.base'; +import type { NotificationLiveViewContent as _NotificationLiveViewContent } from './notification/notificationContent'; +import type { LiveViewStatus as _LiveViewStatus } from './notification/notificationContent'; +import type { LiveViewTypes as _LiveViewTypes } from './notification/notificationContent'; +import type { NotificationFilter as _NotificationFilter } from './notification/notificationRequest'; +import type { NotificationCheckRequest as _NotificationCheckRequest } from './notification/notificationRequest'; import type UIAbilityContext from './application/UIAbilityContext'; +/*** endif */ +/*** if arkts 1.2 */ +import { AsyncCallback } from '@ohos.base'; +import { NotificationLiveViewContent as _NotificationLiveViewContent } from './notification/notificationContent'; +import { LiveViewStatus as _LiveViewStatus } from './notification/notificationContent'; +import { LiveViewTypes as _LiveViewTypes } from './notification/notificationContent'; +import { NotificationFilter as _NotificationFilter } from './notification/notificationRequest'; +import { NotificationCheckRequest as _NotificationCheckRequest } from './notification/notificationRequest'; +import type UIAbilityContext from './application/UIAbilityContext'; +/*** endif */ /** * The NotificationManager module provides notification management capabilities, covering notifications, @@ -63,7 +75,8 @@ import type UIAbilityContext from './application/UIAbilityContext'; * @syscap SystemCapability.Notification.Notification * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace notificationManager { /** @@ -130,7 +143,8 @@ declare namespace notificationManager { * @throws { BusinessError } 2300007 - Network unreachable. * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function publish(request: NotificationRequest, callback: AsyncCallback): void; @@ -198,7 +212,8 @@ declare namespace notificationManager { * @throws { BusinessError } 2300007 - Network unreachable. * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function publish(request: NotificationRequest): Promise; @@ -280,7 +295,8 @@ declare namespace notificationManager { * @throws { BusinessError } 2300007 - Network unreachable. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function publish(request: NotificationRequest, userId: number, callback: AsyncCallback): void; @@ -362,7 +378,8 @@ declare namespace notificationManager { * @throws { BusinessError } 2300007 - Network unreachable. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function publish(request: NotificationRequest, userId: number): Promise; @@ -393,7 +410,8 @@ declare namespace notificationManager { * @throws { BusinessError } 2300007 - Network unreachable. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function publishAsBundle( request: NotificationRequest, @@ -429,7 +447,8 @@ declare namespace notificationManager { * @throws { BusinessError } 2300007 - Network unreachable. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function publishAsBundle(request: NotificationRequest, representativeBundle: string, userId: number): Promise; @@ -459,7 +478,8 @@ declare namespace notificationManager { * @throws { BusinessError } 2300007 - Network unreachable. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function publishAsBundle(representativeBundle: BundleOption, request: NotificationRequest): Promise; @@ -490,7 +510,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600007 - The notification does not exist. * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function cancel(id: number, callback: AsyncCallback): void; @@ -507,7 +528,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @throws { BusinessError } 1600007 - The notification does not exist. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function cancel(id: number, label: string, callback: AsyncCallback): void; @@ -524,7 +546,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @throws { BusinessError } 1600007 - The notification does not exist. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function cancel(id: number, label?: string): Promise; @@ -545,7 +568,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600017 - There is no corresponding agent relationship configuration. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function cancel(representativeBundle: BundleOption, id: number): Promise; @@ -569,7 +593,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function cancelAsBundle( id: number, @@ -598,7 +623,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function cancelAsBundle(id: number, representativeBundle: string, userId: number): Promise; @@ -622,7 +648,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function cancelAsBundle(representativeBundle: BundleOption, id: number): Promise; @@ -649,7 +676,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function cancelAll(callback: AsyncCallback): void; @@ -672,7 +700,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function cancelAll(): Promise; @@ -692,7 +721,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function addSlot(slot: NotificationSlot, callback: AsyncCallback): void; @@ -712,7 +742,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function addSlot(slot: NotificationSlot): Promise; @@ -728,7 +759,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function addSlot(type: SlotType, callback: AsyncCallback): void; @@ -744,7 +776,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function addSlot(type: SlotType): Promise; @@ -764,7 +797,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function addSlots(slots: Array, callback: AsyncCallback): void; @@ -784,7 +818,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function addSlots(slots: Array): Promise; @@ -800,7 +835,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSlot(slotType: SlotType, callback: AsyncCallback): void; @@ -815,7 +851,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSlot(slotType: SlotType): Promise; @@ -830,7 +867,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSlots(callback: AsyncCallback>): void; @@ -842,7 +880,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSlots(): Promise>; @@ -858,7 +897,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllNotificationEnabledBundles(): Promise>; @@ -873,7 +913,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeSlot(slotType: SlotType, callback: AsyncCallback): void; @@ -888,7 +929,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeSlot(slotType: SlotType): Promise; @@ -903,7 +945,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeAllSlots(callback: AsyncCallback): void; @@ -915,7 +958,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeAllSlots(): Promise; @@ -936,7 +980,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function setNotificationEnable(bundle: BundleOption, enable: boolean, callback: AsyncCallback): void; @@ -957,7 +1002,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function setNotificationEnable(bundle: BundleOption, enable: boolean): Promise; @@ -977,7 +1023,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isNotificationEnabled(bundle: BundleOption, callback: AsyncCallback): void; @@ -997,7 +1044,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isNotificationEnabled(bundle: BundleOption): Promise; @@ -1044,7 +1092,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function isNotificationEnabled(callback: AsyncCallback): void; @@ -1087,7 +1136,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function isNotificationEnabled(): Promise; @@ -1100,7 +1150,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function isNotificationEnabledSync(): boolean; @@ -1120,7 +1171,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600008 - The user does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isNotificationEnabled(userId: number, callback: AsyncCallback): void; @@ -1140,7 +1192,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600008 - The user does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isNotificationEnabled(userId: number): Promise; @@ -1181,7 +1234,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function displayBadge(bundle: BundleOption, enable: boolean, callback: AsyncCallback): void; @@ -1222,7 +1276,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function displayBadge(bundle: BundleOption, enable: boolean): Promise; @@ -1261,7 +1316,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function isBadgeDisplayed(bundle: BundleOption, callback: AsyncCallback): void; @@ -1300,7 +1356,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function isBadgeDisplayed(bundle: BundleOption): Promise; @@ -1341,7 +1398,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setSlotByBundle(bundle: BundleOption, slot: NotificationSlot, callback: AsyncCallback): void; @@ -1382,7 +1440,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setSlotByBundle(bundle: BundleOption, slot: NotificationSlot): Promise; @@ -1421,7 +1480,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSlotsByBundle(bundle: BundleOption, callback: AsyncCallback>): void; @@ -1503,7 +1563,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSlotsByBundle(bundle: BundleOption): Promise>; @@ -1542,7 +1603,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSlotNumByBundle(bundle: BundleOption, callback: AsyncCallback): void; @@ -1581,7 +1643,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSlotNumByBundle(bundle: BundleOption): Promise; @@ -1600,7 +1663,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllActiveNotifications(callback: AsyncCallback>): void; @@ -1617,7 +1681,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllActiveNotifications(): Promise>; @@ -1632,7 +1697,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getActiveNotificationCount(callback: AsyncCallback): void; @@ -1644,7 +1710,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getActiveNotificationCount(): Promise; @@ -1660,7 +1727,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getActiveNotifications(callback: AsyncCallback>): void; @@ -1672,7 +1740,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getActiveNotifications(): Promise>; @@ -1689,7 +1758,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getActiveNotificationByFilter(filter: NotificationFilter, callback: AsyncCallback): void; @@ -1706,7 +1776,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getActiveNotificationByFilter(filter: NotificationFilter): Promise; @@ -1722,7 +1793,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function cancelGroup(groupName: string, callback: AsyncCallback): void; @@ -1737,7 +1809,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function cancelGroup(groupName: string): Promise; @@ -1758,7 +1831,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeGroupByBundle(bundle: BundleOption, groupName: string, callback: AsyncCallback): void; @@ -1779,7 +1853,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeGroupByBundle(bundle: BundleOption, groupName: string): Promise; @@ -1818,7 +1893,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDoNotDisturbDate(date: DoNotDisturbDate, callback: AsyncCallback): void; @@ -1857,7 +1933,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDoNotDisturbDate(date: DoNotDisturbDate): Promise; @@ -1900,7 +1977,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDoNotDisturbDate(date: DoNotDisturbDate, userId: number, callback: AsyncCallback): void; @@ -1943,7 +2021,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDoNotDisturbDate(date: DoNotDisturbDate, userId: number): Promise; @@ -1980,7 +2059,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDoNotDisturbDate(callback: AsyncCallback): void; @@ -2013,7 +2093,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDoNotDisturbDate(): Promise; @@ -2054,7 +2135,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDoNotDisturbDate(userId: number, callback: AsyncCallback): void; @@ -2095,7 +2177,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDoNotDisturbDate(userId: number): Promise; @@ -2115,7 +2198,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isSupportDoNotDisturbMode(callback: AsyncCallback): void; @@ -2132,7 +2216,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isSupportDoNotDisturbMode(): Promise; @@ -2148,7 +2233,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isSupportTemplate(templateName: string, callback: AsyncCallback): void; @@ -2163,7 +2249,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isSupportTemplate(templateName: string): Promise; @@ -2266,7 +2353,8 @@ declare namespace notificationManager { * @syscap SystemCapability.Notification.Notification * @StageModelOnly * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function requestEnableNotification(context: UIAbilityContext, callback: AsyncCallback): void; @@ -2357,7 +2445,8 @@ declare namespace notificationManager { * @syscap SystemCapability.Notification.Notification * @StageModelOnly * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function requestEnableNotification(context: UIAbilityContext): Promise; @@ -2396,7 +2485,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600010 - Distributed operation failed. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDistributedEnable(enable: boolean, callback: AsyncCallback): void; @@ -2435,7 +2525,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600010 - Distributed operation failed. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDistributedEnable(enable: boolean): Promise; @@ -2450,7 +2541,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @throws { BusinessError } 1600010 - Distributed operation failed. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isDistributedEnabled(callback: AsyncCallback): void; @@ -2463,7 +2555,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @throws { BusinessError } 1600010 - Distributed operation failed. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isDistributedEnabled(): Promise; @@ -2506,7 +2599,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDistributedEnableByBundle(bundle: BundleOption, enable: boolean, callback: AsyncCallback): void; @@ -2549,7 +2643,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDistributedEnableByBundle(bundle: BundleOption, enable: boolean): Promise; @@ -2596,7 +2691,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDistributedEnabledByBundle(bundle: BundleOption, deviceType: string, enable: boolean): Promise; @@ -2639,7 +2735,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function isDistributedEnabledByBundle(bundle: BundleOption, callback: AsyncCallback): void; @@ -2680,7 +2777,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function isDistributedEnabledByBundle(bundle: BundleOption): Promise; @@ -2725,7 +2823,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function isDistributedEnabledByBundle(bundle: BundleOption, deviceType: string): Promise; @@ -2770,7 +2869,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setSmartReminderEnabled(deviceType: string, enable: boolean): Promise; @@ -2813,7 +2913,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function isSmartReminderEnabled(deviceType: string): Promise; @@ -2848,7 +2949,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDeviceRemindType(callback: AsyncCallback): void; @@ -2879,7 +2981,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDeviceRemindType(): Promise; @@ -2944,7 +3047,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setNotificationEnableSlot( bundle: BundleOption, @@ -2998,7 +3102,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setNotificationEnableSlot( bundle: BundleOption, @@ -3073,7 +3178,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setNotificationEnableSlot(bundle: BundleOption, type: SlotType, enable: boolean, isForceControl?: boolean): Promise; @@ -3114,7 +3220,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function isNotificationSlotEnabled(bundle: BundleOption, type: SlotType, callback: AsyncCallback): void; @@ -3155,7 +3262,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function isNotificationSlotEnabled(bundle: BundleOption, type: SlotType): Promise; @@ -3196,7 +3304,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600008 - The user does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setSyncNotificationEnabledWithoutApp(userId: number, enable: boolean, callback: AsyncCallback): void; @@ -3237,7 +3346,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600008 - The user does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setSyncNotificationEnabledWithoutApp(userId: number, enable: boolean): Promise; @@ -3257,7 +3367,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600008 - The user does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSyncNotificationEnabledWithoutApp(userId: number, callback: AsyncCallback): void; @@ -3277,7 +3388,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600008 - The user does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSyncNotificationEnabledWithoutApp(userId: number): Promise; @@ -3330,7 +3442,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setBadgeNumber(badgeNumber: number, callback: AsyncCallback): void; @@ -3380,7 +3493,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setBadgeNumber(badgeNumber: number): Promise; @@ -3421,7 +3535,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setBadgeNumberByBundle(bundle: BundleOption, badgeNumber: number): Promise; @@ -3451,7 +3566,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600001 - Internal error. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'checkNotification', callback: (checkInfo: NotificationCheckInfo) => NotificationCheckResult): void; @@ -3489,7 +3605,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'checkNotification', checkRequest: NotificationCheckRequest, callback: (checkInfo: NotificationCheckInfo) => Promise): void; @@ -3520,7 +3637,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600001 - Internal error. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function off( type: 'checkNotification', @@ -3568,7 +3686,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function triggerSystemLiveView(bundle: BundleOption, notificationId: number, buttonOptions: ButtonOptions): Promise; @@ -3603,7 +3722,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function subscribeSystemLiveView(subscriber: SystemLiveViewSubscriber): Promise; @@ -3644,7 +3764,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setSlotFlagsByBundle(bundle: BundleOption, slotFlags: number): Promise; @@ -3683,7 +3804,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSlotFlagsByBundle(bundle: BundleOption): Promise; @@ -3734,7 +3856,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function addDoNotDisturbProfile(templates: Array): Promise; @@ -3773,7 +3896,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeDoNotDisturbProfile(templates: Array): Promise; @@ -3812,7 +3936,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setAdditionalConfig(key: string, value: string): Promise; @@ -3841,7 +3966,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600018 - the notification settings window is already displayed. * @syscap SystemCapability.Notification.NotificationSettings * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function openNotificationSettings(context: UIAbilityContext): Promise; @@ -3880,7 +4006,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600019 - The do-not-disturb profile does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDoNotDisturbProfile(id: number): Promise; @@ -3897,7 +4024,8 @@ declare namespace notificationManager { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setTargetDeviceStatus(deviceType: string, status: number): Promise; @@ -3916,7 +4044,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function disableNotificationFeature(disabled:boolean, bundleList: Array): Promise; @@ -3934,8 +4063,9 @@ declare namespace notificationManager { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 - */ + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ function setDistributedEnabledBySlot(slot: SlotType, deviceType: string, enabled: boolean): Promise; /** @@ -3951,8 +4081,9 @@ declare namespace notificationManager { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 - */ + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ function isDistributedEnabledBySlot(slot: SlotType, deviceType: string): Promise; /** @@ -3961,7 +4092,8 @@ declare namespace notificationManager { * @typedef ButtonOptions * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface ButtonOptions { /** @@ -3971,7 +4103,8 @@ declare namespace notificationManager { * @type { string } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ buttonName: string; } @@ -3982,7 +4115,8 @@ declare namespace notificationManager { * @typedef SystemLiveViewSubscriber * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface SystemLiveViewSubscriber { /** @@ -3991,7 +4125,8 @@ declare namespace notificationManager { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onResponse?: (notificationId: number, buttonOptions: ButtonOptions) => void; } @@ -4002,7 +4137,8 @@ declare namespace notificationManager { * @typedef NotificationCheckInfo * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationCheckInfo { /** @@ -4012,7 +4148,8 @@ declare namespace notificationManager { * @type { string } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ bundleName: string; @@ -4023,7 +4160,8 @@ declare namespace notificationManager { * @type { number } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ notificationId: number; @@ -4034,7 +4172,8 @@ declare namespace notificationManager { * @type { ?string } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ label?: string; @@ -4045,7 +4184,8 @@ declare namespace notificationManager { * @type { ContentType } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ contentType: ContentType; @@ -4056,7 +4196,8 @@ declare namespace notificationManager { * @type { number } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ creatorUserId: number; @@ -4067,7 +4208,8 @@ declare namespace notificationManager { * @type { SlotType } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ slotType: SlotType; @@ -4078,7 +4220,8 @@ declare namespace notificationManager { * @type { ?Record } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ extraInfos?: Record; } @@ -4089,7 +4232,8 @@ declare namespace notificationManager { * @typedef NotificationCheckResult * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationCheckResult { /** @@ -4099,7 +4243,8 @@ declare namespace notificationManager { * @type { number } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ code: number; @@ -4110,7 +4255,8 @@ declare namespace notificationManager { * @type { string } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ message: string; } @@ -4155,7 +4301,8 @@ declare namespace notificationManager { * @enum { number } * @syscap SystemCapability.Notification.Notification * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum SlotType { /** @@ -4169,7 +4316,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ UNKNOWN_TYPE = 0, @@ -4184,7 +4332,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ SOCIAL_COMMUNICATION = 1, @@ -4199,7 +4348,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ SERVICE_INFORMATION = 2, @@ -4214,7 +4364,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ CONTENT_INFORMATION = 3, @@ -4231,7 +4382,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ LIVE_VIEW = 4, @@ -4248,7 +4400,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ CUSTOMER_SERVICE = 5, @@ -4257,7 +4410,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ EMERGENCY_INFORMATION = 10, @@ -4272,7 +4426,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ OTHER_TYPES = 0xFFFF } @@ -4291,7 +4446,8 @@ declare namespace notificationManager { * @syscap SystemCapability.Notification.Notification * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum ContentType { /** @@ -4306,7 +4462,8 @@ declare namespace notificationManager { * @syscap SystemCapability.Notification.Notification * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NOTIFICATION_CONTENT_BASIC_TEXT, @@ -4322,7 +4479,8 @@ declare namespace notificationManager { * @syscap SystemCapability.Notification.Notification * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NOTIFICATION_CONTENT_LONG_TEXT, @@ -4337,7 +4495,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NOTIFICATION_CONTENT_PICTURE, @@ -4352,7 +4511,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NOTIFICATION_CONTENT_CONVERSATION, @@ -4368,7 +4528,8 @@ declare namespace notificationManager { * @syscap SystemCapability.Notification.Notification * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NOTIFICATION_CONTENT_MULTILINE, @@ -4385,7 +4546,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NOTIFICATION_CONTENT_SYSTEM_LIVE_VIEW, @@ -4400,7 +4562,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NOTIFICATION_CONTENT_LIVE_VIEW, } @@ -4410,14 +4573,16 @@ declare namespace notificationManager { * * @enum { number } * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum SlotLevel { /** * Notification is disabled. * * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ LEVEL_NONE = 0, @@ -4425,7 +4590,8 @@ declare namespace notificationManager { * Notification is enabled, but the notification icon is not displayed in the status bar, with no banner and alert tone. * * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ LEVEL_MIN = 1, @@ -4433,7 +4599,8 @@ declare namespace notificationManager { * Notification is enabled, and the notification icon is displayed in the status bar, with no banner and alert tone. * * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ LEVEL_LOW = 2, @@ -4441,7 +4608,8 @@ declare namespace notificationManager { * Notification is enabled, and the notification icon is displayed in the status bar, with an alert tone but no banner. * * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ LEVEL_DEFAULT = 3, @@ -4449,7 +4617,8 @@ declare namespace notificationManager { * Notification is enabled, and the notification icon is displayed in the status bar, with an alert tone and banner. * * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ LEVEL_HIGH = 4 } @@ -4460,7 +4629,8 @@ declare namespace notificationManager { * @enum { number } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum DoNotDisturbType { /** @@ -4468,7 +4638,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ TYPE_NONE = 0, @@ -4477,7 +4648,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ TYPE_ONCE = 1, @@ -4486,7 +4658,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ TYPE_DAILY = 2, @@ -4495,7 +4668,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ TYPE_CLEARLY = 3 } @@ -4506,7 +4680,8 @@ declare namespace notificationManager { * @typedef DoNotDisturbDate * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface DoNotDisturbDate { /** @@ -4515,7 +4690,8 @@ declare namespace notificationManager { * @type { DoNotDisturbType } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ type: DoNotDisturbType; @@ -4525,7 +4701,8 @@ declare namespace notificationManager { * @type { Date } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ begin: Date; @@ -4535,7 +4712,8 @@ declare namespace notificationManager { * @type { Date } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ end: Date; } @@ -4546,7 +4724,8 @@ declare namespace notificationManager { * @typedef DoNotDisturbProfile * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface DoNotDisturbProfile { /** @@ -4555,7 +4734,8 @@ declare namespace notificationManager { * @type { number } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ id: number; @@ -4565,7 +4745,8 @@ declare namespace notificationManager { * @type { string } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ name: string; @@ -4575,7 +4756,8 @@ declare namespace notificationManager { * @type { ?Array } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ trustlist?: Array; } @@ -4586,7 +4768,8 @@ declare namespace notificationManager { * @enum { number } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum DeviceRemindType { /** @@ -4594,7 +4777,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ IDLE_DONOT_REMIND = 0, @@ -4603,7 +4787,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ IDLE_REMIND = 1, @@ -4612,7 +4797,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ ACTIVE_DONOT_REMIND = 2, @@ -4621,7 +4807,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ ACTIVE_REMIND = 3 } @@ -4632,7 +4819,8 @@ declare namespace notificationManager { * @enum { number } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum SourceType { /** @@ -4640,7 +4828,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ TYPE_NORMAL = 0, @@ -4649,7 +4838,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ TYPE_CONTINUOUS = 1, @@ -4658,7 +4848,8 @@ declare namespace notificationManager { * * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ TYPE_TIMER = 2 } @@ -4669,14 +4860,16 @@ declare namespace notificationManager { * @enum { number } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum NotificationControlFlagStatus { /** * Manipulating of the enumeration by bitwise-or operation represents the closing of ringtone. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NOTIFICATION_STATUS_CLOSE_SOUND = 1 << 0, @@ -4684,7 +4877,8 @@ declare namespace notificationManager { * Manipulating of the enumeration by bitwise-or operation represents the closing of lock screen. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NOTIFICATION_STATUS_CLOSE_LOCKSCREEN = 1 << 1, @@ -4692,7 +4886,8 @@ declare namespace notificationManager { * Manipulating of the enumeration by bitwise-or operation represents the closing of banner. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NOTIFICATION_STATUS_CLOSE_BANNER = 1 << 2, @@ -4700,7 +4895,8 @@ declare namespace notificationManager { * Manipulating of the enumeration by bitwise-or operation represents the closing of light screen. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NOTIFICATION_STATUS_CLOSE_LIGHT_SCREEN = 1 << 3, @@ -4708,7 +4904,8 @@ declare namespace notificationManager { * Manipulating of the enumeration by bitwise-or operation represents the closing of vibration. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NOTIFICATION_STATUS_CLOSE_VIBRATION = 1 << 4, @@ -4716,7 +4913,8 @@ declare namespace notificationManager { * Manipulating of the enumeration by bitwise-or operation represents the closing of status bar icon. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NOTIFICATION_STATUS_CLOSE_STATUSBAR_ICON = 1 << 5 } @@ -4726,7 +4924,8 @@ declare namespace notificationManager { * * @typedef { _BundleOption } BundleOption * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type BundleOption = _BundleOption; @@ -4735,7 +4934,8 @@ declare namespace notificationManager { * * @typedef { _NotificationActionButton } NotificationActionButton * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationActionButton = _NotificationActionButton; @@ -4751,7 +4951,8 @@ declare namespace notificationManager { * @typedef { _NotificationBasicContent } NotificationBasicContent * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationBasicContent = _NotificationBasicContent; @@ -4767,7 +4968,8 @@ declare namespace notificationManager { * @typedef { _NotificationContent } NotificationContent * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationContent = _NotificationContent; @@ -4783,7 +4985,8 @@ declare namespace notificationManager { * @typedef { _NotificationLongTextContent } NotificationLongTextContent * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationLongTextContent = _NotificationLongTextContent; @@ -4793,7 +4996,8 @@ declare namespace notificationManager { * @typedef { _NotificationLiveViewContent } NotificationLiveViewContent * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationLiveViewContent = _NotificationLiveViewContent; @@ -4809,7 +5013,8 @@ declare namespace notificationManager { * @typedef { _NotificationMultiLineContent } NotificationMultiLineContent * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationMultiLineContent = _NotificationMultiLineContent; @@ -4818,7 +5023,8 @@ declare namespace notificationManager { * * @typedef { _NotificationPictureContent } NotificationPictureContent * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationPictureContent = _NotificationPictureContent; @@ -4827,7 +5033,8 @@ declare namespace notificationManager { * * @typedef { _NotificationSystemLiveViewContent } NotificationSystemLiveViewContent * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationSystemLiveViewContent = _NotificationSystemLiveViewContent; @@ -4837,7 +5044,8 @@ declare namespace notificationManager { * @typedef { _NotificationFlags } NotificationFlags * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationFlags = _NotificationFlags; @@ -4847,7 +5055,8 @@ declare namespace notificationManager { * @typedef { _NotificationFlagStatus } NotificationFlagStatus * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationFlagStatus = _NotificationFlagStatus; @@ -4863,7 +5072,8 @@ declare namespace notificationManager { * @typedef { _NotificationRequest } NotificationRequest * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationRequest = _NotificationRequest; @@ -4873,7 +5083,8 @@ declare namespace notificationManager { * @typedef { _UnifiedGroupInfo } UnifiedGroupInfo * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export type UnifiedGroupInfo = _UnifiedGroupInfo; @@ -4883,7 +5094,8 @@ declare namespace notificationManager { * @typedef { _NotificationFilter } NotificationFilter * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationFilter = _NotificationFilter; @@ -4893,7 +5105,8 @@ declare namespace notificationManager { * @typedef { _NotificationCheckRequest } NotificationCheckRequest * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationCheckRequest = _NotificationCheckRequest; @@ -4902,7 +5115,8 @@ declare namespace notificationManager { * * @typedef { _DistributedOptions } DistributedOptions * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type DistributedOptions = _DistributedOptions; @@ -4911,7 +5125,8 @@ declare namespace notificationManager { * * @typedef { _NotificationSlot } NotificationSlot * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationSlot = _NotificationSlot; @@ -4921,7 +5136,8 @@ declare namespace notificationManager { * @typedef { _LiveViewStatus } LiveViewStatus * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export type LiveViewStatus = _LiveViewStatus; @@ -4931,7 +5147,8 @@ declare namespace notificationManager { * @typedef { _LiveViewTypes } LiveViewTypes * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ export type LiveViewTypes = _LiveViewTypes; @@ -4941,7 +5158,8 @@ declare namespace notificationManager { * @typedef { _NotificationSorting } NotificationSorting * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationSorting = _NotificationSorting; @@ -4950,7 +5168,8 @@ declare namespace notificationManager { * * @typedef { _NotificationTemplate } NotificationTemplate * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationTemplate = _NotificationTemplate; @@ -4959,7 +5178,8 @@ declare namespace notificationManager { * * @typedef { _NotificationUserInput } NotificationUserInput * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationUserInput = _NotificationUserInput; @@ -4968,7 +5188,8 @@ declare namespace notificationManager { * * @typedef { _NotificationCapsule } NotificationCapsule * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationCapsule = _NotificationCapsule; @@ -4977,7 +5198,8 @@ declare namespace notificationManager { * * @typedef { _NotificationButton } NotificationButton * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationButton = _NotificationButton; @@ -4986,7 +5208,8 @@ declare namespace notificationManager { * * @typedef { _NotificationTime } NotificationTime * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationTime = _NotificationTime; @@ -4995,7 +5218,8 @@ declare namespace notificationManager { * * @typedef { _NotificationProgress } NotificationProgress * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationProgress = _NotificationProgress; } diff --git a/api/@ohos.notificationSubscribe.d.ts b/api/@ohos.notificationSubscribe.d.ts index dab12eddc5..848fddc27d 100644 --- a/api/@ohos.notificationSubscribe.d.ts +++ b/api/@ohos.notificationSubscribe.d.ts @@ -24,13 +24,19 @@ import { NotificationSubscribeInfo as _NotificationSubscribeInfo } from './notif import { NotificationSubscriber as _NotificationSubscriber } from './notification/notificationSubscriber'; import { SubscribeCallbackData as _SubscribeCallbackData } from './notification/notificationSubscriber'; import { EnabledNotificationCallbackData as _EnabledNotificationCallbackData } from './notification/notificationSubscriber'; +/*** if arkts 1.1 */ import type { BadgeNumberCallbackData as _BadgeNumberCallbackData } from './notification/notificationSubscriber'; +/*** endif */ +/*** if arkts 1.2 */ +import { BadgeNumberCallbackData as _BadgeNumberCallbackData } from './notification/notificationSubscriber'; +/*** endif */ /** * @namespace notificationSubscribe * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace notificationSubscribe { /** @@ -39,7 +45,8 @@ declare namespace notificationSubscribe { * @typedef NotificationKey * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationKey { /** @@ -48,7 +55,8 @@ declare namespace notificationSubscribe { * @type { number } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ id: number; @@ -58,7 +66,8 @@ declare namespace notificationSubscribe { * @type { ?string } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ label?: string; } @@ -69,7 +78,8 @@ declare namespace notificationSubscribe { * @enum { number } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum RemoveReason { /** @@ -77,7 +87,8 @@ declare namespace notificationSubscribe { * * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ CLICK_REASON_REMOVE = 1, @@ -86,7 +97,8 @@ declare namespace notificationSubscribe { * * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ CANCEL_REASON_REMOVE = 2 } @@ -107,7 +119,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function subscribe(subscriber: NotificationSubscriber, callback: AsyncCallback): void; @@ -125,7 +138,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function subscribeSelf(subscriber: NotificationSubscriber): Promise; @@ -146,7 +160,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function subscribe( subscriber: NotificationSubscriber, @@ -171,7 +186,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function subscribe(subscriber: NotificationSubscriber, info?: NotificationSubscribeInfo): Promise; @@ -190,7 +206,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function unsubscribe(subscriber: NotificationSubscriber, callback: AsyncCallback): void; @@ -209,7 +226,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function unsubscribe(subscriber: NotificationSubscriber): Promise; @@ -232,7 +250,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function remove( bundle: BundleOption, @@ -260,7 +279,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function remove(bundle: BundleOption, notificationKey: NotificationKey, reason: RemoveReason): Promise; @@ -281,7 +301,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600007 - The notification does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function remove(hashCode: string, reason: RemoveReason, callback: AsyncCallback): void; @@ -302,7 +323,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function remove(hashCodes: Array, reason: RemoveReason, callback: AsyncCallback): void; @@ -323,7 +345,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600007 - The notification does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function remove(hashCode: string, reason: RemoveReason): Promise; @@ -343,7 +366,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function remove(hashCodes: Array, reason: RemoveReason): Promise; @@ -363,7 +387,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeAll(bundle: BundleOption, callback: AsyncCallback): void; @@ -381,7 +406,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeAll(callback: AsyncCallback): void; @@ -401,7 +427,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600008 - The user does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeAll(userId: number, callback: AsyncCallback): void; @@ -421,7 +448,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600008 - The user does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeAll(userId: number): Promise; @@ -441,7 +469,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeAll(bundle?: BundleOption): Promise; @@ -460,7 +489,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600021 - Distributed operation timed out. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function distributeOperation(hashcode: string, operationInfo?: OperationInfo): Promise; @@ -470,7 +500,8 @@ declare namespace notificationSubscribe { * @typedef OperationInfo * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface OperationInfo { /** @@ -479,7 +510,8 @@ declare namespace notificationSubscribe { * @type { ?string } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ actionName?: string; @@ -489,7 +521,8 @@ declare namespace notificationSubscribe { * @type { ?string } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ userInput?: string; @@ -500,6 +533,7 @@ declare namespace notificationSubscribe { * @syscap SystemCapability.Notification.Notification * @systemapi * @since 20 + * @arkts 1.1&1.2 */ operationType?: number; @@ -510,6 +544,7 @@ declare namespace notificationSubscribe { * @syscap SystemCapability.Notification.Notification * @systemapi * @since 20 + * @arkts 1.1&1.2 */ buttonIndex?: number; } @@ -520,7 +555,8 @@ declare namespace notificationSubscribe { * @typedef { _BundleOption } BundleOption * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type BundleOption = _BundleOption; @@ -530,7 +566,8 @@ declare namespace notificationSubscribe { * @typedef { _NotificationSubscribeInfo } NotificationSubscribeInfo * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationSubscribeInfo = _NotificationSubscribeInfo; @@ -541,7 +578,8 @@ declare namespace notificationSubscribe { * @typedef { _NotificationSubscriber } NotificationSubscriber * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type NotificationSubscriber = _NotificationSubscriber; @@ -552,7 +590,8 @@ declare namespace notificationSubscribe { * @typedef { _SubscribeCallbackData } SubscribeCallbackData * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type SubscribeCallbackData = _SubscribeCallbackData; @@ -562,7 +601,8 @@ declare namespace notificationSubscribe { * @typedef { _EnabledNotificationCallbackData } EnabledNotificationCallbackData * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type EnabledNotificationCallbackData = _EnabledNotificationCallbackData; @@ -572,7 +612,8 @@ declare namespace notificationSubscribe { * @typedef { _BadgeNumberCallbackData } BadgeNumberCallbackData * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export type BadgeNumberCallbackData = _BadgeNumberCallbackData; } diff --git a/api/notification/NotificationCommonDef.d.ts b/api/notification/NotificationCommonDef.d.ts index 6a48a3d194..4adb0f5a61 100644 --- a/api/notification/NotificationCommonDef.d.ts +++ b/api/notification/NotificationCommonDef.d.ts @@ -23,7 +23,8 @@ * * @typedef BundleOption * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface BundleOption { /** @@ -31,7 +32,8 @@ export interface BundleOption { * * @type { string } * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ bundle: string; @@ -40,7 +42,8 @@ export interface BundleOption { * * @type { ?number } * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ uid?: number; } diff --git a/api/notification/notificationActionButton.d.ts b/api/notification/notificationActionButton.d.ts index 7937351430..6293e2b352 100644 --- a/api/notification/notificationActionButton.d.ts +++ b/api/notification/notificationActionButton.d.ts @@ -19,14 +19,21 @@ */ import { NotificationUserInput } from './notificationUserInput'; + +/*** if arkts 1.1 */ import { WantAgent } from '../@ohos.wantAgent'; +/*** endif */ +/*** if arkts 1.2 */ +import { WantAgent } from '../@ohos.app.ability.wantAgent'; +/*** endif */ /** * The NotificationActionButton module provides APIs for describing the button displayed in the notification. * * @typedef NotificationActionButton * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationActionButton { /** @@ -34,7 +41,8 @@ export interface NotificationActionButton { * * @type { string } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ title: string; @@ -43,7 +51,8 @@ export interface NotificationActionButton { * * @type { WantAgent } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ wantAgent: WantAgent; @@ -56,12 +65,23 @@ export interface NotificationActionButton { */ extras?: { [key: string]: any }; + /** + * Extra information of the button. + * + * @type { ?object } + * @syscap SystemCapability.Notification.Notification + * @since 20 + * @arkts 1.2 + */ + extras?: Record; + /** * User input object. ID entered by a subscriber. * * @type { ?NotificationUserInput } * @syscap SystemCapability.Notification.Notification - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ userInput?: NotificationUserInput; } diff --git a/api/notification/notificationContent.d.ts b/api/notification/notificationContent.d.ts index ad6b1c4ec6..b71b498073 100644 --- a/api/notification/notificationContent.d.ts +++ b/api/notification/notificationContent.d.ts @@ -18,10 +18,12 @@ * @kit NotificationKit */ -import notification from '../@ohos.notification'; import image from '../@ohos.multimedia.image'; import { Resource } from '../global/resource'; import type notificationManager from '../@ohos.notificationManager'; +/*** if arkts 1.1 */ +import notification from '../@ohos.notification'; +/*** endif */ /** * Describes icon type. @@ -29,7 +31,8 @@ import type notificationManager from '../@ohos.notificationManager'; * @typedef { Resource | image.PixelMap } IconType * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ type IconType = Resource | image.PixelMap; @@ -46,7 +49,8 @@ type IconType = Resource | image.PixelMap; * @typedef NotificationBasicContent * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationBasicContent { /** @@ -61,7 +65,8 @@ export interface NotificationBasicContent { * @type { string } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ title: string; @@ -78,7 +83,8 @@ export interface NotificationBasicContent { * @type { string } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ text: string; @@ -87,7 +93,8 @@ export interface NotificationBasicContent { * * @type { ?string } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ additionalText?: string; @@ -98,7 +105,8 @@ export interface NotificationBasicContent { * * @type { ?image.PixelMap } * @syscap SystemCapability.Notification.Notification - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ lockscreenPicture?: image.PixelMap; } @@ -117,7 +125,8 @@ export interface NotificationBasicContent { * @typedef NotificationLongTextContent * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationLongTextContent extends NotificationBasicContent { /** @@ -133,7 +142,8 @@ export interface NotificationLongTextContent extends NotificationBasicContent { * @type { string } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ longText: string; @@ -150,7 +160,8 @@ export interface NotificationLongTextContent extends NotificationBasicContent { * @type { string } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ briefText: string; @@ -167,7 +178,8 @@ export interface NotificationLongTextContent extends NotificationBasicContent { * @type { string } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ expandedTitle: string; } @@ -178,7 +190,8 @@ export interface NotificationLongTextContent extends NotificationBasicContent { * @enum { number } * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum LiveViewStatus { /** @@ -186,7 +199,8 @@ export enum LiveViewStatus { * * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ LIVE_VIEW_CREATE = 0, /** @@ -194,7 +208,8 @@ export enum LiveViewStatus { * * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ LIVE_VIEW_INCREMENTAL_UPDATE = 1, /** @@ -202,7 +217,8 @@ export enum LiveViewStatus { * * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ LIVE_VIEW_END = 2, /** @@ -210,7 +226,8 @@ export enum LiveViewStatus { * * @syscap SystemCapability.Security.AccessToken * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ LIVE_VIEW_FULL_UPDATE = 3 } @@ -221,7 +238,8 @@ export enum LiveViewStatus { * @enum { number } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum LiveViewTypes { /** @@ -229,7 +247,8 @@ export enum LiveViewTypes { * * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ LIVE_VIEW_ACTIVITY = 0, /** @@ -237,7 +256,8 @@ export enum LiveViewTypes { * * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ LIVE_VIEW_INSTANT = 1, /** @@ -245,7 +265,8 @@ export enum LiveViewTypes { * * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ LIVE_VIEW_LONG_TERM = 2 } @@ -257,7 +278,8 @@ export enum LiveViewTypes { * @typedef NotificationLiveViewContent * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationLiveViewContent extends NotificationBasicContent { /** @@ -266,7 +288,8 @@ export interface NotificationLiveViewContent extends NotificationBasicContent { * @type { LiveViewStatus } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ status: LiveViewStatus; @@ -278,7 +301,8 @@ export interface NotificationLiveViewContent extends NotificationBasicContent { * @type { ?number } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ version?: number; @@ -288,7 +312,8 @@ export interface NotificationLiveViewContent extends NotificationBasicContent { * @type { ?Record} * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ extraInfo?: Record; @@ -298,7 +323,8 @@ export interface NotificationLiveViewContent extends NotificationBasicContent { * @type { ?Record> } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ pictureInfo?: Record>; @@ -308,7 +334,8 @@ export interface NotificationLiveViewContent extends NotificationBasicContent { * @type { ?boolean } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ isLocalUpdateOnly?: boolean; } @@ -327,7 +354,8 @@ export interface NotificationLiveViewContent extends NotificationBasicContent { * @typedef NotificationMultiLineContent * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationMultiLineContent extends NotificationBasicContent { /** @@ -343,7 +371,8 @@ export interface NotificationMultiLineContent extends NotificationBasicContent { * @type { string } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ briefText: string; @@ -360,7 +389,8 @@ export interface NotificationMultiLineContent extends NotificationBasicContent { * @type { string } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ longTitle: string; @@ -377,7 +407,8 @@ export interface NotificationMultiLineContent extends NotificationBasicContent { * @type { Array } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ lines: Array; } @@ -388,7 +419,8 @@ export interface NotificationMultiLineContent extends NotificationBasicContent { * @extends NotificationBasicContent * @typedef NotificationPictureContent * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationPictureContent extends NotificationBasicContent { /** @@ -396,7 +428,8 @@ export interface NotificationPictureContent extends NotificationBasicContent { * * @type { string } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ briefText: string; @@ -405,7 +438,8 @@ export interface NotificationPictureContent extends NotificationBasicContent { * * @type { string } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ expandedTitle: string; @@ -414,7 +448,8 @@ export interface NotificationPictureContent extends NotificationBasicContent { * * @type { image.PixelMap } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ picture: image.PixelMap; } @@ -427,7 +462,8 @@ export interface NotificationPictureContent extends NotificationBasicContent { * @extends NotificationBasicContent * @typedef NotificationSystemLiveViewContent * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationSystemLiveViewContent extends NotificationBasicContent { /** @@ -435,7 +471,8 @@ export interface NotificationSystemLiveViewContent extends NotificationBasicCont * * @type { number } * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ typeCode: number; @@ -444,7 +481,8 @@ export interface NotificationSystemLiveViewContent extends NotificationBasicCont * * @type { ?NotificationCapsule } * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ capsule?: NotificationCapsule; @@ -453,7 +491,8 @@ export interface NotificationSystemLiveViewContent extends NotificationBasicCont * * @type { ?NotificationButton } * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ button?: NotificationButton; @@ -463,7 +502,8 @@ export interface NotificationSystemLiveViewContent extends NotificationBasicCont * @type { ?Array } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ cardButtons?: Array; @@ -472,7 +512,8 @@ export interface NotificationSystemLiveViewContent extends NotificationBasicCont * * @type { ?NotificationTime } * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ time?: NotificationTime; @@ -481,7 +522,8 @@ export interface NotificationSystemLiveViewContent extends NotificationBasicCont * * @type { ?NotificationProgress } * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ progress?: NotificationProgress; @@ -491,7 +533,8 @@ export interface NotificationSystemLiveViewContent extends NotificationBasicCont * @type { number } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ liveViewType?: LiveViewTypes; } @@ -501,7 +544,8 @@ export interface NotificationSystemLiveViewContent extends NotificationBasicCont * * @typedef NotificationCapsule * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationCapsule { /** @@ -509,7 +553,8 @@ export interface NotificationCapsule { * * @type { ?string } * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ title?: string; @@ -518,7 +563,8 @@ export interface NotificationCapsule { * * @type { ?image.PixelMap } * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ icon?: image.PixelMap; @@ -527,7 +573,8 @@ export interface NotificationCapsule { * * @type { ?string } * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ backgroundColor?: string; @@ -537,7 +584,8 @@ export interface NotificationCapsule { * @type { ?string } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ content?: string; @@ -547,7 +595,8 @@ export interface NotificationCapsule { * @type { ?number } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ time?: number; @@ -557,7 +606,8 @@ export interface NotificationCapsule { * @type { ?Array } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ capsuleButtons?: Array; } @@ -567,7 +617,8 @@ export interface NotificationCapsule { * * @typedef NotificationIconButton * @syscap SystemCapability.Notification.Notification - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationIconButton { @@ -577,7 +628,8 @@ export interface NotificationIconButton { * @type { string } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ name: string; @@ -587,7 +639,8 @@ export interface NotificationIconButton { * @type { IconType } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ iconResource: IconType; @@ -597,7 +650,8 @@ export interface NotificationIconButton { * @type { ?string } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ text?: string; @@ -607,7 +661,8 @@ export interface NotificationIconButton { * @type { ?boolean } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ hidePanel?: boolean; } @@ -617,7 +672,8 @@ export interface NotificationIconButton { * * @typedef NotificationButton * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationButton { /** @@ -625,7 +681,8 @@ export interface NotificationButton { * * @type { ?Array } * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ names?: Array; @@ -634,7 +691,8 @@ export interface NotificationButton { * * @type { ?Array } * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ icons?: Array; @@ -643,7 +701,8 @@ export interface NotificationButton { * * @type { ?Array } * @syscap SystemCapability.Notification.Notification - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ iconsResource?: Array; } @@ -653,7 +712,8 @@ export interface NotificationButton { * * @typedef NotificationTime * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationTime { /** @@ -661,7 +721,8 @@ export interface NotificationTime { * * @type { ?number } * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ initialTime?: number; @@ -670,7 +731,8 @@ export interface NotificationTime { * * @type { ?boolean } * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isCountDown?: boolean; @@ -679,7 +741,8 @@ export interface NotificationTime { * * @type { ?boolean } * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isPaused?: boolean; @@ -688,7 +751,8 @@ export interface NotificationTime { * * @type { ?boolean } * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isInTitle?: boolean; } @@ -698,7 +762,8 @@ export interface NotificationTime { * * @typedef NotificationProgress * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationProgress { /** @@ -706,7 +771,8 @@ export interface NotificationProgress { * * @type { ?number } * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ maxValue?: number; @@ -715,7 +781,8 @@ export interface NotificationProgress { * * @type { ?number } * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ currentValue?: number; @@ -724,7 +791,8 @@ export interface NotificationProgress { * * @type { ?boolean } * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isPercentage?: boolean; } @@ -742,7 +810,8 @@ export interface NotificationProgress { * @typedef NotificationContent * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationContent { /** @@ -769,7 +838,8 @@ export interface NotificationContent { * @type { ?notificationManager.ContentType } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ notificationContentType?: notificationManager.ContentType; @@ -786,7 +856,8 @@ export interface NotificationContent { * @type { ?NotificationBasicContent } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ normal?: NotificationBasicContent; @@ -803,7 +874,8 @@ export interface NotificationContent { * @type { ?NotificationLongTextContent } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ longText?: NotificationLongTextContent; @@ -820,7 +892,8 @@ export interface NotificationContent { * @type { ?NotificationMultiLineContent } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ multiLine?: NotificationMultiLineContent; @@ -829,7 +902,8 @@ export interface NotificationContent { * * @type { ?NotificationPictureContent } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ picture?: NotificationPictureContent; @@ -839,7 +913,8 @@ export interface NotificationContent { * * @type { ?NotificationSystemLiveViewContent } * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ systemLiveView?: NotificationSystemLiveViewContent; @@ -849,7 +924,8 @@ export interface NotificationContent { * @type { ?NotificationLiveViewContent } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ liveView?: NotificationLiveViewContent; } diff --git a/api/notification/notificationFlags.d.ts b/api/notification/notificationFlags.d.ts index 3d5c2ea37b..6a6c98fa37 100644 --- a/api/notification/notificationFlags.d.ts +++ b/api/notification/notificationFlags.d.ts @@ -31,7 +31,8 @@ * * @enum { number } * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum NotificationFlagStatus { /** @@ -45,7 +46,8 @@ export enum NotificationFlagStatus { * The default flag is used. The effect is the same as that of TYPE_OPEN. * * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ TYPE_NONE = 0, @@ -60,7 +62,8 @@ export enum NotificationFlagStatus { * The notification flag is enabled. * * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ TYPE_OPEN = 1, @@ -75,7 +78,8 @@ export enum NotificationFlagStatus { * The notification flag is disabled. * * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ TYPE_CLOSE = 2 } @@ -85,7 +89,8 @@ export enum NotificationFlagStatus { * * @typedef NotificationFlags * @syscap SystemCapability.Notification.Notification - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationFlags { /** @@ -94,7 +99,8 @@ export interface NotificationFlags { * @type { ?NotificationFlagStatus } * @readonly * @syscap SystemCapability.Notification.Notification - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly soundEnabled?: NotificationFlagStatus; @@ -104,7 +110,8 @@ export interface NotificationFlags { * @type { ?NotificationFlagStatus } * @readonly * @syscap SystemCapability.Notification.Notification - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly vibrationEnabled?: NotificationFlagStatus; @@ -115,7 +122,8 @@ export interface NotificationFlags { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly reminderFlags?: number; } diff --git a/api/notification/notificationRequest.d.ts b/api/notification/notificationRequest.d.ts index 96aefd6a20..7d96eeb8ae 100644 --- a/api/notification/notificationRequest.d.ts +++ b/api/notification/notificationRequest.d.ts @@ -18,16 +18,22 @@ * @kit NotificationKit */ -import notification from '../@ohos.notification'; import image from '../@ohos.multimedia.image'; import type notificationManager from '../@ohos.notificationManager'; import type notificationSubscribe from '../@ohos.notificationSubscribe'; -import { WantAgent } from '../@ohos.wantAgent'; import { NotificationContent } from './notificationContent'; import { NotificationActionButton } from './notificationActionButton'; import { NotificationTemplate } from './notificationTemplate'; import { NotificationFlags } from './notificationFlags'; +/*** if arkts 1.1 */ +import notification from '../@ohos.notification'; +import { WantAgent } from '../@ohos.wantAgent'; import type { BundleOption } from './NotificationCommonDef'; +/*** endif */ +/*** if arkts 1.2 */ +import { WantAgent } from '../@ohos.app.ability.wantAgent'; +import { BundleOption } from './NotificationCommonDef'; +/*** endif */ /** * Defines a NotificationRequest instance. @@ -42,7 +48,8 @@ import type { BundleOption } from './NotificationCommonDef'; * @typedef NotificationRequest * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationRequest { /** @@ -58,7 +65,8 @@ export interface NotificationRequest { * @type { NotificationContent } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ content: NotificationContent; @@ -75,7 +83,8 @@ export interface NotificationRequest { * @type { ?number } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ id?: number; @@ -87,7 +96,8 @@ export interface NotificationRequest { * * @type { ?string } * @syscap SystemCapability.Notification.Notification - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ appMessageId?: string; @@ -107,7 +117,8 @@ export interface NotificationRequest { * * @type { ?notificationManager.SlotType } * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ notificationSlotType?: notificationManager.SlotType; @@ -124,7 +135,8 @@ export interface NotificationRequest { * @type { ?boolean } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ isOngoing?: boolean; @@ -133,7 +145,8 @@ export interface NotificationRequest { * * @type { ?boolean } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ isUnremovable?: boolean; @@ -144,7 +157,8 @@ export interface NotificationRequest { * * @type { ?boolean } * @syscap SystemCapability.Notification.Notification - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ updateOnly?: boolean; @@ -161,7 +175,8 @@ export interface NotificationRequest { * @type { ?number } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ deliveryTime?: number; @@ -182,7 +197,8 @@ export interface NotificationRequest { * @type { ?boolean } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ tapDismissed?: boolean; @@ -201,7 +217,8 @@ export interface NotificationRequest { * @type { ?number } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ autoDeletedTime?: number; @@ -210,7 +227,8 @@ export interface NotificationRequest { * * @type { ?WantAgent } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ wantAgent?: WantAgent; @@ -230,6 +248,7 @@ export interface NotificationRequest { * @syscap SystemCapability.Notification.Notification * @systemapi * @since 20 + * @arkts 1.2 */ extendInfo?: Record; @@ -238,7 +257,8 @@ export interface NotificationRequest { * * @type { ?number } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ color?: number; @@ -247,7 +267,8 @@ export interface NotificationRequest { * * @type { ?boolean } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ colorEnabled?: boolean; @@ -268,7 +289,8 @@ export interface NotificationRequest { * @type { ?boolean } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ isAlertOnce?: boolean; @@ -277,7 +299,8 @@ export interface NotificationRequest { * * @type { ?boolean } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ isStopwatch?: boolean; @@ -286,7 +309,8 @@ export interface NotificationRequest { * * @type { ?boolean } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ isCountDown?: boolean; @@ -295,7 +319,8 @@ export interface NotificationRequest { * * @type { ?boolean } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ isFloatingIcon?: boolean; @@ -305,7 +330,8 @@ export interface NotificationRequest { * * @type { ?string } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ label?: string; @@ -314,7 +340,8 @@ export interface NotificationRequest { * * @type { ?number } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ badgeIconStyle?: number; @@ -331,7 +358,8 @@ export interface NotificationRequest { * @type { ?boolean } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ showDeliveryTime?: boolean; @@ -340,7 +368,8 @@ export interface NotificationRequest { * * @type { ?Array } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ actionButtons?: Array; @@ -349,7 +378,8 @@ export interface NotificationRequest { * * @type { ?image.PixelMap } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ smallIcon?: image.PixelMap; @@ -358,7 +388,8 @@ export interface NotificationRequest { * * @type { ?image.PixelMap } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ largeIcon?: image.PixelMap; @@ -368,7 +399,8 @@ export interface NotificationRequest { * @type { ?image.PixelMap } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ overlayIcon?: image.PixelMap; @@ -385,7 +417,8 @@ export interface NotificationRequest { * @type { ?string } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ groupName?: string; @@ -395,7 +428,8 @@ export interface NotificationRequest { * @type { ?string } * @readonly * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly creatorBundleName?: string; @@ -405,7 +439,8 @@ export interface NotificationRequest { * @type { ?number } * @readonly * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly creatorUid?: number; @@ -415,7 +450,8 @@ export interface NotificationRequest { * @type { ?number } * @readonly * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly creatorPid?: number; @@ -425,7 +461,8 @@ export interface NotificationRequest { * @type { ?number } * @readonly * @syscap SystemCapability.Notification.Notification - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly creatorUserId?: number; @@ -447,7 +484,8 @@ export interface NotificationRequest { * * @type { ?string } * @syscap SystemCapability.Notification.Notification - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ sound?: string; @@ -457,7 +495,8 @@ export interface NotificationRequest { * @type { ?string } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ classification?: string; @@ -467,7 +506,8 @@ export interface NotificationRequest { * @type { ?string } * @readonly * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly hashCode?: string; @@ -488,7 +528,8 @@ export interface NotificationRequest { * @default true * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isRemoveAllowed?: boolean; @@ -499,7 +540,8 @@ export interface NotificationRequest { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly source?: number; @@ -508,7 +550,8 @@ export interface NotificationRequest { * * @type { ?NotificationTemplate } * @syscap SystemCapability.Notification.Notification - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ template?: NotificationTemplate; @@ -517,7 +560,8 @@ export interface NotificationRequest { * * @type { ?DistributedOptions } * @syscap SystemCapability.Notification.Notification - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ distributedOption?: DistributedOptions; @@ -528,7 +572,8 @@ export interface NotificationRequest { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly deviceId?: string; @@ -538,7 +583,8 @@ export interface NotificationRequest { * @type { ?NotificationFlags } * @readonly * @syscap SystemCapability.Notification.Notification - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly notificationFlags?: NotificationFlags; @@ -548,7 +594,8 @@ export interface NotificationRequest { * * @type { ?WantAgent } * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ removalWantAgent?: WantAgent; @@ -565,7 +612,8 @@ export interface NotificationRequest { * @type { ?number } * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ badgeNumber?: number; @@ -575,7 +623,8 @@ export interface NotificationRequest { * @type { ?BundleOption } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ representativeBundle?: BundleOption; @@ -586,7 +635,8 @@ export interface NotificationRequest { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly agentBundle?: BundleOption; @@ -596,7 +646,8 @@ export interface NotificationRequest { * @type { ?UnifiedGroupInfo } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ unifiedGroupInfo?: UnifiedGroupInfo; @@ -606,7 +657,8 @@ export interface NotificationRequest { * @type { ?number } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ notificationControlFlags?: number; @@ -617,7 +669,8 @@ export interface NotificationRequest { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly appInstanceKey?: string; @@ -628,7 +681,8 @@ export interface NotificationRequest { * @default false * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ forceDistributed?: boolean; @@ -639,7 +693,8 @@ export interface NotificationRequest { * @default false * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ notDistributed?: boolean; } @@ -649,7 +704,8 @@ export interface NotificationRequest { * * @typedef DistributedOptions * @syscap SystemCapability.Notification.Notification - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface DistributedOptions { /** @@ -658,7 +714,8 @@ export interface DistributedOptions { * @type { ?boolean } * @default true * @syscap SystemCapability.Notification.Notification - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ isDistributed?: boolean; @@ -667,7 +724,8 @@ export interface DistributedOptions { * * @type { ?Array } * @syscap SystemCapability.Notification.Notification - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ supportDisplayDevices?: Array; @@ -676,7 +734,8 @@ export interface DistributedOptions { * * @type { ?Array } * @syscap SystemCapability.Notification.Notification - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ supportOperateDevices?: Array; @@ -687,7 +746,8 @@ export interface DistributedOptions { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly remindType?: number; } @@ -698,7 +758,8 @@ export interface DistributedOptions { * @typedef NotificationFilter * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationFilter { /** @@ -707,7 +768,8 @@ export interface NotificationFilter { * @type { BundleOption } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ bundle: BundleOption; @@ -717,7 +779,8 @@ export interface NotificationFilter { * @type { notificationSubscribe.NotificationKey } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ notificationKey: notificationSubscribe.NotificationKey; @@ -727,7 +790,8 @@ export interface NotificationFilter { * @type { ?Array } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ extraInfoKeys?: Array; } @@ -738,7 +802,8 @@ export interface NotificationFilter { * @typedef NotificationCheckRequest * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationCheckRequest { /** @@ -747,7 +812,8 @@ export interface NotificationCheckRequest { * @type { notificationManager.ContentType } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ contentType: notificationManager.ContentType; @@ -757,7 +823,8 @@ export interface NotificationCheckRequest { * @type { notificationManager.SlotType } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ slotType: notificationManager.SlotType; @@ -767,7 +834,8 @@ export interface NotificationCheckRequest { * @type { Array } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ extraInfoKeys: Array; } @@ -778,7 +846,8 @@ export interface NotificationCheckRequest { * @typedef UnifiedGroupInfo * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface UnifiedGroupInfo { /** @@ -787,7 +856,8 @@ export interface UnifiedGroupInfo { * @type { ?string } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ key?: string; @@ -797,7 +867,8 @@ export interface UnifiedGroupInfo { * @type { ?string } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ title?: string; @@ -807,7 +878,8 @@ export interface UnifiedGroupInfo { * @type { ?string } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ content?: string; @@ -817,7 +889,8 @@ export interface UnifiedGroupInfo { * @type { ?string } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ sceneName?: string; @@ -830,4 +903,15 @@ export interface UnifiedGroupInfo { * @since 12 */ extraInfo?: { [key: string]: any }; + + /** + * Other information is aggregated across applications. + * + * @type { ?object } + * @syscap SystemCapability.Notification.Notification + * @systemapi + * @since 20 + * @arkts 1.2 + */ + extraInfo?: Record; } diff --git a/api/notification/notificationSlot.d.ts b/api/notification/notificationSlot.d.ts index a6255c1ab4..9b7f6da534 100644 --- a/api/notification/notificationSlot.d.ts +++ b/api/notification/notificationSlot.d.ts @@ -18,15 +18,20 @@ * @kit NotificationKit */ +/*** if arkts 1.1 */ import notification from '../@ohos.notification'; +/*** endif */ +/*** if arkts 1.1&1.2 */ import type notificationManager from '../@ohos.notificationManager'; +/*** endif */ /** * The NotificationSlot module provides APIs for defining the notification slot. * * @typedef NotificationSlot * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationSlot { /** @@ -45,7 +50,8 @@ export interface NotificationSlot { * * @type { ?notificationManager.SlotType } * @syscap SystemCapability.Notification.Notification - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ notificationType?: notificationManager.SlotType; @@ -58,12 +64,25 @@ export interface NotificationSlot { */ level?: notification.SlotLevel; + /** + * SlotLevel is used to regulate the display behavior and alert mechanisms of notifications. + * Each value of SlotLevel determines whether the system displays notification icons in the status bar, + * shows banners, or plays prompt tones. + * + * @type { ?notificationManager.SlotLevel } + * @syscap SystemCapability.Notification.Notification + * @since arkts {'1.1':'20', '1.2':'20'} + * @arkts 1.1&1.2 + */ + notificationLevel?: notificationManager.SlotLevel; + /** * Notification slot description. * * @type { ?string } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ desc?: string; @@ -72,7 +91,8 @@ export interface NotificationSlot { * * @type { ?boolean } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ badgeFlag?: boolean; @@ -81,7 +101,8 @@ export interface NotificationSlot { * * @type { ?boolean } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ bypassDnd?: boolean; @@ -90,7 +111,8 @@ export interface NotificationSlot { * * @type { ?number } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ lockscreenVisibility?: number; @@ -99,7 +121,8 @@ export interface NotificationSlot { * * @type { ?boolean } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ vibrationEnabled?: boolean; @@ -108,7 +131,8 @@ export interface NotificationSlot { * * @type { ?string } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ sound?: string; @@ -117,7 +141,8 @@ export interface NotificationSlot { * * @type { ?boolean } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ lightEnabled?: boolean; @@ -126,7 +151,8 @@ export interface NotificationSlot { * * @type { ?number } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ lightColor?: number; @@ -135,7 +161,8 @@ export interface NotificationSlot { * * @type { ?Array } * @syscap SystemCapability.Notification.Notification - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ vibrationValues?: Array; @@ -145,7 +172,8 @@ export interface NotificationSlot { * @type { ?boolean } * @readonly * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly enabled?: boolean; @@ -156,7 +184,8 @@ export interface NotificationSlot { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly reminderMode?: number; @@ -167,7 +196,8 @@ export interface NotificationSlot { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly authorizedStatus?: number; } diff --git a/api/notification/notificationSorting.d.ts b/api/notification/notificationSorting.d.ts index 0a0669db3d..b4aa0b9cd4 100644 --- a/api/notification/notificationSorting.d.ts +++ b/api/notification/notificationSorting.d.ts @@ -26,7 +26,8 @@ import { NotificationSlot } from './notificationSlot'; * @typedef NotificationSorting * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationSorting { /** @@ -36,7 +37,8 @@ export interface NotificationSorting { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly slot: NotificationSlot; @@ -47,7 +49,8 @@ export interface NotificationSorting { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly hashCode: string; @@ -58,7 +61,8 @@ export interface NotificationSorting { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly ranking: number; } diff --git a/api/notification/notificationSortingMap.d.ts b/api/notification/notificationSortingMap.d.ts index 9ba685aa1d..e4b6b7cd0b 100644 --- a/api/notification/notificationSortingMap.d.ts +++ b/api/notification/notificationSortingMap.d.ts @@ -26,9 +26,10 @@ import { NotificationSorting } from './notificationSorting'; * @typedef NotificationSortingMap * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ -interface NotificationSortingMap { +export interface NotificationSortingMap { /** * An array of notification sort information. * @@ -36,7 +37,8 @@ interface NotificationSortingMap { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly sortings: Record; @@ -47,7 +49,8 @@ interface NotificationSortingMap { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly sortedHashCode: Array; } diff --git a/api/notification/notificationSubscribeInfo.d.ts b/api/notification/notificationSubscribeInfo.d.ts index 12e41dd97d..bb4891eabe 100644 --- a/api/notification/notificationSubscribeInfo.d.ts +++ b/api/notification/notificationSubscribeInfo.d.ts @@ -26,7 +26,8 @@ import type notificationManager from '../@ohos.notificationManager'; * @typedef NotificationSubscribeInfo * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationSubscribeInfo { /** @@ -35,7 +36,8 @@ export interface NotificationSubscribeInfo { * @type { ?Array } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ bundleNames?: Array; @@ -45,7 +47,8 @@ export interface NotificationSubscribeInfo { * @type { ?number } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ userId?: number; @@ -55,7 +58,8 @@ export interface NotificationSubscribeInfo { * @type { ?string } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ deviceType?: string; @@ -65,7 +69,8 @@ export interface NotificationSubscribeInfo { * @type { ?Array } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ slotTypes?: Array; @@ -75,7 +80,8 @@ export interface NotificationSubscribeInfo { * @type { ?number } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ filterLimit?: number; } diff --git a/api/notification/notificationSubscriber.d.ts b/api/notification/notificationSubscriber.d.ts index eae4b2f001..53245e4922 100644 --- a/api/notification/notificationSubscriber.d.ts +++ b/api/notification/notificationSubscriber.d.ts @@ -20,8 +20,13 @@ import { NotificationRequest } from './notificationRequest'; import { NotificationSortingMap } from './notificationSortingMap'; +/*** if arkts 1.1 */ import notification from '../@ohos.notification'; import type notificationManager from '../@ohos.notificationManager'; +/*** endif */ +/*** if arkts 1.2 */ +import type notificationManager from '../@ohos.notificationManager'; +/*** endif */ /** * Provides methods that will be called back when the subscriber receives a new notification or @@ -30,7 +35,8 @@ import type notificationManager from '../@ohos.notificationManager'; * @interface NotificationSubscriber * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationSubscriber { /** @@ -39,7 +45,8 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ onConsume?: (data: SubscribeCallbackData) => void; @@ -49,7 +56,8 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ onCancel?: (data: SubscribeCallbackData) => void; @@ -59,7 +67,8 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ onUpdate?: (data: NotificationSortingMap) => void; @@ -69,7 +78,8 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ onConnect?: () => void; @@ -79,7 +89,8 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ onDisconnect?: () => void; @@ -89,7 +100,8 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ onDestroy?: () => void; @@ -111,7 +123,8 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onDoNotDisturbChanged?: (mode: notificationManager.DoNotDisturbDate) => void; @@ -121,7 +134,8 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ onEnabledNotificationChanged?: (callbackData: EnabledNotificationCallbackData) => void; @@ -131,7 +145,8 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ onBadgeChanged?: (data: BadgeNumberCallbackData) => void; @@ -141,7 +156,8 @@ export interface NotificationSubscriber { * @type { ?BadgeEnabledChangedCallback } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onBadgeEnabledChanged?: BadgeEnabledChangedCallback; @@ -151,7 +167,8 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onBatchCancel?: (data: Array) => void; } @@ -163,7 +180,8 @@ export interface NotificationSubscriber { * @typedef SubscribeCallbackData * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface SubscribeCallbackData { /** @@ -173,7 +191,8 @@ export interface SubscribeCallbackData { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly request: NotificationRequest; @@ -184,7 +203,8 @@ export interface SubscribeCallbackData { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly sortingMap?: NotificationSortingMap; @@ -195,7 +215,8 @@ export interface SubscribeCallbackData { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly reason?: number; @@ -206,7 +227,8 @@ export interface SubscribeCallbackData { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly sound?: string; @@ -217,7 +239,8 @@ export interface SubscribeCallbackData { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly vibrationValues?: Array; } @@ -229,7 +252,8 @@ export interface SubscribeCallbackData { * @typedef EnabledNotificationCallbackData * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface EnabledNotificationCallbackData { /** @@ -239,7 +263,8 @@ export interface EnabledNotificationCallbackData { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly bundle: string; @@ -250,7 +275,8 @@ export interface EnabledNotificationCallbackData { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly uid: number; @@ -261,7 +287,8 @@ export interface EnabledNotificationCallbackData { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly enable: boolean; } @@ -272,7 +299,8 @@ export interface EnabledNotificationCallbackData { * @typedef BadgeNumberCallbackData * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface BadgeNumberCallbackData { /** @@ -282,7 +310,8 @@ export interface BadgeNumberCallbackData { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly bundle: string; @@ -293,7 +322,8 @@ export interface BadgeNumberCallbackData { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly uid: number; @@ -304,7 +334,8 @@ export interface BadgeNumberCallbackData { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly badgeNumber: number; @@ -328,7 +359,8 @@ export interface BadgeNumberCallbackData { * @readonly * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly appInstanceKey?: string; } @@ -349,3 +381,12 @@ export interface BadgeEnabledChangedCallback { */ (data: EnabledNotificationCallbackData): void; } +/** + * Defines the BadgeEnabledChanged callback. + * @param { EnabledNotificationCallbackData } data + * @syscap SystemCapability.Notification.Notification + * @systemapi + * @since 20 + * @arkts 1.2 + */ +export type BadgeEnabledChangedCallback = (data: EnabledNotificationCallbackData) => void; \ No newline at end of file diff --git a/api/notification/notificationTemplate.d.ts b/api/notification/notificationTemplate.d.ts index 045e95888d..7452c69182 100644 --- a/api/notification/notificationTemplate.d.ts +++ b/api/notification/notificationTemplate.d.ts @@ -23,7 +23,8 @@ * * @typedef NotificationTemplate * @syscap SystemCapability.Notification.Notification - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationTemplate { /** @@ -31,7 +32,8 @@ export interface NotificationTemplate { * * @type { string } * @syscap SystemCapability.Notification.Notification - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ name: string; @@ -43,7 +45,8 @@ export interface NotificationTemplate { * * @type { Record } * @syscap SystemCapability.Notification.Notification - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ data: Record; } diff --git a/api/notification/notificationUserInput.d.ts b/api/notification/notificationUserInput.d.ts index 77b0e7833f..1c708c237f 100644 --- a/api/notification/notificationUserInput.d.ts +++ b/api/notification/notificationUserInput.d.ts @@ -23,7 +23,8 @@ * * @typedef NotificationUserInput * @syscap SystemCapability.Notification.Notification - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface NotificationUserInput { /** @@ -31,7 +32,8 @@ export interface NotificationUserInput { * * @type { string } * @syscap SystemCapability.Notification.Notification - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ inputKey: string; } -- Gitee From ab7e1315abc53b758574d1a82241374d0b1f02e9 Mon Sep 17 00:00:00 2001 From: Michael Wang Date: Sat, 12 Jul 2025 11:27:41 +0800 Subject: [PATCH 074/746] add Signed-off-by: Michael Wang --- api/@ohos.notificationManager.d.ts | 4 ++-- api/notification/notificationRequest.d.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/@ohos.notificationManager.d.ts b/api/@ohos.notificationManager.d.ts index ac61fddd8a..47011be7cd 100644 --- a/api/@ohos.notificationManager.d.ts +++ b/api/@ohos.notificationManager.d.ts @@ -4208,7 +4208,7 @@ declare namespace notificationManager { * @type { SlotType } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'10', '1.2':'20'} + * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ slotType: SlotType; @@ -4220,7 +4220,7 @@ declare namespace notificationManager { * @type { ?Record } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'10', '1.2':'20'} + * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ extraInfos?: Record; diff --git a/api/notification/notificationRequest.d.ts b/api/notification/notificationRequest.d.ts index 7d96eeb8ae..10b3185f80 100644 --- a/api/notification/notificationRequest.d.ts +++ b/api/notification/notificationRequest.d.ts @@ -248,7 +248,7 @@ export interface NotificationRequest { * @syscap SystemCapability.Notification.Notification * @systemapi * @since 20 - * @arkts 1.2 + * @arkts 1.1&1.2 */ extendInfo?: Record; -- Gitee From dc9052af7852d7fe8b7ab7910d71c83ffcbcef86 Mon Sep 17 00:00:00 2001 From: zhangwt3652 Date: Fri, 11 Jul 2025 22:10:34 +0800 Subject: [PATCH 075/746] audio arkts1.2 api update Signed-off-by: zhangwt3652 --- api/@ohos.multimedia.audio.d.ts | 2945 +++++++++++++++++++------------ 1 file changed, 1852 insertions(+), 1093 deletions(-) diff --git a/api/@ohos.multimedia.audio.d.ts b/api/@ohos.multimedia.audio.d.ts index 51e751d8c4..7a6a21326d 100644 --- a/api/@ohos.multimedia.audio.d.ts +++ b/api/@ohos.multimedia.audio.d.ts @@ -29,21 +29,23 @@ import { ErrorCallback, AsyncCallback, Callback } from './@ohos.base'; * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace audio { /** * Enumerates audio errors. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @since 9 */ /** * Enumerates audio errors. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioErrors { /** @@ -55,7 +57,8 @@ declare namespace audio { * Invalid parameter. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERROR_INVALID_PARAM = 6800101, /** @@ -67,7 +70,8 @@ declare namespace audio { * Allocate memory failed. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERROR_NO_MEMORY = 6800102, /** @@ -79,7 +83,8 @@ declare namespace audio { * Operation not permit at current state. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERROR_ILLEGAL_STATE = 6800103, /** @@ -91,19 +96,22 @@ declare namespace audio { * Unsupported option. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERROR_UNSUPPORTED = 6800104, /** * Time out. * @syscap SystemCapability.Multimedia.Audio.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ ERROR_TIMEOUT = 6800105, /** * Audio specific errors. * @syscap SystemCapability.Multimedia.Audio.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ ERROR_STREAM_LIMIT = 6800201, /** @@ -115,7 +123,8 @@ declare namespace audio { * Default error. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERROR_SYSTEM = 6800301 } @@ -124,7 +133,8 @@ declare namespace audio { * Define local device network id for audio * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ const LOCAL_NETWORK_ID: string; @@ -137,16 +147,18 @@ declare namespace audio { * Define default volume group id for audio * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - const DEFAULT_VOLUME_GROUP_ID: number; + const DEFAULT_VOLUME_GROUP_ID: int; /** * Define default interrupt group id for audio * @syscap SystemCapability.Multimedia.Audio.Interrupt - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ - const DEFAULT_INTERRUPT_GROUP_ID: number; + const DEFAULT_INTERRUPT_GROUP_ID: int; /** * Obtains an {@link AudioManager} instance. @@ -163,7 +175,8 @@ declare namespace audio { * @returns { AudioManager } this {@link AudioManager} object. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function getAudioManager(): AudioManager; @@ -184,7 +197,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the audio capturer instance. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createAudioCapturer(options: AudioCapturerOptions, callback: AsyncCallback): void; @@ -205,7 +219,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the audio capturer instance. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createAudioCapturer(options: AudioCapturerOptions): Promise; @@ -240,7 +255,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the audio renderer instance. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createAudioRenderer(options: AudioRendererOptions, callback: AsyncCallback): void; @@ -275,7 +291,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the audio renderer instance. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createAudioRenderer(options: AudioRendererOptions): Promise; @@ -285,7 +302,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the tonePlayer instance. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function createTonePlayer(options: AudioRendererInfo, callback: AsyncCallback): void; @@ -295,7 +313,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the tonePlayer instance. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function createTonePlayer(options: AudioRendererInfo): Promise; @@ -316,16 +335,17 @@ declare namespace audio { /** * Enumerates the audio states. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @since 8 */ /** * Enumerates the audio states. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioState { /** @@ -337,7 +357,8 @@ declare namespace audio { * Invalid state. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STATE_INVALID = -1, /** @@ -349,7 +370,8 @@ declare namespace audio { * Create new instance state. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STATE_NEW = 0, /** @@ -361,7 +383,8 @@ declare namespace audio { * Prepared state. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STATE_PREPARED = 1, /** @@ -373,7 +396,8 @@ declare namespace audio { * Running state. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STATE_RUNNING = 2, /** @@ -385,7 +409,8 @@ declare namespace audio { * Stopped state. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STATE_STOPPED = 3, /** @@ -397,7 +422,8 @@ declare namespace audio { * Released state. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STATE_RELEASED = 4, /** @@ -409,7 +435,8 @@ declare namespace audio { * Paused state. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STATE_PAUSED = 5 } @@ -464,16 +491,17 @@ declare namespace audio { /** * Enumerates audio stream types. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Volume * @since 7 */ /** * Enumerates audio stream types. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioVolumeType { /** @@ -485,7 +513,8 @@ declare namespace audio { * Audio volume type for voice calls. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ VOICE_CALL = 0, /** @@ -497,7 +526,8 @@ declare namespace audio { * Audio volume type for ringtones. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ RINGTONE = 2, /** @@ -509,7 +539,8 @@ declare namespace audio { * Audio volume type for media purpose. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MEDIA = 3, /** @@ -521,7 +552,8 @@ declare namespace audio { * Audio volume type for alarm purpose. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ALARM = 4, /** @@ -533,20 +565,31 @@ declare namespace audio { * Audio volume type for accessibility purpose. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ACCESSIBILITY = 5, + /** + * Audio volume for system sound. + * @syscap SystemCapability.Multimedia.Audio.Volume + * @systemapi + * @since 20 + * @arkts 1.1&1.2 + */ + SYSTEM = 6, /** * Audio volume type for voice assistant. * @syscap SystemCapability.Multimedia.Audio.Volume - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ VOICE_ASSISTANT = 9, /** * Audio volume type for ultrasonic. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ ULTRASONIC = 10, /** @@ -567,30 +610,33 @@ declare namespace audio { * Audio volume type for all common. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ ALL = 100, } /** * Enumerates audio device flags. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Device * @since 7 */ /** * Enumerates audio device flags. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum DeviceFlag { /** * None devices. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ NONE_DEVICES_FLAG = 0, /** @@ -602,7 +648,8 @@ declare namespace audio { * Output devices. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ OUTPUT_DEVICES_FLAG = 1, /** @@ -614,7 +661,8 @@ declare namespace audio { * Input devices. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ INPUT_DEVICES_FLAG = 2, /** @@ -626,90 +674,102 @@ declare namespace audio { * All devices. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ALL_DEVICES_FLAG = 3, /** * Distributed output devices. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ DISTRIBUTED_OUTPUT_DEVICES_FLAG = 4, /** * Distributed input devices. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ DISTRIBUTED_INPUT_DEVICES_FLAG = 8, /** * All Distributed devices. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ ALL_DISTRIBUTED_DEVICES_FLAG = 12, } /** * Enumerates audio device for usage. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Device - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum DeviceUsage { /** * Media output devices. * @syscap SystemCapability.Multimedia.Audio.Device - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MEDIA_OUTPUT_DEVICES = 1, /** * Media input devices. * @syscap SystemCapability.Multimedia.Audio.Device - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MEDIA_INPUT_DEVICES = 2, /** * All media devices. * @syscap SystemCapability.Multimedia.Audio.Device - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ALL_MEDIA_DEVICES = 3, /** * Call output devices. * @syscap SystemCapability.Multimedia.Audio.Device - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CALL_OUTPUT_DEVICES = 4, /** * Call input devices. * @syscap SystemCapability.Multimedia.Audio.Device - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CALL_INPUT_DEVICES = 8, /** * All call devices. * @syscap SystemCapability.Multimedia.Audio.Device - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ALL_CALL_DEVICES = 12, } /** * Enumerates device roles. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Device * @since 7 */ /** * Enumerates device roles. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum DeviceRole { /** @@ -722,7 +782,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ INPUT_DEVICE = 1, /** @@ -735,24 +796,26 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ OUTPUT_DEVICE = 2, } /** * Enumerates device types. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Device * @since 7 */ /** * Enumerates device types. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum DeviceType { /** @@ -765,7 +828,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ INVALID = 0, /** @@ -778,7 +842,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ EARPIECE = 1, /** @@ -791,7 +856,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SPEAKER = 2, /** @@ -804,7 +870,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ WIRED_HEADSET = 3, /** @@ -817,7 +884,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ WIRED_HEADPHONES = 4, /** @@ -830,7 +898,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ BLUETOOTH_SCO = 7, /** @@ -843,7 +912,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ BLUETOOTH_A2DP = 8, /** @@ -856,7 +926,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MIC = 15, /** @@ -869,54 +940,62 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ USB_HEADSET = 22, /** * Display port device. * @syscap SystemCapability.Multimedia.Audio.Device * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DISPLAY_PORT = 23, /** * Device type for rerouting audio to other remote devices by system application * @syscap SystemCapability.Multimedia.Audio.Device * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ REMOTE_CAST = 24, /** * USB audio device. * @syscap SystemCapability.Multimedia.Audio.Device - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ USB_DEVICE = 25, /** * Accessory devices, such as the mic on remote control. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ ACCESSORY = 26, /** * HDMI device, such as HDMI, ARC, eARC * @syscap SystemCapability.Multimedia.Audio.Device - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ HDMI = 27, /** * Line connected digital output device, such as s/pdif * @syscap SystemCapability.Multimedia.Audio.Device - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ LINE_DIGITAL = 28, /** * Distributed virtualization audio device. * @syscap SystemCapability.Multimedia.Audio.Device * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ REMOTE_DAUDIO = 29, /** @@ -935,7 +1014,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DEFAULT = 1000, } @@ -968,16 +1048,17 @@ declare namespace audio { /** * Enumerates the available device types for communication. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Communication * @since 9 */ /** * Enumerates the available device types for communication. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Communication * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum CommunicationDeviceType { /** @@ -989,23 +1070,25 @@ declare namespace audio { * Speaker. * @syscap SystemCapability.Multimedia.Audio.Communication * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SPEAKER = 2 } /** * Enumerates ringer modes. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Communication * @since 7 */ /** * Enumerates ringer modes. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Communication * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioRingMode { /** @@ -1017,7 +1100,8 @@ declare namespace audio { * Silent mode. * @syscap SystemCapability.Multimedia.Audio.Communication * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ RINGER_MODE_SILENT = 0, /** @@ -1029,7 +1113,8 @@ declare namespace audio { * Vibration mode. * @syscap SystemCapability.Multimedia.Audio.Communication * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ RINGER_MODE_VIBRATE = 1, /** @@ -1041,47 +1126,52 @@ declare namespace audio { * Normal mode. * @syscap SystemCapability.Multimedia.Audio.Communication * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ RINGER_MODE_NORMAL = 2, } /** * Enumerates type. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum PolicyType { /** * EDM type. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ EDM = 0, /** * PRIVACY type. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ PRIVACY = 1, } /** * Enumerates the audio sample formats. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @since 8 */ /** * Enumerates the audio sample formats. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioSampleFormat { /** @@ -1093,7 +1183,8 @@ declare namespace audio { * Invalid format. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SAMPLE_FORMAT_INVALID = -1, /** @@ -1105,7 +1196,8 @@ declare namespace audio { * Unsigned 8 format. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SAMPLE_FORMAT_U8 = 0, /** @@ -1117,7 +1209,8 @@ declare namespace audio { * Signed 16 bit integer, little endian. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SAMPLE_FORMAT_S16LE = 1, /** @@ -1129,7 +1222,8 @@ declare namespace audio { * Signed 24 bit integer, little endian. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SAMPLE_FORMAT_S24LE = 2, /** @@ -1141,7 +1235,8 @@ declare namespace audio { * Signed 32 bit integer, little endian. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SAMPLE_FORMAT_S32LE = 3, /** @@ -1153,23 +1248,25 @@ declare namespace audio { * Signed 32 bit float, little endian. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SAMPLE_FORMAT_F32LE = 4, } /** * Enumerates the audio channel. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @since 8 */ /** * Enumerates the audio channel. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioChannel { /** @@ -1181,7 +1278,8 @@ declare namespace audio { * Channel 1. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CHANNEL_1 = 1, /** @@ -1193,7 +1291,8 @@ declare namespace audio { * Channel 2. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CHANNEL_2 = 2, /** @@ -1205,7 +1304,8 @@ declare namespace audio { * Channel 3. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CHANNEL_3 = 3, /** @@ -1217,7 +1317,8 @@ declare namespace audio { * Channel 4. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CHANNEL_4 = 4, /** @@ -1229,7 +1330,8 @@ declare namespace audio { * Channel 5. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CHANNEL_5 = 5, /** @@ -1241,7 +1343,8 @@ declare namespace audio { * Channel 6. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CHANNEL_6 = 6, /** @@ -1253,7 +1356,8 @@ declare namespace audio { * Channel 7. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CHANNEL_7 = 7, /** @@ -1265,7 +1369,8 @@ declare namespace audio { * Channel 8. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CHANNEL_8 = 8, /** @@ -1277,7 +1382,8 @@ declare namespace audio { * Channel 9. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CHANNEL_9 = 9, /** @@ -1289,7 +1395,8 @@ declare namespace audio { * Channel 10. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CHANNEL_10 = 10, /** @@ -1301,7 +1408,8 @@ declare namespace audio { * Channel 12. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CHANNEL_12 = 12, /** @@ -1313,7 +1421,8 @@ declare namespace audio { * Channel 14. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CHANNEL_14 = 14, /** @@ -1325,23 +1434,25 @@ declare namespace audio { * Channel 16. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CHANNEL_16 = 16 } /** * Enumerates the audio sampling rate. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @since 8 */ /** * Enumerates the audio sampling rate. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioSamplingRate { /** @@ -1353,7 +1464,8 @@ declare namespace audio { * 8kHz sample rate. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SAMPLE_RATE_8000 = 8000, /** @@ -1365,7 +1477,8 @@ declare namespace audio { * 11.025kHz sample rate. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SAMPLE_RATE_11025 = 11025, /** @@ -1377,7 +1490,8 @@ declare namespace audio { * 12kHz sample rate. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SAMPLE_RATE_12000 = 12000, /** @@ -1389,7 +1503,8 @@ declare namespace audio { * 16kHz sample rate. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SAMPLE_RATE_16000 = 16000, /** @@ -1401,7 +1516,8 @@ declare namespace audio { * 22.05kHz sample rate. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SAMPLE_RATE_22050 = 22050, /** @@ -1413,7 +1529,8 @@ declare namespace audio { * 24kHz sample rate. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SAMPLE_RATE_24000 = 24000, /** @@ -1425,7 +1542,8 @@ declare namespace audio { * 32kHz sample rate. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SAMPLE_RATE_32000 = 32000, /** @@ -1437,7 +1555,8 @@ declare namespace audio { * 44.1kHz sample rate. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SAMPLE_RATE_44100 = 44100, /** @@ -1449,7 +1568,8 @@ declare namespace audio { * 48kHz sample rate. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SAMPLE_RATE_48000 = 48000, /** @@ -1461,13 +1581,15 @@ declare namespace audio { * 64kHz sample rate. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SAMPLE_RATE_64000 = 64000, /** * 88.2kHz sample rate. * @syscap SystemCapability.Multimedia.Audio.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SAMPLE_RATE_88200 = 88200, /** @@ -1479,36 +1601,40 @@ declare namespace audio { * 96kHz sample rate. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SAMPLE_RATE_96000 = 96000, /** * 176.4kHz sample rate. * @syscap SystemCapability.Multimedia.Audio.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SAMPLE_RATE_176400 = 176400, /** * 192kHz sample rate. * @syscap SystemCapability.Multimedia.Audio.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SAMPLE_RATE_192000 = 192000 } /** * Enumerates the audio encoding type. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @since 8 */ /** * Enumerates the audio encoding type. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioEncodingType { /** @@ -1521,7 +1647,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ENCODING_TYPE_INVALID = -1, /** @@ -1534,7 +1661,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ENCODING_TYPE_RAW = 0 } @@ -1600,17 +1728,18 @@ declare namespace audio { /** * Enumerates the stream usage. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @since 7 */ /** * Enumerates the stream usage. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum StreamUsage { /** @@ -1623,7 +1752,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STREAM_USAGE_UNKNOWN = 0, /** @@ -1647,7 +1777,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STREAM_USAGE_MUSIC = 1, /** @@ -1660,7 +1791,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STREAM_USAGE_VOICE_COMMUNICATION = 2, /** @@ -1673,7 +1805,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STREAM_USAGE_VOICE_ASSISTANT = 3, /** @@ -1686,7 +1819,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STREAM_USAGE_ALARM = 4, /** @@ -1698,7 +1832,8 @@ declare namespace audio { * Voice message usage. * @syscap SystemCapability.Multimedia.Audio.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STREAM_USAGE_VOICE_MESSAGE = 5, /** @@ -1719,7 +1854,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STREAM_USAGE_RINGTONE = 6, /** @@ -1732,7 +1868,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STREAM_USAGE_NOTIFICATION = 7, /** @@ -1745,14 +1882,16 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STREAM_USAGE_ACCESSIBILITY = 8, /** * System usage, such as screen lock or key click. * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ STREAM_USAGE_SYSTEM = 9, /** @@ -1765,7 +1904,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STREAM_USAGE_MOVIE = 10, /** @@ -1778,7 +1918,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STREAM_USAGE_GAME = 11, /** @@ -1791,7 +1932,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STREAM_USAGE_AUDIOBOOK = 12, /** @@ -1804,59 +1946,67 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STREAM_USAGE_NAVIGATION = 13, /** * DTMF dial tone usage. * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ STREAM_USAGE_DTMF = 14, /** * Enforced tone usage, such as camera shutter. * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ STREAM_USAGE_ENFORCED_TONE = 15, /** * Ultrasonic playing usage. This type is only used for msdp condition. * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ STREAM_USAGE_ULTRASONIC = 16, /** * Used for network video call. * @syscap SystemCapability.Multimedia.Audio.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STREAM_USAGE_VIDEO_COMMUNICATION = 17, /** * Voice call assistant type. This type is only used for call assistant functionalities. * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STREAM_USAGE_VOICE_CALL_ASSISTANT = 21, } /** * Enumerates the audio interrupt request type. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Interrupt * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ enum InterruptRequestType { /** * Default type to request audio interrupt. * @syscap SystemCapability.Multimedia.Audio.Interrupt * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ INTERRUPT_REQUEST_TYPE_DEFAULT = 0, } @@ -1864,17 +2014,19 @@ declare namespace audio { /** * Enumerates volume related operations. * Flags should be powers of 2! - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum VolumeFlag { /** * Show system volume bar. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ FLAG_SHOW_SYSTEM_UI = 1, } @@ -1890,7 +2042,8 @@ declare namespace audio { * @typedef AudioStreamInfo * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioStreamInfo { /** @@ -1904,7 +2057,8 @@ declare namespace audio { * @type { AudioSamplingRate } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ samplingRate: AudioSamplingRate; /** @@ -1918,7 +2072,8 @@ declare namespace audio { * @type { AudioChannel } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ channels: AudioChannel; /** @@ -1932,7 +2087,8 @@ declare namespace audio { * @type { AudioSampleFormat } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ sampleFormat: AudioSampleFormat; /** @@ -1946,7 +2102,8 @@ declare namespace audio { * @type { AudioEncodingType } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ encodingType: AudioEncodingType; /** @@ -1960,7 +2117,8 @@ declare namespace audio { * @type { ?AudioChannelLayout } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ channelLayout?: AudioChannelLayout; } @@ -1977,7 +2135,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioRendererInfo { /** @@ -2007,30 +2166,33 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ usage: StreamUsage; /** * Audio renderer flags. - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Audio.Core * @since 8 */ /** * Audio renderer flags. This method is currently reserved, suggest setting the default value to 0. - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - rendererFlags: number; + rendererFlags: int; /** * Audio volume mode config. If volumeMode is set to {@link AudioVolumeMode.APP_INDIVIDUAL}, this audio renderer * will be affeted by app volume percentage setted by {@link setAppVolumePercentage} * @type { ?AudioVolumeMode } * @syscap SystemCapability.Multimedia.Audio.Volume - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ volumeMode?: AudioVolumeMode; } @@ -2040,33 +2202,37 @@ declare namespace audio { * @typedef AudioRendererFilter * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioRendererFilter { /** * Application uid. - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ - uid?: number; + uid?: int; /** * Renderer information. * @type { ?AudioRendererInfo } * @syscap SystemCapability.Multimedia.Audio.Renderer * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ rendererInfo?: AudioRendererInfo; /** * AudioRenderer id. - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Multimedia.Audio.Renderer * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ - rendererId?: number; + rendererId?: int; } /** @@ -2074,23 +2240,26 @@ declare namespace audio { * @typedef AudioCapturerFilter * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioCapturerFilter { /** * Application uid. - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - uid?: number; + uid?: int; /** * Capturer information. * @type { ?AudioCapturerInfo } * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ capturerInfo?: AudioCapturerInfo; } @@ -2106,7 +2275,8 @@ declare namespace audio { * @typedef AudioRendererOptions * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioRendererOptions { /** @@ -2120,7 +2290,8 @@ declare namespace audio { * @type { AudioStreamInfo } * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ streamInfo: AudioStreamInfo; /** @@ -2134,7 +2305,8 @@ declare namespace audio { * @type { AudioRendererInfo } * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ rendererInfo: AudioRendererInfo; /** @@ -2148,23 +2320,25 @@ declare namespace audio { * @type { ?AudioPrivacyType } * @syscap SystemCapability.Multimedia.Audio.PlaybackCapture * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ privacyType?: AudioPrivacyType; } /** * Enumerates audio stream privacy type for playback capture. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.PlaybackCapture * @since 10 */ /** * Enumerates audio stream privacy type for playback capture. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.PlaybackCapture * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioPrivacyType { /** @@ -2176,7 +2350,8 @@ declare namespace audio { * Privacy type that stream can be captured by third party applications. * @syscap SystemCapability.Multimedia.Audio.PlaybackCapture * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ PRIVACY_TYPE_PUBLIC = 0, @@ -2189,24 +2364,26 @@ declare namespace audio { * Privacy type that stream can not be captured. * @syscap SystemCapability.Multimedia.Audio.PlaybackCapture * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ PRIVACY_TYPE_PRIVATE = 1, } /** * Enumerates the interrupt modes. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Interrupt * @since 9 */ /** * Enumerates the interrupt modes. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Interrupt * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum InterruptMode { /** @@ -2219,7 +2396,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Interrupt * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SHARE_MODE = 0, /** @@ -2232,51 +2410,57 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Interrupt * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ INDEPENDENT_MODE = 1 } /** * Enumerates the audio renderer rates. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Renderer - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioRendererRate { /** * Normal playback render rate. * @syscap SystemCapability.Multimedia.Audio.Renderer - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ RENDER_RATE_NORMAL = 0, /** * Double playback render rate. * @syscap SystemCapability.Multimedia.Audio.Renderer - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ RENDER_RATE_DOUBLE = 1, /** * Half playback render rate. * @syscap SystemCapability.Multimedia.Audio.Renderer - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ RENDER_RATE_HALF = 2 } /** * Enumerates the interrupt types. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 7 */ /** * Enumerates the interrupt types. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum InterruptType { /** @@ -2289,7 +2473,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ INTERRUPT_TYPE_BEGIN = 1, @@ -2303,24 +2488,26 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ INTERRUPT_TYPE_END = 2 } /** * Enumerates the interrupt hints. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 7 */ /** * Enumerates the interrupt hints. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum InterruptHint { /** @@ -2332,7 +2519,8 @@ declare namespace audio { * None. * @syscap SystemCapability.Multimedia.Audio.Renderer * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ INTERRUPT_HINT_NONE = 0, /** @@ -2345,7 +2533,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ INTERRUPT_HINT_RESUME = 1, @@ -2358,7 +2547,8 @@ declare namespace audio { * Paused/Pause the playback. * @syscap SystemCapability.Multimedia.Audio.Renderer * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ INTERRUPT_HINT_PAUSE = 2, @@ -2371,7 +2561,8 @@ declare namespace audio { * Stopped/Stop the playback. * @syscap SystemCapability.Multimedia.Audio.Renderer * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ INTERRUPT_HINT_STOP = 3, @@ -2384,7 +2575,8 @@ declare namespace audio { * Ducked the playback. (In ducking, the audio volume is reduced, but not silenced.) * @syscap SystemCapability.Multimedia.Audio.Renderer * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ INTERRUPT_HINT_DUCK = 4, @@ -2397,7 +2589,8 @@ declare namespace audio { * Unducked the playback. * @syscap SystemCapability.Multimedia.Audio.Renderer * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ INTERRUPT_HINT_UNDUCK = 5, @@ -2418,17 +2611,18 @@ declare namespace audio { /** * Enumerates the interrupt force types. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 9 */ /** * Enumerates the interrupt force types. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum InterruptForceType { /** @@ -2441,7 +2635,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ INTERRUPT_FORCE = 0, /** @@ -2453,7 +2648,8 @@ declare namespace audio { * Share type, application can choose to take action or ignore. * @syscap SystemCapability.Multimedia.Audio.Renderer * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ INTERRUPT_SHARE = 1 } @@ -2470,7 +2666,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface InterruptEvent { /** @@ -2485,7 +2682,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ eventType: InterruptType; @@ -2501,7 +2699,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ forceType: InterruptForceType; @@ -2517,7 +2716,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ hintType: InterruptHint; } @@ -2550,16 +2750,17 @@ declare namespace audio { /** * Enumerates device change types. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Device * @since 7 */ /** * Enumerates device change types. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum DeviceChangeType { /** @@ -2571,7 +2772,8 @@ declare namespace audio { * Device connection. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONNECT = 0, @@ -2584,23 +2786,25 @@ declare namespace audio { * Device disconnection. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DISCONNECT = 1, } /** * Enumerates audio scenes. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Communication * @since 8 */ /** * Enumerates audio scenes. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Communication * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioScene { /** @@ -2612,19 +2816,22 @@ declare namespace audio { * Default audio scene * @syscap SystemCapability.Multimedia.Audio.Communication * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AUDIO_SCENE_DEFAULT = 0, /** * Ringing audio scene * @syscap SystemCapability.Multimedia.Audio.Communication - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AUDIO_SCENE_RINGING = 1, /** * Phone call audio scene * @syscap SystemCapability.Multimedia.Audio.Communication - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AUDIO_SCENE_PHONE_CALL = 2, /** @@ -2636,31 +2843,35 @@ declare namespace audio { * Voice chat audio scene * @syscap SystemCapability.Multimedia.Audio.Communication * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AUDIO_SCENE_VOICE_CHAT = 3 } /** * Enumerates volume adjustment types. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ enum VolumeAdjustType { /** * Adjust volume up. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ VOLUME_UP = 0, /** * Adjust volume down. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ VOLUME_DOWN = 1, } @@ -2676,7 +2887,8 @@ declare namespace audio { * @typedef AudioManager * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioManager { /** @@ -2993,7 +3205,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ setExtraParameters(mainKey: string, kvpairs: Record): Promise; @@ -3009,7 +3222,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ getExtraParameters(mainKey: string, subKeys?: Array): Promise>; @@ -3088,7 +3302,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Communication * @systemapi - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ setAudioScene(scene: AudioScene, callback: AsyncCallback): void; /** @@ -3097,7 +3312,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Communication * @systemapi - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ setAudioScene(scene: AudioScene): Promise; /** @@ -3111,7 +3327,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the audio scene mode. * @syscap SystemCapability.Multimedia.Audio.Communication * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getAudioScene(callback: AsyncCallback): void; /** @@ -3125,7 +3342,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the audio scene mode. * @syscap SystemCapability.Multimedia.Audio.Communication * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getAudioScene(): Promise; /** @@ -3139,7 +3357,8 @@ declare namespace audio { * @returns { AudioScene } Current audio scene mode. * @syscap SystemCapability.Multimedia.Audio.Communication * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getAudioSceneSync(): AudioScene; @@ -3223,7 +3442,8 @@ declare namespace audio { * @returns { AudioVolumeManager } AudioVolumeManager instance. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getVolumeManager(): AudioVolumeManager; @@ -3238,7 +3458,8 @@ declare namespace audio { * @returns { AudioStreamManager } AudioStreamManager instance. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getStreamManager(): AudioStreamManager; @@ -3253,7 +3474,8 @@ declare namespace audio { * @returns { AudioRoutingManager } AudioRoutingManager instance. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getRoutingManager(): AudioRoutingManager; @@ -3262,7 +3484,8 @@ declare namespace audio { * @returns { AudioSessionManager } AudioSessionManager instance. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSessionManager(): AudioSessionManager; @@ -3270,7 +3493,8 @@ declare namespace audio { * Obtains an {@link AudioSpatializationManager} instance. * @returns { AudioSpatializationManager } AudioSpatializationManager instance. * @syscap SystemCapability.Multimedia.Audio.Spatialization - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ getSpatializationManager(): AudioSpatializationManager; @@ -3280,7 +3504,8 @@ declare namespace audio { * @throws { BusinessError } 202 - Not system App. * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ getEffectManager(): AudioEffectManager; @@ -3302,31 +3527,35 @@ declare namespace audio { * @throws { BusinessError } 202 - Not system App. * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ disableSafeMediaVolume(): Promise; } /** * Enumerates audio interrupt request result type. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Interrupt * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ enum InterruptRequestResultType { /** * Request audio interrupt success * @syscap SystemCapability.Multimedia.Audio.Interrupt * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ INTERRUPT_REQUEST_GRANT = 0, /** * Request audio interrupt fail, may have higher priority type * @syscap SystemCapability.Multimedia.Audio.Interrupt * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ INTERRUPT_REQUEST_REJECT = 1 } @@ -3336,7 +3565,8 @@ declare namespace audio { * @typedef InterruptResult * @syscap SystemCapability.Multimedia.Audio.Interrupt * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ interface InterruptResult { /** @@ -3344,36 +3574,41 @@ declare namespace audio { * @type { InterruptRequestResultType } * @syscap SystemCapability.Multimedia.Audio.Interrupt * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ requestResult: InterruptRequestResultType; /** * Interrupt node as a unit to receive interrupt change event. - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Audio.Interrupt * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ - interruptNode: number; + interruptNode: int; } /** * Desribes audio device block status. By default, the device is consider as unblocked. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Device - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ enum DeviceBlockStatus { /** * Device is unblocked. * @syscap SystemCapability.Multimedia.Audio.Device - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ UNBLOCKED = 0, /** * Device is blocked. * @syscap SystemCapability.Multimedia.Audio.Device - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ BLOCKED = 1, } @@ -3382,14 +3617,16 @@ declare namespace audio { * Desribes audio device block status info. * @typedef DeviceBlockStatusInfo * @syscap SystemCapability.Multimedia.Audio.Device - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface DeviceBlockStatusInfo { /** * Device block status. * @type {DeviceBlockStatus} * @syscap SystemCapability.Multimedia.Audio.Device - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ blockStatus: DeviceBlockStatus; @@ -3397,7 +3634,8 @@ declare namespace audio { * Audio device descriptors whose block status has changed. * @type {AudioDeviceDescriptors} * @syscap SystemCapability.Multimedia.Audio.Device - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ devices: AudioDeviceDescriptors; } @@ -3413,7 +3651,8 @@ declare namespace audio { * @typedef AudioRoutingManager * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioRoutingManager { /** @@ -3429,7 +3668,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the device list. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getDevices(deviceFlag: DeviceFlag, callback: AsyncCallback): void; /** @@ -3445,7 +3685,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the device list. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getDevices(deviceFlag: DeviceFlag): Promise; /** @@ -3469,7 +3710,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getDevicesSync(deviceFlag: DeviceFlag): AudioDeviceDescriptors; @@ -3498,7 +3740,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'deviceChange', deviceFlag: DeviceFlag, callback: Callback): void; @@ -3523,7 +3766,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'deviceChange', callback?: Callback): void; @@ -3536,7 +3780,8 @@ declare namespace audio { * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getAvailableDevices(deviceUsage: DeviceUsage): AudioDeviceDescriptors; @@ -3551,7 +3796,8 @@ declare namespace audio { * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'availableDeviceChange', deviceUsage: DeviceUsage, callback: Callback): void; @@ -3564,7 +3810,8 @@ declare namespace audio { * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'availableDeviceChange', callback?: Callback): void; @@ -3586,7 +3833,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Communication * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setCommunicationDevice(deviceType: CommunicationDeviceType, active: boolean, callback: AsyncCallback): void; /** @@ -3607,7 +3855,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Communication * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setCommunicationDevice(deviceType: CommunicationDeviceType, active: boolean): Promise; @@ -3624,7 +3873,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the active status of the device. * @syscap SystemCapability.Multimedia.Audio.Communication * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isCommunicationDeviceActive(deviceType: CommunicationDeviceType, callback: AsyncCallback): void; /** @@ -3640,7 +3890,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the active status of the device. * @syscap SystemCapability.Multimedia.Audio.Communication * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isCommunicationDeviceActive(deviceType: CommunicationDeviceType): Promise; /** @@ -3664,7 +3915,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Communication * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isCommunicationDeviceActiveSync(deviceType: CommunicationDeviceType): boolean; @@ -3674,7 +3926,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ selectOutputDevice(outputAudioDevices: AudioDeviceDescriptors, callback: AsyncCallback): void; /** @@ -3683,7 +3936,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ selectOutputDevice(outputAudioDevices: AudioDeviceDescriptors): Promise; @@ -3694,7 +3948,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ selectOutputDeviceByFilter(filter: AudioRendererFilter, outputAudioDevices: AudioDeviceDescriptors, callback: AsyncCallback): void; /** @@ -3704,7 +3959,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ selectOutputDeviceByFilter(filter: AudioRendererFilter, outputAudioDevices: AudioDeviceDescriptors): Promise; @@ -3714,7 +3970,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ selectInputDevice(inputAudioDevices: AudioDeviceDescriptors, callback: AsyncCallback): void; /** @@ -3723,7 +3980,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ selectInputDevice(inputAudioDevices: AudioDeviceDescriptors): Promise; @@ -3736,7 +3994,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ selectInputDeviceByFilter(filter: AudioCapturerFilter, inputAudioDevices: AudioDeviceDescriptors): Promise; @@ -3763,7 +4022,8 @@ declare namespace audio { * @throws { BusinessError } 6800301 - System error. Return by callback. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getPreferOutputDeviceForRendererInfo(rendererInfo: AudioRendererInfo, callback: AsyncCallback): void; /** @@ -3789,7 +4049,8 @@ declare namespace audio { * @throws { BusinessError } 6800301 - System error. Return by promise. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getPreferOutputDeviceForRendererInfo(rendererInfo: AudioRendererInfo): Promise; @@ -3814,7 +4075,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getPreferredOutputDeviceForRendererInfoSync(rendererInfo: AudioRendererInfo): AudioDeviceDescriptors; @@ -3826,7 +4088,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ getPreferredOutputDeviceByFilter(filter: AudioRendererFilter): AudioDeviceDescriptors; @@ -3857,7 +4120,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'preferOutputDeviceChangeForRendererInfo', rendererInfo: AudioRendererInfo, callback: Callback): void; /** @@ -3883,7 +4147,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'preferOutputDeviceChangeForRendererInfo', callback?: Callback): void; @@ -3910,7 +4175,8 @@ declare namespace audio { * @throws { BusinessError } 6800301 - System error. Return by callback. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getPreferredInputDeviceForCapturerInfo(capturerInfo: AudioCapturerInfo, callback: AsyncCallback): void; /** @@ -3936,7 +4202,8 @@ declare namespace audio { * @throws { BusinessError } 6800301 - System error. Return by promise. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getPreferredInputDeviceForCapturerInfo(capturerInfo: AudioCapturerInfo): Promise; @@ -3948,7 +4215,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ getPreferredInputDeviceByFilter(filter: AudioCapturerFilter): AudioDeviceDescriptors; @@ -3977,7 +4245,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'preferredInputDeviceChangeForCapturerInfo', capturerInfo: AudioCapturerInfo, callback: Callback): void; /** @@ -4001,7 +4270,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'preferredInputDeviceChangeForCapturerInfo', callback?: Callback): void; @@ -4026,7 +4296,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getPreferredInputDeviceForCapturerInfoSync(capturerInfo: AudioCapturerInfo): AudioDeviceDescriptors; @@ -4034,7 +4305,8 @@ declare namespace audio { * Query whether microphone block detection is supported on current device. * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Device - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ isMicBlockDetectionSupported():Promise; @@ -4050,7 +4322,8 @@ declare namespace audio { * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'micBlockStatusChanged', callback: Callback): void; @@ -4063,7 +4336,8 @@ declare namespace audio { * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'micBlockStatusChanged', callback?: Callback): void; @@ -4080,7 +4354,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ excludeOutputDevices(usage: DeviceUsage, devices: AudioDeviceDescriptors): Promise; @@ -4095,7 +4370,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ unexcludeOutputDevices(usage: DeviceUsage, devices: AudioDeviceDescriptors): Promise; @@ -4109,7 +4385,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ unexcludeOutputDevices(usage: DeviceUsage): Promise; @@ -4121,7 +4398,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ getExcludedDevices(usage: DeviceUsage): AudioDeviceDescriptors; } @@ -4137,7 +4415,8 @@ declare namespace audio { * @typedef AudioStreamManager * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioStreamManager { /** @@ -4153,7 +4432,8 @@ declare namespace audio { * of current existing audio renderers. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getCurrentAudioRendererInfoArray(callback: AsyncCallback): void; @@ -4170,7 +4450,8 @@ declare namespace audio { * existing audio renderers. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getCurrentAudioRendererInfoArray(): Promise; @@ -4185,7 +4466,8 @@ declare namespace audio { * @returns { AudioRendererChangeInfoArray } The information of current existing audio renderers. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getCurrentAudioRendererInfoArraySync(): AudioRendererChangeInfoArray; @@ -4202,7 +4484,8 @@ declare namespace audio { * of current existing audio capturers. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getCurrentAudioCapturerInfoArray(callback: AsyncCallback): void; @@ -4219,7 +4502,8 @@ declare namespace audio { * audio capturers. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getCurrentAudioCapturerInfoArray(): Promise; @@ -4234,7 +4518,8 @@ declare namespace audio { * @returns { AudioCapturerChangeInfoArray } The information of current existing audio capturers. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getCurrentAudioCapturerInfoArraySync(): AudioCapturerChangeInfoArray; @@ -4247,7 +4532,8 @@ declare namespace audio { * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. Return by callback. * @syscap SystemCapability.Multimedia.Audio.Renderer - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ getAudioEffectInfoArray(usage: StreamUsage, callback: AsyncCallback): void; @@ -4260,7 +4546,8 @@ declare namespace audio { * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. Return by promise. * @syscap SystemCapability.Multimedia.Audio.Renderer - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ getAudioEffectInfoArray(usage: StreamUsage): Promise; @@ -4273,7 +4560,8 @@ declare namespace audio { * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Renderer - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ getAudioEffectInfoArraySync(usage: StreamUsage): AudioEffectInfoArray; @@ -4300,7 +4588,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'audioRendererChange', callback: Callback): void; @@ -4332,7 +4621,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'audioRendererChange', callback?: Callback): void; @@ -4359,7 +4649,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'audioCapturerChange', callback: Callback): void; @@ -4391,7 +4682,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'audioCapturerChange', callback?: Callback): void; @@ -4410,7 +4702,8 @@ declare namespace audio { * The value true means that the stream is active, and false means the opposite. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isActive(volumeType: AudioVolumeType, callback: AsyncCallback): void; /** @@ -4428,7 +4721,8 @@ declare namespace audio { * true means that the stream is active, and false means the opposite. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isActive(volumeType: AudioVolumeType): Promise; /** @@ -4452,7 +4746,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isActiveSync(volumeType: AudioVolumeType): boolean; @@ -4501,62 +4796,70 @@ declare namespace audio { /** * Audio concurrency mode. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioConcurrencyMode { /** * Default concurrency mode. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONCURRENCY_DEFAULT = 0, /** * Mix with others mode. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONCURRENCY_MIX_WITH_OTHERS = 1, /** * Duck others mode. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONCURRENCY_DUCK_OTHERS = 2, /** * Pause others mode. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONCURRENCY_PAUSE_OTHERS = 3, } /** * Audio session deactivated reason. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioSessionDeactivatedReason { /** * Lower priority. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DEACTIVATED_LOWER_PRIORITY = 0, /** * Time out. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DEACTIVATED_TIMEOUT = 1, } @@ -4566,7 +4869,8 @@ declare namespace audio { * @typedef AudioSessionStrategy * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioSessionStrategy { /** @@ -4574,7 +4878,8 @@ declare namespace audio { * @type { AudioConcurrencyMode } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ concurrencyMode: AudioConcurrencyMode; } @@ -4584,7 +4889,8 @@ declare namespace audio { * @typedef AudioSessionDeactivatedEvent * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioSessionDeactivatedEvent { /** @@ -4592,7 +4898,8 @@ declare namespace audio { * @type { AudioSessionDeactivatedReason } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ reason: AudioSessionDeactivatedReason; } @@ -4602,7 +4909,8 @@ declare namespace audio { * @typedef AudioSessionManager * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioSessionManager { /** @@ -4616,7 +4924,8 @@ declare namespace audio { * @throws { BusinessError } 6800301 - System error. Returned by promise. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ activateAudioSession(strategy: AudioSessionStrategy): Promise; @@ -4626,7 +4935,8 @@ declare namespace audio { * @throws { BusinessError } 6800301 - System error. Returned by promise. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ deactivateAudioSession(): Promise; @@ -4635,7 +4945,8 @@ declare namespace audio { * @returns { boolean } The active audio session status for the current pid application. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isAudioSessionActivated(): boolean; @@ -4650,7 +4961,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'audioSessionDeactivated', callback: Callback): void; @@ -4664,7 +4976,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'audioSessionDeactivated', callback?: Callback): void; } @@ -4689,7 +5002,8 @@ declare namespace audio { * @typedef AudioVolumeManager * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioVolumeManager { /** @@ -4698,7 +5012,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ getVolumeGroupInfos(networkId: string, callback: AsyncCallback): void; /** @@ -4707,7 +5022,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ getVolumeGroupInfos(networkId: string): Promise; /** @@ -4720,45 +5036,48 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ getVolumeGroupInfosSync(networkId: string): VolumeGroupInfos; /** * Obtains an AudioVolumeGroupManager instance. This method uses an asynchronous callback to return the result. - * @param { number } groupId - volume group id, use LOCAL_VOLUME_GROUP_ID in default + * @param { int } groupId - volume group id, use LOCAL_VOLUME_GROUP_ID in default * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Volume * @since 9 */ /** * Obtains an AudioVolumeGroupManager instance. This method uses an asynchronous callback to return the result. - * @param { number } groupId - volume group id, use LOCAL_VOLUME_GROUP_ID in default + * @param { int } groupId - volume group id, use LOCAL_VOLUME_GROUP_ID in default * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getVolumeGroupManager(groupId: number, callback: AsyncCallback): void; + getVolumeGroupManager(groupId: int, callback: AsyncCallback): void; /** * Obtains an AudioVolumeGroupManager instance. This method uses a promise to return the result. - * @param { number } groupId - volume group id, use LOCAL_VOLUME_GROUP_ID in default + * @param { int } groupId - volume group id, use LOCAL_VOLUME_GROUP_ID in default * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Volume * @since 9 */ /** * Obtains an AudioVolumeGroupManager instance. This method uses a promise to return the result. - * @param { number } groupId - volume group id, use {@link DEFAULT_VOLUME_GROUP_ID} in default + * @param { int } groupId - volume group id, use {@link DEFAULT_VOLUME_GROUP_ID} in default * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getVolumeGroupManager(groupId: number): Promise; + getVolumeGroupManager(groupId: int): Promise; /** * Obtains an AudioVolumeGroupManager instance. - * @param { number } groupId - volume group id, use LOCAL_VOLUME_GROUP_ID in default + * @param { int } groupId - volume group id, use LOCAL_VOLUME_GROUP_ID in default * @returns { AudioVolumeGroupManager } The audio volume group manager instance. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; @@ -4769,7 +5088,7 @@ declare namespace audio { */ /** * Obtains an AudioVolumeGroupManager instance. - * @param { number } groupId - volume group id, use {@link DEFAULT_VOLUME_GROUP_ID} in default + * @param { int } groupId - volume group id, use {@link DEFAULT_VOLUME_GROUP_ID} in default * @returns { AudioVolumeGroupManager } The audio volume group manager instance. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; @@ -4777,29 +5096,31 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getVolumeGroupManagerSync(groupId: number): AudioVolumeGroupManager; + getVolumeGroupManagerSync(groupId: int): AudioVolumeGroupManager; /** * Get the volume for specified app with range from 0 to 100. Applications with same uid share the same volume. * @permission ohos.permission.MANAGE_AUDIO_CONFIG - * @param { number } uid - App's uid. - * @returns { Promise } Promise used to return the result. + * @param { int } uid - App's uid. + * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system App. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - getAppVolumePercentageForUid(uid: number): Promise; + getAppVolumePercentageForUid(uid: int): Promise; /** * Sets the volume for specified app with range from 0 to 100. Applications with same uid share the same volume. * @permission ohos.permission.MANAGE_AUDIO_CONFIG - * @param { number } uid - App's uid. - * @param { number } volume - Volume to set. The value range is from 0 to 100. + * @param { int } uid - App's uid. + * @param { int } volume - Volume to set. The value range is from 0 to 100. * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system App. @@ -4807,15 +5128,16 @@ declare namespace audio { * @throws { BusinessError } 6800301 - Crash or blocking occurs in system process. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - setAppVolumePercentageForUid(uid: number, volume: number): Promise; + setAppVolumePercentageForUid(uid: int, volume: int): Promise; /** * Checks whether the app volume is muted. If there are multiple callers setting muted states, * only when all callers cancel muted state the volume of this app will be truly unmuted. * @permission ohos.permission.MANAGE_AUDIO_CONFIG - * @param { number } uid - App's uid. + * @param { int } uid - App's uid. * @param { boolean } owned - If true is passed, the result will be indicated your owned muted state * settings to this app. Otherwise if false is passed, the result will be indicated the real muted state. * @returns { Promise } Promise used to return the result. @@ -4824,15 +5146,16 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - isAppVolumeMutedForUid(uid: number, owned: boolean): Promise; + isAppVolumeMutedForUid(uid: int, owned: boolean): Promise; /** * Change mute state of specified application volume. If there are multiple callers setting muted states, * only when all callers cancel muted state the volume of this app will be truly unmuted. * @permission ohos.permission.MANAGE_AUDIO_CONFIG - * @param { number } uid - App's uid. + * @param { int } uid - App's uid. * @param { boolean } muted - Muted state to set. * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 201 - Permission denied. @@ -4841,17 +5164,19 @@ declare namespace audio { * @throws { BusinessError } 6800301 - Crash or blocking occurs in system process. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - setAppVolumeMutedForUid(uid: number, muted: boolean): Promise; + setAppVolumeMutedForUid(uid: int, muted: boolean): Promise; /** * Get the volume for your app with range from 0 to 100. Applications with the same uid share the same volume. - * @returns { Promise } The application's volume percentage. The value range is from 0 to 100. + * @returns { Promise } The application's volume percentage. The value range is from 0 to 100. * @syscap SystemCapability.Multimedia.Audio.Volume - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - getAppVolumePercentage(): Promise; + getAppVolumePercentage(): Promise; /** * Sets the volume for your app with range from 0 to 100. Applications with the same uid share the same volume. @@ -4860,14 +5185,15 @@ declare namespace audio { * When you change your app's volume, your will receive 'appVolumeChange' callback event. * Your app volume can be also changed by other system settings, and you can monitor the changes through * 'appVolumeChange' callback. - * @param { number } volume - Volume to set. The value range is from 0 to 100. + * @param { int } volume - Volume to set. The value range is from 0 to 100. * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 6800101 - Parameter verification failed. * @throws { BusinessError } 6800301 - Crash or blocking occurs in system process. * @syscap SystemCapability.Multimedia.Audio.Volume - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - setAppVolumePercentage(volume: number): Promise; + setAppVolumePercentage(volume: int): Promise; /** * Listens for system volume change events. This method uses a callback to get volume change events. @@ -4890,7 +5216,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'volumeChange', callback: Callback): void; @@ -4903,7 +5230,8 @@ declare namespace audio { * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'volumeChange', callback?: Callback): void; @@ -4913,16 +5241,17 @@ declare namespace audio { * @permission ohos.permission.MANAGE_AUDIO_CONFIG * @param { 'appVolumeChangeForUid' } type - Type of the event to listen for. Only the * appVolumeChangeForUid event is supported. - * @param { number } uid - The app's uid. + * @param { int } uid - The app's uid. * @param { Callback } callback - Callback used to get the app volume change event. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system App. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - on(type: 'appVolumeChangeForUid', uid: number, callback: Callback): void; + on(type: 'appVolumeChangeForUid', uid: int, callback: Callback): void; /** * Unsubscribes to the app volume change events.. @@ -4935,7 +5264,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'appVolumeChangeForUid', callback?: Callback): void; @@ -4946,7 +5276,8 @@ declare namespace audio { * @param { Callback } callback - Callback used to get the app volume change event. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'appVolumeChange', callback: Callback): void; @@ -4957,7 +5288,8 @@ declare namespace audio { * @param { Callback } callback - Callback used to obtain the invoking volume change event. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'appVolumeChange', callback?: Callback): void; @@ -5198,50 +5530,54 @@ declare namespace audio { * @typedef AudioVolumeGroupManager * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioVolumeGroupManager { /** * Sets the volume for a stream. This method uses an asynchronous callback to return the result. * @permission ohos.permission.ACCESS_NOTIFICATION_POLICY * @param { AudioVolumeType } volumeType - Audio stream type. - * @param { number } volume - Volume to set. The value range can be obtained by calling getMinVolume and getMaxVolume. + * @param { int } volume - Volume to set. The value range can be obtained by calling getMinVolume and getMaxVolume. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ - setVolume(volumeType: AudioVolumeType, volume: number, callback: AsyncCallback): void; + setVolume(volumeType: AudioVolumeType, volume: int, callback: AsyncCallback): void; /** * Sets the volume for a stream. This method uses a promise to return the result. * @permission ohos.permission.ACCESS_NOTIFICATION_POLICY * @param { AudioVolumeType } volumeType - Audio stream type. - * @param { number } volume - Volume to set. The value range can be obtained by calling getMinVolume and getMaxVolume. + * @param { int } volume - Volume to set. The value range can be obtained by calling getMinVolume and getMaxVolume. * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ - setVolume(volumeType: AudioVolumeType, volume: number): Promise; + setVolume(volumeType: AudioVolumeType, volume: int): Promise; /** * Sets the volume for a stream. This method uses a promise to return the result. * @permission ohos.permission.ACCESS_NOTIFICATION_POLICY * @param { AudioVolumeType } volumeType - Audio stream type. - * @param { number } volume - Volume to set. The value range can be obtained by calling getMinVolume and getMaxVolume. - * @param { number } flags - volume flags used to enable different operations, can be union of {@link VolumeFlag} + * @param { int } volume - Volume to set. The value range can be obtained by calling getMinVolume and getMaxVolume. + * @param { int } flags - volume flags used to enable different operations, can be union of {@link VolumeFlag} * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Not system App. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - setVolumeWithFlag(volumeType: AudioVolumeType, volume: number, flags: number): Promise; + setVolumeWithFlag(volumeType: AudioVolumeType, volume: int, flags: int): Promise; /** * Obtains the active volume type in the calling moment. This method returns in sync mode. - * @param { number } uid - The target uid's active volume type or + * @param { int } uid - The target uid's active volume type or * 0 which means the global active volume type. * @returns { AudioVolumeType } Current active volume type. * @throws { BusinessError } 202 - Not system App. @@ -5251,46 +5587,49 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ - getActiveVolumeTypeSync(uid: number): AudioVolumeType; + getActiveVolumeTypeSync(uid: int): AudioVolumeType; /** * Obtains the volume of a stream. This method uses an asynchronous callback to return the query result. * @param { AudioVolumeType } volumeType - Audio stream type. - * @param { AsyncCallback } callback - Callback used to return the volume. + * @param { AsyncCallback } callback - Callback used to return the volume. * @syscap SystemCapability.Multimedia.Audio.Volume * @since 9 */ /** * Obtains the volume of a volume type. This method uses an asynchronous callback to return the query result. * @param { AudioVolumeType } volumeType - Audio volume type. - * @param { AsyncCallback } callback - Callback used to return the volume. + * @param { AsyncCallback } callback - Callback used to return the volume. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getVolume(volumeType: AudioVolumeType, callback: AsyncCallback): void; + getVolume(volumeType: AudioVolumeType, callback: AsyncCallback): void; /** * Obtains the volume of a stream. This method uses a promise to return the query result. * @param { AudioVolumeType } volumeType - Audio stream type. - * @returns { Promise } Promise used to return the volume. + * @returns { Promise } Promise used to return the volume. * @syscap SystemCapability.Multimedia.Audio.Volume * @since 9 */ /** * Obtains the volume of a volume type. This method uses a promise to return the query result. * @param { AudioVolumeType } volumeType - Audio volume type. - * @returns { Promise } Promise used to return the volume. + * @returns { Promise } Promise used to return the volume. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getVolume(volumeType: AudioVolumeType): Promise; + getVolume(volumeType: AudioVolumeType): Promise; /** * Obtains the volume of a stream. * @param { AudioVolumeType } volumeType - Audio stream type. - * @returns { number } Current system volume level. + * @returns { int } Current system volume level. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. @@ -5301,53 +5640,56 @@ declare namespace audio { /** * Obtains the volume of a volume type. * @param { AudioVolumeType } volumeType - Audio volume type. - * @returns { number } Current system volume level. + * @returns { int } Current system volume level. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getVolumeSync(volumeType: AudioVolumeType): number; + getVolumeSync(volumeType: AudioVolumeType): int; /** * Obtains the minimum volume allowed for a stream. This method uses an asynchronous callback to return the query result. * @param { AudioVolumeType } volumeType - Audio stream type. - * @param { AsyncCallback } callback - Callback used to return the minimum volume. + * @param { AsyncCallback } callback - Callback used to return the minimum volume. * @syscap SystemCapability.Multimedia.Audio.Volume * @since 9 */ /** * Obtains the minimum volume allowed for a volume type. This method uses an asynchronous callback to return the query result. * @param { AudioVolumeType } volumeType - Audio volume type. - * @param { AsyncCallback } callback - Callback used to return the minimum volume. + * @param { AsyncCallback } callback - Callback used to return the minimum volume. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getMinVolume(volumeType: AudioVolumeType, callback: AsyncCallback): void; + getMinVolume(volumeType: AudioVolumeType, callback: AsyncCallback): void; /** * Obtains the minimum volume allowed for a stream. This method uses a promise to return the query result. * @param { AudioVolumeType } volumeType - Audio stream type. - * @returns { Promise } Promise used to return the minimum volume. + * @returns { Promise } Promise used to return the minimum volume. * @syscap SystemCapability.Multimedia.Audio.Volume * @since 9 */ /** * Obtains the minimum volume allowed for a volume type. This method uses a promise to return the query result. * @param { AudioVolumeType } volumeType - Audio volume type. - * @returns { Promise } Promise used to return the minimum volume. + * @returns { Promise } Promise used to return the minimum volume. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getMinVolume(volumeType: AudioVolumeType): Promise; + getMinVolume(volumeType: AudioVolumeType): Promise; /** * Obtains the minimum volume allowed for a stream. * @param { AudioVolumeType } volumeType - Audio stream type. - * @returns { number } Min volume level. + * @returns { int } Min volume level. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. @@ -5358,53 +5700,56 @@ declare namespace audio { /** * Obtains the minimum volume allowed for a volume type. * @param { AudioVolumeType } volumeType - Audio volume type. - * @returns { number } Min volume level. + * @returns { int } Min volume level. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getMinVolumeSync(volumeType: AudioVolumeType): number; + getMinVolumeSync(volumeType: AudioVolumeType): int; /** * Obtains the maximum volume allowed for a stream. This method uses an asynchronous callback to return the query result. * @param { AudioVolumeType } volumeType - Audio stream type. - * @param { AsyncCallback } callback - Callback used to return the maximum volume. + * @param { AsyncCallback } callback - Callback used to return the maximum volume. * @syscap SystemCapability.Multimedia.Audio.Volume * @since 9 */ /** * Obtains the maximum volume allowed for a volume type. This method uses an asynchronous callback to return the query result. * @param { AudioVolumeType } volumeType - Audio volume type. - * @param { AsyncCallback } callback - Callback used to return the maximum volume. + * @param { AsyncCallback } callback - Callback used to return the maximum volume. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getMaxVolume(volumeType: AudioVolumeType, callback: AsyncCallback): void; + getMaxVolume(volumeType: AudioVolumeType, callback: AsyncCallback): void; /** * Obtains the maximum volume allowed for a stream. This method uses a promise to return the query result. * @param { AudioVolumeType } volumeType - Audio stream type. - * @returns { Promise } Promise used to return the maximum volume. + * @returns { Promise } Promise used to return the maximum volume. * @syscap SystemCapability.Multimedia.Audio.Volume * @since 9 */ /** * Obtains the maximum volume allowed for a volume type. This method uses a promise to return the query result. * @param { AudioVolumeType } volumeType - Audio volume type. - * @returns { Promise } Promise used to return the maximum volume. + * @returns { Promise } Promise used to return the maximum volume. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getMaxVolume(volumeType: AudioVolumeType): Promise; + getMaxVolume(volumeType: AudioVolumeType): Promise; /** * Obtains the maximum volume allowed for a stream. * @param { AudioVolumeType } volumeType - Audio stream type. - * @returns { number } Max volume level. + * @returns { int } Max volume level. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. @@ -5415,16 +5760,17 @@ declare namespace audio { /** * Obtains the maximum volume allowed for a volume type. * @param { AudioVolumeType } volumeType - Audio volume type. - * @returns { number } Max volume level. + * @returns { int } Max volume level. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getMaxVolumeSync(volumeType: AudioVolumeType): number; + getMaxVolumeSync(volumeType: AudioVolumeType): int; /** * Mutes a stream. This method uses an asynchronous callback to return the result. @@ -5434,7 +5780,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ mute(volumeType: AudioVolumeType, mute: boolean, callback: AsyncCallback): void; /** @@ -5445,7 +5792,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ mute(volumeType: AudioVolumeType, mute: boolean): Promise; @@ -5464,7 +5812,8 @@ declare namespace audio { * value true means that the volume type is muted, and false means the opposite. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isMute(volumeType: AudioVolumeType, callback: AsyncCallback): void; /** @@ -5482,7 +5831,8 @@ declare namespace audio { * means that the volume type is muted, and false means the opposite. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isMute(volumeType: AudioVolumeType): Promise; /** @@ -5508,7 +5858,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isMuteSync(volumeType: AudioVolumeType): boolean; @@ -5519,7 +5870,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ setRingerMode(mode: AudioRingMode, callback: AsyncCallback): void; /** @@ -5529,7 +5881,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ setRingerMode(mode: AudioRingMode): Promise; @@ -5544,7 +5897,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the ringer mode. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getRingerMode(callback: AsyncCallback): void; /** @@ -5558,7 +5912,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the ringer mode. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getRingerMode(): Promise; /** @@ -5572,7 +5927,8 @@ declare namespace audio { * @returns { AudioRingMode } Current ringer mode. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getRingerModeSync(): AudioRingMode; @@ -5585,7 +5941,8 @@ declare namespace audio { * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'ringerModeChange', callback: Callback): void; @@ -5595,7 +5952,8 @@ declare namespace audio { * @param { Callback } callback - Callback used to get the updated ringer mode. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'ringerModeChange', callback?: Callback): void; @@ -5635,7 +5993,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ setMicMute(mute: boolean): Promise; @@ -5653,7 +6012,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setMicMutePersistent(mute: boolean, type: PolicyType): Promise; @@ -5667,7 +6027,8 @@ declare namespace audio { * @throws { BusinessError } 202 - Not system App. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isPersistentMicMute(): boolean; @@ -5684,7 +6045,8 @@ declare namespace audio { * true means that the microphone is muted, and false means the opposite. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isMicrophoneMute(callback: AsyncCallback): void; /** @@ -5700,7 +6062,8 @@ declare namespace audio { * means that the microphone is muted, and false means the opposite. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isMicrophoneMute(): Promise; /** @@ -5716,7 +6079,8 @@ declare namespace audio { * means that the microphone is muted, and false means the opposite. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isMicrophoneMuteSync(): boolean; @@ -5729,7 +6093,8 @@ declare namespace audio { * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'micStateChange', callback: Callback): void; @@ -5742,7 +6107,8 @@ declare namespace audio { * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'micStateChange', callback?: Callback): void; @@ -5757,7 +6123,8 @@ declare namespace audio { * @returns { boolean } Whether it is volume unadjustable. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isVolumeUnadjustable(): boolean; @@ -5775,7 +6142,8 @@ declare namespace audio { * @throws { BusinessError } 6800301 - System error. Return by callback. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ adjustVolumeByStep(adjustType: VolumeAdjustType, callback: AsyncCallback): void; /** @@ -5792,7 +6160,8 @@ declare namespace audio { * @throws { BusinessError } 6800301 - System error. Return by promise. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ adjustVolumeByStep(adjustType: VolumeAdjustType): Promise; @@ -5811,7 +6180,8 @@ declare namespace audio { * @throws { BusinessError } 6800301 - System error. Return by callback. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ adjustSystemVolumeByStep(volumeType: AudioVolumeType, adjustType: VolumeAdjustType, callback: AsyncCallback): void; /** @@ -5829,7 +6199,8 @@ declare namespace audio { * @throws { BusinessError } 6800301 - System error. Return by promise. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ adjustSystemVolumeByStep(volumeType: AudioVolumeType, adjustType: VolumeAdjustType): Promise; @@ -5837,9 +6208,9 @@ declare namespace audio { * Gets the volume db value that system calculate by volume type, volume level and device type. * This method uses an asynchronous callback to return the result. * @param { AudioVolumeType } volumeType - Audio volume type. - * @param { number } volumeLevel - Volume level to set. + * @param { int } volumeLevel - Volume level to set. * @param { DeviceType } device - Output device type. - * @param { AsyncCallback } callback - Callback used to return the result. + * @param { AsyncCallback } callback - Callback used to return the result. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. @@ -5852,9 +6223,9 @@ declare namespace audio { * Gets the volume db value that system calculate by volume type, volume level and device type. * This method uses an asynchronous callback to return the result. * @param { AudioVolumeType } volumeType - Audio volume type. - * @param { number } volumeLevel - Volume level to set. + * @param { int } volumeLevel - Volume level to set. * @param { DeviceType } device - Output device type. - * @param { AsyncCallback } callback - Callback used to return the result. + * @param { AsyncCallback } callback - Callback used to return the result. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. @@ -5862,16 +6233,17 @@ declare namespace audio { * @throws { BusinessError } 6800301 - System error. Return by callback. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getSystemVolumeInDb(volumeType: AudioVolumeType, volumeLevel: number, device: DeviceType, callback: AsyncCallback): void; + getSystemVolumeInDb(volumeType: AudioVolumeType, volumeLevel: int, device: DeviceType, callback: AsyncCallback): void; /** * Gets the volume db value that system calculate by volume type, volume level and device type. * This method uses a promise to return the result. * @param { AudioVolumeType } volumeType - Audio volume type. - * @param { number } volumeLevel - Volume level to set. + * @param { int } volumeLevel - Volume level to set. * @param { DeviceType } device - Output device type. - * @returns { Promise } Promise used to return the result. + * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. @@ -5884,9 +6256,9 @@ declare namespace audio { * Gets the volume db value that system calculate by volume type, volume level and device type. * This method uses a promise to return the result. * @param { AudioVolumeType } volumeType - Audio volume type. - * @param { number } volumeLevel - Volume level to set. + * @param { int } volumeLevel - Volume level to set. * @param { DeviceType } device - Output device type. - * @returns { Promise } Promise used to return the result. + * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. @@ -5894,15 +6266,16 @@ declare namespace audio { * @throws { BusinessError } 6800301 - System error. Return by promise. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getSystemVolumeInDb(volumeType: AudioVolumeType, volumeLevel: number, device: DeviceType): Promise; + getSystemVolumeInDb(volumeType: AudioVolumeType, volumeLevel: int, device: DeviceType): Promise; /** * Gets the volume db value that system calculate by volume type, volume level and device type. * @param { AudioVolumeType } volumeType - Audio volume type. - * @param { number } volumeLevel - Volume level to set. + * @param { int } volumeLevel - Volume level to set. * @param { DeviceType } device - Output device type. - * @returns { number } The system volume in dB. + * @returns { double } The system volume in dB. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. @@ -5913,47 +6286,50 @@ declare namespace audio { /** * Gets the volume db value that system calculate by volume type, volume level and device type. * @param { AudioVolumeType } volumeType - Audio volume type. - * @param { number } volumeLevel - Volume level to set. + * @param { int } volumeLevel - Volume level to set. * @param { DeviceType } device - Output device type. - * @returns { number } The system volume in dB. + * @returns { double } The system volume in dB. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getSystemVolumeInDbSync(volumeType: AudioVolumeType, volumeLevel: number, device: DeviceType): number; + getSystemVolumeInDbSync(volumeType: AudioVolumeType, volumeLevel: int, device: DeviceType): double; /** * Gets the max amplitude value for a specific input device. * This method uses a promise to return the result. * @param { AudioDeviceDescriptor } inputDevice - the target device. - * @returns { Promise } Promise used to return the max amplitude value. + * @returns { Promise } Promise used to return the max amplitude value. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. Return by promise. * @throws { BusinessError } 6800301 - System error. Return by promise. * @syscap SystemCapability.Multimedia.Audio.Volume - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getMaxAmplitudeForInputDevice(inputDevice: AudioDeviceDescriptor): Promise; + getMaxAmplitudeForInputDevice(inputDevice: AudioDeviceDescriptor): Promise; /** * Gets the max amplitude value for a specific output device. * This method uses a promise to return the result. * @param { AudioDeviceDescriptor } outputDevice - the target device. - * @returns { Promise } Promise used to return the max amplitude value. + * @returns { Promise } Promise used to return the max amplitude value. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. Return by promise. * @throws { BusinessError } 6800301 - System error. Return by promise. * @syscap SystemCapability.Multimedia.Audio.Volume - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getMaxAmplitudeForOutputDevice(outputDevice: AudioDeviceDescriptor): Promise; + getMaxAmplitudeForOutputDevice(outputDevice: AudioDeviceDescriptor): Promise; } /** @@ -5961,7 +6337,8 @@ declare namespace audio { * @interface AudioSpatialEnabledStateForDevice * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioSpatialEnabledStateForDevice { /** @@ -5969,7 +6346,8 @@ declare namespace audio { * @type { AudioDeviceDescriptor } * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ deviceDescriptor: AudioDeviceDescriptor; /** @@ -5977,7 +6355,8 @@ declare namespace audio { * @type { boolean } * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enabled: boolean; } @@ -5986,7 +6365,8 @@ declare namespace audio { * Implements audio spatialization management. * @typedef AudioSpatializationManager * @syscap SystemCapability.Multimedia.Audio.Spatialization - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioSpatializationManager { /** @@ -5995,7 +6375,8 @@ declare namespace audio { * @throws { BusinessError } 202 - Not system App. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ isSpatializationSupported(): boolean; @@ -6010,7 +6391,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ isSpatializationSupportedForDevice(deviceDescriptor: AudioDeviceDescriptor): boolean; @@ -6020,7 +6402,8 @@ declare namespace audio { * @throws { BusinessError } 202 - Not system App. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ isHeadTrackingSupported(): boolean; @@ -6035,7 +6418,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ isHeadTrackingSupportedForDevice(deviceDescriptor: AudioDeviceDescriptor): boolean; @@ -6089,7 +6473,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setSpatializationEnabled(deviceDescriptor: AudioDeviceDescriptor, enabled: boolean): Promise; @@ -6115,7 +6500,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isSpatializationEnabled(deviceDescriptor: AudioDeviceDescriptor): boolean; @@ -6148,7 +6534,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'spatializationEnabledChangeForAnyDevice', callback: Callback): void; @@ -6179,7 +6566,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'spatializationEnabledChangeForAnyDevice', callback?: Callback): void; @@ -6233,7 +6621,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setHeadTrackingEnabled(deviceDescriptor: AudioDeviceDescriptor, enabled: boolean): Promise; @@ -6259,7 +6648,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isHeadTrackingEnabled(deviceDescriptor: AudioDeviceDescriptor): boolean; @@ -6292,7 +6682,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'headTrackingEnabledChangeForAnyDevice', callback: Callback): void; @@ -6323,7 +6714,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'headTrackingEnabledChangeForAnyDevice', callback?: Callback): void; @@ -6339,7 +6731,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ updateSpatialDeviceState(spatialDeviceState: AudioSpatialDeviceState): void; @@ -6355,7 +6748,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setSpatializationSceneType(spatializationSceneType: AudioSpatializationSceneType): void; @@ -6365,7 +6759,8 @@ declare namespace audio { * @throws { BusinessError } 202 - Not system App. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSpatializationSceneType(): AudioSpatializationSceneType; @@ -6373,7 +6768,8 @@ declare namespace audio { * Checks whether the spatialization is enabled by the current device. * @returns { boolean } Whether the spatialization is enabled by the current device. * @syscap SystemCapability.Multimedia.Audio.Spatialization - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ isSpatializationEnabledForCurrentDevice(): boolean; @@ -6384,7 +6780,8 @@ declare namespace audio { * @param { Callback } callback - Callback used to get the spatialization enable state. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Spatialization - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'spatializationEnabledChangeForCurrentDevice', callback: Callback): void; @@ -6394,7 +6791,8 @@ declare namespace audio { * @param { Callback } callback - Callback used to get the spatialization enable state. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Spatialization - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'spatializationEnabledChangeForCurrentDevice', callback?: Callback): void; } @@ -6404,7 +6802,8 @@ declare namespace audio { * @typedef AudioEffectManager * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioEffectManager { /** @@ -6416,7 +6815,8 @@ declare namespace audio { * @throws { BusinessError } 6800301 - System error. * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ getSupportedAudioEffectProperty(): Array; @@ -6434,7 +6834,8 @@ declare namespace audio { * @throws { BusinessError } 6800301 - System error. * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ setAudioEffectProperty(propertyArray: Array): void; @@ -6447,7 +6848,8 @@ declare namespace audio { * @throws { BusinessError } 6800301 - System error. * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ getAudioEffectProperty(): Array; } @@ -6504,17 +6906,19 @@ declare namespace audio { /** * Connect type for device. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ enum ConnectType { /** * Connect type for local device. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ CONNECT_TYPE_LOCAL = 1, @@ -6522,7 +6926,8 @@ declare namespace audio { * Connect type for distributed device. * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ CONNECT_TYPE_DISTRIBUTED = 2 } @@ -6532,7 +6937,8 @@ declare namespace audio { * @typedef VolumeGroupInfo * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ interface VolumeGroupInfo { /** @@ -6541,29 +6947,32 @@ declare namespace audio { * @readonly * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ readonly networkId: string; /** * Volume group id. - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly groupId: number; + readonly groupId: int; /** * Volume mapping group id. - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly mappingId: number; + readonly mappingId: int; /** * Volume group name. @@ -6571,7 +6980,8 @@ declare namespace audio { * @readonly * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ readonly groupName: string; @@ -6581,7 +6991,8 @@ declare namespace audio { * @readonly * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ readonly type: ConnectType; } @@ -6591,7 +7002,8 @@ declare namespace audio { * @typedef { Array> } VolumeGroupInfos * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ type VolumeGroupInfos = Array>; @@ -6606,7 +7018,8 @@ declare namespace audio { * @typedef { Array> } AudioRendererChangeInfoArray * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ type AudioRendererChangeInfoArray = Array>; @@ -6621,34 +7034,37 @@ declare namespace audio { * @typedef AudioRendererChangeInfo * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioRendererChangeInfo { /** * Audio stream unique id. - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 9 */ /** * Audio stream unique id. - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly streamId: number; + readonly streamId: int; /** * Uid for audio renderer client application. - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Audio.Renderer * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly clientUid: number; + readonly clientUid: int; /** * Audio renderer information. @@ -6662,7 +7078,8 @@ declare namespace audio { * @readonly * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly rendererInfo: AudioRendererInfo; @@ -6672,7 +7089,8 @@ declare namespace audio { * @readonly * @syscap SystemCapability.Multimedia.Audio.Renderer * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ readonly rendererState: AudioState; @@ -6688,7 +7106,8 @@ declare namespace audio { * @readonly * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly deviceDescriptors: AudioDeviceDescriptors; } @@ -6704,7 +7123,8 @@ declare namespace audio { * @typedef { Array> } AudioCapturerChangeInfoArray * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ type AudioCapturerChangeInfoArray = Array>; @@ -6719,34 +7139,37 @@ declare namespace audio { * @typedef AudioCapturerChangeInfo * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioCapturerChangeInfo { /** * Audio stream unique id. - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Audio.Capturer * @since 9 */ /** * Audio stream unique id. - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly streamId: number; + readonly streamId: int; /** * Uid for audio capturer client application. - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly clientUid: number; + readonly clientUid: int; /** * Audio capturer information. @@ -6760,7 +7183,8 @@ declare namespace audio { * @readonly * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly capturerInfo: AudioCapturerInfo; @@ -6770,7 +7194,8 @@ declare namespace audio { * @readonly * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ readonly capturerState: AudioState; @@ -6786,7 +7211,8 @@ declare namespace audio { * @readonly * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly deviceDescriptors: AudioDeviceDescriptors; @@ -6802,7 +7228,8 @@ declare namespace audio { * @readonly * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly muted?: boolean; } @@ -6819,7 +7246,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioDeviceDescriptor { /** @@ -6835,7 +7263,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly deviceRole: DeviceRole; @@ -6852,26 +7281,28 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly deviceType: DeviceType; /** * Audio device id. - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Audio.Device * @since 9 */ /** * Audio device id. - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly id: number; + readonly id: int; /** * Audio device name. @@ -6886,7 +7317,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly name: string; @@ -6903,87 +7335,94 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly address: string; /** * Supported sampling rates. - * @type { Array } + * @type { Array } * @syscap SystemCapability.Multimedia.Audio.Device * @since 9 */ /** * Supported sampling rates. - * @type { Array } + * @type { Array } * @readonly * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly sampleRates: Array; + readonly sampleRates: Array; /** * Supported channel counts. - * @type { Array } + * @type { Array } * @syscap SystemCapability.Multimedia.Audio.Device * @since 9 */ /** * Supported channel counts. - * @type { Array } + * @type { Array } * @readonly * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly channelCounts: Array; + readonly channelCounts: Array; /** * Supported channel masks. - * @type { Array } + * @type { Array } * @syscap SystemCapability.Multimedia.Audio.Device * @since 9 */ /** * Supported channel masks. - * @type { Array } + * @type { Array } * @readonly * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly channelMasks: Array; + readonly channelMasks: Array; /** * Device network id * @type { string } * @readonly * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ readonly networkId: string; /** * Interrupt group id - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly interruptGroupId: number; + readonly interruptGroupId: int; /** * Volume group id - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Audio.Device * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly volumeGroupId: number; + readonly volumeGroupId: int; /** * Name used to display, considering distributed device situation. * @type { string } @@ -6997,7 +7436,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly displayName: string; @@ -7014,7 +7454,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly encodingTypes?: Array; @@ -7023,20 +7464,22 @@ declare namespace audio { * @type { boolean } * @readonly * @syscap SystemCapability.Multimedia.Audio.Spatialization - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ readonly spatializationSupported?: boolean; /** * Only {@link DeviceType.SPEAKER} with networkId、{@link DeviceType.REMOTE_CAST} * or {@link DeviceType.REMOTE_DAUDIO} has dmDeviceType which indicated deviceTypeId. - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly dmDeviceType?: number; + readonly dmDeviceType?: int; } /** @@ -7051,27 +7494,31 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ type AudioDeviceDescriptors = Array>; /** * Volume mode. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Volume - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioVolumeMode { /** * Audio volume affected by system volume level. * @syscap SystemCapability.Multimedia.Audio.Volume - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ SYSTEM_GLOBAL = 0, /** * Audio volume affected by app's individual percentage. * @syscap SystemCapability.Multimedia.Audio.Volume - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ APP_INDIVIDUAL = 1 } @@ -7087,58 +7534,65 @@ declare namespace audio { * @typedef VolumeEvent * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface VolumeEvent { /** * Volume type of the current stream. * @type { AudioVolumeType } * @syscap SystemCapability.Multimedia.Audio.Volume - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ volumeType: AudioVolumeType; /** * Volume level. - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Audio.Volume * @since 9 */ /** * Volume level. - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Audio.Volume * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - volume: number; + volume: int; /** * Whether to show the volume change in UI. * @type { boolean } * @syscap SystemCapability.Multimedia.Audio.Volume - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ updateUi: boolean; /** * volumeGroup id - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ - volumeGroupId: number; + volumeGroupId: int; /** * Device network id * @type { string } * @syscap SystemCapability.Multimedia.Audio.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ networkId: string; /** * Audio volume mode of this volume event * @type { ?AudioVolumeMode } * @syscap SystemCapability.Multimedia.Audio.Volume - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ volumeMode?: AudioVolumeMode; } @@ -7265,14 +7719,16 @@ declare namespace audio { * Describes the microphone state change event received by the app when the microphone state is changed. * @typedef MicStateChangeEvent * @syscap SystemCapability.Multimedia.Audio.Device - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ interface MicStateChangeEvent { /** * Mic mute state. * @type { boolean } * @syscap SystemCapability.Multimedia.Audio.Device - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ mute: boolean; } @@ -7287,7 +7743,8 @@ declare namespace audio { * @typedef DeviceChangeAction * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface DeviceChangeAction { /** @@ -7301,7 +7758,8 @@ declare namespace audio { * @type { DeviceChangeType } * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ type: DeviceChangeType; @@ -7316,23 +7774,25 @@ declare namespace audio { * @type { AudioDeviceDescriptors } * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ deviceDescriptors: AudioDeviceDescriptors; } /** * Enumerates channel blend mode. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @since 11 */ /** * Enumerates channel blend mode. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum ChannelBlendMode { /** @@ -7344,7 +7804,8 @@ declare namespace audio { * No channel process. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MODE_DEFAULT = 0, /** @@ -7356,7 +7817,8 @@ declare namespace audio { * Blend left and right channel. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MODE_BLEND_LR = 1, /** @@ -7368,7 +7830,8 @@ declare namespace audio { * Replicate left to right channel. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MODE_ALL_LEFT = 2, /** @@ -7380,24 +7843,26 @@ declare namespace audio { * Replicate right to left channel. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MODE_ALL_RIGHT = 3, } /** * Enumerates audio stream device change reason. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Device * @since 11 */ /** * Enumerates audio stream device change reason. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioStreamDeviceChangeReason { /** @@ -7410,7 +7875,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ REASON_UNKNOWN = 0, /** @@ -7423,7 +7889,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ REASON_NEW_DEVICE_AVAILABLE = 1, /** @@ -7438,7 +7905,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ REASON_OLD_DEVICE_UNAVAILABLE = 2, /** @@ -7451,7 +7919,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ REASON_OVERRODE = 3, } @@ -7467,7 +7936,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioStreamDeviceChangeInfo { /** @@ -7482,7 +7952,8 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ devices: AudioDeviceDescriptors; /** @@ -7497,24 +7968,27 @@ declare namespace audio { * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ changeReason: AudioStreamDeviceChangeReason; } /** * Enumerates callback result. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioDataCallbackResult { /** * Indicates data of this callback is invalid. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ INVALID = -1, @@ -7522,7 +7996,8 @@ declare namespace audio { * Indicates data of this callback is valid. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ VALID = 0, } @@ -7546,26 +8021,29 @@ declare namespace audio { * Audio timestamp info. * @typedef AudioTimestampInfo * @syscap SystemCapability.Multimedia.Audio.Core - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioTimestampInfo { /** * Frame position. - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.Multimedia.Audio.Core - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly framePos: number; + readonly framePos: long; /** * Timestamp when frame in {@link AudioTimestampInfo#framePos} was rendered or captured. - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.Multimedia.Audio.Core - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly timestamp: number; + readonly timestamp: long; } /** @@ -7579,7 +8057,8 @@ declare namespace audio { * @typedef AudioRenderer * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioRenderer { /** @@ -7594,7 +8073,8 @@ declare namespace audio { * @readonly * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly state: AudioState; @@ -7611,7 +8091,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the renderer information. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getRendererInfo(callback: AsyncCallback): void; /** @@ -7627,7 +8108,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the renderer information. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getRendererInfo(): Promise; /** @@ -7641,7 +8123,8 @@ declare namespace audio { * @returns { AudioRendererInfo } The renderer information. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getRendererInfoSync(): AudioRendererInfo; @@ -7656,7 +8139,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the stream information. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getStreamInfo(callback: AsyncCallback): void; /** @@ -7670,7 +8154,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the stream information. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getStreamInfo(): Promise; /** @@ -7684,65 +8169,71 @@ declare namespace audio { * @returns { AudioStreamInfo } The stream information. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getStreamInfoSync(): AudioStreamInfo; /** * Obtains the renderer stream id. This method uses an asynchronous callback to return the result. - * @param { AsyncCallback } callback - Callback used to return the stream id. + * @param { AsyncCallback } callback - Callback used to return the stream id. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 9 */ /** * Obtains the renderer stream id. This method uses an asynchronous callback to return the result. - * @param { AsyncCallback } callback - Callback used to return the stream id. + * @param { AsyncCallback } callback - Callback used to return the stream id. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getAudioStreamId(callback: AsyncCallback): void; + getAudioStreamId(callback: AsyncCallback): void; /** * Obtains the renderer stream id. This method uses a promise to return the result. - * @returns { Promise } Promise used to return the stream id. + * @returns { Promise } Promise used to return the stream id. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 9 */ /** * Obtains the renderer stream id. This method uses a promise to return the result. - * @returns { Promise } Promise used to return the stream id. + * @returns { Promise } Promise used to return the stream id. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getAudioStreamId(): Promise; + getAudioStreamId(): Promise; /** * Obtains the renderer stream id. - * @returns { number } The stream id. + * @returns { long } The stream id. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 10 */ /** * Obtains the renderer stream id. - * @returns { number } The stream id. + * @returns { long } The stream id. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getAudioStreamIdSync(): number; + getAudioStreamIdSync(): long; /** * Obtains the current audio effect mode. This method uses an asynchronous callback to return the query result. * @param { AsyncCallback } callback - Callback used to return the current audio effect mode. * @syscap SystemCapability.Multimedia.Audio.Renderer - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ getAudioEffectMode(callback: AsyncCallback): void; /** * Obtains the current audio effect mode. This method uses a promise to return the query result. * @returns { Promise } Promise used to return the current audio effect mode. * @syscap SystemCapability.Multimedia.Audio.Renderer - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ getAudioEffectMode(): Promise; @@ -7755,7 +8246,8 @@ declare namespace audio { * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. Return by callback. * @syscap SystemCapability.Multimedia.Audio.Renderer - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ setAudioEffectMode(mode: AudioEffectMode, callback: AsyncCallback): void; /** @@ -7767,7 +8259,8 @@ declare namespace audio { * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. Return by promise. * @syscap SystemCapability.Multimedia.Audio.Renderer - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ setAudioEffectMode(mode: AudioEffectMode): Promise; @@ -7785,7 +8278,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ start(callback: AsyncCallback): void; /** @@ -7802,7 +8296,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ start(): Promise; @@ -7832,7 +8327,7 @@ declare namespace audio { /** * Obtains the timestamp in Unix epoch time (starts from January 1, 1970), in nanoseconds. This method uses an * asynchronous callback to return the result. - * @param { AsyncCallback } callback - Callback used to return the timestamp. + * @param { AsyncCallback } callback - Callback used to return the timestamp. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 8 */ @@ -7840,16 +8335,17 @@ declare namespace audio { * Obtains the timestamp for audio frame that passed by system framework most recently. * The timestamp is not accurate because audio device latency is not considered very thoughtfully. * This method uses an asynchronous callback to return the result. - * @param { AsyncCallback } callback - Callback used to return the audio timestamp based on the monotonic nanosecond system timer. + * @param { AsyncCallback } callback - Callback used to return the audio timestamp based on the monotonic nanosecond system timer. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getAudioTime(callback: AsyncCallback): void; + getAudioTime(callback: AsyncCallback): void; /** * Obtains the timestamp in Unix epoch time (starts from January 1, 1970), in nanoseconds. This method uses a * promise to return the result. - * @returns { Promise } Promise used to return the timestamp. + * @returns { Promise } Promise used to return the timestamp. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 8 */ @@ -7857,27 +8353,29 @@ declare namespace audio { * Obtains the timestamp for audio frame that passed by system framework most recently. * The timestamp is not accurate because audio device latency is not considered very thoughtfully. * This method uses a promise to return the result. - * @returns { Promise } Promise used to return the audio timestamp based on the monotonic nanosecond system timer. + * @returns { Promise } Promise used to return the audio timestamp based on the monotonic nanosecond system timer. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getAudioTime(): Promise; + getAudioTime(): Promise; /** * Obtains the timestamp in Unix epoch time (starts from January 1, 1970), in nanoseconds. - * @returns { number } The audio timestamp. + * @returns { long } The audio timestamp. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 10 */ /** * Obtains the timestamp for audio frame that passed by system framework most recently. * The timestamp is not accurate because audio device latency is not considered very thoughtfully. - * @returns { number } The audio timestamp based on the monotonic nanosecond system timer. + * @returns { long } The audio timestamp based on the monotonic nanosecond system timer. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getAudioTimeSync(): number; + getAudioTimeSync(): long; /** * Obtains the timestamp info. @@ -7885,7 +8383,8 @@ declare namespace audio { * @returns { Promise } The Promise used to return timestamp info. * @throws { BusinessError } 6800103 - Operation not permit at current state. * @syscap SystemCapability.Multimedia.Audio.Renderer - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ getAudioTimestampInfo(): Promise; @@ -7895,7 +8394,8 @@ declare namespace audio { * @returns { AudioTimestampInfo } The returned timestamp info. * @throws { BusinessError } 6800103 - Operation not permit at current state. * @syscap SystemCapability.Multimedia.Audio.Renderer - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ getAudioTimestampInfoSync(): AudioTimestampInfo; @@ -7910,7 +8410,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ drain(callback: AsyncCallback): void; /** @@ -7924,7 +8425,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ drain(): Promise; @@ -7941,7 +8443,8 @@ declare namespace audio { * @throws { BusinessError } 6800103 - Operation not permit at current state. Return by promise. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ flush(): Promise; @@ -7956,7 +8459,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ pause(callback: AsyncCallback): void; /** @@ -7970,7 +8474,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ pause(): Promise; @@ -7985,7 +8490,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ stop(callback: AsyncCallback): void; /** @@ -7999,7 +8505,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ stop(): Promise; @@ -8019,7 +8526,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ release(callback: AsyncCallback): void; /** @@ -8038,54 +8546,58 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ release(): Promise; /** * Obtains a reasonable minimum buffer size in bytes for rendering. This method uses an asynchronous callback to * return the result. - * @param { AsyncCallback } callback - Callback used to return the buffer size. + * @param { AsyncCallback } callback - Callback used to return the buffer size. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 8 */ /** * Obtains a reasonable minimum buffer size in bytes for rendering. This method uses an asynchronous callback to * return the result. - * @param { AsyncCallback } callback - Callback used to return the buffer size. + * @param { AsyncCallback } callback - Callback used to return the buffer size. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getBufferSize(callback: AsyncCallback): void; + getBufferSize(callback: AsyncCallback): void; /** * Obtains a reasonable minimum buffer size in bytes for rendering. This method uses a promise to return the result. - * @returns { Promise } Promise used to return the buffer size. + * @returns { Promise } Promise used to return the buffer size. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 8 */ /** * Obtains a reasonable minimum buffer size in bytes for rendering. This method uses a promise to return the result. - * @returns { Promise } Promise used to return the buffer size. + * @returns { Promise } Promise used to return the buffer size. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getBufferSize(): Promise; + getBufferSize(): Promise; /** * Obtains a reasonable minimum buffer size in bytes for rendering. - * @returns { number } The audio buffer size. + * @returns { long } The audio buffer size. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 10 */ /** * Obtains a reasonable minimum buffer size in bytes for rendering. - * @returns { number } The audio buffer size. + * @returns { long } The audio buffer size. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getBufferSizeSync(): number; + getBufferSizeSync(): long; /** * Sets the render rate. This method uses an asynchronous callback to return the result. @@ -8111,7 +8623,7 @@ declare namespace audio { /** * Sets the playback speed. - * @param { number } speed - Audio playback speed. The value type is float, form 0.25 to 4.0. + * @param { double } speed - Audio playback speed. The value type is float, form 0.25 to 4.0. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. @@ -8121,16 +8633,17 @@ declare namespace audio { */ /** * Sets the playback speed. - * @param { number } speed - Audio playback speed. The value type is float, form 0.25 to 4.0. + * @param { double } speed - Audio playback speed. The value type is float, form 0.25 to 4.0. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - setSpeed(speed: number): void; + setSpeed(speed: double): void; /** * Obtains the current render rate. This method uses an asynchronous callback to return the result. @@ -8164,18 +8677,19 @@ declare namespace audio { /** * Obtains the current playback speed. - * @returns { number } The playback speed. + * @returns { double } The playback speed. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 11 */ /** * Obtains the current playback speed. - * @returns { number } The playback speed. + * @returns { double } The playback speed. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getSpeed(): number; + getSpeed(): double; /** * Set interrupt mode. @@ -8190,7 +8704,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Interrupt * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setInterruptMode(mode: InterruptMode, callback: AsyncCallback): void; /** @@ -8206,7 +8721,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Interrupt * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setInterruptMode(mode: InterruptMode): Promise; /** @@ -8228,55 +8744,59 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Interrupt * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setInterruptModeSync(mode: InterruptMode): void; /** * Sets the volume for this stream. This method uses an asynchronous callback to return the result. - * @param { number } volume - Volume to set. The value type is float, form 0.0 to 1.0. + * @param { double } volume - Volume to set. The value type is float, form 0.0 to 1.0. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 9 */ /** * Sets the volume for this stream. This method uses an asynchronous callback to return the result. - * @param { number } volume - Volume to set. The value type is float, form 0.0 to 1.0. + * @param { double } volume - Volume to set. The value type is float, form 0.0 to 1.0. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - setVolume(volume: number, callback: AsyncCallback): void; + setVolume(volume: double, callback: AsyncCallback): void; /** * Sets the volume for a stream. This method uses a promise to return the result. - * @param { number } volume - Volume to set. The value type is float, form 0.0 to 1.0. + * @param { double } volume - Volume to set. The value type is float, form 0.0 to 1.0. * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 9 */ /** * Sets the volume for a stream. This method uses a promise to return the result. - * @param { number } volume - Volume to set. The value type is float, form 0.0 to 1.0. + * @param { double } volume - Volume to set. The value type is float, form 0.0 to 1.0. * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - setVolume(volume: number): Promise; + setVolume(volume: double): Promise; /** * Gets volume of this stream. - * @returns { number } Returns one float value. + * @returns { double } Returns one float value. * @syscap SystemCapability.Multimedia.Audio.Renderer - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getVolume(): number; + getVolume(): double; /** * Changes the volume with ramp for a duration. - * @param { number } volume - Volume to set. The value type is float, form 0.0 to 1.0. - * @param { number } duration - Duration for volume ramp, in millisecond. + * @param { double } volume - Volume to set. The value type is float, form 0.0 to 1.0. + * @param { int } duration - Duration for volume ramp, in millisecond. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. @@ -8286,146 +8806,156 @@ declare namespace audio { */ /** * Changes the volume with ramp for a duration. - * @param { number } volume - Volume to set. The value type is float, form 0.0 to 1.0. - * @param { number } duration - Duration for volume ramp, in millisecond. + * @param { double } volume - Volume to set. The value type is float, form 0.0 to 1.0. + * @param { int } duration - Duration for volume ramp, in millisecond. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - setVolumeWithRamp(volume: number, duration: number): void; + setVolumeWithRamp(volume: double, duration: int): void; /** * Gets the min volume this stream can set. This method uses an asynchronous callback to return the result. - * @param { AsyncCallback } callback - Callback used to return the result. + * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 10 */ /** * Gets the min volume this stream can set. This method uses an asynchronous callback to return the result. - * @param { AsyncCallback } callback - Callback used to return the result. + * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getMinStreamVolume(callback: AsyncCallback): void; + getMinStreamVolume(callback: AsyncCallback): void; /** * Gets the min volume this stream can set. This method uses a promise to return the result. - * @returns { Promise } Promise used to return the result. + * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 10 */ /** * Gets the min volume this stream can set. This method uses a promise to return the result. - * @returns { Promise } Promise used to return the result. + * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getMinStreamVolume(): Promise; + getMinStreamVolume(): Promise; /** * Gets the min volume this stream can set. - * @returns { number } Min stream volume. + * @returns { double } Min stream volume. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 10 */ /** * Gets the min volume this stream can set. - * @returns { number } Min stream volume. + * @returns { double } Min stream volume. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getMinStreamVolumeSync(): number; + getMinStreamVolumeSync(): double; /** * Gets the max volume this stream can set. This method uses an asynchronous callback to return the result. - * @param { AsyncCallback } callback - Callback used to return the result. + * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 10 */ /** * Gets the max volume this stream can set. This method uses an asynchronous callback to return the result. - * @param { AsyncCallback } callback - Callback used to return the result. + * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getMaxStreamVolume(callback: AsyncCallback): void; + getMaxStreamVolume(callback: AsyncCallback): void; /** * Gets the max volume this stream can set. This method uses a promise to return the result. - * @returns { Promise } Promise used to return the result. + * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 10 */ /** * Gets the max volume this stream can set. This method uses a promise to return the result. - * @returns { Promise } Promise used to return the result. + * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getMaxStreamVolume(): Promise; + getMaxStreamVolume(): Promise; /** * Gets the max volume this stream can set. - * @returns { number } Max stream volume. + * @returns { double } Max stream volume. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 10 */ /** * Gets the max volume this stream can set. - * @returns { number } Max stream volume. + * @returns { double } Max stream volume. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getMaxStreamVolumeSync(): number; + getMaxStreamVolumeSync(): double; /** * Gets buffer underflow count. This method uses an asynchronous callback to return the result. - * @param { AsyncCallback } callback - Callback used to return the result. + * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 10 */ /** * Gets buffer underflow count. This method uses an asynchronous callback to return the result. - * @param { AsyncCallback } callback - Callback used to return the result. + * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getUnderflowCount(callback: AsyncCallback): void; + getUnderflowCount(callback: AsyncCallback): void; /** * Gets buffer underflow count. This method uses a promise to return the result. - * @returns { Promise } Promise used to return the result. + * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 10 */ /** * Gets buffer underflow count. This method uses a promise to return the result. - * @returns { Promise } Promise used to return the result. + * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getUnderflowCount(): Promise; + getUnderflowCount(): Promise; /** * Gets buffer underflow count. - * @returns { number } Underflow count number. + * @returns { long } Underflow count number. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 10 */ /** * Gets buffer underflow count. - * @returns { number } Underflow count number. + * @returns { long } Underflow count number. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getUnderflowCountSync(): number; + getUnderflowCountSync(): long; /** * Gets the output device or devices for this stream. @@ -8440,7 +8970,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getCurrentOutputDevices(callback: AsyncCallback): void; /** @@ -8456,7 +8987,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getCurrentOutputDevices(): Promise; /** @@ -8470,7 +9002,8 @@ declare namespace audio { * @returns { AudioDeviceDescriptors } Output device or devices. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getCurrentOutputDevicesSync(): AudioDeviceDescriptors; @@ -8495,7 +9028,8 @@ declare namespace audio { * @throws { BusinessError } 6800103 - Operation not permit at current state. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setChannelBlendMode(mode: ChannelBlendMode): void; @@ -8505,7 +9039,8 @@ declare namespace audio { * true: set the silent mode and mix with other streams. * false: unset the silent mode, current stream will trigger the audio focus internally. * @syscap SystemCapability.Multimedia.Audio.Renderer - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setSilentModeAndMixWithOthers(on: boolean): void; @@ -8515,7 +9050,8 @@ declare namespace audio { * true: current stream is in the silent mode and mix with other streams. * false: current stream in in the normal playback mode * @syscap SystemCapability.Multimedia.Audio.Renderer - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSilentModeAndMixWithOthers(): boolean; @@ -8535,7 +9071,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @throws { BusinessError } 6800103 - Operation not permit at current state. * @syscap SystemCapability.Multimedia.Audio.Renderer - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setDefaultOutputDevice(deviceType: DeviceType): Promise; @@ -8587,7 +9124,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Interrupt * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'audioInterrupt', callback: Callback): void; @@ -8597,7 +9135,8 @@ declare namespace audio { * @param { Callback } callback - Callback used to listen for interrupt callback. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Interrupt - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'audioInterrupt', callback?: Callback): void; @@ -8605,8 +9144,8 @@ declare namespace audio { * Subscribes to mark reached events. When the number of frames rendered reaches the value of the frame parameter, * the callback is invoked. * @param { 'markReach' } type - Type of the event to listen for. Only the markReach event is supported. - * @param { number } frame - Number of frames to trigger the event. The value must be greater than 0. - * @param { Callback } callback - Callback invoked when the event is triggered. + * @param { long } frame - Number of frames to trigger the event. The value must be greater than 0. + * @param { Callback } callback - Callback invoked when the event is triggered. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 8 */ @@ -8619,13 +9158,14 @@ declare namespace audio { *

    * * @param { 'markReach' } type - Type of the event to listen for. Only the markReach event is supported. - * @param { number } frame - Number of frames to trigger the event. The value must be greater than 0. - * @param { Callback } callback - Callback invoked when the event is triggered. + * @param { long } frame - Number of frames to trigger the event. The value must be greater than 0. + * @param { Callback } callback - Callback invoked when the event is triggered. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - on(type: 'markReach', frame: number, callback: Callback): void; + on(type: 'markReach', frame: long, callback: Callback): void; /** * Unsubscribes from mark reached events. * @param { 'markReach' } type - Type of the event to listen for. Only the markReach event is supported. @@ -8642,19 +9182,20 @@ declare namespace audio { /** * Unsubscribes from mark reached events. * @param { 'markReach' } type - Type of the event to listen for. Only the markReach event is supported. - * @param { Callback } callback - Callback invoked when the event is triggered. + * @param { Callback } callback - Callback invoked when the event is triggered. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - off(type: 'markReach', callback?: Callback): void; + off(type: 'markReach', callback?: Callback): void; /** * Subscribes to period reached events. When the period of frame rendering reaches the value of frame parameter, * the callback is invoked. * @param { 'periodReach' } type - Type of the event to listen for. Only the periodReach event is supported. - * @param { number } frame - Period during which frame rendering is listened. The value must be greater than 0. - * @param { Callback } callback - Callback invoked when the event is triggered. + * @param { long } frame - Period during which frame rendering is listened. The value must be greater than 0. + * @param { Callback } callback - Callback invoked when the event is triggered. * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 8 */ @@ -8662,13 +9203,14 @@ declare namespace audio { * Subscribes to period reached events. When the period of frame rendering reaches the value of frame parameter, * the callback is invoked. * @param { 'periodReach' } type - Type of the event to listen for. Only the periodReach event is supported. - * @param { number } frame - Period during which frame rendering is listened. The value must be greater than 0. - * @param { Callback } callback - Callback invoked when the event is triggered. + * @param { long } frame - Period during which frame rendering is listened. The value must be greater than 0. + * @param { Callback } callback - Callback invoked when the event is triggered. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - on(type: 'periodReach', frame: number, callback: Callback): void; + on(type: 'periodReach', frame: long, callback: Callback): void; /** * Unsubscribes from period reached events. * @param { 'periodReach' } type - Type of the event to listen for. Only the periodReach event is supported. @@ -8685,12 +9227,13 @@ declare namespace audio { /** * Unsubscribes from period reached events. * @param { 'periodReach' } type - Type of the event to listen for. Only the periodReach event is supported. - * @param { Callback } callback - Callback invoked when the event is triggered. + * @param { Callback } callback - Callback invoked when the event is triggered. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - off(type: 'periodReach', callback?: Callback): void; + off(type: 'periodReach', callback?: Callback): void; /** * Subscribes audio state change event callback. @@ -8705,7 +9248,8 @@ declare namespace audio { * @param { Callback } callback - Callback invoked when state change. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'stateChange', callback: Callback): void; @@ -8715,7 +9259,8 @@ declare namespace audio { * @param { Callback } callback - Callback invoked when state change. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Renderer - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'stateChange', callback?: Callback): void; @@ -8742,7 +9287,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'outputDeviceChange', callback: Callback): void; @@ -8769,7 +9315,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'outputDeviceChangeWithInfo', callback: Callback): void; @@ -8794,7 +9341,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'outputDeviceChange', callback?: Callback): void; @@ -8819,7 +9367,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'outputDeviceChangeWithInfo', callback?: Callback): void; @@ -8846,7 +9395,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'writeData', callback: AudioRendererWriteDataCallback): void; @@ -8871,29 +9421,32 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Renderer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'writeData', callback?: AudioRendererWriteDataCallback): void; } /** * Enumerates source types. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @since 8 */ /** * Enumerates source types. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum SourceType { /** * Invalid source type. * @syscap SystemCapability.Multimedia.Audio.Core - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ SOURCE_TYPE_INVALID = -1, /** @@ -8905,7 +9458,8 @@ declare namespace audio { * Mic source type. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SOURCE_TYPE_MIC = 0, /** @@ -8917,7 +9471,8 @@ declare namespace audio { * Voice recognition source type. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SOURCE_TYPE_VOICE_RECOGNITION = 1, /** @@ -8933,7 +9488,8 @@ declare namespace audio { * Permission ohos.permission.MANAGE_INTELLIGENT_VOICE is needed when calling createAudioCapturer with this type. * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ SOURCE_TYPE_WAKEUP = 3, @@ -8942,7 +9498,8 @@ declare namespace audio { * Permission ohos.permission.RECORD_VOICE_CALL is needed when calling createAudioCapturer with this type. * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ SOURCE_TYPE_VOICE_CALL = 4, @@ -8955,14 +9512,16 @@ declare namespace audio { * Voice communication source type. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SOURCE_TYPE_VOICE_COMMUNICATION = 7, /** * Voice message source type. * @syscap SystemCapability.Multimedia.Audio.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SOURCE_TYPE_VOICE_MESSAGE = 10, @@ -8970,21 +9529,24 @@ declare namespace audio { * Source type for voice transcription and processing. * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ SOURCE_TYPE_VOICE_TRANSCRIPTION = 12, /** * Camcorder source type. * @syscap SystemCapability.Multimedia.Audio.Core - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ SOURCE_TYPE_CAMCORDER = 13, /** * Unprocessed source type. * @syscap SystemCapability.Multimedia.Audio.Core - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ SOURCE_TYPE_UNPROCESSED = 14, /** @@ -9006,7 +9568,8 @@ declare namespace audio { * @typedef AudioCapturerInfo * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioCapturerInfo { /** @@ -9020,23 +9583,25 @@ declare namespace audio { * @type { SourceType } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ source: SourceType; /** * Audio capturer flags. - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Audio.Core * @since 8 */ /** * Audio capturer flags. - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - capturerFlags: number; + capturerFlags: int; } /** @@ -9050,7 +9615,8 @@ declare namespace audio { * @typedef AudioCapturerOptions * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioCapturerOptions { /** @@ -9064,7 +9630,8 @@ declare namespace audio { * @type { AudioStreamInfo } * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ streamInfo: AudioStreamInfo; /** @@ -9078,7 +9645,8 @@ declare namespace audio { * @type { AudioCapturerInfo } * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ capturerInfo: AudioCapturerInfo; /** @@ -9150,7 +9718,8 @@ declare namespace audio { * @typedef AudioCapturer * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioCapturer { /** @@ -9165,7 +9734,8 @@ declare namespace audio { * @readonly * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly state: AudioState; @@ -9182,7 +9752,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the capturer information. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getCapturerInfo(callback: AsyncCallback): void; /** @@ -9198,7 +9769,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the capturer information. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getCapturerInfo(): Promise; /** @@ -9212,7 +9784,8 @@ declare namespace audio { * @returns { AudioCapturerInfo } The capturer information. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getCapturerInfoSync(): AudioCapturerInfo; @@ -9227,7 +9800,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the stream information. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getStreamInfo(callback: AsyncCallback): void; /** @@ -9241,7 +9815,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the stream information. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getStreamInfo(): Promise; /** @@ -9255,52 +9830,56 @@ declare namespace audio { * @returns { AudioStreamInfo } The stream information. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getStreamInfoSync(): AudioStreamInfo; /** * Obtains the capturer stream id. This method uses an asynchronous callback to return the result. - * @param { AsyncCallback } callback - Callback used to return the stream id. + * @param { AsyncCallback } callback - Callback used to return the stream id. * @syscap SystemCapability.Multimedia.Audio.Capturer * @since 9 */ /** * Obtains the capturer stream id. This method uses an asynchronous callback to return the result. - * @param { AsyncCallback } callback - Callback used to return the stream id. + * @param { AsyncCallback } callback - Callback used to return the stream id. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getAudioStreamId(callback: AsyncCallback): void; + getAudioStreamId(callback: AsyncCallback): void; /** * Obtains the capturer stream id. This method uses a promise to return the result. - * @returns { Promise } Promise used to return the stream id. + * @returns { Promise } Promise used to return the stream id. * @syscap SystemCapability.Multimedia.Audio.Capturer * @since 9 */ /** * Obtains the capturer stream id. This method uses a promise to return the result. - * @returns { Promise } Promise used to return the stream id. + * @returns { Promise } Promise used to return the stream id. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getAudioStreamId(): Promise; + getAudioStreamId(): Promise; /** * Obtains the capturer stream id. - * @returns { number } The stream id. + * @returns { long } The stream id. * @syscap SystemCapability.Multimedia.Audio.Capturer * @since 10 */ /** * Obtains the capturer stream id. - * @returns { number } The stream id. + * @returns { long } The stream id. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getAudioStreamIdSync(): number; + getAudioStreamIdSync(): long; /** * Starts capturing. @@ -9316,7 +9895,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ start(callback: AsyncCallback): void; /** @@ -9333,7 +9913,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ start(): Promise; @@ -9364,7 +9945,7 @@ declare namespace audio { /** * Obtains the timestamp in Unix epoch time (starts from January 1, 1970), in nanoseconds. This method uses an * asynchronous callback to return the result. - * @param { AsyncCallback } callback - Callback used to return the timestamp. + * @param { AsyncCallback } callback - Callback used to return the timestamp. * @syscap SystemCapability.Multimedia.Audio.Capturer * @since 8 */ @@ -9372,16 +9953,16 @@ declare namespace audio { * Obtains the timestamp for audio frame that passed by system framework most recently. * The timestamp is not accurate because audio device latency is not considered very thoughtfully. * This method uses an asynchronous callback to return the result. - * @param { AsyncCallback } callback - Callback used to return the audio timestamp based on the monotonic nanosecond system timer. + * @param { AsyncCallback } callback - Callback used to return the audio timestamp based on the monotonic nanosecond system timer. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform * @since 12 */ - getAudioTime(callback: AsyncCallback): void; + getAudioTime(callback: AsyncCallback): void; /** * Obtains the timestamp in Unix epoch time (starts from January 1, 1970), in nanoseconds. This method uses a * promise to return the result. - * @returns { Promise } Promise used to return the timestamp. + * @returns { Promise } Promise used to return the timestamp. * @syscap SystemCapability.Multimedia.Audio.Capturer * @since 8 */ @@ -9392,24 +9973,26 @@ declare namespace audio { * @returns { Promise } Promise used to return the audio timestamp based on the monotonic nanosecond system timer. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getAudioTime(): Promise; + getAudioTime(): Promise; /** * Obtains the timestamp in Unix epoch time (starts from January 1, 1970), in nanoseconds. - * @returns { number } The audio timestamp. + * @returns { long } The audio timestamp. * @syscap SystemCapability.Multimedia.Audio.Capturer * @since 10 */ /** * Obtains the timestamp for audio frame that passed by system framework most recently. * The timestamp is not accurate because audio device latency is not considered very thoughtfully. - * @returns { number } The audio timestamp based on the monotonic nanosecond system timer. + * @returns { long } The audio timestamp based on the monotonic nanosecond system timer. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getAudioTimeSync(): number; + getAudioTimeSync(): long; /** * Obtains the timestamp info. @@ -9417,7 +10000,8 @@ declare namespace audio { * @returns { Promise } The Promise used to return timestamp info. * @throws { BusinessError } 6800103 - Operation not permit at current state. * @syscap SystemCapability.Multimedia.Audio.Capturer - * @since 19 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ getAudioTimestampInfo(): Promise; @@ -9427,7 +10011,8 @@ declare namespace audio { * @returns { AudioTimestampInfo } The returned timestamp info. * @throws { BusinessError } 6800103 - Operation not permit at current state. * @syscap SystemCapability.Multimedia.Audio.Capturer - * @since 19 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ getAudioTimestampInfoSync(): AudioTimestampInfo; @@ -9442,7 +10027,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ stop(callback: AsyncCallback): void; /** @@ -9456,7 +10042,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ stop(): Promise; @@ -9471,7 +10058,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ release(callback: AsyncCallback): void; /** @@ -9485,54 +10073,58 @@ declare namespace audio { * @returns { Promise } - Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ release(): Promise; /** * Obtains a reasonable minimum buffer size in bytes for capturing. This method uses an asynchronous callback to * return the result. - * @param { AsyncCallback } callback - Callback used to return the buffer size. + * @param { AsyncCallback } callback - Callback used to return the buffer size. * @syscap SystemCapability.Multimedia.Audio.Capturer * @since 8 */ /** * Obtains a reasonable minimum buffer size in bytes for capturing. This method uses an asynchronous callback to * return the result. - * @param { AsyncCallback } callback - Callback used to return the buffer size. + * @param { AsyncCallback } callback - Callback used to return the buffer size. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getBufferSize(callback: AsyncCallback): void; + getBufferSize(callback: AsyncCallback): void; /** * Obtains a reasonable minimum buffer size in bytes for capturing. This method uses a promise to return the result. - * @returns { Promise } Promise used to return the buffer size. + * @returns { Promise } Promise used to return the buffer size. * @syscap SystemCapability.Multimedia.Audio.Capturer * @since 8 */ /** * Obtains a reasonable minimum buffer size in bytes for capturing. This method uses a promise to return the result. - * @returns { Promise } Promise used to return the buffer size. + * @returns { Promise } Promise used to return the buffer size. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getBufferSize(): Promise; + getBufferSize(): Promise; /** * Obtains a reasonable minimum buffer size in bytes for capturing. - * @returns { number } Promise used to return the buffer size. + * @returns { long } Promise used to return the buffer size. * @syscap SystemCapability.Multimedia.Audio.Capturer * @since 10 */ /** * Obtains a reasonable minimum buffer size in bytes for capturing. - * @returns { number } Promise used to return the buffer size. + * @returns { long } Promise used to return the buffer size. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getBufferSizeSync(): number; + getBufferSizeSync(): long; /** * Gets the input device or devices for this stream. @@ -9545,7 +10137,8 @@ declare namespace audio { * @returns { AudioDeviceDescriptors } Descriptors of input devices. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getCurrentInputDevices(): AudioDeviceDescriptors; @@ -9560,25 +10153,28 @@ declare namespace audio { * @returns { AudioCapturerChangeInfo } Full capture info. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getCurrentAudioCapturerChangeInfo(): AudioCapturerChangeInfo; /** * Gets overflow count. - * @returns { Promise } - Promise used to return the result. + * @returns { Promise } - Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Capturer - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getOverflowCount(): Promise + getOverflowCount(): Promise /** * Gets overflow count. - * @returns { number } Overflow count number. + * @returns { long } Overflow count number. * @syscap SystemCapability.Multimedia.Audio.Capturer - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getOverflowCountSync(): number; + getOverflowCountSync(): long; /** * Set if capturer want to be muted instead of interrupted. should be set before start @@ -9595,8 +10191,8 @@ declare namespace audio { * Subscribes to mark reached events. When the number of frames captured reaches the value of the frame parameter, * the callback is invoked. * @param { 'markReach' } type - Type of the event to listen for. Only the markReach event is supported. - * @param { number } frame - Number of frames to trigger the event. The value must be greater than 0. - * @param { Callback } callback - Callback invoked when the event is triggered. + * @param { long } frame - Number of frames to trigger the event. The value must be greater than 0. + * @param { Callback } callback - Callback invoked when the event is triggered. * @syscap SystemCapability.Multimedia.Audio.Capturer * @since 8 */ @@ -9604,13 +10200,14 @@ declare namespace audio { * Subscribes to mark reached events. When the number of frames captured reaches the value of the frame parameter, * the callback is invoked. * @param { 'markReach' } type - Type of the event to listen for. Only the markReach event is supported. - * @param { number } frame - Number of frames to trigger the event. The value must be greater than 0. - * @param { Callback } callback - Callback invoked when the event is triggered. + * @param { long } frame - Number of frames to trigger the event. The value must be greater than 0. + * @param { Callback } callback - Callback invoked when the event is triggered. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - on(type: 'markReach', frame: number, callback: Callback): void; + on(type: 'markReach', frame: long, callback: Callback): void; /** * Unsubscribes from the mark reached events. * @param { 'markReach' } type - Type of the event to listen for. Only the markReach event is supported. @@ -9627,19 +10224,20 @@ declare namespace audio { /** * Unsubscribes from the mark reached events. * @param { 'markReach' } type - Type of the event to listen for. Only the markReach event is supported. - * @param { Callback } callback - Callback invoked when the event is triggered. + * @param { Callback } callback - Callback invoked when the event is triggered. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - off(type: 'markReach', callback?: Callback): void; + off(type: 'markReach', callback?: Callback): void; /** * Subscribes to period reached events. When the period of frame capturing reaches the value of frame parameter, * the callback is invoked. * @param { 'periodReach' } type - Type of the event to listen for. Only the periodReach event is supported. - * @param { number } frame - Period during which frame capturing is listened. The value must be greater than 0. - * @param { Callback } callback - Callback invoked when the event is triggered. + * @param { long } frame - Period during which frame capturing is listened. The value must be greater than 0. + * @param { Callback } callback - Callback invoked when the event is triggered. * @syscap SystemCapability.Multimedia.Audio.Capturer * @since 8 */ @@ -9647,13 +10245,14 @@ declare namespace audio { * Subscribes to period reached events. When the period of frame capturing reaches the value of frame parameter, * the callback is invoked. * @param { 'periodReach' } type - Type of the event to listen for. Only the periodReach event is supported. - * @param { number } frame - Period during which frame capturing is listened. The value must be greater than 0. - * @param { Callback } callback - Callback invoked when the event is triggered. + * @param { long } frame - Period during which frame capturing is listened. The value must be greater than 0. + * @param { Callback } callback - Callback invoked when the event is triggered. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - on(type: 'periodReach', frame: number, callback: Callback): void; + on(type: 'periodReach', frame: long, callback: Callback): void; /** * Unsubscribes from period reached events. * @param { 'periodReach' } type - Type of the event to listen for. Only the periodReach event is supported. @@ -9670,12 +10269,13 @@ declare namespace audio { /** * Unsubscribes from period reached events. * @param { 'periodReach' } type - Type of the event to listen for. Only the periodReach event is supported. - * @param { Callback } callback - Callback invoked when the event is triggered. + * @param { Callback } callback - Callback invoked when the event is triggered. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - off(type: 'periodReach', callback?: Callback): void; + off(type: 'periodReach', callback?: Callback): void; /** * Subscribes audio state change event callback. @@ -9690,7 +10290,8 @@ declare namespace audio { * @param { Callback } callback - Callback used to listen for the audio state change event. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'stateChange', callback: Callback): void; @@ -9700,7 +10301,8 @@ declare namespace audio { * @param { Callback } callback - Callback used to listen for the audio state change event. * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Capturer - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'stateChange', callback?: Callback): void; @@ -9727,7 +10329,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Interrupt * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'audioInterrupt', callback: Callback): void; @@ -9750,7 +10353,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Interrupt * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'audioInterrupt'): void; @@ -9777,7 +10381,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'inputDeviceChange', callback: Callback): void; /** @@ -9801,7 +10406,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Device * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'inputDeviceChange', callback?: Callback): void; @@ -9828,7 +10434,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'audioCapturerChange', callback: Callback): void; /** @@ -9852,7 +10459,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'audioCapturerChange', callback?: Callback): void; @@ -9879,7 +10487,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'readData', callback: Callback): void; @@ -9904,7 +10513,8 @@ declare namespace audio { * @throws { BusinessError } 6800101 - Parameter verification failed. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'readData', callback?: Callback): void; @@ -9926,169 +10536,191 @@ declare namespace audio { /** * ASR noise suppression mode. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AsrNoiseSuppressionMode { /** * Bypass noise suppression. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ BYPASS = 0, /** * Standard noise suppression. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STANDARD = 1, /** * Near field noise suppression. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ NEAR_FIELD = 2, /** * Far field noise suppression. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ FAR_FIELD = 3, } /** * ASR AEC mode. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AsrAecMode { /** * Bypass AEC. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ BYPASS = 0, /** * Using standard AEC. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STANDARD = 1, } /** * ASR voice control mode. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AsrVoiceControlMode { /** * Send output stream to TX. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AUDIO_2_VOICE_TX = 0, /** * Send both output stream and MIC input to TX. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AUDIO_MIX_2_VOICE_TX = 1, /** * Based on the AUDIO_2_VOICE_TX, Send output stream to voice call record. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AUDIO_2_VOICE_TX_EX = 2, /** * Based on the AUDIO_MIX_2_VOICE_TX, Send output stream to voice call record. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AUDIO_MIX_2_VOICE_TX_EX = 3, } /** * ASR voice mute mode. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AsrVoiceMuteMode { /** * Mute the local output stream. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ OUTPUT_MUTE = 0, /** * Mute the local MIC input stream. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ INPUT_MUTE = 1, /** * Send tts output stream to TX and mute the local output stream. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ TTS_MUTE = 2, /** * Mute the voice call stream. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 - */ + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 + */ CALL_MUTE = 3, /** * Based on the OUTPUT_MUTE, send output stream to voice call record. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ OUTPUT_MUTE_EX = 4, } /** * ASR whisper detection mode. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AsrWhisperDetectionMode { /** * No operation. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ BYPASS = 0, /** * Use standard whisper detection model. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STANDARD = 1, } @@ -10098,7 +10730,8 @@ declare namespace audio { * @typedef AsrProcessingController * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface AsrProcessingController { /** @@ -10113,7 +10746,8 @@ declare namespace audio { * @throws { BusinessError } 6800104 - Operation not allowed. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setAsrAecMode(mode: AsrAecMode): boolean; @@ -10124,7 +10758,8 @@ declare namespace audio { * @throws { BusinessError } 6800104 - Operation not allowed. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getAsrAecMode(): AsrAecMode; @@ -10140,7 +10775,8 @@ declare namespace audio { * @throws { BusinessError } 6800104 - Operation not allowed. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setAsrNoiseSuppressionMode(mode: AsrNoiseSuppressionMode): boolean; @@ -10151,7 +10787,8 @@ declare namespace audio { * @throws { BusinessError } 6800104 - Operation not allowed. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getAsrNoiseSuppressionMode(): AsrNoiseSuppressionMode; @@ -10162,7 +10799,8 @@ declare namespace audio { * @throws { BusinessError } 6800104 - Operation not allowed. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isWhispering(): boolean; @@ -10179,7 +10817,8 @@ declare namespace audio { * @throws { BusinessError } 6800104 - Operation not allowed. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setAsrVoiceControlMode(mode: AsrVoiceControlMode, enable: boolean): boolean; @@ -10196,7 +10835,8 @@ declare namespace audio { * @throws { BusinessError } 6800104 - Operation not allowed. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setAsrVoiceMuteMode(mode: AsrVoiceMuteMode, enable: boolean): boolean; @@ -10212,7 +10852,8 @@ declare namespace audio { * @throws { BusinessError } 6800104 - Operation not allowed. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setAsrWhisperDetectionMode(mode: AsrWhisperDetectionMode): boolean; @@ -10223,7 +10864,8 @@ declare namespace audio { * @throws { BusinessError } 6800104 - Operation not allowed. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getAsrWhisperDetectionMode(): AsrWhisperDetectionMode; } @@ -10243,212 +10885,242 @@ declare namespace audio { * is already released. * @syscap SystemCapability.Multimedia.Audio.Capturer * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function createAsrProcessingController(audioCapturer: AudioCapturer): AsrProcessingController; /** * Enumerates tone types for player. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ enum ToneType { /** * Dial tone for key 0. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_DIAL_0 = 0, /** * Dial tone for key 1. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_DIAL_1 = 1, /** * Dial tone for key 2. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_DIAL_2 = 2, /** * Dial tone for key 3. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_DIAL_3 = 3, /** * Dial tone for key 4. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_DIAL_4 = 4, /** * Dial tone for key 5. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_DIAL_5 = 5, /** * Dial tone for key 6. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_DIAL_6 = 6, /** * Dial tone for key 7. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_DIAL_7 = 7, /** * Dial tone for key 8. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_DIAL_8 = 8, /** * Dial tone for key 9. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_DIAL_9 = 9, /** * Dial tone for key *. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_DIAL_S = 10, /** * Dial tone for key #. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_DIAL_P = 11, /** * Dial tone for key A. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_DIAL_A = 12, /** * Dial tone for key B. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_DIAL_B = 13, /** * Dial tone for key C. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_DIAL_C = 14, /** * Dial tone for key D. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_DIAL_D = 15, /** * Supervisory tone for dial. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_COMMON_SUPERVISORY_DIAL = 100, /** * Supervisory tone for busy. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_COMMON_SUPERVISORY_BUSY = 101, /** * Supervisory tone for dial. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_COMMON_SUPERVISORY_CONGESTION = 102, /** * Supervisory tone for radio path acknowledgment. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_COMMON_SUPERVISORY_RADIO_ACK = 103, /** * Supervisory tone for radio path not available. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_COMMON_SUPERVISORY_RADIO_NOT_AVAILABLE = 104, /** * Supervisory tone for call waiting. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_COMMON_SUPERVISORY_CALL_WAITING = 106, /** * Supervisory tone for ringtone. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_COMMON_SUPERVISORY_RINGTONE = 107, /** * Supervisory tone for call holding. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_COMMON_SUPERVISORY_CALL_HOLDING = 108, /** * Proprietary tone for beep. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_COMMON_PROPRIETARY_BEEP = 200, /** * Proprietary tone for positive acknowledgment. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_COMMON_PROPRIETARY_ACK = 201, /** * Proprietary tone for prompt. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_COMMON_PROPRIETARY_PROMPT = 203, /** * Proprietary tone for double beep. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TONE_TYPE_COMMON_PROPRIETARY_DOUBLE_BEEP = 204, } @@ -10458,7 +11130,8 @@ declare namespace audio { * @typedef TonePlayer * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ interface TonePlayer { /** @@ -10467,7 +11140,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ load(type: ToneType, callback: AsyncCallback): void; /** @@ -10476,7 +11150,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ load(type: ToneType): Promise; @@ -10485,7 +11160,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ start(callback: AsyncCallback): void; /** @@ -10493,7 +11169,8 @@ declare namespace audio { * @returns { Promise }Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ start(): Promise; @@ -10502,7 +11179,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ stop(callback: AsyncCallback): void; /** @@ -10510,7 +11188,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ stop(): Promise; @@ -10519,7 +11198,8 @@ declare namespace audio { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ release(callback: AsyncCallback): void; /** @@ -10527,7 +11207,8 @@ declare namespace audio { * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Audio.Tone * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ release(): Promise; } @@ -10536,22 +11217,24 @@ declare namespace audio { * Array of AudioEffectMode, which is read-only. * @typedef { Array> } AudioEffectInfoArray * @syscap SystemCapability.Multimedia.Audio.Renderer - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ type AudioEffectInfoArray = Array>; /** * Describes an audio effect mode group. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Renderer * @since 10 */ /** * Describes an audio effect mode group. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Renderer * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioEffectMode { /** @@ -10560,10 +11243,11 @@ declare namespace audio { * @since 10 */ /** - * Audio Effect Mode effect none. This effect mode will disable audio effect process for current audio renderer. + * Audio Effect Mode effect none. * @syscap SystemCapability.Multimedia.Audio.Renderer * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ EFFECT_NONE = 0, /** @@ -10575,7 +11259,8 @@ declare namespace audio { * Audio Effect Mode effect default. * @syscap SystemCapability.Multimedia.Audio.Renderer * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ EFFECT_DEFAULT = 1, } @@ -10585,7 +11270,8 @@ declare namespace audio { * @typedef AudioSpatialDeviceState * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioSpatialDeviceState { /** @@ -10593,7 +11279,8 @@ declare namespace audio { * @type { string } * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ address: string; @@ -10602,7 +11289,8 @@ declare namespace audio { * @type { boolean } * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ isSpatializationSupported: boolean; @@ -10611,7 +11299,8 @@ declare namespace audio { * @type { boolean } * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ isHeadTrackingSupported: boolean; @@ -10620,97 +11309,110 @@ declare namespace audio { * @type { AudioSpatialDeviceType } * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ spatialDeviceType: AudioSpatialDeviceType; } /** * Describes a spatial device type group. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioSpatialDeviceType { /** * Audio Spatial Device Type none. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ SPATIAL_DEVICE_TYPE_NONE = 0, /** * Audio Spatial Device Type in-ear headphone. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ SPATIAL_DEVICE_TYPE_IN_EAR_HEADPHONE = 1, /** * Audio Spatial Device Type half-in-ear headphone. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ SPATIAL_DEVICE_TYPE_HALF_IN_EAR_HEADPHONE = 2, /** * Audio Spatial Device Type over-ear headphone. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ SPATIAL_DEVICE_TYPE_OVER_EAR_HEADPHONE = 3, /** * Audio Spatial Device Type glasses. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ SPATIAL_DEVICE_TYPE_GLASSES = 4, /** * Audio Spatial Device Type others. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ SPATIAL_DEVICE_TYPE_OTHERS = 5, } /** * Describes a spatialization scene type group. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioSpatializationSceneType { /** * Audio Spatialization Scene Type Default. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DEFAULT = 0, /** * Audio Spatialization Scene Type Music. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MUSIC = 1, /** * Audio Spatialization Scene Type Movie. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MOVIE = 2, /** * Audio Spatialization Scene Type Audio Book. * @syscap SystemCapability.Multimedia.Audio.Spatialization * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AUDIOBOOK = 3, } @@ -10718,17 +11420,18 @@ declare namespace audio { /** * Audio AudioChannel Layout * A 64-bit integer indicates that the appearance and order of the speakers for recording or playback. - * @enum { number } + * @enum { long } * @syscap SystemCapability.Multimedia.Audio.Core * @since 11 */ /** * Audio AudioChannel Layout * A 64-bit integer indicates that the appearance and order of the speakers for recording or playback. - * @enum { number } + * @enum { long } * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioChannelLayout { /** @@ -10740,7 +11443,8 @@ declare namespace audio { * Unknown Channel Layout * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_UNKNOWN = 0x0, /** @@ -10754,7 +11458,8 @@ declare namespace audio { * Speaker layout: front center(FC) * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_MONO = 0x4, /** @@ -10768,14 +11473,16 @@ declare namespace audio { * Speaker layout: front left(FL), front right(FR) * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_STEREO = 0x3, /** * Channel Layout For Stereo-Downmix, 2 channels in total * Speaker layout: Stereo left, stereo right * @syscap SystemCapability.Multimedia.Audio.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_STEREO_DOWNMIX = 0x60000000, /** @@ -10789,7 +11496,8 @@ declare namespace audio { * Speaker layout: Stereo plus low-frequency effects(LFE) * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_2POINT1 = 0xB, /** @@ -10803,7 +11511,8 @@ declare namespace audio { * Speaker layout: Stereo plus back center(BC) * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_3POINT0 = 0x103, /** @@ -10817,7 +11526,8 @@ declare namespace audio { * Speaker layout: Stereo plus FC * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_SURROUND = 0x7, /** @@ -10831,7 +11541,8 @@ declare namespace audio { * Speaker layout: Surround plus LFE * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_3POINT1 = 0xF, /** @@ -10845,7 +11556,8 @@ declare namespace audio { * Speaker layout: Surround plus BC * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_4POINT0 = 0x107, /** @@ -10859,14 +11571,16 @@ declare namespace audio { * Speaker layout: Stereo plus left and right back speakers * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_QUAD = 0x33, /** * Channel Layout For Quad-Side, 4 channels in total * Speaker layout: Stereo plus left and right side speakers(SL, SR) * @syscap SystemCapability.Multimedia.Audio.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_QUAD_SIDE = 0x603, /** @@ -10880,28 +11594,32 @@ declare namespace audio { * Speaker layout: Stereo plus left and right top side speakers * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_2POINT0POINT2 = 0x3000000003, /** * Channel Layout For ORDER1-ACN-N3D First Order Ambisonic(FOA), 4 channels in total * First order, Ambisonic Channel Number(ACN) format, Normalization of three-D(N3D) * @syscap SystemCapability.Multimedia.Audio.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_AMB_ORDER1_ACN_N3D = 0x100000000001, /** * Channel Layout For ORDER1-ACN-SN3D FOA, 4 channels in total * First order, ACN format, Semi-Normalization of three-D(SN3D) * @syscap SystemCapability.Multimedia.Audio.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_AMB_ORDER1_ACN_SN3D = 0x100000001001, /** * Channel Layout For ORDER1-FUMA FOA, 4 channels in total * First order, Furse-Malham(FuMa) format * @syscap SystemCapability.Multimedia.Audio.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_AMB_ORDER1_FUMA = 0x100000000101, /** @@ -10915,7 +11633,8 @@ declare namespace audio { * Speaker layout: 4.0 plus LFE * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_4POINT1 = 0x10F, /** @@ -10929,28 +11648,32 @@ declare namespace audio { * Speaker layout: Surround plus two side speakers * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_5POINT0 = 0x607, /** * Channel Layout For 5.0-Back, 5 channels in total * Speaker layout: Surround plus two back speakers * @syscap SystemCapability.Multimedia.Audio.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_5POINT0_BACK = 0x37, /** * Channel Layout For 2.1.2, 5 channels in total * Speaker layout: 2.0.2 plus LFE * @syscap SystemCapability.Multimedia.Audio.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_2POINT1POINT2 = 0x300000000B, /** * Channel Layout For 3.0.2, 5 channels in total * Speaker layout: 2.0.2 plus FC * @syscap SystemCapability.Multimedia.Audio.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_3POINT0POINT2 = 0x3000000007, /** @@ -10964,14 +11687,16 @@ declare namespace audio { * Speaker layout: 5.0 plus LFE * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_5POINT1 = 0x60F, /** * Channel Layout For 5.1-Back, 6 channels in total * Speaker layout: 5.0-Back plus LFE * @syscap SystemCapability.Multimedia.Audio.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_5POINT1_BACK = 0x3F, /** @@ -10985,7 +11710,8 @@ declare namespace audio { * Speaker layout: 5.0 plus BC * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_6POINT0 = 0x707, /** @@ -10999,21 +11725,24 @@ declare namespace audio { * Speaker layout: 5.0-Back plus BC * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_HEXAGONAL = 0x137, /** * Channel Layout For 3.1.2, 6 channels in total * Speaker layout: 3.1 plus two top front speakers(TFL, TFR) * @syscap SystemCapability.Multimedia.Audio.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_3POINT1POINT2 = 0x500F, /** * Channel Layout For 6.0-Front, 6 channels in total * Speaker layout: Quad-Side plus left and right front center speakers(FLC, FRC) * @syscap SystemCapability.Multimedia.Audio.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_6POINT0_FRONT = 0x6C3, /** @@ -11027,21 +11756,24 @@ declare namespace audio { * Speaker layout: 5.1 plus BC * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_6POINT1 = 0x70F, /** * Channel Layout For 6.1-Back, 7 channels in total * Speaker layout: 5.1-Back plus BC * @syscap SystemCapability.Multimedia.Audio.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_6POINT1_BACK = 0x13F, /** * Channel Layout For 6.1-Front, 7 channels in total * Speaker layout: 6.0-Front plus LFE * @syscap SystemCapability.Multimedia.Audio.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_6POINT1_FRONT = 0x6CB, /** @@ -11055,7 +11787,8 @@ declare namespace audio { * Speaker layout: 5.0 plus two back speakers * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_7POINT0 = 0x637, /** @@ -11069,7 +11802,8 @@ declare namespace audio { * Speaker layout: 5.0 plus left and right front center speakers * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_7POINT0_FRONT = 0x6C7, /** @@ -11083,7 +11817,8 @@ declare namespace audio { * Speaker layout: 5.1 plus two back speakers * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_7POINT1 = 0x63F, /** @@ -11097,7 +11832,8 @@ declare namespace audio { * Speaker layout: 5.0 plus BL, BR and BC. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_OCTAGONAL = 0x737, /** @@ -11111,42 +11847,48 @@ declare namespace audio { * Speaker layout: 5.1 plus two top side speakers. * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_5POINT1POINT2 = 0x300000060F, /** * Channel Layout For 7.1-Wide, 8 channels in total * Speaker layout: 5.1 plus left and right front center speakers. * @syscap SystemCapability.Multimedia.Audio.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_7POINT1_WIDE = 0x6CF, /** * Channel Layout For 7.1-Wide, 8 channels in total * Speaker layout: 5.1-Back plus left and right front center speakers. * @syscap SystemCapability.Multimedia.Audio.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_7POINT1_WIDE_BACK = 0xFF, /** * Channel Layout For ORDER2-ACN-N3D Higher Order Ambisonics(HOA), 9 channels in total * Second order, ACN format, N3D * @syscap SystemCapability.Multimedia.Audio.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_AMB_ORDER2_ACN_N3D = 0x100000000002, /** * Channel Layout For ORDER2-ACN-SN3D HOA, 9 channels in total * Second order, ACN format, SN3D * @syscap SystemCapability.Multimedia.Audio.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_AMB_ORDER2_ACN_SN3D = 0x100000001002, /** * Channel Layout For ORDER2-FUMA HOA, 9 channels in total * Second order, FuMa format * @syscap SystemCapability.Multimedia.Audio.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_AMB_ORDER2_FUMA = 0x100000000102, /** @@ -11160,7 +11902,8 @@ declare namespace audio { * Speaker layout: 5.1 plus four top speakers(TFL, TFR, TBL, TBR) * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_5POINT1POINT4 = 0x2D60F, /** @@ -11174,7 +11917,8 @@ declare namespace audio { * Speaker layout: 7.1 plus two top side speakers * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_7POINT1POINT2 = 0x300000063F, /** @@ -11188,7 +11932,8 @@ declare namespace audio { * Speaker layout: 7.1 plus four top speakers * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_7POINT1POINT4 = 0x2D63F, /** @@ -11202,14 +11947,16 @@ declare namespace audio { * Speaker layout: FL, FR, FC, TFL, TFR, BL, BR, BC, SL, SR, wide left(WL), and wide right(WR) * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_10POINT2 = 0x180005737, /** * Channel Layout For 9.1.4, 14 channels in total * Speaker layout: 7.1.4 plus two wide speakers(WL, WR) * @syscap SystemCapability.Multimedia.Audio.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_9POINT1POINT4 = 0x18002D63F, /** @@ -11223,7 +11970,8 @@ declare namespace audio { * Speaker layout: 9.1.4 plus two top side speakers * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_9POINT1POINT6 = 0x318002D63F, /** @@ -11237,7 +11985,8 @@ declare namespace audio { * Speaker layout: Octagonal plus two wide speakers, six top speakers(TFL, TFR, TFC, TBL, TBR, TBC) * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_HEXADECAGONAL = 0x18003F737, /** @@ -11251,7 +12000,8 @@ declare namespace audio { * Third order, ACN format, N3D * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_AMB_ORDER3_ACN_N3D = 0x100000000003, /** @@ -11265,31 +12015,35 @@ declare namespace audio { * Third order, ACN format, N3D * @syscap SystemCapability.Multimedia.Audio.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_AMB_ORDER3_ACN_SN3D = 0x100000001003, /** * Channel Layout For ORDER3-FUMA HOA, 16 channels in total * Third order, FuMa format * @syscap SystemCapability.Multimedia.Audio.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ CH_LAYOUT_AMB_ORDER3_FUMA = 0x100000000103 } /** * Enumerates audio effect flags. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ enum EffectFlag { /** * Audio render effect. * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ RENDER_EFFECT_FLAG = 0, @@ -11297,7 +12051,8 @@ declare namespace audio { * Audio capture effect. * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ CAPTURE_EFFECT_FLAG = 1 } @@ -11307,7 +12062,8 @@ declare namespace audio { * @typedef AudioEffectProperty * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioEffectProperty { /** @@ -11315,7 +12071,8 @@ declare namespace audio { * @type { string } * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ name: string; @@ -11324,7 +12081,8 @@ declare namespace audio { * @type { string } * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ category: string; @@ -11333,7 +12091,8 @@ declare namespace audio { * @type { EffectFlag } * @syscap SystemCapability.Multimedia.Audio.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ flag: EffectFlag; } -- Gitee From 2b10fa21b84fde6d98eb47e133ebdf65984e20af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=8F=91=E5=8F=91?= Date: Sat, 12 Jul 2025 14:27:04 +0800 Subject: [PATCH 076/746] description MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 小发发 --- api/@ohos.accessibility.config.d.ts | 23 +++++++++++++++-------- api/@ohos.accessibility.d.ts | 6 ++++-- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/api/@ohos.accessibility.config.d.ts b/api/@ohos.accessibility.config.d.ts index 1bd8be5a5d..877971a279 100644 --- a/api/@ohos.accessibility.config.d.ts +++ b/api/@ohos.accessibility.config.d.ts @@ -27,7 +27,8 @@ import type { AsyncCallback, Callback } from './@ohos.base'; * @namespace config * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace config { /** @@ -59,9 +60,10 @@ declare namespace config { * * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - var highContrastText: Config; + let highContrastText: Config; /** * Indicates the configuration of invert color. * @@ -375,7 +377,8 @@ declare namespace config { * @typedef Config * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface Config { /** @@ -393,7 +396,8 @@ declare namespace config { * 3. Parameter verification failed. * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ set(value: T): Promise; @@ -412,7 +416,8 @@ declare namespace config { * 3. Parameter verification failed. * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ set(value: T, callback: AsyncCallback): void; @@ -425,7 +430,8 @@ declare namespace config { * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ get(): Promise; @@ -436,7 +442,8 @@ declare namespace config { * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ get(callback: AsyncCallback): void; diff --git a/api/@ohos.accessibility.d.ts b/api/@ohos.accessibility.d.ts index e818965817..3cf30e986f 100644 --- a/api/@ohos.accessibility.d.ts +++ b/api/@ohos.accessibility.d.ts @@ -1316,7 +1316,8 @@ declare namespace accessibility { * 2. Incorrect parameter types; * 3. Parameter verification failed. * @syscap SystemCapability.BarrierFree.Accessibility.Core - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'screenReaderStateChange', callback: Callback): void; @@ -1385,7 +1386,8 @@ declare namespace accessibility { * 2. Incorrect parameter types; * 3. Parameter verification failed. * @syscap SystemCapability.BarrierFree.Accessibility.Core - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'screenReaderStateChange', callback?: Callback): void; -- Gitee From 6fac6d57a4c30b531a04bcd8847637b903c83b52 Mon Sep 17 00:00:00 2001 From: zhangwt3652 Date: Sat, 12 Jul 2025 14:39:40 +0800 Subject: [PATCH 077/746] add AudioRendererWriteDataCallback Signed-off-by: zhangwt3652 --- api/@ohos.multimedia.audio.d.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/api/@ohos.multimedia.audio.d.ts b/api/@ohos.multimedia.audio.d.ts index 7a6a21326d..0b429a4f5c 100644 --- a/api/@ohos.multimedia.audio.d.ts +++ b/api/@ohos.multimedia.audio.d.ts @@ -8016,6 +8016,20 @@ declare namespace audio { */ type AudioRendererWriteDataCallback = (data: ArrayBuffer) => AudioDataCallbackResult | void; + /** + * Type definition of callback function for audio renderer write data. + * + * @typedef { function } AudioRendererWriteDataCallback + * @param { ArrayBuffer } data - audio data array buffer. + * @returns { AudioDataCallbackResult } result of callback. If AudioDataCallbackResult.VALID + * is returned, it indicates the data is valid and will be played. If AudioDataCallbackResult.INVALID + * is returned, it indicates the data is will not be played. + * @syscap SystemCapability.Multimedia.Audio.Renderer + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + type AudioRendererWriteDataCallback = (data: ArrayBuffer) => AudioDataCallbackResult; /** * Audio timestamp info. -- Gitee From 20cb9653ccf07287c76eee5ba81802644f32c241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=B5=9A=E4=BA=88?= Date: Sat, 12 Jul 2025 14:55:52 +0800 Subject: [PATCH 078/746] 0702remake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 孙浚予 --- api/@ohos.wifi.d.ts | 3 +- api/@ohos.wifiManager.d.ts | 306 ++++++++++++++++++++++++------------- 2 files changed, 206 insertions(+), 103 deletions(-) diff --git a/api/@ohos.wifi.d.ts b/api/@ohos.wifi.d.ts index bc98aa0fb4..e38024591b 100644 --- a/api/@ohos.wifi.d.ts +++ b/api/@ohos.wifi.d.ts @@ -23,7 +23,8 @@ import { AsyncCallback, Callback } from './@ohos.base'; /** * Provides methods to operate or manage Wi-Fi. * @namespace wifi - * @since 6 + * @since arkts {'1.1':'6', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace wifi { /** diff --git a/api/@ohos.wifiManager.d.ts b/api/@ohos.wifiManager.d.ts index f8b3982d97..b5017ec013 100644 --- a/api/@ohos.wifiManager.d.ts +++ b/api/@ohos.wifiManager.d.ts @@ -50,7 +50,8 @@ declare namespace wifiManager { * @throws {BusinessError} 2501000 - Operation failed. * @throws {BusinessError} 2501003 - Operation failed because the service is being closed. * @syscap SystemCapability.Communication.WiFi.STA - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ function enableWifi(): void; @@ -62,7 +63,8 @@ declare namespace wifiManager { * @throws {BusinessError} 2501000 - Operation failed. * @throws {BusinessError} 2501004 - Operation failed because the service is being opened. * @syscap SystemCapability.Communication.WiFi.STA - * @since 16 + * @since arkts {'1.1':'16', '1.2':'20'} + * @arkts 1.1&1.2 */ function disableWifi(): void; @@ -76,7 +78,8 @@ declare namespace wifiManager { * @throws {BusinessError} 2501004 - Operation failed because the service is being opened. * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function enableSemiWifi(): void; @@ -231,7 +234,8 @@ declare namespace wifiManager { * @throws {BusinessError} 2501000 - Operation failed. * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getScanInfoList(): Array; @@ -591,7 +595,8 @@ declare namespace wifiManager { * @throws {BusinessError} 801 - Capability not supported. * @throws {BusinessError} 2501000 - Operation failed. * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSignalLevel(rssi: number, band: number): number; @@ -618,7 +623,8 @@ declare namespace wifiManager { * @syscap SystemCapability.Communication.WiFi.STA * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getLinkedInfo(): Promise; @@ -662,7 +668,8 @@ declare namespace wifiManager { * @throws {BusinessError} 2501001 - Wi-Fi STA disabled. * @syscap SystemCapability.Communication.WiFi.STA * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getLinkedInfo(callback: AsyncCallback): void; @@ -677,7 +684,8 @@ declare namespace wifiManager { * @throws {BusinessError} 2501001 - Wi-Fi STA disabled. * @syscap SystemCapability.Communication.WiFi.STA * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getLinkedInfoSync(): WifiLinkedInfo; @@ -702,7 +710,8 @@ declare namespace wifiManager { * @syscap SystemCapability.Communication.WiFi.STA * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function isConnected(): boolean; @@ -759,7 +768,8 @@ declare namespace wifiManager { * @throws {BusinessError} 801 - Capability not supported. * @throws {BusinessError} 2501000 - Operation failed. * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getIpInfo(): IpInfo; @@ -772,7 +782,8 @@ declare namespace wifiManager { * @throws {BusinessError} 801 - Capability not supported. * @throws {BusinessError} 2501000 - Operation failed. * @syscap SystemCapability.Communication.WiFi.STA - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getIpv6Info(): Ipv6Info; @@ -980,7 +991,8 @@ declare namespace wifiManager { * @throws {BusinessError} 2501000 - Operation failed. * @throws {BusinessError} 2501001 - Wi-Fi STA disabled. * @syscap SystemCapability.Communication.WiFi.STA - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function isMeteredHotspot(): boolean; @@ -1070,7 +1082,8 @@ declare namespace wifiManager { * @throws {BusinessError} 2601000 - Operation failed. * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function isOpenSoftApAllowed(): boolean; @@ -1154,7 +1167,8 @@ declare namespace wifiManager { * @throws {BusinessError} 2601000 - Operation failed. * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getStations(): Array; @@ -2214,7 +2228,8 @@ declare namespace wifiManager { * @enum { number } * @syscap SystemCapability.Communication.WiFi.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum DeviceAddressType { /** @@ -2227,7 +2242,8 @@ declare namespace wifiManager { * random device address * @syscap SystemCapability.Communication.WiFi.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ RANDOM_DEVICE_ADDRESS, @@ -2241,7 +2257,8 @@ declare namespace wifiManager { * real device address * @syscap SystemCapability.Communication.WiFi.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ REAL_DEVICE_ADDRESS, } @@ -2404,14 +2421,16 @@ declare namespace wifiManager { * @enum { number } WifiDetailState * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum WifiDetailState { /** * state is unknown * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ UNKNOWN = -1, @@ -2419,7 +2438,8 @@ declare namespace wifiManager { * wifi is closed * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ INACTIVE = 0, @@ -2427,7 +2447,8 @@ declare namespace wifiManager { * wifi is opened * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ACTIVATED = 1, @@ -2435,7 +2456,8 @@ declare namespace wifiManager { * wifi is opening * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ACTIVATING = 2, @@ -2443,7 +2465,8 @@ declare namespace wifiManager { * wifi is closing * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ DEACTIVATING = 3, @@ -2451,7 +2474,8 @@ declare namespace wifiManager { * wifi sta is entering semi active * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ SEMI_ACTIVATING = 4, @@ -2459,7 +2483,8 @@ declare namespace wifiManager { * wifi sta is semi active * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ SEMI_ACTIVE = 5, } @@ -2501,41 +2526,47 @@ declare namespace wifiManager { * Wi-Fi Category. * @enum { number } * @syscap SystemCapability.Communication.WiFi.STA - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum WifiCategory { /** * Default. * @syscap SystemCapability.Communication.WiFi.STA - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ DEFAULT = 1, /** * Wifi6. * @syscap SystemCapability.Communication.WiFi.STA - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI6 = 2, /** * Wifi6+. * @syscap SystemCapability.Communication.WiFi.STA - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI6_PLUS = 3, /** * Wifi7. * @syscap SystemCapability.Communication.WiFi.STA - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI7 = 4, /** * Wifi7+. * @syscap SystemCapability.Communication.WiFi.STA - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI7_PLUS = 5 } @@ -2777,7 +2808,8 @@ declare namespace wifiManager { * @typedef WifiDeviceConfig * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface WifiDeviceConfig { /** @@ -2791,7 +2823,8 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ssid: string; @@ -2806,7 +2839,8 @@ declare namespace wifiManager { * @type { ?string } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ bssid?: string; @@ -2836,7 +2870,8 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ preSharedKey: string; @@ -2860,7 +2895,8 @@ declare namespace wifiManager { * @type { WifiSecurityType } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ securityType: WifiSecurityType; @@ -3157,7 +3193,8 @@ declare namespace wifiManager { * @typedef WifiScanInfo * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface WifiScanInfo { /** @@ -3171,7 +3208,8 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ssid: string; @@ -3186,7 +3224,8 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ bssid: string; @@ -3224,7 +3263,8 @@ declare namespace wifiManager { * @type { WifiSecurityType } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ securityType: WifiSecurityType; @@ -3239,7 +3279,8 @@ declare namespace wifiManager { * @type { number } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ rssi: number; @@ -3247,7 +3288,8 @@ declare namespace wifiManager { * Frequency band, 1: 2.4G, 2: 5G * @type { number } * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ band: number; @@ -3310,7 +3352,8 @@ declare namespace wifiManager { * Supported wifi category * @type { WifiCategory } * @syscap SystemCapability.Communication.WiFi.STA - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ supportedWifiCategory: WifiCategory; @@ -3334,14 +3377,16 @@ declare namespace wifiManager { * @enum { number } * @syscap SystemCapability.Communication.WiFi.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum WifiSecurityType { /** * Invalid security type * * @syscap SystemCapability.Communication.WiFi.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_SEC_TYPE_INVALID = 0, @@ -3356,7 +3401,8 @@ declare namespace wifiManager { * * @syscap SystemCapability.Communication.WiFi.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_SEC_TYPE_OPEN = 1, @@ -3364,7 +3410,8 @@ declare namespace wifiManager { * Wired Equivalent Privacy (WEP) * * @syscap SystemCapability.Communication.WiFi.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_SEC_TYPE_WEP = 2, @@ -3372,7 +3419,8 @@ declare namespace wifiManager { * Pre-shared key (PSK) * * @syscap SystemCapability.Communication.WiFi.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_SEC_TYPE_PSK = 3, @@ -3380,7 +3428,8 @@ declare namespace wifiManager { * Simultaneous Authentication of Equals (SAE) * * @syscap SystemCapability.Communication.WiFi.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_SEC_TYPE_SAE = 4, @@ -3388,7 +3437,8 @@ declare namespace wifiManager { * EAP authentication. * * @syscap SystemCapability.Communication.WiFi.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_SEC_TYPE_EAP = 5, @@ -3396,7 +3446,8 @@ declare namespace wifiManager { * SUITE_B_192 192 bit level. * * @syscap SystemCapability.Communication.WiFi.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_SEC_TYPE_EAP_SUITE_B = 6, @@ -3404,7 +3455,8 @@ declare namespace wifiManager { * Opportunistic Wireless Encryption. * * @syscap SystemCapability.Communication.WiFi.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_SEC_TYPE_OWE = 7, @@ -3412,7 +3464,8 @@ declare namespace wifiManager { * WAPI certificate to be specified. * * @syscap SystemCapability.Communication.WiFi.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_SEC_TYPE_WAPI_CERT = 8, @@ -3420,7 +3473,8 @@ declare namespace wifiManager { * WAPI pre-shared key to be specified. * * @syscap SystemCapability.Communication.WiFi.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_SEC_TYPE_WAPI_PSK = 9 } @@ -3573,7 +3627,8 @@ declare namespace wifiManager { * @typedef WifiLinkedInfo * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface WifiLinkedInfo { @@ -3588,7 +3643,8 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ssid: string; @@ -3603,7 +3659,8 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ bssid: string; @@ -3627,7 +3684,8 @@ declare namespace wifiManager { * @type { number } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ rssi: number; @@ -3635,7 +3693,8 @@ declare namespace wifiManager { * The frequency band of a Wi-Fi access point. * @type { number } * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ band: number; @@ -3732,7 +3791,8 @@ declare namespace wifiManager { * The Wi-Fi MAC address of a device. * @type { string } * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ macAddress: string; @@ -3757,7 +3817,8 @@ declare namespace wifiManager { * The state of this Wi-Fi connection. * @type { ConnState } * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ connState: ConnState; @@ -3781,7 +3842,8 @@ declare namespace wifiManager { * Supported wifi category * @type { WifiCategory } * @syscap SystemCapability.Communication.WiFi.STA - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ supportedWifiCategory: WifiCategory; @@ -3806,14 +3868,16 @@ declare namespace wifiManager { * Wi-Fi IP information. * @typedef IpInfo * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface IpInfo { /** * The IP address of the Wi-Fi connection * @type { number } * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ ipAddress: number; @@ -3870,14 +3934,16 @@ declare namespace wifiManager { * Wi-Fi IPv6 information. * @typedef Ipv6Info * @syscap SystemCapability.Communication.WiFi.STA - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ interface Ipv6Info { /** * The link IPv6 address of the Wi-Fi connection * @type { string } * @syscap SystemCapability.Communication.WiFi.STA - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ linkIpv6Address: string; @@ -3951,7 +4017,8 @@ declare namespace wifiManager { * @typedef HotspotConfig * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface HotspotConfig { /** @@ -3959,7 +4026,8 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ ssid: string; @@ -3968,7 +4036,8 @@ declare namespace wifiManager { * @type { WifiSecurityType } * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ securityType: WifiSecurityType; @@ -3977,7 +4046,8 @@ declare namespace wifiManager { * @type { number } * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ band: number; @@ -3995,7 +4065,8 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ preSharedKey: string; @@ -4023,7 +4094,8 @@ declare namespace wifiManager { * @typedef StationInfo * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface StationInfo { /** @@ -4040,7 +4112,8 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ macAddress: string; @@ -4208,14 +4281,16 @@ declare namespace wifiManager { * * @enum { number } * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum ConnState { /** * The device is searching for an available AP. * * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ SCANNING, @@ -4223,7 +4298,8 @@ declare namespace wifiManager { * The Wi-Fi connection is being set up. * * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ CONNECTING, @@ -4231,7 +4307,8 @@ declare namespace wifiManager { * The Wi-Fi connection is being authenticated. * * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ AUTHENTICATING, @@ -4239,7 +4316,8 @@ declare namespace wifiManager { * The IP address of the Wi-Fi connection is being obtained. * * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ OBTAINING_IPADDR, @@ -4247,7 +4325,8 @@ declare namespace wifiManager { * The Wi-Fi connection has been set up. * * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ CONNECTED, @@ -4255,7 +4334,8 @@ declare namespace wifiManager { * The Wi-Fi connection is being torn down. * * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ DISCONNECTING, @@ -4263,7 +4343,8 @@ declare namespace wifiManager { * The Wi-Fi connection has been torn down. * * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ DISCONNECTED, @@ -4271,7 +4352,8 @@ declare namespace wifiManager { * Failed to set up the Wi-Fi connection. * * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ UNKNOWN } @@ -4281,14 +4363,16 @@ declare namespace wifiManager { * * @typedef WifiP2pDevice * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface WifiP2pDevice { /** * Device name * @type { string } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ deviceName: string; @@ -4296,7 +4380,8 @@ declare namespace wifiManager { * Device mac address * @type { string } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ deviceAddress: string; @@ -4304,7 +4389,8 @@ declare namespace wifiManager { * Device mac address type * @type { ?DeviceAddressType } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ deviceAddressType?: DeviceAddressType; @@ -4312,7 +4398,8 @@ declare namespace wifiManager { * Primary device type * @type { string } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ primaryDeviceType: string; @@ -4320,7 +4407,8 @@ declare namespace wifiManager { * Device status * @type { P2pDeviceStatus } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ deviceStatus: P2pDeviceStatus; @@ -4328,7 +4416,8 @@ declare namespace wifiManager { * Device group capabilities * @type { number } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ groupCapabilities: number; } @@ -4477,20 +4566,23 @@ declare namespace wifiManager { * * @enum { number } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ enum P2pConnectState { /** * p2p is disconnected * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ DISCONNECTED = 0, /** * p2p is connected * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ CONNECTED = 1 } @@ -4500,14 +4592,16 @@ declare namespace wifiManager { * * @typedef WifiP2pLinkedInfo * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface WifiP2pLinkedInfo { /** * Connection status * @type { P2pConnectState } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ connectState: P2pConnectState; @@ -4515,7 +4609,8 @@ declare namespace wifiManager { * Indicates whether it is group owner * @type { boolean } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ isGroupOwner: boolean; @@ -4523,7 +4618,8 @@ declare namespace wifiManager { * Group owner address * @type { string } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ groupOwnerAddr: string; } @@ -4533,41 +4629,47 @@ declare namespace wifiManager { * * @enum { number } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ enum P2pDeviceStatus { /** * Indicate p2p device is connected. * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ CONNECTED = 0, /** * Indicate p2p device is invited. * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ INVITED = 1, /** * Indicate p2p device is failed. * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ FAILED = 2, /** * Indicate p2p device is available. * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ AVAILABLE = 3, /** * Indicate p2p device is unavailable. * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ UNAVAILABLE = 4 } -- Gitee From cb533ec17920168c60caee6f49810788a10c8999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=8F=91=E5=8F=91?= Date: Sat, 12 Jul 2025 15:03:04 +0800 Subject: [PATCH 079/746] description MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 小发发 --- api/@ohos.accessibility.config.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/api/@ohos.accessibility.config.d.ts b/api/@ohos.accessibility.config.d.ts index 877971a279..45a5ff46c8 100644 --- a/api/@ohos.accessibility.config.d.ts +++ b/api/@ohos.accessibility.config.d.ts @@ -58,6 +58,7 @@ declare namespace config { /** * Indicates the configuration of high-contrast text. * + * @type { Config } * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} -- Gitee From ebc2ca81b07b2b2fc56180a750cb5f0c8c1fb686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=B5=9A=E4=BA=88?= Date: Sat, 12 Jul 2025 15:03:51 +0800 Subject: [PATCH 080/746] add getwifidetailstate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 孙浚予 --- api/@ohos.wifiManager.d.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/@ohos.wifiManager.d.ts b/api/@ohos.wifiManager.d.ts index b5017ec013..ae4840a16f 100644 --- a/api/@ohos.wifiManager.d.ts +++ b/api/@ohos.wifiManager.d.ts @@ -180,7 +180,8 @@ declare namespace wifiManager { * @throws {BusinessError} 2501000 - Operation failed. * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getWifiDetailState(): WifiDetailState; -- Gitee From e7088c4b840b97a9b38605e7dbce105aff3484d2 Mon Sep 17 00:00:00 2001 From: zhangziye Date: Fri, 4 Jul 2025 19:25:15 +0800 Subject: [PATCH 081/746] =?UTF-8?q?[=E6=96=B0=E9=9C=80=E6=B1=82]:=20Remove?= =?UTF-8?q?=20Any=20Type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue: https://gitee.com/openharmony/interface_sdk-js/issues/ICK490 Signed-off-by: zhangziye --- api/@ohos.transfer.d.ets | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/api/@ohos.transfer.d.ets b/api/@ohos.transfer.d.ets index 9f401a8502..2d7069c96f 100644 --- a/api/@ohos.transfer.d.ets +++ b/api/@ohos.transfer.d.ets @@ -30,17 +30,6 @@ */ declare namespace transfer { - /** - * Any is used for the parameter type and return type of the transfer methods - * - * @typedef {Object | undefined | null} - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - */ - type Any = Object | undefined | null; - /** * Converting the 1.0 object to a 1.2 object. * -- Gitee From 71203a0093a9a3ed80ec1641b6333b33cb633535 Mon Sep 17 00:00:00 2001 From: sun-xinyan Date: Sat, 12 Jul 2025 01:59:04 +0800 Subject: [PATCH 082/746] add file change from 0603 to 0702 Signed-off-by: sun-xinyan --- .../decoratorState.d.ets => CODEOWNERS | 39 +- BUILD.gn | 52 + api/@internal/component/ets/action_sheet.d.ts | 11 + api/@internal/component/ets/alert_dialog.d.ts | 12 + .../component/ets/alphabet_indexer.d.ts | 29 + api/@internal/component/ets/calendar.d.ts | 98 + api/@internal/component/ets/checkbox.d.ts | 21 + .../component/ets/checkboxgroup.d.ts | 20 + api/@internal/component/ets/common.d.ts | 701 ++- .../ets/custom_dialog_controller.d.ts | 28 + .../component/ets/embedded_component.d.ts | 18 + api/@internal/component/ets/enums.d.ts | 17 + api/@internal/component/ets/grid.d.ts | 47 +- api/@internal/component/ets/image_span.d.ts | 12 +- .../component/ets/lazy_grid_layout.d.ts | 27 +- api/@internal/component/ets/list.d.ts | 49 +- api/@internal/component/ets/list_item.d.ts | 22 + api/@internal/component/ets/menu_item.d.ts | 21 + .../component/ets/nav_destination.d.ts | 13 +- api/@internal/component/ets/navigation.d.ts | 27 + .../component/ets/page_transition.d.ts | 86 + api/@internal/component/ets/particle.d.ts | 16 +- .../component/ets/plugin_component.d.ts | 37 +- api/@internal/component/ets/radio.d.ts | 20 + api/@internal/component/ets/rating.d.ts | 18 + api/@internal/component/ets/refresh.d.ts | 19 + api/@internal/component/ets/rich_editor.d.ts | 89 + api/@internal/component/ets/save_button.d.ts | 3 +- api/@internal/component/ets/search.d.ts | 23 + .../component/ets/security_component.d.ts | 37 +- api/@internal/component/ets/select.d.ts | 37 + api/@internal/component/ets/sidebar.d.ts | 33 + api/@internal/component/ets/slider.d.ts | 25 + api/@internal/component/ets/stepper.d.ts | 52 + .../component/ets/styled_string.d.ts | 13 + api/@internal/component/ets/swiper.d.ts | 20 + api/@internal/component/ets/tabs.d.ts | 18 + api/@internal/component/ets/text_area.d.ts | 26 + api/@internal/component/ets/text_common.d.ts | 53 + api/@internal/component/ets/text_input.d.ts | 24 + api/@internal/component/ets/toggle.d.ts | 19 + .../component/ets/ui_extension_component.d.ts | 72 +- api/@internal/component/ets/units.d.ts | 13 + api/@internal/component/ets/water_flow.d.ts | 26 +- api/@internal/component/ets/web.d.ts | 83 +- api/@ohos.InputMethodSubtype.d.ts | 8 +- api/@ohos.UiTest.d.ts | 12 + api/@ohos.WorkSchedulerExtensionAbility.d.ts | 15 +- api/@ohos.ability.errorCode.d.ts | 15 +- api/@ohos.ability.screenLockFileManager.d.ts | 60 +- api/@ohos.accessibility.config.d.ts | 24 +- api/@ohos.accessibility.d.ts | 18 +- ...os.app.ability.ActionExtensionAbility.d.ts | 3 +- ...ohos.app.ability.AtomicServiceOptions.d.ts | 9 +- ...os.app.ability.DriverExtensionAbility.d.ts | 43 +- ...hos.app.ability.PrintExtensionAbility.d.ts | 6 +- ...s.app.ability.ServiceExtensionAbility.d.ts | 3 +- ...hos.app.ability.ShareExtensionAbility.d.ts | 3 +- api/@ohos.app.ability.UIAbility.d.ts | 23 +- ....app.ability.abilityDelegatorRegistry.d.ts | 1 - api/@ohos.app.ability.abilityManager.d.ts | 49 +- api/@ohos.app.ability.appManager.d.ts | 39 +- api/@ohos.app.ability.application.d.ts | 3 +- api/@ohos.app.ability.dataUriUtils.d.ts | 15 +- api/@ohos.app.ability.errorManager.d.ts | 33 +- ...os.application.BackupExtensionAbility.d.ts | 2 +- ...application.DataShareExtensionAbility.d.ts | 21 +- api/@ohos.arkui.UIContext.d.ts | 63 +- api/@ohos.arkui.advanced.SplitLayout.d.ets | 41 +- api/@ohos.arkui.advanced.SwipeRefresher.d.ets | 22 +- api/@ohos.arkui.component.d.ets | 18 +- api/@ohos.arkui.componentSnapshot.d.ts | 18 +- api/@ohos.arkui.dragController.d.ts | 105 +- api/@ohos.arkui.drawableDescriptor.d.ts | 52 + api/@ohos.arkui.inspector.d.ts | 73 + api/@ohos.arkui.shape.d.ts | 8 +- api/@ohos.arkui.stateManagement.d.ets | 6 +- api/@ohos.batteryInfo.d.ets | 432 +- api/@ohos.batteryStatistics.d.ts | 159 +- api/@ohos.bluetooth.a2dp.d.ts | 3 +- api/@ohos.bluetooth.ble.d.ts | 27 +- api/@ohos.bluetooth.connection.d.ts | 9 +- api/@ohos.bluetooth.hfp.d.ts | 3 +- api/@ohos.bluetooth.hid.d.ts | 3 +- api/@ohos.buffer.d.ts | 34 +- api/@ohos.bundle.appControl.d.ts | 38 +- api/@ohos.bundle.appDomainVerify.d.ts | 9 +- api/@ohos.bundle.bundleManager.d.ts | 300 +- api/@ohos.bundle.bundleMonitor.d.ts | 8 +- api/@ohos.bundle.bundleResourceManager.d.ts | 38 +- api/@ohos.bundle.defaultAppManager.d.ts | 38 +- api/@ohos.bundle.freeInstall.d.ts | 4 +- api/@ohos.bundle.installer.d.ts | 47 +- api/@ohos.bundle.launcherBundleManager.d.ts | 26 +- api/@ohos.bundle.shortcutManager.d.ts | 12 +- api/@ohos.charger.d.ts | 2 +- api/@ohos.curves.d.ts | 197 +- api/@ohos.data.DataShareResultSet.d.ts | 9 +- api/@ohos.data.dataShare.d.ts | 57 +- api/@ohos.data.dataSharePredicates.d.ts | 12 +- api/@ohos.data.distributedKVStore.d.ts | 111 +- api/@ohos.data.preferences.d.ts | 37 +- api/@ohos.data.relationalStore.d.ts | 36 +- api/@ohos.data.unifiedDataChannel.d.ts | 2194 ++++++-- api/@ohos.deviceStatus.dragInteraction.d.ts | 37 +- ...s.distributedHardware.mechanicManager.d.ts | 128 +- api/@ohos.driver.deviceManager.d.ts | 233 +- api/@ohos.effectKit.d.ts | 1600 +++--- api/@ohos.file.hash.d.ts | 3 +- api/@ohos.file.keyManager.d.ts | 7 +- api/@ohos.file.photoAccessHelper.d.ts | 384 +- api/@ohos.file.storageStatistics.d.ts | 53 +- api/@ohos.file.volumeManager.d.ts | 26 +- api/@ohos.fileshare.d.ts | 33 +- api/@ohos.geoLocationManager.d.ts | 120 +- api/@ohos.graphics.text.d.ts | 498 +- api/@ohos.hiSysEvent.d.ts | 96 +- api/@ohos.hichecker.d.ts | 40 +- api/@ohos.hidebug.d.ts | 258 +- api/@ohos.hilog.d.ts | 44 +- api/@ohos.hiviewdfx.hiAppEvent.d.ts | 237 +- api/@ohos.i18n.d.ts | 8 +- api/@ohos.inputMethod.d.ts | 35 +- api/@ohos.matrix4.d.ts | 8 +- api/@ohos.multimedia.audio.d.ts | 6 +- api/@ohos.multimedia.avCastPickerParam.d.ts | 9 +- api/@ohos.multimedia.avsession.d.ts | 2 +- api/@ohos.multimedia.camera.d.ts | 2664 +++++---- api/@ohos.multimedia.cameraPicker.d.ts | 47 +- api/@ohos.multimedia.image.d.ts | 471 +- api/@ohos.multimedia.media.d.ts | 602 +- ...ohos.multimodalAwareness.roomLocation.d.ts | 122 + api/@ohos.multimodalInput.gestureEvent.d.ts | 32 +- api/@ohos.multimodalInput.inputConsumer.d.ts | 64 +- api/@ohos.multimodalInput.inputDevice.d.ts | 40 +- ....multimodalInput.inputDeviceCooperate.d.ts | 1 - api/@ohos.multimodalInput.inputEvent.d.ts | 20 +- ...ohos.multimodalInput.inputEventClient.d.ts | 6 +- api/@ohos.multimodalInput.inputMonitor.d.ts | 3 +- api/@ohos.multimodalInput.keyCode.d.ts | 1044 ++-- api/@ohos.multimodalInput.keyEvent.d.ts | 33 +- api/@ohos.multimodalInput.mouseEvent.d.ts | 29 +- api/@ohos.multimodalInput.pointer.d.ts | 47 +- api/@ohos.multimodalInput.shortKey.d.ts | 38 +- api/@ohos.multimodalInput.touchEvent.d.ts | 76 +- api/@ohos.nfc.tag.d.ts | 2 + api/@ohos.notificationManager.d.ts | 238 +- api/@ohos.notificationSubscribe.d.ts | 18 +- api/@ohos.print.d.ts | 520 ++ api/@ohos.promptAction.d.ts | 3 + api/@ohos.resourceManager.d.ts | 5 - ...urceschedule.backgroundProcessManager.d.ts | 14 + ...esourceschedule.backgroundTaskManager.d.ts | 217 +- ...ohos.resourceschedule.usageStatistics.d.ts | 294 +- api/@ohos.resourceschedule.workScheduler.d.ts | 141 +- api/@ohos.rpc.d.ts | 416 +- api/@ohos.runningLock.d.ts | 7 +- api/@ohos.security.certManager.d.ts | 3 +- api/@ohos.sensor.d.ets | 2116 +++++++ api/@ohos.thermal.d.ts | 2 +- api/@ohos.usbManager.d.ts | 4915 +++++++++-------- api/@ohos.usbManager.serial.d.ts | 263 +- api/@ohos.util.ArrayList.d.ts | 37 +- api/@ohos.util.Deque.d.ts | 22 +- api/@ohos.util.LightWeightMap.d.ts | 26 + api/@ohos.util.List.d.ts | 2 + api/@ohos.util.d.ets | 51 + api/@ohos.util.stream.d.ts | 374 +- api/@ohos.web.webview.d.ts | 104 +- api/@ohos.wifi.d.ts | 3 +- api/@ohos.wifiManager.d.ts | 306 +- api/@ohos.window.d.ts | 12 + api/@ohos.zlib.d.ts | 300 +- api/@system.notification.d.ts | 3 + api/@system.prompt.d.ts | 4 +- api/ability/connectOptions.d.ts | 9 +- api/application/AbilityDelegator.d.ts | 2 + api/application/AbilityRunningInfo.d.ts | 21 +- api/application/ApplicationContext.d.ts | 9 +- api/application/AutoFillType.d.ts | 102 +- api/application/Context.d.ts | 27 +- api/application/DriverExtensionContext.d.ts | 24 +- api/application/ErrorObserver.d.ts | 9 +- api/application/EventHub.d.ts | 19 +- api/application/ExtensionRunningInfo.d.ts | 24 +- api/application/LoopObserver.d.ts | 6 +- api/application/ProcessInformation.d.ts | 1 - api/application/RunningMultiAppInfo.d.ts | 6 +- api/application/RunningMultiInstanceInfo.d.ts | 6 +- api/application/ServiceExtensionContext.d.ts | 6 +- api/application/UIAbilityContext.d.ts | 26 +- api/application/UIExtensionContext.d.ts | 25 +- .../WorkSchedulerExtensionContext.d.ts | 9 +- api/arkui/BuilderNode.d.ts | 149 + api/arkui/ComponentContent.d.ts | 121 +- api/arkui/Content.d.ets | 2 +- api/arkui/FrameNode.d.ts | 24 + api/arkui/Graphics.d.ts | 12 +- api/arkui/NodeController.d.ts | 3 +- .../animation.d.ets} | 11 +- api/arkui/component/builder.d.ets | 112 + api/arkui/component/customComponent.d.ets | 403 +- api/arkui/component/extendableComponent.d.ets | 113 + api/arkui/component/repeat.d.ets | 250 + api/arkui/component/resources.d.ets | 36 + api/arkui/stateManagement/common.d.ets | 81 - api/arkui/stateManagement/decorator.d.ets | 850 +++ .../decorators/decoratorStorageProp.d.ets | 30 - api/arkui/stateManagement/storage.d.ets | 339 -- .../appStorage.d.ets} | 9 +- .../stateManagement/storage/environment.d.ets | 91 + .../storage/localStorage.d.ets | 197 + .../storage/persistentStorage.d.ets | 89 + .../storage/storageProperty.d.ets | 144 + .../stateManagement/storages/appStorage.d.ets | 39 - .../storages/localStorage.d.ets | 40 - .../{base/decoratorBase.d.ets => utils.d.ets} | 99 +- api/bundleManager/AbilityInfo.d.ts | 32 +- api/bundleManager/AppProvisionInfo.d.ts | 12 +- api/bundleManager/ApplicationInfo.d.ts | 232 +- api/bundleManager/BundleInfo.d.ts | 227 +- api/bundleManager/BundlePackInfo.d.ts | 20 +- api/bundleManager/BundleResourceInfo.d.ts | 9 +- api/bundleManager/ExtensionAbilityInfo.d.ts | 16 +- api/bundleManager/HapModuleInfo.d.ts | 16 +- api/bundleManager/LauncherAbilityInfo.d.ts | 16 +- .../LauncherAbilityResourceInfo.d.ts | 9 +- api/bundleManager/Metadata.d.ts | 4 +- api/bundleManager/OverlayModuleInfo.d.ts | 8 +- api/bundleManager/PermissionDef.d.ts | 12 +- api/bundleManager/PluginBundleInfo.d.ts | 16 +- .../RecoverableApplicationInfo.d.ts | 8 +- api/bundleManager/SharedBundleInfo.d.ts | 8 +- api/bundleManager/ShortcutInfo.d.ts | 134 +- api/bundleManager/Skill.d.ts | 8 +- api/commonEvent/commonEventSubscriber.d.ts | 70 + api/device-define/wearable.json | 3 +- api/global/rawFileDescriptor.d.ts | 5 +- api/global/resource.d.ts | 2 + api/multimedia/soundPool.d.ts | 44 +- api/notification/notificationSubscriber.d.ts | 33 +- arkts/@arkts.collections.d.ets | 20 +- arkts/@arkts.math.Decimal.d.ets | 366 +- .../config/arkui_m3_white_list.json | 4 - .../arkui_transformer/package-lock.json | 228 +- .../pattern/arkts_component_decl.pattern | 2 +- .../pattern/arkts_component_decl_m3.pattern | 8 - .../arkui_transformer/src/add_import.ts | 9 - .../src/arkui_config_util.ts | 35 +- .../src/arkui_transformer.ts | 20 +- .../src/interface_converter.ts | 4 +- .../api-check-wrapper/index.ts | 17 + .../src/api_check_wrapper.ts | 0 .../utils/api_check_wrapper_enums.ts | 19 + .../utils/api_check_wrapper_typedef.ts | 113 + .../utils/api_check_wrapper_utils.ts | 41 +- .../utils/ts_wrapper_node_util.ts | 0 .../api-check-plugin-static/babel.config.js | 43 +- .../api-check-plugin-static/index.ts | 72 + .../api-check-plugin-static/package.json | 24 + .../src/api_check_config.ts | 172 + .../utils/api_check_plugin_define.ts | 103 + .../utils/api_check_plugin_enums.ts | 23 + .../utils/api_check_plugin_typedef.ts | 123 + .../utils/api_check_plugin_utils.ts | 903 +++ build-tools/declgen.js | 97 + build-tools/package-lock.json | 53 - build-tools/package.json | 10 +- build-tools/package_tools/.gitignore | 3 + .../package_tools/main.ts | 27 +- build-tools/package_tools/model/Constants.ts | 62 + build-tools/package_tools/model/Enums.ts | 43 + build-tools/package_tools/model/FileModify.ts | 321 ++ build-tools/package_tools/model/LogModel.ts | 126 + .../package_tools/model/PackagingModel.ts | 59 +- build-tools/package_tools/package.json | 23 + .../package_tools/src/PackagingEntry.ts | 80 + .../package_tools/src/handleApiMainPage.ts | 499 ++ build-tools/package_tools/tsconfig.json | 96 + .../package_tools/utils/Log.ts | 11 +- build-tools/package_tools/utils/Utils.ts | 66 + build-tools/package_tools/webpack.config.js | 61 + build-tools/remove_declgen.json | 6 + build_api_check_plugin.py | 74 + bundle.json | 2 +- kits/@kit.AbilityKit.d.ts | 4 + kits/@kit.ArkUI.d.ts | 18 +- kits/@kit.ImageKit.d.ts | 4 + kits/@kit.MultimodalAwarenessKit.d.ts | 1 - kits/@kit.PerformanceAnalysisKit.d.ts | 2 + run_compile_declgen.py | 93 + 291 files changed, 26128 insertions(+), 8985 deletions(-) rename api/arkui/stateManagement/decorators/decoratorState.d.ets => CODEOWNERS (43%) create mode 100644 api/@ohos.multimodalAwareness.roomLocation.d.ts create mode 100644 api/@ohos.sensor.d.ets rename api/arkui/{stateManagement/decorators/decoratorLink.d.ets => component/animation.d.ets} (60%) mode change 100644 => 100755 create mode 100755 api/arkui/component/builder.d.ets create mode 100644 api/arkui/component/extendableComponent.d.ets create mode 100755 api/arkui/component/repeat.d.ets delete mode 100644 api/arkui/stateManagement/common.d.ets create mode 100644 api/arkui/stateManagement/decorator.d.ets delete mode 100644 api/arkui/stateManagement/decorators/decoratorStorageProp.d.ets delete mode 100644 api/arkui/stateManagement/storage.d.ets rename api/arkui/stateManagement/{base/iObservedObject.d.ets => storage/appStorage.d.ets} (70%) create mode 100644 api/arkui/stateManagement/storage/environment.d.ets create mode 100644 api/arkui/stateManagement/storage/localStorage.d.ets create mode 100644 api/arkui/stateManagement/storage/persistentStorage.d.ets create mode 100644 api/arkui/stateManagement/storage/storageProperty.d.ets delete mode 100644 api/arkui/stateManagement/storages/appStorage.d.ets delete mode 100644 api/arkui/stateManagement/storages/localStorage.d.ets rename api/arkui/stateManagement/{base/decoratorBase.d.ets => utils.d.ets} (40%) delete mode 100644 build-tools/arkui_transformer/config/arkui_m3_white_list.json delete mode 100644 build-tools/arkui_transformer/pattern/arkts_component_decl_m3.pattern create mode 100644 build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/index.ts create mode 100644 build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/src/api_check_wrapper.ts create mode 100644 build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_enums.ts create mode 100644 build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_typedef.ts rename api/arkui/stateManagement/decorators/decoratorProp.d.ets => build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_utils.ts (37%) create mode 100644 build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/ts_wrapper_node_util.ts rename api/arkui/stateManagement/base/mutableStateMeta.d.ets => build-tools/compiler-plugins/api-check-plugin-static/babel.config.js (50%) create mode 100644 build-tools/compiler-plugins/api-check-plugin-static/index.ts create mode 100644 build-tools/compiler-plugins/api-check-plugin-static/package.json create mode 100644 build-tools/compiler-plugins/api-check-plugin-static/src/api_check_config.ts create mode 100644 build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_define.ts create mode 100644 build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_enums.ts create mode 100644 build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_typedef.ts create mode 100644 build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_utils.ts create mode 100644 build-tools/declgen.js delete mode 100644 build-tools/package-lock.json create mode 100644 build-tools/package_tools/.gitignore rename api/arkui/stateManagement/decorators/decoratorStorageLink.d.ets => build-tools/package_tools/main.ts (48%) create mode 100644 build-tools/package_tools/model/Constants.ts create mode 100644 build-tools/package_tools/model/Enums.ts create mode 100644 build-tools/package_tools/model/FileModify.ts create mode 100644 build-tools/package_tools/model/LogModel.ts rename api/arkui/stateManagement/decorators/decoratorWatch.d.ets => build-tools/package_tools/model/PackagingModel.ts (37%) create mode 100644 build-tools/package_tools/package.json create mode 100644 build-tools/package_tools/src/PackagingEntry.ts create mode 100644 build-tools/package_tools/src/handleApiMainPage.ts create mode 100644 build-tools/package_tools/tsconfig.json rename api/arkui/stateManagement/base/backingValue.d.ets => build-tools/package_tools/utils/Log.ts (76%) create mode 100644 build-tools/package_tools/utils/Utils.ts create mode 100644 build-tools/package_tools/webpack.config.js create mode 100644 build-tools/remove_declgen.json create mode 100755 build_api_check_plugin.py create mode 100755 run_compile_declgen.py diff --git a/api/arkui/stateManagement/decorators/decoratorState.d.ets b/ CODEOWNERS similarity index 43% rename from api/arkui/stateManagement/decorators/decoratorState.d.ets rename to CODEOWNERS index 5992f62fc1..0865e79457 100644 --- a/api/arkui/stateManagement/decorators/decoratorState.d.ets +++ b/ CODEOWNERS @@ -1,5 +1,5 @@ /* - * Copyright (C) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,24 +12,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * @file - * @kit ArkUI - * @arkts 1.2 - */ -import { DecoratedV1VariableBase, IDecoratedMutableVariable } from '../base/decoratorBase'; -import { PropDecoratedVariable } from './decoratorProp'; -import { WatchIdType, WatchFuncType } from './decoratorWatch'; +[base api] +api/@ohos.base.d.ets @majiajun518 +api/@ohos.base.d.ts @majiajun518 + +[通用模块] +build-tools/ @wangcaoyu @txdyyangbo @wanghanghui @Gpangjiaxue +BUILD.gn @wangcaoyu @txdyyangbo @wanghanghui @Gpangjiaxue +bundle.json @wangcaoyu @txdyyangbo @wanghanghui @Gpangjiaxue +exists_path.py @wangcaoyu @txdyyangbo @wanghanghui @Gpangjiaxue +ohos_copy_ets.py @wangcaoyu @txdyyangbo @wanghanghui @Gpangjiaxue +process_internal.py @wangcaoyu @txdyyangbo @wanghanghui @Gpangjiaxue + +[API裁剪工具] +build-tools/delete_systemapi_plugin.js @wangcaoyu -export declare interface __MkPropReturnType { - prop: PropDecoratedVariable; - watchId: WatchIdType; -} +[API打包工具] +build-tools/handleApiFiles.js @wangzhiyusss +arkui_transformer.py -export declare class StateDecoratedVariable extends DecoratedV1VariableBase - implements IDecoratedMutableVariable { - public constructor(varName: string, initValue: T, watchFunc?: WatchFuncType) - public get(): T - public set(newValue: T): void -} \ No newline at end of file +[int转number工具] +build-tools/intToNumber.js @wangzhiyusss diff --git a/BUILD.gn b/BUILD.gn index a7a70d9d9e..a58ebd1584 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -354,3 +354,55 @@ ohos_copy("ohos_ets_api") { part_name = "sdk" subsystem_name = "sdk" } + +action("install_tsc_declgen") { + deps = [ + ":ohos_base_split" + ] + external_deps = [ + "runtime_core:declgen_ts2sts_compile_declgen" + ] + script="run_compile_declgen.py" + args = [ + "--root-build-dir", + rebase_path("//", root_build_dir), + "--current-os-dir", + current_os, + "--output-interface-sdk", + rebase_path(interface_sdk_path, root_build_dir), + "--tool-dir", + rebase_path( + "${root_out_dir}/obj/arkcompiler/runtime_core/static_core/plugins/ets/tools/declgen_ts2sts/panda-declgen-1.0.0.tgz"), + "--node-js", + rebase_path(nodejs, root_build_dir), + ] + outputs = [ "${interface_sdk_path}/ets1.1interop" ] +} + +action("gen_api_check_plugin") { + deps = [ + "//developtools/ace_ets2bundle/arkui-plugins:ui_plugin" + ] + script = "build_api_check_plugin.py" + args = [ + "--source_path", + rebase_path(get_path_info("./build-tools/compiler-plugins/api-check-plugin-static", "abspath")), + "--output_path", + rebase_path("$target_gen_dir"), + "--npm", + rebase_path(npm), + ] + outputs = [ "$target_gen_dir" ] +} + +ohos_copy("api_check_plugin") { + deps = [ + ":gen_api_check_plugin" + ] + sources = [ + rebase_path("$target_gen_dir") + ] + outputs = [ target_out_dir + "/$target_name" ] + module_source_dir = target_out_dir + "/$target_name" + module_install_name = "" +} \ No newline at end of file diff --git a/api/@internal/component/ets/action_sheet.d.ts b/api/@internal/component/ets/action_sheet.d.ts index 8c34b13777..a7cb0c59b6 100644 --- a/api/@internal/component/ets/action_sheet.d.ts +++ b/api/@internal/component/ets/action_sheet.d.ts @@ -152,6 +152,17 @@ declare interface DismissDialogAction { * @since 12 */ dismiss: Callback; + + /** + * Defines dialog dismiss function. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + dismiss(): void; /** * Reason why the dialog box cannot be dismissed. You must specify whether to close the dialog box for each of the diff --git a/api/@internal/component/ets/alert_dialog.d.ts b/api/@internal/component/ets/alert_dialog.d.ts index 9c7ee8c1d0..78288760ab 100644 --- a/api/@internal/component/ets/alert_dialog.d.ts +++ b/api/@internal/component/ets/alert_dialog.d.ts @@ -18,6 +18,18 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { + ResourceStr, ResourceColor, VoidCallback, Offset, Dimension, BorderRadiuses, LocalizedBorderRadiuses, EdgeWidths, + LocalizedEdgeWidths, EdgeColors, LocalizedEdgeColors, EdgeStyles +} from './units'; +import { WordBreak, DialogButtonStyle, BorderStyle } from './enums'; +import { Rectangle, BlurStyle, Callback, TransitionEffect, ShadowOptions, ShadowStyle, HoverModeAreaType, DismissReason, + BackgroundBlurStyleOptions, BackgroundEffectOptions } from './common'; +import { LevelOrder, ImmersiveMode, LevelMode } from '../../@ohos.promptAction'; +import { DismissDialogAction } from './actionSheet'; +/*** endif */ + /** * The alignment of dialog, * diff --git a/api/@internal/component/ets/alphabet_indexer.d.ts b/api/@internal/component/ets/alphabet_indexer.d.ts index c809c09254..1f69d01830 100644 --- a/api/@internal/component/ets/alphabet_indexer.d.ts +++ b/api/@internal/component/ets/alphabet_indexer.d.ts @@ -18,6 +18,12 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { CommonMethod, BlurStyle, Bindable } from './common' +import { ResourceColor, Length, Position } from './units' +import { Font } from './units' +/*** endif */ + /** * indexer align property. * @@ -190,6 +196,17 @@ interface AlphabetIndexerOptions { * @since 18 */ selected: number; + /** + * ID of the selected item. + * + * @type { number | Bindable } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + selected: number | Bindable; } /** @@ -894,6 +911,18 @@ declare class AlphabetIndexerAttribute extends CommonMethod } index + * @returns { AlphabetIndexerAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + selected(index: number | Bindable): AlphabetIndexerAttribute; /** * Position of the pop-up windows, relative to the midpoint of the top border of the indexer bar. diff --git a/api/@internal/component/ets/calendar.d.ts b/api/@internal/component/ets/calendar.d.ts index ecac65717c..bf5216137e 100644 --- a/api/@internal/component/ets/calendar.d.ts +++ b/api/@internal/component/ets/calendar.d.ts @@ -34,6 +34,7 @@ * @systemapi * @form * @since 10 + * @deprecated since 20 */ interface CalendarDay { /** @@ -54,6 +55,7 @@ interface CalendarDay { * @systemapi * @form * @since 10 + * @deprecated since 20 */ index: number; @@ -75,6 +77,7 @@ interface CalendarDay { * @systemapi * @form * @since 10 + * @deprecated since 20 */ lunarMonth: string; @@ -94,6 +97,7 @@ interface CalendarDay { * @systemapi * @form * @since 10 + * @deprecated since 20 */ lunarDay: string; @@ -113,6 +117,7 @@ interface CalendarDay { * @systemapi * @form * @since 10 + * @deprecated since 20 */ dayMark: string; @@ -132,6 +137,7 @@ interface CalendarDay { * @systemapi * @form * @since 10 + * @deprecated since 20 */ dayMarkValue: string; @@ -151,6 +157,7 @@ interface CalendarDay { * @systemapi * @form * @since 10 + * @deprecated since 20 */ year: number; @@ -170,6 +177,7 @@ interface CalendarDay { * @systemapi * @form * @since 10 + * @deprecated since 20 */ month: number; @@ -189,6 +197,7 @@ interface CalendarDay { * @systemapi * @form * @since 10 + * @deprecated since 20 */ day: number; @@ -208,6 +217,7 @@ interface CalendarDay { * @systemapi * @form * @since 10 + * @deprecated since 20 */ isFirstOfLunar: boolean; @@ -229,6 +239,7 @@ interface CalendarDay { * @systemapi * @form * @since 10 + * @deprecated since 20 */ hasSchedule: boolean; @@ -248,6 +259,7 @@ interface CalendarDay { * @systemapi * @form * @since 10 + * @deprecated since 20 */ markLunarDay: boolean; } @@ -268,6 +280,7 @@ interface CalendarDay { * @systemapi * @form * @since 10 + * @deprecated since 20 */ interface MonthData { /** @@ -286,6 +299,7 @@ interface MonthData { * @systemapi * @form * @since 10 + * @deprecated since 20 */ year: number; @@ -305,6 +319,7 @@ interface MonthData { * @systemapi * @form * @since 10 + * @deprecated since 20 */ month: number; @@ -324,6 +339,7 @@ interface MonthData { * @systemapi * @form * @since 10 + * @deprecated since 20 */ data: CalendarDay[]; } @@ -344,6 +360,7 @@ interface MonthData { * @systemapi * @form * @since 10 + * @deprecated since 20 */ interface CurrentDayStyle { /** @@ -362,6 +379,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ dayColor?: ResourceColor; @@ -381,6 +399,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ lunarColor?: ResourceColor; @@ -400,6 +419,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ markLunarColor?: ResourceColor; @@ -419,6 +439,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ dayFontSize?: number; @@ -438,6 +459,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ lunarDayFontSize?: number; @@ -457,6 +479,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ dayHeight?: number; @@ -476,6 +499,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ dayWidth?: number; @@ -495,6 +519,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ gregorianCalendarHeight?: number; @@ -514,6 +539,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ dayYAxisOffset?: number; @@ -533,6 +559,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ lunarDayYAxisOffset?: number; @@ -552,6 +579,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ underscoreXAxisOffset?: number; @@ -571,6 +599,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ underscoreYAxisOffset?: number; @@ -590,6 +619,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ scheduleMarkerXAxisOffset?: number; @@ -609,6 +639,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ scheduleMarkerYAxisOffset?: number; @@ -628,6 +659,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ colSpace?: number; @@ -647,6 +679,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ dailyFiveRowSpace?: number; @@ -666,6 +699,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ dailySixRowSpace?: number; @@ -685,6 +719,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ lunarHeight?: number; @@ -704,6 +739,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ underscoreWidth?: number; @@ -723,6 +759,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ underscoreLength?: number; @@ -742,6 +779,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ scheduleMarkerRadius?: number; @@ -761,6 +799,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ boundaryRowOffset?: number; @@ -780,6 +819,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ boundaryColOffset?: number; } @@ -800,6 +840,7 @@ interface CurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ interface NonCurrentDayStyle { /** @@ -818,6 +859,7 @@ interface NonCurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ nonCurrentMonthDayColor?: ResourceColor; @@ -837,6 +879,7 @@ interface NonCurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ nonCurrentMonthLunarColor?: ResourceColor; @@ -856,6 +899,7 @@ interface NonCurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ nonCurrentMonthWorkDayMarkColor?: ResourceColor; @@ -875,6 +919,7 @@ interface NonCurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ nonCurrentMonthOffDayMarkColor?: ResourceColor; } @@ -895,6 +940,7 @@ interface NonCurrentDayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ interface TodayStyle { /** @@ -913,6 +959,7 @@ interface TodayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ focusedDayColor?: ResourceColor; @@ -932,6 +979,7 @@ interface TodayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ focusedLunarColor?: ResourceColor; @@ -951,6 +999,7 @@ interface TodayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ focusedAreaBackgroundColor?: ResourceColor; @@ -970,6 +1019,7 @@ interface TodayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ focusedAreaRadius?: number; } @@ -990,6 +1040,7 @@ interface TodayStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ interface WeekStyle { /** @@ -1008,6 +1059,7 @@ interface WeekStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ weekColor?: ResourceColor; @@ -1027,6 +1079,7 @@ interface WeekStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ weekendDayColor?: ResourceColor; @@ -1046,6 +1099,7 @@ interface WeekStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ weekendLunarColor?: ResourceColor; @@ -1065,6 +1119,7 @@ interface WeekStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ weekFontSize?: number; @@ -1084,6 +1139,7 @@ interface WeekStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ weekHeight?: number; @@ -1103,6 +1159,7 @@ interface WeekStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ weekWidth?: number; @@ -1122,6 +1179,7 @@ interface WeekStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ weekAndDayRowSpace?: number; } @@ -1142,6 +1200,7 @@ interface WeekStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ interface WorkStateStyle { /** @@ -1160,6 +1219,7 @@ interface WorkStateStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ workDayMarkColor?: ResourceColor; @@ -1179,6 +1239,7 @@ interface WorkStateStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ offDayMarkColor?: ResourceColor; @@ -1198,6 +1259,7 @@ interface WorkStateStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ workDayMarkSize?: number; @@ -1217,6 +1279,7 @@ interface WorkStateStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ offDayMarkSize?: number; @@ -1236,6 +1299,7 @@ interface WorkStateStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ workStateWidth?: number; @@ -1255,6 +1319,7 @@ interface WorkStateStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ workStateHorizontalMovingDistance?: number; @@ -1274,6 +1339,7 @@ interface WorkStateStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ workStateVerticalMovingDistance?: number; } @@ -1294,6 +1360,7 @@ interface WorkStateStyle { * @systemapi * @form * @since 10 + * @deprecated since 20 */ declare interface CalendarSelectedDate { /** @@ -1312,6 +1379,7 @@ declare interface CalendarSelectedDate { * @systemapi * @form * @since 10 + * @deprecated since 20 */ year: number; @@ -1331,6 +1399,7 @@ declare interface CalendarSelectedDate { * @systemapi * @form * @since 10 + * @deprecated since 20 */ month: number; @@ -1350,6 +1419,7 @@ declare interface CalendarSelectedDate { * @systemapi * @form * @since 10 + * @deprecated since 20 */ day: number; } @@ -1370,6 +1440,7 @@ declare interface CalendarSelectedDate { * @systemapi * @form * @since 10 + * @deprecated since 20 */ declare interface CalendarRequestedData { /** @@ -1388,6 +1459,7 @@ declare interface CalendarRequestedData { * @systemapi * @form * @since 10 + * @deprecated since 20 */ year: number; @@ -1407,6 +1479,7 @@ declare interface CalendarRequestedData { * @systemapi * @form * @since 10 + * @deprecated since 20 */ month: number; @@ -1426,6 +1499,7 @@ declare interface CalendarRequestedData { * @systemapi * @form * @since 10 + * @deprecated since 20 */ currentYear: number; @@ -1445,6 +1519,7 @@ declare interface CalendarRequestedData { * @systemapi * @form * @since 10 + * @deprecated since 20 */ currentMonth: number; @@ -1464,6 +1539,7 @@ declare interface CalendarRequestedData { * @systemapi * @form * @since 10 + * @deprecated since 20 */ monthState: number; } @@ -1482,6 +1558,7 @@ declare interface CalendarRequestedData { * @systemapi * @form * @since 10 + * @deprecated since 20 */ declare class CalendarController { /** @@ -1498,6 +1575,7 @@ declare class CalendarController { * @systemapi * @form * @since 10 + * @deprecated since 20 */ constructor(); @@ -1515,6 +1593,7 @@ declare class CalendarController { * @systemapi * @form * @since 10 + * @deprecated since 20 */ backToToday(); @@ -1534,6 +1613,7 @@ declare class CalendarController { * @systemapi * @form * @since 10 + * @deprecated since 20 */ goTo(value: { year: number; month: number; day: number }); } @@ -1554,6 +1634,7 @@ declare class CalendarController { * @systemapi * @form * @since 10 + * @deprecated since 20 */ interface CalendarInterface { /** @@ -1574,6 +1655,7 @@ interface CalendarInterface { * @systemapi * @form * @since 10 + * @deprecated since 20 */ (value: { date: { year: number; month: number; day: number }; @@ -1594,6 +1676,7 @@ interface CalendarInterface { * @systemapi * @form * @since 10 + * @deprecated since 20 */ declare class CalendarAttribute { /** @@ -1614,6 +1697,7 @@ declare class CalendarAttribute { * @systemapi * @form * @since 10 + * @deprecated since 20 */ showLunar(value: boolean): CalendarAttribute; @@ -1635,6 +1719,7 @@ declare class CalendarAttribute { * @systemapi * @form * @since 10 + * @deprecated since 20 */ showHoliday(value: boolean): CalendarAttribute; @@ -1656,6 +1741,7 @@ declare class CalendarAttribute { * @systemapi * @form * @since 10 + * @deprecated since 20 */ needSlide(value: boolean): CalendarAttribute; @@ -1677,6 +1763,7 @@ declare class CalendarAttribute { * @systemapi * @form * @since 10 + * @deprecated since 20 */ startOfWeek(value: number): CalendarAttribute; @@ -1698,6 +1785,7 @@ declare class CalendarAttribute { * @systemapi * @form * @since 10 + * @deprecated since 20 */ offDays(value: number): CalendarAttribute; @@ -1719,6 +1807,7 @@ declare class CalendarAttribute { * @systemapi * @form * @since 10 + * @deprecated since 20 */ direction(value: Axis): CalendarAttribute; @@ -1740,6 +1829,7 @@ declare class CalendarAttribute { * @systemapi * @form * @since 10 + * @deprecated since 20 */ currentDayStyle(value: CurrentDayStyle): CalendarAttribute; @@ -1761,6 +1851,7 @@ declare class CalendarAttribute { * @systemapi * @form * @since 10 + * @deprecated since 20 */ nonCurrentDayStyle(value: NonCurrentDayStyle): CalendarAttribute; @@ -1782,6 +1873,7 @@ declare class CalendarAttribute { * @systemapi * @form * @since 10 + * @deprecated since 20 */ todayStyle(value: TodayStyle): CalendarAttribute; @@ -1803,6 +1895,7 @@ declare class CalendarAttribute { * @systemapi * @form * @since 10 + * @deprecated since 20 */ weekStyle(value: WeekStyle): CalendarAttribute; @@ -1824,6 +1917,7 @@ declare class CalendarAttribute { * @systemapi * @form * @since 10 + * @deprecated since 20 */ workStateStyle(value: WorkStateStyle): CalendarAttribute; @@ -1845,6 +1939,7 @@ declare class CalendarAttribute { * @systemapi * @form * @since 10 + * @deprecated since 20 */ onSelectChange(event: (event: CalendarSelectedDate) => void): CalendarAttribute; @@ -1866,6 +1961,7 @@ declare class CalendarAttribute { * @systemapi * @form * @since 10 + * @deprecated since 20 */ onRequestData( event: (event: CalendarRequestedData) => void, @@ -1886,6 +1982,7 @@ declare class CalendarAttribute { * @systemapi * @form * @since 10 + * @deprecated since 20 */ declare const Calendar: CalendarInterface; @@ -1903,5 +2000,6 @@ declare const Calendar: CalendarInterface; * @systemapi * @form * @since 10 + * @deprecated since 20 */ declare const CalendarInstance: CalendarAttribute; diff --git a/api/@internal/component/ets/checkbox.d.ts b/api/@internal/component/ets/checkbox.d.ts index 1026186971..c4d13f33d1 100644 --- a/api/@internal/component/ets/checkbox.d.ts +++ b/api/@internal/component/ets/checkbox.d.ts @@ -18,6 +18,13 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { CommonConfiguration, Callback, CommonMethod, ContentModifier, Optional, Bindable } from './common'; +import { CustomBuilder } from './builder'; +import { ResourceColor, MarkStyle } from './units'; +import { CheckBoxShape } from './enums'; +/*** endif */ + /** * Defines the options of Checkbox. * @@ -364,6 +371,20 @@ declare class CheckboxAttribute extends CommonMethod { */ select(isSelected: Optional): CheckboxAttribute; + /** + * setting whether checkbox is selected. + * + * @param { boolean | undefined | Bindable } isSelected + * @returns { CheckboxAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + select(isSelected: boolean | undefined | Bindable): CheckboxAttribute; + /** * setting the display color of checkbox. * diff --git a/api/@internal/component/ets/checkboxgroup.d.ts b/api/@internal/component/ets/checkboxgroup.d.ts index 7d33b8fd86..b85d806683 100644 --- a/api/@internal/component/ets/checkboxgroup.d.ts +++ b/api/@internal/component/ets/checkboxgroup.d.ts @@ -18,6 +18,12 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { CommonMethod, Optional, Bindable } from './common'; +import { ResourceColor, MarkStyle } from './units'; +import { CheckBoxShape } from './enums'; +/*** endif */ + /** * CheckboxGroup SelectStatus * @@ -505,6 +511,20 @@ declare class CheckboxGroupAttribute extends CommonMethod): CheckboxGroupAttribute; + /** + * setting whether all checkbox is selected. + * + * @param { boolean| undefined|Bindable } isAllSelected + * @returns { CheckboxGroupAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + selectAll(isAllSelected: boolean | undefined | Bindable): CheckboxGroupAttribute; + /** * setting the display color of checkbox. * diff --git a/api/@internal/component/ets/common.d.ts b/api/@internal/component/ets/common.d.ts index b046a758d2..cca065f514 100644 --- a/api/@internal/component/ets/common.d.ts +++ b/api/@internal/component/ets/common.d.ts @@ -18,6 +18,59 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import OriginalContext from '../../application/Context'; +import { Resource } from '../../global/resource'; +import pointer from '../../@ohos.multimodalInput.pointer'; +import image from '../../@ohos.multimedia.image'; +import unifiedDataChannel from '../../@ohos.data.unifiedDataChannel'; +import promptAction from '../../@ohos.promptAction'; +import uniformTypeDescriptor from '../../@ohos.data.uniformTypeDescriptor'; +import Want from '../../@ohos.app.ability.Want'; +import { IntentionCode } from '../../@ohos.multimodalInput.intentionCode'; +import { SymbolGlyphModifier } from '../../arkui/SymbolGlyphModifier'; +import { CircleShape, EllipseShape, PathShape, RectShape } from '../../@ohos.arkui.shape'; +import uiObserver from '../../@ohos.arkui.observer'; +import { UIContext as _UIContext } from '../../@ohos.arkui.UIContext'; +import { DrawContext as _DrawContext, LengthMetrics } from '../../arkui/Graphics'; +import uiEffect from '../../@ohos.graphics.uiEffect'; +import { FocusBoxStyle, FocusPriority } from './focus'; +import { ComponentContent } from '../../arkui/ComponentContent'; +import { ResizableOptions } from './image'; +import { Theme } from '../../@ohos.arkui.theme'; +import intl from '../../@ohos.intl'; +import { ButtonType, ButtonStyleMode, ButtonRole } from './button'; +import { + Area, ResourceColor, Dimension, ResourceStr, Font, Length, EdgeColors, + LocalizedEdgeColors, BorderRadiuses, EdgeWidths, LocalizedEdgeWidths, SizeOptions, Bias, + EdgeStyles, Position, LocalizedBorderRadiuses, Margin, ChainWeightOptions, Padding, LocalizedPadding, LocalizedMargin, + BorderOptions, OutlineOptions, EdgeOutlineStyles, EdgeOutlineWidths, OutlineRadiuses, Edges, LocalizedEdges, LocalizedPosition, + AccessibilityOptions, ConstraintSizeOptions, EdgeWidth, DirectionalEdgesT, VoidCallback + } from './units'; +import { BaseGestureEvent, GestureRecognizer, GestureJudgeResult, GestureType, + GestureMask, GestureHandler, GesturePriority, GestureInfo + } from './gesture'; +import { ScrollState } from './list'; +import { + AccessibilityHoverType, Curve, PlayMode, SharedTransitionEffectType, KeySource, BorderStyle, + HorizontalAlign, VerticalAlign, MouseButton, MouseAction, TransitionType, FontWeight, TouchType, + FontStyle, Color, ColoringStrategy, Placement, ArrowPointPosition, ClickEffectLevel, NestedScrollMode, HitTestMode, + Alignment, ImageRepeat, ImageSize, HoverEffect, Visibility, ItemAlign, Direction, Axis, GradientDirection, FunctionKey, + ModifierKey, ObscuredReasons, RenderFit, LineCapStyle, LineJoinStyle, PixelRoundCalcPolicy, IlluminatedType, TextDecorationType, + TextDecorationStyle, KeyType, ResponseType, BarState, EdgeEffect, ScrollSource, InteractionHand, AxisAction, AxisModel, CrownAction, + FocusDrawLevel, CrownSensitivity +} from './enums'; +import { TextRange } from './textCommon'; +import { StyledString } from './styledString'; +import { CircleAttribute } from './circle'; +import { RectAttribute } from './rect'; +import { PathAttribute } from './path'; +import { EllipseAttribute } from './ellipse'; +import { LocalStorage } from '../stateManagement/storage/localStorage'; +import { CustomBuilder, WrappedBuilder } from './builder'; +import curves from '../../@ohos.curves'; +/*** endif */ + /** * Defines the options of Component ClassDecorator. * @@ -1446,6 +1499,19 @@ declare interface ReuseOptions { */ declare type Context = import('../api/application/Context').default; +/** + * Export Context. + * + * @typedef { OriginalContext } Context + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @stagemodelonly + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +export type Context = OriginalContext; + /** * Post Card Action. * @@ -3802,6 +3868,19 @@ interface ICurve { interpolate(fraction: number): number; } +/** + * Interface for curve object. + * + * @typedef { curves.ICurve } ICurve + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +export type ICurve = curves.ICurve; + /** * Defines the motion path options. * @@ -7104,6 +7183,306 @@ declare class TransitionEffect< combine(transitionEffect: TransitionEffect): TransitionEffect; } +/** + * Defines the transition effect + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +declare class TransitionEffect { + + /** + * Disables the transition effect + * + * @type { TransitionEffect } + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + static get IDENTITY(): TransitionEffect; + + /** + * Specifies a transition effect with transparency of 0, which is equivalent to TransitionEffect.opacity(0). + * + * @type { TransitionEffect } + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + static get OPACITY(): TransitionEffect; + + /** + * Defines a slide transition effect + * + * @type { TransitionEffect } + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + static get SLIDE(): TransitionEffect; + + /** + * Specify a transition effect where the element enters by shrinking first and then expanding as it slides in from the right, + * and exits by shrinking first and then expanding as it slides out to the left, with a minimum scale ratio of 0.8. + * It comes with default animation parameters, which can also be overridden. + * The default animation duration is set to 600ms, and the specified animation curve is cubicBezierCurve(0.24, 0.0, 0.50, 1.0). + * + * @type { TransitionEffect } + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + static get SLIDE_SWITCH(): TransitionEffect; + + /** + * Creates a translate transition effect + * + * @param { TranslateOptions } options - translate options + * @returns { TransitionEffect } + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + static translate(options: TranslateOptions): TransitionEffect; + + /** + * Creates a rotation transition effect + * + * @param { RotateOptions } options - rotate options + * Set the rotation effect for component transitions when inserting and deleting. + * The value represents the starting rotation point for the inserting animation and the ending rotation point for the deleting animation. + * -x: Horizontal component of the rotational vector. + * -y: Vertical component of the rotational vector. + * -z: Vertical component of the rotational vector. + * -centerX, centerY specify the rotation center point, with default values of "50%", + * meaning that the default rotation center point is the center point of the component. + * -The center point of (0, 0) represents the upper-left corner of the component. + * -centerZ refers to the Z-axis anchor point. The default value of centerZ is 0. + * -perspective indicates the visual distance. The perspective property does not support transition animation. + * @returns { TransitionEffect } + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + static rotate(options: RotateOptions): TransitionEffect; + + /** + * Creates a scale transition effect + * + * @param { ScaleOptions } options - scale options + * @returns { TransitionEffect } + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + static scale(options: ScaleOptions): TransitionEffect; + + /** + * Creates an opacity transition effect with alpha value + * + * @param { number } alpha - opacity alpha value, value range [0, 1]. + * Illegal values less than 0 are treated as 0, and illegal values greater than 1 are treated as 1. + * @returns { TransitionEffect } + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + static opacity(alpha: number): TransitionEffect; + + /** + * Creates a move transition effect + * + * @param { TransitionEdge } edge - the edge that component will move to + * @returns { TransitionEffect } + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + static move(edge: TransitionEdge): TransitionEffect; + + /** + * Creates an asymmetric transition effect + * + * @param { TransitionEffect } appear - the transition which will be attached when the component is appear + * @param { TransitionEffect } disappear - the transition which will be attached when the component is disappear + * @returns { TransitionEffect } + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + static asymmetric(appear: TransitionEffect, disappear: TransitionEffect): TransitionEffect; + + /** + * identity or slideSwitch TransitionEffect constructor + * + * @param { 'identity' | 'slideSwitch' } type - transition type + * @param { undefined } effect - transition options + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + constructor(type: 'identity' | 'slideSwitch', effect: undefined); + + /** + * opacity TransitionEffect constructor + * + * @param { 'opacity' } type - transition type + * @param { number } effect - transition options + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + constructor(type: 'opacity', effect: number); + + /** + * move TransitionEffect constructor + * + * @param { 'move' } type - transition type + * @param { TransitionEdge } effect - transition options + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + constructor(type: 'move', effect: TransitionEdge); + + /** + * translate TransitionEffect constructor + * + * @param { 'translate' } type - transition type + * @param { TranslateOptions } effect - transition options + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + constructor(type: 'translate', effect:TranslateOptions); + + /** + * rotate TransitionEffect constructor + * + * @param { 'rotate' } type - transition type + * @param { RotateOptions } effect - transition options + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + constructor(type: 'rotate', effect: RotateOptions); + + /** + * scale TransitionEffect constructor + * + * @param { 'scale' } type - transition type + * @param { ScaleOptions } effect - transition options + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + constructor(type: 'scale', effect: ScaleOptions); + + /** + * asymmetric TransitionEffect constructor + * + * @param { 'asymmetric' } type - transition type + * @param { AsymmetricTransitionOption } effect - transition options + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + constructor(type: 'asymmetric', effect: AsymmetricTransitionOption); + + /** + * Set the animation of current transition effect + * + * @param { AnimateParam } value - animation parameters + * @returns { TransitionEffect } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + animation(value: AnimateParam): TransitionEffect; + + /** + * Combines another transition effect + * + * @param { TransitionEffect } transitionEffect - transition effect which is be combined + * @returns { TransitionEffect } combined transition effect + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + combine(transitionEffect: TransitionEffect): TransitionEffect; +} + /** * Define Preview property * @@ -12794,6 +13173,17 @@ declare type Summary = import('../api/@ohos.data.unifiedDataChannel').default.Su */ declare type UniformDataType = import('../api/@ohos.data.uniformTypeDescriptor').default.UniformDataType; +/** + * Import the UniformDataType type object for ui component. + * + * @typedef { uniformTypeDescriptor.UniformDataType } UniformDataType + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +declare type UniformDataType = uniformTypeDescriptor.UniformDataType; + /** * Import the GetDataParams type object for ui component. * @@ -12805,11 +13195,24 @@ declare type UniformDataType = import('../api/@ohos.data.uniformTypeDescriptor') */ declare type DataSyncOptions = import('../api/@ohos.data.unifiedDataChannel').default.GetDataParams; +/** + * Import the GetDataParams type object for ui component. + * + * @typedef { unifiedDataChannel.GetDataParams } GetDataParams + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +declare type DataSyncOptions = unifiedDataChannel.GetDataParams; + /** * The type for SpringLoadingContext, see the detailed description in dragController. * * @typedef {import('../api/@ohos.arkui.dragController').default.SpringLoadingContext} SpringLoadingContext * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform * @atomicservice * @since 20 */ @@ -14048,7 +14451,8 @@ declare interface DragEvent { * @throws { BusinessError } 190003 - Operation not allowed for current pharse. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ startDataLoading(options: DataSyncOptions): string; @@ -15160,6 +15564,67 @@ declare interface SpringBackAction { springBack: Callback; } +/** + * Defines sheet spring back action + * + * @interface SpringBackAction + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +declare interface SpringBackAction { + /** + * Defines spring back function + * + * @type { VoidCallback } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + springBack: VoidCallback; +} + + +/** + * Defines the detent array of a single length. + * + * @typedef { [SheetSize | Length] } SingleLengthDetent + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +declare type SingleLengthDetent = [SheetSize | Length]; + +/** + * Defines the detent array of a two-length. + * + * @typedef { [(SheetSize | Length), SheetSize | Length | undefined] } DoubleLengthDetents + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +declare type DoubleLengthDetents = [(SheetSize | Length), SheetSize | Length | undefined]; + +/** + * Defines the detent array of a three-length. + * + * @typedef { [(SheetSize | Length), SheetSize | Length | undefined, SheetSize | Length | undefined] } TripleLengthDetents + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +declare type TripleLengthDetents = [(SheetSize | Length), SheetSize | Length | undefined, SheetSize | Length | undefined]; + /** * Component sheet options * @@ -15290,6 +15755,18 @@ declare interface SheetOptions extends BindOptions { */ detents?: [(SheetSize | Length), (SheetSize | Length)?, (SheetSize | Length)?]; + /** + * Defines sheet detents + * + * @type { ?(SingleLengthDetent | DoubleLengthDetents | TripleLengthDetents) } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + detents?: SingleLengthDetent | DoubleLengthDetents | TripleLengthDetents; + /** * Background blur of the sheet. By default, there is no background blur. * @@ -16140,6 +16617,17 @@ declare interface DismissPopupAction { */ dismiss: Callback; + /** + * Defines popup dismiss function + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + dismiss(): void; + /** * Defines popup dismiss reason * @@ -16681,6 +17169,43 @@ declare interface TipsOptions { showAtAnchor?: TipsAnchorType; } +/** + * Defines the popup button. + * + * @interface PopupButton + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +declare interface PopupButton { + + /** + * Button text value + * + * @type { string } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + value: string; + + /** + * action + * + * @type { VoidCallback } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + action: VoidCallback; +} + /** * Defines the popup options. * @@ -27085,6 +27610,21 @@ declare class CommonMethod { /** * Binds a modal page to the component, whose visibility is subject to the isShow settings. * + * @param { boolean | Bindable} isShow - true means display content, false means hide content. + * @param { CustomBuilder } builder - the content to be displayed. + * @param { ModalTransition } [type] - transition type. + * @returns { T } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + bindContentCover(isShow: boolean | Bindable, builder: CustomBuilder, type?: ModalTransition): T; + + /** + * Bind content cover + * * @param { boolean } isShow - true means display content, false means hide content. * @param { CustomBuilder } builder - the content to be displayed. * @param { ContentCoverOptions } options - options of content cover. @@ -27105,7 +27645,22 @@ declare class CommonMethod { * @atomicservice * @since 11 */ - bindContentCover(isShow: boolean, builder: CustomBuilder, options?: ContentCoverOptions): T; + bindContentCover(isShow: boolean , builder: CustomBuilder, options?: ContentCoverOptions): T; + + /** + * Bind content cover + * + * @param { boolean | Bindable } isShow - true means display content, false means hide content. + * @param { CustomBuilder } builder - the content to be displayed. + * @param { ContentCoverOptions } [options] - options of content cover. + * @returns { T } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + bindContentCover(isShow: boolean | Bindable, builder: CustomBuilder, options?: ContentCoverOptions): T; /** * Binds a sheet page to the component, whose visibility is subject to the isShow settings. @@ -27132,6 +27687,21 @@ declare class CommonMethod { */ bindSheet(isShow: boolean, builder: CustomBuilder, options?: SheetOptions): T; + /** + * Bind sheet + * + * @param { boolean | Bindable} isShow - true means display sheet, false means hide sheet. + * @param { CustomBuilder } builder - the sheet to be displayed. + * @param { SheetOptions } [options] - options of sheet. + * @returns { T } - template type + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + bindSheet(isShow: boolean | Bindable, builder: CustomBuilder, options?: SheetOptions): T; + /** * Sets styles for component state. * @@ -27247,7 +27817,8 @@ declare class CommonMethod { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 17 + * @since arkts {'1.1':'17','1.2':'20'} + * @arkts 1.1&1.2 */ onVisibleAreaApproximateChange(options: VisibleAreaEventOptions, event: VisibleAreaChangeCallback | undefined): void; @@ -29934,6 +30505,19 @@ declare type RouterPageInfo = import('../api/@ohos.arkui.observer').default.Rout */ declare type UIContext = import('../api/@ohos.arkui.UIContext').UIContext; +/** + * UIContext. + * + * @typedef { _UIContext } UIContext + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @stagemodelonly + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +export type UIContext = _UIContext; + /** * DrawContext * @@ -29945,6 +30529,19 @@ declare type UIContext = import('../api/@ohos.arkui.UIContext').UIContext; */ declare type DrawContext = import('../api/arkui/Graphics').DrawContext; +/** + * DrawContext. + * + * @typedef { _DrawContext } DrawContext + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @stagemodelonly + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +export type DrawContext = _DrawContext; + /** * VisualEffect * @@ -32837,3 +33434,101 @@ declare interface DateRange { */ end?: Date; } + +/** + * Indicates the information when the provider of the embedded UI is terminated. + * + * @interface TerminationInfo + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + * @arkts 1.2 + */ +declare interface TerminationInfo { + /** + * Defines the termination code. + * + * @type { number } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + * @arkts 1.2 + */ + code: number; + + /** + * Defines the additional termination information. + * + * @type { ?Want } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + * @arkts 1.2 + */ + want?: Want; +} + +/** + * Defines the format for displaying dates and times. + * + * @typedef { intl.DateTimeOptions } DateTimeOptions + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +declare type DateTimeOptions = intl.DateTimeOptions; + +/** + * Defines a bindable property + * @interface Bindable + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +export declare interface Bindable { + /** + * Defines value of the bindable property. + * @type { T } + * @readonly + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + readonly value: T; + + /** + * Defines the callback of the bindable property which will be invork when the property is changed.. + * @type { Callback } + * @readonly + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + * @arkts 1.2 + */ + readonly onChange: Callback; +} + +/** + * Convert to a bindable property. + * + * @param { T } value - indicate the value of a state property. + * @returns { Bindable } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + * @arkts 1.2 + */ +export declare function $$(value: T): Bindable; + +/** + * Apply style function on this CommonMethod. + * + * @param { T } this + * @param { CustomStyles } customStyles + * @returns { T } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + * @arkts 1.2 + */ +export declare function applyStyles(this: T, customStyles: CustomStyles): T; diff --git a/api/@internal/component/ets/custom_dialog_controller.d.ts b/api/@internal/component/ets/custom_dialog_controller.d.ts index 8002913639..e812db621f 100644 --- a/api/@internal/component/ets/custom_dialog_controller.d.ts +++ b/api/@internal/component/ets/custom_dialog_controller.d.ts @@ -18,6 +18,22 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { + Rectangle, AnimateParam, Callback, ShadowOptions, ShadowStyle, KeyboardAvoidMode, BlurStyle, HoverModeAreaType, + DismissReason, BackgroundBlurStyleOptions, BackgroundEffectOptions +} from './common'; +import { CustomBuilder } from './builder'; +import { ExtendableComponent } from './extendableComponent'; +import { DialogAlignment } from './alertDialog'; +import { Offset, ResourceColor, Dimension, BorderRadiuses, EdgeWidths, EdgeColors, EdgeStyles } from './units'; +import { BorderStyle } from './enums'; +import { LengthMetrics } from '../Graphics'; +import { LevelMode, LevelOrder, ImmersiveMode } from '../../@ohos.promptAction'; +import { CustomBuilder } from './builder'; +import { DismissDialogAction } from './actionSheet'; +/*** endif */ + /** * Defines the options of CustomDialogController. * @@ -69,6 +85,18 @@ declare interface CustomDialogControllerOptions { */ builder: any; + /** + * Custom builder function. + * + * @type { CustomBuilder | ExtendableComponent } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + builder: CustomBuilder | ExtendableComponent; + /** * Defines the cancel function. * diff --git a/api/@internal/component/ets/embedded_component.d.ts b/api/@internal/component/ets/embedded_component.d.ts index 48a15bb05a..d3a20db61f 100644 --- a/api/@internal/component/ets/embedded_component.d.ts +++ b/api/@internal/component/ets/embedded_component.d.ts @@ -18,6 +18,12 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import Want from '../../@ohos.app.ability.Want' +import { Callback, ErrorCallback ,BusinessError} from '../../@ohos.base' +import { CommonMethod, TerminationInfo } from './common' +import { EmbeddedType } from './enums' +/*** endif */ /** * Provide an interface for the EmbeddedComponent, which is used @@ -106,6 +112,18 @@ declare class EmbeddedComponentAttribute extends CommonMethod } callback + * @returns { EmbeddedComponentAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + onError(callback: ErrorCallback): EmbeddedComponentAttribute; } /** diff --git a/api/@internal/component/ets/enums.d.ts b/api/@internal/component/ets/enums.d.ts index 94b9a98534..1ef76b5042 100644 --- a/api/@internal/component/ets/enums.d.ts +++ b/api/@internal/component/ets/enums.d.ts @@ -18,6 +18,10 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import curves from '../../@ohos.curves'; +/*** endif */ + /** * common enum of the checkbox shape * @@ -2232,6 +2236,19 @@ declare enum Curve { Friction, } +/** + * enum Curve. + * + * @typedef { curves.Curve } Curve + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +export type Curve = curves.Curve; + /** * Sets the state before and after the animation starts. * diff --git a/api/@internal/component/ets/grid.d.ts b/api/@internal/component/ets/grid.d.ts index 4ff5042993..52ab5df9d1 100644 --- a/api/@internal/component/ets/grid.d.ts +++ b/api/@internal/component/ets/grid.d.ts @@ -18,6 +18,14 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { EdgeEffectOptions, NestedScrollOptions, ItemDragInfo, ScrollableCommonMethod, Optional, CommonMethod, OnWillScrollCallback, OnScrollCallback, OnItemDragStartCallback } from './common'; +import { Length, Resource } from './units'; +import { Scroller, OnScrollFrameBeginCallback } from './scroll'; +import { ScrollState } from './list'; +import { BarState, Color, EdgeEffect } from './enums'; +/*** endif */ + /** * The options to help grid layout * @@ -1379,7 +1387,44 @@ declare class GridAttribute extends ScrollableCommonMethod { * @atomicservice * @since 11 */ - onScrollFrameBegin(event: (offset: number, state: ScrollState) => { offsetRemain: number }): GridAttribute; + /** + * Called when scrolling begin each frame. + * Anonymous Object Rectification. + * + * @param { OnScrollFrameBeginCallback } event - callback function, triggered when the scrolling begin each frame. + * @returns { GridAttribute } Returns the instance of the GridAttribute. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ + onScrollFrameBegin(event: OnScrollFrameBeginCallback): GridAttribute; + + /** + * Called when the scrollable will scroll. + * + * @param { Optional } handler - callback of scrollable. + * @returns { GridAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + onWillScroll(handler: Optional): GridAttribute; + + /** + * Called when the scrollable did scroll. + * + * @param { OnScrollCallback } handler - callback of scrollable, + * scrollOffset is offset this frame did scroll, scrollState is current scroll state. + * @returns { GridAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + onDidScroll(handler: OnScrollCallback): GridAttribute; } /** diff --git a/api/@internal/component/ets/image_span.d.ts b/api/@internal/component/ets/image_span.d.ts index 40109b352a..ca37b877ab 100644 --- a/api/@internal/component/ets/image_span.d.ts +++ b/api/@internal/component/ets/image_span.d.ts @@ -18,6 +18,15 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { ResourceStr, ColorFilter} from './units'; +import { BaseSpan } from './span'; +import { ImageSpanAlignment, ImageFit } from './enums'; +import { ImageErrorCallback, DrawingColorFilter } from './image'; +import { PixelMap } from './common'; +import image from '../../@ohos.multimedia.image'; +/*** endif */ + /** * Provide image decoration in the text component. * @@ -105,7 +114,8 @@ declare class ImageSpanAttribute extends BaseSpan { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ colorFilter(filter: ColorFilter | DrawingColorFilter): ImageSpanAttribute; diff --git a/api/@internal/component/ets/lazy_grid_layout.d.ts b/api/@internal/component/ets/lazy_grid_layout.d.ts index 632f0f7f17..cd82bcfe98 100644 --- a/api/@internal/component/ets/lazy_grid_layout.d.ts +++ b/api/@internal/component/ets/lazy_grid_layout.d.ts @@ -18,6 +18,12 @@ * @kit ArkUI */ + +/*** if arkts 1.2 */ +import { CommonMethod } from './common'; +import { LengthMetrics } from '../Graphics'; +/*** endif */ + /** * Defines the lazy vertical grid layout component. * @@ -25,7 +31,8 @@ * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface LazyVGridLayoutInterface { /** @@ -35,7 +42,8 @@ interface LazyVGridLayoutInterface { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ (): LazyVGridLayoutAttribute; } @@ -47,7 +55,8 @@ interface LazyVGridLayoutInterface { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ declare class LazyGridLayoutAttribute extends CommonMethod { /** @@ -58,7 +67,8 @@ declare class LazyGridLayoutAttribute extends CommonMethod { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ rowsGap(value: LengthMetrics): T; @@ -70,7 +80,8 @@ declare class LazyGridLayoutAttribute extends CommonMethod { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ columnsGap(value: LengthMetrics): T; } @@ -82,7 +93,8 @@ declare class LazyGridLayoutAttribute extends CommonMethod { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ declare class LazyVGridLayoutAttribute extends LazyGridLayoutAttribute { /** @@ -93,7 +105,8 @@ declare class LazyVGridLayoutAttribute extends LazyGridLayoutAttribute { * @atomicservice * @since 11 */ - onScrollFrameBegin(event: (offset: number, state: ScrollState) => { offsetRemain: number }): ListAttribute; + /** + * Called when scrolling begin each frame. + * Anonymous Object Rectification. + * + * @param { OnScrollFrameBeginCallback } event - callback function, triggered when the scrolling begin each frame. + * @returns { ListAttribute } Returns the instance of the ListAttribute. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ + onScrollFrameBegin(event: OnScrollFrameBeginCallback): ListAttribute; + + /** + * Called when the scrollable will scroll. + * + * @param { Optional } handler - callback of scrollable. + * @returns { ListAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + onWillScroll(handler: Optional): ListAttribute; + + /** + * Called when the scrollable did scroll. + * + * @param { OnScrollCallback } handler - callback of scrollable, + * scrollOffset is offset this frame did scroll, scrollState is current scroll state. + * @returns { ListAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + onDidScroll(handler: OnScrollCallback): ListAttribute; } /** diff --git a/api/@internal/component/ets/list_item.d.ts b/api/@internal/component/ets/list_item.d.ts index ae66c200dc..6f16bf1a1c 100644 --- a/api/@internal/component/ets/list_item.d.ts +++ b/api/@internal/component/ets/list_item.d.ts @@ -18,6 +18,13 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { CommonMethod, Bindable } from './common'; +import { CustomBuilder } from './builder' +import { Length } from './units'; +import { ComponentContent } from '../ComponentContent' +/*** endif */ + /** * Declare item ceiling attribute. * @@ -782,6 +789,21 @@ declare class ListItemAttribute extends CommonMethod { */ selected(value: boolean): ListItemAttribute; + /** + * Called when judging whether it is selected. + * This parameter supports $$ for two-way binding of variables. + * + * @param { boolean | Bindable } value - if the listItem is selected. + * @returns { ListItemAttribute } the attribute of the listItem. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + selected(value: boolean | Bindable): ListItemAttribute; + /** * Sets the action item that appears when the list item slides in the cross axis direction of the list. * diff --git a/api/@internal/component/ets/menu_item.d.ts b/api/@internal/component/ets/menu_item.d.ts index 825be1c7b0..ace751e724 100644 --- a/api/@internal/component/ets/menu_item.d.ts +++ b/api/@internal/component/ets/menu_item.d.ts @@ -18,6 +18,13 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { ResourceStr, Font, ResourceColor } from './units'; +import { CommonMethod, Bindable } from './common'; +import { CustomBuilder } from './builder'; +import { SymbolGlyphModifier } from '../../arkui/SymbolGlyphModifier'; +/*** endif */ + /** * Defines the option of MenuItem. * @@ -321,6 +328,20 @@ declare class MenuItemAttribute extends CommonMethod { */ selected(value: boolean): MenuItemAttribute; + /** + * Setting whether menuItem is selected. + * + * @param { boolean | undefined | Bindable } value + * @returns { MenuItemAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + selected(value: boolean | undefined | Bindable): MenuItemAttribute; + + /** * Whether the relevant check icon is displayed when a menu item is selected. * diff --git a/api/@internal/component/ets/nav_destination.d.ts b/api/@internal/component/ets/nav_destination.d.ts index 6ef91a9cc7..fe6dbc10c9 100644 --- a/api/@internal/component/ets/nav_destination.d.ts +++ b/api/@internal/component/ets/nav_destination.d.ts @@ -882,7 +882,18 @@ declare class NavDestinationAttribute extends CommonMethod>): NavDestinationAttribute; + /** + * Invoked when pop to the navDestination with result. + * + * @param {Optional>} callback - Indicates callback when pop to the navDestination with result. + * @returns {NavDestinationAttribute} + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ + onResult(callback: Optional>): NavDestinationAttribute; /** * Sets the mode of the **NavDestination** component. Dynamic modification is not supported. diff --git a/api/@internal/component/ets/navigation.d.ts b/api/@internal/component/ets/navigation.d.ts index a8653f1bdc..ae13f051f5 100644 --- a/api/@internal/component/ets/navigation.d.ts +++ b/api/@internal/component/ets/navigation.d.ts @@ -18,6 +18,19 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import window from '../../@ohos.window'; +import { Resource } from '../../global/resource'; +import { TextModifier } from '../../arkui/TextModifier'; +import { LengthMetrics } from '../../arkui/Graphics'; +import { Callback, BlurStyle, CommonMethod, Optional, LayoutSafeAreaType, LayoutSafeAreaEdge, BackgroundEffectOptions, BackgroundBlurStyleOptions, PixelMap, Bindable } from './common' +import { CustomBuilder, PageMapBuilder } from './builder' +import { Length, ResourceStr, ResourceColor, Dimension, VoidCallback } from './units' +import { TitleHeight } from './enums' +import { SymbolGlyphModifier } from '../../arkui/SymbolGlyphModifier' +import { NavDestinationContext, NavDestinationMode } from './navDestination' +/*** endif */ + /** * Import the SystemBarStyle type for Navigation. * @@ -2631,6 +2644,20 @@ declare class NavigationAttribute extends CommonMethod { */ navBarWidth(value: Length): NavigationAttribute; + /** + + * Sets the width of navigation bar. + * + * @param { Length | Bindable } value + * @returns { NavigationAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + navBarWidth(value: Length | Bindable): NavigationAttribute; + /** * Sets the position of the navigation bar. This attribute takes effect * only when the **Navigation** component is split. diff --git a/api/@internal/component/ets/page_transition.d.ts b/api/@internal/component/ets/page_transition.d.ts index 1ee6c15fac..18e130271b 100644 --- a/api/@internal/component/ets/page_transition.d.ts +++ b/api/@internal/component/ets/page_transition.d.ts @@ -18,6 +18,11 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { ICurve, TranslateOptions, ScaleOptions } from './common'; +import { Curve } from './enums'; +/*** endif */ + /** * Declare the jump method. * @@ -670,6 +675,47 @@ interface PageTransitionEnterInterface extends CommonTransition): ParticleAttribute; + + /** + * create a particle array. + * + * @param { Particles } particles - Array of particles. + * @returns { ParticleAttribute } Returns the particle attribute. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + (particles: Particles): ParticleAttribute; } /** diff --git a/api/@internal/component/ets/plugin_component.d.ts b/api/@internal/component/ets/plugin_component.d.ts index 62733df68d..fb6937eb9f 100644 --- a/api/@internal/component/ets/plugin_component.d.ts +++ b/api/@internal/component/ets/plugin_component.d.ts @@ -54,7 +54,8 @@ interface PluginComponentTemplate { * @interface PluginComponentOptions * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ declare interface PluginComponentOptions { /** @@ -70,7 +71,8 @@ declare interface PluginComponentOptions { * @type { PluginComponentTemplate } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ template: PluginComponentTemplate; @@ -90,6 +92,16 @@ declare interface PluginComponentOptions { * @since 18 */ data: any; + /** + * Plugin component data. + * AnonyMous Object Rectification + * @type { Object|undefined|null } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @since 20 + * @arkts 1.2 + */ + data: Object|undefined|null; } /** @@ -99,7 +111,8 @@ declare interface PluginComponentOptions { * @interface PluginErrorData * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ declare interface PluginErrorData { /** @@ -115,7 +128,8 @@ declare interface PluginErrorData { * @type { number } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ errcode: number; @@ -132,7 +146,8 @@ declare interface PluginErrorData { * @type { string } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ msg: string; } @@ -145,7 +160,8 @@ declare interface PluginErrorData { * @param { PluginErrorData } info - Plugin error data * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ declare type PluginErrorCallback = (info: PluginErrorData) => void; @@ -175,7 +191,8 @@ interface PluginComponentInterface { * @returns { PluginComponentAttribute } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ (options: PluginComponentOptions): PluginComponentAttribute; } @@ -206,7 +223,8 @@ declare class PluginComponentAttribute extends CommonMethod { */ checked(isChecked: Optional): RadioAttribute; + /** + * Called when the radio box is selected. + * + * @param { boolean | undefined | Bindable } isChecked + * @returns { RadioAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + checked(isChecked: boolean | undefined | Bindable): RadioAttribute; + /** * Called when the radio box selection status changes. * diff --git a/api/@internal/component/ets/rating.d.ts b/api/@internal/component/ets/rating.d.ts index 308ed20ef7..30c2e3679c 100644 --- a/api/@internal/component/ets/rating.d.ts +++ b/api/@internal/component/ets/rating.d.ts @@ -18,6 +18,11 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { CommonConfiguration, Callback, CommonMethod, Optional, ContentModifier, Bindable } from './common' +import { ResourceStr } from './units'; +/*** endif */ + /** * Define options used to construct a rating. * @@ -76,6 +81,19 @@ declare interface RatingOptions { */ rating: number; + /** + * Rating option. + * + * @type { number | undefined | Bindable } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + rating: number | undefined | Bindable; + /** * Indicator option. * diff --git a/api/@internal/component/ets/refresh.d.ts b/api/@internal/component/ets/refresh.d.ts index 11e2b9e59a..16155e0e12 100644 --- a/api/@internal/component/ets/refresh.d.ts +++ b/api/@internal/component/ets/refresh.d.ts @@ -18,6 +18,13 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { Callback, Optional, CommonMethod, Bindable } from './common' +import { CustomBuilder } from './builder' +import { ResourceStr } from './units' +import { ComponentContent } from '../ComponentContent' +/*** endif */ + /** * The refresh status of the drop-down refresh. * @@ -212,6 +219,18 @@ interface RefreshOptions { * @since 11 */ refreshing: boolean; + /** + * Whether the current component is being refreshed. + * This parameter supports $$ for two-way binding of variables. + * + * @type { boolean | Bindable } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + refreshing: boolean | Bindable; /** * Distance to the top of the parent component from the component that diff --git a/api/@internal/component/ets/rich_editor.d.ts b/api/@internal/component/ets/rich_editor.d.ts index f8a0be398b..9f98e939c4 100644 --- a/api/@internal/component/ets/rich_editor.d.ts +++ b/api/@internal/component/ets/rich_editor.d.ts @@ -18,6 +18,21 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { ShadowOptions, ClickEvent, SelectionOptions, CommonMethod, Callback, HapticFeedbackMode, RectResult, HoverEvent, PixelMap } from './common'; +import { CustomBuilder } from './builder'; +import { ResourceColor, Length, ResourceStr, Dimension, Margin, BorderRadiuses, Font, VoidCallback } from './units'; +import { FontStyle, FontWeight, TextAlign, WordBreak, LineBreakStrategy, ImageSpanAlignment, ImageFit, ResponseType, CopyOptions, BarState } from './enums'; +import { DecorationStyleInterface, StyledString, MutableStyledString } from './styledString'; +import { Resource } from './../../../api/global/resource'; +import { SymbolEffectStrategy, SymbolRenderingStrategy } from './symbolglyph'; +import { DecorationStyleResult, TextRange, MenuType, TextEditControllerEx, LayoutManager, PreviewText, StyledStringController, StyledStringChangedListener, TextDataDetectorConfig, OnDidChangeCallback, EditMenuOptions, KeyboardAppearance } from './textCommon'; +import { GestureEvent } from './gesture'; +import { EnterKeyType, SubmitEvent } from './textInput'; +import { LengthMetrics , ColorMetrics } from '../Graphics'; +import { TextBackgroundStyle } from "./span"; +/*** endif */ + /** * Defines delete text direction. * @@ -721,6 +736,18 @@ declare interface PasteEvent { * @since 12 */ preventDefault?: Callback; + + /** + * Override system paste event. + * + * @type { ?VoidCallback } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + preventDefault?: VoidCallback; } /** @@ -2935,6 +2962,18 @@ declare interface SelectionMenuOptions { */ onDisappear?: Callback; + /** + * Callback function when the selection menu disappears. + * + * @type { ?VoidCallback } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + onDisappear?: VoidCallback; + /** * Menu type, default value is MenuType.SELECTION_MENU. * @@ -3581,6 +3620,19 @@ declare class RichEditorAttribute extends CommonMethod { */ onReady(callback: Callback): RichEditorAttribute; + /** + * Called when on ready. + * + * @param { VoidCallback } callback - The triggered function when rich editor is ready. + * @returns { RichEditorAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + onReady(callback: VoidCallback): RichEditorAttribute; + /** * Called when the content is selected. * @@ -3755,6 +3807,19 @@ declare class RichEditorAttribute extends CommonMethod { */ onDeleteComplete(callback: Callback): RichEditorAttribute; + /** + * Notify that the deletion has been completed + * + * @param { VoidCallback } callback - The triggered function when text content has been deleted. + * @returns { RichEditorAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + onDeleteComplete(callback: VoidCallback): RichEditorAttribute; + /** * Allow replication. * @@ -4169,6 +4234,18 @@ declare interface CutEvent { * @since 12 */ preventDefault?: Callback; + + /** + * Prevent system cut event. + * + * @type { ?VoidCallback } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + preventDefault?: VoidCallback; } /** @@ -4190,6 +4267,18 @@ declare interface CopyEvent { * @since 12 */ preventDefault?: Callback; + + /** + * Prevent system cut event. + * + * @type { ?VoidCallback } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + preventDefault?: VoidCallback; } /** diff --git a/api/@internal/component/ets/save_button.d.ts b/api/@internal/component/ets/save_button.d.ts index c1f1563e88..9493007579 100644 --- a/api/@internal/component/ets/save_button.d.ts +++ b/api/@internal/component/ets/save_button.d.ts @@ -251,7 +251,8 @@ declare enum SaveDescription { * * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ SAVE_ALL = 12 } diff --git a/api/@internal/component/ets/search.d.ts b/api/@internal/component/ets/search.d.ts index 65229fd131..0a46e5b696 100644 --- a/api/@internal/component/ets/search.d.ts +++ b/api/@internal/component/ets/search.d.ts @@ -18,6 +18,18 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { TextContentControllerBase, SelectionOptions,Callback,CommonMethod,Optional,TextDecorationOptions, Bindable } from './common'; +import { CustomBuilder } from './builder'; +import { ResourceStr,Length,ResourceColor ,Dimension,Font} from './units'; +import { CaretStyle, EditableTextOnChangeCallback, InsertValue, DeleteValue, EditMenuOptions,KeyboardAppearance,EditableTextChangeValue,AutoCapitalizationMode } from './textCommon'; +import { EnterKeyType, OnTextSelectionChangeCallback, OnContentScrollCallback, OnPasteCallback, SubmitEvent } from './textInput'; +import { CopyOptions,TextAlign } from './enums'; +import { KeyboardOptions } from './richEditor'; +import { Resource } from '../../global/resource'; +import { SymbolGlyphModifier } from '../SymbolGlyphModifier'; +/*** endif */ + /** * Provides the method of switching the cursor position. * @@ -377,6 +389,17 @@ declare interface SearchOptions { */ value?: ResourceStr; + /** + * Text input in the search text box. + * + * @type { ?(string | Bindable)} + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + value?: string | Bindable; + /** * Text displayed when there is no input. * diff --git a/api/@internal/component/ets/security_component.d.ts b/api/@internal/component/ets/security_component.d.ts index c84936c798..0fbebc3bee 100644 --- a/api/@internal/component/ets/security_component.d.ts +++ b/api/@internal/component/ets/security_component.d.ts @@ -21,17 +21,18 @@ /** * Enumerates the layout direction of the icon and text. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.ArkUI.ArkUI.Full * @since 10 */ /** * Enumerates the layout direction of the icon and text. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum SecurityComponentLayoutDirection { /** @@ -45,7 +46,8 @@ declare enum SecurityComponentLayoutDirection { * * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ HORIZONTAL = 0, @@ -60,7 +62,8 @@ declare enum SecurityComponentLayoutDirection { * * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ VERTICAL = 1 } @@ -232,7 +235,7 @@ declare class SecurityComponentMethod { /** * Font weight of the inner text. * - * @param { number | FontWeight | string } value - Indicates the font weight of the text in the security component. + * @param { int | FontWeight | string } value - Indicates the font weight of the text in the security component. * @returns { T } Returns the attribute of the security component. * @syscap SystemCapability.ArkUI.ArkUI.Full * @since 10 @@ -254,6 +257,7 @@ declare class SecurityComponentMethod { * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ fontWeight(value: number | FontWeight | string | Resource): T; @@ -416,7 +420,8 @@ declare class SecurityComponentMethod { * @returns { T } Returns the attribute of the security component. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ borderRadius(radius: Dimension | BorderRadiuses): T; @@ -607,29 +612,29 @@ declare class SecurityComponentMethod { /** * Sets the minimum font scale factor for text. * - * @param { number | Resource } scale Minimum font scale factor to set. + * @param { double | Resource } scale Minimum font scale factor to set. * @returns { T } Returns the attributes of the security component. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 18 */ - minFontScale(scale: number | Resource): T; + minFontScale(scale: double | Resource): T; /** * Sets the maximum font scale factor for text. * - * @param { number | Resource } scale Maximum font scale factor to set. + * @param { double | Resource } scale Maximum font scale factor to set. * @returns { T } Returns the attributes of the security component. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 18 */ - maxFontScale(scale: number | Resource): T; + maxFontScale(scale: double | Resource): T; /** * Called when the maximum number of lines of text is set. * - * @param { number } line + * @param { int } line * @returns { T } Returns the attribute of the security component. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice @@ -649,24 +654,24 @@ declare class SecurityComponentMethod { /** * Called when the minimum font size of the font is set. * - * @param { number | string | Resource } minSize + * @param { double | string | Resource } minSize * @returns { T } Returns the attribute of the security component. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 18 */ - minFontSize(minSize: number | string | Resource): T; + minFontSize(minSize: double | string | Resource): T; /** * Called when the maximum font size of the font is set. * - * @param { number | string | Resource } maxSize + * @param { double | string | Resource } maxSize * @returns { T } Returns the attribute of the security component. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 18 */ - maxFontSize(maxSize: number | string | Resource): T; + maxFontSize(maxSize: double | string | Resource): T; /** * Called when the height adaptive policy is set. diff --git a/api/@internal/component/ets/select.d.ts b/api/@internal/component/ets/select.d.ts index 41fcdac73f..897adde00b 100644 --- a/api/@internal/component/ets/select.d.ts +++ b/api/@internal/component/ets/select.d.ts @@ -18,6 +18,16 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { CommonConfiguration, CommonMethod, ContentModifier, Optional, BlurStyle, Bindable } from './common'; +import { ControlSize } from './button'; +import { DividerOptions } from './textPicker'; +import { ResourceStr, Dimension, EdgeOutlineWidths, ResourceColor, EdgeColors, Resource, Font, Length, Offset, DividerStyleOptions } from './units'; +import { SymbolGlyphModifier } from '../SymbolGlyphModifier'; +import { TextModifier } from '../TextModifier'; +import { OptionWidthMode } from './enums'; +/*** endif */ + /** * The declare of selectOption. * @@ -428,6 +438,20 @@ declare class SelectAttribute extends CommonMethod { */ selected(numCount: Optional): SelectAttribute; + /** + * Sets the serial number of the select item, starting from 0. + * + * @param { number | Resource | undefined | Bindable | Bindable } numCount - the serial number of the select item. + * @returns { SelectAttribute } the attribute of the select. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + selected(numCount: number | Resource | undefined | Bindable | Bindable): SelectAttribute; + + /** * Sets the text display of the select button itself. * @@ -469,6 +493,19 @@ declare class SelectAttribute extends CommonMethod { */ value(resStr: Optional): SelectAttribute; + /** + * Sets the text display of the select button itself. + * + * @param { ResourceStr | undefined | Bindable | Bindable } resStr - the text display of the select button itself. + * @returns { SelectAttribute } the attribute of the select. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + value(resStr: ResourceStr | undefined | Bindable | Bindable): SelectAttribute; + /** * Sets the text properties of the select button itself. * diff --git a/api/@internal/component/ets/sidebar.d.ts b/api/@internal/component/ets/sidebar.d.ts index 4622bd4555..e4bc7cd3ad 100644 --- a/api/@internal/component/ets/sidebar.d.ts +++ b/api/@internal/component/ets/sidebar.d.ts @@ -18,6 +18,12 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { Resource } from '../../global/resource' +import { Length, ResourceColor, Dimension } from './units' +import { CommonMethod, PixelMap, Bindable } from './common' +/*** endif */ + /** * Sets the sidebar style of showing * @@ -682,6 +688,19 @@ declare class SideBarContainerAttribute extends CommonMethod } value + * @returns { SideBarContainerAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + showSideBar(value: boolean | Bindable): SideBarContainerAttribute; + /** * Callback controlButton function when setting the style of button * @@ -801,6 +820,20 @@ declare class SideBarContainerAttribute extends CommonMethod } value + * @returns { SideBarContainerAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + sideBarWidth(value: number | Bindable): SideBarContainerAttribute; + /** * Sets the min length of sidebar. * default value is 200vp. diff --git a/api/@internal/component/ets/slider.d.ts b/api/@internal/component/ets/slider.d.ts index 2ecd48ceb7..3eb3834b35 100644 --- a/api/@internal/component/ets/slider.d.ts +++ b/api/@internal/component/ets/slider.d.ts @@ -18,6 +18,18 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { CommonMethod, CommonConfiguration, ContentModifier, Optional, Bindable } from './common'; +import { Axis, CrownSensitivity } from './enums'; +import { ResourceStr, ResourceColor, Length, Dimension, SizeOptions } from './units'; +import { CircleAttribute } from './circle'; +import { RectAttribute } from './rect'; +import { PathAttribute } from './path'; +import { EllipseAttribute } from './ellipse'; +import { LinearGradient } from './dataPanel'; + +/*** endif */ + /** * Declare sliderstyle * @@ -454,6 +466,19 @@ declare interface SliderOptions { */ value?: number; + /** + * Current value of Slider. + * + * @type { ?(number| undefined | Bindable) } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + value?: number | undefined | Bindable; + /** * Sets the min value of Slider. * diff --git a/api/@internal/component/ets/stepper.d.ts b/api/@internal/component/ets/stepper.d.ts index f816757787..5c4b28fecd 100644 --- a/api/@internal/component/ets/stepper.d.ts +++ b/api/@internal/component/ets/stepper.d.ts @@ -18,6 +18,45 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { Bindable, CommonMethod } from './common' +/*** endif */ + +/** + * Declare the StepperOptions. + * + * @interface StepperOptions + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ +interface StepperOptions { + /** + * Set the stepper index. + * + * @type { ?number } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ + index?: number; + + /** + * Set the stepper index. + * + * @type { ?(number | Bindable) } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + index?: number | Bindable; +} + /** * Declare the stepper. * @@ -71,6 +110,19 @@ interface StepperInterface { * @since 11 */ (value?: { index?: number }): StepperAttribute; + /** + * Called when the stepper component is used. + * + * Anonymous Object Rectification. + * @param { StepperOptions } value + * @returns { StepperAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ + (value?: StepperOptions): StepperAttribute; } /** diff --git a/api/@internal/component/ets/styled_string.d.ts b/api/@internal/component/ets/styled_string.d.ts index 33df807764..a0fc9cf832 100644 --- a/api/@internal/component/ets/styled_string.d.ts +++ b/api/@internal/component/ets/styled_string.d.ts @@ -1268,6 +1268,19 @@ UserDataSpan | BackgroundColorStyle; * @since 12 */ declare class MutableStyledString extends StyledString { + /** + * constructor. + * + * @param { string | ImageAttachment | CustomSpan } value - indicates the current object value of the MutableStyledString. + * @param { Array } [styles] - indicates the SpanStyle objects. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + constructor(value: string | ImageAttachment | CustomSpan, styles?: Array); + /** * Replace the string of the specified range. * diff --git a/api/@internal/component/ets/swiper.d.ts b/api/@internal/component/ets/swiper.d.ts index d5b6bf321f..c0b6e453b2 100644 --- a/api/@internal/component/ets/swiper.d.ts +++ b/api/@internal/component/ets/swiper.d.ts @@ -18,6 +18,13 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { IndicatorComponentController } from './indicatorcomponent'; +import { CommonMethod, Callback, ICurve, Optional, Bindable } from './common'; +import { EdgeEffect, Curve, PageFlipMode } from './enums'; +import { Length, LengthMetrics, VoidCallback, ResourceColor, VP, Font } from './units'; +/*** endif */ + /** * Provides methods for switching components. * @@ -1489,6 +1496,19 @@ declare class SwiperAttribute extends CommonMethod { * @since 11 */ index(value: number): SwiperAttribute; + /** + * Called when the index value of the displayed subcomponent is set in the container. + * + * @param { number | Bindable } value + * @returns { SwiperAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + index(value: number | Bindable): SwiperAttribute; /** * Called when setting whether the subcomponent plays automatically. diff --git a/api/@internal/component/ets/tabs.d.ts b/api/@internal/component/ets/tabs.d.ts index ed4700810d..7b6c75c2d5 100644 --- a/api/@internal/component/ets/tabs.d.ts +++ b/api/@internal/component/ets/tabs.d.ts @@ -18,6 +18,13 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { BackgroundBlurStyleOptions, BackgroundEffectOptions, BlurStyle, Callback, CommonMethod, Optional, TranslateOptions, DividerStyle, Bindable } from './common'; +import { EdgeEffect, PageFlipMode } from './enums'; +import { Dimension, Length, ResourceColor } from './units'; +import { CommonModifier } from "../CommonModifier"; +/*** endif */ + /** * CommonModifier * @@ -516,6 +523,17 @@ declare interface TabsOptions { * @since 11 */ index?: number; + /** + * Set the index of the currently displayed tab. + * + * @type { ?(number | Bindable) } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + index?: number | Bindable; /** * Set the Tabs controller. diff --git a/api/@internal/component/ets/text_area.d.ts b/api/@internal/component/ets/text_area.d.ts index 0fb6b4a654..f7d0ad0153 100644 --- a/api/@internal/component/ets/text_area.d.ts +++ b/api/@internal/component/ets/text_area.d.ts @@ -18,6 +18,20 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { KeyboardOptions, PasteEvent } from './richEditor'; +import { CaretStyle, DeleteValue, EditMenuOptions, EditableTextOnChangeCallback, InsertValue, + AutoCapitalizationMode,EditableTextChangeValue,KeyboardAppearance } from './textCommon'; +import { BarState, CopyOptions, FontStyle, FontWeight, LineBreakStrategy, TextContentStyle, TextAlign, TextOverflow, + TextHeightAdaptivePolicy, WordBreak, EllipsisMode } from './enums'; +import { EnterKeyType, SubmitEvent, ContentType } from './textInput'; +import { Dimension, Font, Length, LengthMetrics, ResourceColor, ResourceStr } from './units'; +import { InputCounterOptions, TextContentControllerBase, SelectionOptions, + TextDecorationOptions, CommonMethod, Callback, Optional, Bindable } from './common'; +import { CustomBuilder } from './builder'; +import { Resource } from '../../global/resource'; +/*** endif */ + /** * Provides the method of switching the cursor position. * @@ -242,6 +256,18 @@ declare interface TextAreaOptions { */ text?: ResourceStr; + /** + * Sets the current value of TextArea. + * + * @type { ?(ResourceStr | Bindable | Bindable | Bindable) } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + text?: ResourceStr | Bindable | Bindable | Bindable; + /** * Called when the position of the insertion cursor is set. * diff --git a/api/@internal/component/ets/text_common.d.ts b/api/@internal/component/ets/text_common.d.ts index 4f75e5b57c..4e224efd3e 100644 --- a/api/@internal/component/ets/text_common.d.ts +++ b/api/@internal/component/ets/text_common.d.ts @@ -1228,6 +1228,35 @@ declare interface TextMenuItem { */ type OnPrepareMenuCallback = (menuItems: Array) => Array; +/** + * Callback function when the selection menu create. + * + * @typedef { function } OnCreateMenuCallback + * @param { Array } menuItems - currently displayed menu items. + * @returns { Array } Return the menu items will displayed after operations. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +type OnCreateMenuCallback = (menuItems: Array) => Array; + +/** + * Invoke upon clicking an item, capable of intercepting the default system menu execution behavior. + * + * @typedef { function } OnMenuItemClickCallback + * @param { TextMenuItem } menuItem - current default menu. + * @param { TextRange } range - current selected range. + * @returns { boolean } - Return True, the event is consumed, false otherwise. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +type OnMenuItemClickCallback = (menuItem: TextMenuItem, range: TextRange) => boolean + /** * EditMenuOptions * @@ -1271,6 +1300,30 @@ declare interface EditMenuOptions { * @since 20 */ onPrepareMenu?: OnPrepareMenuCallback; + + /** + * Passes the default menu, invokes before every display to generate a menu for triggering click events. + * + * @type { OnCreateMenuCallback } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + onCreateMenu: OnCreateMenuCallback; + + /** + * Invoke upon clicking an item, capable of intercepting the default system menu execution behavior. + * + * @type { OnMenuItemClickCallback } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + onMenuItemClick: OnMenuItemClickCallback; } /** diff --git a/api/@internal/component/ets/text_input.d.ts b/api/@internal/component/ets/text_input.d.ts index cd6f69004d..5c530da86e 100644 --- a/api/@internal/component/ets/text_input.d.ts +++ b/api/@internal/component/ets/text_input.d.ts @@ -18,6 +18,18 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { CancelButtonSymbolOptions, CancelButtonOptions } from "./search"; +import { Callback, CommonMethod, TextContentControllerBase, SelectionOptions, InputCounterOptions, TextDecorationOptions, Optional, Bindable} from "./common"; +import { CustomBuilder } from './builder'; +import { BarState, LineBreakStrategy, TextAlign, FontStyle, FontWeight, WordBreak, TextOverflow, + CopyOptions, TextHeightAdaptivePolicy, TextContentStyle, EllipsisMode } from './enums'; +import { Resource, ResourceStr, ResourceColor, Dimension, Font, Length } from './units'; +import { InsertValue, DeleteValue, CaretStyle, EditableTextOnChangeCallback, EditMenuOptions, + AutoCapitalizationMode,EditableTextChangeValue,KeyboardAppearance } from "./textCommon"; +import { KeyboardOptions, PasteEvent } from "./richEditor"; +/*** endif */ + /** * Declare the type of input box * @@ -1146,6 +1158,18 @@ declare interface TextInputOptions { */ text?: ResourceStr; + /** + * Sets the current value of TextInput. + * + * @type { ?(ResourceStr | Bindable | Bindable | Bindable) } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + text?: ResourceStr | Bindable | Bindable | Bindable; + /** * Called when the position of the insertion cursor is set. * diff --git a/api/@internal/component/ets/toggle.d.ts b/api/@internal/component/ets/toggle.d.ts index 85c27baa49..31410e3d79 100644 --- a/api/@internal/component/ets/toggle.d.ts +++ b/api/@internal/component/ets/toggle.d.ts @@ -18,6 +18,12 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { Resource } from '../../global/resource'; +import { ResourceColor } from './units'; +import { CommonConfiguration, Callback, CommonMethod, ContentModifier, Bindable } from './common'; +/*** endif */ + /** * Declare the type of status button * @@ -355,6 +361,19 @@ declare interface ToggleOptions { * @since 18 */ isOn?: boolean + + /** + * Whether the toggle is on. + * + * @type { ?(boolean | undefined | Bindable) } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + isOn?: boolean | undefined | Bindable } /** diff --git a/api/@internal/component/ets/ui_extension_component.d.ts b/api/@internal/component/ets/ui_extension_component.d.ts index d3b85e3b24..7579aefff5 100644 --- a/api/@internal/component/ets/ui_extension_component.d.ts +++ b/api/@internal/component/ets/ui_extension_component.d.ts @@ -18,6 +18,13 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import Want from '../../@ohos.app.ability.Want' +import { Callback, ErrorCallback, BusinessError } from '../../@ohos.base' +import { CommonMethod, TerminationInfo } from './common' +import { ComponentContent } from '../ComponentContent' +/*** endif */ + /** * Enumeration of different types of DpiFollowStrategy. * @@ -51,14 +58,16 @@ declare enum DpiFollowStrategy { * @enum { number } * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ declare enum WindowModeFollowStrategy { /** * Followed the host Window Mode. * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ FOLLOW_HOST_WINDOW_MODE = 0, @@ -66,9 +75,10 @@ declare enum WindowModeFollowStrategy { * Followed the UIExtensionAbility. * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - FOLLOW_UI_EXTENSION_ABILITY_WINDOW_MODE = 1, + FOLLOW_UI_EXTENSION_ABILITY_WINDOW_MODE = 1 } /** @@ -132,7 +142,8 @@ declare interface UIExtensionOptions { * @default WindowModeFollowStrategy.FOLLOW_UI_EXTENSION_ABILITY_WINDOW_MODE * @syscap SystemCapability.ArkUI.ArkUI.Full * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ windowModeFollowStrategy?: WindowModeFollowStrategy; } @@ -353,6 +364,24 @@ interface UIExtensionComponentInterface { want: import('../api/@ohos.app.ability.Want').default, options?: UIExtensionOptions ): UIExtensionComponentAttribute; + + /** + * Construct the UIExtensionComponent.
    + * Called when the UIExtensionComponent is used. + * + * @param { Want } want - indicates the want of UIExtensionAbility + * @param { UIExtensionOptions } [options] - Construction configuration of UIExtensionComponentAttribute + * @returns { UIExtensionComponentAttribute } + * @throws { BusinessError } 202 - Non-system applications are not allowed to use system APIs. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @since 20 + * @arkts 1.2 + */ + ( + want: Want, + options?: UIExtensionOptions + ): UIExtensionComponentAttribute; } /** @@ -376,6 +405,21 @@ declare class UIExtensionComponentAttribute extends CommonMethod ): UIExtensionComponentAttribute; + + /** + * callback called when remote UIExtensionAbility object is ready for receive data + * + * @param { Callback } callback + * @returns { UIExtensionComponentAttribute } + * @throws { BusinessError } 202 - Non-system applications are not allowed to use system APIs. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @since 20 + * @arkts 1.2 + */ + onRemoteReady( + callback: Callback + ): UIExtensionComponentAttribute; /** * @param { import('../api/@ohos.base').Callback<{ [key: string]: Object }> } callback @@ -439,6 +483,21 @@ declare class UIExtensionComponentAttribute extends CommonMethod } callback + * @returns { UIExtensionComponentAttribute } + * @throws { BusinessError } 202 - Non-system applications are not allowed to use system APIs. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @systemapi + * @since 20 + * @arkts 1.2 + */ + onError( + callback: ErrorCallback + ): UIExtensionComponentAttribute; /** * Called when the provider of the embedded UI is terminated. @@ -457,7 +516,8 @@ declare class UIExtensionComponentAttribute extends CommonMethod): UIExtensionComponentAttribute; } diff --git a/api/@internal/component/ets/units.d.ts b/api/@internal/component/ets/units.d.ts index 13660a7d91..6cb90e7b06 100644 --- a/api/@internal/component/ets/units.d.ts +++ b/api/@internal/component/ets/units.d.ts @@ -56,6 +56,19 @@ */ declare type Resource = import('../api/global/resource').Resource; +/** + * Defines the data type of the interface restriction. + * + * @typedef { _Resource } Resource + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +declare type Resource = _Resource; + /** * Defines the length property with string, number and resource unit. * diff --git a/api/@internal/component/ets/water_flow.d.ts b/api/@internal/component/ets/water_flow.d.ts index 6bb9e242a5..1320ff0069 100644 --- a/api/@internal/component/ets/water_flow.d.ts +++ b/api/@internal/component/ets/water_flow.d.ts @@ -18,6 +18,16 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { ScrollableCommonMethod, NestedScrollOptions, CommonMethod, Optional, OnWillScrollCallback, OnScrollCallback } from './common'; +import { CustomBuilder } from './builder' +import { Length, Dimension, Margin, ConstraintSizeOptions, Resource } from './units'; +import { Scroller, OnScrollFrameBeginCallback } from './scroll'; +import { ScrollState } from './list' +import { FlexDirection } from './enums' +import { ComponentContent } from '../../arkui/ComponentContent' +/*** endif */ + /** * function that returns item main size by index. * @@ -894,8 +904,20 @@ declare class WaterFlowAttribute extends ScrollableCommonMethod { offsetRemain: number }): WaterFlowAttribute; - + /** + * Called when scrolling begin each frame. + * Anonymous Object Rectification. + * + * @param { OnScrollFrameBeginCallback } event - callback function, triggered when the scrolling begin each frame. + * @returns { WaterFlowAttribute } the attribute of the water flow. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ + onScrollFrameBegin(event: OnScrollFrameBeginCallback): WaterFlowAttribute; + /** * Triggered when the first or last item displayed in the component changes. * It is triggered once when the component is initialized. diff --git a/api/@internal/component/ets/web.d.ts b/api/@internal/component/ets/web.d.ts index f94ee18739..d171c35210 100644 --- a/api/@internal/component/ets/web.d.ts +++ b/api/@internal/component/ets/web.d.ts @@ -18,6 +18,28 @@ * @kit ArkWeb */ +/*** if arkts 1.2 */ +import webview from '../../@ohos.web.webview'; +import image from '../../@ohos.multimedia.image'; +import { CommonMethod, Callback, TouchEvent, NestedScrollOptions, KeyEvent } from './common'; +import { CustomBuilder } from './builder' +import { Resource } from '../../global/resource'; +import { Position, ResourceStr } from './units'; +import { MenuType, EditMenuOptions } from './textCommon'; +import { CopyOptions, NestedScrollMode } from './enums'; +/*** endif */ + +/** + * Provides methods for controlling the web controller. + * + * @typedef { webview.WebviewController } + * @syscap SystemCapability.Web.Webview.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ +type WebviewController = webview.WebviewController; + /** * Provides methods for controlling the web controller. * @@ -2193,7 +2215,8 @@ declare enum ProtectedResourceType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ SENSOR = 'TYPE_SENSOR' } @@ -4815,6 +4838,17 @@ declare interface WebOptions { */ controller: WebController | WebviewController; + /** + * Sets the controller of the Web. + * + * @type { WebviewController } + * @syscap SystemCapability.Web.Webview.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + controller: WebviewController; + /** * Rendering mode. * RenderMode.ASYNC_RENDER (default, cannot be dynamically adjusted): The Web component is rendered asynchronously. @@ -4887,7 +4921,8 @@ declare interface ScriptItem { * @type { string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ script: string; @@ -4897,7 +4932,8 @@ declare interface ScriptItem { * @type { Array } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ scriptRules: Array; } @@ -5576,13 +5612,13 @@ declare interface OnProgressChangeEvent { /** * The new progress of the page. * - * @type { number } + * @type { int } * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice * @since 12 */ - newProgress: number; + newProgress: int; } /** @@ -6135,7 +6171,8 @@ declare interface OnShowFileSelectorEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ result: FileSelectorResult; @@ -6146,7 +6183,8 @@ declare interface OnShowFileSelectorEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ fileSelector: FileSelectorParam; } @@ -6449,7 +6487,8 @@ declare interface OnSslErrorEventReceiveEvent { * * @type { ?Array } * @syscap SystemCapability.Web.Webview.Core - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ certChainData?: Array; } @@ -6612,6 +6651,16 @@ declare interface OnFaviconReceivedEvent { * @since 12 */ favicon: PixelMap; + + /** + * Received the Favicon icon for the image.PixelMap object. + * + * @type { image.PixelMap } + * @syscap SystemCapability.Web.Webview.Core + * @since 20 + * @arkts 1.2 + */ + favicon: image.PixelMap; } /** @@ -6776,6 +6825,7 @@ declare interface OnOverScrollEvent { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ declare interface JavaScriptProxy { /** @@ -6794,6 +6844,7 @@ declare interface JavaScriptProxy { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ object: object; @@ -6815,6 +6866,7 @@ declare interface JavaScriptProxy { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ name: string; @@ -6836,6 +6888,7 @@ declare interface JavaScriptProxy { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ methodList: Array; @@ -6858,6 +6911,18 @@ declare interface JavaScriptProxy { */ controller: WebController | WebviewController; + /** + * Controller. + * + * @type { WebController | WebviewController } + * @syscap SystemCapability.Web.Webview.Core + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + controller: WebviewController; + /** * The async method of the application side JavaScript object participating in the registration. * @@ -6874,6 +6939,7 @@ declare interface JavaScriptProxy { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ asyncMethodList?: Array; @@ -7427,6 +7493,7 @@ declare class WebAttribute extends CommonMethod { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ javaScriptProxy(javaScriptProxy: JavaScriptProxy): WebAttribute; diff --git a/api/@ohos.InputMethodSubtype.d.ts b/api/@ohos.InputMethodSubtype.d.ts index c86eeccd74..fef984af85 100644 --- a/api/@ohos.InputMethodSubtype.d.ts +++ b/api/@ohos.InputMethodSubtype.d.ts @@ -39,12 +39,12 @@ export default interface InputMethodSubtype { /** * The label id of input method subtype. * - * @type { ?number } + * @type { ?double } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework * @since 10 */ - readonly labelId?: number; + readonly labelId?: double; /** * The name of input method. @@ -109,12 +109,12 @@ export default interface InputMethodSubtype { /** * The icon id of input method subtype. * - * @type { ?number } + * @type { ?double } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework * @since 9 */ - readonly iconId?: number; + readonly iconId?: double; /** * The extra info of input method subtype. diff --git a/api/@ohos.UiTest.d.ts b/api/@ohos.UiTest.d.ts index 5f7b7fdf42..3fdda47af7 100755 --- a/api/@ohos.UiTest.d.ts +++ b/api/@ohos.UiTest.d.ts @@ -1553,6 +1553,7 @@ declare interface UIEventObserver { * @since arkts {'1.1':'11','1.2':'20'} * @test * @arkts 1.1&1.2 + * @arkts 1.1&1.2 */ once(type: 'toastShow', callback: Callback): void; @@ -1577,6 +1578,7 @@ declare interface UIEventObserver { * @since arkts {'1.1':'11','1.2':'20'} * @test * @arkts 1.1&1.2 + * @arkts 1.1&1.2 */ once(type: 'dialogShow', callback: Callback): void; } @@ -3351,6 +3353,7 @@ declare class Component { * @since arkts {'1.1':'11','1.2':'20'} * @test * @arkts 1.1&1.2 + * @arkts 1.1&1.2 */ pinchOut(scale: double): Promise; /** @@ -3379,6 +3382,7 @@ declare class Component { * @since arkts {'1.1':'11','1.2':'20'} * @test * @arkts 1.1&1.2 + * @arkts 1.1&1.2 */ pinchIn(scale: double): Promise; @@ -3616,11 +3620,13 @@ declare class Driver { * @param { On } on - the attribute requirements of the target {@link Component}. * @returns { Promise } the first matched {@link Component} or undefined. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. * @syscap SystemCapability.Test.UiTest * @since 20 * @test * @arkts 1.2 + * @arkts 1.2 */ findComponent(on: On): Promise; /** @@ -3653,11 +3659,13 @@ declare class Driver { * @param { WindowFilter } filter - the filer condition of the target {@link UiWindow}. * @returns { Promise } the first matched {@link UiWindow} or undefined. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. * @syscap SystemCapability.Test.UiTest * @since 20 * @test * @arkts 1.2 + * @arkts 1.2 */ findWindow(filter: WindowFilter): Promise; /** @@ -3693,11 +3701,13 @@ declare class Driver { * @param { int } time - duration of finding in milliseconds, not less than 0. * @returns { Promise } the first matched {@link Component} or undefined. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. * @syscap SystemCapability.Test.UiTest * @since 20 * @test * @arkts 1.2 + * @arkts 1.2 */ waitForComponent(on: On, time: int): Promise; /** @@ -3743,11 +3753,13 @@ declare class Driver { * @param { On } on - the attribute requirements of the target {@link Component}. * @returns { Promise | null> } the matched {@link Component}s list. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. * @syscap SystemCapability.Test.UiTest * @since 20 * @test * @arkts 1.2 + * @arkts 1.2 */ findComponents(on: On): Promise | null>; /** diff --git a/api/@ohos.WorkSchedulerExtensionAbility.d.ts b/api/@ohos.WorkSchedulerExtensionAbility.d.ts index 4f2eedcb5f..d63d17a6a3 100644 --- a/api/@ohos.WorkSchedulerExtensionAbility.d.ts +++ b/api/@ohos.WorkSchedulerExtensionAbility.d.ts @@ -28,7 +28,8 @@ import _WorkSchedulerExtensionContext from './application/WorkSchedulerExtension * @typedef { _WorkSchedulerExtensionContext } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ export type WorkSchedulerExtensionContext = _WorkSchedulerExtensionContext; @@ -37,7 +38,8 @@ export type WorkSchedulerExtensionContext = _WorkSchedulerExtensionContext; * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export default class WorkSchedulerExtensionAbility { /** @@ -46,7 +48,8 @@ export default class WorkSchedulerExtensionAbility { * @type { WorkSchedulerExtensionContext } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ context: WorkSchedulerExtensionContext; @@ -56,7 +59,8 @@ export default class WorkSchedulerExtensionAbility { * @param {workScheduler.WorkInfo} work - The info of work. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ onWorkStart(work: workScheduler.WorkInfo): void; @@ -66,7 +70,8 @@ export default class WorkSchedulerExtensionAbility { * @param {workScheduler.WorkInfo} work - The info of work. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ onWorkStop(work: workScheduler.WorkInfo): void; } diff --git a/api/@ohos.ability.errorCode.d.ts b/api/@ohos.ability.errorCode.d.ts index bf6f1e727c..83418a702b 100644 --- a/api/@ohos.ability.errorCode.d.ts +++ b/api/@ohos.ability.errorCode.d.ts @@ -23,14 +23,16 @@ * * @enum { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 6 + * @since arkts {'1.1':'6', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum ErrorCode { /** * Permission denied. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 6 + * @since arkts {'1.1':'6', '1.2':'20'} + * @arkts 1.1&1.2 */ PERMISSION_DENY = -3, @@ -38,7 +40,8 @@ export enum ErrorCode { * Ability not found. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 6 + * @since arkts {'1.1':'6', '1.2':'20'} + * @arkts 1.1&1.2 */ ABILITY_NOT_FOUND = -2, @@ -46,7 +49,8 @@ export enum ErrorCode { * Invalid parameter. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 6 + * @since arkts {'1.1':'6', '1.2':'20'} + * @arkts 1.1&1.2 */ INVALID_PARAMETER = -1, @@ -54,7 +58,8 @@ export enum ErrorCode { * No error. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 6 + * @since arkts {'1.1':'6', '1.2':'20'} + * @arkts 1.1&1.2 */ NO_ERROR = 0 } diff --git a/api/@ohos.ability.screenLockFileManager.d.ts b/api/@ohos.ability.screenLockFileManager.d.ts index df22688c85..4f7ac113b1 100644 --- a/api/@ohos.ability.screenLockFileManager.d.ts +++ b/api/@ohos.ability.screenLockFileManager.d.ts @@ -23,7 +23,8 @@ * * @namespace screenLockFileManager * @syscap SystemCapability.Security.ScreenLockFileManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace screenLockFileManager { /** @@ -31,14 +32,16 @@ declare namespace screenLockFileManager { * * @enum { number } * @syscap SystemCapability.Security.ScreenLockFileManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum DataType { /** * Media photo and video data. * * @syscap SystemCapability.Security.ScreenLockFileManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ MEDIA_DATA = 0x00000001, @@ -46,7 +49,8 @@ declare namespace screenLockFileManager { * All data type. * * @syscap SystemCapability.Security.ScreenLockFileManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ALL_DATA = 0xffffffff } @@ -56,14 +60,16 @@ declare namespace screenLockFileManager { * * @enum { number } * @syscap SystemCapability.Security.ScreenLockFileManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum AccessStatus { /** * Acquire the access of data failed. * * @syscap SystemCapability.Security.ScreenLockFileManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ACCESS_DENIED = -1, @@ -71,7 +77,8 @@ declare namespace screenLockFileManager { * Acquire the access of data success. * * @syscap SystemCapability.Security.ScreenLockFileManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ACCESS_GRANTED = 0 } @@ -81,14 +88,16 @@ declare namespace screenLockFileManager { * * @enum { number } * @syscap SystemCapability.Security.ScreenLockFileManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum ReleaseStatus { /** * Release the access of data failed. * * @syscap SystemCapability.Security.ScreenLockFileManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ RELEASE_DENIED = -1, @@ -96,7 +105,8 @@ declare namespace screenLockFileManager { * Release the access of data success. * * @syscap SystemCapability.Security.ScreenLockFileManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ RELEASE_GRANTED = 0 } @@ -106,14 +116,16 @@ declare namespace screenLockFileManager { * * @enum { number } * @syscap SystemCapability.Security.ScreenLockFileManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum KeyStatus { /** * The application is not enabled the data protection under lock screen. * * @syscap SystemCapability.Security.ScreenLockFileManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ KEY_NOT_EXIST = -2, @@ -121,7 +133,8 @@ declare namespace screenLockFileManager { * AppKey has been released. * * @syscap SystemCapability.Security.ScreenLockFileManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ KEY_RELEASED = -1, @@ -129,7 +142,8 @@ declare namespace screenLockFileManager { * AppKey exists. * * @syscap SystemCapability.Security.ScreenLockFileManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ KEY_EXIST = 0 } @@ -143,7 +157,8 @@ declare namespace screenLockFileManager { * @throws { BusinessError } 29300003 - The application is not enabled the data protection under lock screen. * @throws { BusinessError } 29300004 - File access is denied. * @syscap SystemCapability.Security.ScreenLockFileManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function acquireAccess(): AccessStatus; @@ -163,7 +178,8 @@ declare namespace screenLockFileManager { * @throws { BusinessError } 29300004 - File access is denied. * @syscap SystemCapability.Security.ScreenLockFileManager * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function acquireAccess(dataType: DataType): AccessStatus; @@ -176,7 +192,8 @@ declare namespace screenLockFileManager { * @throws { BusinessError } 29300003 - The application is not enabled the data protection under lock screen. * @throws { BusinessError } 29300005 - File access was not acquired. * @syscap SystemCapability.Security.ScreenLockFileManager - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function releaseAccess(): ReleaseStatus; @@ -196,7 +213,8 @@ declare namespace screenLockFileManager { * @throws { BusinessError } 29300005 - File access was not acquired. * @syscap SystemCapability.Security.ScreenLockFileManager * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function releaseAccess(dataType: DataType): ReleaseStatus; @@ -207,7 +225,8 @@ declare namespace screenLockFileManager { * @throws { BusinessError } 801 - The specified SystemCapability name was not found. * @throws { BusinessError } 29300002 - The system ability work abnormally. * @syscap SystemCapability.Security.ScreenLockFileManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function queryAppKeyState(): KeyStatus; @@ -225,7 +244,8 @@ declare namespace screenLockFileManager { * @throws { BusinessError } 29300002 - The system ability work abnormally. * @syscap SystemCapability.Security.ScreenLockFileManager * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function queryAppKeyState(dataType: DataType): KeyStatus; } diff --git a/api/@ohos.accessibility.config.d.ts b/api/@ohos.accessibility.config.d.ts index 1bd8be5a5d..45a5ff46c8 100644 --- a/api/@ohos.accessibility.config.d.ts +++ b/api/@ohos.accessibility.config.d.ts @@ -27,7 +27,8 @@ import type { AsyncCallback, Callback } from './@ohos.base'; * @namespace config * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace config { /** @@ -57,11 +58,13 @@ declare namespace config { /** * Indicates the configuration of high-contrast text. * + * @type { Config } * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - var highContrastText: Config; + let highContrastText: Config; /** * Indicates the configuration of invert color. * @@ -375,7 +378,8 @@ declare namespace config { * @typedef Config * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface Config { /** @@ -393,7 +397,8 @@ declare namespace config { * 3. Parameter verification failed. * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ set(value: T): Promise; @@ -412,7 +417,8 @@ declare namespace config { * 3. Parameter verification failed. * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ set(value: T, callback: AsyncCallback): void; @@ -425,7 +431,8 @@ declare namespace config { * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ get(): Promise; @@ -436,7 +443,8 @@ declare namespace config { * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ get(callback: AsyncCallback): void; diff --git a/api/@ohos.accessibility.d.ts b/api/@ohos.accessibility.d.ts index e818965817..d4df26f55e 100644 --- a/api/@ohos.accessibility.d.ts +++ b/api/@ohos.accessibility.d.ts @@ -880,7 +880,8 @@ export enum AccessibilityEventType { * @namespace accessibility * @syscap SystemCapability.BarrierFree.Accessibility.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ /** * Accessibility @@ -1058,7 +1059,8 @@ declare namespace accessibility { * @returns { boolean } Returns true if the accessibility is enabled; returns false otherwise. * @syscap SystemCapability.BarrierFree.Accessibility.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ /** * Checks whether accessibility ability is enabled. @@ -1274,7 +1276,8 @@ declare namespace accessibility { * 2. Incorrect parameter types; * 3. Parameter verification failed. * @syscap SystemCapability.BarrierFree.Accessibility.Core - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ /** * Register the observe of the accessibility state changed. @@ -1316,7 +1319,8 @@ declare namespace accessibility { * 2. Incorrect parameter types; * 3. Parameter verification failed. * @syscap SystemCapability.BarrierFree.Accessibility.Core - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'screenReaderStateChange', callback: Callback): void; @@ -1343,7 +1347,8 @@ declare namespace accessibility { * 2. Incorrect parameter types; * 3. Parameter verification failed. * @syscap SystemCapability.BarrierFree.Accessibility.Core - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unregister the observe of the accessibility state changed. @@ -1385,7 +1390,8 @@ declare namespace accessibility { * 2. Incorrect parameter types; * 3. Parameter verification failed. * @syscap SystemCapability.BarrierFree.Accessibility.Core - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'screenReaderStateChange', callback?: Callback): void; diff --git a/api/@ohos.app.ability.ActionExtensionAbility.d.ts b/api/@ohos.app.ability.ActionExtensionAbility.d.ts index 8ef2dfd947..bfa54a6e04 100644 --- a/api/@ohos.app.ability.ActionExtensionAbility.d.ts +++ b/api/@ohos.app.ability.ActionExtensionAbility.d.ts @@ -26,7 +26,8 @@ import UIExtensionAbility from './@ohos.app.ability.UIExtensionAbility'; * @extends UIExtensionAbility * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export default class ActionExtensionAbility extends UIExtensionAbility { } \ No newline at end of file diff --git a/api/@ohos.app.ability.AtomicServiceOptions.d.ts b/api/@ohos.app.ability.AtomicServiceOptions.d.ts index 9168a95e27..694576fe14 100644 --- a/api/@ohos.app.ability.AtomicServiceOptions.d.ts +++ b/api/@ohos.app.ability.AtomicServiceOptions.d.ts @@ -27,7 +27,8 @@ import StartOptions from './@ohos.app.ability.StartOptions'; * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export default class AtomicServiceOptions extends StartOptions { /** @@ -37,7 +38,8 @@ export default class AtomicServiceOptions extends StartOptions { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ flags?: number; @@ -48,7 +50,8 @@ export default class AtomicServiceOptions extends StartOptions { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ parameters?: Record; } \ No newline at end of file diff --git a/api/@ohos.app.ability.DriverExtensionAbility.d.ts b/api/@ohos.app.ability.DriverExtensionAbility.d.ts index e2573372ec..bd373b2c2d 100644 --- a/api/@ohos.app.ability.DriverExtensionAbility.d.ts +++ b/api/@ohos.app.ability.DriverExtensionAbility.d.ts @@ -27,7 +27,8 @@ import _DriverExtensionContext from './application/DriverExtensionContext'; * * @typedef { _DriverExtensionContext } * @syscap SystemCapability.Driver.ExternalDevice - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export type DriverExtensionContext = _DriverExtensionContext; @@ -35,16 +36,18 @@ export type DriverExtensionContext = _DriverExtensionContext; * class of driver extension ability. * @syscap SystemCapability.Driver.ExternalDevice * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ -export default class DriverExtensionAbility { +declare class DriverExtensionAbility { /** * Indicates driver extension ability context. * * @type { DriverExtensionContext } * @syscap SystemCapability.Driver.ExternalDevice * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ context: DriverExtensionContext; @@ -53,7 +56,8 @@ export default class DriverExtensionAbility { * @param { Want } want - Indicates the want of created driver extension. * @syscap SystemCapability.Driver.ExternalDevice * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ onInit(want: Want): void; @@ -61,7 +65,8 @@ export default class DriverExtensionAbility { * Called back before a driver extension is destroyed. * @syscap SystemCapability.Driver.ExternalDevice * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ onRelease(): void; @@ -71,7 +76,8 @@ export default class DriverExtensionAbility { * @returns { rpc.RemoteObject | Promise } Rpc remoteObject. * @syscap SystemCapability.Driver.ExternalDevice * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ onConnect(want: Want): rpc.RemoteObject | Promise; @@ -85,6 +91,17 @@ export default class DriverExtensionAbility { */ onDisconnect(want: Want): void | Promise; + /** + * Called back when all abilities connected to a driver extension are disconnected. + * @param { Want } want - Indicates disconnection information about the driver extension. + * @returns { undefined | Promise } + * @syscap SystemCapability.Driver.ExternalDevice + * @stagemodelonly + * @since 20 + * @arkts 1.2 + */ + onDisconnect(want: Want): undefined | Promise; + /** * Called when dump client information is required. * It is recommended that developers don't DUMP sensitive information. @@ -92,7 +109,17 @@ export default class DriverExtensionAbility { * @returns { Array } The dump info array. * @syscap SystemCapability.Driver.ExternalDevice * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ onDump(params: Array): Array; } + +/** + * class of driver extension ability. + * @syscap SystemCapability.Driver.ExternalDevice + * @stagemodelonly + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 + */ +export default DriverExtensionAbility; diff --git a/api/@ohos.app.ability.PrintExtensionAbility.d.ts b/api/@ohos.app.ability.PrintExtensionAbility.d.ts index e44ce52971..d64a45269a 100644 --- a/api/@ohos.app.ability.PrintExtensionAbility.d.ts +++ b/api/@ohos.app.ability.PrintExtensionAbility.d.ts @@ -18,7 +18,7 @@ * @kit BasicServicesKit */ -import type Want from './@ohos.application.Want'; +import type Want from './@ohos.app.ability.Want'; import type print from './@ohos.print'; /** @@ -29,7 +29,7 @@ import type print from './@ohos.print'; * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 */ -export default class PrintExtensionAbility { +declare class PrintExtensionAbility { /** * Called once to initialize the extensionAbility. @@ -138,3 +138,5 @@ export default class PrintExtensionAbility { */ onDestroy(): void; } + +export default PrintExtensionAbility; \ No newline at end of file diff --git a/api/@ohos.app.ability.ServiceExtensionAbility.d.ts b/api/@ohos.app.ability.ServiceExtensionAbility.d.ts index 9fb19d970b..b2b870f669 100644 --- a/api/@ohos.app.ability.ServiceExtensionAbility.d.ts +++ b/api/@ohos.app.ability.ServiceExtensionAbility.d.ts @@ -169,7 +169,8 @@ declare class ServiceExtensionAbility { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ onDump(params: Array): Array; } diff --git a/api/@ohos.app.ability.ShareExtensionAbility.d.ts b/api/@ohos.app.ability.ShareExtensionAbility.d.ts index 8f6013e83d..bcedcbbf44 100644 --- a/api/@ohos.app.ability.ShareExtensionAbility.d.ts +++ b/api/@ohos.app.ability.ShareExtensionAbility.d.ts @@ -26,7 +26,8 @@ import UIExtensionAbility from './@ohos.app.ability.UIExtensionAbility'; * @extends UIExtensionAbility * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export default class ShareExtensionAbility extends UIExtensionAbility { } \ No newline at end of file diff --git a/api/@ohos.app.ability.UIAbility.d.ts b/api/@ohos.app.ability.UIAbility.d.ts index f0ee7fa13b..c4588c2393 100644 --- a/api/@ohos.app.ability.UIAbility.d.ts +++ b/api/@ohos.app.ability.UIAbility.d.ts @@ -657,7 +657,12 @@ declare class UIAbility extends Ability { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @stagemodelonly * @atomicservice +<<<<<<< HEAD * @since 20 +======= + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 +>>>>>>> 94c88a315 (change 0603 to 0328) */ onDidForeground(): void; @@ -703,7 +708,12 @@ declare class UIAbility extends Ability { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @stagemodelonly * @atomicservice +<<<<<<< HEAD * @since 20 +======= + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 +>>>>>>> 94c88a315 (change 0603 to 0328) */ onWillBackground(): void; @@ -720,7 +730,12 @@ declare class UIAbility extends Ability { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @stagemodelonly * @atomicservice +<<<<<<< HEAD * @since 20 +======= + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 +>>>>>>> 94c88a315 (change 0603 to 0328) */ onDidBackground(): void; @@ -784,9 +799,14 @@ declare class UIAbility extends Ability { * @since 10 */ /** +<<<<<<< HEAD * Called when a UIAbility instance that has undergone the following states is started again: * started in the foreground, running in the foreground, and switched to the background. * In other words, a UIAbility instance enters this lifecycle callback from a hot start. +======= + * Called when the launch mode of an ability is set to singleton. + * This happens when you re-launch an ability that has been at the top of the ability stack. +>>>>>>> 94c88a315 (change 0603 to 0328) * * @param { Want } want - Want information, such as the ability name and bundle name. * @param { AbilityConstant.LaunchParam } launchParam - Reason for the UIAbility startup and the last abnormal exit. @@ -818,7 +838,8 @@ declare class UIAbility extends Ability { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onDump(params: Array): Array; diff --git a/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts b/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts index c927cbc29e..3783df93f8 100644 --- a/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts +++ b/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts @@ -23,7 +23,6 @@ import { AbilityDelegatorArgs as _AbilityDelegatorArgs } from './application/abi import { AbilityMonitor as _AbilityMonitor } from './application/AbilityMonitor'; import { AbilityStageMonitor as _AbilityStageMonitor } from './application/AbilityStageMonitor'; import { ShellCmdResult as _ShellCmdResult } from './application/shellCmdResult'; - /** * A global register used to store the AbilityDelegator and AbilityDelegatorArgs objects registered * during application startup. diff --git a/api/@ohos.app.ability.abilityManager.d.ts b/api/@ohos.app.ability.abilityManager.d.ts index 5c02f6c9e2..c2162a7416 100644 --- a/api/@ohos.app.ability.abilityManager.d.ts +++ b/api/@ohos.app.ability.abilityManager.d.ts @@ -20,12 +20,12 @@ import { AsyncCallback } from './@ohos.base'; import { ElementName } from './bundleManager/ElementName'; +import { AbilityRunningInfo as _AbilityRunningInfo } from './application/AbilityRunningInfo'; +import { ExtensionRunningInfo as _ExtensionRunningInfo } from './application/ExtensionRunningInfo'; /*** if arkts 1.1 */ import { AbilityResult } from './ability/abilityResult'; import { Configuration } from './@ohos.app.ability.Configuration'; import Context from './application/Context'; -import { AbilityRunningInfo as _AbilityRunningInfo } from './application/AbilityRunningInfo'; -import { ExtensionRunningInfo as _ExtensionRunningInfo } from './application/ExtensionRunningInfo'; import * as _AbilityForegroundStateObserver from './application/AbilityForegroundStateObserver'; import * as _AbilityStateData from './application/AbilityStateData'; /*** endif */ @@ -55,14 +55,16 @@ declare namespace abilityManager { * * @enum { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum AbilityState { /** * Ability is initialized. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ INITIAL = 0, @@ -70,7 +72,8 @@ declare namespace abilityManager { * Ability is in the state of getting focus. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ FOCUS = 2, @@ -78,7 +81,8 @@ declare namespace abilityManager { * Ability is in the foreground state. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ FOREGROUND = 9, @@ -86,7 +90,8 @@ declare namespace abilityManager { * Ability is in the background state. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ BACKGROUND = 10, @@ -94,7 +99,8 @@ declare namespace abilityManager { * Ability is in the process of scheduling at the foreground. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ FOREGROUNDING = 11, @@ -102,7 +108,8 @@ declare namespace abilityManager { * Ability is in the process of scheduling in the background. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ BACKGROUNDING = 12 } @@ -114,7 +121,8 @@ declare namespace abilityManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum UserStatus { /** @@ -123,7 +131,8 @@ declare namespace abilityManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ASSERT_TERMINATE = 0, @@ -133,7 +142,8 @@ declare namespace abilityManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ASSERT_CONTINUE = 1, @@ -143,7 +153,8 @@ declare namespace abilityManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ASSERT_RETRY = 2 } @@ -255,7 +266,8 @@ declare namespace abilityManager { * @returns { Promise> } Returns the array of AbilityRunningInfo. * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAbilityRunningInfos(): Promise>; @@ -272,7 +284,8 @@ declare namespace abilityManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAbilityRunningInfos(callback: AsyncCallback>): void; @@ -553,7 +566,8 @@ declare namespace abilityManager { * * @typedef { _AbilityRunningInfo } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ export type AbilityRunningInfo = _AbilityRunningInfo; @@ -583,7 +597,8 @@ declare namespace abilityManager { * @typedef { _ExtensionRunningInfo } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type ExtensionRunningInfo = _ExtensionRunningInfo; diff --git a/api/@ohos.app.ability.appManager.d.ts b/api/@ohos.app.ability.appManager.d.ts index 1ebed985ab..6eefbaf47b 100644 --- a/api/@ohos.app.ability.appManager.d.ts +++ b/api/@ohos.app.ability.appManager.d.ts @@ -555,7 +555,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function killProcessWithAccount(bundleName: string, accountId: number): Promise; @@ -575,7 +576,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function killProcessWithAccount(bundleName: string, accountId: number, clearPageStack: boolean, appIndex?: number): Promise; @@ -611,7 +613,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function killProcessWithAccount(bundleName: string, accountId: number, callback: AsyncCallback): void; @@ -890,7 +893,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRunningProcessInformationByBundleType( bundleType: bundleManager.BundleType): Promise>; @@ -935,7 +939,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function isSharedBundleRunning(bundleName: string, versionCode: number): Promise; @@ -954,7 +959,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function isSharedBundleRunning(bundleName: string, versionCode: number, callback: AsyncCallback): void; @@ -969,7 +975,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getProcessMemoryByPid(pid: number): Promise; @@ -984,7 +991,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getProcessMemoryByPid(pid: number, callback: AsyncCallback): void; @@ -1144,7 +1152,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @throws { BusinessError } 16000073 - The app clone index is invalid. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function isAppRunning(bundleName: string, appCloneIndex?: number): Promise; @@ -1199,7 +1208,8 @@ declare namespace appManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSupportedProcessCachePids(bundleName : string): Promise>; @@ -1223,7 +1233,8 @@ declare namespace appManager { * @throws { BusinessError } 16300010 - The target application is not attached to the status bar. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function setKeepAliveForBundle(bundleName: string, userId: number, enable: boolean): Promise; @@ -1242,7 +1253,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function getKeepAliveBundles(type: KeepAliveAppType, userId?: number): Promise>; @@ -1296,7 +1308,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function killProcessesInBatch(pids: Array): Promise; diff --git a/api/@ohos.app.ability.application.d.ts b/api/@ohos.app.ability.application.d.ts index 9f2e8f15fa..d6a92cda87 100644 --- a/api/@ohos.app.ability.application.d.ts +++ b/api/@ohos.app.ability.application.d.ts @@ -105,7 +105,8 @@ declare namespace application { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ export function getApplicationContext(): ApplicationContext; diff --git a/api/@ohos.app.ability.dataUriUtils.d.ts b/api/@ohos.app.ability.dataUriUtils.d.ts index cdaa9b52b1..63ba6905b8 100644 --- a/api/@ohos.app.ability.dataUriUtils.d.ts +++ b/api/@ohos.app.ability.dataUriUtils.d.ts @@ -23,7 +23,8 @@ * * @namespace dataUriUtils * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace dataUriUtils { /** @@ -34,7 +35,8 @@ declare namespace dataUriUtils { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getId(uri: string): number; @@ -47,7 +49,8 @@ declare namespace dataUriUtils { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function attachId(uri: string, id: number): string; @@ -59,7 +62,8 @@ declare namespace dataUriUtils { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function deleteId(uri: string): string; @@ -72,7 +76,8 @@ declare namespace dataUriUtils { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function updateId(uri: string, id: number): string; } diff --git a/api/@ohos.app.ability.errorManager.d.ts b/api/@ohos.app.ability.errorManager.d.ts index 5350223c8b..7578c8bc50 100644 --- a/api/@ohos.app.ability.errorManager.d.ts +++ b/api/@ohos.app.ability.errorManager.d.ts @@ -44,7 +44,8 @@ import { LoopObserver as _LoopObserver } from './application/LoopObserver'; * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace errorManager { /** @@ -84,7 +85,8 @@ declare namespace errorManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'error', observer: ErrorObserver): number; @@ -125,7 +127,8 @@ declare namespace errorManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'error', observerId: number, callback: AsyncCallback): void; @@ -166,7 +169,8 @@ declare namespace errorManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'error', observerId: number): Promise; @@ -336,7 +340,8 @@ declare namespace errorManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'loopObserver', timeout: number, observer: LoopObserver): void; @@ -361,7 +366,8 @@ declare namespace errorManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'loopObserver', observer?: LoopObserver): void; @@ -388,7 +394,8 @@ declare namespace errorManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'unhandledRejection', observer: UnhandledRejectionObserver): void; @@ -417,7 +424,8 @@ declare namespace errorManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'unhandledRejection', observer?: UnhandledRejectionObserver): void; @@ -473,7 +481,8 @@ declare namespace errorManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ export type ErrorObserver = _ErrorObserver.default; /** @@ -491,7 +500,8 @@ declare namespace errorManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ export type LoopObserver = _LoopObserver; /** @@ -513,7 +523,8 @@ declare namespace errorManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ export type UnhandledRejectionObserver = (reason: Error | any, promise: Promise) => void; /** diff --git a/api/@ohos.application.BackupExtensionAbility.d.ts b/api/@ohos.application.BackupExtensionAbility.d.ts index a03b309519..154ce942bc 100644 --- a/api/@ohos.application.BackupExtensionAbility.d.ts +++ b/api/@ohos.application.BackupExtensionAbility.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2024-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/api/@ohos.application.DataShareExtensionAbility.d.ts b/api/@ohos.application.DataShareExtensionAbility.d.ts index 4dc30e5505..177444235a 100644 --- a/api/@ohos.application.DataShareExtensionAbility.d.ts +++ b/api/@ohos.application.DataShareExtensionAbility.d.ts @@ -42,7 +42,8 @@ type UpdateOperation = dataShare.UpdateOperation; * @syscap SystemCapability.DistributedDataManager.DataShare.Provider * @systemapi * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export default class DataShareExtensionAbility { /** @@ -52,7 +53,8 @@ export default class DataShareExtensionAbility { * @syscap SystemCapability.DistributedDataManager.DataShare.Provider * @systemapi * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ context: ExtensionContext; @@ -64,7 +66,8 @@ export default class DataShareExtensionAbility { * @syscap SystemCapability.DistributedDataManager.DataShare.Provider * @systemapi * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ onCreate?(want: Want, callback: AsyncCallback): void; @@ -92,7 +95,8 @@ export default class DataShareExtensionAbility { * @syscap SystemCapability.DistributedDataManager.DataShare.Provider * @systemapi * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ update?( uri: string, @@ -126,7 +130,8 @@ export default class DataShareExtensionAbility { * @syscap SystemCapability.DistributedDataManager.DataShare.Provider * @systemapi * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ delete?(uri: string, predicates: dataSharePredicates.DataSharePredicates, callback: AsyncCallback): void; @@ -143,7 +148,8 @@ export default class DataShareExtensionAbility { * @syscap SystemCapability.DistributedDataManager.DataShare.Provider * @systemapi * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ query?( uri: string, @@ -161,7 +167,8 @@ export default class DataShareExtensionAbility { * @syscap SystemCapability.DistributedDataManager.DataShare.Provider * @systemapi * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ batchInsert?(uri: string, valueBuckets: Array, callback: AsyncCallback): void; diff --git a/api/@ohos.arkui.UIContext.d.ts b/api/@ohos.arkui.UIContext.d.ts index 5abf099d14..d1fa08e73b 100755 --- a/api/@ohos.arkui.UIContext.d.ts +++ b/api/@ohos.arkui.UIContext.d.ts @@ -37,6 +37,28 @@ import image from './@ohos.multimedia.image'; import type common from './@ohos.app.ability.common'; import type pointer from './@ohos.multimodalInput.pointer'; +/*** if arkts 1.2 */ +import { ComponentContent, FrameNode, Frame } from '@ohos.arkui.node'; +import { AnimatorOptions, AnimatorResult } from './@ohos.animator'; +import { + ClickEvent, ExpectedFrameRateRange, DragItemInfo, AnimateParam, KeyframeAnimateParam, + KeyframeState, SheetOptions, PopupCommonOptions, MenuOptions, KeyEvent, Optional +} from './arkui/component/common'; +import { CustomBuilder } from './arkui/component/builder'; +import { GestureEvent, GestureRecognizer } from './arkui/component/gesture'; +import { ResourceStr, SizeOptions, VoidCallback } from './arkui/component/units'; +import { Nullable, Color, FontStyle, WidthBreakpoint, HeightBreakpoint, PixelRoundMode } from './arkui/component/enums'; +import { TimePickerDialogOptions } from './arkui/component/timePicker'; +import { AlertDialogParamWithConfirm, AlertDialogParamWithButtons, AlertDialogParamWithOptions } from './arkui/component/alertDialog'; +import { ActionSheetOptions } from './arkui/component/actionSheet'; +import { TextPickerDialogOptions } from './arkui/component/textPicker'; +import { LocalStorage } from './arkui/stateManagement/storage/localStorage'; +import { DatePickerDialogOptions } from './arkui/component/datePicker'; +import { TabsController } from './arkui/component/tabs'; +import { Scroller } from './arkui/component/scroll'; +import { KeyProcessingMode } from './arkui/component/focus'; +import { TextMenuOptions } from './arkui/component/textCommon'; +/*** endif */ /** * class Font * @@ -1035,7 +1057,8 @@ export class PromptAction { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 18 + * @since arkts { '1.1':'18','1.2':'20' } + * @arkts 1.1&1.2 */ openToast(options: promptAction.ShowToastOptions): Promise; @@ -1052,7 +1075,8 @@ export class PromptAction { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 18 + * @since arkts { '1.1':'18','1.2':'20' } + * @arkts 1.1&1.2 */ closeToast(toastId: number): void; @@ -1262,7 +1286,8 @@ export class PromptAction { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 12 + * @since arkts { '1.1':'12','1.2':'20' } + * @arkts 1.1&1.2 */ updateCustomDialog(dialogContent: ComponentContent, options: promptAction.BaseDialogOptions): Promise; @@ -1280,8 +1305,9 @@ export class PromptAction { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 12 - */ + * @since arkts { '1.1':'12','1.2':'20' } + * @arkts 1.1&1.2 + */ closeCustomDialog(dialogContent: ComponentContent): Promise; /** @@ -1630,7 +1656,7 @@ export interface OverlayManagerOptions { */ renderRootOverlay?: boolean; - /** +/** * Set whether support backPressed event or not. * * @type { ?boolean } @@ -1648,6 +1674,7 @@ export interface OverlayManagerOptions { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ enableBackPressedEvent?: boolean; } @@ -2759,7 +2786,8 @@ export class SwiperDynamicSyncScene extends DynamicSyncScene { * @extends DynamicSyncScene * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since 14 + * @since arkts { '1.1':'14','1.2':'20' } + * @arkts 1.1&1.2 */ export class MarqueeDynamicSyncScene extends DynamicSyncScene { /** @@ -2768,7 +2796,8 @@ export class MarqueeDynamicSyncScene extends DynamicSyncScene { * @readonly * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since 14 + * @since arkts { '1.1':'14','1.2':'20' } + * @arkts 1.1&1.2 */ readonly type: MarqueeDynamicSyncSceneType; } @@ -4484,6 +4513,18 @@ export class UIContext { * @since 17 */ static destroyUIContextWithoutWindow(): void; + + /** + * Thread-safe UI state variables updates interface. + * + * @param { VoidCallback } callback - The callback function to be executed in the UI thread. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + setUIStates(callback: VoidCallback): void; } /** @@ -4577,7 +4618,8 @@ export const enum SwiperDynamicSyncSceneType { * @enum { number } MarqueeDynamicSyncSceneType * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since 14 + * @since arkts { '1.1':'14','1.2':'20' } + * @arkts 1.1&1.2 */ export const enum MarqueeDynamicSyncSceneType { /** @@ -4585,7 +4627,8 @@ export const enum MarqueeDynamicSyncSceneType { * * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since 14 + * @since arkts { '1.1':'14','1.2':'20' } + * @arkts 1.1&1.2 */ ANIMATION = 1 } diff --git a/api/@ohos.arkui.advanced.SplitLayout.d.ets b/api/@ohos.arkui.advanced.SplitLayout.d.ets index d32452e04f..0544d4f482 100644 --- a/api/@ohos.arkui.advanced.SplitLayout.d.ets +++ b/api/@ohos.arkui.advanced.SplitLayout.d.ets @@ -17,10 +17,12 @@ * @file * @kit ArkUI */ - - - - +/*** if arkts 1.2 */ +import { ResourceStr } from './arkui/component/units'; +import { State, Prop } from './arkui/stateManagement/decorator'; +import { Component } from './arkui/component/customComponent'; +import { BuilderParam, Builder } from './arkui/component/builder'; +/*** endif */ /** * Declare SplitLayout.The SplitLayout is used for upper and lower graphic layouts. @@ -31,7 +33,8 @@ * Declare SplitLayout.The SplitLayout is used for upper and lower graphic layouts. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since 11 + * @since arkts{ '1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ @Component export declare struct SplitLayout { @@ -46,9 +49,10 @@ export declare struct SplitLayout { * @type { container: () => void }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since 11 + * @since arkts{ '1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - @BuilderParam container: () => void; + @BuilderParam container: () => void; /** * Image in the layout. @@ -61,7 +65,8 @@ export declare struct SplitLayout { * @type { ResourceStr }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since 11 + * @since arkts{ '1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ @State mainImage: ResourceStr; @@ -76,7 +81,8 @@ export declare struct SplitLayout { * @type { ResourceStr }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since 11 + * @since arkts{ '1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ @Prop primaryText: ResourceStr; @@ -91,7 +97,8 @@ export declare struct SplitLayout { * @type { ?ResourceStr }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since 11 + * @since arkts{ '1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ @Prop secondaryText?: ResourceStr; @@ -106,7 +113,17 @@ export declare struct SplitLayout { * @type { ?ResourceStr }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since 11 + * @since arkts{ '1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ @Prop tertiaryText?: ResourceStr; -} \ No newline at end of file + + /** + * The method to build component. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + @Builder build(): void; +} diff --git a/api/@ohos.arkui.advanced.SwipeRefresher.d.ets b/api/@ohos.arkui.advanced.SwipeRefresher.d.ets index e17f55838b..44c2a2949d 100644 --- a/api/@ohos.arkui.advanced.SwipeRefresher.d.ets +++ b/api/@ohos.arkui.advanced.SwipeRefresher.d.ets @@ -17,6 +17,12 @@ * @file * @kit ArkUI */ +/*** if arkts 1.2 */ +import { ResourceStr } from './arkui/component/units'; +import { Prop } from './arkui/stateManagement/decorator'; +import { Component } from './arkui/component/customComponent'; +import { Builder } from './arkui/component/builder'; +/*** endif */ /** * Declare component SwipeRefresher @@ -35,6 +41,7 @@ * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ @Component export declare struct SwipeRefresher { @@ -46,7 +53,7 @@ export declare struct SwipeRefresher { */ /** * Sets the content when loading. - * @type { string } + * @type { ?ResourceStr } * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 11 @@ -58,6 +65,7 @@ export declare struct SwipeRefresher { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ @Prop content?: ResourceStr; @@ -81,6 +89,16 @@ export declare struct SwipeRefresher { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ @Prop isLoading: boolean; -} \ No newline at end of file + + /** + * The method to build component. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + @Builder build(): void; +} diff --git a/api/@ohos.arkui.component.d.ets b/api/@ohos.arkui.component.d.ets index 90c190a547..18d011700d 100644 --- a/api/@ohos.arkui.component.d.ets +++ b/api/@ohos.arkui.component.d.ets @@ -18,16 +18,30 @@ * @arkts 1.2 */ export * from './arkui/UserView'; +export * from './arkui/component/animation'; +export * from './arkui/component/customComponent'; +export * from './arkui/component/common'; +export * from './arkui/component/column'; export * from './arkui/component/text'; export * from './arkui/component/enums'; export * from './arkui/component/units'; export * from './arkui/component/blank'; export * from './arkui/component/button'; +export * from './arkui/component/calendarPicker'; +export * from './arkui/component/canvas'; +export * from './arkui/component/checkbox'; +export * from './arkui/component/checkboxgroup'; +export * from './arkui/component/circle'; export * from './arkui/component/column'; export * from './arkui/component/row'; export * from './arkui/component/common'; export * from './arkui/component/customComponent'; export * from './arkui/component/enums'; +export * from './arkui/component/extendableComponent'; +export * from './arkui/component/flex'; +export * from './arkui/component/flowItem'; +export * from './arkui/component/focus'; +export * from './arkui/component/folderStack'; export * from './arkui/component/forEach'; export * from './arkui/component/gesture'; export * from './arkui/component/grid'; @@ -45,9 +59,11 @@ export * from './arkui/component/stack'; export * from './arkui/component/symbolglyph'; export * from './arkui/component/units'; export * from './arkui/component/resources'; +export * from './arkui/component/lazyGridLayout'; export * from './arkui/component/locationButton'; +export * from './arkui/component/pageTransition'; export * from './arkui/component/pasteButton'; export * from './arkui/component/saveButton'; export * from './arkui/component/securityComponent'; export * from './arkui/component/web'; -export * from './arkui/component/textCommon'; \ No newline at end of file +export * from './arkui/component/textCommon'; diff --git a/api/@ohos.arkui.componentSnapshot.d.ts b/api/@ohos.arkui.componentSnapshot.d.ts index bbb183f6dd..06548aaeba 100644 --- a/api/@ohos.arkui.componentSnapshot.d.ts +++ b/api/@ohos.arkui.componentSnapshot.d.ts @@ -18,8 +18,12 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { CustomBuilder } from './arkui/component/builder'; +/*** endif */ + import { AsyncCallback } from './@ohos.base'; -import image from './@ohos.multimedia.image' +import image from './@ohos.multimedia.image'; /** * This module allows developers to export snapshot image from a component or a custom builder. @@ -233,9 +237,10 @@ declare namespace componentSnapshot { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} * @deprecated since 18 * @useinstead ohos.arkui.UIContext.ComponentSnapshot#get + * @arkts 1.1&1.2 */ function get(id: string, callback: AsyncCallback, options?: SnapshotOptions): void; @@ -267,9 +272,10 @@ declare namespace componentSnapshot { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} * @deprecated since 18 * @useinstead ohos.arkui.UIContext.ComponentSnapshot#get + * @arkts 1.1&1.2 */ function get(id: string, options?: SnapshotOptions): Promise; @@ -305,9 +311,10 @@ declare namespace componentSnapshot { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} * @deprecated since 18 * @useinstead ohos.arkui.UIContext.ComponentSnapshot#createFromBuilder + * @arkts 1.1&1.2 */ function createFromBuilder(builder: CustomBuilder, callback: AsyncCallback, delay?: number, checkImageStatus?: boolean, options?: SnapshotOptions): void; @@ -344,9 +351,10 @@ declare namespace componentSnapshot { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} * @deprecated since 18 * @useinstead ohos.arkui.UIContext.ComponentSnapshot#createFromBuilder + * @arkts 1.1&1.2 */ function createFromBuilder(builder: CustomBuilder, delay?: number, checkImageStatus?: boolean, options?: SnapshotOptions): Promise; diff --git a/api/@ohos.arkui.dragController.d.ts b/api/@ohos.arkui.dragController.d.ts index 7430d82dc8..7c3f6fc2f6 100644 --- a/api/@ohos.arkui.dragController.d.ts +++ b/api/@ohos.arkui.dragController.d.ts @@ -18,6 +18,12 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { DragEvent, DragPreviewOptions, DragItemInfo, ICurve } from './arkui/component/common'; +import { CustomBuilder } from './arkui/component/builder'; +import { TouchPoint, ResourceColor } from './arkui/component/units'; +import { Curve } from './arkui/component/enums'; +/*** endif */ import type { AsyncCallback, BusinessError, Callback } from './@ohos.base'; @@ -685,11 +691,12 @@ declare namespace dragController { * Execute a drag event. * @param { CustomBuilder | DragItemInfo } custom - Object used for prompts displayed when the object is dragged. * @param { DragInfo } dragInfo - Information about the drag event. - * @param { AsyncCallback<{ event: DragEvent, extraParams: string }> } callback - Callback that contains the drag event information. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameters types. - *
    3. Parameter verification failed. + * @param { AsyncCallback<{ event: DragEvent, extraParams: string }> } callback - Callback that contains the drag + * event information. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameters types. + *
    3. Parameter verification failed. * @throws { BusinessError } 100001 - Internal handling failed. * @syscap SystemCapability.ArkUI.ArkUI.Full * @since 10 @@ -699,44 +706,45 @@ declare namespace dragController { * @param { CustomBuilder | DragItemInfo } custom - Object used for prompts displayed when the object is dragged. * @param { DragInfo } dragInfo - Information about the drag event. * @param { AsyncCallback } callback - Callback that contains the drag event information. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameters types. - *
    3. Parameter verification failed. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameters types. + *
    3. Parameter verification failed. * @throws { BusinessError } 100001 - Internal handling failed. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 12 - */ + */ /** * Execute a drag event. * @param { CustomBuilder | DragItemInfo } custom - Object used for prompts displayed when the object is dragged. * @param { DragInfo } dragInfo - Information about the drag event. * @param { AsyncCallback } callback - Callback that contains the drag event information. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameters types. - *
    3. Parameter verification failed. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameters types. + *
    3. Parameter verification failed. * @throws { BusinessError } 100001 - Internal handling failed. * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 18 - * @deprecated since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @deprecated since 18 * @useinstead ohos.arkui.UIContext.DragController#executeDrag + * @arkts 1.1&1.2 */ function executeDrag(custom: CustomBuilder | DragItemInfo, dragInfo: DragInfo, - callback: AsyncCallback): void; + callback: AsyncCallback): void; /** * Execute a drag event. * @param { CustomBuilder | DragItemInfo } custom - Object used for prompts displayed when the object is dragged. * @param { DragInfo } dragInfo - Information about the drag event. * @returns { Promise<{ event: DragEvent, extraParams: string }> } A Promise with the drag event information. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameters types. - *
    3. Parameter verification failed. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameters types. + *
    3. Parameter verification failed. * @throws { BusinessError } 100001 - Internal handling failed. * @syscap SystemCapability.ArkUI.ArkUI.Full * @since 10 @@ -746,10 +754,10 @@ declare namespace dragController { * @param { CustomBuilder | DragItemInfo } custom - Object used for prompts displayed when the object is dragged. * @param { DragInfo } dragInfo - Information about the drag event. * @returns { Promise } A Promise with the drag event information. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameters types. - *
    3. Parameter verification failed. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameters types. + *
    3. Parameter verification failed. * @throws { BusinessError } 100001 - Internal handling failed. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice @@ -760,17 +768,18 @@ declare namespace dragController { * @param { CustomBuilder | DragItemInfo } custom - Object used for prompts displayed when the object is dragged. * @param { DragInfo } dragInfo - Information about the drag event. * @returns { Promise } A Promise with the drag event information. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameters types. - *
    3. Parameter verification failed. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameters types. + *
    3. Parameter verification failed. * @throws { BusinessError } 100001 - Internal handling failed. * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} * @deprecated since 18 * @useinstead ohos.arkui.UIContext.DragController#executeDrag + * @arkts 1.1&1.2 */ function executeDrag(custom: CustomBuilder | DragItemInfo, dragInfo: DragInfo): Promise; @@ -778,13 +787,13 @@ declare namespace dragController { * Create one drag action object, which can be used for starting drag later or monitoring * the drag status after drag started. * @param { Array } customArray - Objects used for prompts - * displayed when the objects are dragged. + * displayed when the objects are dragged. * @param { DragInfo } dragInfo - Information about the drag event. * @returns { DragAction } one drag action object - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameters types. - *
    3. Parameter verification failed. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameters types. + *
    3. Parameter verification failed. * @throws { BusinessError } 100001 - Internal handling failed. * @syscap SystemCapability.ArkUI.ArkUI.Full * @since 11 @@ -793,13 +802,13 @@ declare namespace dragController { * Create one drag action object, which can be used for starting drag later or monitoring * the drag status after drag started. * @param { Array } customArray - Objects used for prompts - * displayed when the objects are dragged. + * displayed when the objects are dragged. * @param { DragInfo } dragInfo - Information about the drag event. * @returns { DragAction } one drag action object - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameters types. - *
    3. Parameter verification failed. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameters types. + *
    3. Parameter verification failed. * @throws { BusinessError } 100001 - Internal handling failed. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice @@ -809,20 +818,21 @@ declare namespace dragController { * Create one drag action object, which can be used for starting drag later or monitoring * the drag status after drag started. * @param { Array } customArray - Objects used for prompts - * displayed when the objects are dragged. + * displayed when the objects are dragged. * @param { DragInfo } dragInfo - Information about the drag event. * @returns { DragAction } one drag action object - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameters types. - *
    3. Parameter verification failed. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameters types. + *
    3. Parameter verification failed. * @throws { BusinessError } 100001 - Internal handling failed. * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} * @deprecated since 18 * @useinstead ohos.arkui.UIContext.DragController#createDragAction + * @arkts 1.1&1.2 */ function createDragAction(customArray: Array, dragInfo: DragInfo): DragAction; @@ -845,9 +855,10 @@ declare namespace dragController { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} * @deprecated since 18 * @useinstead ohos.arkui.UIContext.DragController#getDragPreview + * @arkts 1.1&1.2 */ function getDragPreview(): DragPreview; diff --git a/api/@ohos.arkui.drawableDescriptor.d.ts b/api/@ohos.arkui.drawableDescriptor.d.ts index 6c7ff4b6a3..25c9b5398c 100644 --- a/api/@ohos.arkui.drawableDescriptor.d.ts +++ b/api/@ohos.arkui.drawableDescriptor.d.ts @@ -134,6 +134,18 @@ export class DrawableDescriptor { */ getPixelMap(): image.PixelMap; + /** + * Get pixelMap of drawable image. + * + * @returns { image.PixelMap | undefined } Return the PixelMap of the calling DrawableDescriptor object. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + getPixelMap(): image.PixelMap | undefined; + /** * Get original width of drawable object. * @@ -250,6 +262,18 @@ export class LayeredDrawableDescriptor extends DrawableDescriptor { */ getForeground(): DrawableDescriptor; + /** + * Get DrawableDescriptor for the foreground. + * + * @returns { DrawableDescriptor | undefined } Return the DrawableDescriptor object of foreground. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + getForeground(): DrawableDescriptor | undefined; + /** * Get DrawableDescriptor for the background. * @@ -276,6 +300,18 @@ export class LayeredDrawableDescriptor extends DrawableDescriptor { */ getBackground(): DrawableDescriptor; + /** + * Get DrawableDescriptor for the background. + * + * @returns { DrawableDescriptor | undefined } Return the DrawableDescriptor object of background. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + getBackground(): DrawableDescriptor | undefined; + /** * Get DrawableDescriptor for the mask. * @@ -302,6 +338,18 @@ export class LayeredDrawableDescriptor extends DrawableDescriptor { */ getMask(): DrawableDescriptor; + /** + * Get DrawableDescriptor for the mask. + * + * @returns { DrawableDescriptor | undefined } Return the DrawableDescriptor object of mask. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + getMask(): DrawableDescriptor | undefined; + /** * Get the clip path info of the adaptive icon mask. @@ -369,7 +417,11 @@ export class PixelMapDrawableDescriptor extends DrawableDescriptor { * @atomicservice * @since 12 */ +<<<<<<< HEAD declare interface AnimationOptions { +======= +export declare interface AnimationOptions { +>>>>>>> 94c88a315 (change 0603 to 0328) /** * The duration of animation playback once. * diff --git a/api/@ohos.arkui.inspector.d.ts b/api/@ohos.arkui.inspector.d.ts index e1cc913b37..1c5acbc590 100644 --- a/api/@ohos.arkui.inspector.d.ts +++ b/api/@ohos.arkui.inspector.d.ts @@ -183,6 +183,79 @@ declare namespace inspector { * @useinstead ohos.arkui.UIContext.UIInspector#createComponentObserver */ function createComponentObserver(id: string): ComponentObserver; + + /** + * Obtains all attributes of the component with the specified ID. + * + * @param { string } id - ID of the component whose attributes are to be obtained. + * @returns { string } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @test + * @arkts 1.2 + */ + function getInspectorByKey(id: string): string; + + /** + * Get components tree. + * + * @returns { Object } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @test + * @arkts 1.2 + */ + function getInspectorTree(): Object; + + /** + * Sends an event to the component with the specified ID. + * + * @param { string } id - ID of the component for which the event is to be sent. + * @param { number } action - Type of the event to be sent. The options are as follows: Click event: 10 LongClick: 11. + * @param { string } params - Event parameters. If there is no parameter, pass an empty string "". + * @returns { boolean } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @test + * @arkts 1.2 + */ + function sendEventByKey(id: string, action: number, params: string): boolean; } export default inspector; +/** + * export function getInspectorByKey from inspector namespace and provide it for kit ArkUI. + * @constant + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +export const GETINSPECTORBYKEY = inspector.getInspectorByKey; +/** + * export function getInspectorTree from inspector namespace and provide it for kit ArkUI. + * @constant + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +export const GETINSPECTORTREE = inspector.getInspectorTree; +/** + * export function sendEventByKey from inspector namespace and provide it for kit ArkUI. + * @constant + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +export const SENDEVENTBYKEY = inspector.sendEventByKey; \ No newline at end of file diff --git a/api/@ohos.arkui.shape.d.ts b/api/@ohos.arkui.shape.d.ts index f4688f6e5c..8afe674dc9 100644 --- a/api/@ohos.arkui.shape.d.ts +++ b/api/@ohos.arkui.shape.d.ts @@ -30,7 +30,7 @@ * @atomicservice * @since 12 */ -interface ShapeSize { +export interface ShapeSize { /** * Defines the width of Shape. * @type { ? (number | string) } @@ -63,7 +63,7 @@ interface ShapeSize { * @atomicservice * @since 12 */ -interface RectShapeOptions extends ShapeSize { +export interface RectShapeOptions extends ShapeSize { /** * Defines the corner radius of the RectShape. * @type { ? (number | string | Array) } @@ -86,7 +86,7 @@ interface RectShapeOptions extends ShapeSize { * @atomicservice * @since 12 */ -interface RoundRectShapeOptions extends ShapeSize { +export interface RoundRectShapeOptions extends ShapeSize { /** * Defines the width of the corner radius for RectShape. * @type { ? (number | string) } @@ -118,7 +118,7 @@ interface RoundRectShapeOptions extends ShapeSize { * @atomicservice * @since 12 */ -interface PathShapeOptions { +export interface PathShapeOptions { /** * Defines the commands for drawing the PathShape. * @type { ?string } diff --git a/api/@ohos.arkui.stateManagement.d.ets b/api/@ohos.arkui.stateManagement.d.ets index f29f2f0d28..cecd6af264 100644 --- a/api/@ohos.arkui.stateManagement.d.ets +++ b/api/@ohos.arkui.stateManagement.d.ets @@ -19,7 +19,7 @@ * @arkts 1.2 */ -export * from './arkui/stateManagement/common'; +export * from './arkui/stateManagement/decorator'; export * from './arkui/stateManagement/runtime'; export * from './arkui/stateManagement/storage'; export * from './arkui/stateManagement/base/decoratorBase'; @@ -31,4 +31,6 @@ export * from './arkui/stateManagement/decorators/decoratorStorageLink'; export * from './arkui/stateManagement/decorators/decoratorStorageProp'; export * from './arkui/stateManagement/decorators/decoratorWatch'; export * from './arkui/stateManagement/storages/appStorage'; -export * from './arkui/stateManagement/storages/localStorage'; \ No newline at end of file +export * from './arkui/stateManagement/storages/localStorage'; +export * from './arkui/stateManagement/utils'; +export * from './arkui/stateManagement/storage/storageProperty'; diff --git a/api/@ohos.batteryInfo.d.ets b/api/@ohos.batteryInfo.d.ets index 7b8f73ca19..533aefc597 100644 --- a/api/@ohos.batteryInfo.d.ets +++ b/api/@ohos.batteryInfo.d.ets @@ -16,6 +16,7 @@ /** * @file * @kit BasicServicesKit + * @arkts 1.2 */ /** @@ -23,19 +24,442 @@ *

    Battery information includes the remaining battery power, * voltage, temperature, model, and charger type. * + * @namespace batteryInfo * @syscap SystemCapability.PowerManager.BatteryManager.Core * @atomicservice * @since 20 */ -declare class batteryInfo { +declare namespace batteryInfo { + /** + * Sets the battery config by scene name. + * + * @param { string } sceneName - Indicates the battery charging scene name. + * sceneName parameter must be of type string. + * @param { string } sceneValue - Indicates the battery charging scene value. + * sceneValue parameter must be of type string. + * @returns { int } Return to set the charging configuration result. + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Incorrect parameter types; + * @throws { BusinessError } 5100101 - Failed to connect to the service. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @systemapi + * @since 20 + */ + function setBatteryConfig(sceneName: string, sceneValue: string): int; + + /** + * Queries the battery config by scene name. + * + * @param { string } sceneName - Indicates the battery charging scene name. + * sceneName parameter must be of type string. + * @returns { string } Returns the battery charging configuration, returns "" otherwise. + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Incorrect parameter types; + * @throws { BusinessError } 5100101 - Failed to connect to the service. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @systemapi + * @since 20 + */ + function getBatteryConfig(sceneName: string): string; + + /** + * Checks the battery config is enable by scene name. + * + * @param { string } sceneName - Indicates the battery charging scene name. + * sceneName parameter must be of type string. + * @returns { boolean } Returns true if the device supports the charging scene, returns false otherwise. + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Incorrect parameter types; + * @throws { BusinessError } 5100101 - Failed to connect to the service. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @systemapi + * @since 20 + */ + function isBatteryConfigSupported(sceneName: string): boolean; + /** * Battery state of charge (SoC) of the current device, in percent. * - * @readonly + * @returns { int } Returns the battery state of charge (SoC) of the current device, in percent. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + function batterySOC(): int; + + /** + * Battery charging status of the current device. + * + * @returns { BatteryChargeState } Returns the battery charging status of the current device. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + function chargingStatus(): BatteryChargeState; + + /** + * Battery health state of the current device. + * + * @returns { BatteryHealthState } Returns the battery health state of the current device. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + function healthStatus(): BatteryHealthState; + + /** + * Charger type of the current device. + * + * @returns { BatteryPluggedType } Returns the charger type of the current device. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + function pluggedType(): BatteryPluggedType; + + /** + * Battery voltage of the current device, in µV. + * + * @returns { int } Returns the battery voltage of the current device, in µV. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + function voltage(): int; + + /** + * Battery technology of the current device. + * + * @returns { string } Returns the battery technology of the current device. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + function technology(): string; + + /** + * Battery temperature of the current device, in 0.1℃. + * + * @returns { int } Returns the battery temperature of the current device, in 0.1℃. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + function batteryTemperature(): int; + + /** + * Battery present state of the current device. + * + * @returns { boolean } Returns true if the battery is present; returns false if the battery is absent. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + function isBatteryPresent(): boolean; + + /** + * Battery capacity level of the current device. + * + * @returns { BatteryCapacityLevel } Returns the battery capacity level of the current device. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + function batteryCapacityLevel(): BatteryCapacityLevel; + + /** + * Estimated remaining time for the current device to be fully charged, in ms. + * + * @returns { long } Returns the estimated remaining time for the current device to be fully charged, in ms. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @systemapi + * @since 20 + */ + function estimatedRemainingChargeTime(): long; + + /** + * Battery total energy of the current device, in mAh. + * + * @returns { int } Returns the battery total energy of the current device, in mAh. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @systemapi + * @since 20 + */ + function totalEnergy(): int; + + /** + * Battery immediate current of the current device, in mA. + * + * @returns { int } Returns the battery immediate current of the current device, in mA. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + function nowCurrent(): int; + + /** + * Battery remaining energy of the current device, in mAh. + * + * @returns { int } Returns the battery remaining energy of the current device, in mAh. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @systemapi + * @since 20 + */ + function remainingEnergy(): int; + + /** + * Charger type of a device. + * + * @enum { int } + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + export enum BatteryPluggedType { + /** + * Unknown type + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + NONE, + /** + * AC charger + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + AC, + /** + * USB charger + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + USB, + /** + * Wireless charger + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + WIRELESS + } + + /** + * Battery charging status of a device. + * + * @enum { int } * @syscap SystemCapability.PowerManager.BatteryManager.Core * @atomicservice * @since 20 */ - static get batterySOC(): int; + export enum BatteryChargeState { + /** + * Unknown state. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @atomicservice + * @since 20 + */ + NONE, + /** + * The battery is being charged. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @atomicservice + * @since 20 + */ + ENABLE, + /** + * The battery is not being charged. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @atomicservice + * @since 20 + */ + DISABLE, + /** + * The battery is fully charged. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @atomicservice + * @since 20 + */ + FULL + } + + /** + * Battery health status of a device. + * + * @enum { int } + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + export enum BatteryHealthState { + /** + * Unknown state. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + UNKNOWN, + /** + * The battery is in healthy state. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + GOOD, + /** + * The battery is overheated. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + OVERHEAT, + /** + * The battery voltage is over high. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + OVERVOLTAGE, + /** + * The battery temperature is low. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + COLD, + /** + * The battery is dead. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + DEAD + } + + /** + * Battery capacity level of a device. + * + * @enum { int } + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + export enum BatteryCapacityLevel { + /** + * The battery is in full capacity level. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + LEVEL_FULL, + /** + * The battery is in high capacity level. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + LEVEL_HIGH, + /** + * The battery is in normal capacity level. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + LEVEL_NORMAL, + /** + * The battery is in low capacity level. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + LEVEL_LOW, + /** + * The battery is in warning low capacity level. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + LEVEL_WARNING, + /** + * The battery is in critical low capacity level. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + LEVEL_CRITICAL, + /** + * The battery is in the lowest capacity level, system will shut down automatically in a few seconds. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + LEVEL_SHUTDOWN + } + + /** + * Extra key of common event COMMON_EVENT_BATTERY_CHANGED. + * + * @enum { string } + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + export enum CommonEventBatteryChangedKey { + /** + * Extra code of batterySOC. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + EXTRA_SOC = 'soc', + /** + * Extra code of chargingStatus. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + EXTRA_CHARGE_STATE = 'chargeState', + /** + * Extra code of healthStatus. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + EXTRA_HEALTH_STATE = 'healthState', + /** + * Extra code of pluggedType. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + EXTRA_PLUGGED_TYPE = 'pluggedType', + /** + * Extra code of voltage. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + EXTRA_VOLTAGE = 'voltage', + /** + * Extra code of technology. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + EXTRA_TECHNOLOGY = 'technology', + /** + * Extra code of batteryTemperature. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + EXTRA_TEMPERATURE = 'temperature', + /** + * Extra code of isBatteryPresent. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + EXTRA_PRESENT = 'present', + /** + * Extra code of batteryCapacityLevel. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + EXTRA_CAPACITY_LEVEL = 'capacityLevel' + } } -export default batteryInfo; \ No newline at end of file +export default batteryInfo; diff --git a/api/@ohos.batteryStatistics.d.ts b/api/@ohos.batteryStatistics.d.ts index 906cb96453..1ccd48e007 100644 --- a/api/@ohos.batteryStatistics.d.ts +++ b/api/@ohos.batteryStatistics.d.ts @@ -16,6 +16,7 @@ /** * @file * @kit BasicServicesKit + * @arkts 1.1&1.2 */ import { AsyncCallback, BusinessError } from './@ohos.base'; @@ -26,88 +27,108 @@ import { AsyncCallback, BusinessError } from './@ohos.base'; * @namespace batteryStats * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace batteryStats { /** * Describes the consumption type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum ConsumptionType { - /** Indicates an invalid consumption type + /** + * Indicates an invalid consumption type. * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ CONSUMPTION_TYPE_INVALID = -17, - /** Indicates the battery power consumption generated by APP + /** + * Indicates the battery power consumption generated by APP. * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ CONSUMPTION_TYPE_APP, - /** Indicates the battery power consumption generated by bluetooth + /** + * Indicates the battery power consumption generated by bluetooth. * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ CONSUMPTION_TYPE_BLUETOOTH, - /** Indicates the battery power consumption generated when the CPU is idle + /** + * Indicates the battery power consumption generated when the CPU is idle. * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ CONSUMPTION_TYPE_IDLE, - /** Indicates the battery power consumption generated when phone call is active + /** + * Indicates the battery power consumption generated when phone call is active. * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ CONSUMPTION_TYPE_PHONE, - /** Indicates the battery power consumption generated by radio + /** + * Indicates the battery power consumption generated by radio. * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ CONSUMPTION_TYPE_RADIO, - /** Indicates the battery power consumption generated by screen + /** + * Indicates the battery power consumption generated by screen. * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ CONSUMPTION_TYPE_SCREEN, - /** Indicates the battery power consumption generated by user + /** + * Indicates the battery power consumption generated by user. * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ CONSUMPTION_TYPE_USER, - /** Indicates the battery power consumption generated by WIFI + /** + * Indicates the battery power consumption generated by WIFI. * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ CONSUMPTION_TYPE_WIFI } @@ -119,7 +140,8 @@ declare namespace batteryStats { * @throws { BusinessError } 4600101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ function getBatteryStats(): Promise>; @@ -133,67 +155,72 @@ declare namespace batteryStats { * @throws { BusinessError } 4600101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ function getBatteryStats(callback: AsyncCallback>): void; /** * Obtains power consumption information(mAh) for a given uid. * - * @param { number } uid Indicates the uid. - * @returns { number } Power consumption information(mAh). + * @param { int } uid Indicates the uid. + * @returns { double } Power consumption information(mAh). * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. * @throws { BusinessError } 4600101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - function getAppPowerValue(uid: number): number; + function getAppPowerValue(uid: int): double; /** * Obtains power consumption information(Percent) for a given uid. * - * @param { number } uid Indicates the uid. - * @returns { number } Power consumption information(Percent). + * @param { int } uid Indicates the uid. + * @returns { double } Power consumption information(Percent). * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. * @throws { BusinessError } 4600101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - function getAppPowerPercent(uid: number): number; + function getAppPowerPercent(uid: int): double; /** * Obtains power consumption information(mAh) for a given type. * * @param { ConsumptionType } type Indicates the hardware type. * the ConsumptionType type is an enumeration class. - * @returns { number } Power consumption information(mAh). + * @returns { double } Power consumption information(mAh). * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. * @throws { BusinessError } 4600101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - function getHardwareUnitPowerValue(type: ConsumptionType): number; + function getHardwareUnitPowerValue(type: ConsumptionType): double; /** * Obtains power consumption information(Percent) for a given type. * * @param { ConsumptionType } type Indicates the hardware type. * the ConsumptionType type is an enumeration class. - * @returns { number } Power consumption information(Percent). + * @returns { double } Power consumption information(Percent). * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. * @throws { BusinessError } 4600101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - function getHardwareUnitPowerPercent(type: ConsumptionType): number; + function getHardwareUnitPowerPercent(type: ConsumptionType): double; /** * Contains power consumption information of a device. @@ -202,35 +229,42 @@ declare namespace batteryStats { * @typedef BatteryStatsInfo * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ interface BatteryStatsInfo { - /** The uid related with the power consumption info. + /** + * The uid related with the power consumption info. * - * @type { number } + * @type { int } * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ - uid: number; + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ + uid: int; - /** The type related with the power consumption info. + /** + * The type related with the power consumption info. * * @type { ConsumptionType } * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ type: ConsumptionType; - /** The power consumption value(mAh). + /** + * The power consumption value(mAh). * - * @type { number } + * @type { double } * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ - power: number; + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ + power: double; } } @@ -240,6 +274,7 @@ declare namespace batteryStats { * @namespace batteryStats * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 -*/ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ export default batteryStats; diff --git a/api/@ohos.bluetooth.a2dp.d.ts b/api/@ohos.bluetooth.a2dp.d.ts index c3eeaadd89..512fa0ede1 100644 --- a/api/@ohos.bluetooth.a2dp.d.ts +++ b/api/@ohos.bluetooth.a2dp.d.ts @@ -42,7 +42,8 @@ declare namespace a2dp { * * @typedef { baseProfile.BaseProfile } BaseProfile * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ type BaseProfile = baseProfile.BaseProfile; diff --git a/api/@ohos.bluetooth.ble.d.ts b/api/@ohos.bluetooth.ble.d.ts index 7ec2196b21..40fcc0b808 100644 --- a/api/@ohos.bluetooth.ble.d.ts +++ b/api/@ohos.bluetooth.ble.d.ts @@ -4368,7 +4368,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface DescriptorReadRequest { /** @@ -4536,7 +4537,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface DescriptorWriteRequest { /** @@ -5507,7 +5509,8 @@ declare namespace ble { * @typedef AdvertisingStateChangeInfo * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface AdvertisingStateChangeInfo { /** @@ -5720,7 +5723,8 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface ScanFilter { /** @@ -6527,7 +6531,8 @@ declare namespace ble { * @enum { number } * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ enum AdvertisingState { /** @@ -6541,21 +6546,24 @@ declare namespace ble { * * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ STARTED = 1, /** * advertising temporarily enabled. * * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ ENABLED = 2, /** * advertising temporarily disabled. * * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ DISABLED = 3, /** @@ -6569,7 +6577,8 @@ declare namespace ble { * * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ STOPPED = 4 } diff --git a/api/@ohos.bluetooth.connection.d.ts b/api/@ohos.bluetooth.connection.d.ts index 4436723f19..ee6f878199 100644 --- a/api/@ohos.bluetooth.connection.d.ts +++ b/api/@ohos.bluetooth.connection.d.ts @@ -1657,7 +1657,8 @@ declare namespace connection { * * @typedef PinRequiredParam * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ interface PinRequiredParam { /** @@ -2039,7 +2040,8 @@ declare namespace connection { * * @typedef DiscoveryResult * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface DiscoveryResult { /** @@ -2113,7 +2115,8 @@ declare namespace connection { * * @typedef BatteryInfo * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface BatteryInfo { /** diff --git a/api/@ohos.bluetooth.hfp.d.ts b/api/@ohos.bluetooth.hfp.d.ts index f9c6049631..18006a14a1 100644 --- a/api/@ohos.bluetooth.hfp.d.ts +++ b/api/@ohos.bluetooth.hfp.d.ts @@ -33,7 +33,8 @@ declare namespace hfp { * * @typedef { baseProfile.BaseProfile } BaseProfile * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ type BaseProfile = baseProfile.BaseProfile; diff --git a/api/@ohos.bluetooth.hid.d.ts b/api/@ohos.bluetooth.hid.d.ts index 317f129d41..de25e276df 100644 --- a/api/@ohos.bluetooth.hid.d.ts +++ b/api/@ohos.bluetooth.hid.d.ts @@ -33,7 +33,8 @@ declare namespace hid { * * @typedef { baseProfile.BaseProfile } BaseProfile * @syscap SystemCapability.Communication.Bluetooth.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ type BaseProfile = baseProfile.BaseProfile; diff --git a/api/@ohos.buffer.d.ts b/api/@ohos.buffer.d.ts index 1627e06e8e..b59b8d20bf 100644 --- a/api/@ohos.buffer.d.ts +++ b/api/@ohos.buffer.d.ts @@ -2403,6 +2403,18 @@ declare namespace buffer { */ toJSON(): jsonx.JsonElement; + /** + * Converts this Buffer instance into a JsonElement. + * + * @returns { jsonx.JsonElement } A new JsonElement containing the Buffer + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + toJSON(): jsonx.JsonElement; + /** * Decodes buf to a string according to the specified character encoding in encoding * @@ -3551,30 +3563,20 @@ declare namespace buffer { writeUIntLE(value: number, offset: number, byteLength: number): number; /** - * Returns the byte at the specified index. + * Returns the item at that index. * - * @param { number } index - byte index to read - * @returns { number | undefined } Returns the byte value at `index` + * @param { number } index - The zero-based index of the desired code unit. + * Throws error if index < 0 or index >= buffer.length. + * @returns { number } The element in the buffer matching the given index. + * @throws { BusinessError } 10200001 - The value of index is out of range. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice * @since 20 * @arkts 1.2 */ - $_get(index: number): number | undefined; + [index: number]: number; - /** - * Sets the byte at the specified index. - * - * @param { number } index – byte index to write - * @param { number } value – byte value (0–255) - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - $_set(index: number, value: number): void; } /** diff --git a/api/@ohos.bundle.appControl.d.ts b/api/@ohos.bundle.appControl.d.ts index b7f6ac7d90..522a04773b 100644 --- a/api/@ohos.bundle.appControl.d.ts +++ b/api/@ohos.bundle.appControl.d.ts @@ -40,7 +40,7 @@ declare namespace appControl { /** * Indicates the ability component type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} @@ -71,7 +71,7 @@ declare namespace appControl { /** * Indicates the ability component type when uninstalled. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi * @since arkts {'1.1':'15', '1.2':'20'} @@ -92,7 +92,7 @@ declare namespace appControl { /** * Indicates when to intercept the specified application. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} @@ -131,7 +131,7 @@ declare namespace appControl { /** * Indicates the strategy to intercept the specified application. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} @@ -226,13 +226,13 @@ declare namespace appControl { /** * Indicates priority of the rule. * - * @type { number } + * @type { int } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - priority: number; + priority: int; } /** @@ -270,13 +270,13 @@ declare namespace appControl { /** * Indicates priority of the rule. * - * @type { number } + * @type { int } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi * @since arkts {'1.1':'15', '1.2':'20'} * @arkts 1.1&1.2 */ - priority: number; + priority: int; } /** @@ -484,7 +484,7 @@ declare namespace appControl { * * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS * @param { string } appId - Indicates the app ID of the application. - * @param { number } [appIndex] Indicates the index of clone app. + * @param { int } [appIndex] Indicates the index of clone app. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -496,7 +496,7 @@ declare namespace appControl { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function deleteDisposedStatusSync(appId: string, appIndex?: number): void; + function deleteDisposedStatusSync(appId: string, appIndex?: int): void; /** * Obtains the disposed rule of a specified bundle. @@ -518,7 +518,7 @@ declare namespace appControl { * * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS * @param { string } appId - Indicates the app ID of the application. - * @param { number } [appIndex] Indicates the index of clone app. + * @param { int } [appIndex] Indicates the index of clone app. * @returns { DisposedRule } Returns the disposed rule of a specified bundle. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. @@ -531,7 +531,7 @@ declare namespace appControl { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getDisposedRule(appId: string, appIndex?: number): DisposedRule; + function getDisposedRule(appId: string, appIndex?: int): DisposedRule; /** * Sets the disposed rule of a specified bundle. @@ -554,7 +554,7 @@ declare namespace appControl { * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS * @param { string } appId - Indicates the app ID of the application. * @param { DisposedRule } rule - Indicates the disposed rule of a specified bundle. - * @param { number } [appIndex] Indicates the index of clone app. + * @param { int } [appIndex] Indicates the index of clone app. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -566,7 +566,7 @@ declare namespace appControl { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function setDisposedRule(appId: string, rule: DisposedRule, appIndex?: number): void; + function setDisposedRule(appId: string, rule: DisposedRule, appIndex?: int): void; /** * Sets the uninstall disposed rule of a specified bundle. @@ -574,7 +574,7 @@ declare namespace appControl { * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS * @param { string } appIdentifier - Indicates the appIdentifier of the application. * @param { UninstallDisposedRule } rule - Indicates the uninstall disposed rule of a specified bundle. - * @param { number } [appIndex] Indicates the index of clone app. + * @param { int } [appIndex] Indicates the index of clone app. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -587,14 +587,14 @@ declare namespace appControl { * @since arkts {'1.1':'15', '1.2':'20'} * @arkts 1.1&1.2 */ - function setUninstallDisposedRule(appIdentifier: string, rule: UninstallDisposedRule, appIndex?: number): void; + function setUninstallDisposedRule(appIdentifier: string, rule: UninstallDisposedRule, appIndex?: int): void; /** * Obtains the uninstall disposed rule of a specified bundle. * * @permission ohos.permission.GET_DISPOSED_APP_STATUS or ohos.permission.MANAGE_DISPOSED_APP_STATUS * @param { string } appIdentifier - Indicates the appIdentifier of the application. - * @param { number } [appIndex] Indicates the index of clone app. + * @param { int } [appIndex] Indicates the index of clone app. * @returns { UninstallDisposedRule } Returns the uninstall disposed rule of a specified bundle. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. @@ -607,14 +607,14 @@ declare namespace appControl { * @since arkts {'1.1':'15', '1.2':'20'} * @arkts 1.1&1.2 */ - function getUninstallDisposedRule(appIdentifier: string, appIndex?: number): UninstallDisposedRule; + function getUninstallDisposedRule(appIdentifier: string, appIndex?: int): UninstallDisposedRule; /** * Delete the uninstall disposed rule of a specified bundle. * * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS * @param { string } appIdentifier - Indicates the appIdentifier of the application. - * @param { number } [appIndex] Indicates the index of clone app. + * @param { int } [appIndex] Indicates the index of clone app. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. diff --git a/api/@ohos.bundle.appDomainVerify.d.ts b/api/@ohos.bundle.appDomainVerify.d.ts index 972f9cfab2..a28a83468c 100644 --- a/api/@ohos.bundle.appDomainVerify.d.ts +++ b/api/@ohos.bundle.appDomainVerify.d.ts @@ -13,7 +13,8 @@ * @syscap SystemCapability.BundleManager.AppDomainVerify * @systemapi * @stagemodelonly - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace appDomainVerify { @@ -30,7 +31,8 @@ declare namespace appDomainVerify { * @syscap SystemCapability.BundleManager.AppDomainVerify * @systemapi * @stagemodelonly - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ function queryAssociatedDomains(bundleName: string): string[]; @@ -46,7 +48,8 @@ declare namespace appDomainVerify { * @syscap SystemCapability.BundleManager.AppDomainVerify * @systemapi * @stagemodelonly - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ function queryAssociatedBundleNames(domain: string): string[]; } diff --git a/api/@ohos.bundle.bundleManager.d.ts b/api/@ohos.bundle.bundleManager.d.ts index 525a06ae37..91dd5e5409 100644 --- a/api/@ohos.bundle.bundleManager.d.ts +++ b/api/@ohos.bundle.bundleManager.d.ts @@ -95,7 +95,7 @@ declare namespace bundleManager { * Used to query the enumeration value of bundleInfo. Multiple values can be passed in the form. * Multiple value input, such as GET_BUNDLE_INFO_DEFAULT | GET_BUNDLE_INFO_WITH_APPLICATION. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform * @atomicservice @@ -424,7 +424,7 @@ declare namespace bundleManager { * Used to query the enumeration value of applicationInfo. Multiple values can be passed in the form. * Multiple value input, such as GET_APPLICATION_INFO_DEFAULT | GET_APPLICATION_INFO_WITH_PERMISSION. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} @@ -481,7 +481,7 @@ declare namespace bundleManager { /** * Used to query the enumeration value of abilityInfo. Multiple values can be passed in the form. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since 20 @@ -630,7 +630,7 @@ declare namespace bundleManager { /** * Used to query the enumeration value of ExtensionAbilityInfo. Multiple values can be passed in the form. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} @@ -695,7 +695,7 @@ declare namespace bundleManager { /** * This enumeration value is used to identify various types of extension ability * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} @@ -1009,7 +1009,7 @@ declare namespace bundleManager { /** * PermissionGrantState * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform * @atomicservice @@ -1084,7 +1084,7 @@ declare namespace bundleManager { /** * Support window mode * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform * @atomicservice @@ -1181,7 +1181,7 @@ declare namespace bundleManager { /** * Launch type * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform * @atomicservice @@ -1317,7 +1317,7 @@ declare namespace bundleManager { /** * Display orientation * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform * @atomicservice @@ -1676,7 +1676,7 @@ declare namespace bundleManager { /** * Indicates module type * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform * @atomicservice @@ -1765,7 +1765,7 @@ declare namespace bundleManager { /** * Indicates bundle type * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} @@ -1812,7 +1812,7 @@ declare namespace bundleManager { /** * Shared bundle compatible policy * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} @@ -1839,7 +1839,7 @@ declare namespace bundleManager { /** * This enumeration value is used to identify various types of JSON profile. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} @@ -1860,7 +1860,7 @@ declare namespace bundleManager { /** * This enumeration value is used to identify the distribution type of application. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} @@ -1943,7 +1943,7 @@ declare namespace bundleManager { /** * This enumeration value is used to identify various types of extension ability * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 @@ -1978,7 +1978,7 @@ declare namespace bundleManager { /** * This enumeration value is used to identify various flags of application * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} @@ -2045,7 +2045,7 @@ declare namespace bundleManager { /** * Obtains own bundleInfo. * - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. * @returns { Promise } The result of getting the bundle info. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @syscap SystemCapability.BundleManager.BundleFramework.Core @@ -2054,7 +2054,7 @@ declare namespace bundleManager { * @since 20 * @arkts 1.1&1.2 */ - function getBundleInfoForSelf(bundleFlags: number): Promise; + function getBundleInfoForSelf(bundleFlags: int): Promise; /** * Obtains own bundleInfo. @@ -2078,7 +2078,7 @@ declare namespace bundleManager { /** * Obtains own bundleInfo. * - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. * @param { AsyncCallback } callback - The callback of getting bundle info result. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @syscap SystemCapability.BundleManager.BundleFramework.Core @@ -2087,7 +2087,7 @@ declare namespace bundleManager { * @since 20 * @arkts 1.1&1.2 */ - function getBundleInfoForSelf(bundleFlags: number, callback: AsyncCallback): void; + function getBundleInfoForSelf(bundleFlags: int, callback: AsyncCallback): void; /** * Obtains own bundleInfo. @@ -2111,7 +2111,7 @@ declare namespace bundleManager { /** * Obtains own bundleInfo. * - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. * @returns { BundleInfo } The result of getting the bundle info. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @syscap SystemCapability.BundleManager.BundleFramework.Core @@ -2120,14 +2120,14 @@ declare namespace bundleManager { * @since 20 * @arkts 1.1&1.2 */ - function getBundleInfoForSelfSync(bundleFlags: number): BundleInfo; + function getBundleInfoForSelfSync(bundleFlags: int): BundleInfo; /** * Obtains bundleInfo based on bundleName, bundleFlags. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. * @param { AsyncCallback } callback - The callback of getting bundle info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -2137,15 +2137,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleInfo(bundleName: string, bundleFlags: number, callback: AsyncCallback): void; + function getBundleInfo(bundleName: string, bundleFlags: int, callback: AsyncCallback): void; /** * Obtains bundleInfo based on bundleName, bundleFlags and userId. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @param { AsyncCallback } callback - The callback of getting bundle info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -2157,15 +2157,15 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function getBundleInfo(bundleName: string, - bundleFlags: number, userId: number, callback: AsyncCallback): void; + bundleFlags: int, userId: int, callback: AsyncCallback): void; /** * Obtains bundleInfo based on bundleName, bundleFlags and userId. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @returns { Promise } The result of getting the bundle info. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -2176,14 +2176,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleInfo(bundleName: string, bundleFlags: number, userId?: number): Promise; + function getBundleInfo(bundleName: string, bundleFlags: int, userId?: int): Promise; /** * Obtains application info based on a given bundle name. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. + * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. * @param { AsyncCallback } callback - The callback of getting application info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2195,15 +2195,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getApplicationInfo(bundleName: string, appFlags: number, callback: AsyncCallback): void; + function getApplicationInfo(bundleName: string, appFlags: int, callback: AsyncCallback): void; /** * Obtains application info based on a given bundle name. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @param { AsyncCallback } callback - The callback of getting application info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2217,15 +2217,15 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function getApplicationInfo(bundleName: string, - appFlags: number, userId: number, callback: AsyncCallback): void; + appFlags: int, userId: int, callback: AsyncCallback): void; /** * Obtains application info based on a given bundle name. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @returns { Promise } The result of getting the application info. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2238,13 +2238,13 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getApplicationInfo(bundleName: string, appFlags: number, userId?: number): Promise; + function getApplicationInfo(bundleName: string, appFlags: int, userId?: int): Promise; /** * Obtains BundleInfo of all bundles available in the system. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. * @param { AsyncCallback> } callback - The callback of getting a list of BundleInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2254,14 +2254,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllBundleInfo(bundleFlags: number, callback: AsyncCallback>): void; + function getAllBundleInfo(bundleFlags: int, callback: AsyncCallback>): void; /** * Obtains BundleInfo of all bundles available in the system. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. - * @param { number } userId - Indicates the user id. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. + * @param { int } userId - Indicates the user id. * @param { AsyncCallback> } callback - The callback of getting a list of BundleInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2272,14 +2272,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllBundleInfo(bundleFlags: number, userId: number, callback: AsyncCallback>): void; + function getAllBundleInfo(bundleFlags: int, userId: int, callback: AsyncCallback>): void; /** * Obtains BundleInfo of all bundles available in the system. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. - * @param { number } userId - Indicates the user id. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. + * @param { int } userId - Indicates the user id. * @returns { Promise> } Returns a list of BundleInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2290,13 +2290,13 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllBundleInfo(bundleFlags: number, userId?: number): Promise>; + function getAllBundleInfo(bundleFlags: int, userId?: int): Promise>; /** * Obtains information about all installed applications of a specified user. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST - * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. + * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. * @param { AsyncCallback> } callback - The callback of getting a list of ApplicationInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2306,14 +2306,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllApplicationInfo(appFlags: number, callback: AsyncCallback>): void; + function getAllApplicationInfo(appFlags: int, callback: AsyncCallback>): void; /** * Obtains information about all installed applications of a specified user. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST - * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @param { AsyncCallback> } callback - The callback of getting a list of ApplicationInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2324,15 +2324,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllApplicationInfo(appFlags: number, - userId: number, callback: AsyncCallback>): void; + function getAllApplicationInfo(appFlags: int, + userId: int, callback: AsyncCallback>): void; /** * Obtains information about all installed applications of a specified user. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST - * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @returns { Promise> } Returns a list of ApplicationInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2343,14 +2343,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllApplicationInfo(appFlags: number, userId?: number): Promise>; + function getAllApplicationInfo(appFlags: int, userId?: int): Promise>; /** * Query the AbilityInfo by the given Want. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. - * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. + * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. * @param { AsyncCallback> } callback - The callback of querying ability info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2365,15 +2365,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function queryAbilityInfo(want: Want, abilityFlags: number, callback: AsyncCallback>): void; + function queryAbilityInfo(want: Want, abilityFlags: int, callback: AsyncCallback>): void; /** * Query the AbilityInfo by the given Want. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. - * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. - * @param { number } userId - userId Indicates the user ID. + * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. + * @param { int } userId - userId Indicates the user ID. * @param { AsyncCallback> } callback - The callback of querying ability info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2390,15 +2390,15 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function queryAbilityInfo(want: Want, - abilityFlags: number, userId: number, callback: AsyncCallback>): void; + abilityFlags: int, userId: int, callback: AsyncCallback>): void; /** * Query the AbilityInfo by the given Want. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. - * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. - * @param { number } userId - userId Indicates the user ID. + * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. + * @param { int } userId - userId Indicates the user ID. * @returns { Promise> } Returns a list of AbilityInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2414,15 +2414,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function queryAbilityInfo(want: Want, abilityFlags: number, userId?: number): Promise>; + function queryAbilityInfo(want: Want, abilityFlags: int, userId?: int): Promise>; /** * Query the AbilityInfo by the given Want Array. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Array } wants - Indicates the Want Array containing the application bundle name to be queried. - * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. - * @param { number } [userId] - userId Indicates the user ID. + * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. + * @param { int } [userId] - userId Indicates the user ID. * @returns { Promise> } Returns a list of AbilityInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2438,15 +2438,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function queryAbilityInfo(wants: Array, abilityFlags: number, userId?: number): Promise>; + function queryAbilityInfo(wants: Array, abilityFlags: int, userId?: int): Promise>; /** * Query the AbilityInfo by the given Want. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. - * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. - * @param { number } userId - userId Indicates the user ID. + * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. + * @param { int } userId - userId Indicates the user ID. * @returns { Array } Returns a list of AbilityInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2462,7 +2462,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function queryAbilityInfoSync(want: Want, abilityFlags: number, userId?: number): Array; + function queryAbilityInfoSync(want: Want, abilityFlags: int, userId?: int): Array; /** * Get AbilityInfo by the given uri. @@ -2485,7 +2485,7 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. * @param { ExtensionAbilityType } extensionAbilityType - Indicates ExtensionAbilityType. - * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the * ExtensionAbilityInfo objects that will be returned. * @param { AsyncCallback> } callback - The callback of querying extension ability info result. * @throws { BusinessError } 201 - Permission denied. @@ -2501,7 +2501,7 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function queryExtensionAbilityInfo(want: Want, extensionAbilityType: ExtensionAbilityType, - extensionAbilityFlags: number, callback: AsyncCallback>): void; + extensionAbilityFlags: int, callback: AsyncCallback>): void; /** * Query extension info of by utilizing a Want. @@ -2509,9 +2509,9 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. * @param { ExtensionAbilityType } extensionAbilityType - Indicates ExtensionAbilityType. - * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the * ExtensionAbilityInfo objects that will be returned. - * @param { number } userId - Indicates the user ID. + * @param { int } userId - Indicates the user ID. * @param { AsyncCallback> } callback - The callback of querying extension ability info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2527,7 +2527,7 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function queryExtensionAbilityInfo(want: Want, extensionAbilityType: ExtensionAbilityType, - extensionAbilityFlags: number, userId: number, callback: AsyncCallback>): void; + extensionAbilityFlags: int, userId: int, callback: AsyncCallback>): void; /** * Query the ExtensionAbilityInfo by the given Want. @@ -2535,9 +2535,9 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. * @param { ExtensionAbilityType } extensionAbilityType - Indicates ExtensionAbilityType. - * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the * ExtensionAbilityInfo objects that will be returned. - * @param { number } userId - Indicates the user ID. + * @param { int } userId - Indicates the user ID. * @returns { Promise> } Returns a list of ExtensionAbilityInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2553,7 +2553,7 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function queryExtensionAbilityInfo(want: Want, extensionAbilityType: ExtensionAbilityType, - extensionAbilityFlags: number, userId?: number): Promise>; + extensionAbilityFlags: int, userId?: int): Promise>; /** * Query the ExtensionAbilityInfo by the given Want. @@ -2561,9 +2561,9 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. * @param { ExtensionAbilityType } extensionAbilityType - Indicates ExtensionAbilityType. - * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the * ExtensionAbilityInfo objects that will be returned. - * @param { number } userId - Indicates the user ID. + * @param { int } userId - Indicates the user ID. * @returns { Array } Returns a list of ExtensionAbilityInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2579,7 +2579,7 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function queryExtensionAbilityInfoSync(want: Want, extensionAbilityType: ExtensionAbilityType, - extensionAbilityFlags: number, userId?: number): Array; + extensionAbilityFlags: int, userId?: int): Array; /** * Query the ExtensionAbilityInfo by the given Want. @@ -2587,9 +2587,9 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. * @param { string } extensionAbilityType - Indicates extensionAbilityType. - * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the * ExtensionAbilityInfo objects that will be returned. - * @param { number } userId - Indicates the user ID. + * @param { int } userId - Indicates the user ID. * @returns { Array } Returns a list of ExtensionAbilityInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2605,16 +2605,16 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function queryExtensionAbilityInfoSync(want: Want, extensionAbilityType: string, - extensionAbilityFlags: number, userId?: number): Array; + extensionAbilityFlags: int, userId?: int): Array; /** * Query the ExtensionAbilityInfo by extension ability type. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } extensionAbilityType - Indicates ExtensionAbilityType. - * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the * ExtensionAbilityInfo objects that will be returned. - * @param { number } userId - Indicates the user ID. + * @param { int } userId - Indicates the user ID. * @returns { Array } Returns a list of ExtensionAbilityInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2627,14 +2627,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - function queryExtensionAbilityInfoSync(extensionAbilityType: string, extensionAbilityFlags: number, - userId?: number): Array; + function queryExtensionAbilityInfoSync(extensionAbilityType: string, extensionAbilityFlags: int, + userId?: int): Array; /** * Obtains bundle name by the given uid. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { number } uid - Indicates the UID of an application. + * @param { int } uid - Indicates the UID of an application. * @param { AsyncCallback } callback - The callback of getting bundle name. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -2643,13 +2643,13 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleNameByUid(uid: number, callback: AsyncCallback): void; + function getBundleNameByUid(uid: int, callback: AsyncCallback): void; /** * Obtains bundle name by the given uid. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { number } uid - Indicates the UID of an application. + * @param { int } uid - Indicates the UID of an application. * @returns { Promise } Returns the bundle name. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -2658,13 +2658,13 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleNameByUid(uid: number): Promise; + function getBundleNameByUid(uid: int): Promise; /** * Obtains bundle name by the given uid. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { number } uid - Indicates the UID of an application. + * @param { int } uid - Indicates the UID of an application. * @returns { string } Returns the bundle name. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -2673,7 +2673,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleNameByUidSync(uid: number): string; + function getBundleNameByUidSync(uid: int): string; /** * Obtains information about an application bundle contained in an ohos Ability Package (HAP). @@ -2681,7 +2681,7 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } hapFilePath - Indicates the path storing the HAP. * The path should be the relative path to the data directory of the current application. - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. * @param { AsyncCallback } callback - The callback of getting bundle archive info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2692,7 +2692,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleArchiveInfo(hapFilePath: string, bundleFlags: number, callback: AsyncCallback): void; + function getBundleArchiveInfo(hapFilePath: string, bundleFlags: int, callback: AsyncCallback): void; /** * Obtains information about an application bundle contained in an ohos Ability Package (HAP). @@ -2700,7 +2700,7 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } hapFilePath - Indicates the path storing the HAP. * The path should be the relative path to the data directory of the current application. - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. * @returns { Promise } Returns the BundleInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2711,7 +2711,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleArchiveInfo(hapFilePath: string, bundleFlags: number): Promise; + function getBundleArchiveInfo(hapFilePath: string, bundleFlags: int): Promise; /** * Obtains information about an application bundle contained in an ohos Ability Package (HAP). @@ -2719,7 +2719,7 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } hapFilePath - Indicates the path storing the HAP. * The path should be the relative path to the data directory of the current application. - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. * @returns { BundleInfo } Returns the BundleInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2730,7 +2730,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleArchiveInfoSync(hapFilePath: string, bundleFlags: number): BundleInfo; + function getBundleArchiveInfoSync(hapFilePath: string, bundleFlags: int): BundleInfo; /** * Clears cache data of a specified application. @@ -2773,7 +2773,7 @@ declare namespace bundleManager { * * @permission ohos.permission.REMOVE_CACHE_FILES * @param { string } bundleName - Indicates the bundle name of the application whose cache data is to be cleaned. - * @param { number } appIndex - Indicates the index of clone app. + * @param { int } appIndex - Indicates the index of clone app. * @returns { Promise } Clean bundle cache files result * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2786,13 +2786,13 @@ declare namespace bundleManager { * @since arkts {'1.1':'15', '1.2':'20'} * @arkts 1.1&1.2 */ - function cleanBundleCacheFiles(bundleName: string, appIndex: number): Promise; + function cleanBundleCacheFiles(bundleName: string, appIndex: int): Promise; /** * Get the all bundle cache size of the current user. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @returns { Promise } Returns all bundle cache size. + * @returns { Promise } Returns all bundle cache size. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @syscap SystemCapability.BundleManager.BundleFramework.Core @@ -2800,7 +2800,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'15', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllBundleCacheSize(): Promise; + function getAllBundleCacheSize(): Promise; /** * Clean all bundle cache files of the current user, does not include the currently running program. @@ -2821,7 +2821,7 @@ declare namespace bundleManager { * * @permission ohos.permission.CHANGE_ABILITY_ENABLED_STATE * @param { string } bundleName - Indicates the bundle name of the application. - * @param { number } appIndex - Indicates the index of clone app. + * @param { int } appIndex - Indicates the index of clone app. * @param { boolean } isEnabled - The value true means to enable it, and the value false means to disable it. * @returns { Promise } set app enabled result. * @throws { BusinessError } 201 - Permission denied. @@ -2834,7 +2834,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function setApplicationEnabled(bundleName: string, appIndex: number, isEnabled: boolean): Promise; + function setApplicationEnabled(bundleName: string, appIndex: int, isEnabled: boolean): Promise; /** * Sets whether to enable a specified application. @@ -2894,7 +2894,7 @@ declare namespace bundleManager { * * @permission ohos.permission.CHANGE_ABILITY_ENABLED_STATE * @param { AbilityInfo } info - Indicates information about the ability to set. - * @param { number } appIndex - Indicates the index of clone app. + * @param { int } appIndex - Indicates the index of clone app. * @param { boolean } isEnabled - The value true means to enable it, and the value false means to disable it. * @returns { Promise } set ability enabled result. * @throws { BusinessError } 201 - Permission denied. @@ -2908,7 +2908,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function setAbilityEnabled(info: AbilityInfo, appIndex: number, isEnabled: boolean): Promise; + function setAbilityEnabled(info: AbilityInfo, appIndex: int, isEnabled: boolean): Promise; /** * Sets whether to enable a specified ability. @@ -2970,7 +2970,7 @@ declare namespace bundleManager { * Checks whether a specified application is enabled. * * @param { string } bundleName - Indicates the bundle name of the application. - * @param { number } appIndex - Indicates the index of clone app. + * @param { int } appIndex - Indicates the index of clone app. * @returns { Promise } Returns true if the application is enabled; returns false otherwise. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -2981,7 +2981,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function isApplicationEnabled(bundleName: string, appIndex: number): Promise; + function isApplicationEnabled(bundleName: string, appIndex: int): Promise; /** * Checks whether a specified application is enabled. @@ -3032,7 +3032,7 @@ declare namespace bundleManager { * Checks whether a specified ability is enabled. * * @param { AbilityInfo } info - Indicates information about the ability to check. - * @param { number } appIndex - Indicates the index of clone app. + * @param { int } appIndex - Indicates the index of clone app. * @returns { Promise } Returns true if the ability is enabled; returns false otherwise. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -3044,7 +3044,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function isAbilityEnabled(info: AbilityInfo, appIndex: number): Promise; + function isAbilityEnabled(info: AbilityInfo, appIndex: int): Promise; /** * Checks whether a specified ability is enabled. @@ -3101,7 +3101,7 @@ declare namespace bundleManager { * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the bundle name of the application. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @param { AsyncCallback } callback - The callback for starting the application's main ability. * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.GET_BUNDLE_INFO_PRIVILEGED'. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3114,7 +3114,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getLaunchWantForBundle(bundleName: string, userId: number, callback: AsyncCallback): void; + function getLaunchWantForBundle(bundleName: string, userId: int, callback: AsyncCallback): void; /** * Obtains the Want for starting the main ability of an application based on the @@ -3143,7 +3143,7 @@ declare namespace bundleManager { * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the bundle name of the application. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @returns { Promise } the Want for starting the application's main ability. * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.GET_BUNDLE_INFO_PRIVILEGED'. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3156,7 +3156,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getLaunchWantForBundle(bundleName: string, userId?: number): Promise; + function getLaunchWantForBundle(bundleName: string, userId?: int): Promise; /** * Obtains the Want for starting the main ability of an application based on the @@ -3165,7 +3165,7 @@ declare namespace bundleManager { * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the bundle name of the application. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @returns { Want } the Want for starting the application's main ability. * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.GET_BUNDLE_INFO_PRIVILEGED'. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3178,7 +3178,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function getLaunchWantForBundleSync(bundleName: string, userId?: number): Want; + function getLaunchWantForBundleSync(bundleName: string, userId?: int): Want; /** * Obtains the Want for starting the main ability of own application. @@ -3520,8 +3520,8 @@ declare namespace bundleManager { * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } applicationFlags - Indicates the flag used to specify information contained in the ApplicationInfo object that will be returned. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } applicationFlags - Indicates the flag used to specify information contained in the ApplicationInfo object that will be returned. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @returns { ApplicationInfo } - Returns the ApplicationInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3534,14 +3534,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getApplicationInfoSync(bundleName: string, applicationFlags: number, userId: number): ApplicationInfo; + function getApplicationInfoSync(bundleName: string, applicationFlags: int, userId: int): ApplicationInfo; /** * Obtains applicationInfo based on a given bundleName and bundleFlags. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } applicationFlags - Indicates the flag used to specify information contained in the ApplicationInfo object that will be returned. + * @param { int } applicationFlags - Indicates the flag used to specify information contained in the ApplicationInfo object that will be returned. * @returns { ApplicationInfo } - Returns the ApplicationInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3553,15 +3553,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getApplicationInfoSync(bundleName: string, applicationFlags: number): ApplicationInfo; + function getApplicationInfoSync(bundleName: string, applicationFlags: int): ApplicationInfo; /** * Obtains bundleInfo based on bundleName, bundleFlags and userId. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object that will be returned. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object that will be returned. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @returns { BundleInfo } - Returns the BundleInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -3572,14 +3572,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleInfoSync(bundleName: string, bundleFlags: number, userId: number): BundleInfo; + function getBundleInfoSync(bundleName: string, bundleFlags: int, userId: int): BundleInfo; /** * Obtains bundleInfo based on bundleName, bundleFlags. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object that will be returned. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object that will be returned. * @returns { BundleInfo } - Returns the BundleInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -3589,7 +3589,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleInfoSync(bundleName: string, bundleFlags: number): BundleInfo; + function getBundleInfoSync(bundleName: string, bundleFlags: int): BundleInfo; /** * Obtains SharedBundleInfo of all shared bundle available in the system. @@ -3680,7 +3680,7 @@ declare namespace bundleManager { * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the bundle name of the application to which the ability belongs. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @param { AsyncCallback } callback - Indicates the callback of getting AppProvisionInfo result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3693,14 +3693,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAppProvisionInfo(bundleName: string, userId: number, callback: AsyncCallback): void; + function getAppProvisionInfo(bundleName: string, userId: int, callback: AsyncCallback): void; /** * Obtains the profile file information of a specified bundle. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the bundle name of the application to which the ability belongs. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @returns { Promise } Returns the AppProvisionInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3713,14 +3713,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAppProvisionInfo(bundleName: string, userId?: number): Promise; + function getAppProvisionInfo(bundleName: string, userId?: int): Promise; /** * Obtains the profile file information of a specified bundle. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the bundle name of the application to which the ability belongs. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @returns { AppProvisionInfo } Returns the AppProvisionInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3733,7 +3733,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAppProvisionInfoSync(bundleName: string, userId?: number): AppProvisionInfo; + function getAppProvisionInfoSync(bundleName: string, userId?: int): AppProvisionInfo; /** * Obtains the distribution type specified during bundle installation. @@ -3796,7 +3796,7 @@ declare namespace bundleManager { * @param { ProfileType } profileType - Indicates the type of profile to be obtained. * @param { string } bundleName - Indicates the name of the bundle to which the profile belongs. * @param { string } moduleName - Indicates the name of the module to which the profile belongs. - * @param { number } userId - Indicates the user ID or do not pass user ID. + * @param { int } userId - Indicates the user ID or do not pass user ID. * @returns { string } Returns string in json-format of the designated profile. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3811,7 +3811,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getJsonProfile(profileType: ProfileType, bundleName: string, moduleName?: string, userId?: number): string; + function getJsonProfile(profileType: ProfileType, bundleName: string, moduleName?: string, userId?: int): string; /** * Get extend resources. @@ -4179,7 +4179,7 @@ declare namespace bundleManager { * Get a list of developedId by distribution type. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { number } appDistributionType - Indicates the distribution type of the application, and if not passed in, it gets all the developerId. + * @param { int } appDistributionType - Indicates the distribution type of the application, and if not passed in, it gets all the developerId. * @returns { Array } Returns a list of developerId. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -4189,7 +4189,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getDeveloperIds(appDistributionType?: number): Array; + function getDeveloperIds(appDistributionType?: int): Array; /** * Switch uninstall state of a specified application. @@ -4213,7 +4213,7 @@ declare namespace bundleManager { * Get the SignatureInfo of the application through UID. * * @permission ohos.permission.GET_SIGNATURE_INFO - * @param { number } uid - Indicates the UID of an application. + * @param { int } uid - Indicates the UID of an application. * @returns { SignatureInfo } The result of getting the signature info. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 17700021 - The uid is not found. @@ -4221,16 +4221,16 @@ declare namespace bundleManager { * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - function getSignatureInfo(uid: number): SignatureInfo; + function getSignatureInfo(uid: int): SignatureInfo; /** * Get the BundleInfo of the specified MultiIsolation App. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } appIndex - Indicates the index of clone app. - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. - * @param { number } [userId] - Indicates the user ID, If the user id is not specified, the current user id is used by default. + * @param { int } appIndex - Indicates the index of clone app. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { int } [userId] - Indicates the user ID, If the user id is not specified, the current user id is used by default. * @returns { Promise } Returns A BundleInfo Of MultiApp Mode. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -4244,15 +4244,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAppCloneBundleInfo(bundleName: string, appIndex: number, bundleFlags: number, userId?: number): Promise; + function getAppCloneBundleInfo(bundleName: string, appIndex: int, bundleFlags: int, userId?: int): Promise; /** * Get all BundleInfo of clone app. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. - * @param { number } [userId] - Indicates the user ID, If the user id is not specified, the current user id is used by default. + * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { int } [userId] - Indicates the user ID, If the user id is not specified, the current user id is used by default. * @returns { Promise> } Returns BundleInfo Arrays Of MultiApp Mode. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -4265,13 +4265,13 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllAppCloneBundleInfo(bundleName: string, bundleFlags: number, userId?: number): Promise>; + function getAllAppCloneBundleInfo(bundleName: string, bundleFlags: int, userId?: int): Promise>; /** * Obtains AppCloneIdentity contains bundleName and appIndex by the given uid. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { number } uid - Indicates the UID of an application. + * @param { int } uid - Indicates the UID of an application. * @returns { Promise } Returns the clone Identity contains bundleName and appIndex. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -4280,14 +4280,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAppCloneIdentity(uid: number): Promise; + function getAppCloneIdentity(uid: int): Promise; /** * Get all plugin info of host application. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } hostBundleName - Indicates the host application bundle name to be queried. - * @param { number } [userId] - Indicates the user ID or do not pass user ID. + * @param { int } [userId] - Indicates the user ID or do not pass user ID. * @returns { Promise> } Returns PluginBundleInfo Arrays. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -4298,7 +4298,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'19', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllPluginInfo(hostBundleName: string, userId?: number): Promise>; + function getAllPluginInfo(hostBundleName: string, userId?: int): Promise>; /** * Migrate files from the source paths to the destination path. diff --git a/api/@ohos.bundle.bundleMonitor.d.ts b/api/@ohos.bundle.bundleMonitor.d.ts index a9f1ed5e4f..af4c9cbd26 100644 --- a/api/@ohos.bundle.bundleMonitor.d.ts +++ b/api/@ohos.bundle.bundleMonitor.d.ts @@ -54,25 +54,25 @@ declare namespace bundleMonitor { /** * The user id * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly userId: number; + readonly userId: int; /** * The app index of clone app * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: number; + readonly appIndex: int; } /** diff --git a/api/@ohos.bundle.bundleResourceManager.d.ts b/api/@ohos.bundle.bundleResourceManager.d.ts index 20cbf30fd3..396e138386 100644 --- a/api/@ohos.bundle.bundleResourceManager.d.ts +++ b/api/@ohos.bundle.bundleResourceManager.d.ts @@ -43,7 +43,7 @@ declare namespace bundleResourceManager { * Used to query the enumeration value of resource info. Multiple values can be passed in the form. * Multiple value input, such as GET_RESOURCE_INFO_WITH_LABEL | GET_RESOURCE_INFO_WITH_ICON. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} @@ -117,7 +117,7 @@ declare namespace bundleResourceManager { * * @permission ohos.permission.GET_BUNDLE_RESOURCES * @param { string } bundleName - Indicates the bundle name of the application. - * @param { number } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo object that will be returned. + * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo object that will be returned. * @returns { BundleResourceInfo } Returns the BundleResourceInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -128,15 +128,15 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleResourceInfo(bundleName: string, resourceFlags?: number): BundleResourceInfo; + function getBundleResourceInfo(bundleName: string, resourceFlags?: int): BundleResourceInfo; /** * Obtains the BundleResourceInfo of a specified bundle. Default resourceFlag is GET_RESOURCE_INFO_ALL. * * @permission ohos.permission.GET_BUNDLE_RESOURCES * @param { string } bundleName - Indicates the bundle name of the application. - * @param { number } [resourceFlags] {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo object that will be returned. - * @param { number } [appIndex] - Indicates the index of the bundle,The default value is 0. + * @param { int } [resourceFlags] {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo object that will be returned. + * @param { int } [appIndex] - Indicates the index of the bundle,The default value is 0. * @returns { BundleResourceInfo } Returns the BundleResourceInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -148,14 +148,14 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleResourceInfo(bundleName: string, resourceFlags?: number, appIndex?: number): BundleResourceInfo; + function getBundleResourceInfo(bundleName: string, resourceFlags?: int, appIndex?: int): BundleResourceInfo; /** * Obtains the LauncherAbilityResourceInfo of a specified bundle. Default resourceFlag is GET_RESOURCE_INFO_ALL. * * @permission ohos.permission.GET_BUNDLE_RESOURCES * @param { string } bundleName - Indicates the bundle name of the application. - * @param { number } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo object that will be returned. + * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo object that will be returned. * @returns { Array } Returns a list of LauncherAbilityResourceInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -166,16 +166,16 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: number): Array; + function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: int): Array; /** * Obtains the LauncherAbilityResourceInfo of a specified bundle. Default resourceFlag is GET_RESOURCE_INFO_ALL. * * @permission ohos.permission.GET_BUNDLE_RESOURCES * @param { string } bundleName - Indicates the bundle name of the application. - * @param { number } [resourceFlags] {@link ResourceFlag} - Indicates the flag used to specify information + * @param { int } [resourceFlags] {@link ResourceFlag} - Indicates the flag used to specify information *
    contained in the LauncherAbilityResourceInfo object that will be returned. - * @param { number } [appIndex] - Indicates the index of the bundle,The default value is 0. + * @param { int } [appIndex] - Indicates the index of the bundle,The default value is 0. * @returns { Array } Returns a list of LauncherAbilityResourceInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -187,13 +187,13 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: number, appIndex?: number): Array; + function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: int, appIndex?: int): Array; /** * Obtains BundleResourceInfo of all bundles available in the system. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST and ohos.permission.GET_BUNDLE_RESOURCES - * @param { number } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo that will be returned. + * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo that will be returned. * @param { AsyncCallback> } callback - The callback of getting a list of BundleResourceInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -203,13 +203,13 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllBundleResourceInfo(resourceFlags: number, callback: AsyncCallback>): void; + function getAllBundleResourceInfo(resourceFlags: int, callback: AsyncCallback>): void; /** * Obtains BundleResourceInfo of all bundles available in the system. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST and ohos.permission.GET_BUNDLE_RESOURCES - * @param { number } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo that will be returned. + * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo that will be returned. * @returns { Promise> } Returns a list of BundleResourceInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -219,13 +219,13 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllBundleResourceInfo(resourceFlags: number): Promise>; + function getAllBundleResourceInfo(resourceFlags: int): Promise>; /** * Obtains LauncherAbilityResourceInfo of all launcher abilities available in the system. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST and ohos.permission.GET_BUNDLE_RESOURCES - * @param { number } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo that will be returned. + * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo that will be returned. * @param { AsyncCallback> } callback - The callback of getting a list of LauncherAbilityResourceInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -235,13 +235,13 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllLauncherAbilityResourceInfo(resourceFlags: number, callback: AsyncCallback>): void; + function getAllLauncherAbilityResourceInfo(resourceFlags: int, callback: AsyncCallback>): void; /** * Obtains LauncherAbilityResourceInfo of all launcher abilities available in the system. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST and ohos.permission.GET_BUNDLE_RESOURCES - * @param { number } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo that will be returned. + * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo that will be returned. * @returns { Promise> } Returns a list of LauncherAbilityResourceInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -251,7 +251,7 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllLauncherAbilityResourceInfo(resourceFlags: number): Promise>; + function getAllLauncherAbilityResourceInfo(resourceFlags: int): Promise>; /** * Obtains the abilityResourceInfo of a specified bundle. diff --git a/api/@ohos.bundle.defaultAppManager.d.ts b/api/@ohos.bundle.defaultAppManager.d.ts index 358a1d920b..c402034e9b 100644 --- a/api/@ohos.bundle.defaultAppManager.d.ts +++ b/api/@ohos.bundle.defaultAppManager.d.ts @@ -34,7 +34,7 @@ declare namespace defaultAppManager { /** * The constant for application type. * - * @enum { number } + * @enum { string } * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 @@ -158,7 +158,7 @@ declare namespace defaultAppManager { * * @permission ohos.permission.GET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @param { AsyncCallback } callback - The callback of the BundleInfo object result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -172,7 +172,7 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getDefaultApplication(type: string, userId: number, callback: AsyncCallback): void; + function getDefaultApplication(type: string, userId: int, callback: AsyncCallback): void; /** * Get default application based on type. @@ -198,7 +198,7 @@ declare namespace defaultAppManager { * * @permission ohos.permission.GET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @returns { Promise } Return the BundleInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -212,14 +212,14 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getDefaultApplication(type: string, userId?: number): Promise; + function getDefaultApplication(type: string, userId?: int): Promise; /** * Get default application based on type. * * @permission ohos.permission.GET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @returns { BundleInfo } Return the BundleInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -233,7 +233,7 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function getDefaultApplicationSync(type: string, userId?: number): BundleInfo; + function getDefaultApplicationSync(type: string, userId?: int): BundleInfo; /** * Set default application based on type. @@ -241,7 +241,7 @@ declare namespace defaultAppManager { * @permission ohos.permission.SET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. * @param { ElementName } elementName - Uniquely identifies an ability or extensionAbility. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @param { AsyncCallback } callback - The callback of setting default application result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -256,7 +256,7 @@ declare namespace defaultAppManager { * @arkts 1.1&1.2 */ function setDefaultApplication(type: string, - elementName: ElementName, userId: number, callback: AsyncCallback): void; + elementName: ElementName, userId: int, callback: AsyncCallback): void; /** * Set default application based on type. @@ -284,7 +284,7 @@ declare namespace defaultAppManager { * @permission ohos.permission.SET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. * @param { ElementName } elementName - Uniquely identifies an ability or extensionAbility. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @returns { Promise } The result of setting default application. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -298,7 +298,7 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function setDefaultApplication(type: string, elementName: ElementName, userId?: number): Promise; + function setDefaultApplication(type: string, elementName: ElementName, userId?: int): Promise; /** * Set default application based on type. @@ -306,7 +306,7 @@ declare namespace defaultAppManager { * @permission ohos.permission.SET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. * @param { ElementName } elementName - Uniquely identifies an ability or extensionAbility. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -319,14 +319,14 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function setDefaultApplicationSync(type: string, elementName: ElementName, userId?: number): void; + function setDefaultApplicationSync(type: string, elementName: ElementName, userId?: int): void; /** * Reset default application based on type. * * @permission ohos.permission.SET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @param { AsyncCallback } callback - The callback of resetting default application result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -339,7 +339,7 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function resetDefaultApplication(type: string, userId: number, callback: AsyncCallback): void; + function resetDefaultApplication(type: string, userId: int, callback: AsyncCallback): void; /** * Reset default application based on type. @@ -364,7 +364,7 @@ declare namespace defaultAppManager { * * @permission ohos.permission.SET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @returns { Promise } The result of resetting default application. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -377,14 +377,14 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function resetDefaultApplication(type: string, userId?: number): Promise; + function resetDefaultApplication(type: string, userId?: int): Promise; /** * Reset default application based on type. * * @permission ohos.permission.SET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -396,7 +396,7 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function resetDefaultApplicationSync(type: string, userId?: number): void; + function resetDefaultApplicationSync(type: string, userId?: int): void; } export default defaultAppManager; diff --git a/api/@ohos.bundle.freeInstall.d.ts b/api/@ohos.bundle.freeInstall.d.ts index a156bc3015..bf7aeb1813 100644 --- a/api/@ohos.bundle.freeInstall.d.ts +++ b/api/@ohos.bundle.freeInstall.d.ts @@ -43,7 +43,7 @@ declare namespace freeInstall { /** * Used to set the enumeration value of upgrading for free installation. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} @@ -83,7 +83,7 @@ declare namespace freeInstall { * Used to query the enumeration value of bundlePackInfo. * Multiple value input, such as GET_PACKAGES | GET_BUNDLE_SUMMARY. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.BundleFramework * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} diff --git a/api/@ohos.bundle.installer.d.ts b/api/@ohos.bundle.installer.d.ts index e3623e7de4..00a4c65ca3 100644 --- a/api/@ohos.bundle.installer.d.ts +++ b/api/@ohos.bundle.installer.d.ts @@ -1673,7 +1673,7 @@ declare namespace installer { * @permission ohos.permission.INSTALL_CLONE_BUNDLE * @param { string } bundleName - Indicates the path where the HAP of the application is stored. * @param { CreateAppCloneParam } [createAppCloneParam] Indicates the optional params of create clone app. - * @returns { Promise } Return the appIndex of the clone application. + * @returns { Promise } Return the appIndex of the clone application. * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.INSTALL_CLONE_BUNDLE'. * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -1686,7 +1686,7 @@ declare namespace installer { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - createAppClone(bundleName: string, createAppCloneParam?: CreateAppCloneParam): Promise; + createAppClone(bundleName: string, createAppCloneParam?: CreateAppCloneParam): Promise; /** * Destroy clone instance for an application. @@ -1734,12 +1734,11 @@ declare namespace installer { * * @permission ohos.permission.UNINSTALL_CLONE_BUNDLE * @param { string } bundleName - Indicates the bundleName of clone app. - * @param { number } appIndex - Indicates the clone application's index. - * @param { number | DestroyAppCloneParam } [options] - Indicates other parameters required for the uninstallation. + * @param { int } appIndex - Indicates the clone application's index. + * @param { int | DestroyAppCloneParam } [options] - Indicates other parameters required for the uninstallation. * @returns { Promise } the promise returned by the function. * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.UNINSTALL_CLONE_BUNDLE'. * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @throws { BusinessError } 17700001 - The specified bundleName cannot be found or the bundle is not installed by the specified user. * @throws { BusinessError } 17700004 - The userId is invalid. * @throws { BusinessError } 17700061 - AppIndex not in valid range. @@ -1749,7 +1748,7 @@ declare namespace installer { * @since 20 * @arkts 1.2 */ - destroyAppClone(bundleName: string, appIndex: number, options?: number | DestroyAppCloneParam): Promise; + destroyAppClone(bundleName: string, appIndex: int, options?: int | DestroyAppCloneParam): Promise; /** * Install application by bundle name with specified user. @@ -1773,7 +1772,7 @@ declare namespace installer { * * @permission ohos.permission.INSTALL_BUNDLE * @param { string } bundleName - Indicates the bundle name of application. - * @param { number } [userId] - userId Indicates the user ID. + * @param { int } [userId] - userId Indicates the user ID. * @returns { Promise } the promise returned by the function. * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.INSTALL_BUNDLE'. * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. @@ -1788,7 +1787,7 @@ declare namespace installer { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - installPreexistingApp(bundleName: string, userId?: number): Promise; + installPreexistingApp(bundleName: string, userId?: int): Promise; /** * Install plugin for host application. @@ -1990,24 +1989,24 @@ declare namespace installer { /** * Indicates the user id * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - userId?: number; + userId?: int; /** * Indicates the installation type. The value 0x00 means normal installation, 0x01 means overwrite installation, and 0x10 means installation-free. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - installFlag?: number; + installFlag?: int; /** * Indicates whether the param has data @@ -2034,13 +2033,13 @@ declare namespace installer { /** * Indicates the deadline of the crowdtesting bundle * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - crowdtestDeadline?: number; + crowdtestDeadline?: long; /** * Indicates the shared bundle dir paths. @@ -2133,13 +2132,13 @@ declare namespace installer { /** * Indicates the shared version code. If default, indicates that all version sharing bundles are uninstalled * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - versionCode?: number; + versionCode?: int; } /** @@ -2155,23 +2154,23 @@ declare namespace installer { /** * Indicates the user id * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - userId?: number; + userId?: int; /** * Indicates the appIndex of MultiApp * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - appIndex?: number; + appIndex?: int; } /** @@ -2187,13 +2186,13 @@ declare namespace installer { /** * Indicates the user id * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'15', '1.2':'20'} * @arkts 1.1&1.2 */ - userId?: number; + userId?: int; /** * Indicates parameters. * @@ -2219,13 +2218,13 @@ declare namespace installer { /** * Indicates the user id. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'19', '1.2':'20'} * @arkts 1.1&1.2 */ - userId?: number; + userId?: int; /** * Indicates parameters. diff --git a/api/@ohos.bundle.launcherBundleManager.d.ts b/api/@ohos.bundle.launcherBundleManager.d.ts index d6d897bb73..09150c126b 100644 --- a/api/@ohos.bundle.launcherBundleManager.d.ts +++ b/api/@ohos.bundle.launcherBundleManager.d.ts @@ -40,7 +40,7 @@ declare namespace launcherBundleManager { * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @param { AsyncCallback> } callback -The callback of the LauncherAbilityInfo object result. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -54,14 +54,14 @@ declare namespace launcherBundleManager { * @arkts 1.1&1.2 */ function getLauncherAbilityInfo(bundleName: string, - userId: number, callback: AsyncCallback>): void; + userId: int, callback: AsyncCallback>): void; /** * Obtains launcher abilities info based on a given bundleName and userId. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @returns { Promise> } the LauncherAbilityInfo object. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -74,14 +74,14 @@ declare namespace launcherBundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getLauncherAbilityInfo(bundleName: string, userId: number): Promise>; + function getLauncherAbilityInfo(bundleName: string, userId: int): Promise>; /** * Obtains launcher abilities info based on a given bundleName and userId. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @returns { Array } the LauncherAbilityInfo object. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 801 - Capability not support. @@ -91,13 +91,13 @@ declare namespace launcherBundleManager { * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - function getLauncherAbilityInfoSync(bundleName: string, userId: number): Array; + function getLauncherAbilityInfoSync(bundleName: string, userId: int): Array; /** * Obtains launcher abilities info based on a given userId. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @param { AsyncCallback> } callback -The callback of the LauncherAbilityInfo object result. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -109,13 +109,13 @@ declare namespace launcherBundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllLauncherAbilityInfo(userId: number, callback: AsyncCallback>): void; + function getAllLauncherAbilityInfo(userId: int, callback: AsyncCallback>): void; /** * Obtains launcher abilities info based on a given userId. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @returns { Promise> } the LauncherAbilityInfo object. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -127,7 +127,7 @@ declare namespace launcherBundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllLauncherAbilityInfo(userId: number): Promise>; + function getAllLauncherAbilityInfo(userId: int): Promise>; /** * Obtains shortcut info based on a given bundleName. @@ -187,9 +187,9 @@ declare namespace launcherBundleManager { /** * Obtains shortcut info based on bundleName and userId. * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { number } userId - Indicates the user ID. + * @param { int } userId - Indicates the user ID. * @returns { Array } the LauncherShortcutInfo object. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -202,7 +202,7 @@ declare namespace launcherBundleManager { * @since arkts {'1.1':'13', '1.2':'20'} * @arkts 1.1&1.2 */ - function getShortcutInfoSync(bundleName: string, userId: number): Array; + function getShortcutInfoSync(bundleName: string, userId: int): Array; /** * Obtains shortcut info based on bundleName and appIndex. diff --git a/api/@ohos.bundle.shortcutManager.d.ts b/api/@ohos.bundle.shortcutManager.d.ts index 2f06794328..bc479a11a8 100644 --- a/api/@ohos.bundle.shortcutManager.d.ts +++ b/api/@ohos.bundle.shortcutManager.d.ts @@ -42,7 +42,7 @@ declare namespace shortcutManager { * * @permission ohos.permission.MANAGE_SHORTCUTS * @param { ShortcutInfo } shortcutInfo - Indicates the shortcut info which contains shortcut want. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @returns { Promise } the promise returned by the function. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -57,14 +57,14 @@ declare namespace shortcutManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function addDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: number): Promise; + function addDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: int): Promise; /** * Delete desktop shortcut info. * * @permission ohos.permission.MANAGE_SHORTCUTS * @param { ShortcutInfo } shortcutInfo - Indicates the shortcut info which contains shortcut want. - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @returns { Promise } the promise returned by the function. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -75,13 +75,13 @@ declare namespace shortcutManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function deleteDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: number): Promise; + function deleteDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: int): Promise; /** * Get all desktop shortcut info. * * @permission ohos.permission.MANAGE_SHORTCUTS - * @param { number } userId - Indicates the id for the user. + * @param { int } userId - Indicates the id for the user. * @returns { Promise> } the LauncherShortcutInfo object. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -92,7 +92,7 @@ declare namespace shortcutManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllDesktopShortcutInfo(userId: number): Promise>; + function getAllDesktopShortcutInfo(userId: int): Promise>; /** * Set a shortcut of current application is visible or invisible. diff --git a/api/@ohos.charger.d.ts b/api/@ohos.charger.d.ts index a02a52cfd5..d49eb4e343 100644 --- a/api/@ohos.charger.d.ts +++ b/api/@ohos.charger.d.ts @@ -30,7 +30,7 @@ declare namespace charger { /** * Indicates the type of the charger plugged-in. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.PowerManager.BatteryManager.Core * @systemapi * @since 10 diff --git a/api/@ohos.curves.d.ts b/api/@ohos.curves.d.ts index 3c0b0007a8..fbe9db48ca 100644 --- a/api/@ohos.curves.d.ts +++ b/api/@ohos.curves.d.ts @@ -42,6 +42,17 @@ * @atomicservice * @since 11 */ +/** + * Contains interpolator functions such as initialization, third-order Bezier curves, and spring curves. + * + * @namespace curves + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ declare namespace curves { /** * enum Curve. @@ -67,7 +78,18 @@ declare namespace curves { * @atomicservice * @since 11 */ - enum Curve { + /** + * enum Curve. + * + * @enum { number } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ + export enum Curve { /** * Linear. Indicates that the animation has the same velocity from start to finish. * @@ -89,6 +111,16 @@ declare namespace curves { * @atomicservice * @since 11 */ + /** + * Linear. Indicates that the animation has the same velocity from start to finish. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ Linear, /** * Ease. Indicates that the animation starts at a low speed, then speeds up, and slows down before the end, @@ -114,6 +146,17 @@ declare namespace curves { * @atomicservice * @since 11 */ + /** + * Ease. Indicates that the animation starts at a low speed, then speeds up, and slows down before the end, + * CubicBezier(0.25, 0.1, 0.25, 1.0). + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ Ease, /** * EaseIn. Indicates that the animation starts at a low speed, Cubic Bezier (0.42, 0.0, 1.0, 1.0). @@ -136,6 +179,16 @@ declare namespace curves { * @atomicservice * @since 11 */ + /** + * EaseIn. Indicates that the animation starts at a low speed, Cubic Bezier (0.42, 0.0, 1.0, 1.0). + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ EaseIn, /** * EaseOut. Indicates that the animation ends at low speed, CubicBezier (0.0, 0.0, 0.58, 1.0). @@ -158,6 +211,16 @@ declare namespace curves { * @atomicservice * @since 11 */ + /** + * EaseOut. Indicates that the animation ends at low speed, CubicBezier (0.0, 0.0, 0.58, 1.0). + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ EaseOut, /** * EaseInOut. Indicates that the animation starts and ends at low speed, CubicBezier (0.42, 0.0, 0.58, 1.0). @@ -180,6 +243,16 @@ declare namespace curves { * @atomicservice * @since 11 */ + /** + * EaseInOut. Indicates that the animation starts and ends at low speed, CubicBezier (0.42, 0.0, 0.58, 1.0). + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ EaseInOut, /** * FastOutSlowIn. Standard curve, cubic-bezier (0.4, 0.0, 0.2, 1.0). @@ -202,6 +275,16 @@ declare namespace curves { * @atomicservice * @since 11 */ + /** + * FastOutSlowIn. Standard curve, cubic-bezier (0.4, 0.0, 0.2, 1.0). + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ FastOutSlowIn, /** * LinearOutSlowIn. Deceleration curve, cubic-bezier (0.0, 0.0, 0.2, 1.0). @@ -224,6 +307,16 @@ declare namespace curves { * @atomicservice * @since 11 */ + /** + * LinearOutSlowIn. Deceleration curve, cubic-bezier (0.0, 0.0, 0.2, 1.0). + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ LinearOutSlowIn, /** * FastOutLinearIn. Acceleration curve, cubic-bezier (0.4, 0.0, 1.0, 1.0). @@ -246,6 +339,16 @@ declare namespace curves { * @atomicservice * @since 11 */ + /** + * FastOutLinearIn. Acceleration curve, cubic-bezier (0.4, 0.0, 1.0, 1.0). + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ FastOutLinearIn, /** * ExtremeDeceleration. Abrupt curve, cubic-bezier (0.0, 0.0, 0.0, 1.0). @@ -268,6 +371,16 @@ declare namespace curves { * @atomicservice * @since 11 */ + /** + * ExtremeDeceleration. Abrupt curve, cubic-bezier (0.0, 0.0, 0.0, 1.0). + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ ExtremeDeceleration, /** * Sharp. Sharp curves, cubic-bezier (0.33, 0.0, 0.67, 1.0). @@ -290,6 +403,16 @@ declare namespace curves { * @atomicservice * @since 11 */ + /** + * Sharp. Sharp curves, cubic-bezier (0.33, 0.0, 0.67, 1.0). + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ Sharp, /** * Rhythm. Rhythmic curve, cubic-bezier (0.7, 0.0, 0.2, 1.0). @@ -312,6 +435,16 @@ declare namespace curves { * @atomicservice * @since 11 */ + /** + * Rhythm. Rhythmic curve, cubic-bezier (0.7, 0.0, 0.2, 1.0). + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ Rhythm, /** * Smooth. Smooth curves, cubic-bezier (0.4, 0.0, 0.4, 1.0). @@ -334,6 +467,16 @@ declare namespace curves { * @atomicservice * @since 11 */ + /** + * Smooth. Smooth curves, cubic-bezier (0.4, 0.0, 0.4, 1.0). + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ Smooth, /** * Friction. Damping curves, CubicBezier (0.2, 0.0, 0.2, 1.0). @@ -356,6 +499,16 @@ declare namespace curves { * @atomicservice * @since 11 */ + /** + * Friction. Damping curves, CubicBezier (0.2, 0.0, 0.2, 1.0). + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ Friction, } @@ -383,7 +536,18 @@ declare namespace curves { * @atomicservice * @since 11 */ - interface ICurve { + /** + * Interface for curve object. + * + * @interface ICurve + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ + export interface ICurve { /** * Get curve value by fraction. * @@ -416,6 +580,19 @@ declare namespace curves { * @atomicservice * @since 11 */ + /** + * Get curve value by fraction. + * + * @param { number } fraction -Indicates the current normalized time parameter. Value range: [0, 1]. + * Note: If the value is less than 0, it will be processed as 0. If the value is greater than 1, 1 is used. + * @returns { number } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ interpolate(fraction: number): number; } @@ -447,7 +624,7 @@ declare namespace curves { * @atomicservice * @since 11 */ - function initCurve(curve?: Curve): ICurve; + export function initCurve(curve?: Curve): ICurve; /** * Initializes the interpolator curve when called. @@ -496,7 +673,7 @@ declare namespace curves { * @atomicservice * @since 11 */ - function stepsCurve(count: number, end: boolean): ICurve; + export function stepsCurve(count: number, end: boolean): ICurve; /** * Constructs a custom curve when called. @@ -524,7 +701,7 @@ declare namespace curves { * @atomicservice * @since 11 */ - function customCurve(interpolate: (fraction: number) => number): ICurve; + export function customCurve(interpolate: (fraction: number) => number): ICurve; /** * Constructs a step curve when called. @@ -584,7 +761,7 @@ declare namespace curves { * @atomicservice * @since 11 */ - function cubicBezierCurve(x1: number, y1: number, x2: number, y2: number): ICurve; + export function cubicBezierCurve(x1: number, y1: number, x2: number, y2: number): ICurve; /** * Creates a cubic Bezier curve. The curve value must range from 0 to 1. This API is deprecated since API version 9. @@ -659,7 +836,7 @@ declare namespace curves { * @atomicservice * @since 11 */ - function springCurve(velocity: number, mass: number, stiffness: number, damping: number): ICurve; + export function springCurve(velocity: number, mass: number, stiffness: number, damping: number): ICurve; /** * Constructs a spring curve when called. @@ -740,7 +917,7 @@ declare namespace curves { * @atomicservice * @since 11 */ - function springMotion(response?: number, dampingFraction?: number, overlapDuration?: number): ICurve; + export function springMotion(response?: number, dampingFraction?: number, overlapDuration?: number): ICurve; /** * Constructs a responsive spring motion when called. @@ -799,7 +976,7 @@ declare namespace curves { * @atomicservice * @since 11 */ - function responsiveSpringMotion(response?: number, dampingFraction?: number, overlapDuration?: number): ICurve; + export function responsiveSpringMotion(response?: number, dampingFraction?: number, overlapDuration?: number): ICurve; /** * Constructs an interpolating spring curve when called, the animation duration can not be specified manually, @@ -852,7 +1029,7 @@ declare namespace curves { * @atomicservice * @since 11 */ - function interpolatingSpring(velocity: number, mass: number, stiffness: number, damping: number): ICurve; + export function interpolatingSpring(velocity: number, mass: number, stiffness: number, damping: number): ICurve; } export default curves; diff --git a/api/@ohos.data.DataShareResultSet.d.ts b/api/@ohos.data.DataShareResultSet.d.ts index e637a1a698..fb037fd812 100644 --- a/api/@ohos.data.DataShareResultSet.d.ts +++ b/api/@ohos.data.DataShareResultSet.d.ts @@ -161,7 +161,8 @@ export default interface DataShareResultSet { * @syscap SystemCapability.DistributedDataManager.DataShare.Core * @systemapi * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ goToLastRow(): boolean; @@ -173,7 +174,8 @@ export default interface DataShareResultSet { * @syscap SystemCapability.DistributedDataManager.DataShare.Core * @systemapi * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ goToNextRow(): boolean; @@ -254,7 +256,8 @@ export default interface DataShareResultSet { * @syscap SystemCapability.DistributedDataManager.DataShare.Core * @systemapi * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ getLong(columnIndex: number): number; diff --git a/api/@ohos.data.dataShare.d.ts b/api/@ohos.data.dataShare.d.ts index 8256ff332d..625f50da96 100644 --- a/api/@ohos.data.dataShare.d.ts +++ b/api/@ohos.data.dataShare.d.ts @@ -76,7 +76,8 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ waitTime?: number; } @@ -353,7 +354,8 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ interface RdbDataChangeNode { /** @@ -397,7 +399,8 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ interface PublishedDataChangeNode { /** @@ -826,7 +829,8 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ addTemplate(uri: string, subscriberId: string, template: Template): void; @@ -856,7 +860,8 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ delTemplate(uri: string, subscriberId: string): void; @@ -890,7 +895,8 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ on( type: 'rdbDataChange', @@ -929,7 +935,8 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ off( type: 'rdbDataChange', @@ -968,7 +975,8 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ on( type: 'publishedDataChange', @@ -1007,7 +1015,8 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ off( type: 'publishedDataChange', @@ -1046,7 +1055,8 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ publish( data: Array, @@ -1083,7 +1093,8 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ publish( data: Array, @@ -1121,7 +1132,8 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ publish(data: Array, bundleName: string, version?: number): Promise>; @@ -1213,7 +1225,8 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ insert(uri: string, value: ValuesBucket, callback: AsyncCallback): void; @@ -1245,7 +1258,8 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ insert(uri: string, value: ValuesBucket): Promise; @@ -1277,7 +1291,8 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ delete(uri: string, predicates: dataSharePredicates.DataSharePredicates, callback: AsyncCallback): void; @@ -1309,7 +1324,8 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ delete(uri: string, predicates: dataSharePredicates.DataSharePredicates): Promise; @@ -1515,7 +1531,8 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ batchInsert(uri: string, values: Array, callback: AsyncCallback): void; @@ -1545,7 +1562,8 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ batchInsert(uri: string, values: Array): Promise; @@ -1758,7 +1776,8 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ /** * Close the connection between datashare and extension. diff --git a/api/@ohos.data.dataSharePredicates.d.ts b/api/@ohos.data.dataSharePredicates.d.ts index 4844a98ec8..7808ee95ba 100644 --- a/api/@ohos.data.dataSharePredicates.d.ts +++ b/api/@ohos.data.dataSharePredicates.d.ts @@ -279,7 +279,8 @@ declare namespace dataSharePredicates { * @syscap SystemCapability.DistributedDataManager.DataShare.Core * @systemapi * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ isNull(field: string): DataSharePredicates; @@ -293,7 +294,8 @@ declare namespace dataSharePredicates { * @syscap SystemCapability.DistributedDataManager.DataShare.Core * @systemapi * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ isNotNull(field: string): DataSharePredicates; @@ -359,7 +361,8 @@ declare namespace dataSharePredicates { * @syscap SystemCapability.DistributedDataManager.DataShare.Core * @systemapi * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ between(field: string, low: ValueType, high: ValueType): DataSharePredicates; @@ -434,7 +437,8 @@ declare namespace dataSharePredicates { * @syscap SystemCapability.DistributedDataManager.DataShare.Core * @systemapi * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ lessThanOrEqualTo(field: string, value: ValueType): DataSharePredicates; diff --git a/api/@ohos.data.distributedKVStore.d.ts b/api/@ohos.data.distributedKVStore.d.ts index 7c1b0573d5..45db5d00a7 100644 --- a/api/@ohos.data.distributedKVStore.d.ts +++ b/api/@ohos.data.distributedKVStore.d.ts @@ -28,7 +28,8 @@ import BaseContext from './application/BaseContext'; * * @namespace distributedKVStore * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace distributedKVStore { /** @@ -37,7 +38,8 @@ declare namespace distributedKVStore { * * @interface KVManagerConfig * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ interface KVManagerConfig { /** @@ -45,7 +47,8 @@ declare namespace distributedKVStore { * * @type { string } * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ bundleName: string; @@ -54,7 +57,8 @@ declare namespace distributedKVStore { * * @syscap SystemCapability.DistributedDataManager.KVStore.Core * if swap the area, you should close all the KV store and use the new Context to create the KVManager - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Indicates the ability or hap context @@ -62,7 +66,8 @@ declare namespace distributedKVStore { * @type { BaseContext } * @syscap SystemCapability.DistributedDataManager.KVStore.Core * if swap the area, you should close all the KV store and use the new BaseContext to create the KVManager - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ context: BaseContext; } @@ -368,14 +373,16 @@ declare namespace distributedKVStore { * * @enum { number } * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ enum KVStoreType { /** * Device-collaboration database, as specified by {@code DeviceKVStore} * * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ DEVICE_COLLABORATION, @@ -383,7 +390,8 @@ declare namespace distributedKVStore { * Single-version database, as specified by {@code SingleKVStore} * * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ SINGLE_VERSION } @@ -393,7 +401,8 @@ declare namespace distributedKVStore { * * @enum { number } * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ enum SecurityLevel { /** @@ -401,7 +410,8 @@ declare namespace distributedKVStore { * There are some low impact when the data is leaked. * * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ S1, @@ -410,7 +420,8 @@ declare namespace distributedKVStore { * There are some major impact when the data is leaked. * * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ S2, @@ -419,7 +430,8 @@ declare namespace distributedKVStore { * There are some severity impact when the data is leaked. * * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ S3, @@ -428,7 +440,8 @@ declare namespace distributedKVStore { * There are some critical impact when the data is leaked. * * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ S4 } @@ -438,7 +451,8 @@ declare namespace distributedKVStore { * * @interface Options * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ interface Options { /** @@ -446,7 +460,8 @@ declare namespace distributedKVStore { * * @type { ?boolean } * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ createIfMissing?: boolean; @@ -455,7 +470,8 @@ declare namespace distributedKVStore { * * @type { ?boolean } * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ encrypt?: boolean; @@ -464,7 +480,8 @@ declare namespace distributedKVStore { * * @type { ?boolean } * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ backup?: boolean; @@ -474,7 +491,8 @@ declare namespace distributedKVStore { * @permission ohos.permission.DISTRIBUTED_DATASYNC * @type { ?boolean } * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ autoSync?: boolean; @@ -483,7 +501,8 @@ declare namespace distributedKVStore { * * @type { ?KVStoreType } * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ kvStoreType?: KVStoreType; @@ -492,7 +511,8 @@ declare namespace distributedKVStore { * * @type { SecurityLevel } * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * arkts 1.1&1.2 */ securityLevel: SecurityLevel; @@ -501,7 +521,8 @@ declare namespace distributedKVStore { * * @type { ?Schema } * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ schema?: Schema; } @@ -511,7 +532,8 @@ declare namespace distributedKVStore { * You can set the schema object in options when create or open the database. * * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ class Schema { /** @@ -566,7 +588,8 @@ declare namespace distributedKVStore { *

    The leaf node must have a value; the non-leaf node must have a child {@code FieldNode}. * * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ class FieldNode { /** @@ -1179,7 +1202,8 @@ declare namespace distributedKVStore { * @throws { BusinessError } 15100005 - Database or result set already closed. * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ put(key: string, value: Uint8Array | string | number | boolean, callback: AsyncCallback): void; @@ -1216,7 +1240,8 @@ declare namespace distributedKVStore { * @throws { BusinessError } 15100005 - Database or result set already closed. * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ put(key: string, value: Uint8Array | string | number | boolean): Promise; @@ -1579,7 +1604,8 @@ declare namespace distributedKVStore { * @throws { BusinessError } 15100004 - Not found. * @throws { BusinessError } 15100005 - Database or result set already closed. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ get(key: string, callback: AsyncCallback): void; @@ -1596,7 +1622,8 @@ declare namespace distributedKVStore { * @throws { BusinessError } 15100004 - Not found. * @throws { BusinessError } 15100005 - Database or result set already closed. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ get(key: string): Promise; @@ -1934,7 +1961,8 @@ declare namespace distributedKVStore { *
    2.Parameter verification failed. * @throws { BusinessError } 15100005 - Database or result set already closed. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ backup(file: string, callback: AsyncCallback): void; @@ -1948,7 +1976,8 @@ declare namespace distributedKVStore { *
    2.Parameter verification failed. * @throws { BusinessError } 15100005 - Database or result set already closed. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ backup(file: string): Promise; @@ -2338,7 +2367,8 @@ declare namespace distributedKVStore { * @throws { BusinessError } 15100004 - Not found. * @throws { BusinessError } 15100005 - Database or result set already closed. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ get(key: string, callback: AsyncCallback): void; @@ -2355,7 +2385,8 @@ declare namespace distributedKVStore { * @throws { BusinessError } 15100004 - Not found. * @throws { BusinessError } 15100005 - Database or result set already closed. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ get(key: string): Promise; @@ -2374,7 +2405,8 @@ declare namespace distributedKVStore { * @throws { BusinessError } 15100004 - Not found. * @throws { BusinessError } 15100005 - Database or result set already closed. * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ get(deviceId: string, key: string, callback: AsyncCallback): void; @@ -2393,7 +2425,8 @@ declare namespace distributedKVStore { * @throws { BusinessError } 15100004 - Not found. * @throws { BusinessError } 15100005 - Database or result set already closed. * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ get(deviceId: string, key: string): Promise; @@ -3044,7 +3077,8 @@ declare namespace distributedKVStore { *
    2.Incorrect parameters types; *
    3.Parameter verification failed. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function createKVManager(config: KVManagerConfig): KVManager; @@ -3054,7 +3088,8 @@ declare namespace distributedKVStore { * * @interface KVManager * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ interface KVManager { /** @@ -3072,7 +3107,8 @@ declare namespace distributedKVStore { * @throws { BusinessError } 15100002 - Open existed database with changed options. * @throws { BusinessError } 15100003 - Database corrupted. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ getKVStore(storeId: string, options: Options, callback: AsyncCallback): void; @@ -3091,7 +3127,8 @@ declare namespace distributedKVStore { * @throws { BusinessError } 15100002 - Open existed database with changed options. * @throws { BusinessError } 15100003 - Database corrupted. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ getKVStore(storeId: string, options: Options): Promise; diff --git a/api/@ohos.data.preferences.d.ts b/api/@ohos.data.preferences.d.ts index 59e4f91fda..5ee245ab72 100644 --- a/api/@ohos.data.preferences.d.ts +++ b/api/@ohos.data.preferences.d.ts @@ -114,7 +114,8 @@ declare namespace preferences { * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ const MAX_KEY_LENGTH: number; @@ -148,7 +149,8 @@ declare namespace preferences { * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ const MAX_VALUE_LENGTH: number; @@ -158,7 +160,8 @@ declare namespace preferences { * @enum { number } * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ enum StorageType { /** @@ -166,7 +169,8 @@ declare namespace preferences { * * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ XML = 0, @@ -175,7 +179,8 @@ declare namespace preferences { * * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ GSKV } @@ -243,7 +248,8 @@ declare namespace preferences { * @type { ?(StorageType | null | undefined) } * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ storageType?: StorageType | null | undefined; } @@ -1825,7 +1831,8 @@ declare namespace preferences { * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @crossplatform * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ flushSync(): void; @@ -1864,7 +1871,8 @@ declare namespace preferences { * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'change', callback: Callback): void; @@ -1892,7 +1900,8 @@ declare namespace preferences { * @throws { BusinessError } 15500019 - Failed to obtain the subscription service. * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'multiProcessChange', callback: Callback): void; @@ -1924,6 +1933,7 @@ declare namespace preferences { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ on(type: 'dataChange', keys: Array, callback: Callback>): void; @@ -1962,7 +1972,8 @@ declare namespace preferences { * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'change', callback?: Callback): void; @@ -1988,7 +1999,8 @@ declare namespace preferences { * @throws { BusinessError } 15500000 - Inner error. * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'multiProcessChange', callback?: Callback): void; @@ -2004,7 +2016,8 @@ declare namespace preferences { * @throws { BusinessError } 15500000 - Inner error. * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unregisters an observer for changes to the {@ link Preferences} object. diff --git a/api/@ohos.data.relationalStore.d.ts b/api/@ohos.data.relationalStore.d.ts index 886d4d14fc..95a4d95a83 100644 --- a/api/@ohos.data.relationalStore.d.ts +++ b/api/@ohos.data.relationalStore.d.ts @@ -2024,7 +2024,8 @@ declare namespace relationalStore { * @enum { number } * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ enum ColumnType { /** @@ -2032,7 +2033,8 @@ declare namespace relationalStore { * * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ NULL, @@ -2043,7 +2045,8 @@ declare namespace relationalStore { * * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ INTEGER, @@ -2052,7 +2055,8 @@ declare namespace relationalStore { * * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ REAL, @@ -2061,7 +2065,8 @@ declare namespace relationalStore { * * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ TEXT, @@ -2070,7 +2075,8 @@ declare namespace relationalStore { * * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ BLOB, @@ -2079,7 +2085,8 @@ declare namespace relationalStore { * * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ ASSET, @@ -2088,7 +2095,8 @@ declare namespace relationalStore { * * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ ASSETS, @@ -2097,7 +2105,8 @@ declare namespace relationalStore { * * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ FLOAT_VECTOR, @@ -2106,7 +2115,8 @@ declare namespace relationalStore { * * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ UNLIMITED_INT, } @@ -3270,7 +3280,8 @@ declare namespace relationalStore { * @throws { BusinessError } 14800034 - SQLite: Library used incorrectly. * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getColumnType(columnIdentifier: number | string): Promise; @@ -3304,7 +3315,8 @@ declare namespace relationalStore { * @throws { BusinessError } 14800034 - SQLite: Library used incorrectly. * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getColumnTypeSync(columnIdentifier: number | string): ColumnType; diff --git a/api/@ohos.data.unifiedDataChannel.d.ts b/api/@ohos.data.unifiedDataChannel.d.ts index bdc283df1f..d804a0d843 100644 --- a/api/@ohos.data.unifiedDataChannel.d.ts +++ b/api/@ohos.data.unifiedDataChannel.d.ts @@ -451,7 +451,8 @@ declare namespace unifiedDataChannel { * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @crossplatform * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ getType(): string; @@ -518,7 +519,8 @@ declare namespace unifiedDataChannel { * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @crossplatform * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ getValue(): ValueType; @@ -593,7 +595,8 @@ declare namespace unifiedDataChannel { * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @crossplatform * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ class Text extends UnifiedRecord { /** @@ -620,92 +623,85 @@ declare namespace unifiedDataChannel { * @since 14 */ details?: Record; - } - /** - * Describe the unified plain text data - * - * @extends Text - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Describe the unified plain text data - * - * @extends Text - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Describe the unified plain text data - * - * @extends Text - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - class PlainText extends Text { /** - * Indicates the content of text + * Indicates the details of unified text * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the content of text + * Indicates the details of unified text * - * @type { string } + * @type { ?Record } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ /** - * Indicates the content of text + * Indicates the details of unified text * - * @type { string } + * @type { ?Record } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @crossplatform * @atomicservice * @since 14 */ - textContent: string; /** - * Indicates the abstract of text + * Indicates the details of unified text + * + * @returns { Record | undefined } the details of unified text + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + get details(): Record | undefined; + + /** + * Indicates the details of unified text * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the abstract of text + * Indicates the details of unified text * - * @type { ?string } + * @type { ?Record } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ /** - * Indicates the abstract of text + * Indicates the details of unified text * - * @type { ?string } + * @type { ?Record } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @crossplatform * @atomicservice * @since 14 */ - abstract?: string; + /** + * Indicates the details of unified text + * + * @param { Record } the details of unified text + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + set details(value: Record); } /** - * Describe the unified link data + * Describe the unified plain text data * * @extends Text * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Describe the unified link data + * Describe the unified plain text data * * @extends Text * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -713,23 +709,24 @@ declare namespace unifiedDataChannel { * @since 11 */ /** - * Describe the unified link data + * Describe the unified plain text data * * @extends Text * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @crossplatform * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ - class Hyperlink extends Text { + class PlainText extends Text { /** - * Indicates the url of a link + * Indicates the content of text * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the url of a link + * Indicates the content of text * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -737,7 +734,7 @@ declare namespace unifiedDataChannel { * @since 11 */ /** - * Indicates the url of a link + * Indicates the content of text * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -745,66 +742,50 @@ declare namespace unifiedDataChannel { * @atomicservice * @since 14 */ - url: string; + textContent: string; + /** - * Indicates the description of a link + * Indicates the content of text * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the description of a link + * Indicates the content of text * - * @type { ?string } + * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ /** - * Indicates the description of a link + * Indicates the content of text * - * @type { ?string } + * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @crossplatform * @atomicservice * @since 14 */ - description?: string; - } + /** + * Indicates the content of text + * + * @returns { string } the content of text + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + get textContent(): string; - /** - * Describe the unified html data - * - * @extends Text - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Describe the unified html data - * - * @extends Text - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Describe the unified html data - * - * @extends Text - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - class HTML extends Text { /** - * Indicates the content of html, with html tags + * Indicates the content of text * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the content of html, with html tags + * Indicates the content of text * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -812,7 +793,7 @@ declare namespace unifiedDataChannel { * @since 11 */ /** - * Indicates the content of html, with html tags + * Indicates the content of text * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -820,15 +801,25 @@ declare namespace unifiedDataChannel { * @atomicservice * @since 14 */ - htmlContent: string; /** - * Indicates the plain content of html + * Indicates the content of text + * + * @param { string } the content of text + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + set textContent(value: string); + + /** + * Indicates the abstract of text * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the plain content of html + * Indicates the abstract of text * * @type { ?string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -836,7 +827,7 @@ declare namespace unifiedDataChannel { * @since 11 */ /** - * Indicates the plain content of html + * Indicates the abstract of text * * @type { ?string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -844,66 +835,90 @@ declare namespace unifiedDataChannel { * @atomicservice * @since 14 */ - plainContent?: string; + abstract?: string; + + /** + * Indicates the abstract of text + * + * @returns { string | undefined } the abstract of text + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + get textAbstract(): string | undefined; + + /** + * Indicates the abstract of text + * + * @param { string } the abstract of text + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + set textAbstract(value: string); } /** - * Describe the unified file data + * Describe the unified link data * - * @extends UnifiedRecord + * @extends Text * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Describe the unified file data + * Describe the unified link data * - * @extends UnifiedRecord + * @extends Text * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ /** - * Describe the unified file data + * Describe the unified link data * - * @extends UnifiedRecord + * @extends Text * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @crossplatform * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ - class File extends UnifiedRecord { + class Hyperlink extends Text { /** - * Indicates the details of unified File + * Indicates the url of a link * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the details of unified File + * Indicates the url of a link * - * @type { ?Record } + * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ /** - * Indicates the details of unified File + * Indicates the url of a link * - * @type { ?Record } + * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @crossplatform * @atomicservice * @since 14 */ - details?: Record; + url: string; + /** - * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. + * Indicates the url of a link * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. + * Indicates the url of a link * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -911,7 +926,7 @@ declare namespace unifiedDataChannel { * @since 11 */ /** - * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. + * Indicates the url of a link * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -919,42 +934,25 @@ declare namespace unifiedDataChannel { * @atomicservice * @since 14 */ - uri: string; - } + /** + * Indicates the url of a link + * + * @returns { string } the url of a link + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + get url(): string; - /** - * Describe the unified image data - * - * @extends File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Describe the unified image data - * - * @extends File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Describe the unified image data - * - * @extends File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - class Image extends File { /** - * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. + * Indicates the url of a link * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. + * Indicates the url of a link * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -962,7 +960,7 @@ declare namespace unifiedDataChannel { * @since 11 */ /** - * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. + * Indicates the url of a link * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -970,93 +968,145 @@ declare namespace unifiedDataChannel { * @atomicservice * @since 14 */ - imageUri: string; - } - - /** - * Describe the unified video data - * - * @extends File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Describe the unified video data - * - * @extends File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Describe the unified video data - * - * @extends File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - class Video extends File { /** - * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. + * Indicates the url of a link + * + * @param { string } the url of a link + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + set url(value: string); + + /** + * Indicates the description of a link * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. + * Indicates the description of a link * - * @type { string } + * @type { ?string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ /** - * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. + * Indicates the description of a link * - * @type { string } + * @type { ?string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @crossplatform * @atomicservice * @since 14 */ - videoUri: string; + description?: string; + + /** + * Indicates the description of a link + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the description of a link + * + * @type { ?string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the description of a link + * + * @type { ?string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + /** + * Indicates the description of a link + * + * @returns { string | undefined } the description of a link. + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + get description(): string | undefined; + + /** + * Indicates the description of a link. + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the description of a link + * + * @type { ?string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the description of a link + * + * @type { ?string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + /** + * Indicates the description of a link + * + * @param { string } the description of a link + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + set description(value: string); } /** - * Describe the unified audio data + * Describe the unified html data * - * @extends File + * @extends Text * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Describe the unified audio data + * Describe the unified html data * - * @extends File + * @extends Text * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ /** - * Describe the unified audio data + * Describe the unified html data * - * @extends File + * @extends Text * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @crossplatform * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ - class Audio extends File { + class HTML extends Text { /** - * URI of the local audio or online audio. The local audio URI can be obtained using the getUriFromPath function. + * Indicates the content of html, with html tags * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * URI of the local audio or online audio. The local audio URI can be obtained using the getUriFromPath function. + * Indicates the content of html, with html tags * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -1064,7 +1114,7 @@ declare namespace unifiedDataChannel { * @since 11 */ /** - * URI of the local audio or online audio. The local audio URI can be obtained using the getUriFromPath function. + * Indicates the content of html, with html tags * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -1072,42 +1122,16 @@ declare namespace unifiedDataChannel { * @atomicservice * @since 14 */ - audioUri: string; - } + htmlContent: string; - /** - * Describe the unified folder data - * - * @extends File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Describe the unified folder data - * - * @extends File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Describe the unified folder data - * - * @extends File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - class Folder extends File { /** - * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. + * Indicates the content of html, with html tags * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. + * Indicates the content of html, with html tags * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -1115,7 +1139,7 @@ declare namespace unifiedDataChannel { * @since 11 */ /** - * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. + * Indicates the content of html, with html tags * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -1123,232 +1147,1614 @@ declare namespace unifiedDataChannel { * @atomicservice * @since 14 */ - folderUri: string; - } + /** + * Indicates the content of html, with html tags + * + * @returns { string } the content of html + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + get htmlContent(): string; - /** - * Describe system defined type data(this kind of data is provided and bound to OpenHarmony, - * also can be parsed by system provided API) - * - * @extends UnifiedRecord - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Describe system defined type data(this kind of data is provided and bound to OpenHarmony, - * also can be parsed by system provided API) - * - * @extends UnifiedRecord - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - class SystemDefinedRecord extends UnifiedRecord { /** - * Indicates the details of system defined data + * Indicates the content of html, with html tags * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the details of system defined data + * Indicates the content of html, with html tags * - * @type { ?Record } + * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ - details?: Record; - } + /** + * Indicates the content of html, with html tags + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + /** + * Indicates the content of html, with html tags + * + * @param { string } the content of html + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + set htmlContent(value: string); + + /** + * Indicates the plain content of html + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the plain content of html + * + * @type { ?string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the plain content of html + * + * @type { ?string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + plainContent?: string; + + /** + * Indicates the plain content of html + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the plain content of html + * + * @type { ?string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the plain content of html + * + * @type { ?string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + /** + * Indicates the plain content of html + * + * @returns { string | undefined } the plain content of html + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + get plainContent(): string | undefined; + + /** + * Indicates the plain content of html + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the plain content of html + * + * @type { ?string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the plain content of html + * + * @type { ?string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + /** + * Indicates the plain content of html + * + * @param { string } the plain content of html + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + set plainContent(value: string); + } + + /** + * Describe the unified file data + * + * @extends UnifiedRecord + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Describe the unified file data + * + * @extends UnifiedRecord + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Describe the unified file data + * + * @extends UnifiedRecord + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + class File extends UnifiedRecord { + /** + * Indicates the details of unified File + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the details of unified File + * + * @type { ?Record } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the details of unified File + * + * @type { ?Record } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + details?: Record; + + /** + * Indicates the details of unified File + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the details of unified File + * + * @type { ?Record } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the details of unified File + * + * @type { ?Record } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + /** + * Indicates the details of unified File + * + * @returns { Record | undefined } the details of unified File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + get details(): Record | undefined; + + /** + * Indicates the details of unified File + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the details of unified File + * + * @type { ?Record } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the details of unified File + * + * @type { ?Record } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + /** + * Indicates the details of unified File + * + * @param { Record } the details of unified File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + set details(value: Record); + + /** + * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + uri: string; + + /** + * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + /** + * Indicates the uri of file + * + * @returns { string } the uri of file + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + get uri(): string; + + /** + * Indicates the uri of file + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the uri of file + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the uri of file + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + /** + * Indicates the uri of file + * + * @param { string } the uri of file + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + set uri(value: string); + } + + /** + * Describe the unified image data + * + * @extends File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Describe the unified image data + * + * @extends File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Describe the unified image data + * + * @extends File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + class Image extends File { + /** + * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + imageUri: string; + + /** + * Indicates the uri of image + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + /** + * Indicates the uri of image + * + * @returns { string } the uri of image + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + get imageUri(): string; + + /** + * Indicates the uri of image + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the uri of image + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the uri of image + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + /** + * Indicates the uri of image + * + * @param { string } the uri of image + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + set imageUri(value: string); + } + + /** + * Describe the unified video data + * + * @extends File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Describe the unified video data + * + * @extends File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Describe the unified video data + * + * @extends File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + class Video extends File { + /** + * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + videoUri: string; + + /** + * Indicates the uri of video + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + /** + * Indicates the uri of video + * + * @returns { string } the uri of video + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + get videoUri(): string; + + /** + * Indicates the uri of video + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the uri of video + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the uri of video + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + /** + * Indicates the uri of video + * + * @param { string } the uri of video + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + set videoUri(value: string); + } + + /** + * Describe the unified audio data + * + * @extends File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Describe the unified audio data + * + * @extends File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Describe the unified audio data + * + * @extends File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + class Audio extends File { + /** + * URI of the local audio or online audio. The local audio URI can be obtained using the getUriFromPath function. + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * URI of the local audio or online audio. The local audio URI can be obtained using the getUriFromPath function. + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * URI of the local audio or online audio. The local audio URI can be obtained using the getUriFromPath function. + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + audioUri: string; + + /** + * Indicates the uri of audio + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the uri of audio + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the uri of audio + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + /** + * Indicates the uri of audio + * + * @returns { string } the uri of audio + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + get audioUri(): string; + + /** + * Indicates the uri of audio + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the uri of audio + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the uri of audio + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + /** + * Indicates the uri of audio + * + * @param { string } the uri of audio + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + set audioUri(value: string); + } + + /** + * Describe the unified folder data + * + * @extends File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Describe the unified folder data + * + * @extends File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Describe the unified folder data + * + * @extends File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + class Folder extends File { + /** + * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + folderUri: string; + + /** + * Indicates the uri of folder + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + /** + * Indicates the uri of folder + * + * @returns { string } the uri of folder + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + get folderUri(): string; + + /** + * Indicates the uri of folder + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the uri of folder + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the uri of folder + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + /** + * Indicates the uri of folder + * + * @param { string } the uri of folder + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + set folderUri(value: string); + } + + /** + * Describe system defined type data(this kind of data is provided and bound to OpenHarmony, + * also can be parsed by system provided API) + * + * @extends UnifiedRecord + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Describe system defined type data(this kind of data is provided and bound to OpenHarmony, + * also can be parsed by system provided API) + * + * @extends UnifiedRecord + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ + class SystemDefinedRecord extends UnifiedRecord { + /** + * Indicates the details of system defined data + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the details of system defined data + * + * @type { ?Record } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + details?: Record; + + /** + * Indicates the details of system defined data + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the details of system defined data + * + * @type { ?Record } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the details of system defined data + * + * @returns { Record | undefined } the details of system defined data + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + get details(): Record | undefined; + + /** + * Indicates the details of system defined data + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the details of system defined data + * + * @type { ?Record } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the details of system defined data + * + * @param { Record } the details of system defined data + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + set details(value: Record); + } + + /** + * Describe system defined form data(this kind of data is provided and bound to OpenHarmony, + * also can be parsed by system provided API) + * + * @extends SystemDefinedRecord + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Describe system defined form data(this kind of data is provided and bound to OpenHarmony, + * also can be parsed by system provided API) + * + * @extends SystemDefinedRecord + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ + class SystemDefinedForm extends SystemDefinedRecord { + /** + * Indicates the id of form + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the id of form + * + * @type { number } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + formId: number; + + /** + * Indicates the id of form + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the id of form + * + * @type { number } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the id of form + * + * @returns { number } the id of form + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + get formId(): number; + + /** + * Indicates the id of form + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the id of form + * + * @type { number } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the id of form + * + * @param { number } the id of form + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + set formId(value: number); + + /** + * Indicates the name of form + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the name of form + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + formName: string; + + /** + * Indicates the name of form + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the name of form + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the name of form + * + * @returns { string } the name of form + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + get formName(): string; + + /** + * Indicates the name of form + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the name of form + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the name of form + * + * @param { string } the name of form + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + set formName(value: string); + + /** + * Indicates the bundle name of form + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the bundle name of form + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + bundleName: string; + + /** + * Indicates the bundle name of form + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the bundle name of form + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the bundle name of form + * + * @returns { string } the bundle name of form + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + get bundleName(): string; + + /** + * Indicates the bundle name of form + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the bundle name of form + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the bundle name of form + * + * @param { string } the bundle name of form + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + set bundleName(value: string); + + /** + * Indicates the ability name of form + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the ability name of form + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + abilityName: string; + + /** + * Indicates the ability name of form + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the ability name of form + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the ability name of form + * + * @returns { string } the ability name of form + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + get abilityName(): string; + + /** + * Indicates the ability name of form + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the ability name of form + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the ability name of form + * + * @param { string } the ability name of form + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + set abilityName(value: string); + + /** + * Indicates the module of form + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the module of form + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + module: string; + + /** + * Indicates the module of form + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the module of form + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the module of form + * + * @returns { string } the module of form + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + get module(): string; + + /** + * Indicates the module of form + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the module of form + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the module of form + * + * @param { string } the module of form + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + set module(value: string); + } + + /** + * Describe system defined app item data(this kind of data is provided and bound to OpenHarmony, + * also can be parsed by system provided API) + * + * @extends SystemDefinedRecord + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Describe system defined app item data(this kind of data is provided and bound to OpenHarmony, + * also can be parsed by system provided API) + * + * @extends SystemDefinedRecord + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ + class SystemDefinedAppItem extends SystemDefinedRecord { + /** + * Indicates the app id + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the app id + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + appId: string; + + /** + * Indicates the app id + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the app id + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the app id + * + * @returns { string } the app id + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + get appId(): string; + + /** + * Indicates the app id + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the app id + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the app id + * + * @param { string } the app id + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + set appId(value: string); + + /** + * Indicates the app name + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the app name + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + appName: string; + + /** + * Indicates the app name + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the app name + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the app name + * + * @returns { string } the app name + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + get appName(): string; + + /** + * Indicates the app name + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the app name + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the app name + * + * @param { string } the app name + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + set appName(value: string); - /** - * Describe system defined form data(this kind of data is provided and bound to OpenHarmony, - * also can be parsed by system provided API) - * - * @extends SystemDefinedRecord - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Describe system defined form data(this kind of data is provided and bound to OpenHarmony, - * also can be parsed by system provided API) - * - * @extends SystemDefinedRecord - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - class SystemDefinedForm extends SystemDefinedRecord { /** - * Indicates the id of form + * Indicates the id of app icon * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the id of form + * Indicates the id of app icon * - * @type { number } + * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ - formId: number; + appIconId: string; + /** - * Indicates the name of form + * Indicates the id of app icon * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the name of form + * Indicates the id of app icon * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ - formName: string; /** - * Indicates the bundle name of form + * Indicates the id of app icon + * + * @returns { string } the id of app icon + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + get appIconId(): string; + + /** + * Indicates the id of app icon * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the bundle name of form + * Indicates the id of app icon * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ - bundleName: string; /** - * Indicates the ability name of form + * Indicates the id of app icon + * + * @param { string } the id of app icon + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + set appIconId(value: string); + + /** + * Indicates the id of app label * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the ability name of form + * Indicates the id of app label * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ - abilityName: string; + appLabelId: string; + /** - * Indicates the module of form + * Indicates the id of app label * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the module of form + * Indicates the id of app label * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ - module: string; - } + /** + * Indicates the id of app label + * + * @returns { string } the id of app label + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + get appLabelId(): string; - /** - * Describe system defined app item data(this kind of data is provided and bound to OpenHarmony, - * also can be parsed by system provided API) - * - * @extends SystemDefinedRecord - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Describe system defined app item data(this kind of data is provided and bound to OpenHarmony, - * also can be parsed by system provided API) - * - * @extends SystemDefinedRecord - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - class SystemDefinedAppItem extends SystemDefinedRecord { /** - * Indicates the app id + * Indicates the id of app label * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the app id + * Indicates the id of app label * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ - appId: string; /** - * Indicates the app name + * Indicates the id of app label + * + * @param { string } the id of app label + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + set appLabelId(value: string); + + /** + * Indicates the bundle name of app * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the app name + * Indicates the bundle name of app * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ - appName: string; + bundleName: string; + /** - * Indicates the id of app icon + * Indicates the bundle name of app * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the id of app icon + * Indicates the bundle name of app * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ - appIconId: string; /** - * Indicates the id of app label + * Indicates the bundle name of app + * + * @returns { string } the bundle name of app + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + get bundleName(): string; + + /** + * Indicates the bundle name of app * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the id of app label + * Indicates the bundle name of app * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ - appLabelId: string; /** * Indicates the bundle name of app * + * @param { string } the bundle name of app + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + set bundleName(value: string); + + /** + * Indicates the ability name of app + * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the bundle name of app + * Indicates the ability name of app * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ - bundleName: string; + abilityName: string; + /** * Indicates the ability name of app * @@ -1363,7 +2769,39 @@ declare namespace unifiedDataChannel { * @atomicservice * @since 11 */ - abilityName: string; + /** + * Indicates the ability name of app + * + * @returns { string } the ability name of app + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + get abilityName(): string; + + /** + * Indicates the ability name of app + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the ability name of app + * + * @type { string } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the ability name of app + * + * @param { string } the ability name of app + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + set abilityName(value: string); } /** @@ -1381,7 +2819,8 @@ declare namespace unifiedDataChannel { * @extends SystemDefinedRecord * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ class SystemDefinedPixelMap extends SystemDefinedRecord { /** @@ -1399,6 +2838,54 @@ declare namespace unifiedDataChannel { * @since 11 */ rawData: Uint8Array; + + /** + * Indicates the raw data of pixel map + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the raw data of pixel map + * + * @type { Uint8Array } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the raw data of pixel map + * + * @returns { Uint8Array } the raw data of pixel map + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + get rawData(): Uint8Array; + + /** + * Indicates the raw data of pixel map + * + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Indicates the raw data of pixel map + * + * @type { Uint8Array } + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Indicates the raw data of pixel map + * + * @param { Uint8Array } the raw data of pixel map + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 20 + * @arkts 1.2 + */ + set rawData(value: Uint8Array); } /** @@ -1466,7 +2953,8 @@ declare namespace unifiedDataChannel { * @enum { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ enum Intention { /** @@ -1480,7 +2968,8 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DATA_HUB = 'DataHub', @@ -1574,10 +3063,11 @@ declare namespace unifiedDataChannel { /** * Describe the optional arguments of data operation * - * @interface { Options } + * @typedef { Options } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ interface Options { /** @@ -1600,6 +3090,7 @@ declare namespace unifiedDataChannel { * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ intention?: Intention; @@ -1623,6 +3114,7 @@ declare namespace unifiedDataChannel { * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ key?: string; @@ -1644,7 +3136,8 @@ declare namespace unifiedDataChannel { * @enum { number } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ enum FileConflictOptions { /** @@ -1652,7 +3145,8 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ OVERWRITE, @@ -1661,7 +3155,8 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ SKIP } @@ -1672,7 +3167,8 @@ declare namespace unifiedDataChannel { * @enum { number } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ enum ProgressIndicator { /** @@ -1680,7 +3176,8 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ NONE, @@ -1689,7 +3186,8 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ DEFAULT } @@ -1700,7 +3198,8 @@ declare namespace unifiedDataChannel { * @enum { number } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ enum ListenerStatus { /** @@ -1708,7 +3207,8 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ FINISHED = 0, @@ -1717,7 +3217,8 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ PROCESSING, @@ -1726,7 +3227,8 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ CANCELED, @@ -1735,7 +3237,8 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ INNER_ERROR = 200, @@ -1744,7 +3247,8 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ INVALID_PARAMETERS, @@ -1753,7 +3257,8 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ DATA_NOT_FOUND, @@ -1762,7 +3267,8 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ SYNC_FAILED, @@ -1771,7 +3277,8 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ COPY_FILE_FAILED, } @@ -1782,7 +3289,8 @@ declare namespace unifiedDataChannel { * @interface ProgressInfo * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ interface ProgressInfo { /** @@ -1791,7 +3299,8 @@ declare namespace unifiedDataChannel { * @type { number } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ progress: number; @@ -1801,7 +3310,8 @@ declare namespace unifiedDataChannel { * @type { ListenerStatus } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ status: ListenerStatus; } @@ -1814,7 +3324,8 @@ declare namespace unifiedDataChannel { * @param { UnifiedData | null } data - Data obtained when the progress reaches 100%. * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ type DataProgressListener = (progressInfo: ProgressInfo, data: UnifiedData | null) => void; @@ -1824,7 +3335,8 @@ declare namespace unifiedDataChannel { * @interface GetDataParams * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ interface GetDataParams { /** @@ -1833,7 +3345,8 @@ declare namespace unifiedDataChannel { * @type { ProgressIndicator } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ progressIndicator: ProgressIndicator; @@ -1843,7 +3356,8 @@ declare namespace unifiedDataChannel { * @type { DataProgressListener } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ dataProgressListener: DataProgressListener; @@ -1853,7 +3367,8 @@ declare namespace unifiedDataChannel { * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ destUri?: string; @@ -1863,7 +3378,8 @@ declare namespace unifiedDataChannel { * @type { FileConflictOptions } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ fileConflictOptions?: FileConflictOptions; @@ -1971,7 +3487,8 @@ declare namespace unifiedDataChannel { *
    2.Incorrect parameters types. * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function insertData(options: Options, data: UnifiedData, callback: AsyncCallback): void; @@ -1996,7 +3513,8 @@ declare namespace unifiedDataChannel { *
    2.Incorrect parameters types. * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function insertData(options: Options, data: UnifiedData): Promise; @@ -2073,7 +3591,8 @@ declare namespace unifiedDataChannel { *
    2.Incorrect parameters types. * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function queryData(options: Options, callback: AsyncCallback>): void; @@ -2098,7 +3617,8 @@ declare namespace unifiedDataChannel { *
    2.Incorrect parameters types. * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function queryData(options: Options): Promise>; diff --git a/api/@ohos.deviceStatus.dragInteraction.d.ts b/api/@ohos.deviceStatus.dragInteraction.d.ts index 16fc70e7cf..78d9075a49 100644 --- a/api/@ohos.deviceStatus.dragInteraction.d.ts +++ b/api/@ohos.deviceStatus.dragInteraction.d.ts @@ -26,7 +26,8 @@ import { Callback } from './@ohos.base'; * @namespace dragInteraction * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace dragInteraction { /** @@ -35,7 +36,8 @@ declare namespace dragInteraction { * @enum { number } * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ enum DragState { /** @@ -43,7 +45,8 @@ declare namespace dragInteraction { * * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ MSG_DRAG_STATE_START = 1, @@ -52,7 +55,8 @@ declare namespace dragInteraction { * * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ MSG_DRAG_STATE_STOP = 2, @@ -61,7 +65,8 @@ declare namespace dragInteraction { * * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ MSG_DRAG_STATE_CANCEL = 3, } @@ -72,7 +77,8 @@ declare namespace dragInteraction { * @interface Summary * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ interface Summary { /** @@ -81,19 +87,21 @@ declare namespace dragInteraction { * @type { string } * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ dataType: string; /** * Data length of the dragged object. * - * @type { number } + * @type { int } * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - dataSize: number; + dataSize: int; } /** @@ -117,7 +125,8 @@ declare namespace dragInteraction { *
    2.Incorrect parameter types.3.Parameter verification failed. * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'drag', callback: Callback): void; @@ -144,7 +153,8 @@ declare namespace dragInteraction { *
    2.Incorrect parameter types.3.Parameter verification failed. * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'drag', callback?: Callback): void; @@ -155,7 +165,8 @@ declare namespace dragInteraction { * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDataSummary(): Array

    ; diff --git a/api/@ohos.distributedHardware.mechanicManager.d.ts b/api/@ohos.distributedHardware.mechanicManager.d.ts index d38db3768f..e5a5eed669 100644 --- a/api/@ohos.distributedHardware.mechanicManager.d.ts +++ b/api/@ohos.distributedHardware.mechanicManager.d.ts @@ -79,7 +79,7 @@ declare namespace mechanicManager { * @param { boolean } isEnabled Whether to enable camera tracking. * @throws { BusinessError } 33300001 - Service exception. * @throws { BusinessError } 33300002 - Device not connected. - * @throws { BusinessError } 33300003 - Feature not supported. + * @throws { BusinessError } 33300003 - Device not supported. * @syscap SystemCapability.Mechanic.Core * @since 20 */ @@ -124,7 +124,7 @@ declare namespace mechanicManager { * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 33300001 - Service exception. * @throws { BusinessError } 33300002 - Device not connected. - * @throws { BusinessError } 33300003 - Feature not supported. + * @throws { BusinessError } 33300003 - Device not supported. * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 @@ -144,9 +144,9 @@ declare namespace mechanicManager { /** * Rotates a mechanical device to the relative angles. - * @param { number } mechId ID of the mechanical device. + * @param { int } mechId ID of the mechanical device. * @param { RotationAngles } angles Relative angles. - * @param { number } duration Rotation duration. Unit: millisecond. + * @param { int } duration Rotation duration. Unit: millisecond. * @returns { Promise } Promise that return the execution result. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 33300001 - Service exception. @@ -156,13 +156,13 @@ declare namespace mechanicManager { * @since 20 */ - function rotate(mechId: number, angles: RotationAngles, duration: number): Promise; + function rotate(mechId: int, angles: RotationAngles, duration: int): Promise; /** * Rotates a mechanical device to the absolute angles. - * @param { number } mechId ID of the mechanical device. + * @param { int } mechId ID of the mechanical device. * @param { EulerAngles } angles Absolute angles. - * @param { number } duration Rotation duration. Unit: millisecond. + * @param { int } duration Rotation duration. Unit: millisecond. * @returns { Promise } Promise that return the execution result. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 33300001 - Service exception. @@ -172,13 +172,13 @@ declare namespace mechanicManager { * @since 20 */ - function rotateToEulerAngles(mechId: number, angles: EulerAngles, duration: number): Promise; + function rotateToEulerAngles(mechId: int, angles: EulerAngles, duration: int): Promise; /** * Obtains the maximum continuous rotation duration of a mechanical device. * - * @param { number } mechId ID of the mechanical device. - * @returns { number } Maximum rotation duration. Unit: millisecond. + * @param { int } mechId ID of the mechanical device. + * @returns { int } Maximum rotation duration. Unit: millisecond. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 33300001 - Service exception. * @throws { BusinessError } 33300002 - Device not connected. @@ -186,12 +186,12 @@ declare namespace mechanicManager { * @systemapi * @since 20 */ - function getMaxRotationTime(mechId: number): number; + function getMaxRotationTime(mechId: int): int; /** * Obtains the maximum rotation speed of a mechanical device. * - * @param { number } mechId ID of the mechanical device. + * @param { int } mechId ID of the mechanical device. * @returns { RotationSpeed } Maximum speed. Only the absolute value of the speed is returned. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 33300001 - Service exception. @@ -200,13 +200,13 @@ declare namespace mechanicManager { * @systemapi * @since 20 */ - function getMaxRotationSpeed(mechId: number): RotationSpeed; + function getMaxRotationSpeed(mechId: int): RotationSpeed; /** * Rotates a mechanical device at the specified speed. - * @param { number } mechId ID of the mechanical device. + * @param { int } mechId ID of the mechanical device. * @param { RotationSpeed } speed Rotation speed. - * @param { number } duration Rotation duration. Unit: millisecond. + * @param { int } duration Rotation duration. Unit: millisecond. * @returns { Promise } Promise that return the execution result. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 33300001 - Service exception. @@ -215,11 +215,11 @@ declare namespace mechanicManager { * @systemapi * @since 20 */ - function rotateBySpeed(mechId: number, speed: RotationSpeed, duration: number): Promise; + function rotateBySpeed(mechId: int, speed: RotationSpeed, duration: int): Promise; /** * Stops a mechanical device from moving. - * @param { number } mechId ID of the mechanical device. + * @param { int } mechId ID of the mechanical device. * @returns { Promise } Promise that returns no value. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 33300001 - Service exception. @@ -228,11 +228,11 @@ declare namespace mechanicManager { * @systemapi * @since 20 */ - function stopMoving(mechId: number): Promise; + function stopMoving(mechId: int): Promise; /** * Obtains the current angles of a mechanical device. - * @param { number } mechId ID of the mechanical device. + * @param { int } mechId ID of the mechanical device. * @returns { EulerAngles } Rotation angles. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 33300001 - Service exception. @@ -242,12 +242,12 @@ declare namespace mechanicManager { * @since 20 */ - function getCurrentAngles(mechId: number): EulerAngles; + function getCurrentAngles(mechId: int): EulerAngles; /** * Obtains the maximum rotation angles relative to the reference point for the specified mechanical device. * - * @param { number } mechId ID of the mechanical device. + * @param { int } mechId ID of the mechanical device. * @returns { RotationLimits } Maximum rotation angles. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 33300001 - Service exception. @@ -257,11 +257,11 @@ declare namespace mechanicManager { * @since 20 */ - function getRotationLimits(mechId: number): RotationLimits; + function getRotationLimits(mechId: int): RotationLimits; /** * Obtains the status of the rotation axes. - * @param { number } mechId ID of the mechanical device. + * @param { int } mechId ID of the mechanical device. * @returns { RotationAxesStatus } Rotation axis status. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 33300001 - Service exception. @@ -270,7 +270,7 @@ declare namespace mechanicManager { * @systemapi * @since 20 */ - function getRotationAxesStatus(mechId: number): RotationAxesStatus; + function getRotationAxesStatus(mechId: int): RotationAxesStatus; /** @@ -309,11 +309,11 @@ declare namespace mechanicManager { export interface MechInfo { /** * ID of the mechanical device. - * @type { number } + * @type { int } * @syscap SystemCapability.Mechanic.Core * @since 20 */ - mechId: number; + mechId: int; /** @@ -343,34 +343,34 @@ declare namespace mechanicManager { */ export interface RotationAngles { /** - * Yaw angle, ranging from -2*Math.PI to 2*Math.PI, measured in radians. - * @type { ?number } + * Yaw angle, ranging from -2π to 2*π, measured in radians. + * @type { ?double } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - yaw?: number; + yaw?: double; /** - * Roll angle, ranging from -2*Math.PI to 2*Math.PI, measured in radians. - * @type { ?number } + * Roll angle, ranging from -2π to 2*π, measured in radians. + * @type { ?double } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - roll?: number; + roll?: double; /** - * Pitch angle, ranging from -2*Math.PI to 2*Math.PI, measured in radians. - * @type { ?number } + * Pitch angle, ranging from -2π to 2*π, measured in radians. + * @type { ?double } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - pitch?: number; + pitch?: double; } /** @@ -383,34 +383,34 @@ declare namespace mechanicManager { */ export interface EulerAngles { /** - * Yaw angle, ranging from -Math.PI to Math.PI, measured in radians. - * @type { ?number } + * Yaw angle, ranging from -π to π, measured in radians. + * @type { ?double } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - yaw?: number; + yaw?: double; /** - * Roll angle, ranging from -Math.PI to Math.PI, measured in radians. - * @type { ?number } + * Roll angle, ranging from -π to π, measured in radians. + * @type { ?double } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - roll?: number; + roll?: double; /** - * Pitch angle, ranging from -Math.PI to Math.PI, measured in radians. - * @type { ?number } + * Pitch angle, ranging from -π to π, measured in radians. + * @type { ?double } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - pitch?: number; + pitch?: double; } /** @@ -425,33 +425,33 @@ declare namespace mechanicManager { export interface RotationSpeed { /** * Yaw speed, measured in radians per second. - * @type { ?number } + * @type { ?double } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - yawSpeed?: number; + yawSpeed?: double; /** * Roll speed, measured in radians per second. - * @type { ?number } + * @type { ?double } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - rollSpeed?: number; + rollSpeed?: double; /** * Pitch speed, measured in radians per second. - * @type { ?number } + * @type { ?double } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - pitchSpeed?: number; + pitchSpeed?: double; } @@ -467,62 +467,62 @@ declare namespace mechanicManager { /** * Maximum yaw rotation angles in the negative direction, ranging from -2*Math.PI to 0, measured in radians. * If the value is less than or equal to -2*Math.PI, there is no restriction. - * @type { number } + * @type { double } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - negativeYawMax: number; + negativeYawMax: double; /** * Maximum yaw rotation angles in the positive direction, ranging from 0 to 2*Math.PI, measured in radians. * If the value is greater than or equal to 2*Math.PI, there is no restriction. - * @type { number } + * @type { double } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - positiveYawMax: number; + positiveYawMax: double; /** * Maximum roll rotation angles in the negative direction, ranging from -2*Math.PI to 0, measured in radians. * If the value is less than or equal to -2*Math.PI, there is no restriction. - * @type { number } + * @type { double } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - negativeRollMax: number; + negativeRollMax: double; /** * Maximum roll rotation angles in the positive direction, ranging from 0 to 2*Math.PI, measured in radians. * If the value is greater than or equal to 2*Math.PI, there is no restriction. - * @type { number } + * @type { double } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - positiveRollMax: number; + positiveRollMax: double; /** * Maximum pitch rotation angles in the negative direction, ranging from -2*Math.PI to 0, measured in radians. * If the value is less than or equal to -2*Math.PI, there is no restriction. - * @type { number } + * @type { double } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - negativePitchMax: number; + negativePitchMax: double; /** * Maximum pitch rotation angles in the positive direction, ranging from 0 to 2*Math.PI, measured in radians. * If the value is greater than or equal to 2*Math.PI, there is no restriction. - * @type { number } + * @type { double } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - positivePitchMax: number; + positivePitchMax: double; } /** @@ -632,12 +632,12 @@ declare namespace mechanicManager { export interface RotationAxesStateChangeInfo { /** * ID of the mechanical device. - * @type { number } + * @type { int } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - mechId: number; + mechId: int; /** * Rotate axis status. diff --git a/api/@ohos.driver.deviceManager.d.ts b/api/@ohos.driver.deviceManager.d.ts index 86be9a130b..a2b204dce1 100644 --- a/api/@ohos.driver.deviceManager.d.ts +++ b/api/@ohos.driver.deviceManager.d.ts @@ -26,21 +26,23 @@ import type rpc from './@ohos.rpc'; * * @namespace deviceManager * @syscap SystemCapability.Driver.ExternalDevice - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace deviceManager { /** * Query the external device list. * * @permission ohos.permission.ACCESS_EXTENSIONAL_DEVICE_DRIVER - * @param { number } busType - The bus type of device to be queried. + * @param { int } busType - The bus type of device to be queried. * @returns { Array> } External device list. * @throws { BusinessError } 201 - The permission check failed. * @throws { BusinessError } 22900001 - ExternalDeviceManager service exception or busType parameter error. * @syscap SystemCapability.Driver.ExternalDevice - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - function queryDevices(busType?: number): Array>; + function queryDevices(busType?: int): Array>; /** * Bind the device based on the device information returned by queryDevices(). @@ -161,7 +163,7 @@ declare namespace deviceManager { * Queries external device information. * * @permission ohos.permission.ACCESS_EXTENSIONAL_DEVICE_DRIVER - * @param { number } deviceId - ID of device to query. + * @param { long } deviceId - ID of device to query. * @returns { Array> } Device information obtained. * @throws { BusinessError } 201 - The permission check failed. * @throws { BusinessError } 202 - Permission denied. A non-system application cannot call a system API. @@ -169,9 +171,10 @@ declare namespace deviceManager { * @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - function queryDeviceInfo(deviceId?: number): Array>; + function queryDeviceInfo(deviceId?: long): Array>; /** * Queries driver information. @@ -185,53 +188,58 @@ declare namespace deviceManager { * @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function queryDriverInfo(driverUid?: string): Array>; /** - * Bind the device based on the device information returned by queryDevices(). - * - * @permission ohos.permission.ACCESS_DDK_DRIVERS - * @param { number } deviceId - Device id on the device list returned by queryDevices(). - * @param { AsyncCallback } onDisconnect - Callback is invoked when device is disconnected after bind - * success. - * @returns { Promise } Indicates the bind result including device ID and remote object. - * @throws { BusinessError } 201 - The permission check failed. - * @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. - * @throws { BusinessError } 26300002 - The driver service does not allow any client to bind. - * @syscap SystemCapability.Driver.ExternalDevice - * @since 19 - */ - function bindDriverWithDeviceId(deviceId: number, onDisconnect: AsyncCallback): Promise; + * Bind the device based on the device information returned by queryDevices(). + * + * @permission ohos.permission.ACCESS_DDK_DRIVERS + * @param { long } deviceId - Device id on the device list returned by queryDevices(). + * @param { AsyncCallback } onDisconnect - Callback is invoked when device is disconnected after bind + * success. + * @returns { Promise } Indicates the bind result including device ID and remote object. + * @throws { BusinessError } 201 - The permission check failed. + * @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. + * @throws { BusinessError } 26300002 - The driver service does not allow any client to bind. + * @syscap SystemCapability.Driver.ExternalDevice + * @since arkts{ '1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 + */ + function bindDriverWithDeviceId(deviceId: long, onDisconnect: AsyncCallback): Promise; /** - * Unbind the device based on the device information returned by queryDevices(). - * - * @permission ohos.permission.ACCESS_DDK_DRIVERS - * @param { number } deviceId - Device id on the device list returned by queryDevices(). - * @returns { Promise } - Indicates the unbind result invoked when unbind is finished. - * @throws { BusinessError } 201 - The permission check failed. - * @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. - * @throws { BusinessError } 26300003 - There is no binding relationship. - * @syscap SystemCapability.Driver.ExternalDevice - * @since 19 - */ - function unbindDriverWithDeviceId(deviceId: number): Promise; + * Unbind the device based on the device information returned by queryDevices(). + * + * @permission ohos.permission.ACCESS_DDK_DRIVERS + * @param { long } deviceId - Device id on the device list returned by queryDevices(). + * @returns { Promise } - Indicates the unbind result invoked when unbind is finished. + * @throws { BusinessError } 201 - The permission check failed. + * @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. + * @throws { BusinessError } 26300003 - There is no binding relationship. + * @syscap SystemCapability.Driver.ExternalDevice + * @since arkts{ '1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 + */ + function unbindDriverWithDeviceId(deviceId: long): Promise; /** * Enumerates the bus types. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Driver.ExternalDevice - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum BusType { /** * USB device type * * @syscap SystemCapability.Driver.ExternalDevice - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ USB = 1, } @@ -241,7 +249,8 @@ declare namespace deviceManager { * * @typedef Device * @syscap SystemCapability.Driver.ExternalDevice - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ interface Device { /** @@ -249,25 +258,28 @@ declare namespace deviceManager { * * @type { BusType } * @syscap SystemCapability.Driver.ExternalDevice - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ busType: BusType; /** * Device ID. * - * @type { number } + * @type { long } * @syscap SystemCapability.Driver.ExternalDevice - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - deviceId: number; + deviceId: long; /** * Description of the device. * * @type { string } * @syscap SystemCapability.Driver.ExternalDevice - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ description: string; } @@ -278,26 +290,29 @@ declare namespace deviceManager { * @typedef USBDevice * @extends Device * @syscap SystemCapability.Driver.ExternalDevice - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ interface USBDevice extends Device { /** * Vendor ID. * - * @type { number } + * @type { int } * @syscap SystemCapability.Driver.ExternalDevice - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - vendorId: number; + vendorId: int; /** * Product ID. * - * @type { number } + * @type { int } * @syscap SystemCapability.Driver.ExternalDevice - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - productId: number; + productId: int; } /** @@ -305,24 +320,27 @@ declare namespace deviceManager { * * @typedef RemoteDeviceDriver * @syscap SystemCapability.Driver.ExternalDevice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ interface RemoteDeviceDriver { /** * Device ID. * - * @type { number } + * @type { long } * @syscap SystemCapability.Driver.ExternalDevice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - deviceId: number; + deviceId: long; /** * Remote driver object. * * @type { rpc.IRemoteObject } * @syscap SystemCapability.Driver.ExternalDevice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ remote: rpc.IRemoteObject; } @@ -333,48 +351,53 @@ declare namespace deviceManager { * @typedef USBInterfaceDesc * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface USBInterfaceDesc { /** * Interface number. * - * @type { number } + * @type { int } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - bInterfaceNumber: number; + bInterfaceNumber: int; /** * Interface class code. * - * @type { number } + * @type { int } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - bClass: number; + bClass: int; /** * Interface subclass code. * - * @type { number } + * @type { int } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - bSubClass: number; + bSubClass: int; /** * Interface protocol. * - * @type { number } + * @type { int } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - bProtocol: number; + bProtocol: int; } @@ -384,18 +407,20 @@ declare namespace deviceManager { * @typedef DeviceInfo * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface DeviceInfo { /** * Device ID. * - * @type { number } + * @type { long } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - deviceId: number; + deviceId: long; /** * Whether the device has a matched driver. @@ -403,7 +428,8 @@ declare namespace deviceManager { * @type { boolean } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ isDriverMatched: boolean; @@ -413,7 +439,8 @@ declare namespace deviceManager { * @type { ?string } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ driverUid?: string; } @@ -425,28 +452,31 @@ declare namespace deviceManager { * @extends DeviceInfo * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface USBDeviceInfo extends DeviceInfo { /** * Vendor ID. * - * @type { number } + * @type { int } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - vendorId: number; + vendorId: int; /** * Product ID. * - * @type { number } + * @type { int } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - productId: number; + productId: int; /** * List of USB interface descriptors. @@ -454,7 +484,8 @@ declare namespace deviceManager { * @type { Array> } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interfaceDescList: Array>; } @@ -465,7 +496,8 @@ declare namespace deviceManager { * @typedef DriverInfo * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface DriverInfo { /** @@ -474,7 +506,8 @@ declare namespace deviceManager { * @type { BusType } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ busType: BusType; @@ -484,7 +517,8 @@ declare namespace deviceManager { * @type { string } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ driverUid: string; @@ -494,7 +528,8 @@ declare namespace deviceManager { * @type { string } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ driverName: string; @@ -504,7 +539,8 @@ declare namespace deviceManager { * @type { string } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ driverVersion: string; @@ -514,7 +550,8 @@ declare namespace deviceManager { * @type { string } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ driverSize: string; @@ -524,7 +561,8 @@ declare namespace deviceManager { * @type { string } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ description: string; } @@ -536,28 +574,31 @@ declare namespace deviceManager { * @extends DriverInfo * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface USBDriverInfo extends DriverInfo { /** * IDs of supported products. * - * @type { Array } + * @type { Array } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - productIdList: Array; + productIdList: Array; /** * IDs of supported vendors. * - * @type { Array } + * @type { Array } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - vendorIdList: Array; + vendorIdList: Array; } } diff --git a/api/@ohos.effectKit.d.ts b/api/@ohos.effectKit.d.ts index 507f0c73b8..269b7cfe6f 100644 --- a/api/@ohos.effectKit.d.ts +++ b/api/@ohos.effectKit.d.ts @@ -1,800 +1,800 @@ -/* -* Copyright (c) 2022 Huawei Device Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -/** - * @file - * @kit ArkGraphics2D - */ - - -import { AsyncCallback } from './@ohos.base'; -import image from './@ohos.multimedia.image'; - - -/** - * @namespace effectKit - * @since 9 - */ -/** - * @namespace effectKit - * @form - * @atomicservice - * @since 12 - */ -/** - * @namespace effectKit - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - -declare namespace effectKit { - - /** - * The Filter of FilterChain. - * @typedef Filter - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * The Filter of FilterChain. - * @typedef Filter - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * The Filter of FilterChain. - * @typedef Filter - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - interface Filter { - - /** - * A blur effect is added to the image. - * @param { number } radius - The degree of blur, the value is measured in pixels. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * A blur effect is added to the image. - * @param { number } radius - The degree of blur, the value is measured in pixels. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * A blur effect is added to the image. - * @param { number } radius - The degree of blur, the value is measured in pixels. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - blur(radius: number): Filter; - - /** - * A blur effect is added to the image. - * @param { number } radius - The degree of blur, the value is measured in pixels. - * @param { TileMode } tileMode - The tile mode of blur. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - blur(radius: number, tileMode: TileMode): Filter; - - /** - * A Brightness effect is added to the image. - * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * A Brightness effect is added to the image. - * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * A Brightness effect is added to the image. - * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - brightness(bright: number): Filter; - - /** - * A Grayscale effect is added to the image. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * A Grayscale effect is added to the image. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * A Grayscale effect is added to the image. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - grayscale(): Filter; - - /** - * A invert effect is added to the image. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 - */ - /** - * A invert effect is added to the image. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - invert(): Filter; - - /** - * A custom effect is added to the image. - * - * @param { Array } colorMatrix - A matrix of 5x4 size for create effect filter. - * @returns { Filter } Filters for the current effect have been added. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 - */ - /** - * A custom effect is added to the image. - * - * @param { Array } colorMatrix - A matrix of 5x4 size for create effect filter. - * @returns { Filter } Filters for the current effect have been added. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - setColorMatrix(colorMatrix: Array): Filter; - - /** - * Gets the PixelMap where all filter effects have been added to the image. - * @returns { image.PixelMap } image.PixelMap. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - * @deprecated since 11 - * @useinstead effectKit.Filter#getEffectPixelMap - */ - getPixelMap(): image.PixelMap; - - /** - * Gets the PixelMap where all filter effects have been added to the image. - * @returns { Promise } - returns the PixelMap generated. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 11 - */ - /** - * Gets the PixelMap where all filter effects have been added to the image. - * @returns { Promise } - returns the PixelMap generated. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Gets the PixelMap where all filter effects have been added to the image. - * @returns { Promise } - returns the PixelMap generated. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - getEffectPixelMap(): Promise; - } - - /** - * The color picker of an image. - * @typedef ColorPicker - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * The color picker of an image. - * @typedef ColorPicker - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * The color picker of an image. - * @typedef ColorPicker - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - interface ColorPicker { - - /** - * get main color of an image - * @returns { Promise } returns the MainColor generated. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * get main color of an image - * @returns { Promise } returns the MainColor generated. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * get main color of an image - * @returns { Promise } returns the MainColor generated. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - getMainColor(): Promise; - - /** - * get main color of an image - * @returns { Color } Main color picked in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * get main color of an image - * @returns { Color } Main color picked in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * get main color of an image - * @returns { Color } Main color picked in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - getMainColorSync(): Color; - - /** - * Get largest proportion color of an image - * @returns { Color } Largest proportion color picked in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 10 - */ - /** - * Get largest proportion color of an image - * @returns { Color } Largest proportion color picked in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Get largest proportion color of an image - * @returns { Color } Largest proportion color picked in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - getLargestProportionColor(): Color; - - /** - * Get top proportion color of an image - * @param { number } colorCount - The number of colors to require, the value is 1 to 10. - * @returns { Array } An array of feature colors sorted by proportion, with a size equal to - * the minimum of colorCount and the actual number of extracted feature colors. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Get top proportion color of an image - * @param { number } colorCount - The number of colors to require, the value is 1 to 10. - * @returns { Array } An array of feature colors sorted by proportion, with a size equal to - * the minimum of colorCount and the actual number of extracted feature colors. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - getTopProportionColors(colorCount: number): Array; - - /** - * Get highest saturation color of an image - * @returns { Color } Highest saturation color picked in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 10 - */ - /** - * Get highest saturation color of an image - * @returns { Color } Highest saturation color picked in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Get highest saturation color of an image - * @returns { Color } Highest saturation color picked in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - getHighestSaturationColor(): Color; - - /** - * Get average color of an image - * @returns { Color } Average color calculated in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 10 - */ - /** - * Get average color of an image - * @returns { Color } Average color calculated in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Get average color of an image - * @returns { Color } Average color calculated in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - getAverageColor(): Color; - - /** - * Determine whether the color is black or white or gray - * @param { number } color - The 32 bit ARGB color to discriminate. - * @returns { boolean } Result of judging black, white and gray. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 10 - */ - /** - * Determine whether the color is black or white or gray - * @param { number } color - The 32 bit ARGB color to discriminate. - * @returns { boolean } Result of judging black, white and gray. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Determine whether the color is black or white or gray - * @param { number } color - The 32 bit ARGB color to discriminate. - * @returns { boolean } Result of judging black, white and gray. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - isBlackOrWhiteOrGrayColor(color: number): boolean; - } - - /** - * The color param. - * @typedef Color - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * The color param. - * @typedef Color - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * The color param. - * @typedef Color - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - interface Color { - - /** - * Red - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * Red - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Red - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - red: number; - - /** - * Green - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * Green - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Green - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - green: number; - - /** - * Blue - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * Blue - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Blue - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - blue: number; - - /** - * Alpha - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * Alpha - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Alpha - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - alpha: number; - } - - /** - * Create a FilterChain to add multiple effects to an image. - * @param { image.PixelMap } source - the source pixelmap. - * @returns { Filter } Returns the head node of FilterChain. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * Create a FilterChain to add multiple effects to an image. - * @param { image.PixelMap } source - the source pixelmap. - * @returns { Filter } Returns the head node of FilterChain. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Create a FilterChain to add multiple effects to an image. - * @param { image.PixelMap } source - the source pixelmap. - * @returns { Filter } Returns the head node of FilterChain. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function createEffect(source: image.PixelMap): Filter; - - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @returns { Promise } - returns the ColorPicker generated. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @returns { Promise } - returns the ColorPicker generated. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @returns { Promise } - returns the ColorPicker generated. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function createColorPicker(source: image.PixelMap): Promise; - - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, - * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. - * @returns { Promise } - returns the ColorPicker generated. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 10 - */ - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, - * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. - * @returns { Promise } - returns the ColorPicker generated. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, - * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. - * @returns { Promise } - returns the ColorPicker generated. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function createColorPicker(source: image.PixelMap, region: Array): Promise; - - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @param { AsyncCallback } callback - the callback of createColorPicker. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @param { AsyncCallback } callback - the callback of createColorPicker. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @param { AsyncCallback } callback - the callback of createColorPicker. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function createColorPicker(source: image.PixelMap, callback: AsyncCallback): void; - - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, - * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. - * @param { AsyncCallback } callback - the callback of createColorPicker. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 10 - */ - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, - * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. - * @param { AsyncCallback } callback - the callback of createColorPicker. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, - * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. - * @param { AsyncCallback } callback - the callback of createColorPicker. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function createColorPicker(source: image.PixelMap, region: Array, callback: AsyncCallback): void; - - /** - * TileMode enumeration description - * - * @enum { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - enum TileMode { - /** - * Clamp mode. - * - * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - CLAMP = 0, - - /** - * Repeat mode. - * - * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - REPEAT = 1, - - /** - * Mirror mode. - * - * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - MIRROR = 2, - - /** - * Decal mode. - * - * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - DECAL = 3, - } -} - -export default effectKit; +/* +* Copyright (c) 2022 Huawei Device Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +/** + * @file + * @kit ArkGraphics2D + */ + + +import { AsyncCallback } from './@ohos.base'; +import image from './@ohos.multimedia.image'; + + +/** + * @namespace effectKit + * @since 9 + */ +/** + * @namespace effectKit + * @form + * @atomicservice + * @since 12 + */ +/** + * @namespace effectKit + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + +declare namespace effectKit { + + /** + * The Filter of FilterChain. + * @typedef Filter + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * The Filter of FilterChain. + * @typedef Filter + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * The Filter of FilterChain. + * @typedef Filter + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + interface Filter { + + /** + * A blur effect is added to the image. + * @param { number } radius - The degree of blur, the value is measured in pixels. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * A blur effect is added to the image. + * @param { number } radius - The degree of blur, the value is measured in pixels. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * A blur effect is added to the image. + * @param { number } radius - The degree of blur, the value is measured in pixels. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + blur(radius: number): Filter; + + /** + * A blur effect is added to the image. + * @param { number } radius - The degree of blur, the value is measured in pixels. + * @param { TileMode } tileMode - The tile mode of blur. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + blur(radius: number, tileMode: TileMode): Filter; + + /** + * A Brightness effect is added to the image. + * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * A Brightness effect is added to the image. + * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * A Brightness effect is added to the image. + * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + brightness(bright: number): Filter; + + /** + * A Grayscale effect is added to the image. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * A Grayscale effect is added to the image. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * A Grayscale effect is added to the image. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + grayscale(): Filter; + + /** + * A invert effect is added to the image. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 12 + */ + /** + * A invert effect is added to the image. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + invert(): Filter; + + /** + * A custom effect is added to the image. + * + * @param { Array } colorMatrix - A matrix of 5x4 size for create effect filter. + * @returns { Filter } Filters for the current effect have been added. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 12 + */ + /** + * A custom effect is added to the image. + * + * @param { Array } colorMatrix - A matrix of 5x4 size for create effect filter. + * @returns { Filter } Filters for the current effect have been added. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + setColorMatrix(colorMatrix: Array): Filter; + + /** + * Gets the PixelMap where all filter effects have been added to the image. + * @returns { image.PixelMap } image.PixelMap. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + * @deprecated since 11 + * @useinstead effectKit.Filter#getEffectPixelMap + */ + getPixelMap(): image.PixelMap; + + /** + * Gets the PixelMap where all filter effects have been added to the image. + * @returns { Promise } - returns the PixelMap generated. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 11 + */ + /** + * Gets the PixelMap where all filter effects have been added to the image. + * @returns { Promise } - returns the PixelMap generated. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Gets the PixelMap where all filter effects have been added to the image. + * @returns { Promise } - returns the PixelMap generated. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + getEffectPixelMap(): Promise; + } + + /** + * The color picker of an image. + * @typedef ColorPicker + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * The color picker of an image. + * @typedef ColorPicker + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * The color picker of an image. + * @typedef ColorPicker + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + interface ColorPicker { + + /** + * get main color of an image + * @returns { Promise } returns the MainColor generated. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * get main color of an image + * @returns { Promise } returns the MainColor generated. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * get main color of an image + * @returns { Promise } returns the MainColor generated. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + getMainColor(): Promise; + + /** + * get main color of an image + * @returns { Color } Main color picked in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * get main color of an image + * @returns { Color } Main color picked in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * get main color of an image + * @returns { Color } Main color picked in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + getMainColorSync(): Color; + + /** + * Get largest proportion color of an image + * @returns { Color } Largest proportion color picked in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 10 + */ + /** + * Get largest proportion color of an image + * @returns { Color } Largest proportion color picked in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Get largest proportion color of an image + * @returns { Color } Largest proportion color picked in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + getLargestProportionColor(): Color; + + /** + * Get top proportion color of an image + * @param { number } colorCount - The number of colors to require, the value is 1 to 10. + * @returns { Array } An array of feature colors sorted by proportion, with a size equal to + * the minimum of colorCount and the actual number of extracted feature colors. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Get top proportion color of an image + * @param { number } colorCount - The number of colors to require, the value is 1 to 10. + * @returns { Array } An array of feature colors sorted by proportion, with a size equal to + * the minimum of colorCount and the actual number of extracted feature colors. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + getTopProportionColors(colorCount: number): Array; + + /** + * Get highest saturation color of an image + * @returns { Color } Highest saturation color picked in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 10 + */ + /** + * Get highest saturation color of an image + * @returns { Color } Highest saturation color picked in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Get highest saturation color of an image + * @returns { Color } Highest saturation color picked in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + getHighestSaturationColor(): Color; + + /** + * Get average color of an image + * @returns { Color } Average color calculated in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 10 + */ + /** + * Get average color of an image + * @returns { Color } Average color calculated in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Get average color of an image + * @returns { Color } Average color calculated in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + getAverageColor(): Color; + + /** + * Determine whether the color is black or white or gray + * @param { number } color - The 32 bit ARGB color to discriminate. + * @returns { boolean } Result of judging black, white and gray. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 10 + */ + /** + * Determine whether the color is black or white or gray + * @param { number } color - The 32 bit ARGB color to discriminate. + * @returns { boolean } Result of judging black, white and gray. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Determine whether the color is black or white or gray + * @param { number } color - The 32 bit ARGB color to discriminate. + * @returns { boolean } Result of judging black, white and gray. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + isBlackOrWhiteOrGrayColor(color: number): boolean; + } + + /** + * The color param. + * @typedef Color + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * The color param. + * @typedef Color + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * The color param. + * @typedef Color + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + interface Color { + + /** + * Red + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * Red + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Red + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + red: number; + + /** + * Green + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * Green + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Green + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + green: number; + + /** + * Blue + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * Blue + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Blue + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + blue: number; + + /** + * Alpha + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * Alpha + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Alpha + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + alpha: number; + } + + /** + * Create a FilterChain to add multiple effects to an image. + * @param { image.PixelMap } source - the source pixelmap. + * @returns { Filter } Returns the head node of FilterChain. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * Create a FilterChain to add multiple effects to an image. + * @param { image.PixelMap } source - the source pixelmap. + * @returns { Filter } Returns the head node of FilterChain. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Create a FilterChain to add multiple effects to an image. + * @param { image.PixelMap } source - the source pixelmap. + * @returns { Filter } Returns the head node of FilterChain. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function createEffect(source: image.PixelMap): Filter; + + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @returns { Promise } - returns the ColorPicker generated. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @returns { Promise } - returns the ColorPicker generated. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @returns { Promise } - returns the ColorPicker generated. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function createColorPicker(source: image.PixelMap): Promise; + + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, + * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. + * @returns { Promise } - returns the ColorPicker generated. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 10 + */ + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, + * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. + * @returns { Promise } - returns the ColorPicker generated. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, + * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. + * @returns { Promise } - returns the ColorPicker generated. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function createColorPicker(source: image.PixelMap, region: Array): Promise; + + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @param { AsyncCallback } callback - the callback of createColorPicker. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @param { AsyncCallback } callback - the callback of createColorPicker. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @param { AsyncCallback } callback - the callback of createColorPicker. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function createColorPicker(source: image.PixelMap, callback: AsyncCallback): void; + + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, + * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. + * @param { AsyncCallback } callback - the callback of createColorPicker. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 10 + */ + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, + * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. + * @param { AsyncCallback } callback - the callback of createColorPicker. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, + * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. + * @param { AsyncCallback } callback - the callback of createColorPicker. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function createColorPicker(source: image.PixelMap, region: Array, callback: AsyncCallback): void; + + /** + * TileMode enumeration description + * + * @enum { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + enum TileMode { + /** + * Clamp mode. + * + * @syscap SystemCapability.Multimedia.Image.Core + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + CLAMP = 0, + + /** + * Repeat mode. + * + * @syscap SystemCapability.Multimedia.Image.Core + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + REPEAT = 1, + + /** + * Mirror mode. + * + * @syscap SystemCapability.Multimedia.Image.Core + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + MIRROR = 2, + + /** + * Decal mode. + * + * @syscap SystemCapability.Multimedia.Image.Core + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + DECAL = 3, + } +} + +export default effectKit; diff --git a/api/@ohos.file.hash.d.ts b/api/@ohos.file.hash.d.ts index e6beae59b3..ea4355c1f8 100644 --- a/api/@ohos.file.hash.d.ts +++ b/api/@ohos.file.hash.d.ts @@ -195,7 +195,8 @@ declare namespace hash { * @throws { BusinessError } 13900020 - Invalid argument * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ /** * Create file read stream. diff --git a/api/@ohos.file.keyManager.d.ts b/api/@ohos.file.keyManager.d.ts index 058ad8dd99..dd72db4b87 100644 --- a/api/@ohos.file.keyManager.d.ts +++ b/api/@ohos.file.keyManager.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2024-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,6 +16,7 @@ /** * @file * @kit CoreFileKit + * @arkts 1.1&1.2 */ /** @@ -23,7 +24,7 @@ * * @namespace keyManager * @syscap SystemCapability.FileManagement.StorageService.Encryption - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} */ declare namespace keyManager { /** @@ -40,7 +41,7 @@ declare namespace keyManager { * @throws { BusinessError } 13600009 - User ID out of range. Possible causes: input parameter userId < 100 or userId > 10736. * @syscap SystemCapability.FileManagement.StorageService.Encryption * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} */ function deactivateUserKey(userId: number):void; } diff --git a/api/@ohos.file.photoAccessHelper.d.ts b/api/@ohos.file.photoAccessHelper.d.ts index 374a50ee0d..21826c3db9 100644 --- a/api/@ohos.file.photoAccessHelper.d.ts +++ b/api/@ohos.file.photoAccessHelper.d.ts @@ -298,7 +298,8 @@ declare namespace photoAccessHelper { * @enum { number } ThumbnailVisibility * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enum ThumbnailVisibility { /** @@ -306,7 +307,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ INVISIBLE = 0, /** @@ -314,7 +316,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ VISIBLE = 1 } @@ -370,7 +373,8 @@ declare namespace photoAccessHelper { * Stored both on a local device and cloud. * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ LOCAL_AND_CLOUD = 3 } @@ -534,7 +538,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ ANALYSIS_SEARCH_INDEX = 16 } @@ -654,7 +659,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ COLOR_STYLE_PHOTO = 12 } @@ -1092,7 +1098,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ class MediaAssetManager { /** @@ -1110,7 +1117,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @static * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ static requestImage( context: Context, @@ -1158,7 +1166,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @static * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ static requestImageData( context: Context, @@ -1200,7 +1209,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @static * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ static requestMovingPhoto( context: Context, @@ -1222,7 +1232,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @static * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ static cancelRequest(context: Context, requestId: string): Promise; @@ -1261,7 +1272,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @static * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ static requestVideoFile( context: Context, @@ -1298,7 +1310,8 @@ declare namespace photoAccessHelper { * @static * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ static loadMovingPhoto( context: Context, @@ -1699,7 +1712,8 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ getThumbnailData(type: ThumbnailType): Promise; /** @@ -1829,7 +1843,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ getExif(callback: AsyncCallback): void; /** @@ -1862,7 +1877,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ getExif(): Promise; /** @@ -1878,7 +1894,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ setPending(pendingState: boolean, callback: AsyncCallback): void; /** @@ -1894,7 +1911,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ setPending(pendingState: boolean): Promise; /** @@ -1909,7 +1927,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ isEdited(callback: AsyncCallback): void; /** @@ -1924,7 +1943,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ isEdited(): Promise; /** @@ -1939,7 +1959,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ requestEditData(callback: AsyncCallback): void; /** @@ -1954,7 +1975,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ requestEditData(): Promise; /** @@ -1969,7 +1991,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ getEditData(): Promise; /** @@ -1984,7 +2007,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error. It is recommended to retry and check the logs. *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ clone(title: string): Promise; /** @@ -2027,7 +2051,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ requestSource(callback: AsyncCallback): void; /** @@ -2042,7 +2067,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ requestSource(): Promise; /** @@ -2076,7 +2102,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ commitEditedAsset(editData: string, uri: string): Promise; /** @@ -2106,7 +2133,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ revertToOriginal(): Promise; /** @@ -2154,7 +2182,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ cancelPhotoRequest(requestId: string): void; /** @@ -2171,7 +2200,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ getKeyFrameThumbnail(beginFrameTimeMs: number, type: ThumbnailType): Promise; } @@ -2795,7 +2825,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ THUMBNAIL_VISIBLE = 'thumbnail_visible', /** @@ -2803,7 +2834,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ IS_CE_AUTO = 'is_auto', /** @@ -2811,7 +2843,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ OWNER_ALBUM_ID = 'owner_album_id', /** @@ -2819,14 +2852,16 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ IS_RECENT_SHOW = 'is_recent_show', /** * Suffix of the asset, read only * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ MEDIA_SUFFIX = 'media_suffix', /** @@ -2898,7 +2933,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ ALBUM_LPATH = 'lpath', /** @@ -2906,7 +2942,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ BUNDLE_NAME = 'bundle_name', /** @@ -3219,7 +3256,8 @@ declare namespace photoAccessHelper { * @interface PhotoCreationSource * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface PhotoCreationSource { /** @@ -3228,7 +3266,8 @@ declare namespace photoAccessHelper { * @type { ?string } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ bundleName?: string; /** @@ -3237,7 +3276,8 @@ declare namespace photoAccessHelper { * @type { ?string } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ appName?: string; /** @@ -3246,7 +3286,8 @@ declare namespace photoAccessHelper { * @type { ?string } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ appId?: string; /** @@ -3255,7 +3296,8 @@ declare namespace photoAccessHelper { * @type { ?number } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ tokenId?: number; } @@ -3345,7 +3387,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Checks whether the result set points to the last row. @@ -3533,7 +3576,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Obtains the last object asset in the fetch result. @@ -3568,7 +3612,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Obtains the last object asset in the fetch result. @@ -3819,7 +3864,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ SOURCE = 2048, /** @@ -4250,7 +4296,8 @@ declare namespace photoAccessHelper { * @readonly * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ readonly lpath?: string; /** @@ -4454,7 +4501,8 @@ declare namespace photoAccessHelper { * @readonly * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ readonly dateAdded?: number; /** @@ -4464,7 +4512,8 @@ declare namespace photoAccessHelper { * @readonly * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ readonly dateModified?: number; /** @@ -5402,7 +5451,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getDataAnalysisProgress(analysisType: AnalysisType): Promise; /** @@ -5664,7 +5714,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ saveGalleryFormInfo(info: GalleryFormInfo): Promise; /** @@ -5680,7 +5731,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ removeFormInfo(info: FormInfo, callback: AsyncCallback): void; /** @@ -5696,7 +5748,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ removeFormInfo(info: FormInfo): Promise; /** @@ -5712,7 +5765,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ removeGalleryFormInfo(info: GalleryFormInfo): Promise; /** @@ -5728,7 +5782,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ updateGalleryFormInfo(info: GalleryFormInfo): Promise; /** @@ -5778,7 +5833,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ grantPhotoUrisPermission(tokenId: number, uriList: Array, photoPermissionType: PhotoPermissionType, hideSensitiveType: HideSensitiveType): Promise; /** @@ -5817,7 +5873,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ cancelPhotoUriPermission(tokenId: number, uri: string, photoPermissionType: PhotoPermissionType): Promise; /** @@ -5834,7 +5891,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ startThumbnailCreationTask(predicate: dataSharePredicates.DataSharePredicates, callback: AsyncCallback): number; /** @@ -5866,7 +5924,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ getSharedPhotoAssets(options: FetchOptions): Array; /** @@ -5878,7 +5937,8 @@ declare namespace photoAccessHelper { *
    2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 14000011 - Internal system error. It is recommended to retry and check the logs. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ getSupportedPhotoFormats(photoType: PhotoType): Promise>; /** @@ -5894,7 +5954,8 @@ declare namespace photoAccessHelper { *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ startAssetAnalysis(type: AnalysisType, assetUris?: Array): Promise; /** @@ -5910,7 +5971,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ getAlbumsByIds(albumIds: Array): Promise>; /** @@ -5929,7 +5991,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ createAssetsForAppWithAlbum(source: PhotoCreationSource, albumUri: string, isAuthorized: boolean, photoCreationConfigs: Array): Promise>; @@ -6809,7 +6872,8 @@ declare namespace photoAccessHelper { * @interface GalleryFormInfo * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface GalleryFormInfo { /** @@ -6818,7 +6882,8 @@ declare namespace photoAccessHelper { * @type { string } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ formId: string; /** @@ -6827,7 +6892,8 @@ declare namespace photoAccessHelper { * @type { ?Array } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ assetUris?: Array; } @@ -6994,7 +7060,8 @@ declare namespace photoAccessHelper { * @type { Array } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ sharedPhotoAssets: Array; /** @@ -7003,7 +7070,8 @@ declare namespace photoAccessHelper { * @type { Array } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ sharedAlbumAssets: Array; /** @@ -7012,7 +7080,8 @@ declare namespace photoAccessHelper { * @type { Array } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ sharedExtraPhotoAssets: Array; } @@ -7896,7 +7965,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ constructor(compatibleFormat: string, formatVersion: string); @@ -7989,7 +8059,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ PRIVATE_MOVING_PHOTO_METADATA = 5 } @@ -8578,7 +8649,8 @@ declare namespace photoAccessHelper { *
    2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ setOrientation(orientation: number): void; @@ -8630,7 +8702,8 @@ declare namespace photoAccessHelper { * @static * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ static deleteLocalAssetsPermanently(context: Context, assets: Array): Promise; @@ -8735,7 +8808,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ setIsRecentShow(isRencentShow: boolean): void; } @@ -9433,7 +9507,8 @@ declare namespace photoAccessHelper { * @type { ?number } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ thumbnailModifiedMs?: number; /** @@ -9442,7 +9517,8 @@ declare namespace photoAccessHelper { * @type { ThumbnailVisibility } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ thumbnailVisible: ThumbnailVisibility; } @@ -9453,7 +9529,8 @@ declare namespace photoAccessHelper { * @interface SharedAlbumAsset * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ interface SharedAlbumAsset { /** @@ -9462,7 +9539,8 @@ declare namespace photoAccessHelper { * @type { number } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ albumId: number; /** @@ -9471,7 +9549,8 @@ declare namespace photoAccessHelper { * @type { AlbumType } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ albumType: AlbumType; /** @@ -9480,7 +9559,8 @@ declare namespace photoAccessHelper { * @type { AlbumSubtype } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ albumSubType: AlbumSubtype; /** @@ -9489,7 +9569,8 @@ declare namespace photoAccessHelper { * @type { string } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ albumName: string; /** @@ -9498,7 +9579,8 @@ declare namespace photoAccessHelper { * @type { string } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ coverUri: string; /** @@ -9507,7 +9589,8 @@ declare namespace photoAccessHelper { * @type { number } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ count: number; /** @@ -9516,7 +9599,8 @@ declare namespace photoAccessHelper { * @type { number } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ imageCount: number; /** @@ -9525,7 +9609,8 @@ declare namespace photoAccessHelper { * @type { number } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ videoCount: number; } @@ -9792,7 +9877,8 @@ declare namespace photoAccessHelper { * @extends MediaAlbumChangeRequest * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ class MediaAnalysisAlbumChangeRequest extends MediaAlbumChangeRequest { /** @@ -9804,7 +9890,8 @@ declare namespace photoAccessHelper { *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ constructor(album: Album); @@ -9822,7 +9909,8 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ setOrderPosition(assets: Array, position: Array): void; } @@ -9832,7 +9920,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ class AnalysisAlbum { /** @@ -9844,7 +9933,8 @@ declare namespace photoAccessHelper { *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ constructor(album: Album); /** @@ -9861,7 +9951,8 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ getOrderPosition(assets: Array): Promise>; } @@ -9919,7 +10010,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getHighlightResource(resourceUri: string): Promise; @@ -9937,7 +10029,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setHighlightUserActionData(type: HighlightUserActionType, actionData: number): Promise; @@ -9955,7 +10048,8 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ setSubTitle(subTitle: string): Promise; @@ -9975,7 +10069,8 @@ declare namespace photoAccessHelper { * @static * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ static deleteHighlightAlbums(context: Context, albums: Array): Promise; } @@ -10186,7 +10281,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ submitCloudEnhancementTasks( photoAssets: Array, @@ -10255,7 +10351,8 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ queryCloudEnhancementTaskState(photoAsset: PhotoAsset): Promise; @@ -10345,7 +10442,8 @@ declare namespace photoAccessHelper { * @enum { number } CloudMediaAssetTaskStatus * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enum CloudMediaAssetTaskStatus { /** @@ -10353,7 +10451,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ DOWNLOADING = 0, /** @@ -10361,7 +10460,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PAUSED = 1, /** @@ -10369,7 +10469,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ IDLE = 2 } @@ -10380,7 +10481,8 @@ declare namespace photoAccessHelper { * @enum { number } CloudMediaTaskPauseCause * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enum CloudMediaTaskPauseCause { /** @@ -10388,7 +10490,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ NO_PAUSE = 0, /** @@ -10396,7 +10499,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ TEMPERATURE_LIMIT = 1, /** @@ -10404,7 +10508,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ ROM_LIMIT = 2, /** @@ -10412,7 +10517,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ NETWORK_FLOW_LIMIT = 3, /** @@ -10420,7 +10526,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_UNAVAILABLE = 4, /** @@ -10428,7 +10535,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ POWER_LIMIT = 5, /** @@ -10436,7 +10544,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ BACKGROUND_TASK_UNAVAILABLE = 6, /** @@ -10444,7 +10553,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ FREQUENT_USER_REQUESTS = 7, /** @@ -10452,7 +10562,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ CLOUD_ERROR = 8, /** @@ -10460,7 +10571,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ USER_PAUSED = 9 } @@ -10472,7 +10584,8 @@ declare namespace photoAccessHelper { * @interface CloudMediaAssetStatus * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ interface CloudMediaAssetStatus { /** @@ -10482,7 +10595,8 @@ declare namespace photoAccessHelper { * @readonly * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ readonly taskStatus: CloudMediaAssetTaskStatus; /** @@ -10493,7 +10607,8 @@ declare namespace photoAccessHelper { * @readonly * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ readonly taskInfo: string; /** @@ -10503,7 +10618,8 @@ declare namespace photoAccessHelper { * @readonly * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ readonly errorCode: CloudMediaTaskPauseCause; } @@ -10514,7 +10630,8 @@ declare namespace photoAccessHelper { * @enum { number } CloudMediaDownloadType * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enum CloudMediaDownloadType { /** @@ -10522,7 +10639,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ DOWNLOAD_FORCE = 0, /** @@ -10530,7 +10648,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ DOWNLOAD_GENTLE = 1 } @@ -10541,7 +10660,8 @@ declare namespace photoAccessHelper { * @enum { number } CloudMediaRetainType * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enum CloudMediaRetainType { /** @@ -10549,7 +10669,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ RETAIN_FORCE = 0 } @@ -10560,7 +10681,8 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ class CloudMediaAssetManager { /** @@ -10576,7 +10698,8 @@ declare namespace photoAccessHelper { * @static * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ static getCloudMediaAssetManagerInstance(context: Context): CloudMediaAssetManager; @@ -10594,7 +10717,8 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ startDownloadCloudMedia(downloadType: CloudMediaDownloadType): Promise; @@ -10609,7 +10733,8 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ pauseDownloadCloudMedia(): Promise; @@ -10624,7 +10749,8 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ cancelDownloadCloudMedia(): Promise; @@ -10642,7 +10768,8 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ retainCloudMediaAsset(retainType: CloudMediaRetainType): Promise; @@ -10657,7 +10784,8 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ getCloudMediaAssetStatus(): Promise; } diff --git a/api/@ohos.file.storageStatistics.d.ts b/api/@ohos.file.storageStatistics.d.ts index 0bcb09387a..2320239d5d 100644 --- a/api/@ohos.file.storageStatistics.d.ts +++ b/api/@ohos.file.storageStatistics.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2023 Huawei Device Co., Ltd. + * Copyright (C) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -25,7 +25,8 @@ import { AsyncCallback, Callback } from './@ohos.base'; * * @namespace storageStatistics * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace storageStatistics { /** @@ -112,7 +113,8 @@ parameters are left unspecified; * * @interface BundleStats * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface BundleStats { /** @@ -120,7 +122,8 @@ parameters are left unspecified; * * @type { number } * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ appSize: number; @@ -129,7 +132,8 @@ parameters are left unspecified; * * @type { number } * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ cacheSize: number; @@ -138,7 +142,8 @@ parameters are left unspecified; * * @type { number } * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ dataSize: number; } @@ -225,7 +230,8 @@ parameters are left unspecified; * @throws { BusinessError } 13600001 - IPC error. * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getCurrentBundleStats(callback: AsyncCallback): void; @@ -238,7 +244,8 @@ parameters are left unspecified; * @throws { BusinessError } 13600001 - IPC error. * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getCurrentBundleStats(): Promise; @@ -282,7 +289,8 @@ parameters are left unspecified; * @interface StorageStats * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface StorageStats { /** @@ -291,7 +299,8 @@ parameters are left unspecified; * @type { number } * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ total: number; @@ -360,7 +369,8 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getUserStorageStats(): Promise; @@ -378,7 +388,8 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getUserStorageStats(callback: AsyncCallback): void; @@ -398,7 +409,8 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getUserStorageStats(userId: number): Promise; @@ -418,7 +430,8 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getUserStorageStats(userId: number, callback: AsyncCallback): void; @@ -446,7 +459,8 @@ parameters are left unspecified; * @throws { BusinessError } 13600001 - IPC error. * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ function getTotalSize(callback: AsyncCallback): void; @@ -472,7 +486,8 @@ parameters are left unspecified; * @throws { BusinessError } 13600001 - IPC error. * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ function getTotalSize(): Promise; @@ -526,7 +541,8 @@ parameters are left unspecified; * @throws { BusinessError } 13600001 - IPC error. * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ function getFreeSize(callback: AsyncCallback): void; @@ -552,7 +568,8 @@ parameters are left unspecified; * @throws { BusinessError } 13600001 - IPC error. * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ function getFreeSize(): Promise; diff --git a/api/@ohos.file.volumeManager.d.ts b/api/@ohos.file.volumeManager.d.ts index 87377b2690..1b90ba7c3f 100644 --- a/api/@ohos.file.volumeManager.d.ts +++ b/api/@ohos.file.volumeManager.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2023 Huawei Device Co., Ltd. + * Copyright (C) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -26,7 +26,8 @@ import { AsyncCallback, Callback } from './@ohos.base'; * @namespace volumeManager * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace volumeManager { /** @@ -35,7 +36,8 @@ declare namespace volumeManager { * @interface Volume * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface Volume { /** @@ -54,7 +56,8 @@ declare namespace volumeManager { * @type { string } * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ uuid: string; @@ -74,7 +77,8 @@ declare namespace volumeManager { * @type { string } * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ description: string; @@ -131,7 +135,8 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllVolumes(callback: AsyncCallback>): void; @@ -148,7 +153,8 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllVolumes(): Promise>; @@ -260,7 +266,8 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getVolumeByUuid(uuid: string, callback: AsyncCallback): void; @@ -280,7 +287,8 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getVolumeByUuid(uuid: string): Promise; diff --git a/api/@ohos.fileshare.d.ts b/api/@ohos.fileshare.d.ts index ec9b89fe1a..26e68dcccb 100644 --- a/api/@ohos.fileshare.d.ts +++ b/api/@ohos.fileshare.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Huawei Device Co., Ltd. + * Copyright (C) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -199,7 +199,8 @@ declare namespace fileShare { * * @interface PathPolicyInfo * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface PathPolicyInfo { /** @@ -207,7 +208,8 @@ declare namespace fileShare { * * @type { string } * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ path: string; @@ -216,7 +218,8 @@ declare namespace fileShare { * * @type { OperationMode } * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ operationMode: OperationMode; } @@ -226,14 +229,16 @@ declare namespace fileShare { * * @enum { number } policyType * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum PolicyType { /** * Indicates that the policy is temporary. * * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ TEMPORARY_TYPE = 0, @@ -241,7 +246,8 @@ declare namespace fileShare { * Indicates that the policy is persistent. * * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ PERSISTENT_TYPE = 1, } @@ -357,7 +363,8 @@ declare namespace fileShare { * @throws { BusinessError } 13900001 - Operation not permitted. * @throws { BusinessError } 13900042 - Out of memory * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function activatePermission(policies: Array): Promise; @@ -374,7 +381,8 @@ declare namespace fileShare { * @throws { BusinessError } 13900001 - Operation not permitted. * @throws { BusinessError } 13900042 - Out of memory * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function deactivatePermission(policies: Array): Promise; @@ -410,7 +418,7 @@ declare namespace fileShare { * Check permissions for the path. * * @permission ohos.permission.CHECK_SANDBOX_POLICY - * @param { number } tokenID - Token ID of the application. + * @param { int } tokenID - Token ID of the application. * @param { Array } policies - Policy information to check on paths. * @param { PolicyType } policyType - Persistent or temporary type. * @returns { Promise> } Returns the permission state of paths. @@ -421,9 +429,10 @@ declare namespace fileShare { * @throws { BusinessError } 801 - Capability not supported. * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization * @systemapi - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ - function checkPathPermission(tokenID: number, policies: Array, policyType: PolicyType): Promise>; + function checkPathPermission(tokenID: int, policies: Array, policyType: PolicyType): Promise>; } export default fileShare; diff --git a/api/@ohos.geoLocationManager.d.ts b/api/@ohos.geoLocationManager.d.ts index d5413e5ba8..762c98e2d0 100644 --- a/api/@ohos.geoLocationManager.d.ts +++ b/api/@ohos.geoLocationManager.d.ts @@ -108,7 +108,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'locationChange', request: LocationRequest | ContinuousLocationRequest, callback: Callback): void; @@ -156,7 +157,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'locationChange', callback?: Callback): void; @@ -172,7 +174,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'locationError', callback: Callback): void; @@ -188,7 +191,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'locationError', callback?: Callback): void; @@ -201,7 +205,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.on('locationEnabledChange')} due to limited device capabilities. * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'locationEnabledChange', callback: Callback): void; @@ -214,7 +219,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.off('locationEnabledChange')} due to limited device capabilities. * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'locationEnabledChange', callback?: Callback): void; @@ -247,7 +253,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'cachedGnssLocationsChange', request: CachedGnssLocationsRequest, callback: Callback>): void; @@ -278,7 +285,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'cachedGnssLocationsChange', callback?: Callback>): void; @@ -294,7 +302,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'satelliteStatusChange', callback: Callback): void; @@ -310,7 +319,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'satelliteStatusChange', callback?: Callback): void; @@ -326,7 +336,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'nmeaMessage', callback: Callback): void; @@ -342,7 +353,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'nmeaMessage', callback?: Callback): void; @@ -392,7 +404,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301500 - Failed to query the area information. * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'countryCodeChange', callback: Callback): void; @@ -406,7 +419,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301500 - Failed to query the area information. * @syscap SystemCapability.Location.Location.Core - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'countryCodeChange', callback?: Callback): void; @@ -425,7 +439,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301800 - Failed to start WiFi or Bluetooth scanning. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'locatingRequiredDataChange', config: LocatingRequiredDataConfig, callback: Callback>): void; @@ -441,7 +456,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.off('locatingRequiredDataChange')} due to limited device capabilities. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'locatingRequiredDataChange', callback?: Callback>): void; @@ -456,7 +472,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'locationIconStatusChange', callback: Callback): void; @@ -471,7 +488,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'locationIconStatusChange', callback?: Callback): void; @@ -487,7 +505,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Core - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'bluetoothScanResultChange', callback: Callback): void; @@ -502,7 +521,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.off('bluetoothScanResultChange')} due to limited device capabilities. * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'bluetoothScanResultChange', callback?: Callback): void; @@ -665,7 +685,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301200 - Failed to obtain the geographical location. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function getLastLocation(): Location; @@ -686,7 +707,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function isLocationEnabled(): boolean; @@ -730,7 +752,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 20 + * @since arkts {'1.1':'20','1.2':'20'} + * @arkts 1.1&1.2 */ function enableLocation(callback: AsyncCallback): void; @@ -758,7 +781,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 20 + * @since arkts {'1.1':'20','1.2':'20'} + * @arkts 1.1&1.2 */ function enableLocation(): Promise; @@ -800,7 +824,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 20 + * @since arkts {'1.1':'20','1.2':'20'} + * @arkts 1.1&1.2 */ function disableLocation(): void; @@ -845,7 +870,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301300 - Reverse geocoding query failed. * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getAddressesFromLocation(request: ReverseGeoCodeRequest, callback: AsyncCallback>): void; @@ -859,7 +885,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301300 - Reverse geocoding query failed. * @syscap SystemCapability.Location.Location.Geocoder - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getAddressesFromLocation(request: ReverseGeoCodeRequest): Promise>; @@ -1190,7 +1217,8 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function isLocationPrivacyConfirmed(type: LocationPrivacyType): boolean; @@ -1403,7 +1431,8 @@ declare namespace geoLocationManager { * * @typedef SatelliteStatusInfo * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export interface SatelliteStatusInfo { /** @@ -1411,7 +1440,8 @@ declare namespace geoLocationManager { * * @type { number } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ satellitesNumber: number; @@ -1420,7 +1450,8 @@ declare namespace geoLocationManager { * * @type { Array } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ satelliteIds: Array; @@ -1429,7 +1460,8 @@ declare namespace geoLocationManager { * * @type { Array } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ carrierToNoiseDensitys: Array; @@ -1438,7 +1470,8 @@ declare namespace geoLocationManager { * * @type { Array } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ altitudes: Array; @@ -1447,7 +1480,8 @@ declare namespace geoLocationManager { * * @type { Array } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ azimuths: Array; @@ -1456,7 +1490,8 @@ declare namespace geoLocationManager { * * @type { Array } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ carrierFrequencies: Array; @@ -1465,7 +1500,8 @@ declare namespace geoLocationManager { * * @type { ?Array } * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ satelliteConstellation?: Array; @@ -1474,7 +1510,8 @@ declare namespace geoLocationManager { * * @type { ?Array } * @syscap SystemCapability.Location.Location.Gnss - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ satelliteAdditionalInfo?: Array; } @@ -1484,7 +1521,8 @@ declare namespace geoLocationManager { * * @typedef CachedGnssLocationsRequest * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export interface CachedGnssLocationsRequest { /** @@ -1492,7 +1530,8 @@ declare namespace geoLocationManager { * * @type { number } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ reportingPeriodSec: number; @@ -1501,7 +1540,8 @@ declare namespace geoLocationManager { * * @type { boolean } * @syscap SystemCapability.Location.Location.Gnss - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ wakeUpCacheQueueFull: boolean; } diff --git a/api/@ohos.graphics.text.d.ts b/api/@ohos.graphics.text.d.ts index cbf875404c..f6b13ebee6 100755 --- a/api/@ohos.graphics.text.d.ts +++ b/api/@ohos.graphics.text.d.ts @@ -41,7 +41,8 @@ import type common2D from './@ohos.graphics.common2D'; * * @namespace text * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace text { @@ -49,27 +50,31 @@ declare namespace text { * Refers to how to align the horizontal position of text when displaying text. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum TextAlign { /** * Use the left side of the text as a reference line for alignment. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LEFT = 0, /** * Use the right side of the text as a reference line for alignment. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ RIGHT = 1, /** * Use the midpoint line the text as a reference line for alignment. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CENTER = 2, @@ -77,21 +82,24 @@ declare namespace text { * Justified, which means that each line (except the last line) is stretched so that every line has equal width, * and the left and right margins are straight. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ JUSTIFY = 3, /** * Align text from start, based on the TextDirection, such as left-to-right or right-to-left. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ START = 4, /** * Align text from end, based on the TextDirection, such as left-to-right or right-to-left, opposite to START. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ END = 5, } @@ -133,20 +141,23 @@ declare namespace text { * Enumerate text runs direction. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum TextDirection { /** * The text is oriented from right to left. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ RTL, /** * The text is oriented from left to right. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LTR, } @@ -155,27 +166,31 @@ declare namespace text { * Enumerate text segmentation strategy. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum BreakStrategy { /** * Fills the current line as much as possible without adding hyphens. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ GREEDY, /** * Optimizes layout and may add hyphens when necessary. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ HIGH_QUALITY, /** * Ensures consistent line width in a paragraph, adding hyphens if needed. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ BALANCED, } @@ -184,13 +199,15 @@ declare namespace text { * Enumerate word break strategy. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum WordBreak { /** * Default mode that break words based on language-specific conventions. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ NORMAL, @@ -199,7 +216,8 @@ declare namespace text { * This value is suitable for Asian text that contains some non-Asian text. For example, * it can be used to break consecutive English characters. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ BREAK_ALL, @@ -208,7 +226,8 @@ declare namespace text { * or other natural breakpoints to keep words intact. If no breakpoints are found, it breaks between * any two characters. For CJK text, this behaves like NORMAL. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ BREAK_WORD, @@ -216,7 +235,8 @@ declare namespace text { * Attempts to break words at the end of a line using a hyphen. If a hyphen cannot be added, * it behaves like BREAK_WORD. * @syscap SystemCapability.Graphics.Drawing - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ BREAK_HYPHEN, } @@ -225,14 +245,16 @@ declare namespace text { * Describes a text decoration. * @typedef Decoration * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface Decoration { /** * Type of the decoration. The default value is NONE. * @type { ?TextDecorationType } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ textDecoration?: TextDecorationType; @@ -240,7 +262,8 @@ declare namespace text { * Color of the decoration. The default value is transparent. * @type { ?common2D.Color } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ color?: common2D.Color; @@ -248,7 +271,8 @@ declare namespace text { * Style of the decoration. The default value is SOLID. * @type { ?TextDecorationStyle } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ decorationStyle?: TextDecorationStyle; @@ -257,7 +281,8 @@ declare namespace text { * The default value is 1.0. * @type { ?number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ decorationThicknessScale?: number; } @@ -266,34 +291,39 @@ declare namespace text { * Enumerates the text decoration types. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum TextDecorationType { /** * There are no text decoration. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ NONE, /** * There is a decoration line below the text. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ UNDERLINE, /** * There is a decoration line above the text. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ OVERLINE, /** * There is a decoration line through the middle of the text. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LINE_THROUGH, } @@ -302,41 +332,47 @@ declare namespace text { * Enumerates the text decoration styles. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum TextDecorationStyle { /** * Decoration line is solid line. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SOLID, /** * Decoration line is double line. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DOUBLE, /** * Decoration line is dotted line. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DOTTED, /** * Decoration line is dashed line. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DASHED, /** * Decoration line is wavy line. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ WAVY, } @@ -345,69 +381,79 @@ declare namespace text { * Enumeration of font weight of text. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum FontWeight { /** * Thin * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ W100, /** * Extra-light * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ W200, /** * Light * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ W300, /** * Normal/Regular * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ W400, /** * Medium * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ W500, /** * Semi-bold * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ W600, /** * Bold * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ W700, /** * Extra-bold * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ W800, /** * Black * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ W900, } @@ -416,27 +462,31 @@ declare namespace text { * Enumeration of font style of text. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum FontStyle { /** * Upright font type. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ NORMAL, /** * Slant font. If no italic version is available for the current font, the oblique version will be used instead. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ITALIC, /** * Oblique font. If no oblique version is available for the current font, the italic version will be used instead. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ OBLIQUE, } @@ -445,69 +495,79 @@ declare namespace text { * Enumeration of font width of text. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum FontWidth { /** * Ultra condensed font width. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ULTRA_CONDENSED = 1, /** * Extra condensed font width. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ EXTRA_CONDENSED = 2, /** * Condensed font width. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CONDENSED = 3, /** * Semi condensed font width. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SEMI_CONDENSED = 4, /** * Normal font width. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ NORMAL = 5, /** * Semi expanded font width. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SEMI_EXPANDED = 6, /** * Expanded font width. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ EXPANDED = 7, /** * Extra expanded font width. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ EXTRA_EXPANDED = 8, /** * Ultra expanded font width. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ULTRA_EXPANDED = 9, } @@ -516,34 +576,39 @@ declare namespace text { * Enumerates the text height modifier patterns. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum TextHeightBehavior { /** * Allows the first line of the paragraph to rise and the last line to drop. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ALL = 0x0, /** * Prevents the first line of a paragraph from rising. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DISABLE_FIRST_ASCENT = 0x1, /** * Prevents the last line of a paragraph from dropping. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DISABLE_LAST_ASCENT = 0x2, /** * Combines the effects of disabling the first line from rising and the last line from dropping. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DISABLE_ALL = 0x1 | 0x2, } @@ -552,14 +617,16 @@ declare namespace text { * Enumeration the type of text baseline. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum TextBaseline { /** * The alphabetic baseline, typically used for Latin-based scripts where the baseline aligns * with the base of lowercase letters. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ALPHABETIC, @@ -567,7 +634,8 @@ declare namespace text { * The ideographic baseline, commonly used for ideographic scripts such as Chinese, Japanese, and Korean, * where the baseline aligns with the center of characters. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ IDEOGRAPHIC, } @@ -577,27 +645,31 @@ declare namespace text { * EllipsisMode.START and EllipsisMode.MIDDLE take effect only when text overflows in a single line. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum EllipsisMode { /** * Places the ellipsis in the text header. It is valid only when maxLines is set to 1 in ParagraphStyle. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ START, /** * Places the ellipsis in the middle of the text. It is valid only when maxLines is set to 1 in ParagraphStyle. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MIDDLE, /** * Places the ellipsis at the end of the text. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ END, } @@ -606,14 +678,16 @@ declare namespace text { * Describes shadow of text. * @typedef TextShadow * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface TextShadow { /** * Color of the text shadow. The default value is black (255, 0, 0, 0). * @type { ?common2D.Color } The color of text shadow * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ color?: common2D.Color; /** @@ -621,7 +695,8 @@ declare namespace text { * The horizontal and vertical coordinates must be greater than or equal to 0. * @type { ?common2D.Point } The point of shadow * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ point?: common2D.Point; /** @@ -629,7 +704,8 @@ declare namespace text { * The value is a floating point number. The default value is 0.0px. * @type { ?number } The value about radius of blur, it type is "double" * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ blurRadius?: number; } @@ -638,14 +714,16 @@ declare namespace text { * Describes the style of a rectangle. * @typedef RectStyle * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface RectStyle { /** * Color of the rectangle. * @type { common2D.Color } The color of rect style * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ color: common2D.Color; @@ -653,7 +731,8 @@ declare namespace text { * Left top radius of the rectangle. * @type { number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ leftTopRadius: number; @@ -661,7 +740,8 @@ declare namespace text { * Right top radius of the rectangle. * @type { number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ rightTopRadius: number; @@ -669,7 +749,8 @@ declare namespace text { * Right bottom radius of the rectangle. * @type { number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ rightBottomRadius: number; @@ -677,7 +758,8 @@ declare namespace text { * Left bottom radius of the rectangle. * @type { number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ leftBottomRadius: number; } @@ -686,21 +768,24 @@ declare namespace text { * Describes font feature of text. * @typedef FontFeature * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface FontFeature { /** * String identified by the keyword in the font feature key-value pair. * @type { string } feature name * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ name: string; /** * Value in the font feature key-value pair. * @type { number } feature value * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ value: number; } @@ -709,21 +794,24 @@ declare namespace text { * Describes font variation of text. * @typedef FontVariation * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface FontVariation { /** * String identified by the keyword in the font variation key-value pair. * @type { string } variation axis * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ axis: string; /** * Value in the font variation key-value pair. * @type { number } variation value * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ value: number; } @@ -759,7 +847,8 @@ declare namespace text { * Describes text style. * @typedef TextStyle * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface TextStyle { @@ -767,7 +856,8 @@ declare namespace text { * Text decoration. By default, no decoration is used. * @type { ?Decoration } decoration for text * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ decoration?: Decoration; @@ -775,7 +865,8 @@ declare namespace text { * Text color. The default color is white. * @type { ?common2D.Color } it is uint32_t type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ color?: common2D.Color; @@ -785,7 +876,8 @@ declare namespace text { * If the weight is greater than or equal to semi-bold, it might result in a fake bold effect. * @type { ?FontWeight } it is uint32_t type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ fontWeight?: FontWeight; @@ -793,7 +885,8 @@ declare namespace text { * Font style. The default value is NORMAL. * @type { ?FontStyle } it is uint32_t type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ fontStyle?: FontStyle; @@ -801,7 +894,8 @@ declare namespace text { * Text baseline type. The default value is ALPHABETIC. * @type { ?TextBaseline } it is uint32_t type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ baseline?: TextBaseline; @@ -809,7 +903,8 @@ declare namespace text { * Array of font families. By default, the array is empty, indicating that all system fonts are matched. * @type { ?Array } fontfamily gather * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ fontFamilies?: Array; @@ -817,7 +912,8 @@ declare namespace text { * Font size, in units of px. The value is a floating point number. The default value is 14.0. * @type { ?number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ fontSize?: number; @@ -827,7 +923,8 @@ declare namespace text { * and a negative value bring characters closer together. * @type { ?number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ letterSpacing?: number; @@ -835,7 +932,8 @@ declare namespace text { * Word spacing, in units of px. The value is a floating point number. The default value is 0.0. * @type { ?number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ wordSpacing?: number; @@ -844,7 +942,8 @@ declare namespace text { * The default value is 1.0. This parameter is valid only when heightOnly is set to true. * @type { ?number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ heightScale?: number; @@ -854,7 +953,8 @@ declare namespace text { * The value true means that half leading is enabled, and false means the opposite. The default value is false. * @type { ?boolean } it is boolean type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ halfLeading?: boolean; @@ -864,7 +964,8 @@ declare namespace text { * and false means that the height is set based on the line height and line spacing. The default value is false. * @type { ?boolean } it is boolean type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ heightOnly?: boolean; @@ -872,7 +973,8 @@ declare namespace text { * Ellipsis content, which will be used to replace the extra content. * @type { ?string } it is u16string type data. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ellipsis?: string; @@ -880,7 +982,8 @@ declare namespace text { * Ellipsis type. The default value is END, indicating that the ellipsis is at the end of a line. * @type { ?EllipsisMode } Ellipsis mode. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ellipsisMode?: EllipsisMode; @@ -889,7 +992,8 @@ declare namespace text { * and 'zh-Hant' indicates Traditional Chinese. For details, see ISO 639-1. The default value is an empty string. * @type { ?string } it is string type data. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ locale?: string; @@ -897,7 +1001,8 @@ declare namespace text { * Shift of the baseline. The value is a floating point number. The default value is 0.0px. * @type { ?number } it is double type data. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ baselineShift?: number; @@ -905,7 +1010,8 @@ declare namespace text { * Text Style available font features. * @type { ?Array } A collection of font features. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ fontFeatures?: Array; @@ -913,7 +1019,8 @@ declare namespace text { * Text shadows of text. * @type { ?Array } textShadow gather. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ textShadows?: Array; @@ -921,7 +1028,8 @@ declare namespace text { * Rectangle style of text. * @type { ?RectStyle } rect style for text. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ backgroundRect?: RectStyle; @@ -929,7 +1037,8 @@ declare namespace text { * Text Style available font variations. * @type { ?Array } A collection of font variations. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ fontVariations?: Array; @@ -945,14 +1054,16 @@ declare namespace text { /** * Implements a collection of fonts. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ class FontCollection { /** * Get global FontCollection instance of the application. * @returns { FontCollection } The FontCollection object. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ static getGlobalInstance(): FontCollection; @@ -964,7 +1075,8 @@ declare namespace text { * @param { string | Resource } path - Path of the font file to import. The value must be * **file://**absolute path of the font file or **rawfile/**directory or file name. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ loadFontSync(name: string, path: string | Resource): void; @@ -979,7 +1091,8 @@ declare namespace text { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.Graphics.Drawing - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ loadFont(name: string, path: string | Resource): Promise; @@ -1029,14 +1142,16 @@ declare namespace text { * and other properties related to the line height when drawing texts. The strut style is disabled by default. * @typedef StrutStyle * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface StrutStyle { /** * List of font families. By default, the list corresponds to the system's default fonts. * @type { ?Array } fontfamily gather * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ fontFamilies?: Array; @@ -1044,7 +1159,8 @@ declare namespace text { * Font style. The default value is NORMAL. * @type { ?FontStyle } it is uint32_t type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ fontStyle?: FontStyle; @@ -1052,7 +1168,8 @@ declare namespace text { * Font width. The default value is NORMAL. * @type { ?FontWidth } it is uint32_t type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ fontWidth?: FontWidth; @@ -1062,7 +1179,8 @@ declare namespace text { * If the weight is greater than or equal to W600, it might result in a fake bold effect. * @type { ?FontWeight } it is uint32_t type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ fontWeight?: FontWeight; @@ -1070,7 +1188,8 @@ declare namespace text { * Font size, in units of px. The value is a floating point number. The default value is 14.0. * @type { ?number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ fontSize?: number; @@ -1078,7 +1197,8 @@ declare namespace text { * Scale factor of the line height. The value is a floating point number. The default value is 1.0. * @type { ?number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ height?: number; @@ -1086,7 +1206,8 @@ declare namespace text { * Custom leading to be applied to the strut. The value is a floating point number. The default value is -1.0. * @type { ?number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ leading?: number; @@ -1095,7 +1216,8 @@ declare namespace text { * for all lines, and false means the opposite. The default value is false. * @type { ?boolean } it is boolean type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ forceHeight?: boolean; @@ -1104,7 +1226,8 @@ declare namespace text { * The value true means to enable the strut style, and false means the opposite. The default value is false. * @type { ?boolean } it is boolean type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enabled?: boolean; @@ -1113,7 +1236,8 @@ declare namespace text { * The default value is false. * @type { ?boolean } it is boolean type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ heightOverride?: boolean; @@ -1123,7 +1247,8 @@ declare namespace text { * The value true means that half leading is enabled, and false means the opposite. The default value is false. * @type { ?boolean } it is boolean type data * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ halfLeading?: boolean; } @@ -1132,14 +1257,16 @@ declare namespace text { * Determines the configuration used by ParagraphBuilder to position lines within a Paragraph of text. * @typedef ParagraphStyle * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ParagraphStyle { /** * Text style applied to the paragraph. The default value is the initial text style. * @type { ?TextStyle } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ textStyle?: TextStyle; @@ -1147,7 +1274,8 @@ declare namespace text { * Text direction. The default value is LTR. * @type { ?TextDirection } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ textDirection?: TextDirection; @@ -1155,7 +1283,8 @@ declare namespace text { * Text alignment mode. The default value is START. This parameter is invalid when the tab parameter is configured. * @type { ?TextAlign } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ align?: TextAlign; @@ -1163,7 +1292,8 @@ declare namespace text { * Word break type. The default value is BREAK_WORD. * @type { ?WordBreak } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ wordBreak?: WordBreak; @@ -1171,7 +1301,8 @@ declare namespace text { * Maximum number of lines. The value is an integer. The default value is 1e9. * @type { ?number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ maxLines?: number; @@ -1179,7 +1310,8 @@ declare namespace text { * Text break strategy. The default value is GREEDY. * @type { ?BreakStrategy } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ breakStrategy?: BreakStrategy; @@ -1187,7 +1319,8 @@ declare namespace text { * Strut style. The default value is the initial StrutStyle object. * @type { ?StrutStyle } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ strutStyle?: StrutStyle; @@ -1195,7 +1328,8 @@ declare namespace text { * Text height modifier pattern. The default value is ALL. * @type { ?TextHeightBehavior } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ textHeightBehavior?: TextHeightBehavior; @@ -1205,7 +1339,8 @@ declare namespace text { * the ellipsis parameter in TextStyle. * @type { ?TextTab } * @syscap SystemCapability.Graphics.Drawing - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ tab?: TextTab; @@ -1507,14 +1642,16 @@ declare namespace text { * Before calling any of the following APIs, you must use build() of the ParagraphBuilder class to * create a Paragraph object. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ class Paragraph { /** * Performs layout and calculates the positions of all glyphs. * @param { number } width - Maximum width of a single line, in units of px. The value is a floating point number. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ layoutSync(width: number): void; @@ -1535,7 +1672,8 @@ declare namespace text { * @param { number } x - X coordinate of the upper left corner. The value is a floating point number. * @param { number } y - Y coordinate of the upper left corner. The value is a floating point number. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ paint(canvas: drawing.Canvas, x: number, y: number): void; @@ -1549,7 +1687,8 @@ declare namespace text { * @param { number } vOffset - Vertical offset along the path direction. A positive number indicates a position * on the left side of the path, and a negative number indicates a position on the right side of the path. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ paintOnPath(canvas: drawing.Canvas, path: drawing.Path, hOffset: number, vOffset: number): void; @@ -1573,7 +1712,8 @@ declare namespace text { * Obtains the longest line in the text. * @returns { number } Longest line, in units of px. The value is a floating point number. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getLongestLine(): number; @@ -1718,7 +1858,8 @@ declare namespace text { * Obtains an array of line measurement information. * @returns { Array } Array of line measurement information. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getLineMetrics(): Array; @@ -1729,7 +1870,8 @@ declare namespace text { * line number is valid and the measurement information exists. If the line number is invalid or * the measurement information cannot be obtained, undefined is returned. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getLineMetrics(lineNumber: number): LineMetrics | undefined; @@ -1936,7 +2078,8 @@ declare namespace text { /** * Builds a Paragraph containing text with the given styling information. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ class ParagraphBuilder { /** @@ -1944,7 +2087,8 @@ declare namespace text { * @param { ParagraphStyle } paragraphStyle - Paragraph style {@link ParagraphStyle} * @param { FontCollection } fontCollection - Font collection {@link FontCollection} * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ constructor(paragraphStyle: ParagraphStyle, fontCollection: FontCollection); @@ -1956,14 +2100,16 @@ declare namespace text { * font size, color, font weight, word spacing, line spacing, decoration (such as underline and strikethrough), * and text shadow. {@link TextStyle} * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ pushStyle(textStyle: TextStyle): void; /** * Restores the previous text style. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ popStyle(): void; @@ -1972,7 +2118,8 @@ declare namespace text { * @param { string } text - Exact text string inserted into the paragraph. If an invalid Unicode character is * provided, it is displayed as �. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ addText(text: string): void; @@ -1989,7 +2136,8 @@ declare namespace text { * Creates a paragraph object that can be used for subsequent layout and rendering. * @returns { Paragraph } Paragraph object that can be used for subsequent rendering. * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ build(): Paragraph; @@ -2352,14 +2500,16 @@ declare namespace text { * Describes the layout information and metrics for a continuous piece of text (a run) in a line of text. * @typedef RunMetrics * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface RunMetrics { /** * The metrics of an Font. * @type { TextStyle } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ textStyle: TextStyle; @@ -2367,7 +2517,8 @@ declare namespace text { * Describes text style. * @type { drawing.FontMetrics } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ fontMetrics: drawing.FontMetrics; } @@ -2376,14 +2527,16 @@ declare namespace text { * Describes the measurement information of a single line of text in the text layout. * @typedef LineMetrics * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface LineMetrics { /** * Start index of the line in the text buffer. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ startIndex: number; @@ -2391,7 +2544,8 @@ declare namespace text { * End index of the line in the text buffer. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ endIndex: number; @@ -2399,7 +2553,8 @@ declare namespace text { * Ascent, that is, the distance from the baseline to the top of the character. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ascent: number; @@ -2407,7 +2562,8 @@ declare namespace text { * Descent, that is, the distance from the baseline to the bottom of the character. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ descent: number; @@ -2415,7 +2571,8 @@ declare namespace text { * Height of the line, which is Math.round(ascent + descent). * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ height: number; @@ -2423,7 +2580,8 @@ declare namespace text { * Width of the line. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ width: number; @@ -2431,7 +2589,8 @@ declare namespace text { * Left edge of the line. The right edge is the value of left plus the value of width. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ left: number; @@ -2439,7 +2598,8 @@ declare namespace text { * Y coordinate of the baseline in the line relative to the top of the paragraph. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ baseline: number; @@ -2447,7 +2607,8 @@ declare namespace text { * Line number, starting from 0. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ lineNumber: number; @@ -2455,7 +2616,8 @@ declare namespace text { * Height from the top to the current line. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ topHeight: number; @@ -2465,7 +2627,8 @@ declare namespace text { * are before layout and are the base values we calculate from. * @type { Map } * @syscap SystemCapability.Graphics.Drawing - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ runMetrics: Map; } @@ -2515,7 +2678,8 @@ declare namespace text { * Implements a paragraph-style text tab, which stores the alignment mode and position. * @typedef TextTab * @syscap SystemCapability.Graphics.Drawing - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface TextTab { /** @@ -2524,7 +2688,8 @@ declare namespace text { * alignment. * @type { TextAlign } * @syscap SystemCapability.Graphics.Drawing - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ alignment: TextAlign; @@ -2533,7 +2698,8 @@ declare namespace text { * The minimum value is 1.0. When the value is less than 1.0, the tab character is replaced with a space. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ location: number; } diff --git a/api/@ohos.hiSysEvent.d.ts b/api/@ohos.hiSysEvent.d.ts index 68feb315d7..555be14da8 100644 --- a/api/@ohos.hiSysEvent.d.ts +++ b/api/@ohos.hiSysEvent.d.ts @@ -201,7 +201,8 @@ declare namespace hiSysEvent { * @enum {number} * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ enum RuleType { /** @@ -209,7 +210,8 @@ declare namespace hiSysEvent { * * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ WHOLE_WORD = 1, @@ -218,7 +220,8 @@ declare namespace hiSysEvent { * * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ PREFIX = 2, @@ -227,7 +230,8 @@ declare namespace hiSysEvent { * * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ REGULAR = 3 } @@ -238,7 +242,8 @@ declare namespace hiSysEvent { * @interface WatchRule * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ interface WatchRule { /** @@ -247,7 +252,8 @@ declare namespace hiSysEvent { * @type { string } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ domain: string; @@ -257,7 +263,8 @@ declare namespace hiSysEvent { * @type { string } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ name: string; @@ -275,7 +282,8 @@ declare namespace hiSysEvent { * @type { ?string } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ tag?: string; @@ -285,7 +293,8 @@ declare namespace hiSysEvent { * @type { RuleType } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ ruleType: RuleType; } @@ -296,7 +305,8 @@ declare namespace hiSysEvent { * @interface Watcher * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ interface Watcher { /** @@ -305,7 +315,8 @@ declare namespace hiSysEvent { * @type { WatchRule[] } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ rules: WatchRule[]; @@ -315,7 +326,8 @@ declare namespace hiSysEvent { * @type { function } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ onEvent: (info: SysEventInfo) => void; @@ -325,7 +337,8 @@ declare namespace hiSysEvent { * @type { function } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ onServiceDied: () => void; } @@ -336,7 +349,8 @@ declare namespace hiSysEvent { * @interface QueryArg * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ interface QueryArg { /** @@ -345,7 +359,8 @@ declare namespace hiSysEvent { * @type { number } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ beginTime: number; @@ -355,7 +370,8 @@ declare namespace hiSysEvent { * @type { number } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ endTime: number; @@ -365,7 +381,8 @@ declare namespace hiSysEvent { * @type { number } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ maxEvents: number; @@ -375,7 +392,8 @@ declare namespace hiSysEvent { * @type { ?number } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ fromSeq?: number; @@ -385,7 +403,8 @@ declare namespace hiSysEvent { * @type { ?number } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ toSeq?: number; } @@ -396,7 +415,8 @@ declare namespace hiSysEvent { * @interface QueryRule * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ interface QueryRule { /** @@ -405,7 +425,8 @@ declare namespace hiSysEvent { * @type { string } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ domain: string; @@ -415,7 +436,8 @@ declare namespace hiSysEvent { * @type { string[] } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ names: string[]; @@ -425,7 +447,8 @@ declare namespace hiSysEvent { * @type { ?string } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ condition?: string; } @@ -436,7 +459,8 @@ declare namespace hiSysEvent { * @interface Querier * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ interface Querier { /** @@ -445,7 +469,8 @@ declare namespace hiSysEvent { * @type { function } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ onQuery: (infos: SysEventInfo[]) => void; @@ -455,7 +480,8 @@ declare namespace hiSysEvent { * @type { function } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ onComplete: (reason: number, total: number) => void; } @@ -475,7 +501,8 @@ declare namespace hiSysEvent { * @throws {BusinessError} 11200102 - The number of watch rules exceeds the limit. * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function addWatcher(watcher: Watcher): void; @@ -493,7 +520,8 @@ declare namespace hiSysEvent { * @throws {BusinessError} 11200201 - The watcher does not exist. * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function removeWatcher(watcher: Watcher): void; @@ -516,7 +544,8 @@ declare namespace hiSysEvent { * @throws {BusinessError} 11200304 - The query frequency exceeds the limit. * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function query(queryArg: QueryArg, rules: QueryRule[], querier: Querier): void; @@ -538,7 +567,8 @@ declare namespace hiSysEvent { * @throws {BusinessError} 11200304 – The query frequency exceeds the limit. * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function exportSysEvents(queryArg: QueryArg, rules: QueryRule[]): number; @@ -558,7 +588,8 @@ declare namespace hiSysEvent { * @throws {BusinessError} 11200302 - Invalid query rule. * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function subscribe(rules: QueryRule[]): number; @@ -575,7 +606,8 @@ declare namespace hiSysEvent { * @throws {BusinessError} 11200305 – Unsubscription failed. * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function unsubscribe(): void; } diff --git a/api/@ohos.hichecker.d.ts b/api/@ohos.hichecker.d.ts index 22e2a89fd3..ca1a68ee5e 100644 --- a/api/@ohos.hichecker.d.ts +++ b/api/@ohos.hichecker.d.ts @@ -23,7 +23,8 @@ * * @namespace hichecker * @syscap SystemCapability.HiviewDFX.HiChecker - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace hichecker { /** @@ -31,45 +32,50 @@ declare namespace hichecker { * * @constant * @syscap SystemCapability.HiviewDFX.HiChecker - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ - const RULE_CAUTION_PRINT_LOG: 9223372036854775808n; // 1 << 63 + const RULE_CAUTION_PRINT_LOG = 9223372036854775808n; // 1 << 63 /** * The caution rule trigger crash. * * @constant * @syscap SystemCapability.HiviewDFX.HiChecker - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ - const RULE_CAUTION_TRIGGER_CRASH: 4611686018427387904n; // 1 << 62 + const RULE_CAUTION_TRIGGER_CRASH = 4611686018427387904n; // 1 << 62 /** * The thread rule check slow process. * * @constant * @syscap SystemCapability.HiviewDFX.HiChecker - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ - const RULE_THREAD_CHECK_SLOW_PROCESS: 1n; + const RULE_THREAD_CHECK_SLOW_PROCESS = 1n; /** * The process rule check ability connection leak. * * @constant * @syscap SystemCapability.HiviewDFX.HiChecker - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ - const RULE_CHECK_ABILITY_CONNECTION_LEAK: 8589934592n; // 1 << 33 + const RULE_CHECK_ABILITY_CONNECTION_LEAK = 8589934592n; // 1 << 33 /** * The process rule check ability Arkui performance * * @constant * @syscap SystemCapability.HiviewDFX.HiChecker - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - const RULE_CHECK_ARKUI_PERFORMANCE: 17179869184n; // 1 << 34 + const RULE_CHECK_ARKUI_PERFORMANCE = 17179869184n; // 1 << 34 /** * add one or more rule. @@ -98,7 +104,8 @@ declare namespace hichecker { * * @returns { bigint } all added thread rule and process rule. * @syscap SystemCapability.HiviewDFX.HiChecker - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getRule(): bigint; @@ -120,7 +127,8 @@ declare namespace hichecker { * @param { bigint } rule * @throws { BusinessError } 401 - the parameter check failed, only one bigint type parameter is needed * @syscap SystemCapability.HiviewDFX.HiChecker - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function addCheckRule(rule: bigint): void; @@ -130,7 +138,8 @@ declare namespace hichecker { * @param { bigint } rule * @throws { BusinessError } 401 - the parameter check failed, only one bigint type parameter is needed * @syscap SystemCapability.HiviewDFX.HiChecker - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function removeCheckRule(rule: bigint): void; @@ -141,7 +150,8 @@ declare namespace hichecker { * @returns { boolean } the result of whether the query rule is added. * @throws { BusinessError } 401 - the parameter check failed, only one bigint type parameter is needed * @syscap SystemCapability.HiviewDFX.HiChecker - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function containsCheckRule(rule: bigint): boolean; } diff --git a/api/@ohos.hidebug.d.ts b/api/@ohos.hidebug.d.ts index 604bd743cf..97c4637081 100644 --- a/api/@ohos.hidebug.d.ts +++ b/api/@ohos.hidebug.d.ts @@ -37,7 +37,8 @@ * @namespace hidebug * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace hidebug { /** @@ -46,7 +47,8 @@ declare namespace hidebug { * * @returns { bigint } Returns the total number of bytes occupied by the total space. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getNativeHeapSize(): bigint; @@ -55,7 +57,8 @@ declare namespace hidebug { * a process, which is measured by the memory allocator. * @returns { bigint } Returns the total number of bytes occupied by the total allocated space. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getNativeHeapAllocatedSize(): bigint; @@ -65,7 +68,8 @@ declare namespace hidebug { * * @returns { bigint } Returns the size of the memory occupied by the free normal blocks held by the process, in bytes. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getNativeHeapFreeSize(): bigint; @@ -75,7 +79,8 @@ declare namespace hidebug { * * @returns { bigint } Returns the virtual set size used by the application process, in KB. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function getVss(): bigint; @@ -85,7 +90,8 @@ declare namespace hidebug { * * @returns { bigint } Returns the size of the physical memory actually used by the application process, in KB. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getPss(): bigint; @@ -95,7 +101,8 @@ declare namespace hidebug { * * @returns { bigint } Returns the size of the shared dirty memory of the process, in KB. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getSharedDirty(): bigint; @@ -105,7 +112,8 @@ declare namespace hidebug { * * @returns { bigint } Returns the size of the private dirty memory of the process, in KB. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getPrivateDirty(): bigint; @@ -114,7 +122,8 @@ declare namespace hidebug { * * @returns { number } Returns the CPU usage of the process. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getCpuUsage(): number; @@ -169,7 +178,8 @@ declare namespace hidebug { * directory of the application based on the specified file name. * @throws {BusinessError} 401 - the parameter check failed, Parameter type error * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function startJsCpuProfiling(filename: string): void; @@ -179,7 +189,8 @@ declare namespace hidebug { * methods repeatedly. Otherwise, an exception may occur. It takes effect only when the CPU profiler is turned on * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function stopJsCpuProfiling(): void; @@ -210,7 +221,8 @@ declare namespace hidebug { * 2.the args parameter is not string array. * @throws {BusinessError} 11400101 - ServiceId invalid. The system ability does not exist. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getServiceDump(serviceid: number, fd: number, args: Array): void; @@ -220,7 +232,8 @@ declare namespace hidebug { * @returns { number } Returns the CPU usage of the system. * @throws { BusinessError } 11400104 - The status of the system CPU usage is abnormal. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function getSystemCpuUsage(): number; @@ -229,7 +242,8 @@ declare namespace hidebug { * * @interface ThreadCpuUsage * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ThreadCpuUsage { /** @@ -237,7 +251,8 @@ declare namespace hidebug { * * @type { number } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ threadId: number; /** @@ -245,7 +260,8 @@ declare namespace hidebug { * * @type { number } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ cpuUsage: number; } @@ -255,7 +271,8 @@ declare namespace hidebug { * * @returns { ThreadCpuUsage[] } Returns the CPU usage of all threads of the current application process. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function getAppThreadCpuUsage(): ThreadCpuUsage[]; @@ -264,7 +281,8 @@ declare namespace hidebug { * * @interface SystemMemInfo * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface SystemMemInfo { /** @@ -273,7 +291,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ totalMem: bigint; /** @@ -282,7 +301,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ freeMem: bigint; /** @@ -291,7 +311,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ availableMem: bigint; } @@ -301,7 +322,8 @@ declare namespace hidebug { * * @returns { SystemMemInfo } Returns the system memory information. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function getSystemMemInfo(): SystemMemInfo; @@ -310,7 +332,8 @@ declare namespace hidebug { * * @interface NativeMemInfo * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface NativeMemInfo { /** @@ -320,7 +343,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ pss: bigint; /** @@ -330,7 +354,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ vss: bigint; /** @@ -339,7 +364,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ rss: bigint; /** @@ -348,7 +374,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ sharedDirty: bigint; /** @@ -357,7 +384,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ privateDirty: bigint; /** @@ -366,7 +394,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ sharedClean: bigint; /** @@ -375,7 +404,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ privateClean: bigint; } @@ -386,7 +416,8 @@ declare namespace hidebug { * * @returns { NativeMemInfo } Returns the memory information of the application process. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function getAppNativeMemInfo(): NativeMemInfo; @@ -395,7 +426,8 @@ declare namespace hidebug { * * @interface MemoryLimit * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface MemoryLimit { /** @@ -403,7 +435,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ rssLimit: bigint; /** @@ -411,7 +444,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ vssLimit: bigint; /** @@ -419,7 +453,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ vmHeapLimit: bigint; /** @@ -427,7 +462,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ vmTotalHeapSize: bigint; } @@ -437,7 +473,8 @@ declare namespace hidebug { * * @returns { MemoryLimit } Returns the memory limit of the application process. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function getAppMemoryLimit(): MemoryLimit; @@ -446,7 +483,8 @@ declare namespace hidebug { * * @interface VMMemoryInfo * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface VMMemoryInfo { /** @@ -454,7 +492,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ totalHeap: bigint; /** @@ -462,7 +501,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ heapUsed: bigint; /** @@ -470,7 +510,8 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ allArraySize: bigint; } @@ -480,7 +521,8 @@ declare namespace hidebug { * * @returns { VMMemoryInfo } Returns the VM memory information. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function getAppVMMemoryInfo(): VMMemoryInfo; @@ -489,21 +531,24 @@ declare namespace hidebug { * * @enum { number } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum TraceFlag { /** * The main thread of the application. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MAIN_THREAD = 1, /** * All threads of the application. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ALL_THREADS = 2 } @@ -513,231 +558,264 @@ declare namespace hidebug { * * @namespace tags * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ namespace tags { /** * Ability Manager tag. The corresponding HiTrace command is tagName:ability. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const ABILITY_MANAGER: number; /** * ArkUI development framework. The corresponding HiTrace command is tagName:ace. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const ARKUI: number; /** * JSVM VM. The corresponding HiTrace command is tagName:ark. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const ARK: number; /** * Bluetooth. The corresponding HiTrace command is tagName:bluetooth. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const BLUETOOTH: number; /** * Common library subsystem. The corresponding HiTrace command is tagName:commonlibrary. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const COMMON_LIBRARY: number; /** * Distributed hardware device management. The corresponding HiTrace command is tagName:devicemanager. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const DISTRIBUTED_HARDWARE_DEVICE_MANAGER: number; /** * Distributed audio. The corresponding HiTrace command is tagName:daudio. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const DISTRIBUTED_AUDIO: number; /** * Distributed camera. The corresponding HiTrace command is tagName:dcamera. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const DISTRIBUTED_CAMERA: number; /** * Distributed data management. The corresponding HiTrace command is tagName:distributeddatamgr. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const DISTRIBUTED_DATA: number; /** * Distributed hardware framework. The corresponding HiTrace command is tagName:dhfwk. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const DISTRIBUTED_HARDWARE_FRAMEWORK: number; /** * Distributed input. The corresponding HiTrace command is tagName:dinput. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const DISTRIBUTED_INPUT: number; /** * Distributed screen. The corresponding HiTrace command is tagName:dscreen. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const DISTRIBUTED_SCREEN: number; /** * Distributed scheduler. The corresponding HiTrace command is tagName:dsched. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const DISTRIBUTED_SCHEDULER: number; /** * FFRT task. The corresponding HiTrace command is tagName:ffrt. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const FFRT: number; /** * File management system. The corresponding HiTrace command is tagName:filemanagement. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const FILE_MANAGEMENT: number; /** * Global resource management. The corresponding HiTrace command is tagName:gresource. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const GLOBAL_RESOURCE_MANAGER: number; /** * Graphics module. The corresponding HiTrace command is tagName:graphic. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const GRAPHICS: number; /** * HDF subsystem. The corresponding HiTrace command is tagName:hdf. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const HDF: number; /** * MISC module. The corresponding HiTrace command is tagName:misc. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const MISC: number; /** * Multi-modal input module. The corresponding HiTrace command is tagName:multimodalinput. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const MULTIMODAL_INPUT: number; /** * Network. The corresponding HiTrace command is tagName:net. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const NET: number; /** * Notification module. The corresponding HiTrace command is tagName:notification. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const NOTIFICATION: number; /** * Nweb. The corresponding HiTrace command is tagName:nweb. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const NWEB: number; /** * OHOS. The corresponding HiTrace command is tagName:ohos. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const OHOS: number; /** * Power management. The corresponding HiTrace command is tagName:power. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const POWER_MANAGER: number; /** * RPC. The corresponding HiTrace command is tagName:rpc. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const RPC: number; /** * System capability management. The corresponding HiTrace command is tagName:samgr. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const SAMGR: number; /** * Window management. The corresponding HiTrace command is tagName:window. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const WINDOW_MANAGER: number; /** * Audio module. The corresponding HiTrace command is tagName:zaudio. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const AUDIO: number; /** * Camera module. The corresponding HiTrace command is tagName:zcamera. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const CAMERA: number; /** * Image module. The corresponding HiTrace command is tagName:zimage. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const IMAGE: number; /** * Media module. The corresponding HiTrace command is tagName:zmedia. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const MEDIA: number; } @@ -760,7 +838,8 @@ declare namespace hidebug { * @throws { BusinessError } 11400103 - No write permission on the file. * @throws { BusinessError } 11400104 - Abnormal trace status. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function startAppTraceCapture(tags: number[], flag: TraceFlag, limitSize: number): string; @@ -771,7 +850,8 @@ declare namespace hidebug { * @throws { BusinessError } 11400104 - The status of the trace is abnormal. * @throws { BusinessError } 11400105 - No capture trace running. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function stopAppTraceCapture(): void; @@ -781,7 +861,8 @@ declare namespace hidebug { * * @typedef { Record } GcStats * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ type GcStats = Record; @@ -790,7 +871,8 @@ declare namespace hidebug { * * @returns { GcStats } Returns the system GC statistics. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function getVMRuntimeStats(): GcStats; @@ -803,7 +885,8 @@ declare namespace hidebug { * 1. Invalid parameter, a string parameter required. * 2. Invalid parameter, unknown property. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function getVMRuntimeStat(item: string): number; @@ -837,7 +920,8 @@ declare namespace hidebug { * * @returns { boolean } true if the application is in the debugging state. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function isDebugState(): boolean; @@ -848,7 +932,8 @@ declare namespace hidebug { * @throws { BusinessError } 11400104 - Failed to get the application memory due to a remote exception. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ function getGraphicsMemory(): Promise; @@ -859,7 +944,8 @@ declare namespace hidebug { * @throws { BusinessError } 11400104 - Failed to get the application memory due to a remote exception. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ function getGraphicsMemorySync(): number; diff --git a/api/@ohos.hilog.d.ts b/api/@ohos.hilog.d.ts index 88d6fe7cc0..3f72eb2136 100644 --- a/api/@ohos.hilog.d.ts +++ b/api/@ohos.hilog.d.ts @@ -20,20 +20,20 @@ */ /** -* Provides interfaces to generate system logs. -* -* @namespace hilog -* @syscap SystemCapability.HiviewDFX.HiLog -* @since 7 -*/ + * Provides interfaces to generate system logs. + * + * @namespace hilog + * @syscap SystemCapability.HiviewDFX.HiLog + * @since 7 + */ /** -* Provides interfaces to generate system logs. -* -* @namespace hilog -* @syscap SystemCapability.HiviewDFX.HiLog -* @crossplatform -* @since 10 -*/ + * Provides interfaces to generate system logs. + * + * @namespace hilog + * @syscap SystemCapability.HiviewDFX.HiLog + * @crossplatform + * @since 10 + */ /** * Provides interfaces to generate system logs. * @@ -86,13 +86,14 @@ declare namespace hilog { * Outputs debug-level logs. * * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF + * if the value exceeds the range, logs cannot be printed. * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. * @param { string } format Indicates the log format string. * @param { (Object | undefined | null)[] }args Indicates the log parameters. * @syscap SystemCapability.HiviewDFX.HiLog * @crossplatform * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} + * @since 20 * @arkts 1.1&1.2 */ function debug(domain: number, tag: string, format: string, ...args: (Object | undefined | null)[]): void; @@ -137,13 +138,14 @@ declare namespace hilog { * Outputs info-level logs. * * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF + * if the value exceeds the range, logs cannot be printed. * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. * @param { string } format Indicates the log format string. * @param { (Object | undefined | null)[] }args Indicates the log parameters. * @syscap SystemCapability.HiviewDFX.HiLog * @crossplatform * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} + * @since 20 * @arkts 1.1&1.2 */ function info(domain: number, tag: string, format: string, ...args: (Object | undefined | null)[]): void; @@ -188,13 +190,14 @@ declare namespace hilog { * Outputs warning-level logs. * * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF + * if the value exceeds the range, logs cannot be printed. * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. * @param { string } format Indicates the log format string. * @param { (Object | undefined | null)[] }args Indicates the log parameters. * @syscap SystemCapability.HiviewDFX.HiLog * @crossplatform * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} + * @since 20 * @arkts 1.1&1.2 */ function warn(domain: number, tag: string, format: string, ...args: (Object | undefined | null)[]): void; @@ -239,13 +242,14 @@ declare namespace hilog { * Outputs error-level logs. * * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF + * if the value exceeds the range, logs cannot be printed. * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. * @param { string } format Indicates the log format string. * @param { (Object | undefined | null)[] }args Indicates the log parameters. * @syscap SystemCapability.HiviewDFX.HiLog * @crossplatform * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} + * @since 20 * @arkts 1.1&1.2 */ function error(domain: number, tag: string, format: string, ...args: (Object | undefined | null)[]): void; @@ -290,13 +294,14 @@ declare namespace hilog { * Outputs fatal-level logs. * * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF + * if the value exceeds the range, logs cannot be printed. * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. * @param { string } format Indicates the log format string. * @param { (Object | undefined | null)[] }args Indicates the log parameters. * @syscap SystemCapability.HiviewDFX.HiLog * @crossplatform * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} + * @since 20 * @arkts 1.1&1.2 */ function fatal(domain: number, tag: string, format: string, ...args: (Object | undefined | null)[]): void; @@ -333,7 +338,8 @@ declare namespace hilog { * @param { LogLevel } level log level * @syscap SystemCapability.HiviewDFX.HiLog * @atomicservice - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ function setMinLogLevel(level: LogLevel): void; diff --git a/api/@ohos.hiviewdfx.hiAppEvent.d.ts b/api/@ohos.hiviewdfx.hiAppEvent.d.ts index 6ef79c5df6..32b8a5a7b1 100644 --- a/api/@ohos.hiviewdfx.hiAppEvent.d.ts +++ b/api/@ohos.hiviewdfx.hiAppEvent.d.ts @@ -38,7 +38,8 @@ import type { AsyncCallback } from './@ohos.base'; * @namespace hiAppEvent * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Provides the event logging function for applications to log the fault, statistical, security, @@ -66,7 +67,8 @@ declare namespace hiAppEvent { * @enum { number } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Enumerates event types. @@ -90,7 +92,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Fault event. @@ -114,7 +117,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Statistic event. @@ -138,7 +142,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Security event. @@ -162,7 +167,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Behavior event. @@ -182,7 +188,8 @@ declare namespace hiAppEvent { * @namespace domain * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Provides domain name constants. @@ -199,7 +206,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * System domain. @@ -229,7 +237,8 @@ declare namespace hiAppEvent { * @namespace event * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Provides event name constants, including system event name constants and application event name constants. @@ -254,7 +263,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ const USER_LOGIN: string; @@ -269,7 +279,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ const USER_LOGOUT: string; @@ -284,7 +295,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ const DISTRIBUTED_SERVICE_START: string; @@ -293,7 +305,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Application crash event. This is a system event name constant. @@ -310,7 +323,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ const APP_FREEZE: string; @@ -319,7 +333,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const APP_LAUNCH: string; @@ -328,7 +343,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const SCROLL_JANK: string; @@ -337,7 +353,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const CPU_USAGE_HIGH: string; @@ -346,7 +363,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const BATTERY_USAGE: string; @@ -355,7 +373,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const RESOURCE_OVERLIMIT: string; @@ -364,7 +383,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const ADDRESS_SANITIZER: string; @@ -373,7 +393,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ const MAIN_THREAD_JANK: string; @@ -401,7 +422,8 @@ declare namespace hiAppEvent { * @namespace param * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Provides parameter name constants. @@ -424,7 +446,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Custom user ID. @@ -447,7 +470,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Distributed service name. @@ -470,7 +494,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Distributed service instance ID. @@ -503,7 +528,8 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Configures the application event logging function, such as setting the logging switch and directory storage quota. @@ -533,7 +559,8 @@ declare namespace hiAppEvent { * @interface ConfigOption * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Provides configuration options for application event logging. @@ -562,7 +589,8 @@ declare namespace hiAppEvent { * @type { ?boolean } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Whether to enable the event logging function. The default value is false. @@ -608,7 +636,8 @@ declare namespace hiAppEvent { * @type { ?string } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ maxStorage?: string; } @@ -626,7 +655,8 @@ declare namespace hiAppEvent { * @interface AppEventInfo * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Defines parameters of the event information. @@ -654,7 +684,8 @@ declare namespace hiAppEvent { * @type { string } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Event domain. The value is a string of up to 32 characters, including digits (0 to 9), letters (a to z), and @@ -686,7 +717,8 @@ declare namespace hiAppEvent { * @type { string } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Event name. The value is string that contains a maximum of 48 characters, including digits (0 to 9), letters @@ -715,7 +747,8 @@ declare namespace hiAppEvent { * @type { EventType } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Event type. @@ -768,7 +801,8 @@ declare namespace hiAppEvent { * @type { object } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Event parameter object, which consists of a parameter name and a parameter value. In system events, the fields @@ -838,7 +872,8 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Writes events of the AppEventInfo type. This API uses a promise to return the result. The event object written by @@ -909,7 +944,8 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Writes events of the AppEventInfo type. This API uses an asynchronous callback to return the result. The event @@ -944,7 +980,8 @@ declare namespace hiAppEvent { * @typedef {number | string | boolean | Array} * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Type of a custom event parameter value. @@ -982,7 +1019,8 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Sets custom event parameters. This API uses a promise to return the result. During the same lifecycle, system @@ -1031,7 +1069,8 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ function setEventConfig(name: string, config: Record): Promise; @@ -1050,7 +1089,8 @@ declare namespace hiAppEvent { * @interface AppEventPackage * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Defines parameters of an AppEventPackage object. This API is used to obtain detail information about an event @@ -1076,7 +1116,8 @@ declare namespace hiAppEvent { * @type { number } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Event package ID, which is named from 0 in ascending order. @@ -1102,7 +1143,8 @@ declare namespace hiAppEvent { * @type { number } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Number of events in the event package. @@ -1128,7 +1170,8 @@ declare namespace hiAppEvent { * @type { number } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Event size of the event package, in bytes. @@ -1154,7 +1197,8 @@ declare namespace hiAppEvent { * @type { string[] } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Event data in the event package. @@ -1173,7 +1217,8 @@ declare namespace hiAppEvent { * @type { Array } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Event object group. @@ -1198,7 +1243,8 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Defines a subscription data holder for processing event information. @@ -1226,7 +1272,8 @@ declare namespace hiAppEvent { * data is displayed by default. * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Constructs an AppEventPackageHolder instance. You can call addWatcher to add an event watcher, and then @@ -1261,7 +1308,8 @@ declare namespace hiAppEvent { * @throws { BusinessError } 11104001 - Invalid size value. * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Sets the threshold for the data size of the event package obtained each time. @@ -1289,7 +1337,8 @@ declare namespace hiAppEvent { * @throws { BusinessError } 11104001 - Invalid size value. * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Sets the number of data records of the event package obtained each time. When setRow() and setSize() are called @@ -1330,7 +1379,8 @@ declare namespace hiAppEvent { * returned. * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Obtains the subscription event. @@ -1362,7 +1412,8 @@ declare namespace hiAppEvent { * @interface TriggerCondition * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Defines the triggering condition parameters of the onTrigger callback of a Watcher. @@ -1391,7 +1442,8 @@ declare namespace hiAppEvent { * @type { ?number } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Total number of events that trigger callback. The value is a positive integer. The default value is 0, @@ -1423,7 +1475,8 @@ declare namespace hiAppEvent { * @type { ?number } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Total size of events that trigger callback. The value is a positive integer, in bytes. The default value is 0, @@ -1455,7 +1508,8 @@ declare namespace hiAppEvent { * @type { ?number } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Timeout interval for triggering callback. The value is a positive integer, in unit of 30s. The default value is @@ -1488,7 +1542,8 @@ declare namespace hiAppEvent { * @interface AppEventFilter * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Defines parameters of subscription filtering conditions of a Watcher. This API is used to set event filtering @@ -1517,7 +1572,8 @@ declare namespace hiAppEvent { * @type { string } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Event domain, which can be the system event domain (hiAppEvent.domain.OS) or the event domain of the custom @@ -1544,7 +1600,8 @@ declare namespace hiAppEvent { * @type { ?EventType[] } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Event types. If this parameter is not set, events are not filtered by default. @@ -1563,7 +1620,8 @@ declare namespace hiAppEvent { * @type { ?string[] } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Names of the events to be subscribed. If this parameter is not set, events are not filtered by default. @@ -1584,7 +1642,8 @@ declare namespace hiAppEvent { * @interface AppEventGroup * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Defines parameters of the event group returned by a subscription. This API can be used to obtain detail @@ -1603,7 +1662,8 @@ declare namespace hiAppEvent { * @type { string } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Event name. @@ -1622,7 +1682,8 @@ declare namespace hiAppEvent { * @type { Array } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Event object group. @@ -1651,7 +1712,8 @@ declare namespace hiAppEvent { * @interface Watcher * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Defines parameters for a Watcher object. This API is used to configure and manage event watchers to subscribe to @@ -1681,7 +1743,8 @@ declare namespace hiAppEvent { * @type { string } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unique name of a watcher. The value contains a maximum of 32 characters, including digits (0 to 9), letters @@ -1711,7 +1774,8 @@ declare namespace hiAppEvent { * @type { ?TriggerCondition } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Subscription callback triggering condition. This parameter takes effect only when it is passed together with @@ -1740,7 +1804,8 @@ declare namespace hiAppEvent { * @type { ?AppEventFilter[] } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Subscription filtering condition. This parameter is passed only when subscription events need to be filtered. @@ -1775,7 +1840,8 @@ declare namespace hiAppEvent { * @type { ?function } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Subscription callback. This parameter takes effect only when it is passed together with triggerCondition. @@ -1801,7 +1867,8 @@ declare namespace hiAppEvent { * @type { ?function } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Real-time subscription callback. Only this callback function is triggered if it is passed together with @@ -1848,7 +1915,8 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Adds an event watcher. You can use the callback of the event watcher to subscribe to events. @@ -1890,7 +1958,8 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Removes an event watcher. @@ -1920,7 +1989,8 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Clears local logging data of the application. @@ -1945,7 +2015,8 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Sets a user ID, which is used for association when a Processor is configured. @@ -1975,7 +2046,8 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Obtains the value set through setUserId. @@ -2005,7 +2077,8 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Sets a user property, which is used for association when a Processor is configured. @@ -2035,7 +2108,8 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Obtains the value set through setUserProperty. @@ -2059,7 +2133,8 @@ declare namespace hiAppEvent { * @interface AppEventReportConfig * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ interface AppEventReportConfig { /** @@ -2070,7 +2145,8 @@ declare namespace hiAppEvent { * @type { ?string } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ domain?: string; @@ -2082,7 +2158,8 @@ declare namespace hiAppEvent { * @type { ?string } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ name?: string; @@ -2093,7 +2170,8 @@ declare namespace hiAppEvent { * @type { ?boolean } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ isRealTime?: boolean; } @@ -2329,7 +2407,8 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function removeProcessor(id: number): void; } diff --git a/api/@ohos.i18n.d.ts b/api/@ohos.i18n.d.ts index 268888210f..6340eb067c 100644 --- a/api/@ohos.i18n.d.ts +++ b/api/@ohos.i18n.d.ts @@ -4207,12 +4207,12 @@ declare namespace i18n { /** * Creates a NumberFormat object for rich text display. * - * @param { intl.NumberFormat | SimpleNumberFormat } numberFormat - NumberFormat object. - * @param { StyledNumberFormatOptions } [ options ] - Configuration options of the NumberFormat object. - * The default value is the default text style. + * @param { intl.NumberFormat | SimpleNumberFormat } numberFormat - Indicates the number format object that used to format number. + * @param { StyledNumberFormatOptions } [ options ] - Indicates the options used to format the number. * @syscap SystemCapability.Global.I18n * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 * @deprecated since 20 */ constructor(numberFormat: intl.NumberFormat | SimpleNumberFormat, options?: StyledNumberFormatOptions); diff --git a/api/@ohos.inputMethod.d.ts b/api/@ohos.inputMethod.d.ts index f4e99ba13c..629fb617fe 100644 --- a/api/@ohos.inputMethod.d.ts +++ b/api/@ohos.inputMethod.d.ts @@ -1571,12 +1571,13 @@ declare namespace inputMethod { /** * The label id of input method * - * @type { ?number } + * @type { ?double } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - readonly labelId?: number; + readonly labelId?: double; /** * The icon of input method @@ -1591,12 +1592,12 @@ declare namespace inputMethod { /** * The icon id of input method * - * @type { ?number } + * @type { ?double } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework * @since 9 */ - readonly iconId?: number; + readonly iconId?: double; /** * The enabledState of input method @@ -2028,38 +2029,38 @@ declare namespace inputMethod { /** * Indicates the left point of the cursor info and must be absolute coordinate of the physical screen. * - * @type { number } + * @type { double } * @syscap SystemCapability.MiscServices.InputMethodFramework * @since 10 */ - left: number; + left: double; /** * Indicates the top point of the cursor info and must be absolute coordinate of the physical screen. * - * @type { number } + * @type { double } * @syscap SystemCapability.MiscServices.InputMethodFramework * @since 10 */ - top: number; + top: double; /** * Indicates the width point of the cursor info. * - * @type { number } + * @type { double } * @syscap SystemCapability.MiscServices.InputMethodFramework * @since 10 */ - width: number; + width: double; /** * Indicates the height point of the cursor info. * - * @type { number } + * @type { double } * @syscap SystemCapability.MiscServices.InputMethodFramework * @since 10 */ - height: number; + height: double; } /** @@ -2205,20 +2206,20 @@ declare namespace inputMethod { /** * Indicates the width of the input window. * - * @type { number } + * @type { double } * @syscap SystemCapability.MiscServices.InputMethodFramework * @since 10 */ - width: number; + width: double; /** * Indicates the height of the input window. * - * @type { number } + * @type { double } * @syscap SystemCapability.MiscServices.InputMethodFramework * @since 10 */ - height: number; + height: double; } /** diff --git a/api/@ohos.matrix4.d.ts b/api/@ohos.matrix4.d.ts index ebf524195c..17d8a08630 100644 --- a/api/@ohos.matrix4.d.ts +++ b/api/@ohos.matrix4.d.ts @@ -67,7 +67,7 @@ declare namespace matrix4 { * @atomicservice * @since 11 */ - interface TranslateOption { + export interface TranslateOption { /** * Indicates the translation distance of the x-axis, in px. * @@ -180,7 +180,7 @@ declare namespace matrix4 { * @atomicservice * @since 11 */ - interface ScaleOption { + export interface ScaleOption { /** * Zoom factor of the x-axis. * @@ -354,7 +354,7 @@ declare namespace matrix4 { * @atomicservice * @since 11 */ - interface RotateOption { + export interface RotateOption { /** * Axis of rotation vector x coordinate. * @@ -660,7 +660,7 @@ declare namespace matrix4 { * @atomicservice * @since 11 */ - interface Matrix4Transit { + export interface Matrix4Transit { /** * Copy function of Matrix, which can copy a copy of the current matrix object. * diff --git a/api/@ohos.multimedia.audio.d.ts b/api/@ohos.multimedia.audio.d.ts index 51e751d8c4..91e2a371c0 100644 --- a/api/@ohos.multimedia.audio.d.ts +++ b/api/@ohos.multimedia.audio.d.ts @@ -903,13 +903,15 @@ declare namespace audio { /** * HDMI device, such as HDMI, ARC, eARC * @syscap SystemCapability.Multimedia.Audio.Device - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ HDMI = 27, /** * Line connected digital output device, such as s/pdif * @syscap SystemCapability.Multimedia.Audio.Device - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ LINE_DIGITAL = 28, /** diff --git a/api/@ohos.multimedia.avCastPickerParam.d.ts b/api/@ohos.multimedia.avCastPickerParam.d.ts index a98cb42821..6cc41b8d70 100644 --- a/api/@ohos.multimedia.avCastPickerParam.d.ts +++ b/api/@ohos.multimedia.avCastPickerParam.d.ts @@ -29,7 +29,8 @@ * @enum { number } * @syscap SystemCapability.Multimedia.AVSession.AVCast * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export declare enum AVCastPickerState { /** @@ -64,7 +65,8 @@ export declare enum AVCastPickerState { * @enum { number } * @syscap SystemCapability.Multimedia.AVSession.AVCast * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export declare enum AVCastPickerStyle { /** @@ -89,7 +91,8 @@ export declare enum AVCastPickerStyle { * @enum { number } * @syscap SystemCapability.Multimedia.AVSession.AVCast * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export declare enum AVCastPickerColorMode { /** diff --git a/api/@ohos.multimedia.avsession.d.ts b/api/@ohos.multimedia.avsession.d.ts index be9a29d35a..2b5ad2cfa6 100644 --- a/api/@ohos.multimedia.avsession.d.ts +++ b/api/@ohos.multimedia.avsession.d.ts @@ -19,7 +19,7 @@ */ import type { ErrorCallback, AsyncCallback, Callback } from './@ohos.base'; -import { WantAgent } from './@ohos.wantAgent'; +import { WantAgent } from './@ohos.app.ability.wantAgent'; import { KeyEvent } from './@ohos.multimodalInput.keyEvent'; import { ElementName } from './bundleManager/ElementName'; import image from './@ohos.multimedia.image'; diff --git a/api/@ohos.multimedia.camera.d.ts b/api/@ohos.multimedia.camera.d.ts index c4eac85b28..8179d1d3b7 100644 --- a/api/@ohos.multimedia.camera.d.ts +++ b/api/@ohos.multimedia.camera.d.ts @@ -62,7 +62,7 @@ declare namespace camera { /** * Enum for camera status. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -139,7 +139,7 @@ declare namespace camera { /** * Enum for fold status. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 12 */ @@ -203,7 +203,8 @@ declare namespace camera { * * @typedef Profile * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Profile for camera streams. @@ -220,7 +221,8 @@ declare namespace camera { * @type { CameraFormat } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Camera format. @@ -239,7 +241,8 @@ declare namespace camera { * @type { Size } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Resolution. The settings are the width and height of the camera's resolution, not the width and height of the actual output image. @@ -258,7 +261,8 @@ declare namespace camera { * * @typedef FrameRateRange * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Frame rate range. @@ -272,7 +276,7 @@ declare namespace camera { /** * Min frame rate. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 @@ -280,18 +284,19 @@ declare namespace camera { /** * Min frame rate. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly min: number; + readonly min: int; /** * Max frame rate. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 @@ -299,13 +304,14 @@ declare namespace camera { /** * Max frame rate. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly max: number; + readonly max: int; } /** @@ -314,7 +320,8 @@ declare namespace camera { * @extends Profile * @typedef VideoProfile * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Video profile. @@ -332,7 +339,8 @@ declare namespace camera { * @type { FrameRateRange } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Frame rate range, in fps (frames per second). @@ -351,7 +359,8 @@ declare namespace camera { * * @typedef CameraOutputCapability * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Camera output capability. @@ -368,7 +377,8 @@ declare namespace camera { * @type { Array } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Preview profiles. @@ -387,7 +397,8 @@ declare namespace camera { * @type { Array } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Photo profiles. @@ -406,7 +417,8 @@ declare namespace camera { * @type { Array } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Video profiles. @@ -426,7 +438,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ readonly depthProfiles: Array; @@ -436,7 +449,8 @@ declare namespace camera { * @type { Array } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * All the supported metadata Object Types. @@ -453,9 +467,10 @@ declare namespace camera { /** * Enum for camera error code. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Enum for camera error code. @@ -470,7 +485,8 @@ declare namespace camera { * Parameter missing or parameter type incorrect. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Parameter missing or parameter type incorrect. @@ -485,7 +501,8 @@ declare namespace camera { * Operation not allowed. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Operation not allowed. @@ -500,7 +517,8 @@ declare namespace camera { * Session not config. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Session not config. @@ -515,7 +533,8 @@ declare namespace camera { * Session not running. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Session not running. @@ -530,7 +549,8 @@ declare namespace camera { * Session config locked. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Session config locked. @@ -545,7 +565,8 @@ declare namespace camera { * Device setting locked. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Device setting locked. @@ -560,7 +581,8 @@ declare namespace camera { * Can not use camera cause of conflict. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Can not use camera cause of conflict. @@ -575,7 +597,8 @@ declare namespace camera { * Camera disabled cause of security reason. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Camera disabled cause of security reason. @@ -590,7 +613,8 @@ declare namespace camera { * Can not use camera cause of preempted. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Can not use camera cause of preempted. @@ -605,7 +629,8 @@ declare namespace camera { * Unresolved conflicts with current configurations. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unresolved conflicts with current configurations. @@ -621,7 +646,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ DEVICE_FREQUENTLY_SWITCHED = 7400111, @@ -630,7 +656,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ CAMERA_LENS_RETRACTED = 7400112, @@ -638,7 +665,8 @@ declare namespace camera { * Camera service fatal error. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Camera service fatal error. @@ -653,7 +681,7 @@ declare namespace camera { /** * Enum for restore parameter. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 11 @@ -699,32 +727,32 @@ declare namespace camera { /** * Skin smooth level value for restore. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 11 */ - skinSmoothLevel: number; + skinSmoothLevel: int; /** * Face slender value for restore. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 11 */ - faceSlender: number; + faceSlender: int; /** * Skin tone value for restore. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 11 */ - skinTone: number; + skinTone: int; } /** @@ -733,7 +761,8 @@ declare namespace camera { * @typedef PrelaunchConfig * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ interface PrelaunchConfig { /** @@ -742,7 +771,8 @@ declare namespace camera { * @type { CameraDevice } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ cameraDevice: CameraDevice; @@ -752,19 +782,21 @@ declare namespace camera { * @type { ?RestoreParamType } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ restoreParamType?: RestoreParamType; /** * Begin active time. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - activeTime?: number; + activeTime?: int; /** * Setting parameter. @@ -772,7 +804,8 @@ declare namespace camera { * @type { ?SettingParam } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ settingParam?: SettingParam; } @@ -798,7 +831,8 @@ declare namespace camera { * * @returns { Array } An array of supported cameras. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets the supported camera device objects and return the results synchronously. @@ -828,7 +862,8 @@ declare namespace camera { * @param { CameraDevice } camera - Camera device. * @returns { Array } An array of supported scene mode of camera. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets supported scene mode for specific camera. @@ -849,7 +884,8 @@ declare namespace camera { * @param { SceneMode } mode - Scene mode. * @returns { CameraOutputCapability } The camera output capability. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets supported output capability for specific camera. @@ -868,7 +904,8 @@ declare namespace camera { * * @returns { boolean } Is camera muted. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Queries whether the current camera is muted. @@ -895,7 +932,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ isCameraMuteSupported(): boolean; @@ -922,7 +960,8 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ muteCameraPersistent(mute: boolean, type: PolicyType): void; @@ -946,7 +985,8 @@ declare namespace camera { * @throws { BusinessError } 7400102 - Operation not allowed. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Creates a CameraInput instance by camera. @@ -990,7 +1030,8 @@ declare namespace camera { * @throws { BusinessError } 7400102 - Operation not allowed. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Creates a CameraInput instance by camera position and type. @@ -1032,7 +1073,8 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Creates a PreviewOutput instance. @@ -1059,7 +1101,8 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Creates a PreviewOutput instance without profile. @@ -1113,7 +1156,8 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Creates a PhotoOutput instance without surfaceId. @@ -1154,7 +1198,8 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Creates a VideoOutput instance. @@ -1181,7 +1226,8 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Creates a VideoOutput instance without profile. @@ -1215,7 +1261,8 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Creates a MetadataOutput instance. @@ -1240,7 +1287,8 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ createDepthDataOutput(profile: DepthProfile): DepthDataOutput; @@ -1266,7 +1314,8 @@ declare namespace camera { * 3. Parameter verification failed. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets a Session instance by specific scene mode. @@ -1337,7 +1386,8 @@ declare namespace camera { * @param { 'cameraStatus' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the camera status change. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Camera state callback to get the state change of the camera by registering a callback @@ -1360,7 +1410,8 @@ declare namespace camera { * @param { 'cameraStatus' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the camera status change. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from camera status change event callback. @@ -1379,7 +1430,8 @@ declare namespace camera { * @param { 'foldStatusChanged' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the fold status change. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for fold state changes. This API uses an asynchronous callback to return the result. @@ -1401,7 +1453,8 @@ declare namespace camera { * @param { 'foldStatusChanged' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the fold status change. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from fold status change event callback. @@ -1431,7 +1484,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'cameraMute', callback: AsyncCallback): void; @@ -1452,7 +1506,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'cameraMute', callback?: AsyncCallback): void; @@ -1477,7 +1532,8 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isPrelaunchSupported(camera: CameraDevice): boolean; @@ -1505,7 +1561,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setPrelaunchConfig(prelaunchConfig: PrelaunchConfig): void; @@ -1549,7 +1606,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ preSwitchCamera(cameraId: string): void; @@ -1574,7 +1632,8 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ createDeferredPreviewOutput(profile?: Profile): PreviewOutput; @@ -1583,7 +1642,8 @@ declare namespace camera { * * @returns { boolean } this value that specifies whether the device has a torch. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Check if the device has a torch. @@ -1600,7 +1660,8 @@ declare namespace camera { * @param { TorchMode } mode - torch mode. * @returns { boolean } is torch mode supported. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Check if a specifies torch mode is supported. @@ -1617,7 +1678,8 @@ declare namespace camera { * * @returns { TorchMode } torch mode. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Get current torch mode. @@ -1645,7 +1707,8 @@ declare namespace camera { * @throws { BusinessError } 7400102 - Operation not allowed. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Set torch mode to the device. @@ -1674,7 +1737,8 @@ declare namespace camera { * @param { 'torchStatusChange' } type - Event type * @param { AsyncCallback } callback - Callback used to return the torch status change * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for flashlight state changes to get flashlight state change by registering @@ -1697,7 +1761,8 @@ declare namespace camera { * @param { 'torchStatusChange' } type - Event type * @param { AsyncCallback } callback - Callback used to return the torch status change * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes torch status change event callback. @@ -1716,7 +1781,8 @@ declare namespace camera { * * @typedef TorchStatusInfo * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Torch status info. @@ -1733,7 +1799,8 @@ declare namespace camera { * @type { boolean } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * is torch available @@ -1752,7 +1819,8 @@ declare namespace camera { * @type { boolean } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Whether the flashlight is activated or not. True means the flashlight is activated, false means the flashlight @@ -1769,7 +1837,7 @@ declare namespace camera { /** * the current torch brightness level. * - * @type { number } + * @type { double } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @since 11 @@ -1777,19 +1845,20 @@ declare namespace camera { /** * Flashlight brightness level, value range is [0,1], the closer to 1, the brighter it is. * - * @type { number } + * @type { double } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly torchLevel: number; + readonly torchLevel: double; } /** * Enum for torch mode. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 11 */ @@ -1853,7 +1922,8 @@ declare namespace camera { * * @typedef CameraStatusInfo * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * An instance of the interface returned by the camera manager's callback that represents camera state information. @@ -1869,7 +1939,8 @@ declare namespace camera { * * @type { CameraDevice } * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Camera instance. @@ -1886,7 +1957,8 @@ declare namespace camera { * * @type { CameraStatus } * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Current camera status. @@ -1904,7 +1976,8 @@ declare namespace camera { * * @typedef FoldStatusInfo * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Fold status info. @@ -1921,7 +1994,8 @@ declare namespace camera { * @type { Array } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets supported camera devices under the current fold status. @@ -1940,7 +2014,8 @@ declare namespace camera { * @type { FoldStatus } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Current fold status. @@ -1957,14 +2032,14 @@ declare namespace camera { /** * Enum for camera position. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ /** * Enum for camera position. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice * @since 12 @@ -2035,7 +2110,7 @@ declare namespace camera { /** * Enum for camera type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -2127,7 +2202,7 @@ declare namespace camera { /** * Enum for camera connection type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -2189,7 +2264,7 @@ declare namespace camera { /** * Enum for remote camera device type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 10 @@ -2197,7 +2272,7 @@ declare namespace camera { /** * Enum for remote camera device type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 15 */ @@ -2282,7 +2357,8 @@ declare namespace camera { * * @typedef CameraDevice * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Camera device object. @@ -2299,7 +2375,8 @@ declare namespace camera { * @type { string } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Camera ID attribute. @@ -2318,7 +2395,8 @@ declare namespace camera { * @type { CameraPosition } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Camera position attribute. @@ -2337,7 +2415,8 @@ declare namespace camera { * @type { CameraType } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Camera type attribute. @@ -2356,7 +2435,8 @@ declare namespace camera { * @type { ConnectionType } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Camera connection type attribute. @@ -2384,7 +2464,8 @@ declare namespace camera { * @type { string } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Camera remote camera device name attribute. @@ -2412,7 +2493,8 @@ declare namespace camera { * @type { HostDeviceType } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Camera remote camera device type attribute. @@ -2428,7 +2510,7 @@ declare namespace camera { /** * Camera sensor orientation attribute. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @since 12 @@ -2436,13 +2518,14 @@ declare namespace camera { /** * The camera mounting angle, which does not change with screen rotation, takes values from 0° to 360° in degrees. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since 19 + * @since arkts {'1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly cameraOrientation: number; + readonly cameraOrientation: int; /** * Camera device retractable attribute @@ -2451,7 +2534,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ readonly isRetractable?: boolean; } @@ -2475,7 +2559,7 @@ declare namespace camera { /** * Height. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -2487,12 +2571,12 @@ declare namespace camera { * @atomicservice * @since 19 */ - height: number; + height: int; /** * Width. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -2504,7 +2588,7 @@ declare namespace camera { * @atomicservice * @since 19 */ - width: number; + width: int; } /** @@ -2526,7 +2610,7 @@ declare namespace camera { /** * x co-ordinate * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -2538,12 +2622,12 @@ declare namespace camera { * @atomicservice * @since 19 */ - x: number; + x: double; /** * y co-ordinate * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -2555,7 +2639,7 @@ declare namespace camera { * @atomicservice * @since 19 */ - y: number; + y: double; } /** @@ -2563,7 +2647,8 @@ declare namespace camera { * * @interface CameraInput * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Camera input object. @@ -2582,7 +2667,8 @@ declare namespace camera { * @throws { BusinessError } 7400108 - Camera disabled cause of security reason. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Open camera. @@ -2606,7 +2692,8 @@ declare namespace camera { * @throws { BusinessError } 7400108 - Camera disabled cause of security reason. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Open camera. @@ -2631,7 +2718,8 @@ declare namespace camera { * @throws { BusinessError } 7400108 - Camera disabled cause of security reason. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Open camera. @@ -2681,7 +2769,8 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to return the result. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Close camera. @@ -2700,7 +2789,8 @@ declare namespace camera { * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Close camera. @@ -2716,16 +2806,17 @@ declare namespace camera { /** * Delay close camera. * - * @param { number } time - delay time for turning off camera. + * @param { int } time - delay time for turning off camera. * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - closeDelayed(time: number): Promise; + closeDelayed(time: int): Promise; /** * Subscribes to error events. @@ -2734,7 +2825,8 @@ declare namespace camera { * @param { CameraDevice } camera - Camera device. * @param { ErrorCallback } callback - Callback used to get the camera input errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for CameraInput error events to get the result by registering @@ -2759,7 +2851,8 @@ declare namespace camera { * @param { CameraDevice } camera - Camera device. * @param { ErrorCallback } callback - Callback used to get the camera input errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from error events. @@ -2781,7 +2874,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'cameraOcclusionDetection', callback: AsyncCallback): void; @@ -2793,7 +2887,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'cameraOcclusionDetection', callback?: AsyncCallback): void; @@ -2821,7 +2916,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ controlAuxiliary(auxiliaryType: AuxiliaryType, auxiliaryStatus: AuxiliaryStatus): Promise; } @@ -2829,7 +2925,7 @@ declare namespace camera { /** * Enumerates the camera scene modes. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 11 */ @@ -3017,7 +3113,7 @@ declare namespace camera { /** * Enum for camera format type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -3160,7 +3256,7 @@ declare namespace camera { /** * Enum for flash mode. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -3240,7 +3336,8 @@ declare namespace camera { * @typedef LcdFlashStatus * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface LcdFlashStatus { /** @@ -3250,20 +3347,22 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly isLcdFlashNeeded: boolean; /** * Compensate value for lcd flash. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly lcdCompensation: number; + readonly lcdCompensation: int; } /** @@ -3271,7 +3370,8 @@ declare namespace camera { * * @interface FlashQuery * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Flash Query object. @@ -3297,7 +3397,8 @@ declare namespace camera { * @returns { boolean } The flash light support status. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Check if device has flash light. @@ -3328,7 +3429,8 @@ declare namespace camera { * @returns { boolean } Is the flash mode supported. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Checks whether a specified flash mode is supported. @@ -3351,7 +3453,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isLcdFlashSupported(): boolean; } @@ -3362,7 +3465,8 @@ declare namespace camera { * @extends FlashQuery * @interface Flash * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Flash object. @@ -3380,7 +3484,8 @@ declare namespace camera { * @returns { FlashMode } The current flash mode. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets current flash mode. @@ -3399,7 +3504,8 @@ declare namespace camera { * @param { FlashMode } flashMode - Target flash mode. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Sets flash mode. @@ -3420,7 +3526,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ enableLcdFlash(enabled: boolean): void; } @@ -3428,7 +3535,7 @@ declare namespace camera { /** * Enum for exposure mode. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -3499,10 +3606,11 @@ declare namespace camera { /** * Enum for exposure metering mode. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum ExposureMeteringMode { /** @@ -3510,7 +3618,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MATRIX = 0, @@ -3519,7 +3628,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CENTER = 1, @@ -3528,7 +3638,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SPOT = 2 } @@ -3538,7 +3649,8 @@ declare namespace camera { * * @interface AutoExposureQuery * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * AutoExposureQuery object. @@ -3566,7 +3678,8 @@ declare namespace camera { * @returns { boolean } Is the exposure mode supported. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Checks whether a specified exposure mode is supported. @@ -3584,7 +3697,7 @@ declare namespace camera { /** * Query the exposure compensation range. * - * @returns { Array } The array of compensation range. + * @returns { Array } The array of compensation range. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @since 11 @@ -3593,10 +3706,11 @@ declare namespace camera { * Query the exposure compensation range. * Move to AutoExposureQuery interface from AutoExposure interface since 12. * - * @returns { Array } The array of compensation range. + * @returns { Array } The array of compensation range. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Query the exposure compensation range. @@ -3620,7 +3734,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isExposureMeteringModeSupported(aeMeteringMode: ExposureMeteringMode): boolean; } @@ -3631,7 +3746,8 @@ declare namespace camera { * @extends AutoExposureQuery * @interface AutoExposure * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * AutoExposure object. @@ -3649,7 +3765,8 @@ declare namespace camera { * @returns { ExposureMode } The current exposure mode. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets current exposure mode. @@ -3668,7 +3785,8 @@ declare namespace camera { * @param { ExposureMode } aeMode - Exposure mode * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Sets Exposure mode. @@ -3688,7 +3806,8 @@ declare namespace camera { * @returns { Point } The current metering point. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets current metering point. @@ -3707,7 +3826,8 @@ declare namespace camera { * @param { Point } point - metering point * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Set the center point of the metering area. @@ -3723,7 +3843,7 @@ declare namespace camera { /** * Set exposure compensation. * - * @param { number } exposureBias - Exposure compensation + * @param { double } exposureBias - Exposure compensation * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @since 11 @@ -3731,11 +3851,12 @@ declare namespace camera { /** * Set exposure compensation. * - * @param { number } exposureBias - Exposure compensation + * @param { double } exposureBias - Exposure compensation * @throws { BusinessError } 7400102 - Operation not allowed. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Set exposure compensation. @@ -3752,10 +3873,11 @@ declare namespace camera { /** * Query the exposure value. * - * @returns { number } The exposure value. + * @returns { double } The exposure value. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Query the exposure value. @@ -3776,7 +3898,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getExposureMeteringMode(): ExposureMeteringMode; @@ -3789,7 +3912,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setExposureMeteringMode(aeMeteringMode: ExposureMeteringMode): void; } @@ -3797,7 +3921,7 @@ declare namespace camera { /** * Enum for focus mode. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -3874,7 +3998,7 @@ declare namespace camera { /** * Enum for focus state. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -3936,10 +4060,11 @@ declare namespace camera { /** * Enum for focus range type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ enum FocusRangeType { /** @@ -3947,7 +4072,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ AUTO = 0, @@ -3956,7 +4082,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ NEAR = 1 } @@ -3964,10 +4091,11 @@ declare namespace camera { /** * Enum for focus driven type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ enum FocusDrivenType { /** @@ -3975,7 +4103,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ AUTO = 0, @@ -3984,7 +4113,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ FACE = 1 } @@ -3992,10 +4122,11 @@ declare namespace camera { /** * Enum for focus tracking mode. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ enum FocusTrackingMode { /** @@ -4003,7 +4134,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ AUTO = 0 } @@ -4014,7 +4146,8 @@ declare namespace camera { * @typedef FocusTrackingInfo * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ interface FocusTrackingInfo { /** @@ -4023,7 +4156,8 @@ declare namespace camera { * @type { FocusTrackingMode } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ trackingMode: FocusTrackingMode; @@ -4033,7 +4167,8 @@ declare namespace camera { * @type { Rect } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ trackingRegion: Rect; } @@ -4043,7 +4178,8 @@ declare namespace camera { * * @interface FocusQuery * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Focus Query object. @@ -4071,7 +4207,8 @@ declare namespace camera { * @returns { boolean } Is the focus mode supported. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Checks whether a specified focus mode is supported. @@ -4110,7 +4247,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ isFocusRangeTypeSupported(type: FocusRangeType): boolean; @@ -4126,7 +4264,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ isFocusDrivenTypeSupported(type: FocusDrivenType): boolean; } @@ -4137,7 +4276,8 @@ declare namespace camera { * @extends FocusQuery * @interface Focus * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Focus object. @@ -4155,7 +4295,8 @@ declare namespace camera { * @returns { FocusMode } The current focus mode. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets current focus mode. @@ -4174,7 +4315,8 @@ declare namespace camera { * @param { FocusMode } afMode - Target focus mode. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Sets focus mode. @@ -4193,7 +4335,8 @@ declare namespace camera { * @param { Point } point - Target focus point. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Sets focus point. @@ -4212,7 +4355,8 @@ declare namespace camera { * @returns { Point } The current focus point. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets current focus point. @@ -4229,10 +4373,11 @@ declare namespace camera { /** * Gets current focal length. * - * @returns { number } The current focal point. + * @returns { double } The current focal point. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets current focal length. @@ -4266,7 +4411,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setFocusAssist(enabled: boolean): void; @@ -4278,7 +4424,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ getFocusRange(): FocusRangeType; @@ -4295,7 +4442,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ setFocusRange(type: FocusRangeType): void; @@ -4307,7 +4455,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ getFocusDriven(): FocusDrivenType; @@ -4324,7 +4473,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ setFocusDriven(type: FocusDrivenType): void; } @@ -4335,42 +4485,46 @@ declare namespace camera { * @interface ManualFocus * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ManualFocus { /** * Gets current focus distance. * - * @returns { number } The current focus distance. + * @returns { double } The current focus distance. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getFocusDistance(): number; + getFocusDistance(): double; /** * Sets focus distance. * - * @param { number } distance - Focus distance + * @param { double } distance - Focus distance * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - setFocusDistance(distance: number): void; + setFocusDistance(distance: double): void; } /** * Enumerates the camera white balance modes. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Enumerates the camera white balance modes. @@ -4385,7 +4539,8 @@ declare namespace camera { * Automatic white balance mode. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Automatic white balance mode. @@ -4400,7 +4555,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Cloudy white balance mode. @@ -4416,7 +4572,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Incandescent white balance mode. @@ -4432,7 +4589,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Fluorescent white balance mode. @@ -4448,7 +4606,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Daylight white balance mode. @@ -4464,7 +4623,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Manual white balance mode. @@ -4480,7 +4640,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Lock white balance mode. @@ -4498,7 +4659,8 @@ declare namespace camera { * @interface WhiteBalanceQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * White Balance Query object. @@ -4519,7 +4681,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Checks whether the specified white balance mode is supported. @@ -4536,12 +4699,13 @@ declare namespace camera { /** * Query the white balance mode range. * - * @returns { Array } The array of white balance mode range. + * @returns { Array } The array of white balance mode range. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Query the white balance mode range. @@ -4562,7 +4726,8 @@ declare namespace camera { * @interface WhiteBalance * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * WhiteBalance object. @@ -4582,7 +4747,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Obtains the white balance mode in use. @@ -4603,7 +4769,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Sets white balance mode. @@ -4620,12 +4787,13 @@ declare namespace camera { /** * Gets current white balance. * - * @returns { number } The current white balance. + * @returns { int } The current white balance. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets current white balance. @@ -4641,13 +4809,14 @@ declare namespace camera { /** * Sets white balance. * - * @param { number } whiteBalance - White balance. + * @param { int } whiteBalance - White balance. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Sets white balance. @@ -4668,7 +4837,8 @@ declare namespace camera { * @interface ManualIsoQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ManualIsoQuery { /** @@ -4679,21 +4849,23 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isManualIsoSupported(): boolean; /** * Get the ISO range. * - * @returns { Array } The array of ISO range. + * @returns { Array } The array of ISO range. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getIsoRange(): Array; + getIsoRange(): Array; } /** @@ -4703,41 +4875,45 @@ declare namespace camera { * @interface ManualIso * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ManualIso extends ManualIsoQuery { /** * Gets current ISO. * - * @returns { number } The current ISO. + * @returns { int } The current ISO. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getIso(): number; + getIso(): int; /** * Sets ISO. * - * @param { number } iso - ISO + * @param { int } iso - ISO * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - setIso(iso: number): void; + setIso(iso: int): void; } /** * Enum for smooth zoom mode. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Enum for smooth zoom mode. @@ -4752,7 +4928,8 @@ declare namespace camera { * Normal zoom mode. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Normal zoom mode. @@ -4769,7 +4946,8 @@ declare namespace camera { * * @typedef SmoothZoomInfo * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * SmoothZoomInfo object @@ -4783,9 +4961,10 @@ declare namespace camera { /** * The duration of smooth zoom. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * The duration of smooth zoom. @@ -4804,30 +4983,33 @@ declare namespace camera { * @typedef ZoomPointInfo * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ZoomPointInfo { /** * The zoom ratio value. * - * @type { number } + * @type { double } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly zoomRatio: number; + readonly zoomRatio: double; /** * The equivalent focal Length. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly equivalentFocalLength: number; + readonly equivalentFocalLength: int; } /** @@ -4835,7 +5017,8 @@ declare namespace camera { * * @interface ZoomQuery * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Zoom query object. @@ -4849,7 +5032,7 @@ declare namespace camera { /** * Gets all supported zoom ratio range. * - * @returns { Array } The zoom ratio range. + * @returns { Array } The zoom ratio range. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @since 11 @@ -4858,10 +5041,11 @@ declare namespace camera { * Gets all supported zoom ratio range. * Move to ZoomQuery interface from Zoom since 12. * - * @returns { Array } The zoom ratio range. + * @returns { Array } The zoom ratio range. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets all supported zoom ratio range. @@ -4883,7 +5067,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getZoomPointInfos(): Array; } @@ -4894,7 +5079,8 @@ declare namespace camera { * @extends ZoomQuery * @interface Zoom * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Zoom object. @@ -4909,7 +5095,7 @@ declare namespace camera { /** * Gets zoom ratio. * - * @returns { number } The zoom ratio value. + * @returns { double } The zoom ratio value. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @since 11 @@ -4917,11 +5103,12 @@ declare namespace camera { /** * Gets zoom ratio. * - * @returns { number } The zoom ratio value. + * @returns { double } The zoom ratio value. * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets zoom ratio. @@ -4938,10 +5125,11 @@ declare namespace camera { /** * Sets zoom ratio. * - * @param { number } zoomRatio - Target zoom ratio. + * @param { double } zoomRatio - Target zoom ratio. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Sets zoom ratio. @@ -4957,11 +5145,12 @@ declare namespace camera { /** * Sets target zoom ratio by smooth method. * - * @param { number } targetRatio - Target zoom ratio. + * @param { double } targetRatio - Target zoom ratio. * @param { SmoothZoomMode } mode - Smooth zoom mode. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Sets target zoom ratio by smooth method. @@ -4989,7 +5178,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ prepareZoom(): void; @@ -5000,7 +5190,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ unprepareZoom(): void; } @@ -5008,7 +5199,7 @@ declare namespace camera { /** * Enum for video stabilization mode. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -5102,7 +5293,8 @@ declare namespace camera { * * @interface StabilizationQuery * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Stabilization Query object. @@ -5130,7 +5322,8 @@ declare namespace camera { * @returns { boolean } Is video stabilization mode supported. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Check whether the specified video stabilization mode is supported. @@ -5152,7 +5345,8 @@ declare namespace camera { * @extends StabilizationQuery * @interface Stabilization * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Stabilization object. @@ -5170,7 +5364,8 @@ declare namespace camera { * @returns { VideoStabilizationMode } The current video stabilization mode. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Query the video stabilization mode currently in use. @@ -5189,7 +5384,8 @@ declare namespace camera { * @param { VideoStabilizationMode } mode - video stabilization mode to set. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Set video stabilization mode. @@ -5206,10 +5402,11 @@ declare namespace camera { /** * Enumerates the camera portrait theme types. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enum PortraitThemeType { /** @@ -5217,7 +5414,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ NATURAL = 0, @@ -5226,7 +5424,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ DELICATE = 1, @@ -5235,7 +5434,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ STYLISH = 2 } @@ -5243,7 +5443,7 @@ declare namespace camera { /** * Enumerates the camera beauty effect types. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 10 @@ -5292,7 +5492,8 @@ declare namespace camera { * @interface BeautyQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface BeautyQuery { /** @@ -5314,7 +5515,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSupportedBeautyTypes(): Array; @@ -5322,7 +5524,7 @@ declare namespace camera { * Gets the specific beauty effect type range. * * @param { BeautyType } type - The type of beauty effect. - * @returns { Array } The array of the specific beauty effect range. + * @returns { Array } The array of the specific beauty effect range. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core @@ -5334,14 +5536,15 @@ declare namespace camera { * Move to BeautyQuery from Beauty since 12. * * @param { BeautyType } type - The type of beauty effect. - * @returns { Array } The array of the specific beauty effect range. + * @returns { Array } The array of the specific beauty effect range. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getSupportedBeautyRange(type: BeautyType): Array; + getSupportedBeautyRange(type: BeautyType): Array; /** * Gets supported portrait theme type. @@ -5351,7 +5554,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ getSupportedPortraitThemeTypes(): Array; @@ -5363,7 +5567,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ isPortraitThemeSupported(): boolean; } @@ -5375,34 +5580,37 @@ declare namespace camera { * @interface Beauty * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ interface Beauty extends BeautyQuery { /** * Gets the beauty effect in use. * * @param { BeautyType } type - The type of beauty effect. - * @returns { number } the beauty effect in use. + * @returns { int } the beauty effect in use. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - getBeauty(type: BeautyType): number; + getBeauty(type: BeautyType): int; /** * Sets a beauty effect for a camera device. * * @param { BeautyType } type - The type of beauty effect. - * @param { number } value The number of beauty effect. + * @param { int } value The number of beauty effect. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - setBeauty(type: BeautyType, value: number): void; + setBeauty(type: BeautyType, value: int): void; /** * Sets a portrait theme type for a camera device. @@ -5413,7 +5621,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ setPortraitThemeType(type: PortraitThemeType): void; } @@ -5424,7 +5633,8 @@ declare namespace camera { * @typedef EffectSuggestion * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface EffectSuggestion { @@ -5436,7 +5646,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isEffectSuggestionSupported(): boolean; @@ -5449,7 +5660,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enableEffectSuggestion(enabled: boolean): void; @@ -5461,7 +5673,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSupportedEffectSuggestionTypes(): Array; @@ -5475,7 +5688,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setEffectSuggestionStatus(status: Array): void; @@ -5489,7 +5703,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ updateEffectSuggestion(type: EffectSuggestionType, enabled: boolean): void; } @@ -5497,10 +5712,11 @@ declare namespace camera { /** * Enumerates the camera color effect types. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ enum ColorEffectType { /** @@ -5508,7 +5724,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ NORMAL = 0, @@ -5517,7 +5734,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ BRIGHT = 1, @@ -5526,7 +5744,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ SOFT = 2, @@ -5535,7 +5754,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ BLACK_WHITE = 3 } @@ -5543,10 +5763,11 @@ declare namespace camera { /** * Enum for policy type * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum PolicyType { /** @@ -5554,7 +5775,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ PRIVACY = 1 } @@ -5565,7 +5787,8 @@ declare namespace camera { * @interface ColorEffectQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ColorEffectQuery { /** @@ -5587,7 +5810,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSupportedColorEffects(): Array; } @@ -5599,7 +5823,8 @@ declare namespace camera { * @interface ColorEffect * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ interface ColorEffect extends ColorEffectQuery { /** @@ -5610,7 +5835,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ getColorEffect(): ColorEffectType; @@ -5622,7 +5848,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ setColorEffect(type: ColorEffectType): void; } @@ -5632,7 +5859,8 @@ declare namespace camera { * * @interface ColorManagementQuery * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Color Management Query object. @@ -5649,7 +5877,8 @@ declare namespace camera { * @returns { Array } The array of the supported color space for the session. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets the supported color space types. @@ -5675,7 +5904,8 @@ declare namespace camera { * @extends ColorManagementQuery * @interface ColorManagement * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Color Management object. @@ -5693,7 +5923,8 @@ declare namespace camera { * @returns { colorSpaceManager.ColorSpace } Current color space. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets the specific color space type. @@ -5715,7 +5946,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Sets a color space for the session. @@ -5737,7 +5969,8 @@ declare namespace camera { * * @interface AutoDeviceSwitchQuery * @syscap SystemCapability.Multimedia.Camera.Core - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Auto Device Switch Query object. @@ -5754,7 +5987,8 @@ declare namespace camera { * @returns { boolean } Is auto device switch supported. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Check whether auto device switch is supported. @@ -5780,7 +6014,8 @@ declare namespace camera { * @extends AutoDeviceSwitchQuery * @interface AutoDeviceSwitch * @syscap SystemCapability.Multimedia.Camera.Core - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Auto Device Switch object. @@ -5803,7 +6038,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Enable auto device switch for session. @@ -5827,7 +6063,8 @@ declare namespace camera { * * @typedef AutoDeviceSwitchStatus * @syscap SystemCapability.Multimedia.Camera.Core - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Auto Device Switch Status. @@ -5844,7 +6081,8 @@ declare namespace camera { * @type { boolean } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Notify whether device is switched. @@ -5863,7 +6101,8 @@ declare namespace camera { * @type { boolean } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Notify whether device capability is changed. @@ -5883,7 +6122,8 @@ declare namespace camera { * @interface MacroQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Macro Query object. @@ -5911,7 +6151,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Determine whether camera macro is supported. @@ -5931,7 +6172,8 @@ declare namespace camera { * @interface Macro * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Macro object. @@ -5962,7 +6204,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Enable macro for camera. @@ -5980,10 +6223,11 @@ declare namespace camera { /** * Enum for usage type used in capture session. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ enum UsageType { /** @@ -5991,7 +6235,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ BOKEH = 0 } @@ -6001,7 +6246,8 @@ declare namespace camera { * * @interface Session * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Session object. @@ -6025,7 +6271,8 @@ declare namespace camera { * @throws { BusinessError } 7400105 - Session config locked. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Begin capture session config. @@ -6045,7 +6292,8 @@ declare namespace camera { * @throws { BusinessError } 7400102 - Operation not allowed. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Commit capture session config. @@ -6066,7 +6314,8 @@ declare namespace camera { * @throws { BusinessError } 7400102 - Operation not allowed. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Commit capture session config. @@ -6087,7 +6336,8 @@ declare namespace camera { * @param { CameraInput } cameraInput - Target camera input to add. * @returns { boolean } You can add the input into the session. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Determines whether the camera input can be added into the session. @@ -6122,7 +6372,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Adds a camera input. @@ -6170,7 +6421,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Removes a camera input. @@ -6204,7 +6456,8 @@ declare namespace camera { * @param { CameraOutput } cameraOutput - Target camera output to add. * @returns { boolean } You can add the output into the session. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Determines whether the camera output can be added into the session. @@ -6239,7 +6492,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Adds a camera output. @@ -6287,7 +6541,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Removes a camera output. @@ -6331,7 +6586,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Starts capture session. @@ -6363,7 +6619,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Starts capture session. @@ -6384,7 +6641,8 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to return the result. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Stops capture session. @@ -6403,7 +6661,8 @@ declare namespace camera { * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Stops capture session. @@ -6422,7 +6681,8 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to return the result. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Release capture session instance. @@ -6441,7 +6701,8 @@ declare namespace camera { * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Release capture session instance. @@ -6466,7 +6727,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ setUsage(usage: UsageType, enabled: boolean): void; @@ -6480,7 +6742,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ getCameraOutputCapabilities(camera: CameraDevice): Array; } @@ -7062,9 +7325,10 @@ declare namespace camera { * Types of preconfig, which used to configure session conveniently. * Preconfig type contains common use cases of camera output. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Types of preconfig, which used to configure session conveniently. @@ -7080,7 +7344,8 @@ declare namespace camera { * 720P output for preconfig. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * 720P output for preconfig. @@ -7095,7 +7360,8 @@ declare namespace camera { * 1080P output for preconfig. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * 1080P output for preconfig. @@ -7110,7 +7376,8 @@ declare namespace camera { * 4K output for preconfig. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * 4K output for preconfig. @@ -7125,7 +7392,8 @@ declare namespace camera { * high quality output for preconfig. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * high quality output for preconfig. @@ -7140,9 +7408,10 @@ declare namespace camera { /** * The aspect ratios of preconfig, which used to configure session conveniently. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * The aspect ratios of preconfig, which used to configure session conveniently. @@ -7157,7 +7426,8 @@ declare namespace camera { * Aspect ratio 1:1 for preconfig. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Aspect ratio 1:1 for preconfig. @@ -7172,7 +7442,8 @@ declare namespace camera { * Aspect ratio 4:3 for preconfig. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Aspect ratio 4:3 for preconfig. @@ -7187,7 +7458,8 @@ declare namespace camera { * Aspect ratio 16:9 for preconfig. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Aspect ratio 16:9 for preconfig. @@ -7202,10 +7474,11 @@ declare namespace camera { /** * Enum for feature type used in scene detection. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum SceneFeatureType { /** @@ -7213,7 +7486,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MOON_CAPTURE_BOOST = 0, @@ -7222,7 +7496,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ TRIPOD_DETECTION = 1, @@ -7231,7 +7506,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ LOW_LIGHT_BOOST = 2 } @@ -7242,7 +7518,8 @@ declare namespace camera { * @typedef SceneFeatureDetectionResult * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface SceneFeatureDetectionResult { /** @@ -7252,7 +7529,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly featureType: SceneFeatureType; @@ -7263,7 +7541,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly detected: boolean; } @@ -7271,10 +7550,11 @@ declare namespace camera { /** * Enum for tripod status. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ enum TripodStatus { /** @@ -7282,7 +7562,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ INVALID = 0, @@ -7291,7 +7572,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ ACTIVE = 1, @@ -7300,7 +7582,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ ENTERING = 2, @@ -7309,7 +7592,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ EXITING = 3 } @@ -7321,7 +7605,8 @@ declare namespace camera { * @interface TripodDetectionResult * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface TripodDetectionResult extends SceneFeatureDetectionResult { /** @@ -7331,7 +7616,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ readonly tripodStatus: TripodStatus; } @@ -7342,7 +7628,8 @@ declare namespace camera { * @interface SceneDetectionQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface SceneDetectionQuery { /** @@ -7354,7 +7641,8 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isSceneFeatureSupported(type: SceneFeatureType): boolean; } @@ -7366,7 +7654,8 @@ declare namespace camera { * @interface SceneDetection * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface SceneDetection extends SceneDetectionQuery { /** @@ -7378,7 +7667,8 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enableSceneFeature(type: SceneFeatureType, enabled: boolean): void; } @@ -7399,7 +7689,8 @@ declare namespace camera { * @interface PhotoSessionForSys * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ interface PhotoSessionForSys extends PhotoSession, Beauty, ColorEffect, ColorManagement, Macro, SceneDetection, EffectSuggestion, DepthFusion { } @@ -7417,7 +7708,8 @@ declare namespace camera { * @extends Session, Flash, AutoExposure, Focus, Zoom, ColorManagement, AutoDeviceSwitch * @interface PhotoSession * @syscap SystemCapability.Multimedia.Camera.Core - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Photo session object. @@ -7446,7 +7738,8 @@ declare namespace camera { * @returns { boolean } Whether the choosed preconfig type can be used. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets whether the choosed preconfig type can be used to configure photo session. @@ -7472,7 +7765,8 @@ declare namespace camera { * default value {@link PreconfigRatio#PRECONFIG_RATIO_4_3} * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Configure photo session with the preconfig type. @@ -7494,7 +7788,8 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the capture session errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for error events from a normal video session to get the result by registering @@ -7517,7 +7812,8 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the capture session errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from error events. @@ -7536,7 +7832,8 @@ declare namespace camera { * @param { 'focusStateChange' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the focus state change. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for camera focus state changes to get the result by registering @@ -7559,7 +7856,8 @@ declare namespace camera { * @param { 'focusStateChange' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the focus state change. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from focus state change event callback. @@ -7578,7 +7876,8 @@ declare namespace camera { * @param { 'smoothZoomInfoAvailable' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the zoom info. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for state changes in the camera's smooth zoom to get the result by registering @@ -7601,7 +7900,8 @@ declare namespace camera { * @param { 'smoothZoomInfoAvailable' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the zoom info. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from zoom info event callback. @@ -7622,7 +7922,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'macroStatusChanged', callback: AsyncCallback): void; @@ -7634,7 +7935,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'macroStatusChanged', callback?: AsyncCallback): void; @@ -7647,7 +7949,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'featureDetection', featureType: SceneFeatureType, callback: AsyncCallback): void; @@ -7660,7 +7963,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'featureDetection', featureType: SceneFeatureType, callback?: AsyncCallback): void; @@ -7671,7 +7975,8 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'effectSuggestionChange', callback: AsyncCallback): void; @@ -7682,7 +7987,8 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'effectSuggestionChange', callback?: AsyncCallback): void; @@ -7692,7 +7998,8 @@ declare namespace camera { * @param { 'autoDeviceSwitchStatusChange' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for the camera's automatic lens switching state changes to get the result @@ -7715,7 +8022,8 @@ declare namespace camera { * @param { 'autoDeviceSwitchStatusChange' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes to auto device switch status event callback. @@ -7736,7 +8044,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'lcdFlashStatus', callback: AsyncCallback): void; @@ -7748,7 +8057,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'lcdFlashStatus', callback?: AsyncCallback): void; @@ -7761,7 +8071,8 @@ declare namespace camera { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. 2.Incorrect parameter types. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ getSessionFunctions(outputCapability: CameraOutputCapability): Array; @@ -7772,7 +8083,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ getSessionConflictFunctions(): Array; } @@ -7793,7 +8105,8 @@ declare namespace camera { * @interface VideoSessionForSys * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Video session object used by the system camera. @@ -7810,9 +8123,10 @@ declare namespace camera { /** * Enum for quality prioritization. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Enum for quality prioritization. @@ -7827,7 +8141,8 @@ declare namespace camera { * High quality priority. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ /** * High quality priority. @@ -7842,7 +8157,8 @@ declare namespace camera { * Power balance priority. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Power balance priority. @@ -7868,7 +8184,8 @@ declare namespace camera { * @interface VideoSession * @extends AutoDeviceSwitch * @syscap SystemCapability.Multimedia.Camera.Core - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Video session object. @@ -7899,7 +8216,8 @@ declare namespace camera { * @returns { boolean } Whether the choosed preconfig type can be used. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets whether the choosed preconfig type can be used to configure video session. @@ -7925,7 +8243,8 @@ declare namespace camera { * default value {@link PreconfigRatio#PRECONFIG_RATIO_16_9}. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Configure video session with the preconfig type. @@ -7947,7 +8266,8 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the capture session errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for error events in normal photo sessions to get the result by registering @@ -7970,7 +8290,8 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the capture session errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from error events. @@ -7989,7 +8310,8 @@ declare namespace camera { * @param { 'focusStateChange' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the focus state change. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for error events in normal photo sessions to get the result by registering @@ -8012,7 +8334,8 @@ declare namespace camera { * @param { 'focusStateChange' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the focus state change. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from focus state change event callback. @@ -8031,7 +8354,8 @@ declare namespace camera { * @param { 'smoothZoomInfoAvailable' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the zoom info. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for state changes in the camera's smooth zoom to get the result by registering @@ -8054,7 +8378,8 @@ declare namespace camera { * @param { 'smoothZoomInfoAvailable' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the zoom info. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from zoom info event callback. @@ -8075,7 +8400,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'macroStatusChanged', callback: AsyncCallback): void; @@ -8087,7 +8413,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'macroStatusChanged', callback?: AsyncCallback): void; @@ -8099,7 +8426,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'lcdFlashStatus', callback: AsyncCallback): void; @@ -8111,7 +8439,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'lcdFlashStatus', callback?: AsyncCallback): void; @@ -8121,7 +8450,8 @@ declare namespace camera { * @param { 'autoDeviceSwitchStatusChange' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for the camera's automatic lens switching state changes to get the @@ -8145,7 +8475,8 @@ declare namespace camera { * @param { 'autoDeviceSwitchStatusChange' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes to auto device switch status event callback. @@ -8166,7 +8497,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'focusTrackingInfoAvailable', callback: Callback): void; @@ -8178,7 +8510,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'focusTrackingInfoAvailable', callback?: Callback): void; @@ -8214,7 +8547,8 @@ declare namespace camera { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. 2.Incorrect parameter types. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ getSessionFunctions(outputCapability: CameraOutputCapability): Array; @@ -8225,7 +8559,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ getSessionConflictFunctions(): Array; @@ -8240,7 +8575,8 @@ declare namespace camera { * 3. Parameter verification failed. * @throws { BusinessError } 7400103 - Session not config. The session has not been committed or configured. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Sets quality prioritization. @@ -8266,7 +8602,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'lightStatusChange', callback: AsyncCallback): void; @@ -8278,7 +8615,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'lightStatusChange', callback?: AsyncCallback): void; } @@ -8286,10 +8624,11 @@ declare namespace camera { /** * Enum for the camera light status. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ enum LightStatus { /** @@ -8297,7 +8636,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ NORMAL = 0, @@ -8306,7 +8646,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ INSUFFICIENT = 1 } @@ -8314,10 +8655,11 @@ declare namespace camera { /** * Enumerates the camera portrait effects. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ enum PortraitEffect { /** @@ -8325,7 +8667,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ OFF = 0, @@ -8334,7 +8677,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ CIRCLES = 1, @@ -8343,7 +8687,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ HEART = 2, @@ -8352,7 +8697,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ ROTATED = 3, @@ -8361,7 +8707,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ STUDIO = 4, @@ -8370,7 +8717,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ THEATER = 5 } @@ -8381,7 +8729,8 @@ declare namespace camera { * @interface PortraitQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface PortraitQuery { /** @@ -8413,7 +8762,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSupportedPortraitEffects(): Array; } @@ -8425,7 +8775,8 @@ declare namespace camera { * @interface Portrait * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ interface Portrait extends PortraitQuery { /** @@ -8446,7 +8797,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ getPortraitEffect(): PortraitEffect; @@ -8468,7 +8820,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ setPortraitEffect(effect: PortraitEffect): void; } @@ -8479,30 +8832,33 @@ declare namespace camera { * @typedef ZoomRange * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ interface ZoomRange { /** * Min zoom value. * - * @type { number } + * @type { double } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly min: number; + readonly min: double; /** * Max zoom value. * - * @type { number } + * @type { double } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly max: number; + readonly max: double; } /** @@ -8511,7 +8867,8 @@ declare namespace camera { * @typedef PhysicalAperture * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ interface PhysicalAperture { /** @@ -8520,19 +8877,21 @@ declare namespace camera { * @type { ZoomRange } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ zoomRange: ZoomRange; /** * The supported physical apertures. * - * @type { Array } + * @type { Array } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - apertures: Array; + apertures: Array; } /** @@ -8541,13 +8900,14 @@ declare namespace camera { * @interface ApertureQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ApertureQuery { /** * Gets the supported virtual apertures. * - * @returns { Array } The array of supported virtual apertures. + * @returns { Array } The array of supported virtual apertures. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core @@ -8558,14 +8918,15 @@ declare namespace camera { * Gets the supported virtual apertures. * Move to ApertureQuery interface from Aperture since 12. * - * @returns { Array } The array of supported virtual apertures. + * @returns { Array } The array of supported virtual apertures. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getSupportedVirtualApertures(): Array; + getSupportedVirtualApertures(): Array; /** * Gets the supported physical apertures. @@ -8586,7 +8947,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSupportedPhysicalApertures(): Array; } @@ -8598,56 +8960,61 @@ declare namespace camera { * @interface Aperture * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ interface Aperture extends ApertureQuery { /** * Gets current virtual aperture value. * - * @returns { number } The current virtual aperture value. + * @returns { double } The current virtual aperture value. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - getVirtualAperture(): number; + getVirtualAperture(): double; /** * Sets virtual aperture value. * - * @param { number } aperture - virtual aperture value + * @param { double } aperture - virtual aperture value * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - setVirtualAperture(aperture: number): void; + setVirtualAperture(aperture: double): void; /** * Gets current physical aperture value. * - * @returns { number } The current physical aperture value. + * @returns { double } The current physical aperture value. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - getPhysicalAperture(): number; + getPhysicalAperture(): double; /** * Sets physical aperture value. * - * @param { number } aperture - physical aperture value + * @param { double } aperture - physical aperture value * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - setPhysicalAperture(aperture: number): void; + setPhysicalAperture(aperture: double): void; } /** @@ -8657,7 +9024,8 @@ declare namespace camera { * @interface PortraitPhotoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ interface PortraitPhotoSession extends Session, Flash, AutoExposure, Focus, Zoom, Beauty, ColorEffect, ColorManagement, Portrait, Aperture { /** @@ -8667,7 +9035,8 @@ declare namespace camera { * @param { ErrorCallback } callback - Callback used to get the capture session errors. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'error', callback: ErrorCallback): void; @@ -8678,7 +9047,8 @@ declare namespace camera { * @param { ErrorCallback } callback - Callback used to get the capture session errors. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'error', callback?: ErrorCallback): void; @@ -8689,7 +9059,8 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to get the focus state change. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -8700,7 +9071,8 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to get the focus state change. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -8711,7 +9083,8 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to get the zoom info. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; @@ -8722,7 +9095,8 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to get the zoom info. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; @@ -8734,7 +9108,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'lcdFlashStatus', callback: AsyncCallback): void; @@ -8746,7 +9121,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'lcdFlashStatus', callback?: AsyncCallback): void; @@ -8759,7 +9135,8 @@ declare namespace camera { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. 2.Incorrect parameter types. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ getSessionFunctions(outputCapability: CameraOutputCapability): Array; @@ -8770,7 +9147,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ getSessionConflictFunctions(): Array; } @@ -8782,7 +9160,8 @@ declare namespace camera { * @interface ApertureVideoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ApertureVideoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorEffect, Aperture { /** @@ -8793,7 +9172,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'error', callback: ErrorCallback): void; @@ -8805,7 +9185,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'error', callback?: ErrorCallback): void; @@ -8817,7 +9198,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -8829,7 +9211,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -8841,7 +9224,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; @@ -8853,7 +9237,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; } @@ -8864,7 +9249,8 @@ declare namespace camera { * @interface ManualExposureQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ManualExposureQuery { /** @@ -8899,13 +9285,14 @@ declare namespace camera { * @interface ManualExposure * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ interface ManualExposure extends ManualExposureQuery { /** * Gets current exposure value. * - * @returns { number } The current exposure value. + * @returns { int } The current exposure value. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core @@ -8915,20 +9302,21 @@ declare namespace camera { /** * Gets current exposure value. * - * @returns { number } The current exposure value. + * @returns { int } The current exposure value. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getExposure(): number; + getExposure(): int; /** * Sets Exposure value. * - * @param { number } exposure - Exposure value + * @param { int } exposure - Exposure value * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core @@ -8938,15 +9326,16 @@ declare namespace camera { /** * Sets Exposure value. * - * @param { number } exposure - Exposure value + * @param { int } exposure - Exposure value * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400102 - Operation not allowed. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - setExposure(exposure: number): void; + setExposure(exposure: int): void; } /** @@ -8956,7 +9345,8 @@ declare namespace camera { * @interface NightPhotoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ interface NightPhotoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorEffect, Beauty, ColorManagement, ManualExposure { /** @@ -8966,7 +9356,8 @@ declare namespace camera { * @param { ErrorCallback } callback - Callback used to get the capture session errors. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'error', callback: ErrorCallback): void; @@ -8977,7 +9368,8 @@ declare namespace camera { * @param { ErrorCallback } callback - Callback used to get the capture session errors. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'error', callback?: ErrorCallback): void; @@ -8988,7 +9380,8 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to get the focus state change. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -8999,7 +9392,8 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to get the focus state change. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -9010,7 +9404,8 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to get the zoom info. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; @@ -9021,7 +9416,8 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to get the zoom info. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; @@ -9033,7 +9429,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'lcdFlashStatus', callback: AsyncCallback): void; @@ -9045,7 +9442,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'lcdFlashStatus', callback?: AsyncCallback): void; } @@ -9056,19 +9454,21 @@ declare namespace camera { * @typedef IsoInfo * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface IsoInfo { /** * ISO value. * - * @type { ?number } + * @type { ?int } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly iso?: number; + readonly iso?: int; } /** @@ -9077,19 +9477,21 @@ declare namespace camera { * @typedef ExposureInfo * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ExposureInfo { /** * Exposure time value. * - * @type { ?number } + * @type { ?int } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly exposureTime?: number; + readonly exposureTime?: int; } /** @@ -9098,19 +9500,21 @@ declare namespace camera { * @typedef ApertureInfo * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ApertureInfo { /** * Aperture value. * - * @type { ?number } + * @type { ?double } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly aperture?: number; + readonly aperture?: double; } /** @@ -9119,19 +9523,21 @@ declare namespace camera { * @typedef LuminationInfo * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface LuminationInfo { /** * Lumination value. * - * @type { ?number } + * @type { ?double } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly lumination?: number; + readonly lumination?: double; } /** @@ -9140,7 +9546,8 @@ declare namespace camera { * @interface ProfessionalPhotoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ProfessionalPhotoSession extends Session, AutoExposure, ManualExposure, Focus, ManualFocus, WhiteBalance, ManualIso, Flash, Zoom, ColorEffect, Aperture { /** @@ -9151,7 +9558,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'error', callback: ErrorCallback): void; @@ -9163,7 +9571,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'error', callback?: ErrorCallback): void; @@ -9175,7 +9584,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -9187,7 +9597,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -9199,7 +9610,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; @@ -9211,7 +9623,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; @@ -9223,7 +9636,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'isoInfoChange', callback: AsyncCallback): void; @@ -9235,7 +9649,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'isoInfoChange', callback?: AsyncCallback): void; @@ -9247,7 +9662,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'exposureInfoChange', callback: AsyncCallback): void; @@ -9259,7 +9675,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'exposureInfoChange', callback?: AsyncCallback): void; @@ -9271,7 +9688,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'apertureInfoChange', callback: AsyncCallback): void; @@ -9283,7 +9701,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'apertureInfoChange', callback?: AsyncCallback): void; @@ -9295,7 +9714,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'luminationInfoChange', callback: AsyncCallback): void; @@ -9307,7 +9727,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'luminationInfoChange', callback?: AsyncCallback): void; } @@ -9319,7 +9740,8 @@ declare namespace camera { * @interface ProfessionalVideoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ProfessionalVideoSession extends Session, AutoExposure, ManualExposure, Focus, ManualFocus, WhiteBalance, ManualIso, Flash, Zoom, ColorEffect, Aperture { /** @@ -9330,7 +9752,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'error', callback: ErrorCallback): void; @@ -9342,7 +9765,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'error', callback?: ErrorCallback): void; @@ -9354,7 +9778,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -9366,7 +9791,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -9378,7 +9804,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; @@ -9390,7 +9817,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; @@ -9402,7 +9830,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'isoInfoChange', callback: AsyncCallback): void; @@ -9414,7 +9843,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'isoInfoChange', callback?: AsyncCallback): void; @@ -9426,7 +9856,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'exposureInfoChange', callback: AsyncCallback): void; @@ -9438,7 +9869,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'exposureInfoChange', callback?: AsyncCallback): void; @@ -9450,7 +9882,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'apertureInfoChange', callback: AsyncCallback): void; @@ -9462,7 +9895,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'apertureInfoChange', callback?: AsyncCallback): void; @@ -9474,7 +9908,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'luminationInfoChange', callback: AsyncCallback): void; @@ -9486,7 +9921,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'luminationInfoChange', callback?: AsyncCallback): void; } @@ -9494,10 +9930,11 @@ declare namespace camera { /** * Enum for slow motion status. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum SlowMotionStatus { /** @@ -9505,7 +9942,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DISABLED = 0, @@ -9514,7 +9952,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ READY = 1, @@ -9523,7 +9962,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ VIDEO_START = 2, @@ -9532,7 +9972,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ VIDEO_DONE = 3, @@ -9541,7 +9982,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ FINISHED = 4 } @@ -9553,7 +9995,8 @@ declare namespace camera { * @interface SlowMotionVideoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface SlowMotionVideoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorEffect { /** @@ -9564,7 +10007,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'error', callback: ErrorCallback): void; @@ -9576,7 +10020,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'error', callback?: ErrorCallback): void; @@ -9588,7 +10033,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -9600,7 +10046,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -9612,7 +10059,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; @@ -9624,7 +10072,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; @@ -9636,7 +10085,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Determine whether camera slow motion detection is supported. @@ -9658,7 +10108,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Set slow motion detection area. @@ -9679,7 +10130,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'slowMotionStatus', callback: AsyncCallback): void; @@ -9691,7 +10143,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'slowMotionStatus', callback?: AsyncCallback): void; } @@ -9703,7 +10156,8 @@ declare namespace camera { * @interface HighResolutionPhotoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface HighResolutionPhotoSession extends Session, AutoExposure, Focus { /** @@ -9714,7 +10168,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'error', callback: ErrorCallback): void; @@ -9726,7 +10181,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'error', callback?: ErrorCallback): void; @@ -9738,7 +10194,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -9750,7 +10207,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; } @@ -9780,7 +10238,8 @@ declare namespace camera { * @interface MacroPhotoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface MacroPhotoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorEffect, ManualFocus, DepthFusion, ColorManagement { /** @@ -9791,7 +10250,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'error', callback: ErrorCallback): void; @@ -9803,7 +10263,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'error', callback?: ErrorCallback): void; @@ -9815,7 +10276,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -9827,7 +10289,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -9839,7 +10302,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; @@ -9851,7 +10315,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; } @@ -9872,7 +10337,8 @@ declare namespace camera { * @interface MacroVideoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface MacroVideoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorEffect, ManualFocus, ColorManagement { /** @@ -9883,7 +10349,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'error', callback: ErrorCallback): void; @@ -9895,7 +10362,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'error', callback?: ErrorCallback): void; @@ -9907,7 +10375,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -9919,7 +10388,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -9931,7 +10401,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; @@ -9943,7 +10414,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; } @@ -9954,7 +10426,8 @@ declare namespace camera { * @extends Session, Flash, AutoExposure, Focus, Zoom * @interface SecureSession * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Secure camera session object. @@ -9983,7 +10456,8 @@ declare namespace camera { * @throws { BusinessError } 7400102 - Operation not allowed. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Preview output is marked as secure out put by this interface. @@ -10012,7 +10486,8 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the capture session errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for error events on security camera sessions to get the result by registering @@ -10035,7 +10510,8 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the capture session errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from error events. @@ -10054,7 +10530,8 @@ declare namespace camera { * @param { 'focusStateChange' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the focus state change. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for error events on security camera sessions to get the result by registering @@ -10077,7 +10554,8 @@ declare namespace camera { * @param { 'focusStateChange' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the focus state change. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from focus status change event callback. @@ -10098,7 +10576,8 @@ declare namespace camera { * @interface LightPaintingPhotoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface LightPaintingPhotoSession extends Session, Flash, Focus, Zoom, ColorEffect { /** @@ -10109,7 +10588,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'error', callback: ErrorCallback): void; @@ -10121,7 +10601,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'error', callback?: ErrorCallback): void; @@ -10133,7 +10614,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -10145,7 +10627,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -10157,7 +10640,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; @@ -10169,7 +10653,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; @@ -10181,7 +10666,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getLightPaintingType(): LightPaintingType; @@ -10194,7 +10680,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setLightPaintingType(type: LightPaintingType): void; @@ -10206,7 +10693,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSupportedLightPaintingTypes(): Array; } @@ -10218,7 +10706,8 @@ declare namespace camera { * @interface QuickShotPhotoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface QuickShotPhotoSession extends Session, AutoExposure, ColorEffect, ColorManagement, EffectSuggestion, Flash, Focus, Zoom { /** @@ -10229,7 +10718,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'error', callback: ErrorCallback): void; @@ -10241,7 +10731,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'error', callback?: ErrorCallback): void; @@ -10253,7 +10744,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'effectSuggestionChange', callback: AsyncCallback): void; @@ -10265,7 +10757,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'effectSuggestionChange', callback?: AsyncCallback): void; @@ -10277,7 +10770,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -10289,7 +10783,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -10301,7 +10796,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; @@ -10313,7 +10809,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; } @@ -10325,7 +10822,8 @@ declare namespace camera { * @interface PanoramaPhotoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface PanoramaPhotoSession extends Session, Focus, AutoExposure, WhiteBalance, ColorEffect { /** @@ -10336,7 +10834,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'error', callback: ErrorCallback): void; @@ -10348,7 +10847,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'error', callback?: ErrorCallback): void; @@ -10360,7 +10860,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -10372,7 +10873,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; } @@ -10384,7 +10886,8 @@ declare namespace camera { * @interface FluorescencePhotoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface FluorescencePhotoSession extends Session, AutoExposure, Focus, Zoom { /** @@ -10395,7 +10898,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'error', callback: ErrorCallback): void; @@ -10407,7 +10911,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'error', callback?: ErrorCallback): void; @@ -10419,7 +10924,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -10431,7 +10937,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; } @@ -10443,7 +10950,8 @@ declare namespace camera { * @interface PhotoFunctions * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface PhotoFunctions extends FlashQuery, AutoExposureQuery, ManualExposureQuery, FocusQuery, ZoomQuery, BeautyQuery, ColorEffectQuery, ColorManagementQuery, MacroQuery, SceneDetectionQuery { } @@ -10455,7 +10963,8 @@ declare namespace camera { * @interface VideoFunctions * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface VideoFunctions extends FlashQuery, AutoExposureQuery, ManualExposureQuery, FocusQuery, ZoomQuery, StabilizationQuery, BeautyQuery, ColorEffectQuery, ColorManagementQuery, MacroQuery, SceneDetectionQuery { } @@ -10467,7 +10976,8 @@ declare namespace camera { * @interface PortraitPhotoFunctions * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface PortraitPhotoFunctions extends FlashQuery, AutoExposureQuery, FocusQuery, ZoomQuery, BeautyQuery, ColorEffectQuery, ColorManagementQuery, PortraitQuery, ApertureQuery, SceneDetectionQuery { } @@ -10479,7 +10989,8 @@ declare namespace camera { * @interface PhotoConflictFunctions * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface PhotoConflictFunctions extends ZoomQuery, MacroQuery { } @@ -10491,7 +11002,8 @@ declare namespace camera { * @interface VideoConflictFunctions * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface VideoConflictFunctions extends ZoomQuery, MacroQuery { } @@ -10503,7 +11015,8 @@ declare namespace camera { * @extends ZoomQuery, PortraitQuery, ApertureQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface PortraitPhotoConflictFunctions extends ZoomQuery, PortraitQuery, ApertureQuery { } @@ -10513,7 +11026,8 @@ declare namespace camera { * * @interface CameraOutput * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Camera output object. @@ -10530,7 +11044,8 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to return the result. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Release output instance. @@ -10549,7 +11064,8 @@ declare namespace camera { * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Release output instance. @@ -10576,22 +11092,22 @@ declare namespace camera { * Status of the sketch stream. * 0 is stop, and 1 is start. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 11 */ - status: number; + status: int; /** * The zoom ratio of the sketch stream. * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 11 */ - sketchRatio: number; + sketchRatio: double; } /** @@ -10600,7 +11116,8 @@ declare namespace camera { * @extends CameraOutput * @interface PreviewOutput * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Preview output object. @@ -10664,7 +11181,8 @@ declare namespace camera { * @param { 'frameStart' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for the preview frame to start to get the result by registering @@ -10687,7 +11205,8 @@ declare namespace camera { * @param { 'frameStart' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from frame start event callback. @@ -10706,7 +11225,8 @@ declare namespace camera { * @param { 'frameEnd' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for the end of the preview frame to get the result by registering @@ -10729,7 +11249,8 @@ declare namespace camera { * @param { 'frameEnd' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from frame end event callback. @@ -10748,7 +11269,8 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the preview output errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for error events on the preview output to get the result by registering @@ -10771,7 +11293,8 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the preview output errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from error events. @@ -10789,7 +11312,8 @@ declare namespace camera { * * @returns { Array } The array of supported frame rate range. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Get supported frame rates which can be set during session running. @@ -10804,12 +11328,13 @@ declare namespace camera { /** * Set a frame rate range. * - * @param { number } minFps - Minimum frame rate per second. - * @param { number } maxFps - Maximum frame rate per second. + * @param { int } minFps - Minimum frame rate per second. + * @param { int } maxFps - Maximum frame rate per second. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400110 - Unresolved conflicts with current configurations. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * The supported frame rate range can be queried via the getSupportedFrameRates interface before setting. @@ -10829,7 +11354,8 @@ declare namespace camera { * * @returns { FrameRateRange } The active frame rate range. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Queryable after setting the frame rate for the preview stream using the setFrameRate interface. @@ -10847,7 +11373,8 @@ declare namespace camera { * @returns { Profile } The current preconfig type. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets the current preconfig type if you had already call preconfig interface. @@ -10863,12 +11390,13 @@ declare namespace camera { /** * Gets the preview rotation angle. * - * @param { number } displayRotation - The current display rotation angle. + * @param { int } displayRotation - The current display rotation angle. * @returns { ImageRotation } The preview rotation angle. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets the preview rotation angle. @@ -10891,7 +11419,8 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Sets the preview rotation angle. @@ -10923,7 +11452,8 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ addDeferredSurface(surfaceId: string): void; @@ -10934,21 +11464,23 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ isSketchSupported(): boolean; /** * Gets the specific zoom ratio when sketch stream open. * - * @returns { number } The specific zoom ratio of sketch. + * @returns { double } The specific zoom ratio of sketch. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - getSketchRatio(): number; + getSketchRatio(): double; /** * Enable sketch for camera. @@ -10970,7 +11502,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enableSketch(enabled: boolean): void; @@ -10994,7 +11527,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ attachSketchSurface(surfaceId: string): void; @@ -11006,7 +11540,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'sketchStatusChanged', callback: AsyncCallback): void; @@ -11018,7 +11553,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'sketchStatusChanged', callback?: AsyncCallback): void; } @@ -11026,10 +11562,11 @@ declare namespace camera { /** * Enum for effect suggestion. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum EffectSuggestionType { /** @@ -11037,7 +11574,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ EFFECT_SUGGESTION_NONE = 0, /** @@ -11045,7 +11583,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ EFFECT_SUGGESTION_PORTRAIT = 1, /** @@ -11053,7 +11592,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ EFFECT_SUGGESTION_FOOD = 2, @@ -11062,7 +11602,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ EFFECT_SUGGESTION_SKY = 3, @@ -11071,7 +11612,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ EFFECT_SUGGESTION_SUNRISE_SUNSET = 4, @@ -11090,7 +11632,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ class EffectSuggestionStatus { /** @@ -11099,7 +11642,8 @@ declare namespace camera { * @type { EffectSuggestionType } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ type: EffectSuggestionType; /** @@ -11108,7 +11652,8 @@ declare namespace camera { * @type { boolean } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ status: boolean; } @@ -11116,7 +11661,7 @@ declare namespace camera { /** * Enumerates the image rotation angles. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -11209,7 +11754,7 @@ declare namespace camera { /** * Latitude. * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -11221,12 +11766,12 @@ declare namespace camera { * @atomicservice * @since 19 */ - latitude: number; + latitude: double; /** * Longitude. * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -11238,12 +11783,12 @@ declare namespace camera { * @atomicservice * @since 19 */ - longitude: number; + longitude: double; /** * Altitude. * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -11255,13 +11800,13 @@ declare namespace camera { * @atomicservice * @since 19 */ - altitude: number; + altitude: double; } /** * Enumerates the image quality levels. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -11410,7 +11955,7 @@ declare namespace camera { /** * Enumerates the delivery image types. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 11 @@ -11449,7 +11994,8 @@ declare namespace camera { * * @typedef Photo * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Photo object @@ -11521,7 +12067,8 @@ declare namespace camera { * @typedef DeferredPhotoProxy * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ interface DeferredPhotoProxy { /** @@ -11550,7 +12097,7 @@ declare namespace camera { /** * Enumerates the camera video codec type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 13 */ @@ -11600,7 +12147,8 @@ declare namespace camera { * @extends CameraOutput * @interface PhotoOutput * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Photo output object. @@ -11619,7 +12167,8 @@ declare namespace camera { * @throws { BusinessError } 7400104 - Session not running. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Start capture output. @@ -11640,7 +12189,8 @@ declare namespace camera { * @throws { BusinessError } 7400104 - Session not running. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Start capture output. @@ -11663,7 +12213,8 @@ declare namespace camera { * @throws { BusinessError } 7400104 - Session not running. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Start capture output. @@ -11700,7 +12251,8 @@ declare namespace camera { * @throws { BusinessError } 7400104 - Session not running. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Start capture output. @@ -11728,7 +12280,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ burstCapture(setting: PhotoCaptureSetting): Promise; @@ -11753,7 +12306,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ isRawDeliverySupported(): boolean; @@ -11782,7 +12336,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ isDeferredImageDeliverySupported(type: DeferredDeliveryImageType): boolean; @@ -11797,7 +12352,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ isDeferredImageDeliveryEnabled(type: DeferredDeliveryImageType): boolean; @@ -11811,7 +12367,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ deferImageDelivery(type: DeferredDeliveryImageType): void; @@ -11824,7 +12381,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ isDepthDataDeliverySupported(): boolean; @@ -11838,7 +12396,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ enableDepthDataDelivery(enabled: boolean): void; @@ -11848,7 +12407,8 @@ declare namespace camera { * @returns { Array } An array of supported video codec types for moving photo. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Get supported moving photo video codec types. @@ -11867,7 +12427,8 @@ declare namespace camera { * @param { VideoCodecType } codecType - Codec type for moving photo. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Sets codec type for moving photo, default to AVC. @@ -12001,7 +12562,8 @@ declare namespace camera { * * @returns { boolean } Is the mirror supported. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Check whether to support mirror photo. @@ -12021,7 +12583,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Whether to enable moving photo mirroring. @@ -12070,7 +12633,8 @@ declare namespace camera { * @param { 'captureStartWithInfo' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the capture start info. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for the start of the photo taking to get the CaptureStartInfo by registering @@ -12093,7 +12657,8 @@ declare namespace camera { * @param { 'captureStartWithInfo' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the capture start info. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from capture start event callback. @@ -12112,7 +12677,8 @@ declare namespace camera { * @param { 'frameShutter' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the frame shutter information. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Subscribes frame shutter event callback. @@ -12131,7 +12697,8 @@ declare namespace camera { * @param { 'frameShutter' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the frame shutter information. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from frame shutter event callback. @@ -12150,7 +12717,8 @@ declare namespace camera { * @param { 'frameShutterEnd' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the frame shutter end information. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for the end of photo exposure capture to get the result by registering @@ -12173,7 +12741,8 @@ declare namespace camera { * @param { 'frameShutterEnd' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the frame shutter end information. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from frame shutter end event callback. @@ -12192,7 +12761,8 @@ declare namespace camera { * @param { 'captureEnd' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the capture end information. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for the end of the photo shoot to get the result by registering @@ -12216,7 +12786,8 @@ declare namespace camera { * @param { 'captureEnd' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the capture end information. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from capture end event callback. @@ -12235,7 +12806,8 @@ declare namespace camera { * @param { 'captureReady' } type - Event type. * @param { AsyncCallback } callback - Callback used to notice capture ready. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for the next available shot to get the result by registering @@ -12258,7 +12830,8 @@ declare namespace camera { * @param { 'captureReady' } type - Event type. * @param { AsyncCallback } callback - Callback used to notice capture ready. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from capture ready event callback. @@ -12275,9 +12848,10 @@ declare namespace camera { * Subscribes estimated capture duration event callback. * * @param { 'estimatedCaptureDuration' } type - Event type. - * @param { AsyncCallback } callback - Callback used to notify the estimated capture duration (in milliseconds). + * @param { AsyncCallback } callback - Callback used to notify the estimated capture duration (in milliseconds). * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for the estimated time to take a picture to get the result by registering @@ -12298,9 +12872,10 @@ declare namespace camera { * Unsubscribes from estimated capture duration event callback. * * @param { 'estimatedCaptureDuration' } type - Event type. - * @param { AsyncCallback } callback - Callback used to notify the estimated capture duration (in milliseconds). + * @param { AsyncCallback } callback - Callback used to notify the estimated capture duration (in milliseconds). * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from estimated capture duration event callback. @@ -12319,7 +12894,8 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the photo output errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for errors in the photo output to get the result by registering @@ -12342,7 +12918,8 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the photo output errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from error events. @@ -12361,7 +12938,8 @@ declare namespace camera { * @returns { Profile } The current preconfig type. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets the current preconfig type if you had already call preconfig interface. @@ -12393,7 +12971,8 @@ declare namespace camera { * @throws { BusinessError } 7400104 - session is not running. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isQuickThumbnailSupported(): boolean; @@ -12422,7 +13001,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enableQuickThumbnail(enabled: boolean): void; @@ -12459,7 +13039,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ isAutoHighQualityPhotoSupported(): boolean; @@ -12473,7 +13054,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ enableAutoHighQualityPhoto(enabled: boolean): void; @@ -12485,7 +13067,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ isAutoCloudImageEnhancementSupported(): boolean; @@ -12498,7 +13081,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ enableAutoCloudImageEnhancement(enabled: boolean): void; @@ -12508,7 +13092,8 @@ declare namespace camera { * @returns { boolean } TRUE if the moving photo is supported. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Confirm if moving photo supported. @@ -12530,7 +13115,8 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Enable moving photo. @@ -12549,12 +13135,13 @@ declare namespace camera { /** * Gets the photo rotation angle. * - * @param { number } deviceDegree - The current device rotation degree. + * @param { int } deviceDegree - The current device rotation degree. * @returns { ImageRotation } The photo rotation angle. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets the photo rotation angle. @@ -12577,7 +13164,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ isOfflineSupported(): boolean; @@ -12589,7 +13177,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ enableOffline(): void; @@ -12602,7 +13191,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'offlineDeliveryFinished', callback: AsyncCallback): void; @@ -12615,7 +13205,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'offlineDeliveryFinished', callback?: AsyncCallback): void; } @@ -12639,7 +13230,7 @@ declare namespace camera { /** * Capture id. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -12651,11 +13242,11 @@ declare namespace camera { * @atomicservice * @since 19 */ - captureId: number; + captureId: int; /** * Timestamp for frame. * - * @type { number } + * @type { long } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -12667,7 +13258,7 @@ declare namespace camera { * @atomicservice * @since 19 */ - timestamp: number; + timestamp: long; } /** @@ -12689,7 +13280,7 @@ declare namespace camera { /** * Capture id. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 12 */ @@ -12701,7 +13292,7 @@ declare namespace camera { * @atomicservice * @since 19 */ - captureId: number; + captureId: int; } /** @@ -12723,7 +13314,7 @@ declare namespace camera { /** * Capture id. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 11 */ @@ -12735,11 +13326,11 @@ declare namespace camera { * @atomicservice * @since 19 */ - captureId: number; + captureId: int; /** * Time(in milliseconds) is the shutter time for the photo. * - * @type { number } + * @type { long } * @syscap SystemCapability.Multimedia.Camera.Core * @since 11 */ @@ -12751,7 +13342,7 @@ declare namespace camera { * @atomicservice * @since 19 */ - time: number; + time: long; } /** @@ -12773,7 +13364,7 @@ declare namespace camera { /** * Capture id. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -12785,11 +13376,11 @@ declare namespace camera { * @atomicservice * @since 19 */ - captureId: number; + captureId: int; /** * Frame count. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -12801,7 +13392,7 @@ declare namespace camera { * @atomicservice * @since 19 */ - frameCount: number; + frameCount: int; } /** @@ -12810,7 +13401,8 @@ declare namespace camera { * @typedef DeferredVideoEnhancementInfo * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface DeferredVideoEnhancementInfo { /** @@ -12820,7 +13412,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ readonly isDeferredVideoEnhancementAvailable: boolean; /** @@ -12830,7 +13423,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ readonly videoId?: string; } @@ -12841,7 +13435,8 @@ declare namespace camera { * @extends CameraOutput * @interface VideoOutput * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Video output object. @@ -12860,7 +13455,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Start video output. @@ -12881,7 +13477,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Start video output. @@ -12900,7 +13497,8 @@ declare namespace camera { * * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Stop video output. @@ -12917,7 +13515,8 @@ declare namespace camera { * * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Stop video output. @@ -12943,7 +13542,8 @@ declare namespace camera { * * @returns { boolean } Is video mirror supported. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Determine whether video mirror is supported. @@ -12973,7 +13573,8 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Enable/disable mirror recording. @@ -12999,7 +13600,8 @@ declare namespace camera { * * @returns { Array } The array of supported frame rate range. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Get supported frame rates which can be set during session running. @@ -13014,12 +13616,13 @@ declare namespace camera { /** * Set a frame rate range. * - * @param { number } minFps - Minimum frame rate per second. - * @param { number } maxFps - Maximum frame rate per second. + * @param { int } minFps - Minimum frame rate per second. + * @param { int } maxFps - Maximum frame rate per second. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400110 - Unresolved conflicts with current configurations. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Set a frame rate range. @@ -13039,7 +13642,8 @@ declare namespace camera { * * @returns { FrameRateRange } The active frame rate range. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Get active frame rate range which has been set before. @@ -13054,12 +13658,13 @@ declare namespace camera { /** * Gets the video rotation angle. * - * @param { number } deviceDegree - The current device rotation degree. + * @param { int } deviceDegree - The current device rotation degree. * @returns { ImageRotation } The video rotation angle. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets the video rotation angle. @@ -13082,7 +13687,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ isAutoDeferredVideoEnhancementSupported(): boolean; @@ -13094,7 +13700,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ isAutoDeferredVideoEnhancementEnabled(): boolean; @@ -13107,7 +13714,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ enableAutoDeferredVideoEnhancement(enabled: boolean): void; @@ -13118,7 +13726,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ getSupportedRotations(): Array; @@ -13129,7 +13738,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ isRotationSupported(): boolean; @@ -13141,7 +13751,8 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ setRotation(rotation: ImageRotation): void; @@ -13152,7 +13763,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ isAutoVideoFrameRateSupported(): boolean; @@ -13164,7 +13776,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ enableAutoVideoFrameRate(enabled: boolean): void; @@ -13176,7 +13789,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'deferredVideoEnhancementInfo', callback: AsyncCallback): void; @@ -13188,7 +13802,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'deferredVideoEnhancementInfo', callback?: AsyncCallback): void; @@ -13198,7 +13813,8 @@ declare namespace camera { * @param { 'frameStart' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for the start of the video recording to get the result by registering @@ -13221,7 +13837,8 @@ declare namespace camera { * @param { 'frameStart' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from frame start event callback. @@ -13240,7 +13857,8 @@ declare namespace camera { * @param { 'frameEnd' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Subscribes frame end event callback. @@ -13259,7 +13877,8 @@ declare namespace camera { * @param { 'frameEnd' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from frame end event callback. @@ -13278,7 +13897,8 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the video output errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for errors in the metadata stream to get the result by registering @@ -13301,7 +13921,8 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the video output errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from error events. @@ -13320,7 +13941,8 @@ declare namespace camera { * @returns { VideoProfile } The current preconfig type. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Gets the current preconfig type if you had already call preconfig interface. @@ -13340,7 +13962,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSupportedVideoMetaTypes(): Array; @@ -13353,7 +13976,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ attachMetaSurface(surfaceId: string, type: VideoMetaType): void; } @@ -13361,17 +13985,19 @@ declare namespace camera { /** * Video meta type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum VideoMetaType { /** * Video meta type for storing maker info. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ VIDEO_META_MAKER_INFO = 0 } @@ -13379,7 +14005,7 @@ declare namespace camera { /** * Metadata object type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -13474,10 +14100,11 @@ declare namespace camera { /** * Enum for light painting tabletype. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum LightPaintingType { /** @@ -13485,7 +14112,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ TRAFFIC_TRAILS = 0, @@ -13494,7 +14122,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ STAR_TRAILS = 1, @@ -13503,7 +14132,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SILKY_WATER = 2, @@ -13512,7 +14142,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LIGHT_GRAFFITI = 3 } @@ -13536,7 +14167,7 @@ declare namespace camera { /** * X coordinator of top left point. * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -13548,11 +14179,11 @@ declare namespace camera { * @atomicservice * @since 19 */ - topLeftX: number; + topLeftX: double; /** * Y coordinator of top left point. * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -13564,11 +14195,11 @@ declare namespace camera { * @atomicservice * @since 19 */ - topLeftY: number; + topLeftY: double; /** * Width of this rectangle. * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -13580,11 +14211,11 @@ declare namespace camera { * @atomicservice * @since 19 */ - width: number; + width: double; /** * Height of this rectangle. * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -13596,16 +14227,17 @@ declare namespace camera { * @atomicservice * @since 19 */ - height: number; + height: double; } /** * Enum for emotion type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ enum Emotion { /** @@ -13613,7 +14245,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ NEUTRAL = 0, @@ -13622,7 +14255,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ SADNESS = 1, @@ -13631,7 +14265,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ SMILE = 2, @@ -13640,7 +14275,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ SURPRISE = 3 } @@ -13650,7 +14286,8 @@ declare namespace camera { * * @typedef MetadataObject * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Metadata object basis. @@ -13667,7 +14304,8 @@ declare namespace camera { * @type { MetadataObjectType } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Metadata object type. @@ -13682,10 +14320,11 @@ declare namespace camera { /** * Metadata object timestamp in milliseconds. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Metadata object timestamp in milliseconds. @@ -13703,7 +14342,8 @@ declare namespace camera { * @type { Rect } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * The axis-aligned bounding box of detected metadata object. @@ -13718,23 +14358,25 @@ declare namespace camera { /** * Metadata object id. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly objectId: number; + readonly objectId: int; /** * Confidence for the detected type. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly confidence: number; + readonly confidence: int; } /** @@ -13744,7 +14386,8 @@ declare namespace camera { * @extends MetadataObject * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface MetadataFaceObject extends MetadataObject { /** @@ -13754,7 +14397,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ readonly leftEyeBoundingBox: Rect; @@ -13765,7 +14409,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ readonly rightEyeBoundingBox: Rect; @@ -13776,53 +14421,58 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ readonly emotion: Emotion; /** * Emotion confidence. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly emotionConfidence: number; + readonly emotionConfidence: int; /** * Pitch angle for face. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly pitchAngle: number; + readonly pitchAngle: int; /** * Yaw angle for face. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly yawAngle: number; + readonly yawAngle: int; /** * Roll angle for face. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly rollAngle: number; + readonly rollAngle: int; } /** @@ -13832,7 +14482,8 @@ declare namespace camera { * @extends MetadataObject * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface MetadataHumanBodyObject extends MetadataObject { } @@ -13844,7 +14495,8 @@ declare namespace camera { * @extends MetadataObject * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface MetadataCatFaceObject extends MetadataObject { /** @@ -13854,7 +14506,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ readonly leftEyeBoundingBox: Rect; @@ -13865,7 +14518,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ readonly rightEyeBoundingBox: Rect; } @@ -13877,7 +14531,8 @@ declare namespace camera { * @extends MetadataObject * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface MetadataCatBodyObject extends MetadataObject { } @@ -13889,7 +14544,8 @@ declare namespace camera { * @extends MetadataObject * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface MetadataDogFaceObject extends MetadataObject { /** @@ -13899,7 +14555,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ readonly leftEyeBoundingBox: Rect; @@ -13910,7 +14567,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ readonly rightEyeBoundingBox: Rect; } @@ -13922,7 +14580,8 @@ declare namespace camera { * @extends MetadataObject * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface MetadataDogBodyObject extends MetadataObject { } @@ -13934,7 +14593,8 @@ declare namespace camera { * @extends MetadataObject * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface MetadataSalientDetectionObject extends MetadataObject { } @@ -13946,7 +14606,8 @@ declare namespace camera { * @typedef MetadataBarcodeObject * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ interface MetadataBarcodeObject extends MetadataObject { } @@ -13957,7 +14618,8 @@ declare namespace camera { * @typedef CameraOcclusionDetectionResult * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface CameraOcclusionDetectionResult { /** @@ -13967,7 +14629,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly isCameraOccluded: boolean; @@ -13978,7 +14641,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ readonly isCameraLensDirty: boolean; } @@ -13989,7 +14653,8 @@ declare namespace camera { * @extends CameraOutput * @interface MetadataOutput * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Metadata Output object @@ -14008,7 +14673,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Start output metadata @@ -14029,7 +14695,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Start output metadata @@ -14048,7 +14715,8 @@ declare namespace camera { * * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Stop output metadata @@ -14065,7 +14733,8 @@ declare namespace camera { * * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Stop output metadata @@ -14087,7 +14756,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ addMetadataObjectTypes(types: Array): void; @@ -14101,7 +14771,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ removeMetadataObjectTypes(types: Array): void; @@ -14111,7 +14782,8 @@ declare namespace camera { * @param { 'metadataObjectsAvailable' } type - Event type. * @param { AsyncCallback> } callback - Callback used to get the available metadata objects. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for the detected metadata object to get the result by registering @@ -14134,7 +14806,8 @@ declare namespace camera { * @param { 'metadataObjectsAvailable' } type - Event type. * @param { AsyncCallback> } callback - Callback used to get the available metadata objects. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from metadata objects available event callback. @@ -14153,7 +14826,8 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the video output errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Registers a listener for errors in the video output to get the result by registering @@ -14176,7 +14850,8 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the video output errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Unsubscribes from error events. @@ -14333,10 +15008,11 @@ declare namespace camera { /** * Enumerates the timelapse recording state. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum TimeLapseRecordState { /** @@ -14344,7 +15020,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ IDLE = 0, @@ -14353,7 +15030,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ RECORDING = 1 } @@ -14361,10 +15039,11 @@ declare namespace camera { /** * Enumerates the timelapse preview type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum TimeLapsePreviewType { /** @@ -14372,7 +15051,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DARK = 1, @@ -14381,7 +15061,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ LIGHT = 2 } @@ -14392,7 +15073,8 @@ declare namespace camera { * @typedef TryAEInfo * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface TryAEInfo { /** @@ -14402,7 +15084,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly isTryAEDone: boolean; @@ -14413,7 +15096,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly isTryAEHintNeeded?: boolean; @@ -14424,20 +15108,22 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ readonly previewType?: TimeLapsePreviewType; /** * Timelapse capture interval. * - * @type { ?number } + * @type { ?int } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - readonly captureInterval?: number; + readonly captureInterval?: int; } /** @@ -14447,7 +15133,8 @@ declare namespace camera { * @interface TimeLapsePhotoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface TimeLapsePhotoSession extends Session, Focus, ManualFocus, AutoExposure, ManualExposure, ManualIso, WhiteBalance, Zoom, ColorEffect { /** @@ -14458,7 +15145,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'error', callback: ErrorCallback): void; @@ -14470,7 +15158,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'error', callback?: ErrorCallback): void; @@ -14482,7 +15171,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -14494,7 +15184,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -14506,7 +15197,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'isoInfoChange', callback: AsyncCallback): void; @@ -14518,7 +15210,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'isoInfoChange', callback?: AsyncCallback): void; @@ -14530,7 +15223,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'exposureInfoChange', callback: AsyncCallback): void; @@ -14542,7 +15236,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'exposureInfoChange', callback?: AsyncCallback): void; @@ -14554,7 +15249,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'luminationInfoChange', callback: AsyncCallback): void; @@ -14566,7 +15262,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'luminationInfoChange', callback?: AsyncCallback): void; @@ -14578,7 +15275,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ isTryAENeeded(): boolean; @@ -14590,7 +15288,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ startTryAE(): void; @@ -14602,7 +15301,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ stopTryAE(): void; @@ -14614,7 +15314,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'tryAEInfoChange', callback: AsyncCallback): void; @@ -14626,46 +15327,50 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'tryAEInfoChange', callback?: AsyncCallback): void; /** * Gets supported timelapse interval range. * - * @returns { Array } Timelapse interval range. + * @returns { Array } Timelapse interval range. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getSupportedTimeLapseIntervalRange(): Array; + getSupportedTimeLapseIntervalRange(): Array; /** * Gets the timelapse interval in use. * - * @returns { number } the timelapse interval in use. + * @returns { int } the timelapse interval in use. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - getTimeLapseInterval(): number; + getTimeLapseInterval(): int; /** * Sets a timelapse interval for a camera device. * - * @param { number } interval The timelapse interval. + * @param { int } interval The timelapse interval. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - setTimeLapseInterval(interval: number): void; + setTimeLapseInterval(interval: int): void; /** * Gets the timelapse recording state in use. @@ -14688,7 +15393,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setTimeLapseRecordState(state: TimeLapseRecordState): void; @@ -14713,7 +15419,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setTimeLapsePreviewType(type: TimeLapsePreviewType): void; } @@ -14721,7 +15428,7 @@ declare namespace camera { /** * Enum for Depth Data Accuracy. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 13 @@ -14749,7 +15456,7 @@ declare namespace camera { /** * Enum for Depth Data Quality Level. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 13 @@ -14789,7 +15496,8 @@ declare namespace camera { * @interface DepthProfile * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface DepthProfile { /** @@ -14799,7 +15507,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ readonly format: CameraFormat; @@ -14810,7 +15519,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ readonly dataAccuracy: DepthDataAccuracy; @@ -14821,7 +15531,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ readonly size: Size; } @@ -14832,7 +15543,8 @@ declare namespace camera { * @interface DepthData. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface DepthData { /** @@ -14842,7 +15554,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ readonly format: CameraFormat; @@ -14864,7 +15577,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ readonly qualityLevel: DepthDataQualityLevel; @@ -14875,7 +15589,8 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ readonly dataAccuracy: DepthDataAccuracy; @@ -14898,7 +15613,8 @@ declare namespace camera { * @interface DepthDataOutput * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface DepthDataOutput extends CameraOutput { /** @@ -14910,7 +15626,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ start(): Promise; @@ -14923,7 +15640,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ stop(): Promise; @@ -14935,7 +15653,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'depthDataAvailable', callback: AsyncCallback): void; @@ -14947,7 +15666,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'depthDataAvailable', callback?: AsyncCallback): void; @@ -14959,7 +15679,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'error', callback: ErrorCallback): void; @@ -14971,7 +15692,8 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'error', callback?: ErrorCallback): void; } @@ -14982,7 +15704,8 @@ declare namespace camera { * @interface DepthFusionQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ interface DepthFusionQuery { /** @@ -14993,21 +15716,23 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ isDepthFusionSupported(): boolean; /** * Query the depth fusion threshold. * - * @returns { Array } The depth fusion threshold. + * @returns { Array } The depth fusion threshold. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ - getDepthFusionThreshold(): Array; + getDepthFusionThreshold(): Array; } /** @@ -15017,7 +15742,8 @@ declare namespace camera { * @interface DepthFusion * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ interface DepthFusion extends DepthFusionQuery { /** @@ -15028,7 +15754,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ isDepthFusionEnabled(): boolean; @@ -15042,7 +15769,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enableDepthFusion(enabled: boolean): void; } @@ -15050,10 +15778,11 @@ declare namespace camera { /** * Enum for auxiliary type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ enum AuxiliaryType { /** @@ -15061,7 +15790,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ CONTRACT_LENS = 0 } @@ -15069,10 +15799,11 @@ declare namespace camera { /** * Enum for auxiliary status. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ enum AuxiliaryStatus { /** @@ -15080,7 +15811,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ LOCKED = 0, @@ -15089,7 +15821,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ ON = 1, @@ -15098,7 +15831,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ OFF = 2 } @@ -15106,10 +15840,11 @@ declare namespace camera { /** * Enum for color reservation type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ enum ColorReservationType { /** @@ -15117,7 +15852,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ NONE = 0, @@ -15126,7 +15862,8 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ PORTRAIT = 1 } @@ -15137,7 +15874,8 @@ declare namespace camera { * @interface ColorReservationQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ interface ColorReservationQuery { /** @@ -15148,7 +15886,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ getSupportedColorReservationTypes(): Array; } @@ -15160,7 +15899,8 @@ declare namespace camera { * @interface ColorReservation * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ interface ColorReservation extends ColorReservationQuery { /** @@ -15171,7 +15911,8 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ getColorReservation(): ColorReservationType; @@ -15188,7 +15929,8 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ setColorReservation(type: ColorReservationType): void; } diff --git a/api/@ohos.multimedia.cameraPicker.d.ts b/api/@ohos.multimedia.cameraPicker.d.ts index 9998900eda..4ae4cc9424 100644 --- a/api/@ohos.multimedia.cameraPicker.d.ts +++ b/api/@ohos.multimedia.cameraPicker.d.ts @@ -30,7 +30,8 @@ import type camera from './@ohos.multimedia.camera'; * @namespace cameraPicker * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace cameraPicker { @@ -45,7 +46,8 @@ declare namespace cameraPicker { * * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ class PickerProfile { /** @@ -61,7 +63,8 @@ declare namespace cameraPicker { * @type { camera.CameraPosition } * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ cameraPosition: camera.CameraPosition; @@ -78,7 +81,8 @@ declare namespace cameraPicker { * @type { ?string } * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ saveUri?: string; @@ -92,12 +96,13 @@ declare namespace cameraPicker { /** * The max duration of the video. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - videoDuration?: number; + videoDuration?: int; } /** @@ -113,7 +118,8 @@ declare namespace cameraPicker { * @enum { string } * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum PickerMediaType { /** @@ -127,7 +133,8 @@ declare namespace cameraPicker { * * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ PHOTO = 'photo', @@ -142,7 +149,8 @@ declare namespace cameraPicker { * * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ VIDEO = 'video' } @@ -158,7 +166,8 @@ declare namespace cameraPicker { * * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ class PickerResult { /** @@ -171,12 +180,13 @@ declare namespace cameraPicker { /** * The result code. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - resultCode: number; + resultCode: int; /** * The result saved uri. @@ -191,7 +201,8 @@ declare namespace cameraPicker { * @type { string } * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ resultUri: string; @@ -208,7 +219,8 @@ declare namespace cameraPicker { * @type { PickerMediaType } * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ mediaType: PickerMediaType; } @@ -234,7 +246,8 @@ declare namespace cameraPicker { * method. The return value is PickerResult. * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function pick(context: Context, mediaTypes: Array, pickerProfile: PickerProfile): Promise; } diff --git a/api/@ohos.multimedia.image.d.ts b/api/@ohos.multimedia.image.d.ts index 05a0b2fbdb..1d6634aef1 100644 --- a/api/@ohos.multimedia.image.d.ts +++ b/api/@ohos.multimedia.image.d.ts @@ -48,14 +48,14 @@ declare namespace image { /** * Enumerates pixel map formats. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Image.Core * @since 7 */ /** * Enumerates pixel map formats. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @since 10 @@ -63,7 +63,7 @@ declare namespace image { /** * Enumerates pixel map formats. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @atomicservice @@ -72,7 +72,7 @@ declare namespace image { /** * Enumerates pixel map formats. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form @@ -454,7 +454,7 @@ declare namespace image { /** * Enumerates image resolution quality. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Image.Core * @systemapi * @since 12 @@ -526,14 +526,14 @@ declare namespace image { /** * Height * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core * @since 6 */ /** * Height * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @since 10 @@ -541,7 +541,7 @@ declare namespace image { /** * Height * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @atomicservice @@ -562,14 +562,14 @@ declare namespace image { /** * Width * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core * @since 6 */ /** * Width * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @since 10 @@ -577,7 +577,7 @@ declare namespace image { /** * Width * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @atomicservice @@ -2335,7 +2335,7 @@ declare namespace image { /** * Enum for image formats. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Image.Core * @since 9 */ @@ -2360,14 +2360,14 @@ declare namespace image { /** * Enumerates alpha types. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Image.Core * @since 9 */ /** * Enumerates alpha types. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @since 10 @@ -2375,7 +2375,7 @@ declare namespace image { /** * Enumerates alpha types. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @atomicservice @@ -2384,7 +2384,7 @@ declare namespace image { /** * Enumerates alpha types. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form @@ -2524,7 +2524,7 @@ declare namespace image { /** * Enumerates decoding dynamic range. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Image.Core * @since 12 */ @@ -2559,7 +2559,7 @@ declare namespace image { /** * Enumerates packing dynamic range. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Image.Core * @since 12 */ @@ -2762,7 +2762,7 @@ declare namespace image { /** * The component type of image. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Image.ImageReceiver * @since 9 */ @@ -2803,7 +2803,7 @@ declare namespace image { /** * Enumerates the HDR metadata types that need to be stored in Pixelmap. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Image.Core * @since 12 */ @@ -2844,7 +2844,7 @@ declare namespace image { /** * Value for HDR_METADATA_TYPE. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Image.Core * @since 12 */ @@ -2885,7 +2885,7 @@ declare namespace image { /** * Type of allocator used to allocate memory of a PixelMap. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Image.Core * @since 15 */ @@ -2989,14 +2989,14 @@ declare namespace image { /** * x-coordinate at the upper left corner of the image. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core * @since 7 */ /** * x-coordinate at the upper left corner of the image. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @since 10 @@ -3004,7 +3004,7 @@ declare namespace image { /** * x-coordinate at the upper left corner of the image. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @atomicservice @@ -3025,14 +3025,14 @@ declare namespace image { /** * y-coordinate at the upper left corner of the image. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core * @since 7 */ /** * y-coordinate at the upper left corner of the image. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @since 10 @@ -3040,7 +3040,7 @@ declare namespace image { /** * y-coordinate at the upper left corner of the image. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @atomicservice @@ -3313,14 +3313,14 @@ declare namespace image { /** * Indicates image default density. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core * @since 9 */ /** * Indicates image default density. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @since 10 @@ -3328,7 +3328,7 @@ declare namespace image { /** * Indicates image default density. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @atomicservice @@ -3349,7 +3349,7 @@ declare namespace image { /** * The number of byte per row. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core * @atomicservice * @since 11 @@ -3412,7 +3412,7 @@ declare namespace image { /** * Enumerates the strategies for executing the cropping and scaling operations when both desiredSize and desiredRegion are specified. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.Image.Core * @since 18 */ @@ -3488,14 +3488,14 @@ declare namespace image { /** * Quality of the target image. The value is an integer ranging from 0 to 100. A larger value indicates better. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.ImagePacker * @since 6 */ /** * Quality of the target image. The value is an integer ranging from 0 to 100. A larger value indicates better. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.ImagePacker * @crossplatform * @since 10 @@ -3515,7 +3515,7 @@ declare namespace image { * BufferSize of the target image. * If this bufferSize is less than or equal to 0, it will be converted to 10MB. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Multimedia.Image.ImagePacker * @since 9 */ @@ -3523,7 +3523,7 @@ declare namespace image { * BufferSize of the target image. * If this bufferSize is less than or equal to 0, it will be converted to 10MB. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Multimedia.Image.ImagePacker * @crossplatform * @since 10 @@ -3564,46 +3564,51 @@ declare namespace image { * * @typedef PackingOptionsForSequence * @syscap SystemCapability.Multimedia.Image.ImagePacker - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ interface PackingOptionsForSequence { /** * Specify the number of frames. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.ImagePacker - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ - frameCount: number; + frameCount: int; /** * Specify the delay time for each frame of the dynamic image. * If the length is less than frameCount, the missing parts will be filling with the last value * - * @type { Array } + * @type { Array } * @syscap SystemCapability.Multimedia.Image.ImagePacker - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ - delayTimeList: Array; + delayTimeList: Array; /** * Specify the disposal types of each frame in the image sequence packing. * - * @type { ?Array } + * @type { ?Array } * @syscap SystemCapability.Multimedia.Image.ImagePacker - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ - disposalTypes?: Array; + disposalTypes?: Array; /** * Specify the number of times the loop should, the range is [0, 65535] * If this loop is equal to 0, it will be infinite loop. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Multimedia.Image.ImagePacker - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ - loopCount?: number; + loopCount?: int; } /** @@ -3737,14 +3742,14 @@ declare namespace image { /** * Number of image frames. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Multimedia.Image.ImageSource * @since 7 */ /** * Number of image frames. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Multimedia.Image.ImageSource * @crossplatform * @since 10 @@ -3752,7 +3757,7 @@ declare namespace image { /** * Number of image frames. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Multimedia.Image.ImageSource * @crossplatform * @atomicservice @@ -3773,14 +3778,14 @@ declare namespace image { /** * Sampling ratio of the image pixel map. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Multimedia.Image.ImageSource * @since 7 */ /** * Sampling ratio of the image pixel map. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Multimedia.Image.ImageSource * @crossplatform * @since 10 @@ -3788,7 +3793,7 @@ declare namespace image { /** * Sampling ratio of the image pixel map. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Multimedia.Image.ImageSource * @crossplatform * @atomicservice @@ -3809,14 +3814,14 @@ declare namespace image { /** * Rotation angle of the image pixel map. The value ranges from 0 to 360. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Multimedia.Image.ImageSource * @since 7 */ /** * Rotation angle of the image pixel map. The value ranges from 0 to 360. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Multimedia.Image.ImageSource * @crossplatform * @since 10 @@ -3824,7 +3829,7 @@ declare namespace image { /** * Rotation angle of the image pixel map. The value ranges from 0 to 360. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Multimedia.Image.ImageSource * @crossplatform * @atomicservice @@ -3993,14 +3998,14 @@ declare namespace image { /** * The density for image pixel map. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Multimedia.Image.ImageSource * @since 9 */ /** * The density for image pixel map. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Multimedia.Image.ImageSource * @crossplatform * @since 10 @@ -4008,7 +4013,7 @@ declare namespace image { /** * The density for image pixel map. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Multimedia.Image.ImageSource * @crossplatform * @atomicservice @@ -4377,14 +4382,14 @@ declare namespace image { /** * The density for ImageSource. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core * @since 9 */ /** * The density for ImageSource. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @since 10 @@ -4392,7 +4397,7 @@ declare namespace image { /** * The density for ImageSource. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @atomicservice @@ -4488,7 +4493,8 @@ declare namespace image { * * @typedef HdrStaticMetadata * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface HdrStaticMetadata { /** @@ -4498,9 +4504,10 @@ declare namespace image { * * @type { Array } * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - displayPrimariesX: Array; + displayPrimariesX: Array; /** * The Y-coordinate of the primary colors. Specifies the normalized Y-coordinates of the display device's three @@ -4509,69 +4516,76 @@ declare namespace image { * * @type { Array } * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - displayPrimariesY: Array; + displayPrimariesY: Array; /** * The X-coordinate of the white point value. Specifies the normalized X-coordinate of the white point. * The value is represented in units of 0.00002 and must fall within the range [0.0, 1.0]. * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - whitePointX: number; + whitePointX: double; /** * The Y-coordinate of the white point value. Specifies the normalized Y-coordinate of the white point. * The value is represented in units of 0.00002 and must fall within the range [0.0, 1.0]. * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - whitePointY: number; + whitePointY: double; /** * Maximum luminance of the image's primary display. * The value is measured in units of 1, with a maximum allowed value of 65,535. * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - maxLuminance: number; + maxLuminance: double; /** * Minimum luminance of the image's primary display. * The value is measured in units of 0.0001, with a maximum allowed value of 6.55535. * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - minLuminance: number; + minLuminance: double; /** * Maximum brightness of displayed content. * The value is measured in units of 1, with a maximum allowed value of 65,535. * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - maxContentLightLevel: number; + maxContentLightLevel: double; /** * Maximum average brightness of displayed content. * The value is measured in units of 1, with a maximum allowed value of 65,535. * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - maxFrameAverageLightLevel: number; + maxFrameAverageLightLevel: double; } /** @@ -4579,53 +4593,59 @@ declare namespace image { * * @typedef GainmapChannel * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface GainmapChannel { /** * The per-component max gain map values. * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - gainmapMax: number; + gainmapMax: double; /** * The per-component min gain map values. * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - gainmapMin: number; + gainmapMin: double; /** * The per-component gamma values. * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - gamma: number; + gamma: double; /** * The per-component baseline offset. * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - baseOffset: number; + baseOffset: double; /** * The per-component alternate offset. * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - alternateOffset: number; + alternateOffset: double; } /** @@ -4633,69 +4653,77 @@ declare namespace image { * * @typedef HdrGainmapMetadata * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface HdrGainmapMetadata { /** * The version used by the writer. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - writerVersion: number; + writerVersion: int; /** * The minimum version a parser needs to understand. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - miniVersion: number; + miniVersion: int; /** * The number of gain map channels, with a value of 1 or 3. * - * @type { number } + * @type { int } * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - gainmapChannelCount: number; + gainmapChannelCount: int; /** * Indicate whether to use the color space of the base image. * * @type { boolean } * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ useBaseColorFlag: boolean; /** * The baseline hdr headroom. * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - baseHeadroom: number; + baseHeadroom: double; /** * The alternate hdr headroom. * - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - alternateHeadroom: number; + alternateHeadroom: double; /** * The per-channel metadata. * * @type { Array } * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ channels: Array; } @@ -4705,7 +4733,8 @@ declare namespace image { * * @typedef {HdrMetadataType | HdrStaticMetadata | ArrayBuffer | HdrGainmapMetadata} HdrMetadataValue * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ type HdrMetadataValue = HdrMetadataType | HdrStaticMetadata | ArrayBuffer | HdrGainmapMetadata; @@ -5059,7 +5088,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise): void; @@ -5565,7 +5598,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; @@ -5605,7 +5639,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise): void; @@ -5765,7 +5800,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; @@ -5809,7 +5845,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise): void; @@ -5833,7 +5870,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the operation result. If the operation fails, an error message is returned. * @throws { BusinessError } 62980137 - Invalid image operation. * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ toSdr(): Promise; @@ -6025,14 +6063,15 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise): void; @@ -6909,7 +6951,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; @@ -6924,7 +6967,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; @@ -7113,7 +7157,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; @@ -7121,7 +7166,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise @@ -7174,7 +7223,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise @@ -7187,7 +7237,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } * @syscap SystemCapability.Multimedia.Image.ImageSource - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ desiredAuxiliaryPictures: Array; } @@ -8250,9 +8307,10 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise>; + getDisposalTypeList(): Promise>; /** * Obtains the count of frame in an image. This method uses a promise to return the number. @@ -8260,6 +8318,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the number. * @throws { BusinessError } 62980096 - The operation failed. Possible cause: 1.Image upload exception. * 2. Decoding process exception. 3. Insufficient memory. + * @throws { BusinessError } 62980110 - The image source data is incorrect. * @throws { BusinessError } 62980111 - The image source data is incomplete. * @throws { BusinessError } 62980112 - The image format does not match. * @throws { BusinessError } 62980113 - Unknown image format. @@ -8279,6 +8338,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the number. * @throws { BusinessError } 62980096 - The operation failed. Possible cause: 1.Image upload exception. * 2. Decoding process exception. 3. Insufficient memory. + * @throws { BusinessError } 62980110 - The image source data is incorrect. * @throws { BusinessError } 62980111 - The image source data is incomplete. * @throws { BusinessError } 62980112 - The image format does not match. * @throws { BusinessError } 62980113 - Unknown image format. @@ -8290,9 +8350,10 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; + getFrameCount(): Promise; /** * Obtains the count of frame in an image. This method uses a callback to return the number. @@ -8300,6 +8361,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback used to return the number. * @throws { BusinessError } 62980096 - The operation failed. Possible cause: 1.Image upload exception. * 2. Decoding process exception. 3. Insufficient memory. + * @throws { BusinessError } 62980110 - The image source data is incorrect. * @throws { BusinessError } 62980111 - The image source data is incomplete. * @throws { BusinessError } 62980112 - The image format does not match. * @throws { BusinessError } 62980113 - Unknown image format. @@ -8319,6 +8381,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback used to return the number. * @throws { BusinessError } 62980096 - The operation failed. Possible cause: 1.Image upload exception. * 2. Decoding process exception. 3. Insufficient memory. + * @throws { BusinessError } 62980110 - The image source data is incorrect. * @throws { BusinessError } 62980111 - The image source data is incomplete. * @throws { BusinessError } 62980112 - The image format does not match. * @throws { BusinessError } 62980113 - Unknown image format. @@ -8330,9 +8393,10 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise): void; + getFrameCount(callback: AsyncCallback): void; /** * Obtains the value of a property in an image with the specified index. This method uses a @@ -8632,14 +8696,15 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the property value. * @syscap SystemCapability.Multimedia.Image.ImageSource * @crossplatform - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - updateData(buf: ArrayBuffer, isFinished: boolean, offset: number, length: number): Promise; + updateData(buf: ArrayBuffer, isFinished: boolean, offset: int, length: int): Promise; /** * Update the data in the incremental ImageSource. @@ -8669,18 +8734,19 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback to return the operation result. * @syscap SystemCapability.Multimedia.Image.ImageSource * @crossplatform - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ updateData( buf: ArrayBuffer, isFinished: boolean, - offset: number, - length: number, + offset: int, + length: int, callback: AsyncCallback ): void; @@ -8728,7 +8794,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise @@ -8906,7 +8973,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; @@ -9006,7 +9074,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; @@ -9020,7 +9089,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise, options: PackingOptionsForSequence): Promise; @@ -9124,16 +9194,17 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } pixelmapSequence PixelMaps to be encoded. - * @param { number } fd File descriptor of the output encoded file. + * @param { int } fd File descriptor of the output encoded file. * @param { PackingOptionsForSequence } options Options for image packing. * @returns { Promise } void. * @throws { BusinessError } 401 - Parameter error.Possible causes: 1.Mandatory parameters are left unspecified. * 2.Incorrect parameter types;3.Parameter verification failed. * @throws { BusinessError } 7800301 - Failed to encode image. * @syscap SystemCapability.Multimedia.Image.ImagePacker - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ - packToFileFromPixelmapSequence(pixelmapSequence: Array, fd: number, options: PackingOptionsForSequence): Promise; + packToFileFromPixelmapSequence(pixelmapSequence: Array, fd: int, options: PackingOptionsForSequence): Promise; /** * Releases an ImagePacker instance and uses a callback to return the result. @@ -9258,12 +9329,12 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback used to return the next image. * @syscap SystemCapability.Multimedia.Image.ImageReceiver - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ readNextImage(callback: AsyncCallback): void; @@ -9394,7 +9466,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the next image. * @syscap SystemCapability.Multimedia.Image.ImageReceiver - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ readNextImage(): Promise; @@ -9470,7 +9543,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback to return the operation result. * @syscap SystemCapability.Multimedia.Image.ImageCreator - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ dequeueImage(callback: AsyncCallback): void; @@ -9479,29 +9553,32 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the operation result. * @syscap SystemCapability.Multimedia.Image.ImageCreator - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ dequeueImage(): Promise; /** * Queue buffer to dirty queue and uses a callback to return the result. * - * @param { Image } interface + * @param { Image } image * @param { AsyncCallback } callback Callback to return the operation result. * @syscap SystemCapability.Multimedia.Image.ImageCreator - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ - queueImage(interface: Image, callback: AsyncCallback): void; + queueImage(image: Image, callback: AsyncCallback): void; /** * Queue buffer to dirty queue and uses a promise to return the result. * - * @param { Image } interface + * @param { Image } image * @returns { Promise } A Promise instance used to return the operation result. * @syscap SystemCapability.Multimedia.Image.ImageCreator - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ - queueImage(interface: Image): Promise; + queueImage(image: Image): Promise; /** * Subscribe callback when releasing buffer @@ -9509,7 +9586,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback used to return the operation result. * @syscap SystemCapability.Multimedia.Image.ImageCreator - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'imageRelease', callback: AsyncCallback): void; @@ -9519,7 +9597,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback to be removed. * @syscap SystemCapability.Multimedia.Image.ImageCreator - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'imageRelease', callback?: AsyncCallback): void; diff --git a/api/@ohos.multimedia.media.d.ts b/api/@ohos.multimedia.media.d.ts index dbbc24af82..7b8ddd3fcc 100755 --- a/api/@ohos.multimedia.media.d.ts +++ b/api/@ohos.multimedia.media.d.ts @@ -24,6 +24,9 @@ import photoAccessHelper from './@ohos.file.photoAccessHelper'; import type image from './@ohos.multimedia.image'; import type { SoundPool as _SoundPool } from './multimedia/soundPool'; import type { PlayParameters as _PlayParameters } from './multimedia/soundPool'; +import type image from './@ohos.multimedia.image'; +import type { SoundPool as _SoundPool } from './multimedia/soundPool'; +import type { PlayParameters as _PlayParameters } from './multimedia/soundPool'; import type drm from './@ohos.multimedia.drm'; /** @@ -79,6 +82,7 @@ declare namespace media { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ function createAVPlayer(callback: AsyncCallback): void; @@ -114,8 +118,20 @@ declare namespace media { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ function createAVPlayer(): Promise; + /** + * Creates an AVPlayer instance. + * @returns { Promise } A Promise instance used to return AVPlayer instance if the operation is successful; returns null otherwise. + * @throws { BusinessError } 5400101 - No memory. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVPlayer + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + function createAVPlayer(): Promise; /** * Creates an AVRecorder instance. @@ -133,8 +149,19 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVRecorder * @crossplatform * @since 12 + * @since 12 */ function createAVRecorder(callback: AsyncCallback): void; + /** + * Creates an AVRecorder instance. + * @param { AsyncCallback } callback - used to return AVRecorder instance if the operation is successful; returns null otherwise. + * @throws { BusinessError } 5400101 - No memory. Return by callback. + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + function createAVRecorder(callback: AsyncCallback): void; /** * Creates an AVRecorder instance. @@ -153,8 +180,20 @@ declare namespace media { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ function createAVRecorder(): Promise; + /** + * Creates an AVRecorder instance. + * @returns { Promise } A Promise instance used to return AVRecorder instance if the operation is successful; returns null otherwise. + * @throws { BusinessError } 5400101 - No memory. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + function createAVRecorder(): Promise; /** * Creates an AudioPlayer instance. @@ -252,8 +291,21 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 12 + * @since 12 */ function createVideoRecorder(callback: AsyncCallback): void; + /** + * The maintenance of this interface has been stopped since version api 9. Please use AVRecorder + * Creates an VideoRecorder instance. + * @param { AsyncCallback } callback - used to return AudioPlayer instance if the operation is successful; returns null otherwise. + * @throws { BusinessError } 202 - Not System App. + * @throws { BusinessError } 5400101 - No memory. Return by callback. + * @syscap SystemCapability.Multimedia.Media.VideoRecorder + * @systemapi + * @since 20 + * @arkts 1.2 + */ + function createVideoRecorder(callback: AsyncCallback): void; /** * The maintenance of this interface has been stopped since version api 9. Please use AVRecorder @@ -273,6 +325,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 12 + * @since 12 */ function createVideoRecorder(): Promise; @@ -297,8 +350,10 @@ declare namespace media { * @throws { BusinessError } 5400101 - No memory. Return by callback. * @syscap SystemCapability.Multimedia.Media.SoundPool * @since 10 + * @since 10 */ function createSoundPool( + maxStreams: number, maxStreams: number, audioRenderInfo: audio.AudioRendererInfo, callback: AsyncCallback @@ -424,6 +479,7 @@ declare namespace media { * @throws { BusinessError } 5400101 - No memory. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVTranscoder * @since 12 + * @since 12 */ function createAVTranscoder(): Promise; @@ -551,8 +607,20 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor * @crossplatform * @since 12 + * @since 12 */ function createAVMetadataExtractor(): Promise; + /** + * Creates an AVMetadataExtractor instance. + * @returns { Promise } A Promise instance used to return AVMetadataExtractor instance + * if the operation is successful; returns null otherwise. + * @throws { BusinessError } 5400101 - No memory. Returned by promise. + * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + function createAVMetadataExtractor(): Promise; /** * Creates an AVMetadataExtractor instance. @@ -573,7 +641,28 @@ declare namespace media { * @since 12 */ function createAVMetadataExtractor(callback: AsyncCallback): void; + /** + * Creates an **AVMetadataExtractor** instance. This API uses an asynchronous callback to return the result. + * @param { AsyncCallback } callback - Callback used to return the result. If the operation is + * successful, **err** is **undefined** and **data** is the **AVMetadataExtractor** instance created; + * otherwise, **err** is an error object. + * @throws { BusinessError } 5400101 - No memory. Returned by callback. + * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor + * @crossplatform + * @since 12 + */ + function createAVMetadataExtractor(callback: AsyncCallback): void; + /** + * Creates an **AVImageGenerator** instance. This API uses a promise to return the result. + * @returns { Promise } Promise used to return the result. If the operation is successful, + * an **AVImageGenerator** instance is returned; otherwise, **null** is returned. + * The API can be used to obtain a video thumbnail. + * @throws { BusinessError } 5400101 - No memory. Returned by promise. + * @syscap SystemCapability.Multimedia.Media.AVImageGenerator + * @since 12 + */ + function createAVImageGenerator(): Promise; /** * Creates an **AVImageGenerator** instance. This API uses a promise to return the result. * @returns { Promise } Promise used to return the result. If the operation is successful, @@ -678,8 +767,20 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor * @crossplatform * @since 12 + * @since 12 */ fetchMetadata(callback: AsyncCallback): void; + /** + * It will extract the resource to fetch media meta data info. + * @param { AsyncCallback } callback - A callback instance used to return when fetchMetadata completed. + * @throws { BusinessError } 5400102 - Operation not allowed. Returned by callback. + * @throws { BusinessError } 5400106 - Unsupported format. Returned by callback. + * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + fetchMetadata(callback: AsyncCallback): void; /** * It will extract the resource to fetch media meta data info. @@ -697,8 +798,20 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor * @crossplatform * @since 12 + * @since 12 */ fetchMetadata(): Promise; + /** + * It will extract the resource to fetch media meta data info. + * @returns { Promise } A Promise instance used to return when fetchMetadata completed. + * @throws { BusinessError } 5400102 - Operation not allowed. Returned by promise. + * @throws { BusinessError } 5400106 - Unsupported format. Returned by promise. + * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + fetchMetadata(): Promise; /** * It will extract the audio resource to fetch an album cover. @@ -718,6 +831,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor * @crossplatform * @since 12 + * @since 12 */ fetchAlbumCover(callback: AsyncCallback): void; @@ -737,6 +851,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor * @crossplatform * @since 12 + * @since 12 */ fetchAlbumCover(): Promise; @@ -776,7 +891,8 @@ declare namespace media { * @throws { BusinessError } 5400106 - Unsupported format. Returned by promise. * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getTimeByFrameIndex(index: number): Promise; @@ -789,7 +905,8 @@ declare namespace media { * @throws { BusinessError } 5400106 - Unsupported format. Returned by promise. * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getFrameIndexByTime(timeUs: number): Promise; @@ -1250,7 +1367,9 @@ declare namespace media { * @throws { BusinessError } 5400106 - Unsupported format. Returned by callback. * @syscap SystemCapability.Multimedia.Media.AVImageGenerator * @since 12 + * @since 12 */ + fetchFrameByTime(timeUs: number, options: AVImageQueryOptions, param: PixelMapParams, fetchFrameByTime(timeUs: number, options: AVImageQueryOptions, param: PixelMapParams, callback: AsyncCallback): void; @@ -1264,8 +1383,10 @@ declare namespace media { * @throws { BusinessError } 5400106 - Unsupported format. Returned by promise. * @syscap SystemCapability.Multimedia.Media.AVImageGenerator * @since 12 + * @since 12 */ fetchFrameByTime(timeUs: number, options: AVImageQueryOptions, param: PixelMapParams): Promise; + fetchFrameByTime(timeUs: number, options: AVImageQueryOptions, param: PixelMapParams): Promise; /** * Supports extracting video thumbnails by proportional scaling @@ -1356,6 +1477,7 @@ declare namespace media { * @since 12 */ width?: number; + width?: number; /** * Height of the thumbnail. The value must be greater than 0 and less than or equal to the height of the original @@ -1365,6 +1487,7 @@ declare namespace media { * @since 12 */ height?: number; + height?: number; /** * Color format of the thumbnail. @@ -1433,7 +1556,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AVErrorCode { /** @@ -1452,7 +1576,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_OK = 0, @@ -1472,7 +1597,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_NO_PERMISSION = 201, @@ -1492,7 +1618,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_INVALID_PARAMETER = 401, @@ -1512,7 +1639,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_UNSUPPORT_CAPABILITY = 801, @@ -1532,7 +1660,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_NO_MEMORY = 5400101, @@ -1552,7 +1681,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_OPERATE_NOT_PERMIT = 5400102, @@ -1572,7 +1702,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_IO = 5400103, @@ -1592,7 +1723,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_TIMEOUT = 5400104, @@ -1612,7 +1744,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_SERVICE_DIED = 5400105, @@ -1632,7 +1765,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_UNSUPPORT_FORMAT = 5400106, @@ -1647,7 +1781,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_AUDIO_INTERRUPTED = 5400107, /** @@ -1655,7 +1790,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_IO_HOST_NOT_FOUND = 5411001, /** @@ -1663,7 +1799,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_IO_CONNECTION_TIMEOUT = 5411002, /** @@ -1671,7 +1808,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_IO_NETWORK_ABNORMAL = 5411003, /** @@ -1679,7 +1817,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_IO_NETWORK_UNAVAILABLE = 5411004, /** @@ -1687,7 +1826,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_IO_NO_PERMISSION = 5411005, /** @@ -1695,7 +1835,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_IO_REQUEST_DENIED = 5411006, /** @@ -1703,7 +1844,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_IO_RESOURCE_NOT_FOUND = 5411007, /** @@ -1712,7 +1854,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_IO_SSL_CLIENT_CERT_NEEDED = 5411008, /** @@ -1721,7 +1864,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_IO_SSL_CONNECTION_FAILED = 5411009, /** @@ -1729,7 +1873,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_IO_SSL_SERVER_CERT_UNTRUSTED = 5411010, /** @@ -1737,14 +1882,16 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_IO_UNSUPPORTED_REQUEST = 5411011, /** * Seek continuous unsupported. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_SEEK_CONTINUOUS_UNSUPPORTED = 5410002, @@ -1752,7 +1899,8 @@ declare namespace media { * Super-resolution unsupported. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_SUPER_RESOLUTION_UNSUPPORTED = 5410003, @@ -1760,7 +1908,8 @@ declare namespace media { * No PlaybackStrategy set to enable super-resolution feature. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ AVERR_SUPER_RESOLUTION_NOT_ENABLED = 5410004, } @@ -1802,6 +1951,7 @@ declare namespace media { * @since 12 */ type OnTrackChangeHandler = (index: number, isSelected: boolean) => void; + type OnTrackChangeHandler = (index: number, isSelected: boolean) => void; /** * Describes the callback invoked for the AVPlayer state change event. @@ -1822,12 +1972,14 @@ declare namespace media { * @typedef { function } OnBufferingUpdateHandler * @param { BufferingInfoType } infoType - define the Buffering info Type. * @param { number } value - define the value of buffering info type if exist. + * @param { number } value - define the value of buffering info type if exist. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @crossplatform * @atomicservice * @since 12 */ type OnBufferingUpdateHandler = (infoType: BufferingInfoType, value: number) => void; + type OnBufferingUpdateHandler = (infoType: BufferingInfoType, value: number) => void; /** * Describes the callback invoked for the video size change event. @@ -1835,12 +1987,15 @@ declare namespace media { * @typedef { function } OnVideoSizeChangeHandler * @param { number } width - Value of video Width. * @param { number } height - Value of video Height. + * @param { number } width - Value of video Width. + * @param { number } height - Value of video Height. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @crossplatform * @atomicservice * @since 12 */ type OnVideoSizeChangeHandler = (width: number, height: number) => void; + type OnVideoSizeChangeHandler = (width: number, height: number) => void; /** * Describes the callback used to listen for video super resolution status changes. If super resolution is enabled by @@ -1878,11 +2033,13 @@ declare namespace media { /** * Payload type of SEI message. * @type { number } + * @type { number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice * @since 18 */ payloadType: number; + payloadType: number; /** * Payload data of SEI message. @@ -1901,6 +2058,7 @@ declare namespace media { * @typedef { function } OnSeiMessageHandle * @param { Array } messages - SEI messages. * @param { ?number } playbackPosition - playback position. + * @param { ?number } playbackPosition - playback position. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice * @since 18 @@ -2334,10 +2492,12 @@ declare namespace media { * @since 12 */ seek(timeMs: number, mode?: SeekMode): void; + seek(timeMs: number, mode?: SeekMode): void; /** * Sets the volume. * @param { number } volume - Relative volume. The value ranges from 0.00 to 1.00. The value 1 indicates the maximum volume (100%). + * @param { number } volume - Relative volume. The value ranges from 0.00 to 1.00. The value 1 indicates the maximum volume (100%). * @syscap SystemCapability.Multimedia.Media.AVPlayer * @since 9 */ @@ -2353,6 +2513,7 @@ declare namespace media { * @since 12 */ setVolume(volume: number): void; + setVolume(volume: number): void; /** * Get all track infos in MediaDescription, should be called after data loaded callback. @@ -2418,7 +2579,8 @@ declare namespace media { * @throws { BusinessError } 5400102 - Operation not allowed. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getSelectedTracks(): Promise>; @@ -2433,7 +2595,8 @@ declare namespace media { * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ selectTrack(index: number, mode?: SwitchMode): Promise; @@ -2446,7 +2609,8 @@ declare namespace media { * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ deselectTrack(index: number): Promise; @@ -2462,7 +2626,8 @@ declare namespace media { * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setMediaSource(src: MediaSource, strategy?: PlaybackStrategy): Promise; @@ -2481,7 +2646,8 @@ declare namespace media { * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ addSubtitleFromFd(fd: number, offset?: number, length?: number): Promise; @@ -2495,7 +2661,8 @@ declare namespace media { * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ addSubtitleFromUrl(url: string): Promise; @@ -2504,9 +2671,11 @@ declare namespace media { * playing, or paused state. * @returns { Promise } Statistic infos of current player. * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ getPlaybackInfo(): Promise; + getPlaybackInfo(): Promise; /** * Set playback strategy to AVPlayer. This API can be called only when the AVPlayer is in the initialized state. @@ -2516,7 +2685,8 @@ declare namespace media { * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setPlaybackStrategy(strategy: PlaybackStrategy): Promise; @@ -2530,7 +2700,8 @@ declare namespace media { * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setMediaMuted(mediaType: MediaType, muted: boolean): Promise; @@ -2742,6 +2913,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice * @since 12 + * @since 12 */ audioInterruptMode?: audio.InterruptMode; @@ -2762,6 +2934,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice * @since 12 + * @since 12 */ audioRendererInfo?: audio.AudioRendererInfo; @@ -2798,6 +2971,7 @@ declare namespace media { * @since 12 */ readonly currentTime: number; + readonly currentTime: number; /** * Playback duration, When the data source does not support seek, it returns - 1, such as a live broadcast scenario. @@ -2822,6 +2996,7 @@ declare namespace media { * @since 12 */ readonly duration: number; + readonly duration: number; /** * Playback state. @@ -2880,6 +3055,7 @@ declare namespace media { * @since 12 */ readonly width: number; + readonly width: number; /** * Video height, in px, valid after prepared. @@ -2897,6 +3073,7 @@ declare namespace media { * @since 12 */ readonly height: number; + readonly height: number; /** * Video scale type. By default, the {@link #VIDEO_SCALE_TYPE_FIT} will be used, for more @@ -2970,7 +3147,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVPlayer * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setBitrate(bitrate: number): void; @@ -3029,6 +3207,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice * @since 12 + * @since 12 */ on(type: 'mediaKeySystemInfoUpdate', callback: Callback>): void; @@ -3046,6 +3225,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice * @since 12 + * @since 12 */ off(type: 'mediaKeySystemInfoUpdate', callback?: Callback>): void; @@ -3116,6 +3296,7 @@ declare namespace media { * @since 12 */ on(type: 'volumeChange', callback: Callback): void; + on(type: 'volumeChange', callback: Callback): void; /** * Unregister listens for media playback volumeChange event. * @param { 'volumeChange' } type - Type of the playback event to listen for. @@ -3142,6 +3323,7 @@ declare namespace media { * @since 19 */ off(type: 'volumeChange', callback?: Callback): void; + off(type: 'volumeChange', callback?: Callback): void; /** * Register listens for media playback endOfStream event. * @param { 'endOfStream' } type - Type of the playback event to listen for. @@ -3190,6 +3372,7 @@ declare namespace media { * Register listens for media playback seekDone event. * @param { 'seekDone' } type - Type of the playback event to listen for. * @param { Callback } callback - Callback used to listen for the playback seekDone event. + * @param { Callback } callback - Callback used to listen for the playback seekDone event. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @since 9 */ @@ -3197,6 +3380,7 @@ declare namespace media { * Register listens for media playback seekDone event. * @param { 'seekDone' } type - Type of the playback event to listen for. * @param { Callback } callback - Callback used to listen for the playback seekDone event. + * @param { Callback } callback - Callback used to listen for the playback seekDone event. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice * @since 11 @@ -3217,6 +3401,7 @@ declare namespace media { * @since 12 */ on(type: 'seekDone', callback: Callback): void; + on(type: 'seekDone', callback: Callback): void; /** * Unregister listens for media playback seekDone event. * @param { 'seekDone' } type - Type of the playback event to listen for. @@ -3245,10 +3430,12 @@ declare namespace media { * @since 12 */ off(type: 'seekDone', callback?: Callback): void; + off(type: 'seekDone', callback?: Callback): void; /** * Register listens for media playback speedDone event. * @param { 'speedDone' } type - Type of the playback event to listen for. * @param { Callback } callback - Callback used to listen for the playback speedDone event. + * @param { Callback } callback - Callback used to listen for the playback speedDone event. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @since 9 */ @@ -3264,6 +3451,7 @@ declare namespace media { * @since 12 */ on(type: 'speedDone', callback: Callback): void; + on(type: 'speedDone', callback: Callback): void; /** * Unregister listens for media playback speedDone event. * @param { 'speedDone' } type - Type of the playback event to listen for. @@ -3313,6 +3501,7 @@ declare namespace media { * Register listens for media playback setBitrateDone event. * @param { 'bitrateDone' } type - Type of the playback event to listen for. * @param { Callback } callback - Callback used to listen for the playback setBitrateDone event. + * @param { Callback } callback - Callback used to listen for the playback setBitrateDone event. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @since 9 */ @@ -3327,6 +3516,7 @@ declare namespace media { * @since 12 */ on(type: 'bitrateDone', callback: Callback): void; + on(type: 'bitrateDone', callback: Callback): void; /** * Unregister listens for media playback setBitrateDone event. * @param { 'bitrateDone' } type - Type of the playback event to listen for. @@ -3351,10 +3541,12 @@ declare namespace media { * @since 19 */ off(type: 'bitrateDone', callback?: Callback): void; + off(type: 'bitrateDone', callback?: Callback): void; /** * Register listens for media playback timeUpdate event. * @param { 'timeUpdate' } type - Type of the playback event to listen for. * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. + * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @since 9 */ @@ -3362,6 +3554,7 @@ declare namespace media { * Register listens for media playback timeUpdate event. * @param { 'timeUpdate' } type - Type of the playback event to listen for. * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. + * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice * @since 11 @@ -3378,6 +3571,7 @@ declare namespace media { * @since 12 */ on(type: 'timeUpdate', callback: Callback): void; + on(type: 'timeUpdate', callback: Callback): void; /** * Unregister listens for media playback timeUpdate event. * @param { 'timeUpdate' } type - Type of the playback event to listen for. @@ -3401,10 +3595,12 @@ declare namespace media { * @since 12 */ off(type: 'timeUpdate', callback?: Callback): void; + off(type: 'timeUpdate', callback?: Callback): void; /** * Register listens for media playback durationUpdate event. * @param { 'durationUpdate' } type - Type of the playback event to listen for. * @param { Callback } callback - Callback used to listen for the playback durationUpdate event. + * @param { Callback } callback - Callback used to listen for the playback durationUpdate event. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @since 9 */ @@ -3420,6 +3616,7 @@ declare namespace media { * @since 12 */ on(type: 'durationUpdate', callback: Callback): void; + on(type: 'durationUpdate', callback: Callback): void; /** * Unregister listens for media playback durationUpdate event. * @param { 'durationUpdate' } type - Type of the playback event to listen for. @@ -3444,6 +3641,7 @@ declare namespace media { * @since 19 */ off(type: 'durationUpdate', callback?: Callback): void; + off(type: 'durationUpdate', callback?: Callback): void; /** * Register listens for video playback buffering events. @@ -3578,6 +3776,7 @@ declare namespace media { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ on(type: 'audioInterrupt', callback: Callback): void; /** @@ -3594,6 +3793,7 @@ declare namespace media { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ off(type: 'audioInterrupt', callback?: Callback): void; /** @@ -3617,6 +3817,7 @@ declare namespace media { * @since 12 */ on(type: 'availableBitrates', callback: Callback>): void; + on(type: 'availableBitrates', callback: Callback>): void; /** * Unregister listens for available bitrate list collect completed events for HLS protocol stream playback. * This event will be reported after the {@link #prepare} called. @@ -3629,12 +3830,14 @@ declare namespace media { * This event will be reported after the {@link #prepare} called. * @param { 'availableBitrates' } type - Type of the playback event to listen for. * @param { Callback> } callback - Callback used to listen for the playback event return available bitrate list. + * @param { Callback> } callback - Callback used to listen for the playback event return available bitrate list. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @crossplatform * @atomicservice * @since 12 */ off(type: 'availableBitrates', callback?: Callback>): void; + off(type: 'availableBitrates', callback?: Callback>): void; /** * Register listens for playback error events. * @param { 'error' } type - Type of the playback error event to listen for. @@ -3719,6 +3922,7 @@ declare namespace media { * @since 14 */ on(type: 'error', callback: ErrorCallback): void; + on(type: 'error', callback: ErrorCallback): void; /** * Unregister listens for playback error events. * @param { 'error' } type - Type of the playback error event to listen for. @@ -3742,6 +3946,7 @@ declare namespace media { * @since 12 */ off(type: 'error', callback?: ErrorCallback): void; + off(type: 'error', callback?: ErrorCallback): void; /** * Subscribes output device change event callback. @@ -3768,6 +3973,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice * @since 12 + * @since 12 */ on(type: 'audioOutputDeviceChangeWithInfo', callback: Callback): void; @@ -3791,6 +3997,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice * @since 12 + * @since 12 */ off(type: 'audioOutputDeviceChangeWithInfo', callback?: Callback): void; @@ -3877,6 +4084,7 @@ declare namespace media { * @since 13 */ on(type: 'amplitudeUpdate', callback: Callback>): void + on(type: 'amplitudeUpdate', callback: Callback>): void /** * Unsubscribes from update events of the maximum amplitude. @@ -3887,6 +4095,7 @@ declare namespace media { * @since 13 */ off(type: 'amplitudeUpdate', callback?: Callback>): void + off(type: 'amplitudeUpdate', callback?: Callback>): void /** * Subscribes to events indicating that a Supplemental Enhancement Information (SEI) message is received. This @@ -3904,6 +4113,7 @@ declare namespace media { * @since 18 */ on(type: 'seiMessageReceived', payloadTypes: Array, callback: OnSeiMessageHandle): void; + on(type: 'seiMessageReceived', payloadTypes: Array, callback: OnSeiMessageHandle): void; /** * Unsubscribes from the events indicating that an SEI message is received. @@ -3919,6 +4129,7 @@ declare namespace media { * @since 18 */ off(type: 'seiMessageReceived', payloadTypes?: Array, callback?: OnSeiMessageHandle): void; + off(type: 'seiMessageReceived', payloadTypes?: Array, callback?: OnSeiMessageHandle): void; /** * Subscribes to the event indicating that super resolution is enabled or disabled. @@ -3964,41 +4175,47 @@ declare namespace media { * * @enum { string } * @syscap SystemCapability.Multimedia.Media.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum PlaybackInfoKey { /** * IP address of current network stream. * @syscap SystemCapability.Multimedia.Media.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SERVER_IP_ADDRESS = 'server_ip_address', /** * Average download rate during playing except for suspend downloading. * @syscap SystemCapability.Multimedia.Media.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AVG_DOWNLOAD_RATE = 'average_download_rate', /** * Current download rate of the last second except for suspend downloading. * @syscap SystemCapability.Multimedia.Media.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ DOWNLOAD_RATE = 'download_rate', /** * Boolean value, true for current is downloading, false for suspend downloading. * @syscap SystemCapability.Multimedia.Media.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ IS_DOWNLOADING = 'is_downloading', /** * Cached duration in milliseconds. * @syscap SystemCapability.Multimedia.Media.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ BUFFER_DURATION = 'buffer_duration', } @@ -4194,7 +4411,8 @@ declare namespace media { * - client should return immediately. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ type SourceOpenCallback = (request: MediaSourceLoadingRequest) => number; @@ -4212,7 +4430,8 @@ declare namespace media { * @returns { void } - client should return immediately. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ type SourceReadCallback = (uuid: number, requestedOffset: number, requestedLength: number) => void; @@ -4225,7 +4444,8 @@ declare namespace media { * @returns { void } - client should return immediately. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ type SourceCloseCallback = (uuid: number) => void; @@ -4234,7 +4454,8 @@ declare namespace media { * @typedef MediaSourceLoader * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ interface MediaSourceLoader { /** @@ -4242,7 +4463,8 @@ declare namespace media { * @type { SourceOpenCallback } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ open: SourceOpenCallback; @@ -4251,7 +4473,8 @@ declare namespace media { * @type { SourceReadCallback } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ read: SourceReadCallback; @@ -4260,7 +4483,8 @@ declare namespace media { * @type { SourceCloseCallback } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ close: SourceCloseCallback; } @@ -4270,14 +4494,16 @@ declare namespace media { * @enum { number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ enum LoadingRequestError { /** * If reach the resource end, client should return. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ LOADING_ERROR_SUCCESS = 0, @@ -4285,7 +4511,8 @@ declare namespace media { * If resource not ready for access, client should return. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ LOADING_ERROR_NOT_READY = 1, @@ -4293,7 +4520,8 @@ declare namespace media { * If resource url not exist, client should return. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ LOADING_ERROR_NO_RESOURCE = 2, @@ -4301,7 +4529,8 @@ declare namespace media { * If the uuid of resource handle is valid, client should return. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ LOADING_ERROR_INVAID_HANDLE = 3, @@ -4309,7 +4538,8 @@ declare namespace media { * If client has no right to request the resource, client should return. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ LOADING_ERROR_ACCESS_DENIED = 4, @@ -4317,7 +4547,8 @@ declare namespace media { * If access time out, client should return. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ LOADING_ERROR_ACCESS_TIMEOUT = 5, @@ -4325,7 +4556,8 @@ declare namespace media { * If authorization failed, client should return. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ LOADING_ERROR_AUTHORIZE_FAILED = 6, } @@ -4354,7 +4586,8 @@ declare namespace media { * @type { ?Record } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ header?: Record; @@ -4382,7 +4615,8 @@ declare namespace media { * @param { ?string } [redirectUrl] - redirect url from the http response if exist. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ respondHeader(uuid: number, header?: Record, redirectUrl?: string): void; @@ -4394,7 +4628,8 @@ declare namespace media { * @param { LoadingRequestError } state - Request status. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ finishLoading(uuid: number, state: LoadingRequestError): void; } @@ -4419,29 +4654,35 @@ declare namespace media { /** * video width. * @type { number } + * @type { number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice * @since 19 */ width: number; + width: number; /** * video height. * @type { number } + * @type { number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice * @since 19 */ height: number; + height: number; /** * biterate of this mediaStream. * @type { number } + * @type { number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice * @since 19 */ bitrate: number; + bitrate: number; } /** @@ -4450,7 +4691,8 @@ declare namespace media { * @typedef MediaSource * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface MediaSource { /** @@ -4458,7 +4700,8 @@ declare namespace media { * @param { AVMimeTypes } mimeType - for MediaSource define. see @ AVMimeTypes. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ setMimeType(mimeType: AVMimeTypes): void; @@ -4467,7 +4710,8 @@ declare namespace media { * @param { MediaSourceLoader } resourceLoader - callback function interface set for player use. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ setMediaResourceLoaderDelegate(resourceLoader: MediaSourceLoader): void; } @@ -4477,14 +4721,16 @@ declare namespace media { * @enum { string } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AVMimeTypes { /** * Indicate current file is index file for hls Media. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ APPLICATION_M3U8 = 'application/m3u8', } @@ -4494,7 +4740,8 @@ declare namespace media { * @typedef PlaybackStrategy * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface PlaybackStrategy { /** @@ -4502,7 +4749,8 @@ declare namespace media { * @type { ?number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ preferredWidth?: number; /** @@ -4510,7 +4758,8 @@ declare namespace media { * @type { ?number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ preferredHeight?: number; /** @@ -4523,7 +4772,8 @@ declare namespace media { * @type { ?number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ preferredBufferDuration?: number; @@ -4532,7 +4782,8 @@ declare namespace media { * @type { ?boolean } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ preferredHdr?: boolean; @@ -4540,7 +4791,8 @@ declare namespace media { * mute the specified media stream when playing. * @type { ?MediaType } * @syscap SystemCapability.Multimedia.Media.Core - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ mutedMediaType?: MediaType; @@ -4549,7 +4801,8 @@ declare namespace media { * @type { ?string } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ preferredAudioLanguage?: string; @@ -4558,7 +4811,8 @@ declare namespace media { * @type { ?string } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ preferredSubtitleLanguage?: string; @@ -4576,7 +4830,8 @@ declare namespace media { * @type { ?number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ preferredBufferDurationForPlaying?: number; @@ -4586,7 +4841,8 @@ declare namespace media { * @type { ?boolean } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ enableSuperResolution?: boolean; @@ -4596,7 +4852,8 @@ declare namespace media { * @type { ?number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ thresholdForAutoQuickPlay?: number @@ -4657,12 +4914,14 @@ declare namespace media { * The file descriptor of audio or video source from file system. The caller * is responsible to close the file descriptor. * @type { number } + * @type { number } * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice * @since 12 */ fd: number + fd: number /** * The offset into the file where the data to be read, in bytes. By default, @@ -4681,12 +4940,14 @@ declare namespace media { * The offset into the file where the data to be read, in bytes. By default, * the offset is zero. * @type { ?number } + * @type { ?number } * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice * @since 12 */ offset?: number + offset?: number /** * The length in bytes of the data to be read. By default, the length is the @@ -4705,12 +4966,14 @@ declare namespace media { * The length in bytes of the data to be read. By default, the length is the * rest of bytes in the file from the offset. * @type { ?number } + * @type { ?number } * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice * @since 12 */ length?: number + length?: number } /** @@ -4759,12 +5022,14 @@ declare namespace media { * Size of the file, -1 means the file size is unknown, in this case, * seek and setSpeed can't be executed, loop can't be set, and can't replay. * @type { number } + * @type { number } * @syscap SystemCapability.Multimedia.Media.AVPlayer * @crossplatform * @atomicservice * @since 12 */ fileSize: number; + fileSize: number; /** * Callback function implemented by users, which is used to fill data. * buffer - The buffer need to fill. @@ -4801,6 +5066,7 @@ declare namespace media { * @since 12 */ callback: (buffer: ArrayBuffer, length: number, pos?: number) => number; + callback: (buffer: ArrayBuffer, length: number, pos?: number) => number; } /** @@ -4817,19 +5083,23 @@ declare namespace media { /** * Duration of the text to be displayed, as milliseconds. * @type { ?number } + * @type { ?number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice * @since 12 */ duration?: number; + duration?: number; /** * Display start time of the text, as milliseconds. * @type { ?number } + * @type { ?number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice * @since 12 */ startTime?: number; + startTime?: number; /** * Text information of current update event. * @type { ?string } @@ -5069,12 +5339,14 @@ declare namespace media { * Listens for playback error events. * @param { 'error' } type - Type of the playback error event to listen for. * @param { ErrorCallback } callback - Callback used to listen for the playback error event. + * @param { ErrorCallback } callback - Callback used to listen for the playback error event. * @syscap SystemCapability.Multimedia.Media.AudioPlayer * @since 6 * @deprecated since 9 * @useinstead ohos.multimedia.media/media.AVPlayer#event:error */ on(type: 'error', callback: ErrorCallback): void; + on(type: 'error', callback: ErrorCallback): void; } /** @@ -5354,6 +5626,17 @@ declare namespace media { * }); */ getInputSurface(): Promise; + /** + * Get input surface. it must be called between prepare completed and start. + * @returns { Promise } A Promise instance used to return the input surface id in string. + * @throws { BusinessError } 5400102 - Operate not permit. Return by promise. + * @throws { BusinessError } 5400103 - IO error. Return by promise. + * @throws { BusinessError } 5400105 - Service died. Return by promise. + * @syscap SystemCapability.Multimedia.Media.AVRecorder + * @since 20 + * @arkts 1.2 + */ + getInputSurface(): Promise; /** * Get input meta surface for specified meta source type. it must be called between prepare completed and start. @@ -6058,6 +6341,7 @@ declare namespace media { * 2. Incorrect parameter types. 3.Parameter verification failed. * @syscap SystemCapability.Multimedia.Media.AVRecorder * @since 11 + * @since 11 */ on(type: 'audioCapturerChange', callback: Callback): void; @@ -6160,6 +6444,7 @@ declare namespace media { * @since 12 */ on(type: 'error', callback: ErrorCallback): void; + on(type: 'error', callback: ErrorCallback): void; /** * Cancel Listens for recording stateChange events. @@ -6199,6 +6484,7 @@ declare namespace media { * @since 12 */ off(type: 'error', callback?: ErrorCallback): void; + off(type: 'error', callback?: ErrorCallback): void; /** * Cancel Listens for recording audioCapturerChange events. @@ -6214,6 +6500,7 @@ declare namespace media { * This parameter is supported since API version 12. * @syscap SystemCapability.Multimedia.Media.AVRecorder * @since 12 + * @since 12 */ off(type: 'audioCapturerChange', callback?: Callback): void; @@ -6354,11 +6641,13 @@ declare namespace media { /** * Latitude. * @type { number } + * @type { number } * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @since 12 */ latitude: number; + latitude: number; /** * Longitude. @@ -6368,11 +6657,13 @@ declare namespace media { /** * Longitude. * @type { number } + * @type { number } * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @since 12 */ longitude: number; + longitude: number; } /** * Set configures of a watermark to AVRecorder. The position starts at top left corner. @@ -6380,7 +6671,8 @@ declare namespace media { * @typedef WatermarkConfig * @syscap SystemCapability.Multimedia.Media.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ interface WatermarkConfig { /** @@ -6388,7 +6680,8 @@ declare namespace media { * @type { number } * @syscap SystemCapability.Multimedia.Media.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ top: number; /** @@ -6396,7 +6689,8 @@ declare namespace media { * @type { number } * @syscap SystemCapability.Multimedia.Media.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ left: number; } @@ -6526,6 +6820,7 @@ declare namespace media { * @throws { BusinessError } 201 - permission denied. * @syscap SystemCapability.Multimedia.Media.AudioRecorder * @since 12 + * @since 12 * @deprecated since 9 * @useinstead ohos.multimedia.media/media.AVRecorder#prepare */ @@ -6602,12 +6897,14 @@ declare namespace media { * Listens for audio recording error events. * @param { 'error' } type - Type of the audio recording error event to listen for. * @param { ErrorCallback } callback - Callback used to listen for the audio recording error event. + * @param { ErrorCallback } callback - Callback used to listen for the audio recording error event. * @syscap SystemCapability.Multimedia.Media.AudioRecorder * @since 6 * @deprecated since 9 * @useinstead ohos.multimedia.media/media.AVRecorder#on */ on(type: 'error', callback: ErrorCallback): void; + on(type: 'error', callback: ErrorCallback): void; } /** @@ -6712,8 +7009,22 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 12 + * @since 12 */ getInputSurface(callback: AsyncCallback): void; + /** + * get input surface.it must be called between prepare completed and start. + * @param { AsyncCallback } callback - Callback used to return the input surface id in string. + * @throws { BusinessError } 202 - Not System App. + * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. + * @throws { BusinessError } 5400103 - I/O error. Return by callback. + * @throws { BusinessError } 5400105 - Service died. Return by callback. + * @syscap SystemCapability.Multimedia.Media.VideoRecorder + * @systemapi + * @since 20 + * @arkts 1.2 + */ + getInputSurface(callback: AsyncCallback): void; /** * get input surface. it must be called between prepare completed and start. * @returns { Promise } A Promise instance used to return the input surface id in string. @@ -6734,8 +7045,22 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 12 + * @since 12 */ getInputSurface(): Promise; + /** + * get input surface. it must be called between prepare completed and start. + * @returns { Promise } A Promise instance used to return the input surface id in string. + * @throws { BusinessError } 202 - Not System App. + * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. + * @throws { BusinessError } 5400103 - I/O error. Return by promise. + * @throws { BusinessError } 5400105 - Service died. Return by promise. + * @syscap SystemCapability.Multimedia.Media.VideoRecorder + * @systemapi + * @since 20 + * @arkts 1.2 + */ + getInputSurface(): Promise; /** * Starts video recording. * @param { AsyncCallback } callback - A callback instance used to return when start completed. @@ -6755,7 +7080,8 @@ declare namespace media { * @throws { BusinessError } 5400105 - Service died. Return by callback. * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ start(callback: AsyncCallback): void; /** @@ -6777,7 +7103,8 @@ declare namespace media { * @throws { BusinessError } 5400105 - Service died. Return by promise. * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ start(): Promise; /** @@ -6843,7 +7170,8 @@ declare namespace media { * @throws { BusinessError } 5400105 - Service died. Return by callback. * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ resume(callback: AsyncCallback): void; /** @@ -6865,7 +7193,8 @@ declare namespace media { * @throws { BusinessError } 5400105 - Service died. Return by promise. * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ resume(): Promise; /** @@ -7016,7 +7345,8 @@ declare namespace media { * @throws { BusinessError } 5400105 - Service died. Return by callback. * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'error', callback: ErrorCallback): void; @@ -7560,12 +7890,14 @@ declare namespace media { * Listens for playback error events. * @param { 'error' } type - Type of the playback error event to listen for. * @param { ErrorCallback } callback - Callback used to listen for the playback error event. + * @param { ErrorCallback } callback - Callback used to listen for the playback error event. * @syscap SystemCapability.Multimedia.Media.VideoPlayer * @since 8 * @deprecated since 9 * @useinstead ohos.multimedia.media/media.AVPlayer#event:error */ on(type: 'error', callback: ErrorCallback): void; + on(type: 'error', callback: ErrorCallback): void; } /** @@ -8045,22 +8377,26 @@ declare namespace media { /** * Indicates the audio bit rate. * @type { number } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 9 */ readonly audioBitrate: number; + readonly audioBitrate: number; /** * Indicates the number of audio channels. * @type { number } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 9 */ readonly audioChannels: number; + readonly audioChannels: number; /** * Indicates the audio encoding format. @@ -8075,12 +8411,14 @@ declare namespace media { /** * Indicates the audio sampling rate. * @type { number } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 9 */ readonly audioSampleRate: number; + readonly audioSampleRate: number; /** * Indicates the output file format. @@ -8095,12 +8433,14 @@ declare namespace media { /** * Indicates the video bit rate. * @type { number } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 9 */ readonly videoBitrate: number; + readonly videoBitrate: number; /** * Indicates the video encoding format. @@ -8115,32 +8455,38 @@ declare namespace media { /** * Indicates the video width. * @type { number } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 9 */ readonly videoFrameWidth: number; + readonly videoFrameWidth: number; /** * Indicates the video height. * @type { number } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 9 */ readonly videoFrameHeight: number; + readonly videoFrameHeight: number; /** * Indicates the video frame rate. * @type { number } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 9 */ readonly videoFrameRate: number; + readonly videoFrameRate: number; } /** @@ -8343,11 +8689,13 @@ declare namespace media { * Sets the video rotation angle in output file, and for the file to playback. mp4 support. * the range of rotation angle should be {0, 90, 180, 270}, default is 0. * @type { ?number } + * @type { ?number } * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 9 */ rotation?: number; + rotation?: number; /** * geographical location information. * @type { ?Location } @@ -8434,6 +8782,7 @@ declare namespace media { * @since 11 */ sampleRate?: Array; + sampleRate?: Array; } /** @@ -8451,6 +8800,7 @@ declare namespace media { * @since 11 */ min: number; + min: number; /** * Maximum value. @@ -8459,6 +8809,7 @@ declare namespace media { * @since 11 */ max: number; + max: number; } /** @@ -8501,6 +8852,7 @@ declare namespace media { * @since 12 */ audioBitrate?: number; + audioBitrate?: number; /** * Indicates the number of audio channels. @@ -8519,6 +8871,7 @@ declare namespace media { * @since 12 */ audioChannels?: number; + audioChannels?: number; /** * Indicates the audio encoding format. @@ -8556,6 +8909,7 @@ declare namespace media { * @since 12 */ audioSampleRate?: number; + audioSampleRate?: number; /** * Indicates the output file format. @@ -8587,6 +8941,7 @@ declare namespace media { * @since 12 */ videoBitrate?: number; + videoBitrate?: number; /** * Indicates the video encoding format. @@ -8643,6 +8998,7 @@ declare namespace media { * @since 12 */ videoFrameRate?: number; + videoFrameRate?: number; /** * Whether to record HDR video. @@ -8783,7 +9139,8 @@ declare namespace media { * Mode for creating the file, which is used together with on('photoAssetAvailable'). * @type { ?FileGenerationMode } * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ fileGenerationMode?: FileGenerationMode; /** @@ -8793,10 +9150,12 @@ declare namespace media { * @type { ?number } * @syscap SystemCapability.Multimedia.Media.AVRecorder * @since 9 + * @since 9 * @deprecated since 12 * @useinstead ohos.multimedia.media/media.AVMetadata#videoOrientation */ rotation?: number; + rotation?: number; /** * Geographical location of the recorded video. By default, the geographical location information is not recorded. *
    This API is supported since API version 6 and deprecated since API version 12. You are advised to use @@ -8804,6 +9163,7 @@ declare namespace media { * @type { ?Location } * @syscap SystemCapability.Multimedia.Media.AVRecorder * @since 9 + * @since 9 * @deprecated since 12 * @useinstead ohos.multimedia.media/media.AVMetadata#location */ @@ -8812,7 +9172,8 @@ declare namespace media { * Metadata. For details, see @AVMetadata. * @type { ?AVMetadata } * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ metadata?: AVMetadata; /** @@ -8964,7 +9325,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum SwitchMode { /** @@ -8972,7 +9334,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SMOOTH = 0, /** @@ -8980,14 +9343,16 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SEGMENT = 1, /** * switch to the closest frame of the given timestamp. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CLOSEST = 2, } @@ -9154,19 +9519,22 @@ declare namespace media { * * @enum { number } * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum AVScreenCaptureRecordPreset { /** * The H.264 video encoding format, AAC audio encoding format, and MP4 container format are used. * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SCREEN_RECORD_PRESET_H264_AAC_MP4 = 0, /** * The H.265 video encoding format, AAC audio encoding format, and MP4 container format are used. * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ SCREEN_RECORD_PRESET_H265_AAC_MP4 = 1, } @@ -9176,19 +9544,22 @@ declare namespace media { * * @enum { number } * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ enum AVScreenCaptureFillMode { /** * Keeps the original aspect ratio, matching the aspect ratio of the physical screen. * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ PRESERVE_ASPECT_RATIO = 0, /** * Stretches the image to fit the specified dimensions. * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ SCALE_TO_FILL = 1, } @@ -9321,6 +9692,7 @@ declare namespace media { * @since 12 */ fd: number; + fd: number; /** * Video width, in px. The default value varies according to the display in use. * @type { ?number } @@ -9328,6 +9700,7 @@ declare namespace media { * @since 12 */ frameWidth?: number; + frameWidth?: number; /** * Video height, in px. The default value varies according to the display in use. * @type { ?number } @@ -9335,6 +9708,7 @@ declare namespace media { * @since 12 */ frameHeight?: number; + frameHeight?: number; /** * Video bit rate. The default value is **10000000**. * @type { ?number } @@ -9342,6 +9716,7 @@ declare namespace media { * @since 12 */ videoBitrate?: number; + videoBitrate?: number; /** * Audio sampling rate. This value is used for both internal capture and external capture (using microphones). * Only **48000** (default value) and **16000** are supported. @@ -9350,6 +9725,7 @@ declare namespace media { * @since 12 */ audioSampleRate?: number; + audioSampleRate?: number; /** * Number of audio channels. This value is used for both internal capture and external capture (using microphones). * Only **1** and **2** (default) are supported. @@ -9358,6 +9734,7 @@ declare namespace media { * @since 12 */ audioChannelCount?: number; + audioChannelCount?: number; /** * Audio bit rate. This value is used for both internal capture and external capture (using microphones). * The default value is **96000**. @@ -9366,11 +9743,13 @@ declare namespace media { * @since 12 */ audioBitrate?: number; + audioBitrate?: number; /** * Encoding and container format used. The default value is **SCREEN_RECORD_PRESET_H264_AAC_MP4**. * @type { ?AVScreenCaptureRecordPreset } * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ preset?: AVScreenCaptureRecordPreset; /** @@ -9380,11 +9759,13 @@ declare namespace media { * @since 15 */ displayId?: number; + displayId?: number; /** * Video fill mode during screen capture. * @type { ?AVScreenCaptureFillMode } * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since 18 + * @since arkts {'1.1':'18','1.2':'20'} + * @arkts 1.1&1.2 */ fillMode?: AVScreenCaptureFillMode; /** @@ -9565,6 +9946,7 @@ declare namespace media { * }) */ on(type: 'error', callback: ErrorCallback): void; + on(type: 'error', callback: ErrorCallback): void; /** * Unsubscribes from screen capture state changes. You can specify a callback to cancel the specified subscription. @@ -9591,6 +9973,7 @@ declare namespace media { * avScreenCaptureRecorder.off('error'); */ off(type: 'error', callback?: ErrorCallback): void; + off(type: 'error', callback?: ErrorCallback): void; } /** @@ -9608,6 +9991,7 @@ declare namespace media { * @since 12 */ audioBitrate?: number; + audioBitrate?: number; /** * Encoding format of the output audio. Currently, only AAC is supported. The default value is **AAC**. @@ -9634,6 +10018,7 @@ declare namespace media { * @since 12 */ videoBitrate?: number; + videoBitrate?: number; /** * Encoding format of the output video. Currently, only AVC and HEVC are supported. @@ -9661,6 +10046,7 @@ declare namespace media { * @since 12 */ videoFrameHeight?: number; + videoFrameHeight?: number; } /** @@ -9704,7 +10090,8 @@ declare namespace media { * at the same time, resulting in errors in obtaining data. * @type { number } * @syscap SystemCapability.Multimedia.Media.AVTranscoder - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ fdDst: number; @@ -9731,7 +10118,8 @@ declare namespace media { * @throws { BusinessError } 5400103 - IO error. Return by promise. * @throws { BusinessError } 5400105 - Service died. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVTranscoder - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ start(): Promise; @@ -9758,7 +10146,8 @@ declare namespace media { * @throws { BusinessError } 5400103 - IO error. Return by promise. * @throws { BusinessError } 5400105 - Service died. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVTranscoder - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ resume(): Promise; @@ -9771,7 +10160,8 @@ declare namespace media { * @throws { BusinessError } 5400103 - IO error. Return by promise. * @throws { BusinessError } 5400105 - Service died. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVTranscoder - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ cancel(): Promise; @@ -9825,6 +10215,7 @@ declare namespace media { * @since 12 */ on(type:'error', callback: ErrorCallback):void; + on(type:'error', callback: ErrorCallback):void; /** * Subscribes to transcoding progress updates. An application can subscribe to only one transcoding progress update @@ -9837,6 +10228,7 @@ declare namespace media { * @since 12 */ on(type:'progressUpdate', callback: Callback):void; + on(type:'progressUpdate', callback: Callback):void; /** * Unsubscribes from the event indicating that transcoding is complete. @@ -9860,6 +10252,7 @@ declare namespace media { * @since 12 */ off(type:'error', callback?: ErrorCallback):void; + off(type:'error', callback?: ErrorCallback):void; /** * Unsubscribes from transcoding progress updates. @@ -9872,6 +10265,7 @@ declare namespace media { * @since 12 */ off(type:'progressUpdate', callback?: Callback):void; + off(type:'progressUpdate', callback?: Callback):void; } /** diff --git a/api/@ohos.multimodalAwareness.roomLocation.d.ts b/api/@ohos.multimodalAwareness.roomLocation.d.ts new file mode 100644 index 0000000000..c7742f91cd --- /dev/null +++ b/api/@ohos.multimodalAwareness.roomLocation.d.ts @@ -0,0 +1,122 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file + * @kit MultimodalAwarenessKit + */ + +import type { Callback } from './@ohos.base'; + +/** + * This module provides the capability to subscribe to report the room location result. + * @namespace roomLocation + * @syscap SystemCapability.MultimodalAwareness.RoomLocation + * @systemapi + * @since 20 + * @arkts 1.1&1.2 + */ +declare namespace roomLocation { + /** + * Interface for room location result + * @interface RoomLocateResponse + * @syscap SystemCapability.MultimodalAwareness.RoomLocation + * @systemapi + * @since 20 + * @arkts 1.1&1.2 + */ + interface RoomLocateResponse { + /** + * indicates roomId + * @type { string } + * @syscap SystemCapability.MultimodalAwareness.RoomLocation + * @systemapi + * @since 20 + * @arkts 1.1&1.2 + */ + roomId: string; + /** + * indicates errorCode + * @type { int } + * @syscap SystemCapability.MultimodalAwareness.RoomLocation + * @systemapi + * @since 20 + * @arkts 1.1&1.2 + */ + errorCode: int; + } + + /** + * Subscribe to room-level location result data. + * @param { 'onRoomLocated' } type - Indicates the event type. + * @param { Callback } callback - Callback location result data. + * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. + * @throws { BusinessError } 801 - Capability not supported. Function can not work correctly due to + * limited device capabilities. + * @throws { BusinessError } 33800001 - Service exception. + * @throws { BusinessError } 33800002 - Subscription failed. + * @syscap SystemCapability.MultimodalAwareness.RoomLocation + * @systemapi + * @since 20 + * @arkts 1.1&1.2 + */ + function on(type: 'onRoomLocated', callback: Callback): void; + + /** + * Unsubscribe to room-level location result data. + * @param { 'onRoomLocated' } type - Indicates the event type. + * @param { Callback } [callback] - Callback location result data. + * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. + * @throws { BusinessError } 801 - Capability not supported. Function can not work correctly due to + * limited device capabilities. + * @throws { BusinessError } 33800001 - Service exception. + * @throws { BusinessError } 33800003 - Unsubscription failed. + * @syscap SystemCapability.MultimodalAwareness.RoomLocation + * @systemapi + * @since 20 + * @arkts 1.1&1.2 + */ + function off(type: 'onRoomLocated', callback?: Callback): void; + + /** + * Get room-level location result data. + * @returns { RoomLocateResponse } - Result of room-level location. + * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. + * @throws { BusinessError } 801 - Capability not supported. Function can not work correctly due to + * limited device capabilities. + * @throws { BusinessError } 33800005 - Failed to obtain room-level location information. + * @syscap SystemCapability.MultimodalAwareness.RoomLocation + * @systemapi + * @since 20 + * @arkts 1.1&1.2 + */ + function getRoomLocationResult(): RoomLocateResponse; + + /** + * Set devices informations. + * @param { string } deviceInfos - Device informations. + * @returns { Promise } - Result of setting information. + * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. + * @throws { BusinessError } 801 - Capability not supported. Function can not work correctly due to + * limited device capabilities. + * @throws { BusinessError } 33800004 - Failed to set device information. + * @syscap SystemCapability.MultimodalAwareness.RoomLocation + * @systemapi + * @since 20 + * @arkts 1.1&1.2 + */ + function setDeviceInfos(deviceInfos: string): Promise; +} +export default roomLocation; diff --git a/api/@ohos.multimodalInput.gestureEvent.d.ts b/api/@ohos.multimodalInput.gestureEvent.d.ts index 211ba308a6..eec5eca5dc 100644 --- a/api/@ohos.multimodalInput.gestureEvent.d.ts +++ b/api/@ohos.multimodalInput.gestureEvent.d.ts @@ -36,11 +36,11 @@ export declare interface Pinch { /** * scale - * @type { number } + * @type { double } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 10 */ - scale: number; + scale: double; } /** @@ -63,11 +63,11 @@ export declare interface Rotate { /** * Rotate angle * - * @type { number } + * @type { double } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 11 */ - angle: number; + angle: double; } /** @@ -88,19 +88,19 @@ export declare interface ThreeFingersSwipe { /** * Coordinate x - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 10 */ - x: number; + x: int; /** * Coordinate y - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 10 */ - y: number; + y: int; } /** @@ -121,19 +121,19 @@ export declare interface FourFingersSwipe { /** * Coordinate x - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 10 */ - x: number; + x: int; /** * Coordinate y - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 10 */ - y: number; + y: int; } /** @@ -156,21 +156,21 @@ export declare interface SwipeInward { /** * Coordinate x - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi hide for inner use * @since 12 */ - x: number; + x: int; /** * Coordinate y - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi hide for inner use * @since 12 */ - y: number; + y: int; } /** diff --git a/api/@ohos.multimodalInput.inputConsumer.d.ts b/api/@ohos.multimodalInput.inputConsumer.d.ts index 7e0056bf4e..07e07b7d73 100644 --- a/api/@ohos.multimodalInput.inputConsumer.d.ts +++ b/api/@ohos.multimodalInput.inputConsumer.d.ts @@ -50,25 +50,25 @@ declare namespace inputConsumer { * There is no requirement on the sequence of the keys. * For example, in the combination keys Ctrl+Alt+A, Ctrl+Alt are called preceding keys. * - * @type { Array } + * @type { Array } * @syscap SystemCapability.MultimodalInput.Input.InputConsumer * @systemapi hide for inner use * @since arkts {'1.1':'8', '1.2':'20'} * @arkts 1.1&1.2 */ - preKeys: Array; + preKeys: Array; /** * Final key. This parameter is mandatory. A callback is triggered by the final key. * For example, in the combination keys Ctrl+Alt+A, A is called the final key. * - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.InputConsumer * @systemapi hide for inner use * @since arkts {'1.1':'8', '1.2':'20'} * @arkts 1.1&1.2 */ - finalKey: number; + finalKey: int; /** * Whether the final key is pressed. @@ -89,13 +89,13 @@ declare namespace inputConsumer { * a callback is triggered when the key keeps being pressed after the specified duration expires. * If isFinalKeyDown is false, a callback is triggered when the key is released before the specified duration expires. * - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.InputConsumer * @systemapi hide for inner use * @since arkts {'1.1':'8', '1.2':'20'} * @arkts 1.1&1.2 */ - finalKeyDownDuration: number; + finalKeyDownDuration: int; /** * Whether to report repeated key events. The value true means to report repeated key events, and the value false means the opposite. @@ -115,7 +115,8 @@ declare namespace inputConsumer { * * @typedef HotkeyOptions * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ interface HotkeyOptions { /** @@ -123,21 +124,23 @@ declare namespace inputConsumer { * There is no requirement on the sequence of modifier keys. * For example, in Ctrl+Shift+Esc, Ctrl and Shift are modifier keys. * - * @type { Array } + * @type { Array } * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ - preKeys: Array; + preKeys: Array; /** * Modified key, which can be any key except the modifier keys and Meta key. For details about the keys, see Keycode. * For example, in Ctrl+Shift+Esc, Esc is the modified key. * - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ - finalKey: number; + finalKey: int; /** * Whether to report repeated key events. The value true means to report repeated key events, and the value false means the opposite. @@ -145,7 +148,8 @@ declare namespace inputConsumer { * * @type { ?boolean } * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ isRepeat?: boolean; } @@ -155,33 +159,37 @@ declare namespace inputConsumer { * * @typedef KeyPressedConfig * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since 16 + * @since arkts {'1.1':'16', '1.2':'20'} + * @arkts 1.1&1.2 */ interface KeyPressedConfig { /** * Key value. Currently, only the KEYCODE_VOLUME_UP and KEYCODE_VOLUME_DOWN keys are supported. * - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since 16 + * @since arkts {'1.1':'16', '1.2':'20'} + * @arkts 1.1&1.2 */ - key: number; + key: int; /** * Key event type. Currently, this parameter can only be set to 1, indicating key press. * - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since 16 + * @since arkts {'1.1':'16', '1.2':'20'} + * @arkts 1.1&1.2 */ - action: number; + action: int; /** * The value true means to report repeated key events, and the value false means the opposite. The default value is true. * * @type { boolean } * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since 16 + * @since arkts {'1.1':'16', '1.2':'20'} + * @arkts 1.1&1.2 */ isRepeat: boolean; } @@ -323,7 +331,8 @@ declare namespace inputConsumer { * @throws { BusinessError } 4200002 - The hotkey has been used by the system. * @throws { BusinessError } 4200003 - The hotkey has been subscribed to by another. * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'hotkeyChange', hotkeyOptions: HotkeyOptions, callback: Callback): void; @@ -338,7 +347,8 @@ declare namespace inputConsumer { *
    2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - Capability not supported. * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'hotkeyChange', hotkeyOptions: HotkeyOptions, callback?: Callback): void; @@ -353,7 +363,8 @@ declare namespace inputConsumer { *
    2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - Capability not supported. * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since 16 + * @since arkts {'1.1':'16', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'keyPressed', options: KeyPressedConfig, callback: Callback): void; @@ -368,7 +379,8 @@ declare namespace inputConsumer { *
    2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - Capability not supported. * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since 16 + * @since arkts {'1.1':'16', '1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'keyPressed', callback?: Callback): void; } diff --git a/api/@ohos.multimodalInput.inputDevice.d.ts b/api/@ohos.multimodalInput.inputDevice.d.ts index 1bec2bddfb..4e5e99dcb6 100644 --- a/api/@ohos.multimodalInput.inputDevice.d.ts +++ b/api/@ohos.multimodalInput.inputDevice.d.ts @@ -177,7 +177,7 @@ declare namespace inputDevice { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - deviceId: number; + deviceId: int; } /** @@ -240,52 +240,52 @@ declare namespace inputDevice { /** * Maximum value of the axis. * - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.InputDevice * @since arkts {'1.1':'8', '1.2':'20'} * @arkts 1.1&1.2 */ - max: number; + max: int; /** * Minimum value of the axis. * - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.InputDevice * @since arkts {'1.1':'8', '1.2':'20'} * @arkts 1.1&1.2 */ - min: number; + min: int; /** * Fuzzy value of the axis. * - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.InputDevice * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - fuzz: number; + fuzz: int; /** * Benchmark value of the axis. * - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.InputDevice * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - flat: number; + flat: int; /** * Resolution of the axis. * - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.InputDevice * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - resolution: number; + resolution: int; } /** @@ -306,7 +306,7 @@ declare namespace inputDevice { * @since arkts {'1.1':'8', '1.2':'20'} * @arkts 1.1&1.2 */ - id: number; + id: int; /** * Name of the input device. @@ -343,42 +343,42 @@ declare namespace inputDevice { /** * Bus type of the input device. By default, the bus type reported by the input device prevails. * - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.InputDevice * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - bus: number; + bus: int; /** * Product information of the input device. * - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.InputDevice * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - product: number; + product: int; /** * Vendor information of the input device. * - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.InputDevice * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - vendor: number; + vendor: int; /** * Version information of the input device. * - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.InputDevice * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - version: number; + version: int; /** * Physical address of the input device. diff --git a/api/@ohos.multimodalInput.inputDeviceCooperate.d.ts b/api/@ohos.multimodalInput.inputDeviceCooperate.d.ts index c302bdac7e..e7f24e3e12 100644 --- a/api/@ohos.multimodalInput.inputDeviceCooperate.d.ts +++ b/api/@ohos.multimodalInput.inputDeviceCooperate.d.ts @@ -28,7 +28,6 @@ import { AsyncCallback } from "./@ohos.base"; * @since 9 */ - declare namespace inputDeviceCooperate { /** * Enumerates screen hopping event. diff --git a/api/@ohos.multimodalInput.inputEvent.d.ts b/api/@ohos.multimodalInput.inputEvent.d.ts index 65053adb01..f3a91a491a 100644 --- a/api/@ohos.multimodalInput.inputEvent.d.ts +++ b/api/@ohos.multimodalInput.inputEvent.d.ts @@ -42,12 +42,12 @@ export declare interface InputEvent { */ /** * Unique event ID generated by the server - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice * @since 12 */ - id: number; + id: int; /** * ID of the device that reports the input event @@ -57,12 +57,12 @@ export declare interface InputEvent { */ /** * ID of the device that reports the input event - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice * @since 12 */ - deviceId: number; + deviceId: int; /** * Occurrence time of the input event @@ -72,12 +72,12 @@ export declare interface InputEvent { */ /** * Occurrence time of the input event - * @type { number } + * @type { long } * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice * @since 12 */ - actionTime: number; + actionTime: long; /** * ID of the target screen @@ -87,12 +87,12 @@ export declare interface InputEvent { */ /** * ID of the target screen - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice * @since 12 */ - screenId: number; + screenId: int; /** * ID of the target window @@ -102,10 +102,10 @@ export declare interface InputEvent { */ /** * ID of the target window - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice * @since 12 */ - windowId: number; + windowId: int; } \ No newline at end of file diff --git a/api/@ohos.multimodalInput.inputEventClient.d.ts b/api/@ohos.multimodalInput.inputEventClient.d.ts index 150b64d502..4de04bf730 100644 --- a/api/@ohos.multimodalInput.inputEventClient.d.ts +++ b/api/@ohos.multimodalInput.inputEventClient.d.ts @@ -103,7 +103,8 @@ declare namespace inputEventClient { * @interface TouchEventData * @syscap SystemCapability.MultimodalInput.Input.InputSimulator * @systemapi hide for inner use - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ interface TouchEventData { /** @@ -112,7 +113,8 @@ declare namespace inputEventClient { * @type { TouchEvent } * @syscap SystemCapability.MultimodalInput.Input.InputSimulator * @systemapi hide for inner use - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ touchEvent: TouchEvent; } diff --git a/api/@ohos.multimodalInput.inputMonitor.d.ts b/api/@ohos.multimodalInput.inputMonitor.d.ts index d60713c3dc..5fba3c170f 100644 --- a/api/@ohos.multimodalInput.inputMonitor.d.ts +++ b/api/@ohos.multimodalInput.inputMonitor.d.ts @@ -44,7 +44,8 @@ declare namespace inputMonitor { * @interface TouchEventReceiver * @syscap SystemCapability.MultimodalInput.Input.InputMonitor * @systemapi hide for inner use - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ interface TouchEventReceiver { /** diff --git a/api/@ohos.multimodalInput.keyCode.d.ts b/api/@ohos.multimodalInput.keyCode.d.ts index 8c5e443fc2..65e9efc910 100644 --- a/api/@ohos.multimodalInput.keyCode.d.ts +++ b/api/@ohos.multimodalInput.keyCode.d.ts @@ -31,14 +31,16 @@ * @enum { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export declare enum KeyCode { /** * KEYCODE_FN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_FN = 0, @@ -46,7 +48,8 @@ export declare enum KeyCode { * KEYCODE_UNKNOWN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_UNKNOWN = -1, @@ -54,7 +57,8 @@ export declare enum KeyCode { * KEYCODE_HOME * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_HOME = 1, @@ -62,7 +66,8 @@ export declare enum KeyCode { * KEYCODE_BACK * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BACK = 2, @@ -78,7 +83,8 @@ export declare enum KeyCode { * KEYCODE_SEARCH * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SEARCH = 9, @@ -93,7 +99,8 @@ export declare enum KeyCode { * * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MEDIA_PLAY_PAUSE = 10, @@ -108,7 +115,8 @@ export declare enum KeyCode { * * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MEDIA_STOP = 11, @@ -123,7 +131,8 @@ export declare enum KeyCode { * * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MEDIA_NEXT = 12, @@ -138,7 +147,8 @@ export declare enum KeyCode { * * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MEDIA_PREVIOUS = 13, @@ -153,7 +163,8 @@ export declare enum KeyCode { * * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MEDIA_REWIND = 14, @@ -168,7 +179,8 @@ export declare enum KeyCode { * * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MEDIA_FAST_FORWARD = 15, @@ -176,7 +188,8 @@ export declare enum KeyCode { * KEYCODE_VOLUME_UP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_VOLUME_UP = 16, @@ -184,7 +197,8 @@ export declare enum KeyCode { * KEYCODE_VOLUME_DOWN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_VOLUME_DOWN = 17, @@ -192,7 +206,8 @@ export declare enum KeyCode { * KEYCODE_POWER * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_POWER = 18, @@ -200,7 +215,8 @@ export declare enum KeyCode { * KEYCODE_CAMERA * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_CAMERA = 19, @@ -208,7 +224,8 @@ export declare enum KeyCode { * KEYCODE_VOLUME_MUTE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_VOLUME_MUTE = 22, @@ -216,7 +233,8 @@ export declare enum KeyCode { * KEYCODE_MUTE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MUTE = 23, @@ -224,7 +242,8 @@ export declare enum KeyCode { * KEYCODE_BRIGHTNESS_UP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BRIGHTNESS_UP = 40, @@ -232,7 +251,8 @@ export declare enum KeyCode { * KEYCODE_BRIGHTNESS_DOWN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BRIGHTNESS_DOWN = 41, @@ -240,7 +260,8 @@ export declare enum KeyCode { * KEYCODE_0 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_0 = 2000, @@ -248,7 +269,8 @@ export declare enum KeyCode { * KEYCODE_1 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_1 = 2001, @@ -256,7 +278,8 @@ export declare enum KeyCode { * KEYCODE_2 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_2 = 2002, @@ -264,7 +287,8 @@ export declare enum KeyCode { * KEYCODE_3 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_3 = 2003, @@ -272,7 +296,8 @@ export declare enum KeyCode { * KEYCODE_4 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_4 = 2004, @@ -280,7 +305,8 @@ export declare enum KeyCode { * KEYCODE_5 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_5 = 2005, @@ -288,7 +314,8 @@ export declare enum KeyCode { * KEYCODE_6 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_6 = 2006, @@ -296,7 +323,8 @@ export declare enum KeyCode { * KEYCODE_7 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_7 = 2007, @@ -304,7 +332,8 @@ export declare enum KeyCode { * KEYCODE_8 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_8 = 2008, @@ -312,7 +341,8 @@ export declare enum KeyCode { * KEYCODE_9 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_9 = 2009, @@ -320,7 +350,8 @@ export declare enum KeyCode { * KEYCODE_STAR * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_STAR = 2010, @@ -328,7 +359,8 @@ export declare enum KeyCode { * KEYCODE_POUND * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_POUND = 2011, @@ -336,7 +368,8 @@ export declare enum KeyCode { * KEYCODE_DPAD_UP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_DPAD_UP = 2012, @@ -344,7 +377,8 @@ export declare enum KeyCode { * KEYCODE_DPAD_DOWN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_DPAD_DOWN = 2013, @@ -352,7 +386,8 @@ export declare enum KeyCode { * KEYCODE_DPAD_LEFT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_DPAD_LEFT = 2014, @@ -360,7 +395,8 @@ export declare enum KeyCode { * KEYCODE_DPAD_RIGHT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_DPAD_RIGHT = 2015, @@ -368,7 +404,8 @@ export declare enum KeyCode { * KEYCODE_DPAD_CENTER * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_DPAD_CENTER = 2016, @@ -376,7 +413,8 @@ export declare enum KeyCode { * KEYCODE_A * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_A = 2017, @@ -384,7 +422,8 @@ export declare enum KeyCode { * KEYCODE_B * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_B = 2018, @@ -392,7 +431,8 @@ export declare enum KeyCode { * KEYCODE_C * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_C = 2019, @@ -400,7 +440,8 @@ export declare enum KeyCode { * KEYCODE_D * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_D = 2020, @@ -408,7 +449,8 @@ export declare enum KeyCode { * KEYCODE_E * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_E = 2021, @@ -416,7 +458,8 @@ export declare enum KeyCode { * KEYCODE_F * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F = 2022, @@ -424,7 +467,8 @@ export declare enum KeyCode { * KEYCODE_G * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_G = 2023, @@ -432,7 +476,8 @@ export declare enum KeyCode { * KEYCODE_H * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_H = 2024, @@ -440,7 +485,8 @@ export declare enum KeyCode { * KEYCODE_I * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_I = 2025, @@ -448,7 +494,8 @@ export declare enum KeyCode { * KEYCODE_J * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_J = 2026, @@ -456,7 +503,8 @@ export declare enum KeyCode { * KEYCODE_K * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_K = 2027, @@ -464,7 +512,8 @@ export declare enum KeyCode { * KEYCODE_L * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_L = 2028, @@ -472,7 +521,8 @@ export declare enum KeyCode { * KEYCODE_M * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_M = 2029, @@ -480,7 +530,8 @@ export declare enum KeyCode { * KEYCODE_N * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_N = 2030, @@ -488,7 +539,8 @@ export declare enum KeyCode { * KEYCODE_O * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_O = 2031, @@ -496,7 +548,8 @@ export declare enum KeyCode { * KEYCODE_P * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_P = 2032, @@ -504,7 +557,8 @@ export declare enum KeyCode { * KEYCODE_Q * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_Q = 2033, @@ -512,7 +566,8 @@ export declare enum KeyCode { * KEYCODE_R * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_R = 2034, @@ -520,7 +575,8 @@ export declare enum KeyCode { * KEYCODE_S * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_S = 2035, @@ -528,7 +584,8 @@ export declare enum KeyCode { * KEYCODE_T * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_T = 2036, @@ -536,7 +593,8 @@ export declare enum KeyCode { * KEYCODE_U * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_U = 2037, @@ -544,7 +602,8 @@ export declare enum KeyCode { * KEYCODE_V * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_V = 2038, @@ -552,7 +611,8 @@ export declare enum KeyCode { * KEYCODE_W * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_W = 2039, @@ -560,7 +620,8 @@ export declare enum KeyCode { * KEYCODE_X * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_X = 2040, @@ -568,7 +629,8 @@ export declare enum KeyCode { * KEYCODE_Y * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_Y = 2041, @@ -576,7 +638,8 @@ export declare enum KeyCode { * KEYCODE_Z * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_Z = 2042, @@ -584,7 +647,8 @@ export declare enum KeyCode { * KEYCODE_COMMA * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_COMMA = 2043, @@ -592,7 +656,8 @@ export declare enum KeyCode { * KEYCODE_PERIOD * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_PERIOD = 2044, @@ -600,7 +665,8 @@ export declare enum KeyCode { * KEYCODE_ALT_LEFT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_ALT_LEFT = 2045, @@ -608,7 +674,8 @@ export declare enum KeyCode { * KEYCODE_ALT_RIGHT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_ALT_RIGHT = 2046, @@ -616,7 +683,8 @@ export declare enum KeyCode { * KEYCODE_SHIFT_LEFT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SHIFT_LEFT = 2047, @@ -624,7 +692,8 @@ export declare enum KeyCode { * KEYCODE_SHIFT_RIGHT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SHIFT_RIGHT = 2048, @@ -632,7 +701,8 @@ export declare enum KeyCode { * KEYCODE_TAB * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_TAB = 2049, @@ -640,7 +710,8 @@ export declare enum KeyCode { * KEYCODE_SPACE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SPACE = 2050, @@ -648,7 +719,8 @@ export declare enum KeyCode { * KEYCODE_SYM * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SYM = 2051, @@ -656,7 +728,8 @@ export declare enum KeyCode { * Explorer key, which is used to start the explorer application * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_EXPLORER = 2052, @@ -664,7 +737,8 @@ export declare enum KeyCode { * Email key, which is used to start the email application * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_ENVELOPE = 2053, @@ -672,7 +746,8 @@ export declare enum KeyCode { * KEYCODE_ENTER * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_ENTER = 2054, @@ -680,7 +755,8 @@ export declare enum KeyCode { * KEYCODE_DEL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_DEL = 2055, @@ -688,7 +764,8 @@ export declare enum KeyCode { * Key / * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_GRAVE = 2056, @@ -696,7 +773,8 @@ export declare enum KeyCode { * Key - * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MINUS = 2057, @@ -704,7 +782,8 @@ export declare enum KeyCode { * Key = * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_EQUALS = 2058, @@ -712,7 +791,8 @@ export declare enum KeyCode { * Key [ * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_LEFT_BRACKET = 2059, @@ -720,7 +800,8 @@ export declare enum KeyCode { * Key ] * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_RIGHT_BRACKET = 2060, @@ -728,7 +809,8 @@ export declare enum KeyCode { * Key \ * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BACKSLASH = 2061, @@ -736,7 +818,8 @@ export declare enum KeyCode { * Key ; * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SEMICOLON = 2062, @@ -744,7 +827,8 @@ export declare enum KeyCode { * Key ' * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_APOSTROPHE = 2063, @@ -752,7 +836,8 @@ export declare enum KeyCode { * Key / * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SLASH = 2064, @@ -760,7 +845,8 @@ export declare enum KeyCode { * Key @ * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_AT = 2065, @@ -768,7 +854,8 @@ export declare enum KeyCode { * Key + * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_PLUS = 2066, @@ -776,7 +863,8 @@ export declare enum KeyCode { * KEYCODE_MENU * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MENU = 2067, @@ -784,7 +872,8 @@ export declare enum KeyCode { * KEYCODE_PAGE_UP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_PAGE_UP = 2068, @@ -792,7 +881,8 @@ export declare enum KeyCode { * KEYCODE_PAGE_DOWN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_PAGE_DOWN = 2069, @@ -800,7 +890,8 @@ export declare enum KeyCode { * KEYCODE_ESCAPE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_ESCAPE = 2070, @@ -808,7 +899,8 @@ export declare enum KeyCode { * KEYCODE_FORWARD_DEL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_FORWARD_DEL = 2071, @@ -816,7 +908,8 @@ export declare enum KeyCode { * KEYCODE_CTRL_LEFT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_CTRL_LEFT = 2072, @@ -824,7 +917,8 @@ export declare enum KeyCode { * KEYCODE_CTRL_RIGHT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_CTRL_RIGHT = 2073, @@ -832,7 +926,8 @@ export declare enum KeyCode { * KEYCODE_CAPS_LOCK * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_CAPS_LOCK = 2074, @@ -840,7 +935,8 @@ export declare enum KeyCode { * KEYCODE_SCROLL_LOCK * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SCROLL_LOCK = 2075, @@ -848,7 +944,8 @@ export declare enum KeyCode { * KEYCODE_META_LEFT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_META_LEFT = 2076, @@ -856,7 +953,8 @@ export declare enum KeyCode { * KEYCODE_META_RIGHT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_META_RIGHT = 2077, @@ -864,7 +962,8 @@ export declare enum KeyCode { * KEYCODE_FUNCTION * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_FUNCTION = 2078, @@ -872,7 +971,8 @@ export declare enum KeyCode { * KEYCODE_SYSRQ * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SYSRQ = 2079, @@ -880,7 +980,8 @@ export declare enum KeyCode { * KEYCODE_BREAK * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BREAK = 2080, @@ -888,7 +989,8 @@ export declare enum KeyCode { * KEYCODE_MOVE_HOME * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MOVE_HOME = 2081, @@ -896,7 +998,8 @@ export declare enum KeyCode { * KEYCODE_MOVE_END * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MOVE_END = 2082, @@ -904,7 +1007,8 @@ export declare enum KeyCode { * KEYCODE_INSERT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_INSERT = 2083, @@ -912,7 +1016,8 @@ export declare enum KeyCode { * KEYCODE_FORWARD * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_FORWARD = 2084, @@ -927,7 +1032,8 @@ export declare enum KeyCode { * * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MEDIA_PLAY = 2085, @@ -942,7 +1048,8 @@ export declare enum KeyCode { * * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MEDIA_PAUSE = 2086, @@ -950,7 +1057,8 @@ export declare enum KeyCode { * KEYCODE_MEDIA_CLOSE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MEDIA_CLOSE = 2087, @@ -958,7 +1066,8 @@ export declare enum KeyCode { * KEYCODE_MEDIA_EJECT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MEDIA_EJECT = 2088, @@ -966,7 +1075,8 @@ export declare enum KeyCode { * KEYCODE_MEDIA_RECORD * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MEDIA_RECORD = 2089, @@ -974,7 +1084,8 @@ export declare enum KeyCode { * KEYCODE_F1 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F1 = 2090, @@ -982,7 +1093,8 @@ export declare enum KeyCode { * KEYCODE_F2 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F2 = 2091, @@ -990,7 +1102,8 @@ export declare enum KeyCode { * KEYCODE_F3 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F3 = 2092, @@ -998,7 +1111,8 @@ export declare enum KeyCode { * KEYCODE_F4 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F4 = 2093, @@ -1006,7 +1120,8 @@ export declare enum KeyCode { * KEYCODE_F5 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F5 = 2094, @@ -1014,7 +1129,8 @@ export declare enum KeyCode { * KEYCODE_F6 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F6 = 2095, @@ -1022,7 +1138,8 @@ export declare enum KeyCode { * KEYCODE_F7 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F7 = 2096, @@ -1030,7 +1147,8 @@ export declare enum KeyCode { * KEYCODE_F8 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F8 = 2097, @@ -1038,7 +1156,8 @@ export declare enum KeyCode { * KEYCODE_F9 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F9 = 2098, @@ -1046,7 +1165,8 @@ export declare enum KeyCode { * KEYCODE_F10 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F10 = 2099, @@ -1054,7 +1174,8 @@ export declare enum KeyCode { * KEYCODE_F11 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F11 = 2100, @@ -1062,7 +1183,8 @@ export declare enum KeyCode { * KEYCODE_F12 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F12 = 2101, @@ -1070,7 +1192,8 @@ export declare enum KeyCode { * Number Lock key on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUM_LOCK = 2102, @@ -1078,7 +1201,8 @@ export declare enum KeyCode { * Key 0 on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUMPAD_0 = 2103, @@ -1086,7 +1210,8 @@ export declare enum KeyCode { * Key 1 on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUMPAD_1 = 2104, @@ -1094,7 +1219,8 @@ export declare enum KeyCode { * Key 2 on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUMPAD_2 = 2105, @@ -1102,7 +1228,8 @@ export declare enum KeyCode { * Key 3 on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUMPAD_3 = 2106, @@ -1110,7 +1237,8 @@ export declare enum KeyCode { * Key 4 on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUMPAD_4 = 2107, @@ -1118,7 +1246,8 @@ export declare enum KeyCode { * Key 5 on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUMPAD_5 = 2108, @@ -1126,7 +1255,8 @@ export declare enum KeyCode { * Key 6 on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUMPAD_6 = 2109, @@ -1134,7 +1264,8 @@ export declare enum KeyCode { * Key 7 on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUMPAD_7 = 2110, @@ -1142,7 +1273,8 @@ export declare enum KeyCode { * Key 8 on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUMPAD_8 = 2111, @@ -1150,7 +1282,8 @@ export declare enum KeyCode { * Key 9 on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUMPAD_9 = 2112, @@ -1158,7 +1291,8 @@ export declare enum KeyCode { * Key / on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUMPAD_DIVIDE = 2113, @@ -1166,7 +1300,8 @@ export declare enum KeyCode { * Key ) on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUMPAD_MULTIPLY = 2114, @@ -1174,7 +1309,8 @@ export declare enum KeyCode { * Key - on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUMPAD_SUBTRACT = 2115, @@ -1182,7 +1318,8 @@ export declare enum KeyCode { * Key + on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUMPAD_ADD = 2116, @@ -1190,7 +1327,8 @@ export declare enum KeyCode { * Key . on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUMPAD_DOT = 2117, @@ -1198,7 +1336,8 @@ export declare enum KeyCode { * Key , on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUMPAD_COMMA = 2118, @@ -1206,7 +1345,8 @@ export declare enum KeyCode { * Enter key on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUMPAD_ENTER = 2119, @@ -1214,7 +1354,8 @@ export declare enum KeyCode { * Key = on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUMPAD_EQUALS = 2120, @@ -1222,7 +1363,8 @@ export declare enum KeyCode { * Key ( on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUMPAD_LEFT_PAREN = 2121, @@ -1230,7 +1372,8 @@ export declare enum KeyCode { * Key ) on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUMPAD_RIGHT_PAREN = 2122, @@ -1238,7 +1381,8 @@ export declare enum KeyCode { * KEYCODE_VIRTUAL_MULTITASK * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_VIRTUAL_MULTITASK = 2210, @@ -1246,7 +1390,8 @@ export declare enum KeyCode { * Joystick key A * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BUTTON_A = 2301, @@ -1254,7 +1399,8 @@ export declare enum KeyCode { * Joystick key B * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BUTTON_B = 2302, @@ -1262,7 +1408,8 @@ export declare enum KeyCode { * Joystick key X * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BUTTON_X = 2304, @@ -1270,7 +1417,8 @@ export declare enum KeyCode { * Joystick key Y * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BUTTON_Y = 2305, @@ -1278,7 +1426,8 @@ export declare enum KeyCode { * Joystick key L1 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BUTTON_L1 = 2307, @@ -1286,7 +1435,8 @@ export declare enum KeyCode { * Joystick key R1 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BUTTON_R1 = 2308, @@ -1294,7 +1444,8 @@ export declare enum KeyCode { * Joystick key L2 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BUTTON_L2 = 2309, @@ -1302,7 +1453,8 @@ export declare enum KeyCode { * Joystick key R2 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BUTTON_R2 = 2310, @@ -1310,7 +1462,8 @@ export declare enum KeyCode { * Joystick key Select * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BUTTON_SELECT = 2311, @@ -1318,7 +1471,8 @@ export declare enum KeyCode { * Joystick key Start * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BUTTON_START = 2312, @@ -1326,7 +1480,8 @@ export declare enum KeyCode { * Joystick key Mode * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BUTTON_MODE = 2313, @@ -1334,7 +1489,8 @@ export declare enum KeyCode { *Joystick key THUMBL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BUTTON_THUMBL = 2314, @@ -1342,7 +1498,8 @@ export declare enum KeyCode { * Joystick key THUMBR * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BUTTON_THUMBR = 2315, @@ -1350,7 +1507,8 @@ export declare enum KeyCode { * KEYCODE_SLEEP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SLEEP = 2600, @@ -1358,7 +1516,8 @@ export declare enum KeyCode { * KEYCODE_ZENKAKU_HANKAKU * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_ZENKAKU_HANKAKU = 2601, @@ -1366,7 +1525,8 @@ export declare enum KeyCode { * KEYCODE_102ND * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_102ND = 2602, @@ -1374,7 +1534,8 @@ export declare enum KeyCode { * KEYCODE_RO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_RO = 2603, @@ -1382,7 +1543,8 @@ export declare enum KeyCode { * KEYCODE_KATAKANA * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_KATAKANA = 2604, @@ -1390,7 +1552,8 @@ export declare enum KeyCode { * KEYCODE_HIRAGANA * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_HIRAGANA = 2605, @@ -1398,7 +1561,8 @@ export declare enum KeyCode { * KEYCODE_HENKAN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_HENKAN = 2606, @@ -1406,7 +1570,8 @@ export declare enum KeyCode { * KEYCODE_KATAKANA_HIRAGANA * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_KATAKANA_HIRAGANA = 2607, @@ -1414,7 +1579,8 @@ export declare enum KeyCode { * KEYCODE_MUHENKAN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MUHENKAN = 2608, @@ -1422,7 +1588,8 @@ export declare enum KeyCode { * KEYCODE_LINEFEED * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_LINEFEED = 2609, @@ -1430,7 +1597,8 @@ export declare enum KeyCode { * KEYCODE_MACRO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MACRO = 2610, @@ -1438,7 +1606,8 @@ export declare enum KeyCode { * KEYCODE_NUMPAD_PLUSMINUS * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NUMPAD_PLUSMINUS = 2611, @@ -1446,7 +1615,8 @@ export declare enum KeyCode { * KEYCODE_SCALE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SCALE = 2612, @@ -1454,7 +1624,8 @@ export declare enum KeyCode { * KEYCODE_HANGUEL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_HANGUEL = 2613, @@ -1462,7 +1633,8 @@ export declare enum KeyCode { * KEYCODE_HANJA * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_HANJA = 2614, @@ -1470,7 +1642,8 @@ export declare enum KeyCode { * KEYCODE_YEN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_YEN = 2615, @@ -1478,7 +1651,8 @@ export declare enum KeyCode { * KEYCODE_STOP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_STOP = 2616, @@ -1486,7 +1660,8 @@ export declare enum KeyCode { * KEYCODE_AGAIN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_AGAIN = 2617, @@ -1494,7 +1669,8 @@ export declare enum KeyCode { * KEYCODE_PROPS * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_PROPS = 2618, @@ -1502,7 +1678,8 @@ export declare enum KeyCode { * KEYCODE_UNDO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_UNDO = 2619, @@ -1510,7 +1687,8 @@ export declare enum KeyCode { * KEYCODE_COPY * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_COPY = 2620, @@ -1518,7 +1696,8 @@ export declare enum KeyCode { * KEYCODE_OPEN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_OPEN = 2621, @@ -1526,7 +1705,8 @@ export declare enum KeyCode { * KEYCODE_PASTE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_PASTE = 2622, @@ -1534,7 +1714,8 @@ export declare enum KeyCode { * KEYCODE_FIND * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_FIND = 2623, @@ -1542,7 +1723,8 @@ export declare enum KeyCode { * KEYCODE_CUT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_CUT = 2624, @@ -1550,7 +1732,8 @@ export declare enum KeyCode { * KEYCODE_HELP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_HELP = 2625, @@ -1558,7 +1741,8 @@ export declare enum KeyCode { * Calc key, which is used to start the calculator application * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_CALC = 2626, @@ -1566,7 +1750,8 @@ export declare enum KeyCode { * KEYCODE_FILE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_FILE = 2627, @@ -1574,7 +1759,8 @@ export declare enum KeyCode { * KEYCODE_BOOKMARKS * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BOOKMARKS = 2628, @@ -1582,7 +1768,8 @@ export declare enum KeyCode { * KEYCODE_NEXT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NEXT = 2629, @@ -1590,7 +1777,8 @@ export declare enum KeyCode { * KEYCODE_PLAYPAUSE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_PLAYPAUSE = 2630, @@ -1598,7 +1786,8 @@ export declare enum KeyCode { * KEYCODE_PREVIOUS * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_PREVIOUS = 2631, @@ -1606,7 +1795,8 @@ export declare enum KeyCode { * KEYCODE_STOPCD * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_STOPCD = 2632, @@ -1614,7 +1804,8 @@ export declare enum KeyCode { * KEYCODE_CONFIG * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_CONFIG = 2634, @@ -1622,7 +1813,8 @@ export declare enum KeyCode { * KEYCODE_REFRESH * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_REFRESH = 2635, @@ -1630,7 +1822,8 @@ export declare enum KeyCode { * KEYCODE_EXIT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_EXIT = 2636, @@ -1638,7 +1831,8 @@ export declare enum KeyCode { * KEYCODE_EDIT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_EDIT = 2637, @@ -1646,7 +1840,8 @@ export declare enum KeyCode { * KEYCODE_SCROLLUP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SCROLLUP = 2638, @@ -1654,7 +1849,8 @@ export declare enum KeyCode { * KEYCODE_SCROLLDOWN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SCROLLDOWN = 2639, @@ -1662,7 +1858,8 @@ export declare enum KeyCode { * KEYCODE_NEW * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NEW = 2640, @@ -1670,7 +1867,8 @@ export declare enum KeyCode { * KEYCODE_REDO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_REDO = 2641, @@ -1678,7 +1876,8 @@ export declare enum KeyCode { * KEYCODE_CLOSE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_CLOSE = 2642, @@ -1686,7 +1885,8 @@ export declare enum KeyCode { * KEYCODE_PLAY * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_PLAY = 2643, @@ -1694,7 +1894,8 @@ export declare enum KeyCode { * KEYCODE_BASSBOOST * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BASSBOOST = 2644, @@ -1702,7 +1903,8 @@ export declare enum KeyCode { * KEYCODE_PRINT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_PRINT = 2645, @@ -1710,7 +1912,8 @@ export declare enum KeyCode { * KEYCODE_CHAT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_CHAT = 2646, @@ -1718,7 +1921,8 @@ export declare enum KeyCode { * KEYCODE_FINANCE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_FINANCE = 2647, @@ -1726,7 +1930,8 @@ export declare enum KeyCode { * KEYCODE_CANCEL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_CANCEL = 2648, @@ -1734,7 +1939,8 @@ export declare enum KeyCode { * KEYCODE_KBDILLUM_TOGGLE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_KBDILLUM_TOGGLE = 2649, @@ -1742,7 +1948,8 @@ export declare enum KeyCode { * KEYCODE_KBDILLUM_DOWN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_KBDILLUM_DOWN = 2650, @@ -1750,7 +1957,8 @@ export declare enum KeyCode { * KEYCODE_KBDILLUM_UP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_KBDILLUM_UP = 2651, @@ -1758,7 +1966,8 @@ export declare enum KeyCode { * KEYCODE_SEND * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SEND = 2652, @@ -1766,7 +1975,8 @@ export declare enum KeyCode { * KEYCODE_REPLY * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_REPLY = 2653, @@ -1774,7 +1984,8 @@ export declare enum KeyCode { * KEYCODE_FORWARDMAIL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_FORWARDMAIL = 2654, @@ -1782,7 +1993,8 @@ export declare enum KeyCode { * KEYCODE_SAVE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SAVE = 2655, @@ -1790,7 +2002,8 @@ export declare enum KeyCode { * KEYCODE_DOCUMENTS * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_DOCUMENTS = 2656, @@ -1798,7 +2011,8 @@ export declare enum KeyCode { * KEYCODE_VIDEO_NEXT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_VIDEO_NEXT = 2657, @@ -1806,7 +2020,8 @@ export declare enum KeyCode { * KEYCODE_VIDEO_PREV * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_VIDEO_PREV = 2658, @@ -1814,7 +2029,8 @@ export declare enum KeyCode { * KEYCODE_BRIGHTNESS_CYCLE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BRIGHTNESS_CYCLE = 2659, @@ -1822,7 +2038,8 @@ export declare enum KeyCode { * KEYCODE_BRIGHTNESS_ZERO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BRIGHTNESS_ZERO = 2660, @@ -1830,7 +2047,8 @@ export declare enum KeyCode { * KEYCODE_DISPLAY_OFF * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_DISPLAY_OFF = 2661, @@ -1838,7 +2056,8 @@ export declare enum KeyCode { * KEYCODE_BTN_MISC * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BTN_MISC = 2662, @@ -1846,7 +2065,8 @@ export declare enum KeyCode { * KEYCODE_GOTO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_GOTO = 2663, @@ -1854,7 +2074,8 @@ export declare enum KeyCode { * KEYCODE_INFO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_INFO = 2664, @@ -1862,7 +2083,8 @@ export declare enum KeyCode { * KEYCODE_PROGRAM * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_PROGRAM = 2665, @@ -1870,7 +2092,8 @@ export declare enum KeyCode { * KEYCODE_PVR * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_PVR = 2666, @@ -1878,7 +2101,8 @@ export declare enum KeyCode { * KEYCODE_SUBTITLE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SUBTITLE = 2667, @@ -1886,7 +2110,8 @@ export declare enum KeyCode { * KEYCODE_FULL_SCREEN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_FULL_SCREEN = 2668, @@ -1894,7 +2119,8 @@ export declare enum KeyCode { * KEYCODE_KEYBOARD * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_KEYBOARD = 2669, @@ -1902,7 +2128,8 @@ export declare enum KeyCode { * KEYCODE_ASPECT_RATIO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_ASPECT_RATIO = 2670, @@ -1910,7 +2137,8 @@ export declare enum KeyCode { * KEYCODE_PC * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_PC = 2671, @@ -1918,7 +2146,8 @@ export declare enum KeyCode { * KEYCODE_TV * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_TV = 2672, @@ -1926,7 +2155,8 @@ export declare enum KeyCode { * KEYCODE_TV2 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_TV2 = 2673, @@ -1934,7 +2164,8 @@ export declare enum KeyCode { * KEYCODE_VCR * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_VCR = 2674, @@ -1942,7 +2173,8 @@ export declare enum KeyCode { * KEYCODE_VCR2 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_VCR2 = 2675, @@ -1950,7 +2182,8 @@ export declare enum KeyCode { * KEYCODE_SAT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SAT = 2676, @@ -1958,7 +2191,8 @@ export declare enum KeyCode { * KEYCODE_CD * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_CD = 2677, @@ -1966,7 +2200,8 @@ export declare enum KeyCode { * KEYCODE_TAPE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_TAPE = 2678, @@ -1974,7 +2209,8 @@ export declare enum KeyCode { * KEYCODE_TUNER * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_TUNER = 2679, @@ -1982,7 +2218,8 @@ export declare enum KeyCode { * KEYCODE_PLAYER * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_PLAYER = 2680, @@ -1990,7 +2227,8 @@ export declare enum KeyCode { * KEYCODE_DVD * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_DVD = 2681, @@ -1998,7 +2236,8 @@ export declare enum KeyCode { * KEYCODE_AUDIO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_AUDIO = 2682, @@ -2006,7 +2245,8 @@ export declare enum KeyCode { * KEYCODE_VIDEO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_VIDEO = 2683, @@ -2014,7 +2254,8 @@ export declare enum KeyCode { * KEYCODE_MEMO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MEMO = 2684, @@ -2022,7 +2263,8 @@ export declare enum KeyCode { * KEYCODE_CALENDAR * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_CALENDAR = 2685, @@ -2030,7 +2272,8 @@ export declare enum KeyCode { * KEYCODE_RED * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_RED = 2686, @@ -2038,7 +2281,8 @@ export declare enum KeyCode { * KEYCODE_GREEN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_GREEN = 2687, @@ -2046,7 +2290,8 @@ export declare enum KeyCode { * KEYCODE_YELLOW * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_YELLOW = 2688, @@ -2054,7 +2299,8 @@ export declare enum KeyCode { * KEYCODE_BLUE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BLUE = 2689, @@ -2062,7 +2308,8 @@ export declare enum KeyCode { * KEYCODE_CHANNELUP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_CHANNELUP = 2690, @@ -2070,7 +2317,8 @@ export declare enum KeyCode { * KEYCODE_CHANNELDOWN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_CHANNELDOWN = 2691, @@ -2078,7 +2326,8 @@ export declare enum KeyCode { * KEYCODE_LAST * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_LAST = 2692, @@ -2086,7 +2335,8 @@ export declare enum KeyCode { * KEYCODE_RESTART * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_RESTART = 2693, @@ -2094,7 +2344,8 @@ export declare enum KeyCode { * KEYCODE_SLOW * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SLOW = 2694, @@ -2102,7 +2353,8 @@ export declare enum KeyCode { * KEYCODE_SHUFFLE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SHUFFLE = 2695, @@ -2110,7 +2362,8 @@ export declare enum KeyCode { * KEYCODE_VIDEOPHONE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_VIDEOPHONE = 2696, @@ -2118,7 +2371,8 @@ export declare enum KeyCode { * KEYCODE_GAMES * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_GAMES = 2697, @@ -2126,7 +2380,8 @@ export declare enum KeyCode { * KEYCODE_ZOOMIN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_ZOOMIN = 2698, @@ -2134,7 +2389,8 @@ export declare enum KeyCode { * KEYCODE_ZOOMOUT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_ZOOMOUT = 2699, @@ -2142,7 +2398,8 @@ export declare enum KeyCode { * KEYCODE_ZOOMRESET * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_ZOOMRESET = 2700, @@ -2150,7 +2407,8 @@ export declare enum KeyCode { * KEYCODE_WORDPROCESSOR * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_WORDPROCESSOR = 2701, @@ -2158,7 +2416,8 @@ export declare enum KeyCode { * KEYCODE_EDITOR * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_EDITOR = 2702, @@ -2166,7 +2425,8 @@ export declare enum KeyCode { * KEYCODE_SPREADSHEET * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SPREADSHEET = 2703, @@ -2174,7 +2434,8 @@ export declare enum KeyCode { * KEYCODE_GRAPHICSEDITOR * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_GRAPHICSEDITOR = 2704, @@ -2182,7 +2443,8 @@ export declare enum KeyCode { * KEYCODE_PRESENTATION * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_PRESENTATION = 2705, @@ -2190,7 +2452,8 @@ export declare enum KeyCode { * KEYCODE_DATABASE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_DATABASE = 2706, @@ -2198,7 +2461,8 @@ export declare enum KeyCode { * KEYCODE_NEWS * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_NEWS = 2707, @@ -2206,7 +2470,8 @@ export declare enum KeyCode { * KEYCODE_VOICEMAIL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_VOICEMAIL = 2708, @@ -2214,7 +2479,8 @@ export declare enum KeyCode { * KEYCODE_ADDRESSBOOK * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_ADDRESSBOOK = 2709, @@ -2222,7 +2488,8 @@ export declare enum KeyCode { * KEYCODE_MESSENGER * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MESSENGER = 2710, @@ -2230,7 +2497,8 @@ export declare enum KeyCode { * KEYCODE_BRIGHTNESS_TOGGLE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BRIGHTNESS_TOGGLE = 2711, @@ -2238,7 +2506,8 @@ export declare enum KeyCode { * KEYCODE_SPELLCHECK * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SPELLCHECK = 2712, @@ -2246,7 +2515,8 @@ export declare enum KeyCode { * KEYCODE_COFFEE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_COFFEE = 2713, @@ -2254,7 +2524,8 @@ export declare enum KeyCode { * KEYCODE_MEDIA_REPEAT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MEDIA_REPEAT = 2714, @@ -2262,7 +2533,8 @@ export declare enum KeyCode { * KEYCODE_IMAGES * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_IMAGES = 2715, @@ -2270,7 +2542,8 @@ export declare enum KeyCode { * KEYCODE_BUTTONCONFIG * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BUTTONCONFIG = 2716, @@ -2278,7 +2551,8 @@ export declare enum KeyCode { * KEYCODE_TASKMANAGER * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_TASKMANAGER = 2717, @@ -2286,7 +2560,8 @@ export declare enum KeyCode { * KEYCODE_JOURNAL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_JOURNAL = 2718, @@ -2294,7 +2569,8 @@ export declare enum KeyCode { * KEYCODE_CONTROLPANEL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_CONTROLPANEL = 2719, @@ -2302,7 +2578,8 @@ export declare enum KeyCode { * KEYCODE_APPSELECT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_APPSELECT = 2720, @@ -2310,7 +2587,8 @@ export declare enum KeyCode { * KEYCODE_SCREENSAVER * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SCREENSAVER = 2721, @@ -2318,7 +2596,8 @@ export declare enum KeyCode { * KEYCODE_ASSISTANT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_ASSISTANT = 2722, @@ -2326,7 +2605,8 @@ export declare enum KeyCode { * KEYCODE_KBD_LAYOUT_NEXT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_KBD_LAYOUT_NEXT = 2723, @@ -2334,7 +2614,8 @@ export declare enum KeyCode { * KEYCODE_BRIGHTNESS_MIN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BRIGHTNESS_MIN = 2724, @@ -2342,7 +2623,8 @@ export declare enum KeyCode { * KEYCODE_BRIGHTNESS_MAX * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BRIGHTNESS_MAX = 2725, @@ -2350,7 +2632,8 @@ export declare enum KeyCode { * Assist_Previous key, used to view historical inputs * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_KBDINPUTASSIST_PREV = 2726, @@ -2358,7 +2641,8 @@ export declare enum KeyCode { * Assist_Next key, used to view predictive inputs * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_KBDINPUTASSIST_NEXT = 2727, @@ -2366,7 +2650,8 @@ export declare enum KeyCode { * Assist_Previous_Group key, used to switch to the previous input method in the input group * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_KBDINPUTASSIST_PREVGROUP = 2728, @@ -2374,7 +2659,8 @@ export declare enum KeyCode { * Assist_Next_Group key, used to switch to the next input method in the input group * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_KBDINPUTASSIST_NEXTGROUP = 2729, @@ -2382,7 +2668,8 @@ export declare enum KeyCode { * KEYCODE_KBDINPUTASSIST_ACCEPT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_KBDINPUTASSIST_ACCEPT = 2730, @@ -2390,7 +2677,8 @@ export declare enum KeyCode { * KEYCODE_KBDINPUTASSIST_CANCEL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_KBDINPUTASSIST_CANCEL = 2731, @@ -2398,7 +2686,8 @@ export declare enum KeyCode { * KEYCODE_FRONT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_FRONT = 2800, @@ -2406,7 +2695,8 @@ export declare enum KeyCode { * KEYCODE_SETUP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SETUP = 2801, @@ -2414,7 +2704,8 @@ export declare enum KeyCode { * KEYCODE_WAKEUP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_WAKEUP = 2802, @@ -2422,7 +2713,8 @@ export declare enum KeyCode { * KEYCODE_SENDFILE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SENDFILE = 2803, @@ -2430,7 +2722,8 @@ export declare enum KeyCode { * KEYCODE_DELETEFILE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_DELETEFILE = 2804, @@ -2438,7 +2731,8 @@ export declare enum KeyCode { * KEYCODE_XFER * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_XFER = 2805, @@ -2446,7 +2740,8 @@ export declare enum KeyCode { * KEYCODE_PROG1 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_PROG1 = 2806, @@ -2454,7 +2749,8 @@ export declare enum KeyCode { * KEYCODE_PROG2 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_PROG2 = 2807, @@ -2462,7 +2758,8 @@ export declare enum KeyCode { * KEYCODE_MSDOS * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MSDOS = 2808, @@ -2470,7 +2767,8 @@ export declare enum KeyCode { * KEYCODE_SCREENLOCK * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SCREENLOCK = 2809, @@ -2478,7 +2776,8 @@ export declare enum KeyCode { * KEYCODE_DIRECTION_ROTATE_DISPLAY * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_DIRECTION_ROTATE_DISPLAY = 2810, @@ -2486,7 +2785,8 @@ export declare enum KeyCode { * KEYCODE_CYCLEWINDOWS * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_CYCLEWINDOWS = 2811, @@ -2494,7 +2794,8 @@ export declare enum KeyCode { * KEYCODE_COMPUTER * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_COMPUTER = 2812, @@ -2502,7 +2803,8 @@ export declare enum KeyCode { * KEYCODE_EJECTCLOSECD * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_EJECTCLOSECD = 2813, @@ -2510,7 +2812,8 @@ export declare enum KeyCode { * KEYCODE_ISO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_ISO = 2814, @@ -2518,7 +2821,8 @@ export declare enum KeyCode { * KEYCODE_MOVE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_MOVE = 2815, @@ -2526,7 +2830,8 @@ export declare enum KeyCode { * KEYCODE_F13 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F13 = 2816, @@ -2534,7 +2839,8 @@ export declare enum KeyCode { * KEYCODE_F14 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F14 = 2817, @@ -2542,7 +2848,8 @@ export declare enum KeyCode { * KEYCODE_F15 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F15 = 2818, @@ -2550,7 +2857,8 @@ export declare enum KeyCode { * KEYCODE_F16 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F16 = 2819, @@ -2558,7 +2866,8 @@ export declare enum KeyCode { * KEYCODE_F17 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F17 = 2820, @@ -2566,7 +2875,8 @@ export declare enum KeyCode { * KEYCODE_F18 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F18 = 2821, @@ -2574,7 +2884,8 @@ export declare enum KeyCode { * KEYCODE_F19 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F19 = 2822, @@ -2582,7 +2893,8 @@ export declare enum KeyCode { * KEYCODE_F20 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F20 = 2823, @@ -2590,7 +2902,8 @@ export declare enum KeyCode { * KEYCODE_F21 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F21 = 2824, @@ -2598,7 +2911,8 @@ export declare enum KeyCode { * KEYCODE_F22 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F22 = 2825, @@ -2606,7 +2920,8 @@ export declare enum KeyCode { * KEYCODE_F23 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F23 = 2826, @@ -2614,7 +2929,8 @@ export declare enum KeyCode { * KEYCODE_F24 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_F24 = 2827, @@ -2622,7 +2938,8 @@ export declare enum KeyCode { * KEYCODE_PROG3 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_PROG3 = 2828, @@ -2630,7 +2947,8 @@ export declare enum KeyCode { * KEYCODE_PROG4 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_PROG4 = 2829, @@ -2638,7 +2956,8 @@ export declare enum KeyCode { * KEYCODE_DASHBOARD * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_DASHBOARD = 2830, @@ -2646,7 +2965,8 @@ export declare enum KeyCode { * KEYCODE_SUSPEND * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SUSPEND = 2831, @@ -2654,7 +2974,8 @@ export declare enum KeyCode { * KEYCODE_HP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_HP = 2832, @@ -2662,7 +2983,8 @@ export declare enum KeyCode { * KEYCODE_SOUND * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SOUND = 2833, @@ -2670,7 +2992,8 @@ export declare enum KeyCode { * KEYCODE_QUESTION * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_QUESTION = 2834, @@ -2678,7 +3001,8 @@ export declare enum KeyCode { * KEYCODE_CONNECT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_CONNECT = 2836, @@ -2686,7 +3010,8 @@ export declare enum KeyCode { * KEYCODE_SPORT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SPORT = 2837, @@ -2694,7 +3019,8 @@ export declare enum KeyCode { * KEYCODE_SHOP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SHOP = 2838, @@ -2702,7 +3028,8 @@ export declare enum KeyCode { * KEYCODE_ALTERASE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_ALTERASE = 2839, @@ -2710,7 +3037,8 @@ export declare enum KeyCode { * KEYCODE_SWITCHVIDEOMODE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_SWITCHVIDEOMODE = 2841, @@ -2718,7 +3046,8 @@ export declare enum KeyCode { * KEYCODE_BATTERY * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BATTERY = 2842, @@ -2726,7 +3055,8 @@ export declare enum KeyCode { * KEYCODE_BLUETOOTH * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BLUETOOTH = 2843, @@ -2734,7 +3064,8 @@ export declare enum KeyCode { * KEYCODE_WLAN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_WLAN = 2844, @@ -2742,7 +3073,8 @@ export declare enum KeyCode { * KEYCODE_UWB * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_UWB = 2845, @@ -2750,7 +3082,8 @@ export declare enum KeyCode { * KEYCODE_WWAN_WIMAX * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_WWAN_WIMAX = 2846, @@ -2758,7 +3091,8 @@ export declare enum KeyCode { * KEYCODE_RFKILL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_RFKILL = 2847, @@ -2766,7 +3100,8 @@ export declare enum KeyCode { * KEYCODE_CHANNEL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_CHANNEL = 3001, @@ -2774,7 +3109,8 @@ export declare enum KeyCode { * KEYCODE_BTN_0 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BTN_0 = 3100, @@ -2782,7 +3118,8 @@ export declare enum KeyCode { * KEYCODE_BTN_1 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BTN_1 = 3101, @@ -2790,7 +3127,8 @@ export declare enum KeyCode { * KEYCODE_BTN_2 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BTN_2 = 3102, @@ -2798,7 +3136,8 @@ export declare enum KeyCode { * KEYCODE_BTN_3 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BTN_3 = 3103, @@ -2806,7 +3145,8 @@ export declare enum KeyCode { * KEYCODE_BTN_4 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BTN_4 = 3104, @@ -2814,7 +3154,8 @@ export declare enum KeyCode { * KEYCODE_BTN_5 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BTN_5 = 3105, @@ -2822,7 +3163,8 @@ export declare enum KeyCode { * KEYCODE_BTN_6 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BTN_6 = 3106, @@ -2830,7 +3172,8 @@ export declare enum KeyCode { * KEYCODE_BTN_7 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BTN_7 = 3107, @@ -2838,7 +3181,8 @@ export declare enum KeyCode { * KEYCODE_BTN_8 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BTN_8 = 3108, @@ -2846,7 +3190,8 @@ export declare enum KeyCode { * KEYCODE_BTN_9 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_BTN_9 = 3109, @@ -2854,7 +3199,8 @@ export declare enum KeyCode { * KEYCODE_DAGGER_CLICK * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_DAGGER_CLICK = 3211, @@ -2862,7 +3208,8 @@ export declare enum KeyCode { * KEYCODE_DAGGER_DOUBLE_CLICK * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_DAGGER_DOUBLE_CLICK = 3212, @@ -2870,7 +3217,8 @@ export declare enum KeyCode { * KEYCODE_DAGGER_LONG_PRESS * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ KEYCODE_DAGGER_LONG_PRESS = 3213, diff --git a/api/@ohos.multimodalInput.keyEvent.d.ts b/api/@ohos.multimodalInput.keyEvent.d.ts index da04f64ae4..8af4c06928 100644 --- a/api/@ohos.multimodalInput.keyEvent.d.ts +++ b/api/@ohos.multimodalInput.keyEvent.d.ts @@ -26,6 +26,7 @@ import type { KeyCode } from './@ohos.multimodalInput.keyCode'; * @enum { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ /** * Action @@ -41,6 +42,7 @@ export declare enum Action { * * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ /** * Cancel key @@ -56,6 +58,7 @@ export declare enum Action { * * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ /** * Down key @@ -71,6 +74,7 @@ export declare enum Action { * * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ /** * Up key @@ -88,6 +92,7 @@ export declare enum Action { * @interface Key * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ /** * Key @@ -103,6 +108,7 @@ export declare interface Key { * @type { KeyCode } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ /** * Key code @@ -118,30 +124,32 @@ export declare interface Key { * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ /** * Time when the key is pressed - * @type { number } + * @type { long } * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice * @since 12 */ - pressedTime: number; + pressedTime: long; /** * Device to which the key belongs * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ /** * Device to which the key belongs - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice * @since 12 */ - deviceId: number; + deviceId: int; } /** @@ -150,6 +158,7 @@ export declare interface Key { * @interface KeyEvent * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ /** * KeyEvent @@ -166,6 +175,7 @@ export declare interface KeyEvent extends InputEvent { * @type { Action } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ /** * Key action @@ -181,6 +191,7 @@ export declare interface KeyEvent extends InputEvent { * @type { Key } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ /** * Key that has changed @@ -196,21 +207,23 @@ export declare interface KeyEvent extends InputEvent { * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ /** * Unicode character corresponding to the key - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice * @since 12 */ - unicodeChar: number; + unicodeChar: int; /** * List of pressed keys * @type { Key[] } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ /** * List of pressed keys @@ -226,6 +239,7 @@ export declare interface KeyEvent extends InputEvent { * @type { boolean } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ /** * Whether ctrlKey is being pressed @@ -241,6 +255,7 @@ export declare interface KeyEvent extends InputEvent { * @type { boolean } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ /** * Whether altKey is being pressed @@ -256,6 +271,7 @@ export declare interface KeyEvent extends InputEvent { * @type { boolean } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ /** * Whether shiftKey is being pressed @@ -271,6 +287,7 @@ export declare interface KeyEvent extends InputEvent { * @type { boolean } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ /** * Whether logoKey is being pressed @@ -286,6 +303,7 @@ export declare interface KeyEvent extends InputEvent { * @type { boolean } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ /** * Whether fnKey is being pressed @@ -301,6 +319,7 @@ export declare interface KeyEvent extends InputEvent { * @type { boolean } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ /** * Whether capsLock is active @@ -316,6 +335,7 @@ export declare interface KeyEvent extends InputEvent { * @type { boolean } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ /** * Whether numLock is active @@ -331,6 +351,7 @@ export declare interface KeyEvent extends InputEvent { * @type { boolean } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ /** * Whether scrollLock is active diff --git a/api/@ohos.multimodalInput.mouseEvent.d.ts b/api/@ohos.multimodalInput.mouseEvent.d.ts index 29c7d1936b..8ca45f9410 100644 --- a/api/@ohos.multimodalInput.mouseEvent.d.ts +++ b/api/@ohos.multimodalInput.mouseEvent.d.ts @@ -226,11 +226,11 @@ export declare interface AxisValue { /** * Axis value - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - value: number; + value: int; } /** @@ -293,52 +293,52 @@ export declare interface MouseEvent extends InputEvent { /** * X coordinate of the mouse pointer on the screen - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - screenX: number; + screenX: int; /** * Y coordinate of the mouse pointer on the screen - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - screenY: number; + screenY: int; /** * X coordinate of the mouse pointer in the window - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - windowX: number; + windowX: int; /** * Y coordinate of the mouse pointer in the window - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - windowY: number; + windowY: int; /** * X axis offset relative to the previous reported mouse pointer position. When the mouse pointer is at * the edge of the screen, the value may be less than the difference of the X coordinate reported twice. - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - rawDeltaX: number; + rawDeltaX: int; /** * Y axis offset relative to the previous reported mouse pointer position - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - rawDeltaY: number; + rawDeltaY: int; /** * Button that is currently pressed or released @@ -369,6 +369,7 @@ export declare interface MouseEvent extends InputEvent { * @type { KeyCode[] } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 + * @since 9 */ pressedKeys: KeyCode[]; diff --git a/api/@ohos.multimodalInput.pointer.d.ts b/api/@ohos.multimodalInput.pointer.d.ts index 0491653da2..932df2bb71 100644 --- a/api/@ohos.multimodalInput.pointer.d.ts +++ b/api/@ohos.multimodalInput.pointer.d.ts @@ -489,21 +489,24 @@ declare namespace pointer { * * @enum { number } * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ enum PrimaryButton { /** * Left mouse button * * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ LEFT = 0, /** * Right mouse button * * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ RIGHT = 1 } @@ -513,28 +516,32 @@ declare namespace pointer { * * @enum { number } * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ enum RightClickType { /** * Tapping the right-button area of the touchpad. * * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ TOUCHPAD_RIGHT_BUTTON = 1, /** * Tapping the left-button area of the touchpad. * * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ TOUCHPAD_LEFT_BUTTON = 2, /** * Tapping or pressing the touchpad with two fingers. * * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ TOUCHPAD_TWO_FINGER_TAP = 3, /** @@ -595,7 +602,8 @@ declare namespace pointer { * * @interface CursorConfig * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ interface CursorConfig { /** @@ -605,7 +613,8 @@ declare namespace pointer { * * @type { boolean } * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ followSystem : boolean; } @@ -731,7 +740,7 @@ declare namespace pointer { /** * Sets the mouse pointer style. This API uses an asynchronous callback to return the result. * - * @param { number } windowId - Window ID. + * @param { int } windowId - Window ID. * @param { PointerStyle } pointerStyle - Pointer style. * @param { AsyncCallback } callback - Callback used to return the result. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; @@ -740,12 +749,12 @@ declare namespace pointer { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function setPointerStyle(windowId: number, pointerStyle: PointerStyle, callback: AsyncCallback): void; + function setPointerStyle(windowId: int, pointerStyle: PointerStyle, callback: AsyncCallback): void; /** * Sets the mouse pointer style. This API uses a promise to return the result. * - * @param { number } windowId - Window ID. + * @param { int } windowId - Window ID. * @param { PointerStyle } pointerStyle - Pointer style. * @returns { Promise } Promise that returns no value. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; @@ -754,19 +763,20 @@ declare namespace pointer { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function setPointerStyle(windowId: number, pointerStyle: PointerStyle): Promise; + function setPointerStyle(windowId: int, pointerStyle: PointerStyle): Promise; /** * Sets the mouse pointer style. This API returns the result synchronously. * - * @param { number } windowId - Window ID. + * @param { int } windowId - Window ID. * @param { PointerStyle } pointerStyle - Pointer style. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - function setPointerStyleSync(windowId: number, pointerStyle: PointerStyle): void; + function setPointerStyleSync(windowId: int, pointerStyle: PointerStyle): void; /** * Obtains the mouse pointer style. This API uses an asynchronous callback to return the result. @@ -802,9 +812,10 @@ declare namespace pointer { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ - function getPointerStyleSync(windowId: number): PointerStyle; + function getPointerStyleSync(windowId: int): PointerStyle; /** * Sets the visible status of the mouse pointer. This API uses an asynchronous callback to return the result. diff --git a/api/@ohos.multimodalInput.shortKey.d.ts b/api/@ohos.multimodalInput.shortKey.d.ts index d9436672cf..e906e19254 100644 --- a/api/@ohos.multimodalInput.shortKey.d.ts +++ b/api/@ohos.multimodalInput.shortKey.d.ts @@ -74,7 +74,8 @@ export default shortKey; * @enum { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export declare enum FingerprintAction { /** @@ -82,7 +83,8 @@ export declare enum FingerprintAction { * * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ DOWN = 0, @@ -91,7 +93,8 @@ export declare enum FingerprintAction { * * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ UP = 1, @@ -100,7 +103,8 @@ export declare enum FingerprintAction { * * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ SLIDE = 2, @@ -109,7 +113,8 @@ export declare enum FingerprintAction { * * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ RETOUCH = 3, @@ -118,7 +123,8 @@ export declare enum FingerprintAction { * * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ CLICK = 4, } @@ -129,7 +135,8 @@ export declare enum FingerprintAction { * @interface FingerprintEvent * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export declare interface FingerprintEvent { /** @@ -138,7 +145,8 @@ export declare interface FingerprintEvent { * @type { FingerprintAction } * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ action: FingerprintAction; @@ -152,12 +160,13 @@ export declare interface FingerprintEvent { * and the horizontal rightward direction stands for the positive direction of the X axis. * This way, a rectangular coordinate system is constructed. * - * @type { number } + * @type { double } * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - distanceX: number; + distanceX: double; /** * This value indicates the sliding percentage of the fingerprint key on the Y axis, @@ -169,10 +178,11 @@ export declare interface FingerprintEvent { * and the horizontal rightward direction stands for the positive direction of the X axis. * This way, a rectangular coordinate system is constructed. * - * @type { number } + * @type { double } * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - distanceY: number; + distanceY: double; } \ No newline at end of file diff --git a/api/@ohos.multimodalInput.touchEvent.d.ts b/api/@ohos.multimodalInput.touchEvent.d.ts index a7a66aeccb..19d1db2c56 100644 --- a/api/@ohos.multimodalInput.touchEvent.d.ts +++ b/api/@ohos.multimodalInput.touchEvent.d.ts @@ -205,139 +205,139 @@ export declare enum FixedMode { export declare interface Touch { /** * Pointer identifier - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - id: number; + id: int; /** * Time stamp when touch is pressed - * @type { number } + * @type { long } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - pressedTime: number; + pressedTime: long; /** * X coordinate of the touch position on the screen - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - screenX: number; + screenX: int; /** * Y coordinate of the touch position on the screen - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - screenY: number; + screenY: int; /** * X coordinate of the touch position in the window - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - windowX: number; + windowX: int; /** * Y coordinate of the touch position in the window - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - windowY: number; + windowY: int; /** * Pressure value. The value range is [0.0, 1.0]. The value 0.0 indicates that the pressure is not supported. - * @type { number } + * @type { double } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - pressure: number; + pressure: double; /** * Width of the contact area when touch is pressed - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - width: number; + width: int; /** * Height of the contact area when touch is pressed - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - height: number; + height: int; /** * Angle relative to the YZ plane. The value range is [-90, 90]. A positive value indicates a rightward tilt. - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - tiltX: number; + tiltX: int; /** * Angle relative to the XZ plane. The value range is [-90, 90]. A positive value indicates a downward tilt. - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - tiltY: number; + tiltY: int; /** * Center point X of the tool area - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - toolX: number; + toolX: int; /** * Center point Y of the tool area - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - toolY: number; + toolY: int; /** * Width of the tool area - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - toolWidth: number; + toolWidth: int; /** * Height of the tool area - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - toolHeight: number; + toolHeight: int; /** * X coordinate of the input device - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - rawX: number; + rawX: int; /** * Y coordinate of the input device - * @type { number } + * @type { int } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - rawY: number; + rawY: int; /** * Tool type @@ -349,21 +349,21 @@ export declare interface Touch { /** * fixedDisplayX - Corrected value of the screen x coordinate. - * @type { number } + * @type { ?int } * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. * @since 19 */ - fixedDisplayX?: number; + fixedDisplayX?: int; /** * fixedDisplayY - Corrected value of the screen y coordinate. - * @type { number } + * @type { ?int } * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. * @since 19 */ - fixedDisplayY?: number; + fixedDisplayY?: int; } /** diff --git a/api/@ohos.nfc.tag.d.ts b/api/@ohos.nfc.tag.d.ts index da104445a2..034cbe3a37 100644 --- a/api/@ohos.nfc.tag.d.ts +++ b/api/@ohos.nfc.tag.d.ts @@ -29,7 +29,9 @@ import { } from './tag/nfctech'; import { NdefMessage as _NdefMessage } from './tag/nfctech'; import { TagSession as _TagSession } from './tag/tagSession'; +/*** if arkts 1.1 */ import type { PacMap } from './ability/dataAbilityHelper'; +/*** endif */ import type rpc from './@ohos.rpc'; import type { AsyncCallback } from './@ohos.base'; import Want from './@ohos.app.ability.Want'; diff --git a/api/@ohos.notificationManager.d.ts b/api/@ohos.notificationManager.d.ts index 0e42bac075..ebaa42f2ef 100644 --- a/api/@ohos.notificationManager.d.ts +++ b/api/@ohos.notificationManager.d.ts @@ -393,7 +393,8 @@ declare namespace notificationManager { * @throws { BusinessError } 2300007 - Network unreachable. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function publishAsBundle( request: NotificationRequest, @@ -429,7 +430,8 @@ declare namespace notificationManager { * @throws { BusinessError } 2300007 - Network unreachable. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function publishAsBundle(request: NotificationRequest, representativeBundle: string, userId: number): Promise; @@ -459,7 +461,8 @@ declare namespace notificationManager { * @throws { BusinessError } 2300007 - Network unreachable. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function publishAsBundle(representativeBundle: BundleOption, request: NotificationRequest): Promise; @@ -569,7 +572,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function cancelAsBundle( id: number, @@ -598,7 +602,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function cancelAsBundle(id: number, representativeBundle: string, userId: number): Promise; @@ -622,7 +627,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function cancelAsBundle(representativeBundle: BundleOption, id: number): Promise; @@ -692,7 +698,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function addSlot(slot: NotificationSlot, callback: AsyncCallback): void; @@ -712,7 +719,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function addSlot(slot: NotificationSlot): Promise; @@ -728,7 +736,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function addSlot(type: SlotType, callback: AsyncCallback): void; @@ -744,7 +753,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function addSlot(type: SlotType): Promise; @@ -764,7 +774,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function addSlots(slots: Array, callback: AsyncCallback): void; @@ -784,7 +795,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function addSlots(slots: Array): Promise; @@ -800,7 +812,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSlot(slotType: SlotType, callback: AsyncCallback): void; @@ -815,7 +828,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSlot(slotType: SlotType): Promise; @@ -830,7 +844,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSlots(callback: AsyncCallback>): void; @@ -842,7 +857,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSlots(): Promise>; @@ -858,7 +874,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllNotificationEnabledBundles(): Promise>; @@ -873,7 +890,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeSlot(slotType: SlotType, callback: AsyncCallback): void; @@ -888,7 +906,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeSlot(slotType: SlotType): Promise; @@ -903,7 +922,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeAllSlots(callback: AsyncCallback): void; @@ -915,7 +935,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeAllSlots(): Promise; @@ -1100,7 +1121,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function isNotificationEnabledSync(): boolean; @@ -1341,7 +1363,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setSlotByBundle(bundle: BundleOption, slot: NotificationSlot, callback: AsyncCallback): void; @@ -1382,7 +1405,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setSlotByBundle(bundle: BundleOption, slot: NotificationSlot): Promise; @@ -1464,7 +1488,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSlotByBundle(bundle: BundleOption, slotType: SlotType): Promise; @@ -1542,7 +1567,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSlotNumByBundle(bundle: BundleOption, callback: AsyncCallback): void; @@ -1581,7 +1607,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSlotNumByBundle(bundle: BundleOption): Promise; @@ -1632,7 +1659,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getActiveNotificationCount(callback: AsyncCallback): void; @@ -1689,7 +1717,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getActiveNotificationByFilter(filter: NotificationFilter, callback: AsyncCallback): void; @@ -1706,7 +1735,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getActiveNotificationByFilter(filter: NotificationFilter): Promise; @@ -1722,7 +1752,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function cancelGroup(groupName: string, callback: AsyncCallback): void; @@ -1737,7 +1768,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function cancelGroup(groupName: string): Promise; @@ -1758,7 +1790,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeGroupByBundle(bundle: BundleOption, groupName: string, callback: AsyncCallback): void; @@ -1779,7 +1812,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeGroupByBundle(bundle: BundleOption, groupName: string): Promise; @@ -1818,7 +1852,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDoNotDisturbDate(date: DoNotDisturbDate, callback: AsyncCallback): void; @@ -1857,7 +1892,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDoNotDisturbDate(date: DoNotDisturbDate): Promise; @@ -1900,7 +1936,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDoNotDisturbDate(date: DoNotDisturbDate, userId: number, callback: AsyncCallback): void; @@ -1943,7 +1980,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDoNotDisturbDate(date: DoNotDisturbDate, userId: number): Promise; @@ -1980,7 +2018,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDoNotDisturbDate(callback: AsyncCallback): void; @@ -2013,7 +2052,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDoNotDisturbDate(): Promise; @@ -2054,7 +2094,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDoNotDisturbDate(userId: number, callback: AsyncCallback): void; @@ -2095,7 +2136,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDoNotDisturbDate(userId: number): Promise; @@ -2115,7 +2157,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isSupportDoNotDisturbMode(callback: AsyncCallback): void; @@ -2132,7 +2175,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isSupportDoNotDisturbMode(): Promise; @@ -2148,7 +2192,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isSupportTemplate(templateName: string, callback: AsyncCallback): void; @@ -2163,7 +2208,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isSupportTemplate(templateName: string): Promise; @@ -2396,7 +2442,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600010 - Distributed operation failed. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDistributedEnable(enable: boolean, callback: AsyncCallback): void; @@ -2435,7 +2482,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600010 - Distributed operation failed. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDistributedEnable(enable: boolean): Promise; @@ -2450,7 +2498,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @throws { BusinessError } 1600010 - Distributed operation failed. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isDistributedEnabled(callback: AsyncCallback): void; @@ -2463,7 +2512,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @throws { BusinessError } 1600010 - Distributed operation failed. * @syscap SystemCapability.Notification.Notification - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isDistributedEnabled(): Promise; @@ -2506,7 +2556,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDistributedEnableByBundle(bundle: BundleOption, enable: boolean, callback: AsyncCallback): void; @@ -2549,7 +2600,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDistributedEnableByBundle(bundle: BundleOption, enable: boolean): Promise; @@ -2596,7 +2648,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setDistributedEnabledByBundle(bundle: BundleOption, deviceType: string, enable: boolean): Promise; @@ -2639,7 +2692,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function isDistributedEnabledByBundle(bundle: BundleOption, callback: AsyncCallback): void; @@ -2680,7 +2734,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function isDistributedEnabledByBundle(bundle: BundleOption): Promise; @@ -2725,7 +2780,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function isDistributedEnabledByBundle(bundle: BundleOption, deviceType: string): Promise; @@ -2770,7 +2826,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setSmartReminderEnabled(deviceType: string, enable: boolean): Promise; @@ -2813,7 +2870,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function isSmartReminderEnabled(deviceType: string): Promise; @@ -2848,7 +2906,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDeviceRemindType(callback: AsyncCallback): void; @@ -2879,7 +2938,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDeviceRemindType(): Promise; @@ -3196,7 +3256,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600008 - The user does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setSyncNotificationEnabledWithoutApp(userId: number, enable: boolean, callback: AsyncCallback): void; @@ -3237,7 +3298,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600008 - The user does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setSyncNotificationEnabledWithoutApp(userId: number, enable: boolean): Promise; @@ -3257,7 +3319,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600008 - The user does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSyncNotificationEnabledWithoutApp(userId: number, callback: AsyncCallback): void; @@ -3277,7 +3340,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600008 - The user does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSyncNotificationEnabledWithoutApp(userId: number): Promise; @@ -3330,7 +3394,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setBadgeNumber(badgeNumber: number, callback: AsyncCallback): void; @@ -3380,7 +3445,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setBadgeNumber(badgeNumber: number): Promise; @@ -3421,7 +3487,8 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setBadgeNumberByBundle(bundle: BundleOption, badgeNumber: number): Promise; @@ -3451,7 +3518,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600001 - Internal error. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'checkNotification', callback: (checkInfo: NotificationCheckInfo) => NotificationCheckResult): void; @@ -3489,7 +3557,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'checkNotification', checkRequest: NotificationCheckRequest, callback: (checkInfo: NotificationCheckInfo) => Promise): void; @@ -3520,7 +3589,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600001 - Internal error. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function off( type: 'checkNotification', @@ -3812,7 +3882,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setAdditionalConfig(key: string, value: string): Promise; @@ -3841,7 +3912,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600018 - the notification settings window is already displayed. * @syscap SystemCapability.Notification.NotificationSettings * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function openNotificationSettings(context: UIAbilityContext): Promise; @@ -3880,7 +3952,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600019 - The do-not-disturb profile does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getDoNotDisturbProfile(id: number): Promise; @@ -3897,7 +3970,8 @@ declare namespace notificationManager { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function setTargetDeviceStatus(deviceType: string, status: number): Promise; @@ -3916,7 +3990,8 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function disableNotificationFeature(disabled:boolean, bundleList: Array): Promise; @@ -3934,8 +4009,9 @@ declare namespace notificationManager { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 - */ + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ function setDistributedEnabledBySlot(slot: SlotType, deviceType: string, enabled: boolean): Promise; /** @@ -3951,8 +4027,9 @@ declare namespace notificationManager { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 18 - */ + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ function isDistributedEnabledBySlot(slot: SlotType, deviceType: string): Promise; /** @@ -3991,7 +4068,8 @@ declare namespace notificationManager { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onResponse?: (notificationId: number, buttonOptions: ButtonOptions) => void; } diff --git a/api/@ohos.notificationSubscribe.d.ts b/api/@ohos.notificationSubscribe.d.ts index dab12eddc5..0bacb21b7b 100644 --- a/api/@ohos.notificationSubscribe.d.ts +++ b/api/@ohos.notificationSubscribe.d.ts @@ -125,7 +125,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function subscribeSelf(subscriber: NotificationSubscriber): Promise; @@ -363,7 +364,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeAll(bundle: BundleOption, callback: AsyncCallback): void; @@ -381,7 +383,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeAll(callback: AsyncCallback): void; @@ -401,7 +404,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600008 - The user does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeAll(userId: number, callback: AsyncCallback): void; @@ -421,7 +425,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600008 - The user does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeAll(userId: number): Promise; @@ -441,7 +446,8 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function removeAll(bundle?: BundleOption): Promise; diff --git a/api/@ohos.print.d.ts b/api/@ohos.print.d.ts index da2ed40d14..cc3f94c296 100644 --- a/api/@ohos.print.d.ts +++ b/api/@ohos.print.d.ts @@ -28,6 +28,8 @@ import type Context from './application/Context'; * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace print { @@ -37,6 +39,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ interface PrintTask { /** @@ -49,6 +53,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'block', callback: Callback): void; @@ -62,6 +68,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'succeed', callback: Callback): void; @@ -75,6 +83,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'fail', callback: Callback): void; @@ -88,6 +98,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'cancel', callback: Callback): void; @@ -101,6 +113,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'block', callback?: Callback): void; @@ -114,6 +128,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'succeed', callback?: Callback): void; @@ -127,6 +143,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'fail', callback?: Callback): void; @@ -140,6 +158,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'cancel', callback?: Callback): void; } @@ -164,6 +184,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ interface PrintDocumentAdapter { /** @@ -179,6 +201,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ onStartLayoutWrite(jobId: string, oldAttrs: PrintAttributes, newAttrs: PrintAttributes, fd: int, writeResultCallback: PrinterWriteResultCallback): void; @@ -193,6 +217,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ onJobStateChanged(jobId: string, state: PrintDocumentAdapterState): void; } @@ -207,6 +233,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function print(files: Array, callback: AsyncCallback): void; @@ -220,6 +248,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function print(files: Array): Promise; @@ -234,6 +264,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function print(files: Array, context: Context, callback: AsyncCallback): void; @@ -248,6 +280,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function print(files: Array, context: Context): Promise; @@ -264,6 +298,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function print(jobName: string, printAdapter: PrintDocumentAdapter, printAttributes: PrintAttributes, context: Context): Promise; @@ -274,6 +310,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ interface PrintAttributes { /** @@ -282,6 +320,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ copyNumber?: int; @@ -291,6 +331,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ pageRange?: PrintPageRange; @@ -300,6 +342,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ pageSize?: PrintPageSize | PrintPageType; @@ -309,6 +353,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ directionMode?: PrintDirectionMode; @@ -318,6 +364,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ colorMode?: PrintColorMode; @@ -327,6 +375,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ duplexMode?: PrintDuplexMode; } @@ -337,6 +387,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ interface PrintPageRange { /** @@ -345,6 +397,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ startPage?: int; @@ -354,6 +408,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ endPage?: int; @@ -363,6 +419,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ pages?: Array; } @@ -374,6 +432,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ interface PrintMargin { /** @@ -383,6 +443,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ top?: int; @@ -393,6 +455,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ bottom?: int; @@ -403,6 +467,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ left?: int; @@ -413,6 +479,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ right?: int; } @@ -424,6 +492,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ interface PrinterRange { /** @@ -433,6 +503,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ startPage?: int; @@ -443,6 +515,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ endPage?: int; @@ -453,6 +527,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ pages?: Array; } @@ -464,6 +540,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ interface PreviewAttribute { /** @@ -473,6 +551,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ previewRange: PrinterRange; @@ -483,6 +563,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ result?: int; } @@ -494,6 +576,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ interface PrintResolution { /** @@ -503,6 +587,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ id: string; @@ -513,6 +599,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ horizontalDpi: int; @@ -523,6 +611,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ verticalDpi: int; } @@ -533,6 +623,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ interface PrintPageSize { /** @@ -541,6 +633,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ id: string; @@ -550,6 +644,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ name: string; @@ -559,6 +655,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ width: int; @@ -568,6 +666,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ height: int; } @@ -579,6 +679,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ interface PrinterCapability { /** @@ -588,6 +690,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ colorMode: int; @@ -598,6 +702,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ duplexMode: int; @@ -608,6 +714,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ pageSize: Array; @@ -618,6 +726,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ resolution?: Array; @@ -628,6 +738,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ minMargin?: PrintMargin; @@ -638,6 +750,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ options?: Object; } @@ -649,6 +763,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ interface PrinterInfo { /** @@ -658,6 +774,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ printerId: string; @@ -668,6 +786,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ printerName: string; @@ -678,6 +798,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ printerState: PrinterState; @@ -688,6 +810,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ printerIcon?: int; @@ -698,6 +822,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ description?: string; @@ -708,6 +834,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ capability?: PrinterCapability; @@ -718,6 +846,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ options?: Object; } @@ -729,6 +859,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ interface PrintJob { /** @@ -738,6 +870,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ fdList: Array; @@ -748,6 +882,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ jobId: string; @@ -758,6 +894,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ printerId: string; @@ -768,6 +906,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ jobState: PrintJobState; @@ -778,6 +918,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ jobSubstate: PrintJobSubState; @@ -788,6 +930,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ copyNumber: int; @@ -798,6 +942,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ pageRange: PrinterRange; @@ -808,6 +954,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ isSequential: boolean; @@ -818,6 +966,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ pageSize: PrintPageSize; @@ -828,6 +978,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ isLandscape: boolean; @@ -838,6 +990,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ colorMode: int; @@ -848,6 +1002,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ duplexMode: int; @@ -858,6 +1014,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ margin?: PrintMargin; @@ -868,6 +1026,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ preview?: PreviewAttribute; @@ -878,6 +1038,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ options?: Object; } @@ -888,6 +1050,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ enum PrintDirectionMode { /** @@ -895,6 +1059,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ DIRECTION_MODE_AUTO = 0, @@ -903,6 +1069,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ DIRECTION_MODE_PORTRAIT = 1, @@ -911,6 +1079,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ DIRECTION_MODE_LANDSCAPE = 2, } @@ -921,6 +1091,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ enum PrintColorMode { /** @@ -928,6 +1100,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ COLOR_MODE_MONOCHROME = 0, @@ -936,6 +1110,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ COLOR_MODE_COLOR = 1, } @@ -946,6 +1122,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ enum PrintDuplexMode { /** @@ -953,6 +1131,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ DUPLEX_MODE_NONE = 0, @@ -961,6 +1141,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ DUPLEX_MODE_LONG_EDGE = 1, @@ -969,6 +1151,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ DUPLEX_MODE_SHORT_EDGE = 2, } @@ -979,6 +1163,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ enum PrintPageType { /** @@ -986,6 +1172,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PAGE_ISO_A3 = 0, @@ -994,6 +1182,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PAGE_ISO_A4 = 1, @@ -1002,6 +1192,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PAGE_ISO_A5 = 2, @@ -1010,6 +1202,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PAGE_JIS_B5 = 3, @@ -1018,6 +1212,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PAGE_ISO_C5 = 4, @@ -1026,6 +1222,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PAGE_ISO_DL = 5, @@ -1034,6 +1232,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PAGE_LETTER = 6, @@ -1042,6 +1242,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PAGE_LEGAL = 7, @@ -1050,6 +1252,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PAGE_PHOTO_4X6 = 8, @@ -1058,6 +1262,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PAGE_PHOTO_5X7 = 9, @@ -1066,6 +1272,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PAGE_INT_DL_ENVELOPE = 10, @@ -1074,6 +1282,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PAGE_B_TABLOID = 11, } @@ -1084,6 +1294,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ enum PrintDocumentAdapterState { /** @@ -1091,6 +1303,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PREVIEW_DESTROY = 0, @@ -1099,6 +1313,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_TASK_SUCCEED = 1, @@ -1107,6 +1323,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_TASK_FAIL = 2, @@ -1115,6 +1333,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_TASK_CANCEL = 3, @@ -1123,6 +1343,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_TASK_BLOCK = 4, } @@ -1133,6 +1355,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ enum PrintFileCreationState { /** @@ -1140,6 +1364,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_FILE_CREATED = 0, @@ -1148,6 +1374,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_FILE_CREATION_FAILED = 1, @@ -1156,6 +1384,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_FILE_CREATED_UNRENDERED = 2, } @@ -1166,6 +1396,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enum PrinterState { /** @@ -1173,6 +1405,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINTER_ADDED = 0, @@ -1181,6 +1415,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINTER_REMOVED = 1, @@ -1189,6 +1425,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINTER_CAPABILITY_UPDATED = 2, @@ -1197,6 +1435,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINTER_CONNECTED = 3, @@ -1205,6 +1445,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINTER_DISCONNECTED = 4, @@ -1213,6 +1455,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINTER_RUNNING = 5, } @@ -1223,6 +1467,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enum PrintJobState { /** @@ -1230,6 +1476,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_PREPARE = 0, @@ -1238,6 +1486,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_QUEUED = 1, @@ -1246,6 +1496,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_RUNNING = 2, @@ -1254,6 +1506,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCKED = 3, @@ -1262,6 +1516,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_COMPLETED = 4, } @@ -1272,6 +1528,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enum PrintJobSubState { /** @@ -1279,6 +1537,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_COMPLETED_SUCCESS = 0, @@ -1287,6 +1547,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_COMPLETED_FAILED = 1, @@ -1295,6 +1557,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_COMPLETED_CANCELLED = 2, @@ -1303,6 +1567,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_COMPLETED_FILE_CORRUPTED = 3, @@ -1311,6 +1577,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_OFFLINE = 4, @@ -1319,6 +1587,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_BUSY = 5, @@ -1327,6 +1597,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_CANCELLED = 6, @@ -1335,6 +1607,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_OUT_OF_PAPER = 7, @@ -1343,6 +1617,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_OUT_OF_INK = 8, @@ -1351,6 +1627,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_OUT_OF_TONER = 9, @@ -1359,6 +1637,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_JAMMED = 10, @@ -1367,6 +1647,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_DOOR_OPEN = 11, @@ -1375,6 +1657,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_SERVICE_REQUEST = 12, @@ -1383,6 +1667,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_LOW_ON_INK = 13, @@ -1391,6 +1677,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_LOW_ON_TONER = 14, @@ -1399,6 +1687,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_REALLY_LOW_ON_INK = 15, @@ -1407,6 +1697,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_BAD_CERTIFICATE = 16, @@ -1415,6 +1707,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_ACCOUNT_ERROR = 18, @@ -1423,6 +1717,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_PRINT_PERMISSION_ERROR = 19, @@ -1431,6 +1727,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_PRINT_COLOR_PERMISSION_ERROR = 20, @@ -1439,6 +1737,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_NETWORK_ERROR = 21, @@ -1447,6 +1747,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_SERVER_CONNECTION_ERROR = 22, @@ -1455,6 +1757,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_LARGE_FILE_ERROR = 23, @@ -1463,6 +1767,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_FILE_PARSING_ERROR = 24, @@ -1471,6 +1777,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_SLOW_FILE_CONVERSION = 25, @@ -1479,6 +1787,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_RUNNING_UPLOADING_FILES = 26, @@ -1487,6 +1797,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_RUNNING_CONVERTING_FILES = 27, @@ -1503,6 +1815,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_UNKNOWN = 99, } @@ -1513,6 +1827,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enum PrintErrorCode { /** @@ -1520,6 +1836,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ E_PRINT_NONE = 0, @@ -1528,6 +1846,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ E_PRINT_NO_PERMISSION = 201, @@ -1536,6 +1856,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ E_PRINT_INVALID_PARAMETER = 401, @@ -1544,6 +1866,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ E_PRINT_GENERIC_FAILURE = 13100001, @@ -1552,6 +1876,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ E_PRINT_RPC_FAILURE = 13100002, @@ -1560,6 +1886,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ E_PRINT_SERVER_FAILURE = 13100003, @@ -1568,6 +1896,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ E_PRINT_INVALID_EXTENSION = 13100004, @@ -1576,6 +1906,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ E_PRINT_INVALID_PRINTER = 13100005, @@ -1584,6 +1916,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ E_PRINT_INVALID_PRINT_JOB = 13100006, @@ -1592,6 +1926,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ E_PRINT_FILE_IO = 13100007, @@ -1610,6 +1946,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enum ApplicationEvent { /** @@ -1617,6 +1955,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ APPLICATION_CREATED = 0, @@ -1625,6 +1965,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ APPLICATION_CLOSED_FOR_STARTED = 1, @@ -1633,6 +1975,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ APPLICATION_CLOSED_FOR_CANCELED = 2, } @@ -1644,6 +1988,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ interface PrinterExtensionInfo { /** @@ -1653,6 +1999,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ extensionId: string; @@ -1663,6 +2011,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ vendorId: string; @@ -1673,6 +2023,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ vendorName: string; @@ -1683,6 +2035,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ vendorIcon: int; @@ -1693,6 +2047,8 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ version: string; } @@ -1707,6 +2063,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function queryAllPrinterExtensionInfos(callback: AsyncCallback>): void; @@ -1720,6 +2078,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function queryAllPrinterExtensionInfos(): Promise>; @@ -1736,6 +2096,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function startDiscoverPrinter(extensionList: Array, callback: AsyncCallback): void; @@ -1752,6 +2114,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function startDiscoverPrinter(extensionList: Array): Promise; @@ -1765,6 +2129,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function stopDiscoverPrinter(callback: AsyncCallback): void; @@ -1778,6 +2144,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function stopDiscoverPrinter(): Promise; @@ -1793,6 +2161,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function connectPrinter(printerId: string, callback: AsyncCallback): void; @@ -1808,6 +2178,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function connectPrinter(printerId: string): Promise; @@ -1823,6 +2195,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function disconnectPrinter(printerId: string, callback: AsyncCallback): void; @@ -1838,6 +2212,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function disconnectPrinter(printerId: string): Promise; @@ -1853,6 +2229,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function queryPrinterCapability(printerId: string, callback: AsyncCallback): void; @@ -1868,6 +2246,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function queryPrinterCapability(printerId: string): Promise; @@ -1883,6 +2263,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function startPrintJob(jobInfo: PrintJob, callback: AsyncCallback): void; @@ -1898,6 +2280,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function startPrintJob(jobInfo: PrintJob): Promise; @@ -1913,6 +2297,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function cancelPrintJob(jobId: string, callback: AsyncCallback): void; @@ -1928,6 +2314,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function cancelPrintJob(jobId: string): Promise; @@ -1943,6 +2331,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function requestPrintPreview(jobInfo: PrintJob, callback: Callback): void; @@ -1958,6 +2348,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function requestPrintPreview(jobInfo: PrintJob): Promise; @@ -1973,6 +2365,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'printerStateChange', callback: (state: PrinterState, info: PrinterInfo) => void): void; @@ -1988,6 +2382,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'printerStateChange', callback?: Callback): void; @@ -2003,6 +2399,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'jobStateChange', callback: (state: PrintJobState, job: PrintJob) => void): void; @@ -2018,6 +2416,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'jobStateChange', callback?: Callback): void; @@ -2033,6 +2433,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'extInfoChange', callback: (extensionId: string, info: string) => void): void; @@ -2048,6 +2450,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'extInfoChange', callback?: Callback): void; @@ -2063,6 +2467,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function addPrinters(printers: Array, callback: AsyncCallback): void; @@ -2078,6 +2484,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function addPrinters(printers: Array): Promise; @@ -2093,6 +2501,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function removePrinters(printerIds: Array, callback: AsyncCallback): void; @@ -2108,6 +2518,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function removePrinters(printerIds: Array): Promise; @@ -2123,6 +2535,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function updatePrinters(printers: Array, callback: AsyncCallback): void; @@ -2138,6 +2552,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function updatePrinters(printers: Array): Promise; @@ -2154,6 +2570,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function updatePrinterState(printerId: string, state: PrinterState, callback: AsyncCallback): void; @@ -2170,6 +2588,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function updatePrinterState(printerId: string, state: PrinterState): Promise; @@ -2187,6 +2607,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function updatePrintJobState(jobId: string, state: PrintJobState, subState: PrintJobSubState, callback: AsyncCallback): void; @@ -2204,6 +2626,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function updatePrintJobState(jobId: string, state: PrintJobState, subState: PrintJobSubState): Promise; @@ -2219,6 +2643,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function updateExtensionInfo(info: string, callback: AsyncCallback): void; @@ -2234,6 +2660,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function updateExtensionInfo(info: string): Promise; @@ -2247,6 +2675,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 * @deprecated since 11 * @useinstead print#queryPrintJobList */ @@ -2262,6 +2692,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 * @deprecated since 11 * @useinstead print#queryPrintJobList */ @@ -2277,6 +2709,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function queryPrintJobList(callback: AsyncCallback>): void; @@ -2290,6 +2724,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function queryPrintJobList(): Promise>; @@ -2305,6 +2741,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function queryPrintJobById(jobId: string, callback: AsyncCallback): void; @@ -2320,6 +2758,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function queryPrintJobById(jobId: string): Promise; @@ -2337,6 +2777,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function startGettingPrintFile(jobId: string, printAttributes: PrintAttributes, fd: int, onFileStateChanged: Callback): void; @@ -2354,6 +2796,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function notifyPrintService(jobId: string, type: 'spooler_closed_for_cancelled' | 'spooler_closed_for_started', callback: AsyncCallback): void; @@ -2370,6 +2814,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function notifyPrintService(jobId: string, type: 'spooler_closed_for_cancelled' | 'spooler_closed_for_started'): Promise; @@ -2396,6 +2842,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'12','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function getPrinterInfoById(printerId: string): Promise; @@ -2411,6 +2859,8 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'12','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function notifyPrintServiceEvent(event: ApplicationEvent): Promise; @@ -2424,6 +2874,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ function addPrinterToDiscovery(printerInformation: PrinterInformation): Promise; @@ -2437,6 +2889,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ function updatePrinterInDiscovery(printerInformation: PrinterInformation): Promise; @@ -2450,6 +2904,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ function removePrinterFromDiscovery(printerId: string): Promise; @@ -2463,6 +2919,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ function getPrinterInformationById(printerId: string): Promise; @@ -2472,6 +2930,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ interface PrinterInformation { /** @@ -2480,6 +2940,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ printerId: string; @@ -2489,6 +2951,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ printerName: string; @@ -2498,6 +2962,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ printerStatus: PrinterStatus; @@ -2507,6 +2973,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ description?: string; @@ -2516,6 +2984,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ capability?: PrinterCapabilities; @@ -2525,6 +2995,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ uri?: string; @@ -2534,6 +3006,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ printerMake?: string; @@ -2561,6 +3035,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ options?: string; } @@ -2571,6 +3047,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ interface PrinterCapabilities { /** @@ -2579,6 +3057,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ supportedPageSizes: Array; @@ -2588,6 +3068,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ supportedColorModes: Array; @@ -2597,6 +3079,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ supportedDuplexModes: Array; @@ -2606,6 +3090,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ supportedMediaTypes?: Array; @@ -2615,6 +3101,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ supportedQualities?: Array; @@ -2624,6 +3112,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ supportedOrientations?: Array; @@ -2633,6 +3123,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ options?: string; } @@ -2643,6 +3135,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enum PrintQuality { /** @@ -2650,6 +3144,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ QUALITY_DRAFT = 3, @@ -2658,6 +3154,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ QUALITY_NORMAL = 4, @@ -2666,6 +3164,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ QUALITY_HIGH = 5, } @@ -2676,6 +3176,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enum PrintOrientationMode { /** @@ -2683,6 +3185,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ ORIENTATION_MODE_PORTRAIT = 0, @@ -2691,6 +3195,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ ORIENTATION_MODE_LANDSCAPE= 1, @@ -2699,6 +3205,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ ORIENTATION_MODE_REVERSE_LANDSCAPE = 2, @@ -2707,6 +3215,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ ORIENTATION_MODE_REVERSE_PORTRAIT = 3, @@ -2715,6 +3225,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ ORIENTATION_MODE_NONE = 4, } @@ -2725,6 +3237,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enum PrinterStatus { /** @@ -2732,6 +3246,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINTER_IDLE = 0, @@ -2740,6 +3256,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINTER_BUSY = 1, @@ -2748,6 +3266,8 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ PRINTER_UNAVAILABLE = 2, } diff --git a/api/@ohos.promptAction.d.ts b/api/@ohos.promptAction.d.ts index a8cb2fa5a4..5e48b75339 100644 --- a/api/@ohos.promptAction.d.ts +++ b/api/@ohos.promptAction.d.ts @@ -2272,6 +2272,7 @@ declare namespace promptAction { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ declare interface DismissDialogAction { /** @@ -2282,6 +2283,7 @@ declare interface DismissDialogAction { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ dismiss: Callback; @@ -2293,6 +2295,7 @@ declare interface DismissDialogAction { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ reason: DismissReason; } diff --git a/api/@ohos.resourceManager.d.ts b/api/@ohos.resourceManager.d.ts index b01f284d57..4253b1662b 100644 --- a/api/@ohos.resourceManager.d.ts +++ b/api/@ohos.resourceManager.d.ts @@ -2392,7 +2392,6 @@ declare namespace resourceManager { * @param { number } resId - Indicates the resource ID. * @param { (string | number)[] } args - Indicates the formatting string resource parameters. * @returns { string } The character string corresponding to the resource ID. - * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. * @throws { BusinessError } 9001001 - Invalid resource ID. * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. * @throws { BusinessError } 9001006 - The resource is referenced cyclically. @@ -2491,13 +2490,11 @@ declare namespace resourceManager { * @param { Resource } resource - Indicates the resource object. * @param { (string | number)[] } args - Indicates the formatting string resource parameters. * @returns { string } The character string corresponding to the resource object. - * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. * @throws { BusinessError } 9001001 - Invalid resource ID. * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. * @throws { BusinessError } 9001006 - The resource is referenced cyclically. * @throws { BusinessError } 9001007 - Failed to format the resource obtained based on the resource ID. * @syscap SystemCapability.Global.ResourceManager - * @stagemodelonly * @crossplatform * @atomicservice * @since 20 @@ -3203,7 +3200,6 @@ declare namespace resourceManager { * @throws { BusinessError } 9001006 - The resource is referenced cyclically. * @throws { BusinessError } 9001007 - Failed to format the resource obtained based on the resource ID. * @syscap SystemCapability.Global.ResourceManager - * @stagemodelonly * @crossplatform * @atomicservice * @since 20 @@ -3328,7 +3324,6 @@ declare namespace resourceManager { * @throws { BusinessError } 9001006 - The resource is referenced cyclically. * @throws { BusinessError } 9001007 - Failed to format the resource obtained based on the resource ID. * @syscap SystemCapability.Global.ResourceManager - * @stagemodelonly * @crossplatform * @atomicservice * @since 20 diff --git a/api/@ohos.resourceschedule.backgroundProcessManager.d.ts b/api/@ohos.resourceschedule.backgroundProcessManager.d.ts index f6ac1c537c..549ae5ed84 100644 --- a/api/@ohos.resourceschedule.backgroundProcessManager.d.ts +++ b/api/@ohos.resourceschedule.backgroundProcessManager.d.ts @@ -17,6 +17,7 @@ * @file * @kit BackgroundTasksKit * @arkts 1.1&1.2 + * @arkts 1.1&1.2 */ /** @@ -26,15 +27,20 @@ * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager * @since arkts{ '1.1':'17','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts{ '1.1':'17','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace backgroundProcessManager { /** * Describes the level of BackgroundProcessManager priority. * * @enum { int } + * @enum { int } * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager * @since arkts{ '1.1':'17','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts{ '1.1':'17','1.2':'20'} + * @arkts 1.1&1.2 */ export enum ProcessPriority { /** @@ -43,6 +49,8 @@ declare namespace backgroundProcessManager { * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager * @since arkts{ '1.1':'17','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts{ '1.1':'17','1.2':'20'} + * @arkts 1.1&1.2 */ PROCESS_BACKGROUND = 1, @@ -52,6 +60,8 @@ declare namespace backgroundProcessManager { * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager * @since arkts{ '1.1':'17','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts{ '1.1':'17','1.2':'20'} + * @arkts 1.1&1.2 */ PROCESS_INACTIVE = 2, } @@ -89,14 +99,18 @@ declare namespace backgroundProcessManager { * Set the priority of process. * * @param { int } pid - Indicates the pid of the process to be set. + * @param { int } pid - Indicates the pid of the process to be set. * @param { ProcessPriority } priority - Indicates the priority to set. Specific priority can be referenced ProcessPriority * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 401 - Parameter error. Possible causes: priority is out of range. * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager * @since arkts{ '1.1':'17','1.2':'20'} * @arkts 1.1&1.2 + * @since arkts{ '1.1':'17','1.2':'20'} + * @arkts 1.1&1.2 */ function setProcessPriority(pid: int, priority: ProcessPriority): Promise; + function setProcessPriority(pid: int, priority: ProcessPriority): Promise; /** * Reset the priority of process. diff --git a/api/@ohos.resourceschedule.backgroundTaskManager.d.ts b/api/@ohos.resourceschedule.backgroundTaskManager.d.ts index c5bb4124f4..eecc8c48e1 100644 --- a/api/@ohos.resourceschedule.backgroundTaskManager.d.ts +++ b/api/@ohos.resourceschedule.backgroundTaskManager.d.ts @@ -19,7 +19,12 @@ */ import { AsyncCallback, Callback } from './@ohos.base'; -import { WantAgent } from './@ohos.wantAgent'; +/*** if arkts 1.1 */ +import { WantAgent } from '@ohos.wantAgent'; +/*** endif */ +/*** if arkts 1.2 */ +import { WantAgent } from '@ohos.app.ability.wantAgent'; +/*** endif */ import Context from './application/BaseContext'; import type notificationManager from './@ohos.notificationManager'; @@ -36,7 +41,8 @@ import type notificationManager from './@ohos.notificationManager'; * @namespace backgroundTaskManager * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace backgroundTaskManager { /** @@ -44,7 +50,8 @@ declare namespace backgroundTaskManager { * * @interface DelaySuspendInfo * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ interface DelaySuspendInfo { /** @@ -52,7 +59,8 @@ declare namespace backgroundTaskManager { * * @type { number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ requestId: number; /** @@ -60,7 +68,8 @@ declare namespace backgroundTaskManager { * * @type { number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ actualDelayTime: number; } @@ -97,7 +106,8 @@ declare namespace backgroundTaskManager { * @interface ContinuousTaskNotification * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ContinuousTaskNotification { /** @@ -106,7 +116,8 @@ declare namespace backgroundTaskManager { * @type { notificationManager.SlotType } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ slotType: notificationManager.SlotType; /** @@ -115,7 +126,8 @@ declare namespace backgroundTaskManager { * @type { notificationManager.ContentType } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ contentType: notificationManager.ContentType; /** @@ -124,14 +136,16 @@ declare namespace backgroundTaskManager { * @type { number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ notificationId: number; /** * The continuous task id. * @type { ?number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ continuousTaskId?: number; } @@ -141,7 +155,8 @@ declare namespace backgroundTaskManager { * * @interface ContinuousTaskCancelInfo * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ interface ContinuousTaskCancelInfo { /** @@ -149,7 +164,8 @@ declare namespace backgroundTaskManager { * * @type { ContinuousTaskCancelReason } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ reason: ContinuousTaskCancelReason; @@ -158,7 +174,8 @@ declare namespace backgroundTaskManager { * * @type { number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ id: number; } @@ -399,7 +416,8 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 9900001 - Caller information verification failed for a transient task. * @throws { BusinessError } 9900002 - Transient task verification failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function cancelSuspendDelay(requestId: number): void; @@ -418,7 +436,8 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 9900001 - Caller information verification failed for a transient task. * @throws { BusinessError } 9900002 - Transient task verification failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getRemainingDelayTime(requestId: number, callback: AsyncCallback): void; @@ -437,7 +456,8 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 9900001 - Caller information verification failed for a transient task. * @throws { BusinessError } 9900002 - Transient task verification failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getRemainingDelayTime(requestId: number): Promise; @@ -457,7 +477,8 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 9900001 - Caller information verification failed for a transient task. * @throws { BusinessError } 9900002 - Transient task verification failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function requestSuspendDelay(reason: string, callback: Callback): DelaySuspendInfo; @@ -520,7 +541,8 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 9800007 - Continuous task storage failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function startBackgroundRunning(context: Context, bgMode: BackgroundMode, wantAgent: WantAgent, callback: AsyncCallback): void; @@ -570,7 +592,8 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 9800007 - Continuous task storage failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function startBackgroundRunning(context: Context, bgMode: BackgroundMode, wantAgent: WantAgent): Promise; @@ -596,7 +619,8 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 9800007 - Continuous task storage failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function startBackgroundRunning(context: Context, bgModes: string[], wantAgent: WantAgent): Promise; @@ -620,7 +644,8 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 9800007 - Continuous task storage failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function updateBackgroundRunning(context: Context, bgModes: string[]): Promise; @@ -657,7 +682,8 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 9800007 - Continuous task storage failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Service ability uses this method to request stop running in background. @@ -712,7 +738,8 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 9800007 - Continuous task storage failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ /** * Service ability uses this method to request stop running in background. @@ -766,7 +793,8 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 18700001 - Caller information verification failed for an energy resource request. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function applyEfficiencyResources(request: EfficiencyResourcesRequest): void; @@ -784,7 +812,8 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 18700001 - Caller information verification failed for an energy resource request. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function resetAllEfficiencyResources(): void; @@ -813,7 +842,8 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 401 - Parameter error. Possible cause: 1. Callback parameter error; *
    2. Register a exist callback type; 3. Parameter verification failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'continuousTaskCancel', callback: Callback): void; @@ -827,7 +857,8 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 401 - Parameter error. Possible cause: 1. Callback parameter error; *
    2. Unregister type has not register; 3. Parameter verification failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'continuousTaskCancel', callback?: Callback): void; @@ -896,14 +927,16 @@ declare namespace backgroundTaskManager { * @enum { number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export enum BackgroundMode { /** * data transfer mode * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ DATA_TRANSFER = 1, @@ -911,14 +944,16 @@ declare namespace backgroundTaskManager { * audio playback mode * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ /** * audio playback mode * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ AUDIO_PLAYBACK = 2, @@ -926,7 +961,8 @@ declare namespace backgroundTaskManager { * audio recording mode * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ AUDIO_RECORDING = 3, @@ -934,7 +970,8 @@ declare namespace backgroundTaskManager { * location mode * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ LOCATION = 4, @@ -942,7 +979,8 @@ declare namespace backgroundTaskManager { * bluetooth interaction mode * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ BLUETOOTH_INTERACTION = 5, @@ -957,7 +995,8 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ MULTI_DEVICE_CONNECTION = 6, @@ -966,7 +1005,8 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_INTERACTION = 7, @@ -974,7 +1014,8 @@ declare namespace backgroundTaskManager { * Voice over Internet Phone mode * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ VOIP = 8, @@ -983,7 +1024,8 @@ declare namespace backgroundTaskManager { * only supported in particular device * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TASK_KEEPING = 9, } @@ -994,7 +1036,8 @@ declare namespace backgroundTaskManager { * @enum { number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export enum ResourceType { /** @@ -1002,7 +1045,8 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ CPU = 1, @@ -1011,7 +1055,8 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ COMMON_EVENT = 1 << 1, @@ -1020,7 +1065,8 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ TIMER = 1 << 2, @@ -1029,7 +1075,8 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ WORK_SCHEDULER = 1 << 3, @@ -1038,7 +1085,8 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ BLUETOOTH = 1 << 4, @@ -1047,7 +1095,8 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ GPS = 1 << 5, @@ -1056,7 +1105,8 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ AUDIO = 1 << 6, @@ -1065,7 +1115,8 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ RUNNING_LOCK = 1 << 7, @@ -1074,7 +1125,8 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ SENSOR = 1 << 8 } @@ -1085,7 +1137,8 @@ declare namespace backgroundTaskManager { * @interface EfficiencyResourcesRequest * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export interface EfficiencyResourcesRequest { /** @@ -1094,7 +1147,8 @@ declare namespace backgroundTaskManager { * @type { number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ resourceTypes: number; @@ -1104,7 +1158,8 @@ declare namespace backgroundTaskManager { * @type { boolean } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ isApply: boolean; @@ -1114,7 +1169,8 @@ declare namespace backgroundTaskManager { * @type { number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ timeOut: number; @@ -1124,7 +1180,8 @@ declare namespace backgroundTaskManager { * @type { ?boolean } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ isPersist?: boolean; @@ -1134,7 +1191,8 @@ declare namespace backgroundTaskManager { * @type { ?boolean } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ isProcess?: boolean; @@ -1144,7 +1202,8 @@ declare namespace backgroundTaskManager { * @type { string } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ reason: string; } @@ -1154,28 +1213,32 @@ declare namespace backgroundTaskManager { * * @enum { number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ export enum ContinuousTaskCancelReason { /** * User cancel. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ USER_CANCEL = 1, /** * System cancel. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ SYSTEM_CANCEL = 2, /** * User remove notification. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ USER_CANCEL_REMOVE_NOTIFICATION = 3, @@ -1183,7 +1246,8 @@ declare namespace backgroundTaskManager { * Low network speed when request data transfer mode. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ SYSTEM_CANCEL_DATA_TRANSFER_LOW_SPEED = 4, @@ -1191,7 +1255,8 @@ declare namespace backgroundTaskManager { * Not use avsession when request audio playback mode. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ SYSTEM_CANCEL_AUDIO_PLAYBACK_NOT_USE_AVSESSION = 5, @@ -1199,7 +1264,8 @@ declare namespace backgroundTaskManager { * Audio is not running when request audio playback mode. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ SYSTEM_CANCEL_AUDIO_PLAYBACK_NOT_RUNNING = 6, @@ -1207,7 +1273,8 @@ declare namespace backgroundTaskManager { * Audio is not running when request audio recording mode. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ SYSTEM_CANCEL_AUDIO_RECORDING_NOT_RUNNING = 7, @@ -1215,7 +1282,8 @@ declare namespace backgroundTaskManager { * Not use location when request location mode. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ SYSTEM_CANCEL_NOT_USE_LOCATION = 8, @@ -1223,7 +1291,8 @@ declare namespace backgroundTaskManager { * Not use bluetooth when request bluetooth interaction mode. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ SYSTEM_CANCEL_NOT_USE_BLUETOOTH = 9, @@ -1231,7 +1300,8 @@ declare namespace backgroundTaskManager { * Not use multi device when request multi-device connection mode. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ SYSTEM_CANCEL_NOT_USE_MULTI_DEVICE = 10, @@ -1239,7 +1309,8 @@ declare namespace backgroundTaskManager { * Use some mode illegally. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 15 + * @since arkts {'1.1':'15','1.2':'20'} + * @arkts 1.1&1.2 */ SYSTEM_CANCEL_USE_ILLEGALLY = 11, } @@ -1249,14 +1320,16 @@ declare namespace backgroundTaskManager { * * @enum { number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ export enum BackgroundSubMode { /** * bluetooth car key mode * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ CAR_KEY = 1 } @@ -1266,14 +1339,16 @@ declare namespace backgroundTaskManager { * * @enum { string } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ export enum BackgroundModeType { /** * subMode type * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since 16 + * @since arkts {'1.1':'16','1.2':'20'} + * @arkts 1.1&1.2 */ SUB_MODE = 'subMode' } diff --git a/api/@ohos.resourceschedule.usageStatistics.d.ts b/api/@ohos.resourceschedule.usageStatistics.d.ts index c27d16e1fa..4f4ccd9ec1 100644 --- a/api/@ohos.resourceschedule.usageStatistics.d.ts +++ b/api/@ohos.resourceschedule.usageStatistics.d.ts @@ -31,14 +31,16 @@ import { AsyncCallback, Callback } from './@ohos.base'; * * @namespace usageStatistics * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ declare namespace usageStatistics { /** * @interface BundleStatsInfo * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ interface BundleStatsInfo { /** @@ -46,7 +48,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ id: number; @@ -55,7 +58,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ abilityInFgTotalTime?: number; @@ -64,7 +68,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ abilityPrevAccessTime?: number; @@ -73,7 +78,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ abilityPrevSeenTime?: number; @@ -82,7 +88,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ abilitySeenTotalTime?: number; @@ -91,7 +98,8 @@ declare namespace usageStatistics { * @type { ?string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ bundleName?: string; @@ -100,7 +108,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ fgAbilityAccessTotalTime?: number; @@ -109,7 +118,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ fgAbilityPrevAccessTime?: number; @@ -119,7 +129,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ infosBeginTime?: number; @@ -129,7 +140,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ infosEndTime?: number; @@ -138,7 +150,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 15 + * @since arkts{ '1.1':'15', '1.2':'20' } + * @arkts 1.1&1.2 */ appIndex?: number; } @@ -147,7 +160,8 @@ declare namespace usageStatistics { * @interface HapFormInfo * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ interface HapFormInfo { /** @@ -155,7 +169,8 @@ declare namespace usageStatistics { * @type { string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ formName: string; @@ -164,7 +179,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ formDimension: number; @@ -173,7 +189,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ formId: number; @@ -182,7 +199,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ formLastUsedTime: number; @@ -191,7 +209,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ count: number; } @@ -200,7 +219,8 @@ declare namespace usageStatistics { * @interface HapModuleInfo * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ interface HapModuleInfo { /** @@ -208,7 +228,8 @@ declare namespace usageStatistics { * @type { ?string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ deviceId?: string; @@ -217,7 +238,8 @@ declare namespace usageStatistics { * @type { string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ bundleName: string; @@ -226,7 +248,8 @@ declare namespace usageStatistics { * @type { string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ moduleName: string; @@ -235,7 +258,8 @@ declare namespace usageStatistics { * @type { ?string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ abilityName?: string; @@ -244,7 +268,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ appLabelId?: number; @@ -253,7 +278,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ labelId?: number; @@ -262,7 +288,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ descriptionId?: number; @@ -271,7 +298,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ abilityLableId?: number; @@ -280,7 +308,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ abilityDescriptionId?: number; @@ -289,7 +318,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ abilityIconId?: number; @@ -298,7 +328,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ launchedCount: number; @@ -307,7 +338,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ lastModuleUsedTime: number; @@ -316,7 +348,8 @@ declare namespace usageStatistics { * @type { Array } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ formRecords: Array; } @@ -325,7 +358,8 @@ declare namespace usageStatistics { * @interface DeviceEventStats * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ interface DeviceEventStats { /** @@ -333,7 +367,8 @@ declare namespace usageStatistics { * @type { string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ name: string; @@ -342,7 +377,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ eventId: number; @@ -351,7 +387,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ count: number; } @@ -360,7 +397,8 @@ declare namespace usageStatistics { * @interface BundleEvents * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ interface BundleEvents { /** @@ -368,7 +406,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ appGroup?: number; @@ -377,7 +416,8 @@ declare namespace usageStatistics { * @type { ?string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ bundleName?: string; @@ -386,7 +426,8 @@ declare namespace usageStatistics { * @type { ?string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ indexOfLink?: string; @@ -395,7 +436,8 @@ declare namespace usageStatistics { * @type { ?string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ nameOfClass?: string; @@ -404,7 +446,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ eventOccurredTime?: number; @@ -413,7 +456,8 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ eventId?: number; } @@ -422,7 +466,8 @@ declare namespace usageStatistics { * @interface AppGroupCallbackInfo * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ interface AppGroupCallbackInfo { /** @@ -430,7 +475,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ appOldGroup: number; @@ -439,7 +485,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ appNewGroup: number; @@ -448,7 +495,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ userId: number; @@ -457,7 +505,8 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ changeReason: number; @@ -466,7 +515,8 @@ declare namespace usageStatistics { * @type { string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ bundleName: string; } @@ -492,7 +542,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000006 - Failed to get the application information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function isIdleState(bundleName: string, callback: AsyncCallback): void; @@ -517,7 +568,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000006 - Failed to get the application information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function isIdleState(bundleName: string): Promise; @@ -542,7 +594,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000006 - Failed to get the application information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts{ '1.1':'10', '1.2':'20' } + * @arkts 1.1&1.2 */ function isIdleStateSync(bundleName: string): boolean; @@ -568,7 +621,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100002 - Failed to get the application group information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryAppGroup(callback: AsyncCallback): void; @@ -594,7 +648,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100002 - Failed to get the application group information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryAppGroup(): Promise; @@ -619,7 +674,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100002 - Failed to get the application group information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts{ '1.1':'10', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryAppGroupSync(): number; @@ -646,7 +702,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100002 - Failed to get the application group information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryAppGroup(bundleName: string, callback: AsyncCallback): void; @@ -673,7 +730,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100002 - Failed to get the application group information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryAppGroup(bundleName: string): Promise; @@ -699,7 +757,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100002 - Failed to get the application group information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts{ '1.1':'10', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryAppGroupSync(bundleName: string): number; @@ -707,7 +766,8 @@ declare namespace usageStatistics { * @typedef { Record } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ type BundleStatsMap = Record; @@ -733,7 +793,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryBundleStatsInfos(begin: number, end: number, callback: AsyncCallback): void; @@ -759,7 +820,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryBundleStatsInfos(begin: number, end: number): Promise; @@ -767,7 +829,8 @@ declare namespace usageStatistics { * @typedef { Record> } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 15 + * @since arkts{ '1.1':'15', '1.2':'20' } + * @arkts 1.1&1.2 */ type AppStatsMap = Record>; @@ -793,7 +856,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 15 + * @since arkts{ '1.1':'15', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryAppStatsInfos(begin: number, end: number): Promise; @@ -818,7 +882,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 15 + * @since arkts{ '1.1':'15', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryLastUseTime(appInfo: Record>): Promise; @@ -828,7 +893,8 @@ declare namespace usageStatistics { * @enum { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ export enum IntervalType { /** @@ -836,7 +902,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ BY_OPTIMIZED = 0, @@ -845,7 +912,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ BY_DAILY = 1, @@ -854,7 +922,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ BY_WEEKLY = 2, @@ -863,7 +932,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ BY_MONTHLY = 3, @@ -872,7 +942,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ BY_ANNUALLY = 4 } @@ -901,7 +972,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryBundleStatsInfoByInterval( byInterval: IntervalType, @@ -934,7 +1006,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryBundleStatsInfoByInterval( byInterval: IntervalType, @@ -964,7 +1037,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryBundleEvents(begin: number, end: number, callback: AsyncCallback>): void; @@ -990,7 +1064,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryBundleEvents(begin: number, end: number): Promise>; @@ -1014,7 +1089,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryCurrentBundleEvents(begin: number, end: number, callback: AsyncCallback>): void; @@ -1038,7 +1114,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryCurrentBundleEvents(begin: number, end: number): Promise>; @@ -1063,7 +1140,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryModuleUsageRecords(maxNum: number, callback: AsyncCallback>): void; @@ -1088,7 +1166,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryModuleUsageRecords(maxNum: number): Promise>; @@ -1112,7 +1191,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryModuleUsageRecords(callback: AsyncCallback>): void; @@ -1136,7 +1216,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryModuleUsageRecords(): Promise>; @@ -1146,7 +1227,8 @@ declare namespace usageStatistics { * @enum { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ export enum GroupType { /** @@ -1154,7 +1236,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ ALIVE_GROUP = 10, @@ -1163,7 +1246,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ DAILY_GROUP = 20, @@ -1172,7 +1256,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ FIXED_GROUP = 30, @@ -1181,7 +1266,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ RARE_GROUP = 40, @@ -1190,7 +1276,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ LIMITED_GROUP = 50, @@ -1199,7 +1286,8 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ NEVER_GROUP = 60 } @@ -1225,7 +1313,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100001 - Repeated operation on the application group. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function setAppGroup(bundleName: string, newGroup: GroupType, callback: AsyncCallback): void; @@ -1250,7 +1339,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100001 - Repeated operation on the application group. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function setAppGroup(bundleName: string, newGroup: GroupType): Promise; @@ -1274,7 +1364,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100001 - Repeated operation on the application group. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function registerAppGroupCallBack(groupCallback: Callback, callback: AsyncCallback): void; @@ -1298,7 +1389,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100001 - Repeated operation on the application group. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function registerAppGroupCallBack(groupCallback: Callback): Promise; @@ -1320,7 +1412,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100001 - Repeated operation on the application group. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function unregisterAppGroupCallBack(callback: AsyncCallback): void; @@ -1342,7 +1435,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100001 - Repeated operation on the application group. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function unregisterAppGroupCallBack(): Promise; @@ -1368,7 +1462,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryDeviceEventStats(begin: number, end: number, callback: AsyncCallback>): void; @@ -1394,7 +1489,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryDeviceEventStats(begin: number, end: number): Promise>; @@ -1420,7 +1516,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryNotificationEventStats( begin: number, @@ -1450,7 +1547,8 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts{ '1.1':'9', '1.2':'20' } + * @arkts 1.1&1.2 */ function queryNotificationEventStats(begin: number, end: number): Promise>; } diff --git a/api/@ohos.resourceschedule.workScheduler.d.ts b/api/@ohos.resourceschedule.workScheduler.d.ts index fbe64d4053..9b784899cb 100644 --- a/api/@ohos.resourceschedule.workScheduler.d.ts +++ b/api/@ohos.resourceschedule.workScheduler.d.ts @@ -26,7 +26,8 @@ import { AsyncCallback } from './@ohos.base'; * @namespace workScheduler * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace workScheduler { /** @@ -35,7 +36,8 @@ declare namespace workScheduler { * @interface WorkInfo * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ export interface WorkInfo { /** @@ -44,7 +46,8 @@ declare namespace workScheduler { * @type { number } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ workId: number; /** @@ -53,7 +56,8 @@ declare namespace workScheduler { * @type { string } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ bundleName: string; /** @@ -62,7 +66,8 @@ declare namespace workScheduler { * @type { string } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ abilityName: string; /** @@ -71,7 +76,8 @@ declare namespace workScheduler { * @type { ?boolean } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ isPersisted?: boolean; /** @@ -80,7 +86,8 @@ declare namespace workScheduler { * @type { ?NetworkType } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ networkType?: NetworkType; /** @@ -89,7 +96,8 @@ declare namespace workScheduler { * @type { ?boolean } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ isCharging?: boolean; /** @@ -98,7 +106,8 @@ declare namespace workScheduler { * @type { ?ChargingType } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ chargerType?: ChargingType; /** @@ -107,7 +116,8 @@ declare namespace workScheduler { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ batteryLevel?: number; /** @@ -116,7 +126,8 @@ declare namespace workScheduler { * @type { ?BatteryStatus } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ batteryStatus?: BatteryStatus; /** @@ -125,7 +136,8 @@ declare namespace workScheduler { * @type { ?StorageRequest } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ storageRequest?: StorageRequest; /** @@ -134,7 +146,8 @@ declare namespace workScheduler { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ repeatCycleTime?: number; /** @@ -143,7 +156,8 @@ declare namespace workScheduler { * @type { ?boolean } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ isRepeat?: boolean; /** @@ -152,7 +166,8 @@ declare namespace workScheduler { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ repeatCount?: number; /** @@ -161,7 +176,8 @@ declare namespace workScheduler { * @type { ?boolean } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ isDeepIdle?: boolean; /** @@ -170,7 +186,8 @@ declare namespace workScheduler { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ idleWaitTime?: number; /** @@ -179,7 +196,8 @@ declare namespace workScheduler { * @type { ?Record } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ parameters?: Record; } @@ -199,7 +217,8 @@ declare namespace workScheduler { * @throws { BusinessError } 9700005 - Calling startWork failed. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function startWork(work: WorkInfo): void; @@ -217,7 +236,8 @@ declare namespace workScheduler { * @throws { BusinessError } 9700004 - Check on workInfo failed. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function stopWork(work: WorkInfo, needCancel?: boolean): void; @@ -234,7 +254,8 @@ declare namespace workScheduler { * @throws { BusinessError } 9700004 - Check on workInfo failed. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getWorkStatus(workId: number, callback: AsyncCallback): void; @@ -251,7 +272,8 @@ declare namespace workScheduler { * @throws { BusinessError } 9700004 - Check on workInfo failed. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function getWorkStatus(workId: number): Promise; @@ -285,7 +307,8 @@ declare namespace workScheduler { * @throws { BusinessError } 9700003 - System service operation failed. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function obtainAllWorks(callback: AsyncCallback>): void; @@ -301,7 +324,8 @@ declare namespace workScheduler { * @throws { BusinessError } 9700003 - System service operation failed. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function obtainAllWorks(): Promise>; @@ -316,7 +340,8 @@ declare namespace workScheduler { * @throws { BusinessError } 9700003 - System service operation failed. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function stopAndClearWorks(): void; @@ -352,7 +377,8 @@ declare namespace workScheduler { * @throws { BusinessError } 9700004 - Check on workInfo failed. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function isLastWorkTimeOut(workId: number, callback: AsyncCallback): void; @@ -369,7 +395,8 @@ declare namespace workScheduler { * @throws { BusinessError } 9700004 - Check on workInfo failed. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ function isLastWorkTimeOut(workId: number): Promise; @@ -379,7 +406,8 @@ declare namespace workScheduler { * @enum { number } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 * @name NetworkType */ export enum NetworkType { @@ -388,7 +416,8 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ NETWORK_TYPE_ANY = 0, /** @@ -396,7 +425,8 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ NETWORK_TYPE_MOBILE, /** @@ -404,7 +434,8 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ NETWORK_TYPE_WIFI, /** @@ -412,7 +443,8 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ NETWORK_TYPE_BLUETOOTH, /** @@ -420,7 +452,8 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ NETWORK_TYPE_WIFI_P2P, /** @@ -428,7 +461,8 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ NETWORK_TYPE_ETHERNET } @@ -439,7 +473,8 @@ declare namespace workScheduler { * @enum { number } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 * @name ChargingType */ export enum ChargingType { @@ -448,7 +483,8 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ CHARGING_PLUGGED_ANY = 0, /** @@ -456,7 +492,8 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ CHARGING_PLUGGED_AC, /** @@ -464,7 +501,8 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ CHARGING_PLUGGED_USB, /** @@ -472,7 +510,8 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ CHARGING_PLUGGED_WIRELESS } @@ -483,7 +522,8 @@ declare namespace workScheduler { * @enum { number } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 * @name BatteryStatus */ export enum BatteryStatus { @@ -492,7 +532,8 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ BATTERY_STATUS_LOW = 0, /** @@ -500,7 +541,8 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ BATTERY_STATUS_OKAY, /** @@ -508,7 +550,8 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ BATTERY_STATUS_LOW_OR_OKAY } @@ -519,7 +562,8 @@ declare namespace workScheduler { * @enum { number } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 * @name StorageRequest */ export enum StorageRequest { @@ -528,7 +572,8 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ STORAGE_LEVEL_LOW = 0, /** @@ -536,7 +581,8 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ STORAGE_LEVEL_OKAY, /** @@ -544,7 +590,8 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9','1.2':'20'} + * @arkts 1.1&1.2 */ STORAGE_LEVEL_LOW_OR_OKAY } diff --git a/api/@ohos.rpc.d.ts b/api/@ohos.rpc.d.ts index b2efd9bbf2..20a57f5da4 100644 --- a/api/@ohos.rpc.d.ts +++ b/api/@ohos.rpc.d.ts @@ -18,9 +18,7 @@ * @kit IPCKit */ -/*** if arkts 1.1 */ import type { AsyncCallback } from './@ohos.base'; -/*** endif */ /** * This module provides inter process communication capability. @@ -1181,7 +1179,8 @@ declare namespace rpc { * * @returns { MessageSequence } Return the object created. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ static create(): MessageSequence; @@ -1189,7 +1188,8 @@ declare namespace rpc { * Reclaim the {@link MessageSequence} object. * * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ reclaim(): void; @@ -1203,7 +1203,8 @@ declare namespace rpc { * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ writeRemoteObject(object: IRemoteObject): void; @@ -1214,7 +1215,8 @@ declare namespace rpc { * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readRemoteObject(): IRemoteObject; @@ -1229,7 +1231,8 @@ declare namespace rpc { * 4.The number of bytes copied to the buffer is different from the length of the obtained string. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ writeInterfaceToken(token: string): void; @@ -1256,11 +1259,12 @@ declare namespace rpc { /** * Obtains the storage capacity (in bytes) of the {@link MessageSequence} object. * - * @returns { number } Return the storage capacity of the {@link MessageSequence} object. + * @returns { int } Return the storage capacity of the {@link MessageSequence} object. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - getCapacity(): number; + getCapacity(): int; /** * Sets the size of data (in bytes) contained in the {@link MessageSequence} object. @@ -1282,16 +1286,17 @@ declare namespace rpc { *

    {@code false} is returned if the capacity set in this method is less than * the size of data contained in the {@link MessageSequence}. * - * @param { number } size - Indicates the storage capacity of the {@link MessageSequence} object. + * @param { int } size - Indicates the storage capacity of the {@link MessageSequence} object. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; * 2.The parameter type does not match. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @throws { BusinessError } 1900011 - Memory allocation failed. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - setCapacity(size: number): void; + setCapacity(size: int): void; /** * Obtains the writable data space (in bytes) in the {@link MessageSequence} object. @@ -1369,7 +1374,8 @@ declare namespace rpc { * * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ writeNoException(): void; @@ -1381,7 +1387,8 @@ declare namespace rpc { * * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readException(): void; @@ -1414,28 +1421,30 @@ declare namespace rpc { /** * Writes an integer value into the {@link MessageSequence} object. * - * @param { number } val - Indicates the integer value to write. + * @param { int } val - Indicates the integer value to write. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; * 2.The parameter type does not match. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - writeInt(val: number): void; + writeInt(val: int): void; /** * Writes a long integer value into the {@link MessageSequence} object. * - * @param { number } val - Indicates the long integer value to write. + * @param { long } val - Indicates the long integer value to write. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; * 2.The parameter type does not match. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - writeLong(val: number): void; + writeLong(val: long): void; /** * Writes a floating point value into the {@link MessageSequence} object. @@ -1472,7 +1481,8 @@ declare namespace rpc { * 2.The parameter type does not match. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ writeBoolean(val: boolean): void; @@ -1514,14 +1524,15 @@ declare namespace rpc { * 2.The parameter type does not match. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ writeParcelable(val: Parcelable): void; /** * Writes a byte array into the {@link MessageSequence} object. * - * @param { number[] } byteArray - Indicates the byte array to write. + * @param { int[] } byteArray - Indicates the byte array to write. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The parameter is an empty array; * 2.The number of parameters is incorrect; @@ -1530,9 +1541,10 @@ declare namespace rpc { * 5.The type of the element in the array is incorrect. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - writeByteArray(byteArray: number[]): void; + writeByteArray(byteArray: int[]): void; /** * Writes a short integer array into the {@link MessageSequence} object. @@ -1557,7 +1569,7 @@ declare namespace rpc { * Ensure that the data type and size comply with the interface definition. * Otherwise,data may be truncated. * - * @param { number[] } intArray - Indicates the integer array to write. + * @param { int[] } intArray - Indicates the integer array to write. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The parameter is an empty array; * 2.The number of parameters is incorrect; @@ -1566,9 +1578,10 @@ declare namespace rpc { * 5.The type of the element in the array is incorrect. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - writeIntArray(intArray: number[]): void; + writeIntArray(intArray: int[]): void; /** * Writes a long integer array into the {@link MessageSequence} object. @@ -1611,7 +1624,7 @@ declare namespace rpc { * Ensure that the data type and size comply with the interface definition. * Otherwise,data may be truncated. * - * @param { number[] } doubleArray - Indicates the double-precision floating point array to write. + * @param { double[] } doubleArray - Indicates the double-precision floating point array to write. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The parameter is an empty array; * 2.The number of parameters is incorrect; @@ -1620,9 +1633,10 @@ declare namespace rpc { * 5.The type of the element in the array is incorrect. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - writeDoubleArray(doubleArray: number[]): void; + writeDoubleArray(doubleArray: double[]): void; /** * Writes a boolean array into the {@link MessageSequence} object. @@ -1637,7 +1651,8 @@ declare namespace rpc { * 4.The element does not exist in the array. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ writeBooleanArray(booleanArray: boolean[]): void; @@ -1672,7 +1687,8 @@ declare namespace rpc { * 5.The number of bytes copied to the buffer is different from the length of the obtained string. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ writeStringArray(stringArray: string[]): void; @@ -1687,7 +1703,8 @@ declare namespace rpc { * 4.The element does not exist in the array. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ writeParcelableArray(parcelableArray: Parcelable[]): void; @@ -1730,22 +1747,24 @@ declare namespace rpc { /** * Reads an integer value from the {@link MessageSequence} object. * - * @returns { number } Return an integer value. + * @returns { int } Return an integer value. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - readInt(): number; + readInt(): int; /** * Reads a long integer value from the {@link MessageSequence} object. * - * @returns { number } Return a long integer value. + * @returns { long } Return a long integer value. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - readLong(): number; + readLong(): long; /** * Reads a floating point value from the {@link MessageSequence} object. @@ -1773,7 +1792,8 @@ declare namespace rpc { * @returns { boolean } Return a boolean value. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readBoolean(): boolean; @@ -1808,7 +1828,8 @@ declare namespace rpc { * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @throws { BusinessError } 1900012 - Failed to call the JS callback function. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readParcelable(dataIn: Parcelable): void; @@ -1863,26 +1884,28 @@ declare namespace rpc { /** * Reads an integer array from the {@link MessageSequence} object. * - * @param { number[] } dataIn - Indicates the integer array to read. + * @param { int[] } dataIn - Indicates the integer array to read. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The parameter is an empty array; * 2.The number of parameters is incorrect; * 3.The parameter type does not match. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - readIntArray(dataIn: number[]): void; + readIntArray(dataIn: int[]): void; /** * Reads an integer array from the {@link MessageSequence} object. * - * @returns { number[] } Return an integer array. + * @returns { int[] } Return an integer array. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - readIntArray(): number[]; + readIntArray(): int[]; /** * Reads a long integer array from the {@link MessageSequence} object. @@ -1935,26 +1958,28 @@ declare namespace rpc { /** * Reads a double-precision floating point array from the {@link MessageSequence} object. * - * @param { number[] } dataIn - Indicates the double-precision floating point array to read. + * @param { double[] } dataIn - Indicates the double-precision floating point array to read. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The parameter is an empty array; * 2.The number of parameters is incorrect; * 3.The parameter type does not match. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - readDoubleArray(dataIn: number[]): void; + readDoubleArray(dataIn: double[]): void; /** * Reads a double-precision floating point array from the {@link MessageSequence} object. * - * @returns { number[] } Return a double-precision floating point array. + * @returns { double[] } Return a double-precision floating point array. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - readDoubleArray(): number[]; + readDoubleArray(): double[]; /** * Reads a boolean array from the {@link MessageSequence} object. @@ -1966,7 +1991,8 @@ declare namespace rpc { * 3.The parameter type does not match. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readBooleanArray(dataIn: boolean[]): void; @@ -1976,7 +2002,8 @@ declare namespace rpc { * @returns { boolean[] } Return a boolean array. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readBooleanArray(): boolean[]; @@ -2014,7 +2041,8 @@ declare namespace rpc { * 3.The parameter type does not match. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readStringArray(dataIn: string[]): void; @@ -2024,7 +2052,8 @@ declare namespace rpc { * @returns { string[] } Return a string array. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readStringArray(): string[]; @@ -2041,7 +2070,8 @@ declare namespace rpc { * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @throws { BusinessError } 1900012 - Failed to call the JS callback function. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readParcelableArray(parcelableArray: Parcelable[]): void; @@ -2074,14 +2104,16 @@ declare namespace rpc { /** * Closes the specified file descriptor. * - * @param { number } fd - File descriptor to be closed. + * @param { int } fd - File descriptor to be closed. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; * 2.The parameter type does not match. + * @static * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - static closeFileDescriptor(fd: number): void; + static closeFileDescriptor(fd: int): void; /** * Duplicates the specified file descriptor. @@ -2110,25 +2142,27 @@ declare namespace rpc { /** * Writes a file descriptor to this {@link MessageSequence} object. * - * @param { number } fd - File descriptor to wrote. + * @param { int } fd - File descriptor to wrote. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; * 2.The parameter type does not match. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - writeFileDescriptor(fd: number): void; + writeFileDescriptor(fd: int): void; /** * Reads a file descriptor from this {@link MessageSequence} object. * - * @returns { number } Return a file descriptor obtained. + * @returns { int } Return a file descriptor obtained. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - readFileDescriptor(): number; + readFileDescriptor(): int; /** * Writes an anonymous shared memory object to this {@link MessageSequence} object. @@ -2139,7 +2173,8 @@ declare namespace rpc { * 2.The parameter is not an instance of the Ashmem object. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ writeAshmem(ashmem: Ashmem): void; @@ -2149,7 +2184,8 @@ declare namespace rpc { * @returns { Ashmem } Return the anonymous share object obtained. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readAshmem(): Ashmem; @@ -2189,7 +2225,7 @@ declare namespace rpc { * Writes raw data to this {@link MessageSequence} object. * * @param { ArrayBuffer } rawData - Raw data to wrote. - * @param { number } size - Size of the raw data, in bytes. + * @param { int } size - Size of the raw data, in bytes. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; * 2.The parameter type does not match; @@ -2199,9 +2235,10 @@ declare namespace rpc { * 6.The transferred size is greater than the byte length of ArrayBuffer. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - writeRawDataBuffer(rawData: ArrayBuffer, size: number): void; + writeRawDataBuffer(rawData: ArrayBuffer, size: int): void; /** * Reads raw data from this {@link MessageSequence} object. @@ -2222,16 +2259,17 @@ declare namespace rpc { /** * Reads raw data from this {@link MessageSequence} object. * - * @param { number } size - Size of the raw data to read. + * @param { int } size - Size of the raw data to read. * @returns { ArrayBuffer } Return the raw data obtained, in bytes. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; * 2.The parameter type does not match. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - readRawDataBuffer(size: number): ArrayBuffer; + readRawDataBuffer(size: int): ArrayBuffer; /** * Writes the data in an ArrayBuffer object into this {@Link MessageSequence} object. @@ -2321,7 +2359,8 @@ declare namespace rpc { * object will be marshalled. * @returns { boolean } Return {@code true} if the marshalling is successful; return {@code false} otherwise. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ marshalling(dataOut: MessageSequence): boolean; @@ -2332,7 +2371,8 @@ declare namespace rpc { * which the {@code Parcelable} object has been marshalled. * @returns { boolean } Return {@code true} if the unmarshalling is successful; return {@code false} otherwise. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ unmarshalling(dataIn: MessageSequence): boolean; } @@ -2399,26 +2439,29 @@ declare namespace rpc { * * @typedef RequestResult * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface RequestResult { /** * Error code. 0 indicates successful, otherwise it is failed. * - * @type { number } + * @type { int } * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - errCode: number; + errCode: int; /** * Message code. It is same as the code in {@link SendRequest} method. * - * @type { number } + * @type { int } * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - code: number; + code: int; /** * MessageSequence object sent to the peer process. @@ -2426,7 +2469,8 @@ declare namespace rpc { * * @type { MessageSequence } * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ data: MessageSequence; @@ -2436,7 +2480,8 @@ declare namespace rpc { * * @type { MessageSequence } * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ reply: MessageSequence; } @@ -2538,7 +2583,7 @@ declare namespace rpc { * a promise will be fulfilled when the response to sendMessageRequest is returned, * and the reply message contains the returned information. * - * @param { number } code - Message code called by the request, which is determined by the client and server. + * @param { int } code - Message code called by the request, which is determined by the client and server. * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. * @param {MessageSequence } data - {@link MessageSequence} object holding the data to send. * @param {MessageSequence } reply - {@link MessageSequence} object that receives the response. @@ -2549,10 +2594,11 @@ declare namespace rpc { * 2.The parameter type does not match; * 3.Failed to obtain the passed object instance. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ sendMessageRequest( - code: number, + code: int, data: MessageSequence, reply: MessageSequence, options: MessageOption @@ -2591,7 +2637,7 @@ declare namespace rpc { * a callback will be invoked when the response to sendMessageRequest is returned, * and the reply message contains the returned information. * - * @param {number } code - Message code called by the request, which is determined by the client and server. + * @param {int } code - Message code called by the request, which is determined by the client and server. * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. * @param { MessageSequence } data - {@link MessageSequence} object holding the data to send. * @param { MessageSequence } reply - {@link MessageSequence} object that receives the response. @@ -2602,10 +2648,11 @@ declare namespace rpc { * 2.The parameter type does not match; * 3.Failed to obtain the passed object instance. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ sendMessageRequest( - code: number, + code: int, data: MessageSequence, reply: MessageSequence, options: MessageOption, @@ -2630,7 +2677,7 @@ declare namespace rpc { * Register a callback used to receive notifications of the death of a remote object. * * @param { DeathRecipient } recipient - Indicates the callback to be registered. - * @param { number } flags - Indicates the flag of the death notification. + * @param { int } flags - Indicates the flag of the death notification. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; * 2.The parameter type does not match; @@ -2638,9 +2685,10 @@ declare namespace rpc { * @throws { BusinessError } 1900005 - Operation allowed only for the proxy object. * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - registerDeathRecipient(recipient: DeathRecipient, flags: number): void; + registerDeathRecipient(recipient: DeathRecipient, flags: int): void; /** * Unregister a callback used to receive notifications of the death of a remote object. @@ -2660,7 +2708,7 @@ declare namespace rpc { * Unregister a callback used to receive notifications of the death of a remote object. * * @param { DeathRecipient } recipient - Indicates the callback to be unregister. - * @param { number } flags - Indicates the flag of the death notification. + * @param { int } flags - Indicates the flag of the death notification. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; * 2.The parameter type does not match; @@ -2668,9 +2716,10 @@ declare namespace rpc { * @throws { BusinessError } 1900005 - Operation allowed only for the proxy object. * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - unregisterDeathRecipient(recipient: DeathRecipient, flags: number): void; + unregisterDeathRecipient(recipient: DeathRecipient, flags: int): void; /** * Obtains the interface descriptor of an object. @@ -2701,7 +2750,8 @@ declare namespace rpc { * * @returns { boolean } Return {@code true} if the object is dead; return {@code false} otherwise. * @syscap SystemCapability.Communication.IPC.Core - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ isObjectDead(): boolean; } @@ -2716,7 +2766,8 @@ declare namespace rpc { * * @typedef IRemoteBroker * @syscap SystemCapability.Communication.IPC.Core - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ interface IRemoteBroker { /** @@ -2725,7 +2776,8 @@ declare namespace rpc { * @returns { IRemoteObject } Return the RemoteObject if the caller is a RemoteObject; return the IRemoteObject, * that is, the holder of this RemoteProxy object, if the caller is a RemoteProxy object. * @syscap SystemCapability.Communication.IPC.Core - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ asObject(): IRemoteObject; } @@ -2747,14 +2799,16 @@ declare namespace rpc { * * @typedef DeathRecipient * @syscap SystemCapability.Communication.IPC.Core - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ interface DeathRecipient { /** * Called to perform subsequent operations when a death notification of the remote object is received. * * @syscap SystemCapability.Communication.IPC.Core - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ onRemoteDied(): void; } @@ -2774,24 +2828,26 @@ declare namespace rpc { /** * Indicates synchronous call. * - * @type { number } + * @type { int } * @default 0 * @static * @syscap SystemCapability.Communication.IPC.Core - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - static TF_SYNC: number; + static TF_SYNC: int; /** * Indicates asynchronous call. * - * @type { number } + * @type { int } * @default 1 * @static * @syscap SystemCapability.Communication.IPC.Core - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - static TF_ASYNC: number; + static TF_ASYNC: int; /** * Indicates the sendRequest API for returning the file descriptor. @@ -2815,24 +2871,25 @@ declare namespace rpc { /** * Indicates the wait time for RPC, in seconds. It is NOT used in IPC case. * - * @type { number } + * @type { int } * @default 8 * @static * @syscap SystemCapability.Communication.IPC.Core - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - static TF_WAIT_TIME: number; + static TF_WAIT_TIME: int; /** * A constructor used to create a MessageOption instance. * - * @param { number } syncFlags - Specifies whether the SendRequest is called synchronously (default) or asynchronously. - * @param { number } waitTime - Maximum wait time for a RPC call. The default value is TF_WAIT_TIME. + * @param { int } syncFlags - Specifies whether the SendRequest is called synchronously (default) or asynchronously. + * @param { int } waitTime - Maximum wait time for a RPC call. The default value is TF_WAIT_TIME. * @syscap SystemCapability.Communication.IPC.Core * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 */ - constructor(syncFlags?: number, waitTime?: number); + constructor(syncFlags?: int, waitTime?: int); /** * A constructor used to create a MessageOption instance. @@ -2877,18 +2934,20 @@ declare namespace rpc { * @returns { boolean } Return {@code true} if the asynchronous call succeeds; * return {@code false} if the synchronous call succeeds. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ isAsync(): boolean; /** * Sets the SendRequest call flag, which can be synchronous or asynchronous. * - * @param { boolean } async - Indicates the call flag, which can be synchronous or asynchronous. + * @param { boolean } isAsync - Indicates the call flag, which can be synchronous or asynchronous. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - setAsync(async: boolean): void; + setAsync(isAsync: boolean): void; /** * Obtains the maximum wait time for this RPC call. @@ -3003,7 +3062,7 @@ declare namespace rpc { * @arkts 1.1&1.2 */ onRemoteMessageRequest( - code: number, + code: int, data: MessageSequence, reply: MessageSequence, options: MessageOption @@ -3075,7 +3134,7 @@ declare namespace rpc { * a promise will be fulfilled when the response to sendMessageRequest is returned, * and the reply message contains the returned information. * - * @param { number } code - Message code called by the request, which is determined by the client and server. + * @param { int } code - Message code called by the request, which is determined by the client and server. * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. * @param { MessageSequence } data - {@link MessageSequence} object holding the data to send. * @param { MessageSequence } reply - {@link MessageSequence} object that receives the response. @@ -3086,10 +3145,11 @@ declare namespace rpc { * 2.The parameter type does not match; * 3.Failed to obtain the passed object instance. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ sendMessageRequest( - code: number, + code: int, data: MessageSequence, reply: MessageSequence, options: MessageOption @@ -3128,7 +3188,7 @@ declare namespace rpc { * a callback will be invoked when the response to sendMessageRequest is returned, * and the reply message contains the returned information. * - * @param { number } code - Message code called by the request, which is determined by the client and server. + * @param { int } code - Message code called by the request, which is determined by the client and server. * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. * @param { MessageSequence } data - {@link MessageSequence} object holding the data to send. * @param { MessageSequence } reply - {@link MessageSequence} object that receives the response. @@ -3139,10 +3199,11 @@ declare namespace rpc { * 2.The parameter type does not match; * 3.Failed to obtain the passed object instance. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ sendMessageRequest( - code: number, + code: int, data: MessageSequence, reply: MessageSequence, options: MessageOption, @@ -3152,20 +3213,22 @@ declare namespace rpc { /** * Obtains the PID of the {@link RemoteProxy} object. * - * @returns { number } Return the PID of the {@link RemoteProxy} object. + * @returns { int } Return the PID of the {@link RemoteProxy} object. * @syscap SystemCapability.Communication.IPC.Core - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - getCallingPid(): number; + getCallingPid(): int; /** * Obtains the UID of the {@link RemoteProxy} object. * - * @returns { number } Return the UID of the {@link RemoteProxy} object. + * @returns { int } Return the UID of the {@link RemoteProxy} object. * @syscap SystemCapability.Communication.IPC.Core - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - getCallingUid(): number; + getCallingUid(): int; /** * Modifies the description of the current {@code RemoteObject}. @@ -3310,7 +3373,7 @@ declare namespace rpc { * Register a callback used to receive death notifications of a remote object. * * @param { DeathRecipient } recipient - Indicates the callback to be registered. - * @param { number } flags - Indicates the flag of the death notification. This is a reserved parameter. + * @param { int } flags - Indicates the flag of the death notification. This is a reserved parameter. * Set it to {@code 0}. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; @@ -3318,9 +3381,10 @@ declare namespace rpc { * 3.The callback used to receive remote object death notifications is empty. * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - registerDeathRecipient(recipient: DeathRecipient, flags: number): void; + registerDeathRecipient(recipient: DeathRecipient, flags: int): void; /** * Unregister a callback used to receive death notifications of a remote object. @@ -3341,7 +3405,7 @@ declare namespace rpc { * Unregister a callback used to receive death notifications of a remote object. * * @param { DeathRecipient } recipient - Indicates the callback to be unregister. - * @param { number } flags - Indicates the flag of the death notification. This is a reserved parameter. + * @param { int } flags - Indicates the flag of the death notification. This is a reserved parameter. * Set it to {@code 0}. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; @@ -3349,9 +3413,10 @@ declare namespace rpc { * 3.The callback used to receive remote object death notifications is empty. * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - unregisterDeathRecipient(recipient: DeathRecipient, flags: number): void; + unregisterDeathRecipient(recipient: DeathRecipient, flags: int): void; /** * Queries the interface descriptor of remote object. @@ -3424,7 +3489,7 @@ declare namespace rpc { * a promise will be fulfilled when the response to sendMessageRequest is returned, * and the reply message contains the returned information. * - * @param { number } code - Message code called by the request, which is determined by the client and server. + * @param { int } code - Message code called by the request, which is determined by the client and server. * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. * @param { MessageSequence } data - {@link MessageSequence} object holding the data to send. * @param { MessageSequence } reply - {@link MessageSequence} object that receives the response. @@ -3435,10 +3500,11 @@ declare namespace rpc { * 2.The parameter type does not match; * 3.Failed to obtain the passed object instance. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ sendMessageRequest( - code: number, + code: int, data: MessageSequence, reply: MessageSequence, options: MessageOption @@ -3477,7 +3543,7 @@ declare namespace rpc { * a callback will be invoked when the response to sendRequest is returned, * and the reply message contains the returned information. * - * @param { number } code - Message code called by the request, which is determined by the client and server. + * @param { int } code - Message code called by the request, which is determined by the client and server. * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. * @param { MessageSequence } data - {@link MessageSequence} object holding the data to send. * @param { MessageSequence } reply - {@link MessageSequence} object that receives the response. @@ -3488,10 +3554,11 @@ declare namespace rpc { * 2.The parameter type does not match; * 3.Failed to obtain the passed object instance. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ sendMessageRequest( - code: number, + code: int, data: MessageSequence, reply: MessageSequence, options: MessageOption, @@ -3503,7 +3570,8 @@ declare namespace rpc { * * @returns { boolean } Return {@code true} if the {@code RemoteObject} is dead; return {@code false} otherwise. * @syscap SystemCapability.Communication.IPC.Core - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ isObjectDead(): boolean; } @@ -3517,7 +3585,8 @@ declare namespace rpc { * peer device IDs, and checking whether the API call is on the same device. * * @syscap SystemCapability.Communication.IPC.Core - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ class IPCSkeleton { /** @@ -3526,7 +3595,8 @@ declare namespace rpc { * * @returns { IRemoteObject } Return an {@link IRemoteObject} reference of the registered service. * @syscap SystemCapability.Communication.IPC.Core - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ static getContextObject(): IRemoteObject; @@ -3538,11 +3608,13 @@ declare namespace rpc { * {@code 0} is returned; if this method is called from the {@link RemoteObject} object, * the PID of the corresponding {@link RemoteProxy} object is returned. * - * @returns { number } Return the PID of the proxy. + * @returns { int } Return the PID of the proxy. + * @static * @syscap SystemCapability.Communication.IPC.Core - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - static getCallingPid(): number; + static getCallingPid(): int; /** * Obtains the UID of a proxy. @@ -3552,21 +3624,25 @@ declare namespace rpc { * {@code 0} is returned; if this method is called from the {@link RemoteObject} object, * the UID of the corresponding {@link RemoteProxy} object is returned. * - * @returns { number } Return the UID of the proxy. + * @returns { int } Return the UID of the proxy. + * @static * @syscap SystemCapability.Communication.IPC.Core - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - static getCallingUid(): number; + static getCallingUid(): int; /** * Obtains the TOKENID. *

    This method is static. * - * @returns { number } Return the TOKENID. + * @returns { long } Return the TOKENID. + * @static * @syscap SystemCapability.Communication.IPC.Core - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - static getCallingTokenId(): number; + static getCallingTokenId(): long; /** * Obtains the ID of the device where the peer process resides. @@ -3675,7 +3751,8 @@ declare namespace rpc { * obtaining the Ashmem size, and setting Ashmem protection. * * @syscap SystemCapability.Communication.IPC.Core - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ class Ashmem { /** @@ -3739,17 +3816,19 @@ declare namespace rpc { * Creates an Ashmem object with the specified name and size. * * @param { string } name - Name of the Ashmem object to create. - * @param { number } size - Size (in bytes) of the Ashmem object to create. + * @param { int } size - Size (in bytes) of the Ashmem object to create. * @returns { Ashmem } Return the Ashmem object if it is created successfully; return null otherwise. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; * 2.The parameter type does not match; * 3.The Ashmem name passed is empty; * 4.The Ashmem size passed is less than or equal to 0. + * @static * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - static create(name: string, size: number): Ashmem; + static create(name: string, size: int): Ashmem; /** * Creates an Ashmem object by copying the file descriptor (FD) of an existing Ashmem object. @@ -3775,7 +3854,8 @@ declare namespace rpc { * 2.The passed parameter is not an Ahmem object; * 3.The ashmem instance for obtaining packaging is empty. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ static create(ashmem: Ashmem): Ashmem; @@ -3798,11 +3878,12 @@ declare namespace rpc { /** * Obtains the mapped memory size of this Ashmem object. * - * @returns { number } Memory size mapped. + * @returns { int } Memory size mapped. * @syscap SystemCapability.Communication.IPC.Core - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - getAshmemSize(): number; + getAshmemSize(): int; /** * Creates the shared file mapping on the virtual address space of this process. @@ -3848,7 +3929,8 @@ declare namespace rpc { * * @throws { BusinessError } 1900001 - Failed to call mmap. * @syscap SystemCapability.Communication.IPC.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ mapReadWriteAshmem(): void; diff --git a/api/@ohos.runningLock.d.ts b/api/@ohos.runningLock.d.ts index a2f1725ae5..ff518c4dbc 100644 --- a/api/@ohos.runningLock.d.ts +++ b/api/@ohos.runningLock.d.ts @@ -120,7 +120,7 @@ declare namespace runningLock { * {@link BACKGROUND} ensures that applications can run in the background. * {@link PROXIMITY_SCREEN_CONTROL} determines whether to turn on or off the screen based on the proximity sensor. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.PowerManager.PowerManager.Core * @since 7 */ @@ -142,7 +142,7 @@ declare namespace runningLock { * @syscap SystemCapability.PowerManager.PowerManager.Core * @since 7 */ - PROXIMITY_SCREEN_CONTROL + PROXIMITY_SCREEN_CONTROL = 2 } /** @@ -180,7 +180,8 @@ declare namespace runningLock { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Incorrect parameter types; * 2. Parameter verification failed. * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isSupported(type: RunningLockType): boolean; diff --git a/api/@ohos.security.certManager.d.ts b/api/@ohos.security.certManager.d.ts index 43121e90d2..82c3792df3 100644 --- a/api/@ohos.security.certManager.d.ts +++ b/api/@ohos.security.certManager.d.ts @@ -1319,7 +1319,8 @@ declare namespace certificateManager { * @throws { BusinessError } 17500001 - Internal error. Possible causes: 1. IPC communication failed; *
    2. Memory operation error; 3. File operation error. * @syscap SystemCapability.Security.CertificateManager - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ /** * Get the certificate file store path. diff --git a/api/@ohos.sensor.d.ets b/api/@ohos.sensor.d.ets new file mode 100644 index 0000000000..b1f72f705e --- /dev/null +++ b/api/@ohos.sensor.d.ets @@ -0,0 +1,2116 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file + * @kit SensorServiceKit + */ + +import { AsyncCallback, Callback } from './@ohos.base'; + +/** + * This module provides the capability to subscribe to sensor data. + * @namespace sensor + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ +declare namespace sensor { + /** + * Enum for obtain the type of sensor. + * @enum { number } + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + enum SensorId { + /** + * Acceleration sensor. + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + ACCELEROMETER = 1, + + /** + * Gyroscope sensor. + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + GYROSCOPE = 2, + + /** + * Ambient light sensor. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + AMBIENT_LIGHT = 5, + + /** + * Magnetic field sensor. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + MAGNETIC_FIELD = 6, + + /** + * Barometric pressure sensor. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + BAROMETER = 8, + + /** + * Hall effect sensor. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + HALL = 10, + + /** + * Proximity sensor. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + PROXIMITY = 12, + + /** + * Humidity sensor. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + HUMIDITY = 13, + + /** + * Color sensor. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + COLOR = 14, + + /** + * Sar sensor. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + SAR = 15, + + /** + * Orientation sensor. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + /** + * Orientation sensor. + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + ORIENTATION = 256, + + /** + * Gravity sensor. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + GRAVITY = 257, + + /** + * Linear acceleration sensor. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + LINEAR_ACCELEROMETER = 258, + + /** + * Rotation vector sensor. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + ROTATION_VECTOR = 259, + + /** + * Ambient temperature sensor. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + AMBIENT_TEMPERATURE = 260, + + /** + * Uncalibrated magnetic field sensor. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + MAGNETIC_FIELD_UNCALIBRATED = 261, + + /** + * Uncalibrated gyroscope sensor. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + GYROSCOPE_UNCALIBRATED = 263, + + /** + * Significant motion sensor. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + SIGNIFICANT_MOTION = 264, + + /** + * Pedometer detection sensor. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + PEDOMETER_DETECTION = 265, + + /** + * Pedometer sensor. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + PEDOMETER = 266, + + /** + * Heart rate sensor. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + HEART_RATE = 278, + + /** + * Wear detection sensor. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + WEAR_DETECTION = 280, + + /** + * Uncalibrated acceleration sensor. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + ACCELEROMETER_UNCALIBRATED = 281 + } + + /** + * Subscribe to orientation sensor data. + * @param { 'orientationChange' } type - Indicate the sensor type to listen for, {@code SensorId.ORIENTATION}. + * @param { Callback } callback - callback orientation data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + function on(type: 'orientationChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to color sensor data. + * @param { 'colorChange' } type - Indicate the sensor type to listen for, {@code SensorId.COLOR}. + * @param { Callback } callback - callback color data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function on(type: 'colorChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to SAR sensor data. + * @param { 'sarChange' } type - Indicate the sensor type to listen for, {@code SensorId.SAR}. + * @param { Callback } callback - callback sar data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function on(type: 'sarChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to accelerometer sensor data. + * @permission ohos.permission.ACCELEROMETER + * @param { 'accelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.ACCELEROMETER}. + * @param { Callback } callback - callback accelerometer data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + function on(type: 'accelerometerChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to uncalibrated accelerometer sensor data. + * @permission ohos.permission.ACCELEROMETER + * @param { 'accelerometerUncalibratedChange' } type - Indicate the sensor type to listen for,{@code SensorId.ACCELEROMETER_UNCALIBRATED}. + * @param { Callback } callback - callback uncalibrated accelerometer data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function on(type: 'accelerometerUncalibratedChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to ambient light sensor data. + * @param { 'ambientLightChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_LIGHT}. + * @param { Callback } callback - callback ambient light data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function on(type: 'ambientLightChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to ambient temperature sensor data. + * @param { 'ambientTemperatureChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_TEMPERATURE}. + * @param { Callback } callback - callback ambient temperature data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function on(type: 'ambientTemperatureChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to barometer sensor data. + * @param { 'barometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.BAROMETER}. + * @param { Callback } callback - callback barometer data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function on(type: 'barometerChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to gravity sensor data. + * @param { 'gravityChange' } type - Indicate the sensor type to listen for, {@code SensorId.GRAVITY}. + * @param { Callback } callback - callback gravity data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function on(type: 'gravityChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to gyroscope sensor data. + * @permission ohos.permission.GYROSCOPE + * @param { 'gyroscopeChange' } type - Indicate the sensor type to listen for, {@code SensorId.GYROSCOPE}. + * @param { Callback } callback - callback gyroscope data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + function on(type: 'gyroscopeChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to uncalibrated gyroscope sensor data. + * @permission ohos.permission.GYROSCOPE + * @param { 'gyroscopeUncalibratedChange' } type - Indicate the sensor type to listen for, {@code SensorId.GYROSCOPE_UNCALIBRATED}. + * @param { Callback } callback - callback uncalibrated gyroscope data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function on(type: 'gyroscopeUncalibratedChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to hall sensor data. + * @param { 'hallChange' } type - Indicate the sensor type to listen for, {@code SensorId.HALL}. + * @param { Callback } callback - callback hall data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function on(type: 'hallChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to heart rate sensor data. + * @permission ohos.permission.READ_HEALTH_DATA + * @param { 'heartRateChange' } type - Indicate the sensor type to listen for, {@code SensorId.HEART_RATE}. + * @param { Callback } callback - callback heart rate data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function on(type: 'heartRateChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to humidity sensor data. + * @param { 'humidityChange' } type - Indicate the sensor type to listen for, {@code SensorId.HUMIDITY}. + * @param { Callback } callback - callback humidity data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function on(type: 'humidityChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to linear acceleration sensor data. + * @permission ohos.permission.ACCELEROMETER + * @param { 'linearAccelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.LINEAR_ACCELEROMETER}. + * @param { Callback } callback - callback linear accelerometer data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function on(type: 'linearAccelerometerChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to magnetic field sensor data. + * @param { 'magneticFieldChange' } type - Indicate the sensor type to listen for, {@code SensorId.MAGNETIC_FIELD}. + * @param { Callback } callback - callback magnetic field data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function on(type: 'magneticFieldChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to uncalibrated magnetic field sensor data. + * @param { 'magneticFieldUncalibratedChange' } type - Indicate the sensor type to listen for, + * {@code SensorId.MAGNETIC_FIELD_UNCALIBRATED}. + * @param { Callback } callback - callback uncalibrated magnetic field data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function on(type: 'magneticFieldUncalibratedChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to pedometer sensor data. + * @permission ohos.permission.ACTIVITY_MOTION + * @param { 'pedometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER}. + * @param { Callback } callback - callback pedometer data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function on(type: 'pedometerChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to pedometer detection sensor data. + * @permission ohos.permission.ACTIVITY_MOTION + * @param { 'pedometerDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER_DETECTION}. + * @param { Callback } callback - callback pedometer detection data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function on(type: 'pedometerDetectionChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to proximity sensor data. + * @param { 'proximityChange' } type - Indicate the sensor type to listen for, {@code SensorId.PROXIMITY}. + * @param { Callback } callback - callback proximity data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function on(type: 'proximityChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to rotation vector sensor data. + * @param { 'rotationVectorChange' } type - Indicate the sensor type to listen for, {@code SensorId.ROTATION_VECTOR}. + * @param { Callback } callback - callback rotation vector data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function on(type: 'rotationVectorChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to significant motion sensor data. + * @param { 'significantMotionChange' } type - Indicate the sensor type to listen for, {@code SensorId.SIGNIFICANT_MOTION}. + * @param { Callback } callback - callback significant motion data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function on(type: 'significantMotionChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to wear detection sensor data. + * @param { 'wearDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.WEAR_DETECTION}. + * @param { Callback } callback - callback wear detection data. + * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function on(type: 'wearDetectionChange', callback: Callback, options?: Options): void; + + /** + * Subscribe to orientation sensor data once. + * @param { 'orientationChange' } type - Indicate the sensor type to listen for, {@code SensorId.ORIENTATION}. + * @param { Callback } callback - callback orientation data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function once(type: 'orientationChange', callback: Callback): void; + + /** + * Subscribe to accelerometer sensor data once. + * @permission ohos.permission.ACCELEROMETER + * @param { 'accelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.ACCELEROMETER}. + * @param { Callback } callback - callback accelerometer data. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function once(type: 'accelerometerChange', callback: Callback): void; + + /** + * Subscribe to uncalibrated accelerometer sensor data once. + * @permission ohos.permission.ACCELEROMETER + * @param { 'accelerometerUncalibratedChange' } type - Indicate the sensor type to listen for,{@code SensorId.ACCELEROMETER_UNCALIBRATED}. + * @param { Callback } callback - callback uncalibrated accelerometer data. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function once(type: 'accelerometerUncalibratedChange', callback: Callback): void; + + /** + * Subscribe to ambient light sensor data once. + * @param { 'ambientLightChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_LIGHT}. + * @param { Callback } callback - callback ambient light data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function once(type: 'ambientLightChange', callback: Callback): void; + + /** + * Subscribe to ambient temperature sensor data once. + * @param { 'ambientTemperatureChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_TEMPERATURE}. + * @param { Callback } callback - callback ambient temperature data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function once(type: 'ambientTemperatureChange', callback: Callback): void; + + /** + * Subscribe to barometer sensor data once. + * @param { 'barometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.BAROMETER}. + * @param { Callback } callback - callback barometer data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function once(type: 'barometerChange', callback: Callback): void; + + /** + * Subscribe to gravity sensor data once. + * @param { 'gravityChange' } type - Indicate the sensor type to listen for, {@code SensorId.GRAVITY}. + * @param { Callback } callback - callback gravity data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function once(type: 'gravityChange', callback: Callback): void; + + /** + * Subscribe to gyroscope sensor data once. + * @permission ohos.permission.GYROSCOPE + * @param { 'gyroscopeChange' } type - Indicate the sensor type to listen for, {@code SensorId.GYROSCOPE}. + * @param { Callback } callback - callback gyroscope data. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function once(type: 'gyroscopeChange', callback: Callback): void; + + /** + * Subscribe to uncalibrated gyroscope sensor data once. + * @permission ohos.permission.GYROSCOPE + * @param { 'gyroscopeUncalibratedChange' } type - Indicate the sensor type to listen for,{@code SensorId.GYROSCOPE_UNCALIBRATED}. + * @param { Callback } callback - callback uncalibrated gyroscope data. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function once(type: 'gyroscopeUncalibratedChange', callback: Callback): void; + + /** + * Subscribe to hall sensor data once. + * @param { 'hallChange' } type - Indicate the sensor type to listen for, {@code SensorId.HALL}. + * @param { Callback } callback - callback hall data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function once(type: 'hallChange', callback: Callback): void; + + /** + * Subscribe to heart rate sensor data once. + * @permission ohos.permission.READ_HEALTH_DATA + * @param { 'heartRateChange' } type - Indicate the sensor type to listen for, {@code SensorId.HEART_RATE}. + * @param { Callback } callback - callback heart rate data. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function once(type: 'heartRateChange', callback: Callback): void; + + /** + * Subscribe to humidity sensor data once. + * @param { 'humidityChange' } type - Indicate the sensor type to listen for, {@code SensorId.HUMIDITY}. + * @param { Callback } callback - callback humidity data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function once(type: 'humidityChange', callback: Callback): void; + + /** + * Subscribe to linear acceleration sensor data once. + * @permission ohos.permission.ACCELEROMETER + * @param { 'linearAccelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.LINEAR_ACCELEROMETER}. + * @param { Callback } callback - callback linear accelerometer data. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function once(type: 'linearAccelerometerChange', callback: Callback): void; + + /** + * Subscribe to magnetic field sensor data once. + * @param { 'magneticFieldChange' } type - Indicate the sensor type to listen for, {@code SensorId.MAGNETIC_FIELD}. + * @param { Callback } callback - callback magnetic field data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function once(type: 'magneticFieldChange', callback: Callback): void; + + /** + * Subscribe to uncalibrated magnetic field sensor data once. + * @param { 'magneticFieldUncalibratedChange' } type - Indicate the sensor type to listen for, + * {@code SensorId.MAGNETIC_FIELD_UNCALIBRATED}. + * @param { Callback } callback - callback uncalibrated magnetic field data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function once(type: 'magneticFieldUncalibratedChange', callback: Callback): void; + + /** + * Subscribe to pedometer sensor data once. + * @permission ohos.permission.ACTIVITY_MOTION + * @param { 'pedometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER}. + * @param { Callback } callback - callback pedometer data. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function once(type: 'pedometerChange', callback: Callback): void; + + /** + * Subscribe to pedometer detection sensor data once. + * @permission ohos.permission.ACTIVITY_MOTION + * @param { 'pedometerDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER_DETECTION}. + * @param { Callback } callback - callback pedometer detection data. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function once(type: 'pedometerDetectionChange', callback: Callback): void; + + /** + * Subscribe to proximity sensor data once. + * @param { 'proximityChange' } type - Indicate the sensor type to listen for, {@code SensorId.PROXIMITY}. + * @param { Callback } callback - callback proximity data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function once(type: 'proximityChange', callback: Callback): void; + + /** + * Subscribe to rotation vector sensor data once. + * @param { 'rotationVectorChange' } type - Indicate the sensor type to listen for, {@code SensorId.ROTATION_VECTOR}. + * @param { Callback } callback - callback rotation vector data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function once(type: 'rotationVectorChange', callback: Callback): void; + + /** + * Subscribe to significant motion sensor data once. + * @param { 'significantMotionChange' } type - Indicate the sensor type to listen for, {@code SensorId.SIGNIFICANT_MOTION}. + * @param { Callback } callback - callback significant motion data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function once(type: 'significantMotionChange', callback: Callback): void; + + /** + * Subscribe to wear detection sensor data once. + * @param { 'wearDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.WEAR_DETECTION}. + * @param { Callback } callback - callback wear detection data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function once(type: 'wearDetectionChange', callback: Callback): void; + + /** + * Unsubscribe to orientation sensor data. + * @param { 'orientationChange' } type - Indicate the sensor type to listen for, {@code SensorId.ORIENTATION}. + * @param { Callback } callback - callback orientation data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + function off(type: 'orientationChange', callback?: Callback): void; + + /** + * Unsubscribe to color sensor data. + * @param { 'colorChange' } type - Indicate the sensor type to listen for, {@code SensorId.COLOR}. + * @param { Callback } callback - callback color data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function off(type: 'colorChange', callback?: Callback): void; + + /** + * Unsubscribe to sar sensor data. + * @param { 'sarChange' } type - Indicate the sensor type to listen for, {@code SensorId.SAR}. + * @param { Callback } callback - callback sar data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function off(type: 'sarChange', callback?: Callback): void; + + /** + * Unsubscribe to accelerometer sensor data. + * @permission ohos.permission.ACCELEROMETER + * @param { 'accelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.ACCELEROMETER}. + * @param { Callback } callback - callback accelerometer data. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + function off(type: 'accelerometerChange', callback?: Callback): void; + + /** + * Unsubscribe to uncalibrated accelerometer sensor data. + * @permission ohos.permission.ACCELEROMETER + * @param { 'accelerometerUncalibratedChange' } type - Indicate the sensor type to listen for, + * {@code SensorId.ACCELEROMETER_UNCALIBRATED}. + * @param { Callback } callback - callback uncalibrated accelerometer data. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function off(type: 'accelerometerUncalibratedChange', callback?: Callback): void; + + /** + * Unsubscribe to ambient light sensor data. + * @param { 'ambientLightChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_LIGHT}. + * @param { Callback } callback - callback ambient light data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function off(type: 'ambientLightChange', callback?: Callback): void; + + /** + * Unsubscribe to ambient temperature sensor data. + * @param { 'ambientTemperatureChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_TEMPERATURE}. + * @param { Callback } callback - callback ambient temperature data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function off(type: 'ambientTemperatureChange', callback?: Callback): void; + + /** + * Unsubscribe to barometer sensor data. + * @param { 'barometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.BAROMETER}. + * @param { Callback } callback - callback barometer data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function off(type: 'barometerChange', callback?: Callback): void; + + /** + * Unsubscribe to gravity sensor data. + * @param { 'gravityChange' } type - Indicate the sensor type to listen for, {@code SensorId.GRAVITY}. + * @param { Callback } callback - callback gravity data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function off(type: 'gravityChange', callback?: Callback): void; + + /** + * Unsubscribe to gyroscope sensor data. + * @permission ohos.permission.GYROSCOPE + * @param { 'gyroscopeChange' } type - Indicate the sensor type to listen for, {@code SensorId.GYROSCOPE}. + * @param { Callback } callback - callback gyroscope data. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + function off(type: 'gyroscopeChange', callback?: Callback): void; + + /** + * Unsubscribe to uncalibrated gyroscope sensor data. + * @permission ohos.permission.GYROSCOPE + * @param { 'gyroscopeUncalibratedChange' } type - Indicate the sensor type to listen for, {@code SensorId.GYROSCOPE_UNCALIBRATED}. + * @param { Callback } callback - callback uncalibrated gyroscope data. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function off(type: 'gyroscopeUncalibratedChange', callback?: Callback): void; + + /** + * Unsubscribe to hall sensor data. + * @param { 'hallChange' } type - Indicate the sensor type to listen for, {@code SensorId.HALL}. + * @param { Callback } callback - callback hall data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function off(type: 'hallChange', callback?: Callback): void; + + /** + * Unsubscribe to heart rate sensor data. + * @permission ohos.permission.READ_HEALTH_DATA + * @param { 'heartRateChange' } type - Indicate the sensor type to listen for, {@code SensorId.HEART_RATE}. + * @param { Callback } callback - callback heart rate data. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function off(type: 'heartRateChange', callback?: Callback): void; + + /** + * Unsubscribe to humidity sensor data. + * @param { 'humidityChange' } type - Indicate the sensor type to listen for, {@code SensorId.HUMIDITY}. + * @param { Callback } callback - callback humidity data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function off(type: 'humidityChange', callback?: Callback): void; + + /** + * Unsubscribe to linear acceleration sensor data. + * @permission ohos.permission.ACCELEROMETER + * @param { 'linearAccelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.LINEAR_ACCELEROMETER}. + * @param { Callback } callback - callback linear accelerometer data. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function off(type: 'linearAccelerometerChange', callback?: Callback): void; + + /** + * Unsubscribe to magnetic field sensor data. + * @param { 'magneticFieldChange' } type - Indicate the sensor type to listen for, {@code SensorId.MAGNETIC_FIELD}. + * @param { Callback } callback - callback magnetic field data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function off(type: 'magneticFieldChange', callback?: Callback): void; + + /** + * Unsubscribe to uncalibrated magnetic field sensor data. + * @param { 'magneticFieldUncalibratedChange' } type - Indicate the sensor type to listen for, + * {@code SensorId.MAGNETIC_FIELD_UNCALIBRATED}. + * @param { Callback } callback - callback uncalibrated magnetic field data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function off(type: 'magneticFieldUncalibratedChange', callback?: Callback): void; + + /** + * Unsubscribe to pedometer sensor data. + * @permission ohos.permission.ACTIVITY_MOTION + * @param { 'pedometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER}. + * @param { Callback } callback - callback pedometer data. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function off(type: 'pedometerChange', callback?: Callback): void; + + /** + * Unsubscribe to pedometer detection sensor data. + * @permission ohos.permission.ACTIVITY_MOTION + * @param { 'pedometerDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER_DETECTION}. + * @param { Callback } callback - callback pedometer detection data. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function off(type: 'pedometerDetectionChange', callback?: Callback): void; + + /** + * Unsubscribe to proximity sensor data. + * @param { 'proximityChange' } type - Indicate the sensor type to listen for, {@code SensorId.PROXIMITY}. + * @param { Callback } callback - callback proximity data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function off(type: 'proximityChange', callback?: Callback): void; + + /** + * Unsubscribe to rotation vector sensor data. + * @param { 'rotationVectorChange' } type - Indicate the sensor type to listen for, {@code SensorId.ROTATION_VECTOR}. + * @param { Callback } callback - callback rotation vector data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function off(type: 'rotationVectorChange', callback?: Callback): void; + + /** + * Unsubscribe to significant motion sensor data. + * @param { 'significantMotionChange' } type - Indicate the sensor type to listen for, {@code SensorId.SIGNIFICANT_MOTION}. + * @param { Callback } callback - callback significant motion data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function off(type: 'significantMotionChange', callback?: Callback): void; + + /** + * Unsubscribe to wear detection sensor data. + * @param { 'wearDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.WEAR_DETECTION}. + * @param { Callback } callback - callback wear detection data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function off(type: 'wearDetectionChange', callback?: Callback): void; + + /** + * Subscribe to the sensor's optional parameters. + * @typedef Options + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + interface Options { + /** + * Sensor event reporting event interval. + * @type { ?(number | SensorFrequency) } + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + interval?: long | SensorFrequency; + } + + /** + * The sensor reporting frequency is divided into three modes. + * @typedef {'game' | 'ui' | 'normal'} + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + type SensorFrequency = 'game' | 'ui' | 'normal'; + + /** + * Enumerates the accuracy levels of data reported by a sensor. + * @enum { int } + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + enum SensorAccuracy { + /** + * The sensor data is unreliable. It is possible that the sensor does not contact with the device to measure. + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + ACCURACY_UNRELIABLE = 0, + + /** + * The sensor data is at a low accuracy level. The data must be calibrated based on the environment before being used. + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + ACCURACY_LOW = 1, + + /** + * The sensor data is at a medium accuracy level. You are advised to calibrate the data based on the environment + *
    before using it. + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + ACCURACY_MEDIUM = 2, + + /** + * The sensor data is at a high accuracy level. The data can be used directly. + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + ACCURACY_HIGH = 3 + } + + /** + * The basic data structure of the sensor event. + * @typedef Response + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + interface Response { + /** + * The timestamp of the reported sensor data. + * @type { long } + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + timestamp: long; + + /** + * The accuracy levels of data reported by a sensor. + * @type { SensorAccuracy } + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + accuracy: SensorAccuracy; + } + + /** + * Orientation sensor event data. + * @typedef OrientationResponse + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + interface OrientationResponse extends Response { + /** + * The device rotates at an angle around the Z axis. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + alpha: float; + + /** + * The device rotates at an angle around the X axis. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + beta: float; + + /** + * The device rotates at an angle around the Y axis. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + gamma: float; + } + + /** + * Indicates sensor information. + * @typedef Sensor + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface Sensor { + /** + * Sensor name. + * @type { string } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + sensorName:string; + + /** + * Sensor vendor. + * @type { string } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + vendorName:string; + + /** + * Sensor firmware version. + * @type { string } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + firmwareVersion:string; + + /** + * Sensor hardware version. + * @type { string } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + hardwareVersion:string; + + /** + * Sensor type ID, {@code SensorType}. + * @type { int } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + sensorId:int; + + /** + * Maximum measurement range of the sensor. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + maxRange:float; + + /** + * Minimum sample period allowed, in ns. + * @type { long } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + minSamplePeriod:long; + + /** + * Maximum sample period allowed, in ns. + * @type { long } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + maxSamplePeriod:long; + + /** + * Sensor accuracy. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + precision:float; + + /** + * Sensor power. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + power:float; + } + + /** + * Obtains all sensor information on the device. + * @param { AsyncCallback> } callback - callback sensor list. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function getSensorList(callback: AsyncCallback>): void; + + /** + * Obtains all sensor information on the device. + * @returns { Promise> } Promise used to return the result. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function getSensorList(): Promise>; + + /** + * Indicates geomagnetic field data. + * @typedef GeomagneticResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface GeomagneticResponse { + /** + * Geomagnetic x-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + x: float; + + /** + * Geomagnetic y-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + y: float; + + /** + * Geomagnetic z-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + z: float; + + /** + * The Angle between the earth's magnetic field lines and the horizontal plane. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + geomagneticDip: float; + + /** + * The Angle of magnetic north and true north on a horizontal plane. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + deflectionAngle: float; + + /** + * The horizontal strength of the geomagnetic field. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + levelIntensity: float; + + /** + * The total strength of the geomagnetic field. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + totalIntensity: float; + } + + /** + * Convert rotation vector to rotation matrix. + * @param { Array } rotationVector - rotationVector Indicates the rotation vector. + * @param { AsyncCallback> } callback - callback rotation matrix. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function getRotationMatrix(rotationVector: Array, callback: AsyncCallback>): void; + + /** + * Convert rotation vector to rotation matrix. + * @param { Array } rotationVector - rotationVector Indicates the rotation vector. + * @returns { Promise> } Promise used to return the result. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function getRotationMatrix(rotationVector: Array): Promise>; + + /** + * Indicates the axis of the new coordinate system that coincides with the XY axis of the original coordinate system. + * @typedef CoordinatesOptions + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface CoordinatesOptions { + /** Indicates the axis of the new coordinate system that coincides with the X axis of the original coordinate system. + * @type { int } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + x: int; + + /** Indicates the axis of the new coordinate system that coincides with the Y axis of the original coordinate system. + * @type { int } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + y: int; + } + + /** + * Computes the device's orientation based on the rotation matrix. + * @param { Array } rotationMatrix - rotationMatrix Indicates the rotation matrix. + * @param { AsyncCallback> } callback - callback the angle of rotation around the z, x, y axis. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function getOrientation(rotationMatrix: Array, callback: AsyncCallback>): void; + + /** + * Computes the device's orientation based on the rotation matrix. + * @param { Array } rotationMatrix - rotationMatrix Indicates the rotation matrix. + * @returns { Promise> } Promise used to return the result. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function getOrientation(rotationMatrix: Array): Promise>; + + /** + * Indicates the response of rotation matrix. + * @typedef RotationMatrixResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface RotationMatrixResponse { + /** + * rotation matrix. + * @type { Array } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + rotation: Array; + + /** + * inclination matrix. + * @type { Array } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + inclination: Array + } + + /** + * Calculate rotation matrix based on gravity vector and geomagnetic vector. + * @param { Array } gravity - gravity Indicates the gravity vector. + * @param { Array } geomagnetic - geomagnetic Indicates the geomagnetic vector. + * @param { AsyncCallback } callback - callback rotation matrix and inclination matrix. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function getRotationMatrix(gravity: Array, geomagnetic: Array, callback: AsyncCallback): void; + + /** + * Calculate rotation matrix based on gravity vector and geomagnetic vector. + * @param { Array } gravity - gravity Indicates the gravity vector. + * @param { Array } geomagnetic - geomagnetic Indicates the geomagnetic vector. + * @returns { Promise } Promise used to return the result. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; + *
    2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 14500101 - Service exception. + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + function getRotationMatrix(gravity: Array, geomagnetic: Array): Promise; + + /** + * Acceleration sensor event data. + * @typedef AccelerometerResponse + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + interface AccelerometerResponse extends Response { + /** + * Acceleration x-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + x: float; + + /** + * Acceleration y-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + y: float; + + /** + * Acceleration z-axis component + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + z: float; + } + + /** + * Linear acceleration sensor event data. + * @typedef LinearAccelerometerResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface LinearAccelerometerResponse extends Response { + /** + * Linear acceleration x-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + x: float; + + /** + * Linear acceleration y-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + y: float; + + /** + * Linear acceleration z-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + z: float; + } + + /** + * Acceleration uncalibrated sensor event data. + * @typedef AccelerometerUncalibratedResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface AccelerometerUncalibratedResponse extends Response { + /** + * Acceleration uncalibrated x-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + x: float; + + /** + * Acceleration uncalibrated y-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + y: float; + + /** + * Acceleration uncalibrated z-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + z: float; + + /** + * Acceleration uncalibrated x-axis offset. + * + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + biasX: float; + + /** + * Acceleration uncalibrated y-axis offset. + * + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + biasY: float; + + /** + * Acceleration uncalibrated z-axis offset. + * + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + biasZ: float; + } + + /** + * Gravity sensor event data. + * @typedef GravityResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface GravityResponse extends Response { + /** + * Gravity x-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + x: float; + + /** + * Gravity y-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + y: float; + + /** + * Gravity z-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + z: float; + } + + /** + * Rotation vector sensor event data. + * @typedef RotationVectorResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface RotationVectorResponse extends Response { + /** + * Rotation vector x-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + x: float; + + /** + * Rotation vector y-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + y: float; + + /** + * Rotation vector z-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + z: float; + + /** + * Scalar quantity. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + w: float; + } + + /** + * Gyroscope sensor event data. + * @typedef GyroscopeResponse + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + interface GyroscopeResponse extends Response { + /** + * Gyroscope x-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + x: float; + + /** + * Gyroscope y-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + y: float; + + /** + * Gyroscope z-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @atomicservice + * @since 20 + */ + z: float; + } + + /** + * Gyroscope uncalibrated sensor event data. + * @typedef GyroscopeUncalibratedResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface GyroscopeUncalibratedResponse extends Response { + /** + * Gyroscope uncalibrated x-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + x: float; + + /** + * Gyroscope uncalibrated y-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + y: float; + + /** + * Gyroscope uncalibrated z-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + z: float; + + /** + * Gyroscope uncalibrated x-axis offset. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + biasX: float; + + /** + * Gyroscope uncalibrated y-axis offset. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + biasY: float; + + /** + * Gyroscope uncalibrated z-axis offset. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + biasZ: float; + } + + /** + * Significant motion sensor event data. + * @typedef SignificantMotionResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface SignificantMotionResponse extends Response { + /** + * The degree of significant motion. + * Whether the device has a significant motion. + * The value 1 means that the device has a significant motion, and 0 means the opposite. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + scalar: float; + } + + /** + * Proximity sensor event data. + * @typedef ProximityResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface ProximityResponse extends Response { + /** + * Indicates the degree of proximity, event 0 indicates proximity, and greater than 0 indicates distance. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + distance: float; + } + + /** + * Light sensor event data. + * @typedef LightResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface LightResponse extends Response { + /** + * Indicates light intensity, in lux. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + intensity: float; + + /** + * Indicates color temperature, in kelvin. + * @type { ?float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + colorTemperature?: float; + + /** + * Indicates infrared luminance, in cd/m2. + * @type { ?float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + infraredLuminance?: float; + } + + /** + * Hall sensor event data. + * @typedef HallResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface HallResponse extends Response { + /** + * Indicates hall status, 0 indicates open, and greater than 0 indicates suction. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + status: float; + } + + /** + * Magnetic field sensor event data. + * @typedef MagneticFieldResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface MagneticFieldResponse extends Response { + /** + * Magnetic field x-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + x: float; + + /** + * Magnetic field y-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + y: float; + + /** + * Magnetic field z-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + z: float; + } + + /** + * Magnetic field uncalibrated sensor event data. + * @typedef MagneticFieldUncalibratedResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface MagneticFieldUncalibratedResponse extends Response { + /** + * Magnetic field uncalibrated x-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + x: float; + + /** + * Magnetic field uncalibrated y-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + y: float; + + /** + * Magnetic field uncalibrated z-axis component. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + z: float; + + /** + * Magnetic field uncalibrated x-axis offset. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + biasX: float; + + /** + * Magnetic field uncalibrated y-axis offset. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + biasY: float; + + /** + * Magnetic field uncalibrated z-axis offset. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + biasZ: float; + } + + /** + * Pedometer sensor event data. + * @typedef PedometerResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface PedometerResponse extends Response { + /** + * Indicates the number of steps. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + steps: float; + } + + /** + * Humidity sensor event data. + * @typedef HumidityResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface HumidityResponse extends Response { + /** + * Indicates the number of humidity. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + humidity: float; + } + + /** + * Pedometer detection sensor event data. + * @typedef PedometerDetectionResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface PedometerDetectionResponse extends Response { + /** + * Indicates the pedometer detection status, 1 indicates that a walking action has occurred, + * and 0 indicates that no movement has occurred. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + scalar: float; + } + + /** + * Ambient temperature sensor event data. + * @typedef AmbientTemperatureResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface AmbientTemperatureResponse extends Response { + /** + * Indicates ambient temperature, in celsius. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + temperature: float; + } + + /** + * Barometer sensor event data. + * @typedef BarometerResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface BarometerResponse extends Response { + /** + * Indicates the number of barometer, in hpa. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + pressure: float; + } + + /** + * Heart rate sensor event data. + * @typedef HeartRateResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface HeartRateResponse extends Response { + /** + * Indicates the number of heart rate. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + heartRate: float; + } + + /** + * Wear detection sensor event data. + * @typedef WearDetectionResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface WearDetectionResponse extends Response { + /** + * Indicates the status of wear detection, 1 for wearing, 0 for wearing not. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + value: float; + } + + /** + * Color sensor event data. + * @typedef ColorResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface ColorResponse extends Response { + /** + * Indicates the intensity of light, in lux. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + lightIntensity: float; + /** + * Indicates the color temperature, in kelvin. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + colorTemperature: float; + } + + /** + * Sar sensor event data. + * @typedef SarResponse + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + interface SarResponse extends Response { + /** + * Indicates the specific absorption rate, in W/kg. + * @type { float } + * @syscap SystemCapability.Sensors.Sensor + * @since 20 + */ + absorptionRatio: float; + } +} + +export default sensor; \ No newline at end of file diff --git a/api/@ohos.thermal.d.ts b/api/@ohos.thermal.d.ts index 28c9b0938c..bc90f7a1b7 100644 --- a/api/@ohos.thermal.d.ts +++ b/api/@ohos.thermal.d.ts @@ -34,7 +34,7 @@ declare namespace thermal { /** * Enumerates the {@link ThermalLevel} types. * - * @enum {number} + * @enum {int} * @syscap SystemCapability.PowerManager.ThermalManager * @since 8 */ diff --git a/api/@ohos.usbManager.d.ts b/api/@ohos.usbManager.d.ts index ab4f915f81..27ab083de7 100644 --- a/api/@ohos.usbManager.d.ts +++ b/api/@ohos.usbManager.d.ts @@ -1,2396 +1,2521 @@ -/* - * Copyright (c) 2023-2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @file - * @kit BasicServicesKit - */ - -import { AsyncCallback } from './@ohos.base'; - -/** - * This module provides the capability of manage USB device. - * - * @namespace usbManager - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ -declare namespace usbManager { - /** - * Obtains the USB device list. - * - * @returns { Array> } USB device list. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Obtains the USB device list. - * - * @returns { Array> } USB device list. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function getDevices(): Array>; - - /** - * Connects to the USB device based on the device information returned by getDevices(). - * - * @param { USBDevice } device - USB device on the device list returned by getDevices(). It cannot be empty. - * @returns { Readonly } object for data transfer. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Connects to the USB device based on the device information returned by getDevices(). - * - * @param { USBDevice } device - USB device on the device list returned by getDevices(). It cannot be empty. - * @returns { Readonly } object for data transfer. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function connectDevice(device: USBDevice): Readonly; - - /** - * Checks whether the application has the permission to access the device. - * - * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. - * @returns { boolean } indicates if the user has the permission to access the device. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Checks whether the application has the permission to access the device. - * - * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. - * @returns { boolean } indicates if the user has the permission to access the device. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function hasRight(deviceName: string): boolean; - - /** - * Requests the permission for a given application to access the USB device. - * The system application has access to the device by default, and there is no need to call this interface to apply. - * - * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. - * @returns { Promise } indicates if the device access permissions are granted. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Requests the permission for a given application to access the USB device. - * The system application has access to the device by default, and there is no need to call this interface to apply. - * - * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. - * @returns { Promise } indicates if the device access permissions are granted. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function requestRight(deviceName: string): Promise; - - /** - * Remove the permission for a given application to access the USB device. - * The system application has access to the device by default, and calling this interface will not have any impact. - * - * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. - * @returns { boolean } indicates if the device access permissions are removed. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Remove the permission for a given application to access the USB device. - * The system application has access to the device by default, and calling this interface will not have any impact. - * - * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. - * @returns { boolean } indicates if the device access permissions are removed. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function removeRight(deviceName: string): boolean; - - /** - * Add device access permission. - * The system application has access to the device by default, and calling this interface will not have any impact. - * - * @param { string } bundleName - refers to application that require access permissions. It cannot be empty. - * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. - * @returns { boolean } value to indicate whether the permission is granted. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - * @deprecated since 12 - * @useinstead ohos.usbManager/usbManager#addDeviceAccessRight - */ - function addRight(bundleName: string, deviceName: string): boolean; - - /** - * Converts the string descriptor of a given USB function list to a numeric mask combination. - * - * @param { string } funcs - descriptor of the supported function list. It cannot be empty. - * @returns { number } the numeric mask combination of the function list. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - * @deprecated since 12 - * @useinstead ohos.usbManager/usbManager#getFunctionsFromString - */ - function usbFunctionsFromString(funcs: string): number; - - /** - * Converts the numeric mask combination of a given USB function list to a string descriptor. - * - * @param { FunctionType } funcs - numeric mask combination of the function list. The type of funcs must be number. It cannot be empty. - * @returns { string } - descriptor of the supported function list. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - * @deprecated since 12 - * @useinstead ohos.usbManager/usbManager#getStringFromFunctions - */ - function usbFunctionsToString(funcs: FunctionType): string; - - /** - * Sets the current USB function list in Device mode. - * - * @param { FunctionType } funcs - numeric mask combination of the supported function list. It cannot be empty. - * @returns { Promise } the promise returned by the function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 14400002 - Permission denied. The HDC is disabled by the system. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - * @deprecated since 12 - * @useinstead ohos.usbManager/usbManager#setDeviceFunctions - */ - function setCurrentFunctions(funcs: FunctionType): Promise; - - /** - * Obtains the numeric mask combination for the current USB function list in Device mode. - * - * @returns { FunctionType } the numeric mask combination for the current USB function list in FunctionType. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - * @deprecated since 12 - * @useinstead ohos.usbManager/usbManager#getDeviceFunctions - */ - function getCurrentFunctions(): FunctionType; - /* usb port functions begin */ - /** - * Obtains the USBPort list. - * - * @returns { Array } the USBPort list. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - * @deprecated since 12 - * @useinstead ohos.usbManager/usbManager#getPortList - */ - function getPorts(): Array; - - /** - * Gets the mask combination for the supported mode list of the specified USBPort. - * - * @param { number } portId - unique ID of the port. It cannot be empty. - * @returns { PortModeType } the mask combination for the supported mode list in PortModeType. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - * @deprecated since 12 - * @useinstead ohos.usbManager/usbManager#getPortSupportModes - */ - function getSupportedModes(portId: number): PortModeType; - - /** - * Sets the role types supported by the specified USBPort, which can be powerRole (for charging) and dataRole (for data transfer). - * - * @param { number } portId - unique ID of the port. It cannot be empty. - * @param { PowerRoleType } powerRole - charging role. It cannot be empty. - * @param { DataRoleType } dataRole - data role. It cannot be empty. - * @returns { Promise } the promise returned by the function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - * @deprecated since 12 - * @useinstead ohos.usbManager/usbManager#setPortRoleTypes - */ - function setPortRoles(portId: number, powerRole: PowerRoleType, dataRole: DataRoleType): Promise; - - /** - * Add USB device access right. - * The system application has access to the device by default, and calling this interface will not have any impact. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { string } tokenId - refers to application that require access permissions. It cannot be empty. - * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. - * @returns { boolean } value to indicate whether the permission is granted. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 12 - */ - /** - * Add USB device access right. - * The system application has access to the device by default, and calling this interface will not have any impact. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { string } tokenId - refers to application that require access permissions. It cannot be empty. - * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. - * @returns { boolean } value to indicate whether the permission is granted. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 18 - */ - function addDeviceAccessRight(tokenId: string, deviceName: string): boolean; - - /** - * Converts the string descriptor of a given USB function list to a numeric mask combination. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { string } funcs - descriptor of the supported function list. It cannot be empty. - * @returns { number } the numeric mask combination of the function list. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 12 - */ - /** - * Converts the string descriptor of a given USB function list to a numeric mask combination. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { string } funcs - descriptor of the supported function list. It cannot be empty. - * @returns { number } the numeric mask combination of the function list. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 18 - */ - function getFunctionsFromString(funcs: string): number; - - /** - * Converts the numeric mask combination of a given USB function list to a string descriptor. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { FunctionType } funcs - numeric mask combination of the function list. It cannot be empty. - * @returns { string } - descriptor of the supported function list. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 12 - */ - /** - * Converts the numeric mask combination of a given USB function list to a string descriptor. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { FunctionType } funcs - numeric mask combination of the function list. It cannot be empty. - * @returns { string } - descriptor of the supported function list. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 18 - */ - function getStringFromFunctions(funcs: FunctionType): string; - - /** - * Sets the current USB function list in Device mode. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { FunctionType } funcs - numeric mask combination of the supported function list. It cannot be empty. - * @returns { Promise } the promise returned by the function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 14400002 - Permission denied. The HDC is disabled by the system. - * @throws { BusinessError } 14400006 - Unsupported operation. The function is not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 12 - */ - /** - * Sets the current USB function list in Device mode. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { FunctionType } funcs - numeric mask combination of the supported function list. It cannot be empty. - * @returns { Promise } the promise returned by the function. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400002 - Permission denied. The HDC is disabled by the system. - * @throws { BusinessError } 14400006 - Unsupported operation. The function is not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 18 - */ - function setDeviceFunctions(funcs: FunctionType): Promise; - - /** - * Obtains the numeric mask combination for the current USB function list in Device mode. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @returns { FunctionType } the numeric mask combination for the current USB function list in FunctionType. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 12 - */ - /** - * Obtains the numeric mask combination for the current USB function list in Device mode. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @returns { FunctionType } the numeric mask combination for the current USB function list in FunctionType. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 18 - */ - function getDeviceFunctions(): FunctionType; - /* usb port functions begin */ - /** - * Obtains the USBPort list. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @returns { Array } the USBPort list. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 12 - */ - /* usb port functions begin */ - /** - * Obtains the USBPort list. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @returns { Array } the USBPort list. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 18 - */ - function getPortList(): Array; - - /** - * Gets the mask combination for the supported mode list of the specified USBPort. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { number } portId - unique ID of the port. It cannot be empty. - * @returns { PortModeType } the mask combination for the supported mode list in PortModeType. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 12 - */ - /** - * Gets the mask combination for the supported mode list of the specified USBPort. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { number } portId - unique ID of the port. It cannot be empty. - * @returns { PortModeType } the mask combination for the supported mode list in PortModeType. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 18 - */ - function getPortSupportModes(portId: number): PortModeType; - - /** - * Sets the role types supported by the specified USBPort, which can be powerRole (for charging) and dataRole (for data transfer). - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { number } portId - unique ID of the port. It cannot be empty. - * @param { PowerRoleType } powerRole - charging role. It cannot be empty. - * @param { DataRoleType } dataRole - data role. It cannot be empty. - * @returns { Promise } the promise returned by the function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 14400003 - Unsupported operation. The current device does not support port role switching. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 12 - */ - /** - * Sets the role types supported by the specified USBPort, which can be powerRole (for charging) and dataRole (for data transfer). - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { number } portId - unique ID of the port. It cannot be empty. - * @param { PowerRoleType } powerRole - charging role. It cannot be empty. - * @param { DataRoleType } dataRole - data role. It cannot be empty. - * @returns { Promise } the promise returned by the function. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400003 - Unsupported operation. The current device does not support port role switching. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 18 - */ - function setPortRoleTypes(portId: number, powerRole: PowerRoleType, dataRole: DataRoleType): Promise; - - /** - * Adds USB accessory access right. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { number } tokenId - refers to application that require access permissions. It cannot be empty. - * @param { USBAccessory } accessory - USB accessory. It cannot be empty. - * @throws { BusinessError } 201 - The permission check failed. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @throws { BusinessError } 14400005 - Database operation exception. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 14 - */ - /** - * Adds USB accessory access right. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { number } tokenId - refers to application that require access permissions. It cannot be empty. - * @param { USBAccessory } accessory - USB accessory. It cannot be empty. - * @throws { BusinessError } 201 - The permission check failed. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @throws { BusinessError } 14400005 - Database operation exception. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 18 - */ - function addAccessoryRight(tokenId: number, accessory: USBAccessory): void; - /* usb pipe functions begin */ - /** - * Claims a USB interface. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @param { USBInterface } iface - USB interface, which is used to determine the interface to claim. It cannot be empty. - * @param { boolean } [force] - optional parameter that determines whether to forcibly claim the USB interface. - * @returns { number } returns **0** if the USB interface is successfully claimed; returns an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Claims a USB interface. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @param { USBInterface } iface - USB interface, which is used to determine the interface to claim. It cannot be empty. - * @param { boolean } [force] - optional parameter that determines whether to forcibly claim the USB interface. - * @returns { number } returns **0** if the USB interface is successfully claimed; returns an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function claimInterface(pipe: USBDevicePipe, iface: USBInterface, force?: boolean): number; - - /** - * Releases a USB interface. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @param { USBInterface } iface - USB interface, which is used to determine the interface to release. It cannot be empty. - * @returns { number } returns **0** if the USB interface is successfully released; returns an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Releases a USB interface. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @param { USBInterface } iface - USB interface, which is used to determine the interface to release. It cannot be empty. - * @returns { number } returns **0** if the USB interface is successfully released; returns an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function releaseInterface(pipe: USBDevicePipe, iface: USBInterface): number; - - /** - * Sets the device configuration. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @param { USBConfiguration } config - device configuration. It cannot be empty. - * @returns { number } returns **0** if the device configuration is successfully set; returns an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Sets the device configuration. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @param { USBConfiguration } config - device configuration. It cannot be empty. - * @returns { number } returns **0** if the device configuration is successfully set; returns an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function setConfiguration(pipe: USBDevicePipe, config: USBConfiguration): number; - - /** - * Sets a USB interface. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @param { USBInterface } iface - USB interface, which is used to determine the interface to set. It cannot be empty. - * @returns { number } returns **0** if the USB interface is successfully set; return an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Sets a USB interface. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @param { USBInterface } iface - USB interface, which is used to determine the interface to set. It cannot be empty. - * @returns { number } returns **0** if the USB interface is successfully set; return an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function setInterface(pipe: USBDevicePipe, iface: USBInterface): number; - - /** - * Obtains the raw USB descriptor. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @returns { Uint8Array } returns the raw descriptor data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Obtains the raw USB descriptor. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @returns { Uint8Array } returns the raw descriptor data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function getRawDescriptor(pipe: USBDevicePipe): Uint8Array; - - /** - * Obtains the file descriptor. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. - * @returns { number } returns the file descriptor of the USB device. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Obtains the file descriptor. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. - * @returns { number } returns the file descriptor of the USB device. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function getFileDescriptor(pipe: USBDevicePipe): number; - - /** - * Performs control transfer. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. - * @param { USBControlParams } controlparam - control transfer parameters. It cannot be empty. - * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. - * @returns { Promise } returns the size of the transmitted or received data block if the control transfer is successful; - * return -1 if an exception occurs. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - * @deprecated since 12 - * @useinstead ohos.usbManager/usbManager#usbControlTransfer - */ - function controlTransfer(pipe: USBDevicePipe, controlparam: USBControlParams, timeout?: number): Promise; - - /** - * Performs usb control transfer. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. - * @param { USBDeviceRequestParams } requestparam - control transfer parameters. It cannot be empty. - * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. - * @returns { Promise } returns the size of the transmitted or received data block if the control transfer is successful; - * return -1 if an exception occurs. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 12 - */ - /** - * Performs usb control transfer. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. - * @param { USBDeviceRequestParams } requestparam - control transfer parameters. It cannot be empty. - * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. - * @returns { Promise } returns the size of the transmitted or received data block if the control transfer is successful; - * return -1 if an exception occurs. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function usbControlTransfer(pipe: USBDevicePipe, requestparam: USBDeviceRequestParams, timeout?: number): Promise; - - /** - * Performs bulk transfer. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. - * @param { USBEndpoint } endpoint - USB endpoint, which is used to determine the USB port for data transfer. It cannot be empty. - * @param { Uint8Array } buffer - buffer for writing or reading data. It cannot be empty. - * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. - * @returns { Promise } the size of the transmitted or received data block if the control transfer is successful; - * return -1 if an exception occurs. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Performs bulk transfer. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. - * @param { USBEndpoint } endpoint - USB endpoint, which is used to determine the USB port for data transfer. It cannot be empty. - * @param { Uint8Array } buffer - buffer for writing or reading data. It cannot be empty. - * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. - * @returns { Promise } the size of the transmitted or received data block if the control transfer is successful; - * return -1 if an exception occurs. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function bulkTransfer( - pipe: USBDevicePipe, - endpoint: USBEndpoint, - buffer: Uint8Array, - timeout?: number - ): Promise; - - /** - * Closes a USB device pipe. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. - * @returns { number } returns **0** if the USB device pipe is closed successfully; return an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Closes a USB device pipe. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. - * @returns { number } returns **0** if the USB device pipe is closed successfully; return an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function closePipe(pipe: USBDevicePipe): number; - - /** - * Checks whether the application has the right to access the USB accessory. - * - * @param { USBAccessory } accessory - USB accessory. It cannot be empty. - * @returns { boolean } indicates if the user has the right to access the USB accessory. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @throws { BusinessError } 14400005 - Database operation exception. - * @throws { BusinessError } 14401001 - The target USBAccessory not matched. - * @syscap SystemCapability.USB.USBManager - * @since 14 - */ - /** - * Checks whether the application has the right to access the USB accessory. - * - * @param { USBAccessory } accessory - USB accessory. It cannot be empty. - * @returns { boolean } indicates if the user has the right to access the USB accessory. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @throws { BusinessError } 14400005 - Database operation exception. - * @throws { BusinessError } 14401001 - The target USBAccessory not matched. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function hasAccessoryRight(accessory: USBAccessory): boolean; - - /** - * Requests the right for a given application to access the USB accessory. - * - * @param { USBAccessory } accessory - USB accessory. It cannot be empty. - * @returns { Promise } indicates if the USB accessory access right are granted. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @throws { BusinessError } 14400005 - Database operation exception. - * @throws { BusinessError } 14401001 - The target USBAccessory not matched. - * @syscap SystemCapability.USB.USBManager - * @since 14 - */ - /** - * Requests the right for a given application to access the USB accessory. - * - * @param { USBAccessory } accessory - USB accessory. It cannot be empty. - * @returns { Promise } indicates if the USB accessory access right are granted. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @throws { BusinessError } 14400005 - Database operation exception. - * @throws { BusinessError } 14401001 - The target USBAccessory not matched. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function requestAccessoryRight(accessory: USBAccessory): Promise; - - /** - * Cancels the right for a given application to access the USB accessory. - * - * @param { USBAccessory } accessory - USB accessory. It cannot be empty. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @throws { BusinessError } 14400005 - Database operation exception. - * @throws { BusinessError } 14401001 - The target USBAccessory not matched. - * @syscap SystemCapability.USB.USBManager - * @since 14 - */ - /** - * Cancels the right for a given application to access the USB accessory. - * - * @param { USBAccessory } accessory - USB accessory. It cannot be empty. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @throws { BusinessError } 14400005 - Database operation exception. - * @throws { BusinessError } 14401001 - The target USBAccessory not matched. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function cancelAccessoryRight(accessory: USBAccessory): void; - - /** - * Obtains the USB Accessory list. - * - * @returns { Array> } USB accessory list. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @syscap SystemCapability.USB.USBManager - * @since 14 - */ - /** - * Obtains the USB Accessory list. - * - * @returns { Array> } USB accessory list. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function getAccessoryList(): Array>; - - /** - * Obtains the accessory handle and opens accessory file descriptor. - * - * @param { USBAccessory } accessory - accessory, which is used to determine the accessory. It cannot be empty. - * @returns { USBAccessoryHandle } returns the handle of the accessory. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @throws { BusinessError } 14401001 - The target USBAccessory not matched. - * @throws { BusinessError } 14401002 - Failed to open the native accessory node. - * @throws { BusinessError } 14401003 - Cannot reopen the accessory. - * @syscap SystemCapability.USB.USBManager - * @since 14 - */ - /** - * Obtains the accessory handle and opens accessory file descriptor. - * - * @param { USBAccessory } accessory - accessory, which is used to determine the accessory. It cannot be empty. - * @returns { USBAccessoryHandle } returns the handle of the accessory. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @throws { BusinessError } 14401001 - The target USBAccessory not matched. - * @throws { BusinessError } 14401002 - Failed to open the native accessory node. - * @throws { BusinessError } 14401003 - Cannot reopen the accessory. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function openAccessory(accessory: USBAccessory): USBAccessoryHandle; - - /** - * Closes the accessory file descriptor. - * - * @param { USBAccessoryHandle } accessoryHandle - Accessory handle to be closed. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @syscap SystemCapability.USB.USBManager - * @since 14 - */ - /** - * Closes the accessory file descriptor. - * - * @param { USBAccessoryHandle } accessoryHandle - Accessory handle to be closed. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function closeAccessory(accessoryHandle: USBAccessoryHandle): void; - - /** - * Represents the USB endpoint from which data is sent or received. You can obtain the USB endpoint through USBInterface. - * - * @typedef USBEndpoint - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - interface USBEndpoint { - /** - * Endpoint address - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - address: number; - - /** - * Endpoint attributes - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - attributes: number; - - /** - * Endpoint interval - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - interval: number; - - /** - * Maximum size of data packets on the endpoint - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - maxPacketSize: number; - - /** - * Endpoint direction - * - * @type { USBRequestDirection } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - direction: USBRequestDirection; - - /** - * Endpoint number - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - number: number; - - /** - * Endpoint type - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - type: number; - - /** - * Unique ID defined by USBInterface.id, which indicates the interface to which the endpoint belongs - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - interfaceId: number; - - - - } - - /** - * Represents a USB interface. One config can contain multiple **USBInterface** instances, each providing a specific function. - * - * @typedef USBInterface - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - interface USBInterface { - /** - * Unique ID of the USB interface - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - id: number; - - /** - * Interface protocol - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - protocol: number; - - /** - * Device type - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - clazz: number; - - /** - * Device subclass - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - subClass: number; - - /** - * Alternation between descriptors of the same USB interface - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - alternateSetting: number; - - /** - * Interface name - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - name: string; - - /** - * USBEndpoint that belongs to the USB interface - * - * @type { Array } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - endpoints: Array; - } - - /** - * USB configuration. One USBDevice can contain multiple USBConfiguration instances. - * - * @typedef USBConfiguration - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - interface USBConfiguration { - /** - * Unique ID of the USB configuration - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - id: number; - - /** - * Configuration attributes - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - attributes: number; - - /** - * Maximum power consumption, in mA - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - maxPower: number; - - /** - * Configuration name, which can be left empty - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - name: string; - - /** - * Support for remote wakeup - * - * @type { boolean } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - isRemoteWakeup: boolean; - - /** - * Support for independent power supplies - * - * @type { boolean } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - isSelfPowered: boolean; - - /** - * Supported interface attributes - * - * @type { Array } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - interfaces: Array; - } - - /** - * Represents a USB device. - * - * @typedef USBDevice - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - interface USBDevice { - /** - * Bus address - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - busNum: number; - - /** - * Device address - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - devAddress: number; - - /** - * Device SN - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - serial: string; - - /** - * Device name - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - name: string; - - /** - * Device manufacturer - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - manufacturerName: string; - - /** - * Product information - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - productName: string; - - /** - * Product version - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - version: string; - - /** - * Vendor ID - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - vendorId: number; - - /** - * Product ID - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - productId: number; - - /** - * Device class - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - clazz: number; - - /** - * Device subclass - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - subClass: number; - - /** - * Device protocol code - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - protocol: number; - - /** - * Device configuration descriptor information - * - * @type { Array } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - configs: Array; - } - - /** - * Represents a USB device pipe, which is used to determine the USB device. - * - * @typedef USBDevicePipe - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - interface USBDevicePipe { - /** - * Bus address. - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - busNum: number; - - /** - * Device address - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - devAddress: number; - } - - /** - * Enumerates power role types. - * - * @enum { number } - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - export enum PowerRoleType { - /** - * None - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - NONE = 0, - - /** - * External power supply - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - SOURCE = 1, - - /** - * Internal power supply - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - SINK = 2 - } - - /** - * Enumerates data role types. - * - * @enum { number } - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - export enum DataRoleType { - /** - * None - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - NONE = 0, - - /** - * Host mode - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - HOST = 1, - - /** - * Device mode - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - DEVICE = 2 - } - - /** - * Enumerates port mode types - * - * @enum { number } - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - export enum PortModeType { - /** - * None - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - NONE = 0, - - /** - * Upstream facing port, which functions as the sink of power supply - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - UFP = 1, - - /** - * Downstream facing port, which functions as the source of power supply - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - DFP = 2, - - /** - * Dynamic reconfiguration port (DRP), which can function as the DFP (host) or UFP (device). It is not supported currently. - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - DRP = 3, - - /** - * Not supported currently - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - NUM_MODES = 4 - } - - /** - * Enumerates USB device port roles. - * - * @typedef USBPortStatus - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - interface USBPortStatus { - /** - * USB mode - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - currentMode: number; - - /** - * Power role - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - currentPowerRole: number; - - /** - * Data role - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - currentDataRole: number; - } - - /** - * Represents a USB device port. - * - * @typedef USBPort - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - interface USBPort { - /** - * Unique ID of the USB port - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - id: number; - - /** - * Mask combination for the supported mode list of the USB port - * - * @type { PortModeType } - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - supportedModes: PortModeType; - - /** - * USB port role - * - * @type { USBPortStatus } - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - status: USBPortStatus; - } - - /** - * Represents control transfer parameters. - * - * @typedef USBControlParams - * @syscap SystemCapability.USB.USBManager - * @since 9 - * @deprecated since 18 - * @useinstead ohos.usbManager/usbManager#USBDeviceRequestParams - */ - interface USBControlParams { - /** - * Request type - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - * @deprecated since 18 - */ - request: number; - - /** - * Request target type - * - * @type { USBRequestTargetType } - * @syscap SystemCapability.USB.USBManager - * @since 9 - * @deprecated since 18 - */ - target: USBRequestTargetType; - - /** - * Control request type - * - * @type { USBControlRequestType } - * @syscap SystemCapability.USB.USBManager - * @since 9 - * @deprecated since 18 - */ - reqType: USBControlRequestType; - - /** - * Request parameter value - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - * @deprecated since 18 - */ - value: number; - - /** - * Index of the parameter value - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - * @deprecated since 18 - */ - index: number; - - /** - * Data written to or read from the buffer - * - * @type { Uint8Array } - * @syscap SystemCapability.USB.USBManager - * @since 9 - * @deprecated since 18 - */ - data: Uint8Array; - } - - /** - * Represents control transfer parameters. - * - * @typedef USBDeviceRequestParams - * @syscap SystemCapability.USB.USBManager - * @since 12 - */ - interface USBDeviceRequestParams { - /** - * Bit map request type - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 12 - */ - bmRequestType: number; - - /** - * Byte request - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 12 - */ - bRequest: number; - - /** - * Request parameter word value - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 12 - */ - wValue: number; - - /** - * Word index of the parameter value - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 12 - */ - wIndex: number; - - /** - * Word length of the parameter value - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 12 - */ - wLength: number; - - /** - * Data written to or read from the buffer - * - * @type { Uint8Array } - * @syscap SystemCapability.USB.USBManager - * @since 12 - */ - data: Uint8Array; - } - - /** - * Enumerates USB request target types. - * - * @enum { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - export enum USBRequestTargetType { - /** - * USB device - * - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - USB_REQUEST_TARGET_DEVICE = 0, - - /** - * USB interface - * - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - USB_REQUEST_TARGET_INTERFACE = 1, - - /** - * Endpoint - * - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - USB_REQUEST_TARGET_ENDPOINT = 2, - - /** - * Others - * - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - USB_REQUEST_TARGET_OTHER = 3 - } - - /** - * Enumerates control request types. - * - * @enum { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - export enum USBControlRequestType { - /** - * Standard - * - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - USB_REQUEST_TYPE_STANDARD = 0, - - /** - * Class - * - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - USB_REQUEST_TYPE_CLASS = 1, - - /** - * Vendor - * - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - USB_REQUEST_TYPE_VENDOR = 2 - } - - /** - * Enumerates request directions. - * - * @enum { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - export enum USBRequestDirection { - /** - * Request for writing data from the host to the device - * - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - USB_REQUEST_DIR_TO_DEVICE = 0, - - /** - * Request for reading data from the device to the host - * - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - USB_REQUEST_DIR_FROM_DEVICE = 0x80 - } - - /** - * Enumerates function modes. - * - * @enum { number } - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - export enum FunctionType { - /** - * None - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - NONE = 0, - - /** - * Serial port device - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - ACM = 1, - - /** - * Ethernet port device - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - ECM = 2, - - /** - * HDC device - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - HDC = 4, - - /** - * MTP device - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - MTP = 8, - - /** - * PTP device - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - PTP = 16, - - /** - * RNDIS device - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - RNDIS = 32, - - /** - * MIDI device - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - MIDI = 64, - - /** - * Audio source device - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - AUDIO_SOURCE = 128, - - /** - * NCM device - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - */ - NCM = 256 - } - - /** - * Represents a USB Accessory. - * - * @typedef USBAccessory - * @syscap SystemCapability.USB.USBManager - * @since 14 - */ - interface USBAccessory { - /** - * The manufacturer name of the accessory. - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since 14 - */ - manufacturer: string; - - /** - * The product of the accessory. - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since 14 - */ - product: string; - - /** - * The user visible description of the accessory. - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since 14 - */ - description: string; - - /** - * The version of the accessory. - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since 14 - */ - version: string; - - /** - * The serial number of the accessory. - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since 14 - */ - serialNumber: string; - } - - /** - * Handle of accessory. - * - * @typedef USBAccessoryHandle - * @syscap SystemCapability.USB.USBManager - * @since 14 - */ - interface USBAccessoryHandle { - /** - * The file descriptor of the accessory.The valid USBAccessoryHandle.accessoryFd is a positive value. - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 14 - */ - accessoryFd: number; - } - - /** - * Usb transfer flag. - * - * @enum { number } - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - export enum UsbTransferFlags { - /** - * Report short frames as errors - * - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - USB_TRANSFER_SHORT_NOT_OK = 0, - - /** - * Automatically free transfer buffer - * - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - USB_TRANSFER_FREE_BUFFER = 1, - - /** - * Automatically free transfer after callback returns - * - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - USB_TRANSFER_FREE_TRANSFER = 2, - - /** - * Transmissions that are multiples of wMaxPacketSize will add an additional zero packet. - * - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - USB_TRANSFER_ADD_ZERO_PACKET = 3 - } - - /** - * Usb transfer status. - * - * @enum { number } - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - export enum UsbTransferStatus { - /** - * Transfer completed - * - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - TRANSFER_COMPLETED = 0, - - /** - * Transfer failed - * - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - TRANSFER_ERROR = 1, - - /** - * Transfer timed out - * - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - TRANSFER_TIMED_OUT = 2, - - /** - * Transfer was canceled - * - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - TRANSFER_CANCELED = 3, - - /** - * For bulk/interrupt endpoints: halt condition detected (endpoint - * stalled). For control endpoints: control request not supported. - * - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - TRANSFER_STALL = 4, - - /** - * Device was disconnected - * - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - TRANSFER_NO_DEVICE = 5, - - /** - * Device sent more data than requested - * - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - TRANSFER_OVERFLOW = 6 - } - - /** - * USB DATA transfer type. - * - * @enum { number } - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - export enum UsbEndpointTransferType { - /** - * Isochronous endpoint - * - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - TRANSFER_TYPE_ISOCHRONOUS = 0x1, - - /** - * Bulk endpoint - * - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - TRANSFER_TYPE_BULK = 0x2, - - /** - * Interrupt endpoint - * - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - TRANSFER_TYPE_INTERRUPT = 0x3 - } - - /** - * Isochronous packet descriptors, only for isochronous transfers. - * - * @typedef UsbIsoPacketDescriptor - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - interface UsbIsoPacketDescriptor { - /** - * Length of data to request in this packet - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - length: number; - - /** - * Amount of data that was actually transferred - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - actualLength: number; - - /** - * Status code for this packet - * - * @type { UsbTransferStatus } - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - status: UsbTransferStatus; - } - - /** - * submit transfer callback. - * - * @typedef SubmitTransferCallback - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - interface SubmitTransferCallback { - /** - * Actual length of data that was transferred. Read-only, and only for - * use within transfer callback function. Not valid for isochronous endpoint transfers. - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - actualLength: number; - - /** - * The status of the transfer. Read-only, and only for use within transfer callback function. - * - * @type { UsbTransferStatus } - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - status: UsbTransferStatus; - - /** - * Isochronous packet descriptors, for isochronous transfers only. - * - * @type { Array> } - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - isoPacketDescs: Array>; - } - - /** - * As a generic USB data transfer interface. The Client populates this interface and - * submits it in order to request a transfer. - * - * @typedef UsbDataTransferParams - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - interface UsbDataTransferParams { - /** - * Pipe of the device that this data transfer will be submitted to. - * - * @type { USBDevicePipe } - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - devPipe: USBDevicePipe; - - /** - * A bitwise OR combination of UsbTransferFlags. - * - * @type { UsbTransferFlags } - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - flags: UsbTransferFlags; - - /** - * Address of the endpoint where this transfer will be sent. - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - endpoint: number; - - /** - * Type of the transfer - * - * @type { UsbEndpointTransferType } - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - type: UsbEndpointTransferType; - - /** - * Timeout for this transfer in milliseconds. A value of 0 indicates no timeout. - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - timeout: number; - - /** - * Length of the data buffer. Must be non-negative. - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - length: number; - - /** - * Callback function. This will be invoked when the transfer completes, fails, or is canceled. - * - * @type { AsyncCallback } - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - callback: AsyncCallback; - - /** - * User context data. Useful for associating specific data to a transfer - * that can be accessed from within the callback function. - * - * @type { Uint8Array } - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - userData: Uint8Array; - - /** - * Data buffer - * - * @type { Uint8Array } - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - buffer: Uint8Array; - - /** - * Count of isochronous packets. Only used for I/O with isochronous endpoints. Must be non-negative. - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - isoPacketCount: number; - } - - /** - * Submit USB data transfer. - * - * @param { transfer } As a generic USB data transfer interface. The Client populates this interface and - * submits it in order to request a transfer - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. - * @throws { BusinessError } 14400007 - Resource busy. Possible causes: - *
    1. The transfer has already been submitted. - *
    2. The interface is claimed by another program or driver. - * @throws { BusinessError } 14400008 - No such device (it may have been disconnected). - * @throws { BusinessError } 14400009 - Insufficient memory. Possible causes: - *
    1. Memory allocation failed. - * @throws { BusinessError } 14400012 - Transmission I/O error. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function usbSubmitTransfer(transfer: UsbDataTransferParams): void; - - /** - * Cancel USB data transfer. - * - * @param { transfer } Cancel the target transfer - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. - * @throws { BusinessError } 14400008 - No such device (it may have been disconnected). - * @throws { BusinessError } 14400010 - Other USB error. Possible causes: - *
    1.Unrecognized discard error code. - * @throws { BusinessError } 14400011 - The transfer is not in progress, or is already complete or cancelled. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function usbCancelTransfer(transfer: UsbDataTransferParams): void; - - /** - * Perform a USB port reset to reinitialize a usb device. The operation will attempt to restore the previous configuration - * and alternate interface settings after the reset has completed. - * - * @param { USBDevicePipe } pipe - Represents a USB device,which is the target object to be restarted.It cannot be empty. - * @returns { boolean } If the restart operation is successful, return {@code true}; if the restart operation fails, return {@code false}. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. - * @throws { BusinessError } 14400004 -Service exception. Possible causes: 1. No accessory is plugged in.. - * @throws { BusinessError } 14400008 - No such device(it may have been disconnected) - * @throws { BusinessError } 14400010 - Other USB error. Possible causes: - *
    1.Unrecognized discard error code. - * @throws { BusinessError } 14400013 - The USBDevicePipe validity check failed. Possible causes: - *
    1.The input parameters fail the validation check. - *
    2.The call chain used to obtain the input parameters is not reasonable. - * @syscap SystemCapability.USB.USBManager - * @since 20 - */ - function resetUsbDevice(pipe: USBDevicePipe): boolean; - - - - - -} - +/* + * Copyright (c) 2023-2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file + * @kit BasicServicesKit + */ + +import { AsyncCallback } from './@ohos.base'; + +/** + * This module provides the capability of manage USB device. + * + * @namespace usbManager + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ +declare namespace usbManager { + /** + * Obtains the USB device list. + * + * @returns { Array> } USB device list. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Obtains the USB device list. + * + * @returns { Array> } USB device list. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function getDevices(): Array>; + + /** + * Connects to the USB device based on the device information returned by getDevices(). + * + * @param { USBDevice } device - USB device on the device list returned by getDevices(). It cannot be empty. + * @returns { Readonly } object for data transfer. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Connects to the USB device based on the device information returned by getDevices(). + * + * @param { USBDevice } device - USB device on the device list returned by getDevices(). It cannot be empty. + * @returns { Readonly } object for data transfer. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function connectDevice(device: USBDevice): Readonly; + + /** + * Checks whether the application has the permission to access the device. + * + * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. + * @returns { boolean } indicates if the user has the permission to access the device. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Checks whether the application has the permission to access the device. + * + * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. + * @returns { boolean } indicates if the user has the permission to access the device. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function hasRight(deviceName: string): boolean; + + /** + * Requests the permission for a given application to access the USB device. + * The system application has access to the device by default, and there is no need to call this interface to apply. + * + * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. + * @returns { Promise } indicates if the device access permissions are granted. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Requests the permission for a given application to access the USB device. + * The system application has access to the device by default, and there is no need to call this interface to apply. + * + * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. + * @returns { Promise } indicates if the device access permissions are granted. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function requestRight(deviceName: string): Promise; + + /** + * Remove the permission for a given application to access the USB device. + * The system application has access to the device by default, and calling this interface will not have any impact. + * + * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. + * @returns { boolean } indicates if the device access permissions are removed. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Remove the permission for a given application to access the USB device. + * The system application has access to the device by default, and calling this interface will not have any impact. + * + * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. + * @returns { boolean } indicates if the device access permissions are removed. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function removeRight(deviceName: string): boolean; + + /** + * Add device access permission. + * The system application has access to the device by default, and calling this interface will not have any impact. + * + * @param { string } bundleName - refers to application that require access permissions. It cannot be empty. + * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. + * @returns { boolean } value to indicate whether the permission is granted. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + * @deprecated since 12 + * @useinstead ohos.usbManager/usbManager#addDeviceAccessRight + */ + function addRight(bundleName: string, deviceName: string): boolean; + + /** + * Converts the string descriptor of a given USB function list to a numeric mask combination. + * + * @param { string } funcs - descriptor of the supported function list. It cannot be empty. + * @returns { number } the numeric mask combination of the function list. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + * @deprecated since 12 + * @useinstead ohos.usbManager/usbManager#getFunctionsFromString + */ + function usbFunctionsFromString(funcs: string): number; + + /** + * Converts the numeric mask combination of a given USB function list to a string descriptor. + * + * @param { FunctionType } funcs - numeric mask combination of the function list. The type of funcs must be number. It cannot be empty. + * @returns { string } - descriptor of the supported function list. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + * @deprecated since 12 + * @useinstead ohos.usbManager/usbManager#getStringFromFunctions + */ + function usbFunctionsToString(funcs: FunctionType): string; + + /** + * Sets the current USB function list in Device mode. + * + * @param { FunctionType } funcs - numeric mask combination of the supported function list. It cannot be empty. + * @returns { Promise } the promise returned by the function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 14400002 - Permission denied. The HDC is disabled by the system. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + * @deprecated since 12 + * @useinstead ohos.usbManager/usbManager#setDeviceFunctions + */ + function setCurrentFunctions(funcs: FunctionType): Promise; + + /** + * Obtains the numeric mask combination for the current USB function list in Device mode. + * + * @returns { FunctionType } the numeric mask combination for the current USB function list in FunctionType. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + * @deprecated since 12 + * @useinstead ohos.usbManager/usbManager#getDeviceFunctions + */ + function getCurrentFunctions(): FunctionType; + /* usb port functions begin */ + /** + * Obtains the USBPort list. + * + * @returns { Array } the USBPort list. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + * @deprecated since 12 + * @useinstead ohos.usbManager/usbManager#getPortList + */ + function getPorts(): Array; + + /** + * Gets the mask combination for the supported mode list of the specified USBPort. + * + * @param { number } portId - unique ID of the port. It cannot be empty. + * @returns { PortModeType } the mask combination for the supported mode list in PortModeType. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + * @deprecated since 12 + * @useinstead ohos.usbManager/usbManager#getPortSupportModes + */ + function getSupportedModes(portId: number): PortModeType; + + /** + * Sets the role types supported by the specified USBPort, which can be powerRole (for charging) and dataRole (for data transfer). + * + * @param { number } portId - unique ID of the port. It cannot be empty. + * @param { PowerRoleType } powerRole - charging role. It cannot be empty. + * @param { DataRoleType } dataRole - data role. It cannot be empty. + * @returns { Promise } the promise returned by the function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + * @deprecated since 12 + * @useinstead ohos.usbManager/usbManager#setPortRoleTypes + */ + function setPortRoles(portId: number, powerRole: PowerRoleType, dataRole: DataRoleType): Promise; + + /** + * Add USB device access right. + * The system application has access to the device by default, and calling this interface will not have any impact. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { string } tokenId - refers to application that require access permissions. It cannot be empty. + * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. + * @returns { boolean } value to indicate whether the permission is granted. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 12 + */ + /** + * Add USB device access right. + * The system application has access to the device by default, and calling this interface will not have any impact. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { string } tokenId - refers to application that require access permissions. It cannot be empty. + * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. + * @returns { boolean } value to indicate whether the permission is granted. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function addDeviceAccessRight(tokenId: string, deviceName: string): boolean; + + /** + * Converts the string descriptor of a given USB function list to a numeric mask combination. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { string } funcs - descriptor of the supported function list. It cannot be empty. + * @returns { number } the numeric mask combination of the function list. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 12 + */ + /** + * Converts the string descriptor of a given USB function list to a numeric mask combination. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { string } funcs - descriptor of the supported function list. It cannot be empty. + * @returns { int } the numeric mask combination of the function list. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function getFunctionsFromString(funcs: string): int; + + /** + * Converts the numeric mask combination of a given USB function list to a string descriptor. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { FunctionType } funcs - numeric mask combination of the function list. It cannot be empty. + * @returns { string } - descriptor of the supported function list. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 12 + */ + /** + * Converts the numeric mask combination of a given USB function list to a string descriptor. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { FunctionType } funcs - numeric mask combination of the function list. It cannot be empty. + * @returns { string } - descriptor of the supported function list. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function getStringFromFunctions(funcs: FunctionType): string; + + /** + * Sets the current USB function list in Device mode. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { FunctionType } funcs - numeric mask combination of the supported function list. It cannot be empty. + * @returns { Promise } the promise returned by the function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 14400002 - Permission denied. The HDC is disabled by the system. + * @throws { BusinessError } 14400006 - Unsupported operation. The function is not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 12 + */ + /** + * Sets the current USB function list in Device mode. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { FunctionType } funcs - numeric mask combination of the supported function list. It cannot be empty. + * @returns { Promise } the promise returned by the function. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400002 - Permission denied. The HDC is disabled by the system. + * @throws { BusinessError } 14400006 - Unsupported operation. The function is not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function setDeviceFunctions(funcs: FunctionType): Promise; + + /** + * Obtains the numeric mask combination for the current USB function list in Device mode. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @returns { FunctionType } the numeric mask combination for the current USB function list in FunctionType. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 12 + */ + /** + * Obtains the numeric mask combination for the current USB function list in Device mode. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @returns { FunctionType } the numeric mask combination for the current USB function list in FunctionType. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function getDeviceFunctions(): FunctionType; + /* usb port functions begin */ + /** + * Obtains the USBPort list. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @returns { Array } the USBPort list. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 12 + */ + /* usb port functions begin */ + /** + * Obtains the USBPort list. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @returns { Array } the USBPort list. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function getPortList(): Array; + + /** + * Gets the mask combination for the supported mode list of the specified USBPort. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { number } portId - unique ID of the port. It cannot be empty. + * @returns { PortModeType } the mask combination for the supported mode list in PortModeType. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 12 + */ + /** + * Gets the mask combination for the supported mode list of the specified USBPort. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { int } portId - unique ID of the port. It cannot be empty. + * @returns { PortModeType } the mask combination for the supported mode list in PortModeType. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function getPortSupportModes(portId: int): PortModeType; + + /** + * Sets the role types supported by the specified USBPort, which can be powerRole (for charging) and dataRole (for data transfer). + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { number } portId - unique ID of the port. It cannot be empty. + * @param { PowerRoleType } powerRole - charging role. It cannot be empty. + * @param { DataRoleType } dataRole - data role. It cannot be empty. + * @returns { Promise } the promise returned by the function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 14400003 - Unsupported operation. The current device does not support port role switching. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 12 + */ + /** + * Sets the role types supported by the specified USBPort, which can be powerRole (for charging) and dataRole (for data transfer). + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { int } portId - unique ID of the port. It cannot be empty. + * @param { PowerRoleType } powerRole - charging role. It cannot be empty. + * @param { DataRoleType } dataRole - data role. It cannot be empty. + * @returns { Promise } the promise returned by the function. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400003 - Unsupported operation. The current device does not support port role switching. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function setPortRoleTypes(portId: int, powerRole: PowerRoleType, dataRole: DataRoleType): Promise; + + /** + * Adds USB accessory access right. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { number } tokenId - refers to application that require access permissions. It cannot be empty. + * @param { USBAccessory } accessory - USB accessory. It cannot be empty. + * @throws { BusinessError } 201 - The permission check failed. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @throws { BusinessError } 14400005 - Database operation exception. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 14 + */ + /** + * Adds USB accessory access right. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { int } tokenId - refers to application that require access permissions. It cannot be empty. + * @param { USBAccessory } accessory - USB accessory. It cannot be empty. + * @throws { BusinessError } 201 - The permission check failed. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @throws { BusinessError } 14400005 - Database operation exception. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function addAccessoryRight(tokenId: number, accessory: USBAccessory): void; + /* usb pipe functions begin */ + /** + * Claims a USB interface. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @param { USBInterface } iface - USB interface, which is used to determine the interface to claim. It cannot be empty. + * @param { boolean } [force] - optional parameter that determines whether to forcibly claim the USB interface. + * @returns { number } returns **0** if the USB interface is successfully claimed; returns an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Claims a USB interface. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @param { USBInterface } iface - USB interface, which is used to determine the interface to claim. It cannot be empty. + * @param { boolean } [force] - optional parameter that determines whether to forcibly claim the USB interface. + * @returns { int } returns **0** if the USB interface is successfully claimed; returns an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function claimInterface(pipe: USBDevicePipe, iface: USBInterface, force?: boolean): int; + + /** + * Releases a USB interface. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @param { USBInterface } iface - USB interface, which is used to determine the interface to release. It cannot be empty. + * @returns { number } returns **0** if the USB interface is successfully released; returns an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Releases a USB interface. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @param { USBInterface } iface - USB interface, which is used to determine the interface to release. It cannot be empty. + * @returns { int } returns **0** if the USB interface is successfully released; returns an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function releaseInterface(pipe: USBDevicePipe, iface: USBInterface): int; + + /** + * Sets the device configuration. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @param { USBConfiguration } config - device configuration. It cannot be empty. + * @returns { number } returns **0** if the device configuration is successfully set; returns an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Sets the device configuration. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @param { USBConfiguration } config - device configuration. It cannot be empty. + * @returns { int } returns **0** if the device configuration is successfully set; returns an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function setConfiguration(pipe: USBDevicePipe, config: USBConfiguration): int; + + /** + * Sets a USB interface. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @param { USBInterface } iface - USB interface, which is used to determine the interface to set. It cannot be empty. + * @returns { number } returns **0** if the USB interface is successfully set; return an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Sets a USB interface. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @param { USBInterface } iface - USB interface, which is used to determine the interface to set. It cannot be empty. + * @returns { int } returns **0** if the USB interface is successfully set; return an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function setInterface(pipe: USBDevicePipe, iface: USBInterface): int; + + /** + * Obtains the raw USB descriptor. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @returns { Uint8Array } returns the raw descriptor data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Obtains the raw USB descriptor. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @returns { Uint8Array } returns the raw descriptor data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function getRawDescriptor(pipe: USBDevicePipe): Uint8Array; + + /** + * Obtains the file descriptor. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. + * @returns { number } returns the file descriptor of the USB device. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Obtains the file descriptor. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. + * @returns { int } returns the file descriptor of the USB device. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function getFileDescriptor(pipe: USBDevicePipe): int; + + /** + * Performs control transfer. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. + * @param { USBControlParams } controlparam - control transfer parameters. It cannot be empty. + * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. + * @returns { Promise } returns the size of the transmitted or received data block if the control transfer is successful; + * return -1 if an exception occurs. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + * @deprecated since 12 + * @useinstead ohos.usbManager/usbManager#usbControlTransfer + */ + function controlTransfer(pipe: USBDevicePipe, controlparam: USBControlParams, timeout?: number): Promise; + + /** + * Performs usb control transfer. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. + * @param { USBDeviceRequestParams } requestparam - control transfer parameters. It cannot be empty. + * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. + * @returns { Promise } returns the size of the transmitted or received data block if the control transfer is successful; + * return -1 if an exception occurs. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 12 + */ + /** + * Performs usb control transfer. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. + * @param { USBDeviceRequestParams } requestparam - control transfer parameters. It cannot be empty. + * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. + * @returns { Promise } returns the size of the transmitted or received data block if the control transfer is successful; + * return -1 if an exception occurs. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function usbControlTransfer(pipe: USBDevicePipe, requestparam: USBDeviceRequestParams, timeout?: int): Promise; + + /** + * Performs bulk transfer. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. + * @param { USBEndpoint } endpoint - USB endpoint, which is used to determine the USB port for data transfer. It cannot be empty. + * @param { Uint8Array } buffer - buffer for writing or reading data. It cannot be empty. + * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. + * @returns { Promise } the size of the transmitted or received data block if the control transfer is successful; + * return -1 if an exception occurs. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Performs bulk transfer. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. + * @param { USBEndpoint } endpoint - USB endpoint, which is used to determine the USB port for data transfer. It cannot be empty. + * @param { Uint8Array } buffer - buffer for writing or reading data. It cannot be empty. + * @param { int } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. + * @returns { Promise } the size of the transmitted or received data block if the control transfer is successful; + * return -1 if an exception occurs. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function bulkTransfer( + pipe: USBDevicePipe, + endpoint: USBEndpoint, + buffer: Uint8Array, + timeout?: int + ): Promise; + + /** + * Closes a USB device pipe. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. + * @returns { number } returns **0** if the USB device pipe is closed successfully; return an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Closes a USB device pipe. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. + * @returns { int } returns **0** if the USB device pipe is closed successfully; return an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function closePipe(pipe: USBDevicePipe): int; + + /** + * Checks whether the application has the right to access the USB accessory. + * + * @param { USBAccessory } accessory - USB accessory. It cannot be empty. + * @returns { boolean } indicates if the user has the right to access the USB accessory. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @throws { BusinessError } 14400005 - Database operation exception. + * @throws { BusinessError } 14401001 - The target USBAccessory not matched. + * @syscap SystemCapability.USB.USBManager + * @since 14 + */ + /** + * Checks whether the application has the right to access the USB accessory. + * + * @param { USBAccessory } accessory - USB accessory. It cannot be empty. + * @returns { boolean } indicates if the user has the right to access the USB accessory. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @throws { BusinessError } 14400005 - Database operation exception. + * @throws { BusinessError } 14401001 - The target USBAccessory not matched. + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function hasAccessoryRight(accessory: USBAccessory): boolean; + + /** + * Requests the right for a given application to access the USB accessory. + * + * @param { USBAccessory } accessory - USB accessory. It cannot be empty. + * @returns { Promise } indicates if the USB accessory access right are granted. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @throws { BusinessError } 14400005 - Database operation exception. + * @throws { BusinessError } 14401001 - The target USBAccessory not matched. + * @syscap SystemCapability.USB.USBManager + * @since 14 + */ + /** + * Requests the right for a given application to access the USB accessory. + * + * @param { USBAccessory } accessory - USB accessory. It cannot be empty. + * @returns { Promise } indicates if the USB accessory access right are granted. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @throws { BusinessError } 14400005 - Database operation exception. + * @throws { BusinessError } 14401001 - The target USBAccessory not matched. + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function requestAccessoryRight(accessory: USBAccessory): Promise; + + /** + * Cancels the right for a given application to access the USB accessory. + * + * @param { USBAccessory } accessory - USB accessory. It cannot be empty. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @throws { BusinessError } 14400005 - Database operation exception. + * @throws { BusinessError } 14401001 - The target USBAccessory not matched. + * @syscap SystemCapability.USB.USBManager + * @since 14 + */ + /** + * Cancels the right for a given application to access the USB accessory. + * + * @param { USBAccessory } accessory - USB accessory. It cannot be empty. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @throws { BusinessError } 14400005 - Database operation exception. + * @throws { BusinessError } 14401001 - The target USBAccessory not matched. + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function cancelAccessoryRight(accessory: USBAccessory): void; + + /** + * Obtains the USB Accessory list. + * + * @returns { Array> } USB accessory list. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @syscap SystemCapability.USB.USBManager + * @since 14 + */ + /** + * Obtains the USB Accessory list. + * + * @returns { Array> } USB accessory list. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function getAccessoryList(): Array>; + + /** + * Obtains the accessory handle and opens accessory file descriptor. + * + * @param { USBAccessory } accessory - accessory, which is used to determine the accessory. It cannot be empty. + * @returns { USBAccessoryHandle } returns the handle of the accessory. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @throws { BusinessError } 14401001 - The target USBAccessory not matched. + * @throws { BusinessError } 14401002 - Failed to open the native accessory node. + * @throws { BusinessError } 14401003 - Cannot reopen the accessory. + * @syscap SystemCapability.USB.USBManager + * @since 14 + */ + /** + * Obtains the accessory handle and opens accessory file descriptor. + * + * @param { USBAccessory } accessory - accessory, which is used to determine the accessory. It cannot be empty. + * @returns { USBAccessoryHandle } returns the handle of the accessory. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @throws { BusinessError } 14401001 - The target USBAccessory not matched. + * @throws { BusinessError } 14401002 - Failed to open the native accessory node. + * @throws { BusinessError } 14401003 - Cannot reopen the accessory. + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function openAccessory(accessory: USBAccessory): USBAccessoryHandle; + + /** + * Closes the accessory file descriptor. + * + * @param { USBAccessoryHandle } accessoryHandle - Accessory handle to be closed. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @syscap SystemCapability.USB.USBManager + * @since 14 + */ + /** + * Closes the accessory file descriptor. + * + * @param { USBAccessoryHandle } accessoryHandle - Accessory handle to be closed. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function closeAccessory(accessoryHandle: USBAccessoryHandle): void; + + /** + * Represents the USB endpoint from which data is sent or received. You can obtain the USB endpoint through USBInterface. + * + * @typedef USBEndpoint + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + interface USBEndpoint { + /** + * Endpoint address + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + address: int; + + /** + * Endpoint attributes + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + attributes: int; + + /** + * Endpoint interval + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + interval: int; + + /** + * Maximum size of data packets on the endpoint + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + maxPacketSize: int; + + /** + * Endpoint direction + * + * @type { USBRequestDirection } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + direction: USBRequestDirection; + + /** + * Endpoint number + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + number: number; + + /** + * Endpoint type + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + type: int; + + /** + * Unique ID defined by USBInterface.id, which indicates the interface to which the endpoint belongs + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + interfaceId: number; + + + + } + + /** + * Represents a USB interface. One config can contain multiple **USBInterface** instances, each providing a specific function. + * + * @typedef USBInterface + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + interface USBInterface { + /** + * Unique ID of the USB interface + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + id: int; + + /** + * Interface protocol + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + protocol: int; + + /** + * Device type + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + clazz: int; + + /** + * Device subclass + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + subClass: int; + + /** + * Alternation between descriptors of the same USB interface + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + alternateSetting: int; + + /** + * Interface name + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + name: string; + + /** + * USBEndpoint that belongs to the USB interface + * + * @type { Array } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + endpoints: Array; + } + + /** + * USB configuration. One USBDevice can contain multiple USBConfiguration instances. + * + * @typedef USBConfiguration + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + interface USBConfiguration { + /** + * Unique ID of the USB configuration + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + id: int; + + /** + * Configuration attributes + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + attributes: int; + + /** + * Maximum power consumption, in mA + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + maxPower: int; + + /** + * Configuration name, which can be left empty + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + name: string; + + /** + * Support for remote wakeup + * + * @type { boolean } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + isRemoteWakeup: boolean; + + /** + * Support for independent power supplies + * + * @type { boolean } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + isSelfPowered: boolean; + + /** + * Supported interface attributes + * + * @type { Array } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + interfaces: Array; + } + + /** + * Represents a USB device. + * + * @typedef USBDevice + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + interface USBDevice { + /** + * Bus address + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + busNum: int; + + /** + * Device address + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + devAddress: int; + + /** + * Device SN + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + serial: string; + + /** + * Device name + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + name: string; + + /** + * Device manufacturer + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + manufacturerName: string; + + /** + * Product information + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + productName: string; + + /** + * Product version + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + version: string; + + /** + * Vendor ID + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + vendorId: int; + + /** + * Product ID + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + productId: int; + + /** + * Device class + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + clazz: int; + + /** + * Device subclass + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + subClass: int; + + /** + * Device protocol code + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + protocol: int; + + /** + * Device configuration descriptor information + * + * @type { Array } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + configs: Array; + } + + /** + * Represents a USB device pipe, which is used to determine the USB device. + * + * @typedef USBDevicePipe + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + interface USBDevicePipe { + /** + * Bus address. + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + busNum: int; + + /** + * Device address + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + devAddress: int; + } + + /** + * Enumerates power role types. + * + * @enum { int } + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + export enum PowerRoleType { + /** + * None + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + NONE = 0, + + /** + * External power supply + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + SOURCE = 1, + + /** + * Internal power supply + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + SINK = 2 + } + + /** + * Enumerates data role types. + * + * @enum { int } + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + export enum DataRoleType { + /** + * None + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + NONE = 0, + + /** + * Host mode + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + HOST = 1, + + /** + * Device mode + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + DEVICE = 2 + } + + /** + * Enumerates port mode types + * + * @enum { int } + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + export enum PortModeType { + /** + * None + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + NONE = 0, + + /** + * Upstream facing port, which functions as the sink of power supply + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + UFP = 1, + + /** + * Downstream facing port, which functions as the source of power supply + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + DFP = 2, + + /** + * Dynamic reconfiguration port (DRP), which can function as the DFP (host) or UFP (device). It is not supported currently. + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + DRP = 3, + + /** + * Not supported currently + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + NUM_MODES = 4 + } + + /** + * Enumerates USB device port roles. + * + * @typedef USBPortStatus + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + interface USBPortStatus { + /** + * USB mode + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + currentMode: int; + + /** + * Power role + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + currentPowerRole: int; + + /** + * Data role + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + currentDataRole: int; + } + + /** + * Represents a USB device port. + * + * @typedef USBPort + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + interface USBPort { + /** + * Unique ID of the USB port + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + id: int; + + /** + * Mask combination for the supported mode list of the USB port + * + * @type { PortModeType } + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + supportedModes: PortModeType; + + /** + * USB port role + * + * @type { USBPortStatus } + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + status: USBPortStatus; + } + + /** + * Represents control transfer parameters. + * + * @typedef USBControlParams + * @syscap SystemCapability.USB.USBManager + * @since 9 + * @deprecated since 18 + * @useinstead ohos.usbManager/usbManager#USBDeviceRequestParams + */ + interface USBControlParams { + /** + * Request type + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + * @deprecated since 18 + */ + request: number; + + /** + * Request target type + * + * @type { USBRequestTargetType } + * @syscap SystemCapability.USB.USBManager + * @since 9 + * @deprecated since 18 + */ + target: USBRequestTargetType; + + /** + * Control request type + * + * @type { USBControlRequestType } + * @syscap SystemCapability.USB.USBManager + * @since 9 + * @deprecated since 18 + */ + reqType: USBControlRequestType; + + /** + * Request parameter value + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + * @deprecated since 18 + */ + value: number; + + /** + * Index of the parameter value + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + * @deprecated since 18 + */ + index: number; + + /** + * Data written to or read from the buffer + * + * @type { Uint8Array } + * @syscap SystemCapability.USB.USBManager + * @since 9 + * @deprecated since 18 + */ + data: Uint8Array; + } + + /** + * Represents control transfer parameters. + * + * @typedef USBDeviceRequestParams + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ + interface USBDeviceRequestParams { + /** + * Bit map request type + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ + bmRequestType: int; + + /** + * Byte request + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ + bRequest: int; + + /** + * Request parameter word value + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ + wValue: int; + + /** + * Word index of the parameter value + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ + wIndex: int; + + /** + * Word length of the parameter value + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ + wLength: int; + + /** + * Data written to or read from the buffer + * + * @type { Uint8Array } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ + data: Uint8Array; + } + + /** + * Enumerates USB request target types. + * + * @enum { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + export enum USBRequestTargetType { + /** + * USB device + * + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + USB_REQUEST_TARGET_DEVICE = 0, + + /** + * USB interface + * + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + USB_REQUEST_TARGET_INTERFACE = 1, + + /** + * Endpoint + * + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + USB_REQUEST_TARGET_ENDPOINT = 2, + + /** + * Others + * + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + USB_REQUEST_TARGET_OTHER = 3 + } + + /** + * Enumerates control request types. + * + * @enum { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + export enum USBControlRequestType { + /** + * Standard + * + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + USB_REQUEST_TYPE_STANDARD = 0, + + /** + * Class + * + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + USB_REQUEST_TYPE_CLASS = 1, + + /** + * Vendor + * + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + USB_REQUEST_TYPE_VENDOR = 2 + } + + /** + * Enumerates request directions. + * + * @enum { int } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + export enum USBRequestDirection { + /** + * Request for writing data from the host to the device + * + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + USB_REQUEST_DIR_TO_DEVICE = 0, + + /** + * Request for reading data from the device to the host + * + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + USB_REQUEST_DIR_FROM_DEVICE = 0x80 + } + + /** + * Enumerates function modes. + * + * @enum { int } + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + export enum FunctionType { + /** + * None + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + NONE = 0, + + /** + * Serial port device + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + ACM = 1, + + /** + * Ethernet port device + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + ECM = 2, + + /** + * HDC device + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + HDC = 4, + + /** + * MTP device + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + MTP = 8, + + /** + * PTP device + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + PTP = 16, + + /** + * RNDIS device + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + RNDIS = 32, + + /** + * MIDI device + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + MIDI = 64, + + /** + * Audio source device + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + AUDIO_SOURCE = 128, + + /** + * NCM device + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + */ + NCM = 256 + } + + /** + * Represents a USB Accessory. + * + * @typedef USBAccessory + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + interface USBAccessory { + /** + * The manufacturer name of the accessory. + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + manufacturer: string; + + /** + * The product of the accessory. + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + product: string; + + /** + * The user visible description of the accessory. + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + description: string; + + /** + * The version of the accessory. + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + version: string; + + /** + * The serial number of the accessory. + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + serialNumber: string; + } + + /** + * Handle of accessory. + * + * @typedef USBAccessoryHandle + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + interface USBAccessoryHandle { + /** + * The file descriptor of the accessory.The valid USBAccessoryHandle.accessoryFd is a positive value. + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + accessoryFd: int; + } + + /** + * Usb transfer flag. + * + * @enum { number } + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + export enum UsbTransferFlags { + /** + * Report short frames as errors + * + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + USB_TRANSFER_SHORT_NOT_OK = 0, + + /** + * Automatically free transfer buffer + * + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + USB_TRANSFER_FREE_BUFFER = 1, + + /** + * Automatically free transfer after callback returns + * + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + USB_TRANSFER_FREE_TRANSFER = 2, + + /** + * Transmissions that are multiples of wMaxPacketSize will add an additional zero packet. + * + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + USB_TRANSFER_ADD_ZERO_PACKET = 3 + } + + /** + * Usb transfer status. + * + * @enum { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + export enum UsbTransferStatus { + /** + * Transfer completed + * + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + TRANSFER_COMPLETED = 0, + + /** + * Transfer failed + * + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + TRANSFER_ERROR = 1, + + /** + * Transfer timed out + * + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + TRANSFER_TIMED_OUT = 2, + + /** + * Transfer was canceled + * + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + TRANSFER_CANCELED = 3, + + /** + * For bulk/interrupt endpoints: halt condition detected (endpoint + * stalled). For control endpoints: control request not supported. + * + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + TRANSFER_STALL = 4, + + /** + * Device was disconnected + * + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + TRANSFER_NO_DEVICE = 5, + + /** + * Device sent more data than requested + * + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + TRANSFER_OVERFLOW = 6 + } + + /** + * USB DATA transfer type. + * + * @enum { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + export enum UsbEndpointTransferType { + /** + * Isochronous endpoint + * + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + TRANSFER_TYPE_ISOCHRONOUS = 0x1, + + /** + * Bulk endpoint + * + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + TRANSFER_TYPE_BULK = 0x2, + + /** + * Interrupt endpoint + * + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + TRANSFER_TYPE_INTERRUPT = 0x3 + } + + /** + * Isochronous packet descriptors, only for isochronous transfers. + * + * @typedef UsbIsoPacketDescriptor + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + interface UsbIsoPacketDescriptor { + /** + * Length of data to request in this packet + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + length: int; + + /** + * Amount of data that was actually transferred + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + actualLength: int; + + /** + * Status code for this packet + * + * @type { UsbTransferStatus } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + status: UsbTransferStatus; + } + + /** + * submit transfer callback. + * + * @typedef SubmitTransferCallback + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + interface SubmitTransferCallback { + /** + * Actual length of data that was transferred. Read-only, and only for + * use within transfer callback function. Not valid for isochronous endpoint transfers. + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + actualLength: int; + + /** + * The status of the transfer. Read-only, and only for use within transfer callback function. + * + * @type { UsbTransferStatus } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + status: UsbTransferStatus; + + /** + * Isochronous packet descriptors, for isochronous transfers only. + * + * @type { Array> } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + isoPacketDescs: Array>; + } + + /** + * As a generic USB data transfer interface. The Client populates this interface and + * submits it in order to request a transfer. + * + * @typedef UsbDataTransferParams + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + interface UsbDataTransferParams { + /** + * Pipe of the device that this data transfer will be submitted to. + * + * @type { USBDevicePipe } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + devPipe: USBDevicePipe; + + /** + * A bitwise OR combination of UsbTransferFlags. + * + * @type { UsbTransferFlags } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + flags: UsbTransferFlags; + + /** + * Address of the endpoint where this transfer will be sent. + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + endpoint: int; + + /** + * Type of the transfer + * + * @type { UsbEndpointTransferType } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + type: UsbEndpointTransferType; + + /** + * Timeout for this transfer in milliseconds. A value of 0 indicates no timeout. + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + timeout: int; + + /** + * Length of the data buffer. Must be non-negative. + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + length: int; + + /** + * Callback function. This will be invoked when the transfer completes, fails, or is canceled. + * + * @type { AsyncCallback } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + callback: AsyncCallback; + + /** + * User context data. Useful for associating specific data to a transfer + * that can be accessed from within the callback function. + * + * @type { Uint8Array } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + userData: Uint8Array; + + /** + * Data buffer + * + * @type { Uint8Array } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + buffer: Uint8Array; + + /** + * Count of isochronous packets. Only used for I/O with isochronous endpoints. Must be non-negative. + * + * @type { int } + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + isoPacketCount: int; + } + + /** + * Submit USB data transfer. + * + * @param { transfer } As a generic USB data transfer interface. The Client populates this interface and + * submits it in order to request a transfer + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. + * @throws { BusinessError } 14400007 - Resource busy. Possible causes: + *
    1. The transfer has already been submitted. + *
    2. The interface is claimed by another program or driver. + * @throws { BusinessError } 14400008 - No such device (it may have been disconnected). + * @throws { BusinessError } 14400009 - Insufficient memory. Possible causes: + *
    1. Memory allocation failed. + * @throws { BusinessError } 14400012 - Transmission I/O error. + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function usbSubmitTransfer(transfer: UsbDataTransferParams): void; + + /** + * Cancel USB data transfer. + * + * @param { transfer } Cancel the target transfer + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. + * @throws { BusinessError } 14400008 - No such device (it may have been disconnected). + * @throws { BusinessError } 14400010 - Other USB error. Possible causes: + *
    1.Unrecognized discard error code. + * @throws { BusinessError } 14400011 - The transfer is not in progress, or is already complete or cancelled. + * @syscap SystemCapability.USB.USBManager + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function usbCancelTransfer(transfer: UsbDataTransferParams): void; + + /** + * Perform a USB port reset to reinitialize a usb device. The operation will attempt to restore the previous configuration + * and alternate interface settings after the reset has completed. + * + * @param { USBDevicePipe } pipe - Represents a USB device,which is the target object to be restarted.It cannot be empty. + * @returns { boolean } If the restart operation is successful, return {@code true}; if the restart operation fails, return {@code false}. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. + * @throws { BusinessError } 14400004 -Service exception. Possible causes: 1. No accessory is plugged in.. + * @throws { BusinessError } 14400008 - No such device(it may have been disconnected) + * @throws { BusinessError } 14400010 - Other USB error. Possible causes: + *
    1.Unrecognized discard error code. + * @throws { BusinessError } 14400013 - The USBDevicePipe validity check failed. Possible causes: + *
    1.The input parameters fail the validation check. + *
    2.The call chain used to obtain the input parameters is not reasonable. + * @syscap SystemCapability.USB.USBManager + * @since 20 + * @arkts 1.1&1.2 + */ + function resetUsbDevice(pipe: USBDevicePipe): boolean; + + + + + +} + export default usbManager; \ No newline at end of file diff --git a/api/@ohos.usbManager.serial.d.ts b/api/@ohos.usbManager.serial.d.ts index 621b6a5918..08992a6b7f 100644 --- a/api/@ohos.usbManager.serial.d.ts +++ b/api/@ohos.usbManager.serial.d.ts @@ -22,7 +22,8 @@ * Provides APIs for managing USB-to-virtual serial ports and implementing USB-to-virtual serial port communication. * @namespace serialManager * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace serialManager { @@ -30,22 +31,25 @@ declare namespace serialManager { * Obtains the serial port device list. * @returns { Readonly[]} Returns the list of serial port devices obtained. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ function getPortList(): Readonly[]; /** * Checks whether a serial port device has the access right. The system applications have the access right by default. - * @param { number} portId ID of the target device. For details, see SerialPort.portId. + * @param { int} portId ID of the target device. For details, see SerialPort.portId. * @returns {boolean} Returns true if the device has the right; returns false otherwise. * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 14400005 Database operation exception. * @throws { BusinessError } 31400001 Serial port management exception. * @throws { BusinessError } 31400003 PortId does not exist. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts{ '1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - function hasSerialRight(portId: number): boolean; + function hasSerialRight(portId: int): boolean; /** * Requests the right for accessing a serial port device from the user. The system applications do not need to call this API. @@ -56,26 +60,29 @@ declare namespace serialManager { * @throws { BusinessError } 31400001 Serial port management exception. * @throws { BusinessError } 31400003 PortId does not exist. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts{ '1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - function requestSerialRight(portId: number): Promise; + function requestSerialRight(portId: int): Promise; /** * Adds the access right for a serial port device. * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { number } tokenId Token ID of the target application. - * @param { number} portId ID of the target device. For details, see SerialPort.portId. + * @param { int } tokenId Token ID of the target application. + * @param { int} portId ID of the target device. For details, see SerialPort.portId. * @throws { BusinessError } 201 Permission verification failed. The application does not have the permission required to call the API. * @throws { BusinessError } 202 Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 14400005 Database operation exception. * @throws { BusinessError } 31400001 Serial port management exception. * @throws { BusinessError } 31400003 PortId does not exist. * @syscap SystemCapability.USB.USBManager.Serial * @systemapi - * @since 19 + * @since arkts{ '1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - function addSerialRight(tokenId: number, portId: number): void; + function addSerialRight(tokenId: int, portId: int): void; /** * Cancels the access right for a serial port device. This API will not cancel the default access right of system applications. @@ -86,9 +93,10 @@ declare namespace serialManager { * @throws { BusinessError } 31400002 Access denied. Call requestSerialRight to request user authorization first. * @throws { BusinessError } 31400003 PortId does not exist. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts{ '1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - function cancelSerialRight(portId: number): void; + function cancelSerialRight(portId: int): void; /** * Opens a serial port device. @@ -99,9 +107,10 @@ declare namespace serialManager { * @throws { BusinessError } 31400003 PortId does not exist. * @throws { BusinessError } 31400004 The serial port device is occupied. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts{ '1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - function open(portId: number): void; + function open(portId: int): void; /** * Closes a serial port device. @@ -111,39 +120,44 @@ declare namespace serialManager { * @throws { BusinessError } 31400003 PortId does not exist. * @throws { BusinessError } 31400005 The serial port device is not opened. Call the open API first. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts{ '1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - function close(portId: number): void; + function close(portId: int): void; /** * Obtains the communication parameters of a serial port device. - * @param { number} portId ID of the target device. For details, see SerialPort.portId. + * @param { int} portId ID of the target device. For details, see SerialPort.portId. * @returns { Readonly} Communication parameters obtained, which are read-only. * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 31400001 Serial port management exception. * @throws { BusinessError } 31400003 PortId does not exist. * @throws { BusinessError } 31400005 The serial port device is not opened. Call the open API first. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts{ '1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - function getAttribute(portId: number): Readonly; + function getAttribute(portId: int): Readonly; /** * Sets the communication parameters for a serial port device. - * @param { number} portId ID of the target device. For details, see SerialPort.portId. + * @param { int} portId ID of the target device. For details, see SerialPort.portId. * @param { SerialAttribute} attribute Communication parameters to set. * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. + * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 31400001 Serial port management exception. * @throws { BusinessError } 31400003 PortId does not exist. * @throws { BusinessError } 31400005 The serial port device is not opened. Call the open API first. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts{ '1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - function setAttribute(portId: number, attribute: SerialAttribute): void; + function setAttribute(portId: int, attribute: SerialAttribute): void; /** * Reads data from a serial port device. This API uses a promise to return the result. - * @param { number} portId ID of the target device. For details, see SerialPort.portId. + * @param { int} portId ID of the target device. For details, see SerialPort.portId. * @param { Uint8Array } buffer Buffer for storing the data read, with a maximum length of 8192 bytes. * @param { number } timeout Timeout duration for reading data. The value is a non-negative number. The default value 0 indicates that there is no time limit for data reading. * @returns { Promise } Promise used to return the length of the data read. @@ -156,13 +170,14 @@ declare namespace serialManager { *
    1. The transfer was canceled. *
    2. The device offered more data than allowed. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts{ '1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - function read(portId: number, buffer: Uint8Array, timeout?: number): Promise; + function read(portId: int, buffer: Uint8Array, timeout?: int): Promise; /** * Reads data from a serial port device. This API returns the result synchronously. - * @param { number} portId ID of the target device. For details, see SerialPort.portId. + * @param { int} portId ID of the target device. For details, see SerialPort.portId. * @param { Uint8Array } buffer Buffer for storing the data read, with a maximum length of 8192 bytes. * @param { number } timeout Timeout duration for reading data. The value is a non-negative number. The default value 0 indicates that there is no time limit for data reading. * @returns {number} Length of the data read. @@ -175,13 +190,14 @@ declare namespace serialManager { *
    1. The transfer was canceled. *
    2. The device offered more data than allowed. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts{ '1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - function readSync(portId: number, buffer: Uint8Array, timeout?: number): number; + function readSync(portId: int, buffer: Uint8Array, timeout?: int): int; /** * Writes data to a serial port device. This API uses a promise to return the result. - * @param { number} portId ID of the target device. For details, see SerialPort.portId. + * @param { int} portId ID of the target device. For details, see SerialPort.portId. * @param { Uint8Array } buffer Buffer for storing the data written, with a maximum length of 128 KB. * @param { number } timeout Timeout duration for writing data. The value is a non-negative number. The default value 0 indicates that there is no time limit for data writing. * @returns { Promise } Promise used to return the length of the data written. @@ -194,13 +210,14 @@ declare namespace serialManager { *
    1. The transfer was canceled. *
    2. The device offered more data than allowed. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts{ '1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - function write(portId: number, buffer: Uint8Array, timeout?: number): Promise; + function write(portId: int, buffer: Uint8Array, timeout?: int): Promise; /** * Writes data to a serial port device. This API returns the result synchronously. - * @param { number} portId ID of the target device. For details, see SerialPort.portId. + * @param { int} portId ID of the target device. For details, see SerialPort.portId. * @param { Uint8Array } buffer Buffer for storing the data written, with a maximum length of 128 KB. * @param { number } timeout Timeout duration for writing data. The value is a non-negative number. The default value 0 indicates that there is no time limit for data writing. * @returns { number } Length of the data written. @@ -213,31 +230,35 @@ declare namespace serialManager { *
    1. The transfer was canceled. *
    2. The device offered more data than allowed. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts{ '1.1':'19','1.2':'20'} + * @arkts 1.1&1.2 */ - function writeSync(portId: number, buffer: Uint8Array, timeout?: number): number; + function writeSync(portId: int, buffer: Uint8Array, timeout?: int): int; /** * Represents a serial port device. * @typedef SerialPort * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ interface SerialPort { /** * Serial port device ID. - * @type { number } + * @type { int } * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ - portId: number; + portId: int; /** * Serial port device name. * @type { string } * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ deviceName: string; } @@ -245,7 +266,8 @@ declare namespace serialManager { * Represents the communication parameters of a serial port device. * @typedef SerialAttribute * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ interface SerialAttribute { @@ -253,7 +275,8 @@ declare namespace serialManager { * Baud rate. * @type { BaudRates } * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ baudRate: BaudRates; @@ -262,7 +285,8 @@ declare namespace serialManager { * @type { DataBits } * @default DATABIT_8 * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ dataBits?: DataBits; @@ -271,7 +295,8 @@ declare namespace serialManager { * @type { Parity } * @default NONE * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ parity?: Parity; @@ -280,43 +305,49 @@ declare namespace serialManager { * @type { StopBits } * @default STOPBIT_1 * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ stopBits?: StopBits; } /** * Enumerates the baud rates of a serial port device, in bit/s. - * @enum { number } + * @enum { int } * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ enum BaudRates { /** * The baud rate is 50 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_50 = 50, /** * The baud rate is 75 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_75 = 75, /** * The baud rate is 110 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_110 = 110, /** * The baud rate is 134 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_134 = 134, @@ -324,286 +355,328 @@ declare namespace serialManager { * The baud rate is 150 bit/s. * * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_150 = 150, /** * The baud rate is 200 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_200 = 200, /** * The baud rate is 300 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_300 = 300, /** * The baud rate is 600 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_600 = 600, /** * The baud rate is 1200 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_1200 = 1200, /** * The baud rate is 1800 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_1800 = 1800, /** * The baud rate is 2400 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_2400 = 2400, /** * The baud rate is 4800 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_4800 = 4800, /** * The baud rate is 9600 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_9600 = 9600, /** * The baud rate is 19200 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_19200 = 19200, /** * The baud rate is 38400 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_38400 = 38400, /** * The baud rate is 57600 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_57600 = 57600, /** * The baud rate is 115200 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_115200 = 115200, /** * The baud rate is 230400 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_230400 = 230400, /** * The baud rate is 460800 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_460800 = 460800, /** * The baud rate is 500000 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_500000 = 500000, /** * The baud rate is 576000 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_576000 = 576000, /** * The baud rate is 921600 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_921600 = 921600, /** * The baud rate is 1000000 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_1000000 = 1000000, /** * The baud rate is 1152000 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_1152000 = 1152000, /** * The baud rate is 1500000 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_1500000 = 1500000, /** * The baud rate is 2000000 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_2000000 = 2000000, /** * The baud rate is 2500000 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_2500000 = 2500000, /** * The baud rate is 3000000 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_3000000 = 3000000, /** * The baud rate is 3500000 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_3500000 = 3500000, /** * The baud rate is 4000000 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ BAUDRATE_4000000 = 4000000 } /** * Enumerates the data bits of a serial port device. - * @enum { number } + * @enum { int } * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ enum DataBits { /** * The number of data bits is 8. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ DATABIT_8 = 8, /** * The number of data bits is 7. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ DATABIT_7 = 7, /** * The number of data bits is 6. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ DATABIT_6 = 6, /** * The number of data bits is 5. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ DATABIT_5 = 5 + DATABIT_5 = 5 } /** * Enumerates the parity bits of a serial port device. - * @enum { number } + * @enum { int } * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ enum Parity { /** * No parity. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ PARITY_NONE = 0, /** * Odd parity. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ PARITY_ODD = 1, /** * Even parity. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ PARITY_EVEN = 2, /** * Mark parity, whose parity bit is always 1. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ PARITY_MARK = 3, /** * Space parity, whose parity bit is always 0. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ PARITY_SPACE = 4 } /** * Enumerates the stop bits for serial port communication. - * @enum { number } + * @enum { int } * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ enum StopBits { /** * The number of stop bits is 1. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ STOPBIT_1 = 0, /** * The number of stop bits is 2. * @syscap SystemCapability.USB.USBManager.Serial - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ STOPBIT_2 = 1 + STOPBIT_2 = 1 } } -export default serialManager; \ No newline at end of file +export default serialManager; diff --git a/api/@ohos.util.ArrayList.d.ts b/api/@ohos.util.ArrayList.d.ts index 55f957b50b..a4b9f799e3 100644 --- a/api/@ohos.util.ArrayList.d.ts +++ b/api/@ohos.util.ArrayList.d.ts @@ -482,6 +482,7 @@ declare class ArrayList { * @arkts 1.2 */ replaceAllElements(callbackFn: ArrayListReplaceCb): void; + replaceAllElements(callbackFn: ArrayListReplaceCb): void; /** * Executes a provided function once for each value in the arraylist object. @@ -540,6 +541,7 @@ declare class ArrayList { * Iterates over elements in a generic ArrayList and executes a callback function for each element. * * @param { ArrayListForEachCb } callbackFn - A callback function to execute for each element. + * @param { ArrayListForEachCb } callbackFn - A callback function to execute for each element. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice @@ -547,6 +549,7 @@ declare class ArrayList { * @arkts 1.2 */ forEach(callbackFn: ArrayListForEachCb): void; + forEach(callbackFn: ArrayListForEachCb): void; /** * Sorts this arraylist according to the order induced by the specified comparator,without comparator this parameter, @@ -800,37 +803,13 @@ declare class ArrayList { * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 10200001 - The value of index is out of range. * @syscap SystemCapability.Utils.Lang + * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ [index: number]: T; - /** - * Returns the item at that index. - * - * @param { number } index - The zero-based index of the desired code unit. - * @returns { T } The element in the arrayList matching the given index. - * @throws { BusinessError } 10200001 - The value of index is out of range. - * @syscap SystemCapability.Utils.Lang - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - $_get(index: number): T; - - /** - * Set the value of item at that index. - * - * @param { number } index - The index of the element to set. - * @param { T } value - The value to set at the specified index. - * @throws { BusinessError } 10200001 - The value of index is out of range. - * @syscap SystemCapability.Utils.Lang - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - $_set(index: number, value: T): void; - /** * If the newCapacity provided by the user is greater than or equal to length, * change the capacity of the arraylist to newCapacity, otherwise the capacity will not be changed @@ -944,6 +923,7 @@ declare class ArrayList { * The type of ArrayList callback function. * * @typedef { function } ArrayListForEachCb + * @typedef { function } ArrayListForEachCb * @param { T } value - The current element being processed * @param { number } index - The index of the current element * @param { ArrayList } arrlist - The ArrayList instance being traversed @@ -954,11 +934,13 @@ declare class ArrayList { * @arkts 1.2 */ export type ArrayListForEachCb = (value: T, index: number, arrlist: ArrayList) => void; + export type ArrayListForEachCb = (value: T, index: number, arrlist: ArrayList) => void; /** * The type of ArrayList callback function. * * @typedef { function } ArrayListReplaceCb + * @typedef { function } ArrayListReplaceCb * @param { T } value - The current element being processed * @param { number } index - The index of the current element * @param { ArrayList } arrlist - The ArrayList instance being traversed @@ -969,5 +951,6 @@ declare class ArrayList { * @arkts 1.2 */ export type ArrayListReplaceCb = (value: T, index: number, arrlist: ArrayList) => T; + export type ArrayListReplaceCb = (value: T, index: number, arrlist: ArrayList) => T; export default ArrayList; diff --git a/api/@ohos.util.Deque.d.ts b/api/@ohos.util.Deque.d.ts index 73f2f662e3..98e109eac3 100644 --- a/api/@ohos.util.Deque.d.ts +++ b/api/@ohos.util.Deque.d.ts @@ -420,6 +420,7 @@ declare class Deque { * Iterates over elements in a generic Deque (double-ended queue) and executes a callback function for each element. * * @param { DequeForEachCb } callbackFn - A callback function to execute for each element. + * @param { DequeForEachCb } callbackFn - A callback function to execute for each element. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice @@ -431,27 +432,16 @@ declare class Deque { * Returns the byte at the specified index. * * @param { number } index - The zero-based index of the desired code unit. - * @returns { T } The element in the deque matching the given index. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - $_get(index: number): T; - - /** - * Sets the byte at the specified index. - * - * @param { number } index – The index of the element to set. - * @param { T } value – The value to set at the specified index. + * Throws error if index < 0 or index >= deque.length. + * @returns { T } The element in the deque matching the given index. + * @throws { BusinessError } 10200001 - The value of index is out of range. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice * @since 20 * @arkts 1.2 */ - $_set(index: number, value: T): void; + [index: number]: T; /** * returns an iterator.Each item of the iterator is a Javascript Object @@ -499,6 +489,7 @@ declare class Deque { * The type of Deque forEach callback function. * * @typedef { function } DequeForEachCb + * @typedef { function } DequeForEachCb * @param { T } value - The current element being processed * @param { number } index - The index of the current element * @param { Deque } deque - The Deque instance being traversed @@ -509,5 +500,6 @@ declare class Deque { * @arkts 1.2 */ export type DequeForEachCb = (value: T, index: number, deque: Deque) => void; + export type DequeForEachCb = (value: T, index: number, deque: Deque) => void; export default Deque; diff --git a/api/@ohos.util.LightWeightMap.d.ts b/api/@ohos.util.LightWeightMap.d.ts index ff83f28ea5..99ac357abc 100644 --- a/api/@ohos.util.LightWeightMap.d.ts +++ b/api/@ohos.util.LightWeightMap.d.ts @@ -483,6 +483,19 @@ declare class LightWeightMap { getKeyAt(index: number): K | undefined; + /** + * Obtains the key at the location identified by index in an LightWeightMap container + * + * @param { number } index - index index Target subscript for search + * @returns { K | undefined } the key of key-value pairs or undefined + * @throws { BusinessError } 10200001 - The value of index is out of range. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + getKeyAt(index: number): K | undefined; /** * Obtains a ES6 iterator that contains all the keys of an LightWeightMap container * @@ -954,6 +967,19 @@ declare class LightWeightMap { */ getValueAt(index: number): V | undefined; + /** + * Obtains the value identified by index in an LightWeightMap container + * + * @param { number } index - index index Target subscript for search + * @returns { V | undefined } the value of key-value pairs or undefined + * @throws { BusinessError } 10200001 - The value of index is out of range. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + getValueAt(index: number): V | undefined; /** * Returns an iterator of the values contained in this map * diff --git a/api/@ohos.util.List.d.ts b/api/@ohos.util.List.d.ts index 405a412252..2d768e007e 100644 --- a/api/@ohos.util.List.d.ts +++ b/api/@ohos.util.List.d.ts @@ -1008,6 +1008,7 @@ declare class List { * @arkts 1.2 */ export type ListForEachCb = (value: T, index: number, list: List) => void +export type ListForEachCb = (value: T, index: number, list: List) => void /** * The type of List callback function. @@ -1023,5 +1024,6 @@ export type ListForEachCb = (value: T, index: number, list: List) => void * @arkts 1.2 */ export type ListReplaceCb = (value: T, index: number, list: List) => T +export type ListReplaceCb = (value: T, index: number, list: List) => T export default List; diff --git a/api/@ohos.util.d.ets b/api/@ohos.util.d.ets index c3883f4614..f8ce4a7f0f 100644 --- a/api/@ohos.util.d.ets +++ b/api/@ohos.util.d.ets @@ -144,6 +144,7 @@ declare namespace util { * @since 20 */ encodeSync(src: Uint8Array, options?: Type): Uint8Array; + encodeSync(src: Uint8Array, options?: Type): Uint8Array; /** * Encodes the specified byte array into a String using the Base64 encoding scheme. @@ -160,6 +161,7 @@ declare namespace util { * @since 20 */ encodeToStringSync(src: Uint8Array, options?: Type): string; + encodeToStringSync(src: Uint8Array, options?: Type): string; /** * Decodes a Base64 encoded String or input u8 array into a newly-allocated u8 array using the Base64 encoding scheme. @@ -176,6 +178,7 @@ declare namespace util { * @since 20 */ decodeSync(src: Uint8Array | string, options?: Type): Uint8Array; + decodeSync(src: Uint8Array | string, options?: Type): Uint8Array; /** * Asynchronously encodes all bytes in the specified u8 array into the newly allocated u8 array using the Base64 encoding scheme. @@ -192,6 +195,7 @@ declare namespace util { * @since 20 */ encode(src: Uint8Array, options?: Type): Promise; + encode(src: Uint8Array, options?: Type): Promise; /** * Asynchronously encodes the specified byte array into a String using the Base64 encoding scheme. @@ -208,12 +212,14 @@ declare namespace util { * @since 20 */ encodeToString(src: Uint8Array, options?: Type): Promise; + encodeToString(src: Uint8Array, options?: Type): Promise; /** * Use the Base64 encoding scheme to asynchronously decode a Base64-encoded string or * input u8 array into a newly allocated u8 array. * * @param { Uint8Array | string } src - A Uint8Array value or a string value + * @param { Uint8Array | string } src - A Uint8Array value or a string value * @param { Type } [options] - one of the Type enumeration * @returns { Promise } Return the decoded asynchronous Uint8Array. * @throws { BusinessError } 401 - Parameter error. Possible causes: @@ -225,6 +231,7 @@ declare namespace util { * @since 20 */ decode(src: Uint8Array | string, options?: Type): Promise; + decode(src: Uint8Array | string, options?: Type): Promise; } /** @@ -935,6 +942,8 @@ declare namespace util { * @param { Object } obj - An object * @returns { boolean } Returns true if the given object is the same as the current object; * Otherwise, false is returned. + * @returns { boolean } Returns true if the given object is the same as the current object; + * Otherwise, false is returned. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice @@ -1018,6 +1027,8 @@ declare namespace util { * * @returns { boolean } If the value represented by the current object is 0, true is returned. * Otherwise, false is returned. + * @returns { boolean } If the value represented by the current object is 0, true is returned. + * Otherwise, false is returned. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice @@ -1150,6 +1161,8 @@ declare namespace util { * @param { Object } value - A arraybuffer value * @returns { boolean } Returns true if the value is a built-in ArrayBuffer instance. * This does not include SharedArrayBuffer instances. + * @returns { boolean } Returns true if the value is a built-in ArrayBuffer instance. + * This does not include SharedArrayBuffer instances. * Usually, it is desirable to test for both; See isAnyArrayBuffer() for that. * @syscap SystemCapability.Utils.Lang * @crossplatform @@ -1425,6 +1438,19 @@ declare namespace util { */ function promisify(original: Function): (...args: FixedArray) => Promise; + /** + * Takes a function following the common error-first callback style, i.e taking an (err, value) => + * callback as the last argument, and return a function that returns promises. + * + * @param { Function } original - Asynchronous Function + * @returns { Function } Return a function that returns promises + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + function promisify(original: Function): (...args: FixedArray) => Promise; + /** * Get the hash code of an object. * @@ -1461,5 +1487,30 @@ declare namespace util { * @since 20 */ function parseUUID(uuid: string): Uint8Array; + + /** + * Generate a random RFC 4122 version 4 binary UUID using a cryptographically secure random number generator. + * + * @param { boolean } [entropyCache] - Whether to generate the UUID with using the cache. Default: true. + * @returns { Uint8Array | undefined } Return a Uint8Array representing this UUID, or undefined on failure. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + function generateRandomBinaryUUID(entropyCache?: boolean): Uint8Array | undefined; + + /** + * Parse a UUID from the string standard representation as described in the RFC 4122 version 4. + * + * @param { string } uuid - String that specifies a UUID + * @returns { Uint8Array } Return a Uint8Array representing this UUID. Throw SyntaxError if parsing fails. + * @throws { BusinessError } 10200002 - Invalid uuid string. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + */ + function parseUUID(uuid: string): Uint8Array; } export default util; diff --git a/api/@ohos.util.stream.d.ts b/api/@ohos.util.stream.d.ts index bc2a0151eb..0ee2bb6e3c 100644 --- a/api/@ohos.util.stream.d.ts +++ b/api/@ohos.util.stream.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2024-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - /** + +/** * @file * @kit ArkTS */ @@ -26,6 +26,29 @@ import emitter from './@ohos.events.emitter'; import buffer from '@ohos.buffer'; /*** endif */ +/** + * The stream module provides a comprehensive set of stream processing capabilities, including four types of streams: + * - Writable: streams designed for writing data to. + * - Readable: streams designed for reading data from. + * - Duplex: streams that are both readable and writable. + * - Transform: a specialized type of duplex stream that can modify or transform data as it's being written and read. + * + * @namespace stream + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ + +/*** if arkts 1.1 */ +import { Callback } from './@ohos.base'; +import emitter from './@ohos.events.emitter'; +/*** endif */ +/*** if arkts 1.2 */ +import buffer from '@ohos.buffer'; +/*** endif */ + /** * The stream module provides a comprehensive set of stream processing capabilities, including four types of streams: * - Writable: streams designed for writing data to. @@ -42,14 +65,19 @@ import buffer from '@ohos.buffer'; */ declare namespace stream { /** + * Return readable options. * Return readable options. * * @interface ReadableOptions + * @interface ReadableOptions * @syscap SystemCapability.Utils.Lang * @crossplatform + * @crossplatform * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface ReadableOptions { /** @@ -72,6 +100,27 @@ declare namespace stream { encoding?: string; } + interface ReadableOptions { + /** + * Specifies the encoding format of the data. If this parameter is provided, + * the readable stream decodes the data into a string in the specified encoding format. Default: utf8. + * If an invalid string is entered, a 401 exception is thrown in the Readable constructor. + * Supported encoding formats: utf-8, ibm866, iso-8859-2, iso-8859-3, iso-8859-4, iso-8859-5, iso-8859-6, + * iso-8859-7, iso-8859-8, iso-8859-8-i, iso-8859-10, iso-8859-13, iso-8859-14, iso-8859-15, koi8-r, koi8-u, + * macintosh, windows-874, windows-1250, windows-1251, windows-1252, windows-1253, windows-1254, windows-1255, + * windows-1256, windows-1257, windows-1258, x-mac-cyrillic, gbk, gb18030, big5, euc-jp, iso-2022-jp, shift_jis, + * euc-kr, utf-16be, utf-16le. + * + * @type { ?string } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 + */ + encoding?: string; + } + /** * Streams to which data can be written. * @@ -93,6 +142,7 @@ declare namespace stream { */ constructor(); + /** * writes a chunk to Writable and invokes callback when the chunk is flushed. The return value indicates * whether the internal buffer of the Writable reaches the hightWaterMark. If true is returned, the buffer @@ -116,6 +166,8 @@ declare namespace stream { * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ write(chunk?: string | Uint8Array, encoding?: string, callback?: Function): boolean; @@ -136,6 +188,8 @@ declare namespace stream { * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ end(chunk?: string | Uint8Array, encoding?: string, callback?: Function): Writable; @@ -156,6 +210,7 @@ declare namespace stream { */ setDefaultEncoding(encoding?: string): boolean; + /** * After the call, all Write operations will be forced to write to the buffer instead of being flushed. * @@ -168,6 +223,7 @@ declare namespace stream { */ cork(): boolean; + /** * After calling, flush all buffers. * @@ -180,6 +236,7 @@ declare namespace stream { */ uncork(): boolean; + /** * Registering Event Messages. * @@ -193,9 +250,24 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ on(event: string, callback: Callback): void; + /** + * Registering Event Messages. + * + * @param { string } event - Register Event. + * @param { Function } callback - event callbacks. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + on(event: string, callback: Function): void; + + /** * Registering Event Messages. * @@ -221,10 +293,16 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ off(event: string, callback?: Callback): void; + /** + * Cancel event message. + * + * @param { string } event - Register Event. + * @param { Function } [callback] - event callbacks. * Cancel event message. * * @param { string } event - Register Event. @@ -234,8 +312,11 @@ declare namespace stream { * @atomicservice * @since 20 * @arkts 1.2 + * @since 20 + * @arkts 1.2 */ off(event: string, callback?: Function): void; + off(event: string, callback?: Function): void; /** * This method is invoked by the Writable method during initialization and must not be invoked directly. @@ -245,13 +326,20 @@ declare namespace stream { * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. + * @param { Function } callback - Callback when the stream has completed the initial. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified; + * 2.Incorrect parameter types. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ doInitialize(callback: Function): void; + doInitialize(callback: Function): void; /** * Implemented by subclass inheritance. The implementation logic of flushing chunks in the buffer must not be @@ -269,9 +357,12 @@ declare namespace stream { * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ doWrite(chunk: string | Uint8Array, encoding: string, callback: Function): void; + /** * The implementation logic of flushing chunks in the buffer in batches should not be actively called. * The call is controlled by Writable.write. @@ -287,6 +378,8 @@ declare namespace stream { * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ doWritev(chunks: string[] | Uint8Array[], callback: Function): void; @@ -342,7 +435,6 @@ declare namespace stream { * Is true if it is safe to call writable.write(), which means the stream has not been destroyed, error or end. * * @type { boolean } - * @readonly * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice @@ -363,7 +455,7 @@ declare namespace stream { get writable(): boolean; /** - * Size of data that can be flushed, in bytes or objects. + * Value of highWatermark. * * @type { number } * @readonly @@ -371,6 +463,7 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ readonly writableLength: number; @@ -387,10 +480,9 @@ declare namespace stream { get writableLength(): number; /** - * Number of times writable.uncork() needs to be called in order to fully uncork the stream. + * Value of highWatermark. * * @type { number } - * @readonly * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice @@ -419,6 +511,7 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ readonly writableEnded: boolean; @@ -435,10 +528,9 @@ declare namespace stream { get writableEnded(): boolean; /** - * Whether Writable.end has been called and all buffers have been flushed. + * Is true if it is safe to call writable.write(), which means the stream has not been destroyed, error or end. * * @type { boolean } - * @readonly * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice @@ -473,13 +565,14 @@ declare namespace stream { */ class Transform extends Duplex { /** - * The Transform constructor. + * Size of data that can be flushed, in bytes or objects. * + * @type { number } * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 20 + * @arkts 1.2 */ constructor(); @@ -504,8 +597,7 @@ declare namespace stream { doTransform(chunk: string, encoding: string, callback: Function): void; /** - * After all data is flushed to the write stream, you can use the Transform.doFlush writes some extra data, must - * not be called directly, only called by Writable after flushing all data. + * Whether Writable.end has been called. * * @param { Function } callback - Callback after flush completion. * @throws { BusinessError } 401 - Parameter error. Possible causes: @@ -542,6 +634,7 @@ declare namespace stream { */ constructor(); + /** * The Readable constructor. * @@ -558,6 +651,7 @@ declare namespace stream { */ constructor(options: ReadableOptions); + /** * Reads a buffer of a specified size from the buffer. If the available buffer is sufficient, the result * of the specified size is returned. Otherwise, if Readable has ended, all remaining buffers are returned. @@ -573,9 +667,30 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ read(size?: number): string | null; + /** + * Reads a buffer of a specified size from the buffer. If the available buffer is sufficient, the result + * of the specified size is returned. Otherwise, if Readable has ended, all remaining buffers are returned. + * + * @param { number } [size] - Expected length of the data to be read. + * @returns { buffer.Buffer | string | null } If no data is available to read, null is returned. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified; + * 2.Incorrect parameter types; + * 3.Parameter verification failed. + * @throws { BusinessError } 10200038 - The doRead method has not been implemented. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + read(size?: number): buffer.Buffer | string | null; + + /** * Reads a buffer of a specified size from the buffer. If the available buffer is sufficient, the result * of the specified size is returned. Otherwise, if Readable has ended, all remaining buffers are returned. @@ -607,6 +722,7 @@ declare namespace stream { */ resume(): Readable; + /** * Toggle Readable to Suspend Mode. * @@ -619,6 +735,7 @@ declare namespace stream { */ pause(): Readable; + /** * Sets the encoding format of the input binary data.Default: utf8. * @@ -635,6 +752,7 @@ declare namespace stream { */ setEncoding(encoding?: string): boolean; + /** * Query whether it is in pause state. * @@ -647,6 +765,7 @@ declare namespace stream { */ isPaused(): boolean; + /** * Concatenated a Writable to a Readable and switches the Readable to stream mode. * @@ -665,6 +784,7 @@ declare namespace stream { */ pipe(destination: Writable, options?: Object): Writable; + /** * Disconnect Writable from Readable. * @@ -682,6 +802,7 @@ declare namespace stream { */ unpipe(destination?: Writable): Readable; + /** * Registering Event Messages. * @@ -694,9 +815,24 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ on(event: string, callback: Callback): void; + /** + * Registering Event Messages. + * + * @param { string } event - Registering Events. + * @param { Function } callback - Event callback. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + on(event: string, callback: Function): void; + + /** * Registering Event Messages. * @@ -722,21 +858,29 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ off(event: string, callback?: Callback): void; + /** + * Cancel event message. * Cancel event message. * * @param { string } event - Registering Events. * @param { Function } [callback] - Event callback. + * @param { string } event - Registering Events. + * @param { Function } [callback] - Event callback. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice * @since 20 * @arkts 1.2 + * @since 20 + * @arkts 1.2 */ off(event: string, callback?: Function): void; + off(event: string, callback?: Function): void; /** * It may be implemented by child classes, and if so, will be called by the Readable class methods only. @@ -747,13 +891,21 @@ declare namespace stream { * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types; * 3.Parameter verification failed. + * @param { Function } callback - Callback when the stream has completed the initial. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + * 1.Mandatory parameters are left unspecified; + * 2.Incorrect parameter types; + * 3.Parameter verification failed. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ doInitialize(callback: Function): void; + doInitialize(callback: Function): void; /** * The specific implementation of data production. It must not be actively called. @@ -773,6 +925,7 @@ declare namespace stream { */ doRead(size: number): void; + /** * Adds the generated data to the buffer. The return value indicates whether the data in the buffer has not * reached the highWaterMark (similar to Writable.write). If the chunk is null, all data has been generated. @@ -792,6 +945,7 @@ declare namespace stream { */ push(chunk: Uint8Array | string | null, encoding?: string): boolean; + /** * Returns boolean indicating whether it is in ObjectMode. * @@ -801,9 +955,23 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ readonly readableObjectMode: boolean; + /** + * Returns boolean indicating whether it is in ObjectMode. + * + * @type { boolean } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get readableObjectMode(): boolean; + + /** * Returns boolean indicating whether it is in ObjectMode. * @@ -826,9 +994,24 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ readonly readable: boolean; + /** + * Is true if it is safe to call readable.read(), which means + * the stream has not been destroyed or emitted 'error' or 'end'. + * + * @type { boolean } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get readable(): boolean; + + /** * Is true if it is safe to call readable.read(), which means * the stream has not been destroyed or emitted 'error' or 'end'. @@ -851,9 +1034,23 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ readonly readableHighWatermark: number; + /** + * Returns the value of highWatermark passed when creating this Readable. + * + * @type { number } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get readableHighWatermark(): number; + + /** * Returns the value of highWatermark passed when creating this Readable. * @@ -875,9 +1072,23 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ readonly readableFlowing: boolean | null; + /** + * This property reflects the current state of the readable stream null/true/false. + * + * @type { boolean | null } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get readableFlowing(): boolean | null; + + /** * This property reflects the current state of the readable stream null/true/false. * @@ -899,9 +1110,23 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ readonly readableLength: number; + /** + * Size of the data that can be read, in bytes or objects. + * + * @type { number } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get readableLength(): number; + + /** * Size of the data that can be read, in bytes or objects. * @@ -924,9 +1149,24 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ readonly readableEncoding: string | null; + /** + * Getter for the property encoding of a given Readable stream. The encoding property can be set using the + * readable.setEncoding() method. + * + * @type { string | null } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get readableEncoding(): string | null; + + /** * Getter for the property encoding of a given Readable stream. The encoding property can be set using the * readable.setEncoding() method. @@ -949,6 +1189,7 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ readonly readableEnded: boolean; @@ -963,8 +1204,21 @@ declare namespace stream { * @arkts 1.2 */ get readableEnded(): boolean; + + /** + * Whether all data has been generated. + * + * @type { boolean } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get readableEnded(): boolean; } + /** * Duplex streams are streams that implement both the Readable streams and Writable streams interfaces. * @@ -977,6 +1231,7 @@ declare namespace stream { */ class Duplex extends Readable { /** + * The Duplex constructor. * The Duplex constructor. * * @syscap SystemCapability.Utils.Lang @@ -987,6 +1242,7 @@ declare namespace stream { */ constructor(); + /** * writes a chunk to Writable and invokes callback when the chunk is flushed. The return value indicates * whether the internal buffer of the Writable reaches the hightWaterMark. If true is returned, the buffer @@ -1010,6 +1266,8 @@ declare namespace stream { * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ write(chunk?: string | Uint8Array, encoding?: string, callback?: Function): boolean; @@ -1030,6 +1288,8 @@ declare namespace stream { * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ end(chunk?: string | Uint8Array, encoding?: string, callback?: Function): Writable; @@ -1050,6 +1310,7 @@ declare namespace stream { */ setDefaultEncoding(encoding?: string): boolean; + /** * After the call, all Write operations will be forced to write to the buffer instead of being flushed. * @@ -1062,6 +1323,7 @@ declare namespace stream { */ cork(): boolean; + /** * After calling, flush all buffers. * @@ -1074,6 +1336,7 @@ declare namespace stream { */ uncork(): boolean; + /** * Implemented by subclass inheritance. The implementation logic of flushing chunks in the buffer must not be * directly called. The call is controlled by Writable.write. @@ -1090,6 +1353,8 @@ declare namespace stream { * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ doWrite(chunk: string | Uint8Array, encoding: string, callback: Function): void; @@ -1108,20 +1373,27 @@ declare namespace stream { * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ doWritev(chunks: string[] | Uint8Array[], callback: Function): void; /** + * Returns boolean indicating whether it is in ObjectMode. * Returns boolean indicating whether it is in ObjectMode. * * @type { boolean } * @readonly + * @type { boolean } + * @readonly * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice * @since 12 + * @since 12 */ readonly writableObjectMode: boolean; + readonly writableObjectMode: boolean; /** * Returns boolean indicating whether it is in ObjectMode. @@ -1132,9 +1404,13 @@ declare namespace stream { * @atomicservice * @since 20 * @arkts 1.2 + * @since 20 + * @arkts 1.2 */ get writableObjectMode(): boolean; + get writableObjectMode(): boolean; + /** * Value of highWatermark. * @@ -1144,9 +1420,23 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ readonly writableHighWatermark: number; + /** + * Value of highWatermark. + * + * @type { number } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get writableHighWatermark(): number; + + /** * Value of highWatermark. * @@ -1168,9 +1458,23 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ readonly writable: boolean; + /** + * Is true if it is safe to call writable.write(), which means the stream has not been destroyed, error or end. + * + * @type { boolean } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get writable(): boolean; + + /** * Is true if it is safe to call writable.write(), which means the stream has not been destroyed, error or end. * @@ -1192,9 +1496,23 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ readonly writableLength: number; + /** + * Size of data that can be flushed, in bytes or objects. + * + * @type { number } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get writableLength(): number; + + /** * Size of data that can be flushed, in bytes or objects. * @@ -1216,9 +1534,23 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ readonly writableCorked: number; + /** + * Number of times writable.uncork() needs to be called in order to fully uncork the stream. + * + * @type { number } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get writableCorked(): number; + + /** * Number of times writable.uncork() needs to be called in order to fully uncork the stream. * @@ -1240,9 +1572,23 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 + * @since 12 */ readonly writableEnded: boolean; + /** + * Whether Writable.end has been called. + * + * @type { boolean } + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get writableEnded(): boolean; + + /** * Whether Writable.end has been called. * diff --git a/api/@ohos.web.webview.d.ts b/api/@ohos.web.webview.d.ts index 5911146701..39c7908808 100644 --- a/api/@ohos.web.webview.d.ts +++ b/api/@ohos.web.webview.d.ts @@ -2955,13 +2955,13 @@ declare namespace webview { */ /** * Current index in BackForwardList. - * @type { number } + * @type { int } * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice * @since 11 */ - currentIndex: number; + currentIndex: int; /** * Size of in BackForwardList. @@ -2970,18 +2970,18 @@ declare namespace webview { */ /** * Size of in BackForwardList. - * @type { number } + * @type { int } * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice * @since 11 */ - size: number; + size: int; /** * Get history entry at given index. * - * @param { number } index Index of back forward list entry. + * @param { int } index Index of back forward list entry. * @returns { HistoryItem } HistoryItem at given index in back forward list. * @throws { BusinessError } 401 - Invalid input parameter. * @syscap SystemCapability.Web.Webview.Core @@ -2990,7 +2990,7 @@ declare namespace webview { /** * Get history entry at given index. * - * @param { number } index Index of back forward list entry. + * @param { int } index Index of back forward list entry. * @returns { HistoryItem } HistoryItem at given index in back forward list. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
    2. Incorrect parameter types. 3.Parameter verification failed. @@ -2999,7 +2999,7 @@ declare namespace webview { * @atomicservice * @since 11 */ - getItemAtIndex(index: number): HistoryItem; + getItemAtIndex(index: int): HistoryItem; } /** @@ -4075,6 +4075,7 @@ declare namespace webview { * @atomicservice * @since 11 * @deprecated since 18 + * @deprecated since 18 * @useinstead ohos.web.webview.WebviewController#getLastHitTest */ getHitTest(): WebHitTestType; @@ -4274,6 +4275,7 @@ declare namespace webview { * @atomicservice * @since 11 * @deprecated since 18 + * @deprecated since 18 * @useinstead ohos.web.webview.WebviewController#getLastHitTest */ getHitTestValue(): HitTestValue; @@ -5700,7 +5702,8 @@ declare namespace webview { * @throws { BusinessError } 17100001 - Init error. * The WebviewController must be associated with a Web component. * @syscap SystemCapability.Web.Webview.Core - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ createWebPrintDocumentAdapter(jobName: string): print.PrintDocumentAdapter; @@ -6080,7 +6083,8 @@ declare namespace webview { * @param { CreateNativeMediaPlayerCallback } callback - Called everytime when web pages try to play media. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onCreateNativeMediaPlayer(callback: CreateNativeMediaPlayerCallback): void; @@ -8404,6 +8408,27 @@ declare namespace webview { AUTO_CLEANUP } + /** + * The function of reusme media play. + * + * @typedef { function } ResumePlayerFn + * @syscap SystemCapability.Web.Webview.Core + * @since 20 + * @arkts 1.2 + */ + type ResumePlayerFn = () => void; + + /** + * The function of suspend media play. + * + * @typedef { function } SuspendPlayerFn + * @param { SuspendType } type - The scenario for suspending the media player. + * @syscap SystemCapability.Web.Webview.Core + * @since 20 + * @arkts 1.2 + */ + type SuspendPlayerFn = (type: SuspendType) => void; + /** * The bridge between web core and native media player. * Apps should implements this interface, and pass an instance to web core. @@ -8412,7 +8437,8 @@ declare namespace webview { * @typedef NativeMediaPlayerBridge * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface NativeMediaPlayerBridge { /** @@ -8424,7 +8450,8 @@ declare namespace webview { * @param { number } height - The height of video tag. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ updateRect(x: number, y: number, width: number, height: number): void @@ -8433,7 +8460,8 @@ declare namespace webview { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ play(): void @@ -8442,7 +8470,8 @@ declare namespace webview { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ pause(): void @@ -8454,7 +8483,8 @@ declare namespace webview { * @param { number } targetTime - The target time (in seconds) to FF/BF to. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ seek(targetTime: number): void @@ -8466,7 +8496,8 @@ declare namespace webview { * @param { number } volume - The volume of native media player. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ setVolume(volume: number): void @@ -8476,7 +8507,8 @@ declare namespace webview { * @param { boolean } muted - Should mute native media player. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ setMuted(muted: boolean): void @@ -8488,7 +8520,8 @@ declare namespace webview { * @param { number } playbackRate - The playback rate of native media player. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ setPlaybackRate(playbackRate: number): void @@ -8497,7 +8530,8 @@ declare namespace webview { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ release(): void @@ -8506,7 +8540,8 @@ declare namespace webview { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enterFullscreen(): void @@ -8515,7 +8550,8 @@ declare namespace webview { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ exitFullscreen(): void @@ -8527,6 +8563,16 @@ declare namespace webview { */ resumePlayer?(): void + /** + * Resume the native media player. + * + * @type { ?ResumePlayerFn } + * @syscap SystemCapability.Web.Webview.Core + * @since 20 + * @arkts 1.2 + */ + resumePlayer?: ResumePlayerFn; + /** * Suspend to release native media player, not the NativeMediaPlayerBridge. The * embedder should save the status of player when release the native media player @@ -8537,6 +8583,18 @@ declare namespace webview { * @since 12 */ suspendPlayer?(type: SuspendType): void + + /** + * Suspend to release native media player, not the NativeMediaPlayerBridge. The + * embedder should save the status of player when release the native media player + * through NativeMediaPlayerBridge. + * + * @type { ?SuspendPlayerFn } + * @syscap SystemCapability.Web.Webview.Core + * @since 20 + * @arkts 1.2 + */ + suspendPlayer?: SuspendPlayerFn; } /** @@ -8827,7 +8885,8 @@ declare namespace webview { * @returns { NativeMediaPlayerBridge } Returns whether the app takes over the media. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ type CreateNativeMediaPlayerCallback = (handler: NativeMediaPlayerHandler, mediaInfo: MediaInfo) => NativeMediaPlayerBridge; @@ -9110,6 +9169,7 @@ declare namespace webview { /** * The ProxyConfig used by applyProxyOverride. * + * * @syscap SystemCapability.Web.Webview.Core * @since 15 */ @@ -9126,6 +9186,7 @@ declare namespace webview { * These maybe URLs or IP addresses and wildcards are supported. e.g. "*.example.com" means that requests to * "https://www.example.com" and "http://test.example.com" will connect the server directly. * + * * @param { string } bypassRule - The bypass rule. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
    2. Incorrect parameter types. @@ -9149,6 +9210,7 @@ declare namespace webview { /** * Insert a proxy rule that indicates URLs that match the schemeFilter will connect the server directly. * + * * @param { ProxySchemeFilter } schemeFilter - The scheme filter for this rule. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
    2. Incorrect parameter types. diff --git a/api/@ohos.wifi.d.ts b/api/@ohos.wifi.d.ts index bc98aa0fb4..e38024591b 100644 --- a/api/@ohos.wifi.d.ts +++ b/api/@ohos.wifi.d.ts @@ -23,7 +23,8 @@ import { AsyncCallback, Callback } from './@ohos.base'; /** * Provides methods to operate or manage Wi-Fi. * @namespace wifi - * @since 6 + * @since arkts {'1.1':'6', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace wifi { /** diff --git a/api/@ohos.wifiManager.d.ts b/api/@ohos.wifiManager.d.ts index f8b3982d97..72e2910acb 100644 --- a/api/@ohos.wifiManager.d.ts +++ b/api/@ohos.wifiManager.d.ts @@ -50,7 +50,8 @@ declare namespace wifiManager { * @throws {BusinessError} 2501000 - Operation failed. * @throws {BusinessError} 2501003 - Operation failed because the service is being closed. * @syscap SystemCapability.Communication.WiFi.STA - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ function enableWifi(): void; @@ -76,7 +77,8 @@ declare namespace wifiManager { * @throws {BusinessError} 2501004 - Operation failed because the service is being opened. * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function enableSemiWifi(): void; @@ -177,7 +179,8 @@ declare namespace wifiManager { * @throws {BusinessError} 2501000 - Operation failed. * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getWifiDetailState(): WifiDetailState; @@ -231,7 +234,8 @@ declare namespace wifiManager { * @throws {BusinessError} 2501000 - Operation failed. * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getScanInfoList(): Array; @@ -591,7 +595,8 @@ declare namespace wifiManager { * @throws {BusinessError} 801 - Capability not supported. * @throws {BusinessError} 2501000 - Operation failed. * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSignalLevel(rssi: number, band: number): number; @@ -618,7 +623,8 @@ declare namespace wifiManager { * @syscap SystemCapability.Communication.WiFi.STA * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getLinkedInfo(): Promise; @@ -662,7 +668,8 @@ declare namespace wifiManager { * @throws {BusinessError} 2501001 - Wi-Fi STA disabled. * @syscap SystemCapability.Communication.WiFi.STA * @crossplatform - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getLinkedInfo(callback: AsyncCallback): void; @@ -677,7 +684,8 @@ declare namespace wifiManager { * @throws {BusinessError} 2501001 - Wi-Fi STA disabled. * @syscap SystemCapability.Communication.WiFi.STA * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function getLinkedInfoSync(): WifiLinkedInfo; @@ -702,7 +710,8 @@ declare namespace wifiManager { * @syscap SystemCapability.Communication.WiFi.STA * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function isConnected(): boolean; @@ -759,7 +768,8 @@ declare namespace wifiManager { * @throws {BusinessError} 801 - Capability not supported. * @throws {BusinessError} 2501000 - Operation failed. * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getIpInfo(): IpInfo; @@ -772,7 +782,8 @@ declare namespace wifiManager { * @throws {BusinessError} 801 - Capability not supported. * @throws {BusinessError} 2501000 - Operation failed. * @syscap SystemCapability.Communication.WiFi.STA - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getIpv6Info(): Ipv6Info; @@ -980,7 +991,8 @@ declare namespace wifiManager { * @throws {BusinessError} 2501000 - Operation failed. * @throws {BusinessError} 2501001 - Wi-Fi STA disabled. * @syscap SystemCapability.Communication.WiFi.STA - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function isMeteredHotspot(): boolean; @@ -1070,7 +1082,8 @@ declare namespace wifiManager { * @throws {BusinessError} 2601000 - Operation failed. * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ function isOpenSoftApAllowed(): boolean; @@ -1154,7 +1167,8 @@ declare namespace wifiManager { * @throws {BusinessError} 2601000 - Operation failed. * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getStations(): Array; @@ -2214,7 +2228,8 @@ declare namespace wifiManager { * @enum { number } * @syscap SystemCapability.Communication.WiFi.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum DeviceAddressType { /** @@ -2227,7 +2242,8 @@ declare namespace wifiManager { * random device address * @syscap SystemCapability.Communication.WiFi.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ RANDOM_DEVICE_ADDRESS, @@ -2241,7 +2257,8 @@ declare namespace wifiManager { * real device address * @syscap SystemCapability.Communication.WiFi.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ REAL_DEVICE_ADDRESS, } @@ -2404,14 +2421,16 @@ declare namespace wifiManager { * @enum { number } WifiDetailState * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum WifiDetailState { /** * state is unknown * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ UNKNOWN = -1, @@ -2419,7 +2438,8 @@ declare namespace wifiManager { * wifi is closed * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ INACTIVE = 0, @@ -2427,7 +2447,8 @@ declare namespace wifiManager { * wifi is opened * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ACTIVATED = 1, @@ -2435,7 +2456,8 @@ declare namespace wifiManager { * wifi is opening * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ACTIVATING = 2, @@ -2443,7 +2465,8 @@ declare namespace wifiManager { * wifi is closing * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ DEACTIVATING = 3, @@ -2451,7 +2474,8 @@ declare namespace wifiManager { * wifi sta is entering semi active * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ SEMI_ACTIVATING = 4, @@ -2459,7 +2483,8 @@ declare namespace wifiManager { * wifi sta is semi active * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ SEMI_ACTIVE = 5, } @@ -2501,41 +2526,47 @@ declare namespace wifiManager { * Wi-Fi Category. * @enum { number } * @syscap SystemCapability.Communication.WiFi.STA - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum WifiCategory { /** * Default. * @syscap SystemCapability.Communication.WiFi.STA - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ DEFAULT = 1, /** * Wifi6. * @syscap SystemCapability.Communication.WiFi.STA - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI6 = 2, /** * Wifi6+. * @syscap SystemCapability.Communication.WiFi.STA - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI6_PLUS = 3, /** * Wifi7. * @syscap SystemCapability.Communication.WiFi.STA - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI7 = 4, /** * Wifi7+. * @syscap SystemCapability.Communication.WiFi.STA - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI7_PLUS = 5 } @@ -2777,7 +2808,8 @@ declare namespace wifiManager { * @typedef WifiDeviceConfig * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface WifiDeviceConfig { /** @@ -2791,7 +2823,8 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ssid: string; @@ -2806,7 +2839,8 @@ declare namespace wifiManager { * @type { ?string } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ bssid?: string; @@ -2836,7 +2870,8 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ preSharedKey: string; @@ -2860,7 +2895,8 @@ declare namespace wifiManager { * @type { WifiSecurityType } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ securityType: WifiSecurityType; @@ -3157,7 +3193,8 @@ declare namespace wifiManager { * @typedef WifiScanInfo * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface WifiScanInfo { /** @@ -3171,7 +3208,8 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ssid: string; @@ -3186,7 +3224,8 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ bssid: string; @@ -3224,7 +3263,8 @@ declare namespace wifiManager { * @type { WifiSecurityType } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ securityType: WifiSecurityType; @@ -3239,7 +3279,8 @@ declare namespace wifiManager { * @type { number } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ rssi: number; @@ -3247,7 +3288,8 @@ declare namespace wifiManager { * Frequency band, 1: 2.4G, 2: 5G * @type { number } * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ band: number; @@ -3310,7 +3352,8 @@ declare namespace wifiManager { * Supported wifi category * @type { WifiCategory } * @syscap SystemCapability.Communication.WiFi.STA - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ supportedWifiCategory: WifiCategory; @@ -3334,14 +3377,16 @@ declare namespace wifiManager { * @enum { number } * @syscap SystemCapability.Communication.WiFi.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum WifiSecurityType { /** * Invalid security type * * @syscap SystemCapability.Communication.WiFi.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_SEC_TYPE_INVALID = 0, @@ -3356,7 +3401,8 @@ declare namespace wifiManager { * * @syscap SystemCapability.Communication.WiFi.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_SEC_TYPE_OPEN = 1, @@ -3364,7 +3410,8 @@ declare namespace wifiManager { * Wired Equivalent Privacy (WEP) * * @syscap SystemCapability.Communication.WiFi.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_SEC_TYPE_WEP = 2, @@ -3372,7 +3419,8 @@ declare namespace wifiManager { * Pre-shared key (PSK) * * @syscap SystemCapability.Communication.WiFi.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_SEC_TYPE_PSK = 3, @@ -3380,7 +3428,8 @@ declare namespace wifiManager { * Simultaneous Authentication of Equals (SAE) * * @syscap SystemCapability.Communication.WiFi.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_SEC_TYPE_SAE = 4, @@ -3388,7 +3437,8 @@ declare namespace wifiManager { * EAP authentication. * * @syscap SystemCapability.Communication.WiFi.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_SEC_TYPE_EAP = 5, @@ -3396,7 +3446,8 @@ declare namespace wifiManager { * SUITE_B_192 192 bit level. * * @syscap SystemCapability.Communication.WiFi.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_SEC_TYPE_EAP_SUITE_B = 6, @@ -3404,7 +3455,8 @@ declare namespace wifiManager { * Opportunistic Wireless Encryption. * * @syscap SystemCapability.Communication.WiFi.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_SEC_TYPE_OWE = 7, @@ -3412,7 +3464,8 @@ declare namespace wifiManager { * WAPI certificate to be specified. * * @syscap SystemCapability.Communication.WiFi.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_SEC_TYPE_WAPI_CERT = 8, @@ -3420,7 +3473,8 @@ declare namespace wifiManager { * WAPI pre-shared key to be specified. * * @syscap SystemCapability.Communication.WiFi.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ WIFI_SEC_TYPE_WAPI_PSK = 9 } @@ -3573,7 +3627,8 @@ declare namespace wifiManager { * @typedef WifiLinkedInfo * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface WifiLinkedInfo { @@ -3588,7 +3643,8 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ssid: string; @@ -3603,7 +3659,8 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ bssid: string; @@ -3627,7 +3684,8 @@ declare namespace wifiManager { * @type { number } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ rssi: number; @@ -3635,7 +3693,8 @@ declare namespace wifiManager { * The frequency band of a Wi-Fi access point. * @type { number } * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ band: number; @@ -3732,7 +3791,8 @@ declare namespace wifiManager { * The Wi-Fi MAC address of a device. * @type { string } * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ macAddress: string; @@ -3757,7 +3817,8 @@ declare namespace wifiManager { * The state of this Wi-Fi connection. * @type { ConnState } * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ connState: ConnState; @@ -3781,7 +3842,8 @@ declare namespace wifiManager { * Supported wifi category * @type { WifiCategory } * @syscap SystemCapability.Communication.WiFi.STA - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ supportedWifiCategory: WifiCategory; @@ -3806,14 +3868,16 @@ declare namespace wifiManager { * Wi-Fi IP information. * @typedef IpInfo * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface IpInfo { /** * The IP address of the Wi-Fi connection * @type { number } * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ ipAddress: number; @@ -3870,14 +3934,16 @@ declare namespace wifiManager { * Wi-Fi IPv6 information. * @typedef Ipv6Info * @syscap SystemCapability.Communication.WiFi.STA - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ interface Ipv6Info { /** * The link IPv6 address of the Wi-Fi connection * @type { string } * @syscap SystemCapability.Communication.WiFi.STA - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ linkIpv6Address: string; @@ -3951,7 +4017,8 @@ declare namespace wifiManager { * @typedef HotspotConfig * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface HotspotConfig { /** @@ -3959,7 +4026,8 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ ssid: string; @@ -3968,7 +4036,8 @@ declare namespace wifiManager { * @type { WifiSecurityType } * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ securityType: WifiSecurityType; @@ -3977,7 +4046,8 @@ declare namespace wifiManager { * @type { number } * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ band: number; @@ -3995,7 +4065,8 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ preSharedKey: string; @@ -4023,7 +4094,8 @@ declare namespace wifiManager { * @typedef StationInfo * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface StationInfo { /** @@ -4040,7 +4112,8 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ macAddress: string; @@ -4208,14 +4281,16 @@ declare namespace wifiManager { * * @enum { number } * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum ConnState { /** * The device is searching for an available AP. * * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ SCANNING, @@ -4223,7 +4298,8 @@ declare namespace wifiManager { * The Wi-Fi connection is being set up. * * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ CONNECTING, @@ -4231,7 +4307,8 @@ declare namespace wifiManager { * The Wi-Fi connection is being authenticated. * * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ AUTHENTICATING, @@ -4239,7 +4316,8 @@ declare namespace wifiManager { * The IP address of the Wi-Fi connection is being obtained. * * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ OBTAINING_IPADDR, @@ -4247,7 +4325,8 @@ declare namespace wifiManager { * The Wi-Fi connection has been set up. * * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ CONNECTED, @@ -4255,7 +4334,8 @@ declare namespace wifiManager { * The Wi-Fi connection is being torn down. * * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ DISCONNECTING, @@ -4263,7 +4343,8 @@ declare namespace wifiManager { * The Wi-Fi connection has been torn down. * * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ DISCONNECTED, @@ -4271,7 +4352,8 @@ declare namespace wifiManager { * Failed to set up the Wi-Fi connection. * * @syscap SystemCapability.Communication.WiFi.STA - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ UNKNOWN } @@ -4281,14 +4363,16 @@ declare namespace wifiManager { * * @typedef WifiP2pDevice * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface WifiP2pDevice { /** * Device name * @type { string } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ deviceName: string; @@ -4296,7 +4380,8 @@ declare namespace wifiManager { * Device mac address * @type { string } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ deviceAddress: string; @@ -4304,7 +4389,8 @@ declare namespace wifiManager { * Device mac address type * @type { ?DeviceAddressType } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ deviceAddressType?: DeviceAddressType; @@ -4312,7 +4398,8 @@ declare namespace wifiManager { * Primary device type * @type { string } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ primaryDeviceType: string; @@ -4320,7 +4407,8 @@ declare namespace wifiManager { * Device status * @type { P2pDeviceStatus } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ deviceStatus: P2pDeviceStatus; @@ -4328,7 +4416,8 @@ declare namespace wifiManager { * Device group capabilities * @type { number } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ groupCapabilities: number; } @@ -4477,20 +4566,23 @@ declare namespace wifiManager { * * @enum { number } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ enum P2pConnectState { /** * p2p is disconnected * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ DISCONNECTED = 0, /** * p2p is connected * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ CONNECTED = 1 } @@ -4500,14 +4592,16 @@ declare namespace wifiManager { * * @typedef WifiP2pLinkedInfo * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface WifiP2pLinkedInfo { /** * Connection status * @type { P2pConnectState } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ connectState: P2pConnectState; @@ -4515,7 +4609,8 @@ declare namespace wifiManager { * Indicates whether it is group owner * @type { boolean } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ isGroupOwner: boolean; @@ -4523,7 +4618,8 @@ declare namespace wifiManager { * Group owner address * @type { string } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ groupOwnerAddr: string; } @@ -4533,41 +4629,47 @@ declare namespace wifiManager { * * @enum { number } * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ enum P2pDeviceStatus { /** * Indicate p2p device is connected. * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ CONNECTED = 0, /** * Indicate p2p device is invited. * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ INVITED = 1, /** * Indicate p2p device is failed. * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ FAILED = 2, /** * Indicate p2p device is available. * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ AVAILABLE = 3, /** * Indicate p2p device is unavailable. * @syscap SystemCapability.Communication.WiFi.P2P - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ UNAVAILABLE = 4 } diff --git a/api/@ohos.window.d.ts b/api/@ohos.window.d.ts index 07741a8a50..b41f5f7e92 100644 --- a/api/@ohos.window.d.ts +++ b/api/@ohos.window.d.ts @@ -58,6 +58,18 @@ declare interface Callback { } /*** endif */ +/*** if arkts 1.2 */ +/** + * Defines the window callback. + * + * @typedef {function} + * @syscap SystemCapability.Window.SessionManager + * @atomicservice + * @since 20 + */ +type Callback = (data: T) => V; +/*** endif */ + /** * Defines the window callback. * diff --git a/api/@ohos.zlib.d.ts b/api/@ohos.zlib.d.ts index 3378c2d3ea..b8aae08c9d 100644 --- a/api/@ohos.zlib.d.ts +++ b/api/@ohos.zlib.d.ts @@ -73,7 +73,7 @@ declare namespace zlib { /** * CompressLevel * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.Zlib * @crossplatform * @atomicservice @@ -157,7 +157,7 @@ declare namespace zlib { /** * CompressStrategy * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.Zlib * @crossplatform * @atomicservice @@ -250,7 +250,7 @@ declare namespace zlib { /** * ParallelStrategy * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.Zlib * @crossplatform * @atomicservice @@ -287,7 +287,7 @@ declare namespace zlib { /** * MemLevel * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.Zlib * @crossplatform * @atomicservice @@ -348,7 +348,7 @@ declare namespace zlib { /** * CompressFlushMode * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 @@ -415,7 +415,7 @@ declare namespace zlib { /** * Return codes for the compression/decompression functions. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 @@ -450,7 +450,7 @@ declare namespace zlib { /** * The deflate compression method (the only one supported in this version). * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 @@ -469,7 +469,7 @@ declare namespace zlib { /** * Define the reference point for offset. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 @@ -597,22 +597,22 @@ declare namespace zlib { /** * Number of bytes available at nextIn. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - availableIn?: number; + availableIn?: int; /** * Total number of input bytes read so far. * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - totalIn?: number; + totalIn?: long; /** * Next output byte will go here. @@ -627,42 +627,42 @@ declare namespace zlib { /** * Remaining free space at nextOut. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - availableOut?: number; + availableOut?: int; /** * Total number of bytes output so far. * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - totalOut?: number; + totalOut?: long; /** * Best guess about the data type. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - dataType?: number; + dataType?: int; /** * Adler-32 or CRC-32 value of the uncompressed data. * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - adler?: number; + adler?: long; } /** @@ -687,32 +687,32 @@ declare namespace zlib { /** * Operating system. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - os?: number; + os?: int; /** * Modification time. * - * @type { ?number } + * @type { ?long } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - time?: number; + time?: long; /** * Extra flags. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - xflags?: number; + xflags?: int; /** * Extra field. @@ -727,12 +727,12 @@ declare namespace zlib { /** * Extra field length. * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - extraLen?: number; + extraLen?: int; /** * Zero-terminated file name. @@ -797,12 +797,12 @@ declare namespace zlib { /** * Total sizeof the destination buffer. * - * @type { number } + * @type { long } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - destLen: number + destLen: long } /** @@ -827,12 +827,12 @@ declare namespace zlib { /** * Return dictionary length. * - * @type { number } + * @type { int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - dictionaryLength: number + dictionaryLength: int } /** @@ -857,22 +857,22 @@ declare namespace zlib { /** * Total sizeof the destination buffer. * - * @type { number } + * @type { long } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - destLength: number + destLength: long /** * Total sizeof the sourceLen. * - * @type { number } + * @type { long } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - sourceLength: number + sourceLength: long } /** @@ -897,22 +897,22 @@ declare namespace zlib { /** * The number of bytes of output that have been generated. * - * @type { number } + * @type { int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - pending: number + pending: int /** * The number of bits of output that have been generated. * - * @type { number } + * @type { int } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - bits: number + bits: int } /** @@ -966,13 +966,13 @@ declare namespace zlib { * @typedef { function } * @param { object } outDesc - Object passed to output function. Object dependency requirement implementation. * @param { ArrayBuffer } buf - Used to store data to be written. - * @param { number } length - Write the length of the output buffer. - * @returns { number } Return the number of bytes output. + * @param { int } length - Write the length of the output buffer. + * @returns { int } Return the number of bytes output. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - type InflateBackOutputCallback = (outDesc: object, buf: ArrayBuffer, length: number) => number; + type InflateBackOutputCallback = (outDesc: object, buf: ArrayBuffer, length: int) => int; /** * Compress the specified file. @@ -1208,7 +1208,7 @@ declare namespace zlib { * Get the original size of the compressed zip file, the size is the meta data stored in zip file. * * @param { string } compressedFile - Indicates the path of the compressed file. - * @returns { Promise } Returns the original size of the compressed file. + * @returns { Promise } Returns the original size of the compressed file. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @throws { BusinessError } 900001 - The input source file is invalid. * @throws { BusinessError } 900003 - The input source file is not in ZIP format or is damaged. @@ -1218,7 +1218,7 @@ declare namespace zlib { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getOriginalSize(compressedFile: string): Promise; + function getOriginalSize(compressedFile: string): Promise; /** * Asynchronous creation of verification objects. @@ -1295,9 +1295,9 @@ declare namespace zlib { /** * Update a running Adler-32 checksum with the bytes buf. * - * @param { number } adler - Initial value of Adler32 checksum. + * @param { long } adler - Initial value of Adler32 checksum. * @param { ArrayBuffer } buf - Calculate checksum data buffer. - * @returns { Promise } Return the updated checksum. + * @returns { Promise } Return the updated checksum. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib @@ -1305,15 +1305,15 @@ declare namespace zlib { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - adler32(adler: number, buf: ArrayBuffer): Promise; + adler32(adler: long, buf: ArrayBuffer): Promise; /** * Combine two Adler-32 checksum into one. * - * @param { number } adler1 - The first Adler32 checksum. - * @param { number } adler2 - The second Adler32 checksum. - * @param { number } len2 - The length of the data block associated with the second Adler32 checksum. - * @returns { Promise } Returns the Adler-32 checksum. + * @param { long } adler1 - The first Adler32 checksum. + * @param { long } adler2 - The second Adler32 checksum. + * @param { long } len2 - The length of the data block associated with the second Adler32 checksum. + * @returns { Promise } Returns the Adler-32 checksum. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib @@ -1321,14 +1321,14 @@ declare namespace zlib { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - adler32Combine(adler1: number, adler2: number, len2: number): Promise; + adler32Combine(adler1: long, adler2: long, len2: long): Promise; /** * Update a running CRC-32 with the bytes buf. * - * @param { number } crc - Initial value of CRC-32 checksum. + * @param { long } crc - Initial value of CRC-32 checksum. * @param { ArrayBuffer } buf - Calculate checksum data buffer. - * @returns { Promise } Return the updated CRC-32. + * @returns { Promise } Return the updated CRC-32. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib @@ -1336,15 +1336,15 @@ declare namespace zlib { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - crc32(crc: number, buf: ArrayBuffer): Promise; + crc32(crc: long, buf: ArrayBuffer): Promise; /** * Combine two CRC-32 check values into one. * - * @param { number } crc1 - The first CRC-32 checksum. - * @param { number } crc2 - The second CRC-32 checksum. - * @param { number } len2 - The length of the data block associated with the second CRC-32 checksum. - * @returns { Promise } Returns the CRC-32 check value. + * @param { long } crc1 - The first CRC-32 checksum. + * @param { long } crc2 - The second CRC-32 checksum. + * @param { long } len2 - The length of the data block associated with the second CRC-32 checksum. + * @returns { Promise } Returns the CRC-32 check value. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib @@ -1352,42 +1352,42 @@ declare namespace zlib { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - crc32Combine(crc1: number, crc2: number, len2: number): Promise; + crc32Combine(crc1: long, crc2: long, len2: long): Promise; /** * Update a running CRC-64 with the bytes buf. * - * @param { number } crc - Initial value of CRC-64 checksum. + * @param { long } crc - Initial value of CRC-64 checksum. * @param { ArrayBuffer } buf - Calculate checksum data buffer. - * @returns { Promise } Return the updated CRC-64. + * @returns { Promise } Return the updated CRC-64. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - crc64(crc: number, buf: ArrayBuffer): Promise; + crc64(crc: long, buf: ArrayBuffer): Promise; /** * Get CRC-32 table. * - * @returns { Promise> } Return a array to the CRC-32 table. + * @returns { Promise> } Return a array to the CRC-32 table. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - getCrcTable(): Promise>; + getCrcTable(): Promise>; /** * Get CRC-64 table. * - * @returns { Promise> } Return a array to the CRC-64 table. + * @returns { Promise> } Return a array to the CRC-64 table. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - getCrc64Table(): Promise>; + getCrc64Table(): Promise>; } /** @@ -1422,7 +1422,7 @@ declare namespace zlib { /** * Return flags indicating compile-time options. * - * @returns { Promise } Return flags indicating compile-time options. + * @returns { Promise } Return flags indicating compile-time options. * Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: * 1.0: size of uInt. * 3.2: size of uLong. @@ -1455,14 +1455,14 @@ declare namespace zlib { * @atomicservice * @since 12 */ - zlibCompileFlags(): Promise; + zlibCompileFlags(): Promise; /** * Compresses the source buffer into the destination buffer. * * @param { ArrayBuffer } dest - Destination buffer. * @param { ArrayBuffer } source - Source data buffer. - * @param { number } sourceLen - Source data length. + * @param { long } sourceLen - Source data length. * @returns { Promise } Return ReturnStatus and total sizeof the destination buffer. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -1471,7 +1471,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - compress(dest: ArrayBuffer, source: ArrayBuffer, sourceLen?: number): Promise; + compress(dest: ArrayBuffer, source: ArrayBuffer, sourceLen?: long): Promise; /** * Compresses the source buffer into the destination buffer. @@ -1479,7 +1479,7 @@ declare namespace zlib { * @param { ArrayBuffer } dest - Destination buffer. * @param { ArrayBuffer } source - Source data buffer. * @param { CompressLevel } level - Compression level. - * @param { number } sourceLen - Source data length. + * @param { long } sourceLen - Source data length. * @returns { Promise } Return ReturnStatus and total sizeof the destination buffer. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -1489,27 +1489,27 @@ declare namespace zlib { * @atomicservice * @since 12 */ - compress2(dest: ArrayBuffer, source: ArrayBuffer, level: CompressLevel, sourceLen?: number,): Promise; + compress2(dest: ArrayBuffer, source: ArrayBuffer, level: CompressLevel, sourceLen?: long,): Promise; /** * Calculate the upper limit of the return compression size. * - * @param { number } sourceLen - The length of the source data. - * @returns { Promise } Returns an upper bound on the compressed size after. + * @param { int } sourceLen - The length of the source data. + * @returns { Promise } Returns an upper bound on the compressed size after. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - compressBound(sourceLen: number): Promise; + compressBound(sourceLen: int): Promise; /** * Decompress the compressed data into its original uncompressed form. * * @param { ArrayBuffer } dest - Destination buffer. * @param { ArrayBuffer } source - Source data buffer. - * @param { number } sourceLen - Source data length. + * @param { long } sourceLen - Source data length. * @returns { Promise } Return ReturnStatus and total sizeof the destination buffer. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -1519,14 +1519,14 @@ declare namespace zlib { * @atomicservice * @since 12 */ - uncompress(dest:ArrayBuffer, source: ArrayBuffer, sourceLen?: number): Promise; + uncompress(dest:ArrayBuffer, source: ArrayBuffer, sourceLen?: long): Promise; /** * Decompress the compressed data into its original uncompressed form. * * @param { ArrayBuffer } dest - Destination buffer. * @param { ArrayBuffer } source - Source data buffer. - * @param { number } sourceLen - Source data length. + * @param { long } sourceLen - Source data length. * @returns { Promise } Return ReturnStatus and total sizeof the destination buffer and total sizeof the sourceLen. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -1536,13 +1536,13 @@ declare namespace zlib { * @atomicservice * @since 12 */ - uncompress2(dest: ArrayBuffer, source: ArrayBuffer, sourceLen?: number): Promise; + uncompress2(dest: ArrayBuffer, source: ArrayBuffer, sourceLen?: long): Promise; /** * Verify the checksum inside the structure of compressed stream z_stream. * * @param { ZStream } strm - Object to structure z_stream. - * @param { number } check - Expected checksum. + * @param { int } check - Expected checksum. * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -1551,7 +1551,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - inflateValidate(strm: ZStream, check: number): Promise; + inflateValidate(strm: ZStream, check: int): Promise; /** * Find a synchronization point for the current decompressed stream. @@ -1617,7 +1617,7 @@ declare namespace zlib { * This function is equivalent to inflateEnd followed by inflateInit, but does not free and reallocate the internal decompression state. * * @param { ZStream } strm - Object to structure z_stream. - * @param { number } windowBits - Parameter is interpreted the same as it is for inflateInit2. + * @param { int } windowBits - Parameter is interpreted the same as it is for inflateInit2. * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -1626,7 +1626,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - inflateReset2(strm: ZStream, windowBits: number): Promise; + inflateReset2(strm: ZStream, windowBits: int): Promise; /** * This function is equivalent to inflateEnd followed by inflateInit, but does not free and reallocate the internal decompression state. @@ -1646,8 +1646,8 @@ declare namespace zlib { * This function inserts bits in the inflate input stream. * * @param { ZStream } strm - Object to structure z_stream. - * @param { number } bits - The provided bits. - * @param { number } value - The provided value. + * @param { int } bits - The provided bits. + * @param { int } value - The provided value. * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -1656,26 +1656,26 @@ declare namespace zlib { * @atomicservice * @since 12 */ - inflatePrime(strm: ZStream, bits: number, value: number): Promise; + inflatePrime(strm: ZStream, bits: int, value: int): Promise; /** * Is used to mark locations in the input data for random access. * * @param { ZStream } strm - Object to structure z_stream. - * @returns { Promise } Return the internal marker position of the current decompressed stream. + * @returns { Promise } Return the internal marker position of the current decompressed stream. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - inflateMark(strm: ZStream): Promise; + inflateMark(strm: ZStream): Promise; /** * Initializes the internal stream state for decompression. * * @param { ZStream } strm - Object to structure z_stream. - * @param { number } windowBits - Is the base two logarithm of the maximum window size. + * @param { int } windowBits - Is the base two logarithm of the maximum window size. * It should be in the range 8..15 for this version of the library. The default value is 15 if inflateInit is used instead. * windowBits must be greater than or equal to the windowBits value provided to deflateInit2() while compressing, * or it must be equal to 15 if deflateInit2() was not used. If a compressed stream with a larger window size is given as input, @@ -1701,7 +1701,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - inflateInit2(strm: ZStream, windowBits: number): Promise; + inflateInit2(strm: ZStream, windowBits: int): Promise; /** * Initializes the internal stream state for decompression. @@ -1778,20 +1778,20 @@ declare namespace zlib { * Obtain the number of Huffman encoding trees that have been used in the current decompression stream during the inflate process. * * @param { ZStream } strm - Object to structure z_stream. - * @returns { Promise } Return the number of used Huffman encoding trees. + * @returns { Promise } Return the number of used Huffman encoding trees. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - inflateCodesUsed(strm: ZStream): Promise; + inflateCodesUsed(strm: ZStream): Promise; /** * Initialize the internal stream state for decompression using inflateBack() calls. * * @param { ZStream } strm - Object to structure z_stream. - * @param { number } windowBits - Parameter is interpreted the same as it is for inflateInit2. The value range is between 8~15. + * @param { long } windowBits - Parameter is interpreted the same as it is for inflateInit2. The value range is between 8~15. * @param { ArrayBuffer } window - The preset sliding window buffer. * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; @@ -1801,7 +1801,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - inflateBackInit(strm: ZStream, windowBits: number, window: ArrayBuffer): Promise; + inflateBackInit(strm: ZStream, windowBits: long, window: ArrayBuffer): Promise; /** * All memory allocated by inflateBackInit() is freed. @@ -1872,7 +1872,7 @@ declare namespace zlib { * @param { ZStream } strm - Object to structure z_stream. * @param { CompressLevel } level - Compression level. * @param { CompressMethod } method - The compression method. - * @param { number } windowBits - Parameter is interpreted the same as it is for inflateInit2. + * @param { int } windowBits - Parameter is interpreted the same as it is for inflateInit2. * @param { MemLevel } memLevel - The memory usage level. * @param { CompressStrategy } strategy - The compression strategy. * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. @@ -1883,7 +1883,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - deflateInit2(strm: ZStream, level: CompressLevel, method: CompressMethod, windowBits: number, + deflateInit2(strm: ZStream, level: CompressLevel, method: CompressMethod, windowBits: int, memLevel: MemLevel, strategy: CompressStrategy): Promise; /** @@ -1920,15 +1920,15 @@ declare namespace zlib { * Calculate an upper bound on the compressed size. * * @param { ZStream } strm - Object to structure z_stream. - * @param { number } sourceLength - The length of uncompressed data. - * @returns { Promise } Return an upper bound on the compressed size. + * @param { long } sourceLength - The length of uncompressed data. + * @returns { Promise } Return an upper bound on the compressed size. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - deflateBound(strm: ZStream, sourceLength: number): Promise; + deflateBound(strm: ZStream, sourceLength: long): Promise; /** * Provides gzip header information for when a gzip stream is requested by deflateInit2(). @@ -1993,10 +1993,10 @@ declare namespace zlib { * Fine tune deflate's internal compression parameters. * * @param { ZStream } strm - Object to structure z_stream. - * @param { number } goodLength - Good matching length threshold. - * @param { number } maxLazy - Maximum lazy matching times. - * @param { number } niceLength - Good Lazy Length Threshold. - * @param { number } maxChain - Maximum chain length. + * @param { int } goodLength - Good matching length threshold. + * @param { int } maxLazy - Maximum lazy matching times. + * @param { int } niceLength - Good Lazy Length Threshold. + * @param { int } maxChain - Maximum chain length. * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -2005,7 +2005,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - deflateTune(strm: ZStream, goodLength: number, maxLazy: number, niceLength: number, maxChain: number): Promise; + deflateTune(strm: ZStream, goodLength: int, maxLazy: int, niceLength: int, maxChain: int): Promise; /** * This function is equivalent to deflateEnd followed by deflateInit, but does not free and reallocate the internal compression state. @@ -2069,8 +2069,8 @@ declare namespace zlib { * Inserts bits in the deflate output stream. * * @param { ZStream } strm - Object to structure z_stream. - * @param { number } bits - The number of bits to be inserted. The value range is between 0~16. - * @param { number } value - The bit value corresponding to the number of bits. + * @param { int } bits - The number of bits to be inserted. The value range is between 0~16. + * @param { int } value - The bit value corresponding to the number of bits. * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -2079,7 +2079,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - deflatePrime(strm: ZStream, bits: number, value: number): Promise; + deflatePrime(strm: ZStream, bits: int, value: int): Promise; } /** @@ -2095,7 +2095,7 @@ declare namespace zlib { /** * Associate a gzFile with the file descriptor fd. * - * @param { number } fd - The file descriptor. Usually this is obtained through system calls to 'open' or other methods. + * @param { int } fd - The file descriptor. Usually this is obtained through system calls to 'open' or other methods. * @param { string } mode - Used to specify access mode. * @returns { Promise } * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; @@ -2105,13 +2105,13 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzdopen(fd: number, mode: string): Promise; + gzdopen(fd: int, mode: string): Promise; /** * Set the internal buffer size used by this library's functions for file to size. * - * @param { number } size - The internal buffer size to be set. - * @returns { Promise } Returns 0 on success. + * @param { long } size - The internal buffer size to be set. + * @returns { Promise } Returns 0 on success. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2119,7 +2119,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzbuffer(size: number): Promise; + gzbuffer(size: long): Promise; /** * Open the gzip (.gz) file at path for reading and decompressing, or compressing and writing. @@ -2139,22 +2139,22 @@ declare namespace zlib { /** * Check if the reading position of the gzip compressed file has reached the end of the file. * - * @returns { Promise } Return 1 (true) if the end-of-file indicator for file has been set while reading. + * @returns { Promise } Return 1 (true) if the end-of-file indicator for file has been set while reading. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - gzeof(): Promise; + gzeof(): Promise; /** * Check if the specified gzip file handle file directly accesses the original uncompressed data. * - * @returns { Promise } returns 1 (true) if transparent writing was requested. + * @returns { Promise } returns 1 (true) if transparent writing was requested. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - gzdirect(): Promise; + gzdirect(): Promise; /** * Flush all pending output for file, if necessary, close file and deallocate the (de)compression state. @@ -2192,13 +2192,13 @@ declare namespace zlib { /** * Read and decompress one byte from file. * - * @returns { Promise } Return the ASCII code of a character. + * @returns { Promise } Return the ASCII code of a character. * @throws { BusinessError } 17800009 - Internal structure error. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - gzgetc(): Promise; + gzgetc(): Promise; /** * Flush all pending output to file. @@ -2218,9 +2218,9 @@ declare namespace zlib { * Compress and write nitems items of size size from buf to file. * * @param { ArrayBuffer } buf - The buffer to write data to. - * @param { number } size - The number of bytes in a single data block. - * @param { number } nitems - Number of data blocks to be written. - * @returns { Promise } Return the number of full items written of size size. + * @param { long } size - The number of bytes in a single data block. + * @param { long } nitems - Number of data blocks to be written. + * @returns { Promise } Return the number of full items written of size size. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2228,15 +2228,15 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzfwrite(buf: ArrayBuffer, size: number, nitems: number): Promise; + gzfwrite(buf: ArrayBuffer, size: long, nitems: long): Promise; /** * Read and decompress data from gzip compressed files. * * @param { ArrayBuffer } buf - Target buffer for storing read results. - * @param { number } size - The number of bytes in a single data block. - * @param { number } nitems - Number of data blocks to be read. - * @returns { Promise } Return the number of full items read of size size. + * @param { long } size - The number of bytes in a single data block. + * @param { long } nitems - Number of data blocks to be read. + * @returns { Promise } Return the number of full items read of size size. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2244,7 +2244,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzfread(buf: ArrayBuffer, size: number, nitems: number): Promise; + gzfread(buf: ArrayBuffer, size: long, nitems: long): Promise; /** * Same as gzclose(), gzclosew() only for use when writing or appending. @@ -2273,8 +2273,8 @@ declare namespace zlib { * Compress and write the len uncompressed bytes at buf to file. * * @param { ArrayBuffer } buf - Object to the data buffer to be written. - * @param { number } len - The len uncompressed bytes. - * @returns { Promise } Return the number of uncompressed bytes written. + * @param { long } len - The len uncompressed bytes. + * @returns { Promise } Return the number of uncompressed bytes written. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2282,13 +2282,13 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzwrite(buf: ArrayBuffer, len: number): Promise; + gzwrite(buf: ArrayBuffer, len: long): Promise; /** * Push c back onto the stream for file to be read as the first character on the next read. * - * @param { number } c - To fall back to the character before the input stream. - * @returns { Promise } Return the character pushed. + * @param { int } c - To fall back to the character before the input stream. + * @returns { Promise } Return the character pushed. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2296,18 +2296,18 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzungetc(c: number): Promise; + gzungetc(c: int): Promise; /** * Return the starting position for the next gzread or gzwrite on file. * - * @returns { Promise } Return the starting position for the next gzread or gzwrite on file. + * @returns { Promise } Return the starting position for the next gzread or gzwrite on file. * @throws { BusinessError } 17800009 - Internal structure error. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - gztell(): Promise; + gztell(): Promise; /** * Dynamically update the compression level and strategy for file. @@ -2327,9 +2327,9 @@ declare namespace zlib { /** * Set the starting position to offset relative to whence for the next gzread or gzwrite on file. * - * @param { number } offset - Specify the new offset to move to. + * @param { long } offset - Specify the new offset to move to. * @param { OffsetReferencePoint } whence - Define the reference point for offset. - * @returns { Promise } Return the resulting offset location as measured in bytes from the beginning of the uncompressed stream. + * @returns { Promise } Return the resulting offset location as measured in bytes from the beginning of the uncompressed stream. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2337,7 +2337,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzseek(offset: number, whence: OffsetReferencePoint): Promise; + gzseek(offset: long, whence: OffsetReferencePoint): Promise; /** * Rewind file. This function is supported only for reading. @@ -2354,7 +2354,7 @@ declare namespace zlib { * Read and decompress up to len uncompressed bytes from file into buf. * * @param { ArrayBuffer } buf - User provided buffer address. - * @returns { Promise } Return the number of uncompressed bytes actually read, less than len for end of file. + * @returns { Promise } Return the number of uncompressed bytes actually read, less than len for end of file. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2362,13 +2362,13 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzread(buf: ArrayBuffer): Promise; + gzread(buf: ArrayBuffer): Promise; /** * Compress and write the given null-terminated string s to file, excluding the terminating null character. * * @param { string } str - Format descriptors and plain text. - * @returns { Promise } Return the number of characters written. + * @returns { Promise } Return the number of characters written. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2376,13 +2376,13 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzputs(str: string): Promise; + gzputs(str: string): Promise; /** * Compress and write c, converted to an unsigned char, into file. * - * @param { number } char - Write ASCII values for characters. - * @returns { Promise } Return the value that was written. + * @param { int } ch - Write ASCII values for characters. + * @returns { Promise } Return the value that was written. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2390,14 +2390,14 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzputc(char: number): Promise; + gzputc(ch: int): Promise; /** * Convert, format, compress, and write the arguments to file under control of the string format, as in fprintf. * * @param { string } format - Format descriptors and plain text. * @param { Array } args - Variable argument lists. - * @returns { Promise } Return the number of uncompressed bytes actually written. + * @returns { Promise } Return the number of uncompressed bytes actually written. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800004 - Compression or decompression stream error, which may be caused by an initialization error in the zlib stream structure or a modified structure. @@ -2406,18 +2406,18 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzprintf(format: string, ...args: Array): Promise; + gzprintf(format: string, ...args: Array): Promise; /** * Return the current compressed (actual) read or write offset of file. * - * @returns { Promise } Return the current compressed (actual) read or write offset of file. + * @returns { Promise } Return the current compressed (actual) read or write offset of file. * @throws { BusinessError } 17800009 - Internal structure error. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - gzoffset(): Promise; + gzoffset(): Promise; /** * Read and decompress bytes from file into buf, until len-1 characters are read, or until a newline character is read and transferred to buf, diff --git a/api/@system.notification.d.ts b/api/@system.notification.d.ts index 174ff3602b..3e494f68ea 100644 --- a/api/@system.notification.d.ts +++ b/api/@system.notification.d.ts @@ -91,6 +91,8 @@ export interface ShowNotificationOptions { } /** + * Manages notifications. + * * @syscap SystemCapability.Notification.Notification * @since 3 */ @@ -101,6 +103,7 @@ export default class Notification { * @param { ShowNotificationOptions } [options] - Options. * @syscap SystemCapability.Notification.Notification * @since 3 + * @deprecated since 7 */ static show(options?: ShowNotificationOptions): void; } diff --git a/api/@system.prompt.d.ts b/api/@system.prompt.d.ts index 087c0d3c45..d5b9e2de07 100644 --- a/api/@system.prompt.d.ts +++ b/api/@system.prompt.d.ts @@ -388,7 +388,7 @@ export interface ShowActionMenuOptions { * @atomicservice * @since 11 */ -export default class Prompt { +declare class Prompt { /** * Displays the notification text. * @@ -440,3 +440,5 @@ export default class Prompt { */ static showActionMenu(options: ShowActionMenuOptions): void; } + +export default Prompt; \ No newline at end of file diff --git a/api/ability/connectOptions.d.ts b/api/ability/connectOptions.d.ts index 7a911505f6..705436959c 100644 --- a/api/ability/connectOptions.d.ts +++ b/api/ability/connectOptions.d.ts @@ -44,7 +44,8 @@ export interface ConnectOptions { * @param { ElementName } elementName - The ohos.bundleManager.ElementName object of the service ability * @param { rpc.IRemoteObject } remote - The remote object instance * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onConnect(elementName: ElementName, remote: rpc.IRemoteObject): void; @@ -60,7 +61,8 @@ export interface ConnectOptions { * * @param { ElementName } elementName - The ohos.bundleManager.ElementName object of the service ability * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onDisconnect(elementName: ElementName): void; @@ -69,7 +71,8 @@ export interface ConnectOptions { * * @param { number } code - The error code of the failed. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ onFailed(code: number): void; } diff --git a/api/application/AbilityDelegator.d.ts b/api/application/AbilityDelegator.d.ts index d7a91d0bf7..b0f58bec9d 100644 --- a/api/application/AbilityDelegator.d.ts +++ b/api/application/AbilityDelegator.d.ts @@ -18,6 +18,8 @@ * @kit AbilityKit */ +import AbilityStage from '../@ohos.app.ability.AbilityStage'; +import { AbilityStageMonitor } from './AbilityStageMonitor'; import { AsyncCallback } from '../@ohos.base'; import { AbilityMonitor } from './AbilityMonitor'; import Context from './Context'; diff --git a/api/application/AbilityRunningInfo.d.ts b/api/application/AbilityRunningInfo.d.ts index d19e8366d3..26f2e16562 100644 --- a/api/application/AbilityRunningInfo.d.ts +++ b/api/application/AbilityRunningInfo.d.ts @@ -26,7 +26,8 @@ import abilityManager from '../@ohos.app.ability.abilityManager'; * * @typedef AbilityRunningInfo * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface AbilityRunningInfo { /** @@ -43,7 +44,8 @@ export interface AbilityRunningInfo { * @type { ElementName } * @default the ohos.bundleManager.ElementName object of the ability. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ ability: ElementName; @@ -53,7 +55,8 @@ export interface AbilityRunningInfo { * @type { number } * @default process id * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ pid: number; @@ -63,7 +66,8 @@ export interface AbilityRunningInfo { * @type { number } * @default user id * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ uid: number; @@ -73,7 +77,8 @@ export interface AbilityRunningInfo { * @type { string } * @default the name of the process * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ processName: string; @@ -83,7 +88,8 @@ export interface AbilityRunningInfo { * @type { number } * @default ability start time * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ startTime: number; @@ -93,7 +99,8 @@ export interface AbilityRunningInfo { * @type { abilityManager.AbilityState } * @default Enumerates state of the ability state info * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ abilityState: abilityManager.AbilityState; } diff --git a/api/application/ApplicationContext.d.ts b/api/application/ApplicationContext.d.ts index e4777379ad..fef8f63b44 100644 --- a/api/application/ApplicationContext.d.ts +++ b/api/application/ApplicationContext.d.ts @@ -751,7 +751,8 @@ declare class ApplicationContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ getCurrentAppCloneIndex(): number; @@ -787,7 +788,8 @@ declare class ApplicationContext extends Context { * @throws { BusinessError } 16000078 - The multi-instance is not supported. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ getCurrentInstanceKey(): string; @@ -807,7 +809,8 @@ declare class ApplicationContext extends Context { * @throws { BusinessError } 16000078 - The multi-instance is not supported. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ getAllRunningInstanceKeys(): Promise>; } diff --git a/api/application/AutoFillType.d.ts b/api/application/AutoFillType.d.ts index 8a5d9eb3ba..ec2bc65918 100644 --- a/api/application/AutoFillType.d.ts +++ b/api/application/AutoFillType.d.ts @@ -25,7 +25,8 @@ * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum AutoFillType { /** @@ -34,7 +35,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ UNSPECIFIED = 0, @@ -44,7 +46,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ PASSWORD = 1, @@ -54,7 +57,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ USER_NAME = 2, @@ -64,7 +68,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ NEW_PASSWORD = 3, @@ -74,7 +79,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ FULL_STREET_ADDRESS = 4, @@ -84,7 +90,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ HOUSE_NUMBER = 5, @@ -94,7 +101,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ DISTRICT_ADDRESS = 6, @@ -104,7 +112,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ CITY_ADDRESS = 7, @@ -114,7 +123,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PROVINCE_ADDRESS = 8, @@ -124,7 +134,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ COUNTRY_ADDRESS = 9, @@ -134,7 +145,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PERSON_FULL_NAME = 10, @@ -144,7 +156,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PERSON_LAST_NAME = 11, @@ -154,7 +167,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PERSON_FIRST_NAME = 12, @@ -164,7 +178,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PHONE_NUMBER = 13, @@ -174,7 +189,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PHONE_COUNTRY_CODE = 14, @@ -184,7 +200,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ FULL_PHONE_NUMBER = 15, @@ -204,7 +221,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ BANK_CARD_NUMBER = 17, @@ -214,7 +232,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ID_CARD_NUMBER = 18, @@ -224,7 +243,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NICKNAME = 24, @@ -234,7 +254,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ DETAIL_INFO_WITHOUT_STREET = 25, @@ -244,7 +265,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ FORMAT_ADDRESS = 26, @@ -254,7 +276,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ PASSPORT_NUMBER = 27, @@ -264,7 +287,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ VALIDITY = 28, @@ -274,7 +298,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ ISSUE_AT = 29, @@ -284,7 +309,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ ORGANIZATION = 30, @@ -294,7 +320,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ TAX_ID = 31, @@ -304,7 +331,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ ADDRESS_CITY_AND_STATE = 32, @@ -314,7 +342,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ FLIGHT_NUMBER = 33, @@ -324,7 +353,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ LICENSE_NUMBER = 34, @@ -334,7 +364,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ LICENSE_FILE_NUMBER = 35, @@ -344,7 +375,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ LICENSE_PLATE = 36, @@ -354,7 +386,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ ENGINE_NUMBER = 37, @@ -364,7 +397,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ LICENSE_CHASSIS_NUMBER = 38 } \ No newline at end of file diff --git a/api/application/Context.d.ts b/api/application/Context.d.ts index b226b36719..9e2747b22a 100644 --- a/api/application/Context.d.ts +++ b/api/application/Context.d.ts @@ -299,7 +299,8 @@ declare class Context extends BaseContext { * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ bundleCodeDir: string; @@ -318,7 +319,8 @@ declare 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 */ distributedFilesDir: string; @@ -335,7 +337,8 @@ declare class Context extends BaseContext { * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ resourceDir: string; @@ -346,7 +349,8 @@ declare class Context extends BaseContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ cloudFileDir: string; @@ -430,7 +434,8 @@ declare class Context extends BaseContext { * @stagemodelonly * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ processName: string; @@ -595,7 +600,8 @@ declare 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 */ getGroupDir(dataGroupID: string, callback: AsyncCallback): void; @@ -623,7 +629,8 @@ declare 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 */ getGroupDir(dataGroupID: string): Promise; @@ -656,7 +663,8 @@ declare class Context extends BaseContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ createAreaModeContext(areaMode: contextConstant.AreaMode): Context; @@ -671,7 +679,8 @@ declare class Context extends BaseContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ createDisplayContext(displayId: number): Context; } diff --git a/api/application/DriverExtensionContext.d.ts b/api/application/DriverExtensionContext.d.ts index 6a87f00f86..6c64f808fd 100644 --- a/api/application/DriverExtensionContext.d.ts +++ b/api/application/DriverExtensionContext.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"), * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -27,16 +27,26 @@ import ExtensionContext from './ExtensionContext'; * @extends ExtensionContext * @syscap SystemCapability.Driver.ExternalDevice * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ -export default class DriverExtensionContext extends ExtensionContext { - - +declare class DriverExtensionContext extends ExtensionContext { /** * update the state of driver extension. * @syscap SystemCapability.Driver.ExternalDevice * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ updateDriverState(): void; -} \ No newline at end of file +} +/** + * Define a DriverExtensionContext. + * + * @typedef { DriverExtensionContext } + * @syscap SystemCapability.Driver.ExternalDevice + * @stagemodelonly + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 + */ +export default DriverExtensionContext; diff --git a/api/application/ErrorObserver.d.ts b/api/application/ErrorObserver.d.ts index e388cd08e0..b6fd088d97 100644 --- a/api/application/ErrorObserver.d.ts +++ b/api/application/ErrorObserver.d.ts @@ -37,7 +37,8 @@ * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ export default class ErrorObserver { /** @@ -62,7 +63,8 @@ export default class ErrorObserver { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ onUnhandledException(errMsg: string): void; @@ -88,7 +90,8 @@ export default class ErrorObserver { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ onException?(errObject: Error): void; } diff --git a/api/application/EventHub.d.ts b/api/application/EventHub.d.ts index 8b1a3fb6c1..5551d8e56a 100644 --- a/api/application/EventHub.d.ts +++ b/api/application/EventHub.d.ts @@ -79,7 +79,8 @@ export default class EventHub { * @stagemodelonly * @crossplatform * @atomicservice - * @since 12 + * @since arkts{ '1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ on(event: string, callback: Function): void; @@ -117,7 +118,8 @@ export default class EventHub { * @stagemodelonly * @crossplatform * @atomicservice - * @since 12 + * @since arkts{ '1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ off(event: string, callback?: Function): void; @@ -158,4 +160,17 @@ export default class EventHub { * @since 12 */ emit(event: string, ...args: Object[]): void; + + /** + * Trigger the event callbacks. + * + * @param { string } event - Indicates the event. + * @param { (Object|null|undefined)[] } args - Indicates the callback arguments. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + emit(event: string, ...args: (Object|null|undefined)[]): void; } diff --git a/api/application/ExtensionRunningInfo.d.ts b/api/application/ExtensionRunningInfo.d.ts index 6c23c5536b..7b6bdaaf40 100644 --- a/api/application/ExtensionRunningInfo.d.ts +++ b/api/application/ExtensionRunningInfo.d.ts @@ -27,7 +27,8 @@ import bundle from '../@ohos.bundle.bundleManager'; * @typedef ExtensionRunningInfo * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface ExtensionRunningInfo { /** @@ -35,7 +36,8 @@ export interface ExtensionRunningInfo { * @default Indicates the extension of the extension info * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ extension: ElementName; @@ -44,7 +46,8 @@ export interface ExtensionRunningInfo { * @default process id * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ pid: number; @@ -53,7 +56,8 @@ export interface ExtensionRunningInfo { * @default user id * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ uid: number; @@ -62,7 +66,8 @@ export interface ExtensionRunningInfo { * @default the name of the process * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ processName: string; @@ -71,7 +76,8 @@ export interface ExtensionRunningInfo { * @default ability start time * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ startTime: number; @@ -80,7 +86,8 @@ export interface ExtensionRunningInfo { * @default All package names under the current process * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ clientPackage: Array; @@ -89,7 +96,8 @@ export interface ExtensionRunningInfo { * @default Enumerates types of the extension info * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ type: bundle.ExtensionAbilityType; } diff --git a/api/application/LoopObserver.d.ts b/api/application/LoopObserver.d.ts index 0285fd6622..148cc608cf 100644 --- a/api/application/LoopObserver.d.ts +++ b/api/application/LoopObserver.d.ts @@ -33,7 +33,8 @@ * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface LoopObserver { /** @@ -51,7 +52,8 @@ export interface LoopObserver { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ onLoopTimeOut?(timeout: number): void; } diff --git a/api/application/ProcessInformation.d.ts b/api/application/ProcessInformation.d.ts index 8f64c790d6..8a7320f660 100644 --- a/api/application/ProcessInformation.d.ts +++ b/api/application/ProcessInformation.d.ts @@ -17,7 +17,6 @@ * @file * @kit AbilityKit */ - /*** if arkts 1.1 */ import type appManager from '../@ohos.app.ability.appManager'; /*** endif */ diff --git a/api/application/RunningMultiAppInfo.d.ts b/api/application/RunningMultiAppInfo.d.ts index cb77e92feb..f5732fa40b 100644 --- a/api/application/RunningMultiAppInfo.d.ts +++ b/api/application/RunningMultiAppInfo.d.ts @@ -51,7 +51,8 @@ export interface RunningMultiAppInfo { * @type { MultiAppMode } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ mode: MultiAppMode; @@ -72,7 +73,8 @@ export interface RunningMultiAppInfo { * @type { ?Array } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ runningAppClones?: Array; } \ No newline at end of file diff --git a/api/application/RunningMultiInstanceInfo.d.ts b/api/application/RunningMultiInstanceInfo.d.ts index 1645db4051..c64921df69 100644 --- a/api/application/RunningMultiInstanceInfo.d.ts +++ b/api/application/RunningMultiInstanceInfo.d.ts @@ -45,7 +45,8 @@ export interface RunningMultiInstanceInfo { * @type { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ uid: number; @@ -55,7 +56,8 @@ export interface RunningMultiInstanceInfo { * @type { Array } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ pids: Array; } \ No newline at end of file diff --git a/api/application/ServiceExtensionContext.d.ts b/api/application/ServiceExtensionContext.d.ts index d133113da9..b095231a75 100644 --- a/api/application/ServiceExtensionContext.d.ts +++ b/api/application/ServiceExtensionContext.d.ts @@ -1614,7 +1614,8 @@ declare class ServiceExtensionContext extends ExtensionContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ stopServiceExtensionAbility(want: Want, callback: AsyncCallback): void; @@ -1662,7 +1663,8 @@ declare class ServiceExtensionContext extends ExtensionContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ stopServiceExtensionAbility(want: Want): Promise; diff --git a/api/application/UIAbilityContext.d.ts b/api/application/UIAbilityContext.d.ts index 73cf76d55b..ccaefcc033 100644 --- a/api/application/UIAbilityContext.d.ts +++ b/api/application/UIAbilityContext.d.ts @@ -17,7 +17,6 @@ * @file * @kit AbilityKit */ - /*** if arkts 1.1 */ import { ConnectOptions } from '../ability/connectOptions'; import { Caller } from '../@ohos.app.ability.UIAbility'; @@ -25,7 +24,6 @@ import image from '../@ohos.multimedia.image'; import dialogRequest from '../@ohos.app.ability.dialogRequest'; import AbilityConstant from '../@ohos.app.ability.AbilityConstant'; import type AtomicServiceOptions from '../@ohos.app.ability.AtomicServiceOptions'; -import type ConfigurationConstant from '../@ohos.app.ability.ConfigurationConstant'; import type UIServiceProxy from './UIServiceProxy'; import type UIServiceExtensionConnectCallback from './UIServiceExtensionConnectCallback'; import type AbilityStartCallback from './AbilityStartCallback'; @@ -3560,7 +3558,8 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ backToCallerAbilityWithResult(abilityResult: AbilityResult, requestCode: string): Promise; @@ -3604,7 +3603,8 @@ declare class UIAbilityContext extends Context { * @throws { BusinessError } 16000055 - Installation-free timed out. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ connectServiceExtensionAbility(want: Want, options: ConnectOptions): number; @@ -3670,7 +3670,8 @@ declare class UIAbilityContext extends Context { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ disconnectServiceExtensionAbility(connection: number, callback: AsyncCallback): void; @@ -3684,7 +3685,8 @@ declare class UIAbilityContext extends Context { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ disconnectServiceExtensionAbility(connection: number): Promise; @@ -3711,7 +3713,8 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setMissionLabel(label: string, callback: AsyncCallback): void; @@ -3738,7 +3741,8 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setMissionLabel(label: string): Promise; @@ -3875,7 +3879,8 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ restoreWindowStage(localStorage: LocalStorage): void; @@ -4830,7 +4835,8 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ setColorMode(colorMode: ConfigurationConstant.ColorMode): void; diff --git a/api/application/UIExtensionContext.d.ts b/api/application/UIExtensionContext.d.ts index 9d577273b3..bb61450dbe 100755 --- a/api/application/UIExtensionContext.d.ts +++ b/api/application/UIExtensionContext.d.ts @@ -18,7 +18,6 @@ * @kit AbilityKit */ - import type { AsyncCallback } from '../@ohos.base'; import ExtensionContext from './ExtensionContext'; import type Want from '../@ohos.app.ability.Want'; @@ -528,7 +527,8 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16200001 - The caller has been released. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ startAbilityForResult(want: Want, callback: AsyncCallback): void; @@ -637,7 +637,8 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16200001 - The caller has been released. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ startAbilityForResult(want: Want, options: StartOptions, callback: AsyncCallback): void; @@ -752,7 +753,8 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16200001 - The caller has been released. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ startAbilityForResult(want: Want, options?: StartOptions): Promise; @@ -840,7 +842,8 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16000070 - The extension cannot start the service. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ connectServiceExtensionAbility(want: Want, options: ConnectOptions): number; @@ -854,7 +857,8 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ disconnectServiceExtensionAbility(connection: number, callback: AsyncCallback): void; @@ -868,7 +872,8 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ disconnectServiceExtensionAbility(connection: number): Promise; @@ -880,7 +885,8 @@ declare class UIExtensionContext extends ExtensionContext { * @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 */ reportDrawnCompleted(callback: AsyncCallback): void; @@ -1112,7 +1118,8 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16000011 - The context does not exist. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ setColorMode(colorMode: ConfigurationConstant.ColorMode): void; } diff --git a/api/application/WorkSchedulerExtensionContext.d.ts b/api/application/WorkSchedulerExtensionContext.d.ts index e15279d81c..f6a7732f46 100644 --- a/api/application/WorkSchedulerExtensionContext.d.ts +++ b/api/application/WorkSchedulerExtensionContext.d.ts @@ -28,7 +28,8 @@ import type Want from '../@ohos.app.ability.Want'; * @extends ExtensionContext * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ export default class WorkSchedulerExtensionContext extends ExtensionContext { /** @@ -58,7 +59,8 @@ export default class WorkSchedulerExtensionContext extends ExtensionContext { * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @systemapi * @stagemodelonly - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ startServiceExtensionAbility(want: Want): Promise; @@ -86,7 +88,8 @@ export default class WorkSchedulerExtensionContext extends ExtensionContext { * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @systemapi * @stagemodelonly - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ stopServiceExtensionAbility(want: Want): Promise; } diff --git a/api/arkui/BuilderNode.d.ts b/api/arkui/BuilderNode.d.ts index 382f2c75f2..0e3a591abd 100644 --- a/api/arkui/BuilderNode.d.ts +++ b/api/arkui/BuilderNode.d.ts @@ -21,6 +21,10 @@ import { UIContext } from '../@ohos.arkui.UIContext'; import { FrameNode } from './FrameNode'; import { Size } from './Graphics'; +/*** if arkts 1.2 */ +import { TouchEvent } from './component/common'; +import { WrappedBuilder, CustomBuilder, CustomBuilderT } from './component/builder'; +/*** endif */ /** * Render type of the node using for indicating that @@ -551,3 +555,148 @@ export class BuilderNode { */ isDisposed(): boolean; } + +/** + * Defines BuilderNode. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +export declare class BuilderNode { + /** + * Constructor. + * + * @param { UIContext } uiContext - uiContext used to create the BuilderNode + * @param { RenderOptions } [options] - Render options of the Builder Node + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + constructor(uiContext: UIContext, options?: RenderOptions); + + /** + * Build the BuilderNode with the builder. + * + * @param { WrappedBuilder } builder - Defined the builder will be called to build the node. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + build(builder: WrappedBuilder): void; + + /** + * Build the BuilderNode with the builder. + * + * @param { WrappedBuilder> } builder - Defined the builder will be called to build the node. + * @param { T } arg - Defined the args will be used in the builder. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + build(builder: WrappedBuilder>, arg: T): void; + + /** + * Build the BuilderNode with the builder.Support the type that WrappedBuilder contains builder used different params. + * + * @param { WrappedBuilder> } builder - Defined the builder will be called to build the node. + * @param { T } arg - Defined the args will be used in the builder. + * @param { BuildOptions } options - Defined the options will be used when build. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + build(builder: WrappedBuilder>, arg: T, options: BuildOptions): void; + + /** + * Update the BuilderNode based on the provided parameters. + * + * @param { T } arg - Parameters used to update the BuilderNode, which must match the types required by the builder bound to the BuilderNode. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + update(arg: T): void; + + /** + * Get the FrameNode in BuilderNode. + * + * @returns { FrameNode | null } - Returns a FrameNode inside the BuilderNode, or null if not contained. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + getFrameNode(): FrameNode | null; + + /** + * Dispatch touchEvent to targetNode. + * + * @param { TouchEvent } event - The touchEvent which will be sent to the targetNode. + * @returns { boolean } - Returns true if the TouchEvent has been successfully posted to the targetNode, false otherwise. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + postTouchEvent(event: TouchEvent): boolean; + + /** + * Dispose the BuilderNode immediately. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + dispose(): void; + + /** + * Reuse the BuilderNode based on the provided parameters. + * + * @param { Record } [param] - Parameters for reusing BuilderNode. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + reuse(param?: Record): void; + + /** + * Recycle the BuilderNode. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + recycle(): void; + + /** + * Notify BuilderNode to update the configuration to trigger a reload of the BuilderNode. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + updateConfiguration(): void; + } \ No newline at end of file diff --git a/api/arkui/ComponentContent.d.ts b/api/arkui/ComponentContent.d.ts index 41ea6177fc..d35cdce61b 100644 --- a/api/arkui/ComponentContent.d.ts +++ b/api/arkui/ComponentContent.d.ts @@ -22,6 +22,14 @@ import { BuildOptions } from './BuilderNode'; import { Content } from './Content'; import { UIContext } from '../@ohos.arkui.UIContext'; import { WrappedBuilder } from 'wrappedBuilderObject'; +/*** endif */ + +/*** if arkts 1.2 */ +import { BuildOptions } from './BuilderNode'; +import { Content } from './Content'; +import { UIContext } from '../@ohos.arkui.UIContext'; +import { WrappedBuilder, CustomBuilder, CustomBuilderT } from './component/builder'; +/*** endif */ /** * Defines ComponentContent. @@ -32,7 +40,7 @@ import { WrappedBuilder } from 'wrappedBuilderObject'; * @atomicservice * @since 12 */ -export class ComponentContent extends Content{ +export class ComponentContent extends Content { /** * Constructor. * @@ -148,3 +156,114 @@ export class ComponentContent extends Content{ */ isDisposed(): boolean; } + +/** + * Defines ComponentContent. + * + * @extends Content + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +export declare class ComponentContent extends Content { + /** + * Constructor. + * + * @param { UIContext } uiContext - uiContext used to create the ComponentContent + * @param { WrappedBuilder } builder - Defined the builder will be called to build ComponentContent. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + constructor(uiContext: UIContext, builder: WrappedBuilder); + + /** + * Constructor. + * + * @param { UIContext } uiContext - uiContext used to create the ComponentContent + * @param { WrappedBuilder> } builder - Defined the builder will be called to build ComponentContent. + * @param { T } args - Parameters used to update the ComponentContent. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + constructor(uiContext: UIContext, builder: WrappedBuilder>, args: T); + + /** + * Constructor. + * + * @param { UIContext } uiContext - uiContext used to create the ComponentContent + * @param { WrappedBuilder> } builder - Defined the builder will be called to build ComponentContent. + * @param { T } args - Parameters used to update the ComponentContent. + * @param { BuildOptions } options - Defined the options will be used when build. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + constructor(uiContext: UIContext, builder: WrappedBuilder>, args: T, options: BuildOptions); + + /** + * Update the ComponentContent based on the provided parameters. + * + * @param { T } args - Parameters used to update the ComponentContent, which must match the types required by the builder bound to the ComponentContent. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + update(args: T): void; + + /** + * Reuse the ComponentContent based on the provided parameters. + * + * @param { Record } [param] - Parameters for reusing ComponentContent. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + reuse(param?: Record): void; + + /** + * Recycle the ComponentContent. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + recycle(): void; + + /** + * Dispose the ComponentContent immediately. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + dispose(): void; + + /** + * Notify ComponentContent to update the configuration to trigger a reload of the ComponentContent. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + updateConfiguration(): void; +} diff --git a/api/arkui/Content.d.ets b/api/arkui/Content.d.ets index 01afe4f1f0..2f1c30c53a 100644 --- a/api/arkui/Content.d.ets +++ b/api/arkui/Content.d.ets @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/api/arkui/FrameNode.d.ts b/api/arkui/FrameNode.d.ts index 7060a1a924..83c1e9ea29 100644 --- a/api/arkui/FrameNode.d.ts +++ b/api/arkui/FrameNode.d.ts @@ -1199,6 +1199,30 @@ export interface TypedFrameNode extends FrameNode { readonly attribute: T; } +/** + * Used to define the FrameNode type. + * + * @extends FrameNode + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +export declare abstract class TypedFrameNode extends FrameNode { + /** + * Get attribute instance of FrameNode to set attributes. + * + * @returns { T } - Returns the attribute instance of FrameNode. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get attribute(): T; +} + /** * Provides methods to implement FrameNode. * When typeNode is used to create nodes such as Text, Image, Select, or Toggle, if the UIContext instance diff --git a/api/arkui/Graphics.d.ts b/api/arkui/Graphics.d.ts index 19adb28e61..1acecd6303 100644 --- a/api/arkui/Graphics.d.ts +++ b/api/arkui/Graphics.d.ts @@ -687,7 +687,17 @@ export interface Edges { * @atomicservice * @since 12 */ -declare enum LengthUnit { +/** + * Defines the Length Unit. + * + * @enum { number } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.1&1.2 + */ +export declare enum LengthUnit { /** * Logical pixel used in Ace1.0. It's based on frontend design width. * For example, when a frontend with 750px design width running on a diff --git a/api/arkui/NodeController.d.ts b/api/arkui/NodeController.d.ts index a1c3a8f091..8460d7ffbf 100644 --- a/api/arkui/NodeController.d.ts +++ b/api/arkui/NodeController.d.ts @@ -131,7 +131,8 @@ export abstract class NodeController { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 12 + * @since arkts{'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ rebuild(): void; diff --git a/api/arkui/stateManagement/decorators/decoratorLink.d.ets b/api/arkui/component/animation.d.ets old mode 100644 new mode 100755 similarity index 60% rename from api/arkui/stateManagement/decorators/decoratorLink.d.ets rename to api/arkui/component/animation.d.ets index 5d65d77dac..fba0dc459e --- a/api/arkui/stateManagement/decorators/decoratorLink.d.ets +++ b/api/arkui/component/animation.d.ets @@ -18,12 +18,5 @@ * @arkts 1.2 */ -import { DecoratedV1VariableBase, IDecoratedMutableVariable } from '../base/decoratorBase'; -import { WatchFuncType } from './decoratorWatch'; - -export declare class LinkDecoratedVariable extends DecoratedV1VariableBase - implements IDecoratedMutableVariable { - public constructor(varName: string, source: DecoratedV1VariableBase, watchFunc?: WatchFuncType) - public get(): T - public set(newValue: T): void -} \ No newline at end of file +@Retention({policy: "SOURCE"}) +export declare @interface AnimatableExtend {} diff --git a/api/arkui/component/builder.d.ets b/api/arkui/component/builder.d.ets new file mode 100755 index 0000000000..fcebce52ef --- /dev/null +++ b/api/arkui/component/builder.d.ets @@ -0,0 +1,112 @@ +/* + * Copyright (C) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * @file + * @kit ArkUI + * @arkts 1.2 + */ + +import { memo, ComponentBuilder, __memo_context_type, __memo_id_type } from "../stateManagement/runtime"; + +/** + * Defines Builder Annotation. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface Builder {} + +/** + * Defines BuilderParam Annotation. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface BuilderParam {} + +/** + * Defines the CustomBuilder Type. + * + * @typedef { @Builder (() => void) } CustomBuilder + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + */ +export type CustomBuilder = @Builder (() => void); + +/** + * Defines the CustomBuilder Type. + * + * @typedef { @Builder ((t:T) => void) } CustomBuilderT + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + */ +export type CustomBuilderT = @Builder ((t: T) => void); + +/** + * Defines the PageMapBuilder Type. + * + * @typedef { @Builder ((name: string, param: Object | null | undefined) => void) } PageMapBuilder + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + */ +export type PageMapBuilder = @Builder ((name: string, param: Object | null | undefined) => void) + +/** + * Defining wrapBuilder function. + * @param { function } builder + * @returns { WrappedBuilder } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare function wrapBuilder(builder: T): WrappedBuilder; + +/** + * Defines the WrappedBuilder class. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare class WrappedBuilder { + + /** + * @type { function } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + @Builder public builder: T; + + /** + * @param { function } builder + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + public constructor(builder: T); +} diff --git a/api/arkui/component/customComponent.d.ets b/api/arkui/component/customComponent.d.ets index c91cb57c4f..cfd065cf4b 100644 --- a/api/arkui/component/customComponent.d.ets +++ b/api/arkui/component/customComponent.d.ets @@ -19,59 +19,380 @@ */ import { memo, ComponentBuilder, __memo_context_type, __memo_id_type } from "../stateManagement/runtime"; +import { ExtendableComponent } from './extendableComponent'; +import { GeometryInfo, Layoutable, Measurable, SizeResult } from './common' +import { ConstraintSizeOptions } from './units' +import { Builder } from './builder' +import { LocalStorage } from './../stateManagement/storage/localStorage'; -import { UIContext } from './../../../api/@ohos.arkui.UIContext' - - -@Retention({policy: "SOURCE"}) -export declare @interface Component { - freezeWhenInactive: boolean = false; -} - +/** + * Defines Entry Annotation. + * + * Entry is an Annotation and it supports parameters. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ @Retention({policy: "SOURCE"}) -export declare @interface Entry { +export @interface Entry { + /** + * Named route name. + * + * @type { string } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice + * @since 20 + */ routeName: string = ""; + + /** + * Name of the function which returns LocalStorage instance. + * + * @type { string } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @atomicservice + * @since 20 + */ storage: string = ""; + + /** + * Determines whether to use the LocalStorage instance object returned by UIContext.getSharedLocalStorage() interface. + * + * @type { boolean } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ useSharedStorage: boolean = false; } +/** + * Defining Component Annotation + * + * Component is an Annotation to define a custom component using state management V1. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ @Retention({policy: "SOURCE"}) -export declare @interface Reusable {} +export @interface Component {} -export interface CustomBuild { - @memo - build(): void; -} +/** + * Defining ComponentV2 Annotation + * + * ComponentV2 is an Annotation to define a custom component using state management V2. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export @interface ComponentV2 {} + +/** + * Defining Reusable Annotation that is used to decorate @Component. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export @interface Reusable {} -export interface CustomLayout { +/** + * Defining ReusableV2 Annotation that is used to decorate @ComponentV2. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export @interface ReusableV2 {} -} +/** + * Defining CustomLayout Annotation that is used to decorate @Component and @ComponentV2. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export @interface CustomLayout {} -export declare abstract class CustomComponent, T_Options> { +/** + * Defining CustomDialog Annotation + * + * CustomDialog is an Annotation to define a custom dialog. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export @interface CustomDialog {} - @memo +/** + * Definition of base custom dialog class. + * + * @extends ExtendableComponent + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ +export declare abstract class BaseCustomDialog, T_Options> extends ExtendableComponent { + /** + * Constructor to use to create a custom dialog instance. + * @param {boolean} [useSharedStorage] - determine whether to use the LocalStorage instance object returned by UIContext.getSharedLocalStorage() interface. + * @param {LocalStorage} [storage] - localStorage instance. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + constructor(useSharedStorage?: boolean, storage?: LocalStorage); + + /** + * Define the constructor of custom dialog + * + * @param { () => T } factory - factory to create instance of custom dialog + * @param { T_Options } initializers - initial data for all the fields in custom dialog + * @param { @Builder () => void } content - tail closure for custom dialog + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ @ComponentBuilder - static $_instantiate, S_Options>( - factory: () => S, - initializers?: S_Options, - @memo - content?: () => void, - reuseKey?: string - ): S; - - // Life cycle for custom component - aboutToAppear(): void - aboutToDisappear(): void - onDidBuild(): void - - onPageShow(): void - onPageHide(): void - onBackPress(): boolean - getUIContext(): UIContext - - @memo - build(): void; + static $_instantiate( + factory: () => T, + initializers?: T_Options, + @Builder content?: () => void + ): T +} + +/** + * Definition of base custom component, which is base class of custom component. + * + * @extends ExtendableComponent + * @implements CommonAttribute + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ +export declare abstract class BaseCustomComponent extends ExtendableComponent { + /** + * aboutToRecycle Method. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ + aboutToRecycle(): void; +} + +/** + * Definition of custom component class. + * + * @extends BaseCustomComponent + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ +export declare abstract class CustomComponent, T_Options> extends BaseCustomComponent { + /** + * Constructor to use to create a customComponent instance. + * @param {boolean} [useSharedStorage] - determine whether to use the LocalStorage instance object returned by UIContext.getSharedLocalStorage() interface. + * @param {LocalStorage} [storage] - localStorage instance. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + constructor(useSharedStorage?: boolean, storage?: LocalStorage); - aboutToReuse(): void - aboutToRecycle(): void -} \ No newline at end of file + /** + * Define the constructor of custom component + * + * @param { () => T } factory - factory to create instance of custom component + * @param { T_Options } initializers - initial data for all the fields in custom component + * @param { string } reuseId - reuse id for reusable. Only valid if custom component decorated with @Reusable + * @param { @Builder () => void } content - tail closure for custom component + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ + @ComponentBuilder + static $_instantiate( + factory: () => T, + initializers?: T_Options, + reuseId?: string, + @Builder content?: () => void + ): T + + /** + * aboutToReuse Method + * + * @param { Record } params - Custom component init params. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ + aboutToReuse(params: Record): void; +} + +/** + * Definition of V2 custom component class. + * + * @extends BaseCustomComponent + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ +export declare abstract class CustomComponentV2, T_Options> extends BaseCustomComponent { + /** + * Define the constructor of custom component + * + * @param { () => T } factory - factory to create instance of custom component + * @param { T_Options } initializers - initial data for all the fields in custom component + * @param { string } reuseId - reuse id for reusable. Only valid if custom component decorated with @Reusable + * @param { @Builder () => void } content - tail closure for custom component + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ + @ComponentBuilder + static $_instantiate( + factory: () => T, + initializers?: T_Options, + reuseId?: string, + @Builder content?: () => void + ): T + + /** + * aboutToReuse Method + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ + aboutToReuse(): void; +} + +/** + * Defining interface of PageLifeCycle for custom component, when decorate with @Entry. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ +export interface PageLifeCycle { + /** + * onPageShow Method. + * + * The page is triggered once each time it is displayed, including scenarios such as the routing process and the application entering the foreground + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ + onPageShow(): void {} + + /** + * onPageHide Method. + * + * It is triggered once each time the page is hidden, including scenarios such as the routing process and the application entering the background + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ + onPageHide(): void {} + + /** + * onBackPress Method. + * + * Triggered when the user clicks the back button + * + * @returns { boolean } true means that the page itself processes the return logic. + * false means that the default return logic is used. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ + onBackPress(): boolean { return false } + + /** + * PageTransition Method. + * Implement Animation when enter this page or move to other pages. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ + pageTransition(): void {} + + /** + * Triggered when the Entry custom component has been pushed with singleton mode. + * + * @param { object | undefined | null } param - New parameters pushed with singleton mode. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ + onNewParam(param: object | undefined | null): void {} +} + +/** + * Defining interface of LayoutCallback for custom component, when decorate with @Layoutable. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ +export interface LayoutCallback { + /** + * Custom component override this method to layout each of its sub components. + * + * @param { GeometryInfo } selfLayoutInfo + * @param { Array } children + * @param { ConstraintSizeOptions } constraint + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ + onPlaceChildren(selfLayoutInfo: GeometryInfo, children: Array, constraint: ConstraintSizeOptions): void {} + + /** + * Custom component override this method to measure each of its sub components. + * @param { GeometryInfo } selfLayoutInfo + * @param { Array } children - indicate the measure child + * @param { ConstraintSizeOptions } constraint - indicate child constraint size + * @returns { SizeResult } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ + onMeasureSize(selfLayoutInfo: GeometryInfo, children: Array, constraint: ConstraintSizeOptions): SizeResult { + return {width: 0, height: 0} as SizeResult + } +} diff --git a/api/arkui/component/extendableComponent.d.ets b/api/arkui/component/extendableComponent.d.ets new file mode 100644 index 0000000000..ae28068b49 --- /dev/null +++ b/api/arkui/component/extendableComponent.d.ets @@ -0,0 +1,113 @@ +/* + * Copyright (C) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * @file + * @kit ArkUI + * @arkts 1.2 + */ + +import { UIContext } from '@ohos.arkui.UIContext' +import { Builder } from './builder' + +/** + * Defining interface of LifeCycle for custom component and custom dialog + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ +export interface LifeCycle { + /** + * aboutToAppear Method. + * + * The aboutToAppear function is executed after a new instance of the custom component is created, + * before its build() function is executed. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ + aboutToAppear(): void {} + + /** + * aboutToDisappear Method. + * + * The aboutToDisappear function executes before a custom component is destroyed. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ + aboutToDisappear(): void {} + + /** + * The callback method after the custom component is built. + * + * Triggered when the custom component has been built. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ + onDidBuild(): void {} + + /** + * Customize the build process of the custom component. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ + @Builder + build(): void +} + +/** + * Definition of extendable component, which is base class of custom component and custom dialog. + * + * @implements LifeCycle + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ +export declare abstract class ExtendableComponent implements LifeCycle { + /** + * Get current UIContext. + * + * @returns { UIContext } The UIContext that the custom component belongs to. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ + getUIContext(): UIContext + + /** + * Get uniqueId of the custom component. + * + * @returns { int } - The uniqueId of the custom component. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + */ + getUniqueId(): int +} \ No newline at end of file diff --git a/api/arkui/component/repeat.d.ets b/api/arkui/component/repeat.d.ets new file mode 100755 index 0000000000..0d9490370e --- /dev/null +++ b/api/arkui/component/repeat.d.ets @@ -0,0 +1,250 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file + * @kit ArkUI + * @arkts 1.2 + */ + +import { Builder } from './builder'; +import { ComponentBuilder } from './../stateManagement/runtime'; + +/** + * Indicates the type of Repeat's Data Source. + * + * @typedef { Array | ReadonlyArray | Readonly> } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +type RepeatArray = Array | ReadonlyArray | Readonly>; +/** + * Function that return typed string to render one template. + * + * @typedef {function} TemplateTypedFunc + * @param { T } item - data item. + * @param { number } index - data index number in array. + * @returns { string } template type. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +type TemplateTypedFunc = (item: T, index: number) => string; +/** + * Define builder function to render one template type. + * + * @typedef {function} RepeatItemBuilder + * @param { RepeatItem } repeatItem - the repeat item builder function. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Builder +type RepeatItemBuilder = (repeatItem: RepeatItem) => void; + +/** + * Construct a new type for each item. + * + * @interface RepeatItem + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export interface RepeatItem { + /** + * The origin data. + * + * @type { T } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + item: T; + /** + * index of each item. + * + * @type { number } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + index: number; +} + +/** + * Function that is used to do lazy loading. + * + * @typedef {function} OnLazyLoadingFunc + * @param { number } index - data index. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +type OnLazyLoadingFunc = (index: number) => void; + +/** + * Define key generator function. + * + * @typedef {function} KeyGeneratorFunc + * @param { T } item - data item. + * @param { number } index - data index number in array. + * @returns { string } key value. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +type KeyGeneratorFunc = (item: T, index: number) => string; + +/** + * Function that is used to get total count. + * + * @typedef {function} OnTotalCountFunc + * @returns { number } Returns the total data count + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +type OnTotalCountFunc = () => number; + +/** + * Define the options of repeat virtualScroll to implement reuse and lazy loading. + * + * @interface VirtualScrollOptions + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export interface VirtualScrollOptions { + /** + * Total data count. + * + * @type { ?number } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + totalCount?: number; + /** + * Reuse or not. + * + * @type { ?boolean } + * @default true + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + reusable?: boolean; + /** + * Data lazy loading + * + * @type { ?OnLazyLoadingFunc } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + onLazyLoading?: OnLazyLoadingFunc; + /** + * The function of total data count. + * + * @type { ?OnTotalCountFunc } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + onTotalCount?: OnTotalCountFunc; + /** + * Indicates whether to activate virtual scroll mode. + * + * @type { ?boolean } + * @default false + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + disableVirtualScroll?: boolean; +} + +/** + * Define a builder template option parameter. + * + * @interface TemplateOptions + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export interface TemplateOptions { + /** + * The cached number of each template. + * + * @type { ?number } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + cachedCount?: number; +} + +/** + * Defines the Repeat component attribute functions. + * + * @typedef RepeatAttribute + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export interface RepeatAttribute { + /** + * Executes itemGenerator of each item. + * + * @param { RepeatItemBuilder } itemGenerator + * @returns { this } RepeatAttribute instance + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + each(itemGenerator: RepeatItemBuilder): this; + /** + * Obtains key of each item. + * + * @param { KeyGeneratorFunc } keyGenerator + * @returns { this } RepeatAttribute instance + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + key(keyGenerator: KeyGeneratorFunc): this; + /** + * Enable UI lazy loading when scroll up or down. + * + * @param { VirtualScrollOptions } [virtualScrollOptions] that defines the options of repeat virtual scroll to + * implement reuse and lazy loading. + * @returns { this } RepeatAttribute instance + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + virtualScroll(virtualScrollOptions?: VirtualScrollOptions): this; + /** + * Type builder function to render specific type of data item. + * + * @param { string } type that defines the template id. + * @param { RepeatItemBuilder } itemBuilder that defines UI builder function. + * @param { TemplateOptions } [templateOptions] that defines a builder template option parameter. + * @returns { this } RepeatAttribute instance + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + template(type: string, itemBuilder: RepeatItemBuilder, templateOptions?: TemplateOptions): this; + /** + * Typed function to render specific type of data item. + * + * @param { TemplateTypedFunc } typedFunc that define template typed function. + * @returns { this } RepeatAttribute instance + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + templateId(typedFunc: TemplateTypedFunc): this; +} + +/** + * Indicates the type of Repeat. + * + * @param { RepeatArray } arr - The Data Source + * @returns { RepeatAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@ComponentBuilder +export declare function Repeat(arr: RepeatArray): RepeatAttribute; \ No newline at end of file diff --git a/api/arkui/component/resources.d.ets b/api/arkui/component/resources.d.ets index 2a749e6b54..68448421a2 100644 --- a/api/arkui/component/resources.d.ets +++ b/api/arkui/component/resources.d.ets @@ -35,6 +35,24 @@ import { Resource } from './../../../api/global/resource' */ export declare function _r(bundleName: string, moduleName: string, name: string, ...params: Object[]): Resource; +/** + * Obtain the resource in resources, used by plugin. + * + * @param { number } id - Indicates the id of resource. + * @param { number } type - Indicates the type of resource. + * @param { string } bundleName - Indicates the name of bundle. + * @param { string } moduleName - Indicates the name of module. + * @param { Object[] } params - Custom parameters. + * @returns { Resource } Returns the resource instance. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +export declare function _r( + id: number, type: number, bundleName: string, moduleName: string, ...params: Object[]): Resource; + /** * Obtain the resource in resources/rawfile, used by plugin. * @@ -48,3 +66,21 @@ export declare function _r(bundleName: string, moduleName: string, name: string, * @arkts 1.2 */ export declare function _rawfile(bundleName: string, moduleName: string, name: string): Resource; + +/** + * Obtain the resource in resources/rawfile, used by plugin. + * + * @param { number } id - Indicates the id of resource. + * @param { number } type - Indicates the type of resource. + * @param { string } bundleName - Indicates the name of bundle. + * @param { string } moduleName - Indicates the name of module. + * @param { Object[] } params - Custom parameters. + * @returns { Resource } Returns the resource instance. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +export declare function _rawfile( + id: number, type: number, bundleName: string, moduleName: string, ...params: Object[]): Resource; diff --git a/api/arkui/stateManagement/common.d.ets b/api/arkui/stateManagement/common.d.ets deleted file mode 100644 index 2f47985366..0000000000 --- a/api/arkui/stateManagement/common.d.ets +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (C) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * @file - * @kit ArkUI - * @arkts 1.2 - */ - -@Retention({policy: "SOURCE"}) -export declare @interface State {}; - -@Retention({policy: "SOURCE"}) -export declare @interface Prop {}; - -@Retention({policy: "SOURCE"}) -export declare @interface Link {}; - -@Retention({policy: "SOURCE"}) -export declare @interface Observed {}; - -@Retention({policy: "SOURCE"}) -export declare @interface Track {}; - -@Retention({policy: "SOURCE"}) -export declare @interface ObjectLink {}; - -@Retention({policy: "SOURCE"}) -export declare @interface StorageProp { - property: string; -}; - -@Retention({policy: "SOURCE"}) -export declare @interface StorageLink { - property: string; -}; - -@Retention({policy: "SOURCE"}) -export declare @interface LocalStorageProp { - property: string; -}; - -@Retention({policy: "SOURCE"}) -export declare @interface LocalStorageLink { - property: string; -}; - -@Retention({policy: "SOURCE"}) -export declare @interface Provide { - alias: string = ""; - allowOverride: boolean = false; -}; - -@Retention({policy: "SOURCE"}) -export declare @interface Consume { - alias: string = ""; -}; - -@Retention({policy: "SOURCE"}) -export declare @interface Watch { - callback: string; -}; - -@Retention({policy: "SOURCE"}) -export declare @interface Require {}; - -export declare class UIUtils { - static getTarget(source: T): T; - static makeObserved(source: T): T; -} diff --git a/api/arkui/stateManagement/decorator.d.ets b/api/arkui/stateManagement/decorator.d.ets new file mode 100644 index 0000000000..4acc119c9a --- /dev/null +++ b/api/arkui/stateManagement/decorator.d.ets @@ -0,0 +1,850 @@ +/* + * Copyright (C) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * @file + * @kit ArkUI + * @arkts 1.2 + */ + +import { ExtendableComponent } from '../component/extendableComponent'; + +/** + * Defining State annotation + * State variable that holds the state property and is used to render the owning custom component. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface State {}; + +/** + * Defining Prop annotation + * Prop is an annotation which is mutable, and its changes will not be synchronized to the parent component. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface Prop {}; + +/** + * Defining PropRef annotation + * PropRef is an annotation which is mutable. + * Any object property modifications made through PropRef are visible in the + * parent component, which is different from Prop. + * In order to prevent this, need to take a deep copy of the parent data. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface PropRef {}; + +/** + * Defining Link annotation + * Link decorated variable creates two-way synchronization with a variable of its parent component. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface Link {}; + +/** + * Defining Observed annotation + * Observed is used to decorate a class. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface Observed {}; + +/** + * Defining Track annotation + * Track is a decorator used to decorate properties of class objects. + * Any changes to the properties decorated by Track will trigger only updates to the UI associated with those properties. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface Track {}; + +/** + * Defining ObjectLink annotation + * ObjectLink is used to observe property changes in nested class objects. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface ObjectLink {}; + +/** + * Defining StorageProp annotation + * StorageProp a one-way data synchronization is established from the attribute with the given key in AppStorage to the variable. + * A local change can be made, but it will not be synchronized to AppStorage. + * An update to the attribute with the given key in AppStorage will overwrite local changes. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface StorageProp { + property: string; +}; + +/** + * Defining StoragePropRef annotation + * StoragePropRef is an annotation which is mutable. + * Any object property modifications made through StoragePropRef are visible in the + * AppStorage, which is different from StorageProp. + * In order to prevent this, need to take a deep copy of AppStorage instance data. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface StoragePropRef { + /** + * The give property in AppStorage. + * + * @type { string } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + property: string; +}; + +/** + * Defining StorageLink annotation + * StorageLink is used to create a two-way data synchronization between the variable + * it decorates and the attribute with the given key in AppStorage. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface StorageLink { + /** + * The give property in AppStorage. + * + * @type { string } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + property: string; +}; + +/** + * Defining LocalStorageProp annotation + * LocalStorageProp is a one-way data synchronization is established from the attribute with the given key in + * LocalStorage to the variable. This means that, local changes + * (if any) will not be synchronized to LocalStorage, and an update to the attribute with the given key in LocalStorage. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface LocalStorageProp { + /** + * The give property in LocalStorage. + * + * @type { string } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + property: string; +}; + +/** + * Defining LocalStoragePropRef annotation + * LocalStoragePropRef is an annotation which is mutable. + * Any object property modifications made through LocalStoragePropRef are visible in the + * LocalStorage, which is different from LocalStorageProp. + * In order to prevent this, need to take a deep copy of LocalStorage data. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface LocalStoragePropRef { + /** + * The give property in AppStorage. + * + * @type { string } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + property: string; +}; + +/** + * Defining LocalStorageLink annotation + * LocalStorageLink is used to create a two-way data synchronization with the attribute + * in LocalStorage. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface LocalStorageLink { + /** + * The give property in LocalStorage. + * + * @type { string } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + property: string; +}; + +/** + * Defining Provide annotation + * Provide is used for two-way data synchronization with descendant components when + * state data needs to be transferred between multiple levels. An @Provide decorated state + * variable exists in the ancestor component and is said to be "provided" to descendent components. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface Provide { + /** + * The alias name. + * + * @type { string } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + alias: string = ""; + /** + * allowOverride is used to override an existing @Provide decorated variable. + * + * @type { boolean } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + allowOverride: boolean = false; +}; + +/** + * Defining Consume annotation + * Consume is used to access the provided state variable for a descendent component + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface Consume { + /** + * The alias name. + * + * @type { string } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + alias: string = ""; +}; + +/** + * Defining Watch annotation + * Watch is used to listen for state variables. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface Watch { + /** + * The callback function name. + * + * @type { string } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + callback: string; +}; + +/** + * Defining Require annotation + * Require is a decorator for declaring that parameters – regular variables. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface Require {}; + +/** + * Defining Local annotation + * Local is the internal state of a component, which enables the variables in the + * custom component to observe changes. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface Local {}; + +/** + * Defining Param annotation + * Param indicates the state passed in from the external, ensuring that + * data can be synchronized between the parent and child components. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface Param {}; + +/** + * Defining Once annotation + * Once annotation accepts values passed in only during variable initialization + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface Once {}; + +/** + * Defining Event annotation + * Event is used to decorate the callback method is a standard, indicating that the + * child component needs to pass in the callback for updating the data source. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface Event {}; + +/** + * Defining Provider annotation + * Provider is used for two-way data synchronization with descendant components when + * state data needs to be transferred between multiple levels. An @Provider decorated state + * variable exists in the ancestor component and is said to be "provider" to descendent components. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface Provider { + /** + * The alias name. + * + * @type { string } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + alias: string = ""; +}; + +/** + * Defining Consumer annotation + * Consumer is used to access the provided state variable for a descendent component + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface Consumer { + /** + * The alias name. + * + * @type { string } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + alias: string = ""; +}; + +/** + * Defining ObservedV2 annotation + * ObservedV2 is used to decorate with class. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface ObservedV2 {}; + +/** + * Defining Trace annotation + * Trace is used to directly observe the property changes of nested objects + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface Trace {}; + +/** + * Defining Computed annotation + * Computed is a method decorator that decorates the getter method. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface Computed {}; + +/** + * Defining Monitor annotation + * Monitor provides the capability of listening for state variables of V2. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +@Retention({policy: "SOURCE"}) +export declare @interface Monitor { + /** + * Listened property name. + * + * @type { string[] } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + path: string[]; +}; + +/** + * Define IMonitor interface + * + * @interface IMonitor + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +declare interface IMonitor { + /** + * Array of changed paths(keys) + * + * @type { Array } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + dirty: Array; + /** + * Return the pair of the value before the most recent change and current value for given path. + * If path does not exist, return undefined; If path is not specified, return the value pair corresponding to the first path in dirty. + * + * @param { string } [path] Listened property name + * @returns { IMonitorValue | undefined } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + value(path?: string): IMonitorValue | undefined; +} + +/** + * Define IMonitorValue interface + * + * @interface IMonitorValue + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +declare interface IMonitorValue { + /** + * Get the previous value. + * + * @type { T } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + before: T; + /** + * Get current value. + * + * @type { T } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + now: T; + /** + * Monitored path input by the user. + * + * @type { string } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + path: string; +} + +/** + * Define decorated variable interface. + * + * @interface IDecoratedVariable + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare interface IDecoratedVariable { + /** + * Decorated variable name. + * + * @type { string } + * @readonly + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + readonly varName: string; +} + +/** + * Define V1 decorated variable interface. + * + * @extends IDecoratedVariable + * @interface IDecoratedVariable + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare interface IDecoratedV1Variable extends IDecoratedVariable { + /** + * Registers the watch callback function with the data source. + * + * @param { IDecoratedV1Variable } decoratedVar + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + registerWatchToSource(decoratedVar: IDecoratedV1Variable): void; +} + +/** + * Define decorated immutable variable interface. + * + * @interface IDecoratedImmutableVariable + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare interface IDecoratedImmutableVariable { + /** + * Get the state variable. + * + * @returns { T } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + get(): T; +} + +/** + * Define decorated mutable variable interface. + * + * @interface IDecoratedMutableVariable + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare interface IDecoratedMutableVariable { + /** + * Get the state variable. + * + * @returns { T } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + get(): T; + /** + * Set the state variable with a new Value. + * + * @param { T } newValue + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + set(newValue: T): void; +} + +/** + * Define decorated updatable variable interface. + * + * @interface IDecoratedUpdatableVariable + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare interface IDecoratedUpdatableVariable { + /** + * Update the state variable with a new Value. + * + * @param { T } newValue + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + update(newValue: T): void; +} + +/** + * Define state decoration variable interface. + * + * @extends IDecoratedMutableVariable, IDecoratedV1Variable + * @interface IStateDecoratedVariable + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare interface IStateDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} + +export declare interface IPropDecoratedVariable extends IDecoratedMutableVariable, + IDecoratedUpdatableVariable, IDecoratedV1Variable { +} + +/** + * Define PropRef decoration variable interface. + * + * @extends IDecoratedMutableVariable, IDecoratedUpdatableVariable, IDecoratedV1Variable + * @interface IPropRefDecoratedVariable + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare interface IPropRefDecoratedVariable extends IDecoratedMutableVariable, + IDecoratedUpdatableVariable, IDecoratedV1Variable {} + +/** + * Define LocalStoragePropRef decoration variable interface. + * + * @extends IDecoratedMutableVariable, IDecoratedV1Variable + * @interface ILocalStoragePropRefDecoratedVariable + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare interface ILocalStoragePropRefDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} + +/** + * Define Link decoration variable interface. + * + * @extends IDecoratedMutableVariable, IDecoratedV1Variable + * @interface ILinkDecoratedVariable + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare interface ILinkDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} + +/** + * Define Provide decoration variable interface. + * + * @extends IDecoratedMutableVariable, IDecoratedV1Variable + * @interface IProvideDecoratedVariable + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare interface IProvideDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} + +/** + * Define Consume decoration variable interface. + * + * @extends IDecoratedMutableVariable, IDecoratedV1Variable + * @interface IConsumeDecoratedVariable + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare interface IConsumeDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} + +/** + * Define ObjectLink decoration variable interface. + * + * @extends IDecoratedImmutableVariable, IDecoratedUpdatableVariable, IDecoratedV1Variable + * @interface IObjectLinkDecoratedVariable + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare interface IObjectLinkDecoratedVariable extends IDecoratedImmutableVariable, + IDecoratedUpdatableVariable, IDecoratedV1Variable {} + +/** + * Define StorageLink decoration variable interface. + * + * @extends IDecoratedMutableVariable, IDecoratedV1Variable + * @interface IStorageLinkDecoratedVariable + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare interface IStorageLinkDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} + +/** + * Define StorageProp decoration variable interface. + * + * @extends IDecoratedMutableVariable, IDecoratedV1Variable + * @interface IStoragePropDecoratedVariable + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare interface IStoragePropDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable { +} + +/** + * Define StoragePropRef decoration variable interface. + * + * @extends IDecoratedMutableVariable, IDecoratedV1Variable + * @interface IStoragePropRefDecoratedVariable + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare interface IStoragePropRefDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} + +/** + * Define LocalStorageLink decoration variable interface. + * + * @extends IDecoratedMutableVariable, IDecoratedV1Variable + * @interface ILocalStorageLinkDecoratedVariable + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare interface ILocalStorageLinkDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} + +/** + * Define Link source type. + * + * @typedef { IStateDecoratedVariable | ILinkDecoratedVariable | IObjectLinkDecoratedVariable | + IPropDecoratedVariable | IStorageLinkDecoratedVariable | ILocalStorageLinkDecoratedVariable | IStoragePropRefDecoratedVariable | + IProvideDecoratedVariable | IConsumeDecoratedVariable } LinkSourceType + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export type LinkSourceType = IStateDecoratedVariable | ILinkDecoratedVariable | IObjectLinkDecoratedVariable | + IPropDecoratedVariable | IStorageLinkDecoratedVariable | ILocalStorageLinkDecoratedVariable | IStoragePropRefDecoratedVariable | + IProvideDecoratedVariable | IConsumeDecoratedVariable; + + +/** + * Define mutable state meta interface. + * + * @interface IMutableStateMeta + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare interface IMutableStateMeta { + /** + * Collect the dependancy for UI component with state variable + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + addRef(): void; + /** + * Notify UI component to update when state variable is changed + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + fireChange(): void; +} + +export declare interface IMutableKeyedStateMeta { + addRef(key: string): void; + addRef(index: int): void; + fireChange(key: string): void; + fireChange(index: int): void; +} + +export declare interface IObserve { + readonly renderingComponent: number; + readonly renderingId: RenderIdType; + shouldAddRef(iObjectsRenderId: RenderIdType): boolean; +} + +export declare const OBSERVE: IObserve; + +export type RenderIdType = int; + +export declare interface IObservedObject extends IWatchSubscriberRegister { + setV1RenderId(renderId: RenderIdType): void; +} + +export declare const STATE_MGMT_FACTORY: IStateMgmtFactory; + +export declare interface IStateMgmtFactory { + makeMutableStateMeta(): IMutableStateMeta; + makeSubscribedWatches(): ISubscribedWatches; + makeState(owningView: ExtendableComponent, varName: string, initValue: T, + watchFunc?: WatchFuncType): IStateDecoratedVariable; + makeProp(owningView: ExtendableComponent, varName: string, initValue: T, + watchFunc?: WatchFuncType): IPropDecoratedVariable; + makeLink(owningView: ExtendableComponent, varName: string, source: LinkSourceType, + watchFunc?: WatchFuncType): ILinkDecoratedVariable; + makeProvide(owningView: ExtendableComponent, varName: string, provideAlias: string, + initValue: T, allowOverride: boolean, wathcFunc?: WatchFuncType): IProvideDecoratedVariable; + makeConsume(owningView: ExtendableComponent, varName: string, + provideAlias: string, watchFunc?: WatchFuncType): IConsumeDecoratedVariable; + makeObjectLink(owningView: ExtendableComponent, varName: string, + initValue: T, wathcFunc?: WatchFuncType): IObjectLinkDecoratedVariable; + + /** + * Create a PropRef variable instance. + * + * @param { ExtendableComponent } owningView - custom component. + * @param { string } varName - state variable name. + * @param { T } initValue - state variable initValue. + * @param { WatchFuncType } [watchFunc] - watch type + * @returns { IPropRefDecoratedVariable } PropRef instance + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + makePropRef(owningView: ExtendableComponent, varName: string, initValue: T, + watchFunc?: WatchFuncType): IPropRefDecoratedVariable; + + /** + * Create a StorageLink variable instance. + * + * @param { ExtendableComponent } owningView - custom component. + * @param { string } propName - property name. + * @param { string } varName - state variable name. + * @param { T } initValue - init value. + * @param { Type } ttype - value type. + * @param { WatchFuncType } [watchFunc] - watch type + * @returns { IStorageLinkDecoratedVariable } StorageLink instance + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + makeStorageLink(owningView: ExtendableComponent, propName: string, + varName: string, initValue: T, ttype: Type, watchFunc?: WatchFuncType): IStorageLinkDecoratedVariable; + /** + * Create a StoragePropRef variable instance. + * + * @param { ExtendableComponent } owningView - custom component. + * @param { string } propName - property name. + * @param { string } varName - state variable name. + * @param { T } initValue - init value. + * @param { Type } ttype - value type. + * @param { WatchFuncType } [watchFunc] - watch type + * @returns { IStoragePropRefDecoratedVariable } StoragePropRef instance + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + makeStoragePropRef(owningView: ExtendableComponent, propName: string, + varName: string, initValue: T, ttype: Type, watchFunc?: WatchFuncType): IStoragePropRefDecoratedVariable; + /** + * Create a LocalStoragePropRef variable instance. + * + * @param { ExtendableComponent } owningView - custom component. + * @param { string } propName - property name. + * @param { string } varName - state variable name. + * @param { T } initValue - init value. + * @param { Type } ttype - value type. + * @param { WatchFuncType } [watchFunc] - watch type + * @returns { ILocalStoragePropRefDecoratedVariable } LocalStoragePropRef instance + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + makeLocalStoragePropRef(owningView: ExtendableComponent, propName: string, + varName: string, initValue: T, ttype: Type, watchFunc?: WatchFuncType): ILocalStoragePropRefDecoratedVariable; + + /** + * Create a LocalStorageLink variable instance. + * + * @param { ExtendableComponent } owningView - custom component. + * @param { string } propName - property name. + * @param { string } varName - state variable name. + * @param { T } initValue - init value. + * @param { Type } ttype - value type + * @param { WatchFuncType } [watchFunc] - watch type + * @returns { ILocalStorageLinkDecoratedVariable } LocalStorageLink instance + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + makeLocalStorageLink(owningView: ExtendableComponent, propName: string, + varName: string, initValue: T, ttype: Type, watchFunc?: WatchFuncType): ILocalStorageLinkDecoratedVariable; +} + +export type WatchFuncType = ((propertyName: string) => void); + +export type WatchIdType = int; + +export declare interface IWatchSubscriberRegister { + addWatchSubscriber(watchId: WatchIdType): void; + removeWatchSubscriber(watchId: WatchIdType): boolean; +} + +export declare interface ISubscribedWatches extends IWatchSubscriberRegister { + executeOnSubscribingWatches(propertyName: string): void; +} + +export declare interface AbstractProperty extends IDecoratedMutableVariable { + info(): string; +} + +export declare interface SubscribedAbstractProperty extends AbstractProperty { + aboutToBeDeleted(): void; +} \ No newline at end of file diff --git a/api/arkui/stateManagement/decorators/decoratorStorageProp.d.ets b/api/arkui/stateManagement/decorators/decoratorStorageProp.d.ets deleted file mode 100644 index 5748443951..0000000000 --- a/api/arkui/stateManagement/decorators/decoratorStorageProp.d.ets +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * @file - * @kit ArkUI - * @arkts 1.2 - */ - -import { DecoratedV1VariableBase, IDecoratedMutableVariable } from '../base/decoratorBase'; -import { WatchFuncType } from './decoratorWatch'; - -export declare class StoragePropDecoratedVariable extends DecoratedV1VariableBase - implements IDecoratedMutableVariable { - public constructor(propName: string, varName:string, localVal: T, watchFunc?: WatchFuncType) - public getInfo(): string - public get(): T - public set(newValue: T): void -} \ No newline at end of file diff --git a/api/arkui/stateManagement/storage.d.ets b/api/arkui/stateManagement/storage.d.ets deleted file mode 100644 index d9db07a645..0000000000 --- a/api/arkui/stateManagement/storage.d.ets +++ /dev/null @@ -1,339 +0,0 @@ -/* - * Copyright (C) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * @file - * @kit ArkUI - * @arkts 1.2 - */ - -export interface StorageProperty { - key: string; - defaultValue: number | string | boolean | Object; -} - -export type PersistPropsOptions = StorageProperty; - -interface AbstractProperty { - info(): string; - get(): T; - set(newValue: T): void; -} - -interface SubscribedAbstractProperty extends AbstractProperty { - aboutToBeDeleted(): void; -} - -declare class LocalStorage { - static getShared(): LocalStorage | undefined; - - constructor(initializingProperties?: StorageProperty[]); - - has(propName: string): boolean; - - keys(): IterableIterator; - - size(): int; - - get(propName: string): T | undefined; - - set(propName: string, newValue: T): boolean; - - setOrCreate(propName: string, newValue?: T): boolean; - - ref(propName: string): AbstractProperty | undefined; - - setAndRef(propName: string, defaultValue: T): AbstractProperty; - - link(propName: string): SubscribedAbstractProperty | undefined; - - setAndLink(propName: string, defaultValue: T): SubscribedAbstractProperty; - - prop(propName: string): SubscribedAbstractProperty | undefined; - - setAndProp(propName: string, defaultValue: T): SubscribedAbstractProperty; - - delete(propName: string): boolean; - - clear(): boolean; -} - -declare class AppStorage { - static has(propName: string): boolean; - - static keys(): IterableIterator; - - static size(): int; - - static get(propName: string): T | undefined; - - static set(propName: string, newValue: T): boolean; - - static setOrCreate(propName: string, newValue?: T): boolean; - - static ref(propName: string): AbstractProperty | undefined; - - static setAndRef(propName: string, defaultValue: T): AbstractProperty; - - static link(propName: string): SubscribedAbstractProperty | undefined; - - static setAndLink(propName: string, defaultValue: T): SubscribedAbstractProperty; - - static prop(propName: string): SubscribedAbstractProperty | undefined; - - static setAndProp(propName: string, defaultValue: T): SubscribedAbstractProperty; - - static delete(propName: string): boolean; - - static clear(): boolean; -} - -export declare class PersistentStorage { - - static persistProp(key: string, defaultValue: T): void; - - static deleteProp(key: string): void; - - static persistProps(props: PersistPropsOptions[]): void; - - static keys(): Array; -} - -export interface EnvPropsOptions { - key: string; - defaultValue: number | string | boolean; -} - -export declare class Environment { - static envProp(key: string, value: S): boolean; - - static envProps(props: EnvPropsOptions[]): void; - - static keys(): Array; -} - - -/** - * Function that returns default creator. - * - * @typedef { function } StorageDefaultCreator - * @returns { T } default creator - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ -export type StorageDefaultCreator = () => T; - -/** - * Define class constructor with arbitrary parameters. - * @interface TypeConstructorWithArgs - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ -// #ToDO: fix -export interface TypeConstructorWithArgs { - /** - * @param { any } args the arguments of the constructor. - * @returns { T } return class instance. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ - // new(...args: Array): T; -} - -/** - * AppStorageV2 is for UI state of app-wide access, has same life cycle as the app, - * and saves database content only in memory. - * - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ -export declare class AppStorageV2 { - /** - * If the value for the given key is already available, return the value. - * If not, add the key with value generated by calling defaultFunc and return it to caller. - * - * @param { TypeConstructorWithArgs } type class type of the stored value. - * @param { string | StorageDefaultCreator } [keyOrDefaultCreator] alias name of the key, - * or the function generating the default value. - * @param { StorageDefaultCreator } [defaultCreator] the function generating the default value - * @returns { T | undefined } the value of the existed key or the default value - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ - static connect( - type: TypeConstructorWithArgs, - keyOrDefaultCreator?: string | StorageDefaultCreator, - defaultCreator?: StorageDefaultCreator - ): T | undefined; - - /** - * Removes data with the given key or given class type. - * - * @param { string | TypeConstructorWithArgs } keyOrType key or class type removing - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ - static remove(keyOrType: string | TypeConstructorWithArgs): void; - /** - * Return the array of all keys. - * - * @returns { Array } the array of all keys - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ - static keys(): Array; -} - -/** - * Function that returns reason type when error. - * - * @typedef { function } PersistenceErrorCallback - * @param { string } key persisted key when error - * @param { 'quota' | 'serialization' | 'unknown' } reason reason type when error - * @param { string } message more message when error - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ -export type PersistenceErrorCallback = (key: string, reason: 'quota' | 'serialization' | 'unknown', message: string) => void; - -/** - * PersistenceV2 is for UI state of app-wide access, available on app re-start, - * and saves database content in disk. - * - * @extends AppStorageV2 - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ -export declare class PersistenceV2 extends AppStorageV2 { - /** - * Used to manually persist data changes to disks. - * - * @param { string | TypeConstructorWithArgs } keyOrType key or class type need to persist. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ - static save(keyOrType: string | TypeConstructorWithArgs): void; - - /** - * Be called when persisting has encountered an error. - * - * @param { PersistenceErrorCallback | undefined } callback called when error - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ - static notifyOnError(callback: PersistenceErrorCallback | undefined): void; -} - -/** - * Define TypeConstructor type. - * - * @interface TypeConstructor - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ -export interface TypeConstructor { - /** - * @returns { T } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ - // new(): T; -} - -/** - * Function that returns PropertyDecorator. - * - * @typedef { function } TypeDecorator - * @param { TypeConstructor } type type info - * @returns { PropertyDecorator } Type decorator - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ -// export type TypeDecorator = (type: TypeConstructor) => PropertyDecorator; - - -/** - * Define Type PropertyDecorator, adds type information to an object. - * - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ -// export declare const Type: TypeDecorator; - -/** - * UIUtils is a state management tool class for operating the observed data. - * - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ -export declare class UIUtils { - /** - * Get raw object from the Object wrapped with an ObservedObject. - * If input parameter is a regular Object without ObservedObject, return Object itself. - * - * @param { T } source input source Object data. - * @returns { T } raw object from the Object wrapped with an ObservedObject. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ - static getTarget(source: T): T; - - /** - * Make non-observed data into observed data. - * Support non-observed class, JSON.parse Object and Sendable class. - * - * @param { T } source input source object data. - * @returns { T } proxy object from the source object data. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ - static makeObserved(source: T): T; - -} \ No newline at end of file diff --git a/api/arkui/stateManagement/base/iObservedObject.d.ets b/api/arkui/stateManagement/storage/appStorage.d.ets similarity index 70% rename from api/arkui/stateManagement/base/iObservedObject.d.ets rename to api/arkui/stateManagement/storage/appStorage.d.ets index 11e25c2a27..4a3bf1b8ff 100644 --- a/api/arkui/stateManagement/base/iObservedObject.d.ets +++ b/api/arkui/stateManagement/storage/appStorage.d.ets @@ -17,12 +17,7 @@ * @kit ArkUI * @arkts 1.2 */ -import { int32 } from '@koalaui.runtime.common'; -export declare interface IObservedObject { - _permissibleAddRefDepth: int32; -} +import { LocalStorage } from './localStorage'; -export declare function castToIObservedObject(obj: T): T | undefined; - -export declare function setObservationDepth(obj: T, depth: number): void; \ No newline at end of file +export const AppStorage: LocalStorage = new LocalStorage(); diff --git a/api/arkui/stateManagement/storage/environment.d.ets b/api/arkui/stateManagement/storage/environment.d.ets new file mode 100644 index 0000000000..0a5fef29db --- /dev/null +++ b/api/arkui/stateManagement/storage/environment.d.ets @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"), + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file + * @kit ArkUI + * @arkts 1.2 + */ + +/** + * EnvProps object + * + * @interface EnvPropsOptions + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare interface EnvPropsOptions { + + /** + * Property name of Environment variable + * + * @type { string } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + key: string; + + /** + * DefaultValue is the default value if cannot get the environment property value + * + * @type { number | string | boolean } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + defaultValue: number | string | boolean; +} + +/** + * Defines the Environment interface. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare class Environment { + /** + * Creates a new property in AppStorage. The UI framework implementation takes care of updating + * its value whenever the named device environment property changes. Recommended use is at app startup. + * The function call fails and returns false if a property with given name exists in AppStorage already. + * It is wrong API use to access a property with given name in AppStorage before calling Environment.envProp. + * + * @param { string } key - environment property + * @param { T } value - is the default value if cannot get the environment property value + * @returns { boolean } false if method failed + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + static envProp(key: string, value: T): boolean; + + /** + * Called when multiple property values are added to Environment. + * + * @param { EnvPropsOptions[] } props environment parameter + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + static envProps(props: EnvPropsOptions[]): void; + + /** + * returns an Array of all environment property keys + * + * @returns { Array } all environment property keys + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + static keys(): Array; +} \ No newline at end of file diff --git a/api/arkui/stateManagement/storage/localStorage.d.ets b/api/arkui/stateManagement/storage/localStorage.d.ets new file mode 100644 index 0000000000..4ddea45ee6 --- /dev/null +++ b/api/arkui/stateManagement/storage/localStorage.d.ets @@ -0,0 +1,197 @@ +/* + * Copyright (C) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * @file + * @kit ArkUI + * @arkts 1.2 + */ + +import { IStorageProperties, AbstractProperty, SubscribedAbstractProperty } from './storageProperty'; + +/** + * LocalStorage + * Class implements a Map of ObservableObjectBase UI state variables. + * Instances can be created to manage UI state within a limited "local" + * access, and life cycle as defined by the app. + * AppStorage singleton is sub-class of LocalStorage for + * UI state of app-wide access and same life cycle as the app. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare class LocalStorage { + /** + * Construct new instance of LocalStorage + * initialize with all properties and their values that Object.keys(params) returns + * Property values must not be undefined. + * + * @param { Record } [initializingProperties] - Record + * containing keys and values. + * see set() for valid values + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + public constructor(initializingProperties?: Record); + /** + * Obtain a handler or an alias to LocalStorage property with given name. + * + * @param { string } propName LocalStorage property name + * @param {Type} ttype - data type + * @returns { AbstractProperty | undefined } AbstractProperty object if property with given name exists + * return undefined otherwise. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + public ref(propName: string, ttype: Type): AbstractProperty | undefined; + /** + * Obtain a handler or an alias to LocalStorage property with given name. + * + * If property does not exist in LocalStorage, create it with given default value. + * + * @param { string } propName LocalStorage property name + * @param { T } defaultValue If property does not exist in LocalStorage, + * create it with given default value. + * @param {Type} ttype - data type + * @returns { AbstractProperty } AbstractProperty object + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + public setAndRef(propName: string, defaultValue: T, ttype: Type): AbstractProperty; + /** + * Create and return a two-way sync "(link") to named property + * + * @param { string } propName - name of source property in LocalStorage + * @param { Type } ttype - data type + * @returns { SubscribedAbstractProperty | undefined } instance of SubscribedAbstractProperty + * return undefined if named property does not already exist in LocalStorage + * Apps can use SDK functions of base class SubscribedPropertyAbstract + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @since 20 + */ + public link(propName: string, ttype: Type): SubscribedAbstractProperty | undefined; + + /** + * Like see link(), but will create and initialize a new source property in LocalStorage if missing + * + * @param { string } propName - name of source property in LocalStorage + * @param { T } defaultValue - value to be used for initializing new property in LocalStorage + * default value must be of type T, can be undefined or null. + * @param { Type } ttype - data type + * @returns { SubscribedAbstractProperty } instance of SubscribedAbstractProperty + * Apps can use SDK functions of base class SubscribedAbstractProperty + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + public setAndLink(propName: string, defaultValue: T, ttype: Type): SubscribedAbstractProperty; + + /** + * Check if LocalStorage has a property with given name + * return true if property with given name exists + * same as ES6 Map.prototype.has() + * + * @param { string } propName - searched property + * @param { Type } [ttype] - data type + * @returns { boolean } true if property with such name exists in LocalStorage + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + public has(propName: string, ttype?: Type): boolean; + /** + * Returns value of given property + * return undefined if no property with this name + * + * @param { string } propName - property name + * @param {Type} ttype - data type + * @returns { T | undefined } property value if found or undefined + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + public get(propName: string, ttype: Type): T | undefined; + /** + * Set value of given property in LocalStorage + * Method sets nothing and returns false if property with this name does not exist in LocalStorage + * newValue can be undefined or null from API 20. + * + * @param { string } propName + * @param { T } newValue - must be of type T, can be undefined or null + * @returns { boolean } true on success, i.e. when above conditions are satisfied, otherwise false + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + public set(propName: string, newValue: T): boolean; + /** + * Set value of given property, if it exists, see set() . + * Add property if no property with given name and initialize with given value. + * newValue can be undefined or null from API 12 + * + * @param { string } propName + * @param { T } newValue - must be of type T, can be undefined or null + * @param { Type } ttype - data type + * @returns { boolean } true on success, i.e. when above conditions are satisfied, otherwise false + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + public setOrCreate(propName: string, newValue: T, ttype: Type): boolean; + /** + * Provide names of all properties in LocalStorage + * same as ES6 Map.prototype.keys() + * + * @returns { IterableIterator } return a Map Iterator + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + public keys(): IterableIterator; + /** + * Returns number of properties in LocalStorage + * same as Map.prototype.size() + * + * @returns { number } return number of properties + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + public size(): number; + /** + * Delete property from StorageBase + * Use with caution: + * Before deleting a prop from LocalStorage all its subscribers need to + * unsubscribe from the property. + * This method fails and returns false if given property still has subscribers + * Another reason for failing is unknown property. + * Developer advise: + * Subscribers are created with see link(), see prop() + * and also via @LocalStorageLink and @LocalStorageProp state variable decorators. + * That means as long as their is a @Component instance that uses such decorated variable + * or a sync relationship with a SubscribedAbstractProperty variable the property can nit + * (and also should not!) be deleted from LocalStorage. + * + * @param { string } propName + * @returns { boolean } false if method failed + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + public delete(propName: string): boolean; + /** + * Delete all properties from the LocalStorage instance + * Precondition is that there are no subscribers. + * method returns false and deletes no properties if there is any property + * that still has subscribers + * + * @returns { boolean } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + public clear(): boolean; +} \ No newline at end of file diff --git a/api/arkui/stateManagement/storage/persistentStorage.d.ets b/api/arkui/stateManagement/storage/persistentStorage.d.ets new file mode 100644 index 0000000000..fcb91d1ec5 --- /dev/null +++ b/api/arkui/stateManagement/storage/persistentStorage.d.ets @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"), + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file + * @kit ArkUI + * @arkts 1.2 + */ + +/** + * Defines the PersistentStorage interface. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare class PersistentStorage { + /** + * Add property 'key' to AppStorage properties whose current value will be + * persistent. + * If AppStorage does not include this property it will be added and initializes + * with given value + * + * @param { string } key - property name + * @param { Type } ttype - persist value type + * @param { T } defaultValue - If AppStorage does not include this property it will be initialized with this value + * @param { ToJSONType } [toJson] - serialization function + * @param { FromJSONType } [fromJson] - deserialization function + * @returns { boolean } + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + static persistProp(key: string, ttype: Type, defaultValue: T, + toJson?: ToJSONType, fromJson?: FromJSONType): boolean; + + /** + * Reverse of @see persistProp + * + * @param { string } key - no longer persist the property named key + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + static deleteProp(key: string): void; + + /** + * Inform persisted AppStorage property names + * + * @returns { Array } array of AppStorage keys + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + static keys(): Array; +} + +/** + * Define toJson type function. + * + * @typedef { function } ToJSONType + * @param { T } value toJson value + * @returns { jsonx.JsonElement } Json stringify element object + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare type ToJSONType = (value: T) => jsonx.JsonElement; + +/** + * Define fromJson type function. + * + * @typedef { function } FromJSONType + * @param { jsonx.JsonElement } element json element + * @returns { T } deserialization result + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare type FromJSONType = (element: jsonx.JsonElement) => T; \ No newline at end of file diff --git a/api/arkui/stateManagement/storage/storageProperty.d.ets b/api/arkui/stateManagement/storage/storageProperty.d.ets new file mode 100644 index 0000000000..191374a7e2 --- /dev/null +++ b/api/arkui/stateManagement/storage/storageProperty.d.ets @@ -0,0 +1,144 @@ +/* + * Copyright (C) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * @file + * @kit ArkUI + * @arkts 1.2 + */ + +/** + * Defines the callback that is called when state variable with value is change + * @typedef { function } OnChangeType + * @param {string} propertyName - property name + * @param {T} newValue - the new value of state variable + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export type OnChangeType = (propertyName: string, newValue: T) => void; + +/** + * Define AbstractProperty interface. + * + * AbstractProperty can be understood as a handler or an alias + * to a property inside LocalStorage / AppStorage singleton + * allows to read the value with @see get and to change the + * value with @see set. + * + * @interface AbstractProperty + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export interface AbstractProperty { + /** + * Returns the name of the referenced property + * + * @returns { string } name of the referenced property + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + info(): string { return ""; }; + + /** + * Returns the type of the referenced property + * + * @returns { Type } type of the referenced property + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + ttype(): Type { return Type.of(undefined); }; + + /** + * Reads value of the referenced AppStorage/LocalStorage property. + * + * @returns { T } value of the referenced AppStorage/LocalStorage property. + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + get(): T { return undefined; }; + + /** + * Assign a new value to the referenced property + * + * @param {T} newValue - a new value of the referenced property + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + set(newValue: T): void {}; + /** + * Register callback function to be called on value change of the referenced property + * calling with value undefined clear the callback. + * + * @param {OnChangeType | undefined} onChangeFunc - register callback function + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + onChange(onChangeFunc: OnChangeType | undefined): void {}; +} + +/** + * SubscribedAbstractProperty is the return value of + * - AppStorage static functions Link(), Prop(), SetAndLink(), and SetAndProp() + * - LocalStorage member methods link(), prop(), setAndLink(), and setAndProp() + * 'T' can be boolean, string, number or custom class. + * Main functions + * see get() reads the linked AppStorage/LocalStorage property value, + * see set(newValue) write a new value to the synched AppStorage/LocalStorage property + * see aboutToBeDeleted() ends the sync relationship with the AppStorage/LocalStorage property + * The app must call this function before the SubscribedAbstractProperty object + * goes out of scope. + * + * @extends AbstractProperty + * @interface SubscribedAbstractProperty + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export interface SubscribedAbstractProperty extends AbstractProperty { + /** + * An app needs to call this function before the instance of SubscribedAbstractProperty + * goes out of scope / is subject to garbage collection. Its purpose is to unregister the + * variable from the two-way/one-way sync relationship that AppStorage/LocalStorage.link()/prop() + * and related functions create. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + aboutToBeDeleted(): void {}; +} + +/** + * Define IStorageProperties interface + * + * @interface IStorageProperties + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export interface IStorageProperties { + /** + * Storage value. + * + * @type { NullishType } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + value: NullishType; + /** + * Storage variable ttype. + * + * @type { Type } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + ttype: Type; +} \ No newline at end of file diff --git a/api/arkui/stateManagement/storages/appStorage.d.ets b/api/arkui/stateManagement/storages/appStorage.d.ets deleted file mode 100644 index b5d4066fe5..0000000000 --- a/api/arkui/stateManagement/storages/appStorage.d.ets +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * @file - * @kit ArkUI - * @arkts 1.2 - */ - -import { LocalStorage } from './localStorage'; -import { AbstractProperty, SubscribedAbstractProperty } from '../base/decoratorBase'; - -export declare class AppStorage extends LocalStorage { - public static ref(propName: string): AbstractProperty | undefined; - public static setAndRef(propName: string, defaultValue: T): AbstractProperty; - public static link(propName: string): SubscribedAbstractProperty | undefined; - public static setAndLink(propName: string, defaultValue: T): SubscribedAbstractProperty; - public static prop(propName: string): SubscribedAbstractProperty | undefined; - public static setAndProp(propName: string, defaultValue: T): SubscribedAbstractProperty; - public static has(propName: string): boolean; - public static get(propName: string): T | undefined; - public static set(propName: string, newValue: T): boolean; - public static setOrCreate(propName: string, newValue: T): void; - public static keys(): IterableIterator; - public static size(): number; - public static delete(propName: string): boolean; - public static clear(): boolean; -} \ No newline at end of file diff --git a/api/arkui/stateManagement/storages/localStorage.d.ets b/api/arkui/stateManagement/storages/localStorage.d.ets deleted file mode 100644 index 96f2790618..0000000000 --- a/api/arkui/stateManagement/storages/localStorage.d.ets +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * @file - * @kit ArkUI - * @arkts 1.2 - */ - -import { AbstractProperty, SubscribedAbstractProperty } from '../base/decoratorBase'; - -export declare class LocalStorage { - public constructor(initializingProperties?: Object); - public static getShared(): LocalStorage | undefined; - public ref(propName: string): AbstractProperty | undefined; - public setAndRef(propName: string, defaultValue: T): AbstractProperty; - public link(propName: string): SubscribedAbstractProperty | undefined; - public setAndLink(propName: string, defaultValue: T): SubscribedAbstractProperty; - public prop(propName: string): SubscribedAbstractProperty | undefined; - public setAndProp(propName: string, defaultValue: T): SubscribedAbstractProperty; - public has(propName: string): boolean; - public get(propName: string): T | undefined; - public set(propName: string, newValue: T): boolean; - public setOrCreate(propName: string, newValue: T): boolean; - public keys(): IterableIterator; - public size(): number; - public delete(propName: string): boolean; - public clear(): boolean; -} \ No newline at end of file diff --git a/api/arkui/stateManagement/base/decoratorBase.d.ets b/api/arkui/stateManagement/utils.d.ets similarity index 40% rename from api/arkui/stateManagement/base/decoratorBase.d.ets rename to api/arkui/stateManagement/utils.d.ets index 47f8b147ff..a764b6d316 100644 --- a/api/arkui/stateManagement/base/decoratorBase.d.ets +++ b/api/arkui/stateManagement/utils.d.ets @@ -1,50 +1,51 @@ -/* - * Copyright (C) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * @file - * @kit ArkUI - * @arkts 1.2 - */ - -import { WatchFuncType } from '../decorators/decoratorWatch'; - -export declare interface IDecoratedImmutableVariable { - get(): T -} - -export declare interface IDecoratedMutableVariable { - get(): T - set(newValue: T): void -} - -export declare interface IDecoratedUpdatableVariable { - update(newValue: T): void -} - -export declare interface AbstractProperty extends IDecoratedMutableVariable { - info(): string; -} - -export declare interface SubscribedAbstractProperty extends AbstractProperty { - aboutToBeDeleted(): void; -} - -export declare class DecoratedVariableBase { - public constructor(decorator: string, varName: string) -} - -export declare class DecoratedV1VariableBase extends DecoratedVariableBase { - public constructor(decorator: string, varName: string, initValue:T, watchFunc?: WatchFuncType) +/* + * Copyright (C) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * @file + * @kit ArkUI + * @arkts 1.2 + */ + +/** + * UIUtils is a state management tool class for operating the observed data. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ +export declare class UIUtils { + /** + * Get raw object from the Object, like builtin type, objectLiteral. + * If input parameter is a regular Object without proxy, return Object itself. + * + * @param { T } source input source Object data. + * @returns { T } raw object. + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + static getTarget(source: T): T; + + /** + * Make non-observed data into observed data. + * Support builtin type and objectLiteral. + * + * @param { T } source input source object data. + * @returns { T } proxy object from the source object data. + * @static + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @since 20 + */ + static makeObserved(source: T): T; } \ No newline at end of file diff --git a/api/bundleManager/AbilityInfo.d.ts b/api/bundleManager/AbilityInfo.d.ts index c178036ae4..92eae0bd87 100644 --- a/api/bundleManager/AbilityInfo.d.ts +++ b/api/bundleManager/AbilityInfo.d.ts @@ -189,7 +189,7 @@ export interface AbilityInfo { /** * Indicates the label id of the ability * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -197,7 +197,7 @@ export interface AbilityInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: number; + readonly labelId: long; /** * Indicates the ability @@ -249,7 +249,7 @@ export interface AbilityInfo { /** * Indicates the description id of the ability * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -257,7 +257,7 @@ export interface AbilityInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly descriptionId: number; + readonly descriptionId: long; /** * Indicates the icon of the ability @@ -309,7 +309,7 @@ export interface AbilityInfo { /** * Indicates the icon id of the ability * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -317,7 +317,7 @@ export interface AbilityInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: number; + readonly iconId: long; /** * Process of ability, if user do not set it, the value equal application process @@ -720,25 +720,25 @@ export interface AbilityInfo { /** * Indicates the appIndex of application, only work in clone app mode * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: number; + readonly appIndex: int; /** * Indicates the orientation id of the ability * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly orientationId: number; + readonly orientationId: long; } /** @@ -795,7 +795,7 @@ export interface WindowSize { * @since 20 * @arkts 1.1&1.2 */ - readonly maxWindowRatio: number; + readonly maxWindowRatio: double; /** * Indicates minimum ratio of width over height of window under free window status. @@ -825,7 +825,7 @@ export interface WindowSize { * @since 20 * @arkts 1.1&1.2 */ - readonly minWindowRatio: number; + readonly minWindowRatio: double; /** * Indicates maximum width of window under free window status. @@ -855,7 +855,7 @@ export interface WindowSize { * @since 20 * @arkts 1.1&1.2 */ - readonly maxWindowWidth: number; + readonly maxWindowWidth: long; /** * Indicates minimum width of window under free window status. @@ -885,7 +885,7 @@ export interface WindowSize { * @since 20 * @arkts 1.1&1.2 */ - readonly minWindowWidth: number; + readonly minWindowWidth: long; /** * Indicates maximum height of window under free window status. @@ -915,7 +915,7 @@ export interface WindowSize { * @since 20 * @arkts 1.1&1.2 */ - readonly maxWindowHeight: number; + readonly maxWindowHeight: long; /** * Indicates minimum height of window under free window status. @@ -945,5 +945,5 @@ export interface WindowSize { * @since 20 * @arkts 1.1&1.2 */ - readonly minWindowHeight: number; + readonly minWindowHeight: long; } diff --git a/api/bundleManager/AppProvisionInfo.d.ts b/api/bundleManager/AppProvisionInfo.d.ts index 98ed464fce..fde167d360 100644 --- a/api/bundleManager/AppProvisionInfo.d.ts +++ b/api/bundleManager/AppProvisionInfo.d.ts @@ -31,14 +31,14 @@ export interface AppProvisionInfo { /** * Indicates the version code of the profile file. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly versionCode: number; + readonly versionCode: long; /** * Indicates the version name of the profile file. @@ -188,24 +188,24 @@ export interface Validity { /** * Indicates the earliest validity of the profile file. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly notBefore: number; + readonly notBefore: long; /** * Indicates the latest validity of the profile file. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly notAfter: number; + readonly notAfter: long; } diff --git a/api/bundleManager/ApplicationInfo.d.ts b/api/bundleManager/ApplicationInfo.d.ts index 5a0ba69cf8..ad602051a4 100644 --- a/api/bundleManager/ApplicationInfo.d.ts +++ b/api/bundleManager/ApplicationInfo.d.ts @@ -128,7 +128,7 @@ export interface ApplicationInfo { /** * Indicates the description id of the application * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -136,7 +136,7 @@ export interface ApplicationInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly descriptionId: number; + readonly descriptionId: long; /** * Indicates whether or not this application may be instantiated @@ -155,6 +155,17 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ + /** + * Indicates whether or not this application may be instantiated + * + * @type { boolean } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates whether or not this application may be instantiated * @@ -218,7 +229,7 @@ export interface ApplicationInfo { /** * Indicates the label id of the application * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -226,7 +237,7 @@ export interface ApplicationInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: number; + readonly labelId: long; /** * Indicates the icon of the application @@ -278,7 +289,7 @@ export interface ApplicationInfo { /** * Indicates the icon id of the application * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -286,7 +297,7 @@ export interface ApplicationInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: number; + readonly iconId: long; /** * Process of application, if user do not set it ,the value equal bundleName @@ -305,6 +316,17 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ + /** + * Process of application, if user do not set it ,the value equal bundleName + * + * @type { string } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Process of application, if user do not set it ,the value equal bundleName * @@ -335,6 +357,17 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ + /** + * Indicates the permissions required for accessing the application. + * + * @type { Array } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates the permissions required for accessing the application. * @@ -407,6 +440,17 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ + /** + * Indicates the metadata of the application + * + * @type { Array } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates the metadata of the application * @@ -437,6 +481,17 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ + /** + * Indicates whether or not this application may be removable + * + * @type { boolean } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates whether or not this application may be removable * @@ -478,7 +533,7 @@ export interface ApplicationInfo { * @since 20 * @arkts 1.1&1.2 */ - readonly accessTokenId: number; + readonly accessTokenId: long; /** * Indicates the uid of the application @@ -508,7 +563,7 @@ export interface ApplicationInfo { * @since 20 * @arkts 1.1&1.2 */ - readonly uid: number; + readonly uid: int; /** * Indicates icon resource of the application @@ -527,6 +582,17 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ + /** + * Indicates icon resource of the application + * + * @type { Resource } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates icon resource of the application * @@ -557,6 +623,17 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ + /** + * Indicates label resource of the application + * + * @type { Resource } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates label resource of the application * @@ -587,6 +664,17 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ + /** + * Indicates description resource of the application + * + * @type { Resource } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates description resource of the application * @@ -617,6 +705,17 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ + /** + * Indicates the appDistributionType of the application + * + * @type { string } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates the appDistributionType of the application * @@ -647,6 +746,17 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ + /** + * Indicates the appProvisionType of the application + * + * @type { string } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates the appProvisionType of the application * @@ -677,6 +787,17 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ + /** + * Indicates whether the application is a system application + * + * @type { boolean } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates whether the application is a system application * @@ -727,6 +848,17 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ + /** + * Indicates whether the application is in debug mode. + * + * @type { boolean } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates whether the application is in debug mode. * @@ -749,6 +881,17 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ + /** + * Indicates whether the application data is unclearable, that is, whether the application data cannot be cleared. + * + * @type { boolean } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates whether the application data is unclearable, that is, whether the application data cannot be cleared. * @@ -770,6 +913,16 @@ export interface ApplicationInfo { * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since 12 */ + /** + * Indicates native library path. + * + * @type { string } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @since 20 + * @since 12 + */ /** * Indicates native library path. * @@ -796,13 +949,13 @@ export interface ApplicationInfo { /** * Indicates the index of the bundle * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: number; + readonly appIndex: int; /** * Indicates sources to install the app @@ -825,6 +978,17 @@ export interface ApplicationInfo { * @atomicservice * @since 12 */ + /** + * Indicates the release type of the app + * + * @type { string } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 12 + */ /** * Indicates the release type of the app * @@ -853,14 +1017,14 @@ export interface ApplicationInfo { /** * Indicates the flags of the application. * - * @type { ?number } + * @type { ?int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly flags?: number; + readonly flags?: int; } /** @@ -878,6 +1042,16 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ +/** + * Indicates the ModuleMetadata + * + * @typedef ModuleMetadata + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates the ModuleMetadata * @@ -906,6 +1080,17 @@ export interface ModuleMetadata { * @atomicservice * @since 11 */ + /** + * Indicates the name of this hap module + * + * @type { string } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates the name of this hap module * @@ -936,6 +1121,17 @@ export interface ModuleMetadata { * @atomicservice * @since 11 */ + /** + * Indicates the metadata of this hap module + * + * @type { Array } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates the metadata of this hap module * @@ -973,13 +1169,13 @@ export interface MultiAppMode { /** * Indicates the max count of the bundle * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly maxCount: number; + readonly maxCount: int; } /** @@ -1020,24 +1216,24 @@ export interface PreinstalledApplicationInfo { /** * Indicates the icon id of the application * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: number; + readonly iconId: long; /** * Indicates the label id of the application * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: number; + readonly labelId: long; } \ No newline at end of file diff --git a/api/bundleManager/BundleInfo.d.ts b/api/bundleManager/BundleInfo.d.ts index caf837e08e..2c5a9b68b0 100644 --- a/api/bundleManager/BundleInfo.d.ts +++ b/api/bundleManager/BundleInfo.d.ts @@ -37,6 +37,16 @@ import bundleManager from './../@ohos.bundle.bundleManager'; * @atomicservice * @since 11 */ +/** + * Obtains configuration information about a bundle + * + * @typedef BundleInfo + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Obtains configuration information about a bundle * @@ -65,6 +75,17 @@ export interface BundleInfo { * @atomicservice * @since 11 */ + /** + * Indicates the name of this bundle + * + * @type { string } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates the name of this bundle * @@ -95,6 +116,17 @@ export interface BundleInfo { * @atomicservice * @since 11 */ + /** + * Indicates the bundle vendor + * + * @type { string } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates the bundle vendor * @@ -136,7 +168,7 @@ export interface BundleInfo { * @since 20 * @arkts 1.1&1.2 */ - readonly versionCode: number; + readonly versionCode: long; /** * Indicates the version name of the bundle @@ -155,6 +187,17 @@ export interface BundleInfo { * @atomicservice * @since 11 */ + /** + * Indicates the version name of the bundle + * + * @type { string } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates the version name of the bundle * @@ -196,7 +239,7 @@ export interface BundleInfo { * @since 20 * @arkts 1.1&1.2 */ - readonly minCompatibleVersionCode: number; + readonly minCompatibleVersionCode: int; /** * Indicates the target version number of the bundle @@ -226,7 +269,7 @@ export interface BundleInfo { * @since 20 * @arkts 1.1&1.2 */ - readonly targetVersion: number; + readonly targetVersion: int; /** * Obtains configuration information about an application @@ -245,6 +288,17 @@ export interface BundleInfo { * @atomicservice * @since 11 */ + /** + * Obtains configuration information about an application + * + * @type { ApplicationInfo } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Obtains configuration information about an application * @@ -275,6 +329,17 @@ export interface BundleInfo { * @atomicservice * @since 11 */ + /** + * Obtains configuration information about a module + * + * @type { Array } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Obtains configuration information about a module * @@ -305,6 +370,17 @@ export interface BundleInfo { * @atomicservice * @since 11 */ + /** + * Indicates the required permissions details defined in the bundle + * + * @type { Array } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates the required permissions details defined in the bundle * @@ -335,6 +411,17 @@ export interface BundleInfo { * @atomicservice * @since 11 */ + /** + * Indicates the grant state of required permissions + * + * @type { Array } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates the grant state of required permissions * @@ -365,6 +452,17 @@ export interface BundleInfo { * @atomicservice * @since 11 */ + /** + * Indicates the SignatureInfo of the bundle + * + * @type { SignatureInfo } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates the SignatureInfo of the bundle * @@ -389,14 +487,14 @@ export interface BundleInfo { /** * Indicates the hap install time * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly installTime: number; + readonly installTime: long; /** * Indicates the hap update time @@ -409,14 +507,14 @@ export interface BundleInfo { /** * Indicates the hap update time * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly updateTime: number; + readonly updateTime: long; /** * Indicates the router information of the application @@ -433,25 +531,25 @@ export interface BundleInfo { /** * Indicates the appIndex of application, only work in appClone mode * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: number; + readonly appIndex: int; /** * Indicates the hap first install time * - * @type { ?number } + * @type { ?long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly firstInstallTime?: number; + readonly firstInstallTime?: long; } /** @@ -469,6 +567,16 @@ export interface BundleInfo { * @atomicservice * @since 11 */ +/** + * Indicates the required permissions details defined in configuration file + * + * @typedef ReqPermissionDetail + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates the required permissions details defined in configuration file * @@ -495,6 +603,16 @@ export interface ReqPermissionDetail { * @atomicservice * @since 11 */ + /** + * Indicates the name of this required permissions + * + * @type { string } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates the name of this required permissions * @@ -540,6 +658,16 @@ export interface ReqPermissionDetail { * @atomicservice * @since 11 */ + /** + * Indicates the reason of this required permissions + * + * @type { string } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates the reason of this required permissions * @@ -577,7 +705,7 @@ export interface ReqPermissionDetail { * @since 20 * @arkts 1.1&1.2 */ - reasonId: number; + reasonId: long; /** * Indicates the used scene of this required permissions @@ -594,6 +722,16 @@ export interface ReqPermissionDetail { * @atomicservice * @since 11 */ + /** + * Indicates the used scene of this required permissions + * + * @type { UsedScene } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates the used scene of this required permissions * @@ -622,6 +760,16 @@ export interface ReqPermissionDetail { * @atomicservice * @since 11 */ +/** + * The scene which is used + * + * @typedef UsedScene + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * The scene which is used * @@ -648,6 +796,16 @@ export interface UsedScene { * @atomicservice * @since 11 */ + /** + * Indicates the abilities that need the permission + * + * @type { Array } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates the abilities that need the permission * @@ -675,6 +833,16 @@ export interface UsedScene { * @atomicservice * @since 11 */ + /** + * Indicates the time when the permission is used + * + * @type { string } + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates the time when the permission is used * @@ -703,6 +871,16 @@ export interface UsedScene { * @atomicservice * @since 11 */ +/** + * Indicates SignatureInfo + * + * @typedef SignatureInfo + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates SignatureInfo * @@ -733,6 +911,18 @@ export interface SignatureInfo { * @atomicservice * @since 11 */ + /** + * Indicates the ID of the application to which this bundle belongs + * The application ID uniquely identifies an application. It is determined by the bundle name and signature + * + * @type { string } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates the ID of the application to which this bundle belongs * The application ID uniquely identifies an application. It is determined by the bundle name and signature @@ -764,6 +954,17 @@ export interface SignatureInfo { * @atomicservice * @since 11 */ + /** + * Indicates the fingerprint of the certificate + * + * @type { string } + * @readonly + * @syscap SystemCapability.BundleManager.BundleFramework.Core + * @crossplatform + * @atomicservice + * @since 20 + * @since 11 + */ /** * Indicates the fingerprint of the certificate * @@ -826,7 +1027,7 @@ export interface AppCloneIdentity { /** * Indicates the index of clone app. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'14', '1.2':'20'} diff --git a/api/bundleManager/BundlePackInfo.d.ts b/api/bundleManager/BundlePackInfo.d.ts index e8ea4a275c..60ea30db70 100644 --- a/api/bundleManager/BundlePackInfo.d.ts +++ b/api/bundleManager/BundlePackInfo.d.ts @@ -479,14 +479,14 @@ export interface AbilityFormInfo { /** * Indicates the update duration * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly updateDuration: number; + readonly updateDuration: int; /** * Indicates the ability support dimensions @@ -526,14 +526,14 @@ export interface Version { /** * Indicates the min compatible code of this version * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly minCompatibleVersionCode: number; + readonly minCompatibleVersionCode: int; /** * Indicates the name of this version @@ -550,14 +550,14 @@ export interface Version { /** * Indicates the code of this version * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly code: number; + readonly code: int; } /** @@ -585,24 +585,24 @@ export interface ApiVersion { /** * Indicates the compatible version code of the api * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly compatible: number; + readonly compatible: int; /** * Indicates the target version code of the api * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly target: number; + readonly target: int; } diff --git a/api/bundleManager/BundleResourceInfo.d.ts b/api/bundleManager/BundleResourceInfo.d.ts index 6952f3d65b..3c597f5798 100644 --- a/api/bundleManager/BundleResourceInfo.d.ts +++ b/api/bundleManager/BundleResourceInfo.d.ts @@ -18,9 +18,7 @@ * @kit AbilityKit */ -/*** if arkts 1.1 */ import { DrawableDescriptor } from './../@ohos.arkui.drawableDescriptor'; -/*** endif */ /** * Obtains resource information about a bundle @@ -75,19 +73,20 @@ export interface BundleResourceInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly drawableDescriptor: DrawableDescriptor; /** * Indicates the index of the bundle * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: number; + readonly appIndex: int; } diff --git a/api/bundleManager/ExtensionAbilityInfo.d.ts b/api/bundleManager/ExtensionAbilityInfo.d.ts index d863294176..c4fb184a03 100644 --- a/api/bundleManager/ExtensionAbilityInfo.d.ts +++ b/api/bundleManager/ExtensionAbilityInfo.d.ts @@ -111,14 +111,14 @@ export interface ExtensionAbilityInfo { /** * Indicates the label id of the extension ability info * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: number; + readonly labelId: long; /** * Indicates the description id of the extension ability info @@ -131,14 +131,14 @@ export interface ExtensionAbilityInfo { /** * Indicates the description id of the extension ability info * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly descriptionId: number; + readonly descriptionId: long; /** * Indicates the icon id of the extension ability info @@ -151,14 +151,14 @@ export interface ExtensionAbilityInfo { /** * Indicates the icon id of the extension ability info * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: number; + readonly iconId: long; /** * Indicates whether this ability can be called by other abilities @@ -347,11 +347,11 @@ export interface ExtensionAbilityInfo { /** * Indicates the appIndex of extension ability, only work in clone app mode * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: number; + readonly appIndex: int; } diff --git a/api/bundleManager/HapModuleInfo.d.ts b/api/bundleManager/HapModuleInfo.d.ts index ae02a1d3b6..d9f0e8db65 100644 --- a/api/bundleManager/HapModuleInfo.d.ts +++ b/api/bundleManager/HapModuleInfo.d.ts @@ -129,7 +129,7 @@ export interface HapModuleInfo { /** * Indicates the icon id of this hap module * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -137,7 +137,7 @@ export interface HapModuleInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: number; + readonly iconId: long; /** * Indicates the label of this hap module @@ -189,7 +189,7 @@ export interface HapModuleInfo { /** * Indicates the label id of this hap module * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -197,7 +197,7 @@ export interface HapModuleInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: number; + readonly labelId: long; /** * Describes the hap module @@ -249,7 +249,7 @@ export interface HapModuleInfo { /** * Indicates the description of this hap module * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -257,7 +257,7 @@ export interface HapModuleInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly descriptionId: number; + readonly descriptionId: long; /** * Indicates main elementName of the hap module @@ -645,14 +645,14 @@ export interface Dependency { /** * Indicates the version code of the dependency * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly versionCode: number; + readonly versionCode: long; } /** diff --git a/api/bundleManager/LauncherAbilityInfo.d.ts b/api/bundleManager/LauncherAbilityInfo.d.ts index de21df51c0..22b5bb4319 100644 --- a/api/bundleManager/LauncherAbilityInfo.d.ts +++ b/api/bundleManager/LauncherAbilityInfo.d.ts @@ -55,44 +55,44 @@ export interface LauncherAbilityInfo { /** * Obtains labelId about an launcher ability. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: number; + readonly labelId: long; /** * Obtains iconId about an launcher ability. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: number; + readonly iconId: long; /** * Obtains userId about an launcher ability. * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly userId: number; + readonly userId: int; /** * Obtains installTime about an launcher ability. * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly installTime: number; + readonly installTime: long; } diff --git a/api/bundleManager/LauncherAbilityResourceInfo.d.ts b/api/bundleManager/LauncherAbilityResourceInfo.d.ts index bd303e501a..930c593c6f 100644 --- a/api/bundleManager/LauncherAbilityResourceInfo.d.ts +++ b/api/bundleManager/LauncherAbilityResourceInfo.d.ts @@ -18,9 +18,7 @@ * @kit AbilityKit */ -/*** if arkts 1.1 */ import { DrawableDescriptor } from './../@ohos.arkui.drawableDescriptor'; -/*** endif */ /** * Obtains resource information about a launcher ability @@ -99,19 +97,20 @@ export interface LauncherAbilityResourceInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly drawableDescriptor: DrawableDescriptor; /** * Indicates the index of the bundle * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: number; + readonly appIndex: int; } diff --git a/api/bundleManager/Metadata.d.ts b/api/bundleManager/Metadata.d.ts index a4886fcb1b..86afd3775a 100644 --- a/api/bundleManager/Metadata.d.ts +++ b/api/bundleManager/Metadata.d.ts @@ -128,12 +128,12 @@ export interface Metadata { /** * Indicates the value id of the metadata * - * @type { ?number } + * @type { ?long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly valueId?: number; + readonly valueId?: long; } diff --git a/api/bundleManager/OverlayModuleInfo.d.ts b/api/bundleManager/OverlayModuleInfo.d.ts index aa2b660c73..1c9f680376 100644 --- a/api/bundleManager/OverlayModuleInfo.d.ts +++ b/api/bundleManager/OverlayModuleInfo.d.ts @@ -63,22 +63,22 @@ export interface OverlayModuleInfo { /** * Indicates the priority of the overlay module * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly priority: number; + readonly priority: int; /** * Indicates the state of the overlay module * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly state: number; + readonly state: int; } diff --git a/api/bundleManager/PermissionDef.d.ts b/api/bundleManager/PermissionDef.d.ts index 4b93792ec6..8b7847b0b5 100644 --- a/api/bundleManager/PermissionDef.d.ts +++ b/api/bundleManager/PermissionDef.d.ts @@ -43,36 +43,36 @@ export interface PermissionDef { /** * Indicates the grant mode of this permission * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly grantMode: number; + readonly grantMode: int; /** * Indicates the labelId of this permission * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: number; + readonly labelId: long; /** * Indicates the descriptionId of this permission * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly descriptionId: number; + readonly descriptionId: long; } diff --git a/api/bundleManager/PluginBundleInfo.d.ts b/api/bundleManager/PluginBundleInfo.d.ts index 40933b54af..c92159c05c 100644 --- a/api/bundleManager/PluginBundleInfo.d.ts +++ b/api/bundleManager/PluginBundleInfo.d.ts @@ -43,14 +43,14 @@ export interface PluginBundleInfo { /** * Indicates the label id of the plugin * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'19', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: number; + readonly labelId: long; /** * Indicates the icon of the plugin @@ -67,14 +67,14 @@ export interface PluginBundleInfo { /** * Indicates the icon id of the plugin * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'19', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: number; + readonly iconId: long; /** * Indicates the name of the plugin @@ -91,14 +91,14 @@ export interface PluginBundleInfo { /** * Indicates the version code of the plugin * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'19', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly versionCode: number; + readonly versionCode: long; /** * Indicates the version name of the plugin @@ -150,14 +150,14 @@ export interface PluginModuleInfo { /** * Indicates the description of the plugin * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'19', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly descriptionId: number; + readonly descriptionId: long; /** * Describes the plugin diff --git a/api/bundleManager/RecoverableApplicationInfo.d.ts b/api/bundleManager/RecoverableApplicationInfo.d.ts index 29b78aed38..144d484710 100644 --- a/api/bundleManager/RecoverableApplicationInfo.d.ts +++ b/api/bundleManager/RecoverableApplicationInfo.d.ts @@ -57,26 +57,26 @@ export interface RecoverableApplicationInfo { /** * Indicates the label id * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: number; + readonly labelId: long; /** * Indicates the icon id * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: number; + readonly iconId: long; /** * Indicates whether the application is a system application diff --git a/api/bundleManager/SharedBundleInfo.d.ts b/api/bundleManager/SharedBundleInfo.d.ts index 4065fc3925..e5ce19fffe 100644 --- a/api/bundleManager/SharedBundleInfo.d.ts +++ b/api/bundleManager/SharedBundleInfo.d.ts @@ -93,14 +93,14 @@ export interface SharedModuleInfo { /** * Indicates the version code of the shared module * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly versionCode: number; + readonly versionCode: long; /** * Indicates the version name of the shared module @@ -129,12 +129,12 @@ export interface SharedModuleInfo { /** * Indicates the description of this shared module * - * @type { number } + * @type { long } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly descriptionId: number; + readonly descriptionId: long; } diff --git a/api/bundleManager/ShortcutInfo.d.ts b/api/bundleManager/ShortcutInfo.d.ts index c4c0b8fb9f..d50ec155b1 100644 --- a/api/bundleManager/ShortcutInfo.d.ts +++ b/api/bundleManager/ShortcutInfo.d.ts @@ -26,6 +26,14 @@ * @systemapi * @since 9 */ +/** + * Provides information about a shortcut, including the shortcut ID and label. + * + * @typedef ShortcutInfo + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @since 20 + * @since 9 + */ /** * Provides information about a shortcut, including the shortcut ID and label. * @@ -52,6 +60,14 @@ export interface ShortcutInfo { * @systemapi * @since 12 */ + /** + * Indicates the ID of the application to which this shortcut belongs + * + * @type { string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @since 20 + * @since 12 + */ /** * Indicates the ID of the application to which this shortcut belongs * @@ -79,6 +95,14 @@ export interface ShortcutInfo { * @systemapi * @since 12 */ + /** + * Indicates the name of the bundle containing the shortcut + * + * @type { string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @since 20 + * @since 12 + */ /** * Indicates the name of the bundle containing the shortcut * @@ -106,6 +130,14 @@ export interface ShortcutInfo { * @systemapi * @since 12 */ + /** + * Indicates the moduleName of the shortcut + * + * @type { ?string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @since 20 + * @since 12 + */ /** * Indicates the moduleName of the shortcut * @@ -133,6 +165,14 @@ export interface ShortcutInfo { * @systemapi * @since 12 */ + /** + * Indicates the host ability of the shortcut + * + * @type { ?string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @since 20 + * @since 12 + */ /** * Indicates the host ability of the shortcut * @@ -160,6 +200,14 @@ export interface ShortcutInfo { * @systemapi * @since 12 */ + /** + * Indicates the icon of the shortcut + * + * @type { ?string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @since 20 + * @since 12 + */ /** * Indicates the icon of the shortcut * @@ -195,7 +243,7 @@ export interface ShortcutInfo { * @since 20 * @arkts 1.1&1.2 */ - iconId?: number; + iconId?: long; /** * Indicates the label of the shortcut @@ -214,6 +262,14 @@ export interface ShortcutInfo { * @systemapi * @since 12 */ + /** + * Indicates the label of the shortcut + * + * @type { ?string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @since 20 + * @since 12 + */ /** * Indicates the label of the shortcut * @@ -249,7 +305,7 @@ export interface ShortcutInfo { * @since 20 * @arkts 1.1&1.2 */ - labelId?: number; + labelId?: long; /** * Indicates the wants of the shortcut @@ -268,6 +324,14 @@ export interface ShortcutInfo { * @systemapi * @since 12 */ + /** + * Indicates the wants of the shortcut + * + * @type { ?Array } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @since 20 + * @since 12 + */ /** * Indicates the wants of the shortcut * @@ -294,7 +358,7 @@ export interface ShortcutInfo { * @since 20 * @arkts 1.1&1.2 */ - appIndex: number; + appIndex: int; /** * Indicates the source type of shortcut. @@ -332,6 +396,14 @@ export interface ShortcutInfo { * @systemapi * @since 9 */ +/** + * Obtains information about the ability that a shortcut will start. + * + * @typedef ShortcutWant + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @since 20 + * @since 9 + */ /** * Obtains information about the ability that a shortcut will start. * @@ -358,6 +430,14 @@ export interface ShortcutWant { * @systemapi * @since 12 */ + /** + * Indicates the target bundle of the shortcut want + * + * @type { string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @since 20 + * @since 12 + */ /** * Indicates the target bundle of the shortcut want * @@ -385,6 +465,14 @@ export interface ShortcutWant { * @systemapi * @since 12 */ + /** + * Indicates the target module of the shortcut want + * + * @type { ?string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @since 20 + * @since 12 + */ /** * Indicates the target module of the shortcut want * @@ -412,6 +500,14 @@ export interface ShortcutWant { * @systemapi * @since 12 */ + /** + * Indicates the target ability of the shortcut want + * + * @type { string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @since 20 + * @since 12 + */ /** * Indicates the target ability of the shortcut want * @@ -430,6 +526,14 @@ export interface ShortcutWant { * @systemapi * @since 12 */ + /** + * Indicates the parameters of the shortcut want + * + * @type { ?Array } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @since 20 + * @since 12 + */ /** * Indicates the parameters of the shortcut want * @@ -449,6 +553,14 @@ export interface ShortcutWant { * @systemapi * @since 12 */ +/** + * Obtains information about the ability that a shortcut will start. + * + * @typedef ParameterItem + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @since 20 + * @since 12 + */ /** * Obtains information about the ability that a shortcut will start. * @@ -466,6 +578,14 @@ export interface ParameterItem { * @systemapi * @since 12 */ + /** + * Indicates the key of the parameter item. + * + * @type { string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @since 20 + * @since 12 + */ /** * Indicates the key of the parameter item. * @@ -484,6 +604,14 @@ export interface ParameterItem { * @systemapi * @since 12 */ + /** + * Indicates the value of the parameter item. + * + * @type { string } + * @syscap SystemCapability.BundleManager.BundleFramework.Launcher + * @since 20 + * @since 12 + */ /** * Indicates the value of the parameter item. * diff --git a/api/bundleManager/Skill.d.ts b/api/bundleManager/Skill.d.ts index 7e09ec6787..ddaedcf470 100644 --- a/api/bundleManager/Skill.d.ts +++ b/api/bundleManager/Skill.d.ts @@ -114,14 +114,14 @@ export interface SkillUri { /** * Indicates the port of the skillUri * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly port: number; + readonly port: int; /** * Indicates the path of the skillUri @@ -186,14 +186,14 @@ export interface SkillUri { /** * Indicates the maxFileSupported of the skillUri * - * @type { number } + * @type { int } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly maxFileSupported: number; + readonly maxFileSupported: int; /** * Indicates the linkFeature of the skillUri diff --git a/api/commonEvent/commonEventSubscriber.d.ts b/api/commonEvent/commonEventSubscriber.d.ts index eb2f3d03c8..f7b224426f 100644 --- a/api/commonEvent/commonEventSubscriber.d.ts +++ b/api/commonEvent/commonEventSubscriber.d.ts @@ -57,6 +57,8 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getCode(callback: AsyncCallback): void; @@ -75,6 +77,8 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getCode(): Promise; @@ -93,6 +97,8 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getCodeSync(): number; @@ -117,6 +123,8 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setCode(code: number, callback: AsyncCallback): void; @@ -141,6 +149,8 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setCode(code: number): Promise; @@ -163,6 +173,8 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setCodeSync(code: number): void; @@ -185,6 +197,8 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getData(callback: AsyncCallback): void; @@ -203,6 +217,8 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getData(): Promise; @@ -221,6 +237,8 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getDataSync(): string; @@ -245,6 +263,8 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setData(data: string, callback: AsyncCallback): void; @@ -269,6 +289,8 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setData(data: string): Promise; @@ -291,6 +313,8 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setDataSync(data: string): void; @@ -317,6 +341,8 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setCodeAndData(code: number, data: string, callback: AsyncCallback): void; @@ -343,6 +369,8 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setCodeAndData(code: number, data: string): Promise; @@ -367,6 +395,8 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setCodeAndDataSync(code: number, data: string): void; @@ -379,6 +409,8 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ isOrderedCommonEvent(callback: AsyncCallback): void; @@ -389,6 +421,8 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ isOrderedCommonEvent(): Promise; @@ -399,6 +433,8 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ isOrderedCommonEventSync(): boolean; @@ -411,6 +447,8 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ isStickyCommonEvent(callback: AsyncCallback): void; @@ -421,6 +459,8 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ isStickyCommonEvent(): Promise; @@ -431,6 +471,8 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ isStickyCommonEventSync(): boolean; @@ -443,6 +485,8 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ abortCommonEvent(callback: AsyncCallback): void; @@ -453,6 +497,8 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ abortCommonEvent(): Promise; @@ -462,6 +508,8 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ abortCommonEventSync(): void; @@ -474,6 +522,8 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ clearAbortCommonEvent(callback: AsyncCallback): void; @@ -484,6 +534,8 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ clearAbortCommonEvent(): Promise; @@ -493,6 +545,8 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ clearAbortCommonEventSync(): void; @@ -505,6 +559,8 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ getAbortCommonEvent(callback: AsyncCallback): void; @@ -515,6 +571,8 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ getAbortCommonEvent(): Promise; @@ -525,6 +583,8 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ getAbortCommonEventSync(): boolean; @@ -548,6 +608,8 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getSubscribeInfo(callback: AsyncCallback): void; @@ -567,6 +629,8 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getSubscribeInfo(): Promise; @@ -585,6 +649,8 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getSubscribeInfoSync(): CommonEventSubscribeInfo; @@ -597,6 +663,8 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ finishCommonEvent(callback: AsyncCallback): void; @@ -607,6 +675,8 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ finishCommonEvent(): Promise; } diff --git a/api/device-define/wearable.json b/api/device-define/wearable.json index a511203b64..3b3b9ff873 100644 --- a/api/device-define/wearable.json +++ b/api/device-define/wearable.json @@ -187,6 +187,7 @@ "SystemCapability.Location.Location.Core", "SystemCapability.Location.Location.Gnss", "SystemCapability.Test.UiTest", - "SystemCapability.Resourceschedule.BackgroundProcessManager" + "SystemCapability.Resourceschedule.BackgroundProcessManager", + "SystemCapability.MultimodalAwareness.RoomLocation" ] } diff --git a/api/global/rawFileDescriptor.d.ts b/api/global/rawFileDescriptor.d.ts index 76d4c8959d..8a85921c4f 100644 --- a/api/global/rawFileDescriptor.d.ts +++ b/api/global/rawFileDescriptor.d.ts @@ -16,7 +16,6 @@ /** * @file * @kit LocalizationKit - * @arkts 1.1&1.2 */ /** @@ -42,6 +41,7 @@ * @crossplatform * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface RawFileDescriptor { /** @@ -65,6 +65,7 @@ export interface RawFileDescriptor { * @crossplatform * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ fd: number; @@ -89,6 +90,7 @@ export interface RawFileDescriptor { * @crossplatform * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ offset: number; @@ -113,6 +115,7 @@ export interface RawFileDescriptor { * @crossplatform * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ length: number; } \ No newline at end of file diff --git a/api/global/resource.d.ts b/api/global/resource.d.ts index bb8beb45be..b516c1d9a5 100644 --- a/api/global/resource.d.ts +++ b/api/global/resource.d.ts @@ -111,6 +111,7 @@ export interface Resource { * @type { ?any[] } * @syscap SystemCapability.Global.ResourceManager * @since 9 + * @since 9 */ /** @@ -130,6 +131,7 @@ export interface Resource { * @type { ?number } * @syscap SystemCapability.Global.ResourceManager * @since 9 + * @since 9 */ /** * Set type. diff --git a/api/multimedia/soundPool.d.ts b/api/multimedia/soundPool.d.ts index 63d9baad36..b46cddf94f 100644 --- a/api/multimedia/soundPool.d.ts +++ b/api/multimedia/soundPool.d.ts @@ -103,18 +103,22 @@ export interface PlayParameters { * The default value is **0**, indicating that the content is played only once. * * @type { ?number } + * @type { ?number } * @syscap SystemCapability.Multimedia.Media.SoundPool * @since 10 */ loop?: number; + loop?: number; /** * Playback rate. For details, see [AudioRendererRate]{@link #audio.AudioRendererRate}. Default value: **0**. * * @type { ?number } + * @type { ?number } * @syscap SystemCapability.Multimedia.Media.SoundPool * @since 10 */ rate?: number; + rate?: number; /** * Volume of the left channel. The value ranges from 0.0 to 1.0. Default value: **1.0**. * @@ -137,10 +141,12 @@ export interface PlayParameters { * The value is an integer greater than or equal to 0. Default value: **0**. * * @type { ?number } + * @type { ?number } * @syscap SystemCapability.Multimedia.Media.SoundPool * @since 10 */ priority?: number; + priority?: number; /** * Whether the sound can be played in parallel with other active audio streams. The value **true** means that the * sound can be played in parallel with other active audio streams, without preempting the audio focus, @@ -175,7 +181,7 @@ export interface PlayParameters { * @syscap SystemCapability.Multimedia.Media.SoundPool * @since 10 */ -export interface SoundPool { +export declare interface SoundPool { /** * Loads a sound. This API uses an asynchronous callback to obtain the sound ID. * The input parameter **uri** is a string starting with fd://, which is generated based on the file descriptor (FD) @@ -224,6 +230,7 @@ export interface SoundPool { * @since 10 */ load(uri: string): Promise; + load(uri: string): Promise; /** * Loads a sound. This API uses an asynchronous callback to obtain the sound ID. The input parameter **fd** can be * manually input or automatically obtained by reading the embedded resource of the application. @@ -250,6 +257,7 @@ export interface SoundPool { * @since 10 */ load(fd: number, offset: number, length: number, callback: AsyncCallback): void; + load(fd: number, offset: number, length: number, callback: AsyncCallback): void; /** * Loads a sound. This API uses a promise to obtain the sound ID. The input parameter **fd** can be manually input or * automatically obtained by reading the embedded resource of the application. @@ -275,6 +283,7 @@ export interface SoundPool { * @since 10 */ load(fd: number, offset: number, length: number): Promise; + load(fd: number, offset: number, length: number): Promise; /** * Plays a sound. This API uses an asynchronous callback to obtain the audio stream ID. * @@ -290,6 +299,7 @@ export interface SoundPool { * @since 10 */ play(soundID: number, params: PlayParameters, callback: AsyncCallback): void; + play(soundID: number, params: PlayParameters, callback: AsyncCallback): void; /** * Plays a sound. This API uses an asynchronous callback to obtain the audio stream ID. * @@ -304,6 +314,7 @@ export interface SoundPool { * @since 10 */ play(soundID: number, callback: AsyncCallback): void; + play(soundID: number, callback: AsyncCallback): void; /** * Plays a sound. This API uses a promise to obtain the audio stream ID. * @@ -318,6 +329,7 @@ export interface SoundPool { * @since 10 */ play(soundID: number, params?: PlayParameters): Promise; + play(soundID: number, params?: PlayParameters): Promise; /** * Stops playing a sound. This API uses an asynchronous callback to return the result. * @@ -331,6 +343,7 @@ export interface SoundPool { * @since 10 */ stop(streamID: number, callback: AsyncCallback): void; + stop(streamID: number, callback: AsyncCallback): void; /** * Stops playing a sound. This API uses a promise to return the result. * @@ -344,6 +357,7 @@ export interface SoundPool { * @since 10 */ stop(streamID: number): Promise; + stop(streamID: number): Promise; /** * Sets the loop mode for an audio stream. This API uses an asynchronous callback to return the result. * @@ -360,9 +374,11 @@ export interface SoundPool { * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. * @throws { BusinessError } 5400105 - Service died. Return by callback. * @syscap SystemCapability.Multimedia.Media.SoundPool - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ setLoop(streamID: number, loop: number, callback: AsyncCallback): void; + setLoop(streamID: number, loop: number, callback: AsyncCallback): void; /** * Sets the loop mode for an audio stream. This API uses a promise to return the result. * @@ -379,9 +395,11 @@ export interface SoundPool { * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. * @throws { BusinessError } 5400105 - Service died. Return by promise. * @syscap SystemCapability.Multimedia.Media.SoundPool - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ setLoop(streamID: number, loop: number): Promise; + setLoop(streamID: number, loop: number): Promise; /** * Sets the priority for an audio stream. This API uses an asynchronous callback to return the result. * @@ -394,9 +412,11 @@ export interface SoundPool { * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. * @throws { BusinessError } 5400105 - Service died. Return by callback. * @syscap SystemCapability.Multimedia.Media.SoundPool - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ setPriority(streamID: number, priority: number, callback: AsyncCallback): void; + setPriority(streamID: number, priority: number, callback: AsyncCallback): void; /** * Sets the priority for an audio stream. This API uses a promise to return the result. * @@ -409,9 +429,11 @@ export interface SoundPool { * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. * @throws { BusinessError } 5400105 - Service died. Return by promise. * @syscap SystemCapability.Multimedia.Media.SoundPool - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ setPriority(streamID: number, priority: number): Promise; + setPriority(streamID: number, priority: number): Promise; /** * Sets the playback rate for an audio stream. This API uses an asynchronous callback to return the result. * @@ -426,6 +448,7 @@ export interface SoundPool { * @since 10 */ setRate(streamID: number, rate: audio.AudioRendererRate, callback: AsyncCallback): void; + setRate(streamID: number, rate: audio.AudioRendererRate, callback: AsyncCallback): void; /** * Sets the playback rate for an audio stream. This API uses a promise to return the result. * @@ -440,6 +463,7 @@ export interface SoundPool { * @since 10 */ setRate(streamID: number, rate: audio.AudioRendererRate): Promise; + setRate(streamID: number, rate: audio.AudioRendererRate): Promise; /** * Sets the volume for an audio stream. This API uses an asynchronous callback to return the result. * @@ -453,9 +477,11 @@ export interface SoundPool { * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. * @throws { BusinessError } 5400105 - Service died. Return by callback. * @syscap SystemCapability.Multimedia.Media.SoundPool - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ setVolume(streamID: number, leftVolume: number, rightVolume: number, callback: AsyncCallback): void; + setVolume(streamID: number, leftVolume: number, rightVolume: number, callback: AsyncCallback): void; /** * Sets the volume for an audio stream. This API uses a promise to return the result. * @@ -469,9 +495,11 @@ export interface SoundPool { * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. * @throws { BusinessError } 5400105 - Service died. Return by promise. * @syscap SystemCapability.Multimedia.Media.SoundPool - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ setVolume(streamID: number, leftVolume: number, rightVolume: number): Promise; + setVolume(streamID: number, leftVolume: number, rightVolume: number): Promise; /** * Unloads a sound. This API uses an asynchronous callback to return the result. * @@ -484,6 +512,7 @@ export interface SoundPool { * @since 10 */ unload(soundID: number, callback: AsyncCallback): void; + unload(soundID: number, callback: AsyncCallback): void; /** * Unloads a sound. This API uses a promise to return the result. * @@ -496,6 +525,7 @@ export interface SoundPool { * @since 10 */ unload(soundID: number): Promise; + unload(soundID: number): Promise; /** * Releases this **SoundPool** instance. This API uses an asynchronous callback to return the result. * diff --git a/api/notification/notificationSubscriber.d.ts b/api/notification/notificationSubscriber.d.ts index eae4b2f001..be346cfcbf 100644 --- a/api/notification/notificationSubscriber.d.ts +++ b/api/notification/notificationSubscriber.d.ts @@ -39,7 +39,8 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ onConsume?: (data: SubscribeCallbackData) => void; @@ -49,7 +50,8 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ onCancel?: (data: SubscribeCallbackData) => void; @@ -59,7 +61,8 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ onUpdate?: (data: NotificationSortingMap) => void; @@ -69,7 +72,8 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ onConnect?: () => void; @@ -79,7 +83,8 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ onDisconnect?: () => void; @@ -89,7 +94,8 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ onDestroy?: () => void; @@ -111,7 +117,8 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onDoNotDisturbChanged?: (mode: notificationManager.DoNotDisturbDate) => void; @@ -121,7 +128,8 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ onEnabledNotificationChanged?: (callbackData: EnabledNotificationCallbackData) => void; @@ -131,7 +139,8 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ onBadgeChanged?: (data: BadgeNumberCallbackData) => void; @@ -141,7 +150,8 @@ export interface NotificationSubscriber { * @type { ?BadgeEnabledChangedCallback } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onBadgeEnabledChanged?: BadgeEnabledChangedCallback; @@ -151,7 +161,8 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onBatchCancel?: (data: Array) => void; } diff --git a/arkts/@arkts.collections.d.ets b/arkts/@arkts.collections.d.ets index f8127b775b..11b52769f0 100644 --- a/arkts/@arkts.collections.d.ets +++ b/arkts/@arkts.collections.d.ets @@ -11971,30 +11971,22 @@ declare namespace collections { * @arkts 1.2 */ values(): IterableIterator; + /** * Returns the item at that index. * * @param { number } index - The zero-based index of the desired code unit. - * @returns { number } The element in the bitVector matching the given index. + * Throws error if index < 0 or index >= bitVector.length. + * @returns { number } The element in the bitVector matching the given index. + * @throws { BusinessError } 10200001 - The value of index is out of range. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice * @since 20 * @arkts 1.2 */ - $_get(index: number): number; - /** - * Set the value of item at that index. - * - * @param { number } index - The index of the element to set. - * @param { number } value - The value to set at the specified index. - * @syscap SystemCapability.Utils.Lang - * @atomicservice - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - $_set(index: number, value: number): void; + [index: number]: number; + } /** diff --git a/arkts/@arkts.math.Decimal.d.ets b/arkts/@arkts.math.Decimal.d.ets index 166fdaefd9..8a3a362fa0 100644 --- a/arkts/@arkts.math.Decimal.d.ets +++ b/arkts/@arkts.math.Decimal.d.ets @@ -38,6 +38,7 @@ type Rounding = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8; /** * The type uesd to set rounding * + * @typedef { number } * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice @@ -73,12 +74,14 @@ type Modulo = Rounding | 9; /** * The type uesd to denote decimal value * + * @typedef { string | number | Decimal } * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice * @since 18 */ type Value = string | number | Decimal; +type Value = string | number | Decimal; /** * Provides configuration for decimal. @@ -339,9 +342,23 @@ declare class Decimal { * @crossplatform * @atomicservice * @since 18 + * @since 18 */ readonly e: number; + /** + * The number of decimal exponent. + * + * @type { number } + * @readonly + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get e(): number; + /** * The number of decimal sign. * @@ -360,13 +377,28 @@ declare class Decimal { * @crossplatform * @atomicservice * @since 18 + * @since 18 */ readonly s: number; + /** + * The number of decimal sign. + * + * @type { number } + * @readonly + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + get s(): number; + /** * Return a new Decimal whose value is the absolute value of this Decimal. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; * 2. Parameter verification failed. @@ -378,6 +410,7 @@ declare class Decimal { * Return a new Decimal whose value is the absolute value of this Decimal. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; * 2. Parameter verification failed. @@ -387,6 +420,7 @@ declare class Decimal { * @since 18 */ constructor(n: Value); + constructor(n: Value); /** * Return a new Decimal whose value is the absolute value of this Decimal. @@ -474,6 +508,8 @@ declare class Decimal { * * @param { Value } min {number | string | Decimal} * @param { Value } max {number | string | Decimal} + * @param { Value } min {number | string | Decimal} + * @param { Value } max {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -489,6 +525,8 @@ declare class Decimal { * * @param { Value } min {number | string | Decimal} * @param { Value } max {number | string | Decimal} + * @param { Value } min {number | string | Decimal} + * @param { Value } max {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -500,12 +538,14 @@ declare class Decimal { * @since 18 */ clamp(min: Value, max: Value): Decimal; + clamp(min: Value, max: Value): Decimal; /** * Return a new Decimal whose value is the value of this Decimal plus `n`, rounded to `precision` * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -519,6 +559,7 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -529,12 +570,14 @@ declare class Decimal { * @since 18 */ add(n: Value): Decimal; + add(n: Value): Decimal; /** * Return a new Decimal whose value is the value of this Decimal minus `n`, rounded to `precision` * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -548,6 +591,7 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -555,15 +599,18 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ sub(n: Value): Decimal; + sub(n: Value): Decimal; /** * Return a new Decimal whose value is this Decimal times `n`, rounded to `precision` significant * digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -577,6 +624,7 @@ declare class Decimal { * digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -587,12 +635,14 @@ declare class Decimal { * @since 18 */ mul(n: Value): Decimal; + mul(n: Value): Decimal; /** * Return a new Decimal whose value is the value of this Decimal divided by `n`, rounded to * `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -606,6 +656,7 @@ declare class Decimal { * `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -613,15 +664,18 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ div(n: Value): Decimal; + div(n: Value): Decimal; /** * Return a new Decimal whose value is the value of this Decimal modulo `n`, rounded to * `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal }the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -635,6 +689,7 @@ declare class Decimal { * `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal }the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -642,9 +697,11 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ mod(n: Value): Decimal; + mod(n: Value): Decimal; /** * Return a new Decimal whose value is the square root of this Decimal, rounded to `precision` @@ -663,7 +720,8 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ sqrt(): Decimal; @@ -684,7 +742,8 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ cbrt(): Decimal; @@ -693,6 +752,7 @@ declare class Decimal { * to `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -707,6 +767,7 @@ declare class Decimal { * to `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -715,9 +776,11 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ pow(n: Value): Decimal; + pow(n: Value): Decimal; /** * Return a new Decimal whose value is the natural exponential of the value of this Decimal, @@ -740,7 +803,8 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ exp(): Decimal; @@ -749,6 +813,7 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -763,6 +828,7 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -771,9 +837,11 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ log(n: Value): Decimal; + log(n: Value): Decimal; /** * Return a new Decimal whose value is the natural logarithm of the value of this Decimal, @@ -794,7 +862,8 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ ln(): Decimal; @@ -813,7 +882,8 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ cos(): Decimal; @@ -832,7 +902,8 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ sin(): Decimal; @@ -851,7 +922,8 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ tan(): Decimal; @@ -872,7 +944,8 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ cosh(): Decimal; @@ -891,7 +964,8 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ sinh(): Decimal; @@ -910,7 +984,8 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ tanh(): Decimal; @@ -931,7 +1006,8 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ acos(): Decimal; @@ -954,7 +1030,8 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ asin(): Decimal; @@ -975,7 +1052,8 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ atan(): Decimal; @@ -998,7 +1076,8 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ acosh(): Decimal; @@ -1021,7 +1100,8 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ asinh(): Decimal; @@ -1044,7 +1124,8 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ atanh(): Decimal; @@ -1056,6 +1137,7 @@ declare class Decimal { * NaN if the value of either Decimal is NaN. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { number } the number type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1072,6 +1154,7 @@ declare class Decimal { * NaN if the value of either Decimal is NaN. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { number } the number type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1082,11 +1165,13 @@ declare class Decimal { * @since 18 */ comparedTo(n: Value): number; + comparedTo(n: Value): number; /** * Return true if the value of this Decimal is equal to the value of `n`, otherwise return false. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { boolean } the boolean type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1099,6 +1184,7 @@ declare class Decimal { * Return true if the value of this Decimal is equal to the value of `n`, otherwise return false. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { boolean } the boolean type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1109,11 +1195,13 @@ declare class Decimal { * @since 18 */ equals(n: Value): boolean; + equals(n: Value): boolean; /** * Return true if the value of this Decimal is greater than the value of `n`, otherwise return false. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { boolean } the boolean type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1126,6 +1214,7 @@ declare class Decimal { * Return true if the value of this Decimal is greater than the value of `n`, otherwise return false. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { boolean } the boolean type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1136,12 +1225,14 @@ declare class Decimal { * @since 18 */ greaterThan(n: Value): boolean; + greaterThan(n: Value): boolean; /** * Return true if the value of this Decimal is greater than or equal to the value of `n`, * otherwise return false. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { boolean } the boolean type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1155,6 +1246,7 @@ declare class Decimal { * otherwise return false. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { boolean } the boolean type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1165,11 +1257,13 @@ declare class Decimal { * @since 18 */ greaterThanOrEqualTo(n: Value): boolean; + greaterThanOrEqualTo(n: Value): boolean; /** * Return true if the value of this Decimal is less than `n`, otherwise return false. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { boolean } the boolean type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1182,6 +1276,7 @@ declare class Decimal { * Return true if the value of this Decimal is less than `n`, otherwise return false. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { boolean } the boolean type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1192,11 +1287,13 @@ declare class Decimal { * @since 18 */ lessThan(n: Value): boolean; + lessThan(n: Value): boolean; /** * Return true if the value of this Decimal is less than or equal to `n`, otherwise return false. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { boolean } the boolean type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1209,6 +1306,7 @@ declare class Decimal { * Return true if the value of this Decimal is less than or equal to `n`, otherwise return false. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { boolean } the boolean type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1219,6 +1317,7 @@ declare class Decimal { * @since 18 */ lessThanOrEqualTo(n: Value): boolean; + lessThanOrEqualTo(n: Value): boolean; /** * Return true if the value of this Decimal is a finite number, otherwise return false. @@ -1339,6 +1438,7 @@ declare class Decimal { * by the value of `n`, rounded to `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1352,6 +1452,7 @@ declare class Decimal { * by the value of `n`, rounded to `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1359,9 +1460,11 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ dividedToIntegerBy(n: Value): Decimal; + dividedToIntegerBy(n: Value): Decimal; /** * Return a new Decimal whose value is the value of this Decimal negated, i.e. as if multiplied by -1. @@ -1829,6 +1932,7 @@ declare class Decimal { * less than or equal to `max_denominator`. * * @param { Value } maxDenominator {number | string | Decimal} + * @param { Value } maxDenominator {number | string | Decimal} * @returns { Decimal[] } the Decimal[] type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1843,6 +1947,7 @@ declare class Decimal { * less than or equal to `max_denominator`. * * @param { Value } maxDenominator {number | string | Decimal} + * @param { Value } maxDenominator {number | string | Decimal} * @returns { Decimal[] } the Decimal[] type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1853,11 +1958,13 @@ declare class Decimal { * @since 18 */ toFraction(maxDenominator: Value): Decimal[]; + toFraction(maxDenominator: Value): Decimal[]; /** * Returns a new Decimal whose value is the nearest multiple of `n`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1870,6 +1977,7 @@ declare class Decimal { * Returns a new Decimal whose value is the nearest multiple of `n`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1880,12 +1988,14 @@ declare class Decimal { * @since 18 */ toNearest(n: Value): Decimal; + toNearest(n: Value): Decimal; /** * Returns a new Decimal whose value is the nearest multiple of `n` in the direction of rounding * mode `rounding`, to the value of this Decimal. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @param { Rounding } rounding Rounding mode. Integer, 0 to 8 inclusive. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: @@ -1901,6 +2011,7 @@ declare class Decimal { * mode `rounding`, to the value of this Decimal. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @param { Rounding } rounding Rounding mode. Integer, 0 to 8 inclusive. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: @@ -1913,6 +2024,7 @@ declare class Decimal { * @since 18 */ toNearest(n: Value, rounding: Rounding): Decimal; + toNearest(n: Value, rounding: Rounding): Decimal; /** * Return a string representing the value of this Decimal. @@ -2151,7 +2263,8 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ precision(): number; @@ -2178,7 +2291,8 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ precision(includeZeros: boolean | number): number; @@ -2186,6 +2300,7 @@ declare class Decimal { * Return a new Decimal whose value is the absolute value of `n`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2199,6 +2314,7 @@ declare class Decimal { * Return a new Decimal whose value is the absolute value of `n`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2210,11 +2326,13 @@ declare class Decimal { * @since 18 */ static abs(n: Value): Decimal; + static abs(n: Value): Decimal; /** * Return a new Decimal whose value is `n` round to an integer using `ROUND_FLOOR`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2228,6 +2346,7 @@ declare class Decimal { * Return a new Decimal whose value is `n` round to an integer using `ROUND_FLOOR`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2239,11 +2358,13 @@ declare class Decimal { * @since 18 */ static floor(n: Value): Decimal; + static floor(n: Value): Decimal; /** * Return a new Decimal whose value is `n` rounded to an integer using `ROUND_CEIL`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2257,6 +2378,7 @@ declare class Decimal { * Return a new Decimal whose value is `n` rounded to an integer using `ROUND_CEIL`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2268,11 +2390,13 @@ declare class Decimal { * @since 18 */ static ceil(n: Value): Decimal; + static ceil(n: Value): Decimal; /** * Return a new Decimal whose value is `n` truncated to an integer. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2286,6 +2410,7 @@ declare class Decimal { * Return a new Decimal whose value is `n` truncated to an integer. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2297,6 +2422,7 @@ declare class Decimal { * @since 18 */ static trunc(n: Value): Decimal; + static trunc(n: Value): Decimal; /** * Return a new Decimal whose value is `n` clamped to the range delineated by `min` and `max`. @@ -2304,6 +2430,9 @@ declare class Decimal { * @param { Value } n {number | string | Decimal} * @param { Value } min {number | string | Decimal} * @param { Value } max {number | string | Decimal} + * @param { Value } n {number | string | Decimal} + * @param { Value } min {number | string | Decimal} + * @param { Value } max {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2320,6 +2449,9 @@ declare class Decimal { * @param { Value } n {number | string | Decimal} * @param { Value } min {number | string | Decimal} * @param { Value } max {number | string | Decimal} + * @param { Value } n {number | string | Decimal} + * @param { Value } min {number | string | Decimal} + * @param { Value } max {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2332,6 +2464,7 @@ declare class Decimal { * @since 18 */ static clamp(n: Value, min: Value, max: Value): Decimal; + static clamp(n: Value, min: Value, max: Value): Decimal; /** * Return a new Decimal whose value is the sum of `x` and `y`, rounded to `precision` significant @@ -2339,6 +2472,8 @@ declare class Decimal { * * @param { Value } x {number | string | Decimal} * @param { Value } y {number | string | Decimal} + * @param { Value } x {number | string | Decimal} + * @param { Value } y {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2354,6 +2489,8 @@ declare class Decimal { * * @param { Value } x {number | string | Decimal} * @param { Value } y {number | string | Decimal} + * @param { Value } x {number | string | Decimal} + * @param { Value } y {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2365,6 +2502,7 @@ declare class Decimal { * @since 18 */ static add(x: Value, y: Value): Decimal; + static add(x: Value, y: Value): Decimal; /** * Return a new Decimal whose value is the sum of the arguments, rounded to `precision` @@ -2373,6 +2511,7 @@ declare class Decimal { * Only the result is rounded, not the intermediate calculations. * * @param { Value[] } n {number | string | Decimal} + * @param { Value[] } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2389,6 +2528,7 @@ declare class Decimal { * Only the result is rounded, not the intermediate calculations. * * @param { Value[] } n {number | string | Decimal} + * @param { Value[] } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2400,6 +2540,7 @@ declare class Decimal { * @since 18 */ static sum(...n: Value[]): Decimal; + static sum(...n: Value[]): Decimal; /** * Return a new Decimal whose value is `x` minus `y`, rounded to `precision` significant digits @@ -2407,6 +2548,8 @@ declare class Decimal { * * @param { Value } x {number | string | Decimal} * @param { Value } y {number | string | Decimal} + * @param { Value } x {number | string | Decimal} + * @param { Value } y {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2422,6 +2565,8 @@ declare class Decimal { * * @param { Value } x {number | string | Decimal} * @param { Value } y {number | string | Decimal} + * @param { Value } x {number | string | Decimal} + * @param { Value } y {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2433,6 +2578,7 @@ declare class Decimal { * @since 18 */ static sub(x: Value, y: Value): Decimal; + static sub(x: Value, y: Value): Decimal; /** * Return a new Decimal whose value is `x` multiplied by `y`, rounded to `precision` significant @@ -2440,6 +2586,8 @@ declare class Decimal { * * @param { Value } x {number | string | Decimal} * @param { Value } y {number | string | Decimal} + * @param { Value } x {number | string | Decimal} + * @param { Value } y {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2455,6 +2603,8 @@ declare class Decimal { * * @param { Value } x {number | string | Decimal} * @param { Value } y {number | string | Decimal} + * @param { Value } x {number | string | Decimal} + * @param { Value } y {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2466,6 +2616,7 @@ declare class Decimal { * @since 18 */ static mul(x: Value, y: Value): Decimal; + static mul(x: Value, y: Value): Decimal; /** * Return a new Decimal whose value is `x` divided by `y`, rounded to `precision` significant @@ -2473,6 +2624,8 @@ declare class Decimal { * * @param { Value } x {number | string | Decimal} * @param { Value } y {number | string | Decimal} + * @param { Value } x {number | string | Decimal} + * @param { Value } y {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2488,6 +2641,8 @@ declare class Decimal { * * @param { Value } x {number | string | Decimal} * @param { Value } y {number | string | Decimal} + * @param { Value } x {number | string | Decimal} + * @param { Value } y {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2496,9 +2651,11 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static div(x: Value, y: Value): Decimal; + static div(x: Value, y: Value): Decimal; /** * Return a new Decimal whose value is `x` modulo `y`, rounded to `precision` significant digits @@ -2506,6 +2663,8 @@ declare class Decimal { * * @param { Value } x {number | string | Decimal} * @param { Value } y {number | string | Decimal} + * @param { Value } x {number | string | Decimal} + * @param { Value } y {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2521,6 +2680,8 @@ declare class Decimal { * * @param { Value } x {number | string | Decimal} * @param { Value } y {number | string | Decimal} + * @param { Value } x {number | string | Decimal} + * @param { Value } y {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2529,15 +2690,18 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static mod(x: Value, y: Value): Decimal; + static mod(x: Value, y: Value): Decimal; /** * Return a new Decimal whose value is the square root of `n`, rounded to `precision` significant * digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2552,6 +2716,7 @@ declare class Decimal { * digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2560,15 +2725,18 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static sqrt(n: Value): Decimal; + static sqrt(n: Value): Decimal; /** * Return a new Decimal whose value is the cube root of `n`, rounded to `precision` significant * digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2583,6 +2751,7 @@ declare class Decimal { * digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2591,9 +2760,11 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static cbrt(n: Value): Decimal; + static cbrt(n: Value): Decimal; /** * Return a new Decimal whose value is `base` raised to the power `exponent`, rounded to precision @@ -2601,6 +2772,8 @@ declare class Decimal { * * @param { Value } base {number | string | Decimal} The base. * @param { Value } exponent {number | string | Decimal} The exponent. + * @param { Value } base {number | string | Decimal} The base. + * @param { Value } exponent {number | string | Decimal} The exponent. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2617,6 +2790,8 @@ declare class Decimal { * * @param { Value } base {number | string | Decimal} The base. * @param { Value } exponent {number | string | Decimal} The exponent. + * @param { Value } base {number | string | Decimal} The base. + * @param { Value } exponent {number | string | Decimal} The exponent. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2626,15 +2801,18 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static pow(base: Value, exponent: Value): Decimal; + static pow(base: Value, exponent: Value): Decimal; /** * Return a new Decimal whose value is the natural exponential of `n`, rounded to `precision` * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2650,6 +2828,7 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2659,9 +2838,11 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static exp(n: Value): Decimal; + static exp(n: Value): Decimal; /** * Return a new Decimal whose value is the log of `n` to the base `base`, rounded to `precision` @@ -2669,6 +2850,8 @@ declare class Decimal { * * @param { Value } n {number | string | Decimal} * @param { Value } base {number | string | Decimal} + * @param { Value } n {number | string | Decimal} + * @param { Value } base {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2685,6 +2868,8 @@ declare class Decimal { * * @param { Value } n {number | string | Decimal} * @param { Value } base {number | string | Decimal} + * @param { Value } n {number | string | Decimal} + * @param { Value } base {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2694,15 +2879,18 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static log(n: Value, base: Value): Decimal; + static log(n: Value, base: Value): Decimal; /** * Return a new Decimal whose value is the natural logarithm of `n`, rounded to `precision` * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2718,6 +2906,7 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2727,15 +2916,18 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static ln(n: Value): Decimal; + static ln(n: Value): Decimal; /** * Return a new Decimal whose value is the base 2 logarithm of `n`, rounded to `precision` * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2751,6 +2943,7 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2760,15 +2953,18 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static log2(n: Value): Decimal; + static log2(n: Value): Decimal; /** * Return a new Decimal whose value is the base 10 logarithm of `n`, rounded to `precision` * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2784,6 +2980,7 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2793,15 +2990,18 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static log10(n: Value): Decimal; + static log10(n: Value): Decimal; /** * Return a new Decimal whose value is the cosine of `n`, rounded to `precision` significant * digits using rounding mode `rounding` * * @param { Value } n {number | string | Decimal} A value in radians. + * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2816,6 +3016,7 @@ declare class Decimal { * digits using rounding mode `rounding` * * @param { Value } n {number | string | Decimal} A value in radians. + * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2824,15 +3025,18 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static cos(n: Value): Decimal; + static cos(n: Value): Decimal; /** * Return a new Decimal whose value is the sine of `n`, rounded to `precision` significant digits * using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. + * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2847,6 +3051,7 @@ declare class Decimal { * using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. + * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2855,15 +3060,18 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static sin(n: Value): Decimal; + static sin(n: Value): Decimal; /** * Return a new Decimal whose value is the tangent of `n`, rounded to `precision` significant * digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. + * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2878,6 +3086,7 @@ declare class Decimal { * digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. + * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2886,15 +3095,18 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static tan(n: Value): Decimal; + static tan(n: Value): Decimal; /** * Return a new Decimal whose value is the hyperbolic cosine of `n`, rounded to precision * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. + * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2909,6 +3121,7 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. + * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2917,15 +3130,18 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static cosh(n: Value): Decimal; + static cosh(n: Value): Decimal; /** * Return a new Decimal whose value is the hyperbolic sine of `n`, rounded to `precision` * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2940,6 +3156,7 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2948,15 +3165,18 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static sinh(n: Value): Decimal; + static sinh(n: Value): Decimal; /** * Return a new Decimal whose value is the hyperbolic tangent of `n`, rounded to `precision` * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. + * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2971,6 +3191,7 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. + * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2979,14 +3200,17 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static tanh(n: Value): Decimal; + static tanh(n: Value): Decimal; /** * Return a new Decimal whose value is the arccosine in radians of `n`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3001,6 +3225,7 @@ declare class Decimal { * Return a new Decimal whose value is the arccosine in radians of `n`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3010,15 +3235,18 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static acos(n: Value): Decimal; + static acos(n: Value): Decimal; /** * Return a new Decimal whose value is the arcsine in radians of `n`, rounded to `precision` * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3034,6 +3262,7 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3043,15 +3272,18 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static asin(n: Value): Decimal; + static asin(n: Value): Decimal; /** * Return a new Decimal whose value is the arctangent in radians of `n`, rounded to `precision` * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3067,6 +3299,7 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3076,15 +3309,18 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static atan(n: Value): Decimal; + static atan(n: Value): Decimal; /** * Return a new Decimal whose value is the inverse of the hyperbolic cosine of `n`, rounded to * `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3100,6 +3336,7 @@ declare class Decimal { * `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3109,15 +3346,18 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static acosh(n: Value): Decimal; + static acosh(n: Value): Decimal; /** * Return a new Decimal whose value is the inverse of the hyperbolic sine of `n`, rounded to * `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. + * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3133,6 +3373,7 @@ declare class Decimal { * `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. + * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3142,15 +3383,18 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static asinh(n: Value): Decimal; + static asinh(n: Value): Decimal; /** * Return a new Decimal whose value is the inverse of the hyperbolic tangent of `n`, rounded to * `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. + * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3166,6 +3410,7 @@ declare class Decimal { * `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. + * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3175,9 +3420,11 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static atanh(n: Value): Decimal; + static atanh(n: Value): Decimal; /** * Return a new Decimal whose value is the arctangent in radians of `y/x` in the range -pi to pi @@ -3185,6 +3432,8 @@ declare class Decimal { * * @param { Value } y {number | string | Decimal} The y-coordinate. * @param { Value } x {number | string | Decimal} The x-coordinate. + * @param { Value } y {number | string | Decimal} The y-coordinate. + * @param { Value } x {number | string | Decimal} The x-coordinate. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3201,6 +3450,8 @@ declare class Decimal { * * @param { Value } y {number | string | Decimal} The y-coordinate. * @param { Value } x {number | string | Decimal} The x-coordinate. + * @param { Value } y {number | string | Decimal} The y-coordinate. + * @param { Value } x {number | string | Decimal} The x-coordinate. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3210,15 +3461,18 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static atan2(y: Value, x: Value): Decimal; + static atan2(y: Value, x: Value): Decimal; /** * Return a new Decimal whose value is the square root of the sum of the squares of the arguments, * rounded to `precision` significant digits using rounding mode `rounding`. * * @param { Value[] } n {number | string | Decimal} Decimal + * @param { Value[] } n {number | string | Decimal} Decimal * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3233,6 +3487,7 @@ declare class Decimal { * rounded to `precision` significant digits using rounding mode `rounding`. * * @param { Value[] } n {number | string | Decimal} Decimal + * @param { Value[] } n {number | string | Decimal} Decimal * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3244,11 +3499,13 @@ declare class Decimal { * @since 18 */ static hypot(...n: Value[]): Decimal; + static hypot(...n: Value[]): Decimal; /** * Return a new Decimal whose value is the maximum of the arguments. * * @param { Value[] } n {number | string | Decimal} + * @param { Value[] } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3262,6 +3519,7 @@ declare class Decimal { * Return a new Decimal whose value is the maximum of the arguments. * * @param { Value[] } n {number | string | Decimal} + * @param { Value[] } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3273,11 +3531,13 @@ declare class Decimal { * @since 18 */ static max(...n: Value[]): Decimal; + static max(...n: Value[]): Decimal; /** * Return a new Decimal whose value is the minimum of the arguments. * * @param { Value[] } n {number | string | Decimal} + * @param { Value[] } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3291,6 +3551,7 @@ declare class Decimal { * Return a new Decimal whose value is the minimum of the arguments. * * @param { Value[] } n {number | string | Decimal} + * @param { Value[] } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3302,6 +3563,7 @@ declare class Decimal { * @since 18 */ static min(...n: Value[]): Decimal; + static min(...n: Value[]): Decimal; /** * Returns a new Decimal with a random value equal to or greater than 0 and less than 1. @@ -3331,6 +3593,7 @@ declare class Decimal { * `significantDigits` significant digits (or less if trailing zeros are produced). * * @param { Value } significantDigits {number} Significant digits. Integer, 0 to MAX_DIGITS inclusive. + * @param { Value } significantDigits {number} Significant digits. Integer, 0 to MAX_DIGITS inclusive. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3346,6 +3609,7 @@ declare class Decimal { * `significantDigits` significant digits (or less if trailing zeros are produced). * * @param { Value } significantDigits {number} Significant digits. Integer, 0 to MAX_DIGITS inclusive. + * @param { Value } significantDigits {number} Significant digits. Integer, 0 to MAX_DIGITS inclusive. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3368,6 +3632,7 @@ declare class Decimal { * NaN otherwise * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3397,11 +3662,13 @@ declare class Decimal { * @since 18 */ static sign(n: Value): number; + static sign(n: Value): number; /** * Return a new Decimal whose value is `n` rounded to an integer using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3415,6 +3682,7 @@ declare class Decimal { * Return a new Decimal whose value is `n` rounded to an integer using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} + * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3426,6 +3694,7 @@ declare class Decimal { * @since 18 */ static round(n: Value): Decimal; + static round(n: Value): Decimal; /** * Configures the 'global' settings for this particular Decimal constructor. @@ -3474,7 +3743,8 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static set(config: DecimalConfig): void; diff --git a/build-tools/arkui_transformer/config/arkui_m3_white_list.json b/build-tools/arkui_transformer/config/arkui_m3_white_list.json deleted file mode 100644 index ea4926b92b..0000000000 --- a/build-tools/arkui_transformer/config/arkui_m3_white_list.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "useM3": [ - ] -} \ No newline at end of file diff --git a/build-tools/arkui_transformer/package-lock.json b/build-tools/arkui_transformer/package-lock.json index c6dac3511e..6709ce6480 100644 --- a/build-tools/arkui_transformer/package-lock.json +++ b/build-tools/arkui_transformer/package-lock.json @@ -1,170 +1,306 @@ { "name": "arkui_transformer", "version": "1.0.0", - "lockfileVersion": 1, + "lockfileVersion": 3, "requires": true, - "dependencies": { - "@rollup/plugin-node-resolve": { + "packages": { + "": { + "name": "arkui_transformer", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "@types/node": "^18.0.0", + "commander": "^10.0.0", + "typescript": "^4.9.5" + }, + "devDependencies": { + "@rollup/plugin-node-resolve": "^16.0.1", + "@rollup/plugin-typescript": "^12.1.2", + "rollup": "^3.29.5", + "tslib": "^2.8.1" + } + }, + "node_modules/@rollup/plugin-node-resolve": { "version": "16.0.1", "resolved": "https://repo.huaweicloud.com/repository/npm/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.1.tgz", "integrity": "sha512-tk5YCxJWIG81umIvNkSod2qK5KyQW19qcBF/B78n1bjtOON6gzKoVeSzAE8yHCZEDmqkHKkxplExA8KzdJLJpA==", "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "@rollup/pluginutils": "^5.0.1", "@types/resolve": "1.20.2", "deepmerge": "^4.2.2", "is-module": "^1.0.0", "resolve": "^1.22.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^2.78.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } } }, - "@rollup/plugin-typescript": { + "node_modules/@rollup/plugin-typescript": { "version": "12.1.2", "resolved": "https://repo.huaweicloud.com/repository/npm/@rollup/plugin-typescript/-/plugin-typescript-12.1.2.tgz", "integrity": "sha512-cdtSp154H5sv637uMr1a8OTWB0L1SWDSm1rDGiyfcGcvQ6cuTs4MDk2BVEBGysUWago4OJN4EQZqOTl/QY3Jgg==", "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "@rollup/pluginutils": "^5.1.0", "resolve": "^1.22.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^2.14.0||^3.0.0||^4.0.0", + "tslib": "*", + "typescript": ">=3.7.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + }, + "tslib": { + "optional": true + } } }, - "@rollup/pluginutils": { + "node_modules/@rollup/pluginutils": { "version": "5.1.4", "resolved": "https://repo.huaweicloud.com/repository/npm/@rollup/pluginutils/-/pluginutils-5.1.4.tgz", "integrity": "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==", "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "@types/estree": "^1.0.0", "estree-walker": "^2.0.2", "picomatch": "^4.0.2" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } } }, - "@types/estree": { + "node_modules/@types/estree": { "version": "1.0.7", "resolved": "https://repo.huaweicloud.com/repository/npm/@types/estree/-/estree-1.0.7.tgz", "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", - "dev": true + "dev": true, + "license": "MIT" }, - "@types/node": { + "node_modules/@types/node": { "version": "18.19.110", "resolved": "https://repo.huaweicloud.com/repository/npm/@types/node/-/node-18.19.110.tgz", "integrity": "sha512-WW2o4gTmREtSnqKty9nhqF/vA0GKd0V/rbC0OyjSk9Bz6bzlsXKT+i7WDdS/a0z74rfT2PO4dArVCSnapNLA5Q==", - "requires": { + "license": "MIT", + "dependencies": { "undici-types": "~5.26.4" } }, - "@types/resolve": { + "node_modules/@types/resolve": { "version": "1.20.2", "resolved": "https://repo.huaweicloud.com/repository/npm/@types/resolve/-/resolve-1.20.2.tgz", "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==", - "dev": true + "dev": true, + "license": "MIT" }, - "commander": { + "node_modules/commander": { "version": "10.0.1", "resolved": "https://repo.huaweicloud.com/repository/npm/commander/-/commander-10.0.1.tgz", - "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==" + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "license": "MIT", + "engines": { + "node": ">=14" + } }, - "deepmerge": { + "node_modules/deepmerge": { "version": "4.3.1", "resolved": "https://repo.huaweicloud.com/repository/npm/deepmerge/-/deepmerge-4.3.1.tgz", "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", - "dev": true + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } }, - "estree-walker": { + "node_modules/estree-walker": { "version": "2.0.2", "resolved": "https://repo.huaweicloud.com/repository/npm/estree-walker/-/estree-walker-2.0.2.tgz", "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", - "dev": true + "dev": true, + "license": "MIT" }, - "fsevents": { + "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://repo.huaweicloud.com/repository/npm/fsevents/-/fsevents-2.3.3.tgz", "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, - "optional": true + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } }, - "function-bind": { + "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://repo.huaweicloud.com/repository/npm/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, - "hasown": { + "node_modules/hasown": { "version": "2.0.2", "resolved": "https://repo.huaweicloud.com/repository/npm/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" } }, - "is-core-module": { + "node_modules/is-core-module": { "version": "2.16.1", "resolved": "https://repo.huaweicloud.com/repository/npm/is-core-module/-/is-core-module-2.16.1.tgz", "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "is-module": { + "node_modules/is-module": { "version": "1.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/is-module/-/is-module-1.0.0.tgz", "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==", - "dev": true + "dev": true, + "license": "MIT" }, - "path-parse": { + "node_modules/path-parse": { "version": "1.0.7", "resolved": "https://repo.huaweicloud.com/repository/npm/path-parse/-/path-parse-1.0.7.tgz", "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true + "dev": true, + "license": "MIT" }, - "picomatch": { + "node_modules/picomatch": { "version": "4.0.2", "resolved": "https://repo.huaweicloud.com/repository/npm/picomatch/-/picomatch-4.0.2.tgz", "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", - "dev": true + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } }, - "resolve": { + "node_modules/resolve": { "version": "1.22.10", "resolved": "https://repo.huaweicloud.com/repository/npm/resolve/-/resolve-1.22.10.tgz", "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "is-core-module": "^2.16.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "rollup": { + "node_modules/rollup": { "version": "3.29.5", "resolved": "https://repo.huaweicloud.com/repository/npm/rollup/-/rollup-3.29.5.tgz", "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==", "dev": true, - "requires": { + "license": "MIT", + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=14.18.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { "fsevents": "~2.3.2" } }, - "supports-preserve-symlinks-flag": { + "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", "resolved": "https://repo.huaweicloud.com/repository/npm/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, - "tslib": { + "node_modules/tslib": { "version": "2.8.1", "resolved": "https://repo.huaweicloud.com/repository/npm/tslib/-/tslib-2.8.1.tgz", "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "dev": true + "dev": true, + "license": "0BSD" }, - "typescript": { + "node_modules/typescript": { "version": "4.9.5", "resolved": "https://repo.huaweicloud.com/repository/npm/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==" + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } }, - "undici-types": { + "node_modules/undici-types": { "version": "5.26.5", "resolved": "https://repo.huaweicloud.com/repository/npm/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "license": "MIT" } } } diff --git a/build-tools/arkui_transformer/pattern/arkts_component_decl.pattern b/build-tools/arkui_transformer/pattern/arkts_component_decl.pattern index ae4a5689f4..c4b09a33d7 100644 --- a/build-tools/arkui_transformer/pattern/arkts_component_decl.pattern +++ b/build-tools/arkui_transformer/pattern/arkts_component_decl.pattern @@ -5,4 +5,4 @@ export declare function %COMPONENT_NAME%( %FUNCTION_PARAMETERS% @memo content_?: () => void, -): UI%COMPONENT_NAME%Attribute \ No newline at end of file +): %COMPONENT_NAME%Attribute \ No newline at end of file diff --git a/build-tools/arkui_transformer/pattern/arkts_component_decl_m3.pattern b/build-tools/arkui_transformer/pattern/arkts_component_decl_m3.pattern deleted file mode 100644 index c4b09a33d7..0000000000 --- a/build-tools/arkui_transformer/pattern/arkts_component_decl_m3.pattern +++ /dev/null @@ -1,8 +0,0 @@ -%COMPONENT_COMMENT% -@memo -@ComponentBuilder -export declare function %COMPONENT_NAME%( - %FUNCTION_PARAMETERS% - @memo - content_?: () => void, -): %COMPONENT_NAME%Attribute \ No newline at end of file diff --git a/build-tools/arkui_transformer/src/add_import.ts b/build-tools/arkui_transformer/src/add_import.ts index daf313dd4e..83a69d9b3a 100644 --- a/build-tools/arkui_transformer/src/add_import.ts +++ b/build-tools/arkui_transformer/src/add_import.ts @@ -68,15 +68,9 @@ function handleImportDeclaration(node: ts.ImportDeclaration): [ts.Node, boolean] if (importClause && ts.isImportClause(importClause) && importClause.namedBindings && ts.isNamedImports(importClause.namedBindings)) { const namedImports = importClause.namedBindings.elements; const existingImports = namedImports.map((element) => element.name.text); - existingImports.forEach((element) => { - if (uiconfig.isUIHeritage(element)) { - uiconfig.useMemoM3 || uiprefixImports.add(`UI${element}`) - } - }) if (moduleText.includes("common")) { uiprefixImports.add('AttributeModifier'); uiprefixImports.add('CommonMethod'); - uiconfig.useMemoM3 || uiprefixImports.add('UICommonMethod'); } const addedImports = Array.from(uiprefixImports).filter((im) => !existingImports.includes(im)); @@ -146,9 +140,6 @@ function createTargetImport(sourceFile: ts.SourceFile, context: ts.Transformatio ts.factory.createNamedImports([ ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("AttributeModifier")), ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("CommonMethod")), - ...(uiconfig.useMemoM3 !== true ? [ - ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("UICommonMethod")) - ] : []) ]) ), ts.factory.createStringLiteral("./common"), diff --git a/build-tools/arkui_transformer/src/arkui_config_util.ts b/build-tools/arkui_transformer/src/arkui_config_util.ts index 965b95a389..5feba8166e 100644 --- a/build-tools/arkui_transformer/src/arkui_config_util.ts +++ b/build-tools/arkui_transformer/src/arkui_config_util.ts @@ -26,10 +26,6 @@ interface NoneUIConfig { files: Array; } -interface UseM3Config { - useM3: Array; -} - export class ArkUIConfigUtil { static instance: ArkUIConfigUtil = new ArkUIConfigUtil(); constructor() { @@ -41,8 +37,6 @@ export class ArkUIConfigUtil { this.noneUIconfig.files.forEach(f => { this.noneUIFileSet.add(f); }); - const useM3Config: UseM3Config = JSON.parse(fs.readFileSync("./config/arkui_m3_white_list.json", 'utf-8')); - this._useM3Files = useM3Config.useM3; } // ui components private config: ArkUIConfig; @@ -62,27 +56,13 @@ export class ArkUIConfigUtil { private file2Attrbiute: Map = new Map(); private shouldNotHaveAttributeModifier: Set = new Set(); private _useMemoM3: boolean = false; - private _useM3Files: Array = []; private _configPath: string = ''; - get useMemoM3(): boolean { - return this._useMemoM3; - } - - set useMemoM3(value: boolean) { - this._useMemoM3 = value; - } - - withM3File(file: string): boolean { - if (this._useMemoM3) { - return true; - } - return this._useM3Files.includes(path.basename(file)); - } - get isHdsComponent(): boolean { return this._configPath.length > 0; } - + get useMemoM3(): boolean { + return this._useMemoM3; + } public loadConfig(config: OptionValues): void { if (config.useMemoM3) { this._useMemoM3 = true; @@ -92,19 +72,19 @@ export class ArkUIConfigUtil { this._configPath = config.configPath; // exception process: avoid non-existing given path try { - this.config = JSON.parse(fs.readFileSync(this._configPath + "/hds_uicomponents.json", 'utf-8')); + this.config = JSON.parse(fs.readFileSync(this._configPath + '/hds_uicomponents.json', 'utf-8')); this.componentSet.clear(); this.config.components.forEach(c => { this.componentSet.add(c); }); - this.noneUIconfig = JSON.parse(fs.readFileSync(this._configPath + "/hds_non_uicomponents.json", 'utf-8')); + this.noneUIconfig = JSON.parse(fs.readFileSync(this._configPath + '/hds_non_uicomponents.json', 'utf-8')); this.noneUIFileSet.clear(); this.noneUIconfig.files.forEach(f => { this.noneUIFileSet.add(f); }); } catch (error) { this._configPath = ''; - console.log("Load given hds_uicomponents file failed!", error); + console.log('Load given hds_uicomponents file failed!', error); } } } @@ -157,6 +137,9 @@ export class ArkUIConfigUtil { return this.componentFiles.has(this.getPureName(name)); } public shouldHaveAttributeModifier(name: string): boolean { + if (this.isHdsComponent) { + return false; + } return !this.shouldNotHaveAttributeModifier.has(name) && this.isComponent(name, 'Attribute'); } } diff --git a/build-tools/arkui_transformer/src/arkui_transformer.ts b/build-tools/arkui_transformer/src/arkui_transformer.ts index 672d9e3352..30802ad34b 100644 --- a/build-tools/arkui_transformer/src/arkui_transformer.ts +++ b/build-tools/arkui_transformer/src/arkui_transformer.ts @@ -53,6 +53,13 @@ function convertFiles(files: string[]): string[] { return result } +function getTransformationResult(sourceFile: ts.SourceFile, program: ts.Program, componentFile: ComponentFile): ts.TransformationResult { + if (uiconfig.isHdsComponent) { + return ts.transform(sourceFile, [interfaceTransformer(program, componentFile), exportAllTransformer()]); + } + return ts.transform(sourceFile, [interfaceTransformer(program, componentFile), exportAllTransformer(), addImportTransformer()]); +} + function printResult(source: string, file: ComponentFile) { const outPath = path.join(options.targetDir, file.outFileName) fs.mkdirSync(path.dirname(outPath), { recursive: true }); @@ -80,10 +87,9 @@ function main() { return (context: ts.TransformationContext) => { return (sourceFile: ts.SourceFile) => { const componentFile = componentFileMap.get(f)!; - const result = ts.transform(sourceFile, [interfaceTransformer(program, componentFile), exportAllTransformer(), addImportTransformer()]); + const result = getTransformationResult(sourceFile, program, componentFile); const transformedFile = ts.createSourceFile(f, printFile(result.transformed[0]), ts.ScriptTarget.Latest, true); - const addMemoResult = ts.transform(transformedFile, [addMemoTransformer(componentFile)]); - const transformedSource = ts.createPrinter().printFile(addMemoResult.transformed[0]); + const transformedSource = ts.createPrinter().printFile(transformedFile); printResult(transformedSource, componentFile); return ts.createSourceFile("", "", ts.ScriptTarget.Latest, true); } @@ -125,12 +131,6 @@ function main() { }) } -function mock() { - const mock_file = path.join(options.targetDir, "type-translated.d.ets") - fs.mkdirSync(options.targetDir, { recursive: true }) - fs.writeFileSync(mock_file, "// WARNING! THIS FILE IS AUTO-GENERATED, DO NOT MAKE CHANGES, THEY WILL BE LOST ON NEXT GENERATION!\n") -} - const options = program .option('--input-dir ', "Path of where d.ets exist") .option('--target-dir ', "Path to generate d.ets file") @@ -139,4 +139,4 @@ const options = program .parse() .opts() -mock() \ No newline at end of file +main() diff --git a/build-tools/arkui_transformer/src/interface_converter.ts b/build-tools/arkui_transformer/src/interface_converter.ts index 95b51421ec..affa082b26 100644 --- a/build-tools/arkui_transformer/src/interface_converter.ts +++ b/build-tools/arkui_transformer/src/interface_converter.ts @@ -22,7 +22,7 @@ import { ComponentFile } from './component_file'; import { analyzeBaseClasses, isComponentHerirage, getBaseClassName, removeDuplicateMethods, mergeUniqueOrdered } from './lib/attribute_utils'; function readLangTemplate(): string { - return uiconfig.useMemoM3 ? fs.readFileSync('./pattern/arkts_component_decl_m3.pattern', 'utf8') : fs.readFileSync('./pattern/arkts_component_decl.pattern', 'utf8'); + return fs.readFileSync('./pattern/arkts_component_decl.pattern', 'utf8'); } function extractSignatureComment( @@ -427,7 +427,7 @@ function isComponentInterface(node: ts.Node) { export function addMemoTransformer(componentFile: ComponentFile): ts.TransformerFactory { return (context) => { const visit: ts.Visitor = (node) => { - if (isComponentHerirage(node) && !uiconfig.useMemoM3) { + if (isComponentHerirage(node)) { addAttributeMemo(node as ts.ClassDeclaration, componentFile); } return ts.visitEachChild(node, visit, context); diff --git a/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/index.ts b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/index.ts new file mode 100644 index 0000000000..00f3775610 --- /dev/null +++ b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/index.ts @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export * from './utils/api_check_wrapper_typedef'; +export * from './utils/api_check_wrapper_enums'; \ No newline at end of file diff --git a/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/src/api_check_wrapper.ts b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/src/api_check_wrapper.ts new file mode 100644 index 0000000000..e69de29bb2 diff --git a/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_enums.ts b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_enums.ts new file mode 100644 index 0000000000..78e1f83cb6 --- /dev/null +++ b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_enums.ts @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export enum DiagnosticCategory { + Warning = 0, + Error = 1 +} \ No newline at end of file diff --git a/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_typedef.ts b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_typedef.ts new file mode 100644 index 0000000000..7fc25348fb --- /dev/null +++ b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_typedef.ts @@ -0,0 +1,113 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { DiagnosticCategory } from "./api_check_wrapper_enums"; +import * as arkts from '@koalaui/libarkts'; + +/** + * ApiCheckWrapper服务,绑定校验规则 + */ +export interface ApiCheckWrapperServiceHost { + getJsDocNodeCheckedConfig: (currentFileName: string, symbolSourceFilePath: string) => JsDocNodeCheckConfig; + // getJsDocNodeConditionCheckedResult: (jsDocFileCheckedInfo: FileCheckModuleInfo, jsDocs: JSDoc[]) => ConditionCheckResult; + getFileCheckedModuleInfo: (containFilePath: string) => FileCheckModuleInfo; + pushLogInfo: (apiName: string, currentFilePath: string, currentAddress: CurrentAddress, logLevel: DiagnosticCategory, logMessage: string) => void; + collectImportInfo: (moduleName: string[], modulePath: string, currentFilePath: string) => void; +} + +export interface JsDocNodeCheckConfig { + nodeNeedCheck: boolean; + checkConfig: JsDocNodeCheckConfigItem[]; +} + +export interface JsDocNodeCheckConfigItem { + tagName: string[]; + message: string; + type: DiagnosticCategory; + tagNameShouldExisted: boolean; + checkValidCallback?: (jsDocs: JSDoc[], config: JsDocNodeCheckConfigItem) => boolean; +} + +/** + * JSDoc类型 + */ +export interface JSDoc { + description: string; + tags: JSDocTag[]; +} + +/** + * JSDoc标签类型 + */ +export interface JSDocTag { + /** + * 标签名 + */ + tag: string; + /** + * 参数名称 + */ + name: string; + /** + * 默认值 + */ + default?: string; + /** + * 类型 + */ + type: string; + /** + * 是否可选 + */ + optional: boolean; + /** + * 描述 + */ + description: string; +} + +export interface CurrentAddress { + line: number; + column: number; +} + +export interface FileCheckModuleInfo { + currentFileName: string; + fileNeedCheck: boolean; +} + +export interface ConditionCheckResult { + valid: boolean; + type?: DiagnosticCategory; + message?: string; +} + +export interface ASTDeclaration extends arkts.AstNode { + kind: number; + pos: number; + end: number; + parent?: ASTDeclaration; + jsDoc?: JSDoc[]; +} + +export interface ASTIdentifier extends arkts.AstNode { + kind: number; + text: string; +} + +export interface ASTSourceFile extends arkts.AstNode { + fileName: string; + text: string; +} \ No newline at end of file diff --git a/api/arkui/stateManagement/decorators/decoratorProp.d.ets b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_utils.ts similarity index 37% rename from api/arkui/stateManagement/decorators/decoratorProp.d.ets rename to build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_utils.ts index 89eb7968be..556a4a0362 100644 --- a/api/arkui/stateManagement/decorators/decoratorProp.d.ets +++ b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_utils.ts @@ -1,10 +1,10 @@ /* - * Copyright (C) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -12,19 +12,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * @file - * @kit ArkUI - * @arkts 1.2 - */ -import { DecoratedV1VariableBase, IDecoratedMutableVariable, IDecoratedUpdatableVariable } from '../base/decoratorBase'; -import { WatchFuncType } from './decoratorWatch'; +import { Block, parse, Spec } from 'comment-parser'; +import { JSDoc, JSDocTag } from './api_check_wrapper_typedef'; -export declare class PropDecoratedVariable extends DecoratedV1VariableBase - implements IDecoratedMutableVariable, IDecoratedUpdatableVariable { - public constructor(varName: string, sourceValue: T, watchFunc?: WatchFuncType) - public get(): T - public set(newValue: T): void - public update(newValue: T): void +export function parseCommand2JSDoc(comment: string): JSDoc[] { + const jsDocs: JSDoc[] = []; + const commentBlock: Block[] = parse(comment); + commentBlock.forEach((block: Block) => { + const tags: JSDocTag[] = []; + const blockTags: Spec[] = block.tags; + blockTags.forEach((blockTag: Spec) => { + tags.push({ + tag: blockTag.tag, + name: blockTag.name, + default: blockTag.default, + type: blockTag.type, + optional: blockTag.optional, + description: blockTag.description + }); + }); + jsDocs.push({ + description: block.description, + tags: tags + }); + }); + return jsDocs; } \ No newline at end of file diff --git a/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/ts_wrapper_node_util.ts b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/ts_wrapper_node_util.ts new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/arkui/stateManagement/base/mutableStateMeta.d.ets b/build-tools/compiler-plugins/api-check-plugin-static/babel.config.js similarity index 50% rename from api/arkui/stateManagement/base/mutableStateMeta.d.ets rename to build-tools/compiler-plugins/api-check-plugin-static/babel.config.js index 6aee33a1b1..6d04bc9283 100644 --- a/api/arkui/stateManagement/base/mutableStateMeta.d.ets +++ b/build-tools/compiler-plugins/api-check-plugin-static/babel.config.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,24 +12,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * @file - * @kit ArkUI - * @arkts 1.2 - */ -export declare class MutableStateMetaBase { - public constructor(decorator: string) -} +module.exports = function(api) { + api.cache(true); -export declare class MutableStateMeta extends MutableStateMetaBase { - public addRef(): void - public fireChange(): void - public constructor(decorator: string) -} + const presets = ['@babel/typescript']; + const plugins = [ + '@babel/plugin-transform-modules-commonjs', + '@babel/plugin-proposal-class-properties', + [ + '@babel/plugin-transform-arrow-functions', + { + spec: true + } + ] + ]; + const ignore = [ + '**/test/**', + '**/node_modules/**' + ]; -export declare class MutableKeyedStateMeta extends MutableStateMetaBase { - public addRef(key: string): void - public fireChange(key: string): void - public constructor(decorator: string) -} \ No newline at end of file + return { + presets, + plugins, + ignore + }; +}; diff --git a/build-tools/compiler-plugins/api-check-plugin-static/index.ts b/build-tools/compiler-plugins/api-check-plugin-static/index.ts new file mode 100644 index 0000000000..9ebab635eb --- /dev/null +++ b/build-tools/compiler-plugins/api-check-plugin-static/index.ts @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Plugins, PluginContext } from '../common/plugin-context'; +import { GlobalObject, ProjectConfig } from './utils/api_check_plugin_typedef'; +import { createOrCleanProjectConfig, updateProjectConfig, initProjectConfig } from './utils/api_check_plugin_utils'; +import { ApiCheckWrapperServiceHost } from './api-check-wrapper'; +import { getApiCheckWrapperServiceHost } from './src/api_check_config'; +import { checkApiExpression, WrapperApi } from './api-check-wrapper/src/api_check_wrapper'; + +/** + * 导出projectConfig作为全局变量 + */ +export const globalObject: GlobalObject = { + projectConfig: createOrCleanProjectConfig() +} + +/** + * 预留apiCheckProjectConfig对象 + */ +export class apiCheckProjectConfig { + constructor(projectConfig: ProjectConfig | undefined) { + if (projectConfig) { + updateProjectConfig(projectConfig); + initProjectConfig(); + } + } +} + +/** + * 入口方法 + * @returns {Plugins} + */ +export function apiCheckPlugin(): Plugins { + return { + name: 'api-check-plugins', + checked: apiCheckCallback, + clean() { + console.log("API_CHECK_PLUGIN CLEAN") + WrapperApi.arktsGlobal.clearContext(); + } + }; +} + +/** + * 入口回调 + * @param {this} + */ +function apiCheckCallback(this: PluginContext): void { + console.log('[API_CHECK_PLUGIN] AFTER CHECKED ENTER'); + const currentProjectConfig: ProjectConfig | undefined = this.getProjectConfig() as ProjectConfig | undefined; + if (currentProjectConfig) { + updateProjectConfig(currentProjectConfig); + initProjectConfig(); + } + const ContextPtr = this.getContextPtr(); + const apiCheckHost: ApiCheckWrapperServiceHost = getApiCheckWrapperServiceHost(); + checkApiExpression(apiCheckHost, ContextPtr); + console.log('[API_CHECK_PLUGIN] AFTER CHECKED EXIT'); +} \ No newline at end of file diff --git a/build-tools/compiler-plugins/api-check-plugin-static/package.json b/build-tools/compiler-plugins/api-check-plugin-static/package.json new file mode 100644 index 0000000000..cedbccb1af --- /dev/null +++ b/build-tools/compiler-plugins/api-check-plugin-static/package.json @@ -0,0 +1,24 @@ +{ + "name": "api-check-plugin-static", + "version": "1.0.0", + "description": "", + "main": "compiler-plugins/api-check-plugin-static/index.ts", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "compile:plugins": "./node_modules/.bin/babel ./ --out-dir ./lib --extensions .ts" + }, + "author": "", + "license": "ISC", + "dependencies": { + "comment-parser": "1.3.1", + "fs": "^0.0.1-security", + "path": "^0.12.7", + "@babel/cli": "7.20.7", + "@babel/core": "7.20.12", + "@babel/plugin-proposal-class-properties": "7.18.6", + "@babel/preset-env": "7.20.2", + "@babel/preset-typescript": "7.18.6", + "@babel/runtime": "7.20.13", + "typescript": "npm:ohos-typescript@4.9.5-r5" + } +} diff --git a/build-tools/compiler-plugins/api-check-plugin-static/src/api_check_config.ts b/build-tools/compiler-plugins/api-check-plugin-static/src/api_check_config.ts new file mode 100644 index 0000000000..104c9f50f2 --- /dev/null +++ b/build-tools/compiler-plugins/api-check-plugin-static/src/api_check_config.ts @@ -0,0 +1,172 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import path from 'path'; +import { + PERMISSION_TAG_CHECK_NAME, + PERMISSION_TAG_CHECK_ERROR, + SYSTEM_API_TAG_CHECK_NAME, + SYSTEM_API_TAG_CHECK_WARNING, + TEST_TAG_CHECK_NAME, + TEST_TAG_CHECK_ERROR, + SYSCAP_TAG_CHECK_NAME, + SYSCAP_TAG_CHECK_WARNING, + FORM_TAG_CHECK_NAME, + FORM_TAG_CHECK_ERROR, + FIND_MODULE_WARNING, + CROSSPLATFORM_TAG_CHECK_NAME, + CROSSPLATFORM_TAG_CHECK_ERROR, + DEPRECATED_TAG_CHECK_NAME, + DEPRECATED_TAG_CHECK_WARNING, + FA_TAG_CHECK_NAME, + FA_TAG_HUMP_CHECK_NAME, + FA_TAG_CHECK_ERROR, + ATOMICSERVICE_BUNDLE_TYPE, + ATOMICSERVICE_TAG_CHECK_NAME, + ATOMICSERVICE_TAG_CHECK_ERROR, + ATOMICSERVICE_TAG_CHECK_VERSION, + SINCE_TAG_NAME, + SINCE_TAG_CHECK_ERROR, + STAGE_TAG_CHECK_NAME, + STAGE_TAG_HUMP_CHECK_NAME, + STAGE_TAG_CHECK_ERROR, + STAGE_COMPILE_MODE +} from '../utils/api_check_plugin_define'; +import { globalObject } from '../index'; +import { + checkPermissionTag, + checkSinceTag, + checkSyscapTag, + getJsDocNodeCheckConfigItem, + isCardFile, + pushLog, + collectInfo +} from '../utils/api_check_plugin_utils'; +import { + ApiCheckWrapperServiceHost, + CurrentAddress, + DiagnosticCategory, + JsDocNodeCheckConfig, + JsDocNodeCheckConfigItem +} from '../api-check-wrapper'; + +const jsDocNodeCheckConfigCache: Map> = + new Map>(); + +/** + * 根据ProjectConfig对象存入JsDoc校验规则 + * + * @param {string} fileName - 原始node文件路径 + * @param {string} sourceFileName - 目标api文件路径 + * @returns {JsDocNodeCheckConfig} - 返回校验规则对象 + */ +function getJsDocNodeCheckConfig(fileName: string, sourceFileName: string): JsDocNodeCheckConfig { + let byFileName: Map | undefined = jsDocNodeCheckConfigCache.get(fileName); + if (byFileName === undefined) { + byFileName = new Map(); + jsDocNodeCheckConfigCache.set(fileName, byFileName); + } + let result: JsDocNodeCheckConfig | undefined = byFileName.get(sourceFileName); + if (result !== undefined) { + return result; + } + // 预留check条件 + let needCheckResult: boolean = true; + const checkConfigArray: JsDocNodeCheckConfigItem[] = []; + const apiName: string = path.basename(fileName); + const sourceBaseName: string = path.basename(sourceFileName); + if (/(?= ATOMICSERVICE_TAG_CHECK_VERSION) { + checkConfigArray.push(getJsDocNodeCheckConfigItem([ATOMICSERVICE_TAG_CHECK_NAME], ATOMICSERVICE_TAG_CHECK_ERROR, + DiagnosticCategory.Error, true)); + } + } + result = { + nodeNeedCheck: needCheckResult, + checkConfig: checkConfigArray + }; + byFileName.set(sourceFileName, result); + return result; +} + + +/** + * 返回apiHost + * @returns {ApiCheckWrapperServiceHost} - apiHost + */ +export function getApiCheckWrapperServiceHost(): ApiCheckWrapperServiceHost { + return { + getJsDocNodeCheckedConfig: (currentFileName: string, symbolSourceFilePath: string) => { + return getJsDocNodeCheckConfig(currentFileName, symbolSourceFilePath); + }, + getFileCheckedModuleInfo: (containFilePath: string) => { + return { + fileNeedCheck: true, + currentFileName: containFilePath + }; + }, + pushLogInfo: (apiName: string, currentFilePath: string, currentAddress: CurrentAddress, + logLevel: DiagnosticCategory, logMessage: string) => { + return pushLog(apiName, currentFilePath, currentAddress, logLevel, logMessage); + }, + collectImportInfo: (moduleName: string[], modulePath: string, currentFilePath: string) => { + collectInfo(moduleName, modulePath, currentFilePath); + } + }; +} \ No newline at end of file diff --git a/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_define.ts b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_define.ts new file mode 100644 index 0000000000..061091846f --- /dev/null +++ b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_define.ts @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export const PERMISSION_TAG_CHECK_NAME: string = 'permission'; + +export const PERMISSION_TAG_CHECK_ERROR: string = "To use this API, you need to apply for the permissions: $DT"; + +export const SYSTEM_API_TAG_CHECK_NAME: string = 'systemapi'; + +export const SYSTEM_API_TAG_CHECK_WARNING: string = "'{0}' is system api"; + +export const TEST_TAG_CHECK_NAME: string = 'test'; + +export const TEST_TAG_CHECK_ERROR: string = "'{0}' can only be used for testing directories "; + +export const SYSCAP_TAG_CHECK_NAME: string = 'syscap'; + +export const SYSCAP_TAG_CHECK_WARNING: string = "The system capacity of this api '{0}' is not supported on all devices"; + +export const SYSCAP_TAG_CONDITION_CHECK_WARNING: string = + 'The API is not supported on all devices. Use the canIUse condition to determine whether the API is supported.'; + +export const CANIUSE_FUNCTION_NAME: string = 'canIUse'; + +export const VERSION_CHECK_FUNCTION_NAME: string = 'isApiVersionGreaterOrEqual'; + +export const RUNTIME_OS_OH: string = 'OpenHarmony'; + +export const FORM_TAG_CHECK_NAME: string = 'form'; + +export const FORM_TAG_CHECK_ERROR: string = "'{0}' can't support form application."; + +export const CROSSPLATFORM_TAG_CHECK_NAME: string = 'crossplatform'; + +export const CROSSPLATFORM_TAG_CHECK_ERROR: string = "'{0}' can't support crossplatform application."; + +export const DEPRECATED_TAG_CHECK_NAME: string = 'deprecated'; + +export const DEPRECATED_TAG_CHECK_WARNING: string = "'{0}' has been deprecated."; + +export const FA_TAG_CHECK_NAME: string = 'famodelonly'; + +export const FA_TAG_HUMP_CHECK_NAME: string = 'FAModelOnly'; + +export const FA_TAG_CHECK_ERROR: string = 'This API is used only in FA Mode, but the current Mode is Stage.'; + +export const STAGE_TAG_CHECK_NAME: string = 'stagemodelonly'; + +export const STAGE_TAG_HUMP_CHECK_NAME: string = 'StageModelOnly'; + +export const STAGE_TAG_CHECK_ERROR: string = 'This API is used only in Stage Mode, but the current Mode is FA.'; + +export const STAGE_COMPILE_MODE: string = 'moduleJson'; + +export const ATOMICSERVICE_BUNDLE_TYPE: string = 'atomicService'; + +export const ATOMICSERVICE_TAG_CHECK_NAME: string = 'atomicservice'; + +export const ATOMICSERVICE_TAG_CHECK_ERROR: string = "'{0}' can't support atomicservice application."; + +export const SINCE_TAG_NAME: string = 'since'; + +export const SINCE_TAG_CHECK_ERROR: string = + "The '{0}' API is supported since SDK version $SINCE1. However, the current compatible SDK version is $SINCE2."; + +export const ATOMICSERVICE_TAG_CHECK_VERSION: number = 11; + +export const FIND_MODULE_WARNING: string = "Cannot find name '{0}'."; + +export const CONSTANT_STEP_0: number = 0; + +export const CONSTANT_STEP_1: number = 1; + +export const CONSTANT_STEP_2: number = 2; + +export const CONSTANT_STEP_3: number = 3; + +export const GLOBAL_DECLARE_WHITE_LIST: Set = new Set(['Context', 'PointerStyle', 'PixelMap', 'UnifiedData', + 'Summary', 'UniformDataType', 'IntentionCode', 'NavDestinationInfo', 'UIContext', 'Resource', 'WebviewController']); + +export const MESSAGE_CONFIG_COLOR_RED: string = '\u001b[31m'; + +export const MESSAGE_CONFIG_COLOR_RESET: string = '\u001b[39m'; + +export const MESSAGE_CONFIG_COLOR_ERROR: string = 'color:#f5a623'; + +export const MESSAGE_CONFIG_COLOR_WARNING: string = 'color:#d0021b'; + +export const MESSAGE_CONFIG_HEADER_ERROR: string = 'ERROR: ArkTS:ERROR File: '; + +export const MESSAGE_CONFIG_HEADER_WARNING: string = 'WARN: ArkTS:WARN File: '; \ No newline at end of file diff --git a/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_enums.ts b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_enums.ts new file mode 100644 index 0000000000..1208ff3c65 --- /dev/null +++ b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_enums.ts @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export enum PermissionValidTokenState { + Init, + LeftParenthesis, + RightParenthesis, + PermissionChar, + And, + Or, +} \ No newline at end of file diff --git a/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_typedef.ts b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_typedef.ts new file mode 100644 index 0000000000..9231f06d9f --- /dev/null +++ b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_typedef.ts @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { JSDoc, JsDocNodeCheckConfigItem } from "../api-check-wrapper"; +import { PermissionValidTokenState } from "./api_check_plugin_enums"; + +// 定义 JSON 数据结构接口 +export interface WindowConfig { + designWidth: number; + autoDesignWidth: boolean; +} + +export interface FormConfig { + name: string; + displayName: string; + description: string; + src: string; // 目标字段 + uiSyntax: string; + window: WindowConfig; + colorMode: string; + isDynamic: boolean; + isDefault: boolean; + updateEnabled: boolean; + scheduledUpdateTime: string; + updateDuration: number; + defaultDimension: string; + supportDimensions: string[]; +} + +export interface ConfigSchema { + forms: FormConfig[]; +} + +/** + * 工程编译配置 + */ +export interface ProjectConfig { + bundleName: string; + moduleName: string; + cachePath: string; + aceModuleJsonPath: string; + compileMode: string; + permissions: ConfigPermission; + requestPermissions: string[]; + definePermissions: string[]; + projectRootPath: string; + isCrossplatform: boolean; + ignoreCrossplatformCheck: boolean; + bundleType: string; + compileSdkVersion: number; + compatibleSdkVersion: number; + projectPath: string; + aceProfilePath: string; + cardPageSet: string[]; + compileSdkPath: string; + systemModules: string[]; + allModulesPaths: string[]; + sdkConfigs: SdkConfig[]; + externalApiPaths: string; + externalSdkPaths: string[]; + sdkConfigPrefix: string; + deviceTypes: string[]; + deviceTypesMessage: string; + runtimeOS: string; + syscapIntersectionSet: Set; + syscapUnionSet: Set; + permissionsArray: string[]; + buildSdkPath: string; + nativeDependencies: string[]; + aceSoPath: string; +} + +export interface CheckValidCallbackInterface { + (jsDocTag: JSDoc[], config: JsDocNodeCheckConfigItem): boolean; +} + +export interface SyscapConfig { + sysCaps: string[] +} + +export interface SdkConfig { + prefix: string; + apiPath: string[]; +} + +export interface GlobalObject { + projectConfig: ProjectConfig +} + +export interface PermissionVaildCalcInfo { + valid: boolean; + currentToken: PermissionValidTokenState; + finish: boolean; + currentPermissionMatch: boolean; +} + +export interface PermissionValidCalcGroup { + subQueue: string[]; + includeParenthesis: boolean; +} + +export interface PermissionModule { + modulePath: string; + testPermissions: string[]; + permissions: string[]; +} + +export interface ConfigPermission { + requestPermissions: Array<{ name: string }>; + definePermissions: Array<{ name: string }>; +} \ No newline at end of file diff --git a/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_utils.ts b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_utils.ts new file mode 100644 index 0000000000..ea074944e2 --- /dev/null +++ b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_utils.ts @@ -0,0 +1,903 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import fs from 'fs'; +import path from 'path'; +import { globalObject } from '../index'; +import { + CheckValidCallbackInterface, + ConfigPermission, + ConfigSchema, + PermissionValidCalcGroup, + PermissionVaildCalcInfo, + ProjectConfig, + SdkConfig, + SyscapConfig +} from './api_check_plugin_typedef'; +import { + MESSAGE_CONFIG_COLOR_ERROR, + MESSAGE_CONFIG_COLOR_RED, + MESSAGE_CONFIG_COLOR_RESET, + MESSAGE_CONFIG_COLOR_WARNING, + MESSAGE_CONFIG_HEADER_ERROR, + MESSAGE_CONFIG_HEADER_WARNING, + PERMISSION_TAG_CHECK_ERROR, + PERMISSION_TAG_CHECK_NAME, + RUNTIME_OS_OH, + SINCE_TAG_CHECK_ERROR, + SINCE_TAG_NAME, + STAGE_COMPILE_MODE, + SYSCAP_TAG_CHECK_NAME +} from './api_check_plugin_define'; +import { + CurrentAddress, + DiagnosticCategory, + JSDoc, + JsDocNodeCheckConfigItem, + JSDocTag +} from '../api-check-wrapper'; +import { PermissionValidTokenState } from './api_check_plugin_enums'; + +/** + * 从 JSON 文件中提取所有 src 字段到数组 + * @param filePath JSON 文件的绝对路径 + * @returns 包含所有 src 字段的字符串数组 + * @throws 文件不存在、JSON 解析错误或数据结构不符时抛出异常 + */ +export function extractSrcPaths(filePath: string): string[] { + // 1. 验证路径格式和存在性 + if (!path.isAbsolute(filePath)) { + throw new Error(`路径必须是绝对路径: ${filePath}`); + } + + if (!fs.existsSync(filePath)) { + throw new Error(`文件不存在: ${filePath}`); + } + + try { + // 2. 读取并解析 JSON 文件 + const rawData = fs.readFileSync(filePath, 'utf-8'); + const config: ConfigSchema = JSON.parse(rawData); + + // 3. 验证数据结构 + if (!config.forms || !Array.isArray(config.forms)) { + throw new Error('JSON 缺少 forms 数组'); + } + + // 4. 提取所有 src 字段 + const srcPaths: string[] = []; + for (const form of config.forms) { + if (form.src && typeof form.src === 'string') { + let src = form.src.replace(/^\.\/ets/, ''); + srcPaths.push(globalObject.projectConfig?.projectPath + src); + } else { + console.warn(`跳过无效 src 字段的表单项: ${form.name}`); + } + } + + // 5. 返回结果数组 + return srcPaths; + } catch (error) { + // 6. 增强错误信息 + if (error instanceof SyntaxError) { + throw new SyntaxError(`JSON 解析错误: ${error.message}`); + } + throw new Error(`处理失败: ${error instanceof Error ? error.message : String(error)}`); + } +} + +export function isCardFile(file: string): boolean { + if (globalObject.projectConfig.cardPageSet.includes(file)) { + return true; + } + return false; +} + +/** + * 校验since标签,当前api版本是否小于等于compatibleSdkVersion + * + * @param { JSDoc[] } jsDocs + * @param config + * @returns + */ +export function checkSinceTag(jsDocs: JSDoc[], config: JsDocNodeCheckConfigItem): boolean { + if (jsDocs && jsDocs.length > 0) { + const minorJSDocVersion: number = getJSDocMinorVersion(jsDocs); + const compatibleSdkVersion: number = globalObject.projectConfig.compatibleSdkVersion; + if (minorJSDocVersion > compatibleSdkVersion) { + config.message = SINCE_TAG_CHECK_ERROR.replace('$SINCE1', minorJSDocVersion.toString()) + .replace('$SINCE2', compatibleSdkVersion.toString()); + return true; + } + } + return false; +} + +/** + * 获取版本号最小的JSDoc + * @param { JSDoc[] } jsDocs + * @returns { number } + */ +function getJSDocMinorVersion(jsDocs: JSDoc[]): number { + let minorVersion: number = 0; + if (jsDocs && jsDocs.length > 0) { + for (let i = 0; i < jsDocs.length; i++) { + const jsdoc: JSDoc = jsDocs[i]; + if (jsdoc.tags && jsdoc.tags.length > 0) { + for (let j = 0; j < jsdoc.tags.length; j++) { + const tag: JSDocTag = jsdoc.tags[j]; + if (tag.name === SINCE_TAG_NAME) { + const currentVersion: number = Number.parseInt(tag.name); + if (minorVersion === 0 || + !Number.isNaN(currentVersion) && currentVersion > minorVersion) { + minorVersion = currentVersion; + } + break; + } + } + } + } + } + return minorVersion; +} + +/** + * 获取最新版本的JSDoc + * @param { JSDoc[] } jsDocs + * @returns { JSDoc } + */ +function getCurrentJSDoc(jsDocs: JSDoc[]): JSDoc { + let minorVersion: number = 0; + let currentJsDoc: JSDoc = jsDocs[0]; + if (jsDocs && jsDocs.length > 0) { + for (let i = 0; i < jsDocs.length; i++) { + const jsdoc: JSDoc = jsDocs[i]; + if (jsdoc.tags && jsdoc.tags.length > 0) { + for (let j = 0; j < jsdoc.tags.length; j++) { + const tag: JSDocTag = jsdoc.tags[j]; + if (tag.name === SINCE_TAG_NAME) { + const currentVersion: number = Number.parseInt(tag.name); + if (!Number.isNaN(currentVersion) && minorVersion > currentVersion) { + minorVersion = currentVersion; + currentJsDoc = jsdoc; + } + break; + } + } + } + } + } + return currentJsDoc; +} + +/** + * 获取最新版本的JSDoc + * @param { JSDoc } jsDoc + * @param { string } tagName + * @returns { JSDocTag | undefined } + */ +function getJSDocTag(jsDoc: JSDoc, tagName: string): JSDocTag | undefined { + const jsDocTag: JSDocTag | undefined = jsDoc.tags.find((item: JSDocTag) => { + return item.name === tagName; + }); + return jsDocTag; +} + +/** + * STER1. Parse the permission information configured on the API + * STEP2. Recursive queue to obtain whether the current permission configuration supports it + */ +function validPermission(comment: string, permissionsArray: string[]): boolean { + const permissionsItem: string[] = getSplitsArrayWithDesignatedCharAndStr(comment ?? '', ' ') + .filter((item) => { + return item !== ''; + }); + const permissionsQueue: string[] = []; + permissionsItem.forEach((item: string) => { + //STEP1.1 Parse'(' + const leftParenthesisItem: string[] = getSplitsArrayWithDesignatedCharAndArrayStr([item], '('); + //STEP1.2 Parse')' + const rightParenthesisItem: string[] = getSplitsArrayWithDesignatedCharAndArrayStr(leftParenthesisItem, ')'); + permissionsQueue.push(...rightParenthesisItem); + }); + //STEP2 + const calcValidResult: PermissionVaildCalcInfo = { + valid: false, + currentToken: PermissionValidTokenState.Init, + finish: false, + currentPermissionMatch: true, + }; + validPermissionRecursion(permissionsQueue, permissionsArray, calcValidResult); + return calcValidResult.valid; +} + +function validPermissionRecursion(permissionsQueue: string[], permissions: string[], + calcValidResult: PermissionVaildCalcInfo): void { + if (permissionsQueue.some(item => ['(', ')'].includes(item))) { + const groups: PermissionValidCalcGroup[] = groupWithParenthesis(permissionsQueue); + const groupJoin: string[] = getGroupItemPermission(groups, calcValidResult, permissions); + getPermissionVaildAtoms(groupJoin, calcValidResult, permissions ?? []); + } else { + getPermissionVaildAtoms(permissionsQueue, calcValidResult, permissions ?? []); + } +} + +function getSplitsArrayWithDesignatedCharAndStr(permission: string, designatedChar: string): string[] { + return permission.split(designatedChar).map(item => item.trim()); +} + +function getGroupItemPermission( + groups: PermissionValidCalcGroup[], + calcValidResult: PermissionVaildCalcInfo, + permissions: string[]): string[] { + const groupJoin: string[] = []; + groups.forEach((groupItem: PermissionValidCalcGroup) => { + if (groupItem.includeParenthesis) { + const calcValidResultItem: PermissionVaildCalcInfo = { + ...calcValidResult, + }; + const subStack: string[] = groupItem.subQueue.slice(1, groupItem.subQueue.length - 1); + validPermissionRecursion(subStack, permissions, calcValidResultItem); + if (calcValidResultItem.valid) { + groupJoin.push(''); + } else { + groupJoin.push('NA'); + } + } else { + groupJoin.push(...groupItem.subQueue); + } + }); + return groupJoin; +} + +function groupWithParenthesis(stack: string[]): PermissionValidCalcGroup[] { + let currentLeftParenthesisCount: number = 0; + const groups: PermissionValidCalcGroup[] = []; + let currentGroupItem: PermissionValidCalcGroup = { + subQueue: [], + includeParenthesis: false, + }; + stack.forEach((item: string, index: number) => { + if (item === '(') { + if (currentLeftParenthesisCount === 0) { + groups.push(currentGroupItem); + currentGroupItem = { + subQueue: [item], + includeParenthesis: true + }; + } else { + currentGroupItem.subQueue.push(item); + } + currentLeftParenthesisCount++; + } else if (item === ')') { + currentLeftParenthesisCount--; + currentGroupItem.subQueue.push(item); + if (currentLeftParenthesisCount === 0) { + groups.push(currentGroupItem); + currentGroupItem = { + subQueue: [], + includeParenthesis: false, + }; + } + } else { + currentGroupItem.subQueue.push(item); + if (index === stack.length - 1) { + groups.push(currentGroupItem); + } + } + }); + return groups; +} + +function getPermissionVaildAtoms(atomStacks: string[], calcValidResult: PermissionVaildCalcInfo, + configPermissions: string[]): void { + if (calcValidResult.finish) { + return; + } + if (atomStacks[0] === 'and') { + calcValidResult.currentToken = PermissionValidTokenState.And; + } else if (atomStacks[0] === 'or') { + calcValidResult.currentToken = PermissionValidTokenState.Or; + } else { + if (calcValidResult.currentToken === PermissionValidTokenState.Or) { + if (inValidOrExpression( + atomStacks, + calcValidResult, + configPermissions + )) { + calcValidResult.currentPermissionMatch = false; + } + } else if (calcValidResult.currentToken === PermissionValidTokenState.And) { + if (inValidAndExpression( + atomStacks, + calcValidResult, + configPermissions + )) { + calcValidResult.currentPermissionMatch = false; + } + } else { + calcValidResult.currentPermissionMatch = + validPermissionItem(atomStacks[0], configPermissions); + } + } + if (atomStacks.length > 1) { + getPermissionVaildAtoms( + atomStacks.slice(1), + calcValidResult, + configPermissions + ); + } else { + calcValidResult.valid = calcValidResult.currentPermissionMatch; + calcValidResult.finish = true; + } +} + +function inValidOrExpression( + atomStacks: string[], + calcValidResult: PermissionVaildCalcInfo, + configPermissions: string[]): boolean { + if ( + !calcValidResult.currentPermissionMatch && + !validPermissionItem(atomStacks[0], configPermissions) + ) { + calcValidResult.valid = false; + return true; + } + calcValidResult.currentPermissionMatch = true; + return false; +} + +function inValidAndExpression( + atomStacks: string[], + calcValidResult: PermissionVaildCalcInfo, + configPermissions: string[]): boolean { + if ( + !calcValidResult.currentPermissionMatch || + !validPermissionItem(atomStacks[0], configPermissions) + ) { + calcValidResult.valid = false; + return true; + } + calcValidResult.currentPermissionMatch = + validPermissionItem(atomStacks[0], configPermissions); + return false; +} + +function validPermissionItem(atomStackItem: string, configPermissions: string[]): boolean { + return atomStackItem === '' || configPermissions.includes(atomStackItem); +} + +function getSplitsArrayWithDesignatedCharAndArrayStr( + leftParenthesisItems: string[], + designatedChar: string +): string[] { + const rightParenthesisItems: string[] = []; + leftParenthesisItems.forEach((leftParenthesisItem: string) => { + if (leftParenthesisItem.includes(designatedChar)) { + const rightParenthesis: string[] = + getSplitsArrayWithDesignatedCharAndStr( + leftParenthesisItem, + designatedChar + ); + rightParenthesis.forEach((item: string) => { + if (item === '') { + rightParenthesisItems.push(designatedChar); + } else { + rightParenthesisItems.push(item); + } + }); + } else { + rightParenthesisItems.push(leftParenthesisItem); + } + }); + return rightParenthesisItems; +} + +/** +* get jsDocNodeCheckConfigItem object +* +* @param {string[]} tagName - tag name +* @param {string} message - error message +* @param {DiagnosticCategory} type - error type +* @param {boolean} tagNameShouldExisted - tag is required +* @param {CheckValidCallbackInterface} checkValidCallback +* @returns {JsDocNodeCheckConfigItem} +*/ +export function getJsDocNodeCheckConfigItem(tagName: string[], message: string, type: DiagnosticCategory, + tagNameShouldExisted: boolean, checkValidCallback?: CheckValidCallbackInterface): JsDocNodeCheckConfigItem { + return { + tagName: tagName, + message: message, + type: type, + tagNameShouldExisted: tagNameShouldExisted, + checkValidCallback: checkValidCallback + }; +} + +/** + * 创建/清空工程配置 + * @param { ProjectConfig } projectConfig + * @returns { ProjectConfig } + */ +export function createOrCleanProjectConfig(): ProjectConfig { + return { + bundleName: '', + moduleName: '', + cachePath: '', + aceModuleJsonPath: '', + compileMode: '', + permissions: { + requestPermissions: [], + definePermissions: [] + }, + requestPermissions: [], + definePermissions: [], + projectRootPath: '', + isCrossplatform: false, + ignoreCrossplatformCheck: false, + bundleType: '', + compileSdkVersion: 0, + compatibleSdkVersion: 0, + projectPath: '', + aceProfilePath: '', + cardPageSet: [], + compileSdkPath: '', + systemModules: [], + allModulesPaths: [], + sdkConfigs: [], + externalApiPaths: '', + externalSdkPaths: [], + sdkConfigPrefix: '', + deviceTypes: [], + deviceTypesMessage: '', + runtimeOS: '', + syscapIntersectionSet: new Set([]), + syscapUnionSet: new Set([]), + permissionsArray: [], + buildSdkPath: '', + nativeDependencies: [], + aceSoPath: '' + }; +} + +/** + * 初始化工程配置 + * @param { ProjectConfig } projectConfig + */ +export function initProjectConfig(): void { + // 绑定cardPageSet + readCardPageSet(); + // 绑定systemModules + readSystemModules(); + // 绑定syscap + readSyscapInfo(); + // 绑定permission + readPermissions(); +} + +/** + * read permissionInfo to this.share.projectConfig + */ +export function readPermissions(): void { + const permission: ConfigPermission = globalObject.projectConfig.permissions; + if (permission.requestPermissions) { + globalObject.projectConfig.requestPermissions = getPermissionFromConfig(permission.requestPermissions); + } + if (permission.definePermissions) { + globalObject.projectConfig.definePermissions = getPermissionFromConfig(permission.definePermissions); + } + globalObject.projectConfig.permissionsArray = + [...globalObject.projectConfig.requestPermissions, ...globalObject.projectConfig.definePermissions]; +} + +function getPermissionFromConfig(array: Array<{ name: string }>): string[] { + return array.map((item: { name: string }) => { + return String(item.name); + }); +} + +function readSystemModules() { + const apiDirPath = path.resolve(globalObject.projectConfig.buildSdkPath, './api'); + const arktsDirPath = path.resolve(globalObject.projectConfig.buildSdkPath, './arkts'); + const kitsDirPath = path.resolve(globalObject.projectConfig.buildSdkPath, './kits'); + const systemModulePathArray = [apiDirPath, arktsDirPath, kitsDirPath]; + + systemModulePathArray.forEach(systemModulesPath => { + if (fs.existsSync(systemModulesPath)) { + const modulePaths = []; + readFile(systemModulesPath, modulePaths); + globalObject.projectConfig.systemModules.push(...fs.readdirSync(systemModulesPath)); + modulePaths.filter(filePath => { + const dirName = path.dirname(filePath); + return !(dirName === apiDirPath || dirName === arktsDirPath || dirName === kitsDirPath); + }).map((filePath: string) => { + return filePath + .replace(apiDirPath, '') + .replace(arktsDirPath, '') + .replace(kitsDirPath, '') + .replace(/(^\\)|(.d.e?ts$)/g, '') + .replace(/\\/g, '/'); + }); + globalObject.projectConfig.allModulesPaths.push(...modulePaths); + } + }); + const defaultSdkConfigs: SdkConfig[] = [ + { + 'apiPath': systemModulePathArray, + 'prefix': '@ohos' + }, { + 'apiPath': systemModulePathArray, + 'prefix': '@system' + }, { + 'apiPath': systemModulePathArray, + 'prefix': '@arkts' + } + ]; + const externalApiPathStr = globalObject.projectConfig.externalApiPaths || ''; + const externalApiPaths = externalApiPathStr.split(path.delimiter); + globalObject.projectConfig.externalSdkPaths = [...externalApiPaths]; + const extendSdkConfigs: SdkConfig[] = []; + collectExternalModules(externalApiPaths, extendSdkConfigs); + globalObject.projectConfig.sdkConfigs = [...defaultSdkConfigs, ...extendSdkConfigs]; +} + +function collectExternalModules(sdkPaths: string[], extendSdkConfigs: SdkConfig[]): void { + for (let i = 0; i < sdkPaths.length; i++) { + const sdkPath = sdkPaths[i]; + const sdkConfigPath = path.resolve(sdkPath, 'sdkConfig.json'); + if (!fs.existsSync(sdkConfigPath)) { + continue; + } + const sdkConfig: SdkConfig = JSON.parse(fs.readFileSync(sdkConfigPath, 'utf-8')); + if (!sdkConfig.apiPath) { + continue; + } + let externalApiPathArray: string[] = []; + if (Array.isArray(sdkConfig.apiPath)) { + externalApiPathArray = sdkConfig.apiPath; + } else { + externalApiPathArray.push(sdkConfig.apiPath); + } + const resolveApiPathArray: string[] = []; + externalApiPathArray.forEach((element: string) => { + const resolvePath: string = path.resolve(sdkPath, element); + resolveApiPathArray.push(resolvePath); + if (fs.existsSync(resolvePath)) { + const extrenalModulePaths = []; + globalObject.projectConfig.systemModules.push(...fs.readdirSync(resolvePath)); + readFile(resolvePath, extrenalModulePaths); + globalObject.projectConfig.allModulesPaths.push(...extrenalModulePaths); + } + }); + globalObject.projectConfig.sdkConfigPrefix += `|${sdkConfig.prefix.replace(/^@/, '')}`; + sdkConfig.apiPath = resolveApiPathArray; + extendSdkConfigs.push(sdkConfig); + } +} + +/** + * 根据配置读取卡片列表 + */ +function readCardPageSet(): void { + if (globalObject.projectConfig.aceModuleJsonPath && fs.existsSync(globalObject.projectConfig.aceModuleJsonPath)) { + globalObject.projectConfig.compileMode = STAGE_COMPILE_MODE; + const moduleJson: any = JSON.parse(fs.readFileSync(globalObject.projectConfig.aceModuleJsonPath).toString()); + const extensionAbilities: any = moduleJson?.module?.extensionAbilities; + if (extensionAbilities && extensionAbilities.length > 0) { + setCardPages(extensionAbilities); + } + } +} + +function setCardPages(extensionAbilities: any) { + if (extensionAbilities && extensionAbilities.length > 0) { + extensionAbilities.forEach((extensionAbility: any) => { + if (extensionAbility.type === 'form' && extensionAbility.metadata) { + extensionAbility.metadata.forEach((metadata: any) => { + if (metadata.resource) { + readCardResource(metadata.resource); + } + }); + } + }); + } +} + +function readCardResource(resource: string) { + const cardJsonFileName: string = `${resource.replace(/\$profile\:/, '')}.json`; + const modulePagePath: string = path.resolve(globalObject.projectConfig.aceProfilePath, cardJsonFileName); + if (fs.existsSync(modulePagePath)) { + const cardConfig: any = JSON.parse(fs.readFileSync(modulePagePath, 'utf-8')); + if (cardConfig.forms) { + cardConfig.forms.forEach((form: any) => { + readCardForm(form); + }); + } + } +} + +function readCardForm(form: any) { + if ((form.type && form.type === 'eTS') || (form.uiSyntax && form.uiSyntax === 'arkts')) { + const cardPath = path.resolve(globalObject.projectConfig.projectPath, '..', form.src); + if (cardPath && fs.existsSync(cardPath) && !globalObject.projectConfig.cardPageSet.includes(cardPath)) { + globalObject.projectConfig.cardPageSet.push(cardPath); + } + } +} + +/** + * 更新工程配置 + * @param { ProjectConfig } targetProjectConfig + * @param { ProjectConfig } newProjectConfig + */ +export function updateProjectConfig(newProjectConfig: ProjectConfig): void { + Object.assign(globalObject.projectConfig, { + bundleName: newProjectConfig.bundleName, + moduleName: newProjectConfig.moduleName, + cachePath: newProjectConfig.cachePath, + requestPermissions: newProjectConfig.requestPermissions, + projectRootPath: newProjectConfig.projectRootPath, + isCrossplatform: newProjectConfig.isCrossplatform, + ignoreCrossplatformCheck: newProjectConfig.ignoreCrossplatformCheck, + bundleType: newProjectConfig.bundleType, + compileSdkVersion: newProjectConfig.compileSdkVersion, + compatibleSdkVersion: newProjectConfig.compatibleSdkVersion, + projectPath: newProjectConfig.projectPath, + aceProfilePath: newProjectConfig.aceProfilePath, + buildSdkPath: newProjectConfig.buildSdkPath + }); +} + +export function readFile(dir: string, utFiles: string[]): void { + try { + const files: string[] = fs.readdirSync(dir); + files.forEach((element) => { + const filePath: string = path.join(dir, element); + const status: fs.Stats = fs.statSync(filePath); + if (status.isDirectory()) { + readFile(filePath, utFiles); + } else { + utFiles.push(filePath); + } + }); + } catch (e) { + console.error(MESSAGE_CONFIG_COLOR_RED, 'ArkTS ERROR: ' + e, MESSAGE_CONFIG_COLOR_RESET); + } +} + +/** +* Determine the necessity of permission check +* +* @param { JSDoc[] } jsDocs +* @param { JsDocNodeCheckConfigItem } config +* @returns { boolean } +*/ +export function checkPermissionTag(jsDocs: JSDoc[], config: JsDocNodeCheckConfigItem): boolean { + const currentJSDoc: JSDoc = getCurrentJSDoc(jsDocs); + const jsDocTag: JSDocTag | undefined = getJSDocTag(currentJSDoc, PERMISSION_TAG_CHECK_NAME); + if (!jsDocTag) { + return false; + } + const permissionExpression: string = jsDocTag.name + ' ' + jsDocTag.description; + config.message = PERMISSION_TAG_CHECK_ERROR.replace('$DT', permissionExpression); + return permissionExpression !== '' && !validPermission(permissionExpression, globalObject.projectConfig.permissionsArray); +} + +/** + * Confirm compliance since + * Only major version can be passed in, such as "19"; + * major and minor version can be passed in, such as "19.1"; major minor and patch + * patch version can be passed in, such as "19.1.2" + * the major version be from 1-999 + * the minor version be from 0-999 + * the patch version be from 0-999 + * + * @param {string} since + * @return {boolean} + */ +function isCompliantSince(since: string): boolean { + return /^(?!0\d)[1-9]\d{0,2}(?:\.[1-9]\d{0,2}|\.0){0,2}$\d{0,2}$/.test(since); +} + +/** + * compare point version + * @param { string } firstVersion + * @param { string } secondVersion + * @returns { number } + */ +function comparePointVersion(firstVersion: string, secondVersion: string): number { + const firstPointVersion = firstVersion.split('.'); + const secondPointVersion = secondVersion.split('.'); + for (let i = 0; i < 3; i++) { + const part1 = parseInt(firstPointVersion[i] || '0', 10); + const part2 = parseInt(secondPointVersion[i] || '0', 10); + if (part1 < part2) { + return -1; + } + if (part1 > part2) { + return 1; + } + } + return 0; +} + +/** + * Determine the necessity of syscap check. + * @param { JSDoc[] } jsDocs + * @param { JsDocNodeCheckConfigItem } config + * @returns { boolean } + */ +export function checkSyscapTag(jsDocs: JSDoc[], config: JsDocNodeCheckConfigItem): boolean { + let currentSyscapValue: string = ''; + if (jsDocs && jsDocs.length > 0) { + const jsDoc: JSDoc = getCurrentJSDoc(jsDocs); + for (let i = 0; i < jsDoc.tags.length; i++) { + const jsDocTag: JSDocTag = jsDoc.tags[i]; + if (jsDocTag && jsDocTag.name === SYSCAP_TAG_CHECK_NAME) { + currentSyscapValue = jsDocTag.comment; + break; + } + } + } + return globalObject.projectConfig.syscapIntersectionSet && !globalObject.projectConfig.syscapIntersectionSet.has(currentSyscapValue); +} + +/** + * read syscapInfo to projectConfig + */ +export function readSyscapInfo(): void { + globalObject.projectConfig.deviceTypesMessage = globalObject.projectConfig.deviceTypes.join(','); + const deviceDir: string = path.resolve(__dirname, '../../../../../api/device-define/'); + const deviceInfoMap: Map = new Map(); + const syscaps: Array = []; + let allSyscaps: string[] = []; + globalObject.projectConfig.deviceTypes.forEach((deviceType: string) => { + collectOhSyscapInfos(deviceType, deviceDir, deviceInfoMap); + }); + if (globalObject.projectConfig.runtimeOS !== RUNTIME_OS_OH) { + collectExternalSyscapInfos(globalObject.projectConfig.externalSdkPaths, globalObject.projectConfig.deviceTypes, + deviceInfoMap); + } + deviceInfoMap.forEach((value: string[]) => { + syscaps.push(value); + allSyscaps = allSyscaps.concat(value); + }); + const intersectNoRepeatTwice = (arrs: Array) => { + return arrs.reduce(function (prev: string[], cur: string[]) { + return Array.from(new Set(cur.filter((item: string) => { + return prev.includes(item); + }))); + }); + }; + let syscapIntersection: string[] = []; + if (globalObject.projectConfig.deviceTypes.length === 1 || syscaps.length === 1) { + syscapIntersection = syscaps[0]; + } else if (syscaps.length > 1) { + syscapIntersection = intersectNoRepeatTwice(syscaps); + } + globalObject.projectConfig.syscapIntersectionSet = new Set(syscapIntersection); + globalObject.projectConfig.syscapUnionSet = new Set(allSyscaps); +} + +function collectOhSyscapInfos(deviceType: string, deviceDir: string, deviceInfoMap: Map) { + let syscapFilePath: string = ''; + if (deviceType === 'phone') { + syscapFilePath = path.resolve(deviceDir, 'default.json'); + } else { + syscapFilePath = path.resolve(deviceDir, deviceType + '.json'); + } + if (fs.existsSync(syscapFilePath)) { + const content: SyscapConfig = JSON.parse(fs.readFileSync(syscapFilePath, 'utf-8')); + if (deviceInfoMap.get(deviceType)) { + deviceInfoMap.set(deviceType, (deviceInfoMap.get(deviceType) as string[]).concat(content.sysCaps)); + } else { + deviceInfoMap.set(deviceType, content.sysCaps); + } + } +} + +function collectExternalSyscapInfos( + externalApiPaths: string[], + deviceTypes: string[], + deviceInfoMap: Map +) { + const externalDeviceDirs: string[] = []; + externalApiPaths.forEach((externalApiPath: string) => { + const externalDeviceDir: string = path.resolve(externalApiPath, './api/device-define'); + if (fs.existsSync(externalDeviceDir)) { + externalDeviceDirs.push(externalDeviceDir); + } + }); + externalDeviceDirs.forEach((externalDeviceDir: string) => { + deviceTypes.forEach((deviceType: string) => { + let syscapFilePath: string = ''; + const files: string[] = fs.readdirSync(externalDeviceDir); + files.forEach((fileName: string) => { + if (fileName.startsWith(deviceType)) { + syscapFilePath = path.resolve(externalDeviceDir, fileName); + if (fs.existsSync(syscapFilePath)) { + const content: SyscapConfig = JSON.parse(fs.readFileSync(syscapFilePath, 'utf-8')); + if (deviceInfoMap.get(deviceType)) { + deviceInfoMap.set(deviceType, (deviceInfoMap.get(deviceType) as string[]).concat(content.sysCaps)); + } else { + deviceInfoMap.set(deviceType, content.sysCaps); + } + } + } + }); + }); + }); +} + +export function pushLog(apiName: string, currentFilePath: string, currentAddress: CurrentAddress, + logLevel: DiagnosticCategory, logMessage: string) { + // 组装文件全路径 + const fileFullPath: string = currentFilePath + `(${currentAddress.column}:${currentAddress.line}).`; + // 替换api名称 + logMessage = logMessage.replace('{0}', apiName); + // 打印日志信息 + printMessage(fileFullPath, logMessage, logLevel); +} + +/** + * 日志打印 + * @param fileInfo + * @param message + * @param level + */ +function printMessage(fileInfo: string, message: string, level: DiagnosticCategory) { + let messageHead: string = MESSAGE_CONFIG_HEADER_WARNING; + let messageColor: string = MESSAGE_CONFIG_COLOR_WARNING; + if (level === DiagnosticCategory.Error) { + messageHead = MESSAGE_CONFIG_HEADER_ERROR; + messageColor = MESSAGE_CONFIG_COLOR_ERROR; + } + // TODO: 待工具链日志输出方式确认后同步适配 + console.log(`%c${messageHead}${fileInfo}\n ${message}`, messageColor); +} + +export function collectInfo(moduleName: string[], modulePath: string, currentFilePath: string) { + // 收集so模块依赖 + if (/lib(\S+)\.so/g.test(modulePath) && !globalObject.projectConfig.nativeDependencies.includes(currentFilePath)) { + globalObject.projectConfig.nativeDependencies.push(currentFilePath); + } +} + +export function writeUseOSFiles(useOSFiles: string[]): void { + let info: string = useOSFiles.join('\n'); + if (!fs.existsSync(globalObject.projectConfig.aceSoPath)) { + const parent: string = path.resolve(globalObject.projectConfig.aceSoPath, '..'); + if (!(fs.existsSync(parent) && !fs.statSync(parent).isFile())) { + mkDir(parent); + } + } else { + const currentUseOSFiles: string[] = fs.readFileSync(globalObject.projectConfig.aceSoPath, 'utf-8').split('\n'); + useOSFiles.forEach((filePath: string) => { + if (!currentUseOSFiles.includes(filePath)) { + currentUseOSFiles.push(filePath); + } + }); + info = currentUseOSFiles.join('\n'); + } + fs.writeFileSync(globalObject.projectConfig.aceSoPath, info); +} + +function mkDir(path_: string): void { + const parent: string = path.join(path_, '..'); + if (!(fs.existsSync(parent) && !fs.statSync(parent).isFile())) { + mkDir(parent); + } + fs.mkdirSync(path_); +} \ No newline at end of file diff --git a/build-tools/declgen.js b/build-tools/declgen.js new file mode 100644 index 0000000000..c2f54541f5 --- /dev/null +++ b/build-tools/declgen.js @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +const fs = require('fs'); +const path = require('path'); +const commander = require('commander'); +const { generateInteropDecls } = require('declgen/build/src/generateInteropDecls'); +let inputFileDir = ''; +let outputFileDir = ''; +const CONFIG = JSON.parse( + fs.readFileSync(path.join(__dirname, 'remove_declgen.json'), 'utf8') +); + +function main() { + const program = new commander.Command(); + program.name('intToNumber').version('0.0.1'); + program + .option('--input ', 'input path') + .option('--output ', 'output path') + .action((opts) => { + if (!opts.input || !opts.output) { + console.error( + 'Error: Must provide --input and --output parameters' + ); + process.exit(1); + } + // 将相对路径解析为绝对路径 + inputFileDir = path.resolve(opts.input); + outputFileDir = path.resolve(opts.output); + // 检查输入目录是否存在 + if (!fs.existsSync(inputFileDir)) { + console.error( + `Error: Input directory does not exist: ${inputFileDir}` + ); + process.exit(1); + } + runDeclgen(inputFileDir, outputFileDir); + }); + program.parse(process.argv); +} + +function runDeclgen(inputDir, outputDir) { + const inputFiles = []; + readFile(inputDir + '/api', inputFiles); + readFile(inputDir + '/arkts', inputFiles); + readFile(inputDir + '/kits', inputFiles); + const config = { + inputDirs: [], + inputFiles: inputFiles, + outDir: outputDir, + rootDir: inputDir + }; + generateInteropDecls(config); +} + +/** + +读取目录下所有文件 +@param {string} inputDir 文件目录 +@param {Array} utFiles 所有文件 +*/ +function readFile(inputDir, utFiles) { + try { + const files = fs.readdirSync(inputDir); + files.forEach((element) => { + if (element === 'build-tools') { + return; + } + const filePath = path.join(inputDir, element); + const status = fs.statSync(filePath); + const relativePath = path.normalize( + path.relative(inputFileDir, filePath) + ); + if (status.isDirectory()) { + readFile(filePath, utFiles); + } else if (!CONFIG.removeFile.includes(relativePath.replace(/\//g, '\\'))) { + utFiles.push(filePath); + } + }); + } catch (e) { + console.error('Error reading files: ' + e.message); + } +} + +main(); \ No newline at end of file diff --git a/build-tools/package-lock.json b/build-tools/package-lock.json deleted file mode 100644 index 516ab7e28b..0000000000 --- a/build-tools/package-lock.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "name": "delete", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "fs": { - "version": "0.0.1-security", - "resolved": "https://repo.huaweicloud.com/repository/npm/fs/-/fs-0.0.1-security.tgz", - "integrity": "sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w==" - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==" - }, - "json5": { - "version": "2.2.3", - "resolved": "https://repo.huaweicloud.com/repository/npm/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" - }, - "path": { - "version": "0.12.7", - "resolved": "https://repo.huaweicloud.com/repository/npm/path/-/path-0.12.7.tgz", - "integrity": "sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==", - "requires": { - "process": "^0.11.1", - "util": "^0.10.3" - } - }, - "process": { - "version": "0.11.10", - "resolved": "https://repo.huaweicloud.com/repository/npm/process/-/process-0.11.10.tgz", - "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==" - }, - "typescript": { - "version": "npm:ohos-typescript@4.2.3-r5", - "resolved": "https://repo.huaweicloud.com/repository/npm/ohos-typescript/-/ohos-typescript-4.2.3-r5.tgz", - "integrity": "sha512-9l72RIvrz8RMpU8j1uK7cIL5/gpNR11nelIFOmMDDOA3LJf70NlMgVIXOIg7MjCgjPb+U9PDwYBpalvb+rd2LA==", - "requires": { - "json5": "^2.2.3" - } - }, - "util": { - "version": "0.10.4", - "resolved": "https://repo.huaweicloud.com/repository/npm/util/-/util-0.10.4.tgz", - "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", - "requires": { - "inherits": "2.0.3" - } - } - } -} diff --git a/build-tools/package.json b/build-tools/package.json index 130a687306..2cbaa3b9ab 100644 --- a/build-tools/package.json +++ b/build-tools/package.json @@ -5,7 +5,7 @@ "main": "delete_systemapi_plugin.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "postinstall": "cd arkui_transformer && npm install" + "postinstall": "cd arkui_transformer && npm install && cd ../compiler-plugins/api-check-plugin-static && npm install" }, "author": "", "license": "ISC", @@ -13,6 +13,12 @@ "commander": "^13.1.0", "fs": "^0.0.1-security", "path": "^0.12.7", - "typescript": "npm:ohos-typescript@4.9.5-r5" + "typescript": "npm:ohos-typescript@4.9.5-r5", + "@babel/cli": "7.20.7", + "@babel/core": "7.20.12", + "@babel/plugin-proposal-class-properties": "7.18.6", + "@babel/preset-env": "7.20.2", + "@babel/preset-typescript": "7.18.6", + "@babel/runtime": "7.20.13" } } diff --git a/build-tools/package_tools/.gitignore b/build-tools/package_tools/.gitignore new file mode 100644 index 0000000000..938479ff0f --- /dev/null +++ b/build-tools/package_tools/.gitignore @@ -0,0 +1,3 @@ +package-lock.json +node_modules/ +package/ \ No newline at end of file diff --git a/api/arkui/stateManagement/decorators/decoratorStorageLink.d.ets b/build-tools/package_tools/main.ts similarity index 48% rename from api/arkui/stateManagement/decorators/decoratorStorageLink.d.ets rename to build-tools/package_tools/main.ts index 45821e860b..07b263e20c 100644 --- a/api/arkui/stateManagement/decorators/decoratorStorageLink.d.ets +++ b/build-tools/package_tools/main.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,19 +13,16 @@ * limitations under the License. */ -/** - * @file - * @kit ArkUI - * @arkts 1.2 - */ +// import { Command } from "commander"; +// import { PackagingType } from "./model/Enums"; +// import { makePackagingOption } from "./utils/utils"; +import { packagingEntry } from "./src/PackagingEntry"; -import { DecoratedV1VariableBase, IDecoratedMutableVariable } from '../base/decoratorBase'; -import { WatchFuncType } from './decoratorWatch'; +function main(type: string, inputDir: string, outputDir?: string): void { + // const program: Command = makePackagingOption('package_tools', '1.0.0', packagingEntry); + // program.parse(process.argv); + packagingEntry(type, inputDir, outputDir); +} -export declare class StorageLinkDecoratedVariable extends DecoratedV1VariableBase - implements IDecoratedMutableVariable { - public constructor(propName: string, varName: string, localValue: T, watchFunc?: WatchFuncType) - public getInfo(): string - public get(): T - public set(newValue: T): void -} \ No newline at end of file +// node package_tools.js type inputDir outputDir +main(process.argv[2], process.argv[3], process.argv[4]); \ No newline at end of file diff --git a/build-tools/package_tools/model/Constants.ts b/build-tools/package_tools/model/Constants.ts new file mode 100644 index 0000000000..5e61c2d4af --- /dev/null +++ b/build-tools/package_tools/model/Constants.ts @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import ts from "typescript"; +import { OperateType } from "./Enums"; + +export const OPERATE_MESSAGE_MAP: Map = new Map([ + [OperateType.DELETE_FILE, 'delete file message, reson $2'] + // TODO +]) + +export class fileDir { + // 处理的目录类型,ets代表处理的是1.1目录,ets2代表处理的是1.2目录里有@arkts 1.1&1.2标签的文件, + // noTagInEts2代表处理的是1.2目录里无标签的文件 + // static readonly DirType = { + // 'typeOne': 'ets', + // 'typeTwo': 'ets2', + // 'typeThree': 'noTagInEts2', + // }; + + // 1.2SDK兼容行打包方案过滤文件 + static readonly API_NO_TAGS_FILTER_LIST = [ + '@arkts.collections.d.ets', + '@arkts.lang.d.ets', + '@arkts.utils.d.ets' + ]; + + // 无需处理的文件路径 + static readonly NOT_COPY_DIR = ['build-tools', '.git', '.gitee']; + + // 所有API的节点类型 + static readonly apiNodeTypeArr = [ + ts.SyntaxKind.VariableStatement, + ts.SyntaxKind.MethodDeclaration, + ts.SyntaxKind.MethodSignature, + ts.SyntaxKind.FunctionDeclaration, + ts.SyntaxKind.Constructor, + ts.SyntaxKind.ConstructSignature, + ts.SyntaxKind.CallSignature, + ts.SyntaxKind.PropertyDeclaration, + ts.SyntaxKind.PropertySignature, + ts.SyntaxKind.EnumMember, + ts.SyntaxKind.EnumDeclaration, + ts.SyntaxKind.TypeAliasDeclaration, + ts.SyntaxKind.ClassDeclaration, + ts.SyntaxKind.InterfaceDeclaration, + ts.SyntaxKind.ModuleDeclaration, + ts.SyntaxKind.StructDeclaration + ]; +} \ No newline at end of file diff --git a/build-tools/package_tools/model/Enums.ts b/build-tools/package_tools/model/Enums.ts new file mode 100644 index 0000000000..6f78ccc91a --- /dev/null +++ b/build-tools/package_tools/model/Enums.ts @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export enum PackagingType { + ETS = 'ets', + ETS2 = 'ets2', + NO_TAG_IN_ETS2 = 'noTagInEts2' +} + +export enum PackagingModelType { + ETS = 'ets', + ETS2 = 'ets2', + BOTH = 'both' +} + +export enum LogType { + INFO = 'info', + ERROR = 'error' +} + +export enum OperateType { + DELETE_FILE = 'delete_file', + COPY_FILE = 'copy_file', + DELETE_IF_STATEMENT = 'delete_if_statement', + ADD_USE_STATIC = 'add_use_static', + DELETE_ARKTS_TAG = 'delete_arkts_tag', + UPDATE_SINCE_TAG = 'update_since_tag', + DELETE_HISTORY_JSDOC = 'delete_history_jsdoc', + DELETE_DEPRECATED_API = 'delete_deprecated_api' + // TODO +} \ No newline at end of file diff --git a/build-tools/package_tools/model/FileModify.ts b/build-tools/package_tools/model/FileModify.ts new file mode 100644 index 0000000000..d8f7cc6105 --- /dev/null +++ b/build-tools/package_tools/model/FileModify.ts @@ -0,0 +1,321 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import fs from 'fs'; +import path from 'path'; +import ts from 'typescript'; +import { PackagingType } from '../model/Enums'; +import { packagingEntry } from '../src/PackagingEntry'; + +export class getFile { + /** + * 判断文件是否为空 + * @param {*} node + */ + public static isEmptyFile(node: ts.Node) { + let isEmpty = true; + if (ts.isSourceFile(node) && node.statements) { + const needExportName = new Set(); + for (let i = 0; i < node.statements.length; i++) { + const statement = node.statements[i]; + if (ts.isExportDeclaration(statement) && statement.moduleSpecifier) { + isEmpty = false; + break; + } + if (this.judgeExportHasImport(statement, needExportName)) { + continue; + } + isEmpty = false; + break; + } + } + return isEmpty; + } + + /** + * 判断import节点和export节点。 + * 当前文本如果还有其他节点则不能删除, + * 如果只有import和export则判断是否export导出import节点 + * + * @param {*} statement + * @param {*} needExportName + * @returns + */ + public static judgeExportHasImport(statement: ts.Statement, needExportName: Set) { + if (ts.isImportDeclaration(statement)) { + this.processImportDeclaration(statement, needExportName); + return true; + } else if (ts.isExportAssignment(statement) && + !needExportName.has(statement.expression.getText().toString())) { + return true; + } else if (ts.isExportDeclaration(statement)) { + return !statement.exportClause?.elements.some((element) => { + const exportName = element.propertyName ? + element.propertyName.escapedText.toString() : + element.name.escapedText.toString(); + return needExportName.has(exportName); + }); + } + return false; + } + + /** + * + * @param { string } apiPath 需要处理的api文件所在路径 + * @param { string } rootPath ets文件夹路径 + * @returns { Set } 需要处理的api文件的相对于ets目录的路径 + */ + public static getApiFileName(apiPath: string, rootPath: string, allApiFilePathSet: Set) { + const apiFilePathSet = new Set(); + const fileNames = fs.readdirSync(apiPath); + + fileNames.forEach(fileName => { + const apiFilePath = path.join(apiPath, fileName).replace(/\\/g, '/'); + const stat = fs.statSync(apiFilePath); + + if (stat.isDirectory()) { + this.getApiFileName(apiFilePath, rootPath, allApiFilePathSet); + } else { + const apiRelativePath = apiFilePath.replace(rootPath, ''); + allApiFilePathSet.add(apiRelativePath); + } + }); + + return apiFilePathSet; + } + + public static processImportDeclaration(statement: ts.Statement, needExportName: Set) { + const importClause = statement.importClause; + if (!ts.isImportClause(importClause)) { + return; + } + if (importClause.name) { + needExportName.add(importClause.name.escapedText.toString()); + } + const namedBindings = importClause.namedBindings; + if (namedBindings !== undefined && ts.isNamedImports(namedBindings)) { + const elements = namedBindings.elements; + elements.forEach((element) => { + const exportName = element.propertyName ? + element.propertyName.escapedText.toString() : + element.name.escapedText.toString(); + needExportName.add(exportName); + }); + } + } + + /** + * + * @param { string } path 需要处理的api文件所在路径 + * @returns { boolean } 文件是否是ets类型 + */ + public static isEtsFile(path: string) { + return path.endsWith('d.ets'); + } + + /** + * + * @param { string } path 需要处理的api文件所在路径 + * @returns { boolean } 文件是否是ts类型 + */ + public static isTsFile(path: string) { + return path.endsWith('d.ts'); + } + + /** + * + * @param { string } path 需要处理的api文件所在路径 + * @returns { boolean } 验证是否存在ets类型文件 + */ + public static hasEtsFile(path: string) { + // 为StateManagement.d.ts设定白名单,在1.2打包的时候在Linux上有大小写不同的重名,碰到直接返回true + // TODO:白名单提出去 + if (path.includes('StateManagement.d.ts')) { + console.log('StateManagement.d.ts is in white list, return true. path = ', path); + return true; + } else { + return fs.existsSync(path.replace(/\.d\.[e]?ts$/g, '.d.ets')); + } + } + + /** + * + * @param { string } path 需要处理的api文件所在路径 + * @returns { boolean } 验证是否存在ts类型文件 + */ + public static hasTsFile(path: string) { + return fs.existsSync(path.replace(/\.d\.[e]?ts$/g, '.d.ts')); + } + + /** + * 判断新生成的文件内容有没有版权头 + * + * @param {*} fileText 新生成的文件内容 + * @returns + */ + public static hasCopyright(fileText: string) { + return /http(\:|\?:)\/\/www(\.|\/)apache\.org\/licenses\/LICENSE\-2\.0 | Copyright\s*\(c\)/gi.test(fileText); + } + + /** + * 判断node节点中是否有famodelonly/deprecated/arkts <=1.1标签 + * + * @param {*} node + * @returns + */ + public static judgeIsDeleteApi(node: ts.Node, dirType: string) { + const notesContent = node.getFullText().replace(node.getText(), '').replace(/[\s]/g, ''); + const notesArr = notesContent.split(/\/\*\*/); + const notesStr = notesArr[notesArr.length - 1]; + const sinceArr = notesStr.match(/@since\d+/); + let sinceVersion = 20; + + if (dirType === PackagingType.ETS) { + return /@arkts1.2/g.test(notesStr); + } + + if (sinceArr) { + sinceVersion = Number(sinceArr[0].replace('@since', '')); + } + + if (dirType === PackagingType.ETS2) { + return (/@deprecated/g.test(notesStr) && sinceVersion < 20) || /@arkts<=1.1/g.test(notesStr); + } + + if (dirType === PackagingType.NO_TAG_IN_ETS2) { + return !/@arkts1.2|@arkts1.1&1.2/g.test(notesStr); + } + + return false; + } + + + /** + * @param firstNode 获取的第一个node节点 + * @returns fileJSDoc + */ + public static getFileJsdoc(firstNode: ts.Node) { + const firstNodeJSDoc = firstNode.getFullText().replace(firstNode.getText(), ''); + const jsdocs = firstNodeJSDoc.split('*/'); + let fileJSDoc = ''; + for (let i = 0; i < jsdocs.length; i++) { + const jsdoc = jsdocs[i]; + if (/\@file/.test(jsdoc)) { + fileJSDoc = jsdoc; + break; + } + } + return fileJSDoc; + } +} + +export class writeFile { + /** + * + * @param { string } path 输出文件的路径 + * @param { string } path 需要文件内容 + */ + public static rewriteFileType(outputPath: string, fileContent: string) { + const outputDir = path.dirname(outputPath); + let newPath = outputPath; + let dirType = ''; + if (!fs.existsSync(outputDir)) { + fs.mkdirSync(outputDir, { recursive: true }); + } + + if (dirType !== PackagingType.ETS && getFile.isTsFile(outputPath)) { + newPath = outputPath.replace('.d.ts', '.d.ets'); + } + fs.writeFileSync(newPath, fileContent); + } + + /** + * 添加use static字符串 + * + * @param {*} fileContent 文件内容 + * @param {*} copyrightMessage 版权头内容 + * @returns + */ + public static addStaticString(fileContent: string, copyrightMessage: string) { + const hasStaticMessage = /use\s+static/g.test(fileContent); + const regex = /\/\*\r?\n\s*\*\s*Copyright[\s\S]*?limitations under the License\.\r?\n\s*\*\//g; + const staticMessage = 'use static'; + let newContent = fileContent; + if (!hasStaticMessage) { + const newfileJsdoc = `${copyrightMessage}'${staticMessage}'\r\n`; + newContent = newContent.replace(regex, newfileJsdoc); + } + return newContent; + } + + /** + * 拼接上被删除的文件注释 + * + * @param {*} deletionContent + * @param {*} sourceFile + * @param {*} dirType + * @returns + */ + public static joinFileJsdoc(deletionContent: string, sourceFile: ts.Node, dirType: string) { + const fileJsdoc = sourceFile.getFullText().replace(sourceFile.getText(), ''); + const copyrightMessage = getFile.hasCopyright(fileJsdoc.split('*/')[0]) ? fileJsdoc.split('*/')[0] + '*/\r\n' : ''; + const regx = /@kit | @file/g; + let kitMessage = ''; + + if (regx.test(fileJsdoc)) { + kitMessage = fileJsdoc.split('*/')[1] + '*/\r\n'; + } + let newContent = deletionContent; + const isHasCopyright = getFile.hasCopyright(deletionContent); + + if (!isHasCopyright && !regx.test(deletionContent)) { + newContent = copyrightMessage + kitMessage + deletionContent; + } else if (!isHasCopyright) { + newContent = copyrightMessage + deletionContent; + } else if (isHasCopyright && !/@kit | @file/g.test(deletionContent)) { + const joinFileJsdoc = copyrightMessage + kitMessage; + newContent = deletionContent.replace(copyrightMessage, joinFileJsdoc); + } + + if (dirType !== PackagingType.ETS) { + // TODO:添加use static字符串 + } + return newContent; + } +} + +export class deleteFile { + /** + * 删除指定的arkts标签 + * + * @param {*} fileContent 文件内容 + * @param {*} regx 删除的正则表达式 + * @returns + */ + public static deleteArktsTag(fileContent: string) { + const arktsTagRegx = /\*\s*@arkts\s+1.1&1.2\s*(\r|\n)\s*|\*\s*@arkts\s*1.2s*(\r|\n)\s*/g; + fileContent = fileContent.replace(arktsTagRegx, (substring, p1) => { + return ''; + }); + return fileContent; + } + + public static deleteSameNameFile(fullPath: string) { + try { + fs.unlinkSync(fullPath); + } catch (error) { + console.error('delete file failed: ', error); + } + } +} \ No newline at end of file diff --git a/build-tools/package_tools/model/LogModel.ts b/build-tools/package_tools/model/LogModel.ts new file mode 100644 index 0000000000..598a7cccf3 --- /dev/null +++ b/build-tools/package_tools/model/LogModel.ts @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import path from 'path'; +import fs from 'fs'; +import { LogType, OperateType, PackagingType } from './Enums'; + +export interface Position { + line: number; + column: number; +} + +interface LogBaseInterface { + print(): void; +} + +export class LogModel implements LogBaseInterface { + // 文件全路径 + private filePath: string; + // 文件名 + private fileName: string; + // 打包类型 + private packagingType: PackagingType; + // 位置信息 + private position: Position; + // 打包日志 + private packagingLog: PackagingBaseLog; + + constructor(filePath: string, fileName: string, packagingType: PackagingType, position: Position, packagingLog: PackagingBaseLog) { + this.filePath = filePath; + this.fileName = fileName; + this.packagingType = packagingType; + this.position = position; + this.packagingLog = packagingLog; + } + + print(): void { + + } +} + +export interface LogParameters { + filePath: string; + packagingType: PackagingType; + position: Position; + apiPath: string; + logType: LogType; + operateType?: OperateType; + errcode?: number; + errorMessage?: string; +} + +abstract class PackagingBaseLog { + // API路径 + private apiPath: string; + // 日志类型 + private logType: LogType; + // 日志信息 + private message?: string; + // 日志实例 + private logModel?: LogModel; + + constructor(apiPath: string, logType: LogType) { + this.apiPath = apiPath; + this.logType = logType; + } + + abstract getMessage(msg: string): string; + + static emitLog(logParam: LogParameters): void { + // TODO 日志唯一入口,构建LogModel实例化对象,并push到全局对象中(process.env/globalObject + const fileName: string = path.basename(logParam.filePath) + const logModelObject: LogModel = new LogModel(logParam.filePath, fileName, logParam.packagingType, logParam.position, this) + } + + updateMessage(msg: string): void { + // TODO + } + + abstract getPackagingLogInstance(logParam: LogParameters): PackagingBaseLog; +} + +export class PackagingError extends PackagingBaseLog { + private errcode: number; + private errorMessage: string; + + constructor(errcode: number, errorMessage: string, apiPath: string, logType: LogType) { + super(apiPath, logType); + this.errcode = errcode; + this.errorMessage = this.getMessage(errorMessage); + super.updateMessage(this.errorMessage); + } + getMessage(message: string): string { + // TODO 实现组装operateMessage的方法 + return '' + } +} + +export class PackagingLog extends PackagingBaseLog { + // 操作类型 + private type: OperateType; + private operateMessage: string; + + constructor(type: OperateType, operateMessage: string, apiPath: string, logType: LogType) { + super(apiPath, logType); + this.type = type; + this.operateMessage = this.getMessage(operateMessage); + super.updateMessage(this.operateMessage); + } + getMessage(message: string): string { + // TODO 实现组装operateMessage的方法 + return '' + } +} \ No newline at end of file diff --git a/api/arkui/stateManagement/decorators/decoratorWatch.d.ets b/build-tools/package_tools/model/PackagingModel.ts similarity index 37% rename from api/arkui/stateManagement/decorators/decoratorWatch.d.ets rename to build-tools/package_tools/model/PackagingModel.ts index 9607eb38cc..4c55aaa5fa 100644 --- a/api/arkui/stateManagement/decorators/decoratorWatch.d.ets +++ b/build-tools/package_tools/model/PackagingModel.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2025 Huawei Device Co., Ltd. + * Copyright (c) 2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,29 +12,44 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * @file - * @kit ArkUI - * @arkts 1.2 - */ -import { int32 } from '@koalaui.runtime.common'; - -export type WatchFuncType = ((propertyName: string) => void); -export type WatchIdType = int32; +import { PackagingModelType } from "./Enums"; -export declare class WatchFunc { - public constructor(func: WatchFuncType) -} +export class PackagingModel { + private apiName: string; + private type: PackagingModelType; + private etsPath: string; + private ets2Path: string; -export declare interface IWatchTrigger { - addWatchSubscriber(watchId: WatchIdType): void - removeWatchSubscriber(watchId: WatchIdType): boolean - executeOnSubscribingWatches(propertyName: string): void -} + constructor(apiName: string, type: PackagingModelType, etsPath: string = '', ets2Path: string = '') { + this.apiName = apiName; + this.type = type; + this.etsPath = etsPath; + this.ets2Path = ets2Path; + } -export declare class SubscribedWatches implements IWatchTrigger { - public addWatchSubscriber(id: WatchIdType): void - public removeWatchSubscriber(id: WatchIdType): boolean - public executeOnSubscribingWatches(propertyName: string): void + setApiName(apiName: string): void { + this.apiName = apiName; + } + getApiName(): string { + return this.apiName; + } + setType(type: PackagingModelType): void { + this.type = type; + } + getType(): PackagingModelType { + return this.type; + } + setEtsPath(etsPath: string): void { + this.etsPath = etsPath; + } + getEtsPath(): string { + return this.etsPath; + } + setEts2Path(ets2Path: string): void { + this.ets2Path = ets2Path; + } + getEts2Path(): string { + return this.ets2Path; + } } \ No newline at end of file diff --git a/build-tools/package_tools/package.json b/build-tools/package_tools/package.json new file mode 100644 index 0000000000..4031720457 --- /dev/null +++ b/build-tools/package_tools/package.json @@ -0,0 +1,23 @@ +{ + "name": "package_tools", + "version": "1.0.0", + "description": "packagind tools for SDK1.2", + "main": "main.ts", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "pack": "webpack --mode=production" + }, + "author": "", + "license": "ISC", + "dependencies": { + "@types/node": "^22.13.14", + "commander": "^13.1.0", + "fs": "^0.0.1-security", + "path": "^0.12.7", + "terser-webpack-plugin": "^5.3.14", + "ts-loader": "^9.5.2", + "typescript": "npm:ohos-typescript@4.9.5-r5", + "webpack": "^5.98.0", + "webpack-cli": "^6.0.1" + } +} \ No newline at end of file diff --git a/build-tools/package_tools/src/PackagingEntry.ts b/build-tools/package_tools/src/PackagingEntry.ts new file mode 100644 index 0000000000..9dfe844c18 --- /dev/null +++ b/build-tools/package_tools/src/PackagingEntry.ts @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import fs from 'fs'; +import path from 'path'; +import { PackagingType } from "../model/Enums"; +import { PackagingModel } from "../model/PackagingModel"; +import { getApiFileName } from "../utils/utils"; + +export function packagingEntry(type: string, inputDir: string, outputDir?: string): void { + // 获取全量API路径 + const allApiFileSet: Set = collectApiFiles(inputDir); + + // 获取数据类集合 + const packagingData: PackagingModel[] = collectPackagingModels(allApiFileSet, type); + + // 处理API文件 + outputDir = outputDir ?? inputDir; + handleApiFileByType(packagingData, type, outputDir); +} + + +/** + * 获取全路径集合 + * + * @param {string} rootPath + */ +function collectApiFiles(rootPath: string): Set { + const allApiFilePathSet: Set = new Set(); + const fileNames: string[] = fs.readdirSync(rootPath); + const apiRootPath = rootPath.replace(/\\/g, '/'); + fileNames.forEach(fileName => { + const apiPath: string = path.join(apiRootPath, fileName); + const stat: fs.Stats = fs.statSync(apiPath); + if (stat.isDirectory()) { + getApiFileName(apiPath, apiRootPath, allApiFilePathSet); + } else { + allApiFilePathSet.add(fileName); + } + }); + // 此处应收集文件全路径集合,不应分rootdir与realpath + return allApiFilePathSet; +} + +/** + * 获取数据类 + * + * @param {Set} allApiFiles + * @param {PackagingType} type + */ +function collectPackagingModels(allApiFiles: Set, type: string): PackagingModel[] { + const packagingData: PackagingModel[] = []; + for (const apiFiles of allApiFiles) { + // TODO new PackagingModel() + } + return packagingData; +} + +/** + * 根据传入的type值去处理文件 + * + * @param {PackagingModel[]} packagingData + * @param {PackagingType} type + * @param {string} outputDir + */ +function handleApiFileByType(packagingData: PackagingModel[], type: string, outputDir: string): void { + // TODO 当outputDir未传入时,默认修改入口路径 +} \ No newline at end of file diff --git a/build-tools/package_tools/src/handleApiMainPage.ts b/build-tools/package_tools/src/handleApiMainPage.ts new file mode 100644 index 0000000000..e82c768b8e --- /dev/null +++ b/build-tools/package_tools/src/handleApiMainPage.ts @@ -0,0 +1,499 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { fileDir } from '../model/Constants'; +import { PackagingType } from '../model/Enums'; +import { deleteFile, getFile, writeFile } from '../model/FileModify'; + +import fs from 'fs'; +import path from 'path'; +import commander from 'commander'; +import ts from 'typescript'; + +// 处理的目录类型 +const deleteApiSet: Set = new Set(); +let dirType: string = ''; + +/** + * 配置参数 + */ +export function start() { + const program = new commander.Command(); + program + .name('handleApiFile') + .version('0.0.1'); + program + .option('--path ', 'path name') + .option('--type ', 'handle type') + .option('--output [string]', 'output path') + .action((opts) => { + dirType = opts.type; + handleApiFiles(opts.path, opts.type, opts.output); + }); + program.parse(process.argv); +} + +/** + * 处理API文件的入口函数 + * + * @param {*} rootPath + * @param {*} type + */ +function handleApiFiles(rootPath: string, type: string, output: string) { + const allApiFilePathSet: Set = new Set(); + const fileNames = fs.readdirSync(rootPath); + const apiRootPath = rootPath.replace(/\\/g, '/'); + fileNames.forEach(fileName => { + const apiPath = path.join(apiRootPath, fileName); + const stat = fs.statSync(apiPath); + if (fileDir.NOT_COPY_DIR.includes(fileName)) { + return; + } + + if (stat.isDirectory()) { + getFile.getApiFileName(apiPath, apiRootPath, allApiFilePathSet); + } else { + allApiFilePathSet.add(fileName); + } + + }); + + for (const apiRelativePath of allApiFilePathSet) { + try { + handleApiFileByType(apiRelativePath as string, rootPath, type, output); + } catch (error) { + console.log('error===>', error); + } + } +} + +/** + * 根据传入的type值去处理文件 + * + * @param {*} apiRelativePath + * @param {*} allApiFilePathSet + * @param {*} rootPath + * @param {*} type + * @returns + */ +function handleApiFileByType(apiRelativePath: string, rootPath: string, type: string, output: string) { + const fullPath = path.join(rootPath, apiRelativePath); + const isEndWithEts = getFile.isEtsFile(apiRelativePath); + const isEndWithTs = getFile.isTsFile(apiRelativePath); + const outputPath = output ? path.join(output, apiRelativePath) : fullPath; + const fileContent = fs.readFileSync(fullPath, 'utf-8'); + + if (!isEndWithEts && !isEndWithTs) { + writeFile.rewriteFileType(outputPath, fileContent); + return; + } + if (type === 'ets2' && !(getFile.hasEtsFile(fullPath) && isEndWithTs)) { + handleFileInSecondType(apiRelativePath, fullPath, type, output); + } else if (type === 'ets' && !(getFile.hasTsFile(fullPath) && isEndWithEts)) { + handleFileInFirstType(apiRelativePath, fullPath, type, output); + } +} + +/** + * 处理文件过滤 if arkts 1.1|1.2|1.1&1.2 定义 + * + * @param {*} type + * @param {*} fileContent + * @returns + */ +function handleArktsDefinition(type: string, fileContent: string) { + let regx = /\/\*\*\* if arkts 1\.1 \*\/\s*([\s\S]*?)\s*\/\*\*\* endif \*\//g; + let regx2 = /\/\*\*\* if arkts 1\.2 \*\/\s*([\s\S]*?)\s*\/\*\*\* endif \*\//g; + let regx3 = /\/\*\*\* if arkts 1\.1\&1\.2 \*\/\s*([\s\S]*?)\s*\/\*\*\* endif \*\//g; + fileContent = fileContent.replace(regx, (substring, p1) => { + return type === 'ets' ? p1 : ''; + }); + fileContent = fileContent.replace(regx2, (substring, p1) => { + if (type === 'ets2') { + return p1.replace(/(\s*)(\*\s\@since)/g, '$1* @arkts 1.2$1$2'); + } else { + return ''; + } + }); + fileContent = fileContent.replace(regx3, (substring, p1) => { + if (type === 'ets') { + return p1; + } else { + return p1.replace(/(\s*)(\*\s\@since)/g, '$1* @arkts 1.2$1$2'); + } + }); + return fileContent; +} + +/** + * 保留每个api最新一段jsdoc + * + * @param {*} fileContent + * @returns + */ +function saveLatestJsDoc(fileContent: string) { + let regx = /(\/\*[\s\S]*?\*\*\/)/g; + + fileContent = fileContent.split('').reverse().join(''); + let preset = 0; + fileContent = fileContent.replace(regx, (substring, p1, offset, str) => { + if (!/ecnis@\s*\*/g.test(substring)) { + return substring; + } + const preStr = str.substring(preset, offset); + preset = offset + substring.length; + if (/\S/g.test(preStr)) { + return substring; + } + return ''; + }); + fileContent = fileContent.split('').reverse().join(''); + return fileContent; +} + +/** + * 处理ets目录 + * + * @param {string} apiRelativePath + * @param {string} fullPath + * @returns + */ +function handleFileInFirstType(apiRelativePath: string, fullPath: string, type: string, output: string) { + const outputPath = output ? path.join(output, apiRelativePath) : fullPath; + let fileContent = fs.readFileSync(fullPath, 'utf-8'); + //删除使用/*** if arkts 1.2 */ + fileContent = handleArktsDefinition(type, fileContent); + + const sourceFile = ts.createSourceFile(path.basename(apiRelativePath), fileContent, ts.ScriptTarget.ES2017, true); + const secondRegx = /(?:@arkts1.2only|@arkts\s+>=\s*1.2|@arkts\s*1.2)/; + const thirdRegx = /(?:\*\s*@arkts\s+1.1&1.2\s*(\r|\n)\s*)/; + if (sourceFile.statements.length === 0) { + // reference文件识别不到首段jsdoc,全文匹配1.2标签,有的话直接删除 + if (secondRegx.test(sourceFile.getFullText())) { + return; + } + // 标有@arkts 1.1&1.2的声明文件,处理since版本号,删除@arkts 1.1&1.2标签 + if (thirdRegx.test(sourceFile.getFullText())) { + fileContent = handleSinceInFirstType(deleteFile.deleteArktsTag(fileContent)); + writeFile.rewriteFileType(outputPath, fileContent); + return; + } + + handleNoTagFileInFirstType(sourceFile, outputPath, fileContent); + return; + } + const firstNode = sourceFile.statements.find(statement => { + return !ts.isExpressionStatement(statement); + }); + + + if (firstNode) { + const firstJsdocText = getFile.getFileJsdoc(firstNode); + // 标有1.2标签的声明文件,不拷贝 + if (secondRegx.test(firstJsdocText)) { + return; + } + // 标有@arkts 1.1&1.2的声明文件,处理since版本号,删除@arkts 1.1&1.2标签 + if (thirdRegx.test(firstJsdocText)) { + fileContent = handleSinceInFirstType(deleteFile.deleteArktsTag(fileContent)); + writeFile.rewriteFileType(outputPath, fileContent); + return; + } + } + + handleNoTagFileInFirstType(sourceFile, outputPath, fileContent); +} + +/** + * 处理1.1目录中无arkts标签的文件 + * @param {*} sourceFile + * @param {*} outputPath + * @returns + */ +function handleNoTagFileInFirstType(sourceFile: ts.SourceFile, outputPath: string, fileContent: string) { + if (path.basename(outputPath) === 'index-full.d.ts') { + writeFile.rewriteFileType(outputPath, fileContent); + return; + } + fileContent = deleteApi(sourceFile); + + if (fileContent === '') { + return; + } + fileContent = deleteFile.deleteArktsTag(fileContent); + fileContent = writeFile.joinFileJsdoc(fileContent, sourceFile, dirType); + + fileContent = handleSinceInFirstType(fileContent); + writeFile.rewriteFileType(outputPath, fileContent); +} + + +/** + * 生成1.1目录里文件时,需要去掉since标签里的1.2版本号 + * + * @param {*} sourceFile + * @param {*} fullPath + */ +function handleSinceInFirstType(fileContent: string) { + const regx = /@since\s+arkts\s*(\{.*\})/g; + fileContent = fileContent.replace(regx, (substring, p1) => { + return '@since ' + JSON.parse(p1.replace(/'/g, '"'))['1.1']; + }); + return fileContent; +} + +/** + * 处理ets2目录 + * + * @param {string} fullPath 文件完整路径 + * @returns + */ +function handleFileInSecondType(apiRelativePath: string, fullPath: string, type: string, output: string) { + const secondRegx = /(?:@arkts1.2only|@arkts\s+>=\s*1.2|@arkts\s*1.2)/; + const thirdRegx = /(?:\*\s*@arkts\s+1.1&1.2\s*(\r|\n)\s*)/; + const arktsRegx = /\/\*\*\* if arkts (1.1&)?1.2 \*\/\s*([\s\S]*?)\s*\/\*\*\* endif \*\//g; + let fileContent = fs.readFileSync(fullPath, 'utf-8'); + let sourceFile = ts.createSourceFile(path.basename(fullPath), fileContent, ts.ScriptTarget.ES2017, true); + const outputPath = output ? path.join(output, apiRelativePath) : fullPath; + if (!secondRegx.test(fileContent) && !thirdRegx.test(fileContent) && arktsRegx.test(fileContent)) { + saveApiByArktsDefinition(sourceFile, fileContent, outputPath); + return; + } + //删除使用/*** if arkts 1.2 */ + fileContent = handleArktsDefinition(type, fileContent); + sourceFile = ts.createSourceFile(path.basename(fullPath), fileContent, ts.ScriptTarget.ES2017, true); + const regx = /(?:@arkts1.1only|@arkts\s+<=\s+1.1)/; + if (sourceFile.statements.length === 0) { + // 有1.2标签的文件,删除标记 + if (secondRegx.test(sourceFile.getFullText())) { + writeFile.rewriteFileType(outputPath, deleteFile.deleteArktsTag(fileContent)); + return; + } + // 处理标有@arkts 1.1&1.2的声明文件 + if (thirdRegx.test(sourceFile.getFullText())) { + handlehasTagFile(sourceFile, outputPath); + return; + } + // 处理既没有@arkts 1.2,也没有@arkts 1.1&1.2的声明文件 + handleNoTagFileInSecondType(sourceFile, outputPath); + return; + } + + const firstNode = sourceFile.statements.find(statement => { + return !ts.isExpressionStatement(statement); + }); + + if (firstNode) { + const firstJsdocText = getFile.getFileJsdoc(firstNode); + if (regx.test(firstJsdocText)) { + return; + } + // 有1.2标签的文件,删除标记 + if (secondRegx.test(firstJsdocText)) { + writeFile.rewriteFileType(outputPath, deleteFile.deleteArktsTag(fileContent)); + return; + } + // 处理标有@arkts 1.1&1.2的声明文件 + if (thirdRegx.test(firstJsdocText)) { + handlehasTagFile(sourceFile, outputPath); + return; + } + } + + // 处理既没有@arkts 1.2,也没有@arkts 1.1&1.2的声明文件 + handleNoTagFileInSecondType(sourceFile, outputPath); +} + +/** + * 处理有@arkts 1.1&1.2标签的文件 + * @param {*} outputPath + */ +function handlehasTagFile(sourceFile: ts.SourceFile, outputPath: string) { + dirType = PackagingType.ETS2; + let newContent = getDeletionContent(sourceFile); + if (newContent === '') { + return; + } + // 保留最后一段注释 + newContent = saveLatestJsDoc(newContent); + writeFile.rewriteFileType(outputPath, deleteFile.deleteArktsTag(newContent)); +} + +/** + * 处理1.2目录中无arkts标签的文件 + * @param {*} sourceFile + * @param {*} outputPath + * @returns + */ +function handleNoTagFileInSecondType(sourceFile: ts.SourceFile, outputPath: string) { + dirType = PackagingType.NO_TAG_IN_ETS2; + const arktsTagRegx = /\*\s*@arkts\s+1.1&1.2\s*(\r|\n)\s*|@arkts\s*1.2/g; + const fileContent = sourceFile.getFullText(); + // API未标@arkts 1.2或@arkts 1.1&1.2标签,删除文件 + if (!arktsTagRegx.test(fileContent)) { + if (!fileDir.API_NO_TAGS_FILTER_LIST.includes(path.basename(outputPath))) { + writeFile.rewriteFileType(outputPath, writeFile.joinFileJsdoc(fileContent, sourceFile, dirType)); + } + // TODO:api未标标签,删除文件 + return; + } + let newContent = getDeletionContent(sourceFile); + if (newContent === '') { + return; + } + // 保留最后一段注释 + newContent = saveLatestJsDoc(newContent); + newContent = deleteFile.deleteArktsTag(newContent); + writeFile.rewriteFileType(outputPath, newContent); +} + +/** + * 生成1.2目录里文件时,需要去掉since标签里的dynamic版本号 + * + * @param {*} fileContent + * @returns + */ +function handleSinceInSecondType(fileContent: string) { + const regx = /@since\s+arkts\s*(\{.*\})/g; + fileContent = fileContent.replace(regx, (substring, p1) => { + return '@since ' + JSON.parse(p1.replace(/'/g, '"'))['1.2']; + }); + return fileContent; +} + + +function getDeletionContent(sourceFile: ts.SourceFile) { + const deletionContent = deleteApi(sourceFile); + if (deletionContent === '') { + return ''; + } + let newContent = writeFile.joinFileJsdoc(deletionContent, sourceFile, dirType); + + // 处理since版本 + newContent = handleSinceInSecondType(newContent); + return newContent; +} + +function collectDeletionApiName(node: ts.Node) { + if (!ts.isImportClause(node)) { + deleteApiSet.add((node as ts.ImportClause).name?.getText()); + return; + } + if (ts.isImportDeclaration(node) && (node as ts.ImportDeclaration).importClause?.name) { + deleteApiSet.add((node as ts.ImportDeclaration).importClause?.name?.escapedText.toString()); + return; + } + const namedBindings = node.namedBindings; + if (namedBindings !== undefined && ts.isNamedImports(namedBindings)) { + const elements = namedBindings.elements; + elements.forEach((element) => { + const exportName = element.propertyName ? + element.propertyName.escapedText.toString() : + element.name.escapedText.toString(); + deleteApiSet.add(exportName); + }); + } +} + +/** + * 删除API + * @param {*} sourceFile + * @returns + */ +function deleteApi(sourceFile: ts.SourceFile) { + let result = ts.transform(sourceFile, [transformer]); + const newSourceFile = result.transformed[0]; + if (getFile.isEmptyFile(newSourceFile)) { + return ''; + } + + // 打印结果 + const printer = ts.createPrinter(); + let fileContent = printer.printFile(newSourceFile as ts.SourceFile); + result = ts.transform(newSourceFile, [transformExportApi]); + fileContent = printer.printFile(result.transformed[0] as ts.SourceFile); + deleteApiSet.clear(); + return fileContent.replace(/export\s*(?:type\s*)?\{\s*\}\s*(;)?/g, ''); +} + +// 创建 Transformer +const transformer = (context: ts.TransformationContext) => { + return (rootNode: ts.Node) => { + const visit = (node: ts.Node) => { + //struct节点下面会自动生成constructor节点, 置为undefined + if (node.kind === ts.SyntaxKind.Constructor && node.parent.kind === ts.SyntaxKind.StructDeclaration) { + return undefined; + } + // 判断是否为要删除的变量声明 + if (fileDir.apiNodeTypeArr.includes(node.kind) && getFile.judgeIsDeleteApi(node, dirType)) { + collectDeletionApiName(node); + // 删除该节点 + return undefined; + } + + // 非目标节点:继续遍历子节点 + return ts.visitEachChild(node, visit, context); + }; + return ts.visitNode(rootNode, visit); + }; +}; + +/** + * 没有arkts标签,但有if arkts 1.2和1.1&1.2的情况 + * @param {*} sourceFile + * @param {*} fileContent + * @param {*} outputPath + */ +function saveApiByArktsDefinition(sourceFile: ts.SourceFile, fileContent: string, outputPath: string) { + const regx = /\/\*\*\* if arkts (1.1&)?1.2 \*\/\s*([\s\S]*?)\s*\/\*\*\* endif \*\//g; + const regex = /\/\*\r?\n\s*\*\s*Copyright[\s\S]*?limitations under the License\.\r?\n\s*\*\//g; + const copyrightMessage = fileContent.match(regex)?.[0]; + const firstNode = sourceFile.statements.find(statement => { + return !ts.isExpressionStatement(statement); + }); + let fileJsdoc = firstNode ? getFile.getFileJsdoc(firstNode) + '*/\n' : ''; + let newContent = copyrightMessage + fileJsdoc + Array.from(fileContent.matchAll(regx), match => match[2]).join('\n'); + + writeFile.rewriteFileType(outputPath, saveLatestJsDoc(newContent)); +} + + +/** + * api被删除后,对应的export api也需要被删除 + * @param {*} context + * @returns + */ +const transformExportApi = (context: ts.TransformationContext) => { + return (rootNode: ts.Node) => { + const visit = (node: ts.Node) => { + //struct节点下面会自动生成constructor节点, 置为undefined + if (node.kind === ts.SyntaxKind.Constructor && node.parent.kind === ts.SyntaxKind.StructDeclaration) { + return undefined; + } + // 判断是否为要删除的变量声明 + if (ts.isExportAssignment(node) && deleteApiSet.has(node.expression.getText().toString())) { + return undefined; + } + + if (ts.isExportSpecifier(node) && deleteApiSet.has(node.name.escapedText.toString())) { + return undefined; + } + + // 非目标节点:继续遍历子节点 + return ts.visitEachChild(node, visit, context); + }; + return ts.visitNode(rootNode, visit); + }; +}; \ No newline at end of file diff --git a/build-tools/package_tools/tsconfig.json b/build-tools/package_tools/tsconfig.json new file mode 100644 index 0000000000..ef92221cff --- /dev/null +++ b/build-tools/package_tools/tsconfig.json @@ -0,0 +1,96 @@ +{ + "compilerOptions": { + /* Visit https://aka.ms/tsconfig.json to read more about this file */ + /* Projects */ + // "incremental": true, /* Enable incremental compilation */ + // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ + // "tsBuildInfoFile": "./", /* Specify the folder for .tsbuildinfo incremental compilation files. */ + // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects */ + // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ + // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ + /* Language and Environment */ + "target": "es2020", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ + "lib": [ + "es2015", + "es2020" + ], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ + // "jsx": "preserve", /* Specify what JSX code is generated. */ + "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */ + // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ + // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h' */ + // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ + // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx*`.` */ + // "reactNamespace": "", /* Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit. */ + // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ + // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ + /* Modules */ + "module": "commonjs", /* Specify what module code is generated. */ + // "rootDir": "./", /* Specify the root folder within your source files. */ + // "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */ + // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ + // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ + // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ + // "typeRoots": [], /* Specify multiple folders that act like `./node_modules/@types`. */ + // "types": [], /* Specify type package names to be included without being referenced in a source file. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + "resolveJsonModule": true, /* Enable importing .json files */ + // "noResolve": true, /* Disallow `import`s, `require`s or ``s from expanding the number of files TypeScript should add to a project. */ + /* JavaScript Support */ + // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */ + // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ + // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`. */ + /* Emit */ + // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ + // "declarationMap": true, /* Create sourcemaps for d.ts files. */ + // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ + // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ + // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */ + // "outDir": "./", /* Specify an output folder for all emitted files. */ + // "removeComments": true, /* Disable emitting comments. */ + // "noEmit": true, /* Disable emitting files from a compilation. */ + // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ + // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types */ + // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ + // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ + // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ + // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ + // "newLine": "crlf", /* Set the newline character for emitting files. */ + // "stripInternal": true, /* Disable emitting declarations that have `@internal` in their JSDoc comments. */ + // "noEmitHelpers": true, /* Disable generating custom helper functions like `__extends` in compiled output. */ + // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ + // "preserveConstEnums": true, /* Disable erasing `const enum` declarations in generated code. */ + // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ + // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ + /* Interop Constraints */ + // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ + // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ + "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */ + // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ + "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */ + /* Type Checking */ + "strict": true, /* Enable all strict type-checking options. */ + // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied `any` type.. */ + // "strictNullChecks": true, /* When type checking, take into account `null` and `undefined`. */ + // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ + // "strictBindCallApply": true, /* Check that the arguments for `bind`, `call`, and `apply` methods match the original function. */ + // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ + // "noImplicitThis": true, /* Enable error reporting when `this` is given the type `any`. */ + // "useUnknownInCatchVariables": true, /* Type catch clause variables as 'unknown' instead of 'any'. */ + // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ + // "noUnusedLocals": true, /* Enable error reporting when a local variables aren't read. */ + // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read */ + // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ + // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ + // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ + // "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */ + // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ + // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type */ + // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ + // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ + /* Completeness */ + // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ + // "skipLibCheck": true /* Skip type checking all .d.ts files. */ + } +} \ No newline at end of file diff --git a/api/arkui/stateManagement/base/backingValue.d.ets b/build-tools/package_tools/utils/Log.ts similarity index 76% rename from api/arkui/stateManagement/base/backingValue.d.ets rename to build-tools/package_tools/utils/Log.ts index 0a915e71f3..bf5736961a 100644 --- a/api/arkui/stateManagement/base/backingValue.d.ets +++ b/build-tools/package_tools/utils/Log.ts @@ -12,14 +12,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * @file - * @kit ArkUI - * @arkts 1.2 - */ - export declare class BackingValue { - public constructor(initValue: T) - public get value(): T - public set value(newVale: T) - } \ No newline at end of file +// TODO 补充日志分析接口 \ No newline at end of file diff --git a/build-tools/package_tools/utils/Utils.ts b/build-tools/package_tools/utils/Utils.ts new file mode 100644 index 0000000000..3a92a62459 --- /dev/null +++ b/build-tools/package_tools/utils/Utils.ts @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Command } from 'commander'; +import fs from 'fs'; +import path from 'path'; +import { OperateType } from '../model/Enums'; +import { OPERATE_MESSAGE_MAP } from '../model/Constants'; + +export function makePackagingOption(name: string, version: string, customCallback: Function): Command { + const program: Command = new Command(); + program + .name(name) + .version(version); + program + .option('--path ', 'path name') + .option('--type ', 'handle type') + .action((opts) => { + customCallback(opts.path, opts.type); + }); + return program; +} + +/** + * + * @param { string } apiPath 需要处理的api文件所在路径 + * @param { string } rootPath ets文件夹路径 + * @returns { Set } 需要处理的api文件的相对于ets目录的路径 + */ +export function getApiFileName(apiPath: string, rootPath: string, allApiFilePathSet: Set) { + const apiFilePathSet: Set = new Set(); + const fileNames: string[] = fs.readdirSync(apiPath); + + fileNames.forEach((fileName: string) => { + const apiFilePath: string = path.join(apiPath, fileName).replace(/\\/g, '/'); + const stat: fs.Stats = fs.statSync(apiFilePath); + + if (stat.isDirectory()) { + getApiFileName(apiFilePath, rootPath, allApiFilePathSet); + } else { + const apiRelativePath: string = apiFilePath.replace(rootPath, ''); + allApiFilePathSet.add(apiRelativePath); + } + }); + return apiFilePathSet; +} + +export function getOperateMessage(operateType: OperateType, ...supplys: string[]): string { + const operateMessage: string | undefined = OPERATE_MESSAGE_MAP.get(operateType); + supplys.forEach((supply: string, index: number) => { + // TODO 替换$2 + }); + return operateMessage ?? ''; +} \ No newline at end of file diff --git a/build-tools/package_tools/webpack.config.js b/build-tools/package_tools/webpack.config.js new file mode 100644 index 0000000000..ddc7bcf8d6 --- /dev/null +++ b/build-tools/package_tools/webpack.config.js @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +const path = require('path'); +const TerserPlugin = require('terser-webpack-plugin'); +const packageInfo = require('./package.json'); + +module.exports = (env, argv) => { + const config = { + name: 'package_tools', + target: 'node', + mode: 'none', + entry: './main.ts', + module: { + rules: [ + { + test: /\.ts$/, + include: path.resolve(__dirname, './'), + exclude: [/node_modules/, /test/], + loader: 'ts-loader', + options: { + onlyCompileBundledFiles: true, + }, + }, + { + test: /build\.json$/, + use: [ + { + loader: path.resolve(__dirname, 'loader/flavor.js'), + }, + ], + }, + ], + }, + resolve: { + extensions: ['.js', '.ts', '.json'], + }, + output: { + filename: `${packageInfo.name}.js`, + path: path.resolve(__dirname, './package'), + }, + optimization: { + minimize: true, + minimizer: [new TerserPlugin({ extractComments: false })], + }, + plugins: [] + }; + return config; +}; diff --git a/build-tools/remove_declgen.json b/build-tools/remove_declgen.json new file mode 100644 index 0000000000..a14b25c42c --- /dev/null +++ b/build-tools/remove_declgen.json @@ -0,0 +1,6 @@ +{ + "removeFile": [ + "api\\@internal\\component\\ets\\ability_component.d.ts", + "api\\@internal\\component\\ets\\action_sheet.d.ts" + ] +} \ No newline at end of file diff --git a/build_api_check_plugin.py b/build_api_check_plugin.py new file mode 100755 index 0000000000..4f833e5984 --- /dev/null +++ b/build_api_check_plugin.py @@ -0,0 +1,74 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import argparse +import os +import shutil +import subprocess +import sys +import tarfile + + +def copy_files(source_path, dest_path, is_file=False): + try: + if is_file: + os.makedirs(os.path.dirname(dest_path), exist_ok=True) + shutil.copy(source_path, dest_path) + else: + shutil.copytree(source_path, dest_path, dirs_exist_ok=True, + symlinks=True) + except Exception as err: + raise Exception("Copy files failed. Error: " + str(err)) from err + + +def run_cmd(cmd, execution_path=None): + proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, + stdin=subprocess.PIPE, + stderr=subprocess.PIPE, + cwd=execution_path) + stdout, stderr = proc.communicate(timeout=1000) + if proc.returncode != 0: + raise Exception(stderr.decode()) + + +def build(options): + build_cmd = [options.npm, 'run', 'compile:plugins'] + run_cmd(build_cmd, options.source_path) + + +def copy_output(options): + copy_files(os.path.join(options.source_path, './lib'), + os.path.join(options.output_path, 'api-check-plugin')) + + +def parse_args(): + parser = argparse.ArgumentParser() + parser.add_argument('--npm', help='path to a npm exetuable') + parser.add_argument('--source_path', help='path to api_check_plugin source') + parser.add_argument('--output_path', help='path to output') + + options = parser.parse_args() + return options + + +def main(): + options = parse_args() + + build(options) + copy_output(options) + + +if __name__ == '__main__': + sys.exit(main()) \ No newline at end of file diff --git a/bundle.json b/bundle.json index fec963ac42..16480eec56 100644 --- a/bundle.json +++ b/bundle.json @@ -28,7 +28,7 @@ "rom": "0KB", "ram": "0KB", "deps": { - "components": [], + "components": ["runtime_core"], "third_party": [] }, "build": { diff --git a/kits/@kit.AbilityKit.d.ts b/kits/@kit.AbilityKit.d.ts index 793da982bf..376cdad043 100644 --- a/kits/@kit.AbilityKit.d.ts +++ b/kits/@kit.AbilityKit.d.ts @@ -142,9 +142,13 @@ import bundleResourceManager from '@ohos.bundle.bundleResourceManager'; import defaultAppManager from '@ohos.bundle.defaultAppManager'; import distributedBundleManager from '@ohos.bundle.distributedBundleManager'; import freeInstall from '@ohos.bundle.freeInstall'; +import defaultAppManager from '@ohos.bundle.defaultAppManager'; +import distributedBundleManager from '@ohos.bundle.distributedBundleManager'; +import freeInstall from '@ohos.bundle.freeInstall'; import installer from '@ohos.bundle.installer'; import launcherBundleManager from '@ohos.bundle.launcherBundleManager'; import overlay from '@ohos.bundle.overlay'; +import overlay from '@ohos.bundle.overlay'; import shortcutManager from '@ohos.bundle.shortcutManager'; export { diff --git a/kits/@kit.ArkUI.d.ts b/kits/@kit.ArkUI.d.ts index edf5484bbf..9f86bb4439 100644 --- a/kits/@kit.ArkUI.d.ts +++ b/kits/@kit.ArkUI.d.ts @@ -53,19 +53,22 @@ import { import { ComposeTitleBar, ComposeTitleBarMenuItem } from '@ohos.arkui.advanced.ComposeTitleBar'; import { CounterComponent, CounterOptions, CounterType, DateData } from '@ohos.arkui.advanced.Counter'; import { - AlertDialog, ButtonOptions, ConfirmDialog, LoadingDialog, SelectDialog, TipsDialog, CustomContentDialog, PopoverDialog, PopoverOptions, + AlertDialog, ButtonOptions, ConfirmDialog, LoadingDialog, SelectDialog, TipsDialog, CustomContentDialog, PopoverDialog, PopoverOptions } from '@ohos.arkui.advanced.Dialog'; import { AlertDialogV2, AdvancedDialogV2Button, AdvancedDialogV2ButtonOptions, AdvancedDialogV2ButtonAction, AdvancedDialogV2OnCheckedChange, - ConfirmDialogV2, LoadingDialogV2, SelectDialogV2, TipsDialogV2, CustomContentDialogV2, PopoverDialogV2, PopoverDialogV2OnVisibleChange, PopoverDialogV2Options, + ConfirmDialogV2, LoadingDialogV2, SelectDialogV2, TipsDialogV2, CustomContentDialogV2, PopoverDialogV2, + PopoverDialogV2OnVisibleChange, PopoverDialogV2Options } from '@ohos.arkui.advanced.DialogV2'; import { - EditableLeftIconType, EditableTitleBar, EditableTitleBarMenuItem, EditableTitleBarItem, EditableTitleBarOptions, + EditableLeftIconType, EditableTitleBar, EditableTitleBarMenuItem, EditableTitleBarItem, EditableTitleBarOptions } from '@ohos.arkui.advanced.EditableTitleBar'; import { MarginType, PromptOptions, ExceptionPrompt } from '@ohos.arkui.advanced.ExceptionPrompt'; import { Filter, FilterParams, FilterResult, FilterType } from '@ohos.arkui.advanced.Filter'; import { AddFormMenuItem, FormMenuItemStyle, AddFormOptions } from '@ohos.arkui.advanced.FormMenu'; -import { GridObjectSortComponentType, GridObjectSortComponentItem, GridObjectSortComponentOptions, GridObjectSortComponent } from '@ohos.arkui.advanced.GridObjectSortComponent'; +import { GridObjectSortComponentType, GridObjectSortComponentItem, GridObjectSortComponentOptions, + GridObjectSortComponent +} from '@ohos.arkui.advanced.GridObjectSortComponent'; import { Popup, PopupButtonOptions, PopupIconOptions, PopupOptions, PopupTextOptions } from '@ohos.arkui.advanced.Popup'; @@ -97,7 +100,9 @@ import { InterstitialDialogAction, IconStyle, TitlePosition, BottomOffset } from import componentSnapshot from '@ohos.arkui.componentSnapshot'; import componentUtils from '@ohos.arkui.componentUtils'; import dragController from '@ohos.arkui.dragController'; -import { DrawableDescriptor, LayeredDrawableDescriptor, PixelMapDrawableDescriptor, AnimationOptions, AnimatedDrawableDescriptor } from '@ohos.arkui.drawableDescriptor'; +import { DrawableDescriptor, LayeredDrawableDescriptor, PixelMapDrawableDescriptor, AnimationOptions, + AnimatedDrawableDescriptor +} from '@ohos.arkui.drawableDescriptor'; import inspector from '@ohos.arkui.inspector'; import { NodeRenderType, RenderOptions, BuilderNode, BuildOptions, NodeController, FrameNode, DrawContext, Size, Offset, Position, Pivot, @@ -249,7 +254,8 @@ export { LabelOptions, LayeredDrawableDescriptor, LoadingDialog, LocaleResponse, MarginType, Matrix4, MeasureOptions, MeasureText, MediaQuery, MediaQueryEvent, MediaQueryList, NodeController, NodeParam, NodeRenderType, Offset, OperateButton, OperateCheck, OperateIcon, OperateItem, OperationOption, OperationType, OverlayManager, PathShape, PiPWindow, Pivot, Popup, PopupButtonOptions, PopupIconOptions, PopupOptions, - PopupTextOptions, Position, PrefixIconOptions, ProgressButton, ProgressButtonV2, ProgressButtonV2Color, ProgressButtonV2ColorOptions, Prompt, PromptAction, PromptOptions, RectShape, RenderNode, RenderOptions, BuildOptions, + PopupTextOptions, Position, PrefixIconOptions, ProgressButton, ProgressButtonV2, ProgressButtonV2Color, + ProgressButtonV2ColorOptions, Prompt, PromptAction, PromptOptions, RectShape, RenderNode, RenderOptions, BuildOptions, RequestFullWindowOptions, Rotation, Router, RouterOptions, RouterState, Scale, ScreenOnVisibleOptions, SegmentButton, SegmentButtonItemOptionsArray, SegmentButtonOptions, SelectDialog, SelectOptions, SelectTitleBar, SelectTitleBarMenuItem, SelectionMenu, SelectionMenuOptions, ShapeMask, ShapeClip, ShowActionMenuOptions, ShowDialogOptions, ShowDialogSuccessResponse, AppStorageV2, PersistenceV2, Type, UIUtils, diff --git a/kits/@kit.ImageKit.d.ts b/kits/@kit.ImageKit.d.ts index 529fd7c15e..67a8cdbe4e 100644 --- a/kits/@kit.ImageKit.d.ts +++ b/kits/@kit.ImageKit.d.ts @@ -18,8 +18,12 @@ * @kit ImageKit */ +/*** if arkts 1.1 */ import image from '@ohos.multimedia.image'; import sendableImage from '@ohos.multimedia.sendableImage'; import videoProcessingEngine from '@ohos.multimedia.videoProcessingEngine'; export { image, sendableImage, videoProcessingEngine }; + +export { image }; +/*** endif */ \ No newline at end of file diff --git a/kits/@kit.MultimodalAwarenessKit.d.ts b/kits/@kit.MultimodalAwarenessKit.d.ts index 605939d0a7..e4703c11e8 100644 --- a/kits/@kit.MultimodalAwarenessKit.d.ts +++ b/kits/@kit.MultimodalAwarenessKit.d.ts @@ -18,7 +18,6 @@ * @kit MultimodalAwarenessKit */ -import stationary from '@ohos.stationary'; import motion from '@ohos.multimodalAwareness.motion'; import deviceStatus from '@ohos.multimodalAwareness.deviceStatus'; import metadataBinding from '@ohos.multimodalAwareness.metadataBinding'; diff --git a/kits/@kit.PerformanceAnalysisKit.d.ts b/kits/@kit.PerformanceAnalysisKit.d.ts index 2d9730b266..0e52f38c10 100644 --- a/kits/@kit.PerformanceAnalysisKit.d.ts +++ b/kits/@kit.PerformanceAnalysisKit.d.ts @@ -18,6 +18,7 @@ * @kit PerformanceAnalysisKit */ +/*** if arkts 1.1&1.2 */ import FaultLogger from '@ohos.faultLogger'; import hiAppEvent from '@ohos.hiviewdfx.hiAppEvent'; import hichecker from '@ohos.hichecker'; @@ -33,3 +34,4 @@ export { FaultLogger, hiAppEvent, hiSysEvent, hiTraceChain, hiTraceMeter, hichecker, hidebug, hilog, logLibrary, jsLeakWatcher }; +/*** endif */ diff --git a/run_compile_declgen.py b/run_compile_declgen.py new file mode 100755 index 0000000000..52b72297a5 --- /dev/null +++ b/run_compile_declgen.py @@ -0,0 +1,93 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import sys +import subprocess +import argparse +import shutil +import tarfile +from pathlib import Path + +PACKAGE_PATH = "interface/sdk-js/build-tools/declgen.js" +TOOL_WAREHOURSE = 'interface/sdk-js/build-tools' + + +def ensure_dir_exists(target_path): + path = Path(target_path).absolute() + if not path.exists(): + print(f"compile_declgen out_path not exit and creating:{path}") + path.mkdir(parents=True, exist_ok=True) + return str(path) + else: + print(f"compile_declgen out_path already exit:{path}") + return str(path) + + +def traverse_function(source_root_dir: str, input_path: str, node_js: str): + source_root_dir = os.path.abspath(source_root_dir) + input_dir = os.path.abspath(os.path.join(input_path, 'ets1.1/sdk-js')) + out_path = os.path.abspath(os.path.join(input_path, 'ets1.1interop')) + package_path = os.path.abspath(os.path.join(source_root_dir, PACKAGE_PATH)) + nodejs = os.path.abspath(node_js) + output_dir = ensure_dir_exists(out_path) + if os.path.exists(package_path): + try: + result = subprocess.run([nodejs, package_path, "--input", input_dir, "--output", output_dir], cwd=source_root_dir, shell=False) + print('run_compile_declgen success:', result) + except subprocess.CalledProcessError as e: + print(f"run_compile_declgen node failed: {str(e.stderr)}") + else: + print("run_compile_declgen: tool path does not exist") + + +def extract(package_path, dest_path, package_name, current_os): + # 解压tar.gz包到目录 + dest_package_path = os.path.join(dest_path, package_name) + temp_package_path = os.path.join(dest_path, current_os + package_name) + if (os.path.exists(dest_package_path) or os.path.exists(temp_package_path)): + return + os.makedirs(temp_package_path, exist_ok=True) + try: + with tarfile.open(package_path, 'r:gz') as tar: + tar.extractall(path=temp_package_path) + except tarfile.TarError as e: + print(f'Error extracting files: {e}') + package_path = os.path.join(temp_package_path, 'package') + if not (os.path.exists(dest_package_path)): + shutil.copytree(package_path, dest_package_path, symlinks=True, dirs_exist_ok=True) + shutil.rmtree(temp_package_path, ignore_errors=True) + + +def run(args): + parser = argparse.ArgumentParser() + parser.add_argument('--root-build-dir', required=True) + parser.add_argument('--current-os-dir', required=True) + parser.add_argument('--output-interface-sdk', required=True) + parser.add_argument('--tool-dir', required=True) + parser.add_argument('--node-js', required=True) + options = parser.parse_args() + source_path = options.root_build_dir + current_os = options.current_os_dir + sdk_path = options.output_interface_sdk + node_path = options.node_js + declgen_path = options.tool_dir + node_modules_path = os.path.join(source_path, TOOL_WAREHOURSE, "node_modules") + extract(declgen_path, node_modules_path, 'declgen', current_os) + traverse_function(source_path, sdk_path, node_path) + + +if __name__ == "__main__": + sys.exit(run(sys.argv[1:])) -- Gitee From e5bbcae4af6dae072c72207b1aa41b31f474354f Mon Sep 17 00:00:00 2001 From: zhangwt3652 Date: Sat, 12 Jul 2025 16:06:48 +0800 Subject: [PATCH 083/746] modify getAudioTime() return Signed-off-by: zhangwt3652 --- api/@ohos.multimedia.audio.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/@ohos.multimedia.audio.d.ts b/api/@ohos.multimedia.audio.d.ts index 0b429a4f5c..2138c4b844 100644 --- a/api/@ohos.multimedia.audio.d.ts +++ b/api/@ohos.multimedia.audio.d.ts @@ -9984,7 +9984,7 @@ declare namespace audio { * Obtains the timestamp for audio frame that passed by system framework most recently. * The timestamp is not accurate because audio device latency is not considered very thoughtfully. * This method uses a promise to return the result. - * @returns { Promise } Promise used to return the audio timestamp based on the monotonic nanosecond system timer. + * @returns { Promise } Promise used to return the audio timestamp based on the monotonic nanosecond system timer. * @syscap SystemCapability.Multimedia.Audio.Capturer * @crossplatform * @since arkts {'1.1':'12','1.2':'20'} -- Gitee From a86027f8039dc464389ae6d3904e48178e6af670 Mon Sep 17 00:00:00 2001 From: yixiaoff Date: Sat, 12 Jul 2025 16:27:53 +0800 Subject: [PATCH 084/746] fix Signed-off-by: yixiaoff --- api/@ohos.file.photoAccessHelper.d.ts | 77 --------------------------- 1 file changed, 77 deletions(-) diff --git a/api/@ohos.file.photoAccessHelper.d.ts b/api/@ohos.file.photoAccessHelper.d.ts index 374a50ee0d..be1ae7f620 100644 --- a/api/@ohos.file.photoAccessHelper.d.ts +++ b/api/@ohos.file.photoAccessHelper.d.ts @@ -5946,7 +5946,6 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. The database is corrupted. 2. The file system is abnormal. 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ on(type: 'photoChange', callback: Callback): void; @@ -5963,7 +5962,6 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. The database is corrupted. 2. The file system is abnormal. 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ off(type: 'photoChange', callback?: Callback): void; @@ -5982,7 +5980,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ on(type: 'hiddenPhotoChange', callback: Callback): void; @@ -6001,7 +5998,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ off(type: 'hiddenPhotoChange', callback?: Callback): void; @@ -6020,7 +6016,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ on(type: 'trashedPhotoChange', callback: Callback): void; @@ -6039,7 +6034,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ off(type: 'trashedPhotoChange', callback?: Callback): void; @@ -6056,7 +6050,6 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. The database is corrupted. 2. The file system is abnormal. 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ on(type: 'photoAlbumChange', callback: Callback): void; @@ -6073,7 +6066,6 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. The database is corrupted. 2. The file system is abnormal. 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ off(type: 'photoAlbumChange', callback?: Callback): void; @@ -6092,7 +6084,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ on(type: 'hiddenAlbumChange', callback: Callback): void; @@ -6111,7 +6102,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ off(type: 'hiddenAlbumChange', callback?: Callback): void; @@ -6130,7 +6120,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ on(type: 'trashedAlbumChange', callback: Callback): void; @@ -6149,7 +6138,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ off(type: 'trashedAlbumChange', callback?: Callback): void; @@ -6231,7 +6219,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ enum ThumbnailChangeStatus { /** @@ -6240,7 +6227,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ THUMBNAIL_NOT_EXISTS = 0, @@ -6250,7 +6236,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ THUMBNAIL_ADD = 1, @@ -6260,7 +6245,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ THUMBNAIL_UPDATE = 2, @@ -6270,7 +6254,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ THUMBNAIL_NOT_CHANGE = 3 } @@ -6282,7 +6265,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ enum StrongAssociationType { /** @@ -6291,7 +6273,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ NORMAL = 0, /** @@ -6300,7 +6281,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ CLOUD_ENHANCEMENT = 1 } @@ -6311,7 +6291,6 @@ declare namespace photoAccessHelper { * @interface PhotoAssetChangeInfos * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ interface PhotoAssetChangeInfos { /** @@ -6320,7 +6299,6 @@ declare namespace photoAccessHelper { * @type { NotifyChangeType } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ type: NotifyChangeType; @@ -6330,7 +6308,6 @@ declare namespace photoAccessHelper { * @type { PhotoAssetChangeData[] | null } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ assetChangeDatas: PhotoAssetChangeData[] | null; @@ -6340,7 +6317,6 @@ declare namespace photoAccessHelper { * @type { boolean } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ isForRecheck: boolean; } @@ -6351,7 +6327,6 @@ declare namespace photoAccessHelper { * @interface PhotoAssetChangeData * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ interface PhotoAssetChangeData { /** @@ -6360,7 +6335,6 @@ declare namespace photoAccessHelper { * @type { PhotoAssetChangeInfo | null } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ assetBeforeChange: PhotoAssetChangeInfo | null; @@ -6370,7 +6344,6 @@ declare namespace photoAccessHelper { * @type { PhotoAssetChangeInfo | null } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ assetAfterChange: PhotoAssetChangeInfo | null; @@ -6380,7 +6353,6 @@ declare namespace photoAccessHelper { * @type { boolean } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ isContentChanged: boolean; @@ -6390,7 +6362,6 @@ declare namespace photoAccessHelper { * @type { boolean } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ isDeleted: boolean; @@ -6401,7 +6372,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ thumbnailChangeStatus: ThumbnailChangeStatus; @@ -6412,7 +6382,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ version: number; } @@ -6423,7 +6392,6 @@ declare namespace photoAccessHelper { * @interface PhotoAssetChangeInfo * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ interface PhotoAssetChangeInfo { /** @@ -6432,7 +6400,6 @@ declare namespace photoAccessHelper { * @type { string } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ uri: string; @@ -6442,7 +6409,6 @@ declare namespace photoAccessHelper { * @type { PhotoType } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ mediaType: PhotoType; @@ -6452,7 +6418,6 @@ declare namespace photoAccessHelper { * @type { string } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ albumUri: string; @@ -6463,7 +6428,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ fileId: number; @@ -6474,7 +6438,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ dateDay: string; @@ -6485,7 +6448,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ isFavorite: boolean; @@ -6496,7 +6458,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ isHidden: boolean; @@ -6507,7 +6468,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ strongAssociation: StrongAssociationType; @@ -6518,7 +6478,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ thumbnailVisible: ThumbnailVisibility; @@ -6529,7 +6488,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ dateTrashedMs: number; @@ -6540,7 +6498,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ dateAddedMs: number; @@ -6551,7 +6508,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ dateTakenMs: number; } @@ -6562,7 +6518,6 @@ declare namespace photoAccessHelper { * @interface AlbumChangeInfos * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ interface AlbumChangeInfos { /** @@ -6571,7 +6526,6 @@ declare namespace photoAccessHelper { * @type { NotifyChangeType } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ type: NotifyChangeType; @@ -6581,7 +6535,6 @@ declare namespace photoAccessHelper { * @type { AlbumChangeData[] | null } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ albumChangeDatas: AlbumChangeData[] | null; @@ -6591,7 +6544,6 @@ declare namespace photoAccessHelper { * @type { boolean } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ isForRecheck: boolean; } @@ -6602,7 +6554,6 @@ declare namespace photoAccessHelper { * @interface AlbumChangeData * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ interface AlbumChangeData { /** @@ -6611,7 +6562,6 @@ declare namespace photoAccessHelper { * @type { AlbumChangeInfo | null } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ albumBeforeChange: AlbumChangeInfo | null; @@ -6621,20 +6571,9 @@ declare namespace photoAccessHelper { * @type { AlbumChangeInfo | null } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ albumAfterChange: AlbumChangeInfo | null; - /** - * Whether the album is deleted. - * - * @type { boolean } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @since 20 - * @arkts 1.1&1.2 - */ - isDeleted: boolean; - /** * The version of the album info used to determine the order of notification changes. * @@ -6642,7 +6581,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ version: number; } @@ -6653,7 +6591,6 @@ declare namespace photoAccessHelper { * @interface AlbumChangeInfo * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ interface AlbumChangeInfo { /** @@ -6662,7 +6599,6 @@ declare namespace photoAccessHelper { * @type { AlbumType } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ albumType: AlbumType; @@ -6672,7 +6608,6 @@ declare namespace photoAccessHelper { * @type { AlbumSubtype } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ albumSubtype: AlbumSubtype; @@ -6682,7 +6617,6 @@ declare namespace photoAccessHelper { * @type { string } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ albumName: string; @@ -6692,7 +6626,6 @@ declare namespace photoAccessHelper { * @type { string } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ albumUri: string; @@ -6702,7 +6635,6 @@ declare namespace photoAccessHelper { * @type { number } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ imageCount: number; @@ -6712,7 +6644,6 @@ declare namespace photoAccessHelper { * @type { number } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ videoCount: number; @@ -6722,7 +6653,6 @@ declare namespace photoAccessHelper { * @type { number } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ count: number; @@ -6732,7 +6662,6 @@ declare namespace photoAccessHelper { * @type { string } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @since 20 - * @arkts 1.1&1.2 */ coverUri: string; @@ -6743,7 +6672,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ hiddenCount: number; @@ -6754,7 +6682,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ hiddenCoverUri: string; @@ -6765,7 +6692,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ isCoverChanged: boolean; @@ -6776,7 +6702,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ isHiddenCoverChanged: boolean; @@ -6787,7 +6712,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ coverInfo?: PhotoAssetChangeInfo; @@ -6798,7 +6722,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ hiddenCoverInfo?: PhotoAssetChangeInfo; } -- Gitee From c786d463d47efe56d0c3457a5ee8e1ee748bbdfb Mon Sep 17 00:00:00 2001 From: sun-xinyan Date: Sat, 12 Jul 2025 16:30:07 +0800 Subject: [PATCH 085/746] revert other file changes except arkui Signed-off-by: sun-xinyan --- api/@ohos.InputMethodSubtype.d.ts | 8 +- api/@ohos.UiTest.d.ts | 12 - api/@ohos.WorkSchedulerExtensionAbility.d.ts | 15 +- api/@ohos.ability.errorCode.d.ts | 15 +- api/@ohos.ability.screenLockFileManager.d.ts | 60 +- api/@ohos.accessibility.config.d.ts | 24 +- api/@ohos.accessibility.d.ts | 18 +- ...os.app.ability.ActionExtensionAbility.d.ts | 3 +- ...ohos.app.ability.AtomicServiceOptions.d.ts | 9 +- ...os.app.ability.DriverExtensionAbility.d.ts | 43 +- ...hos.app.ability.PrintExtensionAbility.d.ts | 6 +- ...s.app.ability.ServiceExtensionAbility.d.ts | 3 +- ...hos.app.ability.ShareExtensionAbility.d.ts | 3 +- api/@ohos.app.ability.UIAbility.d.ts | 23 +- ....app.ability.abilityDelegatorRegistry.d.ts | 1 + api/@ohos.app.ability.abilityManager.d.ts | 49 +- api/@ohos.app.ability.appManager.d.ts | 39 +- api/@ohos.app.ability.application.d.ts | 3 +- api/@ohos.app.ability.dataUriUtils.d.ts | 15 +- api/@ohos.app.ability.errorManager.d.ts | 33 +- ...os.application.BackupExtensionAbility.d.ts | 2 +- ...application.DataShareExtensionAbility.d.ts | 21 +- api/@ohos.batteryInfo.d.ets | 432 +- api/@ohos.batteryStatistics.d.ts | 159 +- api/@ohos.bluetooth.a2dp.d.ts | 3 +- api/@ohos.bluetooth.ble.d.ts | 27 +- api/@ohos.bluetooth.connection.d.ts | 9 +- api/@ohos.bluetooth.hfp.d.ts | 3 +- api/@ohos.bluetooth.hid.d.ts | 3 +- api/@ohos.buffer.d.ts | 34 +- api/@ohos.bundle.appControl.d.ts | 38 +- api/@ohos.bundle.appDomainVerify.d.ts | 9 +- api/@ohos.bundle.bundleManager.d.ts | 300 +- api/@ohos.bundle.bundleMonitor.d.ts | 8 +- api/@ohos.bundle.bundleResourceManager.d.ts | 38 +- api/@ohos.bundle.defaultAppManager.d.ts | 38 +- api/@ohos.bundle.freeInstall.d.ts | 4 +- api/@ohos.bundle.installer.d.ts | 47 +- api/@ohos.bundle.launcherBundleManager.d.ts | 26 +- api/@ohos.bundle.shortcutManager.d.ts | 12 +- api/@ohos.charger.d.ts | 2 +- api/@ohos.data.DataShareResultSet.d.ts | 9 +- api/@ohos.data.dataShare.d.ts | 57 +- api/@ohos.data.dataSharePredicates.d.ts | 12 +- api/@ohos.data.distributedKVStore.d.ts | 111 +- api/@ohos.data.preferences.d.ts | 37 +- api/@ohos.data.relationalStore.d.ts | 36 +- api/@ohos.data.unifiedDataChannel.d.ts | 2162 ++------ api/@ohos.deviceStatus.dragInteraction.d.ts | 37 +- ...s.distributedHardware.mechanicManager.d.ts | 128 +- api/@ohos.driver.deviceManager.d.ts | 233 +- api/@ohos.effectKit.d.ts | 1600 +++--- api/@ohos.file.hash.d.ts | 3 +- api/@ohos.file.keyManager.d.ts | 7 +- api/@ohos.file.photoAccessHelper.d.ts | 384 +- api/@ohos.file.storageStatistics.d.ts | 53 +- api/@ohos.file.volumeManager.d.ts | 26 +- api/@ohos.fileshare.d.ts | 33 +- api/@ohos.geoLocationManager.d.ts | 120 +- api/@ohos.graphics.text.d.ts | 498 +- api/@ohos.hiSysEvent.d.ts | 96 +- api/@ohos.hichecker.d.ts | 40 +- api/@ohos.hidebug.d.ts | 258 +- api/@ohos.hilog.d.ts | 44 +- api/@ohos.hiviewdfx.hiAppEvent.d.ts | 237 +- api/@ohos.i18n.d.ts | 8 +- api/@ohos.inputMethod.d.ts | 35 +- api/@ohos.multimedia.audio.d.ts | 6 +- api/@ohos.multimedia.avCastPickerParam.d.ts | 9 +- api/@ohos.multimedia.avsession.d.ts | 2 +- api/@ohos.multimedia.camera.d.ts | 2664 ++++----- api/@ohos.multimedia.cameraPicker.d.ts | 47 +- api/@ohos.multimedia.image.d.ts | 471 +- api/@ohos.multimedia.media.d.ts | 602 +- ...ohos.multimodalAwareness.roomLocation.d.ts | 122 - api/@ohos.multimodalInput.gestureEvent.d.ts | 32 +- api/@ohos.multimodalInput.inputConsumer.d.ts | 64 +- api/@ohos.multimodalInput.inputDevice.d.ts | 40 +- ....multimodalInput.inputDeviceCooperate.d.ts | 1 + api/@ohos.multimodalInput.inputEvent.d.ts | 20 +- ...ohos.multimodalInput.inputEventClient.d.ts | 6 +- api/@ohos.multimodalInput.inputMonitor.d.ts | 3 +- api/@ohos.multimodalInput.keyCode.d.ts | 1044 ++-- api/@ohos.multimodalInput.keyEvent.d.ts | 33 +- api/@ohos.multimodalInput.mouseEvent.d.ts | 29 +- api/@ohos.multimodalInput.pointer.d.ts | 47 +- api/@ohos.multimodalInput.shortKey.d.ts | 38 +- api/@ohos.multimodalInput.touchEvent.d.ts | 76 +- api/@ohos.nfc.tag.d.ts | 2 - api/@ohos.notificationManager.d.ts | 238 +- api/@ohos.notificationSubscribe.d.ts | 18 +- api/@ohos.print.d.ts | 520 -- api/@ohos.promptAction.d.ts | 3 - api/@ohos.resourceManager.d.ts | 5 + ...urceschedule.backgroundProcessManager.d.ts | 14 - ...esourceschedule.backgroundTaskManager.d.ts | 217 +- ...ohos.resourceschedule.usageStatistics.d.ts | 294 +- api/@ohos.resourceschedule.workScheduler.d.ts | 141 +- api/@ohos.rpc.d.ts | 416 +- api/@ohos.runningLock.d.ts | 7 +- api/@ohos.security.certManager.d.ts | 3 +- api/@ohos.sensor.d.ets | 2116 ------- api/@ohos.thermal.d.ts | 2 +- api/@ohos.usbManager.d.ts | 4915 ++++++++--------- api/@ohos.usbManager.serial.d.ts | 263 +- api/@ohos.util.ArrayList.d.ts | 37 +- api/@ohos.util.Deque.d.ts | 22 +- api/@ohos.util.LightWeightMap.d.ts | 26 - api/@ohos.util.List.d.ts | 2 - api/@ohos.util.d.ets | 51 - api/@ohos.util.stream.d.ts | 374 +- api/@ohos.web.webview.d.ts | 104 +- api/@ohos.wifi.d.ts | 3 +- api/@ohos.wifiManager.d.ts | 306 +- api/@ohos.window.d.ts | 12 - api/@ohos.zlib.d.ts | 300 +- api/@system.notification.d.ts | 3 - api/@system.prompt.d.ts | 4 +- api/ability/connectOptions.d.ts | 9 +- api/application/AbilityDelegator.d.ts | 2 - api/application/AbilityRunningInfo.d.ts | 21 +- api/application/ApplicationContext.d.ts | 9 +- api/application/AutoFillType.d.ts | 102 +- api/application/Context.d.ts | 27 +- api/application/DriverExtensionContext.d.ts | 24 +- api/application/ErrorObserver.d.ts | 9 +- api/application/EventHub.d.ts | 19 +- api/application/ExtensionRunningInfo.d.ts | 24 +- api/application/LoopObserver.d.ts | 6 +- api/application/ProcessInformation.d.ts | 1 + api/application/RunningMultiAppInfo.d.ts | 6 +- api/application/RunningMultiInstanceInfo.d.ts | 6 +- api/application/ServiceExtensionContext.d.ts | 6 +- api/application/UIAbilityContext.d.ts | 26 +- api/application/UIExtensionContext.d.ts | 25 +- .../WorkSchedulerExtensionContext.d.ts | 9 +- .../decorators/decoratorState.d.ets | 35 + 137 files changed, 7728 insertions(+), 16273 deletions(-) delete mode 100644 api/@ohos.multimodalAwareness.roomLocation.d.ts delete mode 100644 api/@ohos.sensor.d.ets create mode 100644 api/arkui/stateManagement/decorators/decoratorState.d.ets diff --git a/api/@ohos.InputMethodSubtype.d.ts b/api/@ohos.InputMethodSubtype.d.ts index fef984af85..c86eeccd74 100644 --- a/api/@ohos.InputMethodSubtype.d.ts +++ b/api/@ohos.InputMethodSubtype.d.ts @@ -39,12 +39,12 @@ export default interface InputMethodSubtype { /** * The label id of input method subtype. * - * @type { ?double } + * @type { ?number } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework * @since 10 */ - readonly labelId?: double; + readonly labelId?: number; /** * The name of input method. @@ -109,12 +109,12 @@ export default interface InputMethodSubtype { /** * The icon id of input method subtype. * - * @type { ?double } + * @type { ?number } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework * @since 9 */ - readonly iconId?: double; + readonly iconId?: number; /** * The extra info of input method subtype. diff --git a/api/@ohos.UiTest.d.ts b/api/@ohos.UiTest.d.ts index 3fdda47af7..5f7b7fdf42 100755 --- a/api/@ohos.UiTest.d.ts +++ b/api/@ohos.UiTest.d.ts @@ -1553,7 +1553,6 @@ declare interface UIEventObserver { * @since arkts {'1.1':'11','1.2':'20'} * @test * @arkts 1.1&1.2 - * @arkts 1.1&1.2 */ once(type: 'toastShow', callback: Callback): void; @@ -1578,7 +1577,6 @@ declare interface UIEventObserver { * @since arkts {'1.1':'11','1.2':'20'} * @test * @arkts 1.1&1.2 - * @arkts 1.1&1.2 */ once(type: 'dialogShow', callback: Callback): void; } @@ -3353,7 +3351,6 @@ declare class Component { * @since arkts {'1.1':'11','1.2':'20'} * @test * @arkts 1.1&1.2 - * @arkts 1.1&1.2 */ pinchOut(scale: double): Promise; /** @@ -3382,7 +3379,6 @@ declare class Component { * @since arkts {'1.1':'11','1.2':'20'} * @test * @arkts 1.1&1.2 - * @arkts 1.1&1.2 */ pinchIn(scale: double): Promise; @@ -3620,13 +3616,11 @@ declare class Driver { * @param { On } on - the attribute requirements of the target {@link Component}. * @returns { Promise } the first matched {@link Component} or undefined. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. * @syscap SystemCapability.Test.UiTest * @since 20 * @test * @arkts 1.2 - * @arkts 1.2 */ findComponent(on: On): Promise; /** @@ -3659,13 +3653,11 @@ declare class Driver { * @param { WindowFilter } filter - the filer condition of the target {@link UiWindow}. * @returns { Promise } the first matched {@link UiWindow} or undefined. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. * @syscap SystemCapability.Test.UiTest * @since 20 * @test * @arkts 1.2 - * @arkts 1.2 */ findWindow(filter: WindowFilter): Promise; /** @@ -3701,13 +3693,11 @@ declare class Driver { * @param { int } time - duration of finding in milliseconds, not less than 0. * @returns { Promise } the first matched {@link Component} or undefined. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. * @syscap SystemCapability.Test.UiTest * @since 20 * @test * @arkts 1.2 - * @arkts 1.2 */ waitForComponent(on: On, time: int): Promise; /** @@ -3753,13 +3743,11 @@ declare class Driver { * @param { On } on - the attribute requirements of the target {@link Component}. * @returns { Promise | null> } the matched {@link Component}s list. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17000002 - The async function is not called with await. * @syscap SystemCapability.Test.UiTest * @since 20 * @test * @arkts 1.2 - * @arkts 1.2 */ findComponents(on: On): Promise | null>; /** diff --git a/api/@ohos.WorkSchedulerExtensionAbility.d.ts b/api/@ohos.WorkSchedulerExtensionAbility.d.ts index d63d17a6a3..4f2eedcb5f 100644 --- a/api/@ohos.WorkSchedulerExtensionAbility.d.ts +++ b/api/@ohos.WorkSchedulerExtensionAbility.d.ts @@ -28,8 +28,7 @@ import _WorkSchedulerExtensionContext from './application/WorkSchedulerExtension * @typedef { _WorkSchedulerExtensionContext } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ export type WorkSchedulerExtensionContext = _WorkSchedulerExtensionContext; @@ -38,8 +37,7 @@ export type WorkSchedulerExtensionContext = _WorkSchedulerExtensionContext; * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ export default class WorkSchedulerExtensionAbility { /** @@ -48,8 +46,7 @@ export default class WorkSchedulerExtensionAbility { * @type { WorkSchedulerExtensionContext } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ context: WorkSchedulerExtensionContext; @@ -59,8 +56,7 @@ export default class WorkSchedulerExtensionAbility { * @param {workScheduler.WorkInfo} work - The info of work. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ onWorkStart(work: workScheduler.WorkInfo): void; @@ -70,8 +66,7 @@ export default class WorkSchedulerExtensionAbility { * @param {workScheduler.WorkInfo} work - The info of work. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ onWorkStop(work: workScheduler.WorkInfo): void; } diff --git a/api/@ohos.ability.errorCode.d.ts b/api/@ohos.ability.errorCode.d.ts index 83418a702b..bf6f1e727c 100644 --- a/api/@ohos.ability.errorCode.d.ts +++ b/api/@ohos.ability.errorCode.d.ts @@ -23,16 +23,14 @@ * * @enum { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'6', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 6 */ export enum ErrorCode { /** * Permission denied. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'6', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 6 */ PERMISSION_DENY = -3, @@ -40,8 +38,7 @@ export enum ErrorCode { * Ability not found. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'6', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 6 */ ABILITY_NOT_FOUND = -2, @@ -49,8 +46,7 @@ export enum ErrorCode { * Invalid parameter. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'6', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 6 */ INVALID_PARAMETER = -1, @@ -58,8 +54,7 @@ export enum ErrorCode { * No error. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'6', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 6 */ NO_ERROR = 0 } diff --git a/api/@ohos.ability.screenLockFileManager.d.ts b/api/@ohos.ability.screenLockFileManager.d.ts index 4f7ac113b1..df22688c85 100644 --- a/api/@ohos.ability.screenLockFileManager.d.ts +++ b/api/@ohos.ability.screenLockFileManager.d.ts @@ -23,8 +23,7 @@ * * @namespace screenLockFileManager * @syscap SystemCapability.Security.ScreenLockFileManager - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ declare namespace screenLockFileManager { /** @@ -32,16 +31,14 @@ declare namespace screenLockFileManager { * * @enum { number } * @syscap SystemCapability.Security.ScreenLockFileManager - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ export enum DataType { /** * Media photo and video data. * * @syscap SystemCapability.Security.ScreenLockFileManager - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ MEDIA_DATA = 0x00000001, @@ -49,8 +46,7 @@ declare namespace screenLockFileManager { * All data type. * * @syscap SystemCapability.Security.ScreenLockFileManager - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ ALL_DATA = 0xffffffff } @@ -60,16 +56,14 @@ declare namespace screenLockFileManager { * * @enum { number } * @syscap SystemCapability.Security.ScreenLockFileManager - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ export enum AccessStatus { /** * Acquire the access of data failed. * * @syscap SystemCapability.Security.ScreenLockFileManager - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ ACCESS_DENIED = -1, @@ -77,8 +71,7 @@ declare namespace screenLockFileManager { * Acquire the access of data success. * * @syscap SystemCapability.Security.ScreenLockFileManager - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ ACCESS_GRANTED = 0 } @@ -88,16 +81,14 @@ declare namespace screenLockFileManager { * * @enum { number } * @syscap SystemCapability.Security.ScreenLockFileManager - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ export enum ReleaseStatus { /** * Release the access of data failed. * * @syscap SystemCapability.Security.ScreenLockFileManager - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ RELEASE_DENIED = -1, @@ -105,8 +96,7 @@ declare namespace screenLockFileManager { * Release the access of data success. * * @syscap SystemCapability.Security.ScreenLockFileManager - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ RELEASE_GRANTED = 0 } @@ -116,16 +106,14 @@ declare namespace screenLockFileManager { * * @enum { number } * @syscap SystemCapability.Security.ScreenLockFileManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ export enum KeyStatus { /** * The application is not enabled the data protection under lock screen. * * @syscap SystemCapability.Security.ScreenLockFileManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ KEY_NOT_EXIST = -2, @@ -133,8 +121,7 @@ declare namespace screenLockFileManager { * AppKey has been released. * * @syscap SystemCapability.Security.ScreenLockFileManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ KEY_RELEASED = -1, @@ -142,8 +129,7 @@ declare namespace screenLockFileManager { * AppKey exists. * * @syscap SystemCapability.Security.ScreenLockFileManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ KEY_EXIST = 0 } @@ -157,8 +143,7 @@ declare namespace screenLockFileManager { * @throws { BusinessError } 29300003 - The application is not enabled the data protection under lock screen. * @throws { BusinessError } 29300004 - File access is denied. * @syscap SystemCapability.Security.ScreenLockFileManager - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function acquireAccess(): AccessStatus; @@ -178,8 +163,7 @@ declare namespace screenLockFileManager { * @throws { BusinessError } 29300004 - File access is denied. * @syscap SystemCapability.Security.ScreenLockFileManager * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function acquireAccess(dataType: DataType): AccessStatus; @@ -192,8 +176,7 @@ declare namespace screenLockFileManager { * @throws { BusinessError } 29300003 - The application is not enabled the data protection under lock screen. * @throws { BusinessError } 29300005 - File access was not acquired. * @syscap SystemCapability.Security.ScreenLockFileManager - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function releaseAccess(): ReleaseStatus; @@ -213,8 +196,7 @@ declare namespace screenLockFileManager { * @throws { BusinessError } 29300005 - File access was not acquired. * @syscap SystemCapability.Security.ScreenLockFileManager * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function releaseAccess(dataType: DataType): ReleaseStatus; @@ -225,8 +207,7 @@ declare namespace screenLockFileManager { * @throws { BusinessError } 801 - The specified SystemCapability name was not found. * @throws { BusinessError } 29300002 - The system ability work abnormally. * @syscap SystemCapability.Security.ScreenLockFileManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function queryAppKeyState(): KeyStatus; @@ -244,8 +225,7 @@ declare namespace screenLockFileManager { * @throws { BusinessError } 29300002 - The system ability work abnormally. * @syscap SystemCapability.Security.ScreenLockFileManager * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function queryAppKeyState(dataType: DataType): KeyStatus; } diff --git a/api/@ohos.accessibility.config.d.ts b/api/@ohos.accessibility.config.d.ts index 45a5ff46c8..1bd8be5a5d 100644 --- a/api/@ohos.accessibility.config.d.ts +++ b/api/@ohos.accessibility.config.d.ts @@ -27,8 +27,7 @@ import type { AsyncCallback, Callback } from './@ohos.base'; * @namespace config * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ declare namespace config { /** @@ -58,13 +57,11 @@ declare namespace config { /** * Indicates the configuration of high-contrast text. * - * @type { Config } * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - let highContrastText: Config; + var highContrastText: Config; /** * Indicates the configuration of invert color. * @@ -378,8 +375,7 @@ declare namespace config { * @typedef Config * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ interface Config { /** @@ -397,8 +393,7 @@ declare namespace config { * 3. Parameter verification failed. * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ set(value: T): Promise; @@ -417,8 +412,7 @@ declare namespace config { * 3. Parameter verification failed. * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ set(value: T, callback: AsyncCallback): void; @@ -431,8 +425,7 @@ declare namespace config { * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ get(): Promise; @@ -443,8 +436,7 @@ declare namespace config { * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @syscap SystemCapability.BarrierFree.Accessibility.Core * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ get(callback: AsyncCallback): void; diff --git a/api/@ohos.accessibility.d.ts b/api/@ohos.accessibility.d.ts index d4df26f55e..e818965817 100644 --- a/api/@ohos.accessibility.d.ts +++ b/api/@ohos.accessibility.d.ts @@ -880,8 +880,7 @@ export enum AccessibilityEventType { * @namespace accessibility * @syscap SystemCapability.BarrierFree.Accessibility.Core * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Accessibility @@ -1059,8 +1058,7 @@ declare namespace accessibility { * @returns { boolean } Returns true if the accessibility is enabled; returns false otherwise. * @syscap SystemCapability.BarrierFree.Accessibility.Core * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Checks whether accessibility ability is enabled. @@ -1276,8 +1274,7 @@ declare namespace accessibility { * 2. Incorrect parameter types; * 3. Parameter verification failed. * @syscap SystemCapability.BarrierFree.Accessibility.Core - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 7 */ /** * Register the observe of the accessibility state changed. @@ -1319,8 +1316,7 @@ declare namespace accessibility { * 2. Incorrect parameter types; * 3. Parameter verification failed. * @syscap SystemCapability.BarrierFree.Accessibility.Core - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function on(type: 'screenReaderStateChange', callback: Callback): void; @@ -1347,8 +1343,7 @@ declare namespace accessibility { * 2. Incorrect parameter types; * 3. Parameter verification failed. * @syscap SystemCapability.BarrierFree.Accessibility.Core - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 7 */ /** * Unregister the observe of the accessibility state changed. @@ -1390,8 +1385,7 @@ declare namespace accessibility { * 2. Incorrect parameter types; * 3. Parameter verification failed. * @syscap SystemCapability.BarrierFree.Accessibility.Core - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function off(type: 'screenReaderStateChange', callback?: Callback): void; diff --git a/api/@ohos.app.ability.ActionExtensionAbility.d.ts b/api/@ohos.app.ability.ActionExtensionAbility.d.ts index bfa54a6e04..8ef2dfd947 100644 --- a/api/@ohos.app.ability.ActionExtensionAbility.d.ts +++ b/api/@ohos.app.ability.ActionExtensionAbility.d.ts @@ -26,8 +26,7 @@ import UIExtensionAbility from './@ohos.app.ability.UIExtensionAbility'; * @extends UIExtensionAbility * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ export default class ActionExtensionAbility extends UIExtensionAbility { } \ No newline at end of file diff --git a/api/@ohos.app.ability.AtomicServiceOptions.d.ts b/api/@ohos.app.ability.AtomicServiceOptions.d.ts index 694576fe14..9168a95e27 100644 --- a/api/@ohos.app.ability.AtomicServiceOptions.d.ts +++ b/api/@ohos.app.ability.AtomicServiceOptions.d.ts @@ -27,8 +27,7 @@ import StartOptions from './@ohos.app.ability.StartOptions'; * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ export default class AtomicServiceOptions extends StartOptions { /** @@ -38,8 +37,7 @@ export default class AtomicServiceOptions extends StartOptions { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ flags?: number; @@ -50,8 +48,7 @@ export default class AtomicServiceOptions extends StartOptions { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ parameters?: Record; } \ No newline at end of file diff --git a/api/@ohos.app.ability.DriverExtensionAbility.d.ts b/api/@ohos.app.ability.DriverExtensionAbility.d.ts index bd373b2c2d..e2573372ec 100644 --- a/api/@ohos.app.ability.DriverExtensionAbility.d.ts +++ b/api/@ohos.app.ability.DriverExtensionAbility.d.ts @@ -27,8 +27,7 @@ import _DriverExtensionContext from './application/DriverExtensionContext'; * * @typedef { _DriverExtensionContext } * @syscap SystemCapability.Driver.ExternalDevice - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ export type DriverExtensionContext = _DriverExtensionContext; @@ -36,18 +35,16 @@ export type DriverExtensionContext = _DriverExtensionContext; * class of driver extension ability. * @syscap SystemCapability.Driver.ExternalDevice * @StageModelOnly - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ -declare class DriverExtensionAbility { +export default class DriverExtensionAbility { /** * Indicates driver extension ability context. * * @type { DriverExtensionContext } * @syscap SystemCapability.Driver.ExternalDevice * @StageModelOnly - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ context: DriverExtensionContext; @@ -56,8 +53,7 @@ declare class DriverExtensionAbility { * @param { Want } want - Indicates the want of created driver extension. * @syscap SystemCapability.Driver.ExternalDevice * @StageModelOnly - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ onInit(want: Want): void; @@ -65,8 +61,7 @@ declare class DriverExtensionAbility { * Called back before a driver extension is destroyed. * @syscap SystemCapability.Driver.ExternalDevice * @StageModelOnly - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ onRelease(): void; @@ -76,8 +71,7 @@ declare class DriverExtensionAbility { * @returns { rpc.RemoteObject | Promise } Rpc remoteObject. * @syscap SystemCapability.Driver.ExternalDevice * @StageModelOnly - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ onConnect(want: Want): rpc.RemoteObject | Promise; @@ -91,17 +85,6 @@ declare class DriverExtensionAbility { */ onDisconnect(want: Want): void | Promise; - /** - * Called back when all abilities connected to a driver extension are disconnected. - * @param { Want } want - Indicates disconnection information about the driver extension. - * @returns { undefined | Promise } - * @syscap SystemCapability.Driver.ExternalDevice - * @stagemodelonly - * @since 20 - * @arkts 1.2 - */ - onDisconnect(want: Want): undefined | Promise; - /** * Called when dump client information is required. * It is recommended that developers don't DUMP sensitive information. @@ -109,17 +92,7 @@ declare class DriverExtensionAbility { * @returns { Array } The dump info array. * @syscap SystemCapability.Driver.ExternalDevice * @StageModelOnly - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ onDump(params: Array): Array; } - -/** - * class of driver extension ability. - * @syscap SystemCapability.Driver.ExternalDevice - * @stagemodelonly - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 - */ -export default DriverExtensionAbility; diff --git a/api/@ohos.app.ability.PrintExtensionAbility.d.ts b/api/@ohos.app.ability.PrintExtensionAbility.d.ts index d64a45269a..e44ce52971 100644 --- a/api/@ohos.app.ability.PrintExtensionAbility.d.ts +++ b/api/@ohos.app.ability.PrintExtensionAbility.d.ts @@ -18,7 +18,7 @@ * @kit BasicServicesKit */ -import type Want from './@ohos.app.ability.Want'; +import type Want from './@ohos.application.Want'; import type print from './@ohos.print'; /** @@ -29,7 +29,7 @@ import type print from './@ohos.print'; * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 */ -declare class PrintExtensionAbility { +export default class PrintExtensionAbility { /** * Called once to initialize the extensionAbility. @@ -138,5 +138,3 @@ declare class PrintExtensionAbility { */ onDestroy(): void; } - -export default PrintExtensionAbility; \ No newline at end of file diff --git a/api/@ohos.app.ability.ServiceExtensionAbility.d.ts b/api/@ohos.app.ability.ServiceExtensionAbility.d.ts index b2b870f669..9fb19d970b 100644 --- a/api/@ohos.app.ability.ServiceExtensionAbility.d.ts +++ b/api/@ohos.app.ability.ServiceExtensionAbility.d.ts @@ -169,8 +169,7 @@ declare class ServiceExtensionAbility { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ onDump(params: Array): Array; } diff --git a/api/@ohos.app.ability.ShareExtensionAbility.d.ts b/api/@ohos.app.ability.ShareExtensionAbility.d.ts index bcedcbbf44..8f6013e83d 100644 --- a/api/@ohos.app.ability.ShareExtensionAbility.d.ts +++ b/api/@ohos.app.ability.ShareExtensionAbility.d.ts @@ -26,8 +26,7 @@ import UIExtensionAbility from './@ohos.app.ability.UIExtensionAbility'; * @extends UIExtensionAbility * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ export default class ShareExtensionAbility extends UIExtensionAbility { } \ No newline at end of file diff --git a/api/@ohos.app.ability.UIAbility.d.ts b/api/@ohos.app.ability.UIAbility.d.ts index c4588c2393..f0ee7fa13b 100644 --- a/api/@ohos.app.ability.UIAbility.d.ts +++ b/api/@ohos.app.ability.UIAbility.d.ts @@ -657,12 +657,7 @@ declare class UIAbility extends Ability { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @stagemodelonly * @atomicservice -<<<<<<< HEAD * @since 20 -======= - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 ->>>>>>> 94c88a315 (change 0603 to 0328) */ onDidForeground(): void; @@ -708,12 +703,7 @@ declare class UIAbility extends Ability { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @stagemodelonly * @atomicservice -<<<<<<< HEAD * @since 20 -======= - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 ->>>>>>> 94c88a315 (change 0603 to 0328) */ onWillBackground(): void; @@ -730,12 +720,7 @@ declare class UIAbility extends Ability { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @stagemodelonly * @atomicservice -<<<<<<< HEAD * @since 20 -======= - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 ->>>>>>> 94c88a315 (change 0603 to 0328) */ onDidBackground(): void; @@ -799,14 +784,9 @@ declare class UIAbility extends Ability { * @since 10 */ /** -<<<<<<< HEAD * Called when a UIAbility instance that has undergone the following states is started again: * started in the foreground, running in the foreground, and switched to the background. * In other words, a UIAbility instance enters this lifecycle callback from a hot start. -======= - * Called when the launch mode of an ability is set to singleton. - * This happens when you re-launch an ability that has been at the top of the ability stack. ->>>>>>> 94c88a315 (change 0603 to 0328) * * @param { Want } want - Want information, such as the ability name and bundle name. * @param { AbilityConstant.LaunchParam } launchParam - Reason for the UIAbility startup and the last abnormal exit. @@ -838,8 +818,7 @@ declare class UIAbility extends Ability { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @stagemodelonly * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ onDump(params: Array): Array; diff --git a/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts b/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts index 3783df93f8..c927cbc29e 100644 --- a/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts +++ b/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts @@ -23,6 +23,7 @@ import { AbilityDelegatorArgs as _AbilityDelegatorArgs } from './application/abi import { AbilityMonitor as _AbilityMonitor } from './application/AbilityMonitor'; import { AbilityStageMonitor as _AbilityStageMonitor } from './application/AbilityStageMonitor'; import { ShellCmdResult as _ShellCmdResult } from './application/shellCmdResult'; + /** * A global register used to store the AbilityDelegator and AbilityDelegatorArgs objects registered * during application startup. diff --git a/api/@ohos.app.ability.abilityManager.d.ts b/api/@ohos.app.ability.abilityManager.d.ts index c2162a7416..5c02f6c9e2 100644 --- a/api/@ohos.app.ability.abilityManager.d.ts +++ b/api/@ohos.app.ability.abilityManager.d.ts @@ -20,12 +20,12 @@ import { AsyncCallback } from './@ohos.base'; import { ElementName } from './bundleManager/ElementName'; -import { AbilityRunningInfo as _AbilityRunningInfo } from './application/AbilityRunningInfo'; -import { ExtensionRunningInfo as _ExtensionRunningInfo } from './application/ExtensionRunningInfo'; /*** if arkts 1.1 */ import { AbilityResult } from './ability/abilityResult'; import { Configuration } from './@ohos.app.ability.Configuration'; import Context from './application/Context'; +import { AbilityRunningInfo as _AbilityRunningInfo } from './application/AbilityRunningInfo'; +import { ExtensionRunningInfo as _ExtensionRunningInfo } from './application/ExtensionRunningInfo'; import * as _AbilityForegroundStateObserver from './application/AbilityForegroundStateObserver'; import * as _AbilityStateData from './application/AbilityStateData'; /*** endif */ @@ -55,16 +55,14 @@ declare namespace abilityManager { * * @enum { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ export enum AbilityState { /** * Ability is initialized. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ INITIAL = 0, @@ -72,8 +70,7 @@ declare namespace abilityManager { * Ability is in the state of getting focus. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ FOCUS = 2, @@ -81,8 +78,7 @@ declare namespace abilityManager { * Ability is in the foreground state. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ FOREGROUND = 9, @@ -90,8 +86,7 @@ declare namespace abilityManager { * Ability is in the background state. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ BACKGROUND = 10, @@ -99,8 +94,7 @@ declare namespace abilityManager { * Ability is in the process of scheduling at the foreground. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ FOREGROUNDING = 11, @@ -108,8 +102,7 @@ declare namespace abilityManager { * Ability is in the process of scheduling in the background. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ BACKGROUNDING = 12 } @@ -121,8 +114,7 @@ declare namespace abilityManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ export enum UserStatus { /** @@ -131,8 +123,7 @@ declare namespace abilityManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ ASSERT_TERMINATE = 0, @@ -142,8 +133,7 @@ declare namespace abilityManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ ASSERT_CONTINUE = 1, @@ -153,8 +143,7 @@ declare namespace abilityManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ ASSERT_RETRY = 2 } @@ -266,8 +255,7 @@ declare namespace abilityManager { * @returns { Promise> } Returns the array of AbilityRunningInfo. * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ function getAbilityRunningInfos(): Promise>; @@ -284,8 +272,7 @@ declare namespace abilityManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getAbilityRunningInfos(callback: AsyncCallback>): void; @@ -566,8 +553,7 @@ declare namespace abilityManager { * * @typedef { _AbilityRunningInfo } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ export type AbilityRunningInfo = _AbilityRunningInfo; @@ -597,8 +583,7 @@ declare namespace abilityManager { * @typedef { _ExtensionRunningInfo } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ export type ExtensionRunningInfo = _ExtensionRunningInfo; diff --git a/api/@ohos.app.ability.appManager.d.ts b/api/@ohos.app.ability.appManager.d.ts index 6eefbaf47b..1ebed985ab 100644 --- a/api/@ohos.app.ability.appManager.d.ts +++ b/api/@ohos.app.ability.appManager.d.ts @@ -555,8 +555,7 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ function killProcessWithAccount(bundleName: string, accountId: number): Promise; @@ -576,8 +575,7 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ function killProcessWithAccount(bundleName: string, accountId: number, clearPageStack: boolean, appIndex?: number): Promise; @@ -613,8 +611,7 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ function killProcessWithAccount(bundleName: string, accountId: number, callback: AsyncCallback): void; @@ -893,8 +890,7 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function getRunningProcessInformationByBundleType( bundleType: bundleManager.BundleType): Promise>; @@ -939,8 +935,7 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ function isSharedBundleRunning(bundleName: string, versionCode: number): Promise; @@ -959,8 +954,7 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ function isSharedBundleRunning(bundleName: string, versionCode: number, callback: AsyncCallback): void; @@ -975,8 +969,7 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ function getProcessMemoryByPid(pid: number): Promise; @@ -991,8 +984,7 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ function getProcessMemoryByPid(pid: number, callback: AsyncCallback): void; @@ -1152,8 +1144,7 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @throws { BusinessError } 16000073 - The app clone index is invalid. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ function isAppRunning(bundleName: string, appCloneIndex?: number): Promise; @@ -1208,8 +1199,7 @@ declare namespace appManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ function getSupportedProcessCachePids(bundleName : string): Promise>; @@ -1233,8 +1223,7 @@ declare namespace appManager { * @throws { BusinessError } 16300010 - The target application is not attached to the status bar. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ function setKeepAliveForBundle(bundleName: string, userId: number, enable: boolean): Promise; @@ -1253,8 +1242,7 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ function getKeepAliveBundles(type: KeepAliveAppType, userId?: number): Promise>; @@ -1308,8 +1296,7 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ function killProcessesInBatch(pids: Array): Promise; diff --git a/api/@ohos.app.ability.application.d.ts b/api/@ohos.app.ability.application.d.ts index d6a92cda87..9f2e8f15fa 100644 --- a/api/@ohos.app.ability.application.d.ts +++ b/api/@ohos.app.ability.application.d.ts @@ -105,8 +105,7 @@ declare namespace application { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ export function getApplicationContext(): ApplicationContext; diff --git a/api/@ohos.app.ability.dataUriUtils.d.ts b/api/@ohos.app.ability.dataUriUtils.d.ts index 63ba6905b8..cdaa9b52b1 100644 --- a/api/@ohos.app.ability.dataUriUtils.d.ts +++ b/api/@ohos.app.ability.dataUriUtils.d.ts @@ -23,8 +23,7 @@ * * @namespace dataUriUtils * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ declare namespace dataUriUtils { /** @@ -35,8 +34,7 @@ declare namespace dataUriUtils { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getId(uri: string): number; @@ -49,8 +47,7 @@ declare namespace dataUriUtils { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function attachId(uri: string, id: number): string; @@ -62,8 +59,7 @@ declare namespace dataUriUtils { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function deleteId(uri: string): string; @@ -76,8 +72,7 @@ declare namespace dataUriUtils { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function updateId(uri: string, id: number): string; } diff --git a/api/@ohos.app.ability.errorManager.d.ts b/api/@ohos.app.ability.errorManager.d.ts index 7578c8bc50..5350223c8b 100644 --- a/api/@ohos.app.ability.errorManager.d.ts +++ b/api/@ohos.app.ability.errorManager.d.ts @@ -44,8 +44,7 @@ import { LoopObserver as _LoopObserver } from './application/LoopObserver'; * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ declare namespace errorManager { /** @@ -85,8 +84,7 @@ declare namespace errorManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ function on(type: 'error', observer: ErrorObserver): number; @@ -127,8 +125,7 @@ declare namespace errorManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ function off(type: 'error', observerId: number, callback: AsyncCallback): void; @@ -169,8 +166,7 @@ declare namespace errorManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ function off(type: 'error', observerId: number): Promise; @@ -340,8 +336,7 @@ declare namespace errorManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ function on(type: 'loopObserver', timeout: number, observer: LoopObserver): void; @@ -366,8 +361,7 @@ declare namespace errorManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ function off(type: 'loopObserver', observer?: LoopObserver): void; @@ -394,8 +388,7 @@ declare namespace errorManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ function on(type: 'unhandledRejection', observer: UnhandledRejectionObserver): void; @@ -424,8 +417,7 @@ declare namespace errorManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ function off(type: 'unhandledRejection', observer?: UnhandledRejectionObserver): void; @@ -481,8 +473,7 @@ declare namespace errorManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ export type ErrorObserver = _ErrorObserver.default; /** @@ -500,8 +491,7 @@ declare namespace errorManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ export type LoopObserver = _LoopObserver; /** @@ -523,8 +513,7 @@ declare namespace errorManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ export type UnhandledRejectionObserver = (reason: Error | any, promise: Promise) => void; /** diff --git a/api/@ohos.application.BackupExtensionAbility.d.ts b/api/@ohos.application.BackupExtensionAbility.d.ts index 154ce942bc..a03b309519 100644 --- a/api/@ohos.application.BackupExtensionAbility.d.ts +++ b/api/@ohos.application.BackupExtensionAbility.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024-2025 Huawei Device Co., Ltd. + * Copyright (c) 2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/api/@ohos.application.DataShareExtensionAbility.d.ts b/api/@ohos.application.DataShareExtensionAbility.d.ts index 177444235a..4dc30e5505 100644 --- a/api/@ohos.application.DataShareExtensionAbility.d.ts +++ b/api/@ohos.application.DataShareExtensionAbility.d.ts @@ -42,8 +42,7 @@ type UpdateOperation = dataShare.UpdateOperation; * @syscap SystemCapability.DistributedDataManager.DataShare.Provider * @systemapi * @StageModelOnly - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ export default class DataShareExtensionAbility { /** @@ -53,8 +52,7 @@ export default class DataShareExtensionAbility { * @syscap SystemCapability.DistributedDataManager.DataShare.Provider * @systemapi * @StageModelOnly - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ context: ExtensionContext; @@ -66,8 +64,7 @@ export default class DataShareExtensionAbility { * @syscap SystemCapability.DistributedDataManager.DataShare.Provider * @systemapi * @StageModelOnly - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ onCreate?(want: Want, callback: AsyncCallback): void; @@ -95,8 +92,7 @@ export default class DataShareExtensionAbility { * @syscap SystemCapability.DistributedDataManager.DataShare.Provider * @systemapi * @StageModelOnly - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ update?( uri: string, @@ -130,8 +126,7 @@ export default class DataShareExtensionAbility { * @syscap SystemCapability.DistributedDataManager.DataShare.Provider * @systemapi * @StageModelOnly - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ delete?(uri: string, predicates: dataSharePredicates.DataSharePredicates, callback: AsyncCallback): void; @@ -148,8 +143,7 @@ export default class DataShareExtensionAbility { * @syscap SystemCapability.DistributedDataManager.DataShare.Provider * @systemapi * @StageModelOnly - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ query?( uri: string, @@ -167,8 +161,7 @@ export default class DataShareExtensionAbility { * @syscap SystemCapability.DistributedDataManager.DataShare.Provider * @systemapi * @StageModelOnly - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ batchInsert?(uri: string, valueBuckets: Array, callback: AsyncCallback): void; diff --git a/api/@ohos.batteryInfo.d.ets b/api/@ohos.batteryInfo.d.ets index 533aefc597..7b8f73ca19 100644 --- a/api/@ohos.batteryInfo.d.ets +++ b/api/@ohos.batteryInfo.d.ets @@ -16,7 +16,6 @@ /** * @file * @kit BasicServicesKit - * @arkts 1.2 */ /** @@ -24,442 +23,19 @@ *

    Battery information includes the remaining battery power, * voltage, temperature, model, and charger type. * - * @namespace batteryInfo * @syscap SystemCapability.PowerManager.BatteryManager.Core * @atomicservice * @since 20 */ -declare namespace batteryInfo { - /** - * Sets the battery config by scene name. - * - * @param { string } sceneName - Indicates the battery charging scene name. - * sceneName parameter must be of type string. - * @param { string } sceneValue - Indicates the battery charging scene value. - * sceneValue parameter must be of type string. - * @returns { int } Return to set the charging configuration result. - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Incorrect parameter types; - * @throws { BusinessError } 5100101 - Failed to connect to the service. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @systemapi - * @since 20 - */ - function setBatteryConfig(sceneName: string, sceneValue: string): int; - - /** - * Queries the battery config by scene name. - * - * @param { string } sceneName - Indicates the battery charging scene name. - * sceneName parameter must be of type string. - * @returns { string } Returns the battery charging configuration, returns "" otherwise. - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Incorrect parameter types; - * @throws { BusinessError } 5100101 - Failed to connect to the service. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @systemapi - * @since 20 - */ - function getBatteryConfig(sceneName: string): string; - - /** - * Checks the battery config is enable by scene name. - * - * @param { string } sceneName - Indicates the battery charging scene name. - * sceneName parameter must be of type string. - * @returns { boolean } Returns true if the device supports the charging scene, returns false otherwise. - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Incorrect parameter types; - * @throws { BusinessError } 5100101 - Failed to connect to the service. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @systemapi - * @since 20 - */ - function isBatteryConfigSupported(sceneName: string): boolean; - +declare class batteryInfo { /** * Battery state of charge (SoC) of the current device, in percent. * - * @returns { int } Returns the battery state of charge (SoC) of the current device, in percent. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - function batterySOC(): int; - - /** - * Battery charging status of the current device. - * - * @returns { BatteryChargeState } Returns the battery charging status of the current device. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - function chargingStatus(): BatteryChargeState; - - /** - * Battery health state of the current device. - * - * @returns { BatteryHealthState } Returns the battery health state of the current device. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - function healthStatus(): BatteryHealthState; - - /** - * Charger type of the current device. - * - * @returns { BatteryPluggedType } Returns the charger type of the current device. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - function pluggedType(): BatteryPluggedType; - - /** - * Battery voltage of the current device, in µV. - * - * @returns { int } Returns the battery voltage of the current device, in µV. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - function voltage(): int; - - /** - * Battery technology of the current device. - * - * @returns { string } Returns the battery technology of the current device. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - function technology(): string; - - /** - * Battery temperature of the current device, in 0.1℃. - * - * @returns { int } Returns the battery temperature of the current device, in 0.1℃. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - function batteryTemperature(): int; - - /** - * Battery present state of the current device. - * - * @returns { boolean } Returns true if the battery is present; returns false if the battery is absent. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - function isBatteryPresent(): boolean; - - /** - * Battery capacity level of the current device. - * - * @returns { BatteryCapacityLevel } Returns the battery capacity level of the current device. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - function batteryCapacityLevel(): BatteryCapacityLevel; - - /** - * Estimated remaining time for the current device to be fully charged, in ms. - * - * @returns { long } Returns the estimated remaining time for the current device to be fully charged, in ms. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @systemapi - * @since 20 - */ - function estimatedRemainingChargeTime(): long; - - /** - * Battery total energy of the current device, in mAh. - * - * @returns { int } Returns the battery total energy of the current device, in mAh. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @systemapi - * @since 20 - */ - function totalEnergy(): int; - - /** - * Battery immediate current of the current device, in mA. - * - * @returns { int } Returns the battery immediate current of the current device, in mA. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - function nowCurrent(): int; - - /** - * Battery remaining energy of the current device, in mAh. - * - * @returns { int } Returns the battery remaining energy of the current device, in mAh. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @systemapi - * @since 20 - */ - function remainingEnergy(): int; - - /** - * Charger type of a device. - * - * @enum { int } - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - export enum BatteryPluggedType { - /** - * Unknown type - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - NONE, - /** - * AC charger - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - AC, - /** - * USB charger - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - USB, - /** - * Wireless charger - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - WIRELESS - } - - /** - * Battery charging status of a device. - * - * @enum { int } + * @readonly * @syscap SystemCapability.PowerManager.BatteryManager.Core * @atomicservice * @since 20 */ - export enum BatteryChargeState { - /** - * Unknown state. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @atomicservice - * @since 20 - */ - NONE, - /** - * The battery is being charged. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @atomicservice - * @since 20 - */ - ENABLE, - /** - * The battery is not being charged. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @atomicservice - * @since 20 - */ - DISABLE, - /** - * The battery is fully charged. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @atomicservice - * @since 20 - */ - FULL - } - - /** - * Battery health status of a device. - * - * @enum { int } - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - export enum BatteryHealthState { - /** - * Unknown state. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - UNKNOWN, - /** - * The battery is in healthy state. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - GOOD, - /** - * The battery is overheated. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - OVERHEAT, - /** - * The battery voltage is over high. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - OVERVOLTAGE, - /** - * The battery temperature is low. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - COLD, - /** - * The battery is dead. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - DEAD - } - - /** - * Battery capacity level of a device. - * - * @enum { int } - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - export enum BatteryCapacityLevel { - /** - * The battery is in full capacity level. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - LEVEL_FULL, - /** - * The battery is in high capacity level. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - LEVEL_HIGH, - /** - * The battery is in normal capacity level. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - LEVEL_NORMAL, - /** - * The battery is in low capacity level. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - LEVEL_LOW, - /** - * The battery is in warning low capacity level. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - LEVEL_WARNING, - /** - * The battery is in critical low capacity level. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - LEVEL_CRITICAL, - /** - * The battery is in the lowest capacity level, system will shut down automatically in a few seconds. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - LEVEL_SHUTDOWN - } - - /** - * Extra key of common event COMMON_EVENT_BATTERY_CHANGED. - * - * @enum { string } - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - export enum CommonEventBatteryChangedKey { - /** - * Extra code of batterySOC. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - EXTRA_SOC = 'soc', - /** - * Extra code of chargingStatus. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - EXTRA_CHARGE_STATE = 'chargeState', - /** - * Extra code of healthStatus. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - EXTRA_HEALTH_STATE = 'healthState', - /** - * Extra code of pluggedType. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - EXTRA_PLUGGED_TYPE = 'pluggedType', - /** - * Extra code of voltage. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - EXTRA_VOLTAGE = 'voltage', - /** - * Extra code of technology. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - EXTRA_TECHNOLOGY = 'technology', - /** - * Extra code of batteryTemperature. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - EXTRA_TEMPERATURE = 'temperature', - /** - * Extra code of isBatteryPresent. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - EXTRA_PRESENT = 'present', - /** - * Extra code of batteryCapacityLevel. - * - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ - EXTRA_CAPACITY_LEVEL = 'capacityLevel' - } + static get batterySOC(): int; } -export default batteryInfo; +export default batteryInfo; \ No newline at end of file diff --git a/api/@ohos.batteryStatistics.d.ts b/api/@ohos.batteryStatistics.d.ts index 1ccd48e007..906cb96453 100644 --- a/api/@ohos.batteryStatistics.d.ts +++ b/api/@ohos.batteryStatistics.d.ts @@ -16,7 +16,6 @@ /** * @file * @kit BasicServicesKit - * @arkts 1.1&1.2 */ import { AsyncCallback, BusinessError } from './@ohos.base'; @@ -27,108 +26,88 @@ import { AsyncCallback, BusinessError } from './@ohos.base'; * @namespace batteryStats * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ declare namespace batteryStats { /** * Describes the consumption type. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ export enum ConsumptionType { - /** - * Indicates an invalid consumption type. + /** Indicates an invalid consumption type * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 - */ + * @since 8 + */ CONSUMPTION_TYPE_INVALID = -17, - /** - * Indicates the battery power consumption generated by APP. + /** Indicates the battery power consumption generated by APP * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 - */ + * @since 8 + */ CONSUMPTION_TYPE_APP, - /** - * Indicates the battery power consumption generated by bluetooth. + /** Indicates the battery power consumption generated by bluetooth * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 - */ + * @since 8 + */ CONSUMPTION_TYPE_BLUETOOTH, - /** - * Indicates the battery power consumption generated when the CPU is idle. + /** Indicates the battery power consumption generated when the CPU is idle * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 - */ + * @since 8 + */ CONSUMPTION_TYPE_IDLE, - /** - * Indicates the battery power consumption generated when phone call is active. + /** Indicates the battery power consumption generated when phone call is active * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 - */ + * @since 8 + */ CONSUMPTION_TYPE_PHONE, - /** - * Indicates the battery power consumption generated by radio. + /** Indicates the battery power consumption generated by radio * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 - */ + * @since 8 + */ CONSUMPTION_TYPE_RADIO, - /** - * Indicates the battery power consumption generated by screen. + /** Indicates the battery power consumption generated by screen * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 - */ + * @since 8 + */ CONSUMPTION_TYPE_SCREEN, - /** - * Indicates the battery power consumption generated by user. + /** Indicates the battery power consumption generated by user * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 - */ + * @since 8 + */ CONSUMPTION_TYPE_USER, - /** - * Indicates the battery power consumption generated by WIFI. + /** Indicates the battery power consumption generated by WIFI * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 - */ + * @since 8 + */ CONSUMPTION_TYPE_WIFI } @@ -140,8 +119,7 @@ declare namespace batteryStats { * @throws { BusinessError } 4600101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ function getBatteryStats(): Promise>; @@ -155,72 +133,67 @@ declare namespace batteryStats { * @throws { BusinessError } 4600101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ function getBatteryStats(callback: AsyncCallback>): void; /** * Obtains power consumption information(mAh) for a given uid. * - * @param { int } uid Indicates the uid. - * @returns { double } Power consumption information(mAh). + * @param { number } uid Indicates the uid. + * @returns { number } Power consumption information(mAh). * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. * @throws { BusinessError } 4600101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ - function getAppPowerValue(uid: int): double; + function getAppPowerValue(uid: number): number; /** * Obtains power consumption information(Percent) for a given uid. * - * @param { int } uid Indicates the uid. - * @returns { double } Power consumption information(Percent). + * @param { number } uid Indicates the uid. + * @returns { number } Power consumption information(Percent). * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. * @throws { BusinessError } 4600101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ - function getAppPowerPercent(uid: int): double; + function getAppPowerPercent(uid: number): number; /** * Obtains power consumption information(mAh) for a given type. * * @param { ConsumptionType } type Indicates the hardware type. * the ConsumptionType type is an enumeration class. - * @returns { double } Power consumption information(mAh). + * @returns { number } Power consumption information(mAh). * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. * @throws { BusinessError } 4600101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ - function getHardwareUnitPowerValue(type: ConsumptionType): double; + function getHardwareUnitPowerValue(type: ConsumptionType): number; /** * Obtains power consumption information(Percent) for a given type. * * @param { ConsumptionType } type Indicates the hardware type. * the ConsumptionType type is an enumeration class. - * @returns { double } Power consumption information(Percent). + * @returns { number } Power consumption information(Percent). * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. * @throws { BusinessError } 4600101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ - function getHardwareUnitPowerPercent(type: ConsumptionType): double; + function getHardwareUnitPowerPercent(type: ConsumptionType): number; /** * Contains power consumption information of a device. @@ -229,42 +202,35 @@ declare namespace batteryStats { * @typedef BatteryStatsInfo * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ interface BatteryStatsInfo { - /** - * The uid related with the power consumption info. + /** The uid related with the power consumption info. * - * @type { int } + * @type { number } * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 - */ - uid: int; + * @since 8 + */ + uid: number; - /** - * The type related with the power consumption info. + /** The type related with the power consumption info. * * @type { ConsumptionType } * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 - */ + * @since 8 + */ type: ConsumptionType; - /** - * The power consumption value(mAh). + /** The power consumption value(mAh). * - * @type { double } + * @type { number } * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 - */ - power: double; + * @since 8 + */ + power: number; } } @@ -274,7 +240,6 @@ declare namespace batteryStats { * @namespace batteryStats * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 - */ + * @since 8 +*/ export default batteryStats; diff --git a/api/@ohos.bluetooth.a2dp.d.ts b/api/@ohos.bluetooth.a2dp.d.ts index 512fa0ede1..c3eeaadd89 100644 --- a/api/@ohos.bluetooth.a2dp.d.ts +++ b/api/@ohos.bluetooth.a2dp.d.ts @@ -42,8 +42,7 @@ declare namespace a2dp { * * @typedef { baseProfile.BaseProfile } BaseProfile * @syscap SystemCapability.Communication.Bluetooth.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ type BaseProfile = baseProfile.BaseProfile; diff --git a/api/@ohos.bluetooth.ble.d.ts b/api/@ohos.bluetooth.ble.d.ts index 40fcc0b808..7ec2196b21 100644 --- a/api/@ohos.bluetooth.ble.d.ts +++ b/api/@ohos.bluetooth.ble.d.ts @@ -4368,8 +4368,7 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface DescriptorReadRequest { /** @@ -4537,8 +4536,7 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface DescriptorWriteRequest { /** @@ -5509,8 +5507,7 @@ declare namespace ble { * @typedef AdvertisingStateChangeInfo * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface AdvertisingStateChangeInfo { /** @@ -5723,8 +5720,7 @@ declare namespace ble { * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface ScanFilter { /** @@ -6531,8 +6527,7 @@ declare namespace ble { * @enum { number } * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ enum AdvertisingState { /** @@ -6546,24 +6541,21 @@ declare namespace ble { * * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ STARTED = 1, /** * advertising temporarily enabled. * * @syscap SystemCapability.Communication.Bluetooth.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ ENABLED = 2, /** * advertising temporarily disabled. * * @syscap SystemCapability.Communication.Bluetooth.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ DISABLED = 3, /** @@ -6577,8 +6569,7 @@ declare namespace ble { * * @syscap SystemCapability.Communication.Bluetooth.Core * @crossplatform - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ STOPPED = 4 } diff --git a/api/@ohos.bluetooth.connection.d.ts b/api/@ohos.bluetooth.connection.d.ts index ee6f878199..4436723f19 100644 --- a/api/@ohos.bluetooth.connection.d.ts +++ b/api/@ohos.bluetooth.connection.d.ts @@ -1657,8 +1657,7 @@ declare namespace connection { * * @typedef PinRequiredParam * @syscap SystemCapability.Communication.Bluetooth.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ interface PinRequiredParam { /** @@ -2040,8 +2039,7 @@ declare namespace connection { * * @typedef DiscoveryResult * @syscap SystemCapability.Communication.Bluetooth.Core - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ interface DiscoveryResult { /** @@ -2115,8 +2113,7 @@ declare namespace connection { * * @typedef BatteryInfo * @syscap SystemCapability.Communication.Bluetooth.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface BatteryInfo { /** diff --git a/api/@ohos.bluetooth.hfp.d.ts b/api/@ohos.bluetooth.hfp.d.ts index 18006a14a1..f9c6049631 100644 --- a/api/@ohos.bluetooth.hfp.d.ts +++ b/api/@ohos.bluetooth.hfp.d.ts @@ -33,8 +33,7 @@ declare namespace hfp { * * @typedef { baseProfile.BaseProfile } BaseProfile * @syscap SystemCapability.Communication.Bluetooth.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ type BaseProfile = baseProfile.BaseProfile; diff --git a/api/@ohos.bluetooth.hid.d.ts b/api/@ohos.bluetooth.hid.d.ts index de25e276df..317f129d41 100644 --- a/api/@ohos.bluetooth.hid.d.ts +++ b/api/@ohos.bluetooth.hid.d.ts @@ -33,8 +33,7 @@ declare namespace hid { * * @typedef { baseProfile.BaseProfile } BaseProfile * @syscap SystemCapability.Communication.Bluetooth.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ type BaseProfile = baseProfile.BaseProfile; diff --git a/api/@ohos.buffer.d.ts b/api/@ohos.buffer.d.ts index b59b8d20bf..1627e06e8e 100644 --- a/api/@ohos.buffer.d.ts +++ b/api/@ohos.buffer.d.ts @@ -2403,18 +2403,6 @@ declare namespace buffer { */ toJSON(): jsonx.JsonElement; - /** - * Converts this Buffer instance into a JsonElement. - * - * @returns { jsonx.JsonElement } A new JsonElement containing the Buffer - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - toJSON(): jsonx.JsonElement; - /** * Decodes buf to a string according to the specified character encoding in encoding * @@ -3563,20 +3551,30 @@ declare namespace buffer { writeUIntLE(value: number, offset: number, byteLength: number): number; /** - * Returns the item at that index. + * Returns the byte at the specified index. * - * @param { number } index - The zero-based index of the desired code unit. - * Throws error if index < 0 or index >= buffer.length. - * @returns { number } The element in the buffer matching the given index. - * @throws { BusinessError } 10200001 - The value of index is out of range. + * @param { number } index - byte index to read + * @returns { number | undefined } Returns the byte value at `index` * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice * @since 20 * @arkts 1.2 */ - [index: number]: number; + $_get(index: number): number | undefined; + /** + * Sets the byte at the specified index. + * + * @param { number } index – byte index to write + * @param { number } value – byte value (0–255) + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + $_set(index: number, value: number): void; } /** diff --git a/api/@ohos.bundle.appControl.d.ts b/api/@ohos.bundle.appControl.d.ts index 522a04773b..b7f6ac7d90 100644 --- a/api/@ohos.bundle.appControl.d.ts +++ b/api/@ohos.bundle.appControl.d.ts @@ -40,7 +40,7 @@ declare namespace appControl { /** * Indicates the ability component type. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} @@ -71,7 +71,7 @@ declare namespace appControl { /** * Indicates the ability component type when uninstalled. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi * @since arkts {'1.1':'15', '1.2':'20'} @@ -92,7 +92,7 @@ declare namespace appControl { /** * Indicates when to intercept the specified application. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} @@ -131,7 +131,7 @@ declare namespace appControl { /** * Indicates the strategy to intercept the specified application. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} @@ -226,13 +226,13 @@ declare namespace appControl { /** * Indicates priority of the rule. * - * @type { int } + * @type { number } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - priority: int; + priority: number; } /** @@ -270,13 +270,13 @@ declare namespace appControl { /** * Indicates priority of the rule. * - * @type { int } + * @type { number } * @syscap SystemCapability.BundleManager.BundleFramework.AppControl * @systemapi * @since arkts {'1.1':'15', '1.2':'20'} * @arkts 1.1&1.2 */ - priority: int; + priority: number; } /** @@ -484,7 +484,7 @@ declare namespace appControl { * * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS * @param { string } appId - Indicates the app ID of the application. - * @param { int } [appIndex] Indicates the index of clone app. + * @param { number } [appIndex] Indicates the index of clone app. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -496,7 +496,7 @@ declare namespace appControl { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function deleteDisposedStatusSync(appId: string, appIndex?: int): void; + function deleteDisposedStatusSync(appId: string, appIndex?: number): void; /** * Obtains the disposed rule of a specified bundle. @@ -518,7 +518,7 @@ declare namespace appControl { * * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS * @param { string } appId - Indicates the app ID of the application. - * @param { int } [appIndex] Indicates the index of clone app. + * @param { number } [appIndex] Indicates the index of clone app. * @returns { DisposedRule } Returns the disposed rule of a specified bundle. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. @@ -531,7 +531,7 @@ declare namespace appControl { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getDisposedRule(appId: string, appIndex?: int): DisposedRule; + function getDisposedRule(appId: string, appIndex?: number): DisposedRule; /** * Sets the disposed rule of a specified bundle. @@ -554,7 +554,7 @@ declare namespace appControl { * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS * @param { string } appId - Indicates the app ID of the application. * @param { DisposedRule } rule - Indicates the disposed rule of a specified bundle. - * @param { int } [appIndex] Indicates the index of clone app. + * @param { number } [appIndex] Indicates the index of clone app. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -566,7 +566,7 @@ declare namespace appControl { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function setDisposedRule(appId: string, rule: DisposedRule, appIndex?: int): void; + function setDisposedRule(appId: string, rule: DisposedRule, appIndex?: number): void; /** * Sets the uninstall disposed rule of a specified bundle. @@ -574,7 +574,7 @@ declare namespace appControl { * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS * @param { string } appIdentifier - Indicates the appIdentifier of the application. * @param { UninstallDisposedRule } rule - Indicates the uninstall disposed rule of a specified bundle. - * @param { int } [appIndex] Indicates the index of clone app. + * @param { number } [appIndex] Indicates the index of clone app. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -587,14 +587,14 @@ declare namespace appControl { * @since arkts {'1.1':'15', '1.2':'20'} * @arkts 1.1&1.2 */ - function setUninstallDisposedRule(appIdentifier: string, rule: UninstallDisposedRule, appIndex?: int): void; + function setUninstallDisposedRule(appIdentifier: string, rule: UninstallDisposedRule, appIndex?: number): void; /** * Obtains the uninstall disposed rule of a specified bundle. * * @permission ohos.permission.GET_DISPOSED_APP_STATUS or ohos.permission.MANAGE_DISPOSED_APP_STATUS * @param { string } appIdentifier - Indicates the appIdentifier of the application. - * @param { int } [appIndex] Indicates the index of clone app. + * @param { number } [appIndex] Indicates the index of clone app. * @returns { UninstallDisposedRule } Returns the uninstall disposed rule of a specified bundle. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. @@ -607,14 +607,14 @@ declare namespace appControl { * @since arkts {'1.1':'15', '1.2':'20'} * @arkts 1.1&1.2 */ - function getUninstallDisposedRule(appIdentifier: string, appIndex?: int): UninstallDisposedRule; + function getUninstallDisposedRule(appIdentifier: string, appIndex?: number): UninstallDisposedRule; /** * Delete the uninstall disposed rule of a specified bundle. * * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS * @param { string } appIdentifier - Indicates the appIdentifier of the application. - * @param { int } [appIndex] Indicates the index of clone app. + * @param { number } [appIndex] Indicates the index of clone app. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. diff --git a/api/@ohos.bundle.appDomainVerify.d.ts b/api/@ohos.bundle.appDomainVerify.d.ts index a28a83468c..972f9cfab2 100644 --- a/api/@ohos.bundle.appDomainVerify.d.ts +++ b/api/@ohos.bundle.appDomainVerify.d.ts @@ -13,8 +13,7 @@ * @syscap SystemCapability.BundleManager.AppDomainVerify * @systemapi * @stagemodelonly - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ declare namespace appDomainVerify { @@ -31,8 +30,7 @@ declare namespace appDomainVerify { * @syscap SystemCapability.BundleManager.AppDomainVerify * @systemapi * @stagemodelonly - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ function queryAssociatedDomains(bundleName: string): string[]; @@ -48,8 +46,7 @@ declare namespace appDomainVerify { * @syscap SystemCapability.BundleManager.AppDomainVerify * @systemapi * @stagemodelonly - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ function queryAssociatedBundleNames(domain: string): string[]; } diff --git a/api/@ohos.bundle.bundleManager.d.ts b/api/@ohos.bundle.bundleManager.d.ts index 91dd5e5409..525a06ae37 100644 --- a/api/@ohos.bundle.bundleManager.d.ts +++ b/api/@ohos.bundle.bundleManager.d.ts @@ -95,7 +95,7 @@ declare namespace bundleManager { * Used to query the enumeration value of bundleInfo. Multiple values can be passed in the form. * Multiple value input, such as GET_BUNDLE_INFO_DEFAULT | GET_BUNDLE_INFO_WITH_APPLICATION. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform * @atomicservice @@ -424,7 +424,7 @@ declare namespace bundleManager { * Used to query the enumeration value of applicationInfo. Multiple values can be passed in the form. * Multiple value input, such as GET_APPLICATION_INFO_DEFAULT | GET_APPLICATION_INFO_WITH_PERMISSION. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} @@ -481,7 +481,7 @@ declare namespace bundleManager { /** * Used to query the enumeration value of abilityInfo. Multiple values can be passed in the form. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since 20 @@ -630,7 +630,7 @@ declare namespace bundleManager { /** * Used to query the enumeration value of ExtensionAbilityInfo. Multiple values can be passed in the form. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} @@ -695,7 +695,7 @@ declare namespace bundleManager { /** * This enumeration value is used to identify various types of extension ability * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} @@ -1009,7 +1009,7 @@ declare namespace bundleManager { /** * PermissionGrantState * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform * @atomicservice @@ -1084,7 +1084,7 @@ declare namespace bundleManager { /** * Support window mode * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform * @atomicservice @@ -1181,7 +1181,7 @@ declare namespace bundleManager { /** * Launch type * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform * @atomicservice @@ -1317,7 +1317,7 @@ declare namespace bundleManager { /** * Display orientation * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform * @atomicservice @@ -1676,7 +1676,7 @@ declare namespace bundleManager { /** * Indicates module type * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform * @atomicservice @@ -1765,7 +1765,7 @@ declare namespace bundleManager { /** * Indicates bundle type * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} @@ -1812,7 +1812,7 @@ declare namespace bundleManager { /** * Shared bundle compatible policy * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} @@ -1839,7 +1839,7 @@ declare namespace bundleManager { /** * This enumeration value is used to identify various types of JSON profile. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} @@ -1860,7 +1860,7 @@ declare namespace bundleManager { /** * This enumeration value is used to identify the distribution type of application. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} @@ -1943,7 +1943,7 @@ declare namespace bundleManager { /** * This enumeration value is used to identify various types of extension ability * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 @@ -1978,7 +1978,7 @@ declare namespace bundleManager { /** * This enumeration value is used to identify various flags of application * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} @@ -2045,7 +2045,7 @@ declare namespace bundleManager { /** * Obtains own bundleInfo. * - * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. * @returns { Promise } The result of getting the bundle info. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @syscap SystemCapability.BundleManager.BundleFramework.Core @@ -2054,7 +2054,7 @@ declare namespace bundleManager { * @since 20 * @arkts 1.1&1.2 */ - function getBundleInfoForSelf(bundleFlags: int): Promise; + function getBundleInfoForSelf(bundleFlags: number): Promise; /** * Obtains own bundleInfo. @@ -2078,7 +2078,7 @@ declare namespace bundleManager { /** * Obtains own bundleInfo. * - * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. * @param { AsyncCallback } callback - The callback of getting bundle info result. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @syscap SystemCapability.BundleManager.BundleFramework.Core @@ -2087,7 +2087,7 @@ declare namespace bundleManager { * @since 20 * @arkts 1.1&1.2 */ - function getBundleInfoForSelf(bundleFlags: int, callback: AsyncCallback): void; + function getBundleInfoForSelf(bundleFlags: number, callback: AsyncCallback): void; /** * Obtains own bundleInfo. @@ -2111,7 +2111,7 @@ declare namespace bundleManager { /** * Obtains own bundleInfo. * - * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. * @returns { BundleInfo } The result of getting the bundle info. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @syscap SystemCapability.BundleManager.BundleFramework.Core @@ -2120,14 +2120,14 @@ declare namespace bundleManager { * @since 20 * @arkts 1.1&1.2 */ - function getBundleInfoForSelfSync(bundleFlags: int): BundleInfo; + function getBundleInfoForSelfSync(bundleFlags: number): BundleInfo; /** * Obtains bundleInfo based on bundleName, bundleFlags. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. * @param { AsyncCallback } callback - The callback of getting bundle info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -2137,15 +2137,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleInfo(bundleName: string, bundleFlags: int, callback: AsyncCallback): void; + function getBundleInfo(bundleName: string, bundleFlags: number, callback: AsyncCallback): void; /** * Obtains bundleInfo based on bundleName, bundleFlags and userId. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. - * @param { int } userId - Indicates the user ID or do not pass user ID. + * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { number } userId - Indicates the user ID or do not pass user ID. * @param { AsyncCallback } callback - The callback of getting bundle info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -2157,15 +2157,15 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function getBundleInfo(bundleName: string, - bundleFlags: int, userId: int, callback: AsyncCallback): void; + bundleFlags: number, userId: number, callback: AsyncCallback): void; /** * Obtains bundleInfo based on bundleName, bundleFlags and userId. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. - * @param { int } userId - Indicates the user ID or do not pass user ID. + * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { number } userId - Indicates the user ID or do not pass user ID. * @returns { Promise } The result of getting the bundle info. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -2176,14 +2176,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleInfo(bundleName: string, bundleFlags: int, userId?: int): Promise; + function getBundleInfo(bundleName: string, bundleFlags: number, userId?: number): Promise; /** * Obtains application info based on a given bundle name. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. + * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. * @param { AsyncCallback } callback - The callback of getting application info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2195,15 +2195,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getApplicationInfo(bundleName: string, appFlags: int, callback: AsyncCallback): void; + function getApplicationInfo(bundleName: string, appFlags: number, callback: AsyncCallback): void; /** * Obtains application info based on a given bundle name. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. - * @param { int } userId - Indicates the user ID or do not pass user ID. + * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. + * @param { number } userId - Indicates the user ID or do not pass user ID. * @param { AsyncCallback } callback - The callback of getting application info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2217,15 +2217,15 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function getApplicationInfo(bundleName: string, - appFlags: int, userId: int, callback: AsyncCallback): void; + appFlags: number, userId: number, callback: AsyncCallback): void; /** * Obtains application info based on a given bundle name. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. - * @param { int } userId - Indicates the user ID or do not pass user ID. + * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. + * @param { number } userId - Indicates the user ID or do not pass user ID. * @returns { Promise } The result of getting the application info. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2238,13 +2238,13 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getApplicationInfo(bundleName: string, appFlags: int, userId?: int): Promise; + function getApplicationInfo(bundleName: string, appFlags: number, userId?: number): Promise; /** * Obtains BundleInfo of all bundles available in the system. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST - * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. + * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. * @param { AsyncCallback> } callback - The callback of getting a list of BundleInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2254,14 +2254,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllBundleInfo(bundleFlags: int, callback: AsyncCallback>): void; + function getAllBundleInfo(bundleFlags: number, callback: AsyncCallback>): void; /** * Obtains BundleInfo of all bundles available in the system. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST - * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. - * @param { int } userId - Indicates the user id. + * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. + * @param { number } userId - Indicates the user id. * @param { AsyncCallback> } callback - The callback of getting a list of BundleInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2272,14 +2272,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllBundleInfo(bundleFlags: int, userId: int, callback: AsyncCallback>): void; + function getAllBundleInfo(bundleFlags: number, userId: number, callback: AsyncCallback>): void; /** * Obtains BundleInfo of all bundles available in the system. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST - * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. - * @param { int } userId - Indicates the user id. + * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. + * @param { number } userId - Indicates the user id. * @returns { Promise> } Returns a list of BundleInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2290,13 +2290,13 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllBundleInfo(bundleFlags: int, userId?: int): Promise>; + function getAllBundleInfo(bundleFlags: number, userId?: number): Promise>; /** * Obtains information about all installed applications of a specified user. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST - * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. + * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. * @param { AsyncCallback> } callback - The callback of getting a list of ApplicationInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2306,14 +2306,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllApplicationInfo(appFlags: int, callback: AsyncCallback>): void; + function getAllApplicationInfo(appFlags: number, callback: AsyncCallback>): void; /** * Obtains information about all installed applications of a specified user. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST - * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. - * @param { int } userId - Indicates the user ID or do not pass user ID. + * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. + * @param { number } userId - Indicates the user ID or do not pass user ID. * @param { AsyncCallback> } callback - The callback of getting a list of ApplicationInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2324,15 +2324,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllApplicationInfo(appFlags: int, - userId: int, callback: AsyncCallback>): void; + function getAllApplicationInfo(appFlags: number, + userId: number, callback: AsyncCallback>): void; /** * Obtains information about all installed applications of a specified user. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST - * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. - * @param { int } userId - Indicates the user ID or do not pass user ID. + * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. + * @param { number } userId - Indicates the user ID or do not pass user ID. * @returns { Promise> } Returns a list of ApplicationInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2343,14 +2343,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllApplicationInfo(appFlags: int, userId?: int): Promise>; + function getAllApplicationInfo(appFlags: number, userId?: number): Promise>; /** * Query the AbilityInfo by the given Want. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. - * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. + * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. * @param { AsyncCallback> } callback - The callback of querying ability info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2365,15 +2365,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function queryAbilityInfo(want: Want, abilityFlags: int, callback: AsyncCallback>): void; + function queryAbilityInfo(want: Want, abilityFlags: number, callback: AsyncCallback>): void; /** * Query the AbilityInfo by the given Want. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. - * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. - * @param { int } userId - userId Indicates the user ID. + * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. + * @param { number } userId - userId Indicates the user ID. * @param { AsyncCallback> } callback - The callback of querying ability info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2390,15 +2390,15 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function queryAbilityInfo(want: Want, - abilityFlags: int, userId: int, callback: AsyncCallback>): void; + abilityFlags: number, userId: number, callback: AsyncCallback>): void; /** * Query the AbilityInfo by the given Want. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. - * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. - * @param { int } userId - userId Indicates the user ID. + * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. + * @param { number } userId - userId Indicates the user ID. * @returns { Promise> } Returns a list of AbilityInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2414,15 +2414,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function queryAbilityInfo(want: Want, abilityFlags: int, userId?: int): Promise>; + function queryAbilityInfo(want: Want, abilityFlags: number, userId?: number): Promise>; /** * Query the AbilityInfo by the given Want Array. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Array } wants - Indicates the Want Array containing the application bundle name to be queried. - * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. - * @param { int } [userId] - userId Indicates the user ID. + * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. + * @param { number } [userId] - userId Indicates the user ID. * @returns { Promise> } Returns a list of AbilityInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2438,15 +2438,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function queryAbilityInfo(wants: Array, abilityFlags: int, userId?: int): Promise>; + function queryAbilityInfo(wants: Array, abilityFlags: number, userId?: number): Promise>; /** * Query the AbilityInfo by the given Want. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. - * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. - * @param { int } userId - userId Indicates the user ID. + * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. + * @param { number } userId - userId Indicates the user ID. * @returns { Array } Returns a list of AbilityInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2462,7 +2462,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function queryAbilityInfoSync(want: Want, abilityFlags: int, userId?: int): Array; + function queryAbilityInfoSync(want: Want, abilityFlags: number, userId?: number): Array; /** * Get AbilityInfo by the given uri. @@ -2485,7 +2485,7 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. * @param { ExtensionAbilityType } extensionAbilityType - Indicates ExtensionAbilityType. - * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the * ExtensionAbilityInfo objects that will be returned. * @param { AsyncCallback> } callback - The callback of querying extension ability info result. * @throws { BusinessError } 201 - Permission denied. @@ -2501,7 +2501,7 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function queryExtensionAbilityInfo(want: Want, extensionAbilityType: ExtensionAbilityType, - extensionAbilityFlags: int, callback: AsyncCallback>): void; + extensionAbilityFlags: number, callback: AsyncCallback>): void; /** * Query extension info of by utilizing a Want. @@ -2509,9 +2509,9 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. * @param { ExtensionAbilityType } extensionAbilityType - Indicates ExtensionAbilityType. - * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the * ExtensionAbilityInfo objects that will be returned. - * @param { int } userId - Indicates the user ID. + * @param { number } userId - Indicates the user ID. * @param { AsyncCallback> } callback - The callback of querying extension ability info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2527,7 +2527,7 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function queryExtensionAbilityInfo(want: Want, extensionAbilityType: ExtensionAbilityType, - extensionAbilityFlags: int, userId: int, callback: AsyncCallback>): void; + extensionAbilityFlags: number, userId: number, callback: AsyncCallback>): void; /** * Query the ExtensionAbilityInfo by the given Want. @@ -2535,9 +2535,9 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. * @param { ExtensionAbilityType } extensionAbilityType - Indicates ExtensionAbilityType. - * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the * ExtensionAbilityInfo objects that will be returned. - * @param { int } userId - Indicates the user ID. + * @param { number } userId - Indicates the user ID. * @returns { Promise> } Returns a list of ExtensionAbilityInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2553,7 +2553,7 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function queryExtensionAbilityInfo(want: Want, extensionAbilityType: ExtensionAbilityType, - extensionAbilityFlags: int, userId?: int): Promise>; + extensionAbilityFlags: number, userId?: number): Promise>; /** * Query the ExtensionAbilityInfo by the given Want. @@ -2561,9 +2561,9 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. * @param { ExtensionAbilityType } extensionAbilityType - Indicates ExtensionAbilityType. - * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the * ExtensionAbilityInfo objects that will be returned. - * @param { int } userId - Indicates the user ID. + * @param { number } userId - Indicates the user ID. * @returns { Array } Returns a list of ExtensionAbilityInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2579,7 +2579,7 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function queryExtensionAbilityInfoSync(want: Want, extensionAbilityType: ExtensionAbilityType, - extensionAbilityFlags: int, userId?: int): Array; + extensionAbilityFlags: number, userId?: number): Array; /** * Query the ExtensionAbilityInfo by the given Want. @@ -2587,9 +2587,9 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { Want } want - Indicates the Want containing the application bundle name to be queried. * @param { string } extensionAbilityType - Indicates extensionAbilityType. - * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the * ExtensionAbilityInfo objects that will be returned. - * @param { int } userId - Indicates the user ID. + * @param { number } userId - Indicates the user ID. * @returns { Array } Returns a list of ExtensionAbilityInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2605,16 +2605,16 @@ declare namespace bundleManager { * @arkts 1.1&1.2 */ function queryExtensionAbilityInfoSync(want: Want, extensionAbilityType: string, - extensionAbilityFlags: int, userId?: int): Array; + extensionAbilityFlags: number, userId?: number): Array; /** * Query the ExtensionAbilityInfo by extension ability type. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } extensionAbilityType - Indicates ExtensionAbilityType. - * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the + * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the * ExtensionAbilityInfo objects that will be returned. - * @param { int } userId - Indicates the user ID. + * @param { number } userId - Indicates the user ID. * @returns { Array } Returns a list of ExtensionAbilityInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2627,14 +2627,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - function queryExtensionAbilityInfoSync(extensionAbilityType: string, extensionAbilityFlags: int, - userId?: int): Array; + function queryExtensionAbilityInfoSync(extensionAbilityType: string, extensionAbilityFlags: number, + userId?: number): Array; /** * Obtains bundle name by the given uid. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { int } uid - Indicates the UID of an application. + * @param { number } uid - Indicates the UID of an application. * @param { AsyncCallback } callback - The callback of getting bundle name. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -2643,13 +2643,13 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleNameByUid(uid: int, callback: AsyncCallback): void; + function getBundleNameByUid(uid: number, callback: AsyncCallback): void; /** * Obtains bundle name by the given uid. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { int } uid - Indicates the UID of an application. + * @param { number } uid - Indicates the UID of an application. * @returns { Promise } Returns the bundle name. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -2658,13 +2658,13 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleNameByUid(uid: int): Promise; + function getBundleNameByUid(uid: number): Promise; /** * Obtains bundle name by the given uid. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { int } uid - Indicates the UID of an application. + * @param { number } uid - Indicates the UID of an application. * @returns { string } Returns the bundle name. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -2673,7 +2673,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleNameByUidSync(uid: int): string; + function getBundleNameByUidSync(uid: number): string; /** * Obtains information about an application bundle contained in an ohos Ability Package (HAP). @@ -2681,7 +2681,7 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } hapFilePath - Indicates the path storing the HAP. * The path should be the relative path to the data directory of the current application. - * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. + * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. * @param { AsyncCallback } callback - The callback of getting bundle archive info result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2692,7 +2692,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleArchiveInfo(hapFilePath: string, bundleFlags: int, callback: AsyncCallback): void; + function getBundleArchiveInfo(hapFilePath: string, bundleFlags: number, callback: AsyncCallback): void; /** * Obtains information about an application bundle contained in an ohos Ability Package (HAP). @@ -2700,7 +2700,7 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } hapFilePath - Indicates the path storing the HAP. * The path should be the relative path to the data directory of the current application. - * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. + * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. * @returns { Promise } Returns the BundleInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2711,7 +2711,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleArchiveInfo(hapFilePath: string, bundleFlags: int): Promise; + function getBundleArchiveInfo(hapFilePath: string, bundleFlags: number): Promise; /** * Obtains information about an application bundle contained in an ohos Ability Package (HAP). @@ -2719,7 +2719,7 @@ declare namespace bundleManager { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } hapFilePath - Indicates the path storing the HAP. * The path should be the relative path to the data directory of the current application. - * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. + * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. * @returns { BundleInfo } Returns the BundleInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2730,7 +2730,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleArchiveInfoSync(hapFilePath: string, bundleFlags: int): BundleInfo; + function getBundleArchiveInfoSync(hapFilePath: string, bundleFlags: number): BundleInfo; /** * Clears cache data of a specified application. @@ -2773,7 +2773,7 @@ declare namespace bundleManager { * * @permission ohos.permission.REMOVE_CACHE_FILES * @param { string } bundleName - Indicates the bundle name of the application whose cache data is to be cleaned. - * @param { int } appIndex - Indicates the index of clone app. + * @param { number } appIndex - Indicates the index of clone app. * @returns { Promise } Clean bundle cache files result * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -2786,13 +2786,13 @@ declare namespace bundleManager { * @since arkts {'1.1':'15', '1.2':'20'} * @arkts 1.1&1.2 */ - function cleanBundleCacheFiles(bundleName: string, appIndex: int): Promise; + function cleanBundleCacheFiles(bundleName: string, appIndex: number): Promise; /** * Get the all bundle cache size of the current user. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @returns { Promise } Returns all bundle cache size. + * @returns { Promise } Returns all bundle cache size. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @syscap SystemCapability.BundleManager.BundleFramework.Core @@ -2800,7 +2800,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'15', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllBundleCacheSize(): Promise; + function getAllBundleCacheSize(): Promise; /** * Clean all bundle cache files of the current user, does not include the currently running program. @@ -2821,7 +2821,7 @@ declare namespace bundleManager { * * @permission ohos.permission.CHANGE_ABILITY_ENABLED_STATE * @param { string } bundleName - Indicates the bundle name of the application. - * @param { int } appIndex - Indicates the index of clone app. + * @param { number } appIndex - Indicates the index of clone app. * @param { boolean } isEnabled - The value true means to enable it, and the value false means to disable it. * @returns { Promise } set app enabled result. * @throws { BusinessError } 201 - Permission denied. @@ -2834,7 +2834,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function setApplicationEnabled(bundleName: string, appIndex: int, isEnabled: boolean): Promise; + function setApplicationEnabled(bundleName: string, appIndex: number, isEnabled: boolean): Promise; /** * Sets whether to enable a specified application. @@ -2894,7 +2894,7 @@ declare namespace bundleManager { * * @permission ohos.permission.CHANGE_ABILITY_ENABLED_STATE * @param { AbilityInfo } info - Indicates information about the ability to set. - * @param { int } appIndex - Indicates the index of clone app. + * @param { number } appIndex - Indicates the index of clone app. * @param { boolean } isEnabled - The value true means to enable it, and the value false means to disable it. * @returns { Promise } set ability enabled result. * @throws { BusinessError } 201 - Permission denied. @@ -2908,7 +2908,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function setAbilityEnabled(info: AbilityInfo, appIndex: int, isEnabled: boolean): Promise; + function setAbilityEnabled(info: AbilityInfo, appIndex: number, isEnabled: boolean): Promise; /** * Sets whether to enable a specified ability. @@ -2970,7 +2970,7 @@ declare namespace bundleManager { * Checks whether a specified application is enabled. * * @param { string } bundleName - Indicates the bundle name of the application. - * @param { int } appIndex - Indicates the index of clone app. + * @param { number } appIndex - Indicates the index of clone app. * @returns { Promise } Returns true if the application is enabled; returns false otherwise. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -2981,7 +2981,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function isApplicationEnabled(bundleName: string, appIndex: int): Promise; + function isApplicationEnabled(bundleName: string, appIndex: number): Promise; /** * Checks whether a specified application is enabled. @@ -3032,7 +3032,7 @@ declare namespace bundleManager { * Checks whether a specified ability is enabled. * * @param { AbilityInfo } info - Indicates information about the ability to check. - * @param { int } appIndex - Indicates the index of clone app. + * @param { number } appIndex - Indicates the index of clone app. * @returns { Promise } Returns true if the ability is enabled; returns false otherwise. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -3044,7 +3044,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function isAbilityEnabled(info: AbilityInfo, appIndex: int): Promise; + function isAbilityEnabled(info: AbilityInfo, appIndex: number): Promise; /** * Checks whether a specified ability is enabled. @@ -3101,7 +3101,7 @@ declare namespace bundleManager { * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the bundle name of the application. - * @param { int } userId - Indicates the user ID or do not pass user ID. + * @param { number } userId - Indicates the user ID or do not pass user ID. * @param { AsyncCallback } callback - The callback for starting the application's main ability. * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.GET_BUNDLE_INFO_PRIVILEGED'. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3114,7 +3114,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getLaunchWantForBundle(bundleName: string, userId: int, callback: AsyncCallback): void; + function getLaunchWantForBundle(bundleName: string, userId: number, callback: AsyncCallback): void; /** * Obtains the Want for starting the main ability of an application based on the @@ -3143,7 +3143,7 @@ declare namespace bundleManager { * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the bundle name of the application. - * @param { int } userId - Indicates the user ID or do not pass user ID. + * @param { number } userId - Indicates the user ID or do not pass user ID. * @returns { Promise } the Want for starting the application's main ability. * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.GET_BUNDLE_INFO_PRIVILEGED'. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3156,7 +3156,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getLaunchWantForBundle(bundleName: string, userId?: int): Promise; + function getLaunchWantForBundle(bundleName: string, userId?: number): Promise; /** * Obtains the Want for starting the main ability of an application based on the @@ -3165,7 +3165,7 @@ declare namespace bundleManager { * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the bundle name of the application. - * @param { int } userId - Indicates the user ID or do not pass user ID. + * @param { number } userId - Indicates the user ID or do not pass user ID. * @returns { Want } the Want for starting the application's main ability. * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.GET_BUNDLE_INFO_PRIVILEGED'. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3178,7 +3178,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function getLaunchWantForBundleSync(bundleName: string, userId?: int): Want; + function getLaunchWantForBundleSync(bundleName: string, userId?: number): Want; /** * Obtains the Want for starting the main ability of own application. @@ -3520,8 +3520,8 @@ declare namespace bundleManager { * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { int } applicationFlags - Indicates the flag used to specify information contained in the ApplicationInfo object that will be returned. - * @param { int } userId - Indicates the user ID or do not pass user ID. + * @param { number } applicationFlags - Indicates the flag used to specify information contained in the ApplicationInfo object that will be returned. + * @param { number } userId - Indicates the user ID or do not pass user ID. * @returns { ApplicationInfo } - Returns the ApplicationInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3534,14 +3534,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getApplicationInfoSync(bundleName: string, applicationFlags: int, userId: int): ApplicationInfo; + function getApplicationInfoSync(bundleName: string, applicationFlags: number, userId: number): ApplicationInfo; /** * Obtains applicationInfo based on a given bundleName and bundleFlags. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { int } applicationFlags - Indicates the flag used to specify information contained in the ApplicationInfo object that will be returned. + * @param { number } applicationFlags - Indicates the flag used to specify information contained in the ApplicationInfo object that will be returned. * @returns { ApplicationInfo } - Returns the ApplicationInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3553,15 +3553,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getApplicationInfoSync(bundleName: string, applicationFlags: int): ApplicationInfo; + function getApplicationInfoSync(bundleName: string, applicationFlags: number): ApplicationInfo; /** * Obtains bundleInfo based on bundleName, bundleFlags and userId. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object that will be returned. - * @param { int } userId - Indicates the user ID or do not pass user ID. + * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object that will be returned. + * @param { number } userId - Indicates the user ID or do not pass user ID. * @returns { BundleInfo } - Returns the BundleInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -3572,14 +3572,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleInfoSync(bundleName: string, bundleFlags: int, userId: int): BundleInfo; + function getBundleInfoSync(bundleName: string, bundleFlags: number, userId: number): BundleInfo; /** * Obtains bundleInfo based on bundleName, bundleFlags. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object that will be returned. + * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object that will be returned. * @returns { BundleInfo } - Returns the BundleInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -3589,7 +3589,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleInfoSync(bundleName: string, bundleFlags: int): BundleInfo; + function getBundleInfoSync(bundleName: string, bundleFlags: number): BundleInfo; /** * Obtains SharedBundleInfo of all shared bundle available in the system. @@ -3680,7 +3680,7 @@ declare namespace bundleManager { * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the bundle name of the application to which the ability belongs. - * @param { int } userId - Indicates the user ID or do not pass user ID. + * @param { number } userId - Indicates the user ID or do not pass user ID. * @param { AsyncCallback } callback - Indicates the callback of getting AppProvisionInfo result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3693,14 +3693,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAppProvisionInfo(bundleName: string, userId: int, callback: AsyncCallback): void; + function getAppProvisionInfo(bundleName: string, userId: number, callback: AsyncCallback): void; /** * Obtains the profile file information of a specified bundle. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the bundle name of the application to which the ability belongs. - * @param { int } userId - Indicates the user ID or do not pass user ID. + * @param { number } userId - Indicates the user ID or do not pass user ID. * @returns { Promise } Returns the AppProvisionInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3713,14 +3713,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAppProvisionInfo(bundleName: string, userId?: int): Promise; + function getAppProvisionInfo(bundleName: string, userId?: number): Promise; /** * Obtains the profile file information of a specified bundle. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the bundle name of the application to which the ability belongs. - * @param { int } userId - Indicates the user ID or do not pass user ID. + * @param { number } userId - Indicates the user ID or do not pass user ID. * @returns { AppProvisionInfo } Returns the AppProvisionInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3733,7 +3733,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAppProvisionInfoSync(bundleName: string, userId?: int): AppProvisionInfo; + function getAppProvisionInfoSync(bundleName: string, userId?: number): AppProvisionInfo; /** * Obtains the distribution type specified during bundle installation. @@ -3796,7 +3796,7 @@ declare namespace bundleManager { * @param { ProfileType } profileType - Indicates the type of profile to be obtained. * @param { string } bundleName - Indicates the name of the bundle to which the profile belongs. * @param { string } moduleName - Indicates the name of the module to which the profile belongs. - * @param { int } userId - Indicates the user ID or do not pass user ID. + * @param { number } userId - Indicates the user ID or do not pass user ID. * @returns { string } Returns string in json-format of the designated profile. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -3811,7 +3811,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getJsonProfile(profileType: ProfileType, bundleName: string, moduleName?: string, userId?: int): string; + function getJsonProfile(profileType: ProfileType, bundleName: string, moduleName?: string, userId?: number): string; /** * Get extend resources. @@ -4179,7 +4179,7 @@ declare namespace bundleManager { * Get a list of developedId by distribution type. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { int } appDistributionType - Indicates the distribution type of the application, and if not passed in, it gets all the developerId. + * @param { number } appDistributionType - Indicates the distribution type of the application, and if not passed in, it gets all the developerId. * @returns { Array } Returns a list of developerId. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -4189,7 +4189,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getDeveloperIds(appDistributionType?: int): Array; + function getDeveloperIds(appDistributionType?: number): Array; /** * Switch uninstall state of a specified application. @@ -4213,7 +4213,7 @@ declare namespace bundleManager { * Get the SignatureInfo of the application through UID. * * @permission ohos.permission.GET_SIGNATURE_INFO - * @param { int } uid - Indicates the UID of an application. + * @param { number } uid - Indicates the UID of an application. * @returns { SignatureInfo } The result of getting the signature info. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 17700021 - The uid is not found. @@ -4221,16 +4221,16 @@ declare namespace bundleManager { * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - function getSignatureInfo(uid: int): SignatureInfo; + function getSignatureInfo(uid: number): SignatureInfo; /** * Get the BundleInfo of the specified MultiIsolation App. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { int } appIndex - Indicates the index of clone app. - * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. - * @param { int } [userId] - Indicates the user ID, If the user id is not specified, the current user id is used by default. + * @param { number } appIndex - Indicates the index of clone app. + * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { number } [userId] - Indicates the user ID, If the user id is not specified, the current user id is used by default. * @returns { Promise } Returns A BundleInfo Of MultiApp Mode. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -4244,15 +4244,15 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAppCloneBundleInfo(bundleName: string, appIndex: int, bundleFlags: int, userId?: int): Promise; + function getAppCloneBundleInfo(bundleName: string, appIndex: number, bundleFlags: number, userId?: number): Promise; /** * Get all BundleInfo of clone app. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. - * @param { int } [userId] - Indicates the user ID, If the user id is not specified, the current user id is used by default. + * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. + * @param { number } [userId] - Indicates the user ID, If the user id is not specified, the current user id is used by default. * @returns { Promise> } Returns BundleInfo Arrays Of MultiApp Mode. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -4265,13 +4265,13 @@ declare namespace bundleManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllAppCloneBundleInfo(bundleName: string, bundleFlags: int, userId?: int): Promise>; + function getAllAppCloneBundleInfo(bundleName: string, bundleFlags: number, userId?: number): Promise>; /** * Obtains AppCloneIdentity contains bundleName and appIndex by the given uid. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { int } uid - Indicates the UID of an application. + * @param { number } uid - Indicates the UID of an application. * @returns { Promise } Returns the clone Identity contains bundleName and appIndex. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -4280,14 +4280,14 @@ declare namespace bundleManager { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAppCloneIdentity(uid: int): Promise; + function getAppCloneIdentity(uid: number): Promise; /** * Get all plugin info of host application. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } hostBundleName - Indicates the host application bundle name to be queried. - * @param { int } [userId] - Indicates the user ID or do not pass user ID. + * @param { number } [userId] - Indicates the user ID or do not pass user ID. * @returns { Promise> } Returns PluginBundleInfo Arrays. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -4298,7 +4298,7 @@ declare namespace bundleManager { * @since arkts {'1.1':'19', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllPluginInfo(hostBundleName: string, userId?: int): Promise>; + function getAllPluginInfo(hostBundleName: string, userId?: number): Promise>; /** * Migrate files from the source paths to the destination path. diff --git a/api/@ohos.bundle.bundleMonitor.d.ts b/api/@ohos.bundle.bundleMonitor.d.ts index af4c9cbd26..a9f1ed5e4f 100644 --- a/api/@ohos.bundle.bundleMonitor.d.ts +++ b/api/@ohos.bundle.bundleMonitor.d.ts @@ -54,25 +54,25 @@ declare namespace bundleMonitor { /** * The user id * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly userId: int; + readonly userId: number; /** * The app index of clone app * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: int; + readonly appIndex: number; } /** diff --git a/api/@ohos.bundle.bundleResourceManager.d.ts b/api/@ohos.bundle.bundleResourceManager.d.ts index 396e138386..20cbf30fd3 100644 --- a/api/@ohos.bundle.bundleResourceManager.d.ts +++ b/api/@ohos.bundle.bundleResourceManager.d.ts @@ -43,7 +43,7 @@ declare namespace bundleResourceManager { * Used to query the enumeration value of resource info. Multiple values can be passed in the form. * Multiple value input, such as GET_RESOURCE_INFO_WITH_LABEL | GET_RESOURCE_INFO_WITH_ICON. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} @@ -117,7 +117,7 @@ declare namespace bundleResourceManager { * * @permission ohos.permission.GET_BUNDLE_RESOURCES * @param { string } bundleName - Indicates the bundle name of the application. - * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo object that will be returned. + * @param { number } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo object that will be returned. * @returns { BundleResourceInfo } Returns the BundleResourceInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -128,15 +128,15 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleResourceInfo(bundleName: string, resourceFlags?: int): BundleResourceInfo; + function getBundleResourceInfo(bundleName: string, resourceFlags?: number): BundleResourceInfo; /** * Obtains the BundleResourceInfo of a specified bundle. Default resourceFlag is GET_RESOURCE_INFO_ALL. * * @permission ohos.permission.GET_BUNDLE_RESOURCES * @param { string } bundleName - Indicates the bundle name of the application. - * @param { int } [resourceFlags] {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo object that will be returned. - * @param { int } [appIndex] - Indicates the index of the bundle,The default value is 0. + * @param { number } [resourceFlags] {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo object that will be returned. + * @param { number } [appIndex] - Indicates the index of the bundle,The default value is 0. * @returns { BundleResourceInfo } Returns the BundleResourceInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -148,14 +148,14 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getBundleResourceInfo(bundleName: string, resourceFlags?: int, appIndex?: int): BundleResourceInfo; + function getBundleResourceInfo(bundleName: string, resourceFlags?: number, appIndex?: number): BundleResourceInfo; /** * Obtains the LauncherAbilityResourceInfo of a specified bundle. Default resourceFlag is GET_RESOURCE_INFO_ALL. * * @permission ohos.permission.GET_BUNDLE_RESOURCES * @param { string } bundleName - Indicates the bundle name of the application. - * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo object that will be returned. + * @param { number } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo object that will be returned. * @returns { Array } Returns a list of LauncherAbilityResourceInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -166,16 +166,16 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: int): Array; + function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: number): Array; /** * Obtains the LauncherAbilityResourceInfo of a specified bundle. Default resourceFlag is GET_RESOURCE_INFO_ALL. * * @permission ohos.permission.GET_BUNDLE_RESOURCES * @param { string } bundleName - Indicates the bundle name of the application. - * @param { int } [resourceFlags] {@link ResourceFlag} - Indicates the flag used to specify information + * @param { number } [resourceFlags] {@link ResourceFlag} - Indicates the flag used to specify information *
    contained in the LauncherAbilityResourceInfo object that will be returned. - * @param { int } [appIndex] - Indicates the index of the bundle,The default value is 0. + * @param { number } [appIndex] - Indicates the index of the bundle,The default value is 0. * @returns { Array } Returns a list of LauncherAbilityResourceInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -187,13 +187,13 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: int, appIndex?: int): Array; + function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: number, appIndex?: number): Array; /** * Obtains BundleResourceInfo of all bundles available in the system. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST and ohos.permission.GET_BUNDLE_RESOURCES - * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo that will be returned. + * @param { number } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo that will be returned. * @param { AsyncCallback> } callback - The callback of getting a list of BundleResourceInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -203,13 +203,13 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllBundleResourceInfo(resourceFlags: int, callback: AsyncCallback>): void; + function getAllBundleResourceInfo(resourceFlags: number, callback: AsyncCallback>): void; /** * Obtains BundleResourceInfo of all bundles available in the system. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST and ohos.permission.GET_BUNDLE_RESOURCES - * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo that will be returned. + * @param { number } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo that will be returned. * @returns { Promise> } Returns a list of BundleResourceInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -219,13 +219,13 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllBundleResourceInfo(resourceFlags: int): Promise>; + function getAllBundleResourceInfo(resourceFlags: number): Promise>; /** * Obtains LauncherAbilityResourceInfo of all launcher abilities available in the system. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST and ohos.permission.GET_BUNDLE_RESOURCES - * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo that will be returned. + * @param { number } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo that will be returned. * @param { AsyncCallback> } callback - The callback of getting a list of LauncherAbilityResourceInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -235,13 +235,13 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllLauncherAbilityResourceInfo(resourceFlags: int, callback: AsyncCallback>): void; + function getAllLauncherAbilityResourceInfo(resourceFlags: number, callback: AsyncCallback>): void; /** * Obtains LauncherAbilityResourceInfo of all launcher abilities available in the system. * * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST and ohos.permission.GET_BUNDLE_RESOURCES - * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo that will be returned. + * @param { number } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo that will be returned. * @returns { Promise> } Returns a list of LauncherAbilityResourceInfo objects. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -251,7 +251,7 @@ declare namespace bundleResourceManager { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllLauncherAbilityResourceInfo(resourceFlags: int): Promise>; + function getAllLauncherAbilityResourceInfo(resourceFlags: number): Promise>; /** * Obtains the abilityResourceInfo of a specified bundle. diff --git a/api/@ohos.bundle.defaultAppManager.d.ts b/api/@ohos.bundle.defaultAppManager.d.ts index c402034e9b..358a1d920b 100644 --- a/api/@ohos.bundle.defaultAppManager.d.ts +++ b/api/@ohos.bundle.defaultAppManager.d.ts @@ -34,7 +34,7 @@ declare namespace defaultAppManager { /** * The constant for application type. * - * @enum { string } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 @@ -158,7 +158,7 @@ declare namespace defaultAppManager { * * @permission ohos.permission.GET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. - * @param { int } userId - Indicates the id for the user. + * @param { number } userId - Indicates the id for the user. * @param { AsyncCallback } callback - The callback of the BundleInfo object result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -172,7 +172,7 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getDefaultApplication(type: string, userId: int, callback: AsyncCallback): void; + function getDefaultApplication(type: string, userId: number, callback: AsyncCallback): void; /** * Get default application based on type. @@ -198,7 +198,7 @@ declare namespace defaultAppManager { * * @permission ohos.permission.GET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. - * @param { int } userId - Indicates the id for the user. + * @param { number } userId - Indicates the id for the user. * @returns { Promise } Return the BundleInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -212,14 +212,14 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getDefaultApplication(type: string, userId?: int): Promise; + function getDefaultApplication(type: string, userId?: number): Promise; /** * Get default application based on type. * * @permission ohos.permission.GET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. - * @param { int } userId - Indicates the id for the user. + * @param { number } userId - Indicates the id for the user. * @returns { BundleInfo } Return the BundleInfo object. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -233,7 +233,7 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function getDefaultApplicationSync(type: string, userId?: int): BundleInfo; + function getDefaultApplicationSync(type: string, userId?: number): BundleInfo; /** * Set default application based on type. @@ -241,7 +241,7 @@ declare namespace defaultAppManager { * @permission ohos.permission.SET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. * @param { ElementName } elementName - Uniquely identifies an ability or extensionAbility. - * @param { int } userId - Indicates the id for the user. + * @param { number } userId - Indicates the id for the user. * @param { AsyncCallback } callback - The callback of setting default application result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -256,7 +256,7 @@ declare namespace defaultAppManager { * @arkts 1.1&1.2 */ function setDefaultApplication(type: string, - elementName: ElementName, userId: int, callback: AsyncCallback): void; + elementName: ElementName, userId: number, callback: AsyncCallback): void; /** * Set default application based on type. @@ -284,7 +284,7 @@ declare namespace defaultAppManager { * @permission ohos.permission.SET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. * @param { ElementName } elementName - Uniquely identifies an ability or extensionAbility. - * @param { int } userId - Indicates the id for the user. + * @param { number } userId - Indicates the id for the user. * @returns { Promise } The result of setting default application. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -298,7 +298,7 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function setDefaultApplication(type: string, elementName: ElementName, userId?: int): Promise; + function setDefaultApplication(type: string, elementName: ElementName, userId?: number): Promise; /** * Set default application based on type. @@ -306,7 +306,7 @@ declare namespace defaultAppManager { * @permission ohos.permission.SET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. * @param { ElementName } elementName - Uniquely identifies an ability or extensionAbility. - * @param { int } userId - Indicates the id for the user. + * @param { number } userId - Indicates the id for the user. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -319,14 +319,14 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function setDefaultApplicationSync(type: string, elementName: ElementName, userId?: int): void; + function setDefaultApplicationSync(type: string, elementName: ElementName, userId?: number): void; /** * Reset default application based on type. * * @permission ohos.permission.SET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. - * @param { int } userId - Indicates the id for the user. + * @param { number } userId - Indicates the id for the user. * @param { AsyncCallback } callback - The callback of resetting default application result. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -339,7 +339,7 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function resetDefaultApplication(type: string, userId: int, callback: AsyncCallback): void; + function resetDefaultApplication(type: string, userId: number, callback: AsyncCallback): void; /** * Reset default application based on type. @@ -364,7 +364,7 @@ declare namespace defaultAppManager { * * @permission ohos.permission.SET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. - * @param { int } userId - Indicates the id for the user. + * @param { number } userId - Indicates the id for the user. * @returns { Promise } The result of resetting default application. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -377,14 +377,14 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function resetDefaultApplication(type: string, userId?: int): Promise; + function resetDefaultApplication(type: string, userId?: number): Promise; /** * Reset default application based on type. * * @permission ohos.permission.SET_DEFAULT_APPLICATION * @param { string } type - Application type or a file type that conforms to media type format. - * @param { int } userId - Indicates the id for the user. + * @param { number } userId - Indicates the id for the user. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -396,7 +396,7 @@ declare namespace defaultAppManager { * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - function resetDefaultApplicationSync(type: string, userId?: int): void; + function resetDefaultApplicationSync(type: string, userId?: number): void; } export default defaultAppManager; diff --git a/api/@ohos.bundle.freeInstall.d.ts b/api/@ohos.bundle.freeInstall.d.ts index bf7aeb1813..a156bc3015 100644 --- a/api/@ohos.bundle.freeInstall.d.ts +++ b/api/@ohos.bundle.freeInstall.d.ts @@ -43,7 +43,7 @@ declare namespace freeInstall { /** * Used to set the enumeration value of upgrading for free installation. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} @@ -83,7 +83,7 @@ declare namespace freeInstall { * Used to query the enumeration value of bundlePackInfo. * Multiple value input, such as GET_PACKAGES | GET_BUNDLE_SUMMARY. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.BundleFramework * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} diff --git a/api/@ohos.bundle.installer.d.ts b/api/@ohos.bundle.installer.d.ts index 00a4c65ca3..e3623e7de4 100644 --- a/api/@ohos.bundle.installer.d.ts +++ b/api/@ohos.bundle.installer.d.ts @@ -1673,7 +1673,7 @@ declare namespace installer { * @permission ohos.permission.INSTALL_CLONE_BUNDLE * @param { string } bundleName - Indicates the path where the HAP of the application is stored. * @param { CreateAppCloneParam } [createAppCloneParam] Indicates the optional params of create clone app. - * @returns { Promise } Return the appIndex of the clone application. + * @returns { Promise } Return the appIndex of the clone application. * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.INSTALL_CLONE_BUNDLE'. * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. @@ -1686,7 +1686,7 @@ declare namespace installer { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - createAppClone(bundleName: string, createAppCloneParam?: CreateAppCloneParam): Promise; + createAppClone(bundleName: string, createAppCloneParam?: CreateAppCloneParam): Promise; /** * Destroy clone instance for an application. @@ -1734,11 +1734,12 @@ declare namespace installer { * * @permission ohos.permission.UNINSTALL_CLONE_BUNDLE * @param { string } bundleName - Indicates the bundleName of clone app. - * @param { int } appIndex - Indicates the clone application's index. - * @param { int | DestroyAppCloneParam } [options] - Indicates other parameters required for the uninstallation. + * @param { number } appIndex - Indicates the clone application's index. + * @param { number | DestroyAppCloneParam } [options] - Indicates other parameters required for the uninstallation. * @returns { Promise } the promise returned by the function. * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.UNINSTALL_CLONE_BUNDLE'. * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @throws { BusinessError } 17700001 - The specified bundleName cannot be found or the bundle is not installed by the specified user. * @throws { BusinessError } 17700004 - The userId is invalid. * @throws { BusinessError } 17700061 - AppIndex not in valid range. @@ -1748,7 +1749,7 @@ declare namespace installer { * @since 20 * @arkts 1.2 */ - destroyAppClone(bundleName: string, appIndex: int, options?: int | DestroyAppCloneParam): Promise; + destroyAppClone(bundleName: string, appIndex: number, options?: number | DestroyAppCloneParam): Promise; /** * Install application by bundle name with specified user. @@ -1772,7 +1773,7 @@ declare namespace installer { * * @permission ohos.permission.INSTALL_BUNDLE * @param { string } bundleName - Indicates the bundle name of application. - * @param { int } [userId] - userId Indicates the user ID. + * @param { number } [userId] - userId Indicates the user ID. * @returns { Promise } the promise returned by the function. * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.INSTALL_BUNDLE'. * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. @@ -1787,7 +1788,7 @@ declare namespace installer { * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - installPreexistingApp(bundleName: string, userId?: int): Promise; + installPreexistingApp(bundleName: string, userId?: number): Promise; /** * Install plugin for host application. @@ -1989,24 +1990,24 @@ declare namespace installer { /** * Indicates the user id * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - userId?: int; + userId?: number; /** * Indicates the installation type. The value 0x00 means normal installation, 0x01 means overwrite installation, and 0x10 means installation-free. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - installFlag?: int; + installFlag?: number; /** * Indicates whether the param has data @@ -2033,13 +2034,13 @@ declare namespace installer { /** * Indicates the deadline of the crowdtesting bundle * - * @type { ?long } + * @type { ?number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - crowdtestDeadline?: long; + crowdtestDeadline?: number; /** * Indicates the shared bundle dir paths. @@ -2132,13 +2133,13 @@ declare namespace installer { /** * Indicates the shared version code. If default, indicates that all version sharing bundles are uninstalled * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - versionCode?: int; + versionCode?: number; } /** @@ -2154,23 +2155,23 @@ declare namespace installer { /** * Indicates the user id * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - userId?: int; + userId?: number; /** * Indicates the appIndex of MultiApp * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - appIndex?: int; + appIndex?: number; } /** @@ -2186,13 +2187,13 @@ declare namespace installer { /** * Indicates the user id * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'15', '1.2':'20'} * @arkts 1.1&1.2 */ - userId?: int; + userId?: number; /** * Indicates parameters. * @@ -2218,13 +2219,13 @@ declare namespace installer { /** * Indicates the user id. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'19', '1.2':'20'} * @arkts 1.1&1.2 */ - userId?: int; + userId?: number; /** * Indicates parameters. diff --git a/api/@ohos.bundle.launcherBundleManager.d.ts b/api/@ohos.bundle.launcherBundleManager.d.ts index 09150c126b..d6d897bb73 100644 --- a/api/@ohos.bundle.launcherBundleManager.d.ts +++ b/api/@ohos.bundle.launcherBundleManager.d.ts @@ -40,7 +40,7 @@ declare namespace launcherBundleManager { * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { int } userId - Indicates the id for the user. + * @param { number } userId - Indicates the id for the user. * @param { AsyncCallback> } callback -The callback of the LauncherAbilityInfo object result. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -54,14 +54,14 @@ declare namespace launcherBundleManager { * @arkts 1.1&1.2 */ function getLauncherAbilityInfo(bundleName: string, - userId: int, callback: AsyncCallback>): void; + userId: number, callback: AsyncCallback>): void; /** * Obtains launcher abilities info based on a given bundleName and userId. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { int } userId - Indicates the id for the user. + * @param { number } userId - Indicates the id for the user. * @returns { Promise> } the LauncherAbilityInfo object. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -74,14 +74,14 @@ declare namespace launcherBundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getLauncherAbilityInfo(bundleName: string, userId: int): Promise>; + function getLauncherAbilityInfo(bundleName: string, userId: number): Promise>; /** * Obtains launcher abilities info based on a given bundleName and userId. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { int } userId - Indicates the id for the user. + * @param { number } userId - Indicates the id for the user. * @returns { Array } the LauncherAbilityInfo object. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 801 - Capability not support. @@ -91,13 +91,13 @@ declare namespace launcherBundleManager { * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - function getLauncherAbilityInfoSync(bundleName: string, userId: int): Array; + function getLauncherAbilityInfoSync(bundleName: string, userId: number): Array; /** * Obtains launcher abilities info based on a given userId. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { int } userId - Indicates the id for the user. + * @param { number } userId - Indicates the id for the user. * @param { AsyncCallback> } callback -The callback of the LauncherAbilityInfo object result. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -109,13 +109,13 @@ declare namespace launcherBundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllLauncherAbilityInfo(userId: int, callback: AsyncCallback>): void; + function getAllLauncherAbilityInfo(userId: number, callback: AsyncCallback>): void; /** * Obtains launcher abilities info based on a given userId. * * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { int } userId - Indicates the id for the user. + * @param { number } userId - Indicates the id for the user. * @returns { Promise> } the LauncherAbilityInfo object. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -127,7 +127,7 @@ declare namespace launcherBundleManager { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllLauncherAbilityInfo(userId: int): Promise>; + function getAllLauncherAbilityInfo(userId: number): Promise>; /** * Obtains shortcut info based on a given bundleName. @@ -187,9 +187,9 @@ declare namespace launcherBundleManager { /** * Obtains shortcut info based on bundleName and userId. * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED * @param { string } bundleName - Indicates the application bundle name to be queried. - * @param { int } userId - Indicates the user ID. + * @param { number } userId - Indicates the user ID. * @returns { Array } the LauncherShortcutInfo object. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -202,7 +202,7 @@ declare namespace launcherBundleManager { * @since arkts {'1.1':'13', '1.2':'20'} * @arkts 1.1&1.2 */ - function getShortcutInfoSync(bundleName: string, userId: int): Array; + function getShortcutInfoSync(bundleName: string, userId: number): Array; /** * Obtains shortcut info based on bundleName and appIndex. diff --git a/api/@ohos.bundle.shortcutManager.d.ts b/api/@ohos.bundle.shortcutManager.d.ts index bc479a11a8..2f06794328 100644 --- a/api/@ohos.bundle.shortcutManager.d.ts +++ b/api/@ohos.bundle.shortcutManager.d.ts @@ -42,7 +42,7 @@ declare namespace shortcutManager { * * @permission ohos.permission.MANAGE_SHORTCUTS * @param { ShortcutInfo } shortcutInfo - Indicates the shortcut info which contains shortcut want. - * @param { int } userId - Indicates the id for the user. + * @param { number } userId - Indicates the id for the user. * @returns { Promise } the promise returned by the function. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -57,14 +57,14 @@ declare namespace shortcutManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function addDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: int): Promise; + function addDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: number): Promise; /** * Delete desktop shortcut info. * * @permission ohos.permission.MANAGE_SHORTCUTS * @param { ShortcutInfo } shortcutInfo - Indicates the shortcut info which contains shortcut want. - * @param { int } userId - Indicates the id for the user. + * @param { number } userId - Indicates the id for the user. * @returns { Promise } the promise returned by the function. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -75,13 +75,13 @@ declare namespace shortcutManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function deleteDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: int): Promise; + function deleteDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: number): Promise; /** * Get all desktop shortcut info. * * @permission ohos.permission.MANAGE_SHORTCUTS - * @param { int } userId - Indicates the id for the user. + * @param { number } userId - Indicates the id for the user. * @returns { Promise> } the LauncherShortcutInfo object. * @throws { BusinessError } 201 - Verify permission denied. * @throws { BusinessError } 202 - Permission denied, non-system app called system api. @@ -92,7 +92,7 @@ declare namespace shortcutManager { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getAllDesktopShortcutInfo(userId: int): Promise>; + function getAllDesktopShortcutInfo(userId: number): Promise>; /** * Set a shortcut of current application is visible or invisible. diff --git a/api/@ohos.charger.d.ts b/api/@ohos.charger.d.ts index d49eb4e343..a02a52cfd5 100644 --- a/api/@ohos.charger.d.ts +++ b/api/@ohos.charger.d.ts @@ -30,7 +30,7 @@ declare namespace charger { /** * Indicates the type of the charger plugged-in. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.PowerManager.BatteryManager.Core * @systemapi * @since 10 diff --git a/api/@ohos.data.DataShareResultSet.d.ts b/api/@ohos.data.DataShareResultSet.d.ts index fb037fd812..e637a1a698 100644 --- a/api/@ohos.data.DataShareResultSet.d.ts +++ b/api/@ohos.data.DataShareResultSet.d.ts @@ -161,8 +161,7 @@ export default interface DataShareResultSet { * @syscap SystemCapability.DistributedDataManager.DataShare.Core * @systemapi * @StageModelOnly - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ goToLastRow(): boolean; @@ -174,8 +173,7 @@ export default interface DataShareResultSet { * @syscap SystemCapability.DistributedDataManager.DataShare.Core * @systemapi * @StageModelOnly - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ goToNextRow(): boolean; @@ -256,8 +254,7 @@ export default interface DataShareResultSet { * @syscap SystemCapability.DistributedDataManager.DataShare.Core * @systemapi * @StageModelOnly - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ getLong(columnIndex: number): number; diff --git a/api/@ohos.data.dataShare.d.ts b/api/@ohos.data.dataShare.d.ts index 625f50da96..8256ff332d 100644 --- a/api/@ohos.data.dataShare.d.ts +++ b/api/@ohos.data.dataShare.d.ts @@ -76,8 +76,7 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ waitTime?: number; } @@ -354,8 +353,7 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ interface RdbDataChangeNode { /** @@ -399,8 +397,7 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ interface PublishedDataChangeNode { /** @@ -829,8 +826,7 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ addTemplate(uri: string, subscriberId: string, template: Template): void; @@ -860,8 +856,7 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ delTemplate(uri: string, subscriberId: string): void; @@ -895,8 +890,7 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on( type: 'rdbDataChange', @@ -935,8 +929,7 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off( type: 'rdbDataChange', @@ -975,8 +968,7 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on( type: 'publishedDataChange', @@ -1015,8 +1007,7 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off( type: 'publishedDataChange', @@ -1055,8 +1046,7 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ publish( data: Array, @@ -1093,8 +1083,7 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ publish( data: Array, @@ -1132,8 +1121,7 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ publish(data: Array, bundleName: string, version?: number): Promise>; @@ -1225,8 +1213,7 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ insert(uri: string, value: ValuesBucket, callback: AsyncCallback): void; @@ -1258,8 +1245,7 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ insert(uri: string, value: ValuesBucket): Promise; @@ -1291,8 +1277,7 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ delete(uri: string, predicates: dataSharePredicates.DataSharePredicates, callback: AsyncCallback): void; @@ -1324,8 +1309,7 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ delete(uri: string, predicates: dataSharePredicates.DataSharePredicates): Promise; @@ -1531,8 +1515,7 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ batchInsert(uri: string, values: Array, callback: AsyncCallback): void; @@ -1562,8 +1545,7 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ batchInsert(uri: string, values: Array): Promise; @@ -1776,8 +1758,7 @@ declare namespace dataShare { * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer * @systemapi * @stagemodelonly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Close the connection between datashare and extension. diff --git a/api/@ohos.data.dataSharePredicates.d.ts b/api/@ohos.data.dataSharePredicates.d.ts index 7808ee95ba..4844a98ec8 100644 --- a/api/@ohos.data.dataSharePredicates.d.ts +++ b/api/@ohos.data.dataSharePredicates.d.ts @@ -279,8 +279,7 @@ declare namespace dataSharePredicates { * @syscap SystemCapability.DistributedDataManager.DataShare.Core * @systemapi * @StageModelOnly - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ isNull(field: string): DataSharePredicates; @@ -294,8 +293,7 @@ declare namespace dataSharePredicates { * @syscap SystemCapability.DistributedDataManager.DataShare.Core * @systemapi * @StageModelOnly - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ isNotNull(field: string): DataSharePredicates; @@ -361,8 +359,7 @@ declare namespace dataSharePredicates { * @syscap SystemCapability.DistributedDataManager.DataShare.Core * @systemapi * @StageModelOnly - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ between(field: string, low: ValueType, high: ValueType): DataSharePredicates; @@ -437,8 +434,7 @@ declare namespace dataSharePredicates { * @syscap SystemCapability.DistributedDataManager.DataShare.Core * @systemapi * @StageModelOnly - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ lessThanOrEqualTo(field: string, value: ValueType): DataSharePredicates; diff --git a/api/@ohos.data.distributedKVStore.d.ts b/api/@ohos.data.distributedKVStore.d.ts index 45db5d00a7..7c1b0573d5 100644 --- a/api/@ohos.data.distributedKVStore.d.ts +++ b/api/@ohos.data.distributedKVStore.d.ts @@ -28,8 +28,7 @@ import BaseContext from './application/BaseContext'; * * @namespace distributedKVStore * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ declare namespace distributedKVStore { /** @@ -38,8 +37,7 @@ declare namespace distributedKVStore { * * @interface KVManagerConfig * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ interface KVManagerConfig { /** @@ -47,8 +45,7 @@ declare namespace distributedKVStore { * * @type { string } * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ bundleName: string; @@ -57,8 +54,7 @@ declare namespace distributedKVStore { * * @syscap SystemCapability.DistributedDataManager.KVStore.Core * if swap the area, you should close all the KV store and use the new Context to create the KVManager - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ /** * Indicates the ability or hap context @@ -66,8 +62,7 @@ declare namespace distributedKVStore { * @type { BaseContext } * @syscap SystemCapability.DistributedDataManager.KVStore.Core * if swap the area, you should close all the KV store and use the new BaseContext to create the KVManager - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ context: BaseContext; } @@ -373,16 +368,14 @@ declare namespace distributedKVStore { * * @enum { number } * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ enum KVStoreType { /** * Device-collaboration database, as specified by {@code DeviceKVStore} * * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ DEVICE_COLLABORATION, @@ -390,8 +383,7 @@ declare namespace distributedKVStore { * Single-version database, as specified by {@code SingleKVStore} * * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ SINGLE_VERSION } @@ -401,8 +393,7 @@ declare namespace distributedKVStore { * * @enum { number } * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ enum SecurityLevel { /** @@ -410,8 +401,7 @@ declare namespace distributedKVStore { * There are some low impact when the data is leaked. * * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ S1, @@ -420,8 +410,7 @@ declare namespace distributedKVStore { * There are some major impact when the data is leaked. * * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ S2, @@ -430,8 +419,7 @@ declare namespace distributedKVStore { * There are some severity impact when the data is leaked. * * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ S3, @@ -440,8 +428,7 @@ declare namespace distributedKVStore { * There are some critical impact when the data is leaked. * * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ S4 } @@ -451,8 +438,7 @@ declare namespace distributedKVStore { * * @interface Options * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ interface Options { /** @@ -460,8 +446,7 @@ declare namespace distributedKVStore { * * @type { ?boolean } * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ createIfMissing?: boolean; @@ -470,8 +455,7 @@ declare namespace distributedKVStore { * * @type { ?boolean } * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ encrypt?: boolean; @@ -480,8 +464,7 @@ declare namespace distributedKVStore { * * @type { ?boolean } * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ backup?: boolean; @@ -491,8 +474,7 @@ declare namespace distributedKVStore { * @permission ohos.permission.DISTRIBUTED_DATASYNC * @type { ?boolean } * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ autoSync?: boolean; @@ -501,8 +483,7 @@ declare namespace distributedKVStore { * * @type { ?KVStoreType } * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ kvStoreType?: KVStoreType; @@ -511,8 +492,7 @@ declare namespace distributedKVStore { * * @type { SecurityLevel } * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * arkts 1.1&1.2 + * @since 9 */ securityLevel: SecurityLevel; @@ -521,8 +501,7 @@ declare namespace distributedKVStore { * * @type { ?Schema } * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ schema?: Schema; } @@ -532,8 +511,7 @@ declare namespace distributedKVStore { * You can set the schema object in options when create or open the database. * * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ class Schema { /** @@ -588,8 +566,7 @@ declare namespace distributedKVStore { *

    The leaf node must have a value; the non-leaf node must have a child {@code FieldNode}. * * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ class FieldNode { /** @@ -1202,8 +1179,7 @@ declare namespace distributedKVStore { * @throws { BusinessError } 15100005 - Database or result set already closed. * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ put(key: string, value: Uint8Array | string | number | boolean, callback: AsyncCallback): void; @@ -1240,8 +1216,7 @@ declare namespace distributedKVStore { * @throws { BusinessError } 15100005 - Database or result set already closed. * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ put(key: string, value: Uint8Array | string | number | boolean): Promise; @@ -1604,8 +1579,7 @@ declare namespace distributedKVStore { * @throws { BusinessError } 15100004 - Not found. * @throws { BusinessError } 15100005 - Database or result set already closed. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ get(key: string, callback: AsyncCallback): void; @@ -1622,8 +1596,7 @@ declare namespace distributedKVStore { * @throws { BusinessError } 15100004 - Not found. * @throws { BusinessError } 15100005 - Database or result set already closed. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ get(key: string): Promise; @@ -1961,8 +1934,7 @@ declare namespace distributedKVStore { *
    2.Parameter verification failed. * @throws { BusinessError } 15100005 - Database or result set already closed. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ backup(file: string, callback: AsyncCallback): void; @@ -1976,8 +1948,7 @@ declare namespace distributedKVStore { *
    2.Parameter verification failed. * @throws { BusinessError } 15100005 - Database or result set already closed. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ backup(file: string): Promise; @@ -2367,8 +2338,7 @@ declare namespace distributedKVStore { * @throws { BusinessError } 15100004 - Not found. * @throws { BusinessError } 15100005 - Database or result set already closed. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ get(key: string, callback: AsyncCallback): void; @@ -2385,8 +2355,7 @@ declare namespace distributedKVStore { * @throws { BusinessError } 15100004 - Not found. * @throws { BusinessError } 15100005 - Database or result set already closed. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ get(key: string): Promise; @@ -2405,8 +2374,7 @@ declare namespace distributedKVStore { * @throws { BusinessError } 15100004 - Not found. * @throws { BusinessError } 15100005 - Database or result set already closed. * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ get(deviceId: string, key: string, callback: AsyncCallback): void; @@ -2425,8 +2393,7 @@ declare namespace distributedKVStore { * @throws { BusinessError } 15100004 - Not found. * @throws { BusinessError } 15100005 - Database or result set already closed. * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ get(deviceId: string, key: string): Promise; @@ -3077,8 +3044,7 @@ declare namespace distributedKVStore { *
    2.Incorrect parameters types; *
    3.Parameter verification failed. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function createKVManager(config: KVManagerConfig): KVManager; @@ -3088,8 +3054,7 @@ declare namespace distributedKVStore { * * @interface KVManager * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ interface KVManager { /** @@ -3107,8 +3072,7 @@ declare namespace distributedKVStore { * @throws { BusinessError } 15100002 - Open existed database with changed options. * @throws { BusinessError } 15100003 - Database corrupted. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ getKVStore(storeId: string, options: Options, callback: AsyncCallback): void; @@ -3127,8 +3091,7 @@ declare namespace distributedKVStore { * @throws { BusinessError } 15100002 - Open existed database with changed options. * @throws { BusinessError } 15100003 - Database corrupted. * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ getKVStore(storeId: string, options: Options): Promise; diff --git a/api/@ohos.data.preferences.d.ts b/api/@ohos.data.preferences.d.ts index 5ee245ab72..59e4f91fda 100644 --- a/api/@ohos.data.preferences.d.ts +++ b/api/@ohos.data.preferences.d.ts @@ -114,8 +114,7 @@ declare namespace preferences { * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const MAX_KEY_LENGTH: number; @@ -149,8 +148,7 @@ declare namespace preferences { * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const MAX_VALUE_LENGTH: number; @@ -160,8 +158,7 @@ declare namespace preferences { * @enum { number } * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ enum StorageType { /** @@ -169,8 +166,7 @@ declare namespace preferences { * * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ XML = 0, @@ -179,8 +175,7 @@ declare namespace preferences { * * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ GSKV } @@ -248,8 +243,7 @@ declare namespace preferences { * @type { ?(StorageType | null | undefined) } * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ storageType?: StorageType | null | undefined; } @@ -1831,8 +1825,7 @@ declare namespace preferences { * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ flushSync(): void; @@ -1871,8 +1864,7 @@ declare namespace preferences { * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ on(type: 'change', callback: Callback): void; @@ -1900,8 +1892,7 @@ declare namespace preferences { * @throws { BusinessError } 15500019 - Failed to obtain the subscription service. * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ on(type: 'multiProcessChange', callback: Callback): void; @@ -1933,7 +1924,6 @@ declare namespace preferences { * @crossplatform * @atomicservice * @since 20 - * @arkts 1.1&1.2 */ on(type: 'dataChange', keys: Array, callback: Callback>): void; @@ -1972,8 +1962,7 @@ declare namespace preferences { * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ off(type: 'change', callback?: Callback): void; @@ -1999,8 +1988,7 @@ declare namespace preferences { * @throws { BusinessError } 15500000 - Inner error. * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ off(type: 'multiProcessChange', callback?: Callback): void; @@ -2016,8 +2004,7 @@ declare namespace preferences { * @throws { BusinessError } 15500000 - Inner error. * @syscap SystemCapability.DistributedDataManager.Preferences.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Unregisters an observer for changes to the {@ link Preferences} object. diff --git a/api/@ohos.data.relationalStore.d.ts b/api/@ohos.data.relationalStore.d.ts index 95a4d95a83..886d4d14fc 100644 --- a/api/@ohos.data.relationalStore.d.ts +++ b/api/@ohos.data.relationalStore.d.ts @@ -2024,8 +2024,7 @@ declare namespace relationalStore { * @enum { number } * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ enum ColumnType { /** @@ -2033,8 +2032,7 @@ declare namespace relationalStore { * * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ NULL, @@ -2045,8 +2043,7 @@ declare namespace relationalStore { * * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ INTEGER, @@ -2055,8 +2052,7 @@ declare namespace relationalStore { * * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ REAL, @@ -2065,8 +2061,7 @@ declare namespace relationalStore { * * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ TEXT, @@ -2075,8 +2070,7 @@ declare namespace relationalStore { * * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ BLOB, @@ -2085,8 +2079,7 @@ declare namespace relationalStore { * * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ ASSET, @@ -2095,8 +2088,7 @@ declare namespace relationalStore { * * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ ASSETS, @@ -2105,8 +2097,7 @@ declare namespace relationalStore { * * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ FLOAT_VECTOR, @@ -2115,8 +2106,7 @@ declare namespace relationalStore { * * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ UNLIMITED_INT, } @@ -3280,8 +3270,7 @@ declare namespace relationalStore { * @throws { BusinessError } 14800034 - SQLite: Library used incorrectly. * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ getColumnType(columnIdentifier: number | string): Promise; @@ -3315,8 +3304,7 @@ declare namespace relationalStore { * @throws { BusinessError } 14800034 - SQLite: Library used incorrectly. * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core * @crossplatform - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ getColumnTypeSync(columnIdentifier: number | string): ColumnType; diff --git a/api/@ohos.data.unifiedDataChannel.d.ts b/api/@ohos.data.unifiedDataChannel.d.ts index d804a0d843..bdc283df1f 100644 --- a/api/@ohos.data.unifiedDataChannel.d.ts +++ b/api/@ohos.data.unifiedDataChannel.d.ts @@ -451,8 +451,7 @@ declare namespace unifiedDataChannel { * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ getType(): string; @@ -519,8 +518,7 @@ declare namespace unifiedDataChannel { * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ getValue(): ValueType; @@ -595,8 +593,7 @@ declare namespace unifiedDataChannel { * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ class Text extends UnifiedRecord { /** @@ -623,85 +620,92 @@ declare namespace unifiedDataChannel { * @since 14 */ details?: Record; + } + /** + * Describe the unified plain text data + * + * @extends Text + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Describe the unified plain text data + * + * @extends Text + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Describe the unified plain text data + * + * @extends Text + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + class PlainText extends Text { /** - * Indicates the details of unified text + * Indicates the content of text * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the details of unified text + * Indicates the content of text * - * @type { ?Record } + * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ /** - * Indicates the details of unified text + * Indicates the content of text * - * @type { ?Record } + * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @crossplatform * @atomicservice * @since 14 */ + textContent: string; /** - * Indicates the details of unified text - * - * @returns { Record | undefined } the details of unified text - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - get details(): Record | undefined; - - /** - * Indicates the details of unified text + * Indicates the abstract of text * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the details of unified text + * Indicates the abstract of text * - * @type { ?Record } + * @type { ?string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ /** - * Indicates the details of unified text + * Indicates the abstract of text * - * @type { ?Record } + * @type { ?string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @crossplatform * @atomicservice * @since 14 */ - /** - * Indicates the details of unified text - * - * @param { Record } the details of unified text - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - set details(value: Record); + abstract?: string; } /** - * Describe the unified plain text data + * Describe the unified link data * * @extends Text * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Describe the unified plain text data + * Describe the unified link data * * @extends Text * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -709,24 +713,23 @@ declare namespace unifiedDataChannel { * @since 11 */ /** - * Describe the unified plain text data + * Describe the unified link data * * @extends Text * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ - class PlainText extends Text { + class Hyperlink extends Text { /** - * Indicates the content of text + * Indicates the url of a link * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the content of text + * Indicates the url of a link * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -734,7 +737,7 @@ declare namespace unifiedDataChannel { * @since 11 */ /** - * Indicates the content of text + * Indicates the url of a link * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -742,50 +745,66 @@ declare namespace unifiedDataChannel { * @atomicservice * @since 14 */ - textContent: string; - + url: string; /** - * Indicates the content of text + * Indicates the description of a link * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the content of text + * Indicates the description of a link * - * @type { string } + * @type { ?string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ /** - * Indicates the content of text + * Indicates the description of a link * - * @type { string } + * @type { ?string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @crossplatform * @atomicservice * @since 14 */ - /** - * Indicates the content of text - * - * @returns { string } the content of text - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - get textContent(): string; + description?: string; + } + /** + * Describe the unified html data + * + * @extends Text + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Describe the unified html data + * + * @extends Text + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Describe the unified html data + * + * @extends Text + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + class HTML extends Text { /** - * Indicates the content of text + * Indicates the content of html, with html tags * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the content of text + * Indicates the content of html, with html tags * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -793,7 +812,7 @@ declare namespace unifiedDataChannel { * @since 11 */ /** - * Indicates the content of text + * Indicates the content of html, with html tags * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -801,25 +820,15 @@ declare namespace unifiedDataChannel { * @atomicservice * @since 14 */ + htmlContent: string; /** - * Indicates the content of text - * - * @param { string } the content of text - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - set textContent(value: string); - - /** - * Indicates the abstract of text + * Indicates the plain content of html * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the abstract of text + * Indicates the plain content of html * * @type { ?string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -827,7 +836,7 @@ declare namespace unifiedDataChannel { * @since 11 */ /** - * Indicates the abstract of text + * Indicates the plain content of html * * @type { ?string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -835,90 +844,66 @@ declare namespace unifiedDataChannel { * @atomicservice * @since 14 */ - abstract?: string; - - /** - * Indicates the abstract of text - * - * @returns { string | undefined } the abstract of text - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - get textAbstract(): string | undefined; - - /** - * Indicates the abstract of text - * - * @param { string } the abstract of text - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - set textAbstract(value: string); + plainContent?: string; } /** - * Describe the unified link data + * Describe the unified file data * - * @extends Text + * @extends UnifiedRecord * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Describe the unified link data + * Describe the unified file data * - * @extends Text + * @extends UnifiedRecord * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ /** - * Describe the unified link data + * Describe the unified file data * - * @extends Text + * @extends UnifiedRecord * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ - class Hyperlink extends Text { + class File extends UnifiedRecord { /** - * Indicates the url of a link + * Indicates the details of unified File * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the url of a link + * Indicates the details of unified File * - * @type { string } + * @type { ?Record } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ /** - * Indicates the url of a link + * Indicates the details of unified File * - * @type { string } + * @type { ?Record } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @crossplatform * @atomicservice * @since 14 */ - url: string; - + details?: Record; /** - * Indicates the url of a link + * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the url of a link + * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -926,7 +911,7 @@ declare namespace unifiedDataChannel { * @since 11 */ /** - * Indicates the url of a link + * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -934,25 +919,42 @@ declare namespace unifiedDataChannel { * @atomicservice * @since 14 */ - /** - * Indicates the url of a link - * - * @returns { string } the url of a link - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - get url(): string; + uri: string; + } + /** + * Describe the unified image data + * + * @extends File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Describe the unified image data + * + * @extends File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Describe the unified image data + * + * @extends File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + class Image extends File { /** - * Indicates the url of a link + * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the url of a link + * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -960,7 +962,7 @@ declare namespace unifiedDataChannel { * @since 11 */ /** - * Indicates the url of a link + * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -968,145 +970,42 @@ declare namespace unifiedDataChannel { * @atomicservice * @since 14 */ - /** - * Indicates the url of a link - * - * @param { string } the url of a link - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - set url(value: string); - - /** - * Indicates the description of a link - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the description of a link - * - * @type { ?string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the description of a link - * - * @type { ?string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - description?: string; - - /** - * Indicates the description of a link - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the description of a link - * - * @type { ?string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the description of a link - * - * @type { ?string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - /** - * Indicates the description of a link - * - * @returns { string | undefined } the description of a link. - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - get description(): string | undefined; - - /** - * Indicates the description of a link. - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the description of a link - * - * @type { ?string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the description of a link - * - * @type { ?string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - /** - * Indicates the description of a link - * - * @param { string } the description of a link - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - set description(value: string); + imageUri: string; } /** - * Describe the unified html data + * Describe the unified video data * - * @extends Text + * @extends File * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Describe the unified html data + * Describe the unified video data * - * @extends Text + * @extends File * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ /** - * Describe the unified html data + * Describe the unified video data * - * @extends Text + * @extends File * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ - class HTML extends Text { + class Video extends File { /** - * Indicates the content of html, with html tags + * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the content of html, with html tags + * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -1114,7 +1013,7 @@ declare namespace unifiedDataChannel { * @since 11 */ /** - * Indicates the content of html, with html tags + * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -1122,16 +1021,42 @@ declare namespace unifiedDataChannel { * @atomicservice * @since 14 */ - htmlContent: string; + videoUri: string; + } + /** + * Describe the unified audio data + * + * @extends File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Describe the unified audio data + * + * @extends File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Describe the unified audio data + * + * @extends File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + class Audio extends File { /** - * Indicates the content of html, with html tags + * URI of the local audio or online audio. The local audio URI can be obtained using the getUriFromPath function. * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the content of html, with html tags + * URI of the local audio or online audio. The local audio URI can be obtained using the getUriFromPath function. * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -1139,7 +1064,7 @@ declare namespace unifiedDataChannel { * @since 11 */ /** - * Indicates the content of html, with html tags + * URI of the local audio or online audio. The local audio URI can be obtained using the getUriFromPath function. * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -1147,25 +1072,42 @@ declare namespace unifiedDataChannel { * @atomicservice * @since 14 */ - /** - * Indicates the content of html, with html tags - * - * @returns { string } the content of html - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - get htmlContent(): string; + audioUri: string; + } + /** + * Describe the unified folder data + * + * @extends File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Describe the unified folder data + * + * @extends File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + /** + * Describe the unified folder data + * + * @extends File + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @crossplatform + * @atomicservice + * @since 14 + */ + class Folder extends File { /** - * Indicates the content of html, with html tags + * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the content of html, with html tags + * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -1173,7 +1115,7 @@ declare namespace unifiedDataChannel { * @since 11 */ /** - * Indicates the content of html, with html tags + * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core @@ -1181,1227 +1123,46 @@ declare namespace unifiedDataChannel { * @atomicservice * @since 14 */ - /** - * Indicates the content of html, with html tags - * - * @param { string } the content of html - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - set htmlContent(value: string); + folderUri: string; + } + /** + * Describe system defined type data(this kind of data is provided and bound to OpenHarmony, + * also can be parsed by system provided API) + * + * @extends UnifiedRecord + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Describe system defined type data(this kind of data is provided and bound to OpenHarmony, + * also can be parsed by system provided API) + * + * @extends UnifiedRecord + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + class SystemDefinedRecord extends UnifiedRecord { /** - * Indicates the plain content of html + * Indicates the details of system defined data * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the plain content of html + * Indicates the details of system defined data * - * @type { ?string } + * @type { ?Record } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ - /** - * Indicates the plain content of html - * - * @type { ?string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - plainContent?: string; - - /** - * Indicates the plain content of html - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the plain content of html - * - * @type { ?string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the plain content of html - * - * @type { ?string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - /** - * Indicates the plain content of html - * - * @returns { string | undefined } the plain content of html - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - get plainContent(): string | undefined; - - /** - * Indicates the plain content of html - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the plain content of html - * - * @type { ?string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the plain content of html - * - * @type { ?string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - /** - * Indicates the plain content of html - * - * @param { string } the plain content of html - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - set plainContent(value: string); - } - - /** - * Describe the unified file data - * - * @extends UnifiedRecord - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Describe the unified file data - * - * @extends UnifiedRecord - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Describe the unified file data - * - * @extends UnifiedRecord - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - class File extends UnifiedRecord { - /** - * Indicates the details of unified File - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the details of unified File - * - * @type { ?Record } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the details of unified File - * - * @type { ?Record } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - details?: Record; - - /** - * Indicates the details of unified File - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the details of unified File - * - * @type { ?Record } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the details of unified File - * - * @type { ?Record } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - /** - * Indicates the details of unified File - * - * @returns { Record | undefined } the details of unified File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - get details(): Record | undefined; - - /** - * Indicates the details of unified File - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the details of unified File - * - * @type { ?Record } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the details of unified File - * - * @type { ?Record } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - /** - * Indicates the details of unified File - * - * @param { Record } the details of unified File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - set details(value: Record); - - /** - * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - uri: string; - - /** - * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - /** - * Indicates the uri of file - * - * @returns { string } the uri of file - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - get uri(): string; - - /** - * Indicates the uri of file - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the uri of file - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the uri of file - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - /** - * Indicates the uri of file - * - * @param { string } the uri of file - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - set uri(value: string); - } - - /** - * Describe the unified image data - * - * @extends File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Describe the unified image data - * - * @extends File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Describe the unified image data - * - * @extends File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - class Image extends File { - /** - * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - imageUri: string; - - /** - * Indicates the uri of image - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - /** - * Indicates the uri of image - * - * @returns { string } the uri of image - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - get imageUri(): string; - - /** - * Indicates the uri of image - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the uri of image - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the uri of image - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - /** - * Indicates the uri of image - * - * @param { string } the uri of image - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - set imageUri(value: string); - } - - /** - * Describe the unified video data - * - * @extends File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Describe the unified video data - * - * @extends File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Describe the unified video data - * - * @extends File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - class Video extends File { - /** - * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - videoUri: string; - - /** - * Indicates the uri of video - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - /** - * Indicates the uri of video - * - * @returns { string } the uri of video - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - get videoUri(): string; - - /** - * Indicates the uri of video - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the uri of video - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the uri of video - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - /** - * Indicates the uri of video - * - * @param { string } the uri of video - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - set videoUri(value: string); - } - - /** - * Describe the unified audio data - * - * @extends File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Describe the unified audio data - * - * @extends File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Describe the unified audio data - * - * @extends File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - class Audio extends File { - /** - * URI of the local audio or online audio. The local audio URI can be obtained using the getUriFromPath function. - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * URI of the local audio or online audio. The local audio URI can be obtained using the getUriFromPath function. - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * URI of the local audio or online audio. The local audio URI can be obtained using the getUriFromPath function. - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - audioUri: string; - - /** - * Indicates the uri of audio - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the uri of audio - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the uri of audio - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - /** - * Indicates the uri of audio - * - * @returns { string } the uri of audio - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - get audioUri(): string; - - /** - * Indicates the uri of audio - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the uri of audio - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the uri of audio - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - /** - * Indicates the uri of audio - * - * @param { string } the uri of audio - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - set audioUri(value: string); - } - - /** - * Describe the unified folder data - * - * @extends File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Describe the unified folder data - * - * @extends File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Describe the unified folder data - * - * @extends File - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - class Folder extends File { - /** - * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - folderUri: string; - - /** - * Indicates the uri of folder - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - /** - * Indicates the uri of folder - * - * @returns { string } the uri of folder - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - get folderUri(): string; - - /** - * Indicates the uri of folder - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the uri of folder - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the uri of folder - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ - /** - * Indicates the uri of folder - * - * @param { string } the uri of folder - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - set folderUri(value: string); - } - - /** - * Describe system defined type data(this kind of data is provided and bound to OpenHarmony, - * also can be parsed by system provided API) - * - * @extends UnifiedRecord - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Describe system defined type data(this kind of data is provided and bound to OpenHarmony, - * also can be parsed by system provided API) - * - * @extends UnifiedRecord - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ - class SystemDefinedRecord extends UnifiedRecord { - /** - * Indicates the details of system defined data - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the details of system defined data - * - * @type { ?Record } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - details?: Record; - - /** - * Indicates the details of system defined data - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the details of system defined data - * - * @type { ?Record } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the details of system defined data - * - * @returns { Record | undefined } the details of system defined data - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - get details(): Record | undefined; - - /** - * Indicates the details of system defined data - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the details of system defined data - * - * @type { ?Record } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the details of system defined data - * - * @param { Record } the details of system defined data - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - set details(value: Record); - } - - /** - * Describe system defined form data(this kind of data is provided and bound to OpenHarmony, - * also can be parsed by system provided API) - * - * @extends SystemDefinedRecord - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Describe system defined form data(this kind of data is provided and bound to OpenHarmony, - * also can be parsed by system provided API) - * - * @extends SystemDefinedRecord - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ - class SystemDefinedForm extends SystemDefinedRecord { - /** - * Indicates the id of form - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the id of form - * - * @type { number } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - formId: number; - - /** - * Indicates the id of form - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the id of form - * - * @type { number } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the id of form - * - * @returns { number } the id of form - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - get formId(): number; - - /** - * Indicates the id of form - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the id of form - * - * @type { number } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the id of form - * - * @param { number } the id of form - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - set formId(value: number); - - /** - * Indicates the name of form - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the name of form - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - formName: string; - - /** - * Indicates the name of form - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the name of form - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the name of form - * - * @returns { string } the name of form - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - get formName(): string; - - /** - * Indicates the name of form - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the name of form - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the name of form - * - * @param { string } the name of form - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - set formName(value: string); - - /** - * Indicates the bundle name of form - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the bundle name of form - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - bundleName: string; - - /** - * Indicates the bundle name of form - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the bundle name of form - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the bundle name of form - * - * @returns { string } the bundle name of form - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - get bundleName(): string; - - /** - * Indicates the bundle name of form - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the bundle name of form - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the bundle name of form - * - * @param { string } the bundle name of form - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - set bundleName(value: string); - - /** - * Indicates the ability name of form - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the ability name of form - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - abilityName: string; - - /** - * Indicates the ability name of form - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the ability name of form - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the ability name of form - * - * @returns { string } the ability name of form - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - get abilityName(): string; - - /** - * Indicates the ability name of form - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the ability name of form - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the ability name of form - * - * @param { string } the ability name of form - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - set abilityName(value: string); - - /** - * Indicates the module of form - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the module of form - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - module: string; - - /** - * Indicates the module of form - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the module of form - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the module of form - * - * @returns { string } the module of form - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - get module(): string; - - /** - * Indicates the module of form - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the module of form - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the module of form - * - * @param { string } the module of form - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - set module(value: string); - } + details?: Record; + } /** - * Describe system defined app item data(this kind of data is provided and bound to OpenHarmony, + * Describe system defined form data(this kind of data is provided and bound to OpenHarmony, * also can be parsed by system provided API) * * @extends SystemDefinedRecord @@ -2409,376 +1170,185 @@ declare namespace unifiedDataChannel { * @since 10 */ /** - * Describe system defined app item data(this kind of data is provided and bound to OpenHarmony, + * Describe system defined form data(this kind of data is provided and bound to OpenHarmony, * also can be parsed by system provided API) * * @extends SystemDefinedRecord * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ - class SystemDefinedAppItem extends SystemDefinedRecord { - /** - * Indicates the app id - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the app id - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - appId: string; - - /** - * Indicates the app id - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the app id - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the app id - * - * @returns { string } the app id - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - get appId(): string; - - /** - * Indicates the app id - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the app id - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the app id - * - * @param { string } the app id - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - set appId(value: string); - - /** - * Indicates the app name - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the app name - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - appName: string; - - /** - * Indicates the app name - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the app name - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the app name - * - * @returns { string } the app name - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - get appName(): string; - - /** - * Indicates the app name - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the app name - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the app name - * - * @param { string } the app name - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - set appName(value: string); - + * @since 11 + */ + class SystemDefinedForm extends SystemDefinedRecord { /** - * Indicates the id of app icon + * Indicates the id of form * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the id of app icon + * Indicates the id of form * - * @type { string } + * @type { number } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ - appIconId: string; - + formId: number; /** - * Indicates the id of app icon + * Indicates the name of form * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the id of app icon + * Indicates the name of form * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ + formName: string; /** - * Indicates the id of app icon - * - * @returns { string } the id of app icon - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - get appIconId(): string; - - /** - * Indicates the id of app icon + * Indicates the bundle name of form * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the id of app icon + * Indicates the bundle name of form * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ + bundleName: string; /** - * Indicates the id of app icon - * - * @param { string } the id of app icon - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - set appIconId(value: string); - - /** - * Indicates the id of app label + * Indicates the ability name of form * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the id of app label + * Indicates the ability name of form * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ - appLabelId: string; - + abilityName: string; /** - * Indicates the id of app label + * Indicates the module of form * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the id of app label + * Indicates the module of form * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ - /** - * Indicates the id of app label - * - * @returns { string } the id of app label - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - get appLabelId(): string; + module: string; + } + /** + * Describe system defined app item data(this kind of data is provided and bound to OpenHarmony, + * also can be parsed by system provided API) + * + * @extends SystemDefinedRecord + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @since 10 + */ + /** + * Describe system defined app item data(this kind of data is provided and bound to OpenHarmony, + * also can be parsed by system provided API) + * + * @extends SystemDefinedRecord + * @syscap SystemCapability.DistributedDataManager.UDMF.Core + * @atomicservice + * @since 11 + */ + class SystemDefinedAppItem extends SystemDefinedRecord { /** - * Indicates the id of app label + * Indicates the app id * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the id of app label + * Indicates the app id * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ + appId: string; /** - * Indicates the id of app label - * - * @param { string } the id of app label - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - set appLabelId(value: string); - - /** - * Indicates the bundle name of app + * Indicates the app name * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the bundle name of app + * Indicates the app name * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ - bundleName: string; - + appName: string; /** - * Indicates the bundle name of app + * Indicates the id of app icon * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the bundle name of app + * Indicates the id of app icon * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ + appIconId: string; /** - * Indicates the bundle name of app - * - * @returns { string } the bundle name of app - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - get bundleName(): string; - - /** - * Indicates the bundle name of app + * Indicates the id of app label * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the bundle name of app + * Indicates the id of app label * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ + appLabelId: string; /** * Indicates the bundle name of app * - * @param { string } the bundle name of app - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - set bundleName(value: string); - - /** - * Indicates the ability name of app - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the ability name of app - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - abilityName: string; - - /** - * Indicates the ability name of app - * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @since 10 */ /** - * Indicates the ability name of app + * Indicates the bundle name of app * * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 11 */ - /** - * Indicates the ability name of app - * - * @returns { string } the ability name of app - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - get abilityName(): string; - + bundleName: string; /** * Indicates the ability name of app * @@ -2793,15 +1363,7 @@ declare namespace unifiedDataChannel { * @atomicservice * @since 11 */ - /** - * Indicates the ability name of app - * - * @param { string } the ability name of app - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - set abilityName(value: string); + abilityName: string; } /** @@ -2819,8 +1381,7 @@ declare namespace unifiedDataChannel { * @extends SystemDefinedRecord * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ class SystemDefinedPixelMap extends SystemDefinedRecord { /** @@ -2838,54 +1399,6 @@ declare namespace unifiedDataChannel { * @since 11 */ rawData: Uint8Array; - - /** - * Indicates the raw data of pixel map - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the raw data of pixel map - * - * @type { Uint8Array } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the raw data of pixel map - * - * @returns { Uint8Array } the raw data of pixel map - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - get rawData(): Uint8Array; - - /** - * Indicates the raw data of pixel map - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** - * Indicates the raw data of pixel map - * - * @type { Uint8Array } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** - * Indicates the raw data of pixel map - * - * @param { Uint8Array } the raw data of pixel map - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 20 - * @arkts 1.2 - */ - set rawData(value: Uint8Array); } /** @@ -2953,8 +1466,7 @@ declare namespace unifiedDataChannel { * @enum { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ enum Intention { /** @@ -2968,8 +1480,7 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ DATA_HUB = 'DataHub', @@ -3063,11 +1574,10 @@ declare namespace unifiedDataChannel { /** * Describe the optional arguments of data operation * - * @typedef { Options } + * @interface { Options } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 20 - * @arkts 1.1&1.2 */ interface Options { /** @@ -3090,7 +1600,6 @@ declare namespace unifiedDataChannel { * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 20 - * @arkts 1.1&1.2 */ intention?: Intention; @@ -3114,7 +1623,6 @@ declare namespace unifiedDataChannel { * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice * @since 20 - * @arkts 1.1&1.2 */ key?: string; @@ -3136,8 +1644,7 @@ declare namespace unifiedDataChannel { * @enum { number } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ enum FileConflictOptions { /** @@ -3145,8 +1652,7 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ OVERWRITE, @@ -3155,8 +1661,7 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ SKIP } @@ -3167,8 +1672,7 @@ declare namespace unifiedDataChannel { * @enum { number } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ enum ProgressIndicator { /** @@ -3176,8 +1680,7 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ NONE, @@ -3186,8 +1689,7 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ DEFAULT } @@ -3198,8 +1700,7 @@ declare namespace unifiedDataChannel { * @enum { number } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ enum ListenerStatus { /** @@ -3207,8 +1708,7 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ FINISHED = 0, @@ -3217,8 +1717,7 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ PROCESSING, @@ -3227,8 +1726,7 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ CANCELED, @@ -3237,8 +1735,7 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ INNER_ERROR = 200, @@ -3247,8 +1744,7 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ INVALID_PARAMETERS, @@ -3257,8 +1753,7 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ DATA_NOT_FOUND, @@ -3267,8 +1762,7 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ SYNC_FAILED, @@ -3277,8 +1771,7 @@ declare namespace unifiedDataChannel { * * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ COPY_FILE_FAILED, } @@ -3289,8 +1782,7 @@ declare namespace unifiedDataChannel { * @interface ProgressInfo * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ interface ProgressInfo { /** @@ -3299,8 +1791,7 @@ declare namespace unifiedDataChannel { * @type { number } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ progress: number; @@ -3310,8 +1801,7 @@ declare namespace unifiedDataChannel { * @type { ListenerStatus } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ status: ListenerStatus; } @@ -3324,8 +1814,7 @@ declare namespace unifiedDataChannel { * @param { UnifiedData | null } data - Data obtained when the progress reaches 100%. * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ type DataProgressListener = (progressInfo: ProgressInfo, data: UnifiedData | null) => void; @@ -3335,8 +1824,7 @@ declare namespace unifiedDataChannel { * @interface GetDataParams * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ interface GetDataParams { /** @@ -3345,8 +1833,7 @@ declare namespace unifiedDataChannel { * @type { ProgressIndicator } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ progressIndicator: ProgressIndicator; @@ -3356,8 +1843,7 @@ declare namespace unifiedDataChannel { * @type { DataProgressListener } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ dataProgressListener: DataProgressListener; @@ -3367,8 +1853,7 @@ declare namespace unifiedDataChannel { * @type { string } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ destUri?: string; @@ -3378,8 +1863,7 @@ declare namespace unifiedDataChannel { * @type { FileConflictOptions } * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ fileConflictOptions?: FileConflictOptions; @@ -3487,8 +1971,7 @@ declare namespace unifiedDataChannel { *
    2.Incorrect parameters types. * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ function insertData(options: Options, data: UnifiedData, callback: AsyncCallback): void; @@ -3513,8 +1996,7 @@ declare namespace unifiedDataChannel { *
    2.Incorrect parameters types. * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ function insertData(options: Options, data: UnifiedData): Promise; @@ -3591,8 +2073,7 @@ declare namespace unifiedDataChannel { *
    2.Incorrect parameters types. * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ function queryData(options: Options, callback: AsyncCallback>): void; @@ -3617,8 +2098,7 @@ declare namespace unifiedDataChannel { *
    2.Incorrect parameters types. * @syscap SystemCapability.DistributedDataManager.UDMF.Core * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ function queryData(options: Options): Promise>; diff --git a/api/@ohos.deviceStatus.dragInteraction.d.ts b/api/@ohos.deviceStatus.dragInteraction.d.ts index 78d9075a49..16fc70e7cf 100644 --- a/api/@ohos.deviceStatus.dragInteraction.d.ts +++ b/api/@ohos.deviceStatus.dragInteraction.d.ts @@ -26,8 +26,7 @@ import { Callback } from './@ohos.base'; * @namespace dragInteraction * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ declare namespace dragInteraction { /** @@ -36,8 +35,7 @@ declare namespace dragInteraction { * @enum { number } * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ enum DragState { /** @@ -45,8 +43,7 @@ declare namespace dragInteraction { * * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ MSG_DRAG_STATE_START = 1, @@ -55,8 +52,7 @@ declare namespace dragInteraction { * * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ MSG_DRAG_STATE_STOP = 2, @@ -65,8 +61,7 @@ declare namespace dragInteraction { * * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ MSG_DRAG_STATE_CANCEL = 3, } @@ -77,8 +72,7 @@ declare namespace dragInteraction { * @interface Summary * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ interface Summary { /** @@ -87,21 +81,19 @@ declare namespace dragInteraction { * @type { string } * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ dataType: string; /** * Data length of the dragged object. * - * @type { int } + * @type { number } * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - dataSize: int; + dataSize: number; } /** @@ -125,8 +117,7 @@ declare namespace dragInteraction { *
    2.Incorrect parameter types.3.Parameter verification failed. * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function on(type: 'drag', callback: Callback): void; @@ -153,8 +144,7 @@ declare namespace dragInteraction { *
    2.Incorrect parameter types.3.Parameter verification failed. * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function off(type: 'drag', callback?: Callback): void; @@ -165,8 +155,7 @@ declare namespace dragInteraction { * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. * @syscap SystemCapability.Msdp.DeviceStatus.Drag * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ function getDataSummary(): Array

    ; diff --git a/api/@ohos.distributedHardware.mechanicManager.d.ts b/api/@ohos.distributedHardware.mechanicManager.d.ts index e5a5eed669..d38db3768f 100644 --- a/api/@ohos.distributedHardware.mechanicManager.d.ts +++ b/api/@ohos.distributedHardware.mechanicManager.d.ts @@ -79,7 +79,7 @@ declare namespace mechanicManager { * @param { boolean } isEnabled Whether to enable camera tracking. * @throws { BusinessError } 33300001 - Service exception. * @throws { BusinessError } 33300002 - Device not connected. - * @throws { BusinessError } 33300003 - Device not supported. + * @throws { BusinessError } 33300003 - Feature not supported. * @syscap SystemCapability.Mechanic.Core * @since 20 */ @@ -124,7 +124,7 @@ declare namespace mechanicManager { * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 33300001 - Service exception. * @throws { BusinessError } 33300002 - Device not connected. - * @throws { BusinessError } 33300003 - Device not supported. + * @throws { BusinessError } 33300003 - Feature not supported. * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 @@ -144,9 +144,9 @@ declare namespace mechanicManager { /** * Rotates a mechanical device to the relative angles. - * @param { int } mechId ID of the mechanical device. + * @param { number } mechId ID of the mechanical device. * @param { RotationAngles } angles Relative angles. - * @param { int } duration Rotation duration. Unit: millisecond. + * @param { number } duration Rotation duration. Unit: millisecond. * @returns { Promise } Promise that return the execution result. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 33300001 - Service exception. @@ -156,13 +156,13 @@ declare namespace mechanicManager { * @since 20 */ - function rotate(mechId: int, angles: RotationAngles, duration: int): Promise; + function rotate(mechId: number, angles: RotationAngles, duration: number): Promise; /** * Rotates a mechanical device to the absolute angles. - * @param { int } mechId ID of the mechanical device. + * @param { number } mechId ID of the mechanical device. * @param { EulerAngles } angles Absolute angles. - * @param { int } duration Rotation duration. Unit: millisecond. + * @param { number } duration Rotation duration. Unit: millisecond. * @returns { Promise } Promise that return the execution result. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 33300001 - Service exception. @@ -172,13 +172,13 @@ declare namespace mechanicManager { * @since 20 */ - function rotateToEulerAngles(mechId: int, angles: EulerAngles, duration: int): Promise; + function rotateToEulerAngles(mechId: number, angles: EulerAngles, duration: number): Promise; /** * Obtains the maximum continuous rotation duration of a mechanical device. * - * @param { int } mechId ID of the mechanical device. - * @returns { int } Maximum rotation duration. Unit: millisecond. + * @param { number } mechId ID of the mechanical device. + * @returns { number } Maximum rotation duration. Unit: millisecond. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 33300001 - Service exception. * @throws { BusinessError } 33300002 - Device not connected. @@ -186,12 +186,12 @@ declare namespace mechanicManager { * @systemapi * @since 20 */ - function getMaxRotationTime(mechId: int): int; + function getMaxRotationTime(mechId: number): number; /** * Obtains the maximum rotation speed of a mechanical device. * - * @param { int } mechId ID of the mechanical device. + * @param { number } mechId ID of the mechanical device. * @returns { RotationSpeed } Maximum speed. Only the absolute value of the speed is returned. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 33300001 - Service exception. @@ -200,13 +200,13 @@ declare namespace mechanicManager { * @systemapi * @since 20 */ - function getMaxRotationSpeed(mechId: int): RotationSpeed; + function getMaxRotationSpeed(mechId: number): RotationSpeed; /** * Rotates a mechanical device at the specified speed. - * @param { int } mechId ID of the mechanical device. + * @param { number } mechId ID of the mechanical device. * @param { RotationSpeed } speed Rotation speed. - * @param { int } duration Rotation duration. Unit: millisecond. + * @param { number } duration Rotation duration. Unit: millisecond. * @returns { Promise } Promise that return the execution result. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 33300001 - Service exception. @@ -215,11 +215,11 @@ declare namespace mechanicManager { * @systemapi * @since 20 */ - function rotateBySpeed(mechId: int, speed: RotationSpeed, duration: int): Promise; + function rotateBySpeed(mechId: number, speed: RotationSpeed, duration: number): Promise; /** * Stops a mechanical device from moving. - * @param { int } mechId ID of the mechanical device. + * @param { number } mechId ID of the mechanical device. * @returns { Promise } Promise that returns no value. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 33300001 - Service exception. @@ -228,11 +228,11 @@ declare namespace mechanicManager { * @systemapi * @since 20 */ - function stopMoving(mechId: int): Promise; + function stopMoving(mechId: number): Promise; /** * Obtains the current angles of a mechanical device. - * @param { int } mechId ID of the mechanical device. + * @param { number } mechId ID of the mechanical device. * @returns { EulerAngles } Rotation angles. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 33300001 - Service exception. @@ -242,12 +242,12 @@ declare namespace mechanicManager { * @since 20 */ - function getCurrentAngles(mechId: int): EulerAngles; + function getCurrentAngles(mechId: number): EulerAngles; /** * Obtains the maximum rotation angles relative to the reference point for the specified mechanical device. * - * @param { int } mechId ID of the mechanical device. + * @param { number } mechId ID of the mechanical device. * @returns { RotationLimits } Maximum rotation angles. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 33300001 - Service exception. @@ -257,11 +257,11 @@ declare namespace mechanicManager { * @since 20 */ - function getRotationLimits(mechId: int): RotationLimits; + function getRotationLimits(mechId: number): RotationLimits; /** * Obtains the status of the rotation axes. - * @param { int } mechId ID of the mechanical device. + * @param { number } mechId ID of the mechanical device. * @returns { RotationAxesStatus } Rotation axis status. * @throws { BusinessError } 202 - Not system application. * @throws { BusinessError } 33300001 - Service exception. @@ -270,7 +270,7 @@ declare namespace mechanicManager { * @systemapi * @since 20 */ - function getRotationAxesStatus(mechId: int): RotationAxesStatus; + function getRotationAxesStatus(mechId: number): RotationAxesStatus; /** @@ -309,11 +309,11 @@ declare namespace mechanicManager { export interface MechInfo { /** * ID of the mechanical device. - * @type { int } + * @type { number } * @syscap SystemCapability.Mechanic.Core * @since 20 */ - mechId: int; + mechId: number; /** @@ -343,34 +343,34 @@ declare namespace mechanicManager { */ export interface RotationAngles { /** - * Yaw angle, ranging from -2π to 2*π, measured in radians. - * @type { ?double } + * Yaw angle, ranging from -2*Math.PI to 2*Math.PI, measured in radians. + * @type { ?number } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - yaw?: double; + yaw?: number; /** - * Roll angle, ranging from -2π to 2*π, measured in radians. - * @type { ?double } + * Roll angle, ranging from -2*Math.PI to 2*Math.PI, measured in radians. + * @type { ?number } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - roll?: double; + roll?: number; /** - * Pitch angle, ranging from -2π to 2*π, measured in radians. - * @type { ?double } + * Pitch angle, ranging from -2*Math.PI to 2*Math.PI, measured in radians. + * @type { ?number } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - pitch?: double; + pitch?: number; } /** @@ -383,34 +383,34 @@ declare namespace mechanicManager { */ export interface EulerAngles { /** - * Yaw angle, ranging from -π to π, measured in radians. - * @type { ?double } + * Yaw angle, ranging from -Math.PI to Math.PI, measured in radians. + * @type { ?number } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - yaw?: double; + yaw?: number; /** - * Roll angle, ranging from -π to π, measured in radians. - * @type { ?double } + * Roll angle, ranging from -Math.PI to Math.PI, measured in radians. + * @type { ?number } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - roll?: double; + roll?: number; /** - * Pitch angle, ranging from -π to π, measured in radians. - * @type { ?double } + * Pitch angle, ranging from -Math.PI to Math.PI, measured in radians. + * @type { ?number } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - pitch?: double; + pitch?: number; } /** @@ -425,33 +425,33 @@ declare namespace mechanicManager { export interface RotationSpeed { /** * Yaw speed, measured in radians per second. - * @type { ?double } + * @type { ?number } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - yawSpeed?: double; + yawSpeed?: number; /** * Roll speed, measured in radians per second. - * @type { ?double } + * @type { ?number } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - rollSpeed?: double; + rollSpeed?: number; /** * Pitch speed, measured in radians per second. - * @type { ?double } + * @type { ?number } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - pitchSpeed?: double; + pitchSpeed?: number; } @@ -467,62 +467,62 @@ declare namespace mechanicManager { /** * Maximum yaw rotation angles in the negative direction, ranging from -2*Math.PI to 0, measured in radians. * If the value is less than or equal to -2*Math.PI, there is no restriction. - * @type { double } + * @type { number } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - negativeYawMax: double; + negativeYawMax: number; /** * Maximum yaw rotation angles in the positive direction, ranging from 0 to 2*Math.PI, measured in radians. * If the value is greater than or equal to 2*Math.PI, there is no restriction. - * @type { double } + * @type { number } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - positiveYawMax: double; + positiveYawMax: number; /** * Maximum roll rotation angles in the negative direction, ranging from -2*Math.PI to 0, measured in radians. * If the value is less than or equal to -2*Math.PI, there is no restriction. - * @type { double } + * @type { number } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - negativeRollMax: double; + negativeRollMax: number; /** * Maximum roll rotation angles in the positive direction, ranging from 0 to 2*Math.PI, measured in radians. * If the value is greater than or equal to 2*Math.PI, there is no restriction. - * @type { double } + * @type { number } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - positiveRollMax: double; + positiveRollMax: number; /** * Maximum pitch rotation angles in the negative direction, ranging from -2*Math.PI to 0, measured in radians. * If the value is less than or equal to -2*Math.PI, there is no restriction. - * @type { double } + * @type { number } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - negativePitchMax: double; + negativePitchMax: number; /** * Maximum pitch rotation angles in the positive direction, ranging from 0 to 2*Math.PI, measured in radians. * If the value is greater than or equal to 2*Math.PI, there is no restriction. - * @type { double } + * @type { number } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - positivePitchMax: double; + positivePitchMax: number; } /** @@ -632,12 +632,12 @@ declare namespace mechanicManager { export interface RotationAxesStateChangeInfo { /** * ID of the mechanical device. - * @type { int } + * @type { number } * @syscap SystemCapability.Mechanic.Core * @systemapi * @since 20 */ - mechId: int; + mechId: number; /** * Rotate axis status. diff --git a/api/@ohos.driver.deviceManager.d.ts b/api/@ohos.driver.deviceManager.d.ts index a2b204dce1..86be9a130b 100644 --- a/api/@ohos.driver.deviceManager.d.ts +++ b/api/@ohos.driver.deviceManager.d.ts @@ -26,23 +26,21 @@ import type rpc from './@ohos.rpc'; * * @namespace deviceManager * @syscap SystemCapability.Driver.ExternalDevice - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ declare namespace deviceManager { /** * Query the external device list. * * @permission ohos.permission.ACCESS_EXTENSIONAL_DEVICE_DRIVER - * @param { int } busType - The bus type of device to be queried. + * @param { number } busType - The bus type of device to be queried. * @returns { Array> } External device list. * @throws { BusinessError } 201 - The permission check failed. * @throws { BusinessError } 22900001 - ExternalDeviceManager service exception or busType parameter error. * @syscap SystemCapability.Driver.ExternalDevice - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ - function queryDevices(busType?: int): Array>; + function queryDevices(busType?: number): Array>; /** * Bind the device based on the device information returned by queryDevices(). @@ -163,7 +161,7 @@ declare namespace deviceManager { * Queries external device information. * * @permission ohos.permission.ACCESS_EXTENSIONAL_DEVICE_DRIVER - * @param { long } deviceId - ID of device to query. + * @param { number } deviceId - ID of device to query. * @returns { Array> } Device information obtained. * @throws { BusinessError } 201 - The permission check failed. * @throws { BusinessError } 202 - Permission denied. A non-system application cannot call a system API. @@ -171,10 +169,9 @@ declare namespace deviceManager { * @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - function queryDeviceInfo(deviceId?: long): Array>; + function queryDeviceInfo(deviceId?: number): Array>; /** * Queries driver information. @@ -188,58 +185,53 @@ declare namespace deviceManager { * @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function queryDriverInfo(driverUid?: string): Array>; /** - * Bind the device based on the device information returned by queryDevices(). - * - * @permission ohos.permission.ACCESS_DDK_DRIVERS - * @param { long } deviceId - Device id on the device list returned by queryDevices(). - * @param { AsyncCallback } onDisconnect - Callback is invoked when device is disconnected after bind - * success. - * @returns { Promise } Indicates the bind result including device ID and remote object. - * @throws { BusinessError } 201 - The permission check failed. - * @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. - * @throws { BusinessError } 26300002 - The driver service does not allow any client to bind. - * @syscap SystemCapability.Driver.ExternalDevice - * @since arkts{ '1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 - */ - function bindDriverWithDeviceId(deviceId: long, onDisconnect: AsyncCallback): Promise; + * Bind the device based on the device information returned by queryDevices(). + * + * @permission ohos.permission.ACCESS_DDK_DRIVERS + * @param { number } deviceId - Device id on the device list returned by queryDevices(). + * @param { AsyncCallback } onDisconnect - Callback is invoked when device is disconnected after bind + * success. + * @returns { Promise } Indicates the bind result including device ID and remote object. + * @throws { BusinessError } 201 - The permission check failed. + * @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. + * @throws { BusinessError } 26300002 - The driver service does not allow any client to bind. + * @syscap SystemCapability.Driver.ExternalDevice + * @since 19 + */ + function bindDriverWithDeviceId(deviceId: number, onDisconnect: AsyncCallback): Promise; /** - * Unbind the device based on the device information returned by queryDevices(). - * - * @permission ohos.permission.ACCESS_DDK_DRIVERS - * @param { long } deviceId - Device id on the device list returned by queryDevices(). - * @returns { Promise } - Indicates the unbind result invoked when unbind is finished. - * @throws { BusinessError } 201 - The permission check failed. - * @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. - * @throws { BusinessError } 26300003 - There is no binding relationship. - * @syscap SystemCapability.Driver.ExternalDevice - * @since arkts{ '1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 - */ - function unbindDriverWithDeviceId(deviceId: long): Promise; + * Unbind the device based on the device information returned by queryDevices(). + * + * @permission ohos.permission.ACCESS_DDK_DRIVERS + * @param { number } deviceId - Device id on the device list returned by queryDevices(). + * @returns { Promise } - Indicates the unbind result invoked when unbind is finished. + * @throws { BusinessError } 201 - The permission check failed. + * @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. + * @throws { BusinessError } 26300003 - There is no binding relationship. + * @syscap SystemCapability.Driver.ExternalDevice + * @since 19 + */ + function unbindDriverWithDeviceId(deviceId: number): Promise; /** * Enumerates the bus types. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Driver.ExternalDevice - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ export enum BusType { /** * USB device type * * @syscap SystemCapability.Driver.ExternalDevice - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ USB = 1, } @@ -249,8 +241,7 @@ declare namespace deviceManager { * * @typedef Device * @syscap SystemCapability.Driver.ExternalDevice - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ interface Device { /** @@ -258,28 +249,25 @@ declare namespace deviceManager { * * @type { BusType } * @syscap SystemCapability.Driver.ExternalDevice - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ busType: BusType; /** * Device ID. * - * @type { long } + * @type { number } * @syscap SystemCapability.Driver.ExternalDevice - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ - deviceId: long; + deviceId: number; /** * Description of the device. * * @type { string } * @syscap SystemCapability.Driver.ExternalDevice - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ description: string; } @@ -290,29 +278,26 @@ declare namespace deviceManager { * @typedef USBDevice * @extends Device * @syscap SystemCapability.Driver.ExternalDevice - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ interface USBDevice extends Device { /** * Vendor ID. * - * @type { int } + * @type { number } * @syscap SystemCapability.Driver.ExternalDevice - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ - vendorId: int; + vendorId: number; /** * Product ID. * - * @type { int } + * @type { number } * @syscap SystemCapability.Driver.ExternalDevice - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ - productId: int; + productId: number; } /** @@ -320,27 +305,24 @@ declare namespace deviceManager { * * @typedef RemoteDeviceDriver * @syscap SystemCapability.Driver.ExternalDevice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ interface RemoteDeviceDriver { /** * Device ID. * - * @type { long } + * @type { number } * @syscap SystemCapability.Driver.ExternalDevice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - deviceId: long; + deviceId: number; /** * Remote driver object. * * @type { rpc.IRemoteObject } * @syscap SystemCapability.Driver.ExternalDevice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ remote: rpc.IRemoteObject; } @@ -351,53 +333,48 @@ declare namespace deviceManager { * @typedef USBInterfaceDesc * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface USBInterfaceDesc { /** * Interface number. * - * @type { int } + * @type { number } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - bInterfaceNumber: int; + bInterfaceNumber: number; /** * Interface class code. * - * @type { int } + * @type { number } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - bClass: int; + bClass: number; /** * Interface subclass code. * - * @type { int } + * @type { number } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - bSubClass: int; + bSubClass: number; /** * Interface protocol. * - * @type { int } + * @type { number } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - bProtocol: int; + bProtocol: number; } @@ -407,20 +384,18 @@ declare namespace deviceManager { * @typedef DeviceInfo * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface DeviceInfo { /** * Device ID. * - * @type { long } + * @type { number } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - deviceId: long; + deviceId: number; /** * Whether the device has a matched driver. @@ -428,8 +403,7 @@ declare namespace deviceManager { * @type { boolean } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ isDriverMatched: boolean; @@ -439,8 +413,7 @@ declare namespace deviceManager { * @type { ?string } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ driverUid?: string; } @@ -452,31 +425,28 @@ declare namespace deviceManager { * @extends DeviceInfo * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface USBDeviceInfo extends DeviceInfo { /** * Vendor ID. * - * @type { int } + * @type { number } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - vendorId: int; + vendorId: number; /** * Product ID. * - * @type { int } + * @type { number } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - productId: int; + productId: number; /** * List of USB interface descriptors. @@ -484,8 +454,7 @@ declare namespace deviceManager { * @type { Array> } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interfaceDescList: Array>; } @@ -496,8 +465,7 @@ declare namespace deviceManager { * @typedef DriverInfo * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface DriverInfo { /** @@ -506,8 +474,7 @@ declare namespace deviceManager { * @type { BusType } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ busType: BusType; @@ -517,8 +484,7 @@ declare namespace deviceManager { * @type { string } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ driverUid: string; @@ -528,8 +494,7 @@ declare namespace deviceManager { * @type { string } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ driverName: string; @@ -539,8 +504,7 @@ declare namespace deviceManager { * @type { string } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ driverVersion: string; @@ -550,8 +514,7 @@ declare namespace deviceManager { * @type { string } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ driverSize: string; @@ -561,8 +524,7 @@ declare namespace deviceManager { * @type { string } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ description: string; } @@ -574,31 +536,28 @@ declare namespace deviceManager { * @extends DriverInfo * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface USBDriverInfo extends DriverInfo { /** * IDs of supported products. * - * @type { Array } + * @type { Array } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - productIdList: Array; + productIdList: Array; /** * IDs of supported vendors. * - * @type { Array } + * @type { Array } * @syscap SystemCapability.Driver.ExternalDevice * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - vendorIdList: Array; + vendorIdList: Array; } } diff --git a/api/@ohos.effectKit.d.ts b/api/@ohos.effectKit.d.ts index 269b7cfe6f..507f0c73b8 100644 --- a/api/@ohos.effectKit.d.ts +++ b/api/@ohos.effectKit.d.ts @@ -1,800 +1,800 @@ -/* -* Copyright (c) 2022 Huawei Device Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -/** - * @file - * @kit ArkGraphics2D - */ - - -import { AsyncCallback } from './@ohos.base'; -import image from './@ohos.multimedia.image'; - - -/** - * @namespace effectKit - * @since 9 - */ -/** - * @namespace effectKit - * @form - * @atomicservice - * @since 12 - */ -/** - * @namespace effectKit - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - -declare namespace effectKit { - - /** - * The Filter of FilterChain. - * @typedef Filter - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * The Filter of FilterChain. - * @typedef Filter - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * The Filter of FilterChain. - * @typedef Filter - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - interface Filter { - - /** - * A blur effect is added to the image. - * @param { number } radius - The degree of blur, the value is measured in pixels. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * A blur effect is added to the image. - * @param { number } radius - The degree of blur, the value is measured in pixels. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * A blur effect is added to the image. - * @param { number } radius - The degree of blur, the value is measured in pixels. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - blur(radius: number): Filter; - - /** - * A blur effect is added to the image. - * @param { number } radius - The degree of blur, the value is measured in pixels. - * @param { TileMode } tileMode - The tile mode of blur. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - blur(radius: number, tileMode: TileMode): Filter; - - /** - * A Brightness effect is added to the image. - * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * A Brightness effect is added to the image. - * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * A Brightness effect is added to the image. - * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - brightness(bright: number): Filter; - - /** - * A Grayscale effect is added to the image. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * A Grayscale effect is added to the image. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * A Grayscale effect is added to the image. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - grayscale(): Filter; - - /** - * A invert effect is added to the image. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 - */ - /** - * A invert effect is added to the image. - * @returns { Filter } Filters for the current effect have been added. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - invert(): Filter; - - /** - * A custom effect is added to the image. - * - * @param { Array } colorMatrix - A matrix of 5x4 size for create effect filter. - * @returns { Filter } Filters for the current effect have been added. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 12 - */ - /** - * A custom effect is added to the image. - * - * @param { Array } colorMatrix - A matrix of 5x4 size for create effect filter. - * @returns { Filter } Filters for the current effect have been added. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - setColorMatrix(colorMatrix: Array): Filter; - - /** - * Gets the PixelMap where all filter effects have been added to the image. - * @returns { image.PixelMap } image.PixelMap. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - * @deprecated since 11 - * @useinstead effectKit.Filter#getEffectPixelMap - */ - getPixelMap(): image.PixelMap; - - /** - * Gets the PixelMap where all filter effects have been added to the image. - * @returns { Promise } - returns the PixelMap generated. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 11 - */ - /** - * Gets the PixelMap where all filter effects have been added to the image. - * @returns { Promise } - returns the PixelMap generated. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Gets the PixelMap where all filter effects have been added to the image. - * @returns { Promise } - returns the PixelMap generated. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - getEffectPixelMap(): Promise; - } - - /** - * The color picker of an image. - * @typedef ColorPicker - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * The color picker of an image. - * @typedef ColorPicker - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * The color picker of an image. - * @typedef ColorPicker - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - interface ColorPicker { - - /** - * get main color of an image - * @returns { Promise } returns the MainColor generated. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * get main color of an image - * @returns { Promise } returns the MainColor generated. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * get main color of an image - * @returns { Promise } returns the MainColor generated. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - getMainColor(): Promise; - - /** - * get main color of an image - * @returns { Color } Main color picked in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * get main color of an image - * @returns { Color } Main color picked in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * get main color of an image - * @returns { Color } Main color picked in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - getMainColorSync(): Color; - - /** - * Get largest proportion color of an image - * @returns { Color } Largest proportion color picked in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 10 - */ - /** - * Get largest proportion color of an image - * @returns { Color } Largest proportion color picked in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Get largest proportion color of an image - * @returns { Color } Largest proportion color picked in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - getLargestProportionColor(): Color; - - /** - * Get top proportion color of an image - * @param { number } colorCount - The number of colors to require, the value is 1 to 10. - * @returns { Array } An array of feature colors sorted by proportion, with a size equal to - * the minimum of colorCount and the actual number of extracted feature colors. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Get top proportion color of an image - * @param { number } colorCount - The number of colors to require, the value is 1 to 10. - * @returns { Array } An array of feature colors sorted by proportion, with a size equal to - * the minimum of colorCount and the actual number of extracted feature colors. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - getTopProportionColors(colorCount: number): Array; - - /** - * Get highest saturation color of an image - * @returns { Color } Highest saturation color picked in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 10 - */ - /** - * Get highest saturation color of an image - * @returns { Color } Highest saturation color picked in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Get highest saturation color of an image - * @returns { Color } Highest saturation color picked in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - getHighestSaturationColor(): Color; - - /** - * Get average color of an image - * @returns { Color } Average color calculated in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 10 - */ - /** - * Get average color of an image - * @returns { Color } Average color calculated in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Get average color of an image - * @returns { Color } Average color calculated in the image. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - getAverageColor(): Color; - - /** - * Determine whether the color is black or white or gray - * @param { number } color - The 32 bit ARGB color to discriminate. - * @returns { boolean } Result of judging black, white and gray. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 10 - */ - /** - * Determine whether the color is black or white or gray - * @param { number } color - The 32 bit ARGB color to discriminate. - * @returns { boolean } Result of judging black, white and gray. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Determine whether the color is black or white or gray - * @param { number } color - The 32 bit ARGB color to discriminate. - * @returns { boolean } Result of judging black, white and gray. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - isBlackOrWhiteOrGrayColor(color: number): boolean; - } - - /** - * The color param. - * @typedef Color - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * The color param. - * @typedef Color - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * The color param. - * @typedef Color - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - interface Color { - - /** - * Red - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * Red - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Red - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - red: number; - - /** - * Green - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * Green - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Green - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - green: number; - - /** - * Blue - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * Blue - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Blue - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - blue: number; - - /** - * Alpha - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * Alpha - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Alpha - * @type { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - alpha: number; - } - - /** - * Create a FilterChain to add multiple effects to an image. - * @param { image.PixelMap } source - the source pixelmap. - * @returns { Filter } Returns the head node of FilterChain. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * Create a FilterChain to add multiple effects to an image. - * @param { image.PixelMap } source - the source pixelmap. - * @returns { Filter } Returns the head node of FilterChain. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Create a FilterChain to add multiple effects to an image. - * @param { image.PixelMap } source - the source pixelmap. - * @returns { Filter } Returns the head node of FilterChain. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function createEffect(source: image.PixelMap): Filter; - - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @returns { Promise } - returns the ColorPicker generated. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @returns { Promise } - returns the ColorPicker generated. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @returns { Promise } - returns the ColorPicker generated. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function createColorPicker(source: image.PixelMap): Promise; - - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, - * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. - * @returns { Promise } - returns the ColorPicker generated. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 10 - */ - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, - * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. - * @returns { Promise } - returns the ColorPicker generated. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, - * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. - * @returns { Promise } - returns the ColorPicker generated. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function createColorPicker(source: image.PixelMap, region: Array): Promise; - - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @param { AsyncCallback } callback - the callback of createColorPicker. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @param { AsyncCallback } callback - the callback of createColorPicker. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @param { AsyncCallback } callback - the callback of createColorPicker. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function createColorPicker(source: image.PixelMap, callback: AsyncCallback): void; - - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, - * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. - * @param { AsyncCallback } callback - the callback of createColorPicker. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @since 10 - */ - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, - * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. - * @param { AsyncCallback } callback - the callback of createColorPicker. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @form - * @atomicservice - * @since 12 - */ - /** - * Create a color picker to get color of an image. - * @param { image.PixelMap } source - the source pixelmap. - * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, - * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. - * @param { AsyncCallback } callback - the callback of createColorPicker. - * @throws { BusinessError } 401 - Input parameter error. - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function createColorPicker(source: image.PixelMap, region: Array, callback: AsyncCallback): void; - - /** - * TileMode enumeration description - * - * @enum { number } - * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - enum TileMode { - /** - * Clamp mode. - * - * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - CLAMP = 0, - - /** - * Repeat mode. - * - * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - REPEAT = 1, - - /** - * Mirror mode. - * - * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - MIRROR = 2, - - /** - * Decal mode. - * - * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - DECAL = 3, - } -} - -export default effectKit; +/* +* Copyright (c) 2022 Huawei Device Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +/** + * @file + * @kit ArkGraphics2D + */ + + +import { AsyncCallback } from './@ohos.base'; +import image from './@ohos.multimedia.image'; + + +/** + * @namespace effectKit + * @since 9 + */ +/** + * @namespace effectKit + * @form + * @atomicservice + * @since 12 + */ +/** + * @namespace effectKit + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + +declare namespace effectKit { + + /** + * The Filter of FilterChain. + * @typedef Filter + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * The Filter of FilterChain. + * @typedef Filter + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * The Filter of FilterChain. + * @typedef Filter + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + interface Filter { + + /** + * A blur effect is added to the image. + * @param { number } radius - The degree of blur, the value is measured in pixels. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * A blur effect is added to the image. + * @param { number } radius - The degree of blur, the value is measured in pixels. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * A blur effect is added to the image. + * @param { number } radius - The degree of blur, the value is measured in pixels. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + blur(radius: number): Filter; + + /** + * A blur effect is added to the image. + * @param { number } radius - The degree of blur, the value is measured in pixels. + * @param { TileMode } tileMode - The tile mode of blur. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + blur(radius: number, tileMode: TileMode): Filter; + + /** + * A Brightness effect is added to the image. + * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * A Brightness effect is added to the image. + * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * A Brightness effect is added to the image. + * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + brightness(bright: number): Filter; + + /** + * A Grayscale effect is added to the image. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * A Grayscale effect is added to the image. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * A Grayscale effect is added to the image. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + grayscale(): Filter; + + /** + * A invert effect is added to the image. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 12 + */ + /** + * A invert effect is added to the image. + * @returns { Filter } Filters for the current effect have been added. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + invert(): Filter; + + /** + * A custom effect is added to the image. + * + * @param { Array } colorMatrix - A matrix of 5x4 size for create effect filter. + * @returns { Filter } Filters for the current effect have been added. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 12 + */ + /** + * A custom effect is added to the image. + * + * @param { Array } colorMatrix - A matrix of 5x4 size for create effect filter. + * @returns { Filter } Filters for the current effect have been added. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + setColorMatrix(colorMatrix: Array): Filter; + + /** + * Gets the PixelMap where all filter effects have been added to the image. + * @returns { image.PixelMap } image.PixelMap. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + * @deprecated since 11 + * @useinstead effectKit.Filter#getEffectPixelMap + */ + getPixelMap(): image.PixelMap; + + /** + * Gets the PixelMap where all filter effects have been added to the image. + * @returns { Promise } - returns the PixelMap generated. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 11 + */ + /** + * Gets the PixelMap where all filter effects have been added to the image. + * @returns { Promise } - returns the PixelMap generated. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Gets the PixelMap where all filter effects have been added to the image. + * @returns { Promise } - returns the PixelMap generated. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + getEffectPixelMap(): Promise; + } + + /** + * The color picker of an image. + * @typedef ColorPicker + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * The color picker of an image. + * @typedef ColorPicker + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * The color picker of an image. + * @typedef ColorPicker + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + interface ColorPicker { + + /** + * get main color of an image + * @returns { Promise } returns the MainColor generated. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * get main color of an image + * @returns { Promise } returns the MainColor generated. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * get main color of an image + * @returns { Promise } returns the MainColor generated. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + getMainColor(): Promise; + + /** + * get main color of an image + * @returns { Color } Main color picked in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * get main color of an image + * @returns { Color } Main color picked in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * get main color of an image + * @returns { Color } Main color picked in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + getMainColorSync(): Color; + + /** + * Get largest proportion color of an image + * @returns { Color } Largest proportion color picked in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 10 + */ + /** + * Get largest proportion color of an image + * @returns { Color } Largest proportion color picked in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Get largest proportion color of an image + * @returns { Color } Largest proportion color picked in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + getLargestProportionColor(): Color; + + /** + * Get top proportion color of an image + * @param { number } colorCount - The number of colors to require, the value is 1 to 10. + * @returns { Array } An array of feature colors sorted by proportion, with a size equal to + * the minimum of colorCount and the actual number of extracted feature colors. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Get top proportion color of an image + * @param { number } colorCount - The number of colors to require, the value is 1 to 10. + * @returns { Array } An array of feature colors sorted by proportion, with a size equal to + * the minimum of colorCount and the actual number of extracted feature colors. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + getTopProportionColors(colorCount: number): Array; + + /** + * Get highest saturation color of an image + * @returns { Color } Highest saturation color picked in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 10 + */ + /** + * Get highest saturation color of an image + * @returns { Color } Highest saturation color picked in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Get highest saturation color of an image + * @returns { Color } Highest saturation color picked in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + getHighestSaturationColor(): Color; + + /** + * Get average color of an image + * @returns { Color } Average color calculated in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 10 + */ + /** + * Get average color of an image + * @returns { Color } Average color calculated in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Get average color of an image + * @returns { Color } Average color calculated in the image. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + getAverageColor(): Color; + + /** + * Determine whether the color is black or white or gray + * @param { number } color - The 32 bit ARGB color to discriminate. + * @returns { boolean } Result of judging black, white and gray. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 10 + */ + /** + * Determine whether the color is black or white or gray + * @param { number } color - The 32 bit ARGB color to discriminate. + * @returns { boolean } Result of judging black, white and gray. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Determine whether the color is black or white or gray + * @param { number } color - The 32 bit ARGB color to discriminate. + * @returns { boolean } Result of judging black, white and gray. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + isBlackOrWhiteOrGrayColor(color: number): boolean; + } + + /** + * The color param. + * @typedef Color + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * The color param. + * @typedef Color + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * The color param. + * @typedef Color + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + interface Color { + + /** + * Red + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * Red + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Red + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + red: number; + + /** + * Green + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * Green + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Green + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + green: number; + + /** + * Blue + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * Blue + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Blue + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + blue: number; + + /** + * Alpha + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * Alpha + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Alpha + * @type { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + alpha: number; + } + + /** + * Create a FilterChain to add multiple effects to an image. + * @param { image.PixelMap } source - the source pixelmap. + * @returns { Filter } Returns the head node of FilterChain. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * Create a FilterChain to add multiple effects to an image. + * @param { image.PixelMap } source - the source pixelmap. + * @returns { Filter } Returns the head node of FilterChain. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Create a FilterChain to add multiple effects to an image. + * @param { image.PixelMap } source - the source pixelmap. + * @returns { Filter } Returns the head node of FilterChain. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function createEffect(source: image.PixelMap): Filter; + + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @returns { Promise } - returns the ColorPicker generated. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @returns { Promise } - returns the ColorPicker generated. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @returns { Promise } - returns the ColorPicker generated. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function createColorPicker(source: image.PixelMap): Promise; + + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, + * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. + * @returns { Promise } - returns the ColorPicker generated. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 10 + */ + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, + * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. + * @returns { Promise } - returns the ColorPicker generated. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, + * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. + * @returns { Promise } - returns the ColorPicker generated. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function createColorPicker(source: image.PixelMap, region: Array): Promise; + + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @param { AsyncCallback } callback - the callback of createColorPicker. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 9 + */ + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @param { AsyncCallback } callback - the callback of createColorPicker. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @param { AsyncCallback } callback - the callback of createColorPicker. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function createColorPicker(source: image.PixelMap, callback: AsyncCallback): void; + + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, + * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. + * @param { AsyncCallback } callback - the callback of createColorPicker. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @since 10 + */ + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, + * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. + * @param { AsyncCallback } callback - the callback of createColorPicker. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @form + * @atomicservice + * @since 12 + */ + /** + * Create a color picker to get color of an image. + * @param { image.PixelMap } source - the source pixelmap. + * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, + * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. + * @param { AsyncCallback } callback - the callback of createColorPicker. + * @throws { BusinessError } 401 - Input parameter error. + * @syscap SystemCapability.Multimedia.Image.Core + * @crossplatform + * @form + * @atomicservice + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + function createColorPicker(source: image.PixelMap, region: Array, callback: AsyncCallback): void; + + /** + * TileMode enumeration description + * + * @enum { number } + * @syscap SystemCapability.Multimedia.Image.Core + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + enum TileMode { + /** + * Clamp mode. + * + * @syscap SystemCapability.Multimedia.Image.Core + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + CLAMP = 0, + + /** + * Repeat mode. + * + * @syscap SystemCapability.Multimedia.Image.Core + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + REPEAT = 1, + + /** + * Mirror mode. + * + * @syscap SystemCapability.Multimedia.Image.Core + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + MIRROR = 2, + + /** + * Decal mode. + * + * @syscap SystemCapability.Multimedia.Image.Core + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 + */ + DECAL = 3, + } +} + +export default effectKit; diff --git a/api/@ohos.file.hash.d.ts b/api/@ohos.file.hash.d.ts index ea4355c1f8..e6beae59b3 100644 --- a/api/@ohos.file.hash.d.ts +++ b/api/@ohos.file.hash.d.ts @@ -195,8 +195,7 @@ declare namespace hash { * @throws { BusinessError } 13900020 - Invalid argument * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Create file read stream. diff --git a/api/@ohos.file.keyManager.d.ts b/api/@ohos.file.keyManager.d.ts index dd72db4b87..058ad8dd99 100644 --- a/api/@ohos.file.keyManager.d.ts +++ b/api/@ohos.file.keyManager.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024-2025 Huawei Device Co., Ltd. + * Copyright (c) 2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,6 @@ /** * @file * @kit CoreFileKit - * @arkts 1.1&1.2 */ /** @@ -24,7 +23,7 @@ * * @namespace keyManager * @syscap SystemCapability.FileManagement.StorageService.Encryption - * @since arkts {'1.1':'15', '1.2':'20'} + * @since 15 */ declare namespace keyManager { /** @@ -41,7 +40,7 @@ declare namespace keyManager { * @throws { BusinessError } 13600009 - User ID out of range. Possible causes: input parameter userId < 100 or userId > 10736. * @syscap SystemCapability.FileManagement.StorageService.Encryption * @systemapi - * @since arkts {'1.1':'15', '1.2':'20'} + * @since 15 */ function deactivateUserKey(userId: number):void; } diff --git a/api/@ohos.file.photoAccessHelper.d.ts b/api/@ohos.file.photoAccessHelper.d.ts index 21826c3db9..374a50ee0d 100644 --- a/api/@ohos.file.photoAccessHelper.d.ts +++ b/api/@ohos.file.photoAccessHelper.d.ts @@ -298,8 +298,7 @@ declare namespace photoAccessHelper { * @enum { number } ThumbnailVisibility * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ enum ThumbnailVisibility { /** @@ -307,8 +306,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ INVISIBLE = 0, /** @@ -316,8 +314,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ VISIBLE = 1 } @@ -373,8 +370,7 @@ declare namespace photoAccessHelper { * Stored both on a local device and cloud. * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @since arkts {'1.1':'16','1.2':'20'} - * @arkts 1.1&1.2 + * @since 16 */ LOCAL_AND_CLOUD = 3 } @@ -538,8 +534,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ ANALYSIS_SEARCH_INDEX = 16 } @@ -659,8 +654,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ COLOR_STYLE_PHOTO = 12 } @@ -1098,8 +1092,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @atomicservice - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ class MediaAssetManager { /** @@ -1117,8 +1110,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @static * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ static requestImage( context: Context, @@ -1166,8 +1158,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @static * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ static requestImageData( context: Context, @@ -1209,8 +1200,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @static * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static requestMovingPhoto( context: Context, @@ -1232,8 +1222,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @static * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ static cancelRequest(context: Context, requestId: string): Promise; @@ -1272,8 +1261,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @static * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ static requestVideoFile( context: Context, @@ -1310,8 +1298,7 @@ declare namespace photoAccessHelper { * @static * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @atomicservice - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ static loadMovingPhoto( context: Context, @@ -1712,8 +1699,7 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ getThumbnailData(type: ThumbnailType): Promise; /** @@ -1843,8 +1829,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ getExif(callback: AsyncCallback): void; /** @@ -1877,8 +1862,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ getExif(): Promise; /** @@ -1894,8 +1878,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ setPending(pendingState: boolean, callback: AsyncCallback): void; /** @@ -1911,8 +1894,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ setPending(pendingState: boolean): Promise; /** @@ -1927,8 +1909,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ isEdited(callback: AsyncCallback): void; /** @@ -1943,8 +1924,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ isEdited(): Promise; /** @@ -1959,8 +1939,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ requestEditData(callback: AsyncCallback): void; /** @@ -1975,8 +1954,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ requestEditData(): Promise; /** @@ -1991,8 +1969,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ getEditData(): Promise; /** @@ -2007,8 +1984,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error. It is recommended to retry and check the logs. *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ clone(title: string): Promise; /** @@ -2051,8 +2027,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ requestSource(callback: AsyncCallback): void; /** @@ -2067,8 +2042,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ requestSource(): Promise; /** @@ -2102,8 +2076,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ commitEditedAsset(editData: string, uri: string): Promise; /** @@ -2133,8 +2106,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ revertToOriginal(): Promise; /** @@ -2182,8 +2154,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ cancelPhotoRequest(requestId: string): void; /** @@ -2200,8 +2171,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ getKeyFrameThumbnail(beginFrameTimeMs: number, type: ThumbnailType): Promise; } @@ -2825,8 +2795,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ THUMBNAIL_VISIBLE = 'thumbnail_visible', /** @@ -2834,8 +2803,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ IS_CE_AUTO = 'is_auto', /** @@ -2843,8 +2811,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ OWNER_ALBUM_ID = 'owner_album_id', /** @@ -2852,16 +2819,14 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ IS_RECENT_SHOW = 'is_recent_show', /** * Suffix of the asset, read only * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ MEDIA_SUFFIX = 'media_suffix', /** @@ -2933,8 +2898,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ ALBUM_LPATH = 'lpath', /** @@ -2942,8 +2906,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ BUNDLE_NAME = 'bundle_name', /** @@ -3256,8 +3219,7 @@ declare namespace photoAccessHelper { * @interface PhotoCreationSource * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ interface PhotoCreationSource { /** @@ -3266,8 +3228,7 @@ declare namespace photoAccessHelper { * @type { ?string } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ bundleName?: string; /** @@ -3276,8 +3237,7 @@ declare namespace photoAccessHelper { * @type { ?string } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ appName?: string; /** @@ -3286,8 +3246,7 @@ declare namespace photoAccessHelper { * @type { ?string } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ appId?: string; /** @@ -3296,8 +3255,7 @@ declare namespace photoAccessHelper { * @type { ?number } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ tokenId?: number; } @@ -3387,8 +3345,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @crossplatform - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Checks whether the result set points to the last row. @@ -3576,8 +3533,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @crossplatform - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Obtains the last object asset in the fetch result. @@ -3612,8 +3568,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @crossplatform - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Obtains the last object asset in the fetch result. @@ -3864,8 +3819,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ SOURCE = 2048, /** @@ -4296,8 +4250,7 @@ declare namespace photoAccessHelper { * @readonly * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ readonly lpath?: string; /** @@ -4501,8 +4454,7 @@ declare namespace photoAccessHelper { * @readonly * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ readonly dateAdded?: number; /** @@ -4512,8 +4464,7 @@ declare namespace photoAccessHelper { * @readonly * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ readonly dateModified?: number; /** @@ -5451,8 +5402,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ getDataAnalysisProgress(analysisType: AnalysisType): Promise; /** @@ -5714,8 +5664,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ saveGalleryFormInfo(info: GalleryFormInfo): Promise; /** @@ -5731,8 +5680,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ removeFormInfo(info: FormInfo, callback: AsyncCallback): void; /** @@ -5748,8 +5696,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ removeFormInfo(info: FormInfo): Promise; /** @@ -5765,8 +5712,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ removeGalleryFormInfo(info: GalleryFormInfo): Promise; /** @@ -5782,8 +5728,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ updateGalleryFormInfo(info: GalleryFormInfo): Promise; /** @@ -5833,8 +5778,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ grantPhotoUrisPermission(tokenId: number, uriList: Array, photoPermissionType: PhotoPermissionType, hideSensitiveType: HideSensitiveType): Promise; /** @@ -5873,8 +5817,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ cancelPhotoUriPermission(tokenId: number, uri: string, photoPermissionType: PhotoPermissionType): Promise; /** @@ -5891,8 +5834,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ startThumbnailCreationTask(predicate: dataSharePredicates.DataSharePredicates, callback: AsyncCallback): number; /** @@ -5924,8 +5866,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ getSharedPhotoAssets(options: FetchOptions): Array; /** @@ -5937,8 +5878,7 @@ declare namespace photoAccessHelper { *
    2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 14000011 - Internal system error. It is recommended to retry and check the logs. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ getSupportedPhotoFormats(photoType: PhotoType): Promise>; /** @@ -5954,8 +5894,7 @@ declare namespace photoAccessHelper { *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ startAssetAnalysis(type: AnalysisType, assetUris?: Array): Promise; /** @@ -5971,8 +5910,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ getAlbumsByIds(albumIds: Array): Promise>; /** @@ -5991,8 +5929,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ createAssetsForAppWithAlbum(source: PhotoCreationSource, albumUri: string, isAuthorized: boolean, photoCreationConfigs: Array): Promise>; @@ -6872,8 +6809,7 @@ declare namespace photoAccessHelper { * @interface GalleryFormInfo * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ interface GalleryFormInfo { /** @@ -6882,8 +6818,7 @@ declare namespace photoAccessHelper { * @type { string } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ formId: string; /** @@ -6892,8 +6827,7 @@ declare namespace photoAccessHelper { * @type { ?Array } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ assetUris?: Array; } @@ -7060,8 +6994,7 @@ declare namespace photoAccessHelper { * @type { Array } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ sharedPhotoAssets: Array; /** @@ -7070,8 +7003,7 @@ declare namespace photoAccessHelper { * @type { Array } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ sharedAlbumAssets: Array; /** @@ -7080,8 +7012,7 @@ declare namespace photoAccessHelper { * @type { Array } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ sharedExtraPhotoAssets: Array; } @@ -7965,8 +7896,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ constructor(compatibleFormat: string, formatVersion: string); @@ -8059,8 +7989,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ PRIVATE_MOVING_PHOTO_METADATA = 5 } @@ -8649,8 +8578,7 @@ declare namespace photoAccessHelper { *
    2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ setOrientation(orientation: number): void; @@ -8702,8 +8630,7 @@ declare namespace photoAccessHelper { * @static * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static deleteLocalAssetsPermanently(context: Context, assets: Array): Promise; @@ -8808,8 +8735,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - System inner fail * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ setIsRecentShow(isRencentShow: boolean): void; } @@ -9507,8 +9433,7 @@ declare namespace photoAccessHelper { * @type { ?number } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ thumbnailModifiedMs?: number; /** @@ -9517,8 +9442,7 @@ declare namespace photoAccessHelper { * @type { ThumbnailVisibility } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ thumbnailVisible: ThumbnailVisibility; } @@ -9529,8 +9453,7 @@ declare namespace photoAccessHelper { * @interface SharedAlbumAsset * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ interface SharedAlbumAsset { /** @@ -9539,8 +9462,7 @@ declare namespace photoAccessHelper { * @type { number } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ albumId: number; /** @@ -9549,8 +9471,7 @@ declare namespace photoAccessHelper { * @type { AlbumType } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ albumType: AlbumType; /** @@ -9559,8 +9480,7 @@ declare namespace photoAccessHelper { * @type { AlbumSubtype } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ albumSubType: AlbumSubtype; /** @@ -9569,8 +9489,7 @@ declare namespace photoAccessHelper { * @type { string } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ albumName: string; /** @@ -9579,8 +9498,7 @@ declare namespace photoAccessHelper { * @type { string } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ coverUri: string; /** @@ -9589,8 +9507,7 @@ declare namespace photoAccessHelper { * @type { number } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ count: number; /** @@ -9599,8 +9516,7 @@ declare namespace photoAccessHelper { * @type { number } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ imageCount: number; /** @@ -9609,8 +9525,7 @@ declare namespace photoAccessHelper { * @type { number } * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ videoCount: number; } @@ -9877,8 +9792,7 @@ declare namespace photoAccessHelper { * @extends MediaAlbumChangeRequest * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ class MediaAnalysisAlbumChangeRequest extends MediaAlbumChangeRequest { /** @@ -9890,8 +9804,7 @@ declare namespace photoAccessHelper { *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ constructor(album: Album); @@ -9909,8 +9822,7 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ setOrderPosition(assets: Array, position: Array): void; } @@ -9920,8 +9832,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ class AnalysisAlbum { /** @@ -9933,8 +9844,7 @@ declare namespace photoAccessHelper { *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ constructor(album: Album); /** @@ -9951,8 +9861,7 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ getOrderPosition(assets: Array): Promise>; } @@ -10010,8 +9919,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ getHighlightResource(resourceUri: string): Promise; @@ -10029,8 +9937,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ setHighlightUserActionData(type: HighlightUserActionType, actionData: number): Promise; @@ -10048,8 +9955,7 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ setSubTitle(subTitle: string): Promise; @@ -10069,8 +9975,7 @@ declare namespace photoAccessHelper { * @static * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static deleteHighlightAlbums(context: Context, albums: Array): Promise; } @@ -10281,8 +10186,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ submitCloudEnhancementTasks( photoAssets: Array, @@ -10351,8 +10255,7 @@ declare namespace photoAccessHelper { * @throws { BusinessError } 14000011 - Internal system error * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ queryCloudEnhancementTaskState(photoAsset: PhotoAsset): Promise; @@ -10442,8 +10345,7 @@ declare namespace photoAccessHelper { * @enum { number } CloudMediaAssetTaskStatus * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ enum CloudMediaAssetTaskStatus { /** @@ -10451,8 +10353,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ DOWNLOADING = 0, /** @@ -10460,8 +10361,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ PAUSED = 1, /** @@ -10469,8 +10369,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ IDLE = 2 } @@ -10481,8 +10380,7 @@ declare namespace photoAccessHelper { * @enum { number } CloudMediaTaskPauseCause * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ enum CloudMediaTaskPauseCause { /** @@ -10490,8 +10388,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ NO_PAUSE = 0, /** @@ -10499,8 +10396,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ TEMPERATURE_LIMIT = 1, /** @@ -10508,8 +10404,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ ROM_LIMIT = 2, /** @@ -10517,8 +10412,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ NETWORK_FLOW_LIMIT = 3, /** @@ -10526,8 +10420,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ WIFI_UNAVAILABLE = 4, /** @@ -10535,8 +10428,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ POWER_LIMIT = 5, /** @@ -10544,8 +10436,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ BACKGROUND_TASK_UNAVAILABLE = 6, /** @@ -10553,8 +10444,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ FREQUENT_USER_REQUESTS = 7, /** @@ -10562,8 +10452,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ CLOUD_ERROR = 8, /** @@ -10571,8 +10460,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ USER_PAUSED = 9 } @@ -10584,8 +10472,7 @@ declare namespace photoAccessHelper { * @interface CloudMediaAssetStatus * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ interface CloudMediaAssetStatus { /** @@ -10595,8 +10482,7 @@ declare namespace photoAccessHelper { * @readonly * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ readonly taskStatus: CloudMediaAssetTaskStatus; /** @@ -10607,8 +10493,7 @@ declare namespace photoAccessHelper { * @readonly * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ readonly taskInfo: string; /** @@ -10618,8 +10503,7 @@ declare namespace photoAccessHelper { * @readonly * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ readonly errorCode: CloudMediaTaskPauseCause; } @@ -10630,8 +10514,7 @@ declare namespace photoAccessHelper { * @enum { number } CloudMediaDownloadType * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ enum CloudMediaDownloadType { /** @@ -10639,8 +10522,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ DOWNLOAD_FORCE = 0, /** @@ -10648,8 +10530,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ DOWNLOAD_GENTLE = 1 } @@ -10660,8 +10541,7 @@ declare namespace photoAccessHelper { * @enum { number } CloudMediaRetainType * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ enum CloudMediaRetainType { /** @@ -10669,8 +10549,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ RETAIN_FORCE = 0 } @@ -10681,8 +10560,7 @@ declare namespace photoAccessHelper { * * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ class CloudMediaAssetManager { /** @@ -10698,8 +10576,7 @@ declare namespace photoAccessHelper { * @static * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ static getCloudMediaAssetManagerInstance(context: Context): CloudMediaAssetManager; @@ -10717,8 +10594,7 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ startDownloadCloudMedia(downloadType: CloudMediaDownloadType): Promise; @@ -10733,8 +10609,7 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ pauseDownloadCloudMedia(): Promise; @@ -10749,8 +10624,7 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ cancelDownloadCloudMedia(): Promise; @@ -10768,8 +10642,7 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ retainCloudMediaAsset(retainType: CloudMediaRetainType): Promise; @@ -10784,8 +10657,7 @@ declare namespace photoAccessHelper { *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ getCloudMediaAssetStatus(): Promise; } diff --git a/api/@ohos.file.storageStatistics.d.ts b/api/@ohos.file.storageStatistics.d.ts index 2320239d5d..0bcb09387a 100644 --- a/api/@ohos.file.storageStatistics.d.ts +++ b/api/@ohos.file.storageStatistics.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Huawei Device Co., Ltd. + * Copyright (C) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -25,8 +25,7 @@ import { AsyncCallback, Callback } from './@ohos.base'; * * @namespace storageStatistics * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ declare namespace storageStatistics { /** @@ -113,8 +112,7 @@ parameters are left unspecified; * * @interface BundleStats * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ export interface BundleStats { /** @@ -122,8 +120,7 @@ parameters are left unspecified; * * @type { number } * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ appSize: number; @@ -132,8 +129,7 @@ parameters are left unspecified; * * @type { number } * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ cacheSize: number; @@ -142,8 +138,7 @@ parameters are left unspecified; * * @type { number } * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ dataSize: number; } @@ -230,8 +225,7 @@ parameters are left unspecified; * @throws { BusinessError } 13600001 - IPC error. * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getCurrentBundleStats(callback: AsyncCallback): void; @@ -244,8 +238,7 @@ parameters are left unspecified; * @throws { BusinessError } 13600001 - IPC error. * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getCurrentBundleStats(): Promise; @@ -289,8 +282,7 @@ parameters are left unspecified; * @interface StorageStats * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ export interface StorageStats { /** @@ -299,8 +291,7 @@ parameters are left unspecified; * @type { number } * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ total: number; @@ -369,8 +360,7 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getUserStorageStats(): Promise; @@ -388,8 +378,7 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getUserStorageStats(callback: AsyncCallback): void; @@ -409,8 +398,7 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getUserStorageStats(userId: number): Promise; @@ -430,8 +418,7 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getUserStorageStats(userId: number, callback: AsyncCallback): void; @@ -459,8 +446,7 @@ parameters are left unspecified; * @throws { BusinessError } 13600001 - IPC error. * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ function getTotalSize(callback: AsyncCallback): void; @@ -486,8 +472,7 @@ parameters are left unspecified; * @throws { BusinessError } 13600001 - IPC error. * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ function getTotalSize(): Promise; @@ -541,8 +526,7 @@ parameters are left unspecified; * @throws { BusinessError } 13600001 - IPC error. * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ function getFreeSize(callback: AsyncCallback): void; @@ -568,8 +552,7 @@ parameters are left unspecified; * @throws { BusinessError } 13600001 - IPC error. * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ function getFreeSize(): Promise; diff --git a/api/@ohos.file.volumeManager.d.ts b/api/@ohos.file.volumeManager.d.ts index 1b90ba7c3f..87377b2690 100644 --- a/api/@ohos.file.volumeManager.d.ts +++ b/api/@ohos.file.volumeManager.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Huawei Device Co., Ltd. + * Copyright (C) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -26,8 +26,7 @@ import { AsyncCallback, Callback } from './@ohos.base'; * @namespace volumeManager * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ declare namespace volumeManager { /** @@ -36,8 +35,7 @@ declare namespace volumeManager { * @interface Volume * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ export interface Volume { /** @@ -56,8 +54,7 @@ declare namespace volumeManager { * @type { string } * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ uuid: string; @@ -77,8 +74,7 @@ declare namespace volumeManager { * @type { string } * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ description: string; @@ -135,8 +131,7 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getAllVolumes(callback: AsyncCallback>): void; @@ -153,8 +148,7 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getAllVolumes(): Promise>; @@ -266,8 +260,7 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getVolumeByUuid(uuid: string, callback: AsyncCallback): void; @@ -287,8 +280,7 @@ parameters are left unspecified; * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.StorageService.Volume * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getVolumeByUuid(uuid: string): Promise; diff --git a/api/@ohos.fileshare.d.ts b/api/@ohos.fileshare.d.ts index 26e68dcccb..ec9b89fe1a 100644 --- a/api/@ohos.fileshare.d.ts +++ b/api/@ohos.fileshare.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2025 Huawei Device Co., Ltd. + * Copyright (C) 2022-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -199,8 +199,7 @@ declare namespace fileShare { * * @interface PathPolicyInfo * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ export interface PathPolicyInfo { /** @@ -208,8 +207,7 @@ declare namespace fileShare { * * @type { string } * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ path: string; @@ -218,8 +216,7 @@ declare namespace fileShare { * * @type { OperationMode } * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ operationMode: OperationMode; } @@ -229,16 +226,14 @@ declare namespace fileShare { * * @enum { number } policyType * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ export enum PolicyType { /** * Indicates that the policy is temporary. * * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ TEMPORARY_TYPE = 0, @@ -246,8 +241,7 @@ declare namespace fileShare { * Indicates that the policy is persistent. * * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ PERSISTENT_TYPE = 1, } @@ -363,8 +357,7 @@ declare namespace fileShare { * @throws { BusinessError } 13900001 - Operation not permitted. * @throws { BusinessError } 13900042 - Out of memory * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ function activatePermission(policies: Array): Promise; @@ -381,8 +374,7 @@ declare namespace fileShare { * @throws { BusinessError } 13900001 - Operation not permitted. * @throws { BusinessError } 13900042 - Out of memory * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ function deactivatePermission(policies: Array): Promise; @@ -418,7 +410,7 @@ declare namespace fileShare { * Check permissions for the path. * * @permission ohos.permission.CHECK_SANDBOX_POLICY - * @param { int } tokenID - Token ID of the application. + * @param { number } tokenID - Token ID of the application. * @param { Array } policies - Policy information to check on paths. * @param { PolicyType } policyType - Persistent or temporary type. * @returns { Promise> } Returns the permission state of paths. @@ -429,10 +421,9 @@ declare namespace fileShare { * @throws { BusinessError } 801 - Capability not supported. * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization * @systemapi - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ - function checkPathPermission(tokenID: int, policies: Array, policyType: PolicyType): Promise>; + function checkPathPermission(tokenID: number, policies: Array, policyType: PolicyType): Promise>; } export default fileShare; diff --git a/api/@ohos.geoLocationManager.d.ts b/api/@ohos.geoLocationManager.d.ts index 762c98e2d0..d5413e5ba8 100644 --- a/api/@ohos.geoLocationManager.d.ts +++ b/api/@ohos.geoLocationManager.d.ts @@ -108,8 +108,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function on(type: 'locationChange', request: LocationRequest | ContinuousLocationRequest, callback: Callback): void; @@ -157,8 +156,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function off(type: 'locationChange', callback?: Callback): void; @@ -174,8 +172,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function on(type: 'locationError', callback: Callback): void; @@ -191,8 +188,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function off(type: 'locationError', callback?: Callback): void; @@ -205,8 +201,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.on('locationEnabledChange')} due to limited device capabilities. * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function on(type: 'locationEnabledChange', callback: Callback): void; @@ -219,8 +214,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.off('locationEnabledChange')} due to limited device capabilities. * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function off(type: 'locationEnabledChange', callback?: Callback): void; @@ -253,8 +247,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function on(type: 'cachedGnssLocationsChange', request: CachedGnssLocationsRequest, callback: Callback>): void; @@ -285,8 +278,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function off(type: 'cachedGnssLocationsChange', callback?: Callback>): void; @@ -302,8 +294,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function on(type: 'satelliteStatusChange', callback: Callback): void; @@ -319,8 +310,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function off(type: 'satelliteStatusChange', callback?: Callback): void; @@ -336,8 +326,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function on(type: 'nmeaMessage', callback: Callback): void; @@ -353,8 +342,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Gnss - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function off(type: 'nmeaMessage', callback?: Callback): void; @@ -404,8 +392,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301500 - Failed to query the area information. * @syscap SystemCapability.Location.Location.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function on(type: 'countryCodeChange', callback: Callback): void; @@ -419,8 +406,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301500 - Failed to query the area information. * @syscap SystemCapability.Location.Location.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function off(type: 'countryCodeChange', callback?: Callback): void; @@ -439,8 +425,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301800 - Failed to start WiFi or Bluetooth scanning. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ function on(type: 'locatingRequiredDataChange', config: LocatingRequiredDataConfig, callback: Callback>): void; @@ -456,8 +441,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.off('locatingRequiredDataChange')} due to limited device capabilities. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ function off(type: 'locatingRequiredDataChange', callback?: Callback>): void; @@ -472,8 +456,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function on(type: 'locationIconStatusChange', callback: Callback): void; @@ -488,8 +471,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function off(type: 'locationIconStatusChange', callback?: Callback): void; @@ -505,8 +487,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301100 - The location switch is off. * @syscap SystemCapability.Location.Location.Core - * @since arkts {'1.1':'16','1.2':'20'} - * @arkts 1.1&1.2 + * @since 16 */ function on(type: 'bluetoothScanResultChange', callback: Callback): void; @@ -521,8 +502,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.off('bluetoothScanResultChange')} due to limited device capabilities. * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core - * @since arkts {'1.1':'16','1.2':'20'} - * @arkts 1.1&1.2 + * @since 16 */ function off(type: 'bluetoothScanResultChange', callback?: Callback): void; @@ -685,8 +665,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301200 - Failed to obtain the geographical location. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ function getLastLocation(): Location; @@ -707,8 +686,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ function isLocationEnabled(): boolean; @@ -752,8 +730,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since arkts {'1.1':'20','1.2':'20'} - * @arkts 1.1&1.2 + * @since 20 */ function enableLocation(callback: AsyncCallback): void; @@ -781,8 +758,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since arkts {'1.1':'20','1.2':'20'} - * @arkts 1.1&1.2 + * @since 20 */ function enableLocation(): Promise; @@ -824,8 +800,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since arkts {'1.1':'20','1.2':'20'} - * @arkts 1.1&1.2 + * @since 20 */ function disableLocation(): void; @@ -870,8 +845,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301300 - Reverse geocoding query failed. * @syscap SystemCapability.Location.Location.Geocoder - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getAddressesFromLocation(request: ReverseGeoCodeRequest, callback: AsyncCallback>): void; @@ -885,8 +859,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @throws { BusinessError } 3301300 - Reverse geocoding query failed. * @syscap SystemCapability.Location.Location.Geocoder - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getAddressesFromLocation(request: ReverseGeoCodeRequest): Promise>; @@ -1217,8 +1190,7 @@ declare namespace geoLocationManager { * @throws { BusinessError } 3301000 - The location service is unavailable. * @syscap SystemCapability.Location.Location.Core * @systemapi - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function isLocationPrivacyConfirmed(type: LocationPrivacyType): boolean; @@ -1431,8 +1403,7 @@ declare namespace geoLocationManager { * * @typedef SatelliteStatusInfo * @syscap SystemCapability.Location.Location.Gnss - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ export interface SatelliteStatusInfo { /** @@ -1440,8 +1411,7 @@ declare namespace geoLocationManager { * * @type { number } * @syscap SystemCapability.Location.Location.Gnss - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ satellitesNumber: number; @@ -1450,8 +1420,7 @@ declare namespace geoLocationManager { * * @type { Array } * @syscap SystemCapability.Location.Location.Gnss - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ satelliteIds: Array; @@ -1460,8 +1429,7 @@ declare namespace geoLocationManager { * * @type { Array } * @syscap SystemCapability.Location.Location.Gnss - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ carrierToNoiseDensitys: Array; @@ -1470,8 +1438,7 @@ declare namespace geoLocationManager { * * @type { Array } * @syscap SystemCapability.Location.Location.Gnss - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ altitudes: Array; @@ -1480,8 +1447,7 @@ declare namespace geoLocationManager { * * @type { Array } * @syscap SystemCapability.Location.Location.Gnss - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ azimuths: Array; @@ -1490,8 +1456,7 @@ declare namespace geoLocationManager { * * @type { Array } * @syscap SystemCapability.Location.Location.Gnss - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ carrierFrequencies: Array; @@ -1500,8 +1465,7 @@ declare namespace geoLocationManager { * * @type { ?Array } * @syscap SystemCapability.Location.Location.Gnss - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ satelliteConstellation?: Array; @@ -1510,8 +1474,7 @@ declare namespace geoLocationManager { * * @type { ?Array } * @syscap SystemCapability.Location.Location.Gnss - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ satelliteAdditionalInfo?: Array; } @@ -1521,8 +1484,7 @@ declare namespace geoLocationManager { * * @typedef CachedGnssLocationsRequest * @syscap SystemCapability.Location.Location.Gnss - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ export interface CachedGnssLocationsRequest { /** @@ -1530,8 +1492,7 @@ declare namespace geoLocationManager { * * @type { number } * @syscap SystemCapability.Location.Location.Gnss - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ reportingPeriodSec: number; @@ -1540,8 +1501,7 @@ declare namespace geoLocationManager { * * @type { boolean } * @syscap SystemCapability.Location.Location.Gnss - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ wakeUpCacheQueueFull: boolean; } diff --git a/api/@ohos.graphics.text.d.ts b/api/@ohos.graphics.text.d.ts index f6b13ebee6..cbf875404c 100755 --- a/api/@ohos.graphics.text.d.ts +++ b/api/@ohos.graphics.text.d.ts @@ -41,8 +41,7 @@ import type common2D from './@ohos.graphics.common2D'; * * @namespace text * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ declare namespace text { @@ -50,31 +49,27 @@ declare namespace text { * Refers to how to align the horizontal position of text when displaying text. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum TextAlign { /** * Use the left side of the text as a reference line for alignment. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ LEFT = 0, /** * Use the right side of the text as a reference line for alignment. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ RIGHT = 1, /** * Use the midpoint line the text as a reference line for alignment. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ CENTER = 2, @@ -82,24 +77,21 @@ declare namespace text { * Justified, which means that each line (except the last line) is stretched so that every line has equal width, * and the left and right margins are straight. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ JUSTIFY = 3, /** * Align text from start, based on the TextDirection, such as left-to-right or right-to-left. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ START = 4, /** * Align text from end, based on the TextDirection, such as left-to-right or right-to-left, opposite to START. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ END = 5, } @@ -141,23 +133,20 @@ declare namespace text { * Enumerate text runs direction. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum TextDirection { /** * The text is oriented from right to left. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ RTL, /** * The text is oriented from left to right. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ LTR, } @@ -166,31 +155,27 @@ declare namespace text { * Enumerate text segmentation strategy. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum BreakStrategy { /** * Fills the current line as much as possible without adding hyphens. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ GREEDY, /** * Optimizes layout and may add hyphens when necessary. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ HIGH_QUALITY, /** * Ensures consistent line width in a paragraph, adding hyphens if needed. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ BALANCED, } @@ -199,15 +184,13 @@ declare namespace text { * Enumerate word break strategy. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum WordBreak { /** * Default mode that break words based on language-specific conventions. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ NORMAL, @@ -216,8 +199,7 @@ declare namespace text { * This value is suitable for Asian text that contains some non-Asian text. For example, * it can be used to break consecutive English characters. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ BREAK_ALL, @@ -226,8 +208,7 @@ declare namespace text { * or other natural breakpoints to keep words intact. If no breakpoints are found, it breaks between * any two characters. For CJK text, this behaves like NORMAL. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ BREAK_WORD, @@ -235,8 +216,7 @@ declare namespace text { * Attempts to break words at the end of a line using a hyphen. If a hyphen cannot be added, * it behaves like BREAK_WORD. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ BREAK_HYPHEN, } @@ -245,16 +225,14 @@ declare namespace text { * Describes a text decoration. * @typedef Decoration * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface Decoration { /** * Type of the decoration. The default value is NONE. * @type { ?TextDecorationType } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ textDecoration?: TextDecorationType; @@ -262,8 +240,7 @@ declare namespace text { * Color of the decoration. The default value is transparent. * @type { ?common2D.Color } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ color?: common2D.Color; @@ -271,8 +248,7 @@ declare namespace text { * Style of the decoration. The default value is SOLID. * @type { ?TextDecorationStyle } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ decorationStyle?: TextDecorationStyle; @@ -281,8 +257,7 @@ declare namespace text { * The default value is 1.0. * @type { ?number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ decorationThicknessScale?: number; } @@ -291,39 +266,34 @@ declare namespace text { * Enumerates the text decoration types. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum TextDecorationType { /** * There are no text decoration. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ NONE, /** * There is a decoration line below the text. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ UNDERLINE, /** * There is a decoration line above the text. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ OVERLINE, /** * There is a decoration line through the middle of the text. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ LINE_THROUGH, } @@ -332,47 +302,41 @@ declare namespace text { * Enumerates the text decoration styles. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum TextDecorationStyle { /** * Decoration line is solid line. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ SOLID, /** * Decoration line is double line. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ DOUBLE, /** * Decoration line is dotted line. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ DOTTED, /** * Decoration line is dashed line. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ DASHED, /** * Decoration line is wavy line. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ WAVY, } @@ -381,79 +345,69 @@ declare namespace text { * Enumeration of font weight of text. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum FontWeight { /** * Thin * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ W100, /** * Extra-light * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ W200, /** * Light * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ W300, /** * Normal/Regular * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ W400, /** * Medium * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ W500, /** * Semi-bold * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ W600, /** * Bold * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ W700, /** * Extra-bold * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ W800, /** * Black * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ W900, } @@ -462,31 +416,27 @@ declare namespace text { * Enumeration of font style of text. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum FontStyle { /** * Upright font type. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ NORMAL, /** * Slant font. If no italic version is available for the current font, the oblique version will be used instead. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ ITALIC, /** * Oblique font. If no oblique version is available for the current font, the italic version will be used instead. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ OBLIQUE, } @@ -495,79 +445,69 @@ declare namespace text { * Enumeration of font width of text. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum FontWidth { /** * Ultra condensed font width. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ ULTRA_CONDENSED = 1, /** * Extra condensed font width. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ EXTRA_CONDENSED = 2, /** * Condensed font width. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ CONDENSED = 3, /** * Semi condensed font width. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ SEMI_CONDENSED = 4, /** * Normal font width. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ NORMAL = 5, /** * Semi expanded font width. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ SEMI_EXPANDED = 6, /** * Expanded font width. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ EXPANDED = 7, /** * Extra expanded font width. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ EXTRA_EXPANDED = 8, /** * Ultra expanded font width. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ ULTRA_EXPANDED = 9, } @@ -576,39 +516,34 @@ declare namespace text { * Enumerates the text height modifier patterns. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum TextHeightBehavior { /** * Allows the first line of the paragraph to rise and the last line to drop. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ ALL = 0x0, /** * Prevents the first line of a paragraph from rising. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ DISABLE_FIRST_ASCENT = 0x1, /** * Prevents the last line of a paragraph from dropping. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ DISABLE_LAST_ASCENT = 0x2, /** * Combines the effects of disabling the first line from rising and the last line from dropping. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ DISABLE_ALL = 0x1 | 0x2, } @@ -617,16 +552,14 @@ declare namespace text { * Enumeration the type of text baseline. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum TextBaseline { /** * The alphabetic baseline, typically used for Latin-based scripts where the baseline aligns * with the base of lowercase letters. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ ALPHABETIC, @@ -634,8 +567,7 @@ declare namespace text { * The ideographic baseline, commonly used for ideographic scripts such as Chinese, Japanese, and Korean, * where the baseline aligns with the center of characters. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ IDEOGRAPHIC, } @@ -645,31 +577,27 @@ declare namespace text { * EllipsisMode.START and EllipsisMode.MIDDLE take effect only when text overflows in a single line. * @enum { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum EllipsisMode { /** * Places the ellipsis in the text header. It is valid only when maxLines is set to 1 in ParagraphStyle. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ START, /** * Places the ellipsis in the middle of the text. It is valid only when maxLines is set to 1 in ParagraphStyle. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ MIDDLE, /** * Places the ellipsis at the end of the text. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ END, } @@ -678,16 +606,14 @@ declare namespace text { * Describes shadow of text. * @typedef TextShadow * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface TextShadow { /** * Color of the text shadow. The default value is black (255, 0, 0, 0). * @type { ?common2D.Color } The color of text shadow * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ color?: common2D.Color; /** @@ -695,8 +621,7 @@ declare namespace text { * The horizontal and vertical coordinates must be greater than or equal to 0. * @type { ?common2D.Point } The point of shadow * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ point?: common2D.Point; /** @@ -704,8 +629,7 @@ declare namespace text { * The value is a floating point number. The default value is 0.0px. * @type { ?number } The value about radius of blur, it type is "double" * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ blurRadius?: number; } @@ -714,16 +638,14 @@ declare namespace text { * Describes the style of a rectangle. * @typedef RectStyle * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface RectStyle { /** * Color of the rectangle. * @type { common2D.Color } The color of rect style * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ color: common2D.Color; @@ -731,8 +653,7 @@ declare namespace text { * Left top radius of the rectangle. * @type { number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ leftTopRadius: number; @@ -740,8 +661,7 @@ declare namespace text { * Right top radius of the rectangle. * @type { number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ rightTopRadius: number; @@ -749,8 +669,7 @@ declare namespace text { * Right bottom radius of the rectangle. * @type { number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ rightBottomRadius: number; @@ -758,8 +677,7 @@ declare namespace text { * Left bottom radius of the rectangle. * @type { number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ leftBottomRadius: number; } @@ -768,24 +686,21 @@ declare namespace text { * Describes font feature of text. * @typedef FontFeature * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface FontFeature { /** * String identified by the keyword in the font feature key-value pair. * @type { string } feature name * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ name: string; /** * Value in the font feature key-value pair. * @type { number } feature value * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ value: number; } @@ -794,24 +709,21 @@ declare namespace text { * Describes font variation of text. * @typedef FontVariation * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface FontVariation { /** * String identified by the keyword in the font variation key-value pair. * @type { string } variation axis * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ axis: string; /** * Value in the font variation key-value pair. * @type { number } variation value * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ value: number; } @@ -847,8 +759,7 @@ declare namespace text { * Describes text style. * @typedef TextStyle * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface TextStyle { @@ -856,8 +767,7 @@ declare namespace text { * Text decoration. By default, no decoration is used. * @type { ?Decoration } decoration for text * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ decoration?: Decoration; @@ -865,8 +775,7 @@ declare namespace text { * Text color. The default color is white. * @type { ?common2D.Color } it is uint32_t type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ color?: common2D.Color; @@ -876,8 +785,7 @@ declare namespace text { * If the weight is greater than or equal to semi-bold, it might result in a fake bold effect. * @type { ?FontWeight } it is uint32_t type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ fontWeight?: FontWeight; @@ -885,8 +793,7 @@ declare namespace text { * Font style. The default value is NORMAL. * @type { ?FontStyle } it is uint32_t type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ fontStyle?: FontStyle; @@ -894,8 +801,7 @@ declare namespace text { * Text baseline type. The default value is ALPHABETIC. * @type { ?TextBaseline } it is uint32_t type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ baseline?: TextBaseline; @@ -903,8 +809,7 @@ declare namespace text { * Array of font families. By default, the array is empty, indicating that all system fonts are matched. * @type { ?Array } fontfamily gather * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ fontFamilies?: Array; @@ -912,8 +817,7 @@ declare namespace text { * Font size, in units of px. The value is a floating point number. The default value is 14.0. * @type { ?number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ fontSize?: number; @@ -923,8 +827,7 @@ declare namespace text { * and a negative value bring characters closer together. * @type { ?number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ letterSpacing?: number; @@ -932,8 +835,7 @@ declare namespace text { * Word spacing, in units of px. The value is a floating point number. The default value is 0.0. * @type { ?number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ wordSpacing?: number; @@ -942,8 +844,7 @@ declare namespace text { * The default value is 1.0. This parameter is valid only when heightOnly is set to true. * @type { ?number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ heightScale?: number; @@ -953,8 +854,7 @@ declare namespace text { * The value true means that half leading is enabled, and false means the opposite. The default value is false. * @type { ?boolean } it is boolean type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ halfLeading?: boolean; @@ -964,8 +864,7 @@ declare namespace text { * and false means that the height is set based on the line height and line spacing. The default value is false. * @type { ?boolean } it is boolean type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ heightOnly?: boolean; @@ -973,8 +872,7 @@ declare namespace text { * Ellipsis content, which will be used to replace the extra content. * @type { ?string } it is u16string type data. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ ellipsis?: string; @@ -982,8 +880,7 @@ declare namespace text { * Ellipsis type. The default value is END, indicating that the ellipsis is at the end of a line. * @type { ?EllipsisMode } Ellipsis mode. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ ellipsisMode?: EllipsisMode; @@ -992,8 +889,7 @@ declare namespace text { * and 'zh-Hant' indicates Traditional Chinese. For details, see ISO 639-1. The default value is an empty string. * @type { ?string } it is string type data. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ locale?: string; @@ -1001,8 +897,7 @@ declare namespace text { * Shift of the baseline. The value is a floating point number. The default value is 0.0px. * @type { ?number } it is double type data. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ baselineShift?: number; @@ -1010,8 +905,7 @@ declare namespace text { * Text Style available font features. * @type { ?Array } A collection of font features. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ fontFeatures?: Array; @@ -1019,8 +913,7 @@ declare namespace text { * Text shadows of text. * @type { ?Array } textShadow gather. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ textShadows?: Array; @@ -1028,8 +921,7 @@ declare namespace text { * Rectangle style of text. * @type { ?RectStyle } rect style for text. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ backgroundRect?: RectStyle; @@ -1037,8 +929,7 @@ declare namespace text { * Text Style available font variations. * @type { ?Array } A collection of font variations. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ fontVariations?: Array; @@ -1054,16 +945,14 @@ declare namespace text { /** * Implements a collection of fonts. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ class FontCollection { /** * Get global FontCollection instance of the application. * @returns { FontCollection } The FontCollection object. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ static getGlobalInstance(): FontCollection; @@ -1075,8 +964,7 @@ declare namespace text { * @param { string | Resource } path - Path of the font file to import. The value must be * **file://**absolute path of the font file or **rawfile/**directory or file name. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ loadFontSync(name: string, path: string | Resource): void; @@ -1091,8 +979,7 @@ declare namespace text { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ loadFont(name: string, path: string | Resource): Promise; @@ -1142,16 +1029,14 @@ declare namespace text { * and other properties related to the line height when drawing texts. The strut style is disabled by default. * @typedef StrutStyle * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface StrutStyle { /** * List of font families. By default, the list corresponds to the system's default fonts. * @type { ?Array } fontfamily gather * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ fontFamilies?: Array; @@ -1159,8 +1044,7 @@ declare namespace text { * Font style. The default value is NORMAL. * @type { ?FontStyle } it is uint32_t type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ fontStyle?: FontStyle; @@ -1168,8 +1052,7 @@ declare namespace text { * Font width. The default value is NORMAL. * @type { ?FontWidth } it is uint32_t type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ fontWidth?: FontWidth; @@ -1179,8 +1062,7 @@ declare namespace text { * If the weight is greater than or equal to W600, it might result in a fake bold effect. * @type { ?FontWeight } it is uint32_t type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ fontWeight?: FontWeight; @@ -1188,8 +1070,7 @@ declare namespace text { * Font size, in units of px. The value is a floating point number. The default value is 14.0. * @type { ?number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ fontSize?: number; @@ -1197,8 +1078,7 @@ declare namespace text { * Scale factor of the line height. The value is a floating point number. The default value is 1.0. * @type { ?number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ height?: number; @@ -1206,8 +1086,7 @@ declare namespace text { * Custom leading to be applied to the strut. The value is a floating point number. The default value is -1.0. * @type { ?number } it is double type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ leading?: number; @@ -1216,8 +1095,7 @@ declare namespace text { * for all lines, and false means the opposite. The default value is false. * @type { ?boolean } it is boolean type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ forceHeight?: boolean; @@ -1226,8 +1104,7 @@ declare namespace text { * The value true means to enable the strut style, and false means the opposite. The default value is false. * @type { ?boolean } it is boolean type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enabled?: boolean; @@ -1236,8 +1113,7 @@ declare namespace text { * The default value is false. * @type { ?boolean } it is boolean type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ heightOverride?: boolean; @@ -1247,8 +1123,7 @@ declare namespace text { * The value true means that half leading is enabled, and false means the opposite. The default value is false. * @type { ?boolean } it is boolean type data * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ halfLeading?: boolean; } @@ -1257,16 +1132,14 @@ declare namespace text { * Determines the configuration used by ParagraphBuilder to position lines within a Paragraph of text. * @typedef ParagraphStyle * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface ParagraphStyle { /** * Text style applied to the paragraph. The default value is the initial text style. * @type { ?TextStyle } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ textStyle?: TextStyle; @@ -1274,8 +1147,7 @@ declare namespace text { * Text direction. The default value is LTR. * @type { ?TextDirection } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ textDirection?: TextDirection; @@ -1283,8 +1155,7 @@ declare namespace text { * Text alignment mode. The default value is START. This parameter is invalid when the tab parameter is configured. * @type { ?TextAlign } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ align?: TextAlign; @@ -1292,8 +1163,7 @@ declare namespace text { * Word break type. The default value is BREAK_WORD. * @type { ?WordBreak } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ wordBreak?: WordBreak; @@ -1301,8 +1171,7 @@ declare namespace text { * Maximum number of lines. The value is an integer. The default value is 1e9. * @type { ?number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ maxLines?: number; @@ -1310,8 +1179,7 @@ declare namespace text { * Text break strategy. The default value is GREEDY. * @type { ?BreakStrategy } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ breakStrategy?: BreakStrategy; @@ -1319,8 +1187,7 @@ declare namespace text { * Strut style. The default value is the initial StrutStyle object. * @type { ?StrutStyle } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ strutStyle?: StrutStyle; @@ -1328,8 +1195,7 @@ declare namespace text { * Text height modifier pattern. The default value is ALL. * @type { ?TextHeightBehavior } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ textHeightBehavior?: TextHeightBehavior; @@ -1339,8 +1205,7 @@ declare namespace text { * the ellipsis parameter in TextStyle. * @type { ?TextTab } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ tab?: TextTab; @@ -1642,16 +1507,14 @@ declare namespace text { * Before calling any of the following APIs, you must use build() of the ParagraphBuilder class to * create a Paragraph object. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ class Paragraph { /** * Performs layout and calculates the positions of all glyphs. * @param { number } width - Maximum width of a single line, in units of px. The value is a floating point number. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ layoutSync(width: number): void; @@ -1672,8 +1535,7 @@ declare namespace text { * @param { number } x - X coordinate of the upper left corner. The value is a floating point number. * @param { number } y - Y coordinate of the upper left corner. The value is a floating point number. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ paint(canvas: drawing.Canvas, x: number, y: number): void; @@ -1687,8 +1549,7 @@ declare namespace text { * @param { number } vOffset - Vertical offset along the path direction. A positive number indicates a position * on the left side of the path, and a negative number indicates a position on the right side of the path. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ paintOnPath(canvas: drawing.Canvas, path: drawing.Path, hOffset: number, vOffset: number): void; @@ -1712,8 +1573,7 @@ declare namespace text { * Obtains the longest line in the text. * @returns { number } Longest line, in units of px. The value is a floating point number. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ getLongestLine(): number; @@ -1858,8 +1718,7 @@ declare namespace text { * Obtains an array of line measurement information. * @returns { Array } Array of line measurement information. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ getLineMetrics(): Array; @@ -1870,8 +1729,7 @@ declare namespace text { * line number is valid and the measurement information exists. If the line number is invalid or * the measurement information cannot be obtained, undefined is returned. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ getLineMetrics(lineNumber: number): LineMetrics | undefined; @@ -2078,8 +1936,7 @@ declare namespace text { /** * Builds a Paragraph containing text with the given styling information. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ class ParagraphBuilder { /** @@ -2087,8 +1944,7 @@ declare namespace text { * @param { ParagraphStyle } paragraphStyle - Paragraph style {@link ParagraphStyle} * @param { FontCollection } fontCollection - Font collection {@link FontCollection} * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ constructor(paragraphStyle: ParagraphStyle, fontCollection: FontCollection); @@ -2100,16 +1956,14 @@ declare namespace text { * font size, color, font weight, word spacing, line spacing, decoration (such as underline and strikethrough), * and text shadow. {@link TextStyle} * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ pushStyle(textStyle: TextStyle): void; /** * Restores the previous text style. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ popStyle(): void; @@ -2118,8 +1972,7 @@ declare namespace text { * @param { string } text - Exact text string inserted into the paragraph. If an invalid Unicode character is * provided, it is displayed as �. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ addText(text: string): void; @@ -2136,8 +1989,7 @@ declare namespace text { * Creates a paragraph object that can be used for subsequent layout and rendering. * @returns { Paragraph } Paragraph object that can be used for subsequent rendering. * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ build(): Paragraph; @@ -2500,16 +2352,14 @@ declare namespace text { * Describes the layout information and metrics for a continuous piece of text (a run) in a line of text. * @typedef RunMetrics * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface RunMetrics { /** * The metrics of an Font. * @type { TextStyle } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ textStyle: TextStyle; @@ -2517,8 +2367,7 @@ declare namespace text { * Describes text style. * @type { drawing.FontMetrics } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ fontMetrics: drawing.FontMetrics; } @@ -2527,16 +2376,14 @@ declare namespace text { * Describes the measurement information of a single line of text in the text layout. * @typedef LineMetrics * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface LineMetrics { /** * Start index of the line in the text buffer. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ startIndex: number; @@ -2544,8 +2391,7 @@ declare namespace text { * End index of the line in the text buffer. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ endIndex: number; @@ -2553,8 +2399,7 @@ declare namespace text { * Ascent, that is, the distance from the baseline to the top of the character. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ ascent: number; @@ -2562,8 +2407,7 @@ declare namespace text { * Descent, that is, the distance from the baseline to the bottom of the character. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ descent: number; @@ -2571,8 +2415,7 @@ declare namespace text { * Height of the line, which is Math.round(ascent + descent). * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ height: number; @@ -2580,8 +2423,7 @@ declare namespace text { * Width of the line. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ width: number; @@ -2589,8 +2431,7 @@ declare namespace text { * Left edge of the line. The right edge is the value of left plus the value of width. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ left: number; @@ -2598,8 +2439,7 @@ declare namespace text { * Y coordinate of the baseline in the line relative to the top of the paragraph. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ baseline: number; @@ -2607,8 +2447,7 @@ declare namespace text { * Line number, starting from 0. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ lineNumber: number; @@ -2616,8 +2455,7 @@ declare namespace text { * Height from the top to the current line. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ topHeight: number; @@ -2627,8 +2465,7 @@ declare namespace text { * are before layout and are the base values we calculate from. * @type { Map } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ runMetrics: Map; } @@ -2678,8 +2515,7 @@ declare namespace text { * Implements a paragraph-style text tab, which stores the alignment mode and position. * @typedef TextTab * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ interface TextTab { /** @@ -2688,8 +2524,7 @@ declare namespace text { * alignment. * @type { TextAlign } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ alignment: TextAlign; @@ -2698,8 +2533,7 @@ declare namespace text { * The minimum value is 1.0. When the value is less than 1.0, the tab character is replaced with a space. * @type { number } * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ location: number; } diff --git a/api/@ohos.hiSysEvent.d.ts b/api/@ohos.hiSysEvent.d.ts index 555be14da8..68feb315d7 100644 --- a/api/@ohos.hiSysEvent.d.ts +++ b/api/@ohos.hiSysEvent.d.ts @@ -201,8 +201,7 @@ declare namespace hiSysEvent { * @enum {number} * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ enum RuleType { /** @@ -210,8 +209,7 @@ declare namespace hiSysEvent { * * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ WHOLE_WORD = 1, @@ -220,8 +218,7 @@ declare namespace hiSysEvent { * * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ PREFIX = 2, @@ -230,8 +227,7 @@ declare namespace hiSysEvent { * * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ REGULAR = 3 } @@ -242,8 +238,7 @@ declare namespace hiSysEvent { * @interface WatchRule * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ interface WatchRule { /** @@ -252,8 +247,7 @@ declare namespace hiSysEvent { * @type { string } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ domain: string; @@ -263,8 +257,7 @@ declare namespace hiSysEvent { * @type { string } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ name: string; @@ -282,8 +275,7 @@ declare namespace hiSysEvent { * @type { ?string } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ tag?: string; @@ -293,8 +285,7 @@ declare namespace hiSysEvent { * @type { RuleType } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ ruleType: RuleType; } @@ -305,8 +296,7 @@ declare namespace hiSysEvent { * @interface Watcher * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ interface Watcher { /** @@ -315,8 +305,7 @@ declare namespace hiSysEvent { * @type { WatchRule[] } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ rules: WatchRule[]; @@ -326,8 +315,7 @@ declare namespace hiSysEvent { * @type { function } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ onEvent: (info: SysEventInfo) => void; @@ -337,8 +325,7 @@ declare namespace hiSysEvent { * @type { function } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ onServiceDied: () => void; } @@ -349,8 +336,7 @@ declare namespace hiSysEvent { * @interface QueryArg * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ interface QueryArg { /** @@ -359,8 +345,7 @@ declare namespace hiSysEvent { * @type { number } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ beginTime: number; @@ -370,8 +355,7 @@ declare namespace hiSysEvent { * @type { number } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ endTime: number; @@ -381,8 +365,7 @@ declare namespace hiSysEvent { * @type { number } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ maxEvents: number; @@ -392,8 +375,7 @@ declare namespace hiSysEvent { * @type { ?number } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ fromSeq?: number; @@ -403,8 +385,7 @@ declare namespace hiSysEvent { * @type { ?number } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ toSeq?: number; } @@ -415,8 +396,7 @@ declare namespace hiSysEvent { * @interface QueryRule * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ interface QueryRule { /** @@ -425,8 +405,7 @@ declare namespace hiSysEvent { * @type { string } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ domain: string; @@ -436,8 +415,7 @@ declare namespace hiSysEvent { * @type { string[] } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ names: string[]; @@ -447,8 +425,7 @@ declare namespace hiSysEvent { * @type { ?string } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ condition?: string; } @@ -459,8 +436,7 @@ declare namespace hiSysEvent { * @interface Querier * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ interface Querier { /** @@ -469,8 +445,7 @@ declare namespace hiSysEvent { * @type { function } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ onQuery: (infos: SysEventInfo[]) => void; @@ -480,8 +455,7 @@ declare namespace hiSysEvent { * @type { function } * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ onComplete: (reason: number, total: number) => void; } @@ -501,8 +475,7 @@ declare namespace hiSysEvent { * @throws {BusinessError} 11200102 - The number of watch rules exceeds the limit. * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function addWatcher(watcher: Watcher): void; @@ -520,8 +493,7 @@ declare namespace hiSysEvent { * @throws {BusinessError} 11200201 - The watcher does not exist. * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function removeWatcher(watcher: Watcher): void; @@ -544,8 +516,7 @@ declare namespace hiSysEvent { * @throws {BusinessError} 11200304 - The query frequency exceeds the limit. * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function query(queryArg: QueryArg, rules: QueryRule[], querier: Querier): void; @@ -567,8 +538,7 @@ declare namespace hiSysEvent { * @throws {BusinessError} 11200304 – The query frequency exceeds the limit. * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ function exportSysEvents(queryArg: QueryArg, rules: QueryRule[]): number; @@ -588,8 +558,7 @@ declare namespace hiSysEvent { * @throws {BusinessError} 11200302 - Invalid query rule. * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ function subscribe(rules: QueryRule[]): number; @@ -606,8 +575,7 @@ declare namespace hiSysEvent { * @throws {BusinessError} 11200305 – Unsubscription failed. * @syscap SystemCapability.HiviewDFX.HiSysEvent * @systemapi hide for inner use - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ function unsubscribe(): void; } diff --git a/api/@ohos.hichecker.d.ts b/api/@ohos.hichecker.d.ts index ca1a68ee5e..22e2a89fd3 100644 --- a/api/@ohos.hichecker.d.ts +++ b/api/@ohos.hichecker.d.ts @@ -23,8 +23,7 @@ * * @namespace hichecker * @syscap SystemCapability.HiviewDFX.HiChecker - * @since arkts {'1.1':'8','1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ declare namespace hichecker { /** @@ -32,50 +31,45 @@ declare namespace hichecker { * * @constant * @syscap SystemCapability.HiviewDFX.HiChecker - * @since arkts {'1.1':'8','1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ - const RULE_CAUTION_PRINT_LOG = 9223372036854775808n; // 1 << 63 + const RULE_CAUTION_PRINT_LOG: 9223372036854775808n; // 1 << 63 /** * The caution rule trigger crash. * * @constant * @syscap SystemCapability.HiviewDFX.HiChecker - * @since arkts {'1.1':'8','1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ - const RULE_CAUTION_TRIGGER_CRASH = 4611686018427387904n; // 1 << 62 + const RULE_CAUTION_TRIGGER_CRASH: 4611686018427387904n; // 1 << 62 /** * The thread rule check slow process. * * @constant * @syscap SystemCapability.HiviewDFX.HiChecker - * @since arkts {'1.1':'8','1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ - const RULE_THREAD_CHECK_SLOW_PROCESS = 1n; + const RULE_THREAD_CHECK_SLOW_PROCESS: 1n; /** * The process rule check ability connection leak. * * @constant * @syscap SystemCapability.HiviewDFX.HiChecker - * @since arkts {'1.1':'8','1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ - const RULE_CHECK_ABILITY_CONNECTION_LEAK = 8589934592n; // 1 << 33 + const RULE_CHECK_ABILITY_CONNECTION_LEAK: 8589934592n; // 1 << 33 /** * The process rule check ability Arkui performance * * @constant * @syscap SystemCapability.HiviewDFX.HiChecker - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - const RULE_CHECK_ARKUI_PERFORMANCE = 17179869184n; // 1 << 34 + const RULE_CHECK_ARKUI_PERFORMANCE: 17179869184n; // 1 << 34 /** * add one or more rule. @@ -104,8 +98,7 @@ declare namespace hichecker { * * @returns { bigint } all added thread rule and process rule. * @syscap SystemCapability.HiviewDFX.HiChecker - * @since arkts {'1.1':'8','1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ function getRule(): bigint; @@ -127,8 +120,7 @@ declare namespace hichecker { * @param { bigint } rule * @throws { BusinessError } 401 - the parameter check failed, only one bigint type parameter is needed * @syscap SystemCapability.HiviewDFX.HiChecker - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function addCheckRule(rule: bigint): void; @@ -138,8 +130,7 @@ declare namespace hichecker { * @param { bigint } rule * @throws { BusinessError } 401 - the parameter check failed, only one bigint type parameter is needed * @syscap SystemCapability.HiviewDFX.HiChecker - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function removeCheckRule(rule: bigint): void; @@ -150,8 +141,7 @@ declare namespace hichecker { * @returns { boolean } the result of whether the query rule is added. * @throws { BusinessError } 401 - the parameter check failed, only one bigint type parameter is needed * @syscap SystemCapability.HiviewDFX.HiChecker - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function containsCheckRule(rule: bigint): boolean; } diff --git a/api/@ohos.hidebug.d.ts b/api/@ohos.hidebug.d.ts index 97c4637081..604bd743cf 100644 --- a/api/@ohos.hidebug.d.ts +++ b/api/@ohos.hidebug.d.ts @@ -37,8 +37,7 @@ * @namespace hidebug * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ declare namespace hidebug { /** @@ -47,8 +46,7 @@ declare namespace hidebug { * * @returns { bigint } Returns the total number of bytes occupied by the total space. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'8','1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ function getNativeHeapSize(): bigint; @@ -57,8 +55,7 @@ declare namespace hidebug { * a process, which is measured by the memory allocator. * @returns { bigint } Returns the total number of bytes occupied by the total allocated space. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'8','1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ function getNativeHeapAllocatedSize(): bigint; @@ -68,8 +65,7 @@ declare namespace hidebug { * * @returns { bigint } Returns the size of the memory occupied by the free normal blocks held by the process, in bytes. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'8','1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ function getNativeHeapFreeSize(): bigint; @@ -79,8 +75,7 @@ declare namespace hidebug { * * @returns { bigint } Returns the virtual set size used by the application process, in KB. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ function getVss(): bigint; @@ -90,8 +85,7 @@ declare namespace hidebug { * * @returns { bigint } Returns the size of the physical memory actually used by the application process, in KB. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'8','1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ function getPss(): bigint; @@ -101,8 +95,7 @@ declare namespace hidebug { * * @returns { bigint } Returns the size of the shared dirty memory of the process, in KB. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'8','1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ function getSharedDirty(): bigint; @@ -112,8 +105,7 @@ declare namespace hidebug { * * @returns { bigint } Returns the size of the private dirty memory of the process, in KB. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getPrivateDirty(): bigint; @@ -122,8 +114,7 @@ declare namespace hidebug { * * @returns { number } Returns the CPU usage of the process. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getCpuUsage(): number; @@ -178,8 +169,7 @@ declare namespace hidebug { * directory of the application based on the specified file name. * @throws {BusinessError} 401 - the parameter check failed, Parameter type error * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function startJsCpuProfiling(filename: string): void; @@ -189,8 +179,7 @@ declare namespace hidebug { * methods repeatedly. Otherwise, an exception may occur. It takes effect only when the CPU profiler is turned on * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function stopJsCpuProfiling(): void; @@ -221,8 +210,7 @@ declare namespace hidebug { * 2.the args parameter is not string array. * @throws {BusinessError} 11400101 - ServiceId invalid. The system ability does not exist. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getServiceDump(serviceid: number, fd: number, args: Array): void; @@ -232,8 +220,7 @@ declare namespace hidebug { * @returns { number } Returns the CPU usage of the system. * @throws { BusinessError } 11400104 - The status of the system CPU usage is abnormal. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function getSystemCpuUsage(): number; @@ -242,8 +229,7 @@ declare namespace hidebug { * * @interface ThreadCpuUsage * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface ThreadCpuUsage { /** @@ -251,8 +237,7 @@ declare namespace hidebug { * * @type { number } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ threadId: number; /** @@ -260,8 +245,7 @@ declare namespace hidebug { * * @type { number } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ cpuUsage: number; } @@ -271,8 +255,7 @@ declare namespace hidebug { * * @returns { ThreadCpuUsage[] } Returns the CPU usage of all threads of the current application process. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function getAppThreadCpuUsage(): ThreadCpuUsage[]; @@ -281,8 +264,7 @@ declare namespace hidebug { * * @interface SystemMemInfo * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface SystemMemInfo { /** @@ -291,8 +273,7 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ totalMem: bigint; /** @@ -301,8 +282,7 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ freeMem: bigint; /** @@ -311,8 +291,7 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ availableMem: bigint; } @@ -322,8 +301,7 @@ declare namespace hidebug { * * @returns { SystemMemInfo } Returns the system memory information. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function getSystemMemInfo(): SystemMemInfo; @@ -332,8 +310,7 @@ declare namespace hidebug { * * @interface NativeMemInfo * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface NativeMemInfo { /** @@ -343,8 +320,7 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ pss: bigint; /** @@ -354,8 +330,7 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ vss: bigint; /** @@ -364,8 +339,7 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ rss: bigint; /** @@ -374,8 +348,7 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ sharedDirty: bigint; /** @@ -384,8 +357,7 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ privateDirty: bigint; /** @@ -394,8 +366,7 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ sharedClean: bigint; /** @@ -404,8 +375,7 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ privateClean: bigint; } @@ -416,8 +386,7 @@ declare namespace hidebug { * * @returns { NativeMemInfo } Returns the memory information of the application process. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function getAppNativeMemInfo(): NativeMemInfo; @@ -426,8 +395,7 @@ declare namespace hidebug { * * @interface MemoryLimit * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface MemoryLimit { /** @@ -435,8 +403,7 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ rssLimit: bigint; /** @@ -444,8 +411,7 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ vssLimit: bigint; /** @@ -453,8 +419,7 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ vmHeapLimit: bigint; /** @@ -462,8 +427,7 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ vmTotalHeapSize: bigint; } @@ -473,8 +437,7 @@ declare namespace hidebug { * * @returns { MemoryLimit } Returns the memory limit of the application process. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function getAppMemoryLimit(): MemoryLimit; @@ -483,8 +446,7 @@ declare namespace hidebug { * * @interface VMMemoryInfo * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface VMMemoryInfo { /** @@ -492,8 +454,7 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ totalHeap: bigint; /** @@ -501,8 +462,7 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ heapUsed: bigint; /** @@ -510,8 +470,7 @@ declare namespace hidebug { * * @type { bigint } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ allArraySize: bigint; } @@ -521,8 +480,7 @@ declare namespace hidebug { * * @returns { VMMemoryInfo } Returns the VM memory information. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function getAppVMMemoryInfo(): VMMemoryInfo; @@ -531,24 +489,21 @@ declare namespace hidebug { * * @enum { number } * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum TraceFlag { /** * The main thread of the application. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ MAIN_THREAD = 1, /** * All threads of the application. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ ALL_THREADS = 2 } @@ -558,264 +513,231 @@ declare namespace hidebug { * * @namespace tags * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ namespace tags { /** * Ability Manager tag. The corresponding HiTrace command is tagName:ability. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const ABILITY_MANAGER: number; /** * ArkUI development framework. The corresponding HiTrace command is tagName:ace. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const ARKUI: number; /** * JSVM VM. The corresponding HiTrace command is tagName:ark. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const ARK: number; /** * Bluetooth. The corresponding HiTrace command is tagName:bluetooth. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const BLUETOOTH: number; /** * Common library subsystem. The corresponding HiTrace command is tagName:commonlibrary. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const COMMON_LIBRARY: number; /** * Distributed hardware device management. The corresponding HiTrace command is tagName:devicemanager. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const DISTRIBUTED_HARDWARE_DEVICE_MANAGER: number; /** * Distributed audio. The corresponding HiTrace command is tagName:daudio. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const DISTRIBUTED_AUDIO: number; /** * Distributed camera. The corresponding HiTrace command is tagName:dcamera. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const DISTRIBUTED_CAMERA: number; /** * Distributed data management. The corresponding HiTrace command is tagName:distributeddatamgr. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const DISTRIBUTED_DATA: number; /** * Distributed hardware framework. The corresponding HiTrace command is tagName:dhfwk. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const DISTRIBUTED_HARDWARE_FRAMEWORK: number; /** * Distributed input. The corresponding HiTrace command is tagName:dinput. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const DISTRIBUTED_INPUT: number; /** * Distributed screen. The corresponding HiTrace command is tagName:dscreen. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const DISTRIBUTED_SCREEN: number; /** * Distributed scheduler. The corresponding HiTrace command is tagName:dsched. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const DISTRIBUTED_SCHEDULER: number; /** * FFRT task. The corresponding HiTrace command is tagName:ffrt. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const FFRT: number; /** * File management system. The corresponding HiTrace command is tagName:filemanagement. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const FILE_MANAGEMENT: number; /** * Global resource management. The corresponding HiTrace command is tagName:gresource. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const GLOBAL_RESOURCE_MANAGER: number; /** * Graphics module. The corresponding HiTrace command is tagName:graphic. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const GRAPHICS: number; /** * HDF subsystem. The corresponding HiTrace command is tagName:hdf. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const HDF: number; /** * MISC module. The corresponding HiTrace command is tagName:misc. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const MISC: number; /** * Multi-modal input module. The corresponding HiTrace command is tagName:multimodalinput. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const MULTIMODAL_INPUT: number; /** * Network. The corresponding HiTrace command is tagName:net. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const NET: number; /** * Notification module. The corresponding HiTrace command is tagName:notification. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const NOTIFICATION: number; /** * Nweb. The corresponding HiTrace command is tagName:nweb. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const NWEB: number; /** * OHOS. The corresponding HiTrace command is tagName:ohos. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const OHOS: number; /** * Power management. The corresponding HiTrace command is tagName:power. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const POWER_MANAGER: number; /** * RPC. The corresponding HiTrace command is tagName:rpc. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const RPC: number; /** * System capability management. The corresponding HiTrace command is tagName:samgr. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const SAMGR: number; /** * Window management. The corresponding HiTrace command is tagName:window. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const WINDOW_MANAGER: number; /** * Audio module. The corresponding HiTrace command is tagName:zaudio. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const AUDIO: number; /** * Camera module. The corresponding HiTrace command is tagName:zcamera. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const CAMERA: number; /** * Image module. The corresponding HiTrace command is tagName:zimage. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const IMAGE: number; /** * Media module. The corresponding HiTrace command is tagName:zmedia. * * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const MEDIA: number; } @@ -838,8 +760,7 @@ declare namespace hidebug { * @throws { BusinessError } 11400103 - No write permission on the file. * @throws { BusinessError } 11400104 - Abnormal trace status. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function startAppTraceCapture(tags: number[], flag: TraceFlag, limitSize: number): string; @@ -850,8 +771,7 @@ declare namespace hidebug { * @throws { BusinessError } 11400104 - The status of the trace is abnormal. * @throws { BusinessError } 11400105 - No capture trace running. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function stopAppTraceCapture(): void; @@ -861,8 +781,7 @@ declare namespace hidebug { * * @typedef { Record } GcStats * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ type GcStats = Record; @@ -871,8 +790,7 @@ declare namespace hidebug { * * @returns { GcStats } Returns the system GC statistics. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function getVMRuntimeStats(): GcStats; @@ -885,8 +803,7 @@ declare namespace hidebug { * 1. Invalid parameter, a string parameter required. * 2. Invalid parameter, unknown property. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function getVMRuntimeStat(item: string): number; @@ -920,8 +837,7 @@ declare namespace hidebug { * * @returns { boolean } true if the application is in the debugging state. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function isDebugState(): boolean; @@ -932,8 +848,7 @@ declare namespace hidebug { * @throws { BusinessError } 11400104 - Failed to get the application memory due to a remote exception. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug * @atomicservice - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ function getGraphicsMemory(): Promise; @@ -944,8 +859,7 @@ declare namespace hidebug { * @throws { BusinessError } 11400104 - Failed to get the application memory due to a remote exception. * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug * @atomicservice - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ function getGraphicsMemorySync(): number; diff --git a/api/@ohos.hilog.d.ts b/api/@ohos.hilog.d.ts index 3f72eb2136..88d6fe7cc0 100644 --- a/api/@ohos.hilog.d.ts +++ b/api/@ohos.hilog.d.ts @@ -20,20 +20,20 @@ */ /** - * Provides interfaces to generate system logs. - * - * @namespace hilog - * @syscap SystemCapability.HiviewDFX.HiLog - * @since 7 - */ +* Provides interfaces to generate system logs. +* +* @namespace hilog +* @syscap SystemCapability.HiviewDFX.HiLog +* @since 7 +*/ /** - * Provides interfaces to generate system logs. - * - * @namespace hilog - * @syscap SystemCapability.HiviewDFX.HiLog - * @crossplatform - * @since 10 - */ +* Provides interfaces to generate system logs. +* +* @namespace hilog +* @syscap SystemCapability.HiviewDFX.HiLog +* @crossplatform +* @since 10 +*/ /** * Provides interfaces to generate system logs. * @@ -86,14 +86,13 @@ declare namespace hilog { * Outputs debug-level logs. * * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF - * if the value exceeds the range, logs cannot be printed. * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. * @param { string } format Indicates the log format string. * @param { (Object | undefined | null)[] }args Indicates the log parameters. * @syscap SystemCapability.HiviewDFX.HiLog * @crossplatform * @atomicservice - * @since 20 + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ function debug(domain: number, tag: string, format: string, ...args: (Object | undefined | null)[]): void; @@ -138,14 +137,13 @@ declare namespace hilog { * Outputs info-level logs. * * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF - * if the value exceeds the range, logs cannot be printed. * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. * @param { string } format Indicates the log format string. * @param { (Object | undefined | null)[] }args Indicates the log parameters. * @syscap SystemCapability.HiviewDFX.HiLog * @crossplatform * @atomicservice - * @since 20 + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ function info(domain: number, tag: string, format: string, ...args: (Object | undefined | null)[]): void; @@ -190,14 +188,13 @@ declare namespace hilog { * Outputs warning-level logs. * * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF - * if the value exceeds the range, logs cannot be printed. * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. * @param { string } format Indicates the log format string. * @param { (Object | undefined | null)[] }args Indicates the log parameters. * @syscap SystemCapability.HiviewDFX.HiLog * @crossplatform * @atomicservice - * @since 20 + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ function warn(domain: number, tag: string, format: string, ...args: (Object | undefined | null)[]): void; @@ -242,14 +239,13 @@ declare namespace hilog { * Outputs error-level logs. * * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF - * if the value exceeds the range, logs cannot be printed. * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. * @param { string } format Indicates the log format string. * @param { (Object | undefined | null)[] }args Indicates the log parameters. * @syscap SystemCapability.HiviewDFX.HiLog * @crossplatform * @atomicservice - * @since 20 + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ function error(domain: number, tag: string, format: string, ...args: (Object | undefined | null)[]): void; @@ -294,14 +290,13 @@ declare namespace hilog { * Outputs fatal-level logs. * * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF - * if the value exceeds the range, logs cannot be printed. * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. * @param { string } format Indicates the log format string. * @param { (Object | undefined | null)[] }args Indicates the log parameters. * @syscap SystemCapability.HiviewDFX.HiLog * @crossplatform * @atomicservice - * @since 20 + * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 */ function fatal(domain: number, tag: string, format: string, ...args: (Object | undefined | null)[]): void; @@ -338,8 +333,7 @@ declare namespace hilog { * @param { LogLevel } level log level * @syscap SystemCapability.HiviewDFX.HiLog * @atomicservice - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ function setMinLogLevel(level: LogLevel): void; diff --git a/api/@ohos.hiviewdfx.hiAppEvent.d.ts b/api/@ohos.hiviewdfx.hiAppEvent.d.ts index 32b8a5a7b1..6ef79c5df6 100644 --- a/api/@ohos.hiviewdfx.hiAppEvent.d.ts +++ b/api/@ohos.hiviewdfx.hiAppEvent.d.ts @@ -38,8 +38,7 @@ import type { AsyncCallback } from './@ohos.base'; * @namespace hiAppEvent * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Provides the event logging function for applications to log the fault, statistical, security, @@ -67,8 +66,7 @@ declare namespace hiAppEvent { * @enum { number } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Enumerates event types. @@ -92,8 +90,7 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Fault event. @@ -117,8 +114,7 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Statistic event. @@ -142,8 +138,7 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Security event. @@ -167,8 +162,7 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Behavior event. @@ -188,8 +182,7 @@ declare namespace hiAppEvent { * @namespace domain * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Provides domain name constants. @@ -206,8 +199,7 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * System domain. @@ -237,8 +229,7 @@ declare namespace hiAppEvent { * @namespace event * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Provides event name constants, including system event name constants and application event name constants. @@ -263,8 +254,7 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ const USER_LOGIN: string; @@ -279,8 +269,7 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ const USER_LOGOUT: string; @@ -295,8 +284,7 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ const DISTRIBUTED_SERVICE_START: string; @@ -305,8 +293,7 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Application crash event. This is a system event name constant. @@ -323,8 +310,7 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ const APP_FREEZE: string; @@ -333,8 +319,7 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const APP_LAUNCH: string; @@ -343,8 +328,7 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const SCROLL_JANK: string; @@ -353,8 +337,7 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const CPU_USAGE_HIGH: string; @@ -363,8 +346,7 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const BATTERY_USAGE: string; @@ -373,8 +355,7 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const RESOURCE_OVERLIMIT: string; @@ -383,8 +364,7 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const ADDRESS_SANITIZER: string; @@ -393,8 +373,7 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ const MAIN_THREAD_JANK: string; @@ -422,8 +401,7 @@ declare namespace hiAppEvent { * @namespace param * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Provides parameter name constants. @@ -446,8 +424,7 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Custom user ID. @@ -470,8 +447,7 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Distributed service name. @@ -494,8 +470,7 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Distributed service instance ID. @@ -528,8 +503,7 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Configures the application event logging function, such as setting the logging switch and directory storage quota. @@ -559,8 +533,7 @@ declare namespace hiAppEvent { * @interface ConfigOption * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Provides configuration options for application event logging. @@ -589,8 +562,7 @@ declare namespace hiAppEvent { * @type { ?boolean } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Whether to enable the event logging function. The default value is false. @@ -636,8 +608,7 @@ declare namespace hiAppEvent { * @type { ?string } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ maxStorage?: string; } @@ -655,8 +626,7 @@ declare namespace hiAppEvent { * @interface AppEventInfo * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Defines parameters of the event information. @@ -684,8 +654,7 @@ declare namespace hiAppEvent { * @type { string } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Event domain. The value is a string of up to 32 characters, including digits (0 to 9), letters (a to z), and @@ -717,8 +686,7 @@ declare namespace hiAppEvent { * @type { string } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Event name. The value is string that contains a maximum of 48 characters, including digits (0 to 9), letters @@ -747,8 +715,7 @@ declare namespace hiAppEvent { * @type { EventType } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Event type. @@ -801,8 +768,7 @@ declare namespace hiAppEvent { * @type { object } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Event parameter object, which consists of a parameter name and a parameter value. In system events, the fields @@ -872,8 +838,7 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Writes events of the AppEventInfo type. This API uses a promise to return the result. The event object written by @@ -944,8 +909,7 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Writes events of the AppEventInfo type. This API uses an asynchronous callback to return the result. The event @@ -980,8 +944,7 @@ declare namespace hiAppEvent { * @typedef {number | string | boolean | Array} * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Type of a custom event parameter value. @@ -1019,8 +982,7 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Sets custom event parameters. This API uses a promise to return the result. During the same lifecycle, system @@ -1069,8 +1031,7 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ function setEventConfig(name: string, config: Record): Promise; @@ -1089,8 +1050,7 @@ declare namespace hiAppEvent { * @interface AppEventPackage * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Defines parameters of an AppEventPackage object. This API is used to obtain detail information about an event @@ -1116,8 +1076,7 @@ declare namespace hiAppEvent { * @type { number } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Event package ID, which is named from 0 in ascending order. @@ -1143,8 +1102,7 @@ declare namespace hiAppEvent { * @type { number } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Number of events in the event package. @@ -1170,8 +1128,7 @@ declare namespace hiAppEvent { * @type { number } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Event size of the event package, in bytes. @@ -1197,8 +1154,7 @@ declare namespace hiAppEvent { * @type { string[] } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Event data in the event package. @@ -1217,8 +1173,7 @@ declare namespace hiAppEvent { * @type { Array } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Event object group. @@ -1243,8 +1198,7 @@ declare namespace hiAppEvent { * * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Defines a subscription data holder for processing event information. @@ -1272,8 +1226,7 @@ declare namespace hiAppEvent { * data is displayed by default. * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Constructs an AppEventPackageHolder instance. You can call addWatcher to add an event watcher, and then @@ -1308,8 +1261,7 @@ declare namespace hiAppEvent { * @throws { BusinessError } 11104001 - Invalid size value. * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Sets the threshold for the data size of the event package obtained each time. @@ -1337,8 +1289,7 @@ declare namespace hiAppEvent { * @throws { BusinessError } 11104001 - Invalid size value. * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Sets the number of data records of the event package obtained each time. When setRow() and setSize() are called @@ -1379,8 +1330,7 @@ declare namespace hiAppEvent { * returned. * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Obtains the subscription event. @@ -1412,8 +1362,7 @@ declare namespace hiAppEvent { * @interface TriggerCondition * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Defines the triggering condition parameters of the onTrigger callback of a Watcher. @@ -1442,8 +1391,7 @@ declare namespace hiAppEvent { * @type { ?number } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Total number of events that trigger callback. The value is a positive integer. The default value is 0, @@ -1475,8 +1423,7 @@ declare namespace hiAppEvent { * @type { ?number } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Total size of events that trigger callback. The value is a positive integer, in bytes. The default value is 0, @@ -1508,8 +1455,7 @@ declare namespace hiAppEvent { * @type { ?number } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Timeout interval for triggering callback. The value is a positive integer, in unit of 30s. The default value is @@ -1542,8 +1488,7 @@ declare namespace hiAppEvent { * @interface AppEventFilter * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Defines parameters of subscription filtering conditions of a Watcher. This API is used to set event filtering @@ -1572,8 +1517,7 @@ declare namespace hiAppEvent { * @type { string } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Event domain, which can be the system event domain (hiAppEvent.domain.OS) or the event domain of the custom @@ -1600,8 +1544,7 @@ declare namespace hiAppEvent { * @type { ?EventType[] } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Event types. If this parameter is not set, events are not filtered by default. @@ -1620,8 +1563,7 @@ declare namespace hiAppEvent { * @type { ?string[] } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Names of the events to be subscribed. If this parameter is not set, events are not filtered by default. @@ -1642,8 +1584,7 @@ declare namespace hiAppEvent { * @interface AppEventGroup * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Defines parameters of the event group returned by a subscription. This API can be used to obtain detail @@ -1662,8 +1603,7 @@ declare namespace hiAppEvent { * @type { string } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Event name. @@ -1682,8 +1622,7 @@ declare namespace hiAppEvent { * @type { Array } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Event object group. @@ -1712,8 +1651,7 @@ declare namespace hiAppEvent { * @interface Watcher * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Defines parameters for a Watcher object. This API is used to configure and manage event watchers to subscribe to @@ -1743,8 +1681,7 @@ declare namespace hiAppEvent { * @type { string } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Unique name of a watcher. The value contains a maximum of 32 characters, including digits (0 to 9), letters @@ -1774,8 +1711,7 @@ declare namespace hiAppEvent { * @type { ?TriggerCondition } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Subscription callback triggering condition. This parameter takes effect only when it is passed together with @@ -1804,8 +1740,7 @@ declare namespace hiAppEvent { * @type { ?AppEventFilter[] } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Subscription filtering condition. This parameter is passed only when subscription events need to be filtered. @@ -1840,8 +1775,7 @@ declare namespace hiAppEvent { * @type { ?function } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Subscription callback. This parameter takes effect only when it is passed together with triggerCondition. @@ -1867,8 +1801,7 @@ declare namespace hiAppEvent { * @type { ?function } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Real-time subscription callback. Only this callback function is triggered if it is passed together with @@ -1915,8 +1848,7 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Adds an event watcher. You can use the callback of the event watcher to subscribe to events. @@ -1958,8 +1890,7 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Removes an event watcher. @@ -1989,8 +1920,7 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Clears local logging data of the application. @@ -2015,8 +1945,7 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Sets a user ID, which is used for association when a Processor is configured. @@ -2046,8 +1975,7 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Obtains the value set through setUserId. @@ -2077,8 +2005,7 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Sets a user property, which is used for association when a Processor is configured. @@ -2108,8 +2035,7 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Obtains the value set through setUserProperty. @@ -2133,8 +2059,7 @@ declare namespace hiAppEvent { * @interface AppEventReportConfig * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ interface AppEventReportConfig { /** @@ -2145,8 +2070,7 @@ declare namespace hiAppEvent { * @type { ?string } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ domain?: string; @@ -2158,8 +2082,7 @@ declare namespace hiAppEvent { * @type { ?string } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ name?: string; @@ -2170,8 +2093,7 @@ declare namespace hiAppEvent { * @type { ?boolean } * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ isRealTime?: boolean; } @@ -2407,8 +2329,7 @@ declare namespace hiAppEvent { * @static * @syscap SystemCapability.HiviewDFX.HiAppEvent * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ function removeProcessor(id: number): void; } diff --git a/api/@ohos.i18n.d.ts b/api/@ohos.i18n.d.ts index 6340eb067c..268888210f 100644 --- a/api/@ohos.i18n.d.ts +++ b/api/@ohos.i18n.d.ts @@ -4207,12 +4207,12 @@ declare namespace i18n { /** * Creates a NumberFormat object for rich text display. * - * @param { intl.NumberFormat | SimpleNumberFormat } numberFormat - Indicates the number format object that used to format number. - * @param { StyledNumberFormatOptions } [ options ] - Indicates the options used to format the number. + * @param { intl.NumberFormat | SimpleNumberFormat } numberFormat - NumberFormat object. + * @param { StyledNumberFormatOptions } [ options ] - Configuration options of the NumberFormat object. + * The default value is the default text style. * @syscap SystemCapability.Global.I18n * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 * @deprecated since 20 */ constructor(numberFormat: intl.NumberFormat | SimpleNumberFormat, options?: StyledNumberFormatOptions); diff --git a/api/@ohos.inputMethod.d.ts b/api/@ohos.inputMethod.d.ts index 629fb617fe..f4e99ba13c 100644 --- a/api/@ohos.inputMethod.d.ts +++ b/api/@ohos.inputMethod.d.ts @@ -1571,13 +1571,12 @@ declare namespace inputMethod { /** * The label id of input method * - * @type { ?double } + * @type { ?number } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ - readonly labelId?: double; + readonly labelId?: number; /** * The icon of input method @@ -1592,12 +1591,12 @@ declare namespace inputMethod { /** * The icon id of input method * - * @type { ?double } + * @type { ?number } * @readonly * @syscap SystemCapability.MiscServices.InputMethodFramework * @since 9 */ - readonly iconId?: double; + readonly iconId?: number; /** * The enabledState of input method @@ -2029,38 +2028,38 @@ declare namespace inputMethod { /** * Indicates the left point of the cursor info and must be absolute coordinate of the physical screen. * - * @type { double } + * @type { number } * @syscap SystemCapability.MiscServices.InputMethodFramework * @since 10 */ - left: double; + left: number; /** * Indicates the top point of the cursor info and must be absolute coordinate of the physical screen. * - * @type { double } + * @type { number } * @syscap SystemCapability.MiscServices.InputMethodFramework * @since 10 */ - top: double; + top: number; /** * Indicates the width point of the cursor info. * - * @type { double } + * @type { number } * @syscap SystemCapability.MiscServices.InputMethodFramework * @since 10 */ - width: double; + width: number; /** * Indicates the height point of the cursor info. * - * @type { double } + * @type { number } * @syscap SystemCapability.MiscServices.InputMethodFramework * @since 10 */ - height: double; + height: number; } /** @@ -2206,20 +2205,20 @@ declare namespace inputMethod { /** * Indicates the width of the input window. * - * @type { double } + * @type { number } * @syscap SystemCapability.MiscServices.InputMethodFramework * @since 10 */ - width: double; + width: number; /** * Indicates the height of the input window. * - * @type { double } + * @type { number } * @syscap SystemCapability.MiscServices.InputMethodFramework * @since 10 */ - height: double; + height: number; } /** diff --git a/api/@ohos.multimedia.audio.d.ts b/api/@ohos.multimedia.audio.d.ts index 91e2a371c0..51e751d8c4 100644 --- a/api/@ohos.multimedia.audio.d.ts +++ b/api/@ohos.multimedia.audio.d.ts @@ -903,15 +903,13 @@ declare namespace audio { /** * HDMI device, such as HDMI, ARC, eARC * @syscap SystemCapability.Multimedia.Audio.Device - * @since arkts {'1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ HDMI = 27, /** * Line connected digital output device, such as s/pdif * @syscap SystemCapability.Multimedia.Audio.Device - * @since arkts {'1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ LINE_DIGITAL = 28, /** diff --git a/api/@ohos.multimedia.avCastPickerParam.d.ts b/api/@ohos.multimedia.avCastPickerParam.d.ts index 6cc41b8d70..a98cb42821 100644 --- a/api/@ohos.multimedia.avCastPickerParam.d.ts +++ b/api/@ohos.multimedia.avCastPickerParam.d.ts @@ -29,8 +29,7 @@ * @enum { number } * @syscap SystemCapability.Multimedia.AVSession.AVCast * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ export declare enum AVCastPickerState { /** @@ -65,8 +64,7 @@ export declare enum AVCastPickerState { * @enum { number } * @syscap SystemCapability.Multimedia.AVSession.AVCast * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ export declare enum AVCastPickerStyle { /** @@ -91,8 +89,7 @@ export declare enum AVCastPickerStyle { * @enum { number } * @syscap SystemCapability.Multimedia.AVSession.AVCast * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ export declare enum AVCastPickerColorMode { /** diff --git a/api/@ohos.multimedia.avsession.d.ts b/api/@ohos.multimedia.avsession.d.ts index 2b5ad2cfa6..be9a29d35a 100644 --- a/api/@ohos.multimedia.avsession.d.ts +++ b/api/@ohos.multimedia.avsession.d.ts @@ -19,7 +19,7 @@ */ import type { ErrorCallback, AsyncCallback, Callback } from './@ohos.base'; -import { WantAgent } from './@ohos.app.ability.wantAgent'; +import { WantAgent } from './@ohos.wantAgent'; import { KeyEvent } from './@ohos.multimodalInput.keyEvent'; import { ElementName } from './bundleManager/ElementName'; import image from './@ohos.multimedia.image'; diff --git a/api/@ohos.multimedia.camera.d.ts b/api/@ohos.multimedia.camera.d.ts index 8179d1d3b7..c4eac85b28 100644 --- a/api/@ohos.multimedia.camera.d.ts +++ b/api/@ohos.multimedia.camera.d.ts @@ -62,7 +62,7 @@ declare namespace camera { /** * Enum for camera status. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -139,7 +139,7 @@ declare namespace camera { /** * Enum for fold status. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 12 */ @@ -203,8 +203,7 @@ declare namespace camera { * * @typedef Profile * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Profile for camera streams. @@ -221,8 +220,7 @@ declare namespace camera { * @type { CameraFormat } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Camera format. @@ -241,8 +239,7 @@ declare namespace camera { * @type { Size } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Resolution. The settings are the width and height of the camera's resolution, not the width and height of the actual output image. @@ -261,8 +258,7 @@ declare namespace camera { * * @typedef FrameRateRange * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Frame rate range. @@ -276,7 +272,7 @@ declare namespace camera { /** * Min frame rate. * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 @@ -284,19 +280,18 @@ declare namespace camera { /** * Min frame rate. * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since arkts {'1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ - readonly min: int; + readonly min: number; /** * Max frame rate. * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 @@ -304,14 +299,13 @@ declare namespace camera { /** * Max frame rate. * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since arkts {'1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ - readonly max: int; + readonly max: number; } /** @@ -320,8 +314,7 @@ declare namespace camera { * @extends Profile * @typedef VideoProfile * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Video profile. @@ -339,8 +332,7 @@ declare namespace camera { * @type { FrameRateRange } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Frame rate range, in fps (frames per second). @@ -359,8 +351,7 @@ declare namespace camera { * * @typedef CameraOutputCapability * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Camera output capability. @@ -377,8 +368,7 @@ declare namespace camera { * @type { Array } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Preview profiles. @@ -397,8 +387,7 @@ declare namespace camera { * @type { Array } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Photo profiles. @@ -417,8 +406,7 @@ declare namespace camera { * @type { Array } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Video profiles. @@ -438,8 +426,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ readonly depthProfiles: Array; @@ -449,8 +436,7 @@ declare namespace camera { * @type { Array } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * All the supported metadata Object Types. @@ -467,10 +453,9 @@ declare namespace camera { /** * Enum for camera error code. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Enum for camera error code. @@ -485,8 +470,7 @@ declare namespace camera { * Parameter missing or parameter type incorrect. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Parameter missing or parameter type incorrect. @@ -501,8 +485,7 @@ declare namespace camera { * Operation not allowed. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Operation not allowed. @@ -517,8 +500,7 @@ declare namespace camera { * Session not config. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Session not config. @@ -533,8 +515,7 @@ declare namespace camera { * Session not running. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Session not running. @@ -549,8 +530,7 @@ declare namespace camera { * Session config locked. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Session config locked. @@ -565,8 +545,7 @@ declare namespace camera { * Device setting locked. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Device setting locked. @@ -581,8 +560,7 @@ declare namespace camera { * Can not use camera cause of conflict. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Can not use camera cause of conflict. @@ -597,8 +575,7 @@ declare namespace camera { * Camera disabled cause of security reason. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Camera disabled cause of security reason. @@ -613,8 +590,7 @@ declare namespace camera { * Can not use camera cause of preempted. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Can not use camera cause of preempted. @@ -629,8 +605,7 @@ declare namespace camera { * Unresolved conflicts with current configurations. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Unresolved conflicts with current configurations. @@ -646,8 +621,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ DEVICE_FREQUENTLY_SWITCHED = 7400111, @@ -656,8 +630,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ CAMERA_LENS_RETRACTED = 7400112, @@ -665,8 +638,7 @@ declare namespace camera { * Camera service fatal error. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Camera service fatal error. @@ -681,7 +653,7 @@ declare namespace camera { /** * Enum for restore parameter. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 11 @@ -727,32 +699,32 @@ declare namespace camera { /** * Skin smooth level value for restore. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 11 */ - skinSmoothLevel: int; + skinSmoothLevel: number; /** * Face slender value for restore. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 11 */ - faceSlender: int; + faceSlender: number; /** * Skin tone value for restore. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 11 */ - skinTone: int; + skinTone: number; } /** @@ -761,8 +733,7 @@ declare namespace camera { * @typedef PrelaunchConfig * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ interface PrelaunchConfig { /** @@ -771,8 +742,7 @@ declare namespace camera { * @type { CameraDevice } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ cameraDevice: CameraDevice; @@ -782,21 +752,19 @@ declare namespace camera { * @type { ?RestoreParamType } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ restoreParamType?: RestoreParamType; /** * Begin active time. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - activeTime?: int; + activeTime?: number; /** * Setting parameter. @@ -804,8 +772,7 @@ declare namespace camera { * @type { ?SettingParam } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ settingParam?: SettingParam; } @@ -831,8 +798,7 @@ declare namespace camera { * * @returns { Array } An array of supported cameras. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Gets the supported camera device objects and return the results synchronously. @@ -862,8 +828,7 @@ declare namespace camera { * @param { CameraDevice } camera - Camera device. * @returns { Array } An array of supported scene mode of camera. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Gets supported scene mode for specific camera. @@ -884,8 +849,7 @@ declare namespace camera { * @param { SceneMode } mode - Scene mode. * @returns { CameraOutputCapability } The camera output capability. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Gets supported output capability for specific camera. @@ -904,8 +868,7 @@ declare namespace camera { * * @returns { boolean } Is camera muted. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Queries whether the current camera is muted. @@ -932,8 +895,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ isCameraMuteSupported(): boolean; @@ -960,8 +922,7 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ muteCameraPersistent(mute: boolean, type: PolicyType): void; @@ -985,8 +946,7 @@ declare namespace camera { * @throws { BusinessError } 7400102 - Operation not allowed. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Creates a CameraInput instance by camera. @@ -1030,8 +990,7 @@ declare namespace camera { * @throws { BusinessError } 7400102 - Operation not allowed. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Creates a CameraInput instance by camera position and type. @@ -1073,8 +1032,7 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Creates a PreviewOutput instance. @@ -1101,8 +1059,7 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Creates a PreviewOutput instance without profile. @@ -1156,8 +1113,7 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Creates a PhotoOutput instance without surfaceId. @@ -1198,8 +1154,7 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Creates a VideoOutput instance. @@ -1226,8 +1181,7 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Creates a VideoOutput instance without profile. @@ -1261,8 +1215,7 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Creates a MetadataOutput instance. @@ -1287,8 +1240,7 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ createDepthDataOutput(profile: DepthProfile): DepthDataOutput; @@ -1314,8 +1266,7 @@ declare namespace camera { * 3. Parameter verification failed. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Gets a Session instance by specific scene mode. @@ -1386,8 +1337,7 @@ declare namespace camera { * @param { 'cameraStatus' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the camera status change. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Camera state callback to get the state change of the camera by registering a callback @@ -1410,8 +1360,7 @@ declare namespace camera { * @param { 'cameraStatus' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the camera status change. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Unsubscribes from camera status change event callback. @@ -1430,8 +1379,7 @@ declare namespace camera { * @param { 'foldStatusChanged' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the fold status change. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Registers a listener for fold state changes. This API uses an asynchronous callback to return the result. @@ -1453,8 +1401,7 @@ declare namespace camera { * @param { 'foldStatusChanged' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the fold status change. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Unsubscribes from fold status change event callback. @@ -1484,8 +1431,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ on(type: 'cameraMute', callback: AsyncCallback): void; @@ -1506,8 +1452,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ off(type: 'cameraMute', callback?: AsyncCallback): void; @@ -1532,8 +1477,7 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ isPrelaunchSupported(camera: CameraDevice): boolean; @@ -1561,8 +1505,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ setPrelaunchConfig(prelaunchConfig: PrelaunchConfig): void; @@ -1606,8 +1549,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ preSwitchCamera(cameraId: string): void; @@ -1632,8 +1574,7 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ createDeferredPreviewOutput(profile?: Profile): PreviewOutput; @@ -1642,8 +1583,7 @@ declare namespace camera { * * @returns { boolean } this value that specifies whether the device has a torch. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Check if the device has a torch. @@ -1660,8 +1600,7 @@ declare namespace camera { * @param { TorchMode } mode - torch mode. * @returns { boolean } is torch mode supported. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Check if a specifies torch mode is supported. @@ -1678,8 +1617,7 @@ declare namespace camera { * * @returns { TorchMode } torch mode. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Get current torch mode. @@ -1707,8 +1645,7 @@ declare namespace camera { * @throws { BusinessError } 7400102 - Operation not allowed. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Set torch mode to the device. @@ -1737,8 +1674,7 @@ declare namespace camera { * @param { 'torchStatusChange' } type - Event type * @param { AsyncCallback } callback - Callback used to return the torch status change * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Registers a listener for flashlight state changes to get flashlight state change by registering @@ -1761,8 +1697,7 @@ declare namespace camera { * @param { 'torchStatusChange' } type - Event type * @param { AsyncCallback } callback - Callback used to return the torch status change * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Unsubscribes torch status change event callback. @@ -1781,8 +1716,7 @@ declare namespace camera { * * @typedef TorchStatusInfo * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Torch status info. @@ -1799,8 +1733,7 @@ declare namespace camera { * @type { boolean } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * is torch available @@ -1819,8 +1752,7 @@ declare namespace camera { * @type { boolean } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Whether the flashlight is activated or not. True means the flashlight is activated, false means the flashlight @@ -1837,7 +1769,7 @@ declare namespace camera { /** * the current torch brightness level. * - * @type { double } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @since 11 @@ -1845,20 +1777,19 @@ declare namespace camera { /** * Flashlight brightness level, value range is [0,1], the closer to 1, the brighter it is. * - * @type { double } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since arkts {'1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ - readonly torchLevel: double; + readonly torchLevel: number; } /** * Enum for torch mode. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 11 */ @@ -1922,8 +1853,7 @@ declare namespace camera { * * @typedef CameraStatusInfo * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * An instance of the interface returned by the camera manager's callback that represents camera state information. @@ -1939,8 +1869,7 @@ declare namespace camera { * * @type { CameraDevice } * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Camera instance. @@ -1957,8 +1886,7 @@ declare namespace camera { * * @type { CameraStatus } * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Current camera status. @@ -1976,8 +1904,7 @@ declare namespace camera { * * @typedef FoldStatusInfo * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Fold status info. @@ -1994,8 +1921,7 @@ declare namespace camera { * @type { Array } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Gets supported camera devices under the current fold status. @@ -2014,8 +1940,7 @@ declare namespace camera { * @type { FoldStatus } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Current fold status. @@ -2032,14 +1957,14 @@ declare namespace camera { /** * Enum for camera position. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ /** * Enum for camera position. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice * @since 12 @@ -2110,7 +2035,7 @@ declare namespace camera { /** * Enum for camera type. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -2202,7 +2127,7 @@ declare namespace camera { /** * Enum for camera connection type. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -2264,7 +2189,7 @@ declare namespace camera { /** * Enum for remote camera device type. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 10 @@ -2272,7 +2197,7 @@ declare namespace camera { /** * Enum for remote camera device type. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 15 */ @@ -2357,8 +2282,7 @@ declare namespace camera { * * @typedef CameraDevice * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Camera device object. @@ -2375,8 +2299,7 @@ declare namespace camera { * @type { string } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Camera ID attribute. @@ -2395,8 +2318,7 @@ declare namespace camera { * @type { CameraPosition } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Camera position attribute. @@ -2415,8 +2337,7 @@ declare namespace camera { * @type { CameraType } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Camera type attribute. @@ -2435,8 +2356,7 @@ declare namespace camera { * @type { ConnectionType } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Camera connection type attribute. @@ -2464,8 +2384,7 @@ declare namespace camera { * @type { string } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ /** * Camera remote camera device name attribute. @@ -2493,8 +2412,7 @@ declare namespace camera { * @type { HostDeviceType } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ /** * Camera remote camera device type attribute. @@ -2510,7 +2428,7 @@ declare namespace camera { /** * Camera sensor orientation attribute. * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @since 12 @@ -2518,14 +2436,13 @@ declare namespace camera { /** * The camera mounting angle, which does not change with screen rotation, takes values from 0° to 360° in degrees. * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since arkts {'1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ - readonly cameraOrientation: int; + readonly cameraOrientation: number; /** * Camera device retractable attribute @@ -2534,8 +2451,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ readonly isRetractable?: boolean; } @@ -2559,7 +2475,7 @@ declare namespace camera { /** * Height. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -2571,12 +2487,12 @@ declare namespace camera { * @atomicservice * @since 19 */ - height: int; + height: number; /** * Width. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -2588,7 +2504,7 @@ declare namespace camera { * @atomicservice * @since 19 */ - width: int; + width: number; } /** @@ -2610,7 +2526,7 @@ declare namespace camera { /** * x co-ordinate * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -2622,12 +2538,12 @@ declare namespace camera { * @atomicservice * @since 19 */ - x: double; + x: number; /** * y co-ordinate * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -2639,7 +2555,7 @@ declare namespace camera { * @atomicservice * @since 19 */ - y: double; + y: number; } /** @@ -2647,8 +2563,7 @@ declare namespace camera { * * @interface CameraInput * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Camera input object. @@ -2667,8 +2582,7 @@ declare namespace camera { * @throws { BusinessError } 7400108 - Camera disabled cause of security reason. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Open camera. @@ -2692,8 +2606,7 @@ declare namespace camera { * @throws { BusinessError } 7400108 - Camera disabled cause of security reason. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Open camera. @@ -2718,8 +2631,7 @@ declare namespace camera { * @throws { BusinessError } 7400108 - Camera disabled cause of security reason. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Open camera. @@ -2769,8 +2681,7 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to return the result. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Close camera. @@ -2789,8 +2700,7 @@ declare namespace camera { * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Close camera. @@ -2806,17 +2716,16 @@ declare namespace camera { /** * Delay close camera. * - * @param { int } time - delay time for turning off camera. + * @param { number } time - delay time for turning off camera. * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ - closeDelayed(time: int): Promise; + closeDelayed(time: number): Promise; /** * Subscribes to error events. @@ -2825,8 +2734,7 @@ declare namespace camera { * @param { CameraDevice } camera - Camera device. * @param { ErrorCallback } callback - Callback used to get the camera input errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Registers a listener for CameraInput error events to get the result by registering @@ -2851,8 +2759,7 @@ declare namespace camera { * @param { CameraDevice } camera - Camera device. * @param { ErrorCallback } callback - Callback used to get the camera input errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Unsubscribes from error events. @@ -2874,8 +2781,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'cameraOcclusionDetection', callback: AsyncCallback): void; @@ -2887,8 +2793,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'cameraOcclusionDetection', callback?: AsyncCallback): void; @@ -2916,8 +2821,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ controlAuxiliary(auxiliaryType: AuxiliaryType, auxiliaryStatus: AuxiliaryStatus): Promise; } @@ -2925,7 +2829,7 @@ declare namespace camera { /** * Enumerates the camera scene modes. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 11 */ @@ -3113,7 +3017,7 @@ declare namespace camera { /** * Enum for camera format type. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -3256,7 +3160,7 @@ declare namespace camera { /** * Enum for flash mode. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -3336,8 +3240,7 @@ declare namespace camera { * @typedef LcdFlashStatus * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface LcdFlashStatus { /** @@ -3347,22 +3250,20 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ readonly isLcdFlashNeeded: boolean; /** * Compensate value for lcd flash. * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - readonly lcdCompensation: int; + readonly lcdCompensation: number; } /** @@ -3370,8 +3271,7 @@ declare namespace camera { * * @interface FlashQuery * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Flash Query object. @@ -3397,8 +3297,7 @@ declare namespace camera { * @returns { boolean } The flash light support status. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Check if device has flash light. @@ -3429,8 +3328,7 @@ declare namespace camera { * @returns { boolean } Is the flash mode supported. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Checks whether a specified flash mode is supported. @@ -3453,8 +3351,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ isLcdFlashSupported(): boolean; } @@ -3465,8 +3362,7 @@ declare namespace camera { * @extends FlashQuery * @interface Flash * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Flash object. @@ -3484,8 +3380,7 @@ declare namespace camera { * @returns { FlashMode } The current flash mode. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Gets current flash mode. @@ -3504,8 +3399,7 @@ declare namespace camera { * @param { FlashMode } flashMode - Target flash mode. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Sets flash mode. @@ -3526,8 +3420,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ enableLcdFlash(enabled: boolean): void; } @@ -3535,7 +3428,7 @@ declare namespace camera { /** * Enum for exposure mode. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -3606,11 +3499,10 @@ declare namespace camera { /** * Enum for exposure metering mode. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum ExposureMeteringMode { /** @@ -3618,8 +3510,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ MATRIX = 0, @@ -3628,8 +3519,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ CENTER = 1, @@ -3638,8 +3528,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ SPOT = 2 } @@ -3649,8 +3538,7 @@ declare namespace camera { * * @interface AutoExposureQuery * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * AutoExposureQuery object. @@ -3678,8 +3566,7 @@ declare namespace camera { * @returns { boolean } Is the exposure mode supported. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Checks whether a specified exposure mode is supported. @@ -3697,7 +3584,7 @@ declare namespace camera { /** * Query the exposure compensation range. * - * @returns { Array } The array of compensation range. + * @returns { Array } The array of compensation range. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @since 11 @@ -3706,11 +3593,10 @@ declare namespace camera { * Query the exposure compensation range. * Move to AutoExposureQuery interface from AutoExposure interface since 12. * - * @returns { Array } The array of compensation range. + * @returns { Array } The array of compensation range. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Query the exposure compensation range. @@ -3734,8 +3620,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ isExposureMeteringModeSupported(aeMeteringMode: ExposureMeteringMode): boolean; } @@ -3746,8 +3631,7 @@ declare namespace camera { * @extends AutoExposureQuery * @interface AutoExposure * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * AutoExposure object. @@ -3765,8 +3649,7 @@ declare namespace camera { * @returns { ExposureMode } The current exposure mode. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Gets current exposure mode. @@ -3785,8 +3668,7 @@ declare namespace camera { * @param { ExposureMode } aeMode - Exposure mode * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Sets Exposure mode. @@ -3806,8 +3688,7 @@ declare namespace camera { * @returns { Point } The current metering point. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Gets current metering point. @@ -3826,8 +3707,7 @@ declare namespace camera { * @param { Point } point - metering point * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Set the center point of the metering area. @@ -3843,7 +3723,7 @@ declare namespace camera { /** * Set exposure compensation. * - * @param { double } exposureBias - Exposure compensation + * @param { number } exposureBias - Exposure compensation * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @since 11 @@ -3851,12 +3731,11 @@ declare namespace camera { /** * Set exposure compensation. * - * @param { double } exposureBias - Exposure compensation + * @param { number } exposureBias - Exposure compensation * @throws { BusinessError } 7400102 - Operation not allowed. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Set exposure compensation. @@ -3873,11 +3752,10 @@ declare namespace camera { /** * Query the exposure value. * - * @returns { double } The exposure value. + * @returns { number } The exposure value. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Query the exposure value. @@ -3898,8 +3776,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ getExposureMeteringMode(): ExposureMeteringMode; @@ -3912,8 +3789,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ setExposureMeteringMode(aeMeteringMode: ExposureMeteringMode): void; } @@ -3921,7 +3797,7 @@ declare namespace camera { /** * Enum for focus mode. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -3998,7 +3874,7 @@ declare namespace camera { /** * Enum for focus state. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -4060,11 +3936,10 @@ declare namespace camera { /** * Enum for focus range type. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ enum FocusRangeType { /** @@ -4072,8 +3947,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ AUTO = 0, @@ -4082,8 +3956,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ NEAR = 1 } @@ -4091,11 +3964,10 @@ declare namespace camera { /** * Enum for focus driven type. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ enum FocusDrivenType { /** @@ -4103,8 +3975,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ AUTO = 0, @@ -4113,8 +3984,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ FACE = 1 } @@ -4122,11 +3992,10 @@ declare namespace camera { /** * Enum for focus tracking mode. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ enum FocusTrackingMode { /** @@ -4134,8 +4003,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ AUTO = 0 } @@ -4146,8 +4014,7 @@ declare namespace camera { * @typedef FocusTrackingInfo * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ interface FocusTrackingInfo { /** @@ -4156,8 +4023,7 @@ declare namespace camera { * @type { FocusTrackingMode } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ trackingMode: FocusTrackingMode; @@ -4167,8 +4033,7 @@ declare namespace camera { * @type { Rect } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ trackingRegion: Rect; } @@ -4178,8 +4043,7 @@ declare namespace camera { * * @interface FocusQuery * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Focus Query object. @@ -4207,8 +4071,7 @@ declare namespace camera { * @returns { boolean } Is the focus mode supported. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Checks whether a specified focus mode is supported. @@ -4247,8 +4110,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ isFocusRangeTypeSupported(type: FocusRangeType): boolean; @@ -4264,8 +4126,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ isFocusDrivenTypeSupported(type: FocusDrivenType): boolean; } @@ -4276,8 +4137,7 @@ declare namespace camera { * @extends FocusQuery * @interface Focus * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Focus object. @@ -4295,8 +4155,7 @@ declare namespace camera { * @returns { FocusMode } The current focus mode. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Gets current focus mode. @@ -4315,8 +4174,7 @@ declare namespace camera { * @param { FocusMode } afMode - Target focus mode. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Sets focus mode. @@ -4335,8 +4193,7 @@ declare namespace camera { * @param { Point } point - Target focus point. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Sets focus point. @@ -4355,8 +4212,7 @@ declare namespace camera { * @returns { Point } The current focus point. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Gets current focus point. @@ -4373,11 +4229,10 @@ declare namespace camera { /** * Gets current focal length. * - * @returns { double } The current focal point. + * @returns { number } The current focal point. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Gets current focal length. @@ -4411,8 +4266,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ setFocusAssist(enabled: boolean): void; @@ -4424,8 +4278,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ getFocusRange(): FocusRangeType; @@ -4442,8 +4295,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ setFocusRange(type: FocusRangeType): void; @@ -4455,8 +4307,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ getFocusDriven(): FocusDrivenType; @@ -4473,8 +4324,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ setFocusDriven(type: FocusDrivenType): void; } @@ -4485,46 +4335,42 @@ declare namespace camera { * @interface ManualFocus * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface ManualFocus { /** * Gets current focus distance. * - * @returns { double } The current focus distance. + * @returns { number } The current focus distance. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - getFocusDistance(): double; + getFocusDistance(): number; /** * Sets focus distance. * - * @param { double } distance - Focus distance + * @param { number } distance - Focus distance * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - setFocusDistance(distance: double): void; + setFocusDistance(distance: number): void; } /** * Enumerates the camera white balance modes. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Enumerates the camera white balance modes. @@ -4539,8 +4385,7 @@ declare namespace camera { * Automatic white balance mode. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Automatic white balance mode. @@ -4555,8 +4400,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Cloudy white balance mode. @@ -4572,8 +4416,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Incandescent white balance mode. @@ -4589,8 +4432,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Fluorescent white balance mode. @@ -4606,8 +4448,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Daylight white balance mode. @@ -4623,8 +4464,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Manual white balance mode. @@ -4640,8 +4480,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Lock white balance mode. @@ -4659,8 +4498,7 @@ declare namespace camera { * @interface WhiteBalanceQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * White Balance Query object. @@ -4681,8 +4519,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Checks whether the specified white balance mode is supported. @@ -4699,13 +4536,12 @@ declare namespace camera { /** * Query the white balance mode range. * - * @returns { Array } The array of white balance mode range. + * @returns { Array } The array of white balance mode range. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Query the white balance mode range. @@ -4726,8 +4562,7 @@ declare namespace camera { * @interface WhiteBalance * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * WhiteBalance object. @@ -4747,8 +4582,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Obtains the white balance mode in use. @@ -4769,8 +4603,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Sets white balance mode. @@ -4787,13 +4620,12 @@ declare namespace camera { /** * Gets current white balance. * - * @returns { int } The current white balance. + * @returns { number } The current white balance. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Gets current white balance. @@ -4809,14 +4641,13 @@ declare namespace camera { /** * Sets white balance. * - * @param { int } whiteBalance - White balance. + * @param { number } whiteBalance - White balance. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Sets white balance. @@ -4837,8 +4668,7 @@ declare namespace camera { * @interface ManualIsoQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface ManualIsoQuery { /** @@ -4849,23 +4679,21 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ isManualIsoSupported(): boolean; /** * Get the ISO range. * - * @returns { Array } The array of ISO range. + * @returns { Array } The array of ISO range. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - getIsoRange(): Array; + getIsoRange(): Array; } /** @@ -4875,45 +4703,41 @@ declare namespace camera { * @interface ManualIso * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface ManualIso extends ManualIsoQuery { /** * Gets current ISO. * - * @returns { int } The current ISO. + * @returns { number } The current ISO. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - getIso(): int; + getIso(): number; /** * Sets ISO. * - * @param { int } iso - ISO + * @param { number } iso - ISO * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - setIso(iso: int): void; + setIso(iso: number): void; } /** * Enum for smooth zoom mode. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Enum for smooth zoom mode. @@ -4928,8 +4752,7 @@ declare namespace camera { * Normal zoom mode. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Normal zoom mode. @@ -4946,8 +4769,7 @@ declare namespace camera { * * @typedef SmoothZoomInfo * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * SmoothZoomInfo object @@ -4961,10 +4783,9 @@ declare namespace camera { /** * The duration of smooth zoom. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * The duration of smooth zoom. @@ -4983,33 +4804,30 @@ declare namespace camera { * @typedef ZoomPointInfo * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface ZoomPointInfo { /** * The zoom ratio value. * - * @type { double } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - readonly zoomRatio: double; + readonly zoomRatio: number; /** * The equivalent focal Length. * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - readonly equivalentFocalLength: int; + readonly equivalentFocalLength: number; } /** @@ -5017,8 +4835,7 @@ declare namespace camera { * * @interface ZoomQuery * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Zoom query object. @@ -5032,7 +4849,7 @@ declare namespace camera { /** * Gets all supported zoom ratio range. * - * @returns { Array } The zoom ratio range. + * @returns { Array } The zoom ratio range. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @since 11 @@ -5041,11 +4858,10 @@ declare namespace camera { * Gets all supported zoom ratio range. * Move to ZoomQuery interface from Zoom since 12. * - * @returns { Array } The zoom ratio range. + * @returns { Array } The zoom ratio range. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Gets all supported zoom ratio range. @@ -5067,8 +4883,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ getZoomPointInfos(): Array; } @@ -5079,8 +4894,7 @@ declare namespace camera { * @extends ZoomQuery * @interface Zoom * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Zoom object. @@ -5095,7 +4909,7 @@ declare namespace camera { /** * Gets zoom ratio. * - * @returns { double } The zoom ratio value. + * @returns { number } The zoom ratio value. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @since 11 @@ -5103,12 +4917,11 @@ declare namespace camera { /** * Gets zoom ratio. * - * @returns { double } The zoom ratio value. + * @returns { number } The zoom ratio value. * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Gets zoom ratio. @@ -5125,11 +4938,10 @@ declare namespace camera { /** * Sets zoom ratio. * - * @param { double } zoomRatio - Target zoom ratio. + * @param { number } zoomRatio - Target zoom ratio. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Sets zoom ratio. @@ -5145,12 +4957,11 @@ declare namespace camera { /** * Sets target zoom ratio by smooth method. * - * @param { double } targetRatio - Target zoom ratio. + * @param { number } targetRatio - Target zoom ratio. * @param { SmoothZoomMode } mode - Smooth zoom mode. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Sets target zoom ratio by smooth method. @@ -5178,8 +4989,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ prepareZoom(): void; @@ -5190,8 +5000,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ unprepareZoom(): void; } @@ -5199,7 +5008,7 @@ declare namespace camera { /** * Enum for video stabilization mode. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -5293,8 +5102,7 @@ declare namespace camera { * * @interface StabilizationQuery * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Stabilization Query object. @@ -5322,8 +5130,7 @@ declare namespace camera { * @returns { boolean } Is video stabilization mode supported. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Check whether the specified video stabilization mode is supported. @@ -5345,8 +5152,7 @@ declare namespace camera { * @extends StabilizationQuery * @interface Stabilization * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Stabilization object. @@ -5364,8 +5170,7 @@ declare namespace camera { * @returns { VideoStabilizationMode } The current video stabilization mode. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Query the video stabilization mode currently in use. @@ -5384,8 +5189,7 @@ declare namespace camera { * @param { VideoStabilizationMode } mode - video stabilization mode to set. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Set video stabilization mode. @@ -5402,11 +5206,10 @@ declare namespace camera { /** * Enumerates the camera portrait theme types. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ enum PortraitThemeType { /** @@ -5414,8 +5217,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ NATURAL = 0, @@ -5424,8 +5226,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ DELICATE = 1, @@ -5434,8 +5235,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ STYLISH = 2 } @@ -5443,7 +5243,7 @@ declare namespace camera { /** * Enumerates the camera beauty effect types. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 10 @@ -5492,8 +5292,7 @@ declare namespace camera { * @interface BeautyQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface BeautyQuery { /** @@ -5515,8 +5314,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ getSupportedBeautyTypes(): Array; @@ -5524,7 +5322,7 @@ declare namespace camera { * Gets the specific beauty effect type range. * * @param { BeautyType } type - The type of beauty effect. - * @returns { Array } The array of the specific beauty effect range. + * @returns { Array } The array of the specific beauty effect range. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core @@ -5536,15 +5334,14 @@ declare namespace camera { * Move to BeautyQuery from Beauty since 12. * * @param { BeautyType } type - The type of beauty effect. - * @returns { Array } The array of the specific beauty effect range. + * @returns { Array } The array of the specific beauty effect range. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - getSupportedBeautyRange(type: BeautyType): Array; + getSupportedBeautyRange(type: BeautyType): Array; /** * Gets supported portrait theme type. @@ -5554,8 +5351,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ getSupportedPortraitThemeTypes(): Array; @@ -5567,8 +5363,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ isPortraitThemeSupported(): boolean; } @@ -5580,37 +5375,34 @@ declare namespace camera { * @interface Beauty * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ interface Beauty extends BeautyQuery { /** * Gets the beauty effect in use. * * @param { BeautyType } type - The type of beauty effect. - * @returns { int } the beauty effect in use. + * @returns { number } the beauty effect in use. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - getBeauty(type: BeautyType): int; + getBeauty(type: BeautyType): number; /** * Sets a beauty effect for a camera device. * * @param { BeautyType } type - The type of beauty effect. - * @param { int } value The number of beauty effect. + * @param { number } value The number of beauty effect. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - setBeauty(type: BeautyType, value: int): void; + setBeauty(type: BeautyType, value: number): void; /** * Sets a portrait theme type for a camera device. @@ -5621,8 +5413,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ setPortraitThemeType(type: PortraitThemeType): void; } @@ -5633,8 +5424,7 @@ declare namespace camera { * @typedef EffectSuggestion * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface EffectSuggestion { @@ -5646,8 +5436,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ isEffectSuggestionSupported(): boolean; @@ -5660,8 +5449,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enableEffectSuggestion(enabled: boolean): void; @@ -5673,8 +5461,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ getSupportedEffectSuggestionTypes(): Array; @@ -5688,8 +5475,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ setEffectSuggestionStatus(status: Array): void; @@ -5703,8 +5489,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ updateEffectSuggestion(type: EffectSuggestionType, enabled: boolean): void; } @@ -5712,11 +5497,10 @@ declare namespace camera { /** * Enumerates the camera color effect types. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ enum ColorEffectType { /** @@ -5724,8 +5508,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ NORMAL = 0, @@ -5734,8 +5517,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ BRIGHT = 1, @@ -5744,8 +5526,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ SOFT = 2, @@ -5754,8 +5535,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ BLACK_WHITE = 3 } @@ -5763,11 +5543,10 @@ declare namespace camera { /** * Enum for policy type * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum PolicyType { /** @@ -5775,8 +5554,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ PRIVACY = 1 } @@ -5787,8 +5565,7 @@ declare namespace camera { * @interface ColorEffectQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface ColorEffectQuery { /** @@ -5810,8 +5587,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ getSupportedColorEffects(): Array; } @@ -5823,8 +5599,7 @@ declare namespace camera { * @interface ColorEffect * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ interface ColorEffect extends ColorEffectQuery { /** @@ -5835,8 +5610,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ getColorEffect(): ColorEffectType; @@ -5848,8 +5622,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ setColorEffect(type: ColorEffectType): void; } @@ -5859,8 +5632,7 @@ declare namespace camera { * * @interface ColorManagementQuery * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Color Management Query object. @@ -5877,8 +5649,7 @@ declare namespace camera { * @returns { Array } The array of the supported color space for the session. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Gets the supported color space types. @@ -5904,8 +5675,7 @@ declare namespace camera { * @extends ColorManagementQuery * @interface ColorManagement * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Color Management object. @@ -5923,8 +5693,7 @@ declare namespace camera { * @returns { colorSpaceManager.ColorSpace } Current color space. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Gets the specific color space type. @@ -5946,8 +5715,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Sets a color space for the session. @@ -5969,8 +5737,7 @@ declare namespace camera { * * @interface AutoDeviceSwitchQuery * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ /** * Auto Device Switch Query object. @@ -5987,8 +5754,7 @@ declare namespace camera { * @returns { boolean } Is auto device switch supported. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ /** * Check whether auto device switch is supported. @@ -6014,8 +5780,7 @@ declare namespace camera { * @extends AutoDeviceSwitchQuery * @interface AutoDeviceSwitch * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ /** * Auto Device Switch object. @@ -6038,8 +5803,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ /** * Enable auto device switch for session. @@ -6063,8 +5827,7 @@ declare namespace camera { * * @typedef AutoDeviceSwitchStatus * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ /** * Auto Device Switch Status. @@ -6081,8 +5844,7 @@ declare namespace camera { * @type { boolean } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ /** * Notify whether device is switched. @@ -6101,8 +5863,7 @@ declare namespace camera { * @type { boolean } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ /** * Notify whether device capability is changed. @@ -6122,8 +5883,7 @@ declare namespace camera { * @interface MacroQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Macro Query object. @@ -6151,8 +5911,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Determine whether camera macro is supported. @@ -6172,8 +5931,7 @@ declare namespace camera { * @interface Macro * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Macro object. @@ -6204,8 +5962,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Enable macro for camera. @@ -6223,11 +5980,10 @@ declare namespace camera { /** * Enum for usage type used in capture session. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ enum UsageType { /** @@ -6235,8 +5991,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ BOKEH = 0 } @@ -6246,8 +6001,7 @@ declare namespace camera { * * @interface Session * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Session object. @@ -6271,8 +6025,7 @@ declare namespace camera { * @throws { BusinessError } 7400105 - Session config locked. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Begin capture session config. @@ -6292,8 +6045,7 @@ declare namespace camera { * @throws { BusinessError } 7400102 - Operation not allowed. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Commit capture session config. @@ -6314,8 +6066,7 @@ declare namespace camera { * @throws { BusinessError } 7400102 - Operation not allowed. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Commit capture session config. @@ -6336,8 +6087,7 @@ declare namespace camera { * @param { CameraInput } cameraInput - Target camera input to add. * @returns { boolean } You can add the input into the session. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Determines whether the camera input can be added into the session. @@ -6372,8 +6122,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Adds a camera input. @@ -6421,8 +6170,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Removes a camera input. @@ -6456,8 +6204,7 @@ declare namespace camera { * @param { CameraOutput } cameraOutput - Target camera output to add. * @returns { boolean } You can add the output into the session. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Determines whether the camera output can be added into the session. @@ -6492,8 +6239,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Adds a camera output. @@ -6541,8 +6287,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Removes a camera output. @@ -6586,8 +6331,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Starts capture session. @@ -6619,8 +6363,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Starts capture session. @@ -6641,8 +6384,7 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to return the result. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Stops capture session. @@ -6661,8 +6403,7 @@ declare namespace camera { * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Stops capture session. @@ -6681,8 +6422,7 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to return the result. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Release capture session instance. @@ -6701,8 +6441,7 @@ declare namespace camera { * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Release capture session instance. @@ -6727,8 +6466,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ setUsage(usage: UsageType, enabled: boolean): void; @@ -6742,8 +6480,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ getCameraOutputCapabilities(camera: CameraDevice): Array; } @@ -7325,10 +7062,9 @@ declare namespace camera { * Types of preconfig, which used to configure session conveniently. * Preconfig type contains common use cases of camera output. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Types of preconfig, which used to configure session conveniently. @@ -7344,8 +7080,7 @@ declare namespace camera { * 720P output for preconfig. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * 720P output for preconfig. @@ -7360,8 +7095,7 @@ declare namespace camera { * 1080P output for preconfig. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * 1080P output for preconfig. @@ -7376,8 +7110,7 @@ declare namespace camera { * 4K output for preconfig. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * 4K output for preconfig. @@ -7392,8 +7125,7 @@ declare namespace camera { * high quality output for preconfig. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * high quality output for preconfig. @@ -7408,10 +7140,9 @@ declare namespace camera { /** * The aspect ratios of preconfig, which used to configure session conveniently. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * The aspect ratios of preconfig, which used to configure session conveniently. @@ -7426,8 +7157,7 @@ declare namespace camera { * Aspect ratio 1:1 for preconfig. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Aspect ratio 1:1 for preconfig. @@ -7442,8 +7172,7 @@ declare namespace camera { * Aspect ratio 4:3 for preconfig. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Aspect ratio 4:3 for preconfig. @@ -7458,8 +7187,7 @@ declare namespace camera { * Aspect ratio 16:9 for preconfig. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Aspect ratio 16:9 for preconfig. @@ -7474,11 +7202,10 @@ declare namespace camera { /** * Enum for feature type used in scene detection. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum SceneFeatureType { /** @@ -7486,8 +7213,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ MOON_CAPTURE_BOOST = 0, @@ -7496,8 +7222,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ TRIPOD_DETECTION = 1, @@ -7506,8 +7231,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ LOW_LIGHT_BOOST = 2 } @@ -7518,8 +7242,7 @@ declare namespace camera { * @typedef SceneFeatureDetectionResult * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface SceneFeatureDetectionResult { /** @@ -7529,8 +7252,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ readonly featureType: SceneFeatureType; @@ -7541,8 +7263,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ readonly detected: boolean; } @@ -7550,11 +7271,10 @@ declare namespace camera { /** * Enum for tripod status. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ enum TripodStatus { /** @@ -7562,8 +7282,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ INVALID = 0, @@ -7572,8 +7291,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ ACTIVE = 1, @@ -7582,8 +7300,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ ENTERING = 2, @@ -7592,8 +7309,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ EXITING = 3 } @@ -7605,8 +7321,7 @@ declare namespace camera { * @interface TripodDetectionResult * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface TripodDetectionResult extends SceneFeatureDetectionResult { /** @@ -7616,8 +7331,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ readonly tripodStatus: TripodStatus; } @@ -7628,8 +7342,7 @@ declare namespace camera { * @interface SceneDetectionQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface SceneDetectionQuery { /** @@ -7641,8 +7354,7 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ isSceneFeatureSupported(type: SceneFeatureType): boolean; } @@ -7654,8 +7366,7 @@ declare namespace camera { * @interface SceneDetection * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface SceneDetection extends SceneDetectionQuery { /** @@ -7667,8 +7378,7 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enableSceneFeature(type: SceneFeatureType, enabled: boolean): void; } @@ -7689,8 +7399,7 @@ declare namespace camera { * @interface PhotoSessionForSys * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ interface PhotoSessionForSys extends PhotoSession, Beauty, ColorEffect, ColorManagement, Macro, SceneDetection, EffectSuggestion, DepthFusion { } @@ -7708,8 +7417,7 @@ declare namespace camera { * @extends Session, Flash, AutoExposure, Focus, Zoom, ColorManagement, AutoDeviceSwitch * @interface PhotoSession * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ /** * Photo session object. @@ -7738,8 +7446,7 @@ declare namespace camera { * @returns { boolean } Whether the choosed preconfig type can be used. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Gets whether the choosed preconfig type can be used to configure photo session. @@ -7765,8 +7472,7 @@ declare namespace camera { * default value {@link PreconfigRatio#PRECONFIG_RATIO_4_3} * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Configure photo session with the preconfig type. @@ -7788,8 +7494,7 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the capture session errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Registers a listener for error events from a normal video session to get the result by registering @@ -7812,8 +7517,7 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the capture session errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Unsubscribes from error events. @@ -7832,8 +7536,7 @@ declare namespace camera { * @param { 'focusStateChange' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the focus state change. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Registers a listener for camera focus state changes to get the result by registering @@ -7856,8 +7559,7 @@ declare namespace camera { * @param { 'focusStateChange' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the focus state change. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Unsubscribes from focus state change event callback. @@ -7876,8 +7578,7 @@ declare namespace camera { * @param { 'smoothZoomInfoAvailable' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the zoom info. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Registers a listener for state changes in the camera's smooth zoom to get the result by registering @@ -7900,8 +7601,7 @@ declare namespace camera { * @param { 'smoothZoomInfoAvailable' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the zoom info. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Unsubscribes from zoom info event callback. @@ -7922,8 +7622,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ on(type: 'macroStatusChanged', callback: AsyncCallback): void; @@ -7935,8 +7634,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ off(type: 'macroStatusChanged', callback?: AsyncCallback): void; @@ -7949,8 +7647,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'featureDetection', featureType: SceneFeatureType, callback: AsyncCallback): void; @@ -7963,8 +7660,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'featureDetection', featureType: SceneFeatureType, callback?: AsyncCallback): void; @@ -7975,8 +7671,7 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'effectSuggestionChange', callback: AsyncCallback): void; @@ -7987,8 +7682,7 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'effectSuggestionChange', callback?: AsyncCallback): void; @@ -7998,8 +7692,7 @@ declare namespace camera { * @param { 'autoDeviceSwitchStatusChange' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ /** * Registers a listener for the camera's automatic lens switching state changes to get the result @@ -8022,8 +7715,7 @@ declare namespace camera { * @param { 'autoDeviceSwitchStatusChange' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ /** * Unsubscribes to auto device switch status event callback. @@ -8044,8 +7736,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ on(type: 'lcdFlashStatus', callback: AsyncCallback): void; @@ -8057,8 +7748,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ off(type: 'lcdFlashStatus', callback?: AsyncCallback): void; @@ -8071,8 +7761,7 @@ declare namespace camera { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. 2.Incorrect parameter types. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ getSessionFunctions(outputCapability: CameraOutputCapability): Array; @@ -8083,8 +7772,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ getSessionConflictFunctions(): Array; } @@ -8105,8 +7793,7 @@ declare namespace camera { * @interface VideoSessionForSys * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ /** * Video session object used by the system camera. @@ -8123,10 +7810,9 @@ declare namespace camera { /** * Enum for quality prioritization. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ /** * Enum for quality prioritization. @@ -8141,8 +7827,7 @@ declare namespace camera { * High quality priority. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ /** * High quality priority. @@ -8157,8 +7842,7 @@ declare namespace camera { * Power balance priority. * * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ /** * Power balance priority. @@ -8184,8 +7868,7 @@ declare namespace camera { * @interface VideoSession * @extends AutoDeviceSwitch * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ /** * Video session object. @@ -8216,8 +7899,7 @@ declare namespace camera { * @returns { boolean } Whether the choosed preconfig type can be used. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Gets whether the choosed preconfig type can be used to configure video session. @@ -8243,8 +7925,7 @@ declare namespace camera { * default value {@link PreconfigRatio#PRECONFIG_RATIO_16_9}. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Configure video session with the preconfig type. @@ -8266,8 +7947,7 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the capture session errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Registers a listener for error events in normal photo sessions to get the result by registering @@ -8290,8 +7970,7 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the capture session errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Unsubscribes from error events. @@ -8310,8 +7989,7 @@ declare namespace camera { * @param { 'focusStateChange' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the focus state change. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Registers a listener for error events in normal photo sessions to get the result by registering @@ -8334,8 +8012,7 @@ declare namespace camera { * @param { 'focusStateChange' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the focus state change. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Unsubscribes from focus state change event callback. @@ -8354,8 +8031,7 @@ declare namespace camera { * @param { 'smoothZoomInfoAvailable' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the zoom info. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Registers a listener for state changes in the camera's smooth zoom to get the result by registering @@ -8378,8 +8054,7 @@ declare namespace camera { * @param { 'smoothZoomInfoAvailable' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the zoom info. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Unsubscribes from zoom info event callback. @@ -8400,8 +8075,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ on(type: 'macroStatusChanged', callback: AsyncCallback): void; @@ -8413,8 +8087,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ off(type: 'macroStatusChanged', callback?: AsyncCallback): void; @@ -8426,8 +8099,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ on(type: 'lcdFlashStatus', callback: AsyncCallback): void; @@ -8439,8 +8111,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ off(type: 'lcdFlashStatus', callback?: AsyncCallback): void; @@ -8450,8 +8121,7 @@ declare namespace camera { * @param { 'autoDeviceSwitchStatusChange' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ /** * Registers a listener for the camera's automatic lens switching state changes to get the @@ -8475,8 +8145,7 @@ declare namespace camera { * @param { 'autoDeviceSwitchStatusChange' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ /** * Unsubscribes to auto device switch status event callback. @@ -8497,8 +8166,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ on(type: 'focusTrackingInfoAvailable', callback: Callback): void; @@ -8510,8 +8178,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ off(type: 'focusTrackingInfoAvailable', callback?: Callback): void; @@ -8547,8 +8214,7 @@ declare namespace camera { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. 2.Incorrect parameter types. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ getSessionFunctions(outputCapability: CameraOutputCapability): Array; @@ -8559,8 +8225,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ getSessionConflictFunctions(): Array; @@ -8575,8 +8240,7 @@ declare namespace camera { * 3. Parameter verification failed. * @throws { BusinessError } 7400103 - Session not config. The session has not been committed or configured. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ /** * Sets quality prioritization. @@ -8602,8 +8266,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ on(type: 'lightStatusChange', callback: AsyncCallback): void; @@ -8615,8 +8278,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ off(type: 'lightStatusChange', callback?: AsyncCallback): void; } @@ -8624,11 +8286,10 @@ declare namespace camera { /** * Enum for the camera light status. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ enum LightStatus { /** @@ -8636,8 +8297,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ NORMAL = 0, @@ -8646,8 +8306,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ INSUFFICIENT = 1 } @@ -8655,11 +8314,10 @@ declare namespace camera { /** * Enumerates the camera portrait effects. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ enum PortraitEffect { /** @@ -8667,8 +8325,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ OFF = 0, @@ -8677,8 +8334,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ CIRCLES = 1, @@ -8687,8 +8343,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ HEART = 2, @@ -8697,8 +8352,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ ROTATED = 3, @@ -8707,8 +8361,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ STUDIO = 4, @@ -8717,8 +8370,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ THEATER = 5 } @@ -8729,8 +8381,7 @@ declare namespace camera { * @interface PortraitQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface PortraitQuery { /** @@ -8762,8 +8413,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ getSupportedPortraitEffects(): Array; } @@ -8775,8 +8425,7 @@ declare namespace camera { * @interface Portrait * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ interface Portrait extends PortraitQuery { /** @@ -8797,8 +8446,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ getPortraitEffect(): PortraitEffect; @@ -8820,8 +8468,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ setPortraitEffect(effect: PortraitEffect): void; } @@ -8832,33 +8479,30 @@ declare namespace camera { * @typedef ZoomRange * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ interface ZoomRange { /** * Min zoom value. * - * @type { double } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - readonly min: double; + readonly min: number; /** * Max zoom value. * - * @type { double } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - readonly max: double; + readonly max: number; } /** @@ -8867,8 +8511,7 @@ declare namespace camera { * @typedef PhysicalAperture * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ interface PhysicalAperture { /** @@ -8877,21 +8520,19 @@ declare namespace camera { * @type { ZoomRange } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ zoomRange: ZoomRange; /** * The supported physical apertures. * - * @type { Array } + * @type { Array } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - apertures: Array; + apertures: Array; } /** @@ -8900,14 +8541,13 @@ declare namespace camera { * @interface ApertureQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface ApertureQuery { /** * Gets the supported virtual apertures. * - * @returns { Array } The array of supported virtual apertures. + * @returns { Array } The array of supported virtual apertures. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core @@ -8918,15 +8558,14 @@ declare namespace camera { * Gets the supported virtual apertures. * Move to ApertureQuery interface from Aperture since 12. * - * @returns { Array } The array of supported virtual apertures. + * @returns { Array } The array of supported virtual apertures. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - getSupportedVirtualApertures(): Array; + getSupportedVirtualApertures(): Array; /** * Gets the supported physical apertures. @@ -8947,8 +8586,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ getSupportedPhysicalApertures(): Array; } @@ -8960,61 +8598,56 @@ declare namespace camera { * @interface Aperture * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ interface Aperture extends ApertureQuery { /** * Gets current virtual aperture value. * - * @returns { double } The current virtual aperture value. + * @returns { number } The current virtual aperture value. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - getVirtualAperture(): double; + getVirtualAperture(): number; /** * Sets virtual aperture value. * - * @param { double } aperture - virtual aperture value + * @param { number } aperture - virtual aperture value * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - setVirtualAperture(aperture: double): void; + setVirtualAperture(aperture: number): void; /** * Gets current physical aperture value. * - * @returns { double } The current physical aperture value. + * @returns { number } The current physical aperture value. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - getPhysicalAperture(): double; + getPhysicalAperture(): number; /** * Sets physical aperture value. * - * @param { double } aperture - physical aperture value + * @param { number } aperture - physical aperture value * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - setPhysicalAperture(aperture: double): void; + setPhysicalAperture(aperture: number): void; } /** @@ -9024,8 +8657,7 @@ declare namespace camera { * @interface PortraitPhotoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ interface PortraitPhotoSession extends Session, Flash, AutoExposure, Focus, Zoom, Beauty, ColorEffect, ColorManagement, Portrait, Aperture { /** @@ -9035,8 +8667,7 @@ declare namespace camera { * @param { ErrorCallback } callback - Callback used to get the capture session errors. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ on(type: 'error', callback: ErrorCallback): void; @@ -9047,8 +8678,7 @@ declare namespace camera { * @param { ErrorCallback } callback - Callback used to get the capture session errors. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ off(type: 'error', callback?: ErrorCallback): void; @@ -9059,8 +8689,7 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to get the focus state change. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -9071,8 +8700,7 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to get the focus state change. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -9083,8 +8711,7 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to get the zoom info. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; @@ -9095,8 +8722,7 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to get the zoom info. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; @@ -9108,8 +8734,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ on(type: 'lcdFlashStatus', callback: AsyncCallback): void; @@ -9121,8 +8746,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ off(type: 'lcdFlashStatus', callback?: AsyncCallback): void; @@ -9135,8 +8759,7 @@ declare namespace camera { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. 2.Incorrect parameter types. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ getSessionFunctions(outputCapability: CameraOutputCapability): Array; @@ -9147,8 +8770,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ getSessionConflictFunctions(): Array; } @@ -9160,8 +8782,7 @@ declare namespace camera { * @interface ApertureVideoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface ApertureVideoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorEffect, Aperture { /** @@ -9172,8 +8793,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'error', callback: ErrorCallback): void; @@ -9185,8 +8805,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'error', callback?: ErrorCallback): void; @@ -9198,8 +8817,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -9211,8 +8829,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -9224,8 +8841,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; @@ -9237,8 +8853,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; } @@ -9249,8 +8864,7 @@ declare namespace camera { * @interface ManualExposureQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface ManualExposureQuery { /** @@ -9285,14 +8899,13 @@ declare namespace camera { * @interface ManualExposure * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ interface ManualExposure extends ManualExposureQuery { /** * Gets current exposure value. * - * @returns { int } The current exposure value. + * @returns { number } The current exposure value. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core @@ -9302,21 +8915,20 @@ declare namespace camera { /** * Gets current exposure value. * - * @returns { int } The current exposure value. + * @returns { number } The current exposure value. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - getExposure(): int; + getExposure(): number; /** * Sets Exposure value. * - * @param { int } exposure - Exposure value + * @param { number } exposure - Exposure value * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core @@ -9326,16 +8938,15 @@ declare namespace camera { /** * Sets Exposure value. * - * @param { int } exposure - Exposure value + * @param { number } exposure - Exposure value * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400102 - Operation not allowed. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - setExposure(exposure: int): void; + setExposure(exposure: number): void; } /** @@ -9345,8 +8956,7 @@ declare namespace camera { * @interface NightPhotoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ interface NightPhotoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorEffect, Beauty, ColorManagement, ManualExposure { /** @@ -9356,8 +8966,7 @@ declare namespace camera { * @param { ErrorCallback } callback - Callback used to get the capture session errors. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ on(type: 'error', callback: ErrorCallback): void; @@ -9368,8 +8977,7 @@ declare namespace camera { * @param { ErrorCallback } callback - Callback used to get the capture session errors. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ off(type: 'error', callback?: ErrorCallback): void; @@ -9380,8 +8988,7 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to get the focus state change. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -9392,8 +8999,7 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to get the focus state change. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -9404,8 +9010,7 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to get the zoom info. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; @@ -9416,8 +9021,7 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to get the zoom info. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; @@ -9429,8 +9033,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'lcdFlashStatus', callback: AsyncCallback): void; @@ -9442,8 +9045,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'lcdFlashStatus', callback?: AsyncCallback): void; } @@ -9454,21 +9056,19 @@ declare namespace camera { * @typedef IsoInfo * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface IsoInfo { /** * ISO value. * - * @type { ?int } + * @type { ?number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - readonly iso?: int; + readonly iso?: number; } /** @@ -9477,21 +9077,19 @@ declare namespace camera { * @typedef ExposureInfo * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface ExposureInfo { /** * Exposure time value. * - * @type { ?int } + * @type { ?number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - readonly exposureTime?: int; + readonly exposureTime?: number; } /** @@ -9500,21 +9098,19 @@ declare namespace camera { * @typedef ApertureInfo * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface ApertureInfo { /** * Aperture value. * - * @type { ?double } + * @type { ?number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - readonly aperture?: double; + readonly aperture?: number; } /** @@ -9523,21 +9119,19 @@ declare namespace camera { * @typedef LuminationInfo * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface LuminationInfo { /** * Lumination value. * - * @type { ?double } + * @type { ?number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - readonly lumination?: double; + readonly lumination?: number; } /** @@ -9546,8 +9140,7 @@ declare namespace camera { * @interface ProfessionalPhotoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface ProfessionalPhotoSession extends Session, AutoExposure, ManualExposure, Focus, ManualFocus, WhiteBalance, ManualIso, Flash, Zoom, ColorEffect, Aperture { /** @@ -9558,8 +9151,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'error', callback: ErrorCallback): void; @@ -9571,8 +9163,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'error', callback?: ErrorCallback): void; @@ -9584,8 +9175,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -9597,8 +9187,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -9610,8 +9199,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; @@ -9623,8 +9211,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; @@ -9636,8 +9223,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'isoInfoChange', callback: AsyncCallback): void; @@ -9649,8 +9235,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'isoInfoChange', callback?: AsyncCallback): void; @@ -9662,8 +9247,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'exposureInfoChange', callback: AsyncCallback): void; @@ -9675,8 +9259,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'exposureInfoChange', callback?: AsyncCallback): void; @@ -9688,8 +9271,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'apertureInfoChange', callback: AsyncCallback): void; @@ -9701,8 +9283,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'apertureInfoChange', callback?: AsyncCallback): void; @@ -9714,8 +9295,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'luminationInfoChange', callback: AsyncCallback): void; @@ -9727,8 +9307,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'luminationInfoChange', callback?: AsyncCallback): void; } @@ -9740,8 +9319,7 @@ declare namespace camera { * @interface ProfessionalVideoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface ProfessionalVideoSession extends Session, AutoExposure, ManualExposure, Focus, ManualFocus, WhiteBalance, ManualIso, Flash, Zoom, ColorEffect, Aperture { /** @@ -9752,8 +9330,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'error', callback: ErrorCallback): void; @@ -9765,8 +9342,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'error', callback?: ErrorCallback): void; @@ -9778,8 +9354,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -9791,8 +9366,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -9804,8 +9378,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; @@ -9817,8 +9390,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; @@ -9830,8 +9402,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'isoInfoChange', callback: AsyncCallback): void; @@ -9843,8 +9414,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'isoInfoChange', callback?: AsyncCallback): void; @@ -9856,8 +9426,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'exposureInfoChange', callback: AsyncCallback): void; @@ -9869,8 +9438,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'exposureInfoChange', callback?: AsyncCallback): void; @@ -9882,8 +9450,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'apertureInfoChange', callback: AsyncCallback): void; @@ -9895,8 +9462,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'apertureInfoChange', callback?: AsyncCallback): void; @@ -9908,8 +9474,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'luminationInfoChange', callback: AsyncCallback): void; @@ -9921,8 +9486,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'luminationInfoChange', callback?: AsyncCallback): void; } @@ -9930,11 +9494,10 @@ declare namespace camera { /** * Enum for slow motion status. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum SlowMotionStatus { /** @@ -9942,8 +9505,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ DISABLED = 0, @@ -9952,8 +9514,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ READY = 1, @@ -9962,8 +9523,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ VIDEO_START = 2, @@ -9972,8 +9532,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ VIDEO_DONE = 3, @@ -9982,8 +9541,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ FINISHED = 4 } @@ -9995,8 +9553,7 @@ declare namespace camera { * @interface SlowMotionVideoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface SlowMotionVideoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorEffect { /** @@ -10007,8 +9564,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'error', callback: ErrorCallback): void; @@ -10020,8 +9576,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'error', callback?: ErrorCallback): void; @@ -10033,8 +9588,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -10046,8 +9600,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -10059,8 +9612,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; @@ -10072,8 +9624,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; @@ -10085,8 +9636,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Determine whether camera slow motion detection is supported. @@ -10108,8 +9658,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Set slow motion detection area. @@ -10130,8 +9679,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'slowMotionStatus', callback: AsyncCallback): void; @@ -10143,8 +9691,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'slowMotionStatus', callback?: AsyncCallback): void; } @@ -10156,8 +9703,7 @@ declare namespace camera { * @interface HighResolutionPhotoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface HighResolutionPhotoSession extends Session, AutoExposure, Focus { /** @@ -10168,8 +9714,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'error', callback: ErrorCallback): void; @@ -10181,8 +9726,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'error', callback?: ErrorCallback): void; @@ -10194,8 +9738,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -10207,8 +9750,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; } @@ -10238,8 +9780,7 @@ declare namespace camera { * @interface MacroPhotoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ interface MacroPhotoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorEffect, ManualFocus, DepthFusion, ColorManagement { /** @@ -10250,8 +9791,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'error', callback: ErrorCallback): void; @@ -10263,8 +9803,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'error', callback?: ErrorCallback): void; @@ -10276,8 +9815,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -10289,8 +9827,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -10302,8 +9839,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; @@ -10315,8 +9851,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; } @@ -10337,8 +9872,7 @@ declare namespace camera { * @interface MacroVideoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ interface MacroVideoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorEffect, ManualFocus, ColorManagement { /** @@ -10349,8 +9883,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'error', callback: ErrorCallback): void; @@ -10362,8 +9895,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'error', callback?: ErrorCallback): void; @@ -10375,8 +9907,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -10388,8 +9919,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -10401,8 +9931,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; @@ -10414,8 +9943,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; } @@ -10426,8 +9954,7 @@ declare namespace camera { * @extends Session, Flash, AutoExposure, Focus, Zoom * @interface SecureSession * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Secure camera session object. @@ -10456,8 +9983,7 @@ declare namespace camera { * @throws { BusinessError } 7400102 - Operation not allowed. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Preview output is marked as secure out put by this interface. @@ -10486,8 +10012,7 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the capture session errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Registers a listener for error events on security camera sessions to get the result by registering @@ -10510,8 +10035,7 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the capture session errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Unsubscribes from error events. @@ -10530,8 +10054,7 @@ declare namespace camera { * @param { 'focusStateChange' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the focus state change. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Registers a listener for error events on security camera sessions to get the result by registering @@ -10554,8 +10077,7 @@ declare namespace camera { * @param { 'focusStateChange' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the focus state change. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Unsubscribes from focus status change event callback. @@ -10576,8 +10098,7 @@ declare namespace camera { * @interface LightPaintingPhotoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface LightPaintingPhotoSession extends Session, Flash, Focus, Zoom, ColorEffect { /** @@ -10588,8 +10109,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'error', callback: ErrorCallback): void; @@ -10601,8 +10121,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'error', callback?: ErrorCallback): void; @@ -10614,8 +10133,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -10627,8 +10145,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -10640,8 +10157,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; @@ -10653,8 +10169,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; @@ -10666,8 +10181,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ getLightPaintingType(): LightPaintingType; @@ -10680,8 +10194,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ setLightPaintingType(type: LightPaintingType): void; @@ -10693,8 +10206,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ getSupportedLightPaintingTypes(): Array; } @@ -10706,8 +10218,7 @@ declare namespace camera { * @interface QuickShotPhotoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface QuickShotPhotoSession extends Session, AutoExposure, ColorEffect, ColorManagement, EffectSuggestion, Flash, Focus, Zoom { /** @@ -10718,8 +10229,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'error', callback: ErrorCallback): void; @@ -10731,8 +10241,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'error', callback?: ErrorCallback): void; @@ -10744,8 +10253,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'effectSuggestionChange', callback: AsyncCallback): void; @@ -10757,8 +10265,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'effectSuggestionChange', callback?: AsyncCallback): void; @@ -10770,8 +10277,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -10783,8 +10289,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -10796,8 +10301,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; @@ -10809,8 +10313,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; } @@ -10822,8 +10325,7 @@ declare namespace camera { * @interface PanoramaPhotoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface PanoramaPhotoSession extends Session, Focus, AutoExposure, WhiteBalance, ColorEffect { /** @@ -10834,8 +10336,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'error', callback: ErrorCallback): void; @@ -10847,8 +10348,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'error', callback?: ErrorCallback): void; @@ -10860,8 +10360,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -10873,8 +10372,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; } @@ -10886,8 +10384,7 @@ declare namespace camera { * @interface FluorescencePhotoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface FluorescencePhotoSession extends Session, AutoExposure, Focus, Zoom { /** @@ -10898,8 +10395,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ on(type: 'error', callback: ErrorCallback): void; @@ -10911,8 +10407,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ off(type: 'error', callback?: ErrorCallback): void; @@ -10924,8 +10419,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -10937,8 +10431,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; } @@ -10950,8 +10443,7 @@ declare namespace camera { * @interface PhotoFunctions * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface PhotoFunctions extends FlashQuery, AutoExposureQuery, ManualExposureQuery, FocusQuery, ZoomQuery, BeautyQuery, ColorEffectQuery, ColorManagementQuery, MacroQuery, SceneDetectionQuery { } @@ -10963,8 +10455,7 @@ declare namespace camera { * @interface VideoFunctions * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface VideoFunctions extends FlashQuery, AutoExposureQuery, ManualExposureQuery, FocusQuery, ZoomQuery, StabilizationQuery, BeautyQuery, ColorEffectQuery, ColorManagementQuery, MacroQuery, SceneDetectionQuery { } @@ -10976,8 +10467,7 @@ declare namespace camera { * @interface PortraitPhotoFunctions * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface PortraitPhotoFunctions extends FlashQuery, AutoExposureQuery, FocusQuery, ZoomQuery, BeautyQuery, ColorEffectQuery, ColorManagementQuery, PortraitQuery, ApertureQuery, SceneDetectionQuery { } @@ -10989,8 +10479,7 @@ declare namespace camera { * @interface PhotoConflictFunctions * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface PhotoConflictFunctions extends ZoomQuery, MacroQuery { } @@ -11002,8 +10491,7 @@ declare namespace camera { * @interface VideoConflictFunctions * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface VideoConflictFunctions extends ZoomQuery, MacroQuery { } @@ -11015,8 +10503,7 @@ declare namespace camera { * @extends ZoomQuery, PortraitQuery, ApertureQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface PortraitPhotoConflictFunctions extends ZoomQuery, PortraitQuery, ApertureQuery { } @@ -11026,8 +10513,7 @@ declare namespace camera { * * @interface CameraOutput * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Camera output object. @@ -11044,8 +10530,7 @@ declare namespace camera { * @param { AsyncCallback } callback - Callback used to return the result. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Release output instance. @@ -11064,8 +10549,7 @@ declare namespace camera { * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Release output instance. @@ -11092,22 +10576,22 @@ declare namespace camera { * Status of the sketch stream. * 0 is stop, and 1 is start. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 11 */ - status: int; + status: number; /** * The zoom ratio of the sketch stream. * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 11 */ - sketchRatio: double; + sketchRatio: number; } /** @@ -11116,8 +10600,7 @@ declare namespace camera { * @extends CameraOutput * @interface PreviewOutput * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Preview output object. @@ -11181,8 +10664,7 @@ declare namespace camera { * @param { 'frameStart' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Registers a listener for the preview frame to start to get the result by registering @@ -11205,8 +10687,7 @@ declare namespace camera { * @param { 'frameStart' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Unsubscribes from frame start event callback. @@ -11225,8 +10706,7 @@ declare namespace camera { * @param { 'frameEnd' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Registers a listener for the end of the preview frame to get the result by registering @@ -11249,8 +10729,7 @@ declare namespace camera { * @param { 'frameEnd' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Unsubscribes from frame end event callback. @@ -11269,8 +10748,7 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the preview output errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Registers a listener for error events on the preview output to get the result by registering @@ -11293,8 +10771,7 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the preview output errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Unsubscribes from error events. @@ -11312,8 +10789,7 @@ declare namespace camera { * * @returns { Array } The array of supported frame rate range. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Get supported frame rates which can be set during session running. @@ -11328,13 +10804,12 @@ declare namespace camera { /** * Set a frame rate range. * - * @param { int } minFps - Minimum frame rate per second. - * @param { int } maxFps - Maximum frame rate per second. + * @param { number } minFps - Minimum frame rate per second. + * @param { number } maxFps - Maximum frame rate per second. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400110 - Unresolved conflicts with current configurations. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * The supported frame rate range can be queried via the getSupportedFrameRates interface before setting. @@ -11354,8 +10829,7 @@ declare namespace camera { * * @returns { FrameRateRange } The active frame rate range. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Queryable after setting the frame rate for the preview stream using the setFrameRate interface. @@ -11373,8 +10847,7 @@ declare namespace camera { * @returns { Profile } The current preconfig type. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Gets the current preconfig type if you had already call preconfig interface. @@ -11390,13 +10863,12 @@ declare namespace camera { /** * Gets the preview rotation angle. * - * @param { int } displayRotation - The current display rotation angle. + * @param { number } displayRotation - The current display rotation angle. * @returns { ImageRotation } The preview rotation angle. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Gets the preview rotation angle. @@ -11419,8 +10891,7 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Sets the preview rotation angle. @@ -11452,8 +10923,7 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ addDeferredSurface(surfaceId: string): void; @@ -11464,23 +10934,21 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ isSketchSupported(): boolean; /** * Gets the specific zoom ratio when sketch stream open. * - * @returns { double } The specific zoom ratio of sketch. + * @returns { number } The specific zoom ratio of sketch. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - getSketchRatio(): double; + getSketchRatio(): number; /** * Enable sketch for camera. @@ -11502,8 +10970,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enableSketch(enabled: boolean): void; @@ -11527,8 +10994,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ attachSketchSurface(surfaceId: string): void; @@ -11540,8 +11006,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ on(type: 'sketchStatusChanged', callback: AsyncCallback): void; @@ -11553,8 +11018,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ off(type: 'sketchStatusChanged', callback?: AsyncCallback): void; } @@ -11562,11 +11026,10 @@ declare namespace camera { /** * Enum for effect suggestion. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum EffectSuggestionType { /** @@ -11574,8 +11037,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ EFFECT_SUGGESTION_NONE = 0, /** @@ -11583,8 +11045,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ EFFECT_SUGGESTION_PORTRAIT = 1, /** @@ -11592,8 +11053,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ EFFECT_SUGGESTION_FOOD = 2, @@ -11602,8 +11062,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ EFFECT_SUGGESTION_SKY = 3, @@ -11612,8 +11071,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ EFFECT_SUGGESTION_SUNRISE_SUNSET = 4, @@ -11632,8 +11090,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ class EffectSuggestionStatus { /** @@ -11642,8 +11099,7 @@ declare namespace camera { * @type { EffectSuggestionType } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ type: EffectSuggestionType; /** @@ -11652,8 +11108,7 @@ declare namespace camera { * @type { boolean } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ status: boolean; } @@ -11661,7 +11116,7 @@ declare namespace camera { /** * Enumerates the image rotation angles. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -11754,7 +11209,7 @@ declare namespace camera { /** * Latitude. * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -11766,12 +11221,12 @@ declare namespace camera { * @atomicservice * @since 19 */ - latitude: double; + latitude: number; /** * Longitude. * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -11783,12 +11238,12 @@ declare namespace camera { * @atomicservice * @since 19 */ - longitude: double; + longitude: number; /** * Altitude. * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -11800,13 +11255,13 @@ declare namespace camera { * @atomicservice * @since 19 */ - altitude: double; + altitude: number; } /** * Enumerates the image quality levels. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -11955,7 +11410,7 @@ declare namespace camera { /** * Enumerates the delivery image types. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 11 @@ -11994,8 +11449,7 @@ declare namespace camera { * * @typedef Photo * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Photo object @@ -12067,8 +11521,7 @@ declare namespace camera { * @typedef DeferredPhotoProxy * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ interface DeferredPhotoProxy { /** @@ -12097,7 +11550,7 @@ declare namespace camera { /** * Enumerates the camera video codec type. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 13 */ @@ -12147,8 +11600,7 @@ declare namespace camera { * @extends CameraOutput * @interface PhotoOutput * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Photo output object. @@ -12167,8 +11619,7 @@ declare namespace camera { * @throws { BusinessError } 7400104 - Session not running. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Start capture output. @@ -12189,8 +11640,7 @@ declare namespace camera { * @throws { BusinessError } 7400104 - Session not running. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Start capture output. @@ -12213,8 +11663,7 @@ declare namespace camera { * @throws { BusinessError } 7400104 - Session not running. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Start capture output. @@ -12251,8 +11700,7 @@ declare namespace camera { * @throws { BusinessError } 7400104 - Session not running. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Start capture output. @@ -12280,8 +11728,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ burstCapture(setting: PhotoCaptureSetting): Promise; @@ -12306,8 +11753,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ isRawDeliverySupported(): boolean; @@ -12336,8 +11782,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ isDeferredImageDeliverySupported(type: DeferredDeliveryImageType): boolean; @@ -12352,8 +11797,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ isDeferredImageDeliveryEnabled(type: DeferredDeliveryImageType): boolean; @@ -12367,8 +11811,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ deferImageDelivery(type: DeferredDeliveryImageType): void; @@ -12381,8 +11824,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ isDepthDataDeliverySupported(): boolean; @@ -12396,8 +11838,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ enableDepthDataDelivery(enabled: boolean): void; @@ -12407,8 +11848,7 @@ declare namespace camera { * @returns { Array } An array of supported video codec types for moving photo. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ /** * Get supported moving photo video codec types. @@ -12427,8 +11867,7 @@ declare namespace camera { * @param { VideoCodecType } codecType - Codec type for moving photo. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ /** * Sets codec type for moving photo, default to AVC. @@ -12562,8 +12001,7 @@ declare namespace camera { * * @returns { boolean } Is the mirror supported. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Check whether to support mirror photo. @@ -12583,8 +12021,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ /** * Whether to enable moving photo mirroring. @@ -12633,8 +12070,7 @@ declare namespace camera { * @param { 'captureStartWithInfo' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the capture start info. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Registers a listener for the start of the photo taking to get the CaptureStartInfo by registering @@ -12657,8 +12093,7 @@ declare namespace camera { * @param { 'captureStartWithInfo' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the capture start info. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Unsubscribes from capture start event callback. @@ -12677,8 +12112,7 @@ declare namespace camera { * @param { 'frameShutter' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the frame shutter information. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Subscribes frame shutter event callback. @@ -12697,8 +12131,7 @@ declare namespace camera { * @param { 'frameShutter' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the frame shutter information. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Unsubscribes from frame shutter event callback. @@ -12717,8 +12150,7 @@ declare namespace camera { * @param { 'frameShutterEnd' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the frame shutter end information. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Registers a listener for the end of photo exposure capture to get the result by registering @@ -12741,8 +12173,7 @@ declare namespace camera { * @param { 'frameShutterEnd' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the frame shutter end information. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Unsubscribes from frame shutter end event callback. @@ -12761,8 +12192,7 @@ declare namespace camera { * @param { 'captureEnd' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the capture end information. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Registers a listener for the end of the photo shoot to get the result by registering @@ -12786,8 +12216,7 @@ declare namespace camera { * @param { 'captureEnd' } type - Event type. * @param { AsyncCallback } callback - Callback used to get the capture end information. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Unsubscribes from capture end event callback. @@ -12806,8 +12235,7 @@ declare namespace camera { * @param { 'captureReady' } type - Event type. * @param { AsyncCallback } callback - Callback used to notice capture ready. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Registers a listener for the next available shot to get the result by registering @@ -12830,8 +12258,7 @@ declare namespace camera { * @param { 'captureReady' } type - Event type. * @param { AsyncCallback } callback - Callback used to notice capture ready. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Unsubscribes from capture ready event callback. @@ -12848,10 +12275,9 @@ declare namespace camera { * Subscribes estimated capture duration event callback. * * @param { 'estimatedCaptureDuration' } type - Event type. - * @param { AsyncCallback } callback - Callback used to notify the estimated capture duration (in milliseconds). + * @param { AsyncCallback } callback - Callback used to notify the estimated capture duration (in milliseconds). * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Registers a listener for the estimated time to take a picture to get the result by registering @@ -12872,10 +12298,9 @@ declare namespace camera { * Unsubscribes from estimated capture duration event callback. * * @param { 'estimatedCaptureDuration' } type - Event type. - * @param { AsyncCallback } callback - Callback used to notify the estimated capture duration (in milliseconds). + * @param { AsyncCallback } callback - Callback used to notify the estimated capture duration (in milliseconds). * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Unsubscribes from estimated capture duration event callback. @@ -12894,8 +12319,7 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the photo output errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Registers a listener for errors in the photo output to get the result by registering @@ -12918,8 +12342,7 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the photo output errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Unsubscribes from error events. @@ -12938,8 +12361,7 @@ declare namespace camera { * @returns { Profile } The current preconfig type. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Gets the current preconfig type if you had already call preconfig interface. @@ -12971,8 +12393,7 @@ declare namespace camera { * @throws { BusinessError } 7400104 - session is not running. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ isQuickThumbnailSupported(): boolean; @@ -13001,8 +12422,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enableQuickThumbnail(enabled: boolean): void; @@ -13039,8 +12459,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ isAutoHighQualityPhotoSupported(): boolean; @@ -13054,8 +12473,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ enableAutoHighQualityPhoto(enabled: boolean): void; @@ -13067,8 +12485,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ isAutoCloudImageEnhancementSupported(): boolean; @@ -13081,8 +12498,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ enableAutoCloudImageEnhancement(enabled: boolean): void; @@ -13092,8 +12508,7 @@ declare namespace camera { * @returns { boolean } TRUE if the moving photo is supported. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Confirm if moving photo supported. @@ -13115,8 +12530,7 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Enable moving photo. @@ -13135,13 +12549,12 @@ declare namespace camera { /** * Gets the photo rotation angle. * - * @param { int } deviceDegree - The current device rotation degree. + * @param { number } deviceDegree - The current device rotation degree. * @returns { ImageRotation } The photo rotation angle. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Gets the photo rotation angle. @@ -13164,8 +12577,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ isOfflineSupported(): boolean; @@ -13177,8 +12589,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ enableOffline(): void; @@ -13191,8 +12602,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ on(type: 'offlineDeliveryFinished', callback: AsyncCallback): void; @@ -13205,8 +12615,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ off(type: 'offlineDeliveryFinished', callback?: AsyncCallback): void; } @@ -13230,7 +12639,7 @@ declare namespace camera { /** * Capture id. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -13242,11 +12651,11 @@ declare namespace camera { * @atomicservice * @since 19 */ - captureId: int; + captureId: number; /** * Timestamp for frame. * - * @type { long } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -13258,7 +12667,7 @@ declare namespace camera { * @atomicservice * @since 19 */ - timestamp: long; + timestamp: number; } /** @@ -13280,7 +12689,7 @@ declare namespace camera { /** * Capture id. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 12 */ @@ -13292,7 +12701,7 @@ declare namespace camera { * @atomicservice * @since 19 */ - captureId: int; + captureId: number; } /** @@ -13314,7 +12723,7 @@ declare namespace camera { /** * Capture id. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 11 */ @@ -13326,11 +12735,11 @@ declare namespace camera { * @atomicservice * @since 19 */ - captureId: int; + captureId: number; /** * Time(in milliseconds) is the shutter time for the photo. * - * @type { long } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 11 */ @@ -13342,7 +12751,7 @@ declare namespace camera { * @atomicservice * @since 19 */ - time: long; + time: number; } /** @@ -13364,7 +12773,7 @@ declare namespace camera { /** * Capture id. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -13376,11 +12785,11 @@ declare namespace camera { * @atomicservice * @since 19 */ - captureId: int; + captureId: number; /** * Frame count. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -13392,7 +12801,7 @@ declare namespace camera { * @atomicservice * @since 19 */ - frameCount: int; + frameCount: number; } /** @@ -13401,8 +12810,7 @@ declare namespace camera { * @typedef DeferredVideoEnhancementInfo * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface DeferredVideoEnhancementInfo { /** @@ -13412,8 +12820,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ readonly isDeferredVideoEnhancementAvailable: boolean; /** @@ -13423,8 +12830,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ readonly videoId?: string; } @@ -13435,8 +12841,7 @@ declare namespace camera { * @extends CameraOutput * @interface VideoOutput * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Video output object. @@ -13455,8 +12860,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Start video output. @@ -13477,8 +12881,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Start video output. @@ -13497,8 +12900,7 @@ declare namespace camera { * * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Stop video output. @@ -13515,8 +12917,7 @@ declare namespace camera { * * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Stop video output. @@ -13542,8 +12943,7 @@ declare namespace camera { * * @returns { boolean } Is video mirror supported. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ /** * Determine whether video mirror is supported. @@ -13573,8 +12973,7 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ /** * Enable/disable mirror recording. @@ -13600,8 +12999,7 @@ declare namespace camera { * * @returns { Array } The array of supported frame rate range. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Get supported frame rates which can be set during session running. @@ -13616,13 +13014,12 @@ declare namespace camera { /** * Set a frame rate range. * - * @param { int } minFps - Minimum frame rate per second. - * @param { int } maxFps - Maximum frame rate per second. + * @param { number } minFps - Minimum frame rate per second. + * @param { number } maxFps - Maximum frame rate per second. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400110 - Unresolved conflicts with current configurations. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Set a frame rate range. @@ -13642,8 +13039,7 @@ declare namespace camera { * * @returns { FrameRateRange } The active frame rate range. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Get active frame rate range which has been set before. @@ -13658,13 +13054,12 @@ declare namespace camera { /** * Gets the video rotation angle. * - * @param { int } deviceDegree - The current device rotation degree. + * @param { number } deviceDegree - The current device rotation degree. * @returns { ImageRotation } The video rotation angle. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Gets the video rotation angle. @@ -13687,8 +13082,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ isAutoDeferredVideoEnhancementSupported(): boolean; @@ -13700,8 +13094,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ isAutoDeferredVideoEnhancementEnabled(): boolean; @@ -13714,8 +13107,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ enableAutoDeferredVideoEnhancement(enabled: boolean): void; @@ -13726,8 +13118,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ getSupportedRotations(): Array; @@ -13738,8 +13129,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ isRotationSupported(): boolean; @@ -13751,8 +13141,7 @@ declare namespace camera { * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ setRotation(rotation: ImageRotation): void; @@ -13763,8 +13152,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ isAutoVideoFrameRateSupported(): boolean; @@ -13776,8 +13164,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ enableAutoVideoFrameRate(enabled: boolean): void; @@ -13789,8 +13176,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ on(type: 'deferredVideoEnhancementInfo', callback: AsyncCallback): void; @@ -13802,8 +13188,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ off(type: 'deferredVideoEnhancementInfo', callback?: AsyncCallback): void; @@ -13813,8 +13198,7 @@ declare namespace camera { * @param { 'frameStart' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Registers a listener for the start of the video recording to get the result by registering @@ -13837,8 +13221,7 @@ declare namespace camera { * @param { 'frameStart' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Unsubscribes from frame start event callback. @@ -13857,8 +13240,7 @@ declare namespace camera { * @param { 'frameEnd' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Subscribes frame end event callback. @@ -13877,8 +13259,7 @@ declare namespace camera { * @param { 'frameEnd' } type - Event type. * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Unsubscribes from frame end event callback. @@ -13897,8 +13278,7 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the video output errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Registers a listener for errors in the metadata stream to get the result by registering @@ -13921,8 +13301,7 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the video output errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Unsubscribes from error events. @@ -13941,8 +13320,7 @@ declare namespace camera { * @returns { VideoProfile } The current preconfig type. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Gets the current preconfig type if you had already call preconfig interface. @@ -13962,8 +13340,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ getSupportedVideoMetaTypes(): Array; @@ -13976,8 +13353,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ attachMetaSurface(surfaceId: string, type: VideoMetaType): void; } @@ -13985,19 +13361,17 @@ declare namespace camera { /** * Video meta type. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum VideoMetaType { /** * Video meta type for storing maker info. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ VIDEO_META_MAKER_INFO = 0 } @@ -14005,7 +13379,7 @@ declare namespace camera { /** * Metadata object type. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -14100,11 +13474,10 @@ declare namespace camera { /** * Enum for light painting tabletype. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum LightPaintingType { /** @@ -14112,8 +13485,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ TRAFFIC_TRAILS = 0, @@ -14122,8 +13494,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ STAR_TRAILS = 1, @@ -14132,8 +13503,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ SILKY_WATER = 2, @@ -14142,8 +13512,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ LIGHT_GRAFFITI = 3 } @@ -14167,7 +13536,7 @@ declare namespace camera { /** * X coordinator of top left point. * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -14179,11 +13548,11 @@ declare namespace camera { * @atomicservice * @since 19 */ - topLeftX: double; + topLeftX: number; /** * Y coordinator of top left point. * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -14195,11 +13564,11 @@ declare namespace camera { * @atomicservice * @since 19 */ - topLeftY: double; + topLeftY: number; /** * Width of this rectangle. * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -14211,11 +13580,11 @@ declare namespace camera { * @atomicservice * @since 19 */ - width: double; + width: number; /** * Height of this rectangle. * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @since 10 */ @@ -14227,17 +13596,16 @@ declare namespace camera { * @atomicservice * @since 19 */ - height: double; + height: number; } /** * Enum for emotion type. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ enum Emotion { /** @@ -14245,8 +13613,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ NEUTRAL = 0, @@ -14255,8 +13622,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ SADNESS = 1, @@ -14265,8 +13631,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ SMILE = 2, @@ -14275,8 +13640,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ SURPRISE = 3 } @@ -14286,8 +13650,7 @@ declare namespace camera { * * @typedef MetadataObject * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Metadata object basis. @@ -14304,8 +13667,7 @@ declare namespace camera { * @type { MetadataObjectType } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Metadata object type. @@ -14320,11 +13682,10 @@ declare namespace camera { /** * Metadata object timestamp in milliseconds. * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Metadata object timestamp in milliseconds. @@ -14342,8 +13703,7 @@ declare namespace camera { * @type { Rect } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * The axis-aligned bounding box of detected metadata object. @@ -14358,25 +13718,23 @@ declare namespace camera { /** * Metadata object id. * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ - readonly objectId: int; + readonly objectId: number; /** * Confidence for the detected type. * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ - readonly confidence: int; + readonly confidence: number; } /** @@ -14386,8 +13744,7 @@ declare namespace camera { * @extends MetadataObject * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface MetadataFaceObject extends MetadataObject { /** @@ -14397,8 +13754,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ readonly leftEyeBoundingBox: Rect; @@ -14409,8 +13765,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ readonly rightEyeBoundingBox: Rect; @@ -14421,58 +13776,53 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ readonly emotion: Emotion; /** * Emotion confidence. * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ - readonly emotionConfidence: int; + readonly emotionConfidence: number; /** * Pitch angle for face. * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ - readonly pitchAngle: int; + readonly pitchAngle: number; /** * Yaw angle for face. * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ - readonly yawAngle: int; + readonly yawAngle: number; /** * Roll angle for face. * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ - readonly rollAngle: int; + readonly rollAngle: number; } /** @@ -14482,8 +13832,7 @@ declare namespace camera { * @extends MetadataObject * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface MetadataHumanBodyObject extends MetadataObject { } @@ -14495,8 +13844,7 @@ declare namespace camera { * @extends MetadataObject * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface MetadataCatFaceObject extends MetadataObject { /** @@ -14506,8 +13854,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ readonly leftEyeBoundingBox: Rect; @@ -14518,8 +13865,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ readonly rightEyeBoundingBox: Rect; } @@ -14531,8 +13877,7 @@ declare namespace camera { * @extends MetadataObject * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface MetadataCatBodyObject extends MetadataObject { } @@ -14544,8 +13889,7 @@ declare namespace camera { * @extends MetadataObject * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface MetadataDogFaceObject extends MetadataObject { /** @@ -14555,8 +13899,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ readonly leftEyeBoundingBox: Rect; @@ -14567,8 +13910,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ readonly rightEyeBoundingBox: Rect; } @@ -14580,8 +13922,7 @@ declare namespace camera { * @extends MetadataObject * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface MetadataDogBodyObject extends MetadataObject { } @@ -14593,8 +13934,7 @@ declare namespace camera { * @extends MetadataObject * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface MetadataSalientDetectionObject extends MetadataObject { } @@ -14606,8 +13946,7 @@ declare namespace camera { * @typedef MetadataBarcodeObject * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ interface MetadataBarcodeObject extends MetadataObject { } @@ -14618,8 +13957,7 @@ declare namespace camera { * @typedef CameraOcclusionDetectionResult * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface CameraOcclusionDetectionResult { /** @@ -14629,8 +13967,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ readonly isCameraOccluded: boolean; @@ -14641,8 +13978,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ readonly isCameraLensDirty: boolean; } @@ -14653,8 +13989,7 @@ declare namespace camera { * @extends CameraOutput * @interface MetadataOutput * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Metadata Output object @@ -14673,8 +14008,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Start output metadata @@ -14695,8 +14029,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Start output metadata @@ -14715,8 +14048,7 @@ declare namespace camera { * * @param { AsyncCallback } callback - Callback used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Stop output metadata @@ -14733,8 +14065,7 @@ declare namespace camera { * * @returns { Promise } Promise used to return the result. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Stop output metadata @@ -14756,8 +14087,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ addMetadataObjectTypes(types: Array): void; @@ -14771,8 +14101,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ removeMetadataObjectTypes(types: Array): void; @@ -14782,8 +14111,7 @@ declare namespace camera { * @param { 'metadataObjectsAvailable' } type - Event type. * @param { AsyncCallback> } callback - Callback used to get the available metadata objects. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Registers a listener for the detected metadata object to get the result by registering @@ -14806,8 +14134,7 @@ declare namespace camera { * @param { 'metadataObjectsAvailable' } type - Event type. * @param { AsyncCallback> } callback - Callback used to get the available metadata objects. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Unsubscribes from metadata objects available event callback. @@ -14826,8 +14153,7 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the video output errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Registers a listener for errors in the video output to get the result by registering @@ -14850,8 +14176,7 @@ declare namespace camera { * @param { 'error' } type - Event type. * @param { ErrorCallback } callback - Callback used to get the video output errors. * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ /** * Unsubscribes from error events. @@ -15008,11 +14333,10 @@ declare namespace camera { /** * Enumerates the timelapse recording state. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum TimeLapseRecordState { /** @@ -15020,8 +14344,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ IDLE = 0, @@ -15030,8 +14353,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ RECORDING = 1 } @@ -15039,11 +14361,10 @@ declare namespace camera { /** * Enumerates the timelapse preview type. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum TimeLapsePreviewType { /** @@ -15051,8 +14372,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ DARK = 1, @@ -15061,8 +14381,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ LIGHT = 2 } @@ -15073,8 +14392,7 @@ declare namespace camera { * @typedef TryAEInfo * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface TryAEInfo { /** @@ -15084,8 +14402,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ readonly isTryAEDone: boolean; @@ -15096,8 +14413,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ readonly isTryAEHintNeeded?: boolean; @@ -15108,22 +14424,20 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ readonly previewType?: TimeLapsePreviewType; /** * Timelapse capture interval. * - * @type { ?int } + * @type { ?number } * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - readonly captureInterval?: int; + readonly captureInterval?: number; } /** @@ -15133,8 +14447,7 @@ declare namespace camera { * @interface TimeLapsePhotoSession * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface TimeLapsePhotoSession extends Session, Focus, ManualFocus, AutoExposure, ManualExposure, ManualIso, WhiteBalance, Zoom, ColorEffect { /** @@ -15145,8 +14458,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'error', callback: ErrorCallback): void; @@ -15158,8 +14470,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'error', callback?: ErrorCallback): void; @@ -15171,8 +14482,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'focusStateChange', callback: AsyncCallback): void; @@ -15184,8 +14494,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'focusStateChange', callback?: AsyncCallback): void; @@ -15197,8 +14506,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'isoInfoChange', callback: AsyncCallback): void; @@ -15210,8 +14518,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'isoInfoChange', callback?: AsyncCallback): void; @@ -15223,8 +14530,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'exposureInfoChange', callback: AsyncCallback): void; @@ -15236,8 +14542,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'exposureInfoChange', callback?: AsyncCallback): void; @@ -15249,8 +14554,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'luminationInfoChange', callback: AsyncCallback): void; @@ -15262,8 +14566,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'luminationInfoChange', callback?: AsyncCallback): void; @@ -15275,8 +14578,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ isTryAENeeded(): boolean; @@ -15288,8 +14590,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ startTryAE(): void; @@ -15301,8 +14602,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ stopTryAE(): void; @@ -15314,8 +14614,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'tryAEInfoChange', callback: AsyncCallback): void; @@ -15327,50 +14626,46 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(type: 'tryAEInfoChange', callback?: AsyncCallback): void; /** * Gets supported timelapse interval range. * - * @returns { Array } Timelapse interval range. + * @returns { Array } Timelapse interval range. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - getSupportedTimeLapseIntervalRange(): Array; + getSupportedTimeLapseIntervalRange(): Array; /** * Gets the timelapse interval in use. * - * @returns { int } the timelapse interval in use. + * @returns { number } the timelapse interval in use. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - getTimeLapseInterval(): int; + getTimeLapseInterval(): number; /** * Sets a timelapse interval for a camera device. * - * @param { int } interval The timelapse interval. + * @param { number } interval The timelapse interval. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - setTimeLapseInterval(interval: int): void; + setTimeLapseInterval(interval: number): void; /** * Gets the timelapse recording state in use. @@ -15393,8 +14688,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ setTimeLapseRecordState(state: TimeLapseRecordState): void; @@ -15419,8 +14713,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ setTimeLapsePreviewType(type: TimeLapsePreviewType): void; } @@ -15428,7 +14721,7 @@ declare namespace camera { /** * Enum for Depth Data Accuracy. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 13 @@ -15456,7 +14749,7 @@ declare namespace camera { /** * Enum for Depth Data Quality Level. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi * @since 13 @@ -15496,8 +14789,7 @@ declare namespace camera { * @interface DepthProfile * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface DepthProfile { /** @@ -15507,8 +14799,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ readonly format: CameraFormat; @@ -15519,8 +14810,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ readonly dataAccuracy: DepthDataAccuracy; @@ -15531,8 +14821,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ readonly size: Size; } @@ -15543,8 +14832,7 @@ declare namespace camera { * @interface DepthData. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface DepthData { /** @@ -15554,8 +14842,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ readonly format: CameraFormat; @@ -15577,8 +14864,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ readonly qualityLevel: DepthDataQualityLevel; @@ -15589,8 +14875,7 @@ declare namespace camera { * @readonly * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ readonly dataAccuracy: DepthDataAccuracy; @@ -15613,8 +14898,7 @@ declare namespace camera { * @interface DepthDataOutput * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface DepthDataOutput extends CameraOutput { /** @@ -15626,8 +14910,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ start(): Promise; @@ -15640,8 +14923,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ stop(): Promise; @@ -15653,8 +14935,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ on(type: 'depthDataAvailable', callback: AsyncCallback): void; @@ -15666,8 +14947,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ off(type: 'depthDataAvailable', callback?: AsyncCallback): void; @@ -15679,8 +14959,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ on(type: 'error', callback: ErrorCallback): void; @@ -15692,8 +14971,7 @@ declare namespace camera { * @throws { BusinessError } 202 - Not System Application. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ off(type: 'error', callback?: ErrorCallback): void; } @@ -15704,8 +14982,7 @@ declare namespace camera { * @interface DepthFusionQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ interface DepthFusionQuery { /** @@ -15716,23 +14993,21 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ isDepthFusionSupported(): boolean; /** * Query the depth fusion threshold. * - * @returns { Array } The depth fusion threshold. + * @returns { Array } The depth fusion threshold. * @throws { BusinessError } 202 - Not System Application. * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ - getDepthFusionThreshold(): Array; + getDepthFusionThreshold(): Array; } /** @@ -15742,8 +15017,7 @@ declare namespace camera { * @interface DepthFusion * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ interface DepthFusion extends DepthFusionQuery { /** @@ -15754,8 +15028,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ isDepthFusionEnabled(): boolean; @@ -15769,8 +15042,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ enableDepthFusion(enabled: boolean): void; } @@ -15778,11 +15050,10 @@ declare namespace camera { /** * Enum for auxiliary type. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ enum AuxiliaryType { /** @@ -15790,8 +15061,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ CONTRACT_LENS = 0 } @@ -15799,11 +15069,10 @@ declare namespace camera { /** * Enum for auxiliary status. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ enum AuxiliaryStatus { /** @@ -15811,8 +15080,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ LOCKED = 0, @@ -15821,8 +15089,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ ON = 1, @@ -15831,8 +15098,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ OFF = 2 } @@ -15840,11 +15106,10 @@ declare namespace camera { /** * Enum for color reservation type. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ enum ColorReservationType { /** @@ -15852,8 +15117,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ NONE = 0, @@ -15862,8 +15126,7 @@ declare namespace camera { * * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ PORTRAIT = 1 } @@ -15874,8 +15137,7 @@ declare namespace camera { * @interface ColorReservationQuery * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ interface ColorReservationQuery { /** @@ -15886,8 +15148,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ getSupportedColorReservationTypes(): Array; } @@ -15899,8 +15160,7 @@ declare namespace camera { * @interface ColorReservation * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ interface ColorReservation extends ColorReservationQuery { /** @@ -15911,8 +15171,7 @@ declare namespace camera { * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ getColorReservation(): ColorReservationType; @@ -15929,8 +15188,7 @@ declare namespace camera { * @throws { BusinessError } 7400201 - Camera service fatal error. * @syscap SystemCapability.Multimedia.Camera.Core * @systemapi - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ setColorReservation(type: ColorReservationType): void; } diff --git a/api/@ohos.multimedia.cameraPicker.d.ts b/api/@ohos.multimedia.cameraPicker.d.ts index 4ae4cc9424..9998900eda 100644 --- a/api/@ohos.multimedia.cameraPicker.d.ts +++ b/api/@ohos.multimedia.cameraPicker.d.ts @@ -30,8 +30,7 @@ import type camera from './@ohos.multimedia.camera'; * @namespace cameraPicker * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ declare namespace cameraPicker { @@ -46,8 +45,7 @@ declare namespace cameraPicker { * * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ class PickerProfile { /** @@ -63,8 +61,7 @@ declare namespace cameraPicker { * @type { camera.CameraPosition } * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ cameraPosition: camera.CameraPosition; @@ -81,8 +78,7 @@ declare namespace cameraPicker { * @type { ?string } * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ saveUri?: string; @@ -96,13 +92,12 @@ declare namespace cameraPicker { /** * The max duration of the video. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - videoDuration?: int; + videoDuration?: number; } /** @@ -118,8 +113,7 @@ declare namespace cameraPicker { * @enum { string } * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum PickerMediaType { /** @@ -133,8 +127,7 @@ declare namespace cameraPicker { * * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ PHOTO = 'photo', @@ -149,8 +142,7 @@ declare namespace cameraPicker { * * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ VIDEO = 'video' } @@ -166,8 +158,7 @@ declare namespace cameraPicker { * * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ class PickerResult { /** @@ -180,13 +171,12 @@ declare namespace cameraPicker { /** * The result code. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - resultCode: int; + resultCode: number; /** * The result saved uri. @@ -201,8 +191,7 @@ declare namespace cameraPicker { * @type { string } * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ resultUri: string; @@ -219,8 +208,7 @@ declare namespace cameraPicker { * @type { PickerMediaType } * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ mediaType: PickerMediaType; } @@ -246,8 +234,7 @@ declare namespace cameraPicker { * method. The return value is PickerResult. * @syscap SystemCapability.Multimedia.Camera.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function pick(context: Context, mediaTypes: Array, pickerProfile: PickerProfile): Promise; } diff --git a/api/@ohos.multimedia.image.d.ts b/api/@ohos.multimedia.image.d.ts index 1d6634aef1..05a0b2fbdb 100644 --- a/api/@ohos.multimedia.image.d.ts +++ b/api/@ohos.multimedia.image.d.ts @@ -48,14 +48,14 @@ declare namespace image { /** * Enumerates pixel map formats. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Image.Core * @since 7 */ /** * Enumerates pixel map formats. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @since 10 @@ -63,7 +63,7 @@ declare namespace image { /** * Enumerates pixel map formats. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @atomicservice @@ -72,7 +72,7 @@ declare namespace image { /** * Enumerates pixel map formats. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form @@ -454,7 +454,7 @@ declare namespace image { /** * Enumerates image resolution quality. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Image.Core * @systemapi * @since 12 @@ -526,14 +526,14 @@ declare namespace image { /** * Height * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @since 6 */ /** * Height * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @since 10 @@ -541,7 +541,7 @@ declare namespace image { /** * Height * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @atomicservice @@ -562,14 +562,14 @@ declare namespace image { /** * Width * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @since 6 */ /** * Width * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @since 10 @@ -577,7 +577,7 @@ declare namespace image { /** * Width * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @atomicservice @@ -2335,7 +2335,7 @@ declare namespace image { /** * Enum for image formats. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Image.Core * @since 9 */ @@ -2360,14 +2360,14 @@ declare namespace image { /** * Enumerates alpha types. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Image.Core * @since 9 */ /** * Enumerates alpha types. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @since 10 @@ -2375,7 +2375,7 @@ declare namespace image { /** * Enumerates alpha types. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @atomicservice @@ -2384,7 +2384,7 @@ declare namespace image { /** * Enumerates alpha types. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @form @@ -2524,7 +2524,7 @@ declare namespace image { /** * Enumerates decoding dynamic range. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Image.Core * @since 12 */ @@ -2559,7 +2559,7 @@ declare namespace image { /** * Enumerates packing dynamic range. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Image.Core * @since 12 */ @@ -2762,7 +2762,7 @@ declare namespace image { /** * The component type of image. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Image.ImageReceiver * @since 9 */ @@ -2803,7 +2803,7 @@ declare namespace image { /** * Enumerates the HDR metadata types that need to be stored in Pixelmap. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Image.Core * @since 12 */ @@ -2844,7 +2844,7 @@ declare namespace image { /** * Value for HDR_METADATA_TYPE. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Image.Core * @since 12 */ @@ -2885,7 +2885,7 @@ declare namespace image { /** * Type of allocator used to allocate memory of a PixelMap. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Image.Core * @since 15 */ @@ -2989,14 +2989,14 @@ declare namespace image { /** * x-coordinate at the upper left corner of the image. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @since 7 */ /** * x-coordinate at the upper left corner of the image. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @since 10 @@ -3004,7 +3004,7 @@ declare namespace image { /** * x-coordinate at the upper left corner of the image. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @atomicservice @@ -3025,14 +3025,14 @@ declare namespace image { /** * y-coordinate at the upper left corner of the image. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @since 7 */ /** * y-coordinate at the upper left corner of the image. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @since 10 @@ -3040,7 +3040,7 @@ declare namespace image { /** * y-coordinate at the upper left corner of the image. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @atomicservice @@ -3313,14 +3313,14 @@ declare namespace image { /** * Indicates image default density. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @since 9 */ /** * Indicates image default density. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @since 10 @@ -3328,7 +3328,7 @@ declare namespace image { /** * Indicates image default density. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @atomicservice @@ -3349,7 +3349,7 @@ declare namespace image { /** * The number of byte per row. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @atomicservice * @since 11 @@ -3412,7 +3412,7 @@ declare namespace image { /** * Enumerates the strategies for executing the cropping and scaling operations when both desiredSize and desiredRegion are specified. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.Multimedia.Image.Core * @since 18 */ @@ -3488,14 +3488,14 @@ declare namespace image { /** * Quality of the target image. The value is an integer ranging from 0 to 100. A larger value indicates better. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.ImagePacker * @since 6 */ /** * Quality of the target image. The value is an integer ranging from 0 to 100. A larger value indicates better. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.ImagePacker * @crossplatform * @since 10 @@ -3515,7 +3515,7 @@ declare namespace image { * BufferSize of the target image. * If this bufferSize is less than or equal to 0, it will be converted to 10MB. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.Multimedia.Image.ImagePacker * @since 9 */ @@ -3523,7 +3523,7 @@ declare namespace image { * BufferSize of the target image. * If this bufferSize is less than or equal to 0, it will be converted to 10MB. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.Multimedia.Image.ImagePacker * @crossplatform * @since 10 @@ -3564,51 +3564,46 @@ declare namespace image { * * @typedef PackingOptionsForSequence * @syscap SystemCapability.Multimedia.Image.ImagePacker - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ interface PackingOptionsForSequence { /** * Specify the number of frames. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.ImagePacker - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ - frameCount: int; + frameCount: number; /** * Specify the delay time for each frame of the dynamic image. * If the length is less than frameCount, the missing parts will be filling with the last value * - * @type { Array } + * @type { Array } * @syscap SystemCapability.Multimedia.Image.ImagePacker - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ - delayTimeList: Array; + delayTimeList: Array; /** * Specify the disposal types of each frame in the image sequence packing. * - * @type { ?Array } + * @type { ?Array } * @syscap SystemCapability.Multimedia.Image.ImagePacker - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ - disposalTypes?: Array; + disposalTypes?: Array; /** * Specify the number of times the loop should, the range is [0, 65535] * If this loop is equal to 0, it will be infinite loop. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.Multimedia.Image.ImagePacker - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ - loopCount?: int; + loopCount?: number; } /** @@ -3742,14 +3737,14 @@ declare namespace image { /** * Number of image frames. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.Multimedia.Image.ImageSource * @since 7 */ /** * Number of image frames. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.Multimedia.Image.ImageSource * @crossplatform * @since 10 @@ -3757,7 +3752,7 @@ declare namespace image { /** * Number of image frames. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.Multimedia.Image.ImageSource * @crossplatform * @atomicservice @@ -3778,14 +3773,14 @@ declare namespace image { /** * Sampling ratio of the image pixel map. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.Multimedia.Image.ImageSource * @since 7 */ /** * Sampling ratio of the image pixel map. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.Multimedia.Image.ImageSource * @crossplatform * @since 10 @@ -3793,7 +3788,7 @@ declare namespace image { /** * Sampling ratio of the image pixel map. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.Multimedia.Image.ImageSource * @crossplatform * @atomicservice @@ -3814,14 +3809,14 @@ declare namespace image { /** * Rotation angle of the image pixel map. The value ranges from 0 to 360. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.Multimedia.Image.ImageSource * @since 7 */ /** * Rotation angle of the image pixel map. The value ranges from 0 to 360. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.Multimedia.Image.ImageSource * @crossplatform * @since 10 @@ -3829,7 +3824,7 @@ declare namespace image { /** * Rotation angle of the image pixel map. The value ranges from 0 to 360. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.Multimedia.Image.ImageSource * @crossplatform * @atomicservice @@ -3998,14 +3993,14 @@ declare namespace image { /** * The density for image pixel map. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.Multimedia.Image.ImageSource * @since 9 */ /** * The density for image pixel map. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.Multimedia.Image.ImageSource * @crossplatform * @since 10 @@ -4013,7 +4008,7 @@ declare namespace image { /** * The density for image pixel map. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.Multimedia.Image.ImageSource * @crossplatform * @atomicservice @@ -4382,14 +4377,14 @@ declare namespace image { /** * The density for ImageSource. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @since 9 */ /** * The density for ImageSource. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @since 10 @@ -4397,7 +4392,7 @@ declare namespace image { /** * The density for ImageSource. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core * @crossplatform * @atomicservice @@ -4493,8 +4488,7 @@ declare namespace image { * * @typedef HdrStaticMetadata * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface HdrStaticMetadata { /** @@ -4504,10 +4498,9 @@ declare namespace image { * * @type { Array } * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - displayPrimariesX: Array; + displayPrimariesX: Array; /** * The Y-coordinate of the primary colors. Specifies the normalized Y-coordinates of the display device's three @@ -4516,76 +4509,69 @@ declare namespace image { * * @type { Array } * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - displayPrimariesY: Array; + displayPrimariesY: Array; /** * The X-coordinate of the white point value. Specifies the normalized X-coordinate of the white point. * The value is represented in units of 0.00002 and must fall within the range [0.0, 1.0]. * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - whitePointX: double; + whitePointX: number; /** * The Y-coordinate of the white point value. Specifies the normalized Y-coordinate of the white point. * The value is represented in units of 0.00002 and must fall within the range [0.0, 1.0]. * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - whitePointY: double; + whitePointY: number; /** * Maximum luminance of the image's primary display. * The value is measured in units of 1, with a maximum allowed value of 65,535. * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - maxLuminance: double; + maxLuminance: number; /** * Minimum luminance of the image's primary display. * The value is measured in units of 0.0001, with a maximum allowed value of 6.55535. * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - minLuminance: double; + minLuminance: number; /** * Maximum brightness of displayed content. * The value is measured in units of 1, with a maximum allowed value of 65,535. * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - maxContentLightLevel: double; + maxContentLightLevel: number; /** * Maximum average brightness of displayed content. * The value is measured in units of 1, with a maximum allowed value of 65,535. * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - maxFrameAverageLightLevel: double; + maxFrameAverageLightLevel: number; } /** @@ -4593,59 +4579,53 @@ declare namespace image { * * @typedef GainmapChannel * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface GainmapChannel { /** * The per-component max gain map values. * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - gainmapMax: double; + gainmapMax: number; /** * The per-component min gain map values. * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - gainmapMin: double; + gainmapMin: number; /** * The per-component gamma values. * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - gamma: double; + gamma: number; /** * The per-component baseline offset. * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - baseOffset: double; + baseOffset: number; /** * The per-component alternate offset. * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - alternateOffset: double; + alternateOffset: number; } /** @@ -4653,77 +4633,69 @@ declare namespace image { * * @typedef HdrGainmapMetadata * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface HdrGainmapMetadata { /** * The version used by the writer. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - writerVersion: int; + writerVersion: number; /** * The minimum version a parser needs to understand. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - miniVersion: int; + miniVersion: number; /** * The number of gain map channels, with a value of 1 or 3. * - * @type { int } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - gainmapChannelCount: int; + gainmapChannelCount: number; /** * Indicate whether to use the color space of the base image. * * @type { boolean } * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ useBaseColorFlag: boolean; /** * The baseline hdr headroom. * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - baseHeadroom: double; + baseHeadroom: number; /** * The alternate hdr headroom. * - * @type { double } + * @type { number } * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - alternateHeadroom: double; + alternateHeadroom: number; /** * The per-channel metadata. * * @type { Array } * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ channels: Array; } @@ -4733,8 +4705,7 @@ declare namespace image { * * @typedef {HdrMetadataType | HdrStaticMetadata | ArrayBuffer | HdrGainmapMetadata} HdrMetadataValue * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ type HdrMetadataValue = HdrMetadataType | HdrStaticMetadata | ArrayBuffer | HdrGainmapMetadata; @@ -5088,7 +5059,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise): void; @@ -5598,8 +5565,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; @@ -5639,8 +5605,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise): void; @@ -5800,8 +5765,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; @@ -5845,8 +5809,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise): void; @@ -5870,8 +5833,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the operation result. If the operation fails, an error message is returned. * @throws { BusinessError } 62980137 - Invalid image operation. * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ toSdr(): Promise; @@ -6063,15 +6025,14 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise): void; @@ -6951,8 +6909,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; @@ -6967,8 +6924,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; @@ -7157,8 +7113,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; @@ -7166,8 +7121,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise @@ -7223,8 +7174,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise @@ -7237,8 +7187,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } * @syscap SystemCapability.Multimedia.Image.ImageSource - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ desiredAuxiliaryPictures: Array; } @@ -8307,10 +8250,9 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise>; + getDisposalTypeList(): Promise>; /** * Obtains the count of frame in an image. This method uses a promise to return the number. @@ -8318,7 +8260,6 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the number. * @throws { BusinessError } 62980096 - The operation failed. Possible cause: 1.Image upload exception. * 2. Decoding process exception. 3. Insufficient memory. - * @throws { BusinessError } 62980110 - The image source data is incorrect. * @throws { BusinessError } 62980111 - The image source data is incomplete. * @throws { BusinessError } 62980112 - The image format does not match. * @throws { BusinessError } 62980113 - Unknown image format. @@ -8338,7 +8279,6 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the number. * @throws { BusinessError } 62980096 - The operation failed. Possible cause: 1.Image upload exception. * 2. Decoding process exception. 3. Insufficient memory. - * @throws { BusinessError } 62980110 - The image source data is incorrect. * @throws { BusinessError } 62980111 - The image source data is incomplete. * @throws { BusinessError } 62980112 - The image format does not match. * @throws { BusinessError } 62980113 - Unknown image format. @@ -8350,10 +8290,9 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; + getFrameCount(): Promise; /** * Obtains the count of frame in an image. This method uses a callback to return the number. @@ -8361,7 +8300,6 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback used to return the number. * @throws { BusinessError } 62980096 - The operation failed. Possible cause: 1.Image upload exception. * 2. Decoding process exception. 3. Insufficient memory. - * @throws { BusinessError } 62980110 - The image source data is incorrect. * @throws { BusinessError } 62980111 - The image source data is incomplete. * @throws { BusinessError } 62980112 - The image format does not match. * @throws { BusinessError } 62980113 - Unknown image format. @@ -8381,7 +8319,6 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback used to return the number. * @throws { BusinessError } 62980096 - The operation failed. Possible cause: 1.Image upload exception. * 2. Decoding process exception. 3. Insufficient memory. - * @throws { BusinessError } 62980110 - The image source data is incorrect. * @throws { BusinessError } 62980111 - The image source data is incomplete. * @throws { BusinessError } 62980112 - The image format does not match. * @throws { BusinessError } 62980113 - Unknown image format. @@ -8393,10 +8330,9 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise): void; + getFrameCount(callback: AsyncCallback): void; /** * Obtains the value of a property in an image with the specified index. This method uses a @@ -8696,15 +8632,14 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the property value. * @syscap SystemCapability.Multimedia.Image.ImageSource * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - updateData(buf: ArrayBuffer, isFinished: boolean, offset: int, length: int): Promise; + updateData(buf: ArrayBuffer, isFinished: boolean, offset: number, length: number): Promise; /** * Update the data in the incremental ImageSource. @@ -8734,19 +8669,18 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback to return the operation result. * @syscap SystemCapability.Multimedia.Image.ImageSource * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ updateData( buf: ArrayBuffer, isFinished: boolean, - offset: int, - length: int, + offset: number, + length: number, callback: AsyncCallback ): void; @@ -8794,8 +8728,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise @@ -8973,8 +8906,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; @@ -9074,8 +9006,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; @@ -9089,8 +9020,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise, options: PackingOptionsForSequence): Promise; @@ -9194,17 +9124,16 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } pixelmapSequence PixelMaps to be encoded. - * @param { int } fd File descriptor of the output encoded file. + * @param { number } fd File descriptor of the output encoded file. * @param { PackingOptionsForSequence } options Options for image packing. * @returns { Promise } void. * @throws { BusinessError } 401 - Parameter error.Possible causes: 1.Mandatory parameters are left unspecified. * 2.Incorrect parameter types;3.Parameter verification failed. * @throws { BusinessError } 7800301 - Failed to encode image. * @syscap SystemCapability.Multimedia.Image.ImagePacker - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ - packToFileFromPixelmapSequence(pixelmapSequence: Array, fd: int, options: PackingOptionsForSequence): Promise; + packToFileFromPixelmapSequence(pixelmapSequence: Array, fd: number, options: PackingOptionsForSequence): Promise; /** * Releases an ImagePacker instance and uses a callback to return the result. @@ -9329,12 +9258,12 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback used to return the next image. * @syscap SystemCapability.Multimedia.Image.ImageReceiver - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ readNextImage(callback: AsyncCallback): void; @@ -9466,8 +9394,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the next image. * @syscap SystemCapability.Multimedia.Image.ImageReceiver - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ readNextImage(): Promise; @@ -9543,8 +9470,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback to return the operation result. * @syscap SystemCapability.Multimedia.Image.ImageCreator - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ dequeueImage(callback: AsyncCallback): void; @@ -9553,32 +9479,29 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the operation result. * @syscap SystemCapability.Multimedia.Image.ImageCreator - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ dequeueImage(): Promise; /** * Queue buffer to dirty queue and uses a callback to return the result. * - * @param { Image } image + * @param { Image } interface * @param { AsyncCallback } callback Callback to return the operation result. * @syscap SystemCapability.Multimedia.Image.ImageCreator - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - queueImage(image: Image, callback: AsyncCallback): void; + queueImage(interface: Image, callback: AsyncCallback): void; /** * Queue buffer to dirty queue and uses a promise to return the result. * - * @param { Image } image + * @param { Image } interface * @returns { Promise } A Promise instance used to return the operation result. * @syscap SystemCapability.Multimedia.Image.ImageCreator - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - queueImage(image: Image): Promise; + queueImage(interface: Image): Promise; /** * Subscribe callback when releasing buffer @@ -9586,8 +9509,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback used to return the operation result. * @syscap SystemCapability.Multimedia.Image.ImageCreator - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ on(type: 'imageRelease', callback: AsyncCallback): void; @@ -9597,8 +9519,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback to be removed. * @syscap SystemCapability.Multimedia.Image.ImageCreator - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ off(type: 'imageRelease', callback?: AsyncCallback): void; diff --git a/api/@ohos.multimedia.media.d.ts b/api/@ohos.multimedia.media.d.ts index 7b8ddd3fcc..dbbc24af82 100755 --- a/api/@ohos.multimedia.media.d.ts +++ b/api/@ohos.multimedia.media.d.ts @@ -24,9 +24,6 @@ import photoAccessHelper from './@ohos.file.photoAccessHelper'; import type image from './@ohos.multimedia.image'; import type { SoundPool as _SoundPool } from './multimedia/soundPool'; import type { PlayParameters as _PlayParameters } from './multimedia/soundPool'; -import type image from './@ohos.multimedia.image'; -import type { SoundPool as _SoundPool } from './multimedia/soundPool'; -import type { PlayParameters as _PlayParameters } from './multimedia/soundPool'; import type drm from './@ohos.multimedia.drm'; /** @@ -82,7 +79,6 @@ declare namespace media { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ function createAVPlayer(callback: AsyncCallback): void; @@ -118,20 +114,8 @@ declare namespace media { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ function createAVPlayer(): Promise; - /** - * Creates an AVPlayer instance. - * @returns { Promise } A Promise instance used to return AVPlayer instance if the operation is successful; returns null otherwise. - * @throws { BusinessError } 5400101 - No memory. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - function createAVPlayer(): Promise; /** * Creates an AVRecorder instance. @@ -149,19 +133,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVRecorder * @crossplatform * @since 12 - * @since 12 */ function createAVRecorder(callback: AsyncCallback): void; - /** - * Creates an AVRecorder instance. - * @param { AsyncCallback } callback - used to return AVRecorder instance if the operation is successful; returns null otherwise. - * @throws { BusinessError } 5400101 - No memory. Return by callback. - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - function createAVRecorder(callback: AsyncCallback): void; /** * Creates an AVRecorder instance. @@ -180,20 +153,8 @@ declare namespace media { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ function createAVRecorder(): Promise; - /** - * Creates an AVRecorder instance. - * @returns { Promise } A Promise instance used to return AVRecorder instance if the operation is successful; returns null otherwise. - * @throws { BusinessError } 5400101 - No memory. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - function createAVRecorder(): Promise; /** * Creates an AudioPlayer instance. @@ -291,21 +252,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 12 - * @since 12 */ function createVideoRecorder(callback: AsyncCallback): void; - /** - * The maintenance of this interface has been stopped since version api 9. Please use AVRecorder - * Creates an VideoRecorder instance. - * @param { AsyncCallback } callback - used to return AudioPlayer instance if the operation is successful; returns null otherwise. - * @throws { BusinessError } 202 - Not System App. - * @throws { BusinessError } 5400101 - No memory. Return by callback. - * @syscap SystemCapability.Multimedia.Media.VideoRecorder - * @systemapi - * @since 20 - * @arkts 1.2 - */ - function createVideoRecorder(callback: AsyncCallback): void; /** * The maintenance of this interface has been stopped since version api 9. Please use AVRecorder @@ -325,7 +273,6 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 12 - * @since 12 */ function createVideoRecorder(): Promise; @@ -350,10 +297,8 @@ declare namespace media { * @throws { BusinessError } 5400101 - No memory. Return by callback. * @syscap SystemCapability.Multimedia.Media.SoundPool * @since 10 - * @since 10 */ function createSoundPool( - maxStreams: number, maxStreams: number, audioRenderInfo: audio.AudioRendererInfo, callback: AsyncCallback @@ -479,7 +424,6 @@ declare namespace media { * @throws { BusinessError } 5400101 - No memory. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVTranscoder * @since 12 - * @since 12 */ function createAVTranscoder(): Promise; @@ -607,20 +551,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor * @crossplatform * @since 12 - * @since 12 */ function createAVMetadataExtractor(): Promise; - /** - * Creates an AVMetadataExtractor instance. - * @returns { Promise } A Promise instance used to return AVMetadataExtractor instance - * if the operation is successful; returns null otherwise. - * @throws { BusinessError } 5400101 - No memory. Returned by promise. - * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - function createAVMetadataExtractor(): Promise; /** * Creates an AVMetadataExtractor instance. @@ -641,28 +573,7 @@ declare namespace media { * @since 12 */ function createAVMetadataExtractor(callback: AsyncCallback): void; - /** - * Creates an **AVMetadataExtractor** instance. This API uses an asynchronous callback to return the result. - * @param { AsyncCallback } callback - Callback used to return the result. If the operation is - * successful, **err** is **undefined** and **data** is the **AVMetadataExtractor** instance created; - * otherwise, **err** is an error object. - * @throws { BusinessError } 5400101 - No memory. Returned by callback. - * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor - * @crossplatform - * @since 12 - */ - function createAVMetadataExtractor(callback: AsyncCallback): void; - /** - * Creates an **AVImageGenerator** instance. This API uses a promise to return the result. - * @returns { Promise } Promise used to return the result. If the operation is successful, - * an **AVImageGenerator** instance is returned; otherwise, **null** is returned. - * The API can be used to obtain a video thumbnail. - * @throws { BusinessError } 5400101 - No memory. Returned by promise. - * @syscap SystemCapability.Multimedia.Media.AVImageGenerator - * @since 12 - */ - function createAVImageGenerator(): Promise; /** * Creates an **AVImageGenerator** instance. This API uses a promise to return the result. * @returns { Promise } Promise used to return the result. If the operation is successful, @@ -767,20 +678,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor * @crossplatform * @since 12 - * @since 12 */ fetchMetadata(callback: AsyncCallback): void; - /** - * It will extract the resource to fetch media meta data info. - * @param { AsyncCallback } callback - A callback instance used to return when fetchMetadata completed. - * @throws { BusinessError } 5400102 - Operation not allowed. Returned by callback. - * @throws { BusinessError } 5400106 - Unsupported format. Returned by callback. - * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - fetchMetadata(callback: AsyncCallback): void; /** * It will extract the resource to fetch media meta data info. @@ -798,20 +697,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor * @crossplatform * @since 12 - * @since 12 */ fetchMetadata(): Promise; - /** - * It will extract the resource to fetch media meta data info. - * @returns { Promise } A Promise instance used to return when fetchMetadata completed. - * @throws { BusinessError } 5400102 - Operation not allowed. Returned by promise. - * @throws { BusinessError } 5400106 - Unsupported format. Returned by promise. - * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - fetchMetadata(): Promise; /** * It will extract the audio resource to fetch an album cover. @@ -831,7 +718,6 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor * @crossplatform * @since 12 - * @since 12 */ fetchAlbumCover(callback: AsyncCallback): void; @@ -851,7 +737,6 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor * @crossplatform * @since 12 - * @since 12 */ fetchAlbumCover(): Promise; @@ -891,8 +776,7 @@ declare namespace media { * @throws { BusinessError } 5400106 - Unsupported format. Returned by promise. * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ getTimeByFrameIndex(index: number): Promise; @@ -905,8 +789,7 @@ declare namespace media { * @throws { BusinessError } 5400106 - Unsupported format. Returned by promise. * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ getFrameIndexByTime(timeUs: number): Promise; @@ -1367,9 +1250,7 @@ declare namespace media { * @throws { BusinessError } 5400106 - Unsupported format. Returned by callback. * @syscap SystemCapability.Multimedia.Media.AVImageGenerator * @since 12 - * @since 12 */ - fetchFrameByTime(timeUs: number, options: AVImageQueryOptions, param: PixelMapParams, fetchFrameByTime(timeUs: number, options: AVImageQueryOptions, param: PixelMapParams, callback: AsyncCallback): void; @@ -1383,10 +1264,8 @@ declare namespace media { * @throws { BusinessError } 5400106 - Unsupported format. Returned by promise. * @syscap SystemCapability.Multimedia.Media.AVImageGenerator * @since 12 - * @since 12 */ fetchFrameByTime(timeUs: number, options: AVImageQueryOptions, param: PixelMapParams): Promise; - fetchFrameByTime(timeUs: number, options: AVImageQueryOptions, param: PixelMapParams): Promise; /** * Supports extracting video thumbnails by proportional scaling @@ -1477,7 +1356,6 @@ declare namespace media { * @since 12 */ width?: number; - width?: number; /** * Height of the thumbnail. The value must be greater than 0 and less than or equal to the height of the original @@ -1487,7 +1365,6 @@ declare namespace media { * @since 12 */ height?: number; - height?: number; /** * Color format of the thumbnail. @@ -1556,8 +1433,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum AVErrorCode { /** @@ -1576,8 +1452,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ AVERR_OK = 0, @@ -1597,8 +1472,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ AVERR_NO_PERMISSION = 201, @@ -1618,8 +1492,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ AVERR_INVALID_PARAMETER = 401, @@ -1639,8 +1512,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ AVERR_UNSUPPORT_CAPABILITY = 801, @@ -1660,8 +1532,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ AVERR_NO_MEMORY = 5400101, @@ -1681,8 +1552,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ AVERR_OPERATE_NOT_PERMIT = 5400102, @@ -1702,8 +1572,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ AVERR_IO = 5400103, @@ -1723,8 +1592,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ AVERR_TIMEOUT = 5400104, @@ -1744,8 +1612,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ AVERR_SERVICE_DIED = 5400105, @@ -1765,8 +1632,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ AVERR_UNSUPPORT_FORMAT = 5400106, @@ -1781,8 +1647,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ AVERR_AUDIO_INTERRUPTED = 5400107, /** @@ -1790,8 +1655,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ AVERR_IO_HOST_NOT_FOUND = 5411001, /** @@ -1799,8 +1663,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ AVERR_IO_CONNECTION_TIMEOUT = 5411002, /** @@ -1808,8 +1671,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ AVERR_IO_NETWORK_ABNORMAL = 5411003, /** @@ -1817,8 +1679,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ AVERR_IO_NETWORK_UNAVAILABLE = 5411004, /** @@ -1826,8 +1687,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ AVERR_IO_NO_PERMISSION = 5411005, /** @@ -1835,8 +1695,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ AVERR_IO_REQUEST_DENIED = 5411006, /** @@ -1844,8 +1703,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ AVERR_IO_RESOURCE_NOT_FOUND = 5411007, /** @@ -1854,8 +1712,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ AVERR_IO_SSL_CLIENT_CERT_NEEDED = 5411008, /** @@ -1864,8 +1721,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ AVERR_IO_SSL_CONNECTION_FAILED = 5411009, /** @@ -1873,8 +1729,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ AVERR_IO_SSL_SERVER_CERT_UNTRUSTED = 5411010, /** @@ -1882,16 +1737,14 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ AVERR_IO_UNSUPPORTED_REQUEST = 5411011, /** * Seek continuous unsupported. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ AVERR_SEEK_CONTINUOUS_UNSUPPORTED = 5410002, @@ -1899,8 +1752,7 @@ declare namespace media { * Super-resolution unsupported. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ AVERR_SUPER_RESOLUTION_UNSUPPORTED = 5410003, @@ -1908,8 +1760,7 @@ declare namespace media { * No PlaybackStrategy set to enable super-resolution feature. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ AVERR_SUPER_RESOLUTION_NOT_ENABLED = 5410004, } @@ -1951,7 +1802,6 @@ declare namespace media { * @since 12 */ type OnTrackChangeHandler = (index: number, isSelected: boolean) => void; - type OnTrackChangeHandler = (index: number, isSelected: boolean) => void; /** * Describes the callback invoked for the AVPlayer state change event. @@ -1972,14 +1822,12 @@ declare namespace media { * @typedef { function } OnBufferingUpdateHandler * @param { BufferingInfoType } infoType - define the Buffering info Type. * @param { number } value - define the value of buffering info type if exist. - * @param { number } value - define the value of buffering info type if exist. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @crossplatform * @atomicservice * @since 12 */ type OnBufferingUpdateHandler = (infoType: BufferingInfoType, value: number) => void; - type OnBufferingUpdateHandler = (infoType: BufferingInfoType, value: number) => void; /** * Describes the callback invoked for the video size change event. @@ -1987,15 +1835,12 @@ declare namespace media { * @typedef { function } OnVideoSizeChangeHandler * @param { number } width - Value of video Width. * @param { number } height - Value of video Height. - * @param { number } width - Value of video Width. - * @param { number } height - Value of video Height. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @crossplatform * @atomicservice * @since 12 */ type OnVideoSizeChangeHandler = (width: number, height: number) => void; - type OnVideoSizeChangeHandler = (width: number, height: number) => void; /** * Describes the callback used to listen for video super resolution status changes. If super resolution is enabled by @@ -2033,13 +1878,11 @@ declare namespace media { /** * Payload type of SEI message. * @type { number } - * @type { number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice * @since 18 */ payloadType: number; - payloadType: number; /** * Payload data of SEI message. @@ -2058,7 +1901,6 @@ declare namespace media { * @typedef { function } OnSeiMessageHandle * @param { Array } messages - SEI messages. * @param { ?number } playbackPosition - playback position. - * @param { ?number } playbackPosition - playback position. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice * @since 18 @@ -2492,12 +2334,10 @@ declare namespace media { * @since 12 */ seek(timeMs: number, mode?: SeekMode): void; - seek(timeMs: number, mode?: SeekMode): void; /** * Sets the volume. * @param { number } volume - Relative volume. The value ranges from 0.00 to 1.00. The value 1 indicates the maximum volume (100%). - * @param { number } volume - Relative volume. The value ranges from 0.00 to 1.00. The value 1 indicates the maximum volume (100%). * @syscap SystemCapability.Multimedia.Media.AVPlayer * @since 9 */ @@ -2513,7 +2353,6 @@ declare namespace media { * @since 12 */ setVolume(volume: number): void; - setVolume(volume: number): void; /** * Get all track infos in MediaDescription, should be called after data loaded callback. @@ -2579,8 +2418,7 @@ declare namespace media { * @throws { BusinessError } 5400102 - Operation not allowed. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ getSelectedTracks(): Promise>; @@ -2595,8 +2433,7 @@ declare namespace media { * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ selectTrack(index: number, mode?: SwitchMode): Promise; @@ -2609,8 +2446,7 @@ declare namespace media { * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ deselectTrack(index: number): Promise; @@ -2626,8 +2462,7 @@ declare namespace media { * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ setMediaSource(src: MediaSource, strategy?: PlaybackStrategy): Promise; @@ -2646,8 +2481,7 @@ declare namespace media { * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ addSubtitleFromFd(fd: number, offset?: number, length?: number): Promise; @@ -2661,8 +2495,7 @@ declare namespace media { * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ addSubtitleFromUrl(url: string): Promise; @@ -2671,11 +2504,9 @@ declare namespace media { * playing, or paused state. * @returns { Promise } Statistic infos of current player. * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ getPlaybackInfo(): Promise; - getPlaybackInfo(): Promise; /** * Set playback strategy to AVPlayer. This API can be called only when the AVPlayer is in the initialized state. @@ -2685,8 +2516,7 @@ declare namespace media { * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ setPlaybackStrategy(strategy: PlaybackStrategy): Promise; @@ -2700,8 +2530,7 @@ declare namespace media { * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ setMediaMuted(mediaType: MediaType, muted: boolean): Promise; @@ -2913,7 +2742,6 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice * @since 12 - * @since 12 */ audioInterruptMode?: audio.InterruptMode; @@ -2934,7 +2762,6 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice * @since 12 - * @since 12 */ audioRendererInfo?: audio.AudioRendererInfo; @@ -2971,7 +2798,6 @@ declare namespace media { * @since 12 */ readonly currentTime: number; - readonly currentTime: number; /** * Playback duration, When the data source does not support seek, it returns - 1, such as a live broadcast scenario. @@ -2996,7 +2822,6 @@ declare namespace media { * @since 12 */ readonly duration: number; - readonly duration: number; /** * Playback state. @@ -3055,7 +2880,6 @@ declare namespace media { * @since 12 */ readonly width: number; - readonly width: number; /** * Video height, in px, valid after prepared. @@ -3073,7 +2897,6 @@ declare namespace media { * @since 12 */ readonly height: number; - readonly height: number; /** * Video scale type. By default, the {@link #VIDEO_SCALE_TYPE_FIT} will be used, for more @@ -3147,8 +2970,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVPlayer * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ setBitrate(bitrate: number): void; @@ -3207,7 +3029,6 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice * @since 12 - * @since 12 */ on(type: 'mediaKeySystemInfoUpdate', callback: Callback>): void; @@ -3225,7 +3046,6 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice * @since 12 - * @since 12 */ off(type: 'mediaKeySystemInfoUpdate', callback?: Callback>): void; @@ -3296,7 +3116,6 @@ declare namespace media { * @since 12 */ on(type: 'volumeChange', callback: Callback): void; - on(type: 'volumeChange', callback: Callback): void; /** * Unregister listens for media playback volumeChange event. * @param { 'volumeChange' } type - Type of the playback event to listen for. @@ -3323,7 +3142,6 @@ declare namespace media { * @since 19 */ off(type: 'volumeChange', callback?: Callback): void; - off(type: 'volumeChange', callback?: Callback): void; /** * Register listens for media playback endOfStream event. * @param { 'endOfStream' } type - Type of the playback event to listen for. @@ -3372,7 +3190,6 @@ declare namespace media { * Register listens for media playback seekDone event. * @param { 'seekDone' } type - Type of the playback event to listen for. * @param { Callback } callback - Callback used to listen for the playback seekDone event. - * @param { Callback } callback - Callback used to listen for the playback seekDone event. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @since 9 */ @@ -3380,7 +3197,6 @@ declare namespace media { * Register listens for media playback seekDone event. * @param { 'seekDone' } type - Type of the playback event to listen for. * @param { Callback } callback - Callback used to listen for the playback seekDone event. - * @param { Callback } callback - Callback used to listen for the playback seekDone event. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice * @since 11 @@ -3401,7 +3217,6 @@ declare namespace media { * @since 12 */ on(type: 'seekDone', callback: Callback): void; - on(type: 'seekDone', callback: Callback): void; /** * Unregister listens for media playback seekDone event. * @param { 'seekDone' } type - Type of the playback event to listen for. @@ -3430,12 +3245,10 @@ declare namespace media { * @since 12 */ off(type: 'seekDone', callback?: Callback): void; - off(type: 'seekDone', callback?: Callback): void; /** * Register listens for media playback speedDone event. * @param { 'speedDone' } type - Type of the playback event to listen for. * @param { Callback } callback - Callback used to listen for the playback speedDone event. - * @param { Callback } callback - Callback used to listen for the playback speedDone event. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @since 9 */ @@ -3451,7 +3264,6 @@ declare namespace media { * @since 12 */ on(type: 'speedDone', callback: Callback): void; - on(type: 'speedDone', callback: Callback): void; /** * Unregister listens for media playback speedDone event. * @param { 'speedDone' } type - Type of the playback event to listen for. @@ -3501,7 +3313,6 @@ declare namespace media { * Register listens for media playback setBitrateDone event. * @param { 'bitrateDone' } type - Type of the playback event to listen for. * @param { Callback } callback - Callback used to listen for the playback setBitrateDone event. - * @param { Callback } callback - Callback used to listen for the playback setBitrateDone event. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @since 9 */ @@ -3516,7 +3327,6 @@ declare namespace media { * @since 12 */ on(type: 'bitrateDone', callback: Callback): void; - on(type: 'bitrateDone', callback: Callback): void; /** * Unregister listens for media playback setBitrateDone event. * @param { 'bitrateDone' } type - Type of the playback event to listen for. @@ -3541,12 +3351,10 @@ declare namespace media { * @since 19 */ off(type: 'bitrateDone', callback?: Callback): void; - off(type: 'bitrateDone', callback?: Callback): void; /** * Register listens for media playback timeUpdate event. * @param { 'timeUpdate' } type - Type of the playback event to listen for. * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. - * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @since 9 */ @@ -3554,7 +3362,6 @@ declare namespace media { * Register listens for media playback timeUpdate event. * @param { 'timeUpdate' } type - Type of the playback event to listen for. * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. - * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice * @since 11 @@ -3571,7 +3378,6 @@ declare namespace media { * @since 12 */ on(type: 'timeUpdate', callback: Callback): void; - on(type: 'timeUpdate', callback: Callback): void; /** * Unregister listens for media playback timeUpdate event. * @param { 'timeUpdate' } type - Type of the playback event to listen for. @@ -3595,12 +3401,10 @@ declare namespace media { * @since 12 */ off(type: 'timeUpdate', callback?: Callback): void; - off(type: 'timeUpdate', callback?: Callback): void; /** * Register listens for media playback durationUpdate event. * @param { 'durationUpdate' } type - Type of the playback event to listen for. * @param { Callback } callback - Callback used to listen for the playback durationUpdate event. - * @param { Callback } callback - Callback used to listen for the playback durationUpdate event. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @since 9 */ @@ -3616,7 +3420,6 @@ declare namespace media { * @since 12 */ on(type: 'durationUpdate', callback: Callback): void; - on(type: 'durationUpdate', callback: Callback): void; /** * Unregister listens for media playback durationUpdate event. * @param { 'durationUpdate' } type - Type of the playback event to listen for. @@ -3641,7 +3444,6 @@ declare namespace media { * @since 19 */ off(type: 'durationUpdate', callback?: Callback): void; - off(type: 'durationUpdate', callback?: Callback): void; /** * Register listens for video playback buffering events. @@ -3776,7 +3578,6 @@ declare namespace media { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ on(type: 'audioInterrupt', callback: Callback): void; /** @@ -3793,7 +3594,6 @@ declare namespace media { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ off(type: 'audioInterrupt', callback?: Callback): void; /** @@ -3817,7 +3617,6 @@ declare namespace media { * @since 12 */ on(type: 'availableBitrates', callback: Callback>): void; - on(type: 'availableBitrates', callback: Callback>): void; /** * Unregister listens for available bitrate list collect completed events for HLS protocol stream playback. * This event will be reported after the {@link #prepare} called. @@ -3830,14 +3629,12 @@ declare namespace media { * This event will be reported after the {@link #prepare} called. * @param { 'availableBitrates' } type - Type of the playback event to listen for. * @param { Callback> } callback - Callback used to listen for the playback event return available bitrate list. - * @param { Callback> } callback - Callback used to listen for the playback event return available bitrate list. * @syscap SystemCapability.Multimedia.Media.AVPlayer * @crossplatform * @atomicservice * @since 12 */ off(type: 'availableBitrates', callback?: Callback>): void; - off(type: 'availableBitrates', callback?: Callback>): void; /** * Register listens for playback error events. * @param { 'error' } type - Type of the playback error event to listen for. @@ -3922,7 +3719,6 @@ declare namespace media { * @since 14 */ on(type: 'error', callback: ErrorCallback): void; - on(type: 'error', callback: ErrorCallback): void; /** * Unregister listens for playback error events. * @param { 'error' } type - Type of the playback error event to listen for. @@ -3946,7 +3742,6 @@ declare namespace media { * @since 12 */ off(type: 'error', callback?: ErrorCallback): void; - off(type: 'error', callback?: ErrorCallback): void; /** * Subscribes output device change event callback. @@ -3973,7 +3768,6 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice * @since 12 - * @since 12 */ on(type: 'audioOutputDeviceChangeWithInfo', callback: Callback): void; @@ -3997,7 +3791,6 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.AVPlayer * @atomicservice * @since 12 - * @since 12 */ off(type: 'audioOutputDeviceChangeWithInfo', callback?: Callback): void; @@ -4084,7 +3877,6 @@ declare namespace media { * @since 13 */ on(type: 'amplitudeUpdate', callback: Callback>): void - on(type: 'amplitudeUpdate', callback: Callback>): void /** * Unsubscribes from update events of the maximum amplitude. @@ -4095,7 +3887,6 @@ declare namespace media { * @since 13 */ off(type: 'amplitudeUpdate', callback?: Callback>): void - off(type: 'amplitudeUpdate', callback?: Callback>): void /** * Subscribes to events indicating that a Supplemental Enhancement Information (SEI) message is received. This @@ -4113,7 +3904,6 @@ declare namespace media { * @since 18 */ on(type: 'seiMessageReceived', payloadTypes: Array, callback: OnSeiMessageHandle): void; - on(type: 'seiMessageReceived', payloadTypes: Array, callback: OnSeiMessageHandle): void; /** * Unsubscribes from the events indicating that an SEI message is received. @@ -4129,7 +3919,6 @@ declare namespace media { * @since 18 */ off(type: 'seiMessageReceived', payloadTypes?: Array, callback?: OnSeiMessageHandle): void; - off(type: 'seiMessageReceived', payloadTypes?: Array, callback?: OnSeiMessageHandle): void; /** * Subscribes to the event indicating that super resolution is enabled or disabled. @@ -4175,47 +3964,41 @@ declare namespace media { * * @enum { string } * @syscap SystemCapability.Multimedia.Media.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum PlaybackInfoKey { /** * IP address of current network stream. * @syscap SystemCapability.Multimedia.Media.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ SERVER_IP_ADDRESS = 'server_ip_address', /** * Average download rate during playing except for suspend downloading. * @syscap SystemCapability.Multimedia.Media.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ AVG_DOWNLOAD_RATE = 'average_download_rate', /** * Current download rate of the last second except for suspend downloading. * @syscap SystemCapability.Multimedia.Media.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ DOWNLOAD_RATE = 'download_rate', /** * Boolean value, true for current is downloading, false for suspend downloading. * @syscap SystemCapability.Multimedia.Media.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ IS_DOWNLOADING = 'is_downloading', /** * Cached duration in milliseconds. * @syscap SystemCapability.Multimedia.Media.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ BUFFER_DURATION = 'buffer_duration', } @@ -4411,8 +4194,7 @@ declare namespace media { * - client should return immediately. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ type SourceOpenCallback = (request: MediaSourceLoadingRequest) => number; @@ -4430,8 +4212,7 @@ declare namespace media { * @returns { void } - client should return immediately. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ type SourceReadCallback = (uuid: number, requestedOffset: number, requestedLength: number) => void; @@ -4444,8 +4225,7 @@ declare namespace media { * @returns { void } - client should return immediately. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ type SourceCloseCallback = (uuid: number) => void; @@ -4454,8 +4234,7 @@ declare namespace media { * @typedef MediaSourceLoader * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ interface MediaSourceLoader { /** @@ -4463,8 +4242,7 @@ declare namespace media { * @type { SourceOpenCallback } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ open: SourceOpenCallback; @@ -4473,8 +4251,7 @@ declare namespace media { * @type { SourceReadCallback } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ read: SourceReadCallback; @@ -4483,8 +4260,7 @@ declare namespace media { * @type { SourceCloseCallback } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ close: SourceCloseCallback; } @@ -4494,16 +4270,14 @@ declare namespace media { * @enum { number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ enum LoadingRequestError { /** * If reach the resource end, client should return. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ LOADING_ERROR_SUCCESS = 0, @@ -4511,8 +4285,7 @@ declare namespace media { * If resource not ready for access, client should return. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ LOADING_ERROR_NOT_READY = 1, @@ -4520,8 +4293,7 @@ declare namespace media { * If resource url not exist, client should return. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ LOADING_ERROR_NO_RESOURCE = 2, @@ -4529,8 +4301,7 @@ declare namespace media { * If the uuid of resource handle is valid, client should return. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ LOADING_ERROR_INVAID_HANDLE = 3, @@ -4538,8 +4309,7 @@ declare namespace media { * If client has no right to request the resource, client should return. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ LOADING_ERROR_ACCESS_DENIED = 4, @@ -4547,8 +4317,7 @@ declare namespace media { * If access time out, client should return. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ LOADING_ERROR_ACCESS_TIMEOUT = 5, @@ -4556,8 +4325,7 @@ declare namespace media { * If authorization failed, client should return. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ LOADING_ERROR_AUTHORIZE_FAILED = 6, } @@ -4586,8 +4354,7 @@ declare namespace media { * @type { ?Record } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ header?: Record; @@ -4615,8 +4382,7 @@ declare namespace media { * @param { ?string } [redirectUrl] - redirect url from the http response if exist. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ respondHeader(uuid: number, header?: Record, redirectUrl?: string): void; @@ -4628,8 +4394,7 @@ declare namespace media { * @param { LoadingRequestError } state - Request status. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ finishLoading(uuid: number, state: LoadingRequestError): void; } @@ -4654,35 +4419,29 @@ declare namespace media { /** * video width. * @type { number } - * @type { number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice * @since 19 */ width: number; - width: number; /** * video height. * @type { number } - * @type { number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice * @since 19 */ height: number; - height: number; /** * biterate of this mediaStream. * @type { number } - * @type { number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice * @since 19 */ bitrate: number; - bitrate: number; } /** @@ -4691,8 +4450,7 @@ declare namespace media { * @typedef MediaSource * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface MediaSource { /** @@ -4700,8 +4458,7 @@ declare namespace media { * @param { AVMimeTypes } mimeType - for MediaSource define. see @ AVMimeTypes. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ setMimeType(mimeType: AVMimeTypes): void; @@ -4710,8 +4467,7 @@ declare namespace media { * @param { MediaSourceLoader } resourceLoader - callback function interface set for player use. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ setMediaResourceLoaderDelegate(resourceLoader: MediaSourceLoader): void; } @@ -4721,16 +4477,14 @@ declare namespace media { * @enum { string } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum AVMimeTypes { /** * Indicate current file is index file for hls Media. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ APPLICATION_M3U8 = 'application/m3u8', } @@ -4740,8 +4494,7 @@ declare namespace media { * @typedef PlaybackStrategy * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface PlaybackStrategy { /** @@ -4749,8 +4502,7 @@ declare namespace media { * @type { ?number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ preferredWidth?: number; /** @@ -4758,8 +4510,7 @@ declare namespace media { * @type { ?number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ preferredHeight?: number; /** @@ -4772,8 +4523,7 @@ declare namespace media { * @type { ?number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ preferredBufferDuration?: number; @@ -4782,8 +4532,7 @@ declare namespace media { * @type { ?boolean } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ preferredHdr?: boolean; @@ -4791,8 +4540,7 @@ declare namespace media { * mute the specified media stream when playing. * @type { ?MediaType } * @syscap SystemCapability.Multimedia.Media.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ mutedMediaType?: MediaType; @@ -4801,8 +4549,7 @@ declare namespace media { * @type { ?string } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ preferredAudioLanguage?: string; @@ -4811,8 +4558,7 @@ declare namespace media { * @type { ?string } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ preferredSubtitleLanguage?: string; @@ -4830,8 +4576,7 @@ declare namespace media { * @type { ?number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ preferredBufferDurationForPlaying?: number; @@ -4841,8 +4586,7 @@ declare namespace media { * @type { ?boolean } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ enableSuperResolution?: boolean; @@ -4852,8 +4596,7 @@ declare namespace media { * @type { ?number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ thresholdForAutoQuickPlay?: number @@ -4914,14 +4657,12 @@ declare namespace media { * The file descriptor of audio or video source from file system. The caller * is responsible to close the file descriptor. * @type { number } - * @type { number } * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice * @since 12 */ fd: number - fd: number /** * The offset into the file where the data to be read, in bytes. By default, @@ -4940,14 +4681,12 @@ declare namespace media { * The offset into the file where the data to be read, in bytes. By default, * the offset is zero. * @type { ?number } - * @type { ?number } * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice * @since 12 */ offset?: number - offset?: number /** * The length in bytes of the data to be read. By default, the length is the @@ -4966,14 +4705,12 @@ declare namespace media { * The length in bytes of the data to be read. By default, the length is the * rest of bytes in the file from the offset. * @type { ?number } - * @type { ?number } * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice * @since 12 */ length?: number - length?: number } /** @@ -5022,14 +4759,12 @@ declare namespace media { * Size of the file, -1 means the file size is unknown, in this case, * seek and setSpeed can't be executed, loop can't be set, and can't replay. * @type { number } - * @type { number } * @syscap SystemCapability.Multimedia.Media.AVPlayer * @crossplatform * @atomicservice * @since 12 */ fileSize: number; - fileSize: number; /** * Callback function implemented by users, which is used to fill data. * buffer - The buffer need to fill. @@ -5066,7 +4801,6 @@ declare namespace media { * @since 12 */ callback: (buffer: ArrayBuffer, length: number, pos?: number) => number; - callback: (buffer: ArrayBuffer, length: number, pos?: number) => number; } /** @@ -5083,23 +4817,19 @@ declare namespace media { /** * Duration of the text to be displayed, as milliseconds. * @type { ?number } - * @type { ?number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice * @since 12 */ duration?: number; - duration?: number; /** * Display start time of the text, as milliseconds. * @type { ?number } - * @type { ?number } * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice * @since 12 */ startTime?: number; - startTime?: number; /** * Text information of current update event. * @type { ?string } @@ -5339,14 +5069,12 @@ declare namespace media { * Listens for playback error events. * @param { 'error' } type - Type of the playback error event to listen for. * @param { ErrorCallback } callback - Callback used to listen for the playback error event. - * @param { ErrorCallback } callback - Callback used to listen for the playback error event. * @syscap SystemCapability.Multimedia.Media.AudioPlayer * @since 6 * @deprecated since 9 * @useinstead ohos.multimedia.media/media.AVPlayer#event:error */ on(type: 'error', callback: ErrorCallback): void; - on(type: 'error', callback: ErrorCallback): void; } /** @@ -5626,17 +5354,6 @@ declare namespace media { * }); */ getInputSurface(): Promise; - /** - * Get input surface. it must be called between prepare completed and start. - * @returns { Promise } A Promise instance used to return the input surface id in string. - * @throws { BusinessError } 5400102 - Operate not permit. Return by promise. - * @throws { BusinessError } 5400103 - IO error. Return by promise. - * @throws { BusinessError } 5400105 - Service died. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @since 20 - * @arkts 1.2 - */ - getInputSurface(): Promise; /** * Get input meta surface for specified meta source type. it must be called between prepare completed and start. @@ -6341,7 +6058,6 @@ declare namespace media { * 2. Incorrect parameter types. 3.Parameter verification failed. * @syscap SystemCapability.Multimedia.Media.AVRecorder * @since 11 - * @since 11 */ on(type: 'audioCapturerChange', callback: Callback): void; @@ -6444,7 +6160,6 @@ declare namespace media { * @since 12 */ on(type: 'error', callback: ErrorCallback): void; - on(type: 'error', callback: ErrorCallback): void; /** * Cancel Listens for recording stateChange events. @@ -6484,7 +6199,6 @@ declare namespace media { * @since 12 */ off(type: 'error', callback?: ErrorCallback): void; - off(type: 'error', callback?: ErrorCallback): void; /** * Cancel Listens for recording audioCapturerChange events. @@ -6500,7 +6214,6 @@ declare namespace media { * This parameter is supported since API version 12. * @syscap SystemCapability.Multimedia.Media.AVRecorder * @since 12 - * @since 12 */ off(type: 'audioCapturerChange', callback?: Callback): void; @@ -6641,13 +6354,11 @@ declare namespace media { /** * Latitude. * @type { number } - * @type { number } * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @since 12 */ latitude: number; - latitude: number; /** * Longitude. @@ -6657,13 +6368,11 @@ declare namespace media { /** * Longitude. * @type { number } - * @type { number } * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @since 12 */ longitude: number; - longitude: number; } /** * Set configures of a watermark to AVRecorder. The position starts at top left corner. @@ -6671,8 +6380,7 @@ declare namespace media { * @typedef WatermarkConfig * @syscap SystemCapability.Multimedia.Media.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ interface WatermarkConfig { /** @@ -6680,8 +6388,7 @@ declare namespace media { * @type { number } * @syscap SystemCapability.Multimedia.Media.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ top: number; /** @@ -6689,8 +6396,7 @@ declare namespace media { * @type { number } * @syscap SystemCapability.Multimedia.Media.Core * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ left: number; } @@ -6820,7 +6526,6 @@ declare namespace media { * @throws { BusinessError } 201 - permission denied. * @syscap SystemCapability.Multimedia.Media.AudioRecorder * @since 12 - * @since 12 * @deprecated since 9 * @useinstead ohos.multimedia.media/media.AVRecorder#prepare */ @@ -6897,14 +6602,12 @@ declare namespace media { * Listens for audio recording error events. * @param { 'error' } type - Type of the audio recording error event to listen for. * @param { ErrorCallback } callback - Callback used to listen for the audio recording error event. - * @param { ErrorCallback } callback - Callback used to listen for the audio recording error event. * @syscap SystemCapability.Multimedia.Media.AudioRecorder * @since 6 * @deprecated since 9 * @useinstead ohos.multimedia.media/media.AVRecorder#on */ on(type: 'error', callback: ErrorCallback): void; - on(type: 'error', callback: ErrorCallback): void; } /** @@ -7009,22 +6712,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 12 - * @since 12 */ getInputSurface(callback: AsyncCallback): void; - /** - * get input surface.it must be called between prepare completed and start. - * @param { AsyncCallback } callback - Callback used to return the input surface id in string. - * @throws { BusinessError } 202 - Not System App. - * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. - * @throws { BusinessError } 5400103 - I/O error. Return by callback. - * @throws { BusinessError } 5400105 - Service died. Return by callback. - * @syscap SystemCapability.Multimedia.Media.VideoRecorder - * @systemapi - * @since 20 - * @arkts 1.2 - */ - getInputSurface(callback: AsyncCallback): void; /** * get input surface. it must be called between prepare completed and start. * @returns { Promise } A Promise instance used to return the input surface id in string. @@ -7045,22 +6734,8 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 12 - * @since 12 */ getInputSurface(): Promise; - /** - * get input surface. it must be called between prepare completed and start. - * @returns { Promise } A Promise instance used to return the input surface id in string. - * @throws { BusinessError } 202 - Not System App. - * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. - * @throws { BusinessError } 5400103 - I/O error. Return by promise. - * @throws { BusinessError } 5400105 - Service died. Return by promise. - * @syscap SystemCapability.Multimedia.Media.VideoRecorder - * @systemapi - * @since 20 - * @arkts 1.2 - */ - getInputSurface(): Promise; /** * Starts video recording. * @param { AsyncCallback } callback - A callback instance used to return when start completed. @@ -7080,8 +6755,7 @@ declare namespace media { * @throws { BusinessError } 5400105 - Service died. Return by callback. * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ start(callback: AsyncCallback): void; /** @@ -7103,8 +6777,7 @@ declare namespace media { * @throws { BusinessError } 5400105 - Service died. Return by promise. * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ start(): Promise; /** @@ -7170,8 +6843,7 @@ declare namespace media { * @throws { BusinessError } 5400105 - Service died. Return by callback. * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ resume(callback: AsyncCallback): void; /** @@ -7193,8 +6865,7 @@ declare namespace media { * @throws { BusinessError } 5400105 - Service died. Return by promise. * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ resume(): Promise; /** @@ -7345,8 +7016,7 @@ declare namespace media { * @throws { BusinessError } 5400105 - Service died. Return by callback. * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(type: 'error', callback: ErrorCallback): void; @@ -7890,14 +7560,12 @@ declare namespace media { * Listens for playback error events. * @param { 'error' } type - Type of the playback error event to listen for. * @param { ErrorCallback } callback - Callback used to listen for the playback error event. - * @param { ErrorCallback } callback - Callback used to listen for the playback error event. * @syscap SystemCapability.Multimedia.Media.VideoPlayer * @since 8 * @deprecated since 9 * @useinstead ohos.multimedia.media/media.AVPlayer#event:error */ on(type: 'error', callback: ErrorCallback): void; - on(type: 'error', callback: ErrorCallback): void; } /** @@ -8377,26 +8045,22 @@ declare namespace media { /** * Indicates the audio bit rate. * @type { number } - * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 9 */ readonly audioBitrate: number; - readonly audioBitrate: number; /** * Indicates the number of audio channels. * @type { number } - * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 9 */ readonly audioChannels: number; - readonly audioChannels: number; /** * Indicates the audio encoding format. @@ -8411,14 +8075,12 @@ declare namespace media { /** * Indicates the audio sampling rate. * @type { number } - * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 9 */ readonly audioSampleRate: number; - readonly audioSampleRate: number; /** * Indicates the output file format. @@ -8433,14 +8095,12 @@ declare namespace media { /** * Indicates the video bit rate. * @type { number } - * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 9 */ readonly videoBitrate: number; - readonly videoBitrate: number; /** * Indicates the video encoding format. @@ -8455,38 +8115,32 @@ declare namespace media { /** * Indicates the video width. * @type { number } - * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 9 */ readonly videoFrameWidth: number; - readonly videoFrameWidth: number; /** * Indicates the video height. * @type { number } - * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 9 */ readonly videoFrameHeight: number; - readonly videoFrameHeight: number; /** * Indicates the video frame rate. * @type { number } - * @type { number } * @readonly * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 9 */ readonly videoFrameRate: number; - readonly videoFrameRate: number; } /** @@ -8689,13 +8343,11 @@ declare namespace media { * Sets the video rotation angle in output file, and for the file to playback. mp4 support. * the range of rotation angle should be {0, 90, 180, 270}, default is 0. * @type { ?number } - * @type { ?number } * @syscap SystemCapability.Multimedia.Media.VideoRecorder * @systemapi * @since 9 */ rotation?: number; - rotation?: number; /** * geographical location information. * @type { ?Location } @@ -8782,7 +8434,6 @@ declare namespace media { * @since 11 */ sampleRate?: Array; - sampleRate?: Array; } /** @@ -8800,7 +8451,6 @@ declare namespace media { * @since 11 */ min: number; - min: number; /** * Maximum value. @@ -8809,7 +8459,6 @@ declare namespace media { * @since 11 */ max: number; - max: number; } /** @@ -8852,7 +8501,6 @@ declare namespace media { * @since 12 */ audioBitrate?: number; - audioBitrate?: number; /** * Indicates the number of audio channels. @@ -8871,7 +8519,6 @@ declare namespace media { * @since 12 */ audioChannels?: number; - audioChannels?: number; /** * Indicates the audio encoding format. @@ -8909,7 +8556,6 @@ declare namespace media { * @since 12 */ audioSampleRate?: number; - audioSampleRate?: number; /** * Indicates the output file format. @@ -8941,7 +8587,6 @@ declare namespace media { * @since 12 */ videoBitrate?: number; - videoBitrate?: number; /** * Indicates the video encoding format. @@ -8998,7 +8643,6 @@ declare namespace media { * @since 12 */ videoFrameRate?: number; - videoFrameRate?: number; /** * Whether to record HDR video. @@ -9139,8 +8783,7 @@ declare namespace media { * Mode for creating the file, which is used together with on('photoAssetAvailable'). * @type { ?FileGenerationMode } * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ fileGenerationMode?: FileGenerationMode; /** @@ -9150,12 +8793,10 @@ declare namespace media { * @type { ?number } * @syscap SystemCapability.Multimedia.Media.AVRecorder * @since 9 - * @since 9 * @deprecated since 12 * @useinstead ohos.multimedia.media/media.AVMetadata#videoOrientation */ rotation?: number; - rotation?: number; /** * Geographical location of the recorded video. By default, the geographical location information is not recorded. *
    This API is supported since API version 6 and deprecated since API version 12. You are advised to use @@ -9163,7 +8804,6 @@ declare namespace media { * @type { ?Location } * @syscap SystemCapability.Multimedia.Media.AVRecorder * @since 9 - * @since 9 * @deprecated since 12 * @useinstead ohos.multimedia.media/media.AVMetadata#location */ @@ -9172,8 +8812,7 @@ declare namespace media { * Metadata. For details, see @AVMetadata. * @type { ?AVMetadata } * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ metadata?: AVMetadata; /** @@ -9325,8 +8964,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum SwitchMode { /** @@ -9334,8 +8972,7 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ SMOOTH = 0, /** @@ -9343,16 +8980,14 @@ declare namespace media { * @syscap SystemCapability.Multimedia.Media.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ SEGMENT = 1, /** * switch to the closest frame of the given timestamp. * @syscap SystemCapability.Multimedia.Media.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ CLOSEST = 2, } @@ -9519,22 +9154,19 @@ declare namespace media { * * @enum { number } * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum AVScreenCaptureRecordPreset { /** * The H.264 video encoding format, AAC audio encoding format, and MP4 container format are used. * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ SCREEN_RECORD_PRESET_H264_AAC_MP4 = 0, /** * The H.265 video encoding format, AAC audio encoding format, and MP4 container format are used. * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ SCREEN_RECORD_PRESET_H265_AAC_MP4 = 1, } @@ -9544,22 +9176,19 @@ declare namespace media { * * @enum { number } * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ enum AVScreenCaptureFillMode { /** * Keeps the original aspect ratio, matching the aspect ratio of the physical screen. * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ PRESERVE_ASPECT_RATIO = 0, /** * Stretches the image to fit the specified dimensions. * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ SCALE_TO_FILL = 1, } @@ -9692,7 +9321,6 @@ declare namespace media { * @since 12 */ fd: number; - fd: number; /** * Video width, in px. The default value varies according to the display in use. * @type { ?number } @@ -9700,7 +9328,6 @@ declare namespace media { * @since 12 */ frameWidth?: number; - frameWidth?: number; /** * Video height, in px. The default value varies according to the display in use. * @type { ?number } @@ -9708,7 +9335,6 @@ declare namespace media { * @since 12 */ frameHeight?: number; - frameHeight?: number; /** * Video bit rate. The default value is **10000000**. * @type { ?number } @@ -9716,7 +9342,6 @@ declare namespace media { * @since 12 */ videoBitrate?: number; - videoBitrate?: number; /** * Audio sampling rate. This value is used for both internal capture and external capture (using microphones). * Only **48000** (default value) and **16000** are supported. @@ -9725,7 +9350,6 @@ declare namespace media { * @since 12 */ audioSampleRate?: number; - audioSampleRate?: number; /** * Number of audio channels. This value is used for both internal capture and external capture (using microphones). * Only **1** and **2** (default) are supported. @@ -9734,7 +9358,6 @@ declare namespace media { * @since 12 */ audioChannelCount?: number; - audioChannelCount?: number; /** * Audio bit rate. This value is used for both internal capture and external capture (using microphones). * The default value is **96000**. @@ -9743,13 +9366,11 @@ declare namespace media { * @since 12 */ audioBitrate?: number; - audioBitrate?: number; /** * Encoding and container format used. The default value is **SCREEN_RECORD_PRESET_H264_AAC_MP4**. * @type { ?AVScreenCaptureRecordPreset } * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ preset?: AVScreenCaptureRecordPreset; /** @@ -9759,13 +9380,11 @@ declare namespace media { * @since 15 */ displayId?: number; - displayId?: number; /** * Video fill mode during screen capture. * @type { ?AVScreenCaptureFillMode } * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ fillMode?: AVScreenCaptureFillMode; /** @@ -9946,7 +9565,6 @@ declare namespace media { * }) */ on(type: 'error', callback: ErrorCallback): void; - on(type: 'error', callback: ErrorCallback): void; /** * Unsubscribes from screen capture state changes. You can specify a callback to cancel the specified subscription. @@ -9973,7 +9591,6 @@ declare namespace media { * avScreenCaptureRecorder.off('error'); */ off(type: 'error', callback?: ErrorCallback): void; - off(type: 'error', callback?: ErrorCallback): void; } /** @@ -9991,7 +9608,6 @@ declare namespace media { * @since 12 */ audioBitrate?: number; - audioBitrate?: number; /** * Encoding format of the output audio. Currently, only AAC is supported. The default value is **AAC**. @@ -10018,7 +9634,6 @@ declare namespace media { * @since 12 */ videoBitrate?: number; - videoBitrate?: number; /** * Encoding format of the output video. Currently, only AVC and HEVC are supported. @@ -10046,7 +9661,6 @@ declare namespace media { * @since 12 */ videoFrameHeight?: number; - videoFrameHeight?: number; } /** @@ -10090,8 +9704,7 @@ declare namespace media { * at the same time, resulting in errors in obtaining data. * @type { number } * @syscap SystemCapability.Multimedia.Media.AVTranscoder - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ fdDst: number; @@ -10118,8 +9731,7 @@ declare namespace media { * @throws { BusinessError } 5400103 - IO error. Return by promise. * @throws { BusinessError } 5400105 - Service died. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVTranscoder - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ start(): Promise; @@ -10146,8 +9758,7 @@ declare namespace media { * @throws { BusinessError } 5400103 - IO error. Return by promise. * @throws { BusinessError } 5400105 - Service died. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVTranscoder - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ resume(): Promise; @@ -10160,8 +9771,7 @@ declare namespace media { * @throws { BusinessError } 5400103 - IO error. Return by promise. * @throws { BusinessError } 5400105 - Service died. Return by promise. * @syscap SystemCapability.Multimedia.Media.AVTranscoder - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ cancel(): Promise; @@ -10215,7 +9825,6 @@ declare namespace media { * @since 12 */ on(type:'error', callback: ErrorCallback):void; - on(type:'error', callback: ErrorCallback):void; /** * Subscribes to transcoding progress updates. An application can subscribe to only one transcoding progress update @@ -10228,7 +9837,6 @@ declare namespace media { * @since 12 */ on(type:'progressUpdate', callback: Callback):void; - on(type:'progressUpdate', callback: Callback):void; /** * Unsubscribes from the event indicating that transcoding is complete. @@ -10252,7 +9860,6 @@ declare namespace media { * @since 12 */ off(type:'error', callback?: ErrorCallback):void; - off(type:'error', callback?: ErrorCallback):void; /** * Unsubscribes from transcoding progress updates. @@ -10265,7 +9872,6 @@ declare namespace media { * @since 12 */ off(type:'progressUpdate', callback?: Callback):void; - off(type:'progressUpdate', callback?: Callback):void; } /** diff --git a/api/@ohos.multimodalAwareness.roomLocation.d.ts b/api/@ohos.multimodalAwareness.roomLocation.d.ts deleted file mode 100644 index c7742f91cd..0000000000 --- a/api/@ohos.multimodalAwareness.roomLocation.d.ts +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Copyright (c) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @file - * @kit MultimodalAwarenessKit - */ - -import type { Callback } from './@ohos.base'; - -/** - * This module provides the capability to subscribe to report the room location result. - * @namespace roomLocation - * @syscap SystemCapability.MultimodalAwareness.RoomLocation - * @systemapi - * @since 20 - * @arkts 1.1&1.2 - */ -declare namespace roomLocation { - /** - * Interface for room location result - * @interface RoomLocateResponse - * @syscap SystemCapability.MultimodalAwareness.RoomLocation - * @systemapi - * @since 20 - * @arkts 1.1&1.2 - */ - interface RoomLocateResponse { - /** - * indicates roomId - * @type { string } - * @syscap SystemCapability.MultimodalAwareness.RoomLocation - * @systemapi - * @since 20 - * @arkts 1.1&1.2 - */ - roomId: string; - /** - * indicates errorCode - * @type { int } - * @syscap SystemCapability.MultimodalAwareness.RoomLocation - * @systemapi - * @since 20 - * @arkts 1.1&1.2 - */ - errorCode: int; - } - - /** - * Subscribe to room-level location result data. - * @param { 'onRoomLocated' } type - Indicates the event type. - * @param { Callback } callback - Callback location result data. - * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. - * @throws { BusinessError } 801 - Capability not supported. Function can not work correctly due to - * limited device capabilities. - * @throws { BusinessError } 33800001 - Service exception. - * @throws { BusinessError } 33800002 - Subscription failed. - * @syscap SystemCapability.MultimodalAwareness.RoomLocation - * @systemapi - * @since 20 - * @arkts 1.1&1.2 - */ - function on(type: 'onRoomLocated', callback: Callback): void; - - /** - * Unsubscribe to room-level location result data. - * @param { 'onRoomLocated' } type - Indicates the event type. - * @param { Callback } [callback] - Callback location result data. - * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. - * @throws { BusinessError } 801 - Capability not supported. Function can not work correctly due to - * limited device capabilities. - * @throws { BusinessError } 33800001 - Service exception. - * @throws { BusinessError } 33800003 - Unsubscription failed. - * @syscap SystemCapability.MultimodalAwareness.RoomLocation - * @systemapi - * @since 20 - * @arkts 1.1&1.2 - */ - function off(type: 'onRoomLocated', callback?: Callback): void; - - /** - * Get room-level location result data. - * @returns { RoomLocateResponse } - Result of room-level location. - * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. - * @throws { BusinessError } 801 - Capability not supported. Function can not work correctly due to - * limited device capabilities. - * @throws { BusinessError } 33800005 - Failed to obtain room-level location information. - * @syscap SystemCapability.MultimodalAwareness.RoomLocation - * @systemapi - * @since 20 - * @arkts 1.1&1.2 - */ - function getRoomLocationResult(): RoomLocateResponse; - - /** - * Set devices informations. - * @param { string } deviceInfos - Device informations. - * @returns { Promise } - Result of setting information. - * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. - * @throws { BusinessError } 801 - Capability not supported. Function can not work correctly due to - * limited device capabilities. - * @throws { BusinessError } 33800004 - Failed to set device information. - * @syscap SystemCapability.MultimodalAwareness.RoomLocation - * @systemapi - * @since 20 - * @arkts 1.1&1.2 - */ - function setDeviceInfos(deviceInfos: string): Promise; -} -export default roomLocation; diff --git a/api/@ohos.multimodalInput.gestureEvent.d.ts b/api/@ohos.multimodalInput.gestureEvent.d.ts index eec5eca5dc..211ba308a6 100644 --- a/api/@ohos.multimodalInput.gestureEvent.d.ts +++ b/api/@ohos.multimodalInput.gestureEvent.d.ts @@ -36,11 +36,11 @@ export declare interface Pinch { /** * scale - * @type { double } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 10 */ - scale: double; + scale: number; } /** @@ -63,11 +63,11 @@ export declare interface Rotate { /** * Rotate angle * - * @type { double } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 11 */ - angle: double; + angle: number; } /** @@ -88,19 +88,19 @@ export declare interface ThreeFingersSwipe { /** * Coordinate x - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 10 */ - x: int; + x: number; /** * Coordinate y - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 10 */ - y: int; + y: number; } /** @@ -121,19 +121,19 @@ export declare interface FourFingersSwipe { /** * Coordinate x - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 10 */ - x: int; + x: number; /** * Coordinate y - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 10 */ - y: int; + y: number; } /** @@ -156,21 +156,21 @@ export declare interface SwipeInward { /** * Coordinate x - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi hide for inner use * @since 12 */ - x: int; + x: number; /** * Coordinate y - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi hide for inner use * @since 12 */ - y: int; + y: number; } /** diff --git a/api/@ohos.multimodalInput.inputConsumer.d.ts b/api/@ohos.multimodalInput.inputConsumer.d.ts index 07e07b7d73..7e0056bf4e 100644 --- a/api/@ohos.multimodalInput.inputConsumer.d.ts +++ b/api/@ohos.multimodalInput.inputConsumer.d.ts @@ -50,25 +50,25 @@ declare namespace inputConsumer { * There is no requirement on the sequence of the keys. * For example, in the combination keys Ctrl+Alt+A, Ctrl+Alt are called preceding keys. * - * @type { Array } + * @type { Array } * @syscap SystemCapability.MultimodalInput.Input.InputConsumer * @systemapi hide for inner use * @since arkts {'1.1':'8', '1.2':'20'} * @arkts 1.1&1.2 */ - preKeys: Array; + preKeys: Array; /** * Final key. This parameter is mandatory. A callback is triggered by the final key. * For example, in the combination keys Ctrl+Alt+A, A is called the final key. * - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.InputConsumer * @systemapi hide for inner use * @since arkts {'1.1':'8', '1.2':'20'} * @arkts 1.1&1.2 */ - finalKey: int; + finalKey: number; /** * Whether the final key is pressed. @@ -89,13 +89,13 @@ declare namespace inputConsumer { * a callback is triggered when the key keeps being pressed after the specified duration expires. * If isFinalKeyDown is false, a callback is triggered when the key is released before the specified duration expires. * - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.InputConsumer * @systemapi hide for inner use * @since arkts {'1.1':'8', '1.2':'20'} * @arkts 1.1&1.2 */ - finalKeyDownDuration: int; + finalKeyDownDuration: number; /** * Whether to report repeated key events. The value true means to report repeated key events, and the value false means the opposite. @@ -115,8 +115,7 @@ declare namespace inputConsumer { * * @typedef HotkeyOptions * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ interface HotkeyOptions { /** @@ -124,23 +123,21 @@ declare namespace inputConsumer { * There is no requirement on the sequence of modifier keys. * For example, in Ctrl+Shift+Esc, Ctrl and Shift are modifier keys. * - * @type { Array } + * @type { Array } * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ - preKeys: Array; + preKeys: Array; /** * Modified key, which can be any key except the modifier keys and Meta key. For details about the keys, see Keycode. * For example, in Ctrl+Shift+Esc, Esc is the modified key. * - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ - finalKey: int; + finalKey: number; /** * Whether to report repeated key events. The value true means to report repeated key events, and the value false means the opposite. @@ -148,8 +145,7 @@ declare namespace inputConsumer { * * @type { ?boolean } * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ isRepeat?: boolean; } @@ -159,37 +155,33 @@ declare namespace inputConsumer { * * @typedef KeyPressedConfig * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since arkts {'1.1':'16', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 16 */ interface KeyPressedConfig { /** * Key value. Currently, only the KEYCODE_VOLUME_UP and KEYCODE_VOLUME_DOWN keys are supported. * - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since arkts {'1.1':'16', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 16 */ - key: int; + key: number; /** * Key event type. Currently, this parameter can only be set to 1, indicating key press. * - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since arkts {'1.1':'16', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 16 */ - action: int; + action: number; /** * The value true means to report repeated key events, and the value false means the opposite. The default value is true. * * @type { boolean } * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since arkts {'1.1':'16', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 16 */ isRepeat: boolean; } @@ -331,8 +323,7 @@ declare namespace inputConsumer { * @throws { BusinessError } 4200002 - The hotkey has been used by the system. * @throws { BusinessError } 4200003 - The hotkey has been subscribed to by another. * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ function on(type: 'hotkeyChange', hotkeyOptions: HotkeyOptions, callback: Callback): void; @@ -347,8 +338,7 @@ declare namespace inputConsumer { *
    2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - Capability not supported. * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ function off(type: 'hotkeyChange', hotkeyOptions: HotkeyOptions, callback?: Callback): void; @@ -363,8 +353,7 @@ declare namespace inputConsumer { *
    2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - Capability not supported. * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since arkts {'1.1':'16', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 16 */ function on(type: 'keyPressed', options: KeyPressedConfig, callback: Callback): void; @@ -379,8 +368,7 @@ declare namespace inputConsumer { *
    2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 801 - Capability not supported. * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @since arkts {'1.1':'16', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 16 */ function off(type: 'keyPressed', callback?: Callback): void; } diff --git a/api/@ohos.multimodalInput.inputDevice.d.ts b/api/@ohos.multimodalInput.inputDevice.d.ts index 4e5e99dcb6..1bec2bddfb 100644 --- a/api/@ohos.multimodalInput.inputDevice.d.ts +++ b/api/@ohos.multimodalInput.inputDevice.d.ts @@ -177,7 +177,7 @@ declare namespace inputDevice { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - deviceId: int; + deviceId: number; } /** @@ -240,52 +240,52 @@ declare namespace inputDevice { /** * Maximum value of the axis. * - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.InputDevice * @since arkts {'1.1':'8', '1.2':'20'} * @arkts 1.1&1.2 */ - max: int; + max: number; /** * Minimum value of the axis. * - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.InputDevice * @since arkts {'1.1':'8', '1.2':'20'} * @arkts 1.1&1.2 */ - min: int; + min: number; /** * Fuzzy value of the axis. * - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.InputDevice * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - fuzz: int; + fuzz: number; /** * Benchmark value of the axis. * - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.InputDevice * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - flat: int; + flat: number; /** * Resolution of the axis. * - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.InputDevice * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - resolution: int; + resolution: number; } /** @@ -306,7 +306,7 @@ declare namespace inputDevice { * @since arkts {'1.1':'8', '1.2':'20'} * @arkts 1.1&1.2 */ - id: int; + id: number; /** * Name of the input device. @@ -343,42 +343,42 @@ declare namespace inputDevice { /** * Bus type of the input device. By default, the bus type reported by the input device prevails. * - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.InputDevice * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - bus: int; + bus: number; /** * Product information of the input device. * - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.InputDevice * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - product: int; + product: number; /** * Vendor information of the input device. * - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.InputDevice * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - vendor: int; + vendor: number; /** * Version information of the input device. * - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.InputDevice * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - version: int; + version: number; /** * Physical address of the input device. diff --git a/api/@ohos.multimodalInput.inputDeviceCooperate.d.ts b/api/@ohos.multimodalInput.inputDeviceCooperate.d.ts index e7f24e3e12..c302bdac7e 100644 --- a/api/@ohos.multimodalInput.inputDeviceCooperate.d.ts +++ b/api/@ohos.multimodalInput.inputDeviceCooperate.d.ts @@ -28,6 +28,7 @@ import { AsyncCallback } from "./@ohos.base"; * @since 9 */ + declare namespace inputDeviceCooperate { /** * Enumerates screen hopping event. diff --git a/api/@ohos.multimodalInput.inputEvent.d.ts b/api/@ohos.multimodalInput.inputEvent.d.ts index f3a91a491a..65053adb01 100644 --- a/api/@ohos.multimodalInput.inputEvent.d.ts +++ b/api/@ohos.multimodalInput.inputEvent.d.ts @@ -42,12 +42,12 @@ export declare interface InputEvent { */ /** * Unique event ID generated by the server - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice * @since 12 */ - id: int; + id: number; /** * ID of the device that reports the input event @@ -57,12 +57,12 @@ export declare interface InputEvent { */ /** * ID of the device that reports the input event - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice * @since 12 */ - deviceId: int; + deviceId: number; /** * Occurrence time of the input event @@ -72,12 +72,12 @@ export declare interface InputEvent { */ /** * Occurrence time of the input event - * @type { long } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice * @since 12 */ - actionTime: long; + actionTime: number; /** * ID of the target screen @@ -87,12 +87,12 @@ export declare interface InputEvent { */ /** * ID of the target screen - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice * @since 12 */ - screenId: int; + screenId: number; /** * ID of the target window @@ -102,10 +102,10 @@ export declare interface InputEvent { */ /** * ID of the target window - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice * @since 12 */ - windowId: int; + windowId: number; } \ No newline at end of file diff --git a/api/@ohos.multimodalInput.inputEventClient.d.ts b/api/@ohos.multimodalInput.inputEventClient.d.ts index 4de04bf730..150b64d502 100644 --- a/api/@ohos.multimodalInput.inputEventClient.d.ts +++ b/api/@ohos.multimodalInput.inputEventClient.d.ts @@ -103,8 +103,7 @@ declare namespace inputEventClient { * @interface TouchEventData * @syscap SystemCapability.MultimodalInput.Input.InputSimulator * @systemapi hide for inner use - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ interface TouchEventData { /** @@ -113,8 +112,7 @@ declare namespace inputEventClient { * @type { TouchEvent } * @syscap SystemCapability.MultimodalInput.Input.InputSimulator * @systemapi hide for inner use - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ touchEvent: TouchEvent; } diff --git a/api/@ohos.multimodalInput.inputMonitor.d.ts b/api/@ohos.multimodalInput.inputMonitor.d.ts index 5fba3c170f..d60713c3dc 100644 --- a/api/@ohos.multimodalInput.inputMonitor.d.ts +++ b/api/@ohos.multimodalInput.inputMonitor.d.ts @@ -44,8 +44,7 @@ declare namespace inputMonitor { * @interface TouchEventReceiver * @syscap SystemCapability.MultimodalInput.Input.InputMonitor * @systemapi hide for inner use - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 7 */ interface TouchEventReceiver { /** diff --git a/api/@ohos.multimodalInput.keyCode.d.ts b/api/@ohos.multimodalInput.keyCode.d.ts index 65e9efc910..8c5e443fc2 100644 --- a/api/@ohos.multimodalInput.keyCode.d.ts +++ b/api/@ohos.multimodalInput.keyCode.d.ts @@ -31,16 +31,14 @@ * @enum { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ export declare enum KeyCode { /** * KEYCODE_FN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_FN = 0, @@ -48,8 +46,7 @@ export declare enum KeyCode { * KEYCODE_UNKNOWN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_UNKNOWN = -1, @@ -57,8 +54,7 @@ export declare enum KeyCode { * KEYCODE_HOME * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_HOME = 1, @@ -66,8 +62,7 @@ export declare enum KeyCode { * KEYCODE_BACK * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BACK = 2, @@ -83,8 +78,7 @@ export declare enum KeyCode { * KEYCODE_SEARCH * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'13', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ KEYCODE_SEARCH = 9, @@ -99,8 +93,7 @@ export declare enum KeyCode { * * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ KEYCODE_MEDIA_PLAY_PAUSE = 10, @@ -115,8 +108,7 @@ export declare enum KeyCode { * * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ KEYCODE_MEDIA_STOP = 11, @@ -131,8 +123,7 @@ export declare enum KeyCode { * * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ KEYCODE_MEDIA_NEXT = 12, @@ -147,8 +138,7 @@ export declare enum KeyCode { * * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ KEYCODE_MEDIA_PREVIOUS = 13, @@ -163,8 +153,7 @@ export declare enum KeyCode { * * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ KEYCODE_MEDIA_REWIND = 14, @@ -179,8 +168,7 @@ export declare enum KeyCode { * * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ KEYCODE_MEDIA_FAST_FORWARD = 15, @@ -188,8 +176,7 @@ export declare enum KeyCode { * KEYCODE_VOLUME_UP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_VOLUME_UP = 16, @@ -197,8 +184,7 @@ export declare enum KeyCode { * KEYCODE_VOLUME_DOWN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_VOLUME_DOWN = 17, @@ -206,8 +192,7 @@ export declare enum KeyCode { * KEYCODE_POWER * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_POWER = 18, @@ -215,8 +200,7 @@ export declare enum KeyCode { * KEYCODE_CAMERA * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_CAMERA = 19, @@ -224,8 +208,7 @@ export declare enum KeyCode { * KEYCODE_VOLUME_MUTE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_VOLUME_MUTE = 22, @@ -233,8 +216,7 @@ export declare enum KeyCode { * KEYCODE_MUTE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_MUTE = 23, @@ -242,8 +224,7 @@ export declare enum KeyCode { * KEYCODE_BRIGHTNESS_UP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BRIGHTNESS_UP = 40, @@ -251,8 +232,7 @@ export declare enum KeyCode { * KEYCODE_BRIGHTNESS_DOWN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BRIGHTNESS_DOWN = 41, @@ -260,8 +240,7 @@ export declare enum KeyCode { * KEYCODE_0 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_0 = 2000, @@ -269,8 +248,7 @@ export declare enum KeyCode { * KEYCODE_1 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_1 = 2001, @@ -278,8 +256,7 @@ export declare enum KeyCode { * KEYCODE_2 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_2 = 2002, @@ -287,8 +264,7 @@ export declare enum KeyCode { * KEYCODE_3 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_3 = 2003, @@ -296,8 +272,7 @@ export declare enum KeyCode { * KEYCODE_4 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_4 = 2004, @@ -305,8 +280,7 @@ export declare enum KeyCode { * KEYCODE_5 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_5 = 2005, @@ -314,8 +288,7 @@ export declare enum KeyCode { * KEYCODE_6 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_6 = 2006, @@ -323,8 +296,7 @@ export declare enum KeyCode { * KEYCODE_7 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_7 = 2007, @@ -332,8 +304,7 @@ export declare enum KeyCode { * KEYCODE_8 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_8 = 2008, @@ -341,8 +312,7 @@ export declare enum KeyCode { * KEYCODE_9 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_9 = 2009, @@ -350,8 +320,7 @@ export declare enum KeyCode { * KEYCODE_STAR * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_STAR = 2010, @@ -359,8 +328,7 @@ export declare enum KeyCode { * KEYCODE_POUND * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_POUND = 2011, @@ -368,8 +336,7 @@ export declare enum KeyCode { * KEYCODE_DPAD_UP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_DPAD_UP = 2012, @@ -377,8 +344,7 @@ export declare enum KeyCode { * KEYCODE_DPAD_DOWN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_DPAD_DOWN = 2013, @@ -386,8 +352,7 @@ export declare enum KeyCode { * KEYCODE_DPAD_LEFT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_DPAD_LEFT = 2014, @@ -395,8 +360,7 @@ export declare enum KeyCode { * KEYCODE_DPAD_RIGHT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_DPAD_RIGHT = 2015, @@ -404,8 +368,7 @@ export declare enum KeyCode { * KEYCODE_DPAD_CENTER * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_DPAD_CENTER = 2016, @@ -413,8 +376,7 @@ export declare enum KeyCode { * KEYCODE_A * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_A = 2017, @@ -422,8 +384,7 @@ export declare enum KeyCode { * KEYCODE_B * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_B = 2018, @@ -431,8 +392,7 @@ export declare enum KeyCode { * KEYCODE_C * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_C = 2019, @@ -440,8 +400,7 @@ export declare enum KeyCode { * KEYCODE_D * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_D = 2020, @@ -449,8 +408,7 @@ export declare enum KeyCode { * KEYCODE_E * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_E = 2021, @@ -458,8 +416,7 @@ export declare enum KeyCode { * KEYCODE_F * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F = 2022, @@ -467,8 +424,7 @@ export declare enum KeyCode { * KEYCODE_G * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_G = 2023, @@ -476,8 +432,7 @@ export declare enum KeyCode { * KEYCODE_H * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_H = 2024, @@ -485,8 +440,7 @@ export declare enum KeyCode { * KEYCODE_I * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_I = 2025, @@ -494,8 +448,7 @@ export declare enum KeyCode { * KEYCODE_J * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_J = 2026, @@ -503,8 +456,7 @@ export declare enum KeyCode { * KEYCODE_K * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_K = 2027, @@ -512,8 +464,7 @@ export declare enum KeyCode { * KEYCODE_L * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_L = 2028, @@ -521,8 +472,7 @@ export declare enum KeyCode { * KEYCODE_M * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_M = 2029, @@ -530,8 +480,7 @@ export declare enum KeyCode { * KEYCODE_N * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_N = 2030, @@ -539,8 +488,7 @@ export declare enum KeyCode { * KEYCODE_O * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_O = 2031, @@ -548,8 +496,7 @@ export declare enum KeyCode { * KEYCODE_P * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_P = 2032, @@ -557,8 +504,7 @@ export declare enum KeyCode { * KEYCODE_Q * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_Q = 2033, @@ -566,8 +512,7 @@ export declare enum KeyCode { * KEYCODE_R * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_R = 2034, @@ -575,8 +520,7 @@ export declare enum KeyCode { * KEYCODE_S * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_S = 2035, @@ -584,8 +528,7 @@ export declare enum KeyCode { * KEYCODE_T * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_T = 2036, @@ -593,8 +536,7 @@ export declare enum KeyCode { * KEYCODE_U * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_U = 2037, @@ -602,8 +544,7 @@ export declare enum KeyCode { * KEYCODE_V * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_V = 2038, @@ -611,8 +552,7 @@ export declare enum KeyCode { * KEYCODE_W * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_W = 2039, @@ -620,8 +560,7 @@ export declare enum KeyCode { * KEYCODE_X * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_X = 2040, @@ -629,8 +568,7 @@ export declare enum KeyCode { * KEYCODE_Y * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_Y = 2041, @@ -638,8 +576,7 @@ export declare enum KeyCode { * KEYCODE_Z * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_Z = 2042, @@ -647,8 +584,7 @@ export declare enum KeyCode { * KEYCODE_COMMA * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_COMMA = 2043, @@ -656,8 +592,7 @@ export declare enum KeyCode { * KEYCODE_PERIOD * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_PERIOD = 2044, @@ -665,8 +600,7 @@ export declare enum KeyCode { * KEYCODE_ALT_LEFT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_ALT_LEFT = 2045, @@ -674,8 +608,7 @@ export declare enum KeyCode { * KEYCODE_ALT_RIGHT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_ALT_RIGHT = 2046, @@ -683,8 +616,7 @@ export declare enum KeyCode { * KEYCODE_SHIFT_LEFT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SHIFT_LEFT = 2047, @@ -692,8 +624,7 @@ export declare enum KeyCode { * KEYCODE_SHIFT_RIGHT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SHIFT_RIGHT = 2048, @@ -701,8 +632,7 @@ export declare enum KeyCode { * KEYCODE_TAB * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_TAB = 2049, @@ -710,8 +640,7 @@ export declare enum KeyCode { * KEYCODE_SPACE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SPACE = 2050, @@ -719,8 +648,7 @@ export declare enum KeyCode { * KEYCODE_SYM * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SYM = 2051, @@ -728,8 +656,7 @@ export declare enum KeyCode { * Explorer key, which is used to start the explorer application * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_EXPLORER = 2052, @@ -737,8 +664,7 @@ export declare enum KeyCode { * Email key, which is used to start the email application * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_ENVELOPE = 2053, @@ -746,8 +672,7 @@ export declare enum KeyCode { * KEYCODE_ENTER * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_ENTER = 2054, @@ -755,8 +680,7 @@ export declare enum KeyCode { * KEYCODE_DEL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_DEL = 2055, @@ -764,8 +688,7 @@ export declare enum KeyCode { * Key / * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_GRAVE = 2056, @@ -773,8 +696,7 @@ export declare enum KeyCode { * Key - * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_MINUS = 2057, @@ -782,8 +704,7 @@ export declare enum KeyCode { * Key = * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_EQUALS = 2058, @@ -791,8 +712,7 @@ export declare enum KeyCode { * Key [ * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_LEFT_BRACKET = 2059, @@ -800,8 +720,7 @@ export declare enum KeyCode { * Key ] * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_RIGHT_BRACKET = 2060, @@ -809,8 +728,7 @@ export declare enum KeyCode { * Key \ * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BACKSLASH = 2061, @@ -818,8 +736,7 @@ export declare enum KeyCode { * Key ; * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SEMICOLON = 2062, @@ -827,8 +744,7 @@ export declare enum KeyCode { * Key ' * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_APOSTROPHE = 2063, @@ -836,8 +752,7 @@ export declare enum KeyCode { * Key / * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SLASH = 2064, @@ -845,8 +760,7 @@ export declare enum KeyCode { * Key @ * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_AT = 2065, @@ -854,8 +768,7 @@ export declare enum KeyCode { * Key + * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_PLUS = 2066, @@ -863,8 +776,7 @@ export declare enum KeyCode { * KEYCODE_MENU * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_MENU = 2067, @@ -872,8 +784,7 @@ export declare enum KeyCode { * KEYCODE_PAGE_UP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_PAGE_UP = 2068, @@ -881,8 +792,7 @@ export declare enum KeyCode { * KEYCODE_PAGE_DOWN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_PAGE_DOWN = 2069, @@ -890,8 +800,7 @@ export declare enum KeyCode { * KEYCODE_ESCAPE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_ESCAPE = 2070, @@ -899,8 +808,7 @@ export declare enum KeyCode { * KEYCODE_FORWARD_DEL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_FORWARD_DEL = 2071, @@ -908,8 +816,7 @@ export declare enum KeyCode { * KEYCODE_CTRL_LEFT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_CTRL_LEFT = 2072, @@ -917,8 +824,7 @@ export declare enum KeyCode { * KEYCODE_CTRL_RIGHT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_CTRL_RIGHT = 2073, @@ -926,8 +832,7 @@ export declare enum KeyCode { * KEYCODE_CAPS_LOCK * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_CAPS_LOCK = 2074, @@ -935,8 +840,7 @@ export declare enum KeyCode { * KEYCODE_SCROLL_LOCK * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SCROLL_LOCK = 2075, @@ -944,8 +848,7 @@ export declare enum KeyCode { * KEYCODE_META_LEFT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_META_LEFT = 2076, @@ -953,8 +856,7 @@ export declare enum KeyCode { * KEYCODE_META_RIGHT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_META_RIGHT = 2077, @@ -962,8 +864,7 @@ export declare enum KeyCode { * KEYCODE_FUNCTION * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_FUNCTION = 2078, @@ -971,8 +872,7 @@ export declare enum KeyCode { * KEYCODE_SYSRQ * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SYSRQ = 2079, @@ -980,8 +880,7 @@ export declare enum KeyCode { * KEYCODE_BREAK * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BREAK = 2080, @@ -989,8 +888,7 @@ export declare enum KeyCode { * KEYCODE_MOVE_HOME * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_MOVE_HOME = 2081, @@ -998,8 +896,7 @@ export declare enum KeyCode { * KEYCODE_MOVE_END * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_MOVE_END = 2082, @@ -1007,8 +904,7 @@ export declare enum KeyCode { * KEYCODE_INSERT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_INSERT = 2083, @@ -1016,8 +912,7 @@ export declare enum KeyCode { * KEYCODE_FORWARD * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_FORWARD = 2084, @@ -1032,8 +927,7 @@ export declare enum KeyCode { * * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ KEYCODE_MEDIA_PLAY = 2085, @@ -1048,8 +942,7 @@ export declare enum KeyCode { * * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ KEYCODE_MEDIA_PAUSE = 2086, @@ -1057,8 +950,7 @@ export declare enum KeyCode { * KEYCODE_MEDIA_CLOSE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_MEDIA_CLOSE = 2087, @@ -1066,8 +958,7 @@ export declare enum KeyCode { * KEYCODE_MEDIA_EJECT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_MEDIA_EJECT = 2088, @@ -1075,8 +966,7 @@ export declare enum KeyCode { * KEYCODE_MEDIA_RECORD * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_MEDIA_RECORD = 2089, @@ -1084,8 +974,7 @@ export declare enum KeyCode { * KEYCODE_F1 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F1 = 2090, @@ -1093,8 +982,7 @@ export declare enum KeyCode { * KEYCODE_F2 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F2 = 2091, @@ -1102,8 +990,7 @@ export declare enum KeyCode { * KEYCODE_F3 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F3 = 2092, @@ -1111,8 +998,7 @@ export declare enum KeyCode { * KEYCODE_F4 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F4 = 2093, @@ -1120,8 +1006,7 @@ export declare enum KeyCode { * KEYCODE_F5 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F5 = 2094, @@ -1129,8 +1014,7 @@ export declare enum KeyCode { * KEYCODE_F6 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F6 = 2095, @@ -1138,8 +1022,7 @@ export declare enum KeyCode { * KEYCODE_F7 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F7 = 2096, @@ -1147,8 +1030,7 @@ export declare enum KeyCode { * KEYCODE_F8 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F8 = 2097, @@ -1156,8 +1038,7 @@ export declare enum KeyCode { * KEYCODE_F9 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F9 = 2098, @@ -1165,8 +1046,7 @@ export declare enum KeyCode { * KEYCODE_F10 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F10 = 2099, @@ -1174,8 +1054,7 @@ export declare enum KeyCode { * KEYCODE_F11 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F11 = 2100, @@ -1183,8 +1062,7 @@ export declare enum KeyCode { * KEYCODE_F12 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F12 = 2101, @@ -1192,8 +1070,7 @@ export declare enum KeyCode { * Number Lock key on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUM_LOCK = 2102, @@ -1201,8 +1078,7 @@ export declare enum KeyCode { * Key 0 on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUMPAD_0 = 2103, @@ -1210,8 +1086,7 @@ export declare enum KeyCode { * Key 1 on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUMPAD_1 = 2104, @@ -1219,8 +1094,7 @@ export declare enum KeyCode { * Key 2 on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUMPAD_2 = 2105, @@ -1228,8 +1102,7 @@ export declare enum KeyCode { * Key 3 on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUMPAD_3 = 2106, @@ -1237,8 +1110,7 @@ export declare enum KeyCode { * Key 4 on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUMPAD_4 = 2107, @@ -1246,8 +1118,7 @@ export declare enum KeyCode { * Key 5 on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUMPAD_5 = 2108, @@ -1255,8 +1126,7 @@ export declare enum KeyCode { * Key 6 on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUMPAD_6 = 2109, @@ -1264,8 +1134,7 @@ export declare enum KeyCode { * Key 7 on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUMPAD_7 = 2110, @@ -1273,8 +1142,7 @@ export declare enum KeyCode { * Key 8 on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUMPAD_8 = 2111, @@ -1282,8 +1150,7 @@ export declare enum KeyCode { * Key 9 on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUMPAD_9 = 2112, @@ -1291,8 +1158,7 @@ export declare enum KeyCode { * Key / on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUMPAD_DIVIDE = 2113, @@ -1300,8 +1166,7 @@ export declare enum KeyCode { * Key ) on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUMPAD_MULTIPLY = 2114, @@ -1309,8 +1174,7 @@ export declare enum KeyCode { * Key - on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUMPAD_SUBTRACT = 2115, @@ -1318,8 +1182,7 @@ export declare enum KeyCode { * Key + on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUMPAD_ADD = 2116, @@ -1327,8 +1190,7 @@ export declare enum KeyCode { * Key . on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUMPAD_DOT = 2117, @@ -1336,8 +1198,7 @@ export declare enum KeyCode { * Key , on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUMPAD_COMMA = 2118, @@ -1345,8 +1206,7 @@ export declare enum KeyCode { * Enter key on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUMPAD_ENTER = 2119, @@ -1354,8 +1214,7 @@ export declare enum KeyCode { * Key = on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUMPAD_EQUALS = 2120, @@ -1363,8 +1222,7 @@ export declare enum KeyCode { * Key ( on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUMPAD_LEFT_PAREN = 2121, @@ -1372,8 +1230,7 @@ export declare enum KeyCode { * Key ) on numeric keypad * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUMPAD_RIGHT_PAREN = 2122, @@ -1381,8 +1238,7 @@ export declare enum KeyCode { * KEYCODE_VIRTUAL_MULTITASK * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_VIRTUAL_MULTITASK = 2210, @@ -1390,8 +1246,7 @@ export declare enum KeyCode { * Joystick key A * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ KEYCODE_BUTTON_A = 2301, @@ -1399,8 +1254,7 @@ export declare enum KeyCode { * Joystick key B * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ KEYCODE_BUTTON_B = 2302, @@ -1408,8 +1262,7 @@ export declare enum KeyCode { * Joystick key X * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ KEYCODE_BUTTON_X = 2304, @@ -1417,8 +1270,7 @@ export declare enum KeyCode { * Joystick key Y * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ KEYCODE_BUTTON_Y = 2305, @@ -1426,8 +1278,7 @@ export declare enum KeyCode { * Joystick key L1 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ KEYCODE_BUTTON_L1 = 2307, @@ -1435,8 +1286,7 @@ export declare enum KeyCode { * Joystick key R1 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ KEYCODE_BUTTON_R1 = 2308, @@ -1444,8 +1294,7 @@ export declare enum KeyCode { * Joystick key L2 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ KEYCODE_BUTTON_L2 = 2309, @@ -1453,8 +1302,7 @@ export declare enum KeyCode { * Joystick key R2 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ KEYCODE_BUTTON_R2 = 2310, @@ -1462,8 +1310,7 @@ export declare enum KeyCode { * Joystick key Select * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ KEYCODE_BUTTON_SELECT = 2311, @@ -1471,8 +1318,7 @@ export declare enum KeyCode { * Joystick key Start * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ KEYCODE_BUTTON_START = 2312, @@ -1480,8 +1326,7 @@ export declare enum KeyCode { * Joystick key Mode * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ KEYCODE_BUTTON_MODE = 2313, @@ -1489,8 +1334,7 @@ export declare enum KeyCode { *Joystick key THUMBL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ KEYCODE_BUTTON_THUMBL = 2314, @@ -1498,8 +1342,7 @@ export declare enum KeyCode { * Joystick key THUMBR * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ KEYCODE_BUTTON_THUMBR = 2315, @@ -1507,8 +1350,7 @@ export declare enum KeyCode { * KEYCODE_SLEEP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SLEEP = 2600, @@ -1516,8 +1358,7 @@ export declare enum KeyCode { * KEYCODE_ZENKAKU_HANKAKU * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_ZENKAKU_HANKAKU = 2601, @@ -1525,8 +1366,7 @@ export declare enum KeyCode { * KEYCODE_102ND * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_102ND = 2602, @@ -1534,8 +1374,7 @@ export declare enum KeyCode { * KEYCODE_RO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_RO = 2603, @@ -1543,8 +1382,7 @@ export declare enum KeyCode { * KEYCODE_KATAKANA * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_KATAKANA = 2604, @@ -1552,8 +1390,7 @@ export declare enum KeyCode { * KEYCODE_HIRAGANA * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_HIRAGANA = 2605, @@ -1561,8 +1398,7 @@ export declare enum KeyCode { * KEYCODE_HENKAN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_HENKAN = 2606, @@ -1570,8 +1406,7 @@ export declare enum KeyCode { * KEYCODE_KATAKANA_HIRAGANA * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_KATAKANA_HIRAGANA = 2607, @@ -1579,8 +1414,7 @@ export declare enum KeyCode { * KEYCODE_MUHENKAN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_MUHENKAN = 2608, @@ -1588,8 +1422,7 @@ export declare enum KeyCode { * KEYCODE_LINEFEED * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_LINEFEED = 2609, @@ -1597,8 +1430,7 @@ export declare enum KeyCode { * KEYCODE_MACRO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_MACRO = 2610, @@ -1606,8 +1438,7 @@ export declare enum KeyCode { * KEYCODE_NUMPAD_PLUSMINUS * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NUMPAD_PLUSMINUS = 2611, @@ -1615,8 +1446,7 @@ export declare enum KeyCode { * KEYCODE_SCALE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SCALE = 2612, @@ -1624,8 +1454,7 @@ export declare enum KeyCode { * KEYCODE_HANGUEL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_HANGUEL = 2613, @@ -1633,8 +1462,7 @@ export declare enum KeyCode { * KEYCODE_HANJA * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_HANJA = 2614, @@ -1642,8 +1470,7 @@ export declare enum KeyCode { * KEYCODE_YEN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_YEN = 2615, @@ -1651,8 +1478,7 @@ export declare enum KeyCode { * KEYCODE_STOP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_STOP = 2616, @@ -1660,8 +1486,7 @@ export declare enum KeyCode { * KEYCODE_AGAIN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_AGAIN = 2617, @@ -1669,8 +1494,7 @@ export declare enum KeyCode { * KEYCODE_PROPS * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_PROPS = 2618, @@ -1678,8 +1502,7 @@ export declare enum KeyCode { * KEYCODE_UNDO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_UNDO = 2619, @@ -1687,8 +1510,7 @@ export declare enum KeyCode { * KEYCODE_COPY * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_COPY = 2620, @@ -1696,8 +1518,7 @@ export declare enum KeyCode { * KEYCODE_OPEN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_OPEN = 2621, @@ -1705,8 +1526,7 @@ export declare enum KeyCode { * KEYCODE_PASTE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_PASTE = 2622, @@ -1714,8 +1534,7 @@ export declare enum KeyCode { * KEYCODE_FIND * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_FIND = 2623, @@ -1723,8 +1542,7 @@ export declare enum KeyCode { * KEYCODE_CUT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_CUT = 2624, @@ -1732,8 +1550,7 @@ export declare enum KeyCode { * KEYCODE_HELP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_HELP = 2625, @@ -1741,8 +1558,7 @@ export declare enum KeyCode { * Calc key, which is used to start the calculator application * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_CALC = 2626, @@ -1750,8 +1566,7 @@ export declare enum KeyCode { * KEYCODE_FILE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_FILE = 2627, @@ -1759,8 +1574,7 @@ export declare enum KeyCode { * KEYCODE_BOOKMARKS * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BOOKMARKS = 2628, @@ -1768,8 +1582,7 @@ export declare enum KeyCode { * KEYCODE_NEXT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NEXT = 2629, @@ -1777,8 +1590,7 @@ export declare enum KeyCode { * KEYCODE_PLAYPAUSE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_PLAYPAUSE = 2630, @@ -1786,8 +1598,7 @@ export declare enum KeyCode { * KEYCODE_PREVIOUS * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_PREVIOUS = 2631, @@ -1795,8 +1606,7 @@ export declare enum KeyCode { * KEYCODE_STOPCD * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_STOPCD = 2632, @@ -1804,8 +1614,7 @@ export declare enum KeyCode { * KEYCODE_CONFIG * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_CONFIG = 2634, @@ -1813,8 +1622,7 @@ export declare enum KeyCode { * KEYCODE_REFRESH * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_REFRESH = 2635, @@ -1822,8 +1630,7 @@ export declare enum KeyCode { * KEYCODE_EXIT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_EXIT = 2636, @@ -1831,8 +1638,7 @@ export declare enum KeyCode { * KEYCODE_EDIT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_EDIT = 2637, @@ -1840,8 +1646,7 @@ export declare enum KeyCode { * KEYCODE_SCROLLUP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SCROLLUP = 2638, @@ -1849,8 +1654,7 @@ export declare enum KeyCode { * KEYCODE_SCROLLDOWN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SCROLLDOWN = 2639, @@ -1858,8 +1662,7 @@ export declare enum KeyCode { * KEYCODE_NEW * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NEW = 2640, @@ -1867,8 +1670,7 @@ export declare enum KeyCode { * KEYCODE_REDO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_REDO = 2641, @@ -1876,8 +1678,7 @@ export declare enum KeyCode { * KEYCODE_CLOSE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_CLOSE = 2642, @@ -1885,8 +1686,7 @@ export declare enum KeyCode { * KEYCODE_PLAY * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_PLAY = 2643, @@ -1894,8 +1694,7 @@ export declare enum KeyCode { * KEYCODE_BASSBOOST * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BASSBOOST = 2644, @@ -1903,8 +1702,7 @@ export declare enum KeyCode { * KEYCODE_PRINT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_PRINT = 2645, @@ -1912,8 +1710,7 @@ export declare enum KeyCode { * KEYCODE_CHAT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_CHAT = 2646, @@ -1921,8 +1718,7 @@ export declare enum KeyCode { * KEYCODE_FINANCE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_FINANCE = 2647, @@ -1930,8 +1726,7 @@ export declare enum KeyCode { * KEYCODE_CANCEL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_CANCEL = 2648, @@ -1939,8 +1734,7 @@ export declare enum KeyCode { * KEYCODE_KBDILLUM_TOGGLE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_KBDILLUM_TOGGLE = 2649, @@ -1948,8 +1742,7 @@ export declare enum KeyCode { * KEYCODE_KBDILLUM_DOWN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_KBDILLUM_DOWN = 2650, @@ -1957,8 +1750,7 @@ export declare enum KeyCode { * KEYCODE_KBDILLUM_UP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_KBDILLUM_UP = 2651, @@ -1966,8 +1758,7 @@ export declare enum KeyCode { * KEYCODE_SEND * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SEND = 2652, @@ -1975,8 +1766,7 @@ export declare enum KeyCode { * KEYCODE_REPLY * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_REPLY = 2653, @@ -1984,8 +1774,7 @@ export declare enum KeyCode { * KEYCODE_FORWARDMAIL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_FORWARDMAIL = 2654, @@ -1993,8 +1782,7 @@ export declare enum KeyCode { * KEYCODE_SAVE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SAVE = 2655, @@ -2002,8 +1790,7 @@ export declare enum KeyCode { * KEYCODE_DOCUMENTS * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_DOCUMENTS = 2656, @@ -2011,8 +1798,7 @@ export declare enum KeyCode { * KEYCODE_VIDEO_NEXT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_VIDEO_NEXT = 2657, @@ -2020,8 +1806,7 @@ export declare enum KeyCode { * KEYCODE_VIDEO_PREV * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_VIDEO_PREV = 2658, @@ -2029,8 +1814,7 @@ export declare enum KeyCode { * KEYCODE_BRIGHTNESS_CYCLE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BRIGHTNESS_CYCLE = 2659, @@ -2038,8 +1822,7 @@ export declare enum KeyCode { * KEYCODE_BRIGHTNESS_ZERO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BRIGHTNESS_ZERO = 2660, @@ -2047,8 +1830,7 @@ export declare enum KeyCode { * KEYCODE_DISPLAY_OFF * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_DISPLAY_OFF = 2661, @@ -2056,8 +1838,7 @@ export declare enum KeyCode { * KEYCODE_BTN_MISC * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BTN_MISC = 2662, @@ -2065,8 +1846,7 @@ export declare enum KeyCode { * KEYCODE_GOTO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_GOTO = 2663, @@ -2074,8 +1854,7 @@ export declare enum KeyCode { * KEYCODE_INFO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_INFO = 2664, @@ -2083,8 +1862,7 @@ export declare enum KeyCode { * KEYCODE_PROGRAM * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_PROGRAM = 2665, @@ -2092,8 +1870,7 @@ export declare enum KeyCode { * KEYCODE_PVR * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_PVR = 2666, @@ -2101,8 +1878,7 @@ export declare enum KeyCode { * KEYCODE_SUBTITLE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SUBTITLE = 2667, @@ -2110,8 +1886,7 @@ export declare enum KeyCode { * KEYCODE_FULL_SCREEN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_FULL_SCREEN = 2668, @@ -2119,8 +1894,7 @@ export declare enum KeyCode { * KEYCODE_KEYBOARD * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_KEYBOARD = 2669, @@ -2128,8 +1902,7 @@ export declare enum KeyCode { * KEYCODE_ASPECT_RATIO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_ASPECT_RATIO = 2670, @@ -2137,8 +1910,7 @@ export declare enum KeyCode { * KEYCODE_PC * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_PC = 2671, @@ -2146,8 +1918,7 @@ export declare enum KeyCode { * KEYCODE_TV * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_TV = 2672, @@ -2155,8 +1926,7 @@ export declare enum KeyCode { * KEYCODE_TV2 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_TV2 = 2673, @@ -2164,8 +1934,7 @@ export declare enum KeyCode { * KEYCODE_VCR * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_VCR = 2674, @@ -2173,8 +1942,7 @@ export declare enum KeyCode { * KEYCODE_VCR2 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_VCR2 = 2675, @@ -2182,8 +1950,7 @@ export declare enum KeyCode { * KEYCODE_SAT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SAT = 2676, @@ -2191,8 +1958,7 @@ export declare enum KeyCode { * KEYCODE_CD * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_CD = 2677, @@ -2200,8 +1966,7 @@ export declare enum KeyCode { * KEYCODE_TAPE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_TAPE = 2678, @@ -2209,8 +1974,7 @@ export declare enum KeyCode { * KEYCODE_TUNER * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_TUNER = 2679, @@ -2218,8 +1982,7 @@ export declare enum KeyCode { * KEYCODE_PLAYER * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_PLAYER = 2680, @@ -2227,8 +1990,7 @@ export declare enum KeyCode { * KEYCODE_DVD * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_DVD = 2681, @@ -2236,8 +1998,7 @@ export declare enum KeyCode { * KEYCODE_AUDIO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_AUDIO = 2682, @@ -2245,8 +2006,7 @@ export declare enum KeyCode { * KEYCODE_VIDEO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_VIDEO = 2683, @@ -2254,8 +2014,7 @@ export declare enum KeyCode { * KEYCODE_MEMO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_MEMO = 2684, @@ -2263,8 +2022,7 @@ export declare enum KeyCode { * KEYCODE_CALENDAR * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_CALENDAR = 2685, @@ -2272,8 +2030,7 @@ export declare enum KeyCode { * KEYCODE_RED * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_RED = 2686, @@ -2281,8 +2038,7 @@ export declare enum KeyCode { * KEYCODE_GREEN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_GREEN = 2687, @@ -2290,8 +2046,7 @@ export declare enum KeyCode { * KEYCODE_YELLOW * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_YELLOW = 2688, @@ -2299,8 +2054,7 @@ export declare enum KeyCode { * KEYCODE_BLUE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BLUE = 2689, @@ -2308,8 +2062,7 @@ export declare enum KeyCode { * KEYCODE_CHANNELUP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_CHANNELUP = 2690, @@ -2317,8 +2070,7 @@ export declare enum KeyCode { * KEYCODE_CHANNELDOWN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_CHANNELDOWN = 2691, @@ -2326,8 +2078,7 @@ export declare enum KeyCode { * KEYCODE_LAST * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_LAST = 2692, @@ -2335,8 +2086,7 @@ export declare enum KeyCode { * KEYCODE_RESTART * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_RESTART = 2693, @@ -2344,8 +2094,7 @@ export declare enum KeyCode { * KEYCODE_SLOW * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SLOW = 2694, @@ -2353,8 +2102,7 @@ export declare enum KeyCode { * KEYCODE_SHUFFLE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SHUFFLE = 2695, @@ -2362,8 +2110,7 @@ export declare enum KeyCode { * KEYCODE_VIDEOPHONE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_VIDEOPHONE = 2696, @@ -2371,8 +2118,7 @@ export declare enum KeyCode { * KEYCODE_GAMES * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_GAMES = 2697, @@ -2380,8 +2126,7 @@ export declare enum KeyCode { * KEYCODE_ZOOMIN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_ZOOMIN = 2698, @@ -2389,8 +2134,7 @@ export declare enum KeyCode { * KEYCODE_ZOOMOUT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_ZOOMOUT = 2699, @@ -2398,8 +2142,7 @@ export declare enum KeyCode { * KEYCODE_ZOOMRESET * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_ZOOMRESET = 2700, @@ -2407,8 +2150,7 @@ export declare enum KeyCode { * KEYCODE_WORDPROCESSOR * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_WORDPROCESSOR = 2701, @@ -2416,8 +2158,7 @@ export declare enum KeyCode { * KEYCODE_EDITOR * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_EDITOR = 2702, @@ -2425,8 +2166,7 @@ export declare enum KeyCode { * KEYCODE_SPREADSHEET * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SPREADSHEET = 2703, @@ -2434,8 +2174,7 @@ export declare enum KeyCode { * KEYCODE_GRAPHICSEDITOR * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_GRAPHICSEDITOR = 2704, @@ -2443,8 +2182,7 @@ export declare enum KeyCode { * KEYCODE_PRESENTATION * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_PRESENTATION = 2705, @@ -2452,8 +2190,7 @@ export declare enum KeyCode { * KEYCODE_DATABASE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_DATABASE = 2706, @@ -2461,8 +2198,7 @@ export declare enum KeyCode { * KEYCODE_NEWS * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_NEWS = 2707, @@ -2470,8 +2206,7 @@ export declare enum KeyCode { * KEYCODE_VOICEMAIL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_VOICEMAIL = 2708, @@ -2479,8 +2214,7 @@ export declare enum KeyCode { * KEYCODE_ADDRESSBOOK * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_ADDRESSBOOK = 2709, @@ -2488,8 +2222,7 @@ export declare enum KeyCode { * KEYCODE_MESSENGER * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_MESSENGER = 2710, @@ -2497,8 +2230,7 @@ export declare enum KeyCode { * KEYCODE_BRIGHTNESS_TOGGLE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BRIGHTNESS_TOGGLE = 2711, @@ -2506,8 +2238,7 @@ export declare enum KeyCode { * KEYCODE_SPELLCHECK * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SPELLCHECK = 2712, @@ -2515,8 +2246,7 @@ export declare enum KeyCode { * KEYCODE_COFFEE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_COFFEE = 2713, @@ -2524,8 +2254,7 @@ export declare enum KeyCode { * KEYCODE_MEDIA_REPEAT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_MEDIA_REPEAT = 2714, @@ -2533,8 +2262,7 @@ export declare enum KeyCode { * KEYCODE_IMAGES * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_IMAGES = 2715, @@ -2542,8 +2270,7 @@ export declare enum KeyCode { * KEYCODE_BUTTONCONFIG * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BUTTONCONFIG = 2716, @@ -2551,8 +2278,7 @@ export declare enum KeyCode { * KEYCODE_TASKMANAGER * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_TASKMANAGER = 2717, @@ -2560,8 +2286,7 @@ export declare enum KeyCode { * KEYCODE_JOURNAL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_JOURNAL = 2718, @@ -2569,8 +2294,7 @@ export declare enum KeyCode { * KEYCODE_CONTROLPANEL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_CONTROLPANEL = 2719, @@ -2578,8 +2302,7 @@ export declare enum KeyCode { * KEYCODE_APPSELECT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_APPSELECT = 2720, @@ -2587,8 +2310,7 @@ export declare enum KeyCode { * KEYCODE_SCREENSAVER * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SCREENSAVER = 2721, @@ -2596,8 +2318,7 @@ export declare enum KeyCode { * KEYCODE_ASSISTANT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_ASSISTANT = 2722, @@ -2605,8 +2326,7 @@ export declare enum KeyCode { * KEYCODE_KBD_LAYOUT_NEXT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_KBD_LAYOUT_NEXT = 2723, @@ -2614,8 +2334,7 @@ export declare enum KeyCode { * KEYCODE_BRIGHTNESS_MIN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BRIGHTNESS_MIN = 2724, @@ -2623,8 +2342,7 @@ export declare enum KeyCode { * KEYCODE_BRIGHTNESS_MAX * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BRIGHTNESS_MAX = 2725, @@ -2632,8 +2350,7 @@ export declare enum KeyCode { * Assist_Previous key, used to view historical inputs * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_KBDINPUTASSIST_PREV = 2726, @@ -2641,8 +2358,7 @@ export declare enum KeyCode { * Assist_Next key, used to view predictive inputs * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_KBDINPUTASSIST_NEXT = 2727, @@ -2650,8 +2366,7 @@ export declare enum KeyCode { * Assist_Previous_Group key, used to switch to the previous input method in the input group * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_KBDINPUTASSIST_PREVGROUP = 2728, @@ -2659,8 +2374,7 @@ export declare enum KeyCode { * Assist_Next_Group key, used to switch to the next input method in the input group * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_KBDINPUTASSIST_NEXTGROUP = 2729, @@ -2668,8 +2382,7 @@ export declare enum KeyCode { * KEYCODE_KBDINPUTASSIST_ACCEPT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_KBDINPUTASSIST_ACCEPT = 2730, @@ -2677,8 +2390,7 @@ export declare enum KeyCode { * KEYCODE_KBDINPUTASSIST_CANCEL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_KBDINPUTASSIST_CANCEL = 2731, @@ -2686,8 +2398,7 @@ export declare enum KeyCode { * KEYCODE_FRONT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_FRONT = 2800, @@ -2695,8 +2406,7 @@ export declare enum KeyCode { * KEYCODE_SETUP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SETUP = 2801, @@ -2704,8 +2414,7 @@ export declare enum KeyCode { * KEYCODE_WAKEUP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_WAKEUP = 2802, @@ -2713,8 +2422,7 @@ export declare enum KeyCode { * KEYCODE_SENDFILE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SENDFILE = 2803, @@ -2722,8 +2430,7 @@ export declare enum KeyCode { * KEYCODE_DELETEFILE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_DELETEFILE = 2804, @@ -2731,8 +2438,7 @@ export declare enum KeyCode { * KEYCODE_XFER * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_XFER = 2805, @@ -2740,8 +2446,7 @@ export declare enum KeyCode { * KEYCODE_PROG1 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_PROG1 = 2806, @@ -2749,8 +2454,7 @@ export declare enum KeyCode { * KEYCODE_PROG2 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_PROG2 = 2807, @@ -2758,8 +2462,7 @@ export declare enum KeyCode { * KEYCODE_MSDOS * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_MSDOS = 2808, @@ -2767,8 +2470,7 @@ export declare enum KeyCode { * KEYCODE_SCREENLOCK * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SCREENLOCK = 2809, @@ -2776,8 +2478,7 @@ export declare enum KeyCode { * KEYCODE_DIRECTION_ROTATE_DISPLAY * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_DIRECTION_ROTATE_DISPLAY = 2810, @@ -2785,8 +2486,7 @@ export declare enum KeyCode { * KEYCODE_CYCLEWINDOWS * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_CYCLEWINDOWS = 2811, @@ -2794,8 +2494,7 @@ export declare enum KeyCode { * KEYCODE_COMPUTER * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_COMPUTER = 2812, @@ -2803,8 +2502,7 @@ export declare enum KeyCode { * KEYCODE_EJECTCLOSECD * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_EJECTCLOSECD = 2813, @@ -2812,8 +2510,7 @@ export declare enum KeyCode { * KEYCODE_ISO * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_ISO = 2814, @@ -2821,8 +2518,7 @@ export declare enum KeyCode { * KEYCODE_MOVE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_MOVE = 2815, @@ -2830,8 +2526,7 @@ export declare enum KeyCode { * KEYCODE_F13 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F13 = 2816, @@ -2839,8 +2534,7 @@ export declare enum KeyCode { * KEYCODE_F14 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F14 = 2817, @@ -2848,8 +2542,7 @@ export declare enum KeyCode { * KEYCODE_F15 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F15 = 2818, @@ -2857,8 +2550,7 @@ export declare enum KeyCode { * KEYCODE_F16 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F16 = 2819, @@ -2866,8 +2558,7 @@ export declare enum KeyCode { * KEYCODE_F17 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F17 = 2820, @@ -2875,8 +2566,7 @@ export declare enum KeyCode { * KEYCODE_F18 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F18 = 2821, @@ -2884,8 +2574,7 @@ export declare enum KeyCode { * KEYCODE_F19 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F19 = 2822, @@ -2893,8 +2582,7 @@ export declare enum KeyCode { * KEYCODE_F20 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F20 = 2823, @@ -2902,8 +2590,7 @@ export declare enum KeyCode { * KEYCODE_F21 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F21 = 2824, @@ -2911,8 +2598,7 @@ export declare enum KeyCode { * KEYCODE_F22 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F22 = 2825, @@ -2920,8 +2606,7 @@ export declare enum KeyCode { * KEYCODE_F23 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F23 = 2826, @@ -2929,8 +2614,7 @@ export declare enum KeyCode { * KEYCODE_F24 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_F24 = 2827, @@ -2938,8 +2622,7 @@ export declare enum KeyCode { * KEYCODE_PROG3 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_PROG3 = 2828, @@ -2947,8 +2630,7 @@ export declare enum KeyCode { * KEYCODE_PROG4 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_PROG4 = 2829, @@ -2956,8 +2638,7 @@ export declare enum KeyCode { * KEYCODE_DASHBOARD * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_DASHBOARD = 2830, @@ -2965,8 +2646,7 @@ export declare enum KeyCode { * KEYCODE_SUSPEND * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SUSPEND = 2831, @@ -2974,8 +2654,7 @@ export declare enum KeyCode { * KEYCODE_HP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_HP = 2832, @@ -2983,8 +2662,7 @@ export declare enum KeyCode { * KEYCODE_SOUND * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SOUND = 2833, @@ -2992,8 +2670,7 @@ export declare enum KeyCode { * KEYCODE_QUESTION * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_QUESTION = 2834, @@ -3001,8 +2678,7 @@ export declare enum KeyCode { * KEYCODE_CONNECT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_CONNECT = 2836, @@ -3010,8 +2686,7 @@ export declare enum KeyCode { * KEYCODE_SPORT * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SPORT = 2837, @@ -3019,8 +2694,7 @@ export declare enum KeyCode { * KEYCODE_SHOP * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SHOP = 2838, @@ -3028,8 +2702,7 @@ export declare enum KeyCode { * KEYCODE_ALTERASE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_ALTERASE = 2839, @@ -3037,8 +2710,7 @@ export declare enum KeyCode { * KEYCODE_SWITCHVIDEOMODE * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_SWITCHVIDEOMODE = 2841, @@ -3046,8 +2718,7 @@ export declare enum KeyCode { * KEYCODE_BATTERY * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BATTERY = 2842, @@ -3055,8 +2726,7 @@ export declare enum KeyCode { * KEYCODE_BLUETOOTH * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BLUETOOTH = 2843, @@ -3064,8 +2734,7 @@ export declare enum KeyCode { * KEYCODE_WLAN * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_WLAN = 2844, @@ -3073,8 +2742,7 @@ export declare enum KeyCode { * KEYCODE_UWB * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_UWB = 2845, @@ -3082,8 +2750,7 @@ export declare enum KeyCode { * KEYCODE_WWAN_WIMAX * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_WWAN_WIMAX = 2846, @@ -3091,8 +2758,7 @@ export declare enum KeyCode { * KEYCODE_RFKILL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_RFKILL = 2847, @@ -3100,8 +2766,7 @@ export declare enum KeyCode { * KEYCODE_CHANNEL * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_CHANNEL = 3001, @@ -3109,8 +2774,7 @@ export declare enum KeyCode { * KEYCODE_BTN_0 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BTN_0 = 3100, @@ -3118,8 +2782,7 @@ export declare enum KeyCode { * KEYCODE_BTN_1 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BTN_1 = 3101, @@ -3127,8 +2790,7 @@ export declare enum KeyCode { * KEYCODE_BTN_2 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BTN_2 = 3102, @@ -3136,8 +2798,7 @@ export declare enum KeyCode { * KEYCODE_BTN_3 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BTN_3 = 3103, @@ -3145,8 +2806,7 @@ export declare enum KeyCode { * KEYCODE_BTN_4 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BTN_4 = 3104, @@ -3154,8 +2814,7 @@ export declare enum KeyCode { * KEYCODE_BTN_5 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BTN_5 = 3105, @@ -3163,8 +2822,7 @@ export declare enum KeyCode { * KEYCODE_BTN_6 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BTN_6 = 3106, @@ -3172,8 +2830,7 @@ export declare enum KeyCode { * KEYCODE_BTN_7 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BTN_7 = 3107, @@ -3181,8 +2838,7 @@ export declare enum KeyCode { * KEYCODE_BTN_8 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BTN_8 = 3108, @@ -3190,8 +2846,7 @@ export declare enum KeyCode { * KEYCODE_BTN_9 * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ KEYCODE_BTN_9 = 3109, @@ -3199,8 +2854,7 @@ export declare enum KeyCode { * KEYCODE_DAGGER_CLICK * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ KEYCODE_DAGGER_CLICK = 3211, @@ -3208,8 +2862,7 @@ export declare enum KeyCode { * KEYCODE_DAGGER_DOUBLE_CLICK * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ KEYCODE_DAGGER_DOUBLE_CLICK = 3212, @@ -3217,8 +2870,7 @@ export declare enum KeyCode { * KEYCODE_DAGGER_LONG_PRESS * * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ KEYCODE_DAGGER_LONG_PRESS = 3213, diff --git a/api/@ohos.multimodalInput.keyEvent.d.ts b/api/@ohos.multimodalInput.keyEvent.d.ts index 8af4c06928..da04f64ae4 100644 --- a/api/@ohos.multimodalInput.keyEvent.d.ts +++ b/api/@ohos.multimodalInput.keyEvent.d.ts @@ -26,7 +26,6 @@ import type { KeyCode } from './@ohos.multimodalInput.keyCode'; * @enum { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ /** * Action @@ -42,7 +41,6 @@ export declare enum Action { * * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ /** * Cancel key @@ -58,7 +56,6 @@ export declare enum Action { * * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ /** * Down key @@ -74,7 +71,6 @@ export declare enum Action { * * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ /** * Up key @@ -92,7 +88,6 @@ export declare enum Action { * @interface Key * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ /** * Key @@ -108,7 +103,6 @@ export declare interface Key { * @type { KeyCode } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ /** * Key code @@ -124,32 +118,30 @@ export declare interface Key { * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ /** * Time when the key is pressed - * @type { long } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice * @since 12 */ - pressedTime: long; + pressedTime: number; /** * Device to which the key belongs * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ /** * Device to which the key belongs - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice * @since 12 */ - deviceId: int; + deviceId: number; } /** @@ -158,7 +150,6 @@ export declare interface Key { * @interface KeyEvent * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ /** * KeyEvent @@ -175,7 +166,6 @@ export declare interface KeyEvent extends InputEvent { * @type { Action } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ /** * Key action @@ -191,7 +181,6 @@ export declare interface KeyEvent extends InputEvent { * @type { Key } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ /** * Key that has changed @@ -207,23 +196,21 @@ export declare interface KeyEvent extends InputEvent { * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ /** * Unicode character corresponding to the key - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @atomicservice * @since 12 */ - unicodeChar: int; + unicodeChar: number; /** * List of pressed keys * @type { Key[] } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ /** * List of pressed keys @@ -239,7 +226,6 @@ export declare interface KeyEvent extends InputEvent { * @type { boolean } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ /** * Whether ctrlKey is being pressed @@ -255,7 +241,6 @@ export declare interface KeyEvent extends InputEvent { * @type { boolean } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ /** * Whether altKey is being pressed @@ -271,7 +256,6 @@ export declare interface KeyEvent extends InputEvent { * @type { boolean } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ /** * Whether shiftKey is being pressed @@ -287,7 +271,6 @@ export declare interface KeyEvent extends InputEvent { * @type { boolean } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ /** * Whether logoKey is being pressed @@ -303,7 +286,6 @@ export declare interface KeyEvent extends InputEvent { * @type { boolean } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ /** * Whether fnKey is being pressed @@ -319,7 +301,6 @@ export declare interface KeyEvent extends InputEvent { * @type { boolean } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ /** * Whether capsLock is active @@ -335,7 +316,6 @@ export declare interface KeyEvent extends InputEvent { * @type { boolean } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ /** * Whether numLock is active @@ -351,7 +331,6 @@ export declare interface KeyEvent extends InputEvent { * @type { boolean } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ /** * Whether scrollLock is active diff --git a/api/@ohos.multimodalInput.mouseEvent.d.ts b/api/@ohos.multimodalInput.mouseEvent.d.ts index 8ca45f9410..29c7d1936b 100644 --- a/api/@ohos.multimodalInput.mouseEvent.d.ts +++ b/api/@ohos.multimodalInput.mouseEvent.d.ts @@ -226,11 +226,11 @@ export declare interface AxisValue { /** * Axis value - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - value: int; + value: number; } /** @@ -293,52 +293,52 @@ export declare interface MouseEvent extends InputEvent { /** * X coordinate of the mouse pointer on the screen - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - screenX: int; + screenX: number; /** * Y coordinate of the mouse pointer on the screen - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - screenY: int; + screenY: number; /** * X coordinate of the mouse pointer in the window - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - windowX: int; + windowX: number; /** * Y coordinate of the mouse pointer in the window - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - windowY: int; + windowY: number; /** * X axis offset relative to the previous reported mouse pointer position. When the mouse pointer is at * the edge of the screen, the value may be less than the difference of the X coordinate reported twice. - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - rawDeltaX: int; + rawDeltaX: number; /** * Y axis offset relative to the previous reported mouse pointer position - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - rawDeltaY: int; + rawDeltaY: number; /** * Button that is currently pressed or released @@ -369,7 +369,6 @@ export declare interface MouseEvent extends InputEvent { * @type { KeyCode[] } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 - * @since 9 */ pressedKeys: KeyCode[]; diff --git a/api/@ohos.multimodalInput.pointer.d.ts b/api/@ohos.multimodalInput.pointer.d.ts index 932df2bb71..0491653da2 100644 --- a/api/@ohos.multimodalInput.pointer.d.ts +++ b/api/@ohos.multimodalInput.pointer.d.ts @@ -489,24 +489,21 @@ declare namespace pointer { * * @enum { number } * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ enum PrimaryButton { /** * Left mouse button * * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ LEFT = 0, /** * Right mouse button * * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ RIGHT = 1 } @@ -516,32 +513,28 @@ declare namespace pointer { * * @enum { number } * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ enum RightClickType { /** * Tapping the right-button area of the touchpad. * * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ TOUCHPAD_RIGHT_BUTTON = 1, /** * Tapping the left-button area of the touchpad. * * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ TOUCHPAD_LEFT_BUTTON = 2, /** * Tapping or pressing the touchpad with two fingers. * * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ TOUCHPAD_TWO_FINGER_TAP = 3, /** @@ -602,8 +595,7 @@ declare namespace pointer { * * @interface CursorConfig * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ interface CursorConfig { /** @@ -613,8 +605,7 @@ declare namespace pointer { * * @type { boolean } * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ followSystem : boolean; } @@ -740,7 +731,7 @@ declare namespace pointer { /** * Sets the mouse pointer style. This API uses an asynchronous callback to return the result. * - * @param { int } windowId - Window ID. + * @param { number } windowId - Window ID. * @param { PointerStyle } pointerStyle - Pointer style. * @param { AsyncCallback } callback - Callback used to return the result. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; @@ -749,12 +740,12 @@ declare namespace pointer { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function setPointerStyle(windowId: int, pointerStyle: PointerStyle, callback: AsyncCallback): void; + function setPointerStyle(windowId: number, pointerStyle: PointerStyle, callback: AsyncCallback): void; /** * Sets the mouse pointer style. This API uses a promise to return the result. * - * @param { int } windowId - Window ID. + * @param { number } windowId - Window ID. * @param { PointerStyle } pointerStyle - Pointer style. * @returns { Promise } Promise that returns no value. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; @@ -763,20 +754,19 @@ declare namespace pointer { * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - function setPointerStyle(windowId: int, pointerStyle: PointerStyle): Promise; + function setPointerStyle(windowId: number, pointerStyle: PointerStyle): Promise; /** * Sets the mouse pointer style. This API returns the result synchronously. * - * @param { int } windowId - Window ID. + * @param { number } windowId - Window ID. * @param { PointerStyle } pointerStyle - Pointer style. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ - function setPointerStyleSync(windowId: int, pointerStyle: PointerStyle): void; + function setPointerStyleSync(windowId: number, pointerStyle: PointerStyle): void; /** * Obtains the mouse pointer style. This API uses an asynchronous callback to return the result. @@ -812,10 +802,9 @@ declare namespace pointer { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.MultimodalInput.Input.Pointer - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ - function getPointerStyleSync(windowId: int): PointerStyle; + function getPointerStyleSync(windowId: number): PointerStyle; /** * Sets the visible status of the mouse pointer. This API uses an asynchronous callback to return the result. diff --git a/api/@ohos.multimodalInput.shortKey.d.ts b/api/@ohos.multimodalInput.shortKey.d.ts index e906e19254..d9436672cf 100644 --- a/api/@ohos.multimodalInput.shortKey.d.ts +++ b/api/@ohos.multimodalInput.shortKey.d.ts @@ -74,8 +74,7 @@ export default shortKey; * @enum { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ export declare enum FingerprintAction { /** @@ -83,8 +82,7 @@ export declare enum FingerprintAction { * * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ DOWN = 0, @@ -93,8 +91,7 @@ export declare enum FingerprintAction { * * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ UP = 1, @@ -103,8 +100,7 @@ export declare enum FingerprintAction { * * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ SLIDE = 2, @@ -113,8 +109,7 @@ export declare enum FingerprintAction { * * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ RETOUCH = 3, @@ -123,8 +118,7 @@ export declare enum FingerprintAction { * * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ CLICK = 4, } @@ -135,8 +129,7 @@ export declare enum FingerprintAction { * @interface FingerprintEvent * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ export declare interface FingerprintEvent { /** @@ -145,8 +138,7 @@ export declare interface FingerprintEvent { * @type { FingerprintAction } * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ action: FingerprintAction; @@ -160,13 +152,12 @@ export declare interface FingerprintEvent { * and the horizontal rightward direction stands for the positive direction of the X axis. * This way, a rectangular coordinate system is constructed. * - * @type { double } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - distanceX: double; + distanceX: number; /** * This value indicates the sliding percentage of the fingerprint key on the Y axis, @@ -178,11 +169,10 @@ export declare interface FingerprintEvent { * and the horizontal rightward direction stands for the positive direction of the X axis. * This way, a rectangular coordinate system is constructed. * - * @type { double } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ - distanceY: double; + distanceY: number; } \ No newline at end of file diff --git a/api/@ohos.multimodalInput.touchEvent.d.ts b/api/@ohos.multimodalInput.touchEvent.d.ts index 19d1db2c56..a7a66aeccb 100644 --- a/api/@ohos.multimodalInput.touchEvent.d.ts +++ b/api/@ohos.multimodalInput.touchEvent.d.ts @@ -205,139 +205,139 @@ export declare enum FixedMode { export declare interface Touch { /** * Pointer identifier - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - id: int; + id: number; /** * Time stamp when touch is pressed - * @type { long } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - pressedTime: long; + pressedTime: number; /** * X coordinate of the touch position on the screen - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - screenX: int; + screenX: number; /** * Y coordinate of the touch position on the screen - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - screenY: int; + screenY: number; /** * X coordinate of the touch position in the window - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - windowX: int; + windowX: number; /** * Y coordinate of the touch position in the window - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - windowY: int; + windowY: number; /** * Pressure value. The value range is [0.0, 1.0]. The value 0.0 indicates that the pressure is not supported. - * @type { double } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - pressure: double; + pressure: number; /** * Width of the contact area when touch is pressed - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - width: int; + width: number; /** * Height of the contact area when touch is pressed - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - height: int; + height: number; /** * Angle relative to the YZ plane. The value range is [-90, 90]. A positive value indicates a rightward tilt. - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - tiltX: int; + tiltX: number; /** * Angle relative to the XZ plane. The value range is [-90, 90]. A positive value indicates a downward tilt. - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - tiltY: int; + tiltY: number; /** * Center point X of the tool area - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - toolX: int; + toolX: number; /** * Center point Y of the tool area - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - toolY: int; + toolY: number; /** * Width of the tool area - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - toolWidth: int; + toolWidth: number; /** * Height of the tool area - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - toolHeight: int; + toolHeight: number; /** * X coordinate of the input device - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - rawX: int; + rawX: number; /** * Y coordinate of the input device - * @type { int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @since 9 */ - rawY: int; + rawY: number; /** * Tool type @@ -349,21 +349,21 @@ export declare interface Touch { /** * fixedDisplayX - Corrected value of the screen x coordinate. - * @type { ?int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. * @since 19 */ - fixedDisplayX?: int; + fixedDisplayX?: number; /** * fixedDisplayY - Corrected value of the screen y coordinate. - * @type { ?int } + * @type { number } * @syscap SystemCapability.MultimodalInput.Input.Core * @systemapi Hide this for inner system use. * @since 19 */ - fixedDisplayY?: int; + fixedDisplayY?: number; } /** diff --git a/api/@ohos.nfc.tag.d.ts b/api/@ohos.nfc.tag.d.ts index 034cbe3a37..da104445a2 100644 --- a/api/@ohos.nfc.tag.d.ts +++ b/api/@ohos.nfc.tag.d.ts @@ -29,9 +29,7 @@ import { } from './tag/nfctech'; import { NdefMessage as _NdefMessage } from './tag/nfctech'; import { TagSession as _TagSession } from './tag/tagSession'; -/*** if arkts 1.1 */ import type { PacMap } from './ability/dataAbilityHelper'; -/*** endif */ import type rpc from './@ohos.rpc'; import type { AsyncCallback } from './@ohos.base'; import Want from './@ohos.app.ability.Want'; diff --git a/api/@ohos.notificationManager.d.ts b/api/@ohos.notificationManager.d.ts index ebaa42f2ef..0e42bac075 100644 --- a/api/@ohos.notificationManager.d.ts +++ b/api/@ohos.notificationManager.d.ts @@ -393,8 +393,7 @@ declare namespace notificationManager { * @throws { BusinessError } 2300007 - Network unreachable. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function publishAsBundle( request: NotificationRequest, @@ -430,8 +429,7 @@ declare namespace notificationManager { * @throws { BusinessError } 2300007 - Network unreachable. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function publishAsBundle(request: NotificationRequest, representativeBundle: string, userId: number): Promise; @@ -461,8 +459,7 @@ declare namespace notificationManager { * @throws { BusinessError } 2300007 - Network unreachable. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function publishAsBundle(representativeBundle: BundleOption, request: NotificationRequest): Promise; @@ -572,8 +569,7 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function cancelAsBundle( id: number, @@ -602,8 +598,7 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function cancelAsBundle(id: number, representativeBundle: string, userId: number): Promise; @@ -627,8 +622,7 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function cancelAsBundle(representativeBundle: BundleOption, id: number): Promise; @@ -698,8 +692,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function addSlot(slot: NotificationSlot, callback: AsyncCallback): void; @@ -719,8 +712,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function addSlot(slot: NotificationSlot): Promise; @@ -736,8 +728,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function addSlot(type: SlotType, callback: AsyncCallback): void; @@ -753,8 +744,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function addSlot(type: SlotType): Promise; @@ -774,8 +764,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function addSlots(slots: Array, callback: AsyncCallback): void; @@ -795,8 +784,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function addSlots(slots: Array): Promise; @@ -812,8 +800,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getSlot(slotType: SlotType, callback: AsyncCallback): void; @@ -828,8 +815,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getSlot(slotType: SlotType): Promise; @@ -844,8 +830,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getSlots(callback: AsyncCallback>): void; @@ -857,8 +842,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getSlots(): Promise>; @@ -874,8 +858,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function getAllNotificationEnabledBundles(): Promise>; @@ -890,8 +873,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function removeSlot(slotType: SlotType, callback: AsyncCallback): void; @@ -906,8 +888,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function removeSlot(slotType: SlotType): Promise; @@ -922,8 +903,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function removeAllSlots(callback: AsyncCallback): void; @@ -935,8 +915,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function removeAllSlots(): Promise; @@ -1121,8 +1100,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function isNotificationEnabledSync(): boolean; @@ -1363,8 +1341,7 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function setSlotByBundle(bundle: BundleOption, slot: NotificationSlot, callback: AsyncCallback): void; @@ -1405,8 +1382,7 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function setSlotByBundle(bundle: BundleOption, slot: NotificationSlot): Promise; @@ -1488,8 +1464,7 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function getSlotByBundle(bundle: BundleOption, slotType: SlotType): Promise; @@ -1567,8 +1542,7 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function getSlotNumByBundle(bundle: BundleOption, callback: AsyncCallback): void; @@ -1607,8 +1581,7 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function getSlotNumByBundle(bundle: BundleOption): Promise; @@ -1659,8 +1632,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getActiveNotificationCount(callback: AsyncCallback): void; @@ -1717,8 +1689,7 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ function getActiveNotificationByFilter(filter: NotificationFilter, callback: AsyncCallback): void; @@ -1735,8 +1706,7 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ function getActiveNotificationByFilter(filter: NotificationFilter): Promise; @@ -1752,8 +1722,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function cancelGroup(groupName: string, callback: AsyncCallback): void; @@ -1768,8 +1737,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function cancelGroup(groupName: string): Promise; @@ -1790,8 +1758,7 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function removeGroupByBundle(bundle: BundleOption, groupName: string, callback: AsyncCallback): void; @@ -1812,8 +1779,7 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function removeGroupByBundle(bundle: BundleOption, groupName: string): Promise; @@ -1852,8 +1818,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function setDoNotDisturbDate(date: DoNotDisturbDate, callback: AsyncCallback): void; @@ -1892,8 +1857,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function setDoNotDisturbDate(date: DoNotDisturbDate): Promise; @@ -1936,8 +1900,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function setDoNotDisturbDate(date: DoNotDisturbDate, userId: number, callback: AsyncCallback): void; @@ -1980,8 +1943,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function setDoNotDisturbDate(date: DoNotDisturbDate, userId: number): Promise; @@ -2018,8 +1980,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function getDoNotDisturbDate(callback: AsyncCallback): void; @@ -2052,8 +2013,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function getDoNotDisturbDate(): Promise; @@ -2094,8 +2054,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function getDoNotDisturbDate(userId: number, callback: AsyncCallback): void; @@ -2136,8 +2095,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function getDoNotDisturbDate(userId: number): Promise; @@ -2157,8 +2115,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function isSupportDoNotDisturbMode(callback: AsyncCallback): void; @@ -2175,8 +2132,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function isSupportDoNotDisturbMode(): Promise; @@ -2192,8 +2148,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function isSupportTemplate(templateName: string, callback: AsyncCallback): void; @@ -2208,8 +2163,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function isSupportTemplate(templateName: string): Promise; @@ -2442,8 +2396,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600010 - Distributed operation failed. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function setDistributedEnable(enable: boolean, callback: AsyncCallback): void; @@ -2482,8 +2435,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600010 - Distributed operation failed. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function setDistributedEnable(enable: boolean): Promise; @@ -2498,8 +2450,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @throws { BusinessError } 1600010 - Distributed operation failed. * @syscap SystemCapability.Notification.Notification - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function isDistributedEnabled(callback: AsyncCallback): void; @@ -2512,8 +2463,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @throws { BusinessError } 1600010 - Distributed operation failed. * @syscap SystemCapability.Notification.Notification - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function isDistributedEnabled(): Promise; @@ -2556,8 +2506,7 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function setDistributedEnableByBundle(bundle: BundleOption, enable: boolean, callback: AsyncCallback): void; @@ -2600,8 +2549,7 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function setDistributedEnableByBundle(bundle: BundleOption, enable: boolean): Promise; @@ -2648,8 +2596,7 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function setDistributedEnabledByBundle(bundle: BundleOption, deviceType: string, enable: boolean): Promise; @@ -2692,8 +2639,7 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function isDistributedEnabledByBundle(bundle: BundleOption, callback: AsyncCallback): void; @@ -2734,8 +2680,7 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function isDistributedEnabledByBundle(bundle: BundleOption): Promise; @@ -2780,8 +2725,7 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function isDistributedEnabledByBundle(bundle: BundleOption, deviceType: string): Promise; @@ -2826,8 +2770,7 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function setSmartReminderEnabled(deviceType: string, enable: boolean): Promise; @@ -2870,8 +2813,7 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function isSmartReminderEnabled(deviceType: string): Promise; @@ -2906,8 +2848,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function getDeviceRemindType(callback: AsyncCallback): void; @@ -2938,8 +2879,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function getDeviceRemindType(): Promise; @@ -3256,8 +3196,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600008 - The user does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function setSyncNotificationEnabledWithoutApp(userId: number, enable: boolean, callback: AsyncCallback): void; @@ -3298,8 +3237,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600008 - The user does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function setSyncNotificationEnabledWithoutApp(userId: number, enable: boolean): Promise; @@ -3319,8 +3257,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600008 - The user does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getSyncNotificationEnabledWithoutApp(userId: number, callback: AsyncCallback): void; @@ -3340,8 +3277,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600008 - The user does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getSyncNotificationEnabledWithoutApp(userId: number): Promise; @@ -3394,8 +3330,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function setBadgeNumber(badgeNumber: number, callback: AsyncCallback): void; @@ -3445,8 +3380,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @crossplatform - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function setBadgeNumber(badgeNumber: number): Promise; @@ -3487,8 +3421,7 @@ declare namespace notificationManager { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function setBadgeNumberByBundle(bundle: BundleOption, badgeNumber: number): Promise; @@ -3518,8 +3451,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600001 - Internal error. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function on(type: 'checkNotification', callback: (checkInfo: NotificationCheckInfo) => NotificationCheckResult): void; @@ -3557,8 +3489,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function on(type: 'checkNotification', checkRequest: NotificationCheckRequest, callback: (checkInfo: NotificationCheckInfo) => Promise): void; @@ -3589,8 +3520,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600001 - Internal error. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function off( type: 'checkNotification', @@ -3882,8 +3812,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function setAdditionalConfig(key: string, value: string): Promise; @@ -3912,8 +3841,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600018 - the notification settings window is already displayed. * @syscap SystemCapability.Notification.NotificationSettings * @stagemodelonly - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function openNotificationSettings(context: UIAbilityContext): Promise; @@ -3952,8 +3880,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600019 - The do-not-disturb profile does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function getDoNotDisturbProfile(id: number): Promise; @@ -3970,8 +3897,7 @@ declare namespace notificationManager { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function setTargetDeviceStatus(deviceType: string, status: number): Promise; @@ -3990,8 +3916,7 @@ declare namespace notificationManager { * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function disableNotificationFeature(disabled:boolean, bundleList: Array): Promise; @@ -4009,9 +3934,8 @@ declare namespace notificationManager { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ + * @since 18 + */ function setDistributedEnabledBySlot(slot: SlotType, deviceType: string, enabled: boolean): Promise; /** @@ -4027,9 +3951,8 @@ declare namespace notificationManager { *
    2. Incorrect parameter types. 3. Parameter verification failed. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ + * @since 18 + */ function isDistributedEnabledBySlot(slot: SlotType, deviceType: string): Promise; /** @@ -4068,8 +3991,7 @@ declare namespace notificationManager { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ onResponse?: (notificationId: number, buttonOptions: ButtonOptions) => void; } diff --git a/api/@ohos.notificationSubscribe.d.ts b/api/@ohos.notificationSubscribe.d.ts index 0bacb21b7b..dab12eddc5 100644 --- a/api/@ohos.notificationSubscribe.d.ts +++ b/api/@ohos.notificationSubscribe.d.ts @@ -125,8 +125,7 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600012 - No memory space. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ function subscribeSelf(subscriber: NotificationSubscriber): Promise; @@ -364,8 +363,7 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function removeAll(bundle: BundleOption, callback: AsyncCallback): void; @@ -383,8 +381,7 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600003 - Failed to connect to the service. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function removeAll(callback: AsyncCallback): void; @@ -404,8 +401,7 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600008 - The user does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function removeAll(userId: number, callback: AsyncCallback): void; @@ -425,8 +421,7 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 1600008 - The user does not exist. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function removeAll(userId: number): Promise; @@ -446,8 +441,7 @@ declare namespace notificationSubscribe { * @throws { BusinessError } 17700001 - The specified bundle name was not found. * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function removeAll(bundle?: BundleOption): Promise; diff --git a/api/@ohos.print.d.ts b/api/@ohos.print.d.ts index cc3f94c296..da2ed40d14 100644 --- a/api/@ohos.print.d.ts +++ b/api/@ohos.print.d.ts @@ -28,8 +28,6 @@ import type Context from './application/Context'; * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ declare namespace print { @@ -39,8 +37,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ interface PrintTask { /** @@ -53,8 +49,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ on(type: 'block', callback: Callback): void; @@ -68,8 +62,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ on(type: 'succeed', callback: Callback): void; @@ -83,8 +75,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ on(type: 'fail', callback: Callback): void; @@ -98,8 +88,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ on(type: 'cancel', callback: Callback): void; @@ -113,8 +101,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ off(type: 'block', callback?: Callback): void; @@ -128,8 +114,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ off(type: 'succeed', callback?: Callback): void; @@ -143,8 +127,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ off(type: 'fail', callback?: Callback): void; @@ -158,8 +140,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ off(type: 'cancel', callback?: Callback): void; } @@ -184,8 +164,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ interface PrintDocumentAdapter { /** @@ -201,8 +179,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ onStartLayoutWrite(jobId: string, oldAttrs: PrintAttributes, newAttrs: PrintAttributes, fd: int, writeResultCallback: PrinterWriteResultCallback): void; @@ -217,8 +193,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ onJobStateChanged(jobId: string, state: PrintDocumentAdapterState): void; } @@ -233,8 +207,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function print(files: Array, callback: AsyncCallback): void; @@ -248,8 +220,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function print(files: Array): Promise; @@ -264,8 +234,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ function print(files: Array, context: Context, callback: AsyncCallback): void; @@ -280,8 +248,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ function print(files: Array, context: Context): Promise; @@ -298,8 +264,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ function print(jobName: string, printAdapter: PrintDocumentAdapter, printAttributes: PrintAttributes, context: Context): Promise; @@ -310,8 +274,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ interface PrintAttributes { /** @@ -320,8 +282,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ copyNumber?: int; @@ -331,8 +291,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ pageRange?: PrintPageRange; @@ -342,8 +300,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ pageSize?: PrintPageSize | PrintPageType; @@ -353,8 +309,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ directionMode?: PrintDirectionMode; @@ -364,8 +318,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ colorMode?: PrintColorMode; @@ -375,8 +327,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ duplexMode?: PrintDuplexMode; } @@ -387,8 +337,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ interface PrintPageRange { /** @@ -397,8 +345,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ startPage?: int; @@ -408,8 +354,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ endPage?: int; @@ -419,8 +363,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ pages?: Array; } @@ -432,8 +374,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ interface PrintMargin { /** @@ -443,8 +383,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ top?: int; @@ -455,8 +393,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ bottom?: int; @@ -467,8 +403,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ left?: int; @@ -479,8 +413,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ right?: int; } @@ -492,8 +424,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ interface PrinterRange { /** @@ -503,8 +433,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ startPage?: int; @@ -515,8 +443,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ endPage?: int; @@ -527,8 +453,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ pages?: Array; } @@ -540,8 +464,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ interface PreviewAttribute { /** @@ -551,8 +473,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ previewRange: PrinterRange; @@ -563,8 +483,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ result?: int; } @@ -576,8 +494,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ interface PrintResolution { /** @@ -587,8 +503,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ id: string; @@ -599,8 +513,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ horizontalDpi: int; @@ -611,8 +523,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ verticalDpi: int; } @@ -623,8 +533,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ interface PrintPageSize { /** @@ -633,8 +541,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ id: string; @@ -644,8 +550,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ name: string; @@ -655,8 +559,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ width: int; @@ -666,8 +568,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ height: int; } @@ -679,8 +579,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ interface PrinterCapability { /** @@ -690,8 +588,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ colorMode: int; @@ -702,8 +598,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ duplexMode: int; @@ -714,8 +608,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ pageSize: Array; @@ -726,8 +618,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ resolution?: Array; @@ -738,8 +628,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ minMargin?: PrintMargin; @@ -750,8 +638,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ options?: Object; } @@ -763,8 +649,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ interface PrinterInfo { /** @@ -774,8 +658,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ printerId: string; @@ -786,8 +668,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ printerName: string; @@ -798,8 +678,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ printerState: PrinterState; @@ -810,8 +688,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ printerIcon?: int; @@ -822,8 +698,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ description?: string; @@ -834,8 +708,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ capability?: PrinterCapability; @@ -846,8 +718,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ options?: Object; } @@ -859,8 +729,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ interface PrintJob { /** @@ -870,8 +738,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ fdList: Array; @@ -882,8 +748,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ jobId: string; @@ -894,8 +758,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ printerId: string; @@ -906,8 +768,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ jobState: PrintJobState; @@ -918,8 +778,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ jobSubstate: PrintJobSubState; @@ -930,8 +788,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ copyNumber: int; @@ -942,8 +798,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ pageRange: PrinterRange; @@ -954,8 +808,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ isSequential: boolean; @@ -966,8 +818,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ pageSize: PrintPageSize; @@ -978,8 +828,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ isLandscape: boolean; @@ -990,8 +838,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ colorMode: int; @@ -1002,8 +848,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ duplexMode: int; @@ -1014,8 +858,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ margin?: PrintMargin; @@ -1026,8 +868,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ preview?: PreviewAttribute; @@ -1038,8 +878,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ options?: Object; } @@ -1050,8 +888,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ enum PrintDirectionMode { /** @@ -1059,8 +895,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ DIRECTION_MODE_AUTO = 0, @@ -1069,8 +903,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ DIRECTION_MODE_PORTRAIT = 1, @@ -1079,8 +911,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ DIRECTION_MODE_LANDSCAPE = 2, } @@ -1091,8 +921,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ enum PrintColorMode { /** @@ -1100,8 +928,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ COLOR_MODE_MONOCHROME = 0, @@ -1110,8 +936,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ COLOR_MODE_COLOR = 1, } @@ -1122,8 +946,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ enum PrintDuplexMode { /** @@ -1131,8 +953,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ DUPLEX_MODE_NONE = 0, @@ -1141,8 +961,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ DUPLEX_MODE_LONG_EDGE = 1, @@ -1151,8 +969,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ DUPLEX_MODE_SHORT_EDGE = 2, } @@ -1163,8 +979,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ enum PrintPageType { /** @@ -1172,8 +986,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ PAGE_ISO_A3 = 0, @@ -1182,8 +994,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ PAGE_ISO_A4 = 1, @@ -1192,8 +1002,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ PAGE_ISO_A5 = 2, @@ -1202,8 +1010,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ PAGE_JIS_B5 = 3, @@ -1212,8 +1018,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ PAGE_ISO_C5 = 4, @@ -1222,8 +1026,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ PAGE_ISO_DL = 5, @@ -1232,8 +1034,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ PAGE_LETTER = 6, @@ -1242,8 +1042,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ PAGE_LEGAL = 7, @@ -1252,8 +1050,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ PAGE_PHOTO_4X6 = 8, @@ -1262,8 +1058,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ PAGE_PHOTO_5X7 = 9, @@ -1272,8 +1066,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ PAGE_INT_DL_ENVELOPE = 10, @@ -1282,8 +1074,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ PAGE_B_TABLOID = 11, } @@ -1294,8 +1084,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ enum PrintDocumentAdapterState { /** @@ -1303,8 +1091,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ PREVIEW_DESTROY = 0, @@ -1313,8 +1099,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_TASK_SUCCEED = 1, @@ -1323,8 +1107,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_TASK_FAIL = 2, @@ -1333,8 +1115,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_TASK_CANCEL = 3, @@ -1343,8 +1123,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_TASK_BLOCK = 4, } @@ -1355,8 +1133,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ enum PrintFileCreationState { /** @@ -1364,8 +1140,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_FILE_CREATED = 0, @@ -1374,8 +1148,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_FILE_CREATION_FAILED = 1, @@ -1384,8 +1156,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_FILE_CREATED_UNRENDERED = 2, } @@ -1396,8 +1166,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ enum PrinterState { /** @@ -1405,8 +1173,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINTER_ADDED = 0, @@ -1415,8 +1181,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINTER_REMOVED = 1, @@ -1425,8 +1189,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINTER_CAPABILITY_UPDATED = 2, @@ -1435,8 +1197,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINTER_CONNECTED = 3, @@ -1445,8 +1205,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINTER_DISCONNECTED = 4, @@ -1455,8 +1213,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINTER_RUNNING = 5, } @@ -1467,8 +1223,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ enum PrintJobState { /** @@ -1476,8 +1230,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_PREPARE = 0, @@ -1486,8 +1238,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_QUEUED = 1, @@ -1496,8 +1246,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_RUNNING = 2, @@ -1506,8 +1254,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCKED = 3, @@ -1516,8 +1262,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_COMPLETED = 4, } @@ -1528,8 +1272,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ enum PrintJobSubState { /** @@ -1537,8 +1279,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_COMPLETED_SUCCESS = 0, @@ -1547,8 +1287,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_COMPLETED_FAILED = 1, @@ -1557,8 +1295,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_COMPLETED_CANCELLED = 2, @@ -1567,8 +1303,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_COMPLETED_FILE_CORRUPTED = 3, @@ -1577,8 +1311,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_OFFLINE = 4, @@ -1587,8 +1319,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_BUSY = 5, @@ -1597,8 +1327,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_CANCELLED = 6, @@ -1607,8 +1335,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_OUT_OF_PAPER = 7, @@ -1617,8 +1343,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_OUT_OF_INK = 8, @@ -1627,8 +1351,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_OUT_OF_TONER = 9, @@ -1637,8 +1359,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_JAMMED = 10, @@ -1647,8 +1367,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_DOOR_OPEN = 11, @@ -1657,8 +1375,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_SERVICE_REQUEST = 12, @@ -1667,8 +1383,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_LOW_ON_INK = 13, @@ -1677,8 +1391,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_LOW_ON_TONER = 14, @@ -1687,8 +1399,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_REALLY_LOW_ON_INK = 15, @@ -1697,8 +1407,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_BAD_CERTIFICATE = 16, @@ -1707,8 +1415,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_ACCOUNT_ERROR = 18, @@ -1717,8 +1423,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_PRINT_PERMISSION_ERROR = 19, @@ -1727,8 +1431,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_PRINT_COLOR_PERMISSION_ERROR = 20, @@ -1737,8 +1439,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_NETWORK_ERROR = 21, @@ -1747,8 +1447,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_SERVER_CONNECTION_ERROR = 22, @@ -1757,8 +1455,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_LARGE_FILE_ERROR = 23, @@ -1767,8 +1463,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_FILE_PARSING_ERROR = 24, @@ -1777,8 +1471,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_SLOW_FILE_CONVERSION = 25, @@ -1787,8 +1479,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_RUNNING_UPLOADING_FILES = 26, @@ -1797,8 +1487,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_RUNNING_CONVERTING_FILES = 27, @@ -1815,8 +1503,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINT_JOB_BLOCK_UNKNOWN = 99, } @@ -1827,8 +1513,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ enum PrintErrorCode { /** @@ -1836,8 +1520,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ E_PRINT_NONE = 0, @@ -1846,8 +1528,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ E_PRINT_NO_PERMISSION = 201, @@ -1856,8 +1536,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ E_PRINT_INVALID_PARAMETER = 401, @@ -1866,8 +1544,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ E_PRINT_GENERIC_FAILURE = 13100001, @@ -1876,8 +1552,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ E_PRINT_RPC_FAILURE = 13100002, @@ -1886,8 +1560,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ E_PRINT_SERVER_FAILURE = 13100003, @@ -1896,8 +1568,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ E_PRINT_INVALID_EXTENSION = 13100004, @@ -1906,8 +1576,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ E_PRINT_INVALID_PRINTER = 13100005, @@ -1916,8 +1584,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ E_PRINT_INVALID_PRINT_JOB = 13100006, @@ -1926,8 +1592,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ E_PRINT_FILE_IO = 13100007, @@ -1946,8 +1610,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ enum ApplicationEvent { /** @@ -1955,8 +1617,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ APPLICATION_CREATED = 0, @@ -1965,8 +1625,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ APPLICATION_CLOSED_FOR_STARTED = 1, @@ -1975,8 +1633,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ APPLICATION_CLOSED_FOR_CANCELED = 2, } @@ -1988,8 +1644,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ interface PrinterExtensionInfo { /** @@ -1999,8 +1653,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ extensionId: string; @@ -2011,8 +1663,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ vendorId: string; @@ -2023,8 +1673,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ vendorName: string; @@ -2035,8 +1683,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ vendorIcon: int; @@ -2047,8 +1693,6 @@ declare namespace print { * @systemapi * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ version: string; } @@ -2063,8 +1707,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function queryAllPrinterExtensionInfos(callback: AsyncCallback>): void; @@ -2078,8 +1720,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function queryAllPrinterExtensionInfos(): Promise>; @@ -2096,8 +1736,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function startDiscoverPrinter(extensionList: Array, callback: AsyncCallback): void; @@ -2114,8 +1752,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function startDiscoverPrinter(extensionList: Array): Promise; @@ -2129,8 +1765,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function stopDiscoverPrinter(callback: AsyncCallback): void; @@ -2144,8 +1778,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function stopDiscoverPrinter(): Promise; @@ -2161,8 +1793,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function connectPrinter(printerId: string, callback: AsyncCallback): void; @@ -2178,8 +1808,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function connectPrinter(printerId: string): Promise; @@ -2195,8 +1823,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function disconnectPrinter(printerId: string, callback: AsyncCallback): void; @@ -2212,8 +1838,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function disconnectPrinter(printerId: string): Promise; @@ -2229,8 +1853,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function queryPrinterCapability(printerId: string, callback: AsyncCallback): void; @@ -2246,8 +1868,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function queryPrinterCapability(printerId: string): Promise; @@ -2263,8 +1883,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function startPrintJob(jobInfo: PrintJob, callback: AsyncCallback): void; @@ -2280,8 +1898,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function startPrintJob(jobInfo: PrintJob): Promise; @@ -2297,8 +1913,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function cancelPrintJob(jobId: string, callback: AsyncCallback): void; @@ -2314,8 +1928,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function cancelPrintJob(jobId: string): Promise; @@ -2331,8 +1943,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function requestPrintPreview(jobInfo: PrintJob, callback: Callback): void; @@ -2348,8 +1958,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function requestPrintPreview(jobInfo: PrintJob): Promise; @@ -2365,8 +1973,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function on(type: 'printerStateChange', callback: (state: PrinterState, info: PrinterInfo) => void): void; @@ -2382,8 +1988,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function off(type: 'printerStateChange', callback?: Callback): void; @@ -2399,8 +2003,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function on(type: 'jobStateChange', callback: (state: PrintJobState, job: PrintJob) => void): void; @@ -2416,8 +2018,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function off(type: 'jobStateChange', callback?: Callback): void; @@ -2433,8 +2033,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function on(type: 'extInfoChange', callback: (extensionId: string, info: string) => void): void; @@ -2450,8 +2048,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function off(type: 'extInfoChange', callback?: Callback): void; @@ -2467,8 +2063,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function addPrinters(printers: Array, callback: AsyncCallback): void; @@ -2484,8 +2078,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function addPrinters(printers: Array): Promise; @@ -2501,8 +2093,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function removePrinters(printerIds: Array, callback: AsyncCallback): void; @@ -2518,8 +2108,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function removePrinters(printerIds: Array): Promise; @@ -2535,8 +2123,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function updatePrinters(printers: Array, callback: AsyncCallback): void; @@ -2552,8 +2138,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function updatePrinters(printers: Array): Promise; @@ -2570,8 +2154,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function updatePrinterState(printerId: string, state: PrinterState, callback: AsyncCallback): void; @@ -2588,8 +2170,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function updatePrinterState(printerId: string, state: PrinterState): Promise; @@ -2607,8 +2187,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function updatePrintJobState(jobId: string, state: PrintJobState, subState: PrintJobSubState, callback: AsyncCallback): void; @@ -2626,8 +2204,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function updatePrintJobState(jobId: string, state: PrintJobState, subState: PrintJobSubState): Promise; @@ -2643,8 +2219,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function updateExtensionInfo(info: string, callback: AsyncCallback): void; @@ -2660,8 +2234,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 */ function updateExtensionInfo(info: string): Promise; @@ -2675,8 +2247,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 * @deprecated since 11 * @useinstead print#queryPrintJobList */ @@ -2692,8 +2262,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'10','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 * @deprecated since 11 * @useinstead print#queryPrintJobList */ @@ -2709,8 +2277,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ function queryPrintJobList(callback: AsyncCallback>): void; @@ -2724,8 +2290,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ function queryPrintJobList(): Promise>; @@ -2741,8 +2305,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ function queryPrintJobById(jobId: string, callback: AsyncCallback): void; @@ -2758,8 +2320,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ function queryPrintJobById(jobId: string): Promise; @@ -2777,8 +2337,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ function startGettingPrintFile(jobId: string, printAttributes: PrintAttributes, fd: int, onFileStateChanged: Callback): void; @@ -2796,8 +2354,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ function notifyPrintService(jobId: string, type: 'spooler_closed_for_cancelled' | 'spooler_closed_for_started', callback: AsyncCallback): void; @@ -2814,8 +2370,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'11','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 */ function notifyPrintService(jobId: string, type: 'spooler_closed_for_cancelled' | 'spooler_closed_for_started'): Promise; @@ -2842,8 +2396,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'12','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 */ function getPrinterInfoById(printerId: string): Promise; @@ -2859,8 +2411,6 @@ declare namespace print { * @systemapi Hide this for inner system use. * @since arkts {'1.1':'12','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 */ function notifyPrintServiceEvent(event: ApplicationEvent): Promise; @@ -2874,8 +2424,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ function addPrinterToDiscovery(printerInformation: PrinterInformation): Promise; @@ -2889,8 +2437,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ function updatePrinterInDiscovery(printerInformation: PrinterInformation): Promise; @@ -2904,8 +2450,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ function removePrinterFromDiscovery(printerId: string): Promise; @@ -2919,8 +2463,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ function getPrinterInformationById(printerId: string): Promise; @@ -2930,8 +2472,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ interface PrinterInformation { /** @@ -2940,8 +2480,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ printerId: string; @@ -2951,8 +2489,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ printerName: string; @@ -2962,8 +2498,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ printerStatus: PrinterStatus; @@ -2973,8 +2507,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ description?: string; @@ -2984,8 +2516,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ capability?: PrinterCapabilities; @@ -2995,8 +2525,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ uri?: string; @@ -3006,8 +2534,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ printerMake?: string; @@ -3035,8 +2561,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ options?: string; } @@ -3047,8 +2571,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ interface PrinterCapabilities { /** @@ -3057,8 +2579,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ supportedPageSizes: Array; @@ -3068,8 +2588,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ supportedColorModes: Array; @@ -3079,8 +2597,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ supportedDuplexModes: Array; @@ -3090,8 +2606,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ supportedMediaTypes?: Array; @@ -3101,8 +2615,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ supportedQualities?: Array; @@ -3112,8 +2624,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ supportedOrientations?: Array; @@ -3123,8 +2633,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ options?: string; } @@ -3135,8 +2643,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ enum PrintQuality { /** @@ -3144,8 +2650,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ QUALITY_DRAFT = 3, @@ -3154,8 +2658,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ QUALITY_NORMAL = 4, @@ -3164,8 +2666,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ QUALITY_HIGH = 5, } @@ -3176,8 +2676,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ enum PrintOrientationMode { /** @@ -3185,8 +2683,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ ORIENTATION_MODE_PORTRAIT = 0, @@ -3195,8 +2691,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ ORIENTATION_MODE_LANDSCAPE= 1, @@ -3205,8 +2699,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ ORIENTATION_MODE_REVERSE_LANDSCAPE = 2, @@ -3215,8 +2707,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ ORIENTATION_MODE_REVERSE_PORTRAIT = 3, @@ -3225,8 +2715,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ ORIENTATION_MODE_NONE = 4, } @@ -3237,8 +2725,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ enum PrinterStatus { /** @@ -3246,8 +2732,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINTER_IDLE = 0, @@ -3256,8 +2740,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINTER_BUSY = 1, @@ -3266,8 +2748,6 @@ declare namespace print { * @syscap SystemCapability.Print.PrintFramework * @since arkts {'1.1':'14','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 */ PRINTER_UNAVAILABLE = 2, } diff --git a/api/@ohos.promptAction.d.ts b/api/@ohos.promptAction.d.ts index 5e48b75339..a8cb2fa5a4 100644 --- a/api/@ohos.promptAction.d.ts +++ b/api/@ohos.promptAction.d.ts @@ -2272,7 +2272,6 @@ declare namespace promptAction { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ declare interface DismissDialogAction { /** @@ -2283,7 +2282,6 @@ declare interface DismissDialogAction { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ dismiss: Callback; @@ -2295,7 +2293,6 @@ declare interface DismissDialogAction { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ reason: DismissReason; } diff --git a/api/@ohos.resourceManager.d.ts b/api/@ohos.resourceManager.d.ts index 4253b1662b..b01f284d57 100644 --- a/api/@ohos.resourceManager.d.ts +++ b/api/@ohos.resourceManager.d.ts @@ -2392,6 +2392,7 @@ declare namespace resourceManager { * @param { number } resId - Indicates the resource ID. * @param { (string | number)[] } args - Indicates the formatting string resource parameters. * @returns { string } The character string corresponding to the resource ID. + * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. * @throws { BusinessError } 9001001 - Invalid resource ID. * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. * @throws { BusinessError } 9001006 - The resource is referenced cyclically. @@ -2490,11 +2491,13 @@ declare namespace resourceManager { * @param { Resource } resource - Indicates the resource object. * @param { (string | number)[] } args - Indicates the formatting string resource parameters. * @returns { string } The character string corresponding to the resource object. + * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. * @throws { BusinessError } 9001001 - Invalid resource ID. * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. * @throws { BusinessError } 9001006 - The resource is referenced cyclically. * @throws { BusinessError } 9001007 - Failed to format the resource obtained based on the resource ID. * @syscap SystemCapability.Global.ResourceManager + * @stagemodelonly * @crossplatform * @atomicservice * @since 20 @@ -3200,6 +3203,7 @@ declare namespace resourceManager { * @throws { BusinessError } 9001006 - The resource is referenced cyclically. * @throws { BusinessError } 9001007 - Failed to format the resource obtained based on the resource ID. * @syscap SystemCapability.Global.ResourceManager + * @stagemodelonly * @crossplatform * @atomicservice * @since 20 @@ -3324,6 +3328,7 @@ declare namespace resourceManager { * @throws { BusinessError } 9001006 - The resource is referenced cyclically. * @throws { BusinessError } 9001007 - Failed to format the resource obtained based on the resource ID. * @syscap SystemCapability.Global.ResourceManager + * @stagemodelonly * @crossplatform * @atomicservice * @since 20 diff --git a/api/@ohos.resourceschedule.backgroundProcessManager.d.ts b/api/@ohos.resourceschedule.backgroundProcessManager.d.ts index 549ae5ed84..f6ac1c537c 100644 --- a/api/@ohos.resourceschedule.backgroundProcessManager.d.ts +++ b/api/@ohos.resourceschedule.backgroundProcessManager.d.ts @@ -17,7 +17,6 @@ * @file * @kit BackgroundTasksKit * @arkts 1.1&1.2 - * @arkts 1.1&1.2 */ /** @@ -27,20 +26,15 @@ * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager * @since arkts{ '1.1':'17','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts{ '1.1':'17','1.2':'20'} - * @arkts 1.1&1.2 */ declare namespace backgroundProcessManager { /** * Describes the level of BackgroundProcessManager priority. * * @enum { int } - * @enum { int } * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager * @since arkts{ '1.1':'17','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts{ '1.1':'17','1.2':'20'} - * @arkts 1.1&1.2 */ export enum ProcessPriority { /** @@ -49,8 +43,6 @@ declare namespace backgroundProcessManager { * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager * @since arkts{ '1.1':'17','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts{ '1.1':'17','1.2':'20'} - * @arkts 1.1&1.2 */ PROCESS_BACKGROUND = 1, @@ -60,8 +52,6 @@ declare namespace backgroundProcessManager { * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager * @since arkts{ '1.1':'17','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts{ '1.1':'17','1.2':'20'} - * @arkts 1.1&1.2 */ PROCESS_INACTIVE = 2, } @@ -99,18 +89,14 @@ declare namespace backgroundProcessManager { * Set the priority of process. * * @param { int } pid - Indicates the pid of the process to be set. - * @param { int } pid - Indicates the pid of the process to be set. * @param { ProcessPriority } priority - Indicates the priority to set. Specific priority can be referenced ProcessPriority * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 401 - Parameter error. Possible causes: priority is out of range. * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager * @since arkts{ '1.1':'17','1.2':'20'} * @arkts 1.1&1.2 - * @since arkts{ '1.1':'17','1.2':'20'} - * @arkts 1.1&1.2 */ function setProcessPriority(pid: int, priority: ProcessPriority): Promise; - function setProcessPriority(pid: int, priority: ProcessPriority): Promise; /** * Reset the priority of process. diff --git a/api/@ohos.resourceschedule.backgroundTaskManager.d.ts b/api/@ohos.resourceschedule.backgroundTaskManager.d.ts index eecc8c48e1..c5bb4124f4 100644 --- a/api/@ohos.resourceschedule.backgroundTaskManager.d.ts +++ b/api/@ohos.resourceschedule.backgroundTaskManager.d.ts @@ -19,12 +19,7 @@ */ import { AsyncCallback, Callback } from './@ohos.base'; -/*** if arkts 1.1 */ -import { WantAgent } from '@ohos.wantAgent'; -/*** endif */ -/*** if arkts 1.2 */ -import { WantAgent } from '@ohos.app.ability.wantAgent'; -/*** endif */ +import { WantAgent } from './@ohos.wantAgent'; import Context from './application/BaseContext'; import type notificationManager from './@ohos.notificationManager'; @@ -41,8 +36,7 @@ import type notificationManager from './@ohos.notificationManager'; * @namespace backgroundTaskManager * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.Core * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ declare namespace backgroundTaskManager { /** @@ -50,8 +44,7 @@ declare namespace backgroundTaskManager { * * @interface DelaySuspendInfo * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ interface DelaySuspendInfo { /** @@ -59,8 +52,7 @@ declare namespace backgroundTaskManager { * * @type { number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ requestId: number; /** @@ -68,8 +60,7 @@ declare namespace backgroundTaskManager { * * @type { number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ actualDelayTime: number; } @@ -106,8 +97,7 @@ declare namespace backgroundTaskManager { * @interface ContinuousTaskNotification * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface ContinuousTaskNotification { /** @@ -116,8 +106,7 @@ declare namespace backgroundTaskManager { * @type { notificationManager.SlotType } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ slotType: notificationManager.SlotType; /** @@ -126,8 +115,7 @@ declare namespace backgroundTaskManager { * @type { notificationManager.ContentType } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ contentType: notificationManager.ContentType; /** @@ -136,16 +124,14 @@ declare namespace backgroundTaskManager { * @type { number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ notificationId: number; /** * The continuous task id. * @type { ?number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ continuousTaskId?: number; } @@ -155,8 +141,7 @@ declare namespace backgroundTaskManager { * * @interface ContinuousTaskCancelInfo * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ interface ContinuousTaskCancelInfo { /** @@ -164,8 +149,7 @@ declare namespace backgroundTaskManager { * * @type { ContinuousTaskCancelReason } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ reason: ContinuousTaskCancelReason; @@ -174,8 +158,7 @@ declare namespace backgroundTaskManager { * * @type { number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ id: number; } @@ -416,8 +399,7 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 9900001 - Caller information verification failed for a transient task. * @throws { BusinessError } 9900002 - Transient task verification failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function cancelSuspendDelay(requestId: number): void; @@ -436,8 +418,7 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 9900001 - Caller information verification failed for a transient task. * @throws { BusinessError } 9900002 - Transient task verification failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getRemainingDelayTime(requestId: number, callback: AsyncCallback): void; @@ -456,8 +437,7 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 9900001 - Caller information verification failed for a transient task. * @throws { BusinessError } 9900002 - Transient task verification failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getRemainingDelayTime(requestId: number): Promise; @@ -477,8 +457,7 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 9900001 - Caller information verification failed for a transient task. * @throws { BusinessError } 9900002 - Transient task verification failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function requestSuspendDelay(reason: string, callback: Callback): DelaySuspendInfo; @@ -541,8 +520,7 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 9800007 - Continuous task storage failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function startBackgroundRunning(context: Context, bgMode: BackgroundMode, wantAgent: WantAgent, callback: AsyncCallback): void; @@ -592,8 +570,7 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 9800007 - Continuous task storage failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function startBackgroundRunning(context: Context, bgMode: BackgroundMode, wantAgent: WantAgent): Promise; @@ -619,8 +596,7 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 9800007 - Continuous task storage failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function startBackgroundRunning(context: Context, bgModes: string[], wantAgent: WantAgent): Promise; @@ -644,8 +620,7 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 9800007 - Continuous task storage failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function updateBackgroundRunning(context: Context, bgModes: string[]): Promise; @@ -682,8 +657,7 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 9800007 - Continuous task storage failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Service ability uses this method to request stop running in background. @@ -738,8 +712,7 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 9800007 - Continuous task storage failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ /** * Service ability uses this method to request stop running in background. @@ -793,8 +766,7 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 18700001 - Caller information verification failed for an energy resource request. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function applyEfficiencyResources(request: EfficiencyResourcesRequest): void; @@ -812,8 +784,7 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 18700001 - Caller information verification failed for an energy resource request. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function resetAllEfficiencyResources(): void; @@ -842,8 +813,7 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 401 - Parameter error. Possible cause: 1. Callback parameter error; *
    2. Register a exist callback type; 3. Parameter verification failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ function on(type: 'continuousTaskCancel', callback: Callback): void; @@ -857,8 +827,7 @@ declare namespace backgroundTaskManager { * @throws { BusinessError } 401 - Parameter error. Possible cause: 1. Callback parameter error; *
    2. Unregister type has not register; 3. Parameter verification failed. * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ function off(type: 'continuousTaskCancel', callback?: Callback): void; @@ -927,16 +896,14 @@ declare namespace backgroundTaskManager { * @enum { number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ export enum BackgroundMode { /** * data transfer mode * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ DATA_TRANSFER = 1, @@ -944,16 +911,14 @@ declare namespace backgroundTaskManager { * audio playback mode * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ /** * audio playback mode * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ AUDIO_PLAYBACK = 2, @@ -961,8 +926,7 @@ declare namespace backgroundTaskManager { * audio recording mode * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ AUDIO_RECORDING = 3, @@ -970,8 +934,7 @@ declare namespace backgroundTaskManager { * location mode * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ LOCATION = 4, @@ -979,8 +942,7 @@ declare namespace backgroundTaskManager { * bluetooth interaction mode * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ BLUETOOTH_INTERACTION = 5, @@ -995,8 +957,7 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ MULTI_DEVICE_CONNECTION = 6, @@ -1005,8 +966,7 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ WIFI_INTERACTION = 7, @@ -1014,8 +974,7 @@ declare namespace backgroundTaskManager { * Voice over Internet Phone mode * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ VOIP = 8, @@ -1024,8 +983,7 @@ declare namespace backgroundTaskManager { * only supported in particular device * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ TASK_KEEPING = 9, } @@ -1036,8 +994,7 @@ declare namespace backgroundTaskManager { * @enum { number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ export enum ResourceType { /** @@ -1045,8 +1002,7 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ CPU = 1, @@ -1055,8 +1011,7 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ COMMON_EVENT = 1 << 1, @@ -1065,8 +1020,7 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ TIMER = 1 << 2, @@ -1075,8 +1029,7 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ WORK_SCHEDULER = 1 << 3, @@ -1085,8 +1038,7 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ BLUETOOTH = 1 << 4, @@ -1095,8 +1047,7 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ GPS = 1 << 5, @@ -1105,8 +1056,7 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ AUDIO = 1 << 6, @@ -1115,8 +1065,7 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ RUNNING_LOCK = 1 << 7, @@ -1125,8 +1074,7 @@ declare namespace backgroundTaskManager { * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ SENSOR = 1 << 8 } @@ -1137,8 +1085,7 @@ declare namespace backgroundTaskManager { * @interface EfficiencyResourcesRequest * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ export interface EfficiencyResourcesRequest { /** @@ -1147,8 +1094,7 @@ declare namespace backgroundTaskManager { * @type { number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ resourceTypes: number; @@ -1158,8 +1104,7 @@ declare namespace backgroundTaskManager { * @type { boolean } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ isApply: boolean; @@ -1169,8 +1114,7 @@ declare namespace backgroundTaskManager { * @type { number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ timeOut: number; @@ -1180,8 +1124,7 @@ declare namespace backgroundTaskManager { * @type { ?boolean } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ isPersist?: boolean; @@ -1191,8 +1134,7 @@ declare namespace backgroundTaskManager { * @type { ?boolean } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ isProcess?: boolean; @@ -1202,8 +1144,7 @@ declare namespace backgroundTaskManager { * @type { string } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ reason: string; } @@ -1213,32 +1154,28 @@ declare namespace backgroundTaskManager { * * @enum { number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ export enum ContinuousTaskCancelReason { /** * User cancel. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ USER_CANCEL = 1, /** * System cancel. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ SYSTEM_CANCEL = 2, /** * User remove notification. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ USER_CANCEL_REMOVE_NOTIFICATION = 3, @@ -1246,8 +1183,7 @@ declare namespace backgroundTaskManager { * Low network speed when request data transfer mode. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ SYSTEM_CANCEL_DATA_TRANSFER_LOW_SPEED = 4, @@ -1255,8 +1191,7 @@ declare namespace backgroundTaskManager { * Not use avsession when request audio playback mode. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ SYSTEM_CANCEL_AUDIO_PLAYBACK_NOT_USE_AVSESSION = 5, @@ -1264,8 +1199,7 @@ declare namespace backgroundTaskManager { * Audio is not running when request audio playback mode. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ SYSTEM_CANCEL_AUDIO_PLAYBACK_NOT_RUNNING = 6, @@ -1273,8 +1207,7 @@ declare namespace backgroundTaskManager { * Audio is not running when request audio recording mode. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ SYSTEM_CANCEL_AUDIO_RECORDING_NOT_RUNNING = 7, @@ -1282,8 +1215,7 @@ declare namespace backgroundTaskManager { * Not use location when request location mode. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ SYSTEM_CANCEL_NOT_USE_LOCATION = 8, @@ -1291,8 +1223,7 @@ declare namespace backgroundTaskManager { * Not use bluetooth when request bluetooth interaction mode. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ SYSTEM_CANCEL_NOT_USE_BLUETOOTH = 9, @@ -1300,8 +1231,7 @@ declare namespace backgroundTaskManager { * Not use multi device when request multi-device connection mode. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ SYSTEM_CANCEL_NOT_USE_MULTI_DEVICE = 10, @@ -1309,8 +1239,7 @@ declare namespace backgroundTaskManager { * Use some mode illegally. * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ SYSTEM_CANCEL_USE_ILLEGALLY = 11, } @@ -1320,16 +1249,14 @@ declare namespace backgroundTaskManager { * * @enum { number } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'16','1.2':'20'} - * @arkts 1.1&1.2 + * @since 16 */ export enum BackgroundSubMode { /** * bluetooth car key mode * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'16','1.2':'20'} - * @arkts 1.1&1.2 + * @since 16 */ CAR_KEY = 1 } @@ -1339,16 +1266,14 @@ declare namespace backgroundTaskManager { * * @enum { string } * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'16','1.2':'20'} - * @arkts 1.1&1.2 + * @since 16 */ export enum BackgroundModeType { /** * subMode type * * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @since arkts {'1.1':'16','1.2':'20'} - * @arkts 1.1&1.2 + * @since 16 */ SUB_MODE = 'subMode' } diff --git a/api/@ohos.resourceschedule.usageStatistics.d.ts b/api/@ohos.resourceschedule.usageStatistics.d.ts index 4f4ccd9ec1..c27d16e1fa 100644 --- a/api/@ohos.resourceschedule.usageStatistics.d.ts +++ b/api/@ohos.resourceschedule.usageStatistics.d.ts @@ -31,16 +31,14 @@ import { AsyncCallback, Callback } from './@ohos.base'; * * @namespace usageStatistics * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ declare namespace usageStatistics { /** * @interface BundleStatsInfo * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ interface BundleStatsInfo { /** @@ -48,8 +46,7 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ id: number; @@ -58,8 +55,7 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ abilityInFgTotalTime?: number; @@ -68,8 +64,7 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ abilityPrevAccessTime?: number; @@ -78,8 +73,7 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ abilityPrevSeenTime?: number; @@ -88,8 +82,7 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ abilitySeenTotalTime?: number; @@ -98,8 +91,7 @@ declare namespace usageStatistics { * @type { ?string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ bundleName?: string; @@ -108,8 +100,7 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ fgAbilityAccessTotalTime?: number; @@ -118,8 +109,7 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ fgAbilityPrevAccessTime?: number; @@ -129,8 +119,7 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ infosBeginTime?: number; @@ -140,8 +129,7 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ infosEndTime?: number; @@ -150,8 +138,7 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'15', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 15 */ appIndex?: number; } @@ -160,8 +147,7 @@ declare namespace usageStatistics { * @interface HapFormInfo * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ interface HapFormInfo { /** @@ -169,8 +155,7 @@ declare namespace usageStatistics { * @type { string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ formName: string; @@ -179,8 +164,7 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ formDimension: number; @@ -189,8 +173,7 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ formId: number; @@ -199,8 +182,7 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ formLastUsedTime: number; @@ -209,8 +191,7 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ count: number; } @@ -219,8 +200,7 @@ declare namespace usageStatistics { * @interface HapModuleInfo * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ interface HapModuleInfo { /** @@ -228,8 +208,7 @@ declare namespace usageStatistics { * @type { ?string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ deviceId?: string; @@ -238,8 +217,7 @@ declare namespace usageStatistics { * @type { string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ bundleName: string; @@ -248,8 +226,7 @@ declare namespace usageStatistics { * @type { string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ moduleName: string; @@ -258,8 +235,7 @@ declare namespace usageStatistics { * @type { ?string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ abilityName?: string; @@ -268,8 +244,7 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ appLabelId?: number; @@ -278,8 +253,7 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ labelId?: number; @@ -288,8 +262,7 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ descriptionId?: number; @@ -298,8 +271,7 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ abilityLableId?: number; @@ -308,8 +280,7 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ abilityDescriptionId?: number; @@ -318,8 +289,7 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ abilityIconId?: number; @@ -328,8 +298,7 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ launchedCount: number; @@ -338,8 +307,7 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ lastModuleUsedTime: number; @@ -348,8 +316,7 @@ declare namespace usageStatistics { * @type { Array } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ formRecords: Array; } @@ -358,8 +325,7 @@ declare namespace usageStatistics { * @interface DeviceEventStats * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ interface DeviceEventStats { /** @@ -367,8 +333,7 @@ declare namespace usageStatistics { * @type { string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ name: string; @@ -377,8 +342,7 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ eventId: number; @@ -387,8 +351,7 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ count: number; } @@ -397,8 +360,7 @@ declare namespace usageStatistics { * @interface BundleEvents * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ interface BundleEvents { /** @@ -406,8 +368,7 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ appGroup?: number; @@ -416,8 +377,7 @@ declare namespace usageStatistics { * @type { ?string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ bundleName?: string; @@ -426,8 +386,7 @@ declare namespace usageStatistics { * @type { ?string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ indexOfLink?: string; @@ -436,8 +395,7 @@ declare namespace usageStatistics { * @type { ?string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ nameOfClass?: string; @@ -446,8 +404,7 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ eventOccurredTime?: number; @@ -456,8 +413,7 @@ declare namespace usageStatistics { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ eventId?: number; } @@ -466,8 +422,7 @@ declare namespace usageStatistics { * @interface AppGroupCallbackInfo * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ interface AppGroupCallbackInfo { /** @@ -475,8 +430,7 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ appOldGroup: number; @@ -485,8 +439,7 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ appNewGroup: number; @@ -495,8 +448,7 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ userId: number; @@ -505,8 +457,7 @@ declare namespace usageStatistics { * @type { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ changeReason: number; @@ -515,8 +466,7 @@ declare namespace usageStatistics { * @type { string } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ bundleName: string; } @@ -542,8 +492,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000006 - Failed to get the application information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function isIdleState(bundleName: string, callback: AsyncCallback): void; @@ -568,8 +517,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000006 - Failed to get the application information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function isIdleState(bundleName: string): Promise; @@ -594,8 +542,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000006 - Failed to get the application information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'10', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 10 */ function isIdleStateSync(bundleName: string): boolean; @@ -621,8 +568,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100002 - Failed to get the application group information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function queryAppGroup(callback: AsyncCallback): void; @@ -648,8 +594,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100002 - Failed to get the application group information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function queryAppGroup(): Promise; @@ -674,8 +619,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100002 - Failed to get the application group information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'10', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 10 */ function queryAppGroupSync(): number; @@ -702,8 +646,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100002 - Failed to get the application group information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function queryAppGroup(bundleName: string, callback: AsyncCallback): void; @@ -730,8 +673,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100002 - Failed to get the application group information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function queryAppGroup(bundleName: string): Promise; @@ -757,8 +699,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100002 - Failed to get the application group information. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'10', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 10 */ function queryAppGroupSync(bundleName: string): number; @@ -766,8 +707,7 @@ declare namespace usageStatistics { * @typedef { Record } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ type BundleStatsMap = Record; @@ -793,8 +733,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function queryBundleStatsInfos(begin: number, end: number, callback: AsyncCallback): void; @@ -820,8 +759,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function queryBundleStatsInfos(begin: number, end: number): Promise; @@ -829,8 +767,7 @@ declare namespace usageStatistics { * @typedef { Record> } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'15', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 15 */ type AppStatsMap = Record>; @@ -856,8 +793,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'15', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 15 */ function queryAppStatsInfos(begin: number, end: number): Promise; @@ -882,8 +818,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'15', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 15 */ function queryLastUseTime(appInfo: Record>): Promise; @@ -893,8 +828,7 @@ declare namespace usageStatistics { * @enum { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ export enum IntervalType { /** @@ -902,8 +836,7 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ BY_OPTIMIZED = 0, @@ -912,8 +845,7 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ BY_DAILY = 1, @@ -922,8 +854,7 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ BY_WEEKLY = 2, @@ -932,8 +863,7 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ BY_MONTHLY = 3, @@ -942,8 +872,7 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ BY_ANNUALLY = 4 } @@ -972,8 +901,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function queryBundleStatsInfoByInterval( byInterval: IntervalType, @@ -1006,8 +934,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function queryBundleStatsInfoByInterval( byInterval: IntervalType, @@ -1037,8 +964,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function queryBundleEvents(begin: number, end: number, callback: AsyncCallback>): void; @@ -1064,8 +990,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function queryBundleEvents(begin: number, end: number): Promise>; @@ -1089,8 +1014,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function queryCurrentBundleEvents(begin: number, end: number, callback: AsyncCallback>): void; @@ -1114,8 +1038,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function queryCurrentBundleEvents(begin: number, end: number): Promise>; @@ -1140,8 +1063,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function queryModuleUsageRecords(maxNum: number, callback: AsyncCallback>): void; @@ -1166,8 +1088,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function queryModuleUsageRecords(maxNum: number): Promise>; @@ -1191,8 +1112,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function queryModuleUsageRecords(callback: AsyncCallback>): void; @@ -1216,8 +1136,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function queryModuleUsageRecords(): Promise>; @@ -1227,8 +1146,7 @@ declare namespace usageStatistics { * @enum { number } * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ export enum GroupType { /** @@ -1236,8 +1154,7 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ ALIVE_GROUP = 10, @@ -1246,8 +1163,7 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ DAILY_GROUP = 20, @@ -1256,8 +1172,7 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ FIXED_GROUP = 30, @@ -1266,8 +1181,7 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ RARE_GROUP = 40, @@ -1276,8 +1190,7 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ LIMITED_GROUP = 50, @@ -1286,8 +1199,7 @@ declare namespace usageStatistics { * * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ NEVER_GROUP = 60 } @@ -1313,8 +1225,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100001 - Repeated operation on the application group. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function setAppGroup(bundleName: string, newGroup: GroupType, callback: AsyncCallback): void; @@ -1339,8 +1250,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100001 - Repeated operation on the application group. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function setAppGroup(bundleName: string, newGroup: GroupType): Promise; @@ -1364,8 +1274,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100001 - Repeated operation on the application group. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function registerAppGroupCallBack(groupCallback: Callback, callback: AsyncCallback): void; @@ -1389,8 +1298,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100001 - Repeated operation on the application group. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function registerAppGroupCallBack(groupCallback: Callback): Promise; @@ -1412,8 +1320,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100001 - Repeated operation on the application group. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function unregisterAppGroupCallBack(callback: AsyncCallback): void; @@ -1435,8 +1342,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10100001 - Repeated operation on the application group. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function unregisterAppGroupCallBack(): Promise; @@ -1462,8 +1368,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function queryDeviceEventStats(begin: number, end: number, callback: AsyncCallback>): void; @@ -1489,8 +1394,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function queryDeviceEventStats(begin: number, end: number): Promise>; @@ -1516,8 +1420,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function queryNotificationEventStats( begin: number, @@ -1547,8 +1450,7 @@ declare namespace usageStatistics { * @throws { BusinessError } 10000007 - Failed to get the system time. * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App * @systemapi Hide this for inner system use. - * @since arkts{ '1.1':'9', '1.2':'20' } - * @arkts 1.1&1.2 + * @since 9 */ function queryNotificationEventStats(begin: number, end: number): Promise>; } diff --git a/api/@ohos.resourceschedule.workScheduler.d.ts b/api/@ohos.resourceschedule.workScheduler.d.ts index 9b784899cb..fbe64d4053 100644 --- a/api/@ohos.resourceschedule.workScheduler.d.ts +++ b/api/@ohos.resourceschedule.workScheduler.d.ts @@ -26,8 +26,7 @@ import { AsyncCallback } from './@ohos.base'; * @namespace workScheduler * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ declare namespace workScheduler { /** @@ -36,8 +35,7 @@ declare namespace workScheduler { * @interface WorkInfo * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ export interface WorkInfo { /** @@ -46,8 +44,7 @@ declare namespace workScheduler { * @type { number } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ workId: number; /** @@ -56,8 +53,7 @@ declare namespace workScheduler { * @type { string } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ bundleName: string; /** @@ -66,8 +62,7 @@ declare namespace workScheduler { * @type { string } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ abilityName: string; /** @@ -76,8 +71,7 @@ declare namespace workScheduler { * @type { ?boolean } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ isPersisted?: boolean; /** @@ -86,8 +80,7 @@ declare namespace workScheduler { * @type { ?NetworkType } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ networkType?: NetworkType; /** @@ -96,8 +89,7 @@ declare namespace workScheduler { * @type { ?boolean } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ isCharging?: boolean; /** @@ -106,8 +98,7 @@ declare namespace workScheduler { * @type { ?ChargingType } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ chargerType?: ChargingType; /** @@ -116,8 +107,7 @@ declare namespace workScheduler { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ batteryLevel?: number; /** @@ -126,8 +116,7 @@ declare namespace workScheduler { * @type { ?BatteryStatus } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ batteryStatus?: BatteryStatus; /** @@ -136,8 +125,7 @@ declare namespace workScheduler { * @type { ?StorageRequest } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ storageRequest?: StorageRequest; /** @@ -146,8 +134,7 @@ declare namespace workScheduler { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ repeatCycleTime?: number; /** @@ -156,8 +143,7 @@ declare namespace workScheduler { * @type { ?boolean } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ isRepeat?: boolean; /** @@ -166,8 +152,7 @@ declare namespace workScheduler { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ repeatCount?: number; /** @@ -176,8 +161,7 @@ declare namespace workScheduler { * @type { ?boolean } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ isDeepIdle?: boolean; /** @@ -186,8 +170,7 @@ declare namespace workScheduler { * @type { ?number } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ idleWaitTime?: number; /** @@ -196,8 +179,7 @@ declare namespace workScheduler { * @type { ?Record } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ parameters?: Record; } @@ -217,8 +199,7 @@ declare namespace workScheduler { * @throws { BusinessError } 9700005 - Calling startWork failed. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function startWork(work: WorkInfo): void; @@ -236,8 +217,7 @@ declare namespace workScheduler { * @throws { BusinessError } 9700004 - Check on workInfo failed. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function stopWork(work: WorkInfo, needCancel?: boolean): void; @@ -254,8 +234,7 @@ declare namespace workScheduler { * @throws { BusinessError } 9700004 - Check on workInfo failed. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getWorkStatus(workId: number, callback: AsyncCallback): void; @@ -272,8 +251,7 @@ declare namespace workScheduler { * @throws { BusinessError } 9700004 - Check on workInfo failed. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getWorkStatus(workId: number): Promise; @@ -307,8 +285,7 @@ declare namespace workScheduler { * @throws { BusinessError } 9700003 - System service operation failed. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ function obtainAllWorks(callback: AsyncCallback>): void; @@ -324,8 +301,7 @@ declare namespace workScheduler { * @throws { BusinessError } 9700003 - System service operation failed. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function obtainAllWorks(): Promise>; @@ -340,8 +316,7 @@ declare namespace workScheduler { * @throws { BusinessError } 9700003 - System service operation failed. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function stopAndClearWorks(): void; @@ -377,8 +352,7 @@ declare namespace workScheduler { * @throws { BusinessError } 9700004 - Check on workInfo failed. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ function isLastWorkTimeOut(workId: number, callback: AsyncCallback): void; @@ -395,8 +369,7 @@ declare namespace workScheduler { * @throws { BusinessError } 9700004 - Check on workInfo failed. * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function isLastWorkTimeOut(workId: number): Promise; @@ -406,8 +379,7 @@ declare namespace workScheduler { * @enum { number } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 * @name NetworkType */ export enum NetworkType { @@ -416,8 +388,7 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ NETWORK_TYPE_ANY = 0, /** @@ -425,8 +396,7 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ NETWORK_TYPE_MOBILE, /** @@ -434,8 +404,7 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ NETWORK_TYPE_WIFI, /** @@ -443,8 +412,7 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ NETWORK_TYPE_BLUETOOTH, /** @@ -452,8 +420,7 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ NETWORK_TYPE_WIFI_P2P, /** @@ -461,8 +428,7 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ NETWORK_TYPE_ETHERNET } @@ -473,8 +439,7 @@ declare namespace workScheduler { * @enum { number } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 * @name ChargingType */ export enum ChargingType { @@ -483,8 +448,7 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ CHARGING_PLUGGED_ANY = 0, /** @@ -492,8 +456,7 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ CHARGING_PLUGGED_AC, /** @@ -501,8 +464,7 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ CHARGING_PLUGGED_USB, /** @@ -510,8 +472,7 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ CHARGING_PLUGGED_WIRELESS } @@ -522,8 +483,7 @@ declare namespace workScheduler { * @enum { number } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 * @name BatteryStatus */ export enum BatteryStatus { @@ -532,8 +492,7 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ BATTERY_STATUS_LOW = 0, /** @@ -541,8 +500,7 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ BATTERY_STATUS_OKAY, /** @@ -550,8 +508,7 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ BATTERY_STATUS_LOW_OR_OKAY } @@ -562,8 +519,7 @@ declare namespace workScheduler { * @enum { number } * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 * @name StorageRequest */ export enum StorageRequest { @@ -572,8 +528,7 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ STORAGE_LEVEL_LOW = 0, /** @@ -581,8 +536,7 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ STORAGE_LEVEL_OKAY, /** @@ -590,8 +544,7 @@ declare namespace workScheduler { * * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ STORAGE_LEVEL_LOW_OR_OKAY } diff --git a/api/@ohos.rpc.d.ts b/api/@ohos.rpc.d.ts index 20a57f5da4..b2efd9bbf2 100644 --- a/api/@ohos.rpc.d.ts +++ b/api/@ohos.rpc.d.ts @@ -18,7 +18,9 @@ * @kit IPCKit */ +/*** if arkts 1.1 */ import type { AsyncCallback } from './@ohos.base'; +/*** endif */ /** * This module provides inter process communication capability. @@ -1179,8 +1181,7 @@ declare namespace rpc { * * @returns { MessageSequence } Return the object created. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ static create(): MessageSequence; @@ -1188,8 +1189,7 @@ declare namespace rpc { * Reclaim the {@link MessageSequence} object. * * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ reclaim(): void; @@ -1203,8 +1203,7 @@ declare namespace rpc { * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ writeRemoteObject(object: IRemoteObject): void; @@ -1215,8 +1214,7 @@ declare namespace rpc { * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ readRemoteObject(): IRemoteObject; @@ -1231,8 +1229,7 @@ declare namespace rpc { * 4.The number of bytes copied to the buffer is different from the length of the obtained string. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ writeInterfaceToken(token: string): void; @@ -1259,12 +1256,11 @@ declare namespace rpc { /** * Obtains the storage capacity (in bytes) of the {@link MessageSequence} object. * - * @returns { int } Return the storage capacity of the {@link MessageSequence} object. + * @returns { number } Return the storage capacity of the {@link MessageSequence} object. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - getCapacity(): int; + getCapacity(): number; /** * Sets the size of data (in bytes) contained in the {@link MessageSequence} object. @@ -1286,17 +1282,16 @@ declare namespace rpc { *

    {@code false} is returned if the capacity set in this method is less than * the size of data contained in the {@link MessageSequence}. * - * @param { int } size - Indicates the storage capacity of the {@link MessageSequence} object. + * @param { number } size - Indicates the storage capacity of the {@link MessageSequence} object. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; * 2.The parameter type does not match. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @throws { BusinessError } 1900011 - Memory allocation failed. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - setCapacity(size: int): void; + setCapacity(size: number): void; /** * Obtains the writable data space (in bytes) in the {@link MessageSequence} object. @@ -1374,8 +1369,7 @@ declare namespace rpc { * * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ writeNoException(): void; @@ -1387,8 +1381,7 @@ declare namespace rpc { * * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ readException(): void; @@ -1421,30 +1414,28 @@ declare namespace rpc { /** * Writes an integer value into the {@link MessageSequence} object. * - * @param { int } val - Indicates the integer value to write. + * @param { number } val - Indicates the integer value to write. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; * 2.The parameter type does not match. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - writeInt(val: int): void; + writeInt(val: number): void; /** * Writes a long integer value into the {@link MessageSequence} object. * - * @param { long } val - Indicates the long integer value to write. + * @param { number } val - Indicates the long integer value to write. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; * 2.The parameter type does not match. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - writeLong(val: long): void; + writeLong(val: number): void; /** * Writes a floating point value into the {@link MessageSequence} object. @@ -1481,8 +1472,7 @@ declare namespace rpc { * 2.The parameter type does not match. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ writeBoolean(val: boolean): void; @@ -1524,15 +1514,14 @@ declare namespace rpc { * 2.The parameter type does not match. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ writeParcelable(val: Parcelable): void; /** * Writes a byte array into the {@link MessageSequence} object. * - * @param { int[] } byteArray - Indicates the byte array to write. + * @param { number[] } byteArray - Indicates the byte array to write. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The parameter is an empty array; * 2.The number of parameters is incorrect; @@ -1541,10 +1530,9 @@ declare namespace rpc { * 5.The type of the element in the array is incorrect. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - writeByteArray(byteArray: int[]): void; + writeByteArray(byteArray: number[]): void; /** * Writes a short integer array into the {@link MessageSequence} object. @@ -1569,7 +1557,7 @@ declare namespace rpc { * Ensure that the data type and size comply with the interface definition. * Otherwise,data may be truncated. * - * @param { int[] } intArray - Indicates the integer array to write. + * @param { number[] } intArray - Indicates the integer array to write. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The parameter is an empty array; * 2.The number of parameters is incorrect; @@ -1578,10 +1566,9 @@ declare namespace rpc { * 5.The type of the element in the array is incorrect. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - writeIntArray(intArray: int[]): void; + writeIntArray(intArray: number[]): void; /** * Writes a long integer array into the {@link MessageSequence} object. @@ -1624,7 +1611,7 @@ declare namespace rpc { * Ensure that the data type and size comply with the interface definition. * Otherwise,data may be truncated. * - * @param { double[] } doubleArray - Indicates the double-precision floating point array to write. + * @param { number[] } doubleArray - Indicates the double-precision floating point array to write. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The parameter is an empty array; * 2.The number of parameters is incorrect; @@ -1633,10 +1620,9 @@ declare namespace rpc { * 5.The type of the element in the array is incorrect. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - writeDoubleArray(doubleArray: double[]): void; + writeDoubleArray(doubleArray: number[]): void; /** * Writes a boolean array into the {@link MessageSequence} object. @@ -1651,8 +1637,7 @@ declare namespace rpc { * 4.The element does not exist in the array. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ writeBooleanArray(booleanArray: boolean[]): void; @@ -1687,8 +1672,7 @@ declare namespace rpc { * 5.The number of bytes copied to the buffer is different from the length of the obtained string. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ writeStringArray(stringArray: string[]): void; @@ -1703,8 +1687,7 @@ declare namespace rpc { * 4.The element does not exist in the array. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ writeParcelableArray(parcelableArray: Parcelable[]): void; @@ -1747,24 +1730,22 @@ declare namespace rpc { /** * Reads an integer value from the {@link MessageSequence} object. * - * @returns { int } Return an integer value. + * @returns { number } Return an integer value. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - readInt(): int; + readInt(): number; /** * Reads a long integer value from the {@link MessageSequence} object. * - * @returns { long } Return a long integer value. + * @returns { number } Return a long integer value. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - readLong(): long; + readLong(): number; /** * Reads a floating point value from the {@link MessageSequence} object. @@ -1792,8 +1773,7 @@ declare namespace rpc { * @returns { boolean } Return a boolean value. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ readBoolean(): boolean; @@ -1828,8 +1808,7 @@ declare namespace rpc { * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @throws { BusinessError } 1900012 - Failed to call the JS callback function. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ readParcelable(dataIn: Parcelable): void; @@ -1884,28 +1863,26 @@ declare namespace rpc { /** * Reads an integer array from the {@link MessageSequence} object. * - * @param { int[] } dataIn - Indicates the integer array to read. + * @param { number[] } dataIn - Indicates the integer array to read. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The parameter is an empty array; * 2.The number of parameters is incorrect; * 3.The parameter type does not match. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - readIntArray(dataIn: int[]): void; + readIntArray(dataIn: number[]): void; /** * Reads an integer array from the {@link MessageSequence} object. * - * @returns { int[] } Return an integer array. + * @returns { number[] } Return an integer array. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - readIntArray(): int[]; + readIntArray(): number[]; /** * Reads a long integer array from the {@link MessageSequence} object. @@ -1958,28 +1935,26 @@ declare namespace rpc { /** * Reads a double-precision floating point array from the {@link MessageSequence} object. * - * @param { double[] } dataIn - Indicates the double-precision floating point array to read. + * @param { number[] } dataIn - Indicates the double-precision floating point array to read. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The parameter is an empty array; * 2.The number of parameters is incorrect; * 3.The parameter type does not match. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - readDoubleArray(dataIn: double[]): void; + readDoubleArray(dataIn: number[]): void; /** * Reads a double-precision floating point array from the {@link MessageSequence} object. * - * @returns { double[] } Return a double-precision floating point array. + * @returns { number[] } Return a double-precision floating point array. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - readDoubleArray(): double[]; + readDoubleArray(): number[]; /** * Reads a boolean array from the {@link MessageSequence} object. @@ -1991,8 +1966,7 @@ declare namespace rpc { * 3.The parameter type does not match. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ readBooleanArray(dataIn: boolean[]): void; @@ -2002,8 +1976,7 @@ declare namespace rpc { * @returns { boolean[] } Return a boolean array. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ readBooleanArray(): boolean[]; @@ -2041,8 +2014,7 @@ declare namespace rpc { * 3.The parameter type does not match. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ readStringArray(dataIn: string[]): void; @@ -2052,8 +2024,7 @@ declare namespace rpc { * @returns { string[] } Return a string array. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ readStringArray(): string[]; @@ -2070,8 +2041,7 @@ declare namespace rpc { * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @throws { BusinessError } 1900012 - Failed to call the JS callback function. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ readParcelableArray(parcelableArray: Parcelable[]): void; @@ -2104,16 +2074,14 @@ declare namespace rpc { /** * Closes the specified file descriptor. * - * @param { int } fd - File descriptor to be closed. + * @param { number } fd - File descriptor to be closed. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; * 2.The parameter type does not match. - * @static * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - static closeFileDescriptor(fd: int): void; + static closeFileDescriptor(fd: number): void; /** * Duplicates the specified file descriptor. @@ -2142,27 +2110,25 @@ declare namespace rpc { /** * Writes a file descriptor to this {@link MessageSequence} object. * - * @param { int } fd - File descriptor to wrote. + * @param { number } fd - File descriptor to wrote. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; * 2.The parameter type does not match. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - writeFileDescriptor(fd: int): void; + writeFileDescriptor(fd: number): void; /** * Reads a file descriptor from this {@link MessageSequence} object. * - * @returns { int } Return a file descriptor obtained. + * @returns { number } Return a file descriptor obtained. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - readFileDescriptor(): int; + readFileDescriptor(): number; /** * Writes an anonymous shared memory object to this {@link MessageSequence} object. @@ -2173,8 +2139,7 @@ declare namespace rpc { * 2.The parameter is not an instance of the Ashmem object. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ writeAshmem(ashmem: Ashmem): void; @@ -2184,8 +2149,7 @@ declare namespace rpc { * @returns { Ashmem } Return the anonymous share object obtained. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ readAshmem(): Ashmem; @@ -2225,7 +2189,7 @@ declare namespace rpc { * Writes raw data to this {@link MessageSequence} object. * * @param { ArrayBuffer } rawData - Raw data to wrote. - * @param { int } size - Size of the raw data, in bytes. + * @param { number } size - Size of the raw data, in bytes. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; * 2.The parameter type does not match; @@ -2235,10 +2199,9 @@ declare namespace rpc { * 6.The transferred size is greater than the byte length of ArrayBuffer. * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - writeRawDataBuffer(rawData: ArrayBuffer, size: int): void; + writeRawDataBuffer(rawData: ArrayBuffer, size: number): void; /** * Reads raw data from this {@link MessageSequence} object. @@ -2259,17 +2222,16 @@ declare namespace rpc { /** * Reads raw data from this {@link MessageSequence} object. * - * @param { int } size - Size of the raw data to read. + * @param { number } size - Size of the raw data to read. * @returns { ArrayBuffer } Return the raw data obtained, in bytes. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; * 2.The parameter type does not match. * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - readRawDataBuffer(size: int): ArrayBuffer; + readRawDataBuffer(size: number): ArrayBuffer; /** * Writes the data in an ArrayBuffer object into this {@Link MessageSequence} object. @@ -2359,8 +2321,7 @@ declare namespace rpc { * object will be marshalled. * @returns { boolean } Return {@code true} if the marshalling is successful; return {@code false} otherwise. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ marshalling(dataOut: MessageSequence): boolean; @@ -2371,8 +2332,7 @@ declare namespace rpc { * which the {@code Parcelable} object has been marshalled. * @returns { boolean } Return {@code true} if the unmarshalling is successful; return {@code false} otherwise. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ unmarshalling(dataIn: MessageSequence): boolean; } @@ -2439,29 +2399,26 @@ declare namespace rpc { * * @typedef RequestResult * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ interface RequestResult { /** * Error code. 0 indicates successful, otherwise it is failed. * - * @type { int } + * @type { number } * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - errCode: int; + errCode: number; /** * Message code. It is same as the code in {@link SendRequest} method. * - * @type { int } + * @type { number } * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - code: int; + code: number; /** * MessageSequence object sent to the peer process. @@ -2469,8 +2426,7 @@ declare namespace rpc { * * @type { MessageSequence } * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ data: MessageSequence; @@ -2480,8 +2436,7 @@ declare namespace rpc { * * @type { MessageSequence } * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ reply: MessageSequence; } @@ -2583,7 +2538,7 @@ declare namespace rpc { * a promise will be fulfilled when the response to sendMessageRequest is returned, * and the reply message contains the returned information. * - * @param { int } code - Message code called by the request, which is determined by the client and server. + * @param { number } code - Message code called by the request, which is determined by the client and server. * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. * @param {MessageSequence } data - {@link MessageSequence} object holding the data to send. * @param {MessageSequence } reply - {@link MessageSequence} object that receives the response. @@ -2594,11 +2549,10 @@ declare namespace rpc { * 2.The parameter type does not match; * 3.Failed to obtain the passed object instance. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ sendMessageRequest( - code: int, + code: number, data: MessageSequence, reply: MessageSequence, options: MessageOption @@ -2637,7 +2591,7 @@ declare namespace rpc { * a callback will be invoked when the response to sendMessageRequest is returned, * and the reply message contains the returned information. * - * @param {int } code - Message code called by the request, which is determined by the client and server. + * @param {number } code - Message code called by the request, which is determined by the client and server. * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. * @param { MessageSequence } data - {@link MessageSequence} object holding the data to send. * @param { MessageSequence } reply - {@link MessageSequence} object that receives the response. @@ -2648,11 +2602,10 @@ declare namespace rpc { * 2.The parameter type does not match; * 3.Failed to obtain the passed object instance. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ sendMessageRequest( - code: int, + code: number, data: MessageSequence, reply: MessageSequence, options: MessageOption, @@ -2677,7 +2630,7 @@ declare namespace rpc { * Register a callback used to receive notifications of the death of a remote object. * * @param { DeathRecipient } recipient - Indicates the callback to be registered. - * @param { int } flags - Indicates the flag of the death notification. + * @param { number } flags - Indicates the flag of the death notification. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; * 2.The parameter type does not match; @@ -2685,10 +2638,9 @@ declare namespace rpc { * @throws { BusinessError } 1900005 - Operation allowed only for the proxy object. * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - registerDeathRecipient(recipient: DeathRecipient, flags: int): void; + registerDeathRecipient(recipient: DeathRecipient, flags: number): void; /** * Unregister a callback used to receive notifications of the death of a remote object. @@ -2708,7 +2660,7 @@ declare namespace rpc { * Unregister a callback used to receive notifications of the death of a remote object. * * @param { DeathRecipient } recipient - Indicates the callback to be unregister. - * @param { int } flags - Indicates the flag of the death notification. + * @param { number } flags - Indicates the flag of the death notification. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; * 2.The parameter type does not match; @@ -2716,10 +2668,9 @@ declare namespace rpc { * @throws { BusinessError } 1900005 - Operation allowed only for the proxy object. * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - unregisterDeathRecipient(recipient: DeathRecipient, flags: int): void; + unregisterDeathRecipient(recipient: DeathRecipient, flags: number): void; /** * Obtains the interface descriptor of an object. @@ -2750,8 +2701,7 @@ declare namespace rpc { * * @returns { boolean } Return {@code true} if the object is dead; return {@code false} otherwise. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 7 */ isObjectDead(): boolean; } @@ -2766,8 +2716,7 @@ declare namespace rpc { * * @typedef IRemoteBroker * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ interface IRemoteBroker { /** @@ -2776,8 +2725,7 @@ declare namespace rpc { * @returns { IRemoteObject } Return the RemoteObject if the caller is a RemoteObject; return the IRemoteObject, * that is, the holder of this RemoteProxy object, if the caller is a RemoteProxy object. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 7 */ asObject(): IRemoteObject; } @@ -2799,16 +2747,14 @@ declare namespace rpc { * * @typedef DeathRecipient * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ interface DeathRecipient { /** * Called to perform subsequent operations when a death notification of the remote object is received. * * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 7 */ onRemoteDied(): void; } @@ -2828,26 +2774,24 @@ declare namespace rpc { /** * Indicates synchronous call. * - * @type { int } + * @type { number } * @default 0 * @static * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 7 */ - static TF_SYNC: int; + static TF_SYNC: number; /** * Indicates asynchronous call. * - * @type { int } + * @type { number } * @default 1 * @static * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 7 */ - static TF_ASYNC: int; + static TF_ASYNC: number; /** * Indicates the sendRequest API for returning the file descriptor. @@ -2871,25 +2815,24 @@ declare namespace rpc { /** * Indicates the wait time for RPC, in seconds. It is NOT used in IPC case. * - * @type { int } + * @type { number } * @default 8 * @static * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - static TF_WAIT_TIME: int; + static TF_WAIT_TIME: number; /** * A constructor used to create a MessageOption instance. * - * @param { int } syncFlags - Specifies whether the SendRequest is called synchronously (default) or asynchronously. - * @param { int } waitTime - Maximum wait time for a RPC call. The default value is TF_WAIT_TIME. + * @param { number } syncFlags - Specifies whether the SendRequest is called synchronously (default) or asynchronously. + * @param { number } waitTime - Maximum wait time for a RPC call. The default value is TF_WAIT_TIME. * @syscap SystemCapability.Communication.IPC.Core * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 */ - constructor(syncFlags?: int, waitTime?: int); + constructor(syncFlags?: number, waitTime?: number); /** * A constructor used to create a MessageOption instance. @@ -2934,20 +2877,18 @@ declare namespace rpc { * @returns { boolean } Return {@code true} if the asynchronous call succeeds; * return {@code false} if the synchronous call succeeds. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ isAsync(): boolean; /** * Sets the SendRequest call flag, which can be synchronous or asynchronous. * - * @param { boolean } isAsync - Indicates the call flag, which can be synchronous or asynchronous. + * @param { boolean } async - Indicates the call flag, which can be synchronous or asynchronous. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - setAsync(isAsync: boolean): void; + setAsync(async: boolean): void; /** * Obtains the maximum wait time for this RPC call. @@ -3062,7 +3003,7 @@ declare namespace rpc { * @arkts 1.1&1.2 */ onRemoteMessageRequest( - code: int, + code: number, data: MessageSequence, reply: MessageSequence, options: MessageOption @@ -3134,7 +3075,7 @@ declare namespace rpc { * a promise will be fulfilled when the response to sendMessageRequest is returned, * and the reply message contains the returned information. * - * @param { int } code - Message code called by the request, which is determined by the client and server. + * @param { number } code - Message code called by the request, which is determined by the client and server. * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. * @param { MessageSequence } data - {@link MessageSequence} object holding the data to send. * @param { MessageSequence } reply - {@link MessageSequence} object that receives the response. @@ -3145,11 +3086,10 @@ declare namespace rpc { * 2.The parameter type does not match; * 3.Failed to obtain the passed object instance. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ sendMessageRequest( - code: int, + code: number, data: MessageSequence, reply: MessageSequence, options: MessageOption @@ -3188,7 +3128,7 @@ declare namespace rpc { * a callback will be invoked when the response to sendMessageRequest is returned, * and the reply message contains the returned information. * - * @param { int } code - Message code called by the request, which is determined by the client and server. + * @param { number } code - Message code called by the request, which is determined by the client and server. * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. * @param { MessageSequence } data - {@link MessageSequence} object holding the data to send. * @param { MessageSequence } reply - {@link MessageSequence} object that receives the response. @@ -3199,11 +3139,10 @@ declare namespace rpc { * 2.The parameter type does not match; * 3.Failed to obtain the passed object instance. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ sendMessageRequest( - code: int, + code: number, data: MessageSequence, reply: MessageSequence, options: MessageOption, @@ -3213,22 +3152,20 @@ declare namespace rpc { /** * Obtains the PID of the {@link RemoteProxy} object. * - * @returns { int } Return the PID of the {@link RemoteProxy} object. + * @returns { number } Return the PID of the {@link RemoteProxy} object. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 7 */ - getCallingPid(): int; + getCallingPid(): number; /** * Obtains the UID of the {@link RemoteProxy} object. * - * @returns { int } Return the UID of the {@link RemoteProxy} object. + * @returns { number } Return the UID of the {@link RemoteProxy} object. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 7 */ - getCallingUid(): int; + getCallingUid(): number; /** * Modifies the description of the current {@code RemoteObject}. @@ -3373,7 +3310,7 @@ declare namespace rpc { * Register a callback used to receive death notifications of a remote object. * * @param { DeathRecipient } recipient - Indicates the callback to be registered. - * @param { int } flags - Indicates the flag of the death notification. This is a reserved parameter. + * @param { number } flags - Indicates the flag of the death notification. This is a reserved parameter. * Set it to {@code 0}. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; @@ -3381,10 +3318,9 @@ declare namespace rpc { * 3.The callback used to receive remote object death notifications is empty. * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - registerDeathRecipient(recipient: DeathRecipient, flags: int): void; + registerDeathRecipient(recipient: DeathRecipient, flags: number): void; /** * Unregister a callback used to receive death notifications of a remote object. @@ -3405,7 +3341,7 @@ declare namespace rpc { * Unregister a callback used to receive death notifications of a remote object. * * @param { DeathRecipient } recipient - Indicates the callback to be unregister. - * @param { int } flags - Indicates the flag of the death notification. This is a reserved parameter. + * @param { number } flags - Indicates the flag of the death notification. This is a reserved parameter. * Set it to {@code 0}. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; @@ -3413,10 +3349,9 @@ declare namespace rpc { * 3.The callback used to receive remote object death notifications is empty. * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - unregisterDeathRecipient(recipient: DeathRecipient, flags: int): void; + unregisterDeathRecipient(recipient: DeathRecipient, flags: number): void; /** * Queries the interface descriptor of remote object. @@ -3489,7 +3424,7 @@ declare namespace rpc { * a promise will be fulfilled when the response to sendMessageRequest is returned, * and the reply message contains the returned information. * - * @param { int } code - Message code called by the request, which is determined by the client and server. + * @param { number } code - Message code called by the request, which is determined by the client and server. * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. * @param { MessageSequence } data - {@link MessageSequence} object holding the data to send. * @param { MessageSequence } reply - {@link MessageSequence} object that receives the response. @@ -3500,11 +3435,10 @@ declare namespace rpc { * 2.The parameter type does not match; * 3.Failed to obtain the passed object instance. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ sendMessageRequest( - code: int, + code: number, data: MessageSequence, reply: MessageSequence, options: MessageOption @@ -3543,7 +3477,7 @@ declare namespace rpc { * a callback will be invoked when the response to sendRequest is returned, * and the reply message contains the returned information. * - * @param { int } code - Message code called by the request, which is determined by the client and server. + * @param { number } code - Message code called by the request, which is determined by the client and server. * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. * @param { MessageSequence } data - {@link MessageSequence} object holding the data to send. * @param { MessageSequence } reply - {@link MessageSequence} object that receives the response. @@ -3554,11 +3488,10 @@ declare namespace rpc { * 2.The parameter type does not match; * 3.Failed to obtain the passed object instance. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ sendMessageRequest( - code: int, + code: number, data: MessageSequence, reply: MessageSequence, options: MessageOption, @@ -3570,8 +3503,7 @@ declare namespace rpc { * * @returns { boolean } Return {@code true} if the {@code RemoteObject} is dead; return {@code false} otherwise. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 7 */ isObjectDead(): boolean; } @@ -3585,8 +3517,7 @@ declare namespace rpc { * peer device IDs, and checking whether the API call is on the same device. * * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ class IPCSkeleton { /** @@ -3595,8 +3526,7 @@ declare namespace rpc { * * @returns { IRemoteObject } Return an {@link IRemoteObject} reference of the registered service. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 7 */ static getContextObject(): IRemoteObject; @@ -3608,13 +3538,11 @@ declare namespace rpc { * {@code 0} is returned; if this method is called from the {@link RemoteObject} object, * the PID of the corresponding {@link RemoteProxy} object is returned. * - * @returns { int } Return the PID of the proxy. - * @static + * @returns { number } Return the PID of the proxy. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 7 */ - static getCallingPid(): int; + static getCallingPid(): number; /** * Obtains the UID of a proxy. @@ -3624,25 +3552,21 @@ declare namespace rpc { * {@code 0} is returned; if this method is called from the {@link RemoteObject} object, * the UID of the corresponding {@link RemoteProxy} object is returned. * - * @returns { int } Return the UID of the proxy. - * @static + * @returns { number } Return the UID of the proxy. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 7 */ - static getCallingUid(): int; + static getCallingUid(): number; /** * Obtains the TOKENID. *

    This method is static. * - * @returns { long } Return the TOKENID. - * @static + * @returns { number } Return the TOKENID. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ - static getCallingTokenId(): long; + static getCallingTokenId(): number; /** * Obtains the ID of the device where the peer process resides. @@ -3751,8 +3675,7 @@ declare namespace rpc { * obtaining the Ashmem size, and setting Ashmem protection. * * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ class Ashmem { /** @@ -3816,19 +3739,17 @@ declare namespace rpc { * Creates an Ashmem object with the specified name and size. * * @param { string } name - Name of the Ashmem object to create. - * @param { int } size - Size (in bytes) of the Ashmem object to create. + * @param { number } size - Size (in bytes) of the Ashmem object to create. * @returns { Ashmem } Return the Ashmem object if it is created successfully; return null otherwise. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.The number of parameters is incorrect; * 2.The parameter type does not match; * 3.The Ashmem name passed is empty; * 4.The Ashmem size passed is less than or equal to 0. - * @static * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ - static create(name: string, size: int): Ashmem; + static create(name: string, size: number): Ashmem; /** * Creates an Ashmem object by copying the file descriptor (FD) of an existing Ashmem object. @@ -3854,8 +3775,7 @@ declare namespace rpc { * 2.The passed parameter is not an Ahmem object; * 3.The ashmem instance for obtaining packaging is empty. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ static create(ashmem: Ashmem): Ashmem; @@ -3878,12 +3798,11 @@ declare namespace rpc { /** * Obtains the mapped memory size of this Ashmem object. * - * @returns { int } Memory size mapped. + * @returns { number } Memory size mapped. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ - getAshmemSize(): int; + getAshmemSize(): number; /** * Creates the shared file mapping on the virtual address space of this process. @@ -3929,8 +3848,7 @@ declare namespace rpc { * * @throws { BusinessError } 1900001 - Failed to call mmap. * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ mapReadWriteAshmem(): void; diff --git a/api/@ohos.runningLock.d.ts b/api/@ohos.runningLock.d.ts index ff518c4dbc..a2f1725ae5 100644 --- a/api/@ohos.runningLock.d.ts +++ b/api/@ohos.runningLock.d.ts @@ -120,7 +120,7 @@ declare namespace runningLock { * {@link BACKGROUND} ensures that applications can run in the background. * {@link PROXIMITY_SCREEN_CONTROL} determines whether to turn on or off the screen based on the proximity sensor. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.PowerManager.PowerManager.Core * @since 7 */ @@ -142,7 +142,7 @@ declare namespace runningLock { * @syscap SystemCapability.PowerManager.PowerManager.Core * @since 7 */ - PROXIMITY_SCREEN_CONTROL = 2 + PROXIMITY_SCREEN_CONTROL } /** @@ -180,8 +180,7 @@ declare namespace runningLock { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Incorrect parameter types; * 2. Parameter verification failed. * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function isSupported(type: RunningLockType): boolean; diff --git a/api/@ohos.security.certManager.d.ts b/api/@ohos.security.certManager.d.ts index 82c3792df3..43121e90d2 100644 --- a/api/@ohos.security.certManager.d.ts +++ b/api/@ohos.security.certManager.d.ts @@ -1319,8 +1319,7 @@ declare namespace certificateManager { * @throws { BusinessError } 17500001 - Internal error. Possible causes: 1. IPC communication failed; *
    2. Memory operation error; 3. File operation error. * @syscap SystemCapability.Security.CertificateManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ /** * Get the certificate file store path. diff --git a/api/@ohos.sensor.d.ets b/api/@ohos.sensor.d.ets deleted file mode 100644 index b1f72f705e..0000000000 --- a/api/@ohos.sensor.d.ets +++ /dev/null @@ -1,2116 +0,0 @@ -/* - * Copyright (c) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @file - * @kit SensorServiceKit - */ - -import { AsyncCallback, Callback } from './@ohos.base'; - -/** - * This module provides the capability to subscribe to sensor data. - * @namespace sensor - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ -declare namespace sensor { - /** - * Enum for obtain the type of sensor. - * @enum { number } - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - enum SensorId { - /** - * Acceleration sensor. - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - ACCELEROMETER = 1, - - /** - * Gyroscope sensor. - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - GYROSCOPE = 2, - - /** - * Ambient light sensor. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - AMBIENT_LIGHT = 5, - - /** - * Magnetic field sensor. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - MAGNETIC_FIELD = 6, - - /** - * Barometric pressure sensor. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - BAROMETER = 8, - - /** - * Hall effect sensor. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - HALL = 10, - - /** - * Proximity sensor. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - PROXIMITY = 12, - - /** - * Humidity sensor. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - HUMIDITY = 13, - - /** - * Color sensor. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - COLOR = 14, - - /** - * Sar sensor. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - SAR = 15, - - /** - * Orientation sensor. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - /** - * Orientation sensor. - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - ORIENTATION = 256, - - /** - * Gravity sensor. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - GRAVITY = 257, - - /** - * Linear acceleration sensor. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - LINEAR_ACCELEROMETER = 258, - - /** - * Rotation vector sensor. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - ROTATION_VECTOR = 259, - - /** - * Ambient temperature sensor. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - AMBIENT_TEMPERATURE = 260, - - /** - * Uncalibrated magnetic field sensor. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - MAGNETIC_FIELD_UNCALIBRATED = 261, - - /** - * Uncalibrated gyroscope sensor. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - GYROSCOPE_UNCALIBRATED = 263, - - /** - * Significant motion sensor. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - SIGNIFICANT_MOTION = 264, - - /** - * Pedometer detection sensor. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - PEDOMETER_DETECTION = 265, - - /** - * Pedometer sensor. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - PEDOMETER = 266, - - /** - * Heart rate sensor. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - HEART_RATE = 278, - - /** - * Wear detection sensor. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - WEAR_DETECTION = 280, - - /** - * Uncalibrated acceleration sensor. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - ACCELEROMETER_UNCALIBRATED = 281 - } - - /** - * Subscribe to orientation sensor data. - * @param { 'orientationChange' } type - Indicate the sensor type to listen for, {@code SensorId.ORIENTATION}. - * @param { Callback } callback - callback orientation data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - function on(type: 'orientationChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to color sensor data. - * @param { 'colorChange' } type - Indicate the sensor type to listen for, {@code SensorId.COLOR}. - * @param { Callback } callback - callback color data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function on(type: 'colorChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to SAR sensor data. - * @param { 'sarChange' } type - Indicate the sensor type to listen for, {@code SensorId.SAR}. - * @param { Callback } callback - callback sar data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function on(type: 'sarChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to accelerometer sensor data. - * @permission ohos.permission.ACCELEROMETER - * @param { 'accelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.ACCELEROMETER}. - * @param { Callback } callback - callback accelerometer data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - function on(type: 'accelerometerChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to uncalibrated accelerometer sensor data. - * @permission ohos.permission.ACCELEROMETER - * @param { 'accelerometerUncalibratedChange' } type - Indicate the sensor type to listen for,{@code SensorId.ACCELEROMETER_UNCALIBRATED}. - * @param { Callback } callback - callback uncalibrated accelerometer data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function on(type: 'accelerometerUncalibratedChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to ambient light sensor data. - * @param { 'ambientLightChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_LIGHT}. - * @param { Callback } callback - callback ambient light data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function on(type: 'ambientLightChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to ambient temperature sensor data. - * @param { 'ambientTemperatureChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_TEMPERATURE}. - * @param { Callback } callback - callback ambient temperature data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function on(type: 'ambientTemperatureChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to barometer sensor data. - * @param { 'barometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.BAROMETER}. - * @param { Callback } callback - callback barometer data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function on(type: 'barometerChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to gravity sensor data. - * @param { 'gravityChange' } type - Indicate the sensor type to listen for, {@code SensorId.GRAVITY}. - * @param { Callback } callback - callback gravity data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function on(type: 'gravityChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to gyroscope sensor data. - * @permission ohos.permission.GYROSCOPE - * @param { 'gyroscopeChange' } type - Indicate the sensor type to listen for, {@code SensorId.GYROSCOPE}. - * @param { Callback } callback - callback gyroscope data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - function on(type: 'gyroscopeChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to uncalibrated gyroscope sensor data. - * @permission ohos.permission.GYROSCOPE - * @param { 'gyroscopeUncalibratedChange' } type - Indicate the sensor type to listen for, {@code SensorId.GYROSCOPE_UNCALIBRATED}. - * @param { Callback } callback - callback uncalibrated gyroscope data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function on(type: 'gyroscopeUncalibratedChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to hall sensor data. - * @param { 'hallChange' } type - Indicate the sensor type to listen for, {@code SensorId.HALL}. - * @param { Callback } callback - callback hall data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function on(type: 'hallChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to heart rate sensor data. - * @permission ohos.permission.READ_HEALTH_DATA - * @param { 'heartRateChange' } type - Indicate the sensor type to listen for, {@code SensorId.HEART_RATE}. - * @param { Callback } callback - callback heart rate data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function on(type: 'heartRateChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to humidity sensor data. - * @param { 'humidityChange' } type - Indicate the sensor type to listen for, {@code SensorId.HUMIDITY}. - * @param { Callback } callback - callback humidity data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function on(type: 'humidityChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to linear acceleration sensor data. - * @permission ohos.permission.ACCELEROMETER - * @param { 'linearAccelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.LINEAR_ACCELEROMETER}. - * @param { Callback } callback - callback linear accelerometer data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function on(type: 'linearAccelerometerChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to magnetic field sensor data. - * @param { 'magneticFieldChange' } type - Indicate the sensor type to listen for, {@code SensorId.MAGNETIC_FIELD}. - * @param { Callback } callback - callback magnetic field data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function on(type: 'magneticFieldChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to uncalibrated magnetic field sensor data. - * @param { 'magneticFieldUncalibratedChange' } type - Indicate the sensor type to listen for, - * {@code SensorId.MAGNETIC_FIELD_UNCALIBRATED}. - * @param { Callback } callback - callback uncalibrated magnetic field data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function on(type: 'magneticFieldUncalibratedChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to pedometer sensor data. - * @permission ohos.permission.ACTIVITY_MOTION - * @param { 'pedometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER}. - * @param { Callback } callback - callback pedometer data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function on(type: 'pedometerChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to pedometer detection sensor data. - * @permission ohos.permission.ACTIVITY_MOTION - * @param { 'pedometerDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER_DETECTION}. - * @param { Callback } callback - callback pedometer detection data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function on(type: 'pedometerDetectionChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to proximity sensor data. - * @param { 'proximityChange' } type - Indicate the sensor type to listen for, {@code SensorId.PROXIMITY}. - * @param { Callback } callback - callback proximity data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function on(type: 'proximityChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to rotation vector sensor data. - * @param { 'rotationVectorChange' } type - Indicate the sensor type to listen for, {@code SensorId.ROTATION_VECTOR}. - * @param { Callback } callback - callback rotation vector data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function on(type: 'rotationVectorChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to significant motion sensor data. - * @param { 'significantMotionChange' } type - Indicate the sensor type to listen for, {@code SensorId.SIGNIFICANT_MOTION}. - * @param { Callback } callback - callback significant motion data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function on(type: 'significantMotionChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to wear detection sensor data. - * @param { 'wearDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.WEAR_DETECTION}. - * @param { Callback } callback - callback wear detection data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function on(type: 'wearDetectionChange', callback: Callback, options?: Options): void; - - /** - * Subscribe to orientation sensor data once. - * @param { 'orientationChange' } type - Indicate the sensor type to listen for, {@code SensorId.ORIENTATION}. - * @param { Callback } callback - callback orientation data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function once(type: 'orientationChange', callback: Callback): void; - - /** - * Subscribe to accelerometer sensor data once. - * @permission ohos.permission.ACCELEROMETER - * @param { 'accelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.ACCELEROMETER}. - * @param { Callback } callback - callback accelerometer data. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function once(type: 'accelerometerChange', callback: Callback): void; - - /** - * Subscribe to uncalibrated accelerometer sensor data once. - * @permission ohos.permission.ACCELEROMETER - * @param { 'accelerometerUncalibratedChange' } type - Indicate the sensor type to listen for,{@code SensorId.ACCELEROMETER_UNCALIBRATED}. - * @param { Callback } callback - callback uncalibrated accelerometer data. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function once(type: 'accelerometerUncalibratedChange', callback: Callback): void; - - /** - * Subscribe to ambient light sensor data once. - * @param { 'ambientLightChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_LIGHT}. - * @param { Callback } callback - callback ambient light data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function once(type: 'ambientLightChange', callback: Callback): void; - - /** - * Subscribe to ambient temperature sensor data once. - * @param { 'ambientTemperatureChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_TEMPERATURE}. - * @param { Callback } callback - callback ambient temperature data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function once(type: 'ambientTemperatureChange', callback: Callback): void; - - /** - * Subscribe to barometer sensor data once. - * @param { 'barometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.BAROMETER}. - * @param { Callback } callback - callback barometer data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function once(type: 'barometerChange', callback: Callback): void; - - /** - * Subscribe to gravity sensor data once. - * @param { 'gravityChange' } type - Indicate the sensor type to listen for, {@code SensorId.GRAVITY}. - * @param { Callback } callback - callback gravity data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function once(type: 'gravityChange', callback: Callback): void; - - /** - * Subscribe to gyroscope sensor data once. - * @permission ohos.permission.GYROSCOPE - * @param { 'gyroscopeChange' } type - Indicate the sensor type to listen for, {@code SensorId.GYROSCOPE}. - * @param { Callback } callback - callback gyroscope data. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function once(type: 'gyroscopeChange', callback: Callback): void; - - /** - * Subscribe to uncalibrated gyroscope sensor data once. - * @permission ohos.permission.GYROSCOPE - * @param { 'gyroscopeUncalibratedChange' } type - Indicate the sensor type to listen for,{@code SensorId.GYROSCOPE_UNCALIBRATED}. - * @param { Callback } callback - callback uncalibrated gyroscope data. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function once(type: 'gyroscopeUncalibratedChange', callback: Callback): void; - - /** - * Subscribe to hall sensor data once. - * @param { 'hallChange' } type - Indicate the sensor type to listen for, {@code SensorId.HALL}. - * @param { Callback } callback - callback hall data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function once(type: 'hallChange', callback: Callback): void; - - /** - * Subscribe to heart rate sensor data once. - * @permission ohos.permission.READ_HEALTH_DATA - * @param { 'heartRateChange' } type - Indicate the sensor type to listen for, {@code SensorId.HEART_RATE}. - * @param { Callback } callback - callback heart rate data. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function once(type: 'heartRateChange', callback: Callback): void; - - /** - * Subscribe to humidity sensor data once. - * @param { 'humidityChange' } type - Indicate the sensor type to listen for, {@code SensorId.HUMIDITY}. - * @param { Callback } callback - callback humidity data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function once(type: 'humidityChange', callback: Callback): void; - - /** - * Subscribe to linear acceleration sensor data once. - * @permission ohos.permission.ACCELEROMETER - * @param { 'linearAccelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.LINEAR_ACCELEROMETER}. - * @param { Callback } callback - callback linear accelerometer data. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function once(type: 'linearAccelerometerChange', callback: Callback): void; - - /** - * Subscribe to magnetic field sensor data once. - * @param { 'magneticFieldChange' } type - Indicate the sensor type to listen for, {@code SensorId.MAGNETIC_FIELD}. - * @param { Callback } callback - callback magnetic field data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function once(type: 'magneticFieldChange', callback: Callback): void; - - /** - * Subscribe to uncalibrated magnetic field sensor data once. - * @param { 'magneticFieldUncalibratedChange' } type - Indicate the sensor type to listen for, - * {@code SensorId.MAGNETIC_FIELD_UNCALIBRATED}. - * @param { Callback } callback - callback uncalibrated magnetic field data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function once(type: 'magneticFieldUncalibratedChange', callback: Callback): void; - - /** - * Subscribe to pedometer sensor data once. - * @permission ohos.permission.ACTIVITY_MOTION - * @param { 'pedometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER}. - * @param { Callback } callback - callback pedometer data. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function once(type: 'pedometerChange', callback: Callback): void; - - /** - * Subscribe to pedometer detection sensor data once. - * @permission ohos.permission.ACTIVITY_MOTION - * @param { 'pedometerDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER_DETECTION}. - * @param { Callback } callback - callback pedometer detection data. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function once(type: 'pedometerDetectionChange', callback: Callback): void; - - /** - * Subscribe to proximity sensor data once. - * @param { 'proximityChange' } type - Indicate the sensor type to listen for, {@code SensorId.PROXIMITY}. - * @param { Callback } callback - callback proximity data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function once(type: 'proximityChange', callback: Callback): void; - - /** - * Subscribe to rotation vector sensor data once. - * @param { 'rotationVectorChange' } type - Indicate the sensor type to listen for, {@code SensorId.ROTATION_VECTOR}. - * @param { Callback } callback - callback rotation vector data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function once(type: 'rotationVectorChange', callback: Callback): void; - - /** - * Subscribe to significant motion sensor data once. - * @param { 'significantMotionChange' } type - Indicate the sensor type to listen for, {@code SensorId.SIGNIFICANT_MOTION}. - * @param { Callback } callback - callback significant motion data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function once(type: 'significantMotionChange', callback: Callback): void; - - /** - * Subscribe to wear detection sensor data once. - * @param { 'wearDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.WEAR_DETECTION}. - * @param { Callback } callback - callback wear detection data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function once(type: 'wearDetectionChange', callback: Callback): void; - - /** - * Unsubscribe to orientation sensor data. - * @param { 'orientationChange' } type - Indicate the sensor type to listen for, {@code SensorId.ORIENTATION}. - * @param { Callback } callback - callback orientation data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - function off(type: 'orientationChange', callback?: Callback): void; - - /** - * Unsubscribe to color sensor data. - * @param { 'colorChange' } type - Indicate the sensor type to listen for, {@code SensorId.COLOR}. - * @param { Callback } callback - callback color data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function off(type: 'colorChange', callback?: Callback): void; - - /** - * Unsubscribe to sar sensor data. - * @param { 'sarChange' } type - Indicate the sensor type to listen for, {@code SensorId.SAR}. - * @param { Callback } callback - callback sar data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function off(type: 'sarChange', callback?: Callback): void; - - /** - * Unsubscribe to accelerometer sensor data. - * @permission ohos.permission.ACCELEROMETER - * @param { 'accelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.ACCELEROMETER}. - * @param { Callback } callback - callback accelerometer data. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - function off(type: 'accelerometerChange', callback?: Callback): void; - - /** - * Unsubscribe to uncalibrated accelerometer sensor data. - * @permission ohos.permission.ACCELEROMETER - * @param { 'accelerometerUncalibratedChange' } type - Indicate the sensor type to listen for, - * {@code SensorId.ACCELEROMETER_UNCALIBRATED}. - * @param { Callback } callback - callback uncalibrated accelerometer data. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function off(type: 'accelerometerUncalibratedChange', callback?: Callback): void; - - /** - * Unsubscribe to ambient light sensor data. - * @param { 'ambientLightChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_LIGHT}. - * @param { Callback } callback - callback ambient light data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function off(type: 'ambientLightChange', callback?: Callback): void; - - /** - * Unsubscribe to ambient temperature sensor data. - * @param { 'ambientTemperatureChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_TEMPERATURE}. - * @param { Callback } callback - callback ambient temperature data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function off(type: 'ambientTemperatureChange', callback?: Callback): void; - - /** - * Unsubscribe to barometer sensor data. - * @param { 'barometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.BAROMETER}. - * @param { Callback } callback - callback barometer data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function off(type: 'barometerChange', callback?: Callback): void; - - /** - * Unsubscribe to gravity sensor data. - * @param { 'gravityChange' } type - Indicate the sensor type to listen for, {@code SensorId.GRAVITY}. - * @param { Callback } callback - callback gravity data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function off(type: 'gravityChange', callback?: Callback): void; - - /** - * Unsubscribe to gyroscope sensor data. - * @permission ohos.permission.GYROSCOPE - * @param { 'gyroscopeChange' } type - Indicate the sensor type to listen for, {@code SensorId.GYROSCOPE}. - * @param { Callback } callback - callback gyroscope data. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - function off(type: 'gyroscopeChange', callback?: Callback): void; - - /** - * Unsubscribe to uncalibrated gyroscope sensor data. - * @permission ohos.permission.GYROSCOPE - * @param { 'gyroscopeUncalibratedChange' } type - Indicate the sensor type to listen for, {@code SensorId.GYROSCOPE_UNCALIBRATED}. - * @param { Callback } callback - callback uncalibrated gyroscope data. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function off(type: 'gyroscopeUncalibratedChange', callback?: Callback): void; - - /** - * Unsubscribe to hall sensor data. - * @param { 'hallChange' } type - Indicate the sensor type to listen for, {@code SensorId.HALL}. - * @param { Callback } callback - callback hall data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function off(type: 'hallChange', callback?: Callback): void; - - /** - * Unsubscribe to heart rate sensor data. - * @permission ohos.permission.READ_HEALTH_DATA - * @param { 'heartRateChange' } type - Indicate the sensor type to listen for, {@code SensorId.HEART_RATE}. - * @param { Callback } callback - callback heart rate data. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function off(type: 'heartRateChange', callback?: Callback): void; - - /** - * Unsubscribe to humidity sensor data. - * @param { 'humidityChange' } type - Indicate the sensor type to listen for, {@code SensorId.HUMIDITY}. - * @param { Callback } callback - callback humidity data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function off(type: 'humidityChange', callback?: Callback): void; - - /** - * Unsubscribe to linear acceleration sensor data. - * @permission ohos.permission.ACCELEROMETER - * @param { 'linearAccelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.LINEAR_ACCELEROMETER}. - * @param { Callback } callback - callback linear accelerometer data. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function off(type: 'linearAccelerometerChange', callback?: Callback): void; - - /** - * Unsubscribe to magnetic field sensor data. - * @param { 'magneticFieldChange' } type - Indicate the sensor type to listen for, {@code SensorId.MAGNETIC_FIELD}. - * @param { Callback } callback - callback magnetic field data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function off(type: 'magneticFieldChange', callback?: Callback): void; - - /** - * Unsubscribe to uncalibrated magnetic field sensor data. - * @param { 'magneticFieldUncalibratedChange' } type - Indicate the sensor type to listen for, - * {@code SensorId.MAGNETIC_FIELD_UNCALIBRATED}. - * @param { Callback } callback - callback uncalibrated magnetic field data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function off(type: 'magneticFieldUncalibratedChange', callback?: Callback): void; - - /** - * Unsubscribe to pedometer sensor data. - * @permission ohos.permission.ACTIVITY_MOTION - * @param { 'pedometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER}. - * @param { Callback } callback - callback pedometer data. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function off(type: 'pedometerChange', callback?: Callback): void; - - /** - * Unsubscribe to pedometer detection sensor data. - * @permission ohos.permission.ACTIVITY_MOTION - * @param { 'pedometerDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER_DETECTION}. - * @param { Callback } callback - callback pedometer detection data. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function off(type: 'pedometerDetectionChange', callback?: Callback): void; - - /** - * Unsubscribe to proximity sensor data. - * @param { 'proximityChange' } type - Indicate the sensor type to listen for, {@code SensorId.PROXIMITY}. - * @param { Callback } callback - callback proximity data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function off(type: 'proximityChange', callback?: Callback): void; - - /** - * Unsubscribe to rotation vector sensor data. - * @param { 'rotationVectorChange' } type - Indicate the sensor type to listen for, {@code SensorId.ROTATION_VECTOR}. - * @param { Callback } callback - callback rotation vector data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function off(type: 'rotationVectorChange', callback?: Callback): void; - - /** - * Unsubscribe to significant motion sensor data. - * @param { 'significantMotionChange' } type - Indicate the sensor type to listen for, {@code SensorId.SIGNIFICANT_MOTION}. - * @param { Callback } callback - callback significant motion data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function off(type: 'significantMotionChange', callback?: Callback): void; - - /** - * Unsubscribe to wear detection sensor data. - * @param { 'wearDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.WEAR_DETECTION}. - * @param { Callback } callback - callback wear detection data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function off(type: 'wearDetectionChange', callback?: Callback): void; - - /** - * Subscribe to the sensor's optional parameters. - * @typedef Options - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - interface Options { - /** - * Sensor event reporting event interval. - * @type { ?(number | SensorFrequency) } - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - interval?: long | SensorFrequency; - } - - /** - * The sensor reporting frequency is divided into three modes. - * @typedef {'game' | 'ui' | 'normal'} - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - type SensorFrequency = 'game' | 'ui' | 'normal'; - - /** - * Enumerates the accuracy levels of data reported by a sensor. - * @enum { int } - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - enum SensorAccuracy { - /** - * The sensor data is unreliable. It is possible that the sensor does not contact with the device to measure. - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - ACCURACY_UNRELIABLE = 0, - - /** - * The sensor data is at a low accuracy level. The data must be calibrated based on the environment before being used. - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - ACCURACY_LOW = 1, - - /** - * The sensor data is at a medium accuracy level. You are advised to calibrate the data based on the environment - *
    before using it. - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - ACCURACY_MEDIUM = 2, - - /** - * The sensor data is at a high accuracy level. The data can be used directly. - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - ACCURACY_HIGH = 3 - } - - /** - * The basic data structure of the sensor event. - * @typedef Response - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - interface Response { - /** - * The timestamp of the reported sensor data. - * @type { long } - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - timestamp: long; - - /** - * The accuracy levels of data reported by a sensor. - * @type { SensorAccuracy } - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - accuracy: SensorAccuracy; - } - - /** - * Orientation sensor event data. - * @typedef OrientationResponse - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - interface OrientationResponse extends Response { - /** - * The device rotates at an angle around the Z axis. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - alpha: float; - - /** - * The device rotates at an angle around the X axis. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - beta: float; - - /** - * The device rotates at an angle around the Y axis. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - gamma: float; - } - - /** - * Indicates sensor information. - * @typedef Sensor - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface Sensor { - /** - * Sensor name. - * @type { string } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - sensorName:string; - - /** - * Sensor vendor. - * @type { string } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - vendorName:string; - - /** - * Sensor firmware version. - * @type { string } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - firmwareVersion:string; - - /** - * Sensor hardware version. - * @type { string } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - hardwareVersion:string; - - /** - * Sensor type ID, {@code SensorType}. - * @type { int } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - sensorId:int; - - /** - * Maximum measurement range of the sensor. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - maxRange:float; - - /** - * Minimum sample period allowed, in ns. - * @type { long } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - minSamplePeriod:long; - - /** - * Maximum sample period allowed, in ns. - * @type { long } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - maxSamplePeriod:long; - - /** - * Sensor accuracy. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - precision:float; - - /** - * Sensor power. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - power:float; - } - - /** - * Obtains all sensor information on the device. - * @param { AsyncCallback> } callback - callback sensor list. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function getSensorList(callback: AsyncCallback>): void; - - /** - * Obtains all sensor information on the device. - * @returns { Promise> } Promise used to return the result. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function getSensorList(): Promise>; - - /** - * Indicates geomagnetic field data. - * @typedef GeomagneticResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface GeomagneticResponse { - /** - * Geomagnetic x-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - x: float; - - /** - * Geomagnetic y-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - y: float; - - /** - * Geomagnetic z-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - z: float; - - /** - * The Angle between the earth's magnetic field lines and the horizontal plane. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - geomagneticDip: float; - - /** - * The Angle of magnetic north and true north on a horizontal plane. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - deflectionAngle: float; - - /** - * The horizontal strength of the geomagnetic field. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - levelIntensity: float; - - /** - * The total strength of the geomagnetic field. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - totalIntensity: float; - } - - /** - * Convert rotation vector to rotation matrix. - * @param { Array } rotationVector - rotationVector Indicates the rotation vector. - * @param { AsyncCallback> } callback - callback rotation matrix. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function getRotationMatrix(rotationVector: Array, callback: AsyncCallback>): void; - - /** - * Convert rotation vector to rotation matrix. - * @param { Array } rotationVector - rotationVector Indicates the rotation vector. - * @returns { Promise> } Promise used to return the result. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function getRotationMatrix(rotationVector: Array): Promise>; - - /** - * Indicates the axis of the new coordinate system that coincides with the XY axis of the original coordinate system. - * @typedef CoordinatesOptions - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface CoordinatesOptions { - /** Indicates the axis of the new coordinate system that coincides with the X axis of the original coordinate system. - * @type { int } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - x: int; - - /** Indicates the axis of the new coordinate system that coincides with the Y axis of the original coordinate system. - * @type { int } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - y: int; - } - - /** - * Computes the device's orientation based on the rotation matrix. - * @param { Array } rotationMatrix - rotationMatrix Indicates the rotation matrix. - * @param { AsyncCallback> } callback - callback the angle of rotation around the z, x, y axis. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function getOrientation(rotationMatrix: Array, callback: AsyncCallback>): void; - - /** - * Computes the device's orientation based on the rotation matrix. - * @param { Array } rotationMatrix - rotationMatrix Indicates the rotation matrix. - * @returns { Promise> } Promise used to return the result. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function getOrientation(rotationMatrix: Array): Promise>; - - /** - * Indicates the response of rotation matrix. - * @typedef RotationMatrixResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface RotationMatrixResponse { - /** - * rotation matrix. - * @type { Array } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - rotation: Array; - - /** - * inclination matrix. - * @type { Array } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - inclination: Array - } - - /** - * Calculate rotation matrix based on gravity vector and geomagnetic vector. - * @param { Array } gravity - gravity Indicates the gravity vector. - * @param { Array } geomagnetic - geomagnetic Indicates the geomagnetic vector. - * @param { AsyncCallback } callback - callback rotation matrix and inclination matrix. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function getRotationMatrix(gravity: Array, geomagnetic: Array, callback: AsyncCallback): void; - - /** - * Calculate rotation matrix based on gravity vector and geomagnetic vector. - * @param { Array } gravity - gravity Indicates the gravity vector. - * @param { Array } geomagnetic - geomagnetic Indicates the geomagnetic vector. - * @returns { Promise } Promise used to return the result. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - function getRotationMatrix(gravity: Array, geomagnetic: Array): Promise; - - /** - * Acceleration sensor event data. - * @typedef AccelerometerResponse - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - interface AccelerometerResponse extends Response { - /** - * Acceleration x-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - x: float; - - /** - * Acceleration y-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - y: float; - - /** - * Acceleration z-axis component - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - z: float; - } - - /** - * Linear acceleration sensor event data. - * @typedef LinearAccelerometerResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface LinearAccelerometerResponse extends Response { - /** - * Linear acceleration x-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - x: float; - - /** - * Linear acceleration y-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - y: float; - - /** - * Linear acceleration z-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - z: float; - } - - /** - * Acceleration uncalibrated sensor event data. - * @typedef AccelerometerUncalibratedResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface AccelerometerUncalibratedResponse extends Response { - /** - * Acceleration uncalibrated x-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - x: float; - - /** - * Acceleration uncalibrated y-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - y: float; - - /** - * Acceleration uncalibrated z-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - z: float; - - /** - * Acceleration uncalibrated x-axis offset. - * - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - biasX: float; - - /** - * Acceleration uncalibrated y-axis offset. - * - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - biasY: float; - - /** - * Acceleration uncalibrated z-axis offset. - * - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - biasZ: float; - } - - /** - * Gravity sensor event data. - * @typedef GravityResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface GravityResponse extends Response { - /** - * Gravity x-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - x: float; - - /** - * Gravity y-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - y: float; - - /** - * Gravity z-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - z: float; - } - - /** - * Rotation vector sensor event data. - * @typedef RotationVectorResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface RotationVectorResponse extends Response { - /** - * Rotation vector x-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - x: float; - - /** - * Rotation vector y-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - y: float; - - /** - * Rotation vector z-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - z: float; - - /** - * Scalar quantity. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - w: float; - } - - /** - * Gyroscope sensor event data. - * @typedef GyroscopeResponse - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - interface GyroscopeResponse extends Response { - /** - * Gyroscope x-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - x: float; - - /** - * Gyroscope y-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - y: float; - - /** - * Gyroscope z-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ - z: float; - } - - /** - * Gyroscope uncalibrated sensor event data. - * @typedef GyroscopeUncalibratedResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface GyroscopeUncalibratedResponse extends Response { - /** - * Gyroscope uncalibrated x-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - x: float; - - /** - * Gyroscope uncalibrated y-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - y: float; - - /** - * Gyroscope uncalibrated z-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - z: float; - - /** - * Gyroscope uncalibrated x-axis offset. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - biasX: float; - - /** - * Gyroscope uncalibrated y-axis offset. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - biasY: float; - - /** - * Gyroscope uncalibrated z-axis offset. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - biasZ: float; - } - - /** - * Significant motion sensor event data. - * @typedef SignificantMotionResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface SignificantMotionResponse extends Response { - /** - * The degree of significant motion. - * Whether the device has a significant motion. - * The value 1 means that the device has a significant motion, and 0 means the opposite. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - scalar: float; - } - - /** - * Proximity sensor event data. - * @typedef ProximityResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface ProximityResponse extends Response { - /** - * Indicates the degree of proximity, event 0 indicates proximity, and greater than 0 indicates distance. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - distance: float; - } - - /** - * Light sensor event data. - * @typedef LightResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface LightResponse extends Response { - /** - * Indicates light intensity, in lux. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - intensity: float; - - /** - * Indicates color temperature, in kelvin. - * @type { ?float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - colorTemperature?: float; - - /** - * Indicates infrared luminance, in cd/m2. - * @type { ?float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - infraredLuminance?: float; - } - - /** - * Hall sensor event data. - * @typedef HallResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface HallResponse extends Response { - /** - * Indicates hall status, 0 indicates open, and greater than 0 indicates suction. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - status: float; - } - - /** - * Magnetic field sensor event data. - * @typedef MagneticFieldResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface MagneticFieldResponse extends Response { - /** - * Magnetic field x-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - x: float; - - /** - * Magnetic field y-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - y: float; - - /** - * Magnetic field z-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - z: float; - } - - /** - * Magnetic field uncalibrated sensor event data. - * @typedef MagneticFieldUncalibratedResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface MagneticFieldUncalibratedResponse extends Response { - /** - * Magnetic field uncalibrated x-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - x: float; - - /** - * Magnetic field uncalibrated y-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - y: float; - - /** - * Magnetic field uncalibrated z-axis component. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - z: float; - - /** - * Magnetic field uncalibrated x-axis offset. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - biasX: float; - - /** - * Magnetic field uncalibrated y-axis offset. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - biasY: float; - - /** - * Magnetic field uncalibrated z-axis offset. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - biasZ: float; - } - - /** - * Pedometer sensor event data. - * @typedef PedometerResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface PedometerResponse extends Response { - /** - * Indicates the number of steps. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - steps: float; - } - - /** - * Humidity sensor event data. - * @typedef HumidityResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface HumidityResponse extends Response { - /** - * Indicates the number of humidity. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - humidity: float; - } - - /** - * Pedometer detection sensor event data. - * @typedef PedometerDetectionResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface PedometerDetectionResponse extends Response { - /** - * Indicates the pedometer detection status, 1 indicates that a walking action has occurred, - * and 0 indicates that no movement has occurred. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - scalar: float; - } - - /** - * Ambient temperature sensor event data. - * @typedef AmbientTemperatureResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface AmbientTemperatureResponse extends Response { - /** - * Indicates ambient temperature, in celsius. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - temperature: float; - } - - /** - * Barometer sensor event data. - * @typedef BarometerResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface BarometerResponse extends Response { - /** - * Indicates the number of barometer, in hpa. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - pressure: float; - } - - /** - * Heart rate sensor event data. - * @typedef HeartRateResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface HeartRateResponse extends Response { - /** - * Indicates the number of heart rate. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - heartRate: float; - } - - /** - * Wear detection sensor event data. - * @typedef WearDetectionResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface WearDetectionResponse extends Response { - /** - * Indicates the status of wear detection, 1 for wearing, 0 for wearing not. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - value: float; - } - - /** - * Color sensor event data. - * @typedef ColorResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface ColorResponse extends Response { - /** - * Indicates the intensity of light, in lux. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - lightIntensity: float; - /** - * Indicates the color temperature, in kelvin. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - colorTemperature: float; - } - - /** - * Sar sensor event data. - * @typedef SarResponse - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - interface SarResponse extends Response { - /** - * Indicates the specific absorption rate, in W/kg. - * @type { float } - * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ - absorptionRatio: float; - } -} - -export default sensor; \ No newline at end of file diff --git a/api/@ohos.thermal.d.ts b/api/@ohos.thermal.d.ts index bc90f7a1b7..28c9b0938c 100644 --- a/api/@ohos.thermal.d.ts +++ b/api/@ohos.thermal.d.ts @@ -34,7 +34,7 @@ declare namespace thermal { /** * Enumerates the {@link ThermalLevel} types. * - * @enum {int} + * @enum {number} * @syscap SystemCapability.PowerManager.ThermalManager * @since 8 */ diff --git a/api/@ohos.usbManager.d.ts b/api/@ohos.usbManager.d.ts index 27ab083de7..ab4f915f81 100644 --- a/api/@ohos.usbManager.d.ts +++ b/api/@ohos.usbManager.d.ts @@ -1,2521 +1,2396 @@ -/* - * Copyright (c) 2023-2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @file - * @kit BasicServicesKit - */ - -import { AsyncCallback } from './@ohos.base'; - -/** - * This module provides the capability of manage USB device. - * - * @namespace usbManager - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ -declare namespace usbManager { - /** - * Obtains the USB device list. - * - * @returns { Array> } USB device list. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Obtains the USB device list. - * - * @returns { Array> } USB device list. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - function getDevices(): Array>; - - /** - * Connects to the USB device based on the device information returned by getDevices(). - * - * @param { USBDevice } device - USB device on the device list returned by getDevices(). It cannot be empty. - * @returns { Readonly } object for data transfer. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Connects to the USB device based on the device information returned by getDevices(). - * - * @param { USBDevice } device - USB device on the device list returned by getDevices(). It cannot be empty. - * @returns { Readonly } object for data transfer. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function connectDevice(device: USBDevice): Readonly; - - /** - * Checks whether the application has the permission to access the device. - * - * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. - * @returns { boolean } indicates if the user has the permission to access the device. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Checks whether the application has the permission to access the device. - * - * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. - * @returns { boolean } indicates if the user has the permission to access the device. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function hasRight(deviceName: string): boolean; - - /** - * Requests the permission for a given application to access the USB device. - * The system application has access to the device by default, and there is no need to call this interface to apply. - * - * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. - * @returns { Promise } indicates if the device access permissions are granted. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Requests the permission for a given application to access the USB device. - * The system application has access to the device by default, and there is no need to call this interface to apply. - * - * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. - * @returns { Promise } indicates if the device access permissions are granted. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function requestRight(deviceName: string): Promise; - - /** - * Remove the permission for a given application to access the USB device. - * The system application has access to the device by default, and calling this interface will not have any impact. - * - * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. - * @returns { boolean } indicates if the device access permissions are removed. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Remove the permission for a given application to access the USB device. - * The system application has access to the device by default, and calling this interface will not have any impact. - * - * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. - * @returns { boolean } indicates if the device access permissions are removed. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function removeRight(deviceName: string): boolean; - - /** - * Add device access permission. - * The system application has access to the device by default, and calling this interface will not have any impact. - * - * @param { string } bundleName - refers to application that require access permissions. It cannot be empty. - * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. - * @returns { boolean } value to indicate whether the permission is granted. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - * @deprecated since 12 - * @useinstead ohos.usbManager/usbManager#addDeviceAccessRight - */ - function addRight(bundleName: string, deviceName: string): boolean; - - /** - * Converts the string descriptor of a given USB function list to a numeric mask combination. - * - * @param { string } funcs - descriptor of the supported function list. It cannot be empty. - * @returns { number } the numeric mask combination of the function list. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - * @deprecated since 12 - * @useinstead ohos.usbManager/usbManager#getFunctionsFromString - */ - function usbFunctionsFromString(funcs: string): number; - - /** - * Converts the numeric mask combination of a given USB function list to a string descriptor. - * - * @param { FunctionType } funcs - numeric mask combination of the function list. The type of funcs must be number. It cannot be empty. - * @returns { string } - descriptor of the supported function list. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - * @deprecated since 12 - * @useinstead ohos.usbManager/usbManager#getStringFromFunctions - */ - function usbFunctionsToString(funcs: FunctionType): string; - - /** - * Sets the current USB function list in Device mode. - * - * @param { FunctionType } funcs - numeric mask combination of the supported function list. It cannot be empty. - * @returns { Promise } the promise returned by the function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 14400002 - Permission denied. The HDC is disabled by the system. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - * @deprecated since 12 - * @useinstead ohos.usbManager/usbManager#setDeviceFunctions - */ - function setCurrentFunctions(funcs: FunctionType): Promise; - - /** - * Obtains the numeric mask combination for the current USB function list in Device mode. - * - * @returns { FunctionType } the numeric mask combination for the current USB function list in FunctionType. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - * @deprecated since 12 - * @useinstead ohos.usbManager/usbManager#getDeviceFunctions - */ - function getCurrentFunctions(): FunctionType; - /* usb port functions begin */ - /** - * Obtains the USBPort list. - * - * @returns { Array } the USBPort list. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - * @deprecated since 12 - * @useinstead ohos.usbManager/usbManager#getPortList - */ - function getPorts(): Array; - - /** - * Gets the mask combination for the supported mode list of the specified USBPort. - * - * @param { number } portId - unique ID of the port. It cannot be empty. - * @returns { PortModeType } the mask combination for the supported mode list in PortModeType. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - * @deprecated since 12 - * @useinstead ohos.usbManager/usbManager#getPortSupportModes - */ - function getSupportedModes(portId: number): PortModeType; - - /** - * Sets the role types supported by the specified USBPort, which can be powerRole (for charging) and dataRole (for data transfer). - * - * @param { number } portId - unique ID of the port. It cannot be empty. - * @param { PowerRoleType } powerRole - charging role. It cannot be empty. - * @param { DataRoleType } dataRole - data role. It cannot be empty. - * @returns { Promise } the promise returned by the function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 9 - * @deprecated since 12 - * @useinstead ohos.usbManager/usbManager#setPortRoleTypes - */ - function setPortRoles(portId: number, powerRole: PowerRoleType, dataRole: DataRoleType): Promise; - - /** - * Add USB device access right. - * The system application has access to the device by default, and calling this interface will not have any impact. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { string } tokenId - refers to application that require access permissions. It cannot be empty. - * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. - * @returns { boolean } value to indicate whether the permission is granted. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 12 - */ - /** - * Add USB device access right. - * The system application has access to the device by default, and calling this interface will not have any impact. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { string } tokenId - refers to application that require access permissions. It cannot be empty. - * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. - * @returns { boolean } value to indicate whether the permission is granted. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function addDeviceAccessRight(tokenId: string, deviceName: string): boolean; - - /** - * Converts the string descriptor of a given USB function list to a numeric mask combination. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { string } funcs - descriptor of the supported function list. It cannot be empty. - * @returns { number } the numeric mask combination of the function list. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 12 - */ - /** - * Converts the string descriptor of a given USB function list to a numeric mask combination. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { string } funcs - descriptor of the supported function list. It cannot be empty. - * @returns { int } the numeric mask combination of the function list. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function getFunctionsFromString(funcs: string): int; - - /** - * Converts the numeric mask combination of a given USB function list to a string descriptor. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { FunctionType } funcs - numeric mask combination of the function list. It cannot be empty. - * @returns { string } - descriptor of the supported function list. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 12 - */ - /** - * Converts the numeric mask combination of a given USB function list to a string descriptor. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { FunctionType } funcs - numeric mask combination of the function list. It cannot be empty. - * @returns { string } - descriptor of the supported function list. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function getStringFromFunctions(funcs: FunctionType): string; - - /** - * Sets the current USB function list in Device mode. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { FunctionType } funcs - numeric mask combination of the supported function list. It cannot be empty. - * @returns { Promise } the promise returned by the function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 14400002 - Permission denied. The HDC is disabled by the system. - * @throws { BusinessError } 14400006 - Unsupported operation. The function is not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 12 - */ - /** - * Sets the current USB function list in Device mode. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { FunctionType } funcs - numeric mask combination of the supported function list. It cannot be empty. - * @returns { Promise } the promise returned by the function. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400002 - Permission denied. The HDC is disabled by the system. - * @throws { BusinessError } 14400006 - Unsupported operation. The function is not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function setDeviceFunctions(funcs: FunctionType): Promise; - - /** - * Obtains the numeric mask combination for the current USB function list in Device mode. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @returns { FunctionType } the numeric mask combination for the current USB function list in FunctionType. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 12 - */ - /** - * Obtains the numeric mask combination for the current USB function list in Device mode. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @returns { FunctionType } the numeric mask combination for the current USB function list in FunctionType. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function getDeviceFunctions(): FunctionType; - /* usb port functions begin */ - /** - * Obtains the USBPort list. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @returns { Array } the USBPort list. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 12 - */ - /* usb port functions begin */ - /** - * Obtains the USBPort list. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @returns { Array } the USBPort list. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function getPortList(): Array; - - /** - * Gets the mask combination for the supported mode list of the specified USBPort. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { number } portId - unique ID of the port. It cannot be empty. - * @returns { PortModeType } the mask combination for the supported mode list in PortModeType. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 12 - */ - /** - * Gets the mask combination for the supported mode list of the specified USBPort. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { int } portId - unique ID of the port. It cannot be empty. - * @returns { PortModeType } the mask combination for the supported mode list in PortModeType. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function getPortSupportModes(portId: int): PortModeType; - - /** - * Sets the role types supported by the specified USBPort, which can be powerRole (for charging) and dataRole (for data transfer). - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { number } portId - unique ID of the port. It cannot be empty. - * @param { PowerRoleType } powerRole - charging role. It cannot be empty. - * @param { DataRoleType } dataRole - data role. It cannot be empty. - * @returns { Promise } the promise returned by the function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 14400003 - Unsupported operation. The current device does not support port role switching. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 12 - */ - /** - * Sets the role types supported by the specified USBPort, which can be powerRole (for charging) and dataRole (for data transfer). - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { int } portId - unique ID of the port. It cannot be empty. - * @param { PowerRoleType } powerRole - charging role. It cannot be empty. - * @param { DataRoleType } dataRole - data role. It cannot be empty. - * @returns { Promise } the promise returned by the function. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400003 - Unsupported operation. The current device does not support port role switching. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function setPortRoleTypes(portId: int, powerRole: PowerRoleType, dataRole: DataRoleType): Promise; - - /** - * Adds USB accessory access right. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { number } tokenId - refers to application that require access permissions. It cannot be empty. - * @param { USBAccessory } accessory - USB accessory. It cannot be empty. - * @throws { BusinessError } 201 - The permission check failed. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @throws { BusinessError } 14400005 - Database operation exception. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since 14 - */ - /** - * Adds USB accessory access right. - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { int } tokenId - refers to application that require access permissions. It cannot be empty. - * @param { USBAccessory } accessory - USB accessory. It cannot be empty. - * @throws { BusinessError } 201 - The permission check failed. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @throws { BusinessError } 14400005 - Database operation exception. - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function addAccessoryRight(tokenId: number, accessory: USBAccessory): void; - /* usb pipe functions begin */ - /** - * Claims a USB interface. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @param { USBInterface } iface - USB interface, which is used to determine the interface to claim. It cannot be empty. - * @param { boolean } [force] - optional parameter that determines whether to forcibly claim the USB interface. - * @returns { number } returns **0** if the USB interface is successfully claimed; returns an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Claims a USB interface. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @param { USBInterface } iface - USB interface, which is used to determine the interface to claim. It cannot be empty. - * @param { boolean } [force] - optional parameter that determines whether to forcibly claim the USB interface. - * @returns { int } returns **0** if the USB interface is successfully claimed; returns an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function claimInterface(pipe: USBDevicePipe, iface: USBInterface, force?: boolean): int; - - /** - * Releases a USB interface. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @param { USBInterface } iface - USB interface, which is used to determine the interface to release. It cannot be empty. - * @returns { number } returns **0** if the USB interface is successfully released; returns an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Releases a USB interface. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @param { USBInterface } iface - USB interface, which is used to determine the interface to release. It cannot be empty. - * @returns { int } returns **0** if the USB interface is successfully released; returns an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function releaseInterface(pipe: USBDevicePipe, iface: USBInterface): int; - - /** - * Sets the device configuration. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @param { USBConfiguration } config - device configuration. It cannot be empty. - * @returns { number } returns **0** if the device configuration is successfully set; returns an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Sets the device configuration. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @param { USBConfiguration } config - device configuration. It cannot be empty. - * @returns { int } returns **0** if the device configuration is successfully set; returns an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function setConfiguration(pipe: USBDevicePipe, config: USBConfiguration): int; - - /** - * Sets a USB interface. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @param { USBInterface } iface - USB interface, which is used to determine the interface to set. It cannot be empty. - * @returns { number } returns **0** if the USB interface is successfully set; return an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Sets a USB interface. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @param { USBInterface } iface - USB interface, which is used to determine the interface to set. It cannot be empty. - * @returns { int } returns **0** if the USB interface is successfully set; return an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function setInterface(pipe: USBDevicePipe, iface: USBInterface): int; - - /** - * Obtains the raw USB descriptor. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @returns { Uint8Array } returns the raw descriptor data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Obtains the raw USB descriptor. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @returns { Uint8Array } returns the raw descriptor data. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function getRawDescriptor(pipe: USBDevicePipe): Uint8Array; - - /** - * Obtains the file descriptor. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. - * @returns { number } returns the file descriptor of the USB device. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Obtains the file descriptor. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. - * @returns { int } returns the file descriptor of the USB device. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function getFileDescriptor(pipe: USBDevicePipe): int; - - /** - * Performs control transfer. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. - * @param { USBControlParams } controlparam - control transfer parameters. It cannot be empty. - * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. - * @returns { Promise } returns the size of the transmitted or received data block if the control transfer is successful; - * return -1 if an exception occurs. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - * @deprecated since 12 - * @useinstead ohos.usbManager/usbManager#usbControlTransfer - */ - function controlTransfer(pipe: USBDevicePipe, controlparam: USBControlParams, timeout?: number): Promise; - - /** - * Performs usb control transfer. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. - * @param { USBDeviceRequestParams } requestparam - control transfer parameters. It cannot be empty. - * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. - * @returns { Promise } returns the size of the transmitted or received data block if the control transfer is successful; - * return -1 if an exception occurs. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 12 - */ - /** - * Performs usb control transfer. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. - * @param { USBDeviceRequestParams } requestparam - control transfer parameters. It cannot be empty. - * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. - * @returns { Promise } returns the size of the transmitted or received data block if the control transfer is successful; - * return -1 if an exception occurs. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function usbControlTransfer(pipe: USBDevicePipe, requestparam: USBDeviceRequestParams, timeout?: int): Promise; - - /** - * Performs bulk transfer. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. - * @param { USBEndpoint } endpoint - USB endpoint, which is used to determine the USB port for data transfer. It cannot be empty. - * @param { Uint8Array } buffer - buffer for writing or reading data. It cannot be empty. - * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. - * @returns { Promise } the size of the transmitted or received data block if the control transfer is successful; - * return -1 if an exception occurs. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Performs bulk transfer. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. - * @param { USBEndpoint } endpoint - USB endpoint, which is used to determine the USB port for data transfer. It cannot be empty. - * @param { Uint8Array } buffer - buffer for writing or reading data. It cannot be empty. - * @param { int } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. - * @returns { Promise } the size of the transmitted or received data block if the control transfer is successful; - * return -1 if an exception occurs. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function bulkTransfer( - pipe: USBDevicePipe, - endpoint: USBEndpoint, - buffer: Uint8Array, - timeout?: int - ): Promise; - - /** - * Closes a USB device pipe. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. - * @returns { number } returns **0** if the USB device pipe is closed successfully; return an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - /** - * Closes a USB device pipe. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. - * @returns { int } returns **0** if the USB device pipe is closed successfully; return an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function closePipe(pipe: USBDevicePipe): int; - - /** - * Checks whether the application has the right to access the USB accessory. - * - * @param { USBAccessory } accessory - USB accessory. It cannot be empty. - * @returns { boolean } indicates if the user has the right to access the USB accessory. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @throws { BusinessError } 14400005 - Database operation exception. - * @throws { BusinessError } 14401001 - The target USBAccessory not matched. - * @syscap SystemCapability.USB.USBManager - * @since 14 - */ - /** - * Checks whether the application has the right to access the USB accessory. - * - * @param { USBAccessory } accessory - USB accessory. It cannot be empty. - * @returns { boolean } indicates if the user has the right to access the USB accessory. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @throws { BusinessError } 14400005 - Database operation exception. - * @throws { BusinessError } 14401001 - The target USBAccessory not matched. - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function hasAccessoryRight(accessory: USBAccessory): boolean; - - /** - * Requests the right for a given application to access the USB accessory. - * - * @param { USBAccessory } accessory - USB accessory. It cannot be empty. - * @returns { Promise } indicates if the USB accessory access right are granted. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @throws { BusinessError } 14400005 - Database operation exception. - * @throws { BusinessError } 14401001 - The target USBAccessory not matched. - * @syscap SystemCapability.USB.USBManager - * @since 14 - */ - /** - * Requests the right for a given application to access the USB accessory. - * - * @param { USBAccessory } accessory - USB accessory. It cannot be empty. - * @returns { Promise } indicates if the USB accessory access right are granted. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @throws { BusinessError } 14400005 - Database operation exception. - * @throws { BusinessError } 14401001 - The target USBAccessory not matched. - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function requestAccessoryRight(accessory: USBAccessory): Promise; - - /** - * Cancels the right for a given application to access the USB accessory. - * - * @param { USBAccessory } accessory - USB accessory. It cannot be empty. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @throws { BusinessError } 14400005 - Database operation exception. - * @throws { BusinessError } 14401001 - The target USBAccessory not matched. - * @syscap SystemCapability.USB.USBManager - * @since 14 - */ - /** - * Cancels the right for a given application to access the USB accessory. - * - * @param { USBAccessory } accessory - USB accessory. It cannot be empty. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @throws { BusinessError } 14400005 - Database operation exception. - * @throws { BusinessError } 14401001 - The target USBAccessory not matched. - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function cancelAccessoryRight(accessory: USBAccessory): void; - - /** - * Obtains the USB Accessory list. - * - * @returns { Array> } USB accessory list. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @syscap SystemCapability.USB.USBManager - * @since 14 - */ - /** - * Obtains the USB Accessory list. - * - * @returns { Array> } USB accessory list. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function getAccessoryList(): Array>; - - /** - * Obtains the accessory handle and opens accessory file descriptor. - * - * @param { USBAccessory } accessory - accessory, which is used to determine the accessory. It cannot be empty. - * @returns { USBAccessoryHandle } returns the handle of the accessory. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @throws { BusinessError } 14401001 - The target USBAccessory not matched. - * @throws { BusinessError } 14401002 - Failed to open the native accessory node. - * @throws { BusinessError } 14401003 - Cannot reopen the accessory. - * @syscap SystemCapability.USB.USBManager - * @since 14 - */ - /** - * Obtains the accessory handle and opens accessory file descriptor. - * - * @param { USBAccessory } accessory - accessory, which is used to determine the accessory. It cannot be empty. - * @returns { USBAccessoryHandle } returns the handle of the accessory. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @throws { BusinessError } 14401001 - The target USBAccessory not matched. - * @throws { BusinessError } 14401002 - Failed to open the native accessory node. - * @throws { BusinessError } 14401003 - Cannot reopen the accessory. - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function openAccessory(accessory: USBAccessory): USBAccessoryHandle; - - /** - * Closes the accessory file descriptor. - * - * @param { USBAccessoryHandle } accessoryHandle - Accessory handle to be closed. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @syscap SystemCapability.USB.USBManager - * @since 14 - */ - /** - * Closes the accessory file descriptor. - * - * @param { USBAccessoryHandle } accessoryHandle - Accessory handle to be closed. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function closeAccessory(accessoryHandle: USBAccessoryHandle): void; - - /** - * Represents the USB endpoint from which data is sent or received. You can obtain the USB endpoint through USBInterface. - * - * @typedef USBEndpoint - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - interface USBEndpoint { - /** - * Endpoint address - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - address: int; - - /** - * Endpoint attributes - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - attributes: int; - - /** - * Endpoint interval - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - interval: int; - - /** - * Maximum size of data packets on the endpoint - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - maxPacketSize: int; - - /** - * Endpoint direction - * - * @type { USBRequestDirection } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - direction: USBRequestDirection; - - /** - * Endpoint number - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - number: number; - - /** - * Endpoint type - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - type: int; - - /** - * Unique ID defined by USBInterface.id, which indicates the interface to which the endpoint belongs - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - interfaceId: number; - - - - } - - /** - * Represents a USB interface. One config can contain multiple **USBInterface** instances, each providing a specific function. - * - * @typedef USBInterface - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - interface USBInterface { - /** - * Unique ID of the USB interface - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - id: int; - - /** - * Interface protocol - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - protocol: int; - - /** - * Device type - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - clazz: int; - - /** - * Device subclass - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - subClass: int; - - /** - * Alternation between descriptors of the same USB interface - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - alternateSetting: int; - - /** - * Interface name - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - name: string; - - /** - * USBEndpoint that belongs to the USB interface - * - * @type { Array } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - endpoints: Array; - } - - /** - * USB configuration. One USBDevice can contain multiple USBConfiguration instances. - * - * @typedef USBConfiguration - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - interface USBConfiguration { - /** - * Unique ID of the USB configuration - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - id: int; - - /** - * Configuration attributes - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - attributes: int; - - /** - * Maximum power consumption, in mA - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - maxPower: int; - - /** - * Configuration name, which can be left empty - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - name: string; - - /** - * Support for remote wakeup - * - * @type { boolean } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - isRemoteWakeup: boolean; - - /** - * Support for independent power supplies - * - * @type { boolean } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - isSelfPowered: boolean; - - /** - * Supported interface attributes - * - * @type { Array } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - interfaces: Array; - } - - /** - * Represents a USB device. - * - * @typedef USBDevice - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - interface USBDevice { - /** - * Bus address - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - busNum: int; - - /** - * Device address - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - devAddress: int; - - /** - * Device SN - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - serial: string; - - /** - * Device name - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - name: string; - - /** - * Device manufacturer - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - manufacturerName: string; - - /** - * Product information - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - productName: string; - - /** - * Product version - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - version: string; - - /** - * Vendor ID - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - vendorId: int; - - /** - * Product ID - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - productId: int; - - /** - * Device class - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - clazz: int; - - /** - * Device subclass - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - subClass: int; - - /** - * Device protocol code - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - protocol: int; - - /** - * Device configuration descriptor information - * - * @type { Array } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - configs: Array; - } - - /** - * Represents a USB device pipe, which is used to determine the USB device. - * - * @typedef USBDevicePipe - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - interface USBDevicePipe { - /** - * Bus address. - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - busNum: int; - - /** - * Device address - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - devAddress: int; - } - - /** - * Enumerates power role types. - * - * @enum { int } - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - export enum PowerRoleType { - /** - * None - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - NONE = 0, - - /** - * External power supply - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - SOURCE = 1, - - /** - * Internal power supply - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - SINK = 2 - } - - /** - * Enumerates data role types. - * - * @enum { int } - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - export enum DataRoleType { - /** - * None - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - NONE = 0, - - /** - * Host mode - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - HOST = 1, - - /** - * Device mode - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - DEVICE = 2 - } - - /** - * Enumerates port mode types - * - * @enum { int } - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - export enum PortModeType { - /** - * None - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - NONE = 0, - - /** - * Upstream facing port, which functions as the sink of power supply - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - UFP = 1, - - /** - * Downstream facing port, which functions as the source of power supply - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - DFP = 2, - - /** - * Dynamic reconfiguration port (DRP), which can function as the DFP (host) or UFP (device). It is not supported currently. - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - DRP = 3, - - /** - * Not supported currently - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - NUM_MODES = 4 - } - - /** - * Enumerates USB device port roles. - * - * @typedef USBPortStatus - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - interface USBPortStatus { - /** - * USB mode - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - currentMode: int; - - /** - * Power role - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - currentPowerRole: int; - - /** - * Data role - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - currentDataRole: int; - } - - /** - * Represents a USB device port. - * - * @typedef USBPort - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - interface USBPort { - /** - * Unique ID of the USB port - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - id: int; - - /** - * Mask combination for the supported mode list of the USB port - * - * @type { PortModeType } - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - supportedModes: PortModeType; - - /** - * USB port role - * - * @type { USBPortStatus } - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - status: USBPortStatus; - } - - /** - * Represents control transfer parameters. - * - * @typedef USBControlParams - * @syscap SystemCapability.USB.USBManager - * @since 9 - * @deprecated since 18 - * @useinstead ohos.usbManager/usbManager#USBDeviceRequestParams - */ - interface USBControlParams { - /** - * Request type - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - * @deprecated since 18 - */ - request: number; - - /** - * Request target type - * - * @type { USBRequestTargetType } - * @syscap SystemCapability.USB.USBManager - * @since 9 - * @deprecated since 18 - */ - target: USBRequestTargetType; - - /** - * Control request type - * - * @type { USBControlRequestType } - * @syscap SystemCapability.USB.USBManager - * @since 9 - * @deprecated since 18 - */ - reqType: USBControlRequestType; - - /** - * Request parameter value - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - * @deprecated since 18 - */ - value: number; - - /** - * Index of the parameter value - * - * @type { number } - * @syscap SystemCapability.USB.USBManager - * @since 9 - * @deprecated since 18 - */ - index: number; - - /** - * Data written to or read from the buffer - * - * @type { Uint8Array } - * @syscap SystemCapability.USB.USBManager - * @since 9 - * @deprecated since 18 - */ - data: Uint8Array; - } - - /** - * Represents control transfer parameters. - * - * @typedef USBDeviceRequestParams - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ - interface USBDeviceRequestParams { - /** - * Bit map request type - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ - bmRequestType: int; - - /** - * Byte request - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ - bRequest: int; - - /** - * Request parameter word value - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ - wValue: int; - - /** - * Word index of the parameter value - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ - wIndex: int; - - /** - * Word length of the parameter value - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ - wLength: int; - - /** - * Data written to or read from the buffer - * - * @type { Uint8Array } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ - data: Uint8Array; - } - - /** - * Enumerates USB request target types. - * - * @enum { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - export enum USBRequestTargetType { - /** - * USB device - * - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - USB_REQUEST_TARGET_DEVICE = 0, - - /** - * USB interface - * - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - USB_REQUEST_TARGET_INTERFACE = 1, - - /** - * Endpoint - * - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - USB_REQUEST_TARGET_ENDPOINT = 2, - - /** - * Others - * - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - USB_REQUEST_TARGET_OTHER = 3 - } - - /** - * Enumerates control request types. - * - * @enum { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - export enum USBControlRequestType { - /** - * Standard - * - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - USB_REQUEST_TYPE_STANDARD = 0, - - /** - * Class - * - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - USB_REQUEST_TYPE_CLASS = 1, - - /** - * Vendor - * - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - USB_REQUEST_TYPE_VENDOR = 2 - } - - /** - * Enumerates request directions. - * - * @enum { int } - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - export enum USBRequestDirection { - /** - * Request for writing data from the host to the device - * - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - USB_REQUEST_DIR_TO_DEVICE = 0, - - /** - * Request for reading data from the device to the host - * - * @syscap SystemCapability.USB.USBManager - * @since 9 - */ - USB_REQUEST_DIR_FROM_DEVICE = 0x80 - } - - /** - * Enumerates function modes. - * - * @enum { int } - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - export enum FunctionType { - /** - * None - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - NONE = 0, - - /** - * Serial port device - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - ACM = 1, - - /** - * Ethernet port device - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - ECM = 2, - - /** - * HDC device - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - HDC = 4, - - /** - * MTP device - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - MTP = 8, - - /** - * PTP device - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - PTP = 16, - - /** - * RNDIS device - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - RNDIS = 32, - - /** - * MIDI device - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - MIDI = 64, - - /** - * Audio source device - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - AUDIO_SOURCE = 128, - - /** - * NCM device - * - * @syscap SystemCapability.USB.USBManager - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ - NCM = 256 - } - - /** - * Represents a USB Accessory. - * - * @typedef USBAccessory - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - interface USBAccessory { - /** - * The manufacturer name of the accessory. - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - manufacturer: string; - - /** - * The product of the accessory. - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - product: string; - - /** - * The user visible description of the accessory. - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - description: string; - - /** - * The version of the accessory. - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - version: string; - - /** - * The serial number of the accessory. - * - * @type { string } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - serialNumber: string; - } - - /** - * Handle of accessory. - * - * @typedef USBAccessoryHandle - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - interface USBAccessoryHandle { - /** - * The file descriptor of the accessory.The valid USBAccessoryHandle.accessoryFd is a positive value. - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ - accessoryFd: int; - } - - /** - * Usb transfer flag. - * - * @enum { number } - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - export enum UsbTransferFlags { - /** - * Report short frames as errors - * - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - USB_TRANSFER_SHORT_NOT_OK = 0, - - /** - * Automatically free transfer buffer - * - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - USB_TRANSFER_FREE_BUFFER = 1, - - /** - * Automatically free transfer after callback returns - * - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - USB_TRANSFER_FREE_TRANSFER = 2, - - /** - * Transmissions that are multiples of wMaxPacketSize will add an additional zero packet. - * - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - USB_TRANSFER_ADD_ZERO_PACKET = 3 - } - - /** - * Usb transfer status. - * - * @enum { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - export enum UsbTransferStatus { - /** - * Transfer completed - * - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - TRANSFER_COMPLETED = 0, - - /** - * Transfer failed - * - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - TRANSFER_ERROR = 1, - - /** - * Transfer timed out - * - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - TRANSFER_TIMED_OUT = 2, - - /** - * Transfer was canceled - * - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - TRANSFER_CANCELED = 3, - - /** - * For bulk/interrupt endpoints: halt condition detected (endpoint - * stalled). For control endpoints: control request not supported. - * - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - TRANSFER_STALL = 4, - - /** - * Device was disconnected - * - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - TRANSFER_NO_DEVICE = 5, - - /** - * Device sent more data than requested - * - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - TRANSFER_OVERFLOW = 6 - } - - /** - * USB DATA transfer type. - * - * @enum { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - export enum UsbEndpointTransferType { - /** - * Isochronous endpoint - * - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - TRANSFER_TYPE_ISOCHRONOUS = 0x1, - - /** - * Bulk endpoint - * - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - TRANSFER_TYPE_BULK = 0x2, - - /** - * Interrupt endpoint - * - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - TRANSFER_TYPE_INTERRUPT = 0x3 - } - - /** - * Isochronous packet descriptors, only for isochronous transfers. - * - * @typedef UsbIsoPacketDescriptor - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - interface UsbIsoPacketDescriptor { - /** - * Length of data to request in this packet - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - length: int; - - /** - * Amount of data that was actually transferred - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - actualLength: int; - - /** - * Status code for this packet - * - * @type { UsbTransferStatus } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - status: UsbTransferStatus; - } - - /** - * submit transfer callback. - * - * @typedef SubmitTransferCallback - * @syscap SystemCapability.USB.USBManager - * @since 18 - */ - interface SubmitTransferCallback { - /** - * Actual length of data that was transferred. Read-only, and only for - * use within transfer callback function. Not valid for isochronous endpoint transfers. - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - actualLength: int; - - /** - * The status of the transfer. Read-only, and only for use within transfer callback function. - * - * @type { UsbTransferStatus } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - status: UsbTransferStatus; - - /** - * Isochronous packet descriptors, for isochronous transfers only. - * - * @type { Array> } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - isoPacketDescs: Array>; - } - - /** - * As a generic USB data transfer interface. The Client populates this interface and - * submits it in order to request a transfer. - * - * @typedef UsbDataTransferParams - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - interface UsbDataTransferParams { - /** - * Pipe of the device that this data transfer will be submitted to. - * - * @type { USBDevicePipe } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - devPipe: USBDevicePipe; - - /** - * A bitwise OR combination of UsbTransferFlags. - * - * @type { UsbTransferFlags } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - flags: UsbTransferFlags; - - /** - * Address of the endpoint where this transfer will be sent. - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - endpoint: int; - - /** - * Type of the transfer - * - * @type { UsbEndpointTransferType } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - type: UsbEndpointTransferType; - - /** - * Timeout for this transfer in milliseconds. A value of 0 indicates no timeout. - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - timeout: int; - - /** - * Length of the data buffer. Must be non-negative. - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - length: int; - - /** - * Callback function. This will be invoked when the transfer completes, fails, or is canceled. - * - * @type { AsyncCallback } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - callback: AsyncCallback; - - /** - * User context data. Useful for associating specific data to a transfer - * that can be accessed from within the callback function. - * - * @type { Uint8Array } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - userData: Uint8Array; - - /** - * Data buffer - * - * @type { Uint8Array } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - buffer: Uint8Array; - - /** - * Count of isochronous packets. Only used for I/O with isochronous endpoints. Must be non-negative. - * - * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - isoPacketCount: int; - } - - /** - * Submit USB data transfer. - * - * @param { transfer } As a generic USB data transfer interface. The Client populates this interface and - * submits it in order to request a transfer - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. - * @throws { BusinessError } 14400007 - Resource busy. Possible causes: - *
    1. The transfer has already been submitted. - *
    2. The interface is claimed by another program or driver. - * @throws { BusinessError } 14400008 - No such device (it may have been disconnected). - * @throws { BusinessError } 14400009 - Insufficient memory. Possible causes: - *
    1. Memory allocation failed. - * @throws { BusinessError } 14400012 - Transmission I/O error. - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function usbSubmitTransfer(transfer: UsbDataTransferParams): void; - - /** - * Cancel USB data transfer. - * - * @param { transfer } Cancel the target transfer - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. - * @throws { BusinessError } 14400008 - No such device (it may have been disconnected). - * @throws { BusinessError } 14400010 - Other USB error. Possible causes: - *
    1.Unrecognized discard error code. - * @throws { BusinessError } 14400011 - The transfer is not in progress, or is already complete or cancelled. - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function usbCancelTransfer(transfer: UsbDataTransferParams): void; - - /** - * Perform a USB port reset to reinitialize a usb device. The operation will attempt to restore the previous configuration - * and alternate interface settings after the reset has completed. - * - * @param { USBDevicePipe } pipe - Represents a USB device,which is the target object to be restarted.It cannot be empty. - * @returns { boolean } If the restart operation is successful, return {@code true}; if the restart operation fails, return {@code false}. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. - * @throws { BusinessError } 14400004 -Service exception. Possible causes: 1. No accessory is plugged in.. - * @throws { BusinessError } 14400008 - No such device(it may have been disconnected) - * @throws { BusinessError } 14400010 - Other USB error. Possible causes: - *
    1.Unrecognized discard error code. - * @throws { BusinessError } 14400013 - The USBDevicePipe validity check failed. Possible causes: - *
    1.The input parameters fail the validation check. - *
    2.The call chain used to obtain the input parameters is not reasonable. - * @syscap SystemCapability.USB.USBManager - * @since 20 - * @arkts 1.1&1.2 - */ - function resetUsbDevice(pipe: USBDevicePipe): boolean; - - - - - -} - +/* + * Copyright (c) 2023-2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @file + * @kit BasicServicesKit + */ + +import { AsyncCallback } from './@ohos.base'; + +/** + * This module provides the capability of manage USB device. + * + * @namespace usbManager + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ +declare namespace usbManager { + /** + * Obtains the USB device list. + * + * @returns { Array> } USB device list. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Obtains the USB device list. + * + * @returns { Array> } USB device list. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function getDevices(): Array>; + + /** + * Connects to the USB device based on the device information returned by getDevices(). + * + * @param { USBDevice } device - USB device on the device list returned by getDevices(). It cannot be empty. + * @returns { Readonly } object for data transfer. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Connects to the USB device based on the device information returned by getDevices(). + * + * @param { USBDevice } device - USB device on the device list returned by getDevices(). It cannot be empty. + * @returns { Readonly } object for data transfer. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function connectDevice(device: USBDevice): Readonly; + + /** + * Checks whether the application has the permission to access the device. + * + * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. + * @returns { boolean } indicates if the user has the permission to access the device. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Checks whether the application has the permission to access the device. + * + * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. + * @returns { boolean } indicates if the user has the permission to access the device. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function hasRight(deviceName: string): boolean; + + /** + * Requests the permission for a given application to access the USB device. + * The system application has access to the device by default, and there is no need to call this interface to apply. + * + * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. + * @returns { Promise } indicates if the device access permissions are granted. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Requests the permission for a given application to access the USB device. + * The system application has access to the device by default, and there is no need to call this interface to apply. + * + * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. + * @returns { Promise } indicates if the device access permissions are granted. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function requestRight(deviceName: string): Promise; + + /** + * Remove the permission for a given application to access the USB device. + * The system application has access to the device by default, and calling this interface will not have any impact. + * + * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. + * @returns { boolean } indicates if the device access permissions are removed. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Remove the permission for a given application to access the USB device. + * The system application has access to the device by default, and calling this interface will not have any impact. + * + * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. + * @returns { boolean } indicates if the device access permissions are removed. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function removeRight(deviceName: string): boolean; + + /** + * Add device access permission. + * The system application has access to the device by default, and calling this interface will not have any impact. + * + * @param { string } bundleName - refers to application that require access permissions. It cannot be empty. + * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. + * @returns { boolean } value to indicate whether the permission is granted. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + * @deprecated since 12 + * @useinstead ohos.usbManager/usbManager#addDeviceAccessRight + */ + function addRight(bundleName: string, deviceName: string): boolean; + + /** + * Converts the string descriptor of a given USB function list to a numeric mask combination. + * + * @param { string } funcs - descriptor of the supported function list. It cannot be empty. + * @returns { number } the numeric mask combination of the function list. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + * @deprecated since 12 + * @useinstead ohos.usbManager/usbManager#getFunctionsFromString + */ + function usbFunctionsFromString(funcs: string): number; + + /** + * Converts the numeric mask combination of a given USB function list to a string descriptor. + * + * @param { FunctionType } funcs - numeric mask combination of the function list. The type of funcs must be number. It cannot be empty. + * @returns { string } - descriptor of the supported function list. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + * @deprecated since 12 + * @useinstead ohos.usbManager/usbManager#getStringFromFunctions + */ + function usbFunctionsToString(funcs: FunctionType): string; + + /** + * Sets the current USB function list in Device mode. + * + * @param { FunctionType } funcs - numeric mask combination of the supported function list. It cannot be empty. + * @returns { Promise } the promise returned by the function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 14400002 - Permission denied. The HDC is disabled by the system. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + * @deprecated since 12 + * @useinstead ohos.usbManager/usbManager#setDeviceFunctions + */ + function setCurrentFunctions(funcs: FunctionType): Promise; + + /** + * Obtains the numeric mask combination for the current USB function list in Device mode. + * + * @returns { FunctionType } the numeric mask combination for the current USB function list in FunctionType. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + * @deprecated since 12 + * @useinstead ohos.usbManager/usbManager#getDeviceFunctions + */ + function getCurrentFunctions(): FunctionType; + /* usb port functions begin */ + /** + * Obtains the USBPort list. + * + * @returns { Array } the USBPort list. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + * @deprecated since 12 + * @useinstead ohos.usbManager/usbManager#getPortList + */ + function getPorts(): Array; + + /** + * Gets the mask combination for the supported mode list of the specified USBPort. + * + * @param { number } portId - unique ID of the port. It cannot be empty. + * @returns { PortModeType } the mask combination for the supported mode list in PortModeType. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + * @deprecated since 12 + * @useinstead ohos.usbManager/usbManager#getPortSupportModes + */ + function getSupportedModes(portId: number): PortModeType; + + /** + * Sets the role types supported by the specified USBPort, which can be powerRole (for charging) and dataRole (for data transfer). + * + * @param { number } portId - unique ID of the port. It cannot be empty. + * @param { PowerRoleType } powerRole - charging role. It cannot be empty. + * @param { DataRoleType } dataRole - data role. It cannot be empty. + * @returns { Promise } the promise returned by the function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + * @deprecated since 12 + * @useinstead ohos.usbManager/usbManager#setPortRoleTypes + */ + function setPortRoles(portId: number, powerRole: PowerRoleType, dataRole: DataRoleType): Promise; + + /** + * Add USB device access right. + * The system application has access to the device by default, and calling this interface will not have any impact. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { string } tokenId - refers to application that require access permissions. It cannot be empty. + * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. + * @returns { boolean } value to indicate whether the permission is granted. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 12 + */ + /** + * Add USB device access right. + * The system application has access to the device by default, and calling this interface will not have any impact. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { string } tokenId - refers to application that require access permissions. It cannot be empty. + * @param { string } deviceName - device name defined by USBDevice.name. It cannot be empty. + * @returns { boolean } value to indicate whether the permission is granted. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 18 + */ + function addDeviceAccessRight(tokenId: string, deviceName: string): boolean; + + /** + * Converts the string descriptor of a given USB function list to a numeric mask combination. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { string } funcs - descriptor of the supported function list. It cannot be empty. + * @returns { number } the numeric mask combination of the function list. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 12 + */ + /** + * Converts the string descriptor of a given USB function list to a numeric mask combination. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { string } funcs - descriptor of the supported function list. It cannot be empty. + * @returns { number } the numeric mask combination of the function list. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 18 + */ + function getFunctionsFromString(funcs: string): number; + + /** + * Converts the numeric mask combination of a given USB function list to a string descriptor. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { FunctionType } funcs - numeric mask combination of the function list. It cannot be empty. + * @returns { string } - descriptor of the supported function list. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 12 + */ + /** + * Converts the numeric mask combination of a given USB function list to a string descriptor. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { FunctionType } funcs - numeric mask combination of the function list. It cannot be empty. + * @returns { string } - descriptor of the supported function list. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 18 + */ + function getStringFromFunctions(funcs: FunctionType): string; + + /** + * Sets the current USB function list in Device mode. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { FunctionType } funcs - numeric mask combination of the supported function list. It cannot be empty. + * @returns { Promise } the promise returned by the function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 14400002 - Permission denied. The HDC is disabled by the system. + * @throws { BusinessError } 14400006 - Unsupported operation. The function is not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 12 + */ + /** + * Sets the current USB function list in Device mode. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { FunctionType } funcs - numeric mask combination of the supported function list. It cannot be empty. + * @returns { Promise } the promise returned by the function. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400002 - Permission denied. The HDC is disabled by the system. + * @throws { BusinessError } 14400006 - Unsupported operation. The function is not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 18 + */ + function setDeviceFunctions(funcs: FunctionType): Promise; + + /** + * Obtains the numeric mask combination for the current USB function list in Device mode. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @returns { FunctionType } the numeric mask combination for the current USB function list in FunctionType. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 12 + */ + /** + * Obtains the numeric mask combination for the current USB function list in Device mode. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @returns { FunctionType } the numeric mask combination for the current USB function list in FunctionType. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 18 + */ + function getDeviceFunctions(): FunctionType; + /* usb port functions begin */ + /** + * Obtains the USBPort list. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @returns { Array } the USBPort list. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 12 + */ + /* usb port functions begin */ + /** + * Obtains the USBPort list. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @returns { Array } the USBPort list. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 18 + */ + function getPortList(): Array; + + /** + * Gets the mask combination for the supported mode list of the specified USBPort. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { number } portId - unique ID of the port. It cannot be empty. + * @returns { PortModeType } the mask combination for the supported mode list in PortModeType. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 12 + */ + /** + * Gets the mask combination for the supported mode list of the specified USBPort. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { number } portId - unique ID of the port. It cannot be empty. + * @returns { PortModeType } the mask combination for the supported mode list in PortModeType. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 18 + */ + function getPortSupportModes(portId: number): PortModeType; + + /** + * Sets the role types supported by the specified USBPort, which can be powerRole (for charging) and dataRole (for data transfer). + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { number } portId - unique ID of the port. It cannot be empty. + * @param { PowerRoleType } powerRole - charging role. It cannot be empty. + * @param { DataRoleType } dataRole - data role. It cannot be empty. + * @returns { Promise } the promise returned by the function. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 14400003 - Unsupported operation. The current device does not support port role switching. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 12 + */ + /** + * Sets the role types supported by the specified USBPort, which can be powerRole (for charging) and dataRole (for data transfer). + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { number } portId - unique ID of the port. It cannot be empty. + * @param { PowerRoleType } powerRole - charging role. It cannot be empty. + * @param { DataRoleType } dataRole - data role. It cannot be empty. + * @returns { Promise } the promise returned by the function. + * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400003 - Unsupported operation. The current device does not support port role switching. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 18 + */ + function setPortRoleTypes(portId: number, powerRole: PowerRoleType, dataRole: DataRoleType): Promise; + + /** + * Adds USB accessory access right. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { number } tokenId - refers to application that require access permissions. It cannot be empty. + * @param { USBAccessory } accessory - USB accessory. It cannot be empty. + * @throws { BusinessError } 201 - The permission check failed. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @throws { BusinessError } 14400005 - Database operation exception. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 14 + */ + /** + * Adds USB accessory access right. + * + * @permission ohos.permission.MANAGE_USB_CONFIG + * @param { number } tokenId - refers to application that require access permissions. It cannot be empty. + * @param { USBAccessory } accessory - USB accessory. It cannot be empty. + * @throws { BusinessError } 201 - The permission check failed. + * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @throws { BusinessError } 14400005 - Database operation exception. + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 18 + */ + function addAccessoryRight(tokenId: number, accessory: USBAccessory): void; + /* usb pipe functions begin */ + /** + * Claims a USB interface. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @param { USBInterface } iface - USB interface, which is used to determine the interface to claim. It cannot be empty. + * @param { boolean } [force] - optional parameter that determines whether to forcibly claim the USB interface. + * @returns { number } returns **0** if the USB interface is successfully claimed; returns an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Claims a USB interface. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @param { USBInterface } iface - USB interface, which is used to determine the interface to claim. It cannot be empty. + * @param { boolean } [force] - optional parameter that determines whether to forcibly claim the USB interface. + * @returns { number } returns **0** if the USB interface is successfully claimed; returns an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function claimInterface(pipe: USBDevicePipe, iface: USBInterface, force?: boolean): number; + + /** + * Releases a USB interface. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @param { USBInterface } iface - USB interface, which is used to determine the interface to release. It cannot be empty. + * @returns { number } returns **0** if the USB interface is successfully released; returns an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Releases a USB interface. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @param { USBInterface } iface - USB interface, which is used to determine the interface to release. It cannot be empty. + * @returns { number } returns **0** if the USB interface is successfully released; returns an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function releaseInterface(pipe: USBDevicePipe, iface: USBInterface): number; + + /** + * Sets the device configuration. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @param { USBConfiguration } config - device configuration. It cannot be empty. + * @returns { number } returns **0** if the device configuration is successfully set; returns an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Sets the device configuration. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @param { USBConfiguration } config - device configuration. It cannot be empty. + * @returns { number } returns **0** if the device configuration is successfully set; returns an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function setConfiguration(pipe: USBDevicePipe, config: USBConfiguration): number; + + /** + * Sets a USB interface. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @param { USBInterface } iface - USB interface, which is used to determine the interface to set. It cannot be empty. + * @returns { number } returns **0** if the USB interface is successfully set; return an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Sets a USB interface. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @param { USBInterface } iface - USB interface, which is used to determine the interface to set. It cannot be empty. + * @returns { number } returns **0** if the USB interface is successfully set; return an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function setInterface(pipe: USBDevicePipe, iface: USBInterface): number; + + /** + * Obtains the raw USB descriptor. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @returns { Uint8Array } returns the raw descriptor data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Obtains the raw USB descriptor. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. + * @returns { Uint8Array } returns the raw descriptor data. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function getRawDescriptor(pipe: USBDevicePipe): Uint8Array; + + /** + * Obtains the file descriptor. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. + * @returns { number } returns the file descriptor of the USB device. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Obtains the file descriptor. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. + * @returns { number } returns the file descriptor of the USB device. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function getFileDescriptor(pipe: USBDevicePipe): number; + + /** + * Performs control transfer. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. + * @param { USBControlParams } controlparam - control transfer parameters. It cannot be empty. + * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. + * @returns { Promise } returns the size of the transmitted or received data block if the control transfer is successful; + * return -1 if an exception occurs. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + * @deprecated since 12 + * @useinstead ohos.usbManager/usbManager#usbControlTransfer + */ + function controlTransfer(pipe: USBDevicePipe, controlparam: USBControlParams, timeout?: number): Promise; + + /** + * Performs usb control transfer. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. + * @param { USBDeviceRequestParams } requestparam - control transfer parameters. It cannot be empty. + * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. + * @returns { Promise } returns the size of the transmitted or received data block if the control transfer is successful; + * return -1 if an exception occurs. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 12 + */ + /** + * Performs usb control transfer. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. + * @param { USBDeviceRequestParams } requestparam - control transfer parameters. It cannot be empty. + * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. + * @returns { Promise } returns the size of the transmitted or received data block if the control transfer is successful; + * return -1 if an exception occurs. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function usbControlTransfer(pipe: USBDevicePipe, requestparam: USBDeviceRequestParams, timeout?: number): Promise; + + /** + * Performs bulk transfer. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. + * @param { USBEndpoint } endpoint - USB endpoint, which is used to determine the USB port for data transfer. It cannot be empty. + * @param { Uint8Array } buffer - buffer for writing or reading data. It cannot be empty. + * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. + * @returns { Promise } the size of the transmitted or received data block if the control transfer is successful; + * return -1 if an exception occurs. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Performs bulk transfer. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. + * @param { USBEndpoint } endpoint - USB endpoint, which is used to determine the USB port for data transfer. It cannot be empty. + * @param { Uint8Array } buffer - buffer for writing or reading data. It cannot be empty. + * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. + * @returns { Promise } the size of the transmitted or received data block if the control transfer is successful; + * return -1 if an exception occurs. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function bulkTransfer( + pipe: USBDevicePipe, + endpoint: USBEndpoint, + buffer: Uint8Array, + timeout?: number + ): Promise; + + /** + * Closes a USB device pipe. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. + * @returns { number } returns **0** if the USB device pipe is closed successfully; return an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + /** + * Closes a USB device pipe. + * + * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. + * @returns { number } returns **0** if the USB device pipe is closed successfully; return an error code otherwise. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1.Mandatory parameters are left unspecified. + *
    2.Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function closePipe(pipe: USBDevicePipe): number; + + /** + * Checks whether the application has the right to access the USB accessory. + * + * @param { USBAccessory } accessory - USB accessory. It cannot be empty. + * @returns { boolean } indicates if the user has the right to access the USB accessory. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @throws { BusinessError } 14400005 - Database operation exception. + * @throws { BusinessError } 14401001 - The target USBAccessory not matched. + * @syscap SystemCapability.USB.USBManager + * @since 14 + */ + /** + * Checks whether the application has the right to access the USB accessory. + * + * @param { USBAccessory } accessory - USB accessory. It cannot be empty. + * @returns { boolean } indicates if the user has the right to access the USB accessory. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @throws { BusinessError } 14400005 - Database operation exception. + * @throws { BusinessError } 14401001 - The target USBAccessory not matched. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function hasAccessoryRight(accessory: USBAccessory): boolean; + + /** + * Requests the right for a given application to access the USB accessory. + * + * @param { USBAccessory } accessory - USB accessory. It cannot be empty. + * @returns { Promise } indicates if the USB accessory access right are granted. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @throws { BusinessError } 14400005 - Database operation exception. + * @throws { BusinessError } 14401001 - The target USBAccessory not matched. + * @syscap SystemCapability.USB.USBManager + * @since 14 + */ + /** + * Requests the right for a given application to access the USB accessory. + * + * @param { USBAccessory } accessory - USB accessory. It cannot be empty. + * @returns { Promise } indicates if the USB accessory access right are granted. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @throws { BusinessError } 14400005 - Database operation exception. + * @throws { BusinessError } 14401001 - The target USBAccessory not matched. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function requestAccessoryRight(accessory: USBAccessory): Promise; + + /** + * Cancels the right for a given application to access the USB accessory. + * + * @param { USBAccessory } accessory - USB accessory. It cannot be empty. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @throws { BusinessError } 14400005 - Database operation exception. + * @throws { BusinessError } 14401001 - The target USBAccessory not matched. + * @syscap SystemCapability.USB.USBManager + * @since 14 + */ + /** + * Cancels the right for a given application to access the USB accessory. + * + * @param { USBAccessory } accessory - USB accessory. It cannot be empty. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @throws { BusinessError } 14400005 - Database operation exception. + * @throws { BusinessError } 14401001 - The target USBAccessory not matched. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function cancelAccessoryRight(accessory: USBAccessory): void; + + /** + * Obtains the USB Accessory list. + * + * @returns { Array> } USB accessory list. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @syscap SystemCapability.USB.USBManager + * @since 14 + */ + /** + * Obtains the USB Accessory list. + * + * @returns { Array> } USB accessory list. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function getAccessoryList(): Array>; + + /** + * Obtains the accessory handle and opens accessory file descriptor. + * + * @param { USBAccessory } accessory - accessory, which is used to determine the accessory. It cannot be empty. + * @returns { USBAccessoryHandle } returns the handle of the accessory. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @throws { BusinessError } 14401001 - The target USBAccessory not matched. + * @throws { BusinessError } 14401002 - Failed to open the native accessory node. + * @throws { BusinessError } 14401003 - Cannot reopen the accessory. + * @syscap SystemCapability.USB.USBManager + * @since 14 + */ + /** + * Obtains the accessory handle and opens accessory file descriptor. + * + * @param { USBAccessory } accessory - accessory, which is used to determine the accessory. It cannot be empty. + * @returns { USBAccessoryHandle } returns the handle of the accessory. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @throws { BusinessError } 14401001 - The target USBAccessory not matched. + * @throws { BusinessError } 14401002 - Failed to open the native accessory node. + * @throws { BusinessError } 14401003 - Cannot reopen the accessory. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function openAccessory(accessory: USBAccessory): USBAccessoryHandle; + + /** + * Closes the accessory file descriptor. + * + * @param { USBAccessoryHandle } accessoryHandle - Accessory handle to be closed. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @syscap SystemCapability.USB.USBManager + * @since 14 + */ + /** + * Closes the accessory file descriptor. + * + * @param { USBAccessoryHandle } accessoryHandle - Accessory handle to be closed. + * @throws { BusinessError } 401 - Parameter error. Possible causes: + *
    1. Mandatory parameters are left unspecified. + *
    2. Incorrect parameter types. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400004 - Service exception. Possible causes: + *
    1. No accessory is plugged in. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function closeAccessory(accessoryHandle: USBAccessoryHandle): void; + + /** + * Represents the USB endpoint from which data is sent or received. You can obtain the USB endpoint through USBInterface. + * + * @typedef USBEndpoint + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + interface USBEndpoint { + /** + * Endpoint address + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + address: number; + + /** + * Endpoint attributes + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + attributes: number; + + /** + * Endpoint interval + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + interval: number; + + /** + * Maximum size of data packets on the endpoint + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + maxPacketSize: number; + + /** + * Endpoint direction + * + * @type { USBRequestDirection } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + direction: USBRequestDirection; + + /** + * Endpoint number + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + number: number; + + /** + * Endpoint type + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + type: number; + + /** + * Unique ID defined by USBInterface.id, which indicates the interface to which the endpoint belongs + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + interfaceId: number; + + + + } + + /** + * Represents a USB interface. One config can contain multiple **USBInterface** instances, each providing a specific function. + * + * @typedef USBInterface + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + interface USBInterface { + /** + * Unique ID of the USB interface + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + id: number; + + /** + * Interface protocol + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + protocol: number; + + /** + * Device type + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + clazz: number; + + /** + * Device subclass + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + subClass: number; + + /** + * Alternation between descriptors of the same USB interface + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + alternateSetting: number; + + /** + * Interface name + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + name: string; + + /** + * USBEndpoint that belongs to the USB interface + * + * @type { Array } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + endpoints: Array; + } + + /** + * USB configuration. One USBDevice can contain multiple USBConfiguration instances. + * + * @typedef USBConfiguration + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + interface USBConfiguration { + /** + * Unique ID of the USB configuration + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + id: number; + + /** + * Configuration attributes + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + attributes: number; + + /** + * Maximum power consumption, in mA + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + maxPower: number; + + /** + * Configuration name, which can be left empty + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + name: string; + + /** + * Support for remote wakeup + * + * @type { boolean } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + isRemoteWakeup: boolean; + + /** + * Support for independent power supplies + * + * @type { boolean } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + isSelfPowered: boolean; + + /** + * Supported interface attributes + * + * @type { Array } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + interfaces: Array; + } + + /** + * Represents a USB device. + * + * @typedef USBDevice + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + interface USBDevice { + /** + * Bus address + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + busNum: number; + + /** + * Device address + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + devAddress: number; + + /** + * Device SN + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + serial: string; + + /** + * Device name + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + name: string; + + /** + * Device manufacturer + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + manufacturerName: string; + + /** + * Product information + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + productName: string; + + /** + * Product version + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + version: string; + + /** + * Vendor ID + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + vendorId: number; + + /** + * Product ID + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + productId: number; + + /** + * Device class + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + clazz: number; + + /** + * Device subclass + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + subClass: number; + + /** + * Device protocol code + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + protocol: number; + + /** + * Device configuration descriptor information + * + * @type { Array } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + configs: Array; + } + + /** + * Represents a USB device pipe, which is used to determine the USB device. + * + * @typedef USBDevicePipe + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + interface USBDevicePipe { + /** + * Bus address. + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + busNum: number; + + /** + * Device address + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + devAddress: number; + } + + /** + * Enumerates power role types. + * + * @enum { number } + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + export enum PowerRoleType { + /** + * None + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + NONE = 0, + + /** + * External power supply + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + SOURCE = 1, + + /** + * Internal power supply + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + SINK = 2 + } + + /** + * Enumerates data role types. + * + * @enum { number } + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + export enum DataRoleType { + /** + * None + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + NONE = 0, + + /** + * Host mode + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + HOST = 1, + + /** + * Device mode + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + DEVICE = 2 + } + + /** + * Enumerates port mode types + * + * @enum { number } + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + export enum PortModeType { + /** + * None + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + NONE = 0, + + /** + * Upstream facing port, which functions as the sink of power supply + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + UFP = 1, + + /** + * Downstream facing port, which functions as the source of power supply + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + DFP = 2, + + /** + * Dynamic reconfiguration port (DRP), which can function as the DFP (host) or UFP (device). It is not supported currently. + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + DRP = 3, + + /** + * Not supported currently + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + NUM_MODES = 4 + } + + /** + * Enumerates USB device port roles. + * + * @typedef USBPortStatus + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + interface USBPortStatus { + /** + * USB mode + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + currentMode: number; + + /** + * Power role + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + currentPowerRole: number; + + /** + * Data role + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + currentDataRole: number; + } + + /** + * Represents a USB device port. + * + * @typedef USBPort + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + interface USBPort { + /** + * Unique ID of the USB port + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + id: number; + + /** + * Mask combination for the supported mode list of the USB port + * + * @type { PortModeType } + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + supportedModes: PortModeType; + + /** + * USB port role + * + * @type { USBPortStatus } + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + status: USBPortStatus; + } + + /** + * Represents control transfer parameters. + * + * @typedef USBControlParams + * @syscap SystemCapability.USB.USBManager + * @since 9 + * @deprecated since 18 + * @useinstead ohos.usbManager/usbManager#USBDeviceRequestParams + */ + interface USBControlParams { + /** + * Request type + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + * @deprecated since 18 + */ + request: number; + + /** + * Request target type + * + * @type { USBRequestTargetType } + * @syscap SystemCapability.USB.USBManager + * @since 9 + * @deprecated since 18 + */ + target: USBRequestTargetType; + + /** + * Control request type + * + * @type { USBControlRequestType } + * @syscap SystemCapability.USB.USBManager + * @since 9 + * @deprecated since 18 + */ + reqType: USBControlRequestType; + + /** + * Request parameter value + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + * @deprecated since 18 + */ + value: number; + + /** + * Index of the parameter value + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + * @deprecated since 18 + */ + index: number; + + /** + * Data written to or read from the buffer + * + * @type { Uint8Array } + * @syscap SystemCapability.USB.USBManager + * @since 9 + * @deprecated since 18 + */ + data: Uint8Array; + } + + /** + * Represents control transfer parameters. + * + * @typedef USBDeviceRequestParams + * @syscap SystemCapability.USB.USBManager + * @since 12 + */ + interface USBDeviceRequestParams { + /** + * Bit map request type + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 12 + */ + bmRequestType: number; + + /** + * Byte request + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 12 + */ + bRequest: number; + + /** + * Request parameter word value + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 12 + */ + wValue: number; + + /** + * Word index of the parameter value + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 12 + */ + wIndex: number; + + /** + * Word length of the parameter value + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 12 + */ + wLength: number; + + /** + * Data written to or read from the buffer + * + * @type { Uint8Array } + * @syscap SystemCapability.USB.USBManager + * @since 12 + */ + data: Uint8Array; + } + + /** + * Enumerates USB request target types. + * + * @enum { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + export enum USBRequestTargetType { + /** + * USB device + * + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + USB_REQUEST_TARGET_DEVICE = 0, + + /** + * USB interface + * + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + USB_REQUEST_TARGET_INTERFACE = 1, + + /** + * Endpoint + * + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + USB_REQUEST_TARGET_ENDPOINT = 2, + + /** + * Others + * + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + USB_REQUEST_TARGET_OTHER = 3 + } + + /** + * Enumerates control request types. + * + * @enum { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + export enum USBControlRequestType { + /** + * Standard + * + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + USB_REQUEST_TYPE_STANDARD = 0, + + /** + * Class + * + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + USB_REQUEST_TYPE_CLASS = 1, + + /** + * Vendor + * + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + USB_REQUEST_TYPE_VENDOR = 2 + } + + /** + * Enumerates request directions. + * + * @enum { number } + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + export enum USBRequestDirection { + /** + * Request for writing data from the host to the device + * + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + USB_REQUEST_DIR_TO_DEVICE = 0, + + /** + * Request for reading data from the device to the host + * + * @syscap SystemCapability.USB.USBManager + * @since 9 + */ + USB_REQUEST_DIR_FROM_DEVICE = 0x80 + } + + /** + * Enumerates function modes. + * + * @enum { number } + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + export enum FunctionType { + /** + * None + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + NONE = 0, + + /** + * Serial port device + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + ACM = 1, + + /** + * Ethernet port device + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + ECM = 2, + + /** + * HDC device + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + HDC = 4, + + /** + * MTP device + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + MTP = 8, + + /** + * PTP device + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + PTP = 16, + + /** + * RNDIS device + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + RNDIS = 32, + + /** + * MIDI device + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + MIDI = 64, + + /** + * Audio source device + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + AUDIO_SOURCE = 128, + + /** + * NCM device + * + * @syscap SystemCapability.USB.USBManager + * @systemapi + * @since 9 + */ + NCM = 256 + } + + /** + * Represents a USB Accessory. + * + * @typedef USBAccessory + * @syscap SystemCapability.USB.USBManager + * @since 14 + */ + interface USBAccessory { + /** + * The manufacturer name of the accessory. + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since 14 + */ + manufacturer: string; + + /** + * The product of the accessory. + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since 14 + */ + product: string; + + /** + * The user visible description of the accessory. + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since 14 + */ + description: string; + + /** + * The version of the accessory. + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since 14 + */ + version: string; + + /** + * The serial number of the accessory. + * + * @type { string } + * @syscap SystemCapability.USB.USBManager + * @since 14 + */ + serialNumber: string; + } + + /** + * Handle of accessory. + * + * @typedef USBAccessoryHandle + * @syscap SystemCapability.USB.USBManager + * @since 14 + */ + interface USBAccessoryHandle { + /** + * The file descriptor of the accessory.The valid USBAccessoryHandle.accessoryFd is a positive value. + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 14 + */ + accessoryFd: number; + } + + /** + * Usb transfer flag. + * + * @enum { number } + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + export enum UsbTransferFlags { + /** + * Report short frames as errors + * + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + USB_TRANSFER_SHORT_NOT_OK = 0, + + /** + * Automatically free transfer buffer + * + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + USB_TRANSFER_FREE_BUFFER = 1, + + /** + * Automatically free transfer after callback returns + * + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + USB_TRANSFER_FREE_TRANSFER = 2, + + /** + * Transmissions that are multiples of wMaxPacketSize will add an additional zero packet. + * + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + USB_TRANSFER_ADD_ZERO_PACKET = 3 + } + + /** + * Usb transfer status. + * + * @enum { number } + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + export enum UsbTransferStatus { + /** + * Transfer completed + * + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + TRANSFER_COMPLETED = 0, + + /** + * Transfer failed + * + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + TRANSFER_ERROR = 1, + + /** + * Transfer timed out + * + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + TRANSFER_TIMED_OUT = 2, + + /** + * Transfer was canceled + * + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + TRANSFER_CANCELED = 3, + + /** + * For bulk/interrupt endpoints: halt condition detected (endpoint + * stalled). For control endpoints: control request not supported. + * + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + TRANSFER_STALL = 4, + + /** + * Device was disconnected + * + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + TRANSFER_NO_DEVICE = 5, + + /** + * Device sent more data than requested + * + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + TRANSFER_OVERFLOW = 6 + } + + /** + * USB DATA transfer type. + * + * @enum { number } + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + export enum UsbEndpointTransferType { + /** + * Isochronous endpoint + * + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + TRANSFER_TYPE_ISOCHRONOUS = 0x1, + + /** + * Bulk endpoint + * + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + TRANSFER_TYPE_BULK = 0x2, + + /** + * Interrupt endpoint + * + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + TRANSFER_TYPE_INTERRUPT = 0x3 + } + + /** + * Isochronous packet descriptors, only for isochronous transfers. + * + * @typedef UsbIsoPacketDescriptor + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + interface UsbIsoPacketDescriptor { + /** + * Length of data to request in this packet + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + length: number; + + /** + * Amount of data that was actually transferred + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + actualLength: number; + + /** + * Status code for this packet + * + * @type { UsbTransferStatus } + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + status: UsbTransferStatus; + } + + /** + * submit transfer callback. + * + * @typedef SubmitTransferCallback + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + interface SubmitTransferCallback { + /** + * Actual length of data that was transferred. Read-only, and only for + * use within transfer callback function. Not valid for isochronous endpoint transfers. + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + actualLength: number; + + /** + * The status of the transfer. Read-only, and only for use within transfer callback function. + * + * @type { UsbTransferStatus } + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + status: UsbTransferStatus; + + /** + * Isochronous packet descriptors, for isochronous transfers only. + * + * @type { Array> } + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + isoPacketDescs: Array>; + } + + /** + * As a generic USB data transfer interface. The Client populates this interface and + * submits it in order to request a transfer. + * + * @typedef UsbDataTransferParams + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + interface UsbDataTransferParams { + /** + * Pipe of the device that this data transfer will be submitted to. + * + * @type { USBDevicePipe } + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + devPipe: USBDevicePipe; + + /** + * A bitwise OR combination of UsbTransferFlags. + * + * @type { UsbTransferFlags } + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + flags: UsbTransferFlags; + + /** + * Address of the endpoint where this transfer will be sent. + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + endpoint: number; + + /** + * Type of the transfer + * + * @type { UsbEndpointTransferType } + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + type: UsbEndpointTransferType; + + /** + * Timeout for this transfer in milliseconds. A value of 0 indicates no timeout. + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + timeout: number; + + /** + * Length of the data buffer. Must be non-negative. + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + length: number; + + /** + * Callback function. This will be invoked when the transfer completes, fails, or is canceled. + * + * @type { AsyncCallback } + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + callback: AsyncCallback; + + /** + * User context data. Useful for associating specific data to a transfer + * that can be accessed from within the callback function. + * + * @type { Uint8Array } + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + userData: Uint8Array; + + /** + * Data buffer + * + * @type { Uint8Array } + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + buffer: Uint8Array; + + /** + * Count of isochronous packets. Only used for I/O with isochronous endpoints. Must be non-negative. + * + * @type { number } + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + isoPacketCount: number; + } + + /** + * Submit USB data transfer. + * + * @param { transfer } As a generic USB data transfer interface. The Client populates this interface and + * submits it in order to request a transfer + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. + * @throws { BusinessError } 14400007 - Resource busy. Possible causes: + *
    1. The transfer has already been submitted. + *
    2. The interface is claimed by another program or driver. + * @throws { BusinessError } 14400008 - No such device (it may have been disconnected). + * @throws { BusinessError } 14400009 - Insufficient memory. Possible causes: + *
    1. Memory allocation failed. + * @throws { BusinessError } 14400012 - Transmission I/O error. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function usbSubmitTransfer(transfer: UsbDataTransferParams): void; + + /** + * Cancel USB data transfer. + * + * @param { transfer } Cancel the target transfer + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. + * @throws { BusinessError } 14400008 - No such device (it may have been disconnected). + * @throws { BusinessError } 14400010 - Other USB error. Possible causes: + *
    1.Unrecognized discard error code. + * @throws { BusinessError } 14400011 - The transfer is not in progress, or is already complete or cancelled. + * @syscap SystemCapability.USB.USBManager + * @since 18 + */ + function usbCancelTransfer(transfer: UsbDataTransferParams): void; + + /** + * Perform a USB port reset to reinitialize a usb device. The operation will attempt to restore the previous configuration + * and alternate interface settings after the reset has completed. + * + * @param { USBDevicePipe } pipe - Represents a USB device,which is the target object to be restarted.It cannot be empty. + * @returns { boolean } If the restart operation is successful, return {@code true}; if the restart operation fails, return {@code false}. + * @throws { BusinessError } 801 - Capability not supported. + * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. + * @throws { BusinessError } 14400004 -Service exception. Possible causes: 1. No accessory is plugged in.. + * @throws { BusinessError } 14400008 - No such device(it may have been disconnected) + * @throws { BusinessError } 14400010 - Other USB error. Possible causes: + *
    1.Unrecognized discard error code. + * @throws { BusinessError } 14400013 - The USBDevicePipe validity check failed. Possible causes: + *
    1.The input parameters fail the validation check. + *
    2.The call chain used to obtain the input parameters is not reasonable. + * @syscap SystemCapability.USB.USBManager + * @since 20 + */ + function resetUsbDevice(pipe: USBDevicePipe): boolean; + + + + + +} + export default usbManager; \ No newline at end of file diff --git a/api/@ohos.usbManager.serial.d.ts b/api/@ohos.usbManager.serial.d.ts index 08992a6b7f..621b6a5918 100644 --- a/api/@ohos.usbManager.serial.d.ts +++ b/api/@ohos.usbManager.serial.d.ts @@ -22,8 +22,7 @@ * Provides APIs for managing USB-to-virtual serial ports and implementing USB-to-virtual serial port communication. * @namespace serialManager * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ declare namespace serialManager { @@ -31,25 +30,22 @@ declare namespace serialManager { * Obtains the serial port device list. * @returns { Readonly[]} Returns the list of serial port devices obtained. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ function getPortList(): Readonly[]; /** * Checks whether a serial port device has the access right. The system applications have the access right by default. - * @param { int} portId ID of the target device. For details, see SerialPort.portId. + * @param { number} portId ID of the target device. For details, see SerialPort.portId. * @returns {boolean} Returns true if the device has the right; returns false otherwise. * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 14400005 Database operation exception. * @throws { BusinessError } 31400001 Serial port management exception. * @throws { BusinessError } 31400003 PortId does not exist. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts{ '1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ - function hasSerialRight(portId: int): boolean; + function hasSerialRight(portId: number): boolean; /** * Requests the right for accessing a serial port device from the user. The system applications do not need to call this API. @@ -60,29 +56,26 @@ declare namespace serialManager { * @throws { BusinessError } 31400001 Serial port management exception. * @throws { BusinessError } 31400003 PortId does not exist. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts{ '1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ - function requestSerialRight(portId: int): Promise; + function requestSerialRight(portId: number): Promise; /** * Adds the access right for a serial port device. * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { int } tokenId Token ID of the target application. - * @param { int} portId ID of the target device. For details, see SerialPort.portId. + * @param { number } tokenId Token ID of the target application. + * @param { number} portId ID of the target device. For details, see SerialPort.portId. * @throws { BusinessError } 201 Permission verification failed. The application does not have the permission required to call the API. * @throws { BusinessError } 202 Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 14400005 Database operation exception. * @throws { BusinessError } 31400001 Serial port management exception. * @throws { BusinessError } 31400003 PortId does not exist. * @syscap SystemCapability.USB.USBManager.Serial * @systemapi - * @since arkts{ '1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ - function addSerialRight(tokenId: int, portId: int): void; + function addSerialRight(tokenId: number, portId: number): void; /** * Cancels the access right for a serial port device. This API will not cancel the default access right of system applications. @@ -93,10 +86,9 @@ declare namespace serialManager { * @throws { BusinessError } 31400002 Access denied. Call requestSerialRight to request user authorization first. * @throws { BusinessError } 31400003 PortId does not exist. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts{ '1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ - function cancelSerialRight(portId: int): void; + function cancelSerialRight(portId: number): void; /** * Opens a serial port device. @@ -107,10 +99,9 @@ declare namespace serialManager { * @throws { BusinessError } 31400003 PortId does not exist. * @throws { BusinessError } 31400004 The serial port device is occupied. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts{ '1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ - function open(portId: int): void; + function open(portId: number): void; /** * Closes a serial port device. @@ -120,44 +111,39 @@ declare namespace serialManager { * @throws { BusinessError } 31400003 PortId does not exist. * @throws { BusinessError } 31400005 The serial port device is not opened. Call the open API first. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts{ '1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ - function close(portId: int): void; + function close(portId: number): void; /** * Obtains the communication parameters of a serial port device. - * @param { int} portId ID of the target device. For details, see SerialPort.portId. + * @param { number} portId ID of the target device. For details, see SerialPort.portId. * @returns { Readonly} Communication parameters obtained, which are read-only. * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 31400001 Serial port management exception. * @throws { BusinessError } 31400003 PortId does not exist. * @throws { BusinessError } 31400005 The serial port device is not opened. Call the open API first. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts{ '1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ - function getAttribute(portId: int): Readonly; + function getAttribute(portId: number): Readonly; /** * Sets the communication parameters for a serial port device. - * @param { int} portId ID of the target device. For details, see SerialPort.portId. + * @param { number} portId ID of the target device. For details, see SerialPort.portId. * @param { SerialAttribute} attribute Communication parameters to set. * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 31400001 Serial port management exception. * @throws { BusinessError } 31400003 PortId does not exist. * @throws { BusinessError } 31400005 The serial port device is not opened. Call the open API first. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts{ '1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ - function setAttribute(portId: int, attribute: SerialAttribute): void; + function setAttribute(portId: number, attribute: SerialAttribute): void; /** * Reads data from a serial port device. This API uses a promise to return the result. - * @param { int} portId ID of the target device. For details, see SerialPort.portId. + * @param { number} portId ID of the target device. For details, see SerialPort.portId. * @param { Uint8Array } buffer Buffer for storing the data read, with a maximum length of 8192 bytes. * @param { number } timeout Timeout duration for reading data. The value is a non-negative number. The default value 0 indicates that there is no time limit for data reading. * @returns { Promise } Promise used to return the length of the data read. @@ -170,14 +156,13 @@ declare namespace serialManager { *
    1. The transfer was canceled. *
    2. The device offered more data than allowed. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts{ '1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ - function read(portId: int, buffer: Uint8Array, timeout?: int): Promise; + function read(portId: number, buffer: Uint8Array, timeout?: number): Promise; /** * Reads data from a serial port device. This API returns the result synchronously. - * @param { int} portId ID of the target device. For details, see SerialPort.portId. + * @param { number} portId ID of the target device. For details, see SerialPort.portId. * @param { Uint8Array } buffer Buffer for storing the data read, with a maximum length of 8192 bytes. * @param { number } timeout Timeout duration for reading data. The value is a non-negative number. The default value 0 indicates that there is no time limit for data reading. * @returns {number} Length of the data read. @@ -190,14 +175,13 @@ declare namespace serialManager { *
    1. The transfer was canceled. *
    2. The device offered more data than allowed. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts{ '1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ - function readSync(portId: int, buffer: Uint8Array, timeout?: int): int; + function readSync(portId: number, buffer: Uint8Array, timeout?: number): number; /** * Writes data to a serial port device. This API uses a promise to return the result. - * @param { int} portId ID of the target device. For details, see SerialPort.portId. + * @param { number} portId ID of the target device. For details, see SerialPort.portId. * @param { Uint8Array } buffer Buffer for storing the data written, with a maximum length of 128 KB. * @param { number } timeout Timeout duration for writing data. The value is a non-negative number. The default value 0 indicates that there is no time limit for data writing. * @returns { Promise } Promise used to return the length of the data written. @@ -210,14 +194,13 @@ declare namespace serialManager { *
    1. The transfer was canceled. *
    2. The device offered more data than allowed. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts{ '1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ - function write(portId: int, buffer: Uint8Array, timeout?: int): Promise; + function write(portId: number, buffer: Uint8Array, timeout?: number): Promise; /** * Writes data to a serial port device. This API returns the result synchronously. - * @param { int} portId ID of the target device. For details, see SerialPort.portId. + * @param { number} portId ID of the target device. For details, see SerialPort.portId. * @param { Uint8Array } buffer Buffer for storing the data written, with a maximum length of 128 KB. * @param { number } timeout Timeout duration for writing data. The value is a non-negative number. The default value 0 indicates that there is no time limit for data writing. * @returns { number } Length of the data written. @@ -230,35 +213,31 @@ declare namespace serialManager { *
    1. The transfer was canceled. *
    2. The device offered more data than allowed. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts{ '1.1':'19','1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ - function writeSync(portId: int, buffer: Uint8Array, timeout?: int): int; + function writeSync(portId: number, buffer: Uint8Array, timeout?: number): number; /** * Represents a serial port device. * @typedef SerialPort * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ interface SerialPort { /** * Serial port device ID. - * @type { int } + * @type { number } * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ - portId: int; + portId: number; /** * Serial port device name. * @type { string } * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ deviceName: string; } @@ -266,8 +245,7 @@ declare namespace serialManager { * Represents the communication parameters of a serial port device. * @typedef SerialAttribute * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ interface SerialAttribute { @@ -275,8 +253,7 @@ declare namespace serialManager { * Baud rate. * @type { BaudRates } * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ baudRate: BaudRates; @@ -285,8 +262,7 @@ declare namespace serialManager { * @type { DataBits } * @default DATABIT_8 * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ dataBits?: DataBits; @@ -295,8 +271,7 @@ declare namespace serialManager { * @type { Parity } * @default NONE * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ parity?: Parity; @@ -305,49 +280,43 @@ declare namespace serialManager { * @type { StopBits } * @default STOPBIT_1 * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ stopBits?: StopBits; } /** * Enumerates the baud rates of a serial port device, in bit/s. - * @enum { int } + * @enum { number } * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ enum BaudRates { /** * The baud rate is 50 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_50 = 50, /** * The baud rate is 75 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_75 = 75, /** * The baud rate is 110 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_110 = 110, /** * The baud rate is 134 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_134 = 134, @@ -355,328 +324,286 @@ declare namespace serialManager { * The baud rate is 150 bit/s. * * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_150 = 150, /** * The baud rate is 200 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_200 = 200, /** * The baud rate is 300 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_300 = 300, /** * The baud rate is 600 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_600 = 600, /** * The baud rate is 1200 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_1200 = 1200, /** * The baud rate is 1800 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_1800 = 1800, /** * The baud rate is 2400 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_2400 = 2400, /** * The baud rate is 4800 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_4800 = 4800, /** * The baud rate is 9600 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_9600 = 9600, /** * The baud rate is 19200 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_19200 = 19200, /** * The baud rate is 38400 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_38400 = 38400, /** * The baud rate is 57600 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_57600 = 57600, /** * The baud rate is 115200 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_115200 = 115200, /** * The baud rate is 230400 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_230400 = 230400, /** * The baud rate is 460800 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_460800 = 460800, /** * The baud rate is 500000 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_500000 = 500000, /** * The baud rate is 576000 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_576000 = 576000, /** * The baud rate is 921600 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_921600 = 921600, /** * The baud rate is 1000000 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_1000000 = 1000000, /** * The baud rate is 1152000 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_1152000 = 1152000, /** * The baud rate is 1500000 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_1500000 = 1500000, /** * The baud rate is 2000000 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_2000000 = 2000000, /** * The baud rate is 2500000 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_2500000 = 2500000, /** * The baud rate is 3000000 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_3000000 = 3000000, /** * The baud rate is 3500000 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_3500000 = 3500000, /** * The baud rate is 4000000 bit/s. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ BAUDRATE_4000000 = 4000000 } /** * Enumerates the data bits of a serial port device. - * @enum { int } + * @enum { number } * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ enum DataBits { /** * The number of data bits is 8. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ DATABIT_8 = 8, /** * The number of data bits is 7. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ DATABIT_7 = 7, /** * The number of data bits is 6. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ DATABIT_6 = 6, /** * The number of data bits is 5. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ DATABIT_5 = 5 - DATABIT_5 = 5 } /** * Enumerates the parity bits of a serial port device. - * @enum { int } + * @enum { number } * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ enum Parity { /** * No parity. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ PARITY_NONE = 0, /** * Odd parity. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ PARITY_ODD = 1, /** * Even parity. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ PARITY_EVEN = 2, /** * Mark parity, whose parity bit is always 1. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ PARITY_MARK = 3, /** * Space parity, whose parity bit is always 0. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ PARITY_SPACE = 4 } /** * Enumerates the stop bits for serial port communication. - * @enum { int } + * @enum { number } * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ enum StopBits { /** * The number of stop bits is 1. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ STOPBIT_1 = 0, /** * The number of stop bits is 2. * @syscap SystemCapability.USB.USBManager.Serial - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ STOPBIT_2 = 1 - STOPBIT_2 = 1 } } -export default serialManager; +export default serialManager; \ No newline at end of file diff --git a/api/@ohos.util.ArrayList.d.ts b/api/@ohos.util.ArrayList.d.ts index a4b9f799e3..55f957b50b 100644 --- a/api/@ohos.util.ArrayList.d.ts +++ b/api/@ohos.util.ArrayList.d.ts @@ -482,7 +482,6 @@ declare class ArrayList { * @arkts 1.2 */ replaceAllElements(callbackFn: ArrayListReplaceCb): void; - replaceAllElements(callbackFn: ArrayListReplaceCb): void; /** * Executes a provided function once for each value in the arraylist object. @@ -541,7 +540,6 @@ declare class ArrayList { * Iterates over elements in a generic ArrayList and executes a callback function for each element. * * @param { ArrayListForEachCb } callbackFn - A callback function to execute for each element. - * @param { ArrayListForEachCb } callbackFn - A callback function to execute for each element. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice @@ -549,7 +547,6 @@ declare class ArrayList { * @arkts 1.2 */ forEach(callbackFn: ArrayListForEachCb): void; - forEach(callbackFn: ArrayListForEachCb): void; /** * Sorts this arraylist according to the order induced by the specified comparator,without comparator this parameter, @@ -803,13 +800,37 @@ declare class ArrayList { * @throws { BusinessError } 401 - Parameter error. * @throws { BusinessError } 10200001 - The value of index is out of range. * @syscap SystemCapability.Utils.Lang - * @crossplatform * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ [index: number]: T; + /** + * Returns the item at that index. + * + * @param { number } index - The zero-based index of the desired code unit. + * @returns { T } The element in the arrayList matching the given index. + * @throws { BusinessError } 10200001 - The value of index is out of range. + * @syscap SystemCapability.Utils.Lang + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + $_get(index: number): T; + + /** + * Set the value of item at that index. + * + * @param { number } index - The index of the element to set. + * @param { T } value - The value to set at the specified index. + * @throws { BusinessError } 10200001 - The value of index is out of range. + * @syscap SystemCapability.Utils.Lang + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + $_set(index: number, value: T): void; + /** * If the newCapacity provided by the user is greater than or equal to length, * change the capacity of the arraylist to newCapacity, otherwise the capacity will not be changed @@ -923,7 +944,6 @@ declare class ArrayList { * The type of ArrayList callback function. * * @typedef { function } ArrayListForEachCb - * @typedef { function } ArrayListForEachCb * @param { T } value - The current element being processed * @param { number } index - The index of the current element * @param { ArrayList } arrlist - The ArrayList instance being traversed @@ -934,13 +954,11 @@ declare class ArrayList { * @arkts 1.2 */ export type ArrayListForEachCb = (value: T, index: number, arrlist: ArrayList) => void; - export type ArrayListForEachCb = (value: T, index: number, arrlist: ArrayList) => void; /** * The type of ArrayList callback function. * * @typedef { function } ArrayListReplaceCb - * @typedef { function } ArrayListReplaceCb * @param { T } value - The current element being processed * @param { number } index - The index of the current element * @param { ArrayList } arrlist - The ArrayList instance being traversed @@ -951,6 +969,5 @@ declare class ArrayList { * @arkts 1.2 */ export type ArrayListReplaceCb = (value: T, index: number, arrlist: ArrayList) => T; - export type ArrayListReplaceCb = (value: T, index: number, arrlist: ArrayList) => T; export default ArrayList; diff --git a/api/@ohos.util.Deque.d.ts b/api/@ohos.util.Deque.d.ts index 98e109eac3..73f2f662e3 100644 --- a/api/@ohos.util.Deque.d.ts +++ b/api/@ohos.util.Deque.d.ts @@ -420,7 +420,6 @@ declare class Deque { * Iterates over elements in a generic Deque (double-ended queue) and executes a callback function for each element. * * @param { DequeForEachCb } callbackFn - A callback function to execute for each element. - * @param { DequeForEachCb } callbackFn - A callback function to execute for each element. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice @@ -432,16 +431,27 @@ declare class Deque { * Returns the byte at the specified index. * * @param { number } index - The zero-based index of the desired code unit. - * Throws error if index < 0 or index >= deque.length. - * @returns { T } The element in the deque matching the given index. - * @throws { BusinessError } 10200001 - The value of index is out of range. + * @returns { T } The element in the deque matching the given index. + * @syscap SystemCapability.Utils.Lang + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + $_get(index: number): T; + + /** + * Sets the byte at the specified index. + * + * @param { number } index – The index of the element to set. + * @param { T } value – The value to set at the specified index. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice * @since 20 * @arkts 1.2 */ - [index: number]: T; + $_set(index: number, value: T): void; /** * returns an iterator.Each item of the iterator is a Javascript Object @@ -489,7 +499,6 @@ declare class Deque { * The type of Deque forEach callback function. * * @typedef { function } DequeForEachCb - * @typedef { function } DequeForEachCb * @param { T } value - The current element being processed * @param { number } index - The index of the current element * @param { Deque } deque - The Deque instance being traversed @@ -500,6 +509,5 @@ declare class Deque { * @arkts 1.2 */ export type DequeForEachCb = (value: T, index: number, deque: Deque) => void; - export type DequeForEachCb = (value: T, index: number, deque: Deque) => void; export default Deque; diff --git a/api/@ohos.util.LightWeightMap.d.ts b/api/@ohos.util.LightWeightMap.d.ts index 99ac357abc..ff83f28ea5 100644 --- a/api/@ohos.util.LightWeightMap.d.ts +++ b/api/@ohos.util.LightWeightMap.d.ts @@ -483,19 +483,6 @@ declare class LightWeightMap { getKeyAt(index: number): K | undefined; - /** - * Obtains the key at the location identified by index in an LightWeightMap container - * - * @param { number } index - index index Target subscript for search - * @returns { K | undefined } the key of key-value pairs or undefined - * @throws { BusinessError } 10200001 - The value of index is out of range. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - getKeyAt(index: number): K | undefined; /** * Obtains a ES6 iterator that contains all the keys of an LightWeightMap container * @@ -967,19 +954,6 @@ declare class LightWeightMap { */ getValueAt(index: number): V | undefined; - /** - * Obtains the value identified by index in an LightWeightMap container - * - * @param { number } index - index index Target subscript for search - * @returns { V | undefined } the value of key-value pairs or undefined - * @throws { BusinessError } 10200001 - The value of index is out of range. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - getValueAt(index: number): V | undefined; /** * Returns an iterator of the values contained in this map * diff --git a/api/@ohos.util.List.d.ts b/api/@ohos.util.List.d.ts index 2d768e007e..405a412252 100644 --- a/api/@ohos.util.List.d.ts +++ b/api/@ohos.util.List.d.ts @@ -1008,7 +1008,6 @@ declare class List { * @arkts 1.2 */ export type ListForEachCb = (value: T, index: number, list: List) => void -export type ListForEachCb = (value: T, index: number, list: List) => void /** * The type of List callback function. @@ -1024,6 +1023,5 @@ export type ListForEachCb = (value: T, index: number, list: List) => void * @arkts 1.2 */ export type ListReplaceCb = (value: T, index: number, list: List) => T -export type ListReplaceCb = (value: T, index: number, list: List) => T export default List; diff --git a/api/@ohos.util.d.ets b/api/@ohos.util.d.ets index f8ce4a7f0f..c3883f4614 100644 --- a/api/@ohos.util.d.ets +++ b/api/@ohos.util.d.ets @@ -144,7 +144,6 @@ declare namespace util { * @since 20 */ encodeSync(src: Uint8Array, options?: Type): Uint8Array; - encodeSync(src: Uint8Array, options?: Type): Uint8Array; /** * Encodes the specified byte array into a String using the Base64 encoding scheme. @@ -161,7 +160,6 @@ declare namespace util { * @since 20 */ encodeToStringSync(src: Uint8Array, options?: Type): string; - encodeToStringSync(src: Uint8Array, options?: Type): string; /** * Decodes a Base64 encoded String or input u8 array into a newly-allocated u8 array using the Base64 encoding scheme. @@ -178,7 +176,6 @@ declare namespace util { * @since 20 */ decodeSync(src: Uint8Array | string, options?: Type): Uint8Array; - decodeSync(src: Uint8Array | string, options?: Type): Uint8Array; /** * Asynchronously encodes all bytes in the specified u8 array into the newly allocated u8 array using the Base64 encoding scheme. @@ -195,7 +192,6 @@ declare namespace util { * @since 20 */ encode(src: Uint8Array, options?: Type): Promise; - encode(src: Uint8Array, options?: Type): Promise; /** * Asynchronously encodes the specified byte array into a String using the Base64 encoding scheme. @@ -212,14 +208,12 @@ declare namespace util { * @since 20 */ encodeToString(src: Uint8Array, options?: Type): Promise; - encodeToString(src: Uint8Array, options?: Type): Promise; /** * Use the Base64 encoding scheme to asynchronously decode a Base64-encoded string or * input u8 array into a newly allocated u8 array. * * @param { Uint8Array | string } src - A Uint8Array value or a string value - * @param { Uint8Array | string } src - A Uint8Array value or a string value * @param { Type } [options] - one of the Type enumeration * @returns { Promise } Return the decoded asynchronous Uint8Array. * @throws { BusinessError } 401 - Parameter error. Possible causes: @@ -231,7 +225,6 @@ declare namespace util { * @since 20 */ decode(src: Uint8Array | string, options?: Type): Promise; - decode(src: Uint8Array | string, options?: Type): Promise; } /** @@ -942,8 +935,6 @@ declare namespace util { * @param { Object } obj - An object * @returns { boolean } Returns true if the given object is the same as the current object; * Otherwise, false is returned. - * @returns { boolean } Returns true if the given object is the same as the current object; - * Otherwise, false is returned. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice @@ -1027,8 +1018,6 @@ declare namespace util { * * @returns { boolean } If the value represented by the current object is 0, true is returned. * Otherwise, false is returned. - * @returns { boolean } If the value represented by the current object is 0, true is returned. - * Otherwise, false is returned. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice @@ -1161,8 +1150,6 @@ declare namespace util { * @param { Object } value - A arraybuffer value * @returns { boolean } Returns true if the value is a built-in ArrayBuffer instance. * This does not include SharedArrayBuffer instances. - * @returns { boolean } Returns true if the value is a built-in ArrayBuffer instance. - * This does not include SharedArrayBuffer instances. * Usually, it is desirable to test for both; See isAnyArrayBuffer() for that. * @syscap SystemCapability.Utils.Lang * @crossplatform @@ -1438,19 +1425,6 @@ declare namespace util { */ function promisify(original: Function): (...args: FixedArray) => Promise; - /** - * Takes a function following the common error-first callback style, i.e taking an (err, value) => - * callback as the last argument, and return a function that returns promises. - * - * @param { Function } original - Asynchronous Function - * @returns { Function } Return a function that returns promises - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - */ - function promisify(original: Function): (...args: FixedArray) => Promise; - /** * Get the hash code of an object. * @@ -1487,30 +1461,5 @@ declare namespace util { * @since 20 */ function parseUUID(uuid: string): Uint8Array; - - /** - * Generate a random RFC 4122 version 4 binary UUID using a cryptographically secure random number generator. - * - * @param { boolean } [entropyCache] - Whether to generate the UUID with using the cache. Default: true. - * @returns { Uint8Array | undefined } Return a Uint8Array representing this UUID, or undefined on failure. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - */ - function generateRandomBinaryUUID(entropyCache?: boolean): Uint8Array | undefined; - - /** - * Parse a UUID from the string standard representation as described in the RFC 4122 version 4. - * - * @param { string } uuid - String that specifies a UUID - * @returns { Uint8Array } Return a Uint8Array representing this UUID. Throw SyntaxError if parsing fails. - * @throws { BusinessError } 10200002 - Invalid uuid string. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - */ - function parseUUID(uuid: string): Uint8Array; } export default util; diff --git a/api/@ohos.util.stream.d.ts b/api/@ohos.util.stream.d.ts index 0ee2bb6e3c..bc2a0151eb 100644 --- a/api/@ohos.util.stream.d.ts +++ b/api/@ohos.util.stream.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024-2025 Huawei Device Co., Ltd. + * Copyright (c) 2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -/** + + /** * @file * @kit ArkTS */ @@ -26,29 +26,6 @@ import emitter from './@ohos.events.emitter'; import buffer from '@ohos.buffer'; /*** endif */ -/** - * The stream module provides a comprehensive set of stream processing capabilities, including four types of streams: - * - Writable: streams designed for writing data to. - * - Readable: streams designed for reading data from. - * - Duplex: streams that are both readable and writable. - * - Transform: a specialized type of duplex stream that can modify or transform data as it's being written and read. - * - * @namespace stream - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ - -/*** if arkts 1.1 */ -import { Callback } from './@ohos.base'; -import emitter from './@ohos.events.emitter'; -/*** endif */ -/*** if arkts 1.2 */ -import buffer from '@ohos.buffer'; -/*** endif */ - /** * The stream module provides a comprehensive set of stream processing capabilities, including four types of streams: * - Writable: streams designed for writing data to. @@ -65,19 +42,14 @@ import buffer from '@ohos.buffer'; */ declare namespace stream { /** - * Return readable options. * Return readable options. * * @interface ReadableOptions - * @interface ReadableOptions * @syscap SystemCapability.Utils.Lang * @crossplatform - * @crossplatform * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 */ interface ReadableOptions { /** @@ -100,27 +72,6 @@ declare namespace stream { encoding?: string; } - interface ReadableOptions { - /** - * Specifies the encoding format of the data. If this parameter is provided, - * the readable stream decodes the data into a string in the specified encoding format. Default: utf8. - * If an invalid string is entered, a 401 exception is thrown in the Readable constructor. - * Supported encoding formats: utf-8, ibm866, iso-8859-2, iso-8859-3, iso-8859-4, iso-8859-5, iso-8859-6, - * iso-8859-7, iso-8859-8, iso-8859-8-i, iso-8859-10, iso-8859-13, iso-8859-14, iso-8859-15, koi8-r, koi8-u, - * macintosh, windows-874, windows-1250, windows-1251, windows-1252, windows-1253, windows-1254, windows-1255, - * windows-1256, windows-1257, windows-1258, x-mac-cyrillic, gbk, gb18030, big5, euc-jp, iso-2022-jp, shift_jis, - * euc-kr, utf-16be, utf-16le. - * - * @type { ?string } - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ - encoding?: string; - } - /** * Streams to which data can be written. * @@ -142,7 +93,6 @@ declare namespace stream { */ constructor(); - /** * writes a chunk to Writable and invokes callback when the chunk is flushed. The return value indicates * whether the internal buffer of the Writable reaches the hightWaterMark. If true is returned, the buffer @@ -166,8 +116,6 @@ declare namespace stream { * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 */ write(chunk?: string | Uint8Array, encoding?: string, callback?: Function): boolean; @@ -188,8 +136,6 @@ declare namespace stream { * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 */ end(chunk?: string | Uint8Array, encoding?: string, callback?: Function): Writable; @@ -210,7 +156,6 @@ declare namespace stream { */ setDefaultEncoding(encoding?: string): boolean; - /** * After the call, all Write operations will be forced to write to the buffer instead of being flushed. * @@ -223,7 +168,6 @@ declare namespace stream { */ cork(): boolean; - /** * After calling, flush all buffers. * @@ -236,7 +180,6 @@ declare namespace stream { */ uncork(): boolean; - /** * Registering Event Messages. * @@ -250,24 +193,9 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ on(event: string, callback: Callback): void; - /** - * Registering Event Messages. - * - * @param { string } event - Register Event. - * @param { Function } callback - event callbacks. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - on(event: string, callback: Function): void; - - /** * Registering Event Messages. * @@ -293,16 +221,10 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ off(event: string, callback?: Callback): void; - /** - * Cancel event message. - * - * @param { string } event - Register Event. - * @param { Function } [callback] - event callbacks. * Cancel event message. * * @param { string } event - Register Event. @@ -312,11 +234,8 @@ declare namespace stream { * @atomicservice * @since 20 * @arkts 1.2 - * @since 20 - * @arkts 1.2 */ off(event: string, callback?: Function): void; - off(event: string, callback?: Function): void; /** * This method is invoked by the Writable method during initialization and must not be invoked directly. @@ -326,20 +245,13 @@ declare namespace stream { * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. - * @param { Function } callback - Callback when the stream has completed the initial. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.Mandatory parameters are left unspecified; - * 2.Incorrect parameter types. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 */ doInitialize(callback: Function): void; - doInitialize(callback: Function): void; /** * Implemented by subclass inheritance. The implementation logic of flushing chunks in the buffer must not be @@ -357,12 +269,9 @@ declare namespace stream { * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 */ doWrite(chunk: string | Uint8Array, encoding: string, callback: Function): void; - /** * The implementation logic of flushing chunks in the buffer in batches should not be actively called. * The call is controlled by Writable.write. @@ -378,8 +287,6 @@ declare namespace stream { * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 */ doWritev(chunks: string[] | Uint8Array[], callback: Function): void; @@ -435,6 +342,7 @@ declare namespace stream { * Is true if it is safe to call writable.write(), which means the stream has not been destroyed, error or end. * * @type { boolean } + * @readonly * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice @@ -455,7 +363,7 @@ declare namespace stream { get writable(): boolean; /** - * Value of highWatermark. + * Size of data that can be flushed, in bytes or objects. * * @type { number } * @readonly @@ -463,7 +371,6 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ readonly writableLength: number; @@ -480,9 +387,10 @@ declare namespace stream { get writableLength(): number; /** - * Value of highWatermark. + * Number of times writable.uncork() needs to be called in order to fully uncork the stream. * * @type { number } + * @readonly * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice @@ -511,7 +419,6 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ readonly writableEnded: boolean; @@ -528,9 +435,10 @@ declare namespace stream { get writableEnded(): boolean; /** - * Is true if it is safe to call writable.write(), which means the stream has not been destroyed, error or end. + * Whether Writable.end has been called and all buffers have been flushed. * * @type { boolean } + * @readonly * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice @@ -565,14 +473,13 @@ declare namespace stream { */ class Transform extends Duplex { /** - * Size of data that can be flushed, in bytes or objects. + * The Transform constructor. * - * @type { number } * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since 20 - * @arkts 1.2 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -597,7 +504,8 @@ declare namespace stream { doTransform(chunk: string, encoding: string, callback: Function): void; /** - * Whether Writable.end has been called. + * After all data is flushed to the write stream, you can use the Transform.doFlush writes some extra data, must + * not be called directly, only called by Writable after flushing all data. * * @param { Function } callback - Callback after flush completion. * @throws { BusinessError } 401 - Parameter error. Possible causes: @@ -634,7 +542,6 @@ declare namespace stream { */ constructor(); - /** * The Readable constructor. * @@ -651,7 +558,6 @@ declare namespace stream { */ constructor(options: ReadableOptions); - /** * Reads a buffer of a specified size from the buffer. If the available buffer is sufficient, the result * of the specified size is returned. Otherwise, if Readable has ended, all remaining buffers are returned. @@ -667,30 +573,9 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ read(size?: number): string | null; - /** - * Reads a buffer of a specified size from the buffer. If the available buffer is sufficient, the result - * of the specified size is returned. Otherwise, if Readable has ended, all remaining buffers are returned. - * - * @param { number } [size] - Expected length of the data to be read. - * @returns { buffer.Buffer | string | null } If no data is available to read, null is returned. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.Mandatory parameters are left unspecified; - * 2.Incorrect parameter types; - * 3.Parameter verification failed. - * @throws { BusinessError } 10200038 - The doRead method has not been implemented. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - read(size?: number): buffer.Buffer | string | null; - - /** * Reads a buffer of a specified size from the buffer. If the available buffer is sufficient, the result * of the specified size is returned. Otherwise, if Readable has ended, all remaining buffers are returned. @@ -722,7 +607,6 @@ declare namespace stream { */ resume(): Readable; - /** * Toggle Readable to Suspend Mode. * @@ -735,7 +619,6 @@ declare namespace stream { */ pause(): Readable; - /** * Sets the encoding format of the input binary data.Default: utf8. * @@ -752,7 +635,6 @@ declare namespace stream { */ setEncoding(encoding?: string): boolean; - /** * Query whether it is in pause state. * @@ -765,7 +647,6 @@ declare namespace stream { */ isPaused(): boolean; - /** * Concatenated a Writable to a Readable and switches the Readable to stream mode. * @@ -784,7 +665,6 @@ declare namespace stream { */ pipe(destination: Writable, options?: Object): Writable; - /** * Disconnect Writable from Readable. * @@ -802,7 +682,6 @@ declare namespace stream { */ unpipe(destination?: Writable): Readable; - /** * Registering Event Messages. * @@ -815,24 +694,9 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ on(event: string, callback: Callback): void; - /** - * Registering Event Messages. - * - * @param { string } event - Registering Events. - * @param { Function } callback - Event callback. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - on(event: string, callback: Function): void; - - /** * Registering Event Messages. * @@ -858,29 +722,21 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ off(event: string, callback?: Callback): void; - /** - * Cancel event message. * Cancel event message. * * @param { string } event - Registering Events. * @param { Function } [callback] - Event callback. - * @param { string } event - Registering Events. - * @param { Function } [callback] - Event callback. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice * @since 20 * @arkts 1.2 - * @since 20 - * @arkts 1.2 */ off(event: string, callback?: Function): void; - off(event: string, callback?: Function): void; /** * It may be implemented by child classes, and if so, will be called by the Readable class methods only. @@ -891,21 +747,13 @@ declare namespace stream { * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types; * 3.Parameter verification failed. - * @param { Function } callback - Callback when the stream has completed the initial. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.Mandatory parameters are left unspecified; - * 2.Incorrect parameter types; - * 3.Parameter verification failed. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 */ doInitialize(callback: Function): void; - doInitialize(callback: Function): void; /** * The specific implementation of data production. It must not be actively called. @@ -925,7 +773,6 @@ declare namespace stream { */ doRead(size: number): void; - /** * Adds the generated data to the buffer. The return value indicates whether the data in the buffer has not * reached the highWaterMark (similar to Writable.write). If the chunk is null, all data has been generated. @@ -945,7 +792,6 @@ declare namespace stream { */ push(chunk: Uint8Array | string | null, encoding?: string): boolean; - /** * Returns boolean indicating whether it is in ObjectMode. * @@ -955,23 +801,9 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ readonly readableObjectMode: boolean; - /** - * Returns boolean indicating whether it is in ObjectMode. - * - * @type { boolean } - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - get readableObjectMode(): boolean; - - /** * Returns boolean indicating whether it is in ObjectMode. * @@ -994,24 +826,9 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ readonly readable: boolean; - /** - * Is true if it is safe to call readable.read(), which means - * the stream has not been destroyed or emitted 'error' or 'end'. - * - * @type { boolean } - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - get readable(): boolean; - - /** * Is true if it is safe to call readable.read(), which means * the stream has not been destroyed or emitted 'error' or 'end'. @@ -1034,23 +851,9 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ readonly readableHighWatermark: number; - /** - * Returns the value of highWatermark passed when creating this Readable. - * - * @type { number } - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - get readableHighWatermark(): number; - - /** * Returns the value of highWatermark passed when creating this Readable. * @@ -1072,23 +875,9 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ readonly readableFlowing: boolean | null; - /** - * This property reflects the current state of the readable stream null/true/false. - * - * @type { boolean | null } - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - get readableFlowing(): boolean | null; - - /** * This property reflects the current state of the readable stream null/true/false. * @@ -1110,23 +899,9 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ readonly readableLength: number; - /** - * Size of the data that can be read, in bytes or objects. - * - * @type { number } - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - get readableLength(): number; - - /** * Size of the data that can be read, in bytes or objects. * @@ -1149,24 +924,9 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ readonly readableEncoding: string | null; - /** - * Getter for the property encoding of a given Readable stream. The encoding property can be set using the - * readable.setEncoding() method. - * - * @type { string | null } - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - get readableEncoding(): string | null; - - /** * Getter for the property encoding of a given Readable stream. The encoding property can be set using the * readable.setEncoding() method. @@ -1189,7 +949,6 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ readonly readableEnded: boolean; @@ -1204,21 +963,8 @@ declare namespace stream { * @arkts 1.2 */ get readableEnded(): boolean; - - /** - * Whether all data has been generated. - * - * @type { boolean } - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - get readableEnded(): boolean; } - /** * Duplex streams are streams that implement both the Readable streams and Writable streams interfaces. * @@ -1231,7 +977,6 @@ declare namespace stream { */ class Duplex extends Readable { /** - * The Duplex constructor. * The Duplex constructor. * * @syscap SystemCapability.Utils.Lang @@ -1242,7 +987,6 @@ declare namespace stream { */ constructor(); - /** * writes a chunk to Writable and invokes callback when the chunk is flushed. The return value indicates * whether the internal buffer of the Writable reaches the hightWaterMark. If true is returned, the buffer @@ -1266,8 +1010,6 @@ declare namespace stream { * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 */ write(chunk?: string | Uint8Array, encoding?: string, callback?: Function): boolean; @@ -1288,8 +1030,6 @@ declare namespace stream { * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 */ end(chunk?: string | Uint8Array, encoding?: string, callback?: Function): Writable; @@ -1310,7 +1050,6 @@ declare namespace stream { */ setDefaultEncoding(encoding?: string): boolean; - /** * After the call, all Write operations will be forced to write to the buffer instead of being flushed. * @@ -1323,7 +1062,6 @@ declare namespace stream { */ cork(): boolean; - /** * After calling, flush all buffers. * @@ -1336,7 +1074,6 @@ declare namespace stream { */ uncork(): boolean; - /** * Implemented by subclass inheritance. The implementation logic of flushing chunks in the buffer must not be * directly called. The call is controlled by Writable.write. @@ -1353,8 +1090,6 @@ declare namespace stream { * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 */ doWrite(chunk: string | Uint8Array, encoding: string, callback: Function): void; @@ -1373,27 +1108,20 @@ declare namespace stream { * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 */ doWritev(chunks: string[] | Uint8Array[], callback: Function): void; /** - * Returns boolean indicating whether it is in ObjectMode. * Returns boolean indicating whether it is in ObjectMode. * * @type { boolean } * @readonly - * @type { boolean } - * @readonly * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice * @since 12 - * @since 12 */ readonly writableObjectMode: boolean; - readonly writableObjectMode: boolean; /** * Returns boolean indicating whether it is in ObjectMode. @@ -1404,13 +1132,9 @@ declare namespace stream { * @atomicservice * @since 20 * @arkts 1.2 - * @since 20 - * @arkts 1.2 */ get writableObjectMode(): boolean; - get writableObjectMode(): boolean; - /** * Value of highWatermark. * @@ -1420,23 +1144,9 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ readonly writableHighWatermark: number; - /** - * Value of highWatermark. - * - * @type { number } - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - get writableHighWatermark(): number; - - /** * Value of highWatermark. * @@ -1458,23 +1168,9 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ readonly writable: boolean; - /** - * Is true if it is safe to call writable.write(), which means the stream has not been destroyed, error or end. - * - * @type { boolean } - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - get writable(): boolean; - - /** * Is true if it is safe to call writable.write(), which means the stream has not been destroyed, error or end. * @@ -1496,23 +1192,9 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ readonly writableLength: number; - /** - * Size of data that can be flushed, in bytes or objects. - * - * @type { number } - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - get writableLength(): number; - - /** * Size of data that can be flushed, in bytes or objects. * @@ -1534,23 +1216,9 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ readonly writableCorked: number; - /** - * Number of times writable.uncork() needs to be called in order to fully uncork the stream. - * - * @type { number } - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - get writableCorked(): number; - - /** * Number of times writable.uncork() needs to be called in order to fully uncork the stream. * @@ -1572,23 +1240,9 @@ declare namespace stream { * @crossplatform * @atomicservice * @since 12 - * @since 12 */ readonly writableEnded: boolean; - /** - * Whether Writable.end has been called. - * - * @type { boolean } - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - get writableEnded(): boolean; - - /** * Whether Writable.end has been called. * diff --git a/api/@ohos.web.webview.d.ts b/api/@ohos.web.webview.d.ts index 39c7908808..5911146701 100644 --- a/api/@ohos.web.webview.d.ts +++ b/api/@ohos.web.webview.d.ts @@ -2955,13 +2955,13 @@ declare namespace webview { */ /** * Current index in BackForwardList. - * @type { int } + * @type { number } * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice * @since 11 */ - currentIndex: int; + currentIndex: number; /** * Size of in BackForwardList. @@ -2970,18 +2970,18 @@ declare namespace webview { */ /** * Size of in BackForwardList. - * @type { int } + * @type { number } * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice * @since 11 */ - size: int; + size: number; /** * Get history entry at given index. * - * @param { int } index Index of back forward list entry. + * @param { number } index Index of back forward list entry. * @returns { HistoryItem } HistoryItem at given index in back forward list. * @throws { BusinessError } 401 - Invalid input parameter. * @syscap SystemCapability.Web.Webview.Core @@ -2990,7 +2990,7 @@ declare namespace webview { /** * Get history entry at given index. * - * @param { int } index Index of back forward list entry. + * @param { number } index Index of back forward list entry. * @returns { HistoryItem } HistoryItem at given index in back forward list. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
    2. Incorrect parameter types. 3.Parameter verification failed. @@ -2999,7 +2999,7 @@ declare namespace webview { * @atomicservice * @since 11 */ - getItemAtIndex(index: int): HistoryItem; + getItemAtIndex(index: number): HistoryItem; } /** @@ -4075,7 +4075,6 @@ declare namespace webview { * @atomicservice * @since 11 * @deprecated since 18 - * @deprecated since 18 * @useinstead ohos.web.webview.WebviewController#getLastHitTest */ getHitTest(): WebHitTestType; @@ -4275,7 +4274,6 @@ declare namespace webview { * @atomicservice * @since 11 * @deprecated since 18 - * @deprecated since 18 * @useinstead ohos.web.webview.WebviewController#getLastHitTest */ getHitTestValue(): HitTestValue; @@ -5702,8 +5700,7 @@ declare namespace webview { * @throws { BusinessError } 17100001 - Init error. * The WebviewController must be associated with a Web component. * @syscap SystemCapability.Web.Webview.Core - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ createWebPrintDocumentAdapter(jobName: string): print.PrintDocumentAdapter; @@ -6083,8 +6080,7 @@ declare namespace webview { * @param { CreateNativeMediaPlayerCallback } callback - Called everytime when web pages try to play media. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ onCreateNativeMediaPlayer(callback: CreateNativeMediaPlayerCallback): void; @@ -8408,27 +8404,6 @@ declare namespace webview { AUTO_CLEANUP } - /** - * The function of reusme media play. - * - * @typedef { function } ResumePlayerFn - * @syscap SystemCapability.Web.Webview.Core - * @since 20 - * @arkts 1.2 - */ - type ResumePlayerFn = () => void; - - /** - * The function of suspend media play. - * - * @typedef { function } SuspendPlayerFn - * @param { SuspendType } type - The scenario for suspending the media player. - * @syscap SystemCapability.Web.Webview.Core - * @since 20 - * @arkts 1.2 - */ - type SuspendPlayerFn = (type: SuspendType) => void; - /** * The bridge between web core and native media player. * Apps should implements this interface, and pass an instance to web core. @@ -8437,8 +8412,7 @@ declare namespace webview { * @typedef NativeMediaPlayerBridge * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface NativeMediaPlayerBridge { /** @@ -8450,8 +8424,7 @@ declare namespace webview { * @param { number } height - The height of video tag. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ updateRect(x: number, y: number, width: number, height: number): void @@ -8460,8 +8433,7 @@ declare namespace webview { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ play(): void @@ -8470,8 +8442,7 @@ declare namespace webview { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ pause(): void @@ -8483,8 +8454,7 @@ declare namespace webview { * @param { number } targetTime - The target time (in seconds) to FF/BF to. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ seek(targetTime: number): void @@ -8496,8 +8466,7 @@ declare namespace webview { * @param { number } volume - The volume of native media player. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ setVolume(volume: number): void @@ -8507,8 +8476,7 @@ declare namespace webview { * @param { boolean } muted - Should mute native media player. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ setMuted(muted: boolean): void @@ -8520,8 +8488,7 @@ declare namespace webview { * @param { number } playbackRate - The playback rate of native media player. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ setPlaybackRate(playbackRate: number): void @@ -8530,8 +8497,7 @@ declare namespace webview { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ release(): void @@ -8540,8 +8506,7 @@ declare namespace webview { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enterFullscreen(): void @@ -8550,8 +8515,7 @@ declare namespace webview { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ exitFullscreen(): void @@ -8563,16 +8527,6 @@ declare namespace webview { */ resumePlayer?(): void - /** - * Resume the native media player. - * - * @type { ?ResumePlayerFn } - * @syscap SystemCapability.Web.Webview.Core - * @since 20 - * @arkts 1.2 - */ - resumePlayer?: ResumePlayerFn; - /** * Suspend to release native media player, not the NativeMediaPlayerBridge. The * embedder should save the status of player when release the native media player @@ -8583,18 +8537,6 @@ declare namespace webview { * @since 12 */ suspendPlayer?(type: SuspendType): void - - /** - * Suspend to release native media player, not the NativeMediaPlayerBridge. The - * embedder should save the status of player when release the native media player - * through NativeMediaPlayerBridge. - * - * @type { ?SuspendPlayerFn } - * @syscap SystemCapability.Web.Webview.Core - * @since 20 - * @arkts 1.2 - */ - suspendPlayer?: SuspendPlayerFn; } /** @@ -8885,8 +8827,7 @@ declare namespace webview { * @returns { NativeMediaPlayerBridge } Returns whether the app takes over the media. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ type CreateNativeMediaPlayerCallback = (handler: NativeMediaPlayerHandler, mediaInfo: MediaInfo) => NativeMediaPlayerBridge; @@ -9169,7 +9110,6 @@ declare namespace webview { /** * The ProxyConfig used by applyProxyOverride. * - * * @syscap SystemCapability.Web.Webview.Core * @since 15 */ @@ -9186,7 +9126,6 @@ declare namespace webview { * These maybe URLs or IP addresses and wildcards are supported. e.g. "*.example.com" means that requests to * "https://www.example.com" and "http://test.example.com" will connect the server directly. * - * * @param { string } bypassRule - The bypass rule. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
    2. Incorrect parameter types. @@ -9210,7 +9149,6 @@ declare namespace webview { /** * Insert a proxy rule that indicates URLs that match the schemeFilter will connect the server directly. * - * * @param { ProxySchemeFilter } schemeFilter - The scheme filter for this rule. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
    2. Incorrect parameter types. diff --git a/api/@ohos.wifi.d.ts b/api/@ohos.wifi.d.ts index e38024591b..bc98aa0fb4 100644 --- a/api/@ohos.wifi.d.ts +++ b/api/@ohos.wifi.d.ts @@ -23,8 +23,7 @@ import { AsyncCallback, Callback } from './@ohos.base'; /** * Provides methods to operate or manage Wi-Fi. * @namespace wifi - * @since arkts {'1.1':'6', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 6 */ declare namespace wifi { /** diff --git a/api/@ohos.wifiManager.d.ts b/api/@ohos.wifiManager.d.ts index 72e2910acb..f8b3982d97 100644 --- a/api/@ohos.wifiManager.d.ts +++ b/api/@ohos.wifiManager.d.ts @@ -50,8 +50,7 @@ declare namespace wifiManager { * @throws {BusinessError} 2501000 - Operation failed. * @throws {BusinessError} 2501003 - Operation failed because the service is being closed. * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ function enableWifi(): void; @@ -77,8 +76,7 @@ declare namespace wifiManager { * @throws {BusinessError} 2501004 - Operation failed because the service is being opened. * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function enableSemiWifi(): void; @@ -179,8 +177,7 @@ declare namespace wifiManager { * @throws {BusinessError} 2501000 - Operation failed. * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function getWifiDetailState(): WifiDetailState; @@ -234,8 +231,7 @@ declare namespace wifiManager { * @throws {BusinessError} 2501000 - Operation failed. * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function getScanInfoList(): Array; @@ -595,8 +591,7 @@ declare namespace wifiManager { * @throws {BusinessError} 801 - Capability not supported. * @throws {BusinessError} 2501000 - Operation failed. * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getSignalLevel(rssi: number, band: number): number; @@ -623,8 +618,7 @@ declare namespace wifiManager { * @syscap SystemCapability.Communication.WiFi.STA * @crossplatform * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function getLinkedInfo(): Promise; @@ -668,8 +662,7 @@ declare namespace wifiManager { * @throws {BusinessError} 2501001 - Wi-Fi STA disabled. * @syscap SystemCapability.Communication.WiFi.STA * @crossplatform - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function getLinkedInfo(callback: AsyncCallback): void; @@ -684,8 +677,7 @@ declare namespace wifiManager { * @throws {BusinessError} 2501001 - Wi-Fi STA disabled. * @syscap SystemCapability.Communication.WiFi.STA * @crossplatform - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function getLinkedInfoSync(): WifiLinkedInfo; @@ -710,8 +702,7 @@ declare namespace wifiManager { * @syscap SystemCapability.Communication.WiFi.STA * @crossplatform * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ function isConnected(): boolean; @@ -768,8 +759,7 @@ declare namespace wifiManager { * @throws {BusinessError} 801 - Capability not supported. * @throws {BusinessError} 2501000 - Operation failed. * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ function getIpInfo(): IpInfo; @@ -782,8 +772,7 @@ declare namespace wifiManager { * @throws {BusinessError} 801 - Capability not supported. * @throws {BusinessError} 2501000 - Operation failed. * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ function getIpv6Info(): Ipv6Info; @@ -991,8 +980,7 @@ declare namespace wifiManager { * @throws {BusinessError} 2501000 - Operation failed. * @throws {BusinessError} 2501001 - Wi-Fi STA disabled. * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ function isMeteredHotspot(): boolean; @@ -1082,8 +1070,7 @@ declare namespace wifiManager { * @throws {BusinessError} 2601000 - Operation failed. * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ function isOpenSoftApAllowed(): boolean; @@ -1167,8 +1154,7 @@ declare namespace wifiManager { * @throws {BusinessError} 2601000 - Operation failed. * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ function getStations(): Array; @@ -2228,8 +2214,7 @@ declare namespace wifiManager { * @enum { number } * @syscap SystemCapability.Communication.WiFi.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum DeviceAddressType { /** @@ -2242,8 +2227,7 @@ declare namespace wifiManager { * random device address * @syscap SystemCapability.Communication.WiFi.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ RANDOM_DEVICE_ADDRESS, @@ -2257,8 +2241,7 @@ declare namespace wifiManager { * real device address * @syscap SystemCapability.Communication.WiFi.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ REAL_DEVICE_ADDRESS, } @@ -2421,16 +2404,14 @@ declare namespace wifiManager { * @enum { number } WifiDetailState * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum WifiDetailState { /** * state is unknown * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ UNKNOWN = -1, @@ -2438,8 +2419,7 @@ declare namespace wifiManager { * wifi is closed * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ INACTIVE = 0, @@ -2447,8 +2427,7 @@ declare namespace wifiManager { * wifi is opened * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ ACTIVATED = 1, @@ -2456,8 +2435,7 @@ declare namespace wifiManager { * wifi is opening * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ ACTIVATING = 2, @@ -2465,8 +2443,7 @@ declare namespace wifiManager { * wifi is closing * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ DEACTIVATING = 3, @@ -2474,8 +2451,7 @@ declare namespace wifiManager { * wifi sta is entering semi active * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ SEMI_ACTIVATING = 4, @@ -2483,8 +2459,7 @@ declare namespace wifiManager { * wifi sta is semi active * @syscap SystemCapability.Communication.WiFi.STA * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ SEMI_ACTIVE = 5, } @@ -2526,47 +2501,41 @@ declare namespace wifiManager { * Wi-Fi Category. * @enum { number } * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum WifiCategory { /** * Default. * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ DEFAULT = 1, /** * Wifi6. * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ WIFI6 = 2, /** * Wifi6+. * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ WIFI6_PLUS = 3, /** * Wifi7. * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ WIFI7 = 4, /** * Wifi7+. * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ WIFI7_PLUS = 5 } @@ -2808,8 +2777,7 @@ declare namespace wifiManager { * @typedef WifiDeviceConfig * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface WifiDeviceConfig { /** @@ -2823,8 +2791,7 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ ssid: string; @@ -2839,8 +2806,7 @@ declare namespace wifiManager { * @type { ?string } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ bssid?: string; @@ -2870,8 +2836,7 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ preSharedKey: string; @@ -2895,8 +2860,7 @@ declare namespace wifiManager { * @type { WifiSecurityType } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ securityType: WifiSecurityType; @@ -3193,8 +3157,7 @@ declare namespace wifiManager { * @typedef WifiScanInfo * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface WifiScanInfo { /** @@ -3208,8 +3171,7 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ ssid: string; @@ -3224,8 +3186,7 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ bssid: string; @@ -3263,8 +3224,7 @@ declare namespace wifiManager { * @type { WifiSecurityType } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ securityType: WifiSecurityType; @@ -3279,8 +3239,7 @@ declare namespace wifiManager { * @type { number } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ rssi: number; @@ -3288,8 +3247,7 @@ declare namespace wifiManager { * Frequency band, 1: 2.4G, 2: 5G * @type { number } * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ band: number; @@ -3352,8 +3310,7 @@ declare namespace wifiManager { * Supported wifi category * @type { WifiCategory } * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ supportedWifiCategory: WifiCategory; @@ -3377,16 +3334,14 @@ declare namespace wifiManager { * @enum { number } * @syscap SystemCapability.Communication.WiFi.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ enum WifiSecurityType { /** * Invalid security type * * @syscap SystemCapability.Communication.WiFi.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ WIFI_SEC_TYPE_INVALID = 0, @@ -3401,8 +3356,7 @@ declare namespace wifiManager { * * @syscap SystemCapability.Communication.WiFi.Core * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ WIFI_SEC_TYPE_OPEN = 1, @@ -3410,8 +3364,7 @@ declare namespace wifiManager { * Wired Equivalent Privacy (WEP) * * @syscap SystemCapability.Communication.WiFi.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ WIFI_SEC_TYPE_WEP = 2, @@ -3419,8 +3372,7 @@ declare namespace wifiManager { * Pre-shared key (PSK) * * @syscap SystemCapability.Communication.WiFi.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ WIFI_SEC_TYPE_PSK = 3, @@ -3428,8 +3380,7 @@ declare namespace wifiManager { * Simultaneous Authentication of Equals (SAE) * * @syscap SystemCapability.Communication.WiFi.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ WIFI_SEC_TYPE_SAE = 4, @@ -3437,8 +3388,7 @@ declare namespace wifiManager { * EAP authentication. * * @syscap SystemCapability.Communication.WiFi.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ WIFI_SEC_TYPE_EAP = 5, @@ -3446,8 +3396,7 @@ declare namespace wifiManager { * SUITE_B_192 192 bit level. * * @syscap SystemCapability.Communication.WiFi.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ WIFI_SEC_TYPE_EAP_SUITE_B = 6, @@ -3455,8 +3404,7 @@ declare namespace wifiManager { * Opportunistic Wireless Encryption. * * @syscap SystemCapability.Communication.WiFi.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ WIFI_SEC_TYPE_OWE = 7, @@ -3464,8 +3412,7 @@ declare namespace wifiManager { * WAPI certificate to be specified. * * @syscap SystemCapability.Communication.WiFi.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ WIFI_SEC_TYPE_WAPI_CERT = 8, @@ -3473,8 +3420,7 @@ declare namespace wifiManager { * WAPI pre-shared key to be specified. * * @syscap SystemCapability.Communication.WiFi.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ WIFI_SEC_TYPE_WAPI_PSK = 9 } @@ -3627,8 +3573,7 @@ declare namespace wifiManager { * @typedef WifiLinkedInfo * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ interface WifiLinkedInfo { @@ -3643,8 +3588,7 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ ssid: string; @@ -3659,8 +3603,7 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ bssid: string; @@ -3684,8 +3627,7 @@ declare namespace wifiManager { * @type { number } * @syscap SystemCapability.Communication.WiFi.STA * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ rssi: number; @@ -3693,8 +3635,7 @@ declare namespace wifiManager { * The frequency band of a Wi-Fi access point. * @type { number } * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ band: number; @@ -3791,8 +3732,7 @@ declare namespace wifiManager { * The Wi-Fi MAC address of a device. * @type { string } * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ macAddress: string; @@ -3817,8 +3757,7 @@ declare namespace wifiManager { * The state of this Wi-Fi connection. * @type { ConnState } * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ connState: ConnState; @@ -3842,8 +3781,7 @@ declare namespace wifiManager { * Supported wifi category * @type { WifiCategory } * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ supportedWifiCategory: WifiCategory; @@ -3868,16 +3806,14 @@ declare namespace wifiManager { * Wi-Fi IP information. * @typedef IpInfo * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ interface IpInfo { /** * The IP address of the Wi-Fi connection * @type { number } * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ ipAddress: number; @@ -3934,16 +3870,14 @@ declare namespace wifiManager { * Wi-Fi IPv6 information. * @typedef Ipv6Info * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ interface Ipv6Info { /** * The link IPv6 address of the Wi-Fi connection * @type { string } * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ linkIpv6Address: string; @@ -4017,8 +3951,7 @@ declare namespace wifiManager { * @typedef HotspotConfig * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ interface HotspotConfig { /** @@ -4026,8 +3959,7 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ ssid: string; @@ -4036,8 +3968,7 @@ declare namespace wifiManager { * @type { WifiSecurityType } * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ securityType: WifiSecurityType; @@ -4046,8 +3977,7 @@ declare namespace wifiManager { * @type { number } * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ band: number; @@ -4065,8 +3995,7 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ preSharedKey: string; @@ -4094,8 +4023,7 @@ declare namespace wifiManager { * @typedef StationInfo * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ interface StationInfo { /** @@ -4112,8 +4040,7 @@ declare namespace wifiManager { * @type { string } * @syscap SystemCapability.Communication.WiFi.AP.Core * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ macAddress: string; @@ -4281,16 +4208,14 @@ declare namespace wifiManager { * * @enum { number } * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ export enum ConnState { /** * The device is searching for an available AP. * * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ SCANNING, @@ -4298,8 +4223,7 @@ declare namespace wifiManager { * The Wi-Fi connection is being set up. * * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ CONNECTING, @@ -4307,8 +4231,7 @@ declare namespace wifiManager { * The Wi-Fi connection is being authenticated. * * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ AUTHENTICATING, @@ -4316,8 +4239,7 @@ declare namespace wifiManager { * The IP address of the Wi-Fi connection is being obtained. * * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ OBTAINING_IPADDR, @@ -4325,8 +4247,7 @@ declare namespace wifiManager { * The Wi-Fi connection has been set up. * * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ CONNECTED, @@ -4334,8 +4255,7 @@ declare namespace wifiManager { * The Wi-Fi connection is being torn down. * * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ DISCONNECTING, @@ -4343,8 +4263,7 @@ declare namespace wifiManager { * The Wi-Fi connection has been torn down. * * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ DISCONNECTED, @@ -4352,8 +4271,7 @@ declare namespace wifiManager { * Failed to set up the Wi-Fi connection. * * @syscap SystemCapability.Communication.WiFi.STA - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ UNKNOWN } @@ -4363,16 +4281,14 @@ declare namespace wifiManager { * * @typedef WifiP2pDevice * @syscap SystemCapability.Communication.WiFi.P2P - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ interface WifiP2pDevice { /** * Device name * @type { string } * @syscap SystemCapability.Communication.WiFi.P2P - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ deviceName: string; @@ -4380,8 +4296,7 @@ declare namespace wifiManager { * Device mac address * @type { string } * @syscap SystemCapability.Communication.WiFi.P2P - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ deviceAddress: string; @@ -4389,8 +4304,7 @@ declare namespace wifiManager { * Device mac address type * @type { ?DeviceAddressType } * @syscap SystemCapability.Communication.WiFi.P2P - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ deviceAddressType?: DeviceAddressType; @@ -4398,8 +4312,7 @@ declare namespace wifiManager { * Primary device type * @type { string } * @syscap SystemCapability.Communication.WiFi.P2P - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ primaryDeviceType: string; @@ -4407,8 +4320,7 @@ declare namespace wifiManager { * Device status * @type { P2pDeviceStatus } * @syscap SystemCapability.Communication.WiFi.P2P - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ deviceStatus: P2pDeviceStatus; @@ -4416,8 +4328,7 @@ declare namespace wifiManager { * Device group capabilities * @type { number } * @syscap SystemCapability.Communication.WiFi.P2P - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ groupCapabilities: number; } @@ -4566,23 +4477,20 @@ declare namespace wifiManager { * * @enum { number } * @syscap SystemCapability.Communication.WiFi.P2P - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ enum P2pConnectState { /** * p2p is disconnected * @syscap SystemCapability.Communication.WiFi.P2P - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ DISCONNECTED = 0, /** * p2p is connected * @syscap SystemCapability.Communication.WiFi.P2P - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ CONNECTED = 1 } @@ -4592,16 +4500,14 @@ declare namespace wifiManager { * * @typedef WifiP2pLinkedInfo * @syscap SystemCapability.Communication.WiFi.P2P - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ interface WifiP2pLinkedInfo { /** * Connection status * @type { P2pConnectState } * @syscap SystemCapability.Communication.WiFi.P2P - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ connectState: P2pConnectState; @@ -4609,8 +4515,7 @@ declare namespace wifiManager { * Indicates whether it is group owner * @type { boolean } * @syscap SystemCapability.Communication.WiFi.P2P - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ isGroupOwner: boolean; @@ -4618,8 +4523,7 @@ declare namespace wifiManager { * Group owner address * @type { string } * @syscap SystemCapability.Communication.WiFi.P2P - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ groupOwnerAddr: string; } @@ -4629,47 +4533,41 @@ declare namespace wifiManager { * * @enum { number } * @syscap SystemCapability.Communication.WiFi.P2P - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ enum P2pDeviceStatus { /** * Indicate p2p device is connected. * @syscap SystemCapability.Communication.WiFi.P2P - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ CONNECTED = 0, /** * Indicate p2p device is invited. * @syscap SystemCapability.Communication.WiFi.P2P - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ INVITED = 1, /** * Indicate p2p device is failed. * @syscap SystemCapability.Communication.WiFi.P2P - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ FAILED = 2, /** * Indicate p2p device is available. * @syscap SystemCapability.Communication.WiFi.P2P - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ AVAILABLE = 3, /** * Indicate p2p device is unavailable. * @syscap SystemCapability.Communication.WiFi.P2P - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ UNAVAILABLE = 4 } diff --git a/api/@ohos.window.d.ts b/api/@ohos.window.d.ts index b41f5f7e92..07741a8a50 100644 --- a/api/@ohos.window.d.ts +++ b/api/@ohos.window.d.ts @@ -58,18 +58,6 @@ declare interface Callback { } /*** endif */ -/*** if arkts 1.2 */ -/** - * Defines the window callback. - * - * @typedef {function} - * @syscap SystemCapability.Window.SessionManager - * @atomicservice - * @since 20 - */ -type Callback = (data: T) => V; -/*** endif */ - /** * Defines the window callback. * diff --git a/api/@ohos.zlib.d.ts b/api/@ohos.zlib.d.ts index b8aae08c9d..3378c2d3ea 100644 --- a/api/@ohos.zlib.d.ts +++ b/api/@ohos.zlib.d.ts @@ -73,7 +73,7 @@ declare namespace zlib { /** * CompressLevel * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.Zlib * @crossplatform * @atomicservice @@ -157,7 +157,7 @@ declare namespace zlib { /** * CompressStrategy * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.Zlib * @crossplatform * @atomicservice @@ -250,7 +250,7 @@ declare namespace zlib { /** * ParallelStrategy * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.Zlib * @crossplatform * @atomicservice @@ -287,7 +287,7 @@ declare namespace zlib { /** * MemLevel * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.Zlib * @crossplatform * @atomicservice @@ -348,7 +348,7 @@ declare namespace zlib { /** * CompressFlushMode * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 @@ -415,7 +415,7 @@ declare namespace zlib { /** * Return codes for the compression/decompression functions. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 @@ -450,7 +450,7 @@ declare namespace zlib { /** * The deflate compression method (the only one supported in this version). * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 @@ -469,7 +469,7 @@ declare namespace zlib { /** * Define the reference point for offset. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 @@ -597,22 +597,22 @@ declare namespace zlib { /** * Number of bytes available at nextIn. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - availableIn?: int; + availableIn?: number; /** * Total number of input bytes read so far. * - * @type { ?long } + * @type { ?number } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - totalIn?: long; + totalIn?: number; /** * Next output byte will go here. @@ -627,42 +627,42 @@ declare namespace zlib { /** * Remaining free space at nextOut. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - availableOut?: int; + availableOut?: number; /** * Total number of bytes output so far. * - * @type { ?long } + * @type { ?number } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - totalOut?: long; + totalOut?: number; /** * Best guess about the data type. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - dataType?: int; + dataType?: number; /** * Adler-32 or CRC-32 value of the uncompressed data. * - * @type { ?long } + * @type { ?number } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - adler?: long; + adler?: number; } /** @@ -687,32 +687,32 @@ declare namespace zlib { /** * Operating system. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - os?: int; + os?: number; /** * Modification time. * - * @type { ?long } + * @type { ?number } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - time?: long; + time?: number; /** * Extra flags. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - xflags?: int; + xflags?: number; /** * Extra field. @@ -727,12 +727,12 @@ declare namespace zlib { /** * Extra field length. * - * @type { ?int } + * @type { ?number } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - extraLen?: int; + extraLen?: number; /** * Zero-terminated file name. @@ -797,12 +797,12 @@ declare namespace zlib { /** * Total sizeof the destination buffer. * - * @type { long } + * @type { number } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - destLen: long + destLen: number } /** @@ -827,12 +827,12 @@ declare namespace zlib { /** * Return dictionary length. * - * @type { int } + * @type { number } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - dictionaryLength: int + dictionaryLength: number } /** @@ -857,22 +857,22 @@ declare namespace zlib { /** * Total sizeof the destination buffer. * - * @type { long } + * @type { number } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - destLength: long + destLength: number /** * Total sizeof the sourceLen. * - * @type { long } + * @type { number } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - sourceLength: long + sourceLength: number } /** @@ -897,22 +897,22 @@ declare namespace zlib { /** * The number of bytes of output that have been generated. * - * @type { int } + * @type { number } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - pending: int + pending: number /** * The number of bits of output that have been generated. * - * @type { int } + * @type { number } * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - bits: int + bits: number } /** @@ -966,13 +966,13 @@ declare namespace zlib { * @typedef { function } * @param { object } outDesc - Object passed to output function. Object dependency requirement implementation. * @param { ArrayBuffer } buf - Used to store data to be written. - * @param { int } length - Write the length of the output buffer. - * @returns { int } Return the number of bytes output. + * @param { number } length - Write the length of the output buffer. + * @returns { number } Return the number of bytes output. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - type InflateBackOutputCallback = (outDesc: object, buf: ArrayBuffer, length: int) => int; + type InflateBackOutputCallback = (outDesc: object, buf: ArrayBuffer, length: number) => number; /** * Compress the specified file. @@ -1208,7 +1208,7 @@ declare namespace zlib { * Get the original size of the compressed zip file, the size is the meta data stored in zip file. * * @param { string } compressedFile - Indicates the path of the compressed file. - * @returns { Promise } Returns the original size of the compressed file. + * @returns { Promise } Returns the original size of the compressed file. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. * @throws { BusinessError } 900001 - The input source file is invalid. * @throws { BusinessError } 900003 - The input source file is not in ZIP format or is damaged. @@ -1218,7 +1218,7 @@ declare namespace zlib { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - function getOriginalSize(compressedFile: string): Promise; + function getOriginalSize(compressedFile: string): Promise; /** * Asynchronous creation of verification objects. @@ -1295,9 +1295,9 @@ declare namespace zlib { /** * Update a running Adler-32 checksum with the bytes buf. * - * @param { long } adler - Initial value of Adler32 checksum. + * @param { number } adler - Initial value of Adler32 checksum. * @param { ArrayBuffer } buf - Calculate checksum data buffer. - * @returns { Promise } Return the updated checksum. + * @returns { Promise } Return the updated checksum. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib @@ -1305,15 +1305,15 @@ declare namespace zlib { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - adler32(adler: long, buf: ArrayBuffer): Promise; + adler32(adler: number, buf: ArrayBuffer): Promise; /** * Combine two Adler-32 checksum into one. * - * @param { long } adler1 - The first Adler32 checksum. - * @param { long } adler2 - The second Adler32 checksum. - * @param { long } len2 - The length of the data block associated with the second Adler32 checksum. - * @returns { Promise } Returns the Adler-32 checksum. + * @param { number } adler1 - The first Adler32 checksum. + * @param { number } adler2 - The second Adler32 checksum. + * @param { number } len2 - The length of the data block associated with the second Adler32 checksum. + * @returns { Promise } Returns the Adler-32 checksum. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib @@ -1321,14 +1321,14 @@ declare namespace zlib { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - adler32Combine(adler1: long, adler2: long, len2: long): Promise; + adler32Combine(adler1: number, adler2: number, len2: number): Promise; /** * Update a running CRC-32 with the bytes buf. * - * @param { long } crc - Initial value of CRC-32 checksum. + * @param { number } crc - Initial value of CRC-32 checksum. * @param { ArrayBuffer } buf - Calculate checksum data buffer. - * @returns { Promise } Return the updated CRC-32. + * @returns { Promise } Return the updated CRC-32. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib @@ -1336,15 +1336,15 @@ declare namespace zlib { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - crc32(crc: long, buf: ArrayBuffer): Promise; + crc32(crc: number, buf: ArrayBuffer): Promise; /** * Combine two CRC-32 check values into one. * - * @param { long } crc1 - The first CRC-32 checksum. - * @param { long } crc2 - The second CRC-32 checksum. - * @param { long } len2 - The length of the data block associated with the second CRC-32 checksum. - * @returns { Promise } Returns the CRC-32 check value. + * @param { number } crc1 - The first CRC-32 checksum. + * @param { number } crc2 - The second CRC-32 checksum. + * @param { number } len2 - The length of the data block associated with the second CRC-32 checksum. + * @returns { Promise } Returns the CRC-32 check value. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib @@ -1352,42 +1352,42 @@ declare namespace zlib { * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - crc32Combine(crc1: long, crc2: long, len2: long): Promise; + crc32Combine(crc1: number, crc2: number, len2: number): Promise; /** * Update a running CRC-64 with the bytes buf. * - * @param { long } crc - Initial value of CRC-64 checksum. + * @param { number } crc - Initial value of CRC-64 checksum. * @param { ArrayBuffer } buf - Calculate checksum data buffer. - * @returns { Promise } Return the updated CRC-64. + * @returns { Promise } Return the updated CRC-64. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; *
    2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - crc64(crc: long, buf: ArrayBuffer): Promise; + crc64(crc: number, buf: ArrayBuffer): Promise; /** * Get CRC-32 table. * - * @returns { Promise> } Return a array to the CRC-32 table. + * @returns { Promise> } Return a array to the CRC-32 table. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - getCrcTable(): Promise>; + getCrcTable(): Promise>; /** * Get CRC-64 table. * - * @returns { Promise> } Return a array to the CRC-64 table. + * @returns { Promise> } Return a array to the CRC-64 table. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - getCrc64Table(): Promise>; + getCrc64Table(): Promise>; } /** @@ -1422,7 +1422,7 @@ declare namespace zlib { /** * Return flags indicating compile-time options. * - * @returns { Promise } Return flags indicating compile-time options. + * @returns { Promise } Return flags indicating compile-time options. * Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: * 1.0: size of uInt. * 3.2: size of uLong. @@ -1455,14 +1455,14 @@ declare namespace zlib { * @atomicservice * @since 12 */ - zlibCompileFlags(): Promise; + zlibCompileFlags(): Promise; /** * Compresses the source buffer into the destination buffer. * * @param { ArrayBuffer } dest - Destination buffer. * @param { ArrayBuffer } source - Source data buffer. - * @param { long } sourceLen - Source data length. + * @param { number } sourceLen - Source data length. * @returns { Promise } Return ReturnStatus and total sizeof the destination buffer. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -1471,7 +1471,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - compress(dest: ArrayBuffer, source: ArrayBuffer, sourceLen?: long): Promise; + compress(dest: ArrayBuffer, source: ArrayBuffer, sourceLen?: number): Promise; /** * Compresses the source buffer into the destination buffer. @@ -1479,7 +1479,7 @@ declare namespace zlib { * @param { ArrayBuffer } dest - Destination buffer. * @param { ArrayBuffer } source - Source data buffer. * @param { CompressLevel } level - Compression level. - * @param { long } sourceLen - Source data length. + * @param { number } sourceLen - Source data length. * @returns { Promise } Return ReturnStatus and total sizeof the destination buffer. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -1489,27 +1489,27 @@ declare namespace zlib { * @atomicservice * @since 12 */ - compress2(dest: ArrayBuffer, source: ArrayBuffer, level: CompressLevel, sourceLen?: long,): Promise; + compress2(dest: ArrayBuffer, source: ArrayBuffer, level: CompressLevel, sourceLen?: number,): Promise; /** * Calculate the upper limit of the return compression size. * - * @param { int } sourceLen - The length of the source data. - * @returns { Promise } Returns an upper bound on the compressed size after. + * @param { number } sourceLen - The length of the source data. + * @returns { Promise } Returns an upper bound on the compressed size after. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - compressBound(sourceLen: int): Promise; + compressBound(sourceLen: number): Promise; /** * Decompress the compressed data into its original uncompressed form. * * @param { ArrayBuffer } dest - Destination buffer. * @param { ArrayBuffer } source - Source data buffer. - * @param { long } sourceLen - Source data length. + * @param { number } sourceLen - Source data length. * @returns { Promise } Return ReturnStatus and total sizeof the destination buffer. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -1519,14 +1519,14 @@ declare namespace zlib { * @atomicservice * @since 12 */ - uncompress(dest:ArrayBuffer, source: ArrayBuffer, sourceLen?: long): Promise; + uncompress(dest:ArrayBuffer, source: ArrayBuffer, sourceLen?: number): Promise; /** * Decompress the compressed data into its original uncompressed form. * * @param { ArrayBuffer } dest - Destination buffer. * @param { ArrayBuffer } source - Source data buffer. - * @param { long } sourceLen - Source data length. + * @param { number } sourceLen - Source data length. * @returns { Promise } Return ReturnStatus and total sizeof the destination buffer and total sizeof the sourceLen. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -1536,13 +1536,13 @@ declare namespace zlib { * @atomicservice * @since 12 */ - uncompress2(dest: ArrayBuffer, source: ArrayBuffer, sourceLen?: long): Promise; + uncompress2(dest: ArrayBuffer, source: ArrayBuffer, sourceLen?: number): Promise; /** * Verify the checksum inside the structure of compressed stream z_stream. * * @param { ZStream } strm - Object to structure z_stream. - * @param { int } check - Expected checksum. + * @param { number } check - Expected checksum. * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -1551,7 +1551,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - inflateValidate(strm: ZStream, check: int): Promise; + inflateValidate(strm: ZStream, check: number): Promise; /** * Find a synchronization point for the current decompressed stream. @@ -1617,7 +1617,7 @@ declare namespace zlib { * This function is equivalent to inflateEnd followed by inflateInit, but does not free and reallocate the internal decompression state. * * @param { ZStream } strm - Object to structure z_stream. - * @param { int } windowBits - Parameter is interpreted the same as it is for inflateInit2. + * @param { number } windowBits - Parameter is interpreted the same as it is for inflateInit2. * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -1626,7 +1626,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - inflateReset2(strm: ZStream, windowBits: int): Promise; + inflateReset2(strm: ZStream, windowBits: number): Promise; /** * This function is equivalent to inflateEnd followed by inflateInit, but does not free and reallocate the internal decompression state. @@ -1646,8 +1646,8 @@ declare namespace zlib { * This function inserts bits in the inflate input stream. * * @param { ZStream } strm - Object to structure z_stream. - * @param { int } bits - The provided bits. - * @param { int } value - The provided value. + * @param { number } bits - The provided bits. + * @param { number } value - The provided value. * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -1656,26 +1656,26 @@ declare namespace zlib { * @atomicservice * @since 12 */ - inflatePrime(strm: ZStream, bits: int, value: int): Promise; + inflatePrime(strm: ZStream, bits: number, value: number): Promise; /** * Is used to mark locations in the input data for random access. * * @param { ZStream } strm - Object to structure z_stream. - * @returns { Promise } Return the internal marker position of the current decompressed stream. + * @returns { Promise } Return the internal marker position of the current decompressed stream. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - inflateMark(strm: ZStream): Promise; + inflateMark(strm: ZStream): Promise; /** * Initializes the internal stream state for decompression. * * @param { ZStream } strm - Object to structure z_stream. - * @param { int } windowBits - Is the base two logarithm of the maximum window size. + * @param { number } windowBits - Is the base two logarithm of the maximum window size. * It should be in the range 8..15 for this version of the library. The default value is 15 if inflateInit is used instead. * windowBits must be greater than or equal to the windowBits value provided to deflateInit2() while compressing, * or it must be equal to 15 if deflateInit2() was not used. If a compressed stream with a larger window size is given as input, @@ -1701,7 +1701,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - inflateInit2(strm: ZStream, windowBits: int): Promise; + inflateInit2(strm: ZStream, windowBits: number): Promise; /** * Initializes the internal stream state for decompression. @@ -1778,20 +1778,20 @@ declare namespace zlib { * Obtain the number of Huffman encoding trees that have been used in the current decompression stream during the inflate process. * * @param { ZStream } strm - Object to structure z_stream. - * @returns { Promise } Return the number of used Huffman encoding trees. + * @returns { Promise } Return the number of used Huffman encoding trees. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - inflateCodesUsed(strm: ZStream): Promise; + inflateCodesUsed(strm: ZStream): Promise; /** * Initialize the internal stream state for decompression using inflateBack() calls. * * @param { ZStream } strm - Object to structure z_stream. - * @param { long } windowBits - Parameter is interpreted the same as it is for inflateInit2. The value range is between 8~15. + * @param { number } windowBits - Parameter is interpreted the same as it is for inflateInit2. The value range is between 8~15. * @param { ArrayBuffer } window - The preset sliding window buffer. * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; @@ -1801,7 +1801,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - inflateBackInit(strm: ZStream, windowBits: long, window: ArrayBuffer): Promise; + inflateBackInit(strm: ZStream, windowBits: number, window: ArrayBuffer): Promise; /** * All memory allocated by inflateBackInit() is freed. @@ -1872,7 +1872,7 @@ declare namespace zlib { * @param { ZStream } strm - Object to structure z_stream. * @param { CompressLevel } level - Compression level. * @param { CompressMethod } method - The compression method. - * @param { int } windowBits - Parameter is interpreted the same as it is for inflateInit2. + * @param { number } windowBits - Parameter is interpreted the same as it is for inflateInit2. * @param { MemLevel } memLevel - The memory usage level. * @param { CompressStrategy } strategy - The compression strategy. * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. @@ -1883,7 +1883,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - deflateInit2(strm: ZStream, level: CompressLevel, method: CompressMethod, windowBits: int, + deflateInit2(strm: ZStream, level: CompressLevel, method: CompressMethod, windowBits: number, memLevel: MemLevel, strategy: CompressStrategy): Promise; /** @@ -1920,15 +1920,15 @@ declare namespace zlib { * Calculate an upper bound on the compressed size. * * @param { ZStream } strm - Object to structure z_stream. - * @param { long } sourceLength - The length of uncompressed data. - * @returns { Promise } Return an upper bound on the compressed size. + * @param { number } sourceLength - The length of uncompressed data. + * @returns { Promise } Return an upper bound on the compressed size. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - deflateBound(strm: ZStream, sourceLength: long): Promise; + deflateBound(strm: ZStream, sourceLength: number): Promise; /** * Provides gzip header information for when a gzip stream is requested by deflateInit2(). @@ -1993,10 +1993,10 @@ declare namespace zlib { * Fine tune deflate's internal compression parameters. * * @param { ZStream } strm - Object to structure z_stream. - * @param { int } goodLength - Good matching length threshold. - * @param { int } maxLazy - Maximum lazy matching times. - * @param { int } niceLength - Good Lazy Length Threshold. - * @param { int } maxChain - Maximum chain length. + * @param { number } goodLength - Good matching length threshold. + * @param { number } maxLazy - Maximum lazy matching times. + * @param { number } niceLength - Good Lazy Length Threshold. + * @param { number } maxChain - Maximum chain length. * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -2005,7 +2005,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - deflateTune(strm: ZStream, goodLength: int, maxLazy: int, niceLength: int, maxChain: int): Promise; + deflateTune(strm: ZStream, goodLength: number, maxLazy: number, niceLength: number, maxChain: number): Promise; /** * This function is equivalent to deflateEnd followed by deflateInit, but does not free and reallocate the internal compression state. @@ -2069,8 +2069,8 @@ declare namespace zlib { * Inserts bits in the deflate output stream. * * @param { ZStream } strm - Object to structure z_stream. - * @param { int } bits - The number of bits to be inserted. The value range is between 0~16. - * @param { int } value - The bit value corresponding to the number of bits. + * @param { number } bits - The number of bits to be inserted. The value range is between 0~16. + * @param { number } value - The bit value corresponding to the number of bits. * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. @@ -2079,7 +2079,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - deflatePrime(strm: ZStream, bits: int, value: int): Promise; + deflatePrime(strm: ZStream, bits: number, value: number): Promise; } /** @@ -2095,7 +2095,7 @@ declare namespace zlib { /** * Associate a gzFile with the file descriptor fd. * - * @param { int } fd - The file descriptor. Usually this is obtained through system calls to 'open' or other methods. + * @param { number } fd - The file descriptor. Usually this is obtained through system calls to 'open' or other methods. * @param { string } mode - Used to specify access mode. * @returns { Promise } * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; @@ -2105,13 +2105,13 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzdopen(fd: int, mode: string): Promise; + gzdopen(fd: number, mode: string): Promise; /** * Set the internal buffer size used by this library's functions for file to size. * - * @param { long } size - The internal buffer size to be set. - * @returns { Promise } Returns 0 on success. + * @param { number } size - The internal buffer size to be set. + * @returns { Promise } Returns 0 on success. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2119,7 +2119,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzbuffer(size: long): Promise; + gzbuffer(size: number): Promise; /** * Open the gzip (.gz) file at path for reading and decompressing, or compressing and writing. @@ -2139,22 +2139,22 @@ declare namespace zlib { /** * Check if the reading position of the gzip compressed file has reached the end of the file. * - * @returns { Promise } Return 1 (true) if the end-of-file indicator for file has been set while reading. + * @returns { Promise } Return 1 (true) if the end-of-file indicator for file has been set while reading. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - gzeof(): Promise; + gzeof(): Promise; /** * Check if the specified gzip file handle file directly accesses the original uncompressed data. * - * @returns { Promise } returns 1 (true) if transparent writing was requested. + * @returns { Promise } returns 1 (true) if transparent writing was requested. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - gzdirect(): Promise; + gzdirect(): Promise; /** * Flush all pending output for file, if necessary, close file and deallocate the (de)compression state. @@ -2192,13 +2192,13 @@ declare namespace zlib { /** * Read and decompress one byte from file. * - * @returns { Promise } Return the ASCII code of a character. + * @returns { Promise } Return the ASCII code of a character. * @throws { BusinessError } 17800009 - Internal structure error. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - gzgetc(): Promise; + gzgetc(): Promise; /** * Flush all pending output to file. @@ -2218,9 +2218,9 @@ declare namespace zlib { * Compress and write nitems items of size size from buf to file. * * @param { ArrayBuffer } buf - The buffer to write data to. - * @param { long } size - The number of bytes in a single data block. - * @param { long } nitems - Number of data blocks to be written. - * @returns { Promise } Return the number of full items written of size size. + * @param { number } size - The number of bytes in a single data block. + * @param { number } nitems - Number of data blocks to be written. + * @returns { Promise } Return the number of full items written of size size. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2228,15 +2228,15 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzfwrite(buf: ArrayBuffer, size: long, nitems: long): Promise; + gzfwrite(buf: ArrayBuffer, size: number, nitems: number): Promise; /** * Read and decompress data from gzip compressed files. * * @param { ArrayBuffer } buf - Target buffer for storing read results. - * @param { long } size - The number of bytes in a single data block. - * @param { long } nitems - Number of data blocks to be read. - * @returns { Promise } Return the number of full items read of size size. + * @param { number } size - The number of bytes in a single data block. + * @param { number } nitems - Number of data blocks to be read. + * @returns { Promise } Return the number of full items read of size size. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2244,7 +2244,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzfread(buf: ArrayBuffer, size: long, nitems: long): Promise; + gzfread(buf: ArrayBuffer, size: number, nitems: number): Promise; /** * Same as gzclose(), gzclosew() only for use when writing or appending. @@ -2273,8 +2273,8 @@ declare namespace zlib { * Compress and write the len uncompressed bytes at buf to file. * * @param { ArrayBuffer } buf - Object to the data buffer to be written. - * @param { long } len - The len uncompressed bytes. - * @returns { Promise } Return the number of uncompressed bytes written. + * @param { number } len - The len uncompressed bytes. + * @returns { Promise } Return the number of uncompressed bytes written. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2282,13 +2282,13 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzwrite(buf: ArrayBuffer, len: long): Promise; + gzwrite(buf: ArrayBuffer, len: number): Promise; /** * Push c back onto the stream for file to be read as the first character on the next read. * - * @param { int } c - To fall back to the character before the input stream. - * @returns { Promise } Return the character pushed. + * @param { number } c - To fall back to the character before the input stream. + * @returns { Promise } Return the character pushed. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2296,18 +2296,18 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzungetc(c: int): Promise; + gzungetc(c: number): Promise; /** * Return the starting position for the next gzread or gzwrite on file. * - * @returns { Promise } Return the starting position for the next gzread or gzwrite on file. + * @returns { Promise } Return the starting position for the next gzread or gzwrite on file. * @throws { BusinessError } 17800009 - Internal structure error. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - gztell(): Promise; + gztell(): Promise; /** * Dynamically update the compression level and strategy for file. @@ -2327,9 +2327,9 @@ declare namespace zlib { /** * Set the starting position to offset relative to whence for the next gzread or gzwrite on file. * - * @param { long } offset - Specify the new offset to move to. + * @param { number } offset - Specify the new offset to move to. * @param { OffsetReferencePoint } whence - Define the reference point for offset. - * @returns { Promise } Return the resulting offset location as measured in bytes from the beginning of the uncompressed stream. + * @returns { Promise } Return the resulting offset location as measured in bytes from the beginning of the uncompressed stream. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2337,7 +2337,7 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzseek(offset: long, whence: OffsetReferencePoint): Promise; + gzseek(offset: number, whence: OffsetReferencePoint): Promise; /** * Rewind file. This function is supported only for reading. @@ -2354,7 +2354,7 @@ declare namespace zlib { * Read and decompress up to len uncompressed bytes from file into buf. * * @param { ArrayBuffer } buf - User provided buffer address. - * @returns { Promise } Return the number of uncompressed bytes actually read, less than len for end of file. + * @returns { Promise } Return the number of uncompressed bytes actually read, less than len for end of file. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2362,13 +2362,13 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzread(buf: ArrayBuffer): Promise; + gzread(buf: ArrayBuffer): Promise; /** * Compress and write the given null-terminated string s to file, excluding the terminating null character. * * @param { string } str - Format descriptors and plain text. - * @returns { Promise } Return the number of characters written. + * @returns { Promise } Return the number of characters written. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2376,13 +2376,13 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzputs(str: string): Promise; + gzputs(str: string): Promise; /** * Compress and write c, converted to an unsigned char, into file. * - * @param { int } ch - Write ASCII values for characters. - * @returns { Promise } Return the value that was written. + * @param { number } char - Write ASCII values for characters. + * @returns { Promise } Return the value that was written. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800009 - Internal structure error. @@ -2390,14 +2390,14 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzputc(ch: int): Promise; + gzputc(char: number): Promise; /** * Convert, format, compress, and write the arguments to file under control of the string format, as in fprintf. * * @param { string } format - Format descriptors and plain text. * @param { Array } args - Variable argument lists. - * @returns { Promise } Return the number of uncompressed bytes actually written. + * @returns { Promise } Return the number of uncompressed bytes actually written. * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @throws { BusinessError } 17800004 - Compression or decompression stream error, which may be caused by an initialization error in the zlib stream structure or a modified structure. @@ -2406,18 +2406,18 @@ declare namespace zlib { * @atomicservice * @since 12 */ - gzprintf(format: string, ...args: Array): Promise; + gzprintf(format: string, ...args: Array): Promise; /** * Return the current compressed (actual) read or write offset of file. * - * @returns { Promise } Return the current compressed (actual) read or write offset of file. + * @returns { Promise } Return the current compressed (actual) read or write offset of file. * @throws { BusinessError } 17800009 - Internal structure error. * @syscap SystemCapability.BundleManager.Zlib * @atomicservice * @since 12 */ - gzoffset(): Promise; + gzoffset(): Promise; /** * Read and decompress bytes from file into buf, until len-1 characters are read, or until a newline character is read and transferred to buf, diff --git a/api/@system.notification.d.ts b/api/@system.notification.d.ts index 3e494f68ea..174ff3602b 100644 --- a/api/@system.notification.d.ts +++ b/api/@system.notification.d.ts @@ -91,8 +91,6 @@ export interface ShowNotificationOptions { } /** - * Manages notifications. - * * @syscap SystemCapability.Notification.Notification * @since 3 */ @@ -103,7 +101,6 @@ export default class Notification { * @param { ShowNotificationOptions } [options] - Options. * @syscap SystemCapability.Notification.Notification * @since 3 - * @deprecated since 7 */ static show(options?: ShowNotificationOptions): void; } diff --git a/api/@system.prompt.d.ts b/api/@system.prompt.d.ts index d5b9e2de07..087c0d3c45 100644 --- a/api/@system.prompt.d.ts +++ b/api/@system.prompt.d.ts @@ -388,7 +388,7 @@ export interface ShowActionMenuOptions { * @atomicservice * @since 11 */ -declare class Prompt { +export default class Prompt { /** * Displays the notification text. * @@ -440,5 +440,3 @@ declare class Prompt { */ static showActionMenu(options: ShowActionMenuOptions): void; } - -export default Prompt; \ No newline at end of file diff --git a/api/ability/connectOptions.d.ts b/api/ability/connectOptions.d.ts index 705436959c..7a911505f6 100644 --- a/api/ability/connectOptions.d.ts +++ b/api/ability/connectOptions.d.ts @@ -44,8 +44,7 @@ export interface ConnectOptions { * @param { ElementName } elementName - The ohos.bundleManager.ElementName object of the service ability * @param { rpc.IRemoteObject } remote - The remote object instance * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ onConnect(elementName: ElementName, remote: rpc.IRemoteObject): void; @@ -61,8 +60,7 @@ export interface ConnectOptions { * * @param { ElementName } elementName - The ohos.bundleManager.ElementName object of the service ability * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ onDisconnect(elementName: ElementName): void; @@ -71,8 +69,7 @@ export interface ConnectOptions { * * @param { number } code - The error code of the failed. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 7 */ onFailed(code: number): void; } diff --git a/api/application/AbilityDelegator.d.ts b/api/application/AbilityDelegator.d.ts index b0f58bec9d..d7a91d0bf7 100644 --- a/api/application/AbilityDelegator.d.ts +++ b/api/application/AbilityDelegator.d.ts @@ -18,8 +18,6 @@ * @kit AbilityKit */ -import AbilityStage from '../@ohos.app.ability.AbilityStage'; -import { AbilityStageMonitor } from './AbilityStageMonitor'; import { AsyncCallback } from '../@ohos.base'; import { AbilityMonitor } from './AbilityMonitor'; import Context from './Context'; diff --git a/api/application/AbilityRunningInfo.d.ts b/api/application/AbilityRunningInfo.d.ts index 26f2e16562..d19e8366d3 100644 --- a/api/application/AbilityRunningInfo.d.ts +++ b/api/application/AbilityRunningInfo.d.ts @@ -26,8 +26,7 @@ import abilityManager from '../@ohos.app.ability.abilityManager'; * * @typedef AbilityRunningInfo * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ export interface AbilityRunningInfo { /** @@ -44,8 +43,7 @@ export interface AbilityRunningInfo { * @type { ElementName } * @default the ohos.bundleManager.ElementName object of the ability. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ ability: ElementName; @@ -55,8 +53,7 @@ export interface AbilityRunningInfo { * @type { number } * @default process id * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ pid: number; @@ -66,8 +63,7 @@ export interface AbilityRunningInfo { * @type { number } * @default user id * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ uid: number; @@ -77,8 +73,7 @@ export interface AbilityRunningInfo { * @type { string } * @default the name of the process * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ processName: string; @@ -88,8 +83,7 @@ export interface AbilityRunningInfo { * @type { number } * @default ability start time * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ startTime: number; @@ -99,8 +93,7 @@ export interface AbilityRunningInfo { * @type { abilityManager.AbilityState } * @default Enumerates state of the ability state info * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ abilityState: abilityManager.AbilityState; } diff --git a/api/application/ApplicationContext.d.ts b/api/application/ApplicationContext.d.ts index fef8f63b44..e4777379ad 100644 --- a/api/application/ApplicationContext.d.ts +++ b/api/application/ApplicationContext.d.ts @@ -751,8 +751,7 @@ declare class ApplicationContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ getCurrentAppCloneIndex(): number; @@ -788,8 +787,7 @@ declare class ApplicationContext extends Context { * @throws { BusinessError } 16000078 - The multi-instance is not supported. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ getCurrentInstanceKey(): string; @@ -809,8 +807,7 @@ declare class ApplicationContext extends Context { * @throws { BusinessError } 16000078 - The multi-instance is not supported. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ getAllRunningInstanceKeys(): Promise>; } diff --git a/api/application/AutoFillType.d.ts b/api/application/AutoFillType.d.ts index ec2bc65918..8a5d9eb3ba 100644 --- a/api/application/AutoFillType.d.ts +++ b/api/application/AutoFillType.d.ts @@ -25,8 +25,7 @@ * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ export enum AutoFillType { /** @@ -35,8 +34,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ UNSPECIFIED = 0, @@ -46,8 +44,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ PASSWORD = 1, @@ -57,8 +54,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ USER_NAME = 2, @@ -68,8 +64,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ NEW_PASSWORD = 3, @@ -79,8 +74,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ FULL_STREET_ADDRESS = 4, @@ -90,8 +84,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ HOUSE_NUMBER = 5, @@ -101,8 +94,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ DISTRICT_ADDRESS = 6, @@ -112,8 +104,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ CITY_ADDRESS = 7, @@ -123,8 +114,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ PROVINCE_ADDRESS = 8, @@ -134,8 +124,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ COUNTRY_ADDRESS = 9, @@ -145,8 +134,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ PERSON_FULL_NAME = 10, @@ -156,8 +144,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ PERSON_LAST_NAME = 11, @@ -167,8 +154,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ PERSON_FIRST_NAME = 12, @@ -178,8 +164,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ PHONE_NUMBER = 13, @@ -189,8 +174,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ PHONE_COUNTRY_CODE = 14, @@ -200,8 +184,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ FULL_PHONE_NUMBER = 15, @@ -221,8 +204,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ BANK_CARD_NUMBER = 17, @@ -232,8 +214,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ ID_CARD_NUMBER = 18, @@ -243,8 +224,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ NICKNAME = 24, @@ -254,8 +234,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ DETAIL_INFO_WITHOUT_STREET = 25, @@ -265,8 +244,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ FORMAT_ADDRESS = 26, @@ -276,8 +254,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ PASSPORT_NUMBER = 27, @@ -287,8 +264,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ VALIDITY = 28, @@ -298,8 +274,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ ISSUE_AT = 29, @@ -309,8 +284,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ ORGANIZATION = 30, @@ -320,8 +294,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ TAX_ID = 31, @@ -331,8 +304,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ ADDRESS_CITY_AND_STATE = 32, @@ -342,8 +314,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ FLIGHT_NUMBER = 33, @@ -353,8 +324,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ LICENSE_NUMBER = 34, @@ -364,8 +334,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ LICENSE_FILE_NUMBER = 35, @@ -375,8 +344,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ LICENSE_PLATE = 36, @@ -386,8 +354,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ ENGINE_NUMBER = 37, @@ -397,8 +364,7 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ LICENSE_CHASSIS_NUMBER = 38 } \ No newline at end of file diff --git a/api/application/Context.d.ts b/api/application/Context.d.ts index 9e2747b22a..b226b36719 100644 --- a/api/application/Context.d.ts +++ b/api/application/Context.d.ts @@ -299,8 +299,7 @@ declare class Context extends BaseContext { * @stagemodelonly * @crossplatform * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ bundleCodeDir: string; @@ -319,8 +318,7 @@ declare class Context extends BaseContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ distributedFilesDir: string; @@ -337,8 +335,7 @@ declare class Context extends BaseContext { * @stagemodelonly * @crossplatform * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ resourceDir: string; @@ -349,8 +346,7 @@ declare class Context extends BaseContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ cloudFileDir: string; @@ -434,8 +430,7 @@ declare class Context extends BaseContext { * @stagemodelonly * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ processName: string; @@ -600,8 +595,7 @@ declare class Context extends BaseContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ getGroupDir(dataGroupID: string, callback: AsyncCallback): void; @@ -629,8 +623,7 @@ declare class Context extends BaseContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ getGroupDir(dataGroupID: string): Promise; @@ -663,8 +656,7 @@ declare class Context extends BaseContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ createAreaModeContext(areaMode: contextConstant.AreaMode): Context; @@ -679,8 +671,7 @@ declare class Context extends BaseContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ createDisplayContext(displayId: number): Context; } diff --git a/api/application/DriverExtensionContext.d.ts b/api/application/DriverExtensionContext.d.ts index 6c64f808fd..6a87f00f86 100644 --- a/api/application/DriverExtensionContext.d.ts +++ b/api/application/DriverExtensionContext.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2025 Huawei Device Co., Ltd. + * Copyright (c) 2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"), * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -27,26 +27,16 @@ import ExtensionContext from './ExtensionContext'; * @extends ExtensionContext * @syscap SystemCapability.Driver.ExternalDevice * @StageModelOnly - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ -declare class DriverExtensionContext extends ExtensionContext { +export default class DriverExtensionContext extends ExtensionContext { + + /** * update the state of driver extension. * @syscap SystemCapability.Driver.ExternalDevice * @StageModelOnly - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ updateDriverState(): void; -} -/** - * Define a DriverExtensionContext. - * - * @typedef { DriverExtensionContext } - * @syscap SystemCapability.Driver.ExternalDevice - * @stagemodelonly - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 - */ -export default DriverExtensionContext; +} \ No newline at end of file diff --git a/api/application/ErrorObserver.d.ts b/api/application/ErrorObserver.d.ts index b6fd088d97..e388cd08e0 100644 --- a/api/application/ErrorObserver.d.ts +++ b/api/application/ErrorObserver.d.ts @@ -37,8 +37,7 @@ * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ export default class ErrorObserver { /** @@ -63,8 +62,7 @@ export default class ErrorObserver { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ onUnhandledException(errMsg: string): void; @@ -90,8 +88,7 @@ export default class ErrorObserver { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ onException?(errObject: Error): void; } diff --git a/api/application/EventHub.d.ts b/api/application/EventHub.d.ts index 5551d8e56a..8b1a3fb6c1 100644 --- a/api/application/EventHub.d.ts +++ b/api/application/EventHub.d.ts @@ -79,8 +79,7 @@ export default class EventHub { * @stagemodelonly * @crossplatform * @atomicservice - * @since arkts{ '1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ on(event: string, callback: Function): void; @@ -118,8 +117,7 @@ export default class EventHub { * @stagemodelonly * @crossplatform * @atomicservice - * @since arkts{ '1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ off(event: string, callback?: Function): void; @@ -160,17 +158,4 @@ export default class EventHub { * @since 12 */ emit(event: string, ...args: Object[]): void; - - /** - * Trigger the event callbacks. - * - * @param { string } event - Indicates the event. - * @param { (Object|null|undefined)[] } args - Indicates the callback arguments. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - emit(event: string, ...args: (Object|null|undefined)[]): void; } diff --git a/api/application/ExtensionRunningInfo.d.ts b/api/application/ExtensionRunningInfo.d.ts index 7b6bdaaf40..6c23c5536b 100644 --- a/api/application/ExtensionRunningInfo.d.ts +++ b/api/application/ExtensionRunningInfo.d.ts @@ -27,8 +27,7 @@ import bundle from '../@ohos.bundle.bundleManager'; * @typedef ExtensionRunningInfo * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ export interface ExtensionRunningInfo { /** @@ -36,8 +35,7 @@ export interface ExtensionRunningInfo { * @default Indicates the extension of the extension info * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ extension: ElementName; @@ -46,8 +44,7 @@ export interface ExtensionRunningInfo { * @default process id * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ pid: number; @@ -56,8 +53,7 @@ export interface ExtensionRunningInfo { * @default user id * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ uid: number; @@ -66,8 +62,7 @@ export interface ExtensionRunningInfo { * @default the name of the process * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ processName: string; @@ -76,8 +71,7 @@ export interface ExtensionRunningInfo { * @default ability start time * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ startTime: number; @@ -86,8 +80,7 @@ export interface ExtensionRunningInfo { * @default All package names under the current process * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ clientPackage: Array; @@ -96,8 +89,7 @@ export interface ExtensionRunningInfo { * @default Enumerates types of the extension info * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ type: bundle.ExtensionAbilityType; } diff --git a/api/application/LoopObserver.d.ts b/api/application/LoopObserver.d.ts index 148cc608cf..0285fd6622 100644 --- a/api/application/LoopObserver.d.ts +++ b/api/application/LoopObserver.d.ts @@ -33,8 +33,7 @@ * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ export interface LoopObserver { /** @@ -52,8 +51,7 @@ export interface LoopObserver { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 19 */ onLoopTimeOut?(timeout: number): void; } diff --git a/api/application/ProcessInformation.d.ts b/api/application/ProcessInformation.d.ts index 8a7320f660..8f64c790d6 100644 --- a/api/application/ProcessInformation.d.ts +++ b/api/application/ProcessInformation.d.ts @@ -17,6 +17,7 @@ * @file * @kit AbilityKit */ + /*** if arkts 1.1 */ import type appManager from '../@ohos.app.ability.appManager'; /*** endif */ diff --git a/api/application/RunningMultiAppInfo.d.ts b/api/application/RunningMultiAppInfo.d.ts index f5732fa40b..cb77e92feb 100644 --- a/api/application/RunningMultiAppInfo.d.ts +++ b/api/application/RunningMultiAppInfo.d.ts @@ -51,8 +51,7 @@ export interface RunningMultiAppInfo { * @type { MultiAppMode } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ mode: MultiAppMode; @@ -73,8 +72,7 @@ export interface RunningMultiAppInfo { * @type { ?Array } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ runningAppClones?: Array; } \ No newline at end of file diff --git a/api/application/RunningMultiInstanceInfo.d.ts b/api/application/RunningMultiInstanceInfo.d.ts index c64921df69..1645db4051 100644 --- a/api/application/RunningMultiInstanceInfo.d.ts +++ b/api/application/RunningMultiInstanceInfo.d.ts @@ -45,8 +45,7 @@ export interface RunningMultiInstanceInfo { * @type { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ uid: number; @@ -56,8 +55,7 @@ export interface RunningMultiInstanceInfo { * @type { Array } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ pids: Array; } \ No newline at end of file diff --git a/api/application/ServiceExtensionContext.d.ts b/api/application/ServiceExtensionContext.d.ts index b095231a75..d133113da9 100644 --- a/api/application/ServiceExtensionContext.d.ts +++ b/api/application/ServiceExtensionContext.d.ts @@ -1614,8 +1614,7 @@ declare class ServiceExtensionContext extends ExtensionContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ stopServiceExtensionAbility(want: Want, callback: AsyncCallback): void; @@ -1663,8 +1662,7 @@ declare class ServiceExtensionContext extends ExtensionContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ stopServiceExtensionAbility(want: Want): Promise; diff --git a/api/application/UIAbilityContext.d.ts b/api/application/UIAbilityContext.d.ts index ccaefcc033..73cf76d55b 100644 --- a/api/application/UIAbilityContext.d.ts +++ b/api/application/UIAbilityContext.d.ts @@ -17,6 +17,7 @@ * @file * @kit AbilityKit */ + /*** if arkts 1.1 */ import { ConnectOptions } from '../ability/connectOptions'; import { Caller } from '../@ohos.app.ability.UIAbility'; @@ -24,6 +25,7 @@ import image from '../@ohos.multimedia.image'; import dialogRequest from '../@ohos.app.ability.dialogRequest'; import AbilityConstant from '../@ohos.app.ability.AbilityConstant'; import type AtomicServiceOptions from '../@ohos.app.ability.AtomicServiceOptions'; +import type ConfigurationConstant from '../@ohos.app.ability.ConfigurationConstant'; import type UIServiceProxy from './UIServiceProxy'; import type UIServiceExtensionConnectCallback from './UIServiceExtensionConnectCallback'; import type AbilityStartCallback from './AbilityStartCallback'; @@ -3558,8 +3560,7 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ backToCallerAbilityWithResult(abilityResult: AbilityResult, requestCode: string): Promise; @@ -3603,8 +3604,7 @@ declare class UIAbilityContext extends Context { * @throws { BusinessError } 16000055 - Installation-free timed out. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ connectServiceExtensionAbility(want: Want, options: ConnectOptions): number; @@ -3670,8 +3670,7 @@ declare class UIAbilityContext extends Context { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ disconnectServiceExtensionAbility(connection: number, callback: AsyncCallback): void; @@ -3685,8 +3684,7 @@ declare class UIAbilityContext extends Context { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ disconnectServiceExtensionAbility(connection: number): Promise; @@ -3713,8 +3711,7 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ setMissionLabel(label: string, callback: AsyncCallback): void; @@ -3741,8 +3738,7 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ setMissionLabel(label: string): Promise; @@ -3879,8 +3875,7 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ restoreWindowStage(localStorage: LocalStorage): void; @@ -4835,8 +4830,7 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ setColorMode(colorMode: ConfigurationConstant.ColorMode): void; diff --git a/api/application/UIExtensionContext.d.ts b/api/application/UIExtensionContext.d.ts index bb61450dbe..9d577273b3 100755 --- a/api/application/UIExtensionContext.d.ts +++ b/api/application/UIExtensionContext.d.ts @@ -18,6 +18,7 @@ * @kit AbilityKit */ + import type { AsyncCallback } from '../@ohos.base'; import ExtensionContext from './ExtensionContext'; import type Want from '../@ohos.app.ability.Want'; @@ -527,8 +528,7 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16200001 - The caller has been released. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ startAbilityForResult(want: Want, callback: AsyncCallback): void; @@ -637,8 +637,7 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16200001 - The caller has been released. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ startAbilityForResult(want: Want, options: StartOptions, callback: AsyncCallback): void; @@ -753,8 +752,7 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16200001 - The caller has been released. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 14 */ startAbilityForResult(want: Want, options?: StartOptions): Promise; @@ -842,8 +840,7 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16000070 - The extension cannot start the service. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ connectServiceExtensionAbility(want: Want, options: ConnectOptions): number; @@ -857,8 +854,7 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ disconnectServiceExtensionAbility(connection: number, callback: AsyncCallback): void; @@ -872,8 +868,7 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ disconnectServiceExtensionAbility(connection: number): Promise; @@ -885,8 +880,7 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ reportDrawnCompleted(callback: AsyncCallback): void; @@ -1118,8 +1112,7 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16000011 - The context does not exist. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ setColorMode(colorMode: ConfigurationConstant.ColorMode): void; } diff --git a/api/application/WorkSchedulerExtensionContext.d.ts b/api/application/WorkSchedulerExtensionContext.d.ts index f6a7732f46..e15279d81c 100644 --- a/api/application/WorkSchedulerExtensionContext.d.ts +++ b/api/application/WorkSchedulerExtensionContext.d.ts @@ -28,8 +28,7 @@ import type Want from '../@ohos.app.ability.Want'; * @extends ExtensionContext * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @StageModelOnly - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ export default class WorkSchedulerExtensionContext extends ExtensionContext { /** @@ -59,8 +58,7 @@ export default class WorkSchedulerExtensionContext extends ExtensionContext { * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @systemapi * @stagemodelonly - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ startServiceExtensionAbility(want: Want): Promise; @@ -88,8 +86,7 @@ export default class WorkSchedulerExtensionContext extends ExtensionContext { * @syscap SystemCapability.ResourceSchedule.WorkScheduler * @systemapi * @stagemodelonly - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 + * @since 13 */ stopServiceExtensionAbility(want: Want): Promise; } diff --git a/api/arkui/stateManagement/decorators/decoratorState.d.ets b/api/arkui/stateManagement/decorators/decoratorState.d.ets new file mode 100644 index 0000000000..5992f62fc1 --- /dev/null +++ b/api/arkui/stateManagement/decorators/decoratorState.d.ets @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * @file + * @kit ArkUI + * @arkts 1.2 + */ + +import { DecoratedV1VariableBase, IDecoratedMutableVariable } from '../base/decoratorBase'; +import { PropDecoratedVariable } from './decoratorProp'; +import { WatchIdType, WatchFuncType } from './decoratorWatch'; + +export declare interface __MkPropReturnType { + prop: PropDecoratedVariable; + watchId: WatchIdType; +} + +export declare class StateDecoratedVariable extends DecoratedV1VariableBase + implements IDecoratedMutableVariable { + public constructor(varName: string, initValue: T, watchFunc?: WatchFuncType) + public get(): T + public set(newValue: T): void +} \ No newline at end of file -- Gitee From 8a468512c8b9b52fb20f320fb4d6953f5147914d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BE=8A=E5=A4=B4=E5=86=9B=E5=B8=88?= Date: Sat, 12 Jul 2025 17:49:37 +0800 Subject: [PATCH 086/746] setAppResourceLimit number to int MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 羊头军师 --- api/@ohos.hidebug.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/@ohos.hidebug.d.ts b/api/@ohos.hidebug.d.ts index 604bd743cf..cfc769777b 100644 --- a/api/@ohos.hidebug.d.ts +++ b/api/@ohos.hidebug.d.ts @@ -811,7 +811,7 @@ declare namespace hidebug { * Sets the number of FDs, number of threads, JS memory, or native memory limit of the application. * * @param { string } type - resource type. It could be pss_memory、js_heap、fd、or thread. - * @param { number } value - For different resource type, values could have different meaning: + * @param { int } value - For different resource type, values could have different meaning: * 1.For pss_memory, it means the baseline PSS memory size for the application, * system memory control will be triggered if exceed the value too much. * 2.For js_heap, it means the percentage of the used JS heap memory to the maximum limit exceed @@ -829,7 +829,7 @@ declare namespace hidebug { * @atomicservice * @since 12 */ - function setAppResourceLimit(type: string, value: number, enableDebugLog: boolean): void; + function setAppResourceLimit(type: string, value: int, enableDebugLog: boolean): void; /** * Obtains the debugging state of an application process. If the Ark or native layer of the application process is in -- Gitee From 4c8f47a9217114be7f2ca35908b511761b99e723 Mon Sep 17 00:00:00 2001 From: zhaochang14 Date: Sat, 12 Jul 2025 16:13:13 +0800 Subject: [PATCH 087/746] zhaochang14 Signed-off-by: zhaochang14 --- api/@ohos.file.photoAccessHelper.d.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/api/@ohos.file.photoAccessHelper.d.ts b/api/@ohos.file.photoAccessHelper.d.ts index 374a50ee0d..f8711e0f64 100644 --- a/api/@ohos.file.photoAccessHelper.d.ts +++ b/api/@ohos.file.photoAccessHelper.d.ts @@ -6179,7 +6179,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ getPhotoAlbums(options?: FetchOptions): Promise>; @@ -6199,7 +6198,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ getPhotoAlbumOrder(orderStyle: number, options?: FetchOptions): Promise>; @@ -6219,7 +6217,6 @@ declare namespace photoAccessHelper { * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core * @systemapi * @since 20 - * @arkts 1.1&1.2 */ setPhotoAlbumOrder(orderStyle: number, albumOrders: Array): Promise; } -- Gitee From d85c47eb48c22550f471f1354520c1668460af4e Mon Sep 17 00:00:00 2001 From: ivagin Date: Tue, 8 Jul 2025 13:07:09 +0300 Subject: [PATCH 088/746] Removed some extra overloads for 1.2 Change-Id: I7a7252f40d8fccf2aa4921442a37d7130b2a594a Signed-off-by: ivagin --- api/@internal/component/ets/common.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/@internal/component/ets/common.d.ts b/api/@internal/component/ets/common.d.ts index 97741bdba1..10d3b13728 100644 --- a/api/@internal/component/ets/common.d.ts +++ b/api/@internal/component/ets/common.d.ts @@ -20734,7 +20734,7 @@ declare class CommonMethod { * @crossplatform * @form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} */ width(value: Length): T; /** @@ -20791,7 +20791,7 @@ declare class CommonMethod { * @crossplatform * @form * @atomicservice - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} */ height(value: Length): T; /** -- Gitee From a8581331289f73a9ac89f07a6756cac6d0352294 Mon Sep 17 00:00:00 2001 From: zhangzezhong Date: Sat, 12 Jul 2025 18:04:25 +0800 Subject: [PATCH 089/746] add ets interface code 2 Signed-off-by: zhangzezhong --- api/@ohos.ability.errorCode.d.ts | 15 ++- api/@ohos.app.ability.Ability.d.ts | 14 +- ...bility.ApplicationStateChangeCallback.d.ts | 44 +++++- ...ohos.app.ability.AtomicServiceOptions.d.ts | 9 +- ...@ohos.app.ability.EnvironmentCallback.d.ts | 32 ++++- ...ohos.app.ability.InsightIntentContext.d.ts | 6 +- ...s.app.ability.ServiceExtensionAbility.d.ts | 41 ++++-- api/@ohos.app.ability.UIAbility.d.ts | 3 +- ...app.ability.UIExtensionContentSession.d.ts | 12 +- api/@ohos.app.ability.abilityManager.d.ts | 51 ++++--- api/@ohos.app.ability.appManager.d.ts | 125 +++++++++++++----- api/@ohos.app.ability.application.d.ts | 3 +- api/@ohos.app.ability.common.d.ts | 57 +++++++- api/@ohos.app.ability.dataUriUtils.d.ts | 15 ++- api/ability/connectOptions.d.ts | 12 +- api/application/AbilityRunningInfo.d.ts | 21 ++- api/application/AbilityStartCallback.d.ts | 42 +++++- api/application/ApplicationContext.d.ts | 42 ++++-- api/application/AutoFillType.d.ts | 102 +++++++++----- api/application/Context.d.ts | 29 ++-- api/application/EventHub.d.ts | 3 +- api/application/ExtensionRunningInfo.d.ts | 24 ++-- api/application/ProcessData.d.ts | 21 ++- api/application/RunningMultiInstanceInfo.d.ts | 6 +- api/application/UIAbilityContext.d.ts | 53 +++++--- api/application/UIExtensionContext.d.ts | 35 +++-- api/wantAgent/wantAgentInfo.d.ts | 3 +- 27 files changed, 597 insertions(+), 223 deletions(-) diff --git a/api/@ohos.ability.errorCode.d.ts b/api/@ohos.ability.errorCode.d.ts index bf6f1e727c..83418a702b 100644 --- a/api/@ohos.ability.errorCode.d.ts +++ b/api/@ohos.ability.errorCode.d.ts @@ -23,14 +23,16 @@ * * @enum { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 6 + * @since arkts {'1.1':'6', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum ErrorCode { /** * Permission denied. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 6 + * @since arkts {'1.1':'6', '1.2':'20'} + * @arkts 1.1&1.2 */ PERMISSION_DENY = -3, @@ -38,7 +40,8 @@ export enum ErrorCode { * Ability not found. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 6 + * @since arkts {'1.1':'6', '1.2':'20'} + * @arkts 1.1&1.2 */ ABILITY_NOT_FOUND = -2, @@ -46,7 +49,8 @@ export enum ErrorCode { * Invalid parameter. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 6 + * @since arkts {'1.1':'6', '1.2':'20'} + * @arkts 1.1&1.2 */ INVALID_PARAMETER = -1, @@ -54,7 +58,8 @@ export enum ErrorCode { * No error. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 6 + * @since arkts {'1.1':'6', '1.2':'20'} + * @arkts 1.1&1.2 */ NO_ERROR = 0 } diff --git a/api/@ohos.app.ability.Ability.d.ts b/api/@ohos.app.ability.Ability.d.ts index 5c7161352d..514342c4b6 100644 --- a/api/@ohos.app.ability.Ability.d.ts +++ b/api/@ohos.app.ability.Ability.d.ts @@ -18,10 +18,10 @@ * @kit AbilityKit */ -/*** if arkts 1.1 */ + import AbilityConstant from './@ohos.app.ability.AbilityConstant'; import { Configuration } from './@ohos.app.ability.Configuration'; -/*** endif */ + /** * The class of an ability. @@ -39,7 +39,7 @@ import { Configuration } from './@ohos.app.ability.Configuration'; * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ -export default class Ability { +declare class Ability { /** * Called when the system configuration is updated. * @@ -55,7 +55,8 @@ export default class Ability { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts{'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onConfigurationUpdate(newConfig: Configuration): void; @@ -78,7 +79,10 @@ export default class Ability { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts{'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onMemoryLevel(level: AbilityConstant.MemoryLevel): void; } + +export default Ability; \ No newline at end of file diff --git a/api/@ohos.app.ability.ApplicationStateChangeCallback.d.ts b/api/@ohos.app.ability.ApplicationStateChangeCallback.d.ts index 18504ab7ef..2bcbc1885c 100644 --- a/api/@ohos.app.ability.ApplicationStateChangeCallback.d.ts +++ b/api/@ohos.app.ability.ApplicationStateChangeCallback.d.ts @@ -18,6 +18,7 @@ * @kit AbilityKit */ +/*** if arkts 1.1 */ /** * The application state change callback. * @@ -43,6 +44,39 @@ * @since 18 */ export default class ApplicationStateChangeCallback { +/*** endif */ + +/*** if arkts 1.2 */ +/** + * The application state change callback. + * + * @typedef ApplicationStateChangeCallback + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @StageModelOnly + * @since 10 + */ +/** + * The application state change callback. + * + * @typedef ApplicationStateChangeCallback + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @StageModelOnly + * @atomicservice + * @since 11 + */ +/** + * The application state change callback. + * + * @typedef ApplicationStateChangeCallback + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @StageModelOnly + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +declare interface ApplicationStateChangeCallback { +/*** endif */ /** * Called back when the state of the application changes to foreground. * @@ -65,7 +99,8 @@ export default class ApplicationStateChangeCallback { * @StageModelOnly * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ onApplicationForeground(): void; @@ -91,7 +126,12 @@ export default class ApplicationStateChangeCallback { * @StageModelOnly * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ onApplicationBackground(): void; } + +/*** if arkts 1.2 */ +export default ApplicationStateChangeCallback; +/*** endif */ \ No newline at end of file diff --git a/api/@ohos.app.ability.AtomicServiceOptions.d.ts b/api/@ohos.app.ability.AtomicServiceOptions.d.ts index 9168a95e27..694576fe14 100644 --- a/api/@ohos.app.ability.AtomicServiceOptions.d.ts +++ b/api/@ohos.app.ability.AtomicServiceOptions.d.ts @@ -27,7 +27,8 @@ import StartOptions from './@ohos.app.ability.StartOptions'; * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export default class AtomicServiceOptions extends StartOptions { /** @@ -37,7 +38,8 @@ export default class AtomicServiceOptions extends StartOptions { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ flags?: number; @@ -48,7 +50,8 @@ export default class AtomicServiceOptions extends StartOptions { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ parameters?: Record; } \ No newline at end of file diff --git a/api/@ohos.app.ability.EnvironmentCallback.d.ts b/api/@ohos.app.ability.EnvironmentCallback.d.ts index 7eaea804e9..9f5a4b9013 100644 --- a/api/@ohos.app.ability.EnvironmentCallback.d.ts +++ b/api/@ohos.app.ability.EnvironmentCallback.d.ts @@ -21,6 +21,7 @@ import AbilityConstant from './@ohos.app.ability.AbilityConstant'; import { Configuration } from './@ohos.app.ability.Configuration'; +/*** if arkts 1.1 */ /** * The environment callback. * @@ -35,6 +36,27 @@ import { Configuration } from './@ohos.app.ability.Configuration'; * @since 11 */ export default class EnvironmentCallback { +/*** endif */ + +/*** if arkts 1.2 */ +/** + * The environment callback. + * + * @typedef EnvironmentCallback + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @since 9 + */ +/** + * The environment callback. + * + * @typedef EnvironmentCallback + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +declare interface EnvironmentCallback { +/*** endif */ /** * Called when the system configuration is updated. * @@ -50,7 +72,8 @@ export default class EnvironmentCallback { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onConfigurationUpdated(config: Configuration): void; @@ -71,7 +94,12 @@ export default class EnvironmentCallback { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onMemoryLevel(level: AbilityConstant.MemoryLevel): void; } + +/*** if arkts 1.2 */ +export default EnvironmentCallback; +/*** endif */ \ No newline at end of file diff --git a/api/@ohos.app.ability.InsightIntentContext.d.ts b/api/@ohos.app.ability.InsightIntentContext.d.ts index 89e087146f..d60333a727 100644 --- a/api/@ohos.app.ability.InsightIntentContext.d.ts +++ b/api/@ohos.app.ability.InsightIntentContext.d.ts @@ -57,7 +57,8 @@ declare class InsightIntentContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ startAbility(want: Want, callback: AsyncCallback): void; @@ -87,7 +88,8 @@ declare class InsightIntentContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ startAbility(want: Want): Promise; } diff --git a/api/@ohos.app.ability.ServiceExtensionAbility.d.ts b/api/@ohos.app.ability.ServiceExtensionAbility.d.ts index 9fb19d970b..d165ae8b8d 100644 --- a/api/@ohos.app.ability.ServiceExtensionAbility.d.ts +++ b/api/@ohos.app.ability.ServiceExtensionAbility.d.ts @@ -92,11 +92,36 @@ declare class ServiceExtensionAbility { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 9 */ onConnect(want: Want): rpc.RemoteObject | Promise; + /** + * Called back when a service extension is first connected to an ability. + * + * @param { Want } want - Indicates connection information about the Service ability. + * @returns { rpc.RemoteObject } A RemoteObject for communication between the client and server. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi + * @stagemodelonly + * @since 20 + * @arkts 1.2 + */ + onConnect(want: Want): rpc.RemoteObject; + + /** + * Called back when a service extension is first connected to an ability. + * + * @param { Want } want - Indicates connection information about the Service ability. + * @returns { Promise } A RemoteObject for communication between the client and server. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi + * @stagemodelonly + * @since 20 + * @arkts 1.2 + */ + onConnectAsync(want: Want): Promise; + /** * Called back when all abilities connected to a service extension are disconnected. * @@ -116,21 +141,20 @@ declare class ServiceExtensionAbility { * @returns { void } the promise returned by the function. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @StageModelOnly + * @stagemodelonly * @since 20 * @arkts 1.2 */ onDisconnect(want: Want): void; - /** - * Asynchronous callback when all abilities connected to a service extension are disconnected. - * The next lifecycle callback onDestroy() will be triggered when the returned Promise object resolves. + /** + * Called back when all abilities connected to a service extension are disconnected. * * @param { Want } want - Indicates disconnection information about the service extension. * @returns { Promise } the promise returned by the function. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @StageModelOnly + * @stagemodelonly * @since 20 * @arkts 1.2 */ @@ -169,7 +193,8 @@ declare class ServiceExtensionAbility { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @StageModelOnly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ onDump(params: Array): Array; } diff --git a/api/@ohos.app.ability.UIAbility.d.ts b/api/@ohos.app.ability.UIAbility.d.ts index f0ee7fa13b..0c550d83c5 100644 --- a/api/@ohos.app.ability.UIAbility.d.ts +++ b/api/@ohos.app.ability.UIAbility.d.ts @@ -818,7 +818,8 @@ declare class UIAbility extends Ability { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onDump(params: Array): Array; diff --git a/api/@ohos.app.ability.UIExtensionContentSession.d.ts b/api/@ohos.app.ability.UIExtensionContentSession.d.ts index 8f9f41357a..bd9c0479e1 100644 --- a/api/@ohos.app.ability.UIExtensionContentSession.d.ts +++ b/api/@ohos.app.ability.UIExtensionContentSession.d.ts @@ -18,15 +18,15 @@ * @kit AbilityKit */ -/*** if arkts 1.1 */ import type AbilityStartCallback from './application/AbilityStartCallback'; +import type { AsyncCallback } from './@ohos.base'; +import type uiExtensionHost from './@ohos.uiExtensionHost'; +/*** if arkts 1.1 */ import type Want from './@ohos.app.ability.Want'; import type StartOptions from './@ohos.app.ability.StartOptions'; import type uiExtension from './@ohos.arkui.uiExtension'; import type { AbilityResult } from './ability/abilityResult'; /*** endif */ -import type { AsyncCallback } from './@ohos.base'; -import type uiExtensionHost from './@ohos.uiExtensionHost'; /*** if arkts 1.2 */ import { AbilityResult } from './ability/abilityResult'; import { LocalStorage } from '@ohos.arkui.stateManagement'; @@ -587,7 +587,8 @@ declare class UIExtensionContentSession { * @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 */ startAbilityByType(type: string, wantParam: Record, abilityStartCallback: AbilityStartCallback, callback: AsyncCallback): void; @@ -626,7 +627,8 @@ declare class UIExtensionContentSession { * @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 */ startAbilityByType(type: string, wantParam: Record, abilityStartCallback: AbilityStartCallback): Promise; diff --git a/api/@ohos.app.ability.abilityManager.d.ts b/api/@ohos.app.ability.abilityManager.d.ts index 5c02f6c9e2..5d373122bc 100644 --- a/api/@ohos.app.ability.abilityManager.d.ts +++ b/api/@ohos.app.ability.abilityManager.d.ts @@ -20,12 +20,13 @@ import { AsyncCallback } from './@ohos.base'; import { ElementName } from './bundleManager/ElementName'; +import { AbilityRunningInfo as _AbilityRunningInfo } from './application/AbilityRunningInfo'; +import { ExtensionRunningInfo as _ExtensionRunningInfo } from './application/ExtensionRunningInfo'; /*** if arkts 1.1 */ import { AbilityResult } from './ability/abilityResult'; import { Configuration } from './@ohos.app.ability.Configuration'; import Context from './application/Context'; -import { AbilityRunningInfo as _AbilityRunningInfo } from './application/AbilityRunningInfo'; -import { ExtensionRunningInfo as _ExtensionRunningInfo } from './application/ExtensionRunningInfo'; + import * as _AbilityForegroundStateObserver from './application/AbilityForegroundStateObserver'; import * as _AbilityStateData from './application/AbilityStateData'; /*** endif */ @@ -55,14 +56,16 @@ declare namespace abilityManager { * * @enum { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum AbilityState { /** * Ability is initialized. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ INITIAL = 0, @@ -70,7 +73,8 @@ declare namespace abilityManager { * Ability is in the state of getting focus. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ FOCUS = 2, @@ -78,7 +82,8 @@ declare namespace abilityManager { * Ability is in the foreground state. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ FOREGROUND = 9, @@ -86,7 +91,8 @@ declare namespace abilityManager { * Ability is in the background state. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ BACKGROUND = 10, @@ -94,7 +100,8 @@ declare namespace abilityManager { * Ability is in the process of scheduling at the foreground. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ FOREGROUNDING = 11, @@ -102,7 +109,8 @@ declare namespace abilityManager { * Ability is in the process of scheduling in the background. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ BACKGROUNDING = 12 } @@ -114,7 +122,8 @@ declare namespace abilityManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum UserStatus { /** @@ -123,7 +132,8 @@ declare namespace abilityManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ASSERT_TERMINATE = 0, @@ -133,7 +143,8 @@ declare namespace abilityManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ASSERT_CONTINUE = 1, @@ -143,7 +154,8 @@ declare namespace abilityManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ASSERT_RETRY = 2 } @@ -255,7 +267,8 @@ declare namespace abilityManager { * @returns { Promise> } Returns the array of AbilityRunningInfo. * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAbilityRunningInfos(): Promise>; @@ -272,7 +285,8 @@ declare namespace abilityManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAbilityRunningInfos(callback: AsyncCallback>): void; @@ -553,7 +567,8 @@ declare namespace abilityManager { * * @typedef { _AbilityRunningInfo } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type AbilityRunningInfo = _AbilityRunningInfo; @@ -576,14 +591,14 @@ declare namespace abilityManager { */ export type AbilityStateData = _AbilityStateData; - /** * The class of an extension running information. * * @typedef { _ExtensionRunningInfo } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type ExtensionRunningInfo = _ExtensionRunningInfo; diff --git a/api/@ohos.app.ability.appManager.d.ts b/api/@ohos.app.ability.appManager.d.ts index 1ebed985ab..3da7dcbd60 100644 --- a/api/@ohos.app.ability.appManager.d.ts +++ b/api/@ohos.app.ability.appManager.d.ts @@ -26,7 +26,7 @@ import { RunningMultiAppInfo as _RunningMultiAppInfo } from './application/Runni import * as _ApplicationStateObserver from './application/ApplicationStateObserver'; import type * as _AppForegroundStateObserver from './application/AppForegroundStateObserver'; import * as _AbilityStateData from './application/AbilityStateData'; -import * as _AppStateData from './application/AppStateData'; +import * as _AppStateData from './application/AppStateData'; import type * as _ProcessData from './application/ProcessData'; import * as _AbilityFirstFrameStateObserver from './application/AbilityFirstFrameStateObserver'; import * as _AbilityFirstFrameStateData from './application/AbilityFirstFrameStateData'; @@ -89,7 +89,8 @@ declare namespace appManager { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ STATE_ACTIVE, @@ -240,7 +241,8 @@ declare namespace appManager { * @enum { number } * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum KeepAliveAppType { /** @@ -248,7 +250,8 @@ declare namespace appManager { * * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ ALL = 0, @@ -257,7 +260,8 @@ declare namespace appManager { * * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ THIRD_PARTY = 1, @@ -266,7 +270,8 @@ declare namespace appManager { * * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ SYSTEM = 2 } @@ -276,7 +281,8 @@ declare namespace appManager { * @enum { number } * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum KeepAliveSetter { /** @@ -284,7 +290,8 @@ declare namespace appManager { * * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ SYSTEM = 0, @@ -293,7 +300,8 @@ declare namespace appManager { * * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ USER = 1 } @@ -304,7 +312,8 @@ declare namespace appManager { * @typedef KeepAliveBundleInfo * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface KeepAliveBundleInfo { /** @@ -313,7 +322,8 @@ declare namespace appManager { * @type { string } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ bundleName: string; @@ -323,7 +333,8 @@ declare namespace appManager { * @type { KeepAliveAppType } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ type: KeepAliveAppType; @@ -333,7 +344,8 @@ declare namespace appManager { * @type { KeepAliveSetter } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ setter: KeepAliveSetter; @@ -555,7 +567,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function killProcessWithAccount(bundleName: string, accountId: number): Promise; @@ -575,7 +588,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function killProcessWithAccount(bundleName: string, accountId: number, clearPageStack: boolean, appIndex?: number): Promise; @@ -611,7 +625,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function killProcessWithAccount(bundleName: string, accountId: number, callback: AsyncCallback): void; @@ -634,7 +649,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function isRunningInStabilityTest(callback: AsyncCallback): void; @@ -653,7 +669,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function isRunningInStabilityTest(): Promise; @@ -685,7 +702,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function killProcessesByBundleName(bundleName: string): Promise; @@ -701,7 +719,8 @@ declare namespace appManager { * @throws { BusinessError } 401 - If the input parameter is not valid parameter. * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function killProcessesByBundleName(bundleName: string, clearPageStack: boolean, appIndex?: number): Promise; @@ -786,7 +805,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function isRamConstrainedDevice(): Promise; @@ -809,7 +829,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function isRamConstrainedDevice(callback: AsyncCallback): void; @@ -828,7 +849,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAppMemorySize(): Promise; @@ -851,7 +873,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAppMemorySize(callback: AsyncCallback): void; @@ -890,7 +913,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRunningProcessInformationByBundleType( bundleType: bundleManager.BundleType): Promise>; @@ -935,7 +959,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function isSharedBundleRunning(bundleName: string, versionCode: number): Promise; @@ -954,7 +979,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function isSharedBundleRunning(bundleName: string, versionCode: number, callback: AsyncCallback): void; @@ -969,7 +995,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getProcessMemoryByPid(pid: number): Promise; @@ -984,7 +1011,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getProcessMemoryByPid(pid: number, callback: AsyncCallback): void; @@ -1107,7 +1135,8 @@ declare namespace appManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function preloadApplication(bundleName: string, userId: number, mode: PreloadMode, appIndex?: number): Promise; @@ -1144,7 +1173,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @throws { BusinessError } 16000073 - The app clone index is invalid. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function isAppRunning(bundleName: string, appCloneIndex?: number): Promise; @@ -1199,7 +1229,8 @@ declare namespace appManager { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function getSupportedProcessCachePids(bundleName : string): Promise>; @@ -1223,7 +1254,8 @@ declare namespace appManager { * @throws { BusinessError } 16300010 - The target application is not attached to the status bar. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function setKeepAliveForBundle(bundleName: string, userId: number, enable: boolean): Promise; @@ -1242,7 +1274,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function getKeepAliveBundles(type: KeepAliveAppType, userId?: number): Promise>; @@ -1296,7 +1329,8 @@ declare namespace appManager { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ function killProcessesInBatch(pids: Array): Promise; @@ -1309,6 +1343,17 @@ declare namespace appManager { */ export type AbilityStateData = _AbilityStateData.default; + /** + * The ability or extension state data. + * + * @typedef { _AbilityStateData } + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @systemapi + * @since 20 + * @arkts 1.2 + */ + export type AbilityStateData = _AbilityStateData; + /** * The application state data. * @@ -1337,6 +1382,16 @@ declare namespace appManager { */ export type ApplicationStateObserver = _ApplicationStateObserver.default; + /** + * The application state observer. + * + * @typedef { _ApplicationStateObserver } + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @since 20 + * @arkts 1.2 + */ + export type ApplicationStateObserver = _ApplicationStateObserver; + /** * The application foreground state observer. * diff --git a/api/@ohos.app.ability.application.d.ts b/api/@ohos.app.ability.application.d.ts index 9f2e8f15fa..d6a92cda87 100644 --- a/api/@ohos.app.ability.application.d.ts +++ b/api/@ohos.app.ability.application.d.ts @@ -105,7 +105,8 @@ declare namespace application { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ export function getApplicationContext(): ApplicationContext; diff --git a/api/@ohos.app.ability.common.d.ts b/api/@ohos.app.ability.common.d.ts index f26a6a6e5f..aa0bd3d5e2 100644 --- a/api/@ohos.app.ability.common.d.ts +++ b/api/@ohos.app.ability.common.d.ts @@ -30,9 +30,6 @@ import * as _ExtensionContext from './application/ExtensionContext'; import * as _FormExtensionContext from './application/FormExtensionContext'; import * as _ServiceExtensionContext from './application/ServiceExtensionContext'; import * as _EventHub from './application/EventHub'; -import { PacMap as _PacMap } from './ability/dataAbilityHelper'; -import type _AbilityStartCallback from './application/AbilityStartCallback'; -import { ConnectOptions as _ConnectOptions } from './ability/connectOptions'; import type * as _VpnExtensionContext from './application/VpnExtensionContext'; import type { AutoStartupCallback as _AutoStartupCallback } from './application/AutoStartupCallback'; import type { AutoStartupInfo as _AutoStartupInfo } from './application/AutoStartupInfo'; @@ -42,18 +39,23 @@ import * as _UIServiceExtensionContext from './application/UIServiceExtensionCon import * as _UIServiceProxy from './application/UIServiceProxy'; import * as _UIServiceHostProxy from './application/UIServiceHostProxy'; import * as _UIServiceExtensionConnectCallback from './application/UIServiceExtensionConnectCallback'; -import * as _AppServiceExtensionContext from './application/AppServiceExtensionContext'; +import { PacMap as _PacMap } from './ability/dataAbilityHelper'; /*** endif */ -import { AbilityResult as _AbilityResult } from './ability/abilityResult'; /*** if arkts 1.2 */ import _UIAbilityContext from './application/UIAbilityContext'; import type _UIExtensionContext from './application/UIExtensionContext'; import _AbilityStageContext from './application/AbilityStageContext'; import _ApplicationContext from './application/ApplicationContext'; +import _BaseContext from './application/BaseContext'; import _Context from './application/Context'; import _ExtensionContext from './application/ExtensionContext'; +import _FormExtensionContext from './application/FormExtensionContext'; import _ServiceExtensionContext from './application/ServiceExtensionContext'; +import _EventHub from './application/EventHub'; /*** endif */ +import { AbilityResult as _AbilityResult } from './ability/abilityResult'; +import type _AbilityStartCallback from './application/AbilityStartCallback'; +import { ConnectOptions as _ConnectOptions } from './ability/connectOptions'; /** * This module provides application context classes and common data structures. @@ -230,6 +232,19 @@ declare namespace common { */ export type BaseContext = _BaseContext.default; + /** + * The base context of 'app.Context' for FA Mode or 'application.Context' for Stage Mode. + * + * @typedef { _BaseContext } + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + export type BaseContext = _BaseContext; + /** * The base context of an ability or an application. It allows access to * application-specific resources. @@ -324,6 +339,19 @@ declare namespace common { */ export type FormExtensionContext = _FormExtensionContext.default; + /** + * The context of form extension. It allows access to + * formExtension-specific resources. + * + * @typedef { _FormExtensionContext } + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + export type FormExtensionContext = _FormExtensionContext; + /** * The context of service extension. It allows access to * serviceExtension-specific resources. @@ -376,6 +404,19 @@ declare namespace common { */ export type EventHub = _EventHub.default; + /** + * The event center of a context, support the subscription and publication of events. + * + * @typedef { _EventHub } + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + export type EventHub = _EventHub; + /** * Defines a PacMap object for storing a series of values. * @@ -418,7 +459,8 @@ declare namespace common { * @typedef { _ConnectOptions } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export type ConnectOptions = _ConnectOptions; @@ -464,7 +506,8 @@ declare namespace common { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export type AbilityStartCallback = _AbilityStartCallback; diff --git a/api/@ohos.app.ability.dataUriUtils.d.ts b/api/@ohos.app.ability.dataUriUtils.d.ts index cdaa9b52b1..63ba6905b8 100644 --- a/api/@ohos.app.ability.dataUriUtils.d.ts +++ b/api/@ohos.app.ability.dataUriUtils.d.ts @@ -23,7 +23,8 @@ * * @namespace dataUriUtils * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace dataUriUtils { /** @@ -34,7 +35,8 @@ declare namespace dataUriUtils { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getId(uri: string): number; @@ -47,7 +49,8 @@ declare namespace dataUriUtils { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function attachId(uri: string, id: number): string; @@ -59,7 +62,8 @@ declare namespace dataUriUtils { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function deleteId(uri: string): string; @@ -72,7 +76,8 @@ declare namespace dataUriUtils { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; * 2. Incorrect parameter types; 3. Parameter verification failed. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function updateId(uri: string, id: number): string; } diff --git a/api/ability/connectOptions.d.ts b/api/ability/connectOptions.d.ts index 7a911505f6..f3235571e0 100644 --- a/api/ability/connectOptions.d.ts +++ b/api/ability/connectOptions.d.ts @@ -27,7 +27,8 @@ import rpc from './../@ohos.rpc'; * * @interface ConnectOptions * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface ConnectOptions { /** @@ -44,7 +45,8 @@ export interface ConnectOptions { * @param { ElementName } elementName - The ohos.bundleManager.ElementName object of the service ability * @param { rpc.IRemoteObject } remote - The remote object instance * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onConnect(elementName: ElementName, remote: rpc.IRemoteObject): void; @@ -60,7 +62,8 @@ export interface ConnectOptions { * * @param { ElementName } elementName - The ohos.bundleManager.ElementName object of the service ability * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onDisconnect(elementName: ElementName): void; @@ -69,7 +72,8 @@ export interface ConnectOptions { * * @param { number } code - The error code of the failed. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ onFailed(code: number): void; } diff --git a/api/application/AbilityRunningInfo.d.ts b/api/application/AbilityRunningInfo.d.ts index d19e8366d3..26f2e16562 100644 --- a/api/application/AbilityRunningInfo.d.ts +++ b/api/application/AbilityRunningInfo.d.ts @@ -26,7 +26,8 @@ import abilityManager from '../@ohos.app.ability.abilityManager'; * * @typedef AbilityRunningInfo * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface AbilityRunningInfo { /** @@ -43,7 +44,8 @@ export interface AbilityRunningInfo { * @type { ElementName } * @default the ohos.bundleManager.ElementName object of the ability. * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ ability: ElementName; @@ -53,7 +55,8 @@ export interface AbilityRunningInfo { * @type { number } * @default process id * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ pid: number; @@ -63,7 +66,8 @@ export interface AbilityRunningInfo { * @type { number } * @default user id * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ uid: number; @@ -73,7 +77,8 @@ export interface AbilityRunningInfo { * @type { string } * @default the name of the process * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ processName: string; @@ -83,7 +88,8 @@ export interface AbilityRunningInfo { * @type { number } * @default ability start time * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ startTime: number; @@ -93,7 +99,8 @@ export interface AbilityRunningInfo { * @type { abilityManager.AbilityState } * @default Enumerates state of the ability state info * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ abilityState: abilityManager.AbilityState; } diff --git a/api/application/AbilityStartCallback.d.ts b/api/application/AbilityStartCallback.d.ts index 53953365b2..486dd0eddc 100644 --- a/api/application/AbilityStartCallback.d.ts +++ b/api/application/AbilityStartCallback.d.ts @@ -18,20 +18,33 @@ * @kit AbilityKit */ -/*** if arkts 1.1 */ -import type { AbilityResult } from '../ability/abilityResult'; -/*** endif */ +import { AbilityResult } from '../ability/abilityResult'; + +/*** if arkts 1.1 */ /** * The callback of UIAbility or UIExtensionAbility. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ export default class AbilityStartCallback { +/*** endif */ +/*** if arkts 1.2 */ +/** + * The callback of UIAbility or UIExtensionAbility. + * + * @typedef AbilityStartCallback + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +declare interface AbilityStartCallback { +/*** endif */ /** * Called when some error occurred except disconnected from UIAbility or UIExtensionAbility. * @@ -41,7 +54,8 @@ export default class AbilityStartCallback { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onError(code: number, name: string, message: string): void; @@ -55,4 +69,20 @@ export default class AbilityStartCallback { * @since 12 */ onResult?(parameter: AbilityResult): void; + + /** + * Called when UIExtensionAbility terminate with result. + * + * @param { AbilityResult } parameter - The parameter returned if the UIExtensionAbility call terminateSelfWithResult. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + onResult(parameter: AbilityResult): void; } + +/*** if arkts 1.2 */ +export default AbilityStartCallback; +/*** endif */ \ No newline at end of file diff --git a/api/application/ApplicationContext.d.ts b/api/application/ApplicationContext.d.ts index e4777379ad..cd4f9a46f1 100644 --- a/api/application/ApplicationContext.d.ts +++ b/api/application/ApplicationContext.d.ts @@ -23,10 +23,10 @@ import { AsyncCallback } from '../@ohos.base'; import { ProcessInformation } from './ProcessInformation'; import type ConfigurationConstant from '../@ohos.app.ability.ConfigurationConstant'; import Want from '../@ohos.app.ability.Want'; -/*** if arkts 1.1 */ -import AbilityLifecycleCallback from '../@ohos.app.ability.AbilityLifecycleCallback'; 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 */ /** @@ -220,7 +220,8 @@ declare class ApplicationContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'environment', callback: EnvironmentCallback): number; @@ -252,7 +253,8 @@ declare class ApplicationContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'environment', callbackId: number, callback: AsyncCallback): void; @@ -283,7 +285,8 @@ declare class ApplicationContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'environment', callbackId: number): Promise; @@ -326,7 +329,8 @@ declare class ApplicationContext extends Context { * @stagemodelonly * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'applicationStateChange', callback: ApplicationStateChangeCallback): void; @@ -371,7 +375,8 @@ declare class ApplicationContext extends Context { * @stagemodelonly * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'applicationStateChange', callback?: ApplicationStateChangeCallback): void; @@ -549,6 +554,20 @@ declare class ApplicationContext extends Context { */ killAllProcesses(callback: AsyncCallback); + /** + * Kill all processes of the application + * + * @param { AsyncCallback } callback - The callback of killAllProcesses. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. 2.Incorrect parameter types. + * @throws { BusinessError } 16000011 - The context does not exist. + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + killAllProcesses(callback: AsyncCallback): void; + /** * Set colorMode of the application * @@ -751,7 +770,8 @@ declare class ApplicationContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ getCurrentAppCloneIndex(): number; @@ -787,7 +807,8 @@ declare class ApplicationContext extends Context { * @throws { BusinessError } 16000078 - The multi-instance is not supported. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ getCurrentInstanceKey(): string; @@ -807,7 +828,8 @@ declare class ApplicationContext extends Context { * @throws { BusinessError } 16000078 - The multi-instance is not supported. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ getAllRunningInstanceKeys(): Promise>; } diff --git a/api/application/AutoFillType.d.ts b/api/application/AutoFillType.d.ts index 8a5d9eb3ba..26d20c9967 100644 --- a/api/application/AutoFillType.d.ts +++ b/api/application/AutoFillType.d.ts @@ -25,7 +25,8 @@ * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum AutoFillType { /** @@ -34,7 +35,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ UNSPECIFIED = 0, @@ -44,7 +46,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ PASSWORD = 1, @@ -54,7 +57,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ USER_NAME = 2, @@ -64,7 +68,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ NEW_PASSWORD = 3, @@ -74,7 +79,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ FULL_STREET_ADDRESS = 4, @@ -84,7 +90,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ HOUSE_NUMBER = 5, @@ -94,7 +101,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ DISTRICT_ADDRESS = 6, @@ -104,7 +112,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ CITY_ADDRESS = 7, @@ -114,7 +123,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PROVINCE_ADDRESS = 8, @@ -124,7 +134,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ COUNTRY_ADDRESS = 9, @@ -134,7 +145,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PERSON_FULL_NAME = 10, @@ -144,7 +156,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PERSON_LAST_NAME = 11, @@ -154,7 +167,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PERSON_FIRST_NAME = 12, @@ -164,7 +178,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PHONE_NUMBER = 13, @@ -174,7 +189,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PHONE_COUNTRY_CODE = 14, @@ -184,7 +200,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ FULL_PHONE_NUMBER = 15, @@ -194,7 +211,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ EMAIL_ADDRESS = 16, @@ -204,7 +222,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ BANK_CARD_NUMBER = 17, @@ -214,7 +233,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ID_CARD_NUMBER = 18, @@ -224,7 +244,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NICKNAME = 24, @@ -234,7 +255,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ DETAIL_INFO_WITHOUT_STREET = 25, @@ -244,7 +266,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ FORMAT_ADDRESS = 26, @@ -264,7 +287,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ VALIDITY = 28, @@ -274,7 +298,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ ISSUE_AT = 29, @@ -284,7 +309,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ ORGANIZATION = 30, @@ -294,7 +320,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ TAX_ID = 31, @@ -304,7 +331,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ ADDRESS_CITY_AND_STATE = 32, @@ -314,7 +342,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ FLIGHT_NUMBER = 33, @@ -324,7 +353,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ LICENSE_NUMBER = 34, @@ -334,7 +364,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ LICENSE_FILE_NUMBER = 35, @@ -344,7 +375,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ LICENSE_PLATE = 36, @@ -354,7 +386,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ ENGINE_NUMBER = 37, @@ -364,7 +397,8 @@ export enum AutoFillType { * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore * @systemapi * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ LICENSE_CHASSIS_NUMBER = 38 } \ No newline at end of file diff --git a/api/application/Context.d.ts b/api/application/Context.d.ts index b226b36719..fa74df5c95 100644 --- a/api/application/Context.d.ts +++ b/api/application/Context.d.ts @@ -19,11 +19,11 @@ */ /*** if arkts 1.1 */ -import type { AsyncCallback } from '../@ohos.base'; import EventHub from './EventHub'; /*** endif */ import { ApplicationInfo } from '../bundleManager/ApplicationInfo'; import ApplicationContext from './ApplicationContext'; +import type { AsyncCallback } from '../@ohos.base'; import BaseContext from './BaseContext'; import resmgr from '../@ohos.resourceManager'; import contextConstant from '../@ohos.app.ability.contextConstant'; @@ -299,7 +299,8 @@ declare class Context extends BaseContext { * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ bundleCodeDir: string; @@ -318,7 +319,8 @@ declare 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 */ distributedFilesDir: string; @@ -335,7 +337,8 @@ declare class Context extends BaseContext { * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ resourceDir: string; @@ -346,7 +349,8 @@ declare class Context extends BaseContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ cloudFileDir: string; @@ -430,7 +434,8 @@ declare class Context extends BaseContext { * @stagemodelonly * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ processName: string; @@ -595,7 +600,8 @@ declare 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 */ getGroupDir(dataGroupID: string, callback: AsyncCallback): void; @@ -623,7 +629,8 @@ declare 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 */ getGroupDir(dataGroupID: string): Promise; @@ -656,7 +663,8 @@ declare class Context extends BaseContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ createAreaModeContext(areaMode: contextConstant.AreaMode): Context; @@ -671,7 +679,8 @@ declare class Context extends BaseContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ createDisplayContext(displayId: number): Context; } diff --git a/api/application/EventHub.d.ts b/api/application/EventHub.d.ts index 8b1a3fb6c1..921b346a51 100644 --- a/api/application/EventHub.d.ts +++ b/api/application/EventHub.d.ts @@ -42,7 +42,8 @@ import { BusinessError } from '../@ohos.base'; * @stagemodelonly * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export default class EventHub { /** diff --git a/api/application/ExtensionRunningInfo.d.ts b/api/application/ExtensionRunningInfo.d.ts index 6c23c5536b..7b6bdaaf40 100644 --- a/api/application/ExtensionRunningInfo.d.ts +++ b/api/application/ExtensionRunningInfo.d.ts @@ -27,7 +27,8 @@ import bundle from '../@ohos.bundle.bundleManager'; * @typedef ExtensionRunningInfo * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export interface ExtensionRunningInfo { /** @@ -35,7 +36,8 @@ export interface ExtensionRunningInfo { * @default Indicates the extension of the extension info * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ extension: ElementName; @@ -44,7 +46,8 @@ export interface ExtensionRunningInfo { * @default process id * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ pid: number; @@ -53,7 +56,8 @@ export interface ExtensionRunningInfo { * @default user id * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ uid: number; @@ -62,7 +66,8 @@ export interface ExtensionRunningInfo { * @default the name of the process * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ processName: string; @@ -71,7 +76,8 @@ export interface ExtensionRunningInfo { * @default ability start time * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ startTime: number; @@ -80,7 +86,8 @@ export interface ExtensionRunningInfo { * @default All package names under the current process * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ clientPackage: Array; @@ -89,7 +96,8 @@ export interface ExtensionRunningInfo { * @default Enumerates types of the extension info * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ type: bundle.ExtensionAbilityType; } diff --git a/api/application/ProcessData.d.ts b/api/application/ProcessData.d.ts index 7d6df91bbf..e80fbfb0a0 100644 --- a/api/application/ProcessData.d.ts +++ b/api/application/ProcessData.d.ts @@ -22,7 +22,8 @@ * The process data. * * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ export default class ProcessData { /** @@ -30,7 +31,8 @@ export default class ProcessData { * * @type { string } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ bundleName: string; @@ -39,7 +41,8 @@ export default class ProcessData { * * @type { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ pid: number; @@ -48,7 +51,8 @@ export default class ProcessData { * * @type { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ uid: number; @@ -57,7 +61,8 @@ export default class ProcessData { * * @type { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ state: number; @@ -66,7 +71,8 @@ export default class ProcessData { * * @type { boolean } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ isContinuousTask: boolean; @@ -75,7 +81,8 @@ export default class ProcessData { * * @type { boolean } * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ isKeepAlive: boolean; } diff --git a/api/application/RunningMultiInstanceInfo.d.ts b/api/application/RunningMultiInstanceInfo.d.ts index 1645db4051..c64921df69 100644 --- a/api/application/RunningMultiInstanceInfo.d.ts +++ b/api/application/RunningMultiInstanceInfo.d.ts @@ -45,7 +45,8 @@ export interface RunningMultiInstanceInfo { * @type { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ uid: number; @@ -55,7 +56,8 @@ export interface RunningMultiInstanceInfo { * @type { Array } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ pids: Array; } \ No newline at end of file diff --git a/api/application/UIAbilityContext.d.ts b/api/application/UIAbilityContext.d.ts index 73cf76d55b..34fd6d5074 100644 --- a/api/application/UIAbilityContext.d.ts +++ b/api/application/UIAbilityContext.d.ts @@ -18,28 +18,31 @@ * @kit AbilityKit */ -/*** if arkts 1.1 */ +import { AsyncCallback } from '../@ohos.base'; +import type AbilityStartCallback from './AbilityStartCallback'; +import Want from '../@ohos.app.ability.Want'; +import StartOptions from '../@ohos.app.ability.StartOptions'; +import { Configuration } from '../@ohos.app.ability.Configuration'; +import Context from './Context'; +import { AbilityResult } from '../ability/abilityResult'; +import window from '../@ohos.window'; +import { AbilityInfo } from '../bundleManager/AbilityInfo'; import { ConnectOptions } from '../ability/connectOptions'; +import { HapModuleInfo } from '../bundleManager/HapModuleInfo'; +import OpenLinkOptions from '../@ohos.app.ability.OpenLinkOptions'; import { Caller } from '../@ohos.app.ability.UIAbility'; +import type ConfigurationConstant from '../@ohos.app.ability.ConfigurationConstant'; +/*** if arkts 1.1 */ import image from '../@ohos.multimedia.image'; import dialogRequest from '../@ohos.app.ability.dialogRequest'; import AbilityConstant from '../@ohos.app.ability.AbilityConstant'; import type AtomicServiceOptions from '../@ohos.app.ability.AtomicServiceOptions'; -import type ConfigurationConstant from '../@ohos.app.ability.ConfigurationConstant'; import type UIServiceProxy from './UIServiceProxy'; import type UIServiceExtensionConnectCallback from './UIServiceExtensionConnectCallback'; -import type AbilityStartCallback from './AbilityStartCallback'; /*** endif */ -import { AbilityInfo } from '../bundleManager/AbilityInfo'; -import { AbilityResult } from '../ability/abilityResult'; -import { AsyncCallback } from '../@ohos.base'; -import Context from './Context'; -import { HapModuleInfo } from '../bundleManager/HapModuleInfo'; -import OpenLinkOptions from '../@ohos.app.ability.OpenLinkOptions'; -import Want from '../@ohos.app.ability.Want'; -import StartOptions from '../@ohos.app.ability.StartOptions'; -import { Configuration } from '../@ohos.app.ability.Configuration'; -import window from '../@ohos.window'; +/*** if arkts 1.2 */ +import { LocalStorage } from '@ohos.arkui.stateManagement'; +/*** endif */ /** * The context of an ability. It allows access to ability-specific resources. @@ -1286,7 +1289,8 @@ declare class UIAbilityContext extends Context { * @throws { BusinessError } 16000080 - Creating a new instance is not supported. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ startAbilityByCall(want: Want): Promise; @@ -3604,7 +3608,8 @@ declare class UIAbilityContext extends Context { * @throws { BusinessError } 16000055 - Installation-free timed out. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ connectServiceExtensionAbility(want: Want, options: ConnectOptions): number; @@ -3684,7 +3689,8 @@ declare class UIAbilityContext extends Context { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ disconnectServiceExtensionAbility(connection: number): Promise; @@ -3711,7 +3717,8 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setMissionLabel(label: string, callback: AsyncCallback): void; @@ -3738,7 +3745,8 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setMissionLabel(label: string): Promise; @@ -4499,7 +4507,8 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ startAbilityByType(type: string, wantParam: Record, abilityStartCallback: AbilityStartCallback, callback: AsyncCallback): void; @@ -4540,7 +4549,8 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ startAbilityByType(type: string, wantParam: Record, abilityStartCallback: AbilityStartCallback): Promise; @@ -4830,7 +4840,8 @@ declare class UIAbilityContext extends Context { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ setColorMode(colorMode: ConfigurationConstant.ColorMode): void; diff --git a/api/application/UIExtensionContext.d.ts b/api/application/UIExtensionContext.d.ts index 9d577273b3..8ee099e6d3 100755 --- a/api/application/UIExtensionContext.d.ts +++ b/api/application/UIExtensionContext.d.ts @@ -19,22 +19,23 @@ */ -import type { AsyncCallback } from '../@ohos.base'; -import ExtensionContext from './ExtensionContext'; -import type Want from '../@ohos.app.ability.Want'; -import type StartOptions from '../@ohos.app.ability.StartOptions'; /*** if arkts 1.1 */ import type { AbilityResult } from '../ability/abilityResult'; import type { ConnectOptions } from '../ability/connectOptions'; import type AtomicServiceOptions from '../@ohos.app.ability.AtomicServiceOptions'; import OpenLinkOptions from '../@ohos.app.ability.OpenLinkOptions'; -import type ConfigurationConstant from '../@ohos.app.ability.ConfigurationConstant'; import type UIServiceProxy from './UIServiceProxy'; import type UIServiceExtensionConnectCallback from './UIServiceExtensionConnectCallback'; /*** endif */ /*** if arkts 1.2 */ +import { ConnectOptions } from '../ability/connectOptions'; import { AbilityResult } from '../ability/abilityResult'; /*** endif */ +import type ConfigurationConstant from '../@ohos.app.ability.ConfigurationConstant'; +import type { AsyncCallback } from '../@ohos.base'; +import ExtensionContext from './ExtensionContext'; +import type Want from '../@ohos.app.ability.Want'; +import type StartOptions from '../@ohos.app.ability.StartOptions'; /** * The context of UI extension. It allows access to UIExtension-specific resources. @@ -528,7 +529,8 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16200001 - The caller has been released. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ startAbilityForResult(want: Want, callback: AsyncCallback): void; @@ -637,7 +639,8 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16200001 - The caller has been released. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ startAbilityForResult(want: Want, options: StartOptions, callback: AsyncCallback): void; @@ -752,7 +755,8 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16200001 - The caller has been released. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ startAbilityForResult(want: Want, options?: StartOptions): Promise; @@ -840,7 +844,8 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16000070 - The extension cannot start the service. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ connectServiceExtensionAbility(want: Want, options: ConnectOptions): number; @@ -854,7 +859,8 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ disconnectServiceExtensionAbility(connection: number, callback: AsyncCallback): void; @@ -868,7 +874,8 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ disconnectServiceExtensionAbility(connection: number): Promise; @@ -880,7 +887,8 @@ declare class UIExtensionContext extends ExtensionContext { * @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 */ reportDrawnCompleted(callback: AsyncCallback): void; @@ -1112,7 +1120,8 @@ declare class UIExtensionContext extends ExtensionContext { * @throws { BusinessError } 16000011 - The context does not exist. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ setColorMode(colorMode: ConfigurationConstant.ColorMode): void; } diff --git a/api/wantAgent/wantAgentInfo.d.ts b/api/wantAgent/wantAgentInfo.d.ts index 862c112003..54542b9a02 100644 --- a/api/wantAgent/wantAgentInfo.d.ts +++ b/api/wantAgent/wantAgentInfo.d.ts @@ -112,7 +112,8 @@ export interface WantAgentInfo { * @type { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ requestCode: number; -- Gitee From b553bc6bacecc2a73dee2fa9bbe76f09643e08e0 Mon Sep 17 00:00:00 2001 From: sunjie Date: Sat, 12 Jul 2025 18:10:30 +0800 Subject: [PATCH 090/746] add fontmanager ani Signed-off-by: sunjie --- api/@ohos.fontManager.d.ts | 17 ++++++++++------- kits/@kit.LocalizationKit.d.ts | 3 ++- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/api/@ohos.fontManager.d.ts b/api/@ohos.fontManager.d.ts index 1ce457179a..b661f598b4 100644 --- a/api/@ohos.fontManager.d.ts +++ b/api/@ohos.fontManager.d.ts @@ -24,7 +24,8 @@ * @namespace fontManager * @syscap SystemCapability.Global.FontManager * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace fontManager { /** @@ -32,7 +33,7 @@ declare namespace fontManager { * * @permission ohos.permission.UPDATE_FONT * @param { string } path - path indicates the font path. - * @returns { Promise } - Number indicates the font installation result. + * @returns { Promise } - int indicates the font installation result. * 0 - Install successful. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Non-system application. @@ -44,16 +45,17 @@ declare namespace fontManager { * @throws { BusinessError } 31100106 - Other error. * @syscap SystemCapability.Global.FontManager * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ - function installFont(path: string): Promise; + function installFont(path: string): Promise; /** * Uninstalls the specified path font. * * @permission ohos.permission.UPDATE_FONT * @param { string } fullName - fullName indicates the font name. - * @returns { Promise } - number indicates the font uninstallation result. + * @returns { Promise } - int indicates the font uninstallation result. * 0 - Uninstall successful. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Non-system application. @@ -62,8 +64,9 @@ declare namespace fontManager { * @throws { BusinessError } 31100109 - Other error. * @syscap SystemCapability.Global.FontManager * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ - function uninstallFont(fullName: string): Promise; + function uninstallFont(fullName: string): Promise; } export default fontManager; \ No newline at end of file diff --git a/kits/@kit.LocalizationKit.d.ts b/kits/@kit.LocalizationKit.d.ts index 4f5f329d80..dd02eac51b 100644 --- a/kits/@kit.LocalizationKit.d.ts +++ b/kits/@kit.LocalizationKit.d.ts @@ -27,9 +27,10 @@ import sendableResourceManager from '@ohos.sendableResourceManager'; export { fontManager, i18n, intl, resourceManager, sendableResourceManager }; /*** endif */ /*** if arkts 1.2 */ +import fontManager from '@ohos.fontManager'; import i18n from '@ohos.i18n'; import intl from '@ohos.intl'; import resourceManager from '@ohos.resourceManager'; -export { i18n, intl, resourceManager }; +export { fontManager, i18n, intl, resourceManager }; /*** endif */ -- Gitee From 8a6dcc02944b5149b64ec0b1a81f8c9dd7bd73d9 Mon Sep 17 00:00:00 2001 From: cjw123qq Date: Tue, 8 Jul 2025 17:30:32 +0800 Subject: [PATCH 091/746] fix: 0328 to 0702 for power SDK Signed-off-by: cjw123qq --- api/@ohos.batteryInfo.d.ets | 430 ++++++++++++++++++++++++++++++- api/@ohos.batteryStatistics.d.ts | 159 +++++++----- api/@ohos.brightness.d.ts | 19 +- api/@ohos.charger.d.ts | 30 ++- api/@ohos.power.d.ts | 63 +++-- api/@ohos.runningLock.d.ts | 44 ++-- api/@ohos.thermal.d.ts | 44 +++- 7 files changed, 655 insertions(+), 134 deletions(-) diff --git a/api/@ohos.batteryInfo.d.ets b/api/@ohos.batteryInfo.d.ets index 7b8f73ca19..b3a2419152 100644 --- a/api/@ohos.batteryInfo.d.ets +++ b/api/@ohos.batteryInfo.d.ets @@ -16,6 +16,7 @@ /** * @file * @kit BasicServicesKit + * @arkts 1.2 */ /** @@ -23,19 +24,442 @@ *

    Battery information includes the remaining battery power, * voltage, temperature, model, and charger type. * + * @namespace batteryInfo * @syscap SystemCapability.PowerManager.BatteryManager.Core * @atomicservice * @since 20 */ -declare class batteryInfo { +declare namespace batteryInfo { + /** + * Sets the battery config by scene name. + * + * @param { string } sceneName - Indicates the battery charging scene name. + * sceneName parameter must be of type string. + * @param { string } sceneValue - Indicates the battery charging scene value. + * sceneValue parameter must be of type string. + * @returns { int } Return to set the charging configuration result. + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Incorrect parameter types; + * @throws { BusinessError } 5100101 - Failed to connect to the service. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @systemapi + * @since 20 + */ + function setBatteryConfig(sceneName: string, sceneValue: string): int; + + /** + * Queries the battery config by scene name. + * + * @param { string } sceneName - Indicates the battery charging scene name. + * sceneName parameter must be of type string. + * @returns { string } Returns the battery charging configuration, returns "" otherwise. + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Incorrect parameter types; + * @throws { BusinessError } 5100101 - Failed to connect to the service. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @systemapi + * @since 20 + */ + function getBatteryConfig(sceneName: string): string; + + /** + * Checks the battery config is enable by scene name. + * + * @param { string } sceneName - Indicates the battery charging scene name. + * sceneName parameter must be of type string. + * @returns { boolean } Returns true if the device supports the charging scene, returns false otherwise. + * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. + * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Incorrect parameter types; + * @throws { BusinessError } 5100101 - Failed to connect to the service. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @systemapi + * @since 20 + */ + function isBatteryConfigSupported(sceneName: string): boolean; + /** * Battery state of charge (SoC) of the current device, in percent. * - * @readonly + * @returns { int } Returns the battery state of charge (SoC) of the current device, in percent. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + function batterySOC(): int; + + /** + * Battery charging status of the current device. + * + * @returns { BatteryChargeState } Returns the battery charging status of the current device. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + function chargingStatus(): BatteryChargeState; + + /** + * Battery health state of the current device. + * + * @returns { BatteryHealthState } Returns the battery health state of the current device. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + function healthStatus(): BatteryHealthState; + + /** + * Charger type of the current device. + * + * @returns { BatteryPluggedType } Returns the charger type of the current device. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + function pluggedType(): BatteryPluggedType; + + /** + * Battery voltage of the current device, in µV. + * + * @returns { int } Returns the battery voltage of the current device, in µV. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + function voltage(): int; + + /** + * Battery technology of the current device. + * + * @returns { string } Returns the battery technology of the current device. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + function technology(): string; + + /** + * Battery temperature of the current device, in 0.1℃. + * + * @returns { int } Returns the battery temperature of the current device, in 0.1℃. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + function batteryTemperature(): int; + + /** + * Battery present state of the current device. + * + * @returns { boolean } Returns true if the battery is present; returns false if the battery is absent. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + function isBatteryPresent(): boolean; + + /** + * Battery capacity level of the current device. + * + * @returns { BatteryCapacityLevel } Returns the battery capacity level of the current device. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + function batteryCapacityLevel(): BatteryCapacityLevel; + + /** + * Estimated remaining time for the current device to be fully charged, in ms. + * + * @returns { long } Returns the estimated remaining time for the current device to be fully charged, in ms. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @systemapi + * @since 20 + */ + function estimatedRemainingChargeTime(): long; + + /** + * Battery total energy of the current device, in mAh. + * + * @returns { int } Returns the battery total energy of the current device, in mAh. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @systemapi + * @since 20 + */ + function totalEnergy(): int; + + /** + * Battery immediate current of the current device, in mA. + * + * @returns { int } Returns the battery immediate current of the current device, in mA. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + function nowCurrent(): int; + + /** + * Battery remaining energy of the current device, in mAh. + * + * @returns { int } Returns the battery remaining energy of the current device, in mAh. + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @systemapi + * @since 20 + */ + function remainingEnergy(): int; + + /** + * Charger type of a device. + * + * @enum { int } + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + export enum BatteryPluggedType { + /** + * Unknown type + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + NONE, + /** + * AC charger + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + AC, + /** + * USB charger + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + USB, + /** + * Wireless charger + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + WIRELESS + } + + /** + * Battery charging status of a device. + * + * @enum { int } * @syscap SystemCapability.PowerManager.BatteryManager.Core * @atomicservice * @since 20 */ - static get batterySOC(): int; + export enum BatteryChargeState { + /** + * Unknown state. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @atomicservice + * @since 20 + */ + NONE, + /** + * The battery is being charged. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @atomicservice + * @since 20 + */ + ENABLE, + /** + * The battery is not being charged. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @atomicservice + * @since 20 + */ + DISABLE, + /** + * The battery is fully charged. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @atomicservice + * @since 20 + */ + FULL + } + + /** + * Battery health status of a device. + * + * @enum { int } + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + export enum BatteryHealthState { + /** + * Unknown state. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + UNKNOWN, + /** + * The battery is in healthy state. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + GOOD, + /** + * The battery is overheated. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + OVERHEAT, + /** + * The battery voltage is over high. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + OVERVOLTAGE, + /** + * The battery temperature is low. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + COLD, + /** + * The battery is dead. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + DEAD + } + + /** + * Battery capacity level of a device. + * + * @enum { int } + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + export enum BatteryCapacityLevel { + /** + * The battery is in full capacity level. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + LEVEL_FULL, + /** + * The battery is in high capacity level. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + LEVEL_HIGH, + /** + * The battery is in normal capacity level. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + LEVEL_NORMAL, + /** + * The battery is in low capacity level. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + LEVEL_LOW, + /** + * The battery is in warning low capacity level. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + LEVEL_WARNING, + /** + * The battery is in critical low capacity level. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + LEVEL_CRITICAL, + /** + * The battery is in the lowest capacity level, system will shut down automatically in a few seconds. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + LEVEL_SHUTDOWN + } + + /** + * Extra key of common event COMMON_EVENT_BATTERY_CHANGED. + * + * @enum { string } + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + export enum CommonEventBatteryChangedKey { + /** + * Extra code of batterySOC. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + EXTRA_SOC = 'soc', + /** + * Extra code of chargingStatus. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + EXTRA_CHARGE_STATE = 'chargeState', + /** + * Extra code of healthStatus. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + EXTRA_HEALTH_STATE = 'healthState', + /** + * Extra code of pluggedType. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + EXTRA_PLUGGED_TYPE = 'pluggedType', + /** + * Extra code of voltage. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + EXTRA_VOLTAGE = 'voltage', + /** + * Extra code of technology. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + EXTRA_TECHNOLOGY = 'technology', + /** + * Extra code of batteryTemperature. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + EXTRA_TEMPERATURE = 'temperature', + /** + * Extra code of isBatteryPresent. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + EXTRA_PRESENT = 'present', + /** + * Extra code of batteryCapacityLevel. + * + * @syscap SystemCapability.PowerManager.BatteryManager.Core + * @since 20 + */ + EXTRA_CAPACITY_LEVEL = 'capacityLevel' + } } export default batteryInfo; \ No newline at end of file diff --git a/api/@ohos.batteryStatistics.d.ts b/api/@ohos.batteryStatistics.d.ts index 906cb96453..1ccd48e007 100644 --- a/api/@ohos.batteryStatistics.d.ts +++ b/api/@ohos.batteryStatistics.d.ts @@ -16,6 +16,7 @@ /** * @file * @kit BasicServicesKit + * @arkts 1.1&1.2 */ import { AsyncCallback, BusinessError } from './@ohos.base'; @@ -26,88 +27,108 @@ import { AsyncCallback, BusinessError } from './@ohos.base'; * @namespace batteryStats * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace batteryStats { /** * Describes the consumption type. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum ConsumptionType { - /** Indicates an invalid consumption type + /** + * Indicates an invalid consumption type. * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ CONSUMPTION_TYPE_INVALID = -17, - /** Indicates the battery power consumption generated by APP + /** + * Indicates the battery power consumption generated by APP. * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ CONSUMPTION_TYPE_APP, - /** Indicates the battery power consumption generated by bluetooth + /** + * Indicates the battery power consumption generated by bluetooth. * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ CONSUMPTION_TYPE_BLUETOOTH, - /** Indicates the battery power consumption generated when the CPU is idle + /** + * Indicates the battery power consumption generated when the CPU is idle. * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ CONSUMPTION_TYPE_IDLE, - /** Indicates the battery power consumption generated when phone call is active + /** + * Indicates the battery power consumption generated when phone call is active. * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ CONSUMPTION_TYPE_PHONE, - /** Indicates the battery power consumption generated by radio + /** + * Indicates the battery power consumption generated by radio. * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ CONSUMPTION_TYPE_RADIO, - /** Indicates the battery power consumption generated by screen + /** + * Indicates the battery power consumption generated by screen. * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ CONSUMPTION_TYPE_SCREEN, - /** Indicates the battery power consumption generated by user + /** + * Indicates the battery power consumption generated by user. * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ CONSUMPTION_TYPE_USER, - /** Indicates the battery power consumption generated by WIFI + /** + * Indicates the battery power consumption generated by WIFI. * * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ CONSUMPTION_TYPE_WIFI } @@ -119,7 +140,8 @@ declare namespace batteryStats { * @throws { BusinessError } 4600101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ function getBatteryStats(): Promise>; @@ -133,67 +155,72 @@ declare namespace batteryStats { * @throws { BusinessError } 4600101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ function getBatteryStats(callback: AsyncCallback>): void; /** * Obtains power consumption information(mAh) for a given uid. * - * @param { number } uid Indicates the uid. - * @returns { number } Power consumption information(mAh). + * @param { int } uid Indicates the uid. + * @returns { double } Power consumption information(mAh). * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. * @throws { BusinessError } 4600101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - function getAppPowerValue(uid: number): number; + function getAppPowerValue(uid: int): double; /** * Obtains power consumption information(Percent) for a given uid. * - * @param { number } uid Indicates the uid. - * @returns { number } Power consumption information(Percent). + * @param { int } uid Indicates the uid. + * @returns { double } Power consumption information(Percent). * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. * @throws { BusinessError } 4600101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - function getAppPowerPercent(uid: number): number; + function getAppPowerPercent(uid: int): double; /** * Obtains power consumption information(mAh) for a given type. * * @param { ConsumptionType } type Indicates the hardware type. * the ConsumptionType type is an enumeration class. - * @returns { number } Power consumption information(mAh). + * @returns { double } Power consumption information(mAh). * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. * @throws { BusinessError } 4600101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - function getHardwareUnitPowerValue(type: ConsumptionType): number; + function getHardwareUnitPowerValue(type: ConsumptionType): double; /** * Obtains power consumption information(Percent) for a given type. * * @param { ConsumptionType } type Indicates the hardware type. * the ConsumptionType type is an enumeration class. - * @returns { number } Power consumption information(Percent). + * @returns { double } Power consumption information(Percent). * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. * @throws { BusinessError } 4600101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ - function getHardwareUnitPowerPercent(type: ConsumptionType): number; + function getHardwareUnitPowerPercent(type: ConsumptionType): double; /** * Contains power consumption information of a device. @@ -202,35 +229,42 @@ declare namespace batteryStats { * @typedef BatteryStatsInfo * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ interface BatteryStatsInfo { - /** The uid related with the power consumption info. + /** + * The uid related with the power consumption info. * - * @type { number } + * @type { int } * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ - uid: number; + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ + uid: int; - /** The type related with the power consumption info. + /** + * The type related with the power consumption info. * * @type { ConsumptionType } * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ type: ConsumptionType; - /** The power consumption value(mAh). + /** + * The power consumption value(mAh). * - * @type { number } + * @type { double } * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 - */ - power: number; + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ + power: double; } } @@ -240,6 +274,7 @@ declare namespace batteryStats { * @namespace batteryStats * @syscap SystemCapability.PowerManager.BatteryStatistics * @systemapi - * @since 8 -*/ + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 + */ export default batteryStats; diff --git a/api/@ohos.brightness.d.ts b/api/@ohos.brightness.d.ts index 9b8807e0b0..1545fa73d8 100644 --- a/api/@ohos.brightness.d.ts +++ b/api/@ohos.brightness.d.ts @@ -16,6 +16,7 @@ /** * @file * @kit BasicServicesKit + * @arkts 1.1&1.2 */ import { BusinessError } from './@ohos.base'; @@ -26,29 +27,29 @@ import { BusinessError } from './@ohos.base'; * @namespace brightness * @syscap SystemCapability.PowerManager.DisplayPowerManager * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} */ declare namespace brightness { /** * Sets the screen brightness. * - * @param { number } value Brightness value, ranging from 0 to 255. - * value parameter must be of type number. + * @param { int } value Brightness value, ranging from 0 to 255. + * value parameter must be of type int. * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; * 2. Incorrect parameter types; * @throws { BusinessError } 4700101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.DisplayPowerManager * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} */ - function setValue(value: number): void; + function setValue(value: int): void; /** * Sets the screen brightness. * - * @param { number } value - Brightness value, ranging from 0 to 255. - * value parameter must be of type number. + * @param { int } value - Brightness value, ranging from 0 to 255. + * value parameter must be of type int. * @param { boolean } continuous - This parameter is used in the scenario of continuous adjustment to the brightness. * You are advised to set this parameter to true during the continuous adjustment and * to false at the end of the continuous adjustment for better performance. @@ -59,8 +60,8 @@ declare namespace brightness { * @throws { BusinessError } 4700101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.DisplayPowerManager * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} */ - function setValue(value: number, continuous: boolean): void; + function setValue(value: int, continuous: boolean): void; } export default brightness; diff --git a/api/@ohos.charger.d.ts b/api/@ohos.charger.d.ts index a02a52cfd5..1c8ecd419f 100644 --- a/api/@ohos.charger.d.ts +++ b/api/@ohos.charger.d.ts @@ -16,6 +16,7 @@ /** * @file * @kit BasicServicesKit + * @arkts 1.1&1.2 */ /** @@ -24,16 +25,18 @@ * @namespace charger * @syscap SystemCapability.PowerManager.BatteryManager.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace charger { /** * Indicates the type of the charger plugged-in. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.PowerManager.BatteryManager.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum ChargeType { /** @@ -41,7 +44,8 @@ declare namespace charger { * * @syscap SystemCapability.PowerManager.BatteryManager.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ NONE, /** @@ -49,7 +53,8 @@ declare namespace charger { * * @syscap SystemCapability.PowerManager.BatteryManager.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ WIRED_NORMAL, /** @@ -57,7 +62,8 @@ declare namespace charger { * * @syscap SystemCapability.PowerManager.BatteryManager.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ WIRED_QUICK, /** @@ -65,7 +71,8 @@ declare namespace charger { * * @syscap SystemCapability.PowerManager.BatteryManager.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ WIRED_SUPER_QUICK, /** @@ -73,7 +80,8 @@ declare namespace charger { * * @syscap SystemCapability.PowerManager.BatteryManager.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ WIRELESS_NORMAL, /** @@ -81,7 +89,8 @@ declare namespace charger { * * @syscap SystemCapability.PowerManager.BatteryManager.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ WIRELESS_QUICK, /** @@ -89,7 +98,8 @@ declare namespace charger { * * @syscap SystemCapability.PowerManager.BatteryManager.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ WIRELESS_SUPER_QUICK } diff --git a/api/@ohos.power.d.ts b/api/@ohos.power.d.ts index 0bdb72dc4f..58792b6ee7 100644 --- a/api/@ohos.power.d.ts +++ b/api/@ohos.power.d.ts @@ -25,7 +25,8 @@ import { AsyncCallback, BusinessError } from './@ohos.base'; * * @namespace power * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace power { /** @@ -41,7 +42,8 @@ declare namespace power { * @throws { BusinessError } 4900101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.PowerManager.Core * @systemapi - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ function shutdown(reason: string): void; @@ -73,7 +75,8 @@ declare namespace power { * @throws { BusinessError } 4900101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.PowerManager.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function reboot(reason: string): void; @@ -105,8 +108,10 @@ declare namespace power { * The screen will be on if device is active, screen will be off otherwise. * * @returns { boolean } Returns true if the device is active; returns false otherwise. + * @throws { BusinessError } 4900101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isActive(): boolean; @@ -134,7 +139,8 @@ declare namespace power { * @throws { BusinessError } 4900101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.PowerManager.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ function wakeup(detail: string): void; @@ -170,7 +176,8 @@ declare namespace power { * @throws { BusinessError } 4900101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.PowerManager.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ function suspend(isImmediate?: boolean): void; @@ -178,8 +185,10 @@ declare namespace power { * Obtains the power mode of the current device. For details, see {@link DevicePowerMode}. * * @returns { DevicePowerMode } The power mode {@link DevicePowerMode} of current device . + * @throws { BusinessError } 4900101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getPowerMode(): DevicePowerMode; @@ -193,9 +202,11 @@ declare namespace power { * @throws { BusinessError } 201 – Permission verification failed. The application does not have the permission required to call the API. * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. + * @throws { BusinessError } 4900101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.PowerManager.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function setPowerMode(mode: DevicePowerMode, callback: AsyncCallback): void; @@ -209,9 +220,11 @@ declare namespace power { * @throws { BusinessError } 201 – Permission verification failed. The application does not have the permission required to call the API. * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. + * @throws { BusinessError } 4900101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.PowerManager.Core * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function setPowerMode(mode: DevicePowerMode): Promise; @@ -221,7 +234,8 @@ declare namespace power { * @returns { boolean } Returns true if the device is in idle mode; returns false otherwise. * @throws { BusinessError } 4900101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function isStandby(): boolean; @@ -247,7 +261,8 @@ declare namespace power { * @throws { BusinessError } 4900101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.PowerManager.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ function hibernate(clearMemory: boolean): void; @@ -266,51 +281,57 @@ declare namespace power { * Sets the timeout duration(ms) for turning off the screen with permission. * * @permission ohos.permission.POWER_MANAGER - * @param { number } timeout - Indicates duration(ms) for turning off the screen. The value -1 means restore the default value. + * @param { long } timeout - Indicates duration(ms) for turning off the screen. The value -1 means restore the default value. * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. * @throws { BusinessError } 4900101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.PowerManager.Core * @systemapi - * @since 19 + * @since arkts {'1.1':'19', '1.2':'20'} + * @arkts 1.1&1.2 */ - function setScreenOffTime(timeout: number): void; + function setScreenOffTime(timeout: long): void; /** * Power mode of a device. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum DevicePowerMode { /** * Normal power mode * * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ MODE_NORMAL = 600, /** * Power save mode - * * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 + * */ MODE_POWER_SAVE, /** * Performance power mode * * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ MODE_PERFORMANCE, /** * Extreme power save mode * * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ MODE_EXTREME_POWER_SAVE } diff --git a/api/@ohos.runningLock.d.ts b/api/@ohos.runningLock.d.ts index a2f1725ae5..7e540367b2 100644 --- a/api/@ohos.runningLock.d.ts +++ b/api/@ohos.runningLock.d.ts @@ -30,7 +30,8 @@ import { AsyncCallback, BusinessError } from './@ohos.base'; * * @namespace runningLock * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace runningLock { @@ -38,7 +39,8 @@ declare namespace runningLock { * Provides a mechanism to prevent the system from hibernating so that the applications can run in the background or * when the screen is off. * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ class RunningLock { /** @@ -60,15 +62,17 @@ declare namespace runningLock { * This method requires the ohos.permission.RUNNING_LOCK permission. * * @permission ohos.permission.RUNNING_LOCK - * @param { number } timeout Indicates the lock duration (ms). After the lock duration times out, + * @param { int } timeout Indicates the lock duration (ms). After the lock duration times out, * the lock is automatically released and the system hibernates if no other {@link RunningLock} is set. - * timeout parameter must be of type number. + * timeout parameter must be of type int. * @throws { BusinessError } 201 – If the permission is denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Incorrect parameter types; + * @throws { BusinessError } 4900101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ - hold(timeout: number): void; + hold(timeout: int): void; /** * Checks whether a lock is held or in use. @@ -85,8 +89,10 @@ declare namespace runningLock { * Checks whether a lock is held or in use. * * @returns { boolean } Returns true if the lock is held or in use; returns false if the lock has been released. + * @throws { BusinessError } 4900101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ isHolding(): boolean; @@ -108,8 +114,10 @@ declare namespace runningLock { * * @permission ohos.permission.RUNNING_LOCK * @throws { BusinessError } 201 – If the permission is denied. + * @throws { BusinessError } 4900101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ unhold(): void; } @@ -120,9 +128,10 @@ declare namespace runningLock { * {@link BACKGROUND} ensures that applications can run in the background. * {@link PROXIMITY_SCREEN_CONTROL} determines whether to turn on or off the screen based on the proximity sensor. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum RunningLockType { /** @@ -140,9 +149,10 @@ declare namespace runningLock { * from the user's ear, the screen turns on. * * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ - PROXIMITY_SCREEN_CONTROL + PROXIMITY_SCREEN_CONTROL = 2 } /** @@ -179,8 +189,10 @@ declare namespace runningLock { * @returns { boolean } Whether the specified {@link RunningLockType} is supported. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Incorrect parameter types; * 2. Parameter verification failed. + * @throws { BusinessError } 4900101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function isSupported(type: RunningLockType): boolean; @@ -234,7 +246,8 @@ declare namespace runningLock { * @throws { BusinessError } 201 – If the permission is denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function create(name: string, type: RunningLockType, callback: AsyncCallback): void; @@ -253,7 +266,8 @@ declare namespace runningLock { * @throws { BusinessError } 201 – If the permission is denied. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function create(name: string, type: RunningLockType): Promise; } diff --git a/api/@ohos.thermal.d.ts b/api/@ohos.thermal.d.ts index 28c9b0938c..fadd6ea48a 100644 --- a/api/@ohos.thermal.d.ts +++ b/api/@ohos.thermal.d.ts @@ -28,36 +28,41 @@ import { AsyncCallback, BusinessError, Callback } from './@ohos.base'; * * @namespace thermal * @syscap SystemCapability.PowerManager.ThermalManager - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace thermal { /** * Enumerates the {@link ThermalLevel} types. * - * @enum {number} + * @enum {int} * @syscap SystemCapability.PowerManager.ThermalManager - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum ThermalLevel { /** * The device is cool, and services are not restricted. * * @syscap SystemCapability.PowerManager.ThermalManager - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ COOL = 0, /** * The device is operational but is not cool. You need to pay attention to its heating. * * @syscap SystemCapability.PowerManager.ThermalManager - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ NORMAL = 1, /** * The device is warm. You need to stop or delay some imperceptible services. * * @syscap SystemCapability.PowerManager.ThermalManager - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ WARM = 2, /** @@ -65,7 +70,8 @@ declare namespace thermal { * or reduce the load of other services. * * @syscap SystemCapability.PowerManager.ThermalManager - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ HOT = 3, /** @@ -73,7 +79,8 @@ declare namespace thermal { * or reduce the load of major services. * * @syscap SystemCapability.PowerManager.ThermalManager - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ OVERHEATED = 4, /** @@ -81,7 +88,8 @@ declare namespace thermal { * all imperceptible services and downgrade major services to the maximum extent. * * @syscap SystemCapability.PowerManager.ThermalManager - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ WARNING = 5, /** @@ -89,7 +97,8 @@ declare namespace thermal { * minimized, leaving only the basic functions available. * * @syscap SystemCapability.PowerManager.ThermalManager - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ EMERGENCY = 6, /** @@ -97,7 +106,8 @@ declare namespace thermal { * stopped, you need to implement escape measures. * * @syscap SystemCapability.PowerManager.ThermalManager - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ ESCAPE = 7 } @@ -119,8 +129,10 @@ declare namespace thermal { * @param { Callback } callback Callback of thermal level changes. * this param is a function type. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Incorrect parameter types; + * @throws { BusinessError } 4800101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.ThermalManager - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function registerThermalLevelCallback(callback: Callback): void; @@ -140,8 +152,10 @@ declare namespace thermal { * * @param { Callback } callback Callback of thermal level changes. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Incorrect parameter types; + * @throws { BusinessError } 4800101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.ThermalManager - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function unregisterThermalLevelCallback(callback?: Callback): void; @@ -160,8 +174,10 @@ declare namespace thermal { * Obtains the current thermal level. * * @returns { ThermalLevel } The thermal level. + * @throws { BusinessError } 4800101 - Failed to connect to the service. * @syscap SystemCapability.PowerManager.ThermalManager - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getLevel(): ThermalLevel; } -- Gitee From 334804a0911c2f4aed8d17491c45c1ccb603007b Mon Sep 17 00:00:00 2001 From: zhangwt3652 Date: Sat, 12 Jul 2025 22:51:57 +0800 Subject: [PATCH 092/746] =?UTF-8?q?audio=E5=85=B6=E4=BB=96Kit=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=94=AF=E6=8C=81ArkTS1.2=E9=9D=99=E6=80=81=E8=AF=AD?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangwt3652 --- api/@ohos.multimedia.audioHaptic.d.ts | 102 +++++++----- api/@ohos.multimedia.systemSoundManager.d.ts | 155 ++++++++++++------- api/multimedia/ringtonePlayer.d.ts | 19 ++- api/multimedia/systemTonePlayer.d.ts | 34 ++-- 4 files changed, 196 insertions(+), 114 deletions(-) diff --git a/api/@ohos.multimedia.audioHaptic.d.ts b/api/@ohos.multimedia.audioHaptic.d.ts index 7e44f87dda..429f0fd466 100644 --- a/api/@ohos.multimedia.audioHaptic.d.ts +++ b/api/@ohos.multimedia.audioHaptic.d.ts @@ -26,28 +26,32 @@ import type audio from './@ohos.multimedia.audio'; * * @namespace audioHaptic * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace audioHaptic { /** * Obtains an {@link AudioHapticManager} instance. This object is singleton in one process. * @returns { AudioHapticManager } AudioHapticManager instance. * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function getAudioHapticManager(): AudioHapticManager; /** * Audio Latency mode. - * @enum {number} + * @enum {int} * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioLatencyMode { /** * Normal audio mode. * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ AUDIO_LATENCY_MODE_NORMAL = 0, @@ -55,7 +59,8 @@ declare namespace audioHaptic { * Low latency mode. This mode should be used when duration of the audio source is short. If duration of the audio * source is long, it may be truncated. This behavior is the same with sound pool. * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ AUDIO_LATENCY_MODE_FAST = 1 } @@ -64,14 +69,16 @@ declare namespace audioHaptic { * Audio haptic player options object. * @typedef AudioHapticPlayerOptions * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioHapticPlayerOptions { /** * Mute audio. * @type {?boolean} * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ muteAudio?: boolean; @@ -79,7 +86,8 @@ declare namespace audioHaptic { * Mute haptics. * @type {?boolean} * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ muteHaptics?: boolean; } @@ -88,7 +96,8 @@ declare namespace audioHaptic { * Audio haptic manager object. * @typedef AudioHapticManager * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioHapticManager { /** @@ -96,43 +105,46 @@ declare namespace audioHaptic { * source, it will returns the source id. This method uses a promise to return the source id. * @param { string } audioUri - Audio file uri. * @param { string } hapticUri - Haptic file uri. - * @returns { Promise } Promise used to return the source id. + * @returns { Promise } Promise used to return the source id. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - registerSource(audioUri: string, hapticUri: string): Promise; + registerSource(audioUri: string, hapticUri: string): Promise; /** * Unregister source. This method uses a promise to return the result. - * @param { number } id source id. + * @param { int } id source id. * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - unregisterSource(id: number): Promise; + unregisterSource(id: int): Promise; /** * Set the audio latency mode of one source. - * @param { number } id - Source id. + * @param { int } id - Source id. * @param { AudioLatencyMode } latencyMode - Audio latency mode. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; * 2.Incorrect parameter types. * @throws { BusinessError } 5400102 - Operation not allowed. * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - setAudioLatencyMode(id:number, latencyMode: AudioLatencyMode): void; + setAudioLatencyMode(id:int, latencyMode: AudioLatencyMode): void; /** * Set the stream usage of one source. - * @param { number } id - Source id. + * @param { int } id - Source id. * @param { audio.StreamUsage } usage - Stream usage. * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1.Mandatory parameters are left unspecified; @@ -140,15 +152,16 @@ declare namespace audioHaptic { * 3.Parameter verification failed. * @throws { BusinessError } 5400102 - Operation not allowed. * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - setStreamUsage(id: number, usage: audio.StreamUsage): void; + setStreamUsage(id: int, usage: audio.StreamUsage): void; /** * Create an audio haptic player. This method uses a promise to return the result. If haptics is needed, caller * should have the permission of ohos.permission.VIBRATE. * @permission ohos.permission.VIBRATE - * @param { number } id - Source id. + * @param { int } id - Source id. * @param { AudioHapticPlayerOptions } options - Options when creating audio haptic player. * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 201 - Permission denied. @@ -159,9 +172,10 @@ declare namespace audioHaptic { * @throws { BusinessError } 5400103 - I/O error. * @throws { BusinessError } 5400106 - Unsupport format. * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - createPlayer(id: number, options?: AudioHapticPlayerOptions): Promise; + createPlayer(id: int, options?: AudioHapticPlayerOptions): Promise; /** * Register audio and haptic file represented by fd into manager. Audio and haptic works are paired while playing. @@ -177,22 +191,25 @@ declare namespace audioHaptic { /** * Type of audio haptic. - * @enum {number} + * @enum {int} * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ enum AudioHapticType { /** * Audio. * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ AUDIO_HAPTIC_TYPE_AUDIO = 0, /** * Haptic. * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ AUDIO_HAPTIC_TYPE_HAPTIC = 1, } @@ -236,7 +253,8 @@ declare namespace audioHaptic { * Audio haptic player object. * @typedef AudioHapticPlayer * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ interface AudioHapticPlayer { /** @@ -247,7 +265,8 @@ declare namespace audioHaptic { * 1.Mandatory parameters are left unspecified; * 2.Parameter verification failed. * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ isMuted(type: AudioHapticType): boolean; @@ -258,7 +277,8 @@ declare namespace audioHaptic { * @throws { BusinessError } 5400103 - IO error. * @throws { BusinessError } 5400105 - Service died. * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ start(): Promise; @@ -268,7 +288,8 @@ declare namespace audioHaptic { * @throws { BusinessError } 5400102 - Operate not permit. * @throws { BusinessError } 5400105 - Service died. * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ stop(): Promise; @@ -277,7 +298,8 @@ declare namespace audioHaptic { * @returns { Promise } Promise used to return the result. * @throws { BusinessError } 5400105 - Service died. * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ release(): Promise; @@ -286,7 +308,8 @@ declare namespace audioHaptic { * @param { 'endOfStream' } type - Type of the playback event to listen for. * @param { Callback } callback - Callback used to listen for the playback end of stream. * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'endOfStream', callback: Callback): void; @@ -295,7 +318,8 @@ declare namespace audioHaptic { * @param { 'endOfStream' } type - Type of the playback event to listen for. * @param { Callback } callback - Callback used to listen for the playback end of stream. * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'endOfStream', callback?: Callback): void; @@ -304,7 +328,8 @@ declare namespace audioHaptic { * @param { 'audioInterrupt' } type - Type of the playback event to listen for. * @param { Callback } callback - Callback used to listen for audio interrupt info. * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'audioInterrupt', callback: Callback): void; @@ -313,7 +338,8 @@ declare namespace audioHaptic { * @param { 'audioInterrupt' } type - Type of the playback event to listen for. * @param { Callback } callback - Callback used to listen for audio interrupt info. * @syscap SystemCapability.Multimedia.AudioHaptic.Core - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'audioInterrupt', callback?: Callback): void; diff --git a/api/@ohos.multimedia.systemSoundManager.d.ts b/api/@ohos.multimedia.systemSoundManager.d.ts index 41c9160030..cba164378b 100644 --- a/api/@ohos.multimedia.systemSoundManager.d.ts +++ b/api/@ohos.multimedia.systemSoundManager.d.ts @@ -32,7 +32,8 @@ import type { SystemToneOptions as _SystemToneOptions } from './multimedia/syste * @namespace systemSoundManager * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace systemSoundManager { @@ -111,10 +112,11 @@ declare namespace systemSoundManager { /** * Enum for ringtone type. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ enum RingtoneType { /** @@ -131,7 +133,8 @@ declare namespace systemSoundManager { * Ringtone type for sim card 0. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ RINGTONE_TYPE_SIM_CARD_0 = 0, @@ -149,24 +152,27 @@ declare namespace systemSoundManager { * Ringtone type for sim card 1. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ RINGTONE_TYPE_SIM_CARD_1 = 1, } /** * Enum for system tone type. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ enum SystemToneType { /** * System tone type for sim card 0. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ SYSTEM_TONE_TYPE_SIM_CARD_0 = 0, @@ -174,7 +180,8 @@ declare namespace systemSoundManager { * System tone type for sim card 1. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ SYSTEM_TONE_TYPE_SIM_CARD_1 = 1, @@ -182,31 +189,35 @@ declare namespace systemSoundManager { * System tone type notification. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ SYSTEM_TONE_TYPE_NOTIFICATION = 32, } /** * Enum for tone customized type. - * @enum {number} + * @enum {int} * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ enum ToneCustomizedType { /** * Pre-installed tone type. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ PRE_INSTALLED = 0, /** * Customized tone type. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ CUSTOMIZED = 1, } @@ -240,33 +251,37 @@ declare namespace systemSoundManager { * Define the ringtone category. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - const TONE_CATEGORY_RINGTONE: number; + const TONE_CATEGORY_RINGTONE: long; /** * Define the text message tone category. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - const TONE_CATEGORY_TEXT_MESSAGE:number; + const TONE_CATEGORY_TEXT_MESSAGE: long; /** * Define the notification tone category. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - const TONE_CATEGORY_NOTIFICATION:number; + const TONE_CATEGORY_NOTIFICATION: long; /** * Define the alarm tone category. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ - const TONE_CATEGORY_ALARM:number; + const TONE_CATEGORY_ALARM: long; /** * Define the contact tone category. @@ -282,7 +297,8 @@ declare namespace systemSoundManager { * @typedef ToneAttrs * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface ToneAttrs { /** @@ -406,7 +422,8 @@ declare namespace systemSoundManager { * @typedef {Array} ToneAttrsArray * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ type ToneAttrsArray = Array; @@ -422,41 +439,46 @@ declare namespace systemSoundManager { /** * Definition of haptics feature in tone scenario. - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ enum ToneHapticsFeature { /** * Standard haptics feature. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ STANDARD = 0, /** * Gentle haptics feature. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 13 + * @since arkts {'1.1':'13','1.2':'20'} + * @arkts 1.1&1.2 */ GENTLE = 1, } /** * Enum for haptics in tone scenario. * - * @enum { number } + * @enum { int } * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enum ToneHapticsType { /** * Haptics in incoming call scenario for sim card 0. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ CALL_SIM_CARD_0 = 0, @@ -464,7 +486,8 @@ declare namespace systemSoundManager { * Haptics in incoming call scenario for sim card 1. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ CALL_SIM_CARD_1 = 1, @@ -472,7 +495,8 @@ declare namespace systemSoundManager { * Haptics in text message scenario for sim card 0. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ TEXT_MESSAGE_SIM_CARD_0 = 20, @@ -480,7 +504,8 @@ declare namespace systemSoundManager { * Haptics in text message scenario for sim card 1. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ TEXT_MESSAGE_SIM_CARD_1 = 21, @@ -488,31 +513,35 @@ declare namespace systemSoundManager { * Haptics in notification scenario. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ NOTIFICATION = 40, } /** * Enum for haptics mode in tone scenario. - * @enum {number} + * @enum {int} * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ enum ToneHapticsMode { /** * None haptics mode. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ NONE = 0, /** * Haptics is synchronized with tone. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ SYNC = 1, @@ -520,7 +549,8 @@ declare namespace systemSoundManager { * Haptics is out of synchronize with tone. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ NON_SYNC = 2, } @@ -529,7 +559,8 @@ declare namespace systemSoundManager { * @typedef ToneHapticsSettings * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ interface ToneHapticsSettings { /** @@ -537,7 +568,8 @@ declare namespace systemSoundManager { * @type { ToneHapticsMode } * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ mode: ToneHapticsMode; /** @@ -546,7 +578,8 @@ declare namespace systemSoundManager { * @type { ?string } * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ hapticsUri?: string; } @@ -556,7 +589,8 @@ declare namespace systemSoundManager { * @typedef ToneHapticsAttrs * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ interface ToneHapticsAttrs { /** @@ -596,7 +630,8 @@ declare namespace systemSoundManager { * @typedef { Array } ToneHapticsAttrsArray * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 14 + * @since arkts {'1.1':'14','1.2':'20'} + * @arkts 1.1&1.2 */ type ToneHapticsAttrsArray = Array; @@ -606,7 +641,8 @@ declare namespace systemSoundManager { * @returns { SystemSoundManager } SystemSoundManager instance. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ function getSystemSoundManager(): SystemSoundManager; @@ -615,7 +651,8 @@ declare namespace systemSoundManager { * @typedef SystemSoundManager * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ interface SystemSoundManager { /** @@ -819,7 +856,8 @@ declare namespace systemSoundManager { * @throws { BusinessError } 5400103 - I/O error. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ getSystemToneUri(context: BaseContext, type: SystemToneType): Promise; @@ -867,7 +905,8 @@ declare namespace systemSoundManager { * 2.Incorrect parameter types. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ getSystemTonePlayer(context: BaseContext, type: SystemToneType): Promise; @@ -1028,10 +1067,10 @@ declare namespace systemSoundManager { * @permission ohos.permission.WRITE_RINGTONE * @param { BaseContext } context - Current application context. * @param { ToneAttrs } toneAttr - Tone attributes created by {@link createCustomizedToneAttrs}. - * @param { number } fd - File descriptor. - * @param { number } [offset] - The offset in the file where the data to be read, in bytes. By default, the offset + * @param { int } fd - File descriptor. + * @param { long } [offset] - The offset in the file where the data to be read, in bytes. By default, the offset * is zero. - * @param { number } [length] - The length in bytes of the data to be read. By default, the length is the rest of + * @param { long } [length] - The length in bytes of the data to be read. By default, the length is the rest of * bytes in the file from the offset. * @returns { Promise } Tone uri after adding into ringtone library. * @throws { BusinessError } 201 - Permission denied. @@ -1203,7 +1242,8 @@ declare namespace systemSoundManager { * @typedef { _RingtonePlayer } RingtonePlayer * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ type RingtonePlayer = _RingtonePlayer; @@ -1212,7 +1252,8 @@ declare namespace systemSoundManager { * @typedef { _SystemTonePlayer } SystemTonePlayer * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ type SystemTonePlayer = _SystemTonePlayer; @@ -1221,7 +1262,8 @@ declare namespace systemSoundManager { * @typedef { _RingtoneOptions } RingtoneOptions * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ type RingtoneOptions = _RingtoneOptions; @@ -1230,7 +1272,8 @@ declare namespace systemSoundManager { * @typedef { _SystemToneOptions } SystemToneOptions * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ type SystemToneOptions = _SystemToneOptions; } diff --git a/api/multimedia/ringtonePlayer.d.ts b/api/multimedia/ringtonePlayer.d.ts index 7afe273372..546bb7e44e 100644 --- a/api/multimedia/ringtonePlayer.d.ts +++ b/api/multimedia/ringtonePlayer.d.ts @@ -27,23 +27,26 @@ import type media from '../@ohos.multimedia.media'; * @typedef RingtoneOptions * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ export interface RingtoneOptions { /** * Ringtone volume. - * @type { number } + * @type { double } * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ - volume: number; + volume: double; /** * Loop value. * @type { boolean } * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ loop: boolean; } @@ -53,7 +56,8 @@ export interface RingtoneOptions { * @typedef RingtonePlayer * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ export interface RingtonePlayer { /** @@ -61,7 +65,8 @@ export interface RingtonePlayer { * @type { media.AVPlayerState } * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 10 + * @since arkts {'1.1':'10','1.2':'20'} + * @arkts 1.1&1.2 */ readonly state: media.AVPlayerState; diff --git a/api/multimedia/systemTonePlayer.d.ts b/api/multimedia/systemTonePlayer.d.ts index 960f9378ff..46650755eb 100644 --- a/api/multimedia/systemTonePlayer.d.ts +++ b/api/multimedia/systemTonePlayer.d.ts @@ -25,9 +25,10 @@ import { ErrorCallback, Callback } from '../@ohos.base'; * @typedef SystemTonePlayer * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ -export interface SystemTonePlayer { +export declare interface SystemTonePlayer { /** * Gets the title of system tone. * @returns { Promise } Promise used to return the title. @@ -109,7 +110,8 @@ export interface SystemTonePlayer { * @throws { BusinessError } 5400103 - I/O error. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ prepare(): Promise; @@ -118,7 +120,7 @@ export interface SystemTonePlayer { * or haptics. If haptics is needed, caller should have the permission of ohos.permission.VIBRATE. * @permission ohos.permission.VIBRATE * @param { SystemToneOptions } toneOptions - Tone options used for this play. - * @returns { Promise } Promise used to return the id of this playback. + * @returns { Promise } Promise used to return the id of this playback. * @throws { BusinessError } 201 - Permission denied. * @throws { BusinessError } 202 - Caller is not a system application. * @throws { BusinessError } 401 - Parameter error. Possible causes: @@ -127,13 +129,14 @@ export interface SystemTonePlayer { * @throws { BusinessError } 5400102 - Operation not allowed. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - start(toneOptions?: SystemToneOptions): Promise; + start(toneOptions?: SystemToneOptions): Promise; /** * Stop with playback id. - * @param { number } id - The Playback id to stop. + * @param { int } id - The Playback id to stop. * @returns { Promise } Promise used to return result of this stop. * @throws { BusinessError } 202 - Caller is not a system application. * @throws { BusinessError } 401 - Parameter error. Possible causes: @@ -142,9 +145,10 @@ export interface SystemTonePlayer { * @throws { BusinessError } 5400102 - Operation not allowed. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ - stop(id: number): Promise; + stop(id: int): Promise; /** * Release this system tone player. @@ -152,7 +156,8 @@ export interface SystemTonePlayer { * @throws { BusinessError } 202 - Caller is not a system application. * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ release(): Promise; @@ -212,7 +217,8 @@ export interface SystemTonePlayer { * @typedef SystemToneOptions * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ export interface SystemToneOptions { /** @@ -220,7 +226,8 @@ export interface SystemToneOptions { * @type {?boolean} * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ muteAudio?: boolean; @@ -229,7 +236,8 @@ export interface SystemToneOptions { * @type {?boolean} * @syscap SystemCapability.Multimedia.SystemSound.Core * @systemapi - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ muteHaptics?: boolean; } \ No newline at end of file -- Gitee From b03c805a38724220510837d0a1f9753682ac6709 Mon Sep 17 00:00:00 2001 From: liyuke Date: Wed, 9 Jul 2025 11:35:12 +0800 Subject: [PATCH 093/746] =?UTF-8?q?=E5=9B=9E=E5=90=880702?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liyuke Change-Id: I9e258a9466a663d694feb996301bf29f1b4793bb --- api/@ohos.file.environment.d.ts | 32 +- api/@ohos.file.fs.d.ets | 4042 ++++++++++++++++++++++++++----- api/@ohos.file.hash.d.ts | 4 + api/@ohos.file.statvfs.d.ts | 7 + kits/@kit.CoreFileKit.d.ts | 29 + 5 files changed, 3470 insertions(+), 644 deletions(-) diff --git a/api/@ohos.file.environment.d.ts b/api/@ohos.file.environment.d.ts index 5d89e2c967..cb5c78b0fd 100644 --- a/api/@ohos.file.environment.d.ts +++ b/api/@ohos.file.environment.d.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Huawei Device Co., Ltd. + * Copyright (C) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -25,7 +25,8 @@ import type { AsyncCallback } from './@ohos.base'; * * @namespace Environment * @syscap SystemCapability.FileManagement.File.Environment - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace Environment { /** @@ -37,7 +38,8 @@ declare namespace Environment { * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.Environment * @systemapi - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getStorageDataDir(): Promise; @@ -50,7 +52,8 @@ declare namespace Environment { * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.Environment * @systemapi - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getStorageDataDir(callback: AsyncCallback): void; @@ -63,7 +66,8 @@ declare namespace Environment { * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.Environment * @systemapi - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getUserDataDir(): Promise; @@ -76,7 +80,8 @@ declare namespace Environment { * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.Environment * @systemapi - * @since 8 + * @since arkts {'1.1':'8','1.2':'20'} + * @arkts 1.1&1.2 */ function getUserDataDir(callback: AsyncCallback): void; @@ -98,7 +103,8 @@ declare namespace Environment { * @throws { BusinessError } 801 - Capability not supported. * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.File.Environment.FolderObtain - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function getUserDownloadDir(): string; @@ -120,7 +126,8 @@ declare namespace Environment { * @throws { BusinessError } 801 - Capability not supported. * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.File.Environment.FolderObtain - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function getUserDesktopDir(): string; @@ -142,7 +149,8 @@ declare namespace Environment { * @throws { BusinessError } 801 - Capability not supported. * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.File.Environment.FolderObtain - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ function getUserDocumentDir(): string; @@ -157,7 +165,8 @@ declare namespace Environment { * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.File.Environment.FolderObtain * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function getExternalStorageDir(): string; @@ -172,7 +181,8 @@ declare namespace Environment { * @throws { BusinessError } 13900042 - Unknown error. * @syscap SystemCapability.FileManagement.File.Environment.FolderObtain * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11','1.2':'20'} + * @arkts 1.1&1.2 */ function getUserHomeDir(): string; } diff --git a/api/@ohos.file.fs.d.ets b/api/@ohos.file.fs.d.ets index 13361e559a..86c718a005 100644 --- a/api/@ohos.file.fs.d.ets +++ b/api/@ohos.file.fs.d.ets @@ -20,6 +20,7 @@ */ import { AsyncCallback } from './@ohos.base'; +import stream from './@ohos.util.stream'; /** * FileIO @@ -315,109 +316,126 @@ function close(file: number | File, callback: AsyncCallback): void; function closeSync(file: number | File): void; /** - * Copy file. + * Copy file or directory. * - * @param { string | number } src - src. - * @param { string | number } dest - dest. - * @param { number } [mode = 0] - mode. + * @param { string } srcUri - src uri. + * @param { string } destUri - dest uri. + * @param { CopyOptions } [options] - options. * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; + *
    2.Incorrect parameter types. + * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory * @throws { BusinessError } 13900004 - Interrupted system call * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900010 - Try again * @throws { BusinessError } 13900011 - Out of memory - * @throws { BusinessError } 13900012 - Permission denied - * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900012 - Permission denied by the file system + * @throws { BusinessError } 13900015 - File exists * @throws { BusinessError } 13900018 - Not a directory * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900021 - File table overflow + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900028 - Too many links * @throws { BusinessError } 13900030 - File name too long * @throws { BusinessError } 13900031 - Function not implemented - * @throws { BusinessError } 13900033 - Too many symbolic links encountered * @throws { BusinessError } 13900034 - Operation would block * @throws { BusinessError } 13900038 - Value too large for defined data type + * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error * @throws { BusinessError } 13900044 - Network is unreachable * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function copyFile(src: string | number, dest: string | number, mode?: number): Promise; +function copy(srcUri: string, destUri: string, options?: CopyOptions): Promise; /** - * Copy file. + * Copy file or directory. * - * @param { string | number } src - src. - * @param { string | number } dest - dest. + * @param { string } srcUri - src uri. + * @param { string } destUri - dest uri. * @param { AsyncCallback } callback - Return the callback function. + * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; + *
    2.Incorrect parameter types. + * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory * @throws { BusinessError } 13900004 - Interrupted system call * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900010 - Try again * @throws { BusinessError } 13900011 - Out of memory - * @throws { BusinessError } 13900012 - Permission denied - * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900012 - Permission denied by the file system + * @throws { BusinessError } 13900015 - File exists * @throws { BusinessError } 13900018 - Not a directory * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900021 - File table overflow + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900028 - Too many links * @throws { BusinessError } 13900030 - File name too long * @throws { BusinessError } 13900031 - Function not implemented - * @throws { BusinessError } 13900033 - Too many symbolic links encountered * @throws { BusinessError } 13900034 - Operation would block * @throws { BusinessError } 13900038 - Value too large for defined data type + * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function copyFile(src: string | number, dest: string | number, callback: AsyncCallback): void; +function copy(srcUri: string, destUri: string, callback: AsyncCallback): void; /** - * Copy file. + * Copy file or directory. * - * @param { string | number } src - src. - * @param { string | number } dest - dest. - * @param { number } [mode = 0] - mode. + * @param { string } srcUri - src uri. + * @param { string } destUri - dest uri. + * @param { CopyOptions } options - options. * @param { AsyncCallback } callback - Return the callback function. + * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; + *
    2.Incorrect parameter types. + * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory * @throws { BusinessError } 13900004 - Interrupted system call * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900010 - Try again * @throws { BusinessError } 13900011 - Out of memory - * @throws { BusinessError } 13900012 - Permission denied - * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900012 - Permission denied by the file system + * @throws { BusinessError } 13900015 - File exists * @throws { BusinessError } 13900018 - Not a directory * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900021 - File table overflow + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900028 - Too many links * @throws { BusinessError } 13900030 - File name too long * @throws { BusinessError } 13900031 - Function not implemented - * @throws { BusinessError } 13900033 - Too many symbolic links encountered * @throws { BusinessError } 13900034 - Operation would block * @throws { BusinessError } 13900038 - Value too large for defined data type + * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function copyFile( - src: string | number, - dest: string | number, - mode: number, - callback: AsyncCallback -): void; +function copy(srcUri: string, destUri: string, options: CopyOptions, callback: AsyncCallback): void; /** - * Copy file with sync interface. + * Copy directory. * - * @param { string | number } src - src. - * @param { string | number } dest - dest. + * @param { string } src - source path. + * @param { string } dest - destination path. * @param { number } [mode = 0] - mode. + * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 13900002 - No such file or directory * @throws { BusinessError } 13900004 - Interrupted system call * @throws { BusinessError } 13900005 - I/O error @@ -437,392 +455,446 @@ function copyFile( * @throws { BusinessError } 13900042 - Unknown error * @throws { BusinessError } 13900044 - Network is unreachable * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function copyFileSync(src: string | number, dest: string | number, mode?: number): void; +function copyDir(src: string, dest: string, mode?: number): Promise; /** - * List file. + * Copy directory. * - * @param { string } path - path. - * @param { ListFileOptions } [options] - options. - * @returns { Promise } Returns an Array containing the name of files or directories that meet the filter criteria. - * If present, Include the subdirectory structure. + * @param { string } src - source path. + * @param { string } dest - destination path. + * @param { AsyncCallback } callback - Return the callback function. * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900031 - Function not implemented + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function listFile( - path: string, - options?: ListFileOptions -): Promise; +function copyDir(src: string, dest: string, callback: AsyncCallback): void; /** - * List file. + * Copy directory. * - * @param { string } path - path. - * @param { AsyncCallback } callback - The callback is used to return an Array containing the name of files or directories - * that meet the filter criteria in promise mode. If present, Include the subdirectory structure. - * @throws { BusinessError } 13900002 - No such file or directory - * @throws { BusinessError } 13900008 - Bad file descriptor - * @throws { BusinessError } 13900011 - Out of memory - * @throws { BusinessError } 13900018 - Not a directory - * @throws { BusinessError } 13900042 - Unknown error + * @param { string } src - source path. + * @param { string } dest - destination path. + * @param { AsyncCallback> } callback - Return the callback function. + * @throws { BusinessError } 13900015 - File exists * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function listFile(path: string, callback: AsyncCallback): void; +function copyDir(src: string, dest: string, callback: AsyncCallback>): void; /** - * List file. + * Copy directory. * - * @param { string } path - path. - * @param { ListFileOptions } [options] - options. - * @param { AsyncCallback } callback - The callback is used to return an Array containing the name of files or directories - * that meet the filter criteria in promise mode. If present, Include the subdirectory structure. + * @param { string } src - source path. + * @param { string } dest - destination path. + * @param { number } mode - mode. + * @param { AsyncCallback } callback - Return the callback function. * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900031 - Function not implemented + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function listFile( - path: string, - options: ListFileOptions, - callback: AsyncCallback -): void; +function copyDir(src: string, dest: string, mode: number, callback: AsyncCallback): void; /** - * List file with sync interface. + * Copy directory. * - * @param { string } path - path. - * @param { ListFileOptions } [options] - options. - * @returns { string[] } Returns an Array containing the name of files or directories that meet the filter criteria. - * @throws { BusinessError } 13900002 - No such file or directory - * @throws { BusinessError } 13900008 - Bad file descriptor - * @throws { BusinessError } 13900011 - Out of memory - * @throws { BusinessError } 13900018 - Not a directory - * @throws { BusinessError } 13900042 - Unknown error + * @param { string } src - source path. + * @param { string } dest - destination path. + * @param { number } mode - mode. + * @param { AsyncCallback> } callback - Return the callback function. + * @throws { BusinessError } 13900015 - File exists * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function listFileSync( - path: string, - options?: ListFileOptions -): string[]; +function copyDir(src: string, dest: string, mode: number, callback: AsyncCallback>): void; /** - * Make dir. + * Copy directory with sync interface. * - * @param { string } path - path. - * @returns { Promise } The promise returned by the function. - * @throws { BusinessError } 13900001 - Operation not permitted + * @param { string } src - source path. + * @param { string } dest - destination path. + * @param { number } [mode = 0] - mode. * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address * @throws { BusinessError } 13900015 - File exists * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900025 - No space left on device - * @throws { BusinessError } 13900028 - Too many links * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900031 - Function not implemented * @throws { BusinessError } 13900033 - Too many symbolic links encountered - * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900044 - Network is unreachable * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function mkdir(path: string): Promise; +function copyDirSync(src: string, dest: string, mode?: number): void; /** - * Make dir. + * Copy file. * - * @param { string } path - path. - * @param { boolean } recursion - whether to recursively make directory. + * @param { string | number } src - src. + * @param { string | number } dest - dest. + * @param { number } [mode = 0] - mode. * @returns { Promise } The promise returned by the function. - * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address - * @throws { BusinessError } 13900015 - File exists * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900025 - No space left on device - * @throws { BusinessError } 13900028 - Too many links * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900031 - Function not implemented * @throws { BusinessError } 13900033 - Too many symbolic links encountered - * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900044 - Network is unreachable * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @atomicservice * @since 20 */ -function mkdir(path: string, recursion: boolean): Promise; +function copyFile(src: string | number, dest: string | number, mode?: number): Promise; /** - * Make dir. + * Copy file. * - * @param { string } path - path. + * @param { string | number } src - src. + * @param { string | number } dest - dest. * @param { AsyncCallback } callback - Return the callback function. - * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address - * @throws { BusinessError } 13900015 - File exists * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900025 - No space left on device - * @throws { BusinessError } 13900028 - Too many links * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900031 - Function not implemented * @throws { BusinessError } 13900033 - Too many symbolic links encountered - * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @atomicservice * @since 20 */ -function mkdir(path: string, callback: AsyncCallback): void; +function copyFile(src: string | number, dest: string | number, callback: AsyncCallback): void; /** - * Make dir. + * Copy file. * - * @param { string } path - path. - * @param { boolean } recursion - whether to recursively make directory. + * @param { string | number } src - src. + * @param { string | number } dest - dest. + * @param { number } [mode = 0] - mode. * @param { AsyncCallback } callback - Return the callback function. - * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address - * @throws { BusinessError } 13900015 - File exists * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900025 - No space left on device - * @throws { BusinessError } 13900028 - Too many links * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900031 - Function not implemented * @throws { BusinessError } 13900033 - Too many symbolic links encountered - * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @atomicservice * @since 20 */ -function mkdir(path: string, recursion: boolean, callback: AsyncCallback): void; +function copyFile( + src: string | number, + dest: string | number, + mode: number, + callback: AsyncCallback +): void; /** - * Make dir with sync interface. + * Copy file with sync interface. * - * @param { string } path - path. - * @throws { BusinessError } 13900001 - Operation not permitted + * @param { string | number } src - src. + * @param { string | number } dest - dest. + * @param { number } [mode = 0] - mode. * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address - * @throws { BusinessError } 13900015 - File exists * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900025 - No space left on device - * @throws { BusinessError } 13900028 - Too many links * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900031 - Function not implemented * @throws { BusinessError } 13900033 - Too many symbolic links encountered - * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900044 - Network is unreachable * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @atomicservice * @since 20 */ -function mkdirSync(path: string): void; +function copyFileSync(src: string | number, dest: string | number, mode?: number): void; /** - * Make dir with sync interface. + * Create class Stream. * * @param { string } path - path. - * @param { boolean } recursion - whether to recursively make directory. + * @param { string } mode - mode. + * @returns { Promise } return Promise * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900006 - No such device or address * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900017 - No such device * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900023 - Text file busy + * @throws { BusinessError } 13900024 - File too large * @throws { BusinessError } 13900025 - No space left on device - * @throws { BusinessError } 13900028 - Too many links + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900029 - Resource deadlock would occur * @throws { BusinessError } 13900030 - File name too long * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900044 - Network is unreachable * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function mkdirSync(path: string, recursion: boolean): void; - +function createStream(path: string, mode: string): Promise; /** - * Move file. + * Create class Stream. * - * @param { string } src - source file path. - * @param { string } dest - destination file path. - * @param { number } [mode = 0] - move mode when duplicate file name exists. - * @returns { Promise } The promise returned by the function. + * @param { string } path - path. + * @param { string } mode - mode. + * @param { AsyncCallback } callback - callback. * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900006 - No such device or address * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address * @throws { BusinessError } 13900014 - Device or resource busy * @throws { BusinessError } 13900015 - File exists - * @throws { BusinessError } 13900016 - Cross-device link + * @throws { BusinessError } 13900017 - No such device * @throws { BusinessError } 13900018 - Not a directory * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900023 - Text file busy + * @throws { BusinessError } 13900024 - File too large * @throws { BusinessError } 13900025 - No space left on device * @throws { BusinessError } 13900027 - Read-only file system - * @throws { BusinessError } 13900028 - Too many links - * @throws { BusinessError } 13900032 - Directory not empty + * @throws { BusinessError } 13900029 - Resource deadlock would occur + * @throws { BusinessError } 13900030 - File name too long * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform * @since 20 */ -function moveFile(src: string, dest: string, mode?: number): Promise; +function createStream(path: string, mode: string, callback: AsyncCallback): void; /** - * Move file. + * Create class Stream with sync interface. * - * @param { string } src - source file path. - * @param { string } dest - destination file path. - * @param { AsyncCallback } callback - Return the callback function. + * @param { string } path - path. + * @param { string } mode - mode. + * @returns { Stream } createStream * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900006 - No such device or address * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address * @throws { BusinessError } 13900014 - Device or resource busy * @throws { BusinessError } 13900015 - File exists - * @throws { BusinessError } 13900016 - Cross-device link + * @throws { BusinessError } 13900017 - No such device * @throws { BusinessError } 13900018 - Not a directory * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900023 - Text file busy + * @throws { BusinessError } 13900024 - File too large * @throws { BusinessError } 13900025 - No space left on device * @throws { BusinessError } 13900027 - Read-only file system - * @throws { BusinessError } 13900028 - Too many links - * @throws { BusinessError } 13900032 - Directory not empty + * @throws { BusinessError } 13900029 - Resource deadlock would occur + * @throws { BusinessError } 13900030 - File name too long * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900044 - Network is unreachable * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform * @since 20 */ -function moveFile(src: string, dest: string, callback: AsyncCallback): void; +function createStreamSync(path: string, mode: string): Stream; /** - * Move file. + * Create class RandomAccessFile. * - * @param { string } src - source file path. - * @param { string } dest - destination file path. - * @param { number } [mode = 0] - move mode when duplicate file name exists. - * @param { AsyncCallback } callback - Return the callback function. + * @param { string | File } file - file path, object. + * @param { number } [mode = OpenMode.READ_ONLY] - mode. + * @param { RandomAccessFileOptions } [options] - RandomAccessFile options + * @returns { Promise } Returns the RandomAccessFile object which has been created in promise mode. * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900006 - No such device or address * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address * @throws { BusinessError } 13900014 - Device or resource busy * @throws { BusinessError } 13900015 - File exists - * @throws { BusinessError } 13900016 - Cross-device link + * @throws { BusinessError } 13900017 - No such device * @throws { BusinessError } 13900018 - Not a directory * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900023 - Text file busy + * @throws { BusinessError } 13900024 - File too large * @throws { BusinessError } 13900025 - No space left on device * @throws { BusinessError } 13900027 - Read-only file system - * @throws { BusinessError } 13900028 - Too many links - * @throws { BusinessError } 13900032 - Directory not empty + * @throws { BusinessError } 13900029 - Resource deadlock would occur + * @throws { BusinessError } 13900030 - File name too long * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900044 - Network is unreachable * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform * @since 20 */ -function moveFile(src: string, dest: string, mode: number, callback: AsyncCallback): void; +function createRandomAccessFile(file: string | File, mode?: number, + options?: RandomAccessFileOptions): Promise; /** - * Move file with sync interface. + * Create class RandomAccessFile. * - * @param { string } src - source file path. - * @param { string } dest - destination file path. - * @param { number } [mode = 0] - move mode when duplicate file name exists. + * @param { string | File } file - file path, object. + * @param { AsyncCallback } callback - The callback is used to return the RandomAccessFile object which has been created. * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900006 - No such device or address * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address * @throws { BusinessError } 13900014 - Device or resource busy * @throws { BusinessError } 13900015 - File exists - * @throws { BusinessError } 13900016 - Cross-device link + * @throws { BusinessError } 13900017 - No such device * @throws { BusinessError } 13900018 - Not a directory * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900023 - Text file busy + * @throws { BusinessError } 13900024 - File too large * @throws { BusinessError } 13900025 - No space left on device * @throws { BusinessError } 13900027 - Read-only file system - * @throws { BusinessError } 13900028 - Too many links - * @throws { BusinessError } 13900032 - Directory not empty + * @throws { BusinessError } 13900029 - Resource deadlock would occur + * @throws { BusinessError } 13900030 - File name too long * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform * @since 20 */ -function moveFileSync(src: string, dest: string, mode?: number): void; +function createRandomAccessFile(file: string | File, callback: AsyncCallback): void; /** - * Open file. + * Create class RandomAccessFile. * - * @param { string } path - path. + * @param { string | File } file - file path, object. * @param { number } [mode = OpenMode.READ_ONLY] - mode. - * @returns { Promise } Returns the File object in Promise mode to record the file descriptor. + * @param { AsyncCallback } callback - The callback is used to return the RandomAccessFile object which has been created. * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory * @throws { BusinessError } 13900004 - Interrupted system call @@ -849,19 +921,18 @@ function moveFileSync(src: string, dest: string, mode?: number): void; * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error - * @throws { BusinessError } 13900044 - Network is unreachable * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function open(path: string, mode?: number): Promise; +function createRandomAccessFile(file: string | File, mode: number, callback: AsyncCallback): void; /** - * Open file. + * Create class RandomAccessFile with sync interface. * - * @param { string } path - path. - * @param { AsyncCallback } callback - The callback is used to return the File object to record the file descriptor. + * @param { string | File } file - file path, object. + * @param { number } [mode = OpenMode.READ_ONLY] - mode. + * @param { RandomAccessFileOptions } [options] - RandomAccessFile options + * @returns { RandomAccessFile } Returns the RandomAccessFile object which has been created. * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory * @throws { BusinessError } 13900004 - Interrupted system call @@ -888,805 +959,2364 @@ function open(path: string, mode?: number): Promise; * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900044 - Network is unreachable * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function open(path: string, callback: AsyncCallback): void; +function createRandomAccessFileSync(file: string | File, mode?: number, + options?: RandomAccessFileOptions): RandomAccessFile; /** - * Open file. + * Create file read stream. * - * @param { string } path - path. - * @param { number } [mode = OpenMode.READ_ONLY] - mode. - * @param { AsyncCallback } callback - The callback is used to return the File object to record the file descriptor. + * @param { string } path - file path. + * @param { ReadStreamOptions } [options] - Optional parameters for ReadStream. + * @returns { ReadStream } Returns the ReadStream object which has been created. + * @throws { BusinessError } 401 - Parameter error * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory * @throws { BusinessError } 13900004 - Interrupted system call - * @throws { BusinessError } 13900006 - No such device or address - * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied - * @throws { BusinessError } 13900013 - Bad address - * @throws { BusinessError } 13900014 - Device or resource busy - * @throws { BusinessError } 13900015 - File exists * @throws { BusinessError } 13900017 - No such device - * @throws { BusinessError } 13900018 - Not a directory * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument * @throws { BusinessError } 13900022 - Too many open files - * @throws { BusinessError } 13900023 - Text file busy * @throws { BusinessError } 13900024 - File too large - * @throws { BusinessError } 13900025 - No space left on device - * @throws { BusinessError } 13900027 - Read-only file system - * @throws { BusinessError } 13900029 - Resource deadlock would occur * @throws { BusinessError } 13900030 - File name too long - * @throws { BusinessError } 13900033 - Too many symbolic links encountered - * @throws { BusinessError } 13900034 - Operation would block * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900044 - Network is unreachable * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function open(path: string, mode: number, callback: AsyncCallback): void; +function createReadStream(path: string, options?: ReadStreamOptions): ReadStream; /** - * Open file with sync interface. + * Create file write stream. * - * @param { string } path - path. - * @param { number } [mode = OpenMode.READ_ONLY] - mode. - * @returns { File } Returns the File object to record the file descriptor. + * @param { string } path - file path. + * @param { WriteStreamOptions } [options] - Optional parameters for ReadStream. + * @returns { WriteStream } Returns the WriteStream object which has been created. + * @throws { BusinessError } 401 - Parameter error * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory * @throws { BusinessError } 13900004 - Interrupted system call - * @throws { BusinessError } 13900006 - No such device or address - * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied - * @throws { BusinessError } 13900013 - Bad address - * @throws { BusinessError } 13900014 - Device or resource busy * @throws { BusinessError } 13900015 - File exists * @throws { BusinessError } 13900017 - No such device - * @throws { BusinessError } 13900018 - Not a directory * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument * @throws { BusinessError } 13900022 - Too many open files - * @throws { BusinessError } 13900023 - Text file busy * @throws { BusinessError } 13900024 - File too large * @throws { BusinessError } 13900025 - No space left on device * @throws { BusinessError } 13900027 - Read-only file system - * @throws { BusinessError } 13900029 - Resource deadlock would occur * @throws { BusinessError } 13900030 - File name too long - * @throws { BusinessError } 13900033 - Too many symbolic links encountered - * @throws { BusinessError } 13900034 - Operation would block * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error - * @throws { BusinessError } 13900044 - Network is unreachable * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function openSync(path: string, mode?: number): File; +function createWriteStream(path: string, options?: WriteStreamOptions): WriteStream; /** - * Read file. + * Create watcher to listen for file changes. * - * @param { number } fd - file descriptor. - * @param { ArrayBuffer } buffer - buffer. - * @param { ReadOptions } [options] - options. - * @returns { Promise } Returns the number of file bytes read to buffer in promise mode. - * @throws { BusinessError } 13900004 - Interrupted system call - * @throws { BusinessError } 13900005 - I/O error + * @param { string } path - path. + * @param { number } events - listened events. + * @param { WatchEventListener } listener - Callback to invoke when an event of the specified type occurs. + * @returns { Watcher } Returns the Watcher object which has been created. + * @throws { BusinessError } 13900002 - No such file or directory * @throws { BusinessError } 13900008 - Bad file descriptor - * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address - * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900018 - Not a directory * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900021 - File table overflow + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900030 - File name too long * @throws { BusinessError } 13900042 - Unknown error - * @throws { BusinessError } 13900044 - Network is unreachable * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function read( - fd: number, - buffer: ArrayBuffer, - options?: ReadOptions -): Promise; +function createWatcher(path: string, events: number, listener: WatchEventListener): Watcher; /** - * Read file. + * Duplicate fd to File Object. * - * @param { number } fd - file descriptor. - * @param { ArrayBuffer } buffer - buffer. - * @param { AsyncCallback } callback - The callback is used to return the number of file bytes read to buffer. + * @param { number } fd - fd. + * @returns { File } return File * @throws { BusinessError } 13900004 - Interrupted system call * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor - * @throws { BusinessError } 13900010 - Try again - * @throws { BusinessError } 13900013 - Bad address - * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900014 - Device or resource busy * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900022 - Too many open files * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function read(fd: number, buffer: ArrayBuffer, callback: AsyncCallback): void; +function dup(fd: number): File; /** - * Read file. + * Synchronize file metadata. * - * @param { number } fd - file descriptor. - * @param { ArrayBuffer } buffer - buffer. - * @param { ReadOptions } [options] - options. - * @param { AsyncCallback } callback - The callback is used to return the number of file bytes read to buffer. - * @throws { BusinessError } 13900004 - Interrupted system call + * @param { number } fd - fd. + * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor - * @throws { BusinessError } 13900010 - Try again - * @throws { BusinessError } 13900013 - Bad address - * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform - * @atomicservice * @since 20 */ -function read( - fd: number, - buffer: ArrayBuffer, - options: ReadOptions, - callback: AsyncCallback -): void; +function fdatasync(fd: number): Promise; /** - * Read file with sync interface. + * Synchronize file metadata. * - * @param { number } fd - file descriptor. - * @param { ArrayBuffer } buffer - buffer. - * @param { ReadOptions } [options] - options. - * @returns { number } Returns the number of file bytes read to buffer. - * @throws { BusinessError } 13900004 - Interrupted system call + * @param { number } fd - fd. + * @param { AsyncCallback } callback - Return the callback function. * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor - * @throws { BusinessError } 13900010 - Try again - * @throws { BusinessError } 13900013 - Bad address - * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error - * @throws { BusinessError } 13900044 - Network is unreachable * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform - * @atomicservice * @since 20 */ -function readSync( - fd: number, - buffer: ArrayBuffer, - options?: ReadOptions -): number; +function fdatasync(fd: number, callback: AsyncCallback): void; /** - * Read text. + * Synchronize file metadata with sync interface. * - * @param { string } filePath - file path. - * @param { ReadTextOptions } [options] - options. - * @returns { Promise } Returns the contents of the read file in promise mode. - * @throws { BusinessError } 13900001 - Operation not permitted - * @throws { BusinessError } 13900004 - Interrupted system call + * @param { number } fd - fd. * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor - * @throws { BusinessError } 13900010 - Try again - * @throws { BusinessError } 13900013 - Bad address - * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900024 - File too large * @throws { BusinessError } 13900025 - No space left on device - * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900027 - Read-only file system * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error - * @throws { BusinessError } 13900044 - Network is unreachable * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform - * @atomicservice * @since 20 */ -function readText( - filePath: string, - options?: ReadTextOptions -): Promise; +function fdatasyncSync(fd: number): void; /** - * Read text. + * Create class Stream by using fd. * - * @param { string } filePath - file path. - * @param { AsyncCallback } callback - The callback is used to return the contents of the read file. + * @param { number } fd - fd. + * @param { string } mode - mode. + * @returns { Promise } Returns the Stream object in promise mode. * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory * @throws { BusinessError } 13900004 - Interrupted system call - * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900006 - No such device or address * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900017 - No such device + * @throws { BusinessError } 13900018 - Not a directory * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900023 - Text file busy * @throws { BusinessError } 13900024 - File too large * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900029 - Resource deadlock would occur + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900033 - Too many symbolic links encountered * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function readText(filePath: string, callback: AsyncCallback): void; +function fdopenStream(fd: number, mode: string): Promise; /** - * Read text. + * Create class Stream by using fd. * - * @param { string } filePath - file path. - * @param { ReadTextOptions } [options] - options. - * @param { AsyncCallback } callback - The callback is used to return the contents of the read file. + * @param { number } fd - fd. + * @param { string } mode - mode. + * @param { AsyncCallback } callback - The callback is used to return the Stream object. * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory * @throws { BusinessError } 13900004 - Interrupted system call - * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900006 - No such device or address * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900017 - No such device + * @throws { BusinessError } 13900018 - Not a directory * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900023 - Text file busy * @throws { BusinessError } 13900024 - File too large * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900029 - Resource deadlock would occur + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900033 - Too many symbolic links encountered * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function readText( - filePath: string, - options: ReadTextOptions, - callback: AsyncCallback -): void; +function fdopenStream(fd: number, mode: string, callback: AsyncCallback): void; /** - * Read text with sync interface. + * Create class Stream by using fd with sync interface. * - * @param { string } filePath - file path. - * @param { ReadTextOptions } [options] - options. - * @returns { string } Returns the contents of the read file. + * @param { number } fd - fd. + * @param { string } mode - mode. + * @returns { Stream } Returns the Stream object. * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory * @throws { BusinessError } 13900004 - Interrupted system call - * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900006 - No such device or address * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900017 - No such device + * @throws { BusinessError } 13900018 - Not a directory * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900023 - Text file busy * @throws { BusinessError } 13900024 - File too large * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900029 - Resource deadlock would occur + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900033 - Too many symbolic links encountered * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error - * @throws { BusinessError } 13900044 - Network is unreachable + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +function fdopenStreamSync(fd: number, mode: string): Stream; + +/** + * Synchronize file. + * + * @param { number } fd - fd. + * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @since 20 + */ +function fsync(fd: number): Promise; + +/** + * Synchronize file. + * + * @param { number } fd - fd. + * @param { AsyncCallback } callback - Return the callback function. + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @since 20 + */ +function fsync(fd: number, callback: AsyncCallback): void; + +/** + * Synchronize file with sync interface. + * + * @param { number } fd - fd. + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @since 20 + */ +function fsyncSync(fd: number): void; + +/** + * List file. + * + * @param { string } path - path. + * @param { ListFileOptions } [options] - options. + * @returns { Promise } Returns an Array containing the name of files or directories that meet the filter criteria. + * If present, Include the subdirectory structure. + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @atomicservice * @since 20 */ -function readTextSync( - filePath: string, - options?: ReadTextOptions -): string; +function listFile( + path: string, + options?: ListFileOptions +): Promise; /** - * Delete dir. + * List file. * * @param { string } path - path. - * @returns { Promise } The promise returned by the function. - * @throws { BusinessError } 13900001 - Operation not permitted + * @param { AsyncCallback } callback - The callback is used to return an Array containing the name of files or directories + * that meet the filter criteria in promise mode. If present, Include the subdirectory structure. * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900011 - Out of memory - * @throws { BusinessError } 13900012 - Permission denied - * @throws { BusinessError } 13900013 - Bad address - * @throws { BusinessError } 13900014 - Device or resource busy * @throws { BusinessError } 13900018 - Not a directory - * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900027 - Read-only file system1 - * @throws { BusinessError } 13900030 - File name too long - * @throws { BusinessError } 13900032 - Directory not empty * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @atomicservice * @since 20 */ -function rmdir(path: string): Promise; +function listFile(path: string, callback: AsyncCallback): void; /** - * Delete dir. + * List file. * * @param { string } path - path. - * @param { AsyncCallback } callback - Return the callback function. - * @throws { BusinessError } 13900001 - Operation not permitted + * @param { ListFileOptions } [options] - options. + * @param { AsyncCallback } callback - The callback is used to return an Array containing the name of files or directories + * that meet the filter criteria in promise mode. If present, Include the subdirectory structure. * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900011 - Out of memory - * @throws { BusinessError } 13900012 - Permission denied - * @throws { BusinessError } 13900013 - Bad address - * @throws { BusinessError } 13900014 - Device or resource busy * @throws { BusinessError } 13900018 - Not a directory - * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900027 - Read-only file system1 - * @throws { BusinessError } 13900030 - File name too long - * @throws { BusinessError } 13900032 - Directory not empty * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @atomicservice * @since 20 */ -function rmdir(path: string, callback: AsyncCallback): void; +function listFile( + path: string, + options: ListFileOptions, + callback: AsyncCallback +): void; /** - * Delete dir with sync interface. + * List file with sync interface. * * @param { string } path - path. - * @throws { BusinessError } 13900001 - Operation not permitted + * @param { ListFileOptions } [options] - options. + * @returns { string[] } Returns an Array containing the name of files or directories that meet the filter criteria. * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900011 - Out of memory - * @throws { BusinessError } 13900012 - Permission denied - * @throws { BusinessError } 13900013 - Bad address - * @throws { BusinessError } 13900014 - Device or resource busy * @throws { BusinessError } 13900018 - Not a directory - * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900027 - Read-only file system1 - * @throws { BusinessError } 13900030 - File name too long - * @throws { BusinessError } 13900032 - Directory not empty * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @atomicservice * @since 20 */ -function rmdirSync(path: string): void; +function listFileSync( + path: string, + options?: ListFileOptions +): string[]; /** - * Get file information. + * Reposition file offset. * - * @param { string | number } file - path or file descriptor. + * @param { number } fd - file descriptor. + * @param { number } offset - file offset. + * @param { WhenceType } [whence = WhenceType.SEEK_SET] - directive whence. + * @returns { number } Returns the file offset relative to starting position of file. + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900026 - Illegal seek + * @throws { BusinessError } 13900038 - Value too large for defined data type + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @since 20 + */ +function lseek(fd: number, offset: number, whence?: WhenceType): number; + +/** + * Stat link file. + * + * @param { string } path - path. * @returns { Promise } Returns the Stat object in promise mode. * @throws { BusinessError } 13900002 - No such file or directory - * @throws { BusinessError } 13900004 - Interrupted system call - * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address * @throws { BusinessError } 13900018 - Not a directory * @throws { BusinessError } 13900030 - File name too long - * @throws { BusinessError } 13900031 - Function not implemented * @throws { BusinessError } 13900033 - Too many symbolic links encountered * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function stat(file: string | number): Promise; +function lstat(path: string): Promise; /** - * Get file information. + * Stat link file. * - * @param { string | number } file - path or file descriptor. + * @param { string } path - path. * @param { AsyncCallback } callback - The callback is used to return the Stat object. * @throws { BusinessError } 13900002 - No such file or directory - * @throws { BusinessError } 13900004 - Interrupted system call - * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address * @throws { BusinessError } 13900018 - Not a directory * @throws { BusinessError } 13900030 - File name too long - * @throws { BusinessError } 13900031 - Function not implemented * @throws { BusinessError } 13900033 - Too many symbolic links encountered * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function stat(file: string | number, callback: AsyncCallback): void; +function lstat(path: string, callback: AsyncCallback): void; /** - * Get file information with sync interface. + * Stat link file with sync interface. * - * @param { string | number } file - path or file descriptor. + * @param { string } path - path. * @returns { Stat } Returns the Stat object. * @throws { BusinessError } 13900002 - No such file or directory - * @throws { BusinessError } 13900004 - Interrupted system call - * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address * @throws { BusinessError } 13900018 - Not a directory * @throws { BusinessError } 13900030 - File name too long - * @throws { BusinessError } 13900031 - Function not implemented * @throws { BusinessError } 13900033 - Too many symbolic links encountered * @throws { BusinessError } 13900038 - Value too large for defined data type * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function statSync(file: string | number): Stat; +function lstatSync(path: string): Stat; /** - * Truncate file. + * Make dir. * - * @param { string | number } file - path or file descriptor. - * @param { number } [len = 0] - len. + * @param { string } path - path. * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory - * @throws { BusinessError } 13900004 - Interrupted system call - * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900015 - File exists * @throws { BusinessError } 13900018 - Not a directory - * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900023 - Text file busy - * @throws { BusinessError } 13900024 - File too large - * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900028 - Too many links * @throws { BusinessError } 13900030 - File name too long * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @atomicservice * @since 20 */ -function truncate(file: string | number, len?: number): Promise; +function mkdir(path: string): Promise; /** - * Truncate file. + * Make dir. * - * @param { string | number } file - path or file descriptor. - * @param { AsyncCallback } callback - Return the callback function. + * @param { string } path - path. + * @param { boolean } recursion - whether to recursively make directory. + * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory - * @throws { BusinessError } 13900004 - Interrupted system call - * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900015 - File exists * @throws { BusinessError } 13900018 - Not a directory - * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900023 - Text file busy - * @throws { BusinessError } 13900024 - File too large - * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900028 - Too many links * @throws { BusinessError } 13900030 - File name too long * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @atomicservice * @since 20 */ -function truncate(file: string | number, callback: AsyncCallback): void; +function mkdir(path: string, recursion: boolean): Promise; /** - * Truncate file. + * Make dir. * - * @param { string | number } file - path or file descriptor. - * @param { number } [len = 0] - len. + * @param { string } path - path. * @param { AsyncCallback } callback - Return the callback function. * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory - * @throws { BusinessError } 13900004 - Interrupted system call - * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900015 - File exists * @throws { BusinessError } 13900018 - Not a directory - * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900023 - Text file busy - * @throws { BusinessError } 13900024 - File too large - * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900028 - Too many links * @throws { BusinessError } 13900030 - File name too long * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @atomicservice * @since 20 */ -function truncate(file: string | number, len: number, callback: AsyncCallback): void; +function mkdir(path: string, callback: AsyncCallback): void; /** - * Truncate file with sync interface. + * Make dir. * - * @param { string | number } file - path or file descriptor. - * @param { number } [len = 0] - len. + * @param { string } path - path. + * @param { boolean } recursion - whether to recursively make directory. + * @param { AsyncCallback } callback - Return the callback function. * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory - * @throws { BusinessError } 13900004 - Interrupted system call - * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900015 - File exists * @throws { BusinessError } 13900018 - Not a directory - * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900023 - Text file busy - * @throws { BusinessError } 13900024 - File too large - * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900028 - Too many links * @throws { BusinessError } 13900030 - File name too long * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @atomicservice * @since 20 */ -function truncateSync(file: string | number, len?: number): void; +function mkdir(path: string, recursion: boolean, callback: AsyncCallback): void; /** - * Delete file. + * Make dir with sync interface. * * @param { string } path - path. - * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory - * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address - * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900015 - File exists * @throws { BusinessError } 13900018 - Not a directory - * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900028 - Too many links * @throws { BusinessError } 13900030 - File name too long * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @atomicservice * @since 20 */ -function unlink(path: string): Promise; +function mkdirSync(path: string): void; /** - * Delete file. + * Make dir with sync interface. * * @param { string } path - path. - * @param { AsyncCallback } callback - Return the callback function. + * @param { boolean } recursion - whether to recursively make directory. * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory - * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address - * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900015 - File exists * @throws { BusinessError } 13900018 - Not a directory - * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900028 - Too many links * @throws { BusinessError } 13900030 - File name too long * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @atomicservice * @since 20 */ -function unlink(path: string, callback: AsyncCallback): void; +function mkdirSync(path: string, recursion: boolean): void; /** - * Delete file with sync interface. + * Make temp dir. * - * @param { string } path - path. + * @param { string } prefix - dir prefix. + * @returns { Promise } Returns the path to the new directory in promise mode. * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900002 - No such file or directory - * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor * @throws { BusinessError } 13900011 - Out of memory * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address - * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900015 - File exists * @throws { BusinessError } 13900018 - Not a directory - * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900028 - Too many links * @throws { BusinessError } 13900030 - File name too long * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform - * @atomicservice * @since 20 */ -function unlinkSync(path: string): void; +function mkdtemp(prefix: string): Promise; /** - * Write file. + * Make temp dir. * - * @param { number } fd - file descriptor. - * @param { ArrayBuffer | string } buffer - buffer. - * @param { WriteOptions } [options] - options. - * @returns { Promise } Returns the number of bytes written to the file in promise mode. + * @param { string } prefix - dir prefix. + * @param { AsyncCallback } callback - The callback is used to return the path to the new directory. * @throws { BusinessError } 13900001 - Operation not permitted - * @throws { BusinessError } 13900004 - Interrupted system call - * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900002 - No such file or directory * @throws { BusinessError } 13900008 - Bad file descriptor - * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900018 - Not a directory * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900024 - File too large * @throws { BusinessError } 13900025 - No space left on device - * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900028 - Too many links + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900033 - Too many symbolic links encountered * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform - * @atomicservice * @since 20 */ -function write( - fd: number, - buffer: ArrayBuffer | string, - options?: WriteOptions -): Promise; +function mkdtemp(prefix: string, callback: AsyncCallback): void; /** - * Write file. + * Make temp dir with sync interface. * - * @param { number } fd - file descriptor. - * @param { ArrayBuffer | string } buffer - buffer. - * @param { AsyncCallback } callback - The callback is used to return the number of bytes written to the file. + * @param { string } prefix - dir prefix. + * @returns { string } Returns the path to the new directory. * @throws { BusinessError } 13900001 - Operation not permitted - * @throws { BusinessError } 13900004 - Interrupted system call - * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900002 - No such file or directory * @throws { BusinessError } 13900008 - Bad file descriptor - * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900018 - Not a directory * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900024 - File too large * @throws { BusinessError } 13900025 - No space left on device - * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900028 - Too many links + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900033 - Too many symbolic links encountered * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform - * @atomicservice * @since 20 */ -function write(fd: number, buffer: ArrayBuffer | string, callback: AsyncCallback): void; +function mkdtempSync(prefix: string): string; /** - * Write file. + * Move directory. * - * @param { number } fd - file descriptor. - * @param { ArrayBuffer | string } buffer - buffer. - * @param { WriteOptions } [options] - options. - * @param { AsyncCallback } callback - The callback is used to return the number of bytes written to the file. + * @param { string } src - source file path. + * @param { string } dest - destination file path. + * @param { number } [mode = 0] - move mode when duplicate file name exists. + * @returns { Promise } The promise returned by the function. * @throws { BusinessError } 13900001 - Operation not permitted - * @throws { BusinessError } 13900004 - Interrupted system call - * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900002 - No such file or directory * @throws { BusinessError } 13900008 - Bad file descriptor - * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900016 - Cross-device link + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900024 - File too large * @throws { BusinessError } 13900025 - No space left on device - * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900028 - Too many links + * @throws { BusinessError } 13900032 - Directory not empty + * @throws { BusinessError } 13900033 - Too many symbolic links encountered * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function write( - fd: number, - buffer: ArrayBuffer | string, - options: WriteOptions, - callback: AsyncCallback -): void; +function moveDir(src: string, dest: string, mode?: number): Promise; /** - * Write file with sync interface. + * Move directory. * - * @param { number } fd - file descriptor. - * @param { ArrayBuffer | string } buffer - buffer. - * @param { WriteOptions } [options] - options. - * @returns { number } Returns the number of bytes written to the file. + * @param { string } src - source file path. + * @param { string } dest - destination file path. + * @param { AsyncCallback } callback - Return the callback function. * @throws { BusinessError } 13900001 - Operation not permitted - * @throws { BusinessError } 13900004 - Interrupted system call - * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900002 - No such file or directory * @throws { BusinessError } 13900008 - Bad file descriptor - * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900016 - Cross-device link + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900024 - File too large * @throws { BusinessError } 13900025 - No space left on device - * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900028 - Too many links + * @throws { BusinessError } 13900032 - Directory not empty + * @throws { BusinessError } 13900033 - Too many symbolic links encountered * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -function writeSync( - fd: number, - buffer: ArrayBuffer | string, - options?: WriteOptions -): number; +function moveDir(src: string, dest: string, callback: AsyncCallback): void; /** - * File object. + * Move directory. * - * @interface File + * @param { string } src - source file path. + * @param { string } dest - destination file path. + * @param { AsyncCallback> } callback - Return the callback function. + * @throws { BusinessError } 13900015 - File exists * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ -interface File { - - /** - * @type { number } - * @readonly - * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice - * @since 20 - */ - readonly fd: number; +function moveDir(src: string, dest: string, callback: AsyncCallback>): void; - /** - * File path - * - * @type { string } - * @readonly - * @throws { BusinessError } 13900005 - I/O error - * @throws { BusinessError } 13900042 - Unknown error - * @throws { BusinessError } 14300002 - Invalid URI - * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @since 20 - */ - readonly path: string; +/** + * Move directory. + * + * @param { string } src - source file path. + * @param { string } dest - destination file path. + * @param { number } mode - move mode when duplicate file name exists. + * @param { AsyncCallback } callback - Return the callback function. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900016 - Cross-device link + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900028 - Too many links + * @throws { BusinessError } 13900032 - Directory not empty + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +function moveDir(src: string, dest: string, mode: number, callback: AsyncCallback): void; - /** +/** + * Move directory. + * + * @param { string } src - source file path. + * @param { string } dest - destination file path. + * @param { number } mode - move mode when duplicate file name exists. + * @param { AsyncCallback> } callback - Return the callback function. + * @throws { BusinessError } 13900015 - File exists + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +function moveDir(src: string, dest: string, mode: number, callback: AsyncCallback>): void; + +/** + * Move directory with sync interface. + * + * @param { string } src - source file path. + * @param { string } dest - destination file path. + * @param { number } [mode = 0] - move mode when duplicate file name exists. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900016 - Cross-device link + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900028 - Too many links + * @throws { BusinessError } 13900032 - Directory not empty + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +function moveDirSync(src: string, dest: string, mode?: number): void; + +/** + * Move file. + * + * @param { string } src - source file path. + * @param { string } dest - destination file path. + * @param { number } [mode = 0] - move mode when duplicate file name exists. + * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900016 - Cross-device link + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900028 - Too many links + * @throws { BusinessError } 13900032 - Directory not empty + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @since 20 + */ +function moveFile(src: string, dest: string, mode?: number): Promise; + +/** + * Move file. + * + * @param { string } src - source file path. + * @param { string } dest - destination file path. + * @param { AsyncCallback } callback - Return the callback function. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900016 - Cross-device link + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900028 - Too many links + * @throws { BusinessError } 13900032 - Directory not empty + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @since 20 + */ +function moveFile(src: string, dest: string, callback: AsyncCallback): void; + +/** + * Move file. + * + * @param { string } src - source file path. + * @param { string } dest - destination file path. + * @param { number } [mode = 0] - move mode when duplicate file name exists. + * @param { AsyncCallback } callback - Return the callback function. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900016 - Cross-device link + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900028 - Too many links + * @throws { BusinessError } 13900032 - Directory not empty + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @since 20 + */ +function moveFile(src: string, dest: string, mode: number, callback: AsyncCallback): void; + +/** + * Move file with sync interface. + * + * @param { string } src - source file path. + * @param { string } dest - destination file path. + * @param { number } [mode = 0] - move mode when duplicate file name exists. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900016 - Cross-device link + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900028 - Too many links + * @throws { BusinessError } 13900032 - Directory not empty + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @since 20 + */ +function moveFileSync(src: string, dest: string, mode?: number): void; + +/** + * Open file. + * + * @param { string } path - path. + * @param { number } [mode = OpenMode.READ_ONLY] - mode. + * @returns { Promise } Returns the File object in Promise mode to record the file descriptor. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900006 - No such device or address + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900017 - No such device + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900023 - Text file busy + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900029 - Resource deadlock would occur + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900038 - Value too large for defined data type + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900044 - Network is unreachable + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function open(path: string, mode?: number): Promise; + +/** + * Open file. + * + * @param { string } path - path. + * @param { AsyncCallback } callback - The callback is used to return the File object to record the file descriptor. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900006 - No such device or address + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900017 - No such device + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900023 - Text file busy + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900029 - Resource deadlock would occur + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900038 - Value too large for defined data type + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function open(path: string, callback: AsyncCallback): void; + +/** + * Open file. + * + * @param { string } path - path. + * @param { number } [mode = OpenMode.READ_ONLY] - mode. + * @param { AsyncCallback } callback - The callback is used to return the File object to record the file descriptor. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900006 - No such device or address + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900017 - No such device + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900023 - Text file busy + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900029 - Resource deadlock would occur + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900038 - Value too large for defined data type + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function open(path: string, mode: number, callback: AsyncCallback): void; + +/** + * Open file with sync interface. + * + * @param { string } path - path. + * @param { number } [mode = OpenMode.READ_ONLY] - mode. + * @returns { File } Returns the File object to record the file descriptor. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900006 - No such device or address + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900017 - No such device + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900023 - Text file busy + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900029 - Resource deadlock would occur + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900038 - Value too large for defined data type + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900044 - Network is unreachable + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function openSync(path: string, mode?: number): File; + +/** + * Read file. + * + * @param { number } fd - file descriptor. + * @param { ArrayBuffer } buffer - buffer. + * @param { ReadOptions } [options] - options. + * @returns { Promise } Returns the number of file bytes read to buffer in promise mode. + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900044 - Network is unreachable + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function read( + fd: number, + buffer: ArrayBuffer, + options?: ReadOptions +): Promise; + +/** + * Read file. + * + * @param { number } fd - file descriptor. + * @param { ArrayBuffer } buffer - buffer. + * @param { AsyncCallback } callback - The callback is used to return the number of file bytes read to buffer. + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function read(fd: number, buffer: ArrayBuffer, callback: AsyncCallback): void; + +/** + * Read file. + * + * @param { number } fd - file descriptor. + * @param { ArrayBuffer } buffer - buffer. + * @param { ReadOptions } [options] - options. + * @param { AsyncCallback } callback - The callback is used to return the number of file bytes read to buffer. + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function read( + fd: number, + buffer: ArrayBuffer, + options: ReadOptions, + callback: AsyncCallback +): void; + +/** + * Read file with sync interface. + * + * @param { number } fd - file descriptor. + * @param { ArrayBuffer } buffer - buffer. + * @param { ReadOptions } [options] - options. + * @returns { number } Returns the number of file bytes read to buffer. + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900044 - Network is unreachable + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function readSync( + fd: number, + buffer: ArrayBuffer, + options?: ReadOptions +): number; + +/** + * Read content line by line. + * + * @param { string } filePath - file path. + * @param { Options } [options] - optional parameters + * @returns { Promise } Returns the iterator object in promise mode. + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900044 - Network is unreachable + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +function readLines(filePath: string, options?: Options): Promise; + +/** + * Read content line by line. + * + * @param { string } filePath - file path. + * @param { AsyncCallback } callback - The callback is used to return the iterator object. + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +function readLines(filePath: string, callback: AsyncCallback): void; + +/** + * Read content line by line. + * + * @param { string } filePath - file path. + * @param { Options } options - optional parameters + * @param { AsyncCallback } callback - The callback is used to return the iterator object. + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +function readLines(filePath: string, options: Options, callback: AsyncCallback): void; + +/** + * Read content line by line with sync interface. + * + * @param { string } filePath - file path. + * @param { Options } [options] - optional parameters + * @returns { ReaderIterator } Returns the iterator object. + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900044 - Network is unreachable + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +function readLinesSync(filePath: string, options?: Options): ReaderIterator; + +/** + * Read text. + * + * @param { string } filePath - file path. + * @param { ReadTextOptions } [options] - options. + * @returns { Promise } Returns the contents of the read file in promise mode. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900044 - Network is unreachable + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function readText( + filePath: string, + options?: ReadTextOptions +): Promise; + +/** + * Read text. + * + * @param { string } filePath - file path. + * @param { AsyncCallback } callback - The callback is used to return the contents of the read file. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function readText(filePath: string, callback: AsyncCallback): void; + +/** + * Read text. + * + * @param { string } filePath - file path. + * @param { ReadTextOptions } [options] - options. + * @param { AsyncCallback } callback - The callback is used to return the contents of the read file. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function readText( + filePath: string, + options: ReadTextOptions, + callback: AsyncCallback +): void; + +/** + * Read text with sync interface. + * + * @param { string } filePath - file path. + * @param { ReadTextOptions } [options] - options. + * @returns { string } Returns the contents of the read file. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900044 - Network is unreachable + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function readTextSync( + filePath: string, + options?: ReadTextOptions +): string; + +/** + * Rename file. + * + * @param { string } oldPath - oldPath. + * @param { string } newPath - newPath. + * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900016 - Cross-device link + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900028 - Too many links + * @throws { BusinessError } 13900032 - Directory not empty + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function rename(oldPath: string, newPath: string): Promise; + +/** + * Rename file. + * + * @param { string } oldPath - oldPath. + * @param { string } newPath - newPath. + * @param { AsyncCallback } callback - Returns the callback function. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900016 - Cross-device link + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900028 - Too many links + * @throws { BusinessError } 13900032 - Directory not empty + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function rename(oldPath: string, newPath: string, callback: AsyncCallback): void; + +/** + * Rename file with sync interface. + * + * @param { string } oldPath - oldPath. + * @param { string } newPath - newPath. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900016 - Cross-device link + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900028 - Too many links + * @throws { BusinessError } 13900032 - Directory not empty + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function renameSync(oldPath: string, newPath: string): void; + +/** + * Delete dir. + * + * @param { string } path - path. + * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900027 - Read-only file system1 + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900032 - Directory not empty + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function rmdir(path: string): Promise; + +/** + * Delete dir. + * + * @param { string } path - path. + * @param { AsyncCallback } callback - Return the callback function. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900027 - Read-only file system1 + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900032 - Directory not empty + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function rmdir(path: string, callback: AsyncCallback): void; + +/** + * Delete dir with sync interface. + * + * @param { string } path - path. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900027 - Read-only file system1 + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900032 - Directory not empty + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function rmdirSync(path: string): void; + +/** + * Get file information. + * + * @param { string | number } file - path or file descriptor. + * @returns { Promise } Returns the Stat object in promise mode. + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900031 - Function not implemented + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900038 - Value too large for defined data type + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function stat(file: string | number): Promise; + +/** + * Get file information. + * + * @param { string | number } file - path or file descriptor. + * @param { AsyncCallback } callback - The callback is used to return the Stat object. + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900031 - Function not implemented + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900038 - Value too large for defined data type + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function stat(file: string | number, callback: AsyncCallback): void; + +/** + * Get file information with sync interface. + * + * @param { string | number } file - path or file descriptor. + * @returns { Stat } Returns the Stat object. + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900031 - Function not implemented + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900038 - Value too large for defined data type + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function statSync(file: string | number): Stat; + +/** + * Link file. + * + * @param { string } target - target. + * @param { string } srcPath - srcPath. + * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +function symlink(target: string, srcPath: string): Promise; + +/** + * Link file. + * + * @param { string } target - target. + * @param { string } srcPath - srcPath. + * @param { AsyncCallback } callback - Return the callback function. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +function symlink(target: string, srcPath: string, callback: AsyncCallback): void; + +/** + * Link file with sync interface. + * + * @param { string } target - target. + * @param { string } srcPath - srcPath. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +function symlinkSync(target: string, srcPath: string): void; + +/** + * Truncate file. + * + * @param { string | number } file - path or file descriptor. + * @param { number } [len = 0] - len. + * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900023 - Text file busy + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function truncate(file: string | number, len?: number): Promise; + +/** + * Truncate file. + * + * @param { string | number } file - path or file descriptor. + * @param { AsyncCallback } callback - Return the callback function. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900023 - Text file busy + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function truncate(file: string | number, callback: AsyncCallback): void; + +/** + * Truncate file. + * + * @param { string | number } file - path or file descriptor. + * @param { number } [len = 0] - len. + * @param { AsyncCallback } callback - Return the callback function. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900023 - Text file busy + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function truncate(file: string | number, len: number, callback: AsyncCallback): void; + +/** + * Truncate file with sync interface. + * + * @param { string | number } file - path or file descriptor. + * @param { number } [len = 0] - len. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900023 - Text file busy + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function truncateSync(file: string | number, len?: number): void; + +/** + * Delete file. + * + * @param { string } path - path. + * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function unlink(path: string): Promise; + +/** + * Delete file. + * + * @param { string } path - path. + * @param { AsyncCallback } callback - Return the callback function. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function unlink(path: string, callback: AsyncCallback): void; + +/** + * Delete file with sync interface. + * + * @param { string } path - path. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900014 - Device or resource busy + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900030 - File name too long + * @throws { BusinessError } 13900033 - Too many symbolic links encountered + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function unlinkSync(path: string): void; + +/** + * Change file mtime. + * + * @param { string } path - path. + * @param { number } mtime - last modification time + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900027 - Read-only file system + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @since 20 + */ +function utimes(path: string, mtime: number): void; + +/** + * Write file. + * + * @param { number } fd - file descriptor. + * @param { ArrayBuffer | string } buffer - buffer. + * @param { WriteOptions } [options] - options. + * @returns { Promise } Returns the number of bytes written to the file in promise mode. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function write( + fd: number, + buffer: ArrayBuffer | string, + options?: WriteOptions +): Promise; + +/** + * Write file. + * + * @param { number } fd - file descriptor. + * @param { ArrayBuffer | string } buffer - buffer. + * @param { AsyncCallback } callback - The callback is used to return the number of bytes written to the file. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function write(fd: number, buffer: ArrayBuffer | string, callback: AsyncCallback): void; + +/** + * Write file. + * + * @param { number } fd - file descriptor. + * @param { ArrayBuffer | string } buffer - buffer. + * @param { WriteOptions } [options] - options. + * @param { AsyncCallback } callback - The callback is used to return the number of bytes written to the file. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function write( + fd: number, + buffer: ArrayBuffer | string, + options: WriteOptions, + callback: AsyncCallback +): void; + +/** + * Write file with sync interface. + * + * @param { number } fd - file descriptor. + * @param { ArrayBuffer | string } buffer - buffer. + * @param { WriteOptions } [options] - options. + * @returns { number } Returns the number of bytes written to the file. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +function writeSync( + fd: number, + buffer: ArrayBuffer | string, + options?: WriteOptions +): number; + +/** + * Connect Distributed File System. + * + * @permission ohos.permission.DISTRIBUTED_DATASYNC + * @param { string } networkId - The networkId of device. + * @param { DfsListeners } listeners - The listeners of Distributed File System. + * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - The parameter check failed.Possible causes:1.Mandatory parameters are left unspecified; + *
    2.Incorrect parameter types. + * @throws { BusinessError } 13900045 - Connection failed. + * @throws { BusinessError } 13900046 - Software caused connection abort. + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +function connectDfs(networkId: string, listeners: DfsListeners): Promise; + +/** + * Disconnect Distributed File System. + * + * @permission ohos.permission.DISTRIBUTED_DATASYNC + * @param { string } networkId - The networkId of device. + * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 201 - Permission denied. + * @throws { BusinessError } 401 - The parameter check failed.Possible causes:1.Mandatory parameters are left unspecified; + *
    2.Incorrect parameter types. + * @throws { BusinessError } 13600004 - Unmount failed. + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +function disconnectDfs(networkId: string): Promise; + +/** + * Set extended attributes information of the file. + * + * @param { string } path - path. + * @param { string } key - the key of extended attribute. + * @param { string } value - the value of extended attribute. + * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; + *
    2.Incorrect parameter types. + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900031 - Function not implemented + * @throws { BusinessError } 13900038 - Value too large for defined data type + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +function setxattr(path: string, key: string, value: string): Promise; + +/** + * Set extended attributes information of the file. + * + * @param { string } path - path. + * @param { string } key - the key of extended attribute. + * @param { string } value - the value of extended attribute. + * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; + *
    2.Incorrect parameter types. + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900031 - Function not implemented + * @throws { BusinessError } 13900038 - Value too large for defined data type + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + +function setxattrSync(path: string, key: string, value: string): void; + +/** + * Get extended attributes information of the file. + * + * @param { string } path - path. + * @param { string } key - the key of extended attribute. + * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; + *
    2.Incorrect parameter types. + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900007 - Arg list too long + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900031 - Function not implemented + * @throws { BusinessError } 13900037 - No data available + * @throws { BusinessError } 13900038 - Value too large for defined data type + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +function getxattr(path: string, key: string): Promise; + +/** + * Get extended attributes information of the file with sync interface. + * + * @param { string } path - path. + * @param { string } key - the key of extended attribute. + * @returns { string } Return the value of extended attribute. + * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; + *
    2.Incorrect parameter types. + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900007 - Arg list too long + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900031 - Function not implemented + * @throws { BusinessError } 13900037 - No data available + * @throws { BusinessError } 13900038 - Value too large for defined data type + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +function getxattrSync(path: string, key: string): string; + +/** + * Progress data of copyFile + * + * @typedef Progress + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +interface Progress { + /** + * @type { number } + * @readonly + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + readonly processedSize: number; + + /** + * @type { number } + * @readonly + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + readonly totalSize: number; +} + +/** + * Task signal. + * + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +class TaskSignal { + /** + * Cancel the copy task in progress. + * + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900012 - Permission denied by the file system + * @throws { BusinessError } 13900043 - No task can be canceled. + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + cancel(): void; + + /** + * Subscribe the cancel event of current task. + * + * @returns { Promise } Return the result of the cancel event. + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + onCancel(): Promise; +} + +/** + * Get options of copy + * + * @typedef CopyOptions + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +interface CopyOptions { + /** + * Listener of copy progress + * + * @type { ?ProgressListener } + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + progressListener?: ProgressListener; + /** + * Cancel signal of copy. + * + * @type { ?TaskSignal } + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + copySignal?: TaskSignal; +} + +/** + * Listener of copy progress. + * + * @typedef { function } ProgressListener + * @param { Progress } progress - indicates the progress data of copyFile + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +type ProgressListener = (progress: Progress) => void; + +/** + * File object. + * + * @interface File + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ +interface File { + + /** + * @type { number } + * @readonly + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ + readonly fd: number; + + /** + * File path + * + * @type { string } + * @readonly + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 14300002 - Invalid URI + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @since 20 + */ + readonly path: string; + + /** * File name * * @type { string } @@ -1694,99 +3324,606 @@ interface File { * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform + * @crossplatform + * @since 20 + */ + readonly name: string; + + /** + * Get parent path of file. + * + * @returns { string } Return the parent path of file. + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 14300002 - Invalid URI + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @since 20 + */ + getParent(): string; + + /** + * Lock file with blocking method. + * + * @param { boolean } exclusive - whether lock is exclusive. + * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900043 - No record locks available + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + lock(exclusive?: boolean): Promise; + + /** + * Lock file with blocking method. + * + * @param { AsyncCallback } callback - Return the callback function. + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900043 - No record locks available + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + lock(callback: AsyncCallback): void; + + /** + * Lock file with blocking method. + * + * @param { boolean } exclusive - whether lock is exclusive. + * @param { AsyncCallback } callback - Return the callback function. + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900043 - No record locks available + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + lock(exclusive: boolean, callback: AsyncCallback): void; + + /** + * Try to lock file with returning results immediately. + * + * @param { boolean } exclusive - whether lock is exclusive. + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900043 - No record locks available + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + tryLock(exclusive?: boolean): void; + + /** + * Unlock file. + * + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900043 - No record locks available + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + unlock(): void; +} + +/** + * RandomAccessFile object. + * + * @interface RandomAccessFile + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +interface RandomAccessFile { + + /** + * File descriptor + * + * @type { number } + * @readonly + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + readonly fd: number; + + /** + * File pointer + * + * @type { number } + * @readonly + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + readonly filePointer: number; + + /** + * Set file pointer. + * + * @param { number } filePointer - filePointer. + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO * @since 20 */ - readonly name: string; + setFilePointer(filePointer: number): void; /** - * Get parent path of file. + * Close randomAccessFile with sync interface. * - * @returns { string } Return the parent path of file. + * @throws { BusinessError } 13900004 - Interrupted system call * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error - * @throws { BusinessError } 14300002 - Invalid URI * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform * @since 20 */ - getParent(): string; + close(): void; /** - * Lock file with blocking method. + * Write randomAccessFile. * - * @param { boolean } exclusive - whether lock is exclusive. - * @returns { Promise } The promise returned by the function. + * @param { ArrayBuffer | string } buffer - buffer. + * @param { WriteOptions } [options] - options. + * @returns { Promise } Returns the number of bytes written to the file in promise mode. + * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error - * @throws { BusinessError } 13900043 - No record locks available * @syscap SystemCapability.FileManagement.File.FileIO * @since 20 */ - lock(exclusive?: boolean): Promise; + write( + buffer: ArrayBuffer | string, + options?: WriteOptions + ): Promise; /** - * Lock file with blocking method. + * Write randomAccessFile. * - * @param { AsyncCallback } callback - Return the callback function. + * @param { ArrayBuffer | string } buffer - buffer. + * @param { AsyncCallback } callback - The callback is used to return the number of bytes written to the file. + * @throws { BusinessError } 13900001 - Operation not permitted * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900041 - Quota exceeded * @throws { BusinessError } 13900042 - Unknown error - * @throws { BusinessError } 13900043 - No record locks available * @syscap SystemCapability.FileManagement.File.FileIO * @since 20 */ - lock(callback: AsyncCallback): void; + write(buffer: ArrayBuffer | string, callback: AsyncCallback): void; + + /** + * Write randomAccessFile. + * + * @param { ArrayBuffer | string } buffer - buffer. + * @param { WriteOptions } [options] - options. + * @param { AsyncCallback } callback - The callback is used to return the number of bytes written to the file. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + write( + buffer: ArrayBuffer | string, + options: WriteOptions, + callback: AsyncCallback + ): void; + + /** + * Write randomAccessFile with sync interface. + * + * @param { ArrayBuffer | string } buffer - buffer. + * @param { WriteOptions } [options] - options. + * @returns { number } Returns the number of bytes written to the file. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + writeSync( + buffer: ArrayBuffer | string, + options?: WriteOptions + ): number; + + /** + * Read randomAccessFile. + * + * @param { ArrayBuffer } buffer - buffer. + * @param { ReadOptions } [options] - options. + * @returns { Promise } Returns the number of file bytes read to buffer in promise mode. + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900044 - Network is unreachable + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + read( + buffer: ArrayBuffer, + options?: ReadOptions + ): Promise; + + /** + * Read randomAccessFile. + * + * @param { ArrayBuffer } buffer - buffer. + * @param { AsyncCallback } callback - The callback is used to return the number of file bytes read to buffer. + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + read(buffer: ArrayBuffer, callback: AsyncCallback): void; + + /** + * Read randomAccessFile. + * + * @param { ArrayBuffer } buffer - buffer. + * @param { ReadOptions } [options] - options. + * @param { AsyncCallback } callback - The callback is used to return the number of file bytes read to buffer. + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + read( + buffer: ArrayBuffer, + options: ReadOptions, + callback: AsyncCallback + ): void; + + /** + * Read randomAccessFile with sync interface. + * + * @param { ArrayBuffer } buffer - buffer. + * @param { ReadOptions } [options] - options. + * @returns { number } Returns the number of file bytes read to buffer. + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900044 - Network is unreachable + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + readSync( + buffer: ArrayBuffer, + options?: ReadOptions + ): number; + + /** + * Generate read stream from RandomAccessFile object. + * + * @returns { ReadStream } Return ReadStream object. + * @throws { BusinessError } 401 - Parameter error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + getReadStream(): ReadStream; + + /** + * Generate write stream from RandomAccessFile object. + * + * @returns { WriteStream } Return WriteStream object. + * @throws { BusinessError } 401 - Parameter error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + getWriteStream(): WriteStream; +} + +/** + * File Read Stream. + * + * @extends stream.Readable + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +class ReadStream extends stream.Readable { + /** + * The ReadStream constructor. + * + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + constructor(); + + /** + * The Number of bytes read in the stream. + * + * @type { number } + * @readonly + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + readonly bytesRead: number; + + /** + * The path of the file being read. + * + * @type { string } + * @readonly + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + readonly path: string; + + /** + * Set the file position indicator for the read stream. + * + * @param { number } offset - file offset. + * @param { WhenceType } [whence = WhenceType.SEEK_SET] - directive whence. + * @returns { number } Returns the offset relative to starting position of stream. + * @throws { BusinessError } 401 - Parameter error + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900026 - Illegal seek + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + seek(offset: number, whence?: WhenceType): number; + + /** + * Close ReadStream with sync interface. + * + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + close(): void; +} + +/** + * File Write Stream. + * + * @extends stream.Writable + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +class WriteStream extends stream.Writable { + /** + * The WriteStream constructor. + * + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + constructor(); + + /** + * The Number of bytes written in the stream. + * + * @type { number } + * @readonly + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + readonly bytesWritten: number; + + /** + * The path of the file being written. + * + * @type { string } + * @readonly + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + readonly path: string; + + /** + * Set the file position indicator for the write stream. + * + * @param { number } offset - file offset. + * @param { WhenceType } [whence = WhenceType.SEEK_SET] - directive whence. + * @returns { number } Returns the offset relative to starting position of stream. + * @throws { BusinessError } 401 - Parameter error + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900026 - Illegal seek + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + seek(offset: number, whence?: WhenceType): number; + + /** + * Close WriteStream with sync interface. + * + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + close(): void; +} + +/** + * The AtomicFile class provides methods for performing atomic operations on files. + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +export class AtomicFile { + /** + * The AtomicFile constructor. + * @param { string } path file path. + * @throws { BusinessError } 401 Parameter error.Possible causes:1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + constructor(path: string); + + /** + * Get the File object from AtomicFile object. + * @returns { File } Returns the file object. + * @throws { BusinessError } 13900002 No such file or directory + * @throws { BusinessError } 13900005 IO error + * @throws { BusinessError } 13900012 Permission denied + * @throws { BusinessError } 13900042 Internal error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + getBaseFile(): File; + + /** + * Create the file read stream. + * @returns { ReadStream } Returns the file read stream. + * @throws { BusinessError } 13900001 Operation not permitted + * @throws { BusinessError } 13900002 No such file or directory + * @throws { BusinessError } 13900012 Permission denied + * @throws { BusinessError } 13900042 Internal error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + openRead(): ReadStream; + + /** + * Read the entire contents of the file. + * @returns { ArrayBuffer } Returns the ArrayBuffer of the file contents. + * @throws { BusinessError } 13900005 I/O error + * @throws { BusinessError } 13900042 Internal error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + readFully(): ArrayBuffer; /** - * Lock file with blocking method. - * - * @param { boolean } exclusive - whether lock is exclusive. - * @param { AsyncCallback } callback - Return the callback function. - * @throws { BusinessError } 13900004 - Interrupted system call - * @throws { BusinessError } 13900008 - Bad file descriptor - * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900034 - Operation would block - * @throws { BusinessError } 13900042 - Unknown error - * @throws { BusinessError } 13900043 - No record locks available + * Create the file write stream. + * @returns { WriteStream } Returns the file write stream. + * @throws { BusinessError } 13900001 Operation not permitted + * @throws { BusinessError } 13900002 No such file or directory + * @throws { BusinessError } 13900012 Permission denied + * @throws { BusinessError } 13900027 Read-only file system + * @throws { BusinessError } 13900042 Internal error * @syscap SystemCapability.FileManagement.File.FileIO * @since 20 */ - lock(exclusive: boolean, callback: AsyncCallback): void; + startWrite(): WriteStream; /** - * Try to lock file with returning results immediately. - * - * @param { boolean } exclusive - whether lock is exclusive. - * @throws { BusinessError } 13900004 - Interrupted system call - * @throws { BusinessError } 13900008 - Bad file descriptor - * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900034 - Operation would block - * @throws { BusinessError } 13900042 - Unknown error - * @throws { BusinessError } 13900043 - No record locks available + * If the file is written successfully, the file is closed. + * @throws { BusinessError } 13900042 Internal error * @syscap SystemCapability.FileManagement.File.FileIO * @since 20 */ - tryLock(exclusive?: boolean): void; + finishWrite(): void; /** - * Unlock file. - * - * @throws { BusinessError } 13900004 - Interrupted system call - * @throws { BusinessError } 13900008 - Bad file descriptor - * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900034 - Operation would block - * @throws { BusinessError } 13900042 - Unknown error - * @throws { BusinessError } 13900043 - No record locks available + * If writing to the file fails, the file is rolled back. + * @throws { BusinessError } 13900042 Internal error * @syscap SystemCapability.FileManagement.File.FileIO * @since 20 */ - unlock(): void; + failWrite(): void; + + /** + * Delete all file. + * @throws { BusinessError } 13900001 Operation not permitted + * @throws { BusinessError } 13900002 No such file or directory + * @throws { BusinessError } 13900012 Permission denied + * @throws { BusinessError } 13900027 Read-only file system + * @throws { BusinessError } 13900042 Internal error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + delete(): void; } /** @@ -1922,105 +4059,495 @@ interface Stat { * @syscap SystemCapability.FileManagement.File.FileIO * @since 20 */ - readonly ctimeNs?:bigint; + readonly ctimeNs?:bigint; + + /** + * + * @type { LocationType } + * @readonly + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + readonly location: LocationType; + + /** + * Whether path/fd is block device. + * + * @returns { boolean } Returns whether the path/fd point to a block device or not. + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @since 20 + */ + isBlockDevice(): boolean; + + /** + * Whether path/fd is character device. + * + * @returns { boolean } Returns whether the path/fd point to a character device or not. + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @since 20 + */ + isCharacterDevice(): boolean; + + /** + * Whether path/fd is directory. + * + * @returns { boolean } Returns whether the path/fd point to a directory or not. + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ + isDirectory(): boolean; + + /** + * Whether path/fd is fifo. + * + * @returns { boolean } Returns whether the path/fd point to a fifo file or not. + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @since 20 + */ + isFIFO(): boolean; + + /** + * Whether path/fd is file. + * + * @returns { boolean } Returns whether the path/fd point to a normal file or not. + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @atomicservice + * @since 20 + */ + isFile(): boolean; + + /** + * Whether path/fd is socket. + * + * @returns { boolean } Returns whether the path/fd point to a socket file or not. + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @since 20 + */ + isSocket(): boolean; + + /** + * Whether path/fd is symbolic link. + * + * @returns { boolean } Returns whether the path/fd point to a symbolic link or not. + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @crossplatform + * @since 20 + */ + isSymbolicLink(): boolean; +} + +/** + * Stream object + * + * @interface Stream + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +interface Stream { + /** + * Close stream. + * + * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + close(): Promise; + + /** + * Close stream. + * + * @param { AsyncCallback } callback - Return the callback function. + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + close(callback: AsyncCallback): void; + + /** + * Close stream with sync interface. + * + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + closeSync(): void; + + /** + * Flush stream. + * + * @returns { Promise } The promise returned by the function. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + flush(): Promise; + + /** + * Flush stream. + * + * @param { AsyncCallback } callback - Return the callback function. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + flush(callback: AsyncCallback): void; + + /** + * Flush stream with sync interface. + * + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + flushSync(): void; + + /** + * Write stream. + * + * @param { ArrayBuffer | string } buffer - buffer. + * @param { WriteOptions } [options] - options. + * @returns { Promise } Returns the number of file bytes written to file in promise mode. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + write( + buffer: ArrayBuffer | string, + options?: WriteOptions + ): Promise; + + /** + * Write stream. + * + * @param { ArrayBuffer | string } buffer - buffer. + * @param { AsyncCallback } callback - The callback is used to return the number of file bytes written to file. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + write(buffer: ArrayBuffer | string, callback: AsyncCallback): void; + + /** + * Write stream. + * + * @param { ArrayBuffer | string } buffer - buffer. + * @param { WriteOptions } [options] - options. + * @param { AsyncCallback } callback - The callback is used to return the number of file bytes written to file. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + write( + buffer: ArrayBuffer | string, + options: WriteOptions, + callback: AsyncCallback + ): void; + + /** + * Write stream with sync interface. + * + * @param { ArrayBuffer | string } buffer - buffer. + * @param { WriteOptions } [options] - options. + * @returns { number } Returns the number of file bytes written to file. + * @throws { BusinessError } 13900001 - Operation not permitted + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900024 - File too large + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900034 - Operation would block + * @throws { BusinessError } 13900041 - Quota exceeded + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + writeSync( + buffer: ArrayBuffer | string, + options?: WriteOptions + ): number; /** + * Read stream. * - * @type { LocationType } - * @readonly + * @param { ArrayBuffer } buffer - buffer. + * @param { ReadOptions } [options] - options. + * @returns { Promise } Returns the number of file bytes read to buffer in promise mode. + * @throws { BusinessError } 13900004 - Interrupted system call + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900034 - Operation would block * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900044 - Network is unreachable * @syscap SystemCapability.FileManagement.File.FileIO * @since 20 */ - readonly location: LocationType; + read( + buffer: ArrayBuffer, + options?: ReadOptions + ): Promise; /** - * Whether path/fd is block device. + * Read stream. * - * @returns { boolean } Returns whether the path/fd point to a block device or not. + * @param { ArrayBuffer } buffer - buffer. + * @param { AsyncCallback } callback - The callback is used to return the number of file bytes read to buffer. + * @throws { BusinessError } 13900004 - Interrupted system call * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900034 - Operation would block * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform * @since 20 */ - isBlockDevice(): boolean; + read(buffer: ArrayBuffer, callback: AsyncCallback): void; /** - * Whether path/fd is character device. + * Read stream. * - * @returns { boolean } Returns whether the path/fd point to a character device or not. + * @param { ArrayBuffer } buffer - buffer. + * @param { ReadOptions } [options] - options. + * @param { AsyncCallback } callback - The callback is used to return the number of file bytes read to buffer. + * @throws { BusinessError } 13900004 - Interrupted system call * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900034 - Operation would block * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform * @since 20 */ - isCharacterDevice(): boolean; + read( + buffer: ArrayBuffer, + options: ReadOptions, + callback: AsyncCallback + ): void; /** - * Whether path/fd is directory. + * Read stream with sync interface. * - * @returns { boolean } Returns whether the path/fd point to a directory or not. + * @param { ArrayBuffer } buffer - buffer. + * @param { ReadOptions } [options] - options. + * @returns { number } Returns the number of file bytes read to file. + * @throws { BusinessError } 13900004 - Interrupted system call * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900010 - Try again + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900019 - Is a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900034 - Operation would block * @throws { BusinessError } 13900042 - Unknown error + * @throws { BusinessError } 13900044 - Network is unreachable * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ - isDirectory(): boolean; + readSync( + buffer: ArrayBuffer, + options?: ReadOptions + ): number; +} +/** + * Watcher object + * + * @interface Watcher + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +interface Watcher { /** - * Whether path/fd is fifo. + * Start watcher. * - * @returns { boolean } Returns whether the path/fd point to a fifo file or not. - * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900021 - File table overflow + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900030 - File name too long * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform * @since 20 */ - isFIFO(): boolean; + start(): void; /** - * Whether path/fd is file. + * Stop watcher. * - * @returns { boolean } Returns whether the path/fd point to a normal file or not. - * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900002 - No such file or directory + * @throws { BusinessError } 13900008 - Bad file descriptor + * @throws { BusinessError } 13900011 - Out of memory + * @throws { BusinessError } 13900012 - Permission denied + * @throws { BusinessError } 13900013 - Bad address + * @throws { BusinessError } 13900015 - File exists + * @throws { BusinessError } 13900018 - Not a directory + * @throws { BusinessError } 13900020 - Invalid argument + * @throws { BusinessError } 13900021 - File table overflow + * @throws { BusinessError } 13900022 - Too many open files + * @throws { BusinessError } 13900025 - No space left on device + * @throws { BusinessError } 13900030 - File name too long * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform - * @atomicservice * @since 20 */ - isFile(): boolean; + stop(): void; +} +/** + * Enumeration of different types of whence. + * + * @enum { number } whence type + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +enum WhenceType { /** - * Whether path/fd is socket. + * Starting position of the file offset. * - * @returns { boolean } Returns whether the path/fd point to a socket file or not. - * @throws { BusinessError } 13900005 - I/O error - * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform * @since 20 */ - isSocket(): boolean; + SEEK_SET = 0, /** - * Whether path/fd is symbolic link. + * Current position of the file offset. * - * @returns { boolean } Returns whether the path/fd point to a symbolic link or not. - * @throws { BusinessError } 13900005 - I/O error - * @throws { BusinessError } 13900042 - Unknown error * @syscap SystemCapability.FileManagement.File.FileIO - * @crossplatform * @since 20 */ - isSymbolicLink(): boolean; -} + SEEK_CUR = 1, + /** + * Ending position of the file offset. + * + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + SEEK_END = 2, +} /** * Enumeration of different types of file location. @@ -2115,6 +4642,103 @@ enum AccessFlagType { LOCAL = 0, } +/** + * ReaderIterator object + * + * @interface ReaderIterator + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +interface ReaderIterator { + /** + * Get next result from the iterator. + * + * @returns { ReaderIteratorResult } Returns the result of reader iterator. + * @throws { BusinessError } 13900005 - I/O error + * @throws { BusinessError } 13900037 - No data available + * @throws { BusinessError } 13900042 - Unknown error + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + next(): ReaderIteratorResult; +} + +} + +/** + * Implements watcher event listening. + * + * @typedef { function } WatchEventListener + * @param { WatchEvent } event - Event type for the callback to invoke. + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +export type WatchEventListener = (event: WatchEvent) => void; + +/** + * Event Listening. + * + * @interface WatchEvent + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +export interface WatchEvent { + /** + * File name. + * + * @type { string } + * @readonly + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + readonly fileName: string; + + /** + * Event happened. + * + * @type { number } + * @readonly + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + readonly event: number; + + /** + * Associated rename event. + * + * @type { number } + * @readonly + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + readonly cookie: number; +} + +/** + * Reader Iterator Result + * + * @interface ReaderIteratorResult + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +export interface ReaderIteratorResult { + /** + * Whether reader iterator completes the traversal. + * + * @type { boolean } + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + done: boolean; + + /** + * The value of reader iterator. + * + * @type { string } + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + value: string; } /** @@ -2195,6 +4819,34 @@ export interface Filter { excludeMedia?: boolean; } +/** + * Conflict Files type + * + * @interface ConflictFiles + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +export interface ConflictFiles { + + /** + * The path of the source file. + * + * @type { string } + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + srcFile: string; + + /** + * The path of the destination file. + * + * @type { string } + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + destFile: string; +} + /** * Options type * @@ -2343,4 +4995,128 @@ export interface ListFileOptions { filter?: Filter; } +/** + * RandomAccessFileOptions type + * + * @interface RandomAccessFileOptions + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +export interface RandomAccessFileOptions { + /** + * The starting position of file offset. + * + * @type { ?number } + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + start?: number; + + /** + * The ending position of file offset. + * + * @type { ?number } + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + end?: number; +} + +/** + * ReadStreamOptions type + * + * @interface ReadStreamOptions + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +export interface ReadStreamOptions { + /** + * The starting range for reading a file by stream. + * + * @type { ?number } + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + start?: number; + + /** + * The ending range for reading a file by stream. + * + * @type { ?number } + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + end?: number; +} + +/** + * WriteStreamOptions type + * + * @interface WriteStreamOptions + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +export interface WriteStreamOptions { + /** + * The mode for creating write stream. + * + * @type { ?number } + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + mode?: number; + /** + * The starting range for writing a file by stream. + * + * @type { ?number } + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + start?: number; +} + +/** + * The listeners of Distributed File System. + * + * @typedef DfsListeners + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +export interface DfsListeners { + /** + * The Listener of Distributed File System status + * + * @param { string } networkId - The networkId of device. + * @param { number } status - The status code of Distributed File System. + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ + onStatus(networkId: string, status: number): void; +} + +/** + * Task signal. + * @typedef { fileIo.TaskSignal } + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +type TaskSignal = fileIo.TaskSignal; + +/** + * Watcher object + * @typedef { fileIo.Watcher } + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +type Watcher = fileIo.Watcher; + +/** + * Watcher object + * @typedef { fileIo.AtomicFile } + * @syscap SystemCapability.FileManagement.File.FileIO + * @since 20 + */ +type AtomicFile = fileIo.AtomicFile; + export default fileIo; +export {TaskSignal, Watcher, AtomicFile} diff --git a/api/@ohos.file.hash.d.ts b/api/@ohos.file.hash.d.ts index e6beae59b3..87b0ec6ff9 100644 --- a/api/@ohos.file.hash.d.ts +++ b/api/@ohos.file.hash.d.ts @@ -141,6 +141,7 @@ declare namespace hash { * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @since 20 + * @arkts 1.1&1.2 */ class HashStream extends stream.Transform { /** @@ -161,6 +162,7 @@ declare namespace hash { * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @since 20 + * @arkts 1.1&1.2 */ digest(): string; @@ -182,6 +184,7 @@ declare namespace hash { * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @since 20 + * @arkts 1.1&1.2 */ update(data: ArrayBuffer): void; } @@ -208,6 +211,7 @@ declare namespace hash { * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @since 20 + * @arkts 1.1&1.2 */ function createHash(algorithm: string): HashStream; } diff --git a/api/@ohos.file.statvfs.d.ts b/api/@ohos.file.statvfs.d.ts index 870676443a..ceadd10534 100644 --- a/api/@ohos.file.statvfs.d.ts +++ b/api/@ohos.file.statvfs.d.ts @@ -34,6 +34,7 @@ import type { AsyncCallback } from './@ohos.base'; * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @since 20 + * @arkts 1.1&1.2 */ declare namespace statfs { /** @@ -78,6 +79,7 @@ declare namespace statfs { * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @since 20 + * @arkts 1.1&1.2 */ function getFreeSize(path: string): Promise; @@ -123,6 +125,7 @@ declare namespace statfs { * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @since 20 + * @arkts 1.1&1.2 */ function getFreeSize(path: string, callback: AsyncCallback): void; @@ -168,6 +171,7 @@ declare namespace statfs { * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @since 20 + * @arkts 1.1&1.2 */ function getFreeSizeSync(path: string): number; @@ -213,6 +217,7 @@ declare namespace statfs { * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @since 20 + * @arkts 1.1&1.2 */ function getTotalSize(path: string): Promise; @@ -258,6 +263,7 @@ declare namespace statfs { * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @since 20 + * @arkts 1.1&1.2 */ function getTotalSize(path: string, callback: AsyncCallback): void; @@ -303,6 +309,7 @@ declare namespace statfs { * @syscap SystemCapability.FileManagement.File.FileIO * @crossplatform * @since 20 + * @arkts 1.1&1.2 */ function getTotalSizeSync(path: string): number; } diff --git a/kits/@kit.CoreFileKit.d.ts b/kits/@kit.CoreFileKit.d.ts index 4308ed3a7e..009118efb9 100644 --- a/kits/@kit.CoreFileKit.d.ts +++ b/kits/@kit.CoreFileKit.d.ts @@ -18,6 +18,7 @@ * @kit CoreFileKit */ +/*** if arkts 1.1 */ import BackupExtensionAbility, { BundleVersion } from '@ohos.application.BackupExtensionAbility'; import BackupExtensionContext from '@ohos.file.BackupExtensionContext'; import backup from '@ohos.file.backup'; @@ -50,3 +51,31 @@ export { fileIo, fileShare, fileUri, hash, picker, recent, securityLabel, statfs, storageStatistics, trash, userFileManager, volumeManager, keyManager, DfsListeners, TaskSignal }; +/*** endif */ + +/*** if arkts 1.2 */ +import BackupExtensionAbility from '@ohos.application.BackupExtensionAbility'; +import { BundleVersion } from '@ohos.application.BackupExtensionAbility'; +import backup from '@ohos.file.backup'; +import cloudSync from '@ohos.file.cloudSync'; +import cloudSyncManager from '@ohos.file.cloudSyncManager'; +import Environment from '@ohos.file.environment'; +import fileUri from '@ohos.file.fileuri'; +import fileIo from '@ohos.file.fs' +import { + ConflictFiles, Filter, Options, ReaderIteratorResult, WatchEvent, WatchEventListener, + Watcher, ReadOptions, ReadTextOptions, WriteOptions, ListFileOptions, DfsListeners, TaskSignal +} from '@ohos.file.fs'; +import hash from '@ohos.file.hash'; +import securityLabel from '@ohos.file.securityLabel'; +import statfs from '@ohos.file.statvfs'; +import fileShare from '@ohos.fileshare'; +import userFileManager from '@ohos.filemanagement.userFileManager'; + +export { + BackupExtensionAbility, BundleVersion, ConflictFiles, Environment, Filter, Options, ReaderIteratorResult, + WatchEvent, WatchEventListener, Watcher, ReadOptions, ReadTextOptions, WriteOptions, ListFileOptions, + backup, cloudSync, cloudSyncManager, fileIo, fileShare, fileUri, hash, securityLabel, statfs, DfsListeners, + TaskSignal, userFileManager +}; +/*** endif */ \ No newline at end of file -- Gitee From 1db56d7d53176afe4e96bc0206a268f6623e0ff8 Mon Sep 17 00:00:00 2001 From: zxl <1554188414@qq.com> Date: Sun, 13 Jul 2025 12:00:24 +0800 Subject: [PATCH 094/746] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9C=AA=E4=B8=8A?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zxl <1554188414@qq.com> Change-Id: Ia39fe67cc99060f37bdd3f8e3900a5d384255762 --- kits/@kit.CoreFileKit.d.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kits/@kit.CoreFileKit.d.ts b/kits/@kit.CoreFileKit.d.ts index 009118efb9..36713601bd 100644 --- a/kits/@kit.CoreFileKit.d.ts +++ b/kits/@kit.CoreFileKit.d.ts @@ -21,7 +21,6 @@ /*** if arkts 1.1 */ import BackupExtensionAbility, { BundleVersion } from '@ohos.application.BackupExtensionAbility'; import BackupExtensionContext from '@ohos.file.BackupExtensionContext'; -import backup from '@ohos.file.backup'; import cloudSync from '@ohos.file.cloudSync'; import cloudSyncManager from '@ohos.file.cloudSyncManager'; import Environment from '@ohos.file.environment'; @@ -70,12 +69,11 @@ import hash from '@ohos.file.hash'; import securityLabel from '@ohos.file.securityLabel'; import statfs from '@ohos.file.statvfs'; import fileShare from '@ohos.fileshare'; -import userFileManager from '@ohos.filemanagement.userFileManager'; export { BackupExtensionAbility, BundleVersion, ConflictFiles, Environment, Filter, Options, ReaderIteratorResult, WatchEvent, WatchEventListener, Watcher, ReadOptions, ReadTextOptions, WriteOptions, ListFileOptions, - backup, cloudSync, cloudSyncManager, fileIo, fileShare, fileUri, hash, securityLabel, statfs, DfsListeners, - TaskSignal, userFileManager + cloudSync, cloudSyncManager, fileIo, fileShare, fileUri, hash, securityLabel, statfs, DfsListeners, + TaskSignal }; /*** endif */ \ No newline at end of file -- Gitee From fe8d92b8fac746207e218cb8b9027cbae3f291cb Mon Sep 17 00:00:00 2001 From: niumingyu0 Date: Sun, 13 Jul 2025 16:10:49 +0800 Subject: [PATCH 095/746] modify routeinfo Signed-off-by: niumingyu0 --- api/@ohos.net.connection.d.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/api/@ohos.net.connection.d.ts b/api/@ohos.net.connection.d.ts index 77561b084b..c7b58cbc51 100644 --- a/api/@ohos.net.connection.d.ts +++ b/api/@ohos.net.connection.d.ts @@ -2051,10 +2051,9 @@ declare namespace connection { * Network card name. * @type {string} * @syscap SystemCapability.Communication.NetManager.Core - * @since arkts {'1.1':'8','1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ - iface: string; + interface: string; /** * Destination Address -- Gitee From 3503e8991c98fdb4d28057afbd9685c6f3b2b24e Mon Sep 17 00:00:00 2001 From: sun-xinyan Date: Sat, 12 Jul 2025 16:37:16 +0800 Subject: [PATCH 096/746] revert other files to 0702 Signed-off-by: sun-xinyan --- BUILD.gn | 2 +- api/@internal/component/ets/search.d.ts | 2 +- .../component/ets/security_component.d.ts | 37 +- api/@internal/component/ets/shape.d.ts | 2 +- api/@internal/component/ets/web.d.ts | 2 +- api/@ohos.arkui.drawableDescriptor.d.ts | 4 - api/@ohos.arkui.stateManagement.d.ets | 13 +- .../decorators/decoratorState.d.ets | 35 - api/bundleManager/AbilityInfo.d.ts | 32 +- api/bundleManager/AppProvisionInfo.d.ts | 12 +- api/bundleManager/ApplicationInfo.d.ts | 232 +- api/bundleManager/BundleInfo.d.ts | 227 +- api/bundleManager/BundlePackInfo.d.ts | 20 +- api/bundleManager/BundleResourceInfo.d.ts | 9 +- api/bundleManager/ExtensionAbilityInfo.d.ts | 16 +- api/bundleManager/HapModuleInfo.d.ts | 16 +- api/bundleManager/LauncherAbilityInfo.d.ts | 16 +- .../LauncherAbilityResourceInfo.d.ts | 9 +- api/bundleManager/Metadata.d.ts | 4 +- api/bundleManager/OverlayModuleInfo.d.ts | 8 +- api/bundleManager/PermissionDef.d.ts | 12 +- api/bundleManager/PluginBundleInfo.d.ts | 16 +- .../RecoverableApplicationInfo.d.ts | 8 +- api/bundleManager/SharedBundleInfo.d.ts | 8 +- api/bundleManager/ShortcutInfo.d.ts | 134 +- api/bundleManager/Skill.d.ts | 8 +- api/commonEvent/commonEventSubscriber.d.ts | 70 - api/device-define/wearable.json | 3 +- api/global/rawFileDescriptor.d.ts | 5 +- api/global/resource.d.ts | 2 - api/multimedia/soundPool.d.ts | 44 +- api/notification/notificationSubscriber.d.ts | 33 +- arkts/@arkts.collections.d.ets | 20 +- arkts/@arkts.math.Decimal.d.ets | 366 +- diff.patch | 111883 --------------- kits/@kit.AbilityKit.d.ts | 4 - kits/@kit.ImageKit.d.ts | 4 - kits/@kit.MultimodalAwarenessKit.d.ts | 1 + kits/@kit.PerformanceAnalysisKit.d.ts | 2 - 39 files changed, 237 insertions(+), 113084 deletions(-) delete mode 100644 api/arkui/stateManagement/decorators/decoratorState.d.ets delete mode 100644 diff.patch diff --git a/BUILD.gn b/BUILD.gn index a58ebd1584..a8e68e0168 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -360,7 +360,7 @@ action("install_tsc_declgen") { ":ohos_base_split" ] external_deps = [ - "runtime_core:declgen_ts2sts_compile_declgen" + # "runtime_core:declgen_ts2sts_compile_declgen" ] script="run_compile_declgen.py" args = [ diff --git a/api/@internal/component/ets/search.d.ts b/api/@internal/component/ets/search.d.ts index 0a46e5b696..baab82dd20 100644 --- a/api/@internal/component/ets/search.d.ts +++ b/api/@internal/component/ets/search.d.ts @@ -890,7 +890,7 @@ declare class SearchAttribute extends CommonMethod { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since arkts 20 + * @since 20 * @arkts 1.1&1.2 */ searchButton(value: ResourceStr, option?: SearchButtonOptions): SearchAttribute; diff --git a/api/@internal/component/ets/security_component.d.ts b/api/@internal/component/ets/security_component.d.ts index 0fbebc3bee..c84936c798 100644 --- a/api/@internal/component/ets/security_component.d.ts +++ b/api/@internal/component/ets/security_component.d.ts @@ -21,18 +21,17 @@ /** * Enumerates the layout direction of the icon and text. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.ArkUI.ArkUI.Full * @since 10 */ /** * Enumerates the layout direction of the icon and text. * - * @enum { int } + * @enum { number } * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ declare enum SecurityComponentLayoutDirection { /** @@ -46,8 +45,7 @@ declare enum SecurityComponentLayoutDirection { * * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ HORIZONTAL = 0, @@ -62,8 +60,7 @@ declare enum SecurityComponentLayoutDirection { * * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ VERTICAL = 1 } @@ -235,7 +232,7 @@ declare class SecurityComponentMethod { /** * Font weight of the inner text. * - * @param { int | FontWeight | string } value - Indicates the font weight of the text in the security component. + * @param { number | FontWeight | string } value - Indicates the font weight of the text in the security component. * @returns { T } Returns the attribute of the security component. * @syscap SystemCapability.ArkUI.ArkUI.Full * @since 10 @@ -257,7 +254,6 @@ declare class SecurityComponentMethod { * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 20 - * @arkts 1.1&1.2 */ fontWeight(value: number | FontWeight | string | Resource): T; @@ -420,8 +416,7 @@ declare class SecurityComponentMethod { * @returns { T } Returns the attribute of the security component. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 15 */ borderRadius(radius: Dimension | BorderRadiuses): T; @@ -612,29 +607,29 @@ declare class SecurityComponentMethod { /** * Sets the minimum font scale factor for text. * - * @param { double | Resource } scale Minimum font scale factor to set. + * @param { number | Resource } scale Minimum font scale factor to set. * @returns { T } Returns the attributes of the security component. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 18 */ - minFontScale(scale: double | Resource): T; + minFontScale(scale: number | Resource): T; /** * Sets the maximum font scale factor for text. * - * @param { double | Resource } scale Maximum font scale factor to set. + * @param { number | Resource } scale Maximum font scale factor to set. * @returns { T } Returns the attributes of the security component. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 18 */ - maxFontScale(scale: double | Resource): T; + maxFontScale(scale: number | Resource): T; /** * Called when the maximum number of lines of text is set. * - * @param { int } line + * @param { number } line * @returns { T } Returns the attribute of the security component. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice @@ -654,24 +649,24 @@ declare class SecurityComponentMethod { /** * Called when the minimum font size of the font is set. * - * @param { double | string | Resource } minSize + * @param { number | string | Resource } minSize * @returns { T } Returns the attribute of the security component. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 18 */ - minFontSize(minSize: double | string | Resource): T; + minFontSize(minSize: number | string | Resource): T; /** * Called when the maximum font size of the font is set. * - * @param { double | string | Resource } maxSize + * @param { number | string | Resource } maxSize * @returns { T } Returns the attribute of the security component. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 18 */ - maxFontSize(maxSize: double | string | Resource): T; + maxFontSize(maxSize: number | string | Resource): T; /** * Called when the height adaptive policy is set. diff --git a/api/@internal/component/ets/shape.d.ts b/api/@internal/component/ets/shape.d.ts index a3567fb128..b3bd674fce 100644 --- a/api/@internal/component/ets/shape.d.ts +++ b/api/@internal/component/ets/shape.d.ts @@ -763,7 +763,7 @@ declare class ShapeAttribute extends CommonMethod { * @crossplatform * @form * @atomicservice - * @since arkts 20 + * @since 20 * @arkts 1.1&1.2 */ strokeMiterLimit(value: Length): ShapeAttribute; diff --git a/api/@internal/component/ets/web.d.ts b/api/@internal/component/ets/web.d.ts index d171c35210..74bc5f3c15 100644 --- a/api/@internal/component/ets/web.d.ts +++ b/api/@internal/component/ets/web.d.ts @@ -6914,7 +6914,7 @@ declare interface JavaScriptProxy { /** * Controller. * - * @type { WebController | WebviewController } + * @type { WebviewController } * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice diff --git a/api/@ohos.arkui.drawableDescriptor.d.ts b/api/@ohos.arkui.drawableDescriptor.d.ts index 25c9b5398c..f509dc07fd 100644 --- a/api/@ohos.arkui.drawableDescriptor.d.ts +++ b/api/@ohos.arkui.drawableDescriptor.d.ts @@ -417,11 +417,7 @@ export class PixelMapDrawableDescriptor extends DrawableDescriptor { * @atomicservice * @since 12 */ -<<<<<<< HEAD -declare interface AnimationOptions { -======= export declare interface AnimationOptions { ->>>>>>> 94c88a315 (change 0603 to 0328) /** * The duration of animation playback once. * diff --git a/api/@ohos.arkui.stateManagement.d.ets b/api/@ohos.arkui.stateManagement.d.ets index cecd6af264..89a2bed08d 100644 --- a/api/@ohos.arkui.stateManagement.d.ets +++ b/api/@ohos.arkui.stateManagement.d.ets @@ -21,16 +21,7 @@ export * from './arkui/stateManagement/decorator'; export * from './arkui/stateManagement/runtime'; -export * from './arkui/stateManagement/storage'; -export * from './arkui/stateManagement/base/decoratorBase'; -export * from './arkui/stateManagement/base/iObservedObject'; -export * from './arkui/stateManagement/decorators/decoratorState'; -export * from './arkui/stateManagement/decorators/decoratorLink'; -export * from './arkui/stateManagement/decorators/decoratorProp'; -export * from './arkui/stateManagement/decorators/decoratorStorageLink'; -export * from './arkui/stateManagement/decorators/decoratorStorageProp'; -export * from './arkui/stateManagement/decorators/decoratorWatch'; -export * from './arkui/stateManagement/storages/appStorage'; -export * from './arkui/stateManagement/storages/localStorage'; +export * from './arkui/stateManagement/storage/appStorage'; +export * from './arkui/stateManagement/storage/localStorage'; export * from './arkui/stateManagement/utils'; export * from './arkui/stateManagement/storage/storageProperty'; diff --git a/api/arkui/stateManagement/decorators/decoratorState.d.ets b/api/arkui/stateManagement/decorators/decoratorState.d.ets deleted file mode 100644 index 5992f62fc1..0000000000 --- a/api/arkui/stateManagement/decorators/decoratorState.d.ets +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * @file - * @kit ArkUI - * @arkts 1.2 - */ - -import { DecoratedV1VariableBase, IDecoratedMutableVariable } from '../base/decoratorBase'; -import { PropDecoratedVariable } from './decoratorProp'; -import { WatchIdType, WatchFuncType } from './decoratorWatch'; - -export declare interface __MkPropReturnType { - prop: PropDecoratedVariable; - watchId: WatchIdType; -} - -export declare class StateDecoratedVariable extends DecoratedV1VariableBase - implements IDecoratedMutableVariable { - public constructor(varName: string, initValue: T, watchFunc?: WatchFuncType) - public get(): T - public set(newValue: T): void -} \ No newline at end of file diff --git a/api/bundleManager/AbilityInfo.d.ts b/api/bundleManager/AbilityInfo.d.ts index 92eae0bd87..c178036ae4 100644 --- a/api/bundleManager/AbilityInfo.d.ts +++ b/api/bundleManager/AbilityInfo.d.ts @@ -189,7 +189,7 @@ export interface AbilityInfo { /** * Indicates the label id of the ability * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -197,7 +197,7 @@ export interface AbilityInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: long; + readonly labelId: number; /** * Indicates the ability @@ -249,7 +249,7 @@ export interface AbilityInfo { /** * Indicates the description id of the ability * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -257,7 +257,7 @@ export interface AbilityInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly descriptionId: long; + readonly descriptionId: number; /** * Indicates the icon of the ability @@ -309,7 +309,7 @@ export interface AbilityInfo { /** * Indicates the icon id of the ability * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -317,7 +317,7 @@ export interface AbilityInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: long; + readonly iconId: number; /** * Process of ability, if user do not set it, the value equal application process @@ -720,25 +720,25 @@ export interface AbilityInfo { /** * Indicates the appIndex of application, only work in clone app mode * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: int; + readonly appIndex: number; /** * Indicates the orientation id of the ability * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'14', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly orientationId: long; + readonly orientationId: number; } /** @@ -795,7 +795,7 @@ export interface WindowSize { * @since 20 * @arkts 1.1&1.2 */ - readonly maxWindowRatio: double; + readonly maxWindowRatio: number; /** * Indicates minimum ratio of width over height of window under free window status. @@ -825,7 +825,7 @@ export interface WindowSize { * @since 20 * @arkts 1.1&1.2 */ - readonly minWindowRatio: double; + readonly minWindowRatio: number; /** * Indicates maximum width of window under free window status. @@ -855,7 +855,7 @@ export interface WindowSize { * @since 20 * @arkts 1.1&1.2 */ - readonly maxWindowWidth: long; + readonly maxWindowWidth: number; /** * Indicates minimum width of window under free window status. @@ -885,7 +885,7 @@ export interface WindowSize { * @since 20 * @arkts 1.1&1.2 */ - readonly minWindowWidth: long; + readonly minWindowWidth: number; /** * Indicates maximum height of window under free window status. @@ -915,7 +915,7 @@ export interface WindowSize { * @since 20 * @arkts 1.1&1.2 */ - readonly maxWindowHeight: long; + readonly maxWindowHeight: number; /** * Indicates minimum height of window under free window status. @@ -945,5 +945,5 @@ export interface WindowSize { * @since 20 * @arkts 1.1&1.2 */ - readonly minWindowHeight: long; + readonly minWindowHeight: number; } diff --git a/api/bundleManager/AppProvisionInfo.d.ts b/api/bundleManager/AppProvisionInfo.d.ts index fde167d360..98ed464fce 100644 --- a/api/bundleManager/AppProvisionInfo.d.ts +++ b/api/bundleManager/AppProvisionInfo.d.ts @@ -31,14 +31,14 @@ export interface AppProvisionInfo { /** * Indicates the version code of the profile file. * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly versionCode: long; + readonly versionCode: number; /** * Indicates the version name of the profile file. @@ -188,24 +188,24 @@ export interface Validity { /** * Indicates the earliest validity of the profile file. * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly notBefore: long; + readonly notBefore: number; /** * Indicates the latest validity of the profile file. * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly notAfter: long; + readonly notAfter: number; } diff --git a/api/bundleManager/ApplicationInfo.d.ts b/api/bundleManager/ApplicationInfo.d.ts index ad602051a4..5a0ba69cf8 100644 --- a/api/bundleManager/ApplicationInfo.d.ts +++ b/api/bundleManager/ApplicationInfo.d.ts @@ -128,7 +128,7 @@ export interface ApplicationInfo { /** * Indicates the description id of the application * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -136,7 +136,7 @@ export interface ApplicationInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly descriptionId: long; + readonly descriptionId: number; /** * Indicates whether or not this application may be instantiated @@ -155,17 +155,6 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ - /** - * Indicates whether or not this application may be instantiated - * - * @type { boolean } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates whether or not this application may be instantiated * @@ -229,7 +218,7 @@ export interface ApplicationInfo { /** * Indicates the label id of the application * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -237,7 +226,7 @@ export interface ApplicationInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: long; + readonly labelId: number; /** * Indicates the icon of the application @@ -289,7 +278,7 @@ export interface ApplicationInfo { /** * Indicates the icon id of the application * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -297,7 +286,7 @@ export interface ApplicationInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: long; + readonly iconId: number; /** * Process of application, if user do not set it ,the value equal bundleName @@ -316,17 +305,6 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ - /** - * Process of application, if user do not set it ,the value equal bundleName - * - * @type { string } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Process of application, if user do not set it ,the value equal bundleName * @@ -357,17 +335,6 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ - /** - * Indicates the permissions required for accessing the application. - * - * @type { Array } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates the permissions required for accessing the application. * @@ -440,17 +407,6 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ - /** - * Indicates the metadata of the application - * - * @type { Array } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates the metadata of the application * @@ -481,17 +437,6 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ - /** - * Indicates whether or not this application may be removable - * - * @type { boolean } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates whether or not this application may be removable * @@ -533,7 +478,7 @@ export interface ApplicationInfo { * @since 20 * @arkts 1.1&1.2 */ - readonly accessTokenId: long; + readonly accessTokenId: number; /** * Indicates the uid of the application @@ -563,7 +508,7 @@ export interface ApplicationInfo { * @since 20 * @arkts 1.1&1.2 */ - readonly uid: int; + readonly uid: number; /** * Indicates icon resource of the application @@ -582,17 +527,6 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ - /** - * Indicates icon resource of the application - * - * @type { Resource } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates icon resource of the application * @@ -623,17 +557,6 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ - /** - * Indicates label resource of the application - * - * @type { Resource } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates label resource of the application * @@ -664,17 +587,6 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ - /** - * Indicates description resource of the application - * - * @type { Resource } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates description resource of the application * @@ -705,17 +617,6 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ - /** - * Indicates the appDistributionType of the application - * - * @type { string } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates the appDistributionType of the application * @@ -746,17 +647,6 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ - /** - * Indicates the appProvisionType of the application - * - * @type { string } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates the appProvisionType of the application * @@ -787,17 +677,6 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ - /** - * Indicates whether the application is a system application - * - * @type { boolean } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates whether the application is a system application * @@ -848,17 +727,6 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ - /** - * Indicates whether the application is in debug mode. - * - * @type { boolean } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates whether the application is in debug mode. * @@ -881,17 +749,6 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ - /** - * Indicates whether the application data is unclearable, that is, whether the application data cannot be cleared. - * - * @type { boolean } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates whether the application data is unclearable, that is, whether the application data cannot be cleared. * @@ -913,16 +770,6 @@ export interface ApplicationInfo { * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since 12 */ - /** - * Indicates native library path. - * - * @type { string } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @since 20 - * @since 12 - */ /** * Indicates native library path. * @@ -949,13 +796,13 @@ export interface ApplicationInfo { /** * Indicates the index of the bundle * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: int; + readonly appIndex: number; /** * Indicates sources to install the app @@ -978,17 +825,6 @@ export interface ApplicationInfo { * @atomicservice * @since 12 */ - /** - * Indicates the release type of the app - * - * @type { string } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 12 - */ /** * Indicates the release type of the app * @@ -1017,14 +853,14 @@ export interface ApplicationInfo { /** * Indicates the flags of the application. * - * @type { ?int } + * @type { ?number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly flags?: int; + readonly flags?: number; } /** @@ -1042,16 +878,6 @@ export interface ApplicationInfo { * @atomicservice * @since 11 */ -/** - * Indicates the ModuleMetadata - * - * @typedef ModuleMetadata - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates the ModuleMetadata * @@ -1080,17 +906,6 @@ export interface ModuleMetadata { * @atomicservice * @since 11 */ - /** - * Indicates the name of this hap module - * - * @type { string } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates the name of this hap module * @@ -1121,17 +936,6 @@ export interface ModuleMetadata { * @atomicservice * @since 11 */ - /** - * Indicates the metadata of this hap module - * - * @type { Array } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates the metadata of this hap module * @@ -1169,13 +973,13 @@ export interface MultiAppMode { /** * Indicates the max count of the bundle * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly maxCount: int; + readonly maxCount: number; } /** @@ -1216,24 +1020,24 @@ export interface PreinstalledApplicationInfo { /** * Indicates the icon id of the application * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: long; + readonly iconId: number; /** * Indicates the label id of the application * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: long; + readonly labelId: number; } \ No newline at end of file diff --git a/api/bundleManager/BundleInfo.d.ts b/api/bundleManager/BundleInfo.d.ts index 2c5a9b68b0..caf837e08e 100644 --- a/api/bundleManager/BundleInfo.d.ts +++ b/api/bundleManager/BundleInfo.d.ts @@ -37,16 +37,6 @@ import bundleManager from './../@ohos.bundle.bundleManager'; * @atomicservice * @since 11 */ -/** - * Obtains configuration information about a bundle - * - * @typedef BundleInfo - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Obtains configuration information about a bundle * @@ -75,17 +65,6 @@ export interface BundleInfo { * @atomicservice * @since 11 */ - /** - * Indicates the name of this bundle - * - * @type { string } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates the name of this bundle * @@ -116,17 +95,6 @@ export interface BundleInfo { * @atomicservice * @since 11 */ - /** - * Indicates the bundle vendor - * - * @type { string } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates the bundle vendor * @@ -168,7 +136,7 @@ export interface BundleInfo { * @since 20 * @arkts 1.1&1.2 */ - readonly versionCode: long; + readonly versionCode: number; /** * Indicates the version name of the bundle @@ -187,17 +155,6 @@ export interface BundleInfo { * @atomicservice * @since 11 */ - /** - * Indicates the version name of the bundle - * - * @type { string } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates the version name of the bundle * @@ -239,7 +196,7 @@ export interface BundleInfo { * @since 20 * @arkts 1.1&1.2 */ - readonly minCompatibleVersionCode: int; + readonly minCompatibleVersionCode: number; /** * Indicates the target version number of the bundle @@ -269,7 +226,7 @@ export interface BundleInfo { * @since 20 * @arkts 1.1&1.2 */ - readonly targetVersion: int; + readonly targetVersion: number; /** * Obtains configuration information about an application @@ -288,17 +245,6 @@ export interface BundleInfo { * @atomicservice * @since 11 */ - /** - * Obtains configuration information about an application - * - * @type { ApplicationInfo } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Obtains configuration information about an application * @@ -329,17 +275,6 @@ export interface BundleInfo { * @atomicservice * @since 11 */ - /** - * Obtains configuration information about a module - * - * @type { Array } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Obtains configuration information about a module * @@ -370,17 +305,6 @@ export interface BundleInfo { * @atomicservice * @since 11 */ - /** - * Indicates the required permissions details defined in the bundle - * - * @type { Array } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates the required permissions details defined in the bundle * @@ -411,17 +335,6 @@ export interface BundleInfo { * @atomicservice * @since 11 */ - /** - * Indicates the grant state of required permissions - * - * @type { Array } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates the grant state of required permissions * @@ -452,17 +365,6 @@ export interface BundleInfo { * @atomicservice * @since 11 */ - /** - * Indicates the SignatureInfo of the bundle - * - * @type { SignatureInfo } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates the SignatureInfo of the bundle * @@ -487,14 +389,14 @@ export interface BundleInfo { /** * Indicates the hap install time * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly installTime: long; + readonly installTime: number; /** * Indicates the hap update time @@ -507,14 +409,14 @@ export interface BundleInfo { /** * Indicates the hap update time * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly updateTime: long; + readonly updateTime: number; /** * Indicates the router information of the application @@ -531,25 +433,25 @@ export interface BundleInfo { /** * Indicates the appIndex of application, only work in appClone mode * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: int; + readonly appIndex: number; /** * Indicates the hap first install time * - * @type { ?long } + * @type { ?number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly firstInstallTime?: long; + readonly firstInstallTime?: number; } /** @@ -567,16 +469,6 @@ export interface BundleInfo { * @atomicservice * @since 11 */ -/** - * Indicates the required permissions details defined in configuration file - * - * @typedef ReqPermissionDetail - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates the required permissions details defined in configuration file * @@ -603,16 +495,6 @@ export interface ReqPermissionDetail { * @atomicservice * @since 11 */ - /** - * Indicates the name of this required permissions - * - * @type { string } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates the name of this required permissions * @@ -658,16 +540,6 @@ export interface ReqPermissionDetail { * @atomicservice * @since 11 */ - /** - * Indicates the reason of this required permissions - * - * @type { string } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates the reason of this required permissions * @@ -705,7 +577,7 @@ export interface ReqPermissionDetail { * @since 20 * @arkts 1.1&1.2 */ - reasonId: long; + reasonId: number; /** * Indicates the used scene of this required permissions @@ -722,16 +594,6 @@ export interface ReqPermissionDetail { * @atomicservice * @since 11 */ - /** - * Indicates the used scene of this required permissions - * - * @type { UsedScene } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates the used scene of this required permissions * @@ -760,16 +622,6 @@ export interface ReqPermissionDetail { * @atomicservice * @since 11 */ -/** - * The scene which is used - * - * @typedef UsedScene - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * The scene which is used * @@ -796,16 +648,6 @@ export interface UsedScene { * @atomicservice * @since 11 */ - /** - * Indicates the abilities that need the permission - * - * @type { Array } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates the abilities that need the permission * @@ -833,16 +675,6 @@ export interface UsedScene { * @atomicservice * @since 11 */ - /** - * Indicates the time when the permission is used - * - * @type { string } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates the time when the permission is used * @@ -871,16 +703,6 @@ export interface UsedScene { * @atomicservice * @since 11 */ -/** - * Indicates SignatureInfo - * - * @typedef SignatureInfo - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates SignatureInfo * @@ -911,18 +733,6 @@ export interface SignatureInfo { * @atomicservice * @since 11 */ - /** - * Indicates the ID of the application to which this bundle belongs - * The application ID uniquely identifies an application. It is determined by the bundle name and signature - * - * @type { string } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates the ID of the application to which this bundle belongs * The application ID uniquely identifies an application. It is determined by the bundle name and signature @@ -954,17 +764,6 @@ export interface SignatureInfo { * @atomicservice * @since 11 */ - /** - * Indicates the fingerprint of the certificate - * - * @type { string } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice - * @since 20 - * @since 11 - */ /** * Indicates the fingerprint of the certificate * @@ -1027,7 +826,7 @@ export interface AppCloneIdentity { /** * Indicates the index of clone app. * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'14', '1.2':'20'} diff --git a/api/bundleManager/BundlePackInfo.d.ts b/api/bundleManager/BundlePackInfo.d.ts index 60ea30db70..e8ea4a275c 100644 --- a/api/bundleManager/BundlePackInfo.d.ts +++ b/api/bundleManager/BundlePackInfo.d.ts @@ -479,14 +479,14 @@ export interface AbilityFormInfo { /** * Indicates the update duration * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly updateDuration: int; + readonly updateDuration: number; /** * Indicates the ability support dimensions @@ -526,14 +526,14 @@ export interface Version { /** * Indicates the min compatible code of this version * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly minCompatibleVersionCode: int; + readonly minCompatibleVersionCode: number; /** * Indicates the name of this version @@ -550,14 +550,14 @@ export interface Version { /** * Indicates the code of this version * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly code: int; + readonly code: number; } /** @@ -585,24 +585,24 @@ export interface ApiVersion { /** * Indicates the compatible version code of the api * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly compatible: int; + readonly compatible: number; /** * Indicates the target version code of the api * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly target: int; + readonly target: number; } diff --git a/api/bundleManager/BundleResourceInfo.d.ts b/api/bundleManager/BundleResourceInfo.d.ts index 3c597f5798..6952f3d65b 100644 --- a/api/bundleManager/BundleResourceInfo.d.ts +++ b/api/bundleManager/BundleResourceInfo.d.ts @@ -18,7 +18,9 @@ * @kit AbilityKit */ +/*** if arkts 1.1 */ import { DrawableDescriptor } from './../@ohos.arkui.drawableDescriptor'; +/*** endif */ /** * Obtains resource information about a bundle @@ -73,20 +75,19 @@ export interface BundleResourceInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ readonly drawableDescriptor: DrawableDescriptor; /** * Indicates the index of the bundle * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: int; + readonly appIndex: number; } diff --git a/api/bundleManager/ExtensionAbilityInfo.d.ts b/api/bundleManager/ExtensionAbilityInfo.d.ts index c4fb184a03..d863294176 100644 --- a/api/bundleManager/ExtensionAbilityInfo.d.ts +++ b/api/bundleManager/ExtensionAbilityInfo.d.ts @@ -111,14 +111,14 @@ export interface ExtensionAbilityInfo { /** * Indicates the label id of the extension ability info * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: long; + readonly labelId: number; /** * Indicates the description id of the extension ability info @@ -131,14 +131,14 @@ export interface ExtensionAbilityInfo { /** * Indicates the description id of the extension ability info * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly descriptionId: long; + readonly descriptionId: number; /** * Indicates the icon id of the extension ability info @@ -151,14 +151,14 @@ export interface ExtensionAbilityInfo { /** * Indicates the icon id of the extension ability info * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: long; + readonly iconId: number; /** * Indicates whether this ability can be called by other abilities @@ -347,11 +347,11 @@ export interface ExtensionAbilityInfo { /** * Indicates the appIndex of extension ability, only work in clone app mode * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: int; + readonly appIndex: number; } diff --git a/api/bundleManager/HapModuleInfo.d.ts b/api/bundleManager/HapModuleInfo.d.ts index d9f0e8db65..ae02a1d3b6 100644 --- a/api/bundleManager/HapModuleInfo.d.ts +++ b/api/bundleManager/HapModuleInfo.d.ts @@ -129,7 +129,7 @@ export interface HapModuleInfo { /** * Indicates the icon id of this hap module * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -137,7 +137,7 @@ export interface HapModuleInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: long; + readonly iconId: number; /** * Indicates the label of this hap module @@ -189,7 +189,7 @@ export interface HapModuleInfo { /** * Indicates the label id of this hap module * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -197,7 +197,7 @@ export interface HapModuleInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: long; + readonly labelId: number; /** * Describes the hap module @@ -249,7 +249,7 @@ export interface HapModuleInfo { /** * Indicates the description of this hap module * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @crossplatform @@ -257,7 +257,7 @@ export interface HapModuleInfo { * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly descriptionId: long; + readonly descriptionId: number; /** * Indicates main elementName of the hap module @@ -645,14 +645,14 @@ export interface Dependency { /** * Indicates the version code of the dependency * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly versionCode: long; + readonly versionCode: number; } /** diff --git a/api/bundleManager/LauncherAbilityInfo.d.ts b/api/bundleManager/LauncherAbilityInfo.d.ts index 22b5bb4319..de21df51c0 100644 --- a/api/bundleManager/LauncherAbilityInfo.d.ts +++ b/api/bundleManager/LauncherAbilityInfo.d.ts @@ -55,44 +55,44 @@ export interface LauncherAbilityInfo { /** * Obtains labelId about an launcher ability. * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: long; + readonly labelId: number; /** * Obtains iconId about an launcher ability. * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: long; + readonly iconId: number; /** * Obtains userId about an launcher ability. * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly userId: int; + readonly userId: number; /** * Obtains installTime about an launcher ability. * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Launcher * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly installTime: long; + readonly installTime: number; } diff --git a/api/bundleManager/LauncherAbilityResourceInfo.d.ts b/api/bundleManager/LauncherAbilityResourceInfo.d.ts index 930c593c6f..bd303e501a 100644 --- a/api/bundleManager/LauncherAbilityResourceInfo.d.ts +++ b/api/bundleManager/LauncherAbilityResourceInfo.d.ts @@ -18,7 +18,9 @@ * @kit AbilityKit */ +/*** if arkts 1.1 */ import { DrawableDescriptor } from './../@ohos.arkui.drawableDescriptor'; +/*** endif */ /** * Obtains resource information about a launcher ability @@ -97,20 +99,19 @@ export interface LauncherAbilityResourceInfo { * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ readonly drawableDescriptor: DrawableDescriptor; /** * Indicates the index of the bundle * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Resource * @systemapi * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly appIndex: int; + readonly appIndex: number; } diff --git a/api/bundleManager/Metadata.d.ts b/api/bundleManager/Metadata.d.ts index 86afd3775a..a4886fcb1b 100644 --- a/api/bundleManager/Metadata.d.ts +++ b/api/bundleManager/Metadata.d.ts @@ -128,12 +128,12 @@ export interface Metadata { /** * Indicates the value id of the metadata * - * @type { ?long } + * @type { ?number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'18', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly valueId?: long; + readonly valueId?: number; } diff --git a/api/bundleManager/OverlayModuleInfo.d.ts b/api/bundleManager/OverlayModuleInfo.d.ts index 1c9f680376..aa2b660c73 100644 --- a/api/bundleManager/OverlayModuleInfo.d.ts +++ b/api/bundleManager/OverlayModuleInfo.d.ts @@ -63,22 +63,22 @@ export interface OverlayModuleInfo { /** * Indicates the priority of the overlay module * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly priority: int; + readonly priority: number; /** * Indicates the state of the overlay module * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly state: int; + readonly state: number; } diff --git a/api/bundleManager/PermissionDef.d.ts b/api/bundleManager/PermissionDef.d.ts index 8b7847b0b5..4b93792ec6 100644 --- a/api/bundleManager/PermissionDef.d.ts +++ b/api/bundleManager/PermissionDef.d.ts @@ -43,36 +43,36 @@ export interface PermissionDef { /** * Indicates the grant mode of this permission * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly grantMode: int; + readonly grantMode: number; /** * Indicates the labelId of this permission * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: long; + readonly labelId: number; /** * Indicates the descriptionId of this permission * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly descriptionId: long; + readonly descriptionId: number; } diff --git a/api/bundleManager/PluginBundleInfo.d.ts b/api/bundleManager/PluginBundleInfo.d.ts index c92159c05c..40933b54af 100644 --- a/api/bundleManager/PluginBundleInfo.d.ts +++ b/api/bundleManager/PluginBundleInfo.d.ts @@ -43,14 +43,14 @@ export interface PluginBundleInfo { /** * Indicates the label id of the plugin * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'19', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: long; + readonly labelId: number; /** * Indicates the icon of the plugin @@ -67,14 +67,14 @@ export interface PluginBundleInfo { /** * Indicates the icon id of the plugin * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'19', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: long; + readonly iconId: number; /** * Indicates the name of the plugin @@ -91,14 +91,14 @@ export interface PluginBundleInfo { /** * Indicates the version code of the plugin * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'19', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly versionCode: long; + readonly versionCode: number; /** * Indicates the version name of the plugin @@ -150,14 +150,14 @@ export interface PluginModuleInfo { /** * Indicates the description of the plugin * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'19', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly descriptionId: long; + readonly descriptionId: number; /** * Describes the plugin diff --git a/api/bundleManager/RecoverableApplicationInfo.d.ts b/api/bundleManager/RecoverableApplicationInfo.d.ts index 144d484710..29b78aed38 100644 --- a/api/bundleManager/RecoverableApplicationInfo.d.ts +++ b/api/bundleManager/RecoverableApplicationInfo.d.ts @@ -57,26 +57,26 @@ export interface RecoverableApplicationInfo { /** * Indicates the label id * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly labelId: long; + readonly labelId: number; /** * Indicates the icon id * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly iconId: long; + readonly iconId: number; /** * Indicates whether the application is a system application diff --git a/api/bundleManager/SharedBundleInfo.d.ts b/api/bundleManager/SharedBundleInfo.d.ts index e5ce19fffe..4065fc3925 100644 --- a/api/bundleManager/SharedBundleInfo.d.ts +++ b/api/bundleManager/SharedBundleInfo.d.ts @@ -93,14 +93,14 @@ export interface SharedModuleInfo { /** * Indicates the version code of the shared module * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly versionCode: long; + readonly versionCode: number; /** * Indicates the version name of the shared module @@ -129,12 +129,12 @@ export interface SharedModuleInfo { /** * Indicates the description of this shared module * - * @type { long } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @systemapi * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly descriptionId: long; + readonly descriptionId: number; } diff --git a/api/bundleManager/ShortcutInfo.d.ts b/api/bundleManager/ShortcutInfo.d.ts index d50ec155b1..c4c0b8fb9f 100644 --- a/api/bundleManager/ShortcutInfo.d.ts +++ b/api/bundleManager/ShortcutInfo.d.ts @@ -26,14 +26,6 @@ * @systemapi * @since 9 */ -/** - * Provides information about a shortcut, including the shortcut ID and label. - * - * @typedef ShortcutInfo - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 20 - * @since 9 - */ /** * Provides information about a shortcut, including the shortcut ID and label. * @@ -60,14 +52,6 @@ export interface ShortcutInfo { * @systemapi * @since 12 */ - /** - * Indicates the ID of the application to which this shortcut belongs - * - * @type { string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 20 - * @since 12 - */ /** * Indicates the ID of the application to which this shortcut belongs * @@ -95,14 +79,6 @@ export interface ShortcutInfo { * @systemapi * @since 12 */ - /** - * Indicates the name of the bundle containing the shortcut - * - * @type { string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 20 - * @since 12 - */ /** * Indicates the name of the bundle containing the shortcut * @@ -130,14 +106,6 @@ export interface ShortcutInfo { * @systemapi * @since 12 */ - /** - * Indicates the moduleName of the shortcut - * - * @type { ?string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 20 - * @since 12 - */ /** * Indicates the moduleName of the shortcut * @@ -165,14 +133,6 @@ export interface ShortcutInfo { * @systemapi * @since 12 */ - /** - * Indicates the host ability of the shortcut - * - * @type { ?string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 20 - * @since 12 - */ /** * Indicates the host ability of the shortcut * @@ -200,14 +160,6 @@ export interface ShortcutInfo { * @systemapi * @since 12 */ - /** - * Indicates the icon of the shortcut - * - * @type { ?string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 20 - * @since 12 - */ /** * Indicates the icon of the shortcut * @@ -243,7 +195,7 @@ export interface ShortcutInfo { * @since 20 * @arkts 1.1&1.2 */ - iconId?: long; + iconId?: number; /** * Indicates the label of the shortcut @@ -262,14 +214,6 @@ export interface ShortcutInfo { * @systemapi * @since 12 */ - /** - * Indicates the label of the shortcut - * - * @type { ?string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 20 - * @since 12 - */ /** * Indicates the label of the shortcut * @@ -305,7 +249,7 @@ export interface ShortcutInfo { * @since 20 * @arkts 1.1&1.2 */ - labelId?: long; + labelId?: number; /** * Indicates the wants of the shortcut @@ -324,14 +268,6 @@ export interface ShortcutInfo { * @systemapi * @since 12 */ - /** - * Indicates the wants of the shortcut - * - * @type { ?Array } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 20 - * @since 12 - */ /** * Indicates the wants of the shortcut * @@ -358,7 +294,7 @@ export interface ShortcutInfo { * @since 20 * @arkts 1.1&1.2 */ - appIndex: int; + appIndex: number; /** * Indicates the source type of shortcut. @@ -396,14 +332,6 @@ export interface ShortcutInfo { * @systemapi * @since 9 */ -/** - * Obtains information about the ability that a shortcut will start. - * - * @typedef ShortcutWant - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 20 - * @since 9 - */ /** * Obtains information about the ability that a shortcut will start. * @@ -430,14 +358,6 @@ export interface ShortcutWant { * @systemapi * @since 12 */ - /** - * Indicates the target bundle of the shortcut want - * - * @type { string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 20 - * @since 12 - */ /** * Indicates the target bundle of the shortcut want * @@ -465,14 +385,6 @@ export interface ShortcutWant { * @systemapi * @since 12 */ - /** - * Indicates the target module of the shortcut want - * - * @type { ?string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 20 - * @since 12 - */ /** * Indicates the target module of the shortcut want * @@ -500,14 +412,6 @@ export interface ShortcutWant { * @systemapi * @since 12 */ - /** - * Indicates the target ability of the shortcut want - * - * @type { string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 20 - * @since 12 - */ /** * Indicates the target ability of the shortcut want * @@ -526,14 +430,6 @@ export interface ShortcutWant { * @systemapi * @since 12 */ - /** - * Indicates the parameters of the shortcut want - * - * @type { ?Array } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 20 - * @since 12 - */ /** * Indicates the parameters of the shortcut want * @@ -553,14 +449,6 @@ export interface ShortcutWant { * @systemapi * @since 12 */ -/** - * Obtains information about the ability that a shortcut will start. - * - * @typedef ParameterItem - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 20 - * @since 12 - */ /** * Obtains information about the ability that a shortcut will start. * @@ -578,14 +466,6 @@ export interface ParameterItem { * @systemapi * @since 12 */ - /** - * Indicates the key of the parameter item. - * - * @type { string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 20 - * @since 12 - */ /** * Indicates the key of the parameter item. * @@ -604,14 +484,6 @@ export interface ParameterItem { * @systemapi * @since 12 */ - /** - * Indicates the value of the parameter item. - * - * @type { string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since 20 - * @since 12 - */ /** * Indicates the value of the parameter item. * diff --git a/api/bundleManager/Skill.d.ts b/api/bundleManager/Skill.d.ts index ddaedcf470..7e09ec6787 100644 --- a/api/bundleManager/Skill.d.ts +++ b/api/bundleManager/Skill.d.ts @@ -114,14 +114,14 @@ export interface SkillUri { /** * Indicates the port of the skillUri * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly port: int; + readonly port: number; /** * Indicates the path of the skillUri @@ -186,14 +186,14 @@ export interface SkillUri { /** * Indicates the maxFileSupported of the skillUri * - * @type { int } + * @type { number } * @readonly * @syscap SystemCapability.BundleManager.BundleFramework.Core * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} * @arkts 1.1&1.2 */ - readonly maxFileSupported: int; + readonly maxFileSupported: number; /** * Indicates the linkFeature of the skillUri diff --git a/api/commonEvent/commonEventSubscriber.d.ts b/api/commonEvent/commonEventSubscriber.d.ts index f7b224426f..eb2f3d03c8 100644 --- a/api/commonEvent/commonEventSubscriber.d.ts +++ b/api/commonEvent/commonEventSubscriber.d.ts @@ -57,8 +57,6 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 */ getCode(callback: AsyncCallback): void; @@ -77,8 +75,6 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 */ getCode(): Promise; @@ -97,8 +93,6 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 */ getCodeSync(): number; @@ -123,8 +117,6 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 */ setCode(code: number, callback: AsyncCallback): void; @@ -149,8 +141,6 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 */ setCode(code: number): Promise; @@ -173,8 +163,6 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 */ setCodeSync(code: number): void; @@ -197,8 +185,6 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 */ getData(callback: AsyncCallback): void; @@ -217,8 +203,6 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 */ getData(): Promise; @@ -237,8 +221,6 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 */ getDataSync(): string; @@ -263,8 +245,6 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 */ setData(data: string, callback: AsyncCallback): void; @@ -289,8 +269,6 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 */ setData(data: string): Promise; @@ -313,8 +291,6 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 */ setDataSync(data: string): void; @@ -341,8 +317,6 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 */ setCodeAndData(code: number, data: string, callback: AsyncCallback): void; @@ -369,8 +343,6 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 */ setCodeAndData(code: number, data: string): Promise; @@ -395,8 +367,6 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 */ setCodeAndDataSync(code: number, data: string): void; @@ -409,8 +379,6 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 */ isOrderedCommonEvent(callback: AsyncCallback): void; @@ -421,8 +389,6 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 */ isOrderedCommonEvent(): Promise; @@ -433,8 +399,6 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 */ isOrderedCommonEventSync(): boolean; @@ -447,8 +411,6 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 */ isStickyCommonEvent(callback: AsyncCallback): void; @@ -459,8 +421,6 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 */ isStickyCommonEvent(): Promise; @@ -471,8 +431,6 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 */ isStickyCommonEventSync(): boolean; @@ -485,8 +443,6 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 */ abortCommonEvent(callback: AsyncCallback): void; @@ -497,8 +453,6 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 */ abortCommonEvent(): Promise; @@ -508,8 +462,6 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 */ abortCommonEventSync(): void; @@ -522,8 +474,6 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 */ clearAbortCommonEvent(callback: AsyncCallback): void; @@ -534,8 +484,6 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 */ clearAbortCommonEvent(): Promise; @@ -545,8 +493,6 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 */ clearAbortCommonEventSync(): void; @@ -559,8 +505,6 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 */ getAbortCommonEvent(callback: AsyncCallback): void; @@ -571,8 +515,6 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'7', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 */ getAbortCommonEvent(): Promise; @@ -583,8 +525,6 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'10', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 */ getAbortCommonEventSync(): boolean; @@ -608,8 +548,6 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 */ getSubscribeInfo(callback: AsyncCallback): void; @@ -629,8 +567,6 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 */ getSubscribeInfo(): Promise; @@ -649,8 +585,6 @@ export interface CommonEventSubscriber { * @atomicservice * @since arkts {'1.1':'11', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 */ getSubscribeInfoSync(): CommonEventSubscribeInfo; @@ -663,8 +597,6 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 */ finishCommonEvent(callback: AsyncCallback): void; @@ -675,8 +607,6 @@ export interface CommonEventSubscriber { * @syscap SystemCapability.Notification.CommonEvent * @since arkts {'1.1':'9', '1.2':'20'} * @arkts 1.1&1.2 - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 */ finishCommonEvent(): Promise; } diff --git a/api/device-define/wearable.json b/api/device-define/wearable.json index 3b3b9ff873..a511203b64 100644 --- a/api/device-define/wearable.json +++ b/api/device-define/wearable.json @@ -187,7 +187,6 @@ "SystemCapability.Location.Location.Core", "SystemCapability.Location.Location.Gnss", "SystemCapability.Test.UiTest", - "SystemCapability.Resourceschedule.BackgroundProcessManager", - "SystemCapability.MultimodalAwareness.RoomLocation" + "SystemCapability.Resourceschedule.BackgroundProcessManager" ] } diff --git a/api/global/rawFileDescriptor.d.ts b/api/global/rawFileDescriptor.d.ts index 8a85921c4f..76d4c8959d 100644 --- a/api/global/rawFileDescriptor.d.ts +++ b/api/global/rawFileDescriptor.d.ts @@ -16,6 +16,7 @@ /** * @file * @kit LocalizationKit + * @arkts 1.1&1.2 */ /** @@ -41,7 +42,6 @@ * @crossplatform * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 */ export interface RawFileDescriptor { /** @@ -65,7 +65,6 @@ export interface RawFileDescriptor { * @crossplatform * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 */ fd: number; @@ -90,7 +89,6 @@ export interface RawFileDescriptor { * @crossplatform * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 */ offset: number; @@ -115,7 +113,6 @@ export interface RawFileDescriptor { * @crossplatform * @atomicservice * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 */ length: number; } \ No newline at end of file diff --git a/api/global/resource.d.ts b/api/global/resource.d.ts index b516c1d9a5..bb8beb45be 100644 --- a/api/global/resource.d.ts +++ b/api/global/resource.d.ts @@ -111,7 +111,6 @@ export interface Resource { * @type { ?any[] } * @syscap SystemCapability.Global.ResourceManager * @since 9 - * @since 9 */ /** @@ -131,7 +130,6 @@ export interface Resource { * @type { ?number } * @syscap SystemCapability.Global.ResourceManager * @since 9 - * @since 9 */ /** * Set type. diff --git a/api/multimedia/soundPool.d.ts b/api/multimedia/soundPool.d.ts index b46cddf94f..63d9baad36 100644 --- a/api/multimedia/soundPool.d.ts +++ b/api/multimedia/soundPool.d.ts @@ -103,22 +103,18 @@ export interface PlayParameters { * The default value is **0**, indicating that the content is played only once. * * @type { ?number } - * @type { ?number } * @syscap SystemCapability.Multimedia.Media.SoundPool * @since 10 */ loop?: number; - loop?: number; /** * Playback rate. For details, see [AudioRendererRate]{@link #audio.AudioRendererRate}. Default value: **0**. * * @type { ?number } - * @type { ?number } * @syscap SystemCapability.Multimedia.Media.SoundPool * @since 10 */ rate?: number; - rate?: number; /** * Volume of the left channel. The value ranges from 0.0 to 1.0. Default value: **1.0**. * @@ -141,12 +137,10 @@ export interface PlayParameters { * The value is an integer greater than or equal to 0. Default value: **0**. * * @type { ?number } - * @type { ?number } * @syscap SystemCapability.Multimedia.Media.SoundPool * @since 10 */ priority?: number; - priority?: number; /** * Whether the sound can be played in parallel with other active audio streams. The value **true** means that the * sound can be played in parallel with other active audio streams, without preempting the audio focus, @@ -181,7 +175,7 @@ export interface PlayParameters { * @syscap SystemCapability.Multimedia.Media.SoundPool * @since 10 */ -export declare interface SoundPool { +export interface SoundPool { /** * Loads a sound. This API uses an asynchronous callback to obtain the sound ID. * The input parameter **uri** is a string starting with fd://, which is generated based on the file descriptor (FD) @@ -230,7 +224,6 @@ export declare interface SoundPool { * @since 10 */ load(uri: string): Promise; - load(uri: string): Promise; /** * Loads a sound. This API uses an asynchronous callback to obtain the sound ID. The input parameter **fd** can be * manually input or automatically obtained by reading the embedded resource of the application. @@ -257,7 +250,6 @@ export declare interface SoundPool { * @since 10 */ load(fd: number, offset: number, length: number, callback: AsyncCallback): void; - load(fd: number, offset: number, length: number, callback: AsyncCallback): void; /** * Loads a sound. This API uses a promise to obtain the sound ID. The input parameter **fd** can be manually input or * automatically obtained by reading the embedded resource of the application. @@ -283,7 +275,6 @@ export declare interface SoundPool { * @since 10 */ load(fd: number, offset: number, length: number): Promise; - load(fd: number, offset: number, length: number): Promise; /** * Plays a sound. This API uses an asynchronous callback to obtain the audio stream ID. * @@ -299,7 +290,6 @@ export declare interface SoundPool { * @since 10 */ play(soundID: number, params: PlayParameters, callback: AsyncCallback): void; - play(soundID: number, params: PlayParameters, callback: AsyncCallback): void; /** * Plays a sound. This API uses an asynchronous callback to obtain the audio stream ID. * @@ -314,7 +304,6 @@ export declare interface SoundPool { * @since 10 */ play(soundID: number, callback: AsyncCallback): void; - play(soundID: number, callback: AsyncCallback): void; /** * Plays a sound. This API uses a promise to obtain the audio stream ID. * @@ -329,7 +318,6 @@ export declare interface SoundPool { * @since 10 */ play(soundID: number, params?: PlayParameters): Promise; - play(soundID: number, params?: PlayParameters): Promise; /** * Stops playing a sound. This API uses an asynchronous callback to return the result. * @@ -343,7 +331,6 @@ export declare interface SoundPool { * @since 10 */ stop(streamID: number, callback: AsyncCallback): void; - stop(streamID: number, callback: AsyncCallback): void; /** * Stops playing a sound. This API uses a promise to return the result. * @@ -357,7 +344,6 @@ export declare interface SoundPool { * @since 10 */ stop(streamID: number): Promise; - stop(streamID: number): Promise; /** * Sets the loop mode for an audio stream. This API uses an asynchronous callback to return the result. * @@ -374,11 +360,9 @@ export declare interface SoundPool { * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. * @throws { BusinessError } 5400105 - Service died. Return by callback. * @syscap SystemCapability.Multimedia.Media.SoundPool - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ setLoop(streamID: number, loop: number, callback: AsyncCallback): void; - setLoop(streamID: number, loop: number, callback: AsyncCallback): void; /** * Sets the loop mode for an audio stream. This API uses a promise to return the result. * @@ -395,11 +379,9 @@ export declare interface SoundPool { * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. * @throws { BusinessError } 5400105 - Service died. Return by promise. * @syscap SystemCapability.Multimedia.Media.SoundPool - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ setLoop(streamID: number, loop: number): Promise; - setLoop(streamID: number, loop: number): Promise; /** * Sets the priority for an audio stream. This API uses an asynchronous callback to return the result. * @@ -412,11 +394,9 @@ export declare interface SoundPool { * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. * @throws { BusinessError } 5400105 - Service died. Return by callback. * @syscap SystemCapability.Multimedia.Media.SoundPool - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ setPriority(streamID: number, priority: number, callback: AsyncCallback): void; - setPriority(streamID: number, priority: number, callback: AsyncCallback): void; /** * Sets the priority for an audio stream. This API uses a promise to return the result. * @@ -429,11 +409,9 @@ export declare interface SoundPool { * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. * @throws { BusinessError } 5400105 - Service died. Return by promise. * @syscap SystemCapability.Multimedia.Media.SoundPool - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ setPriority(streamID: number, priority: number): Promise; - setPriority(streamID: number, priority: number): Promise; /** * Sets the playback rate for an audio stream. This API uses an asynchronous callback to return the result. * @@ -448,7 +426,6 @@ export declare interface SoundPool { * @since 10 */ setRate(streamID: number, rate: audio.AudioRendererRate, callback: AsyncCallback): void; - setRate(streamID: number, rate: audio.AudioRendererRate, callback: AsyncCallback): void; /** * Sets the playback rate for an audio stream. This API uses a promise to return the result. * @@ -463,7 +440,6 @@ export declare interface SoundPool { * @since 10 */ setRate(streamID: number, rate: audio.AudioRendererRate): Promise; - setRate(streamID: number, rate: audio.AudioRendererRate): Promise; /** * Sets the volume for an audio stream. This API uses an asynchronous callback to return the result. * @@ -477,11 +453,9 @@ export declare interface SoundPool { * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. * @throws { BusinessError } 5400105 - Service died. Return by callback. * @syscap SystemCapability.Multimedia.Media.SoundPool - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ setVolume(streamID: number, leftVolume: number, rightVolume: number, callback: AsyncCallback): void; - setVolume(streamID: number, leftVolume: number, rightVolume: number, callback: AsyncCallback): void; /** * Sets the volume for an audio stream. This API uses a promise to return the result. * @@ -495,11 +469,9 @@ export declare interface SoundPool { * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. * @throws { BusinessError } 5400105 - Service died. Return by promise. * @syscap SystemCapability.Multimedia.Media.SoundPool - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ setVolume(streamID: number, leftVolume: number, rightVolume: number): Promise; - setVolume(streamID: number, leftVolume: number, rightVolume: number): Promise; /** * Unloads a sound. This API uses an asynchronous callback to return the result. * @@ -512,7 +484,6 @@ export declare interface SoundPool { * @since 10 */ unload(soundID: number, callback: AsyncCallback): void; - unload(soundID: number, callback: AsyncCallback): void; /** * Unloads a sound. This API uses a promise to return the result. * @@ -525,7 +496,6 @@ export declare interface SoundPool { * @since 10 */ unload(soundID: number): Promise; - unload(soundID: number): Promise; /** * Releases this **SoundPool** instance. This API uses an asynchronous callback to return the result. * diff --git a/api/notification/notificationSubscriber.d.ts b/api/notification/notificationSubscriber.d.ts index be346cfcbf..eae4b2f001 100644 --- a/api/notification/notificationSubscriber.d.ts +++ b/api/notification/notificationSubscriber.d.ts @@ -39,8 +39,7 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 7 */ onConsume?: (data: SubscribeCallbackData) => void; @@ -50,8 +49,7 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 7 */ onCancel?: (data: SubscribeCallbackData) => void; @@ -61,8 +59,7 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 7 */ onUpdate?: (data: NotificationSortingMap) => void; @@ -72,8 +69,7 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 7 */ onConnect?: () => void; @@ -83,8 +79,7 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 7 */ onDisconnect?: () => void; @@ -94,8 +89,7 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 7 */ onDestroy?: () => void; @@ -117,8 +111,7 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ onDoNotDisturbChanged?: (mode: notificationManager.DoNotDisturbDate) => void; @@ -128,8 +121,7 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 8 */ onEnabledNotificationChanged?: (callbackData: EnabledNotificationCallbackData) => void; @@ -139,8 +131,7 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 10 */ onBadgeChanged?: (data: BadgeNumberCallbackData) => void; @@ -150,8 +141,7 @@ export interface NotificationSubscriber { * @type { ?BadgeEnabledChangedCallback } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ onBadgeEnabledChanged?: BadgeEnabledChangedCallback; @@ -161,8 +151,7 @@ export interface NotificationSubscriber { * @type { ?function } * @syscap SystemCapability.Notification.Notification * @systemapi - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ onBatchCancel?: (data: Array) => void; } diff --git a/arkts/@arkts.collections.d.ets b/arkts/@arkts.collections.d.ets index 11b52769f0..f8127b775b 100644 --- a/arkts/@arkts.collections.d.ets +++ b/arkts/@arkts.collections.d.ets @@ -11971,22 +11971,30 @@ declare namespace collections { * @arkts 1.2 */ values(): IterableIterator; - /** * Returns the item at that index. * * @param { number } index - The zero-based index of the desired code unit. - * Throws error if index < 0 or index >= bitVector.length. - * @returns { number } The element in the bitVector matching the given index. - * @throws { BusinessError } 10200001 - The value of index is out of range. + * @returns { number } The element in the bitVector matching the given index. * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice * @since 20 * @arkts 1.2 */ - [index: number]: number; - + $_get(index: number): number; + /** + * Set the value of item at that index. + * + * @param { number } index - The index of the element to set. + * @param { number } value - The value to set at the specified index. + * @syscap SystemCapability.Utils.Lang + * @atomicservice + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + $_set(index: number, value: number): void; } /** diff --git a/arkts/@arkts.math.Decimal.d.ets b/arkts/@arkts.math.Decimal.d.ets index 8a3a362fa0..166fdaefd9 100644 --- a/arkts/@arkts.math.Decimal.d.ets +++ b/arkts/@arkts.math.Decimal.d.ets @@ -38,7 +38,6 @@ type Rounding = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8; /** * The type uesd to set rounding * - * @typedef { number } * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice @@ -74,14 +73,12 @@ type Modulo = Rounding | 9; /** * The type uesd to denote decimal value * - * @typedef { string | number | Decimal } * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice * @since 18 */ type Value = string | number | Decimal; -type Value = string | number | Decimal; /** * Provides configuration for decimal. @@ -342,23 +339,9 @@ declare class Decimal { * @crossplatform * @atomicservice * @since 18 - * @since 18 */ readonly e: number; - /** - * The number of decimal exponent. - * - * @type { number } - * @readonly - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - get e(): number; - /** * The number of decimal sign. * @@ -377,28 +360,13 @@ declare class Decimal { * @crossplatform * @atomicservice * @since 18 - * @since 18 */ readonly s: number; - /** - * The number of decimal sign. - * - * @type { number } - * @readonly - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - get s(): number; - /** * Return a new Decimal whose value is the absolute value of this Decimal. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; * 2. Parameter verification failed. @@ -410,7 +378,6 @@ declare class Decimal { * Return a new Decimal whose value is the absolute value of this Decimal. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; * 2. Parameter verification failed. @@ -420,7 +387,6 @@ declare class Decimal { * @since 18 */ constructor(n: Value); - constructor(n: Value); /** * Return a new Decimal whose value is the absolute value of this Decimal. @@ -508,8 +474,6 @@ declare class Decimal { * * @param { Value } min {number | string | Decimal} * @param { Value } max {number | string | Decimal} - * @param { Value } min {number | string | Decimal} - * @param { Value } max {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -525,8 +489,6 @@ declare class Decimal { * * @param { Value } min {number | string | Decimal} * @param { Value } max {number | string | Decimal} - * @param { Value } min {number | string | Decimal} - * @param { Value } max {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -538,14 +500,12 @@ declare class Decimal { * @since 18 */ clamp(min: Value, max: Value): Decimal; - clamp(min: Value, max: Value): Decimal; /** * Return a new Decimal whose value is the value of this Decimal plus `n`, rounded to `precision` * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -559,7 +519,6 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -570,14 +529,12 @@ declare class Decimal { * @since 18 */ add(n: Value): Decimal; - add(n: Value): Decimal; /** * Return a new Decimal whose value is the value of this Decimal minus `n`, rounded to `precision` * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -591,7 +548,6 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -599,18 +555,15 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ sub(n: Value): Decimal; - sub(n: Value): Decimal; /** * Return a new Decimal whose value is this Decimal times `n`, rounded to `precision` significant * digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -624,7 +577,6 @@ declare class Decimal { * digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -635,14 +587,12 @@ declare class Decimal { * @since 18 */ mul(n: Value): Decimal; - mul(n: Value): Decimal; /** * Return a new Decimal whose value is the value of this Decimal divided by `n`, rounded to * `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -656,7 +606,6 @@ declare class Decimal { * `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -664,18 +613,15 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ div(n: Value): Decimal; - div(n: Value): Decimal; /** * Return a new Decimal whose value is the value of this Decimal modulo `n`, rounded to * `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal }the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -689,7 +635,6 @@ declare class Decimal { * `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal }the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -697,11 +642,9 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ mod(n: Value): Decimal; - mod(n: Value): Decimal; /** * Return a new Decimal whose value is the square root of this Decimal, rounded to `precision` @@ -720,8 +663,7 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ sqrt(): Decimal; @@ -742,8 +684,7 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ cbrt(): Decimal; @@ -752,7 +693,6 @@ declare class Decimal { * to `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -767,7 +707,6 @@ declare class Decimal { * to `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -776,11 +715,9 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ pow(n: Value): Decimal; - pow(n: Value): Decimal; /** * Return a new Decimal whose value is the natural exponential of the value of this Decimal, @@ -803,8 +740,7 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ exp(): Decimal; @@ -813,7 +749,6 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -828,7 +763,6 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -837,11 +771,9 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ log(n: Value): Decimal; - log(n: Value): Decimal; /** * Return a new Decimal whose value is the natural logarithm of the value of this Decimal, @@ -862,8 +794,7 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ ln(): Decimal; @@ -882,8 +813,7 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ cos(): Decimal; @@ -902,8 +832,7 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ sin(): Decimal; @@ -922,8 +851,7 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ tan(): Decimal; @@ -944,8 +872,7 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ cosh(): Decimal; @@ -964,8 +891,7 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ sinh(): Decimal; @@ -984,8 +910,7 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ tanh(): Decimal; @@ -1006,8 +931,7 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ acos(): Decimal; @@ -1030,8 +954,7 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ asin(): Decimal; @@ -1052,8 +975,7 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ atan(): Decimal; @@ -1076,8 +998,7 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ acosh(): Decimal; @@ -1100,8 +1021,7 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ asinh(): Decimal; @@ -1124,8 +1044,7 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ atanh(): Decimal; @@ -1137,7 +1056,6 @@ declare class Decimal { * NaN if the value of either Decimal is NaN. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { number } the number type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1154,7 +1072,6 @@ declare class Decimal { * NaN if the value of either Decimal is NaN. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { number } the number type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1165,13 +1082,11 @@ declare class Decimal { * @since 18 */ comparedTo(n: Value): number; - comparedTo(n: Value): number; /** * Return true if the value of this Decimal is equal to the value of `n`, otherwise return false. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { boolean } the boolean type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1184,7 +1099,6 @@ declare class Decimal { * Return true if the value of this Decimal is equal to the value of `n`, otherwise return false. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { boolean } the boolean type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1195,13 +1109,11 @@ declare class Decimal { * @since 18 */ equals(n: Value): boolean; - equals(n: Value): boolean; /** * Return true if the value of this Decimal is greater than the value of `n`, otherwise return false. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { boolean } the boolean type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1214,7 +1126,6 @@ declare class Decimal { * Return true if the value of this Decimal is greater than the value of `n`, otherwise return false. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { boolean } the boolean type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1225,14 +1136,12 @@ declare class Decimal { * @since 18 */ greaterThan(n: Value): boolean; - greaterThan(n: Value): boolean; /** * Return true if the value of this Decimal is greater than or equal to the value of `n`, * otherwise return false. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { boolean } the boolean type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1246,7 +1155,6 @@ declare class Decimal { * otherwise return false. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { boolean } the boolean type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1257,13 +1165,11 @@ declare class Decimal { * @since 18 */ greaterThanOrEqualTo(n: Value): boolean; - greaterThanOrEqualTo(n: Value): boolean; /** * Return true if the value of this Decimal is less than `n`, otherwise return false. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { boolean } the boolean type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1276,7 +1182,6 @@ declare class Decimal { * Return true if the value of this Decimal is less than `n`, otherwise return false. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { boolean } the boolean type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1287,13 +1192,11 @@ declare class Decimal { * @since 18 */ lessThan(n: Value): boolean; - lessThan(n: Value): boolean; /** * Return true if the value of this Decimal is less than or equal to `n`, otherwise return false. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { boolean } the boolean type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1306,7 +1209,6 @@ declare class Decimal { * Return true if the value of this Decimal is less than or equal to `n`, otherwise return false. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { boolean } the boolean type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1317,7 +1219,6 @@ declare class Decimal { * @since 18 */ lessThanOrEqualTo(n: Value): boolean; - lessThanOrEqualTo(n: Value): boolean; /** * Return true if the value of this Decimal is a finite number, otherwise return false. @@ -1438,7 +1339,6 @@ declare class Decimal { * by the value of `n`, rounded to `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1452,7 +1352,6 @@ declare class Decimal { * by the value of `n`, rounded to `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1460,11 +1359,9 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ dividedToIntegerBy(n: Value): Decimal; - dividedToIntegerBy(n: Value): Decimal; /** * Return a new Decimal whose value is the value of this Decimal negated, i.e. as if multiplied by -1. @@ -1932,7 +1829,6 @@ declare class Decimal { * less than or equal to `max_denominator`. * * @param { Value } maxDenominator {number | string | Decimal} - * @param { Value } maxDenominator {number | string | Decimal} * @returns { Decimal[] } the Decimal[] type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1947,7 +1843,6 @@ declare class Decimal { * less than or equal to `max_denominator`. * * @param { Value } maxDenominator {number | string | Decimal} - * @param { Value } maxDenominator {number | string | Decimal} * @returns { Decimal[] } the Decimal[] type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1958,13 +1853,11 @@ declare class Decimal { * @since 18 */ toFraction(maxDenominator: Value): Decimal[]; - toFraction(maxDenominator: Value): Decimal[]; /** * Returns a new Decimal whose value is the nearest multiple of `n`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1977,7 +1870,6 @@ declare class Decimal { * Returns a new Decimal whose value is the nearest multiple of `n`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -1988,14 +1880,12 @@ declare class Decimal { * @since 18 */ toNearest(n: Value): Decimal; - toNearest(n: Value): Decimal; /** * Returns a new Decimal whose value is the nearest multiple of `n` in the direction of rounding * mode `rounding`, to the value of this Decimal. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @param { Rounding } rounding Rounding mode. Integer, 0 to 8 inclusive. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: @@ -2011,7 +1901,6 @@ declare class Decimal { * mode `rounding`, to the value of this Decimal. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @param { Rounding } rounding Rounding mode. Integer, 0 to 8 inclusive. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: @@ -2024,7 +1913,6 @@ declare class Decimal { * @since 18 */ toNearest(n: Value, rounding: Rounding): Decimal; - toNearest(n: Value, rounding: Rounding): Decimal; /** * Return a string representing the value of this Decimal. @@ -2263,8 +2151,7 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ precision(): number; @@ -2291,8 +2178,7 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ precision(includeZeros: boolean | number): number; @@ -2300,7 +2186,6 @@ declare class Decimal { * Return a new Decimal whose value is the absolute value of `n`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2314,7 +2199,6 @@ declare class Decimal { * Return a new Decimal whose value is the absolute value of `n`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2326,13 +2210,11 @@ declare class Decimal { * @since 18 */ static abs(n: Value): Decimal; - static abs(n: Value): Decimal; /** * Return a new Decimal whose value is `n` round to an integer using `ROUND_FLOOR`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2346,7 +2228,6 @@ declare class Decimal { * Return a new Decimal whose value is `n` round to an integer using `ROUND_FLOOR`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2358,13 +2239,11 @@ declare class Decimal { * @since 18 */ static floor(n: Value): Decimal; - static floor(n: Value): Decimal; /** * Return a new Decimal whose value is `n` rounded to an integer using `ROUND_CEIL`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2378,7 +2257,6 @@ declare class Decimal { * Return a new Decimal whose value is `n` rounded to an integer using `ROUND_CEIL`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2390,13 +2268,11 @@ declare class Decimal { * @since 18 */ static ceil(n: Value): Decimal; - static ceil(n: Value): Decimal; /** * Return a new Decimal whose value is `n` truncated to an integer. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2410,7 +2286,6 @@ declare class Decimal { * Return a new Decimal whose value is `n` truncated to an integer. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2422,7 +2297,6 @@ declare class Decimal { * @since 18 */ static trunc(n: Value): Decimal; - static trunc(n: Value): Decimal; /** * Return a new Decimal whose value is `n` clamped to the range delineated by `min` and `max`. @@ -2430,9 +2304,6 @@ declare class Decimal { * @param { Value } n {number | string | Decimal} * @param { Value } min {number | string | Decimal} * @param { Value } max {number | string | Decimal} - * @param { Value } n {number | string | Decimal} - * @param { Value } min {number | string | Decimal} - * @param { Value } max {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2449,9 +2320,6 @@ declare class Decimal { * @param { Value } n {number | string | Decimal} * @param { Value } min {number | string | Decimal} * @param { Value } max {number | string | Decimal} - * @param { Value } n {number | string | Decimal} - * @param { Value } min {number | string | Decimal} - * @param { Value } max {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2464,7 +2332,6 @@ declare class Decimal { * @since 18 */ static clamp(n: Value, min: Value, max: Value): Decimal; - static clamp(n: Value, min: Value, max: Value): Decimal; /** * Return a new Decimal whose value is the sum of `x` and `y`, rounded to `precision` significant @@ -2472,8 +2339,6 @@ declare class Decimal { * * @param { Value } x {number | string | Decimal} * @param { Value } y {number | string | Decimal} - * @param { Value } x {number | string | Decimal} - * @param { Value } y {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2489,8 +2354,6 @@ declare class Decimal { * * @param { Value } x {number | string | Decimal} * @param { Value } y {number | string | Decimal} - * @param { Value } x {number | string | Decimal} - * @param { Value } y {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2502,7 +2365,6 @@ declare class Decimal { * @since 18 */ static add(x: Value, y: Value): Decimal; - static add(x: Value, y: Value): Decimal; /** * Return a new Decimal whose value is the sum of the arguments, rounded to `precision` @@ -2511,7 +2373,6 @@ declare class Decimal { * Only the result is rounded, not the intermediate calculations. * * @param { Value[] } n {number | string | Decimal} - * @param { Value[] } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2528,7 +2389,6 @@ declare class Decimal { * Only the result is rounded, not the intermediate calculations. * * @param { Value[] } n {number | string | Decimal} - * @param { Value[] } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2540,7 +2400,6 @@ declare class Decimal { * @since 18 */ static sum(...n: Value[]): Decimal; - static sum(...n: Value[]): Decimal; /** * Return a new Decimal whose value is `x` minus `y`, rounded to `precision` significant digits @@ -2548,8 +2407,6 @@ declare class Decimal { * * @param { Value } x {number | string | Decimal} * @param { Value } y {number | string | Decimal} - * @param { Value } x {number | string | Decimal} - * @param { Value } y {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2565,8 +2422,6 @@ declare class Decimal { * * @param { Value } x {number | string | Decimal} * @param { Value } y {number | string | Decimal} - * @param { Value } x {number | string | Decimal} - * @param { Value } y {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2578,7 +2433,6 @@ declare class Decimal { * @since 18 */ static sub(x: Value, y: Value): Decimal; - static sub(x: Value, y: Value): Decimal; /** * Return a new Decimal whose value is `x` multiplied by `y`, rounded to `precision` significant @@ -2586,8 +2440,6 @@ declare class Decimal { * * @param { Value } x {number | string | Decimal} * @param { Value } y {number | string | Decimal} - * @param { Value } x {number | string | Decimal} - * @param { Value } y {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2603,8 +2455,6 @@ declare class Decimal { * * @param { Value } x {number | string | Decimal} * @param { Value } y {number | string | Decimal} - * @param { Value } x {number | string | Decimal} - * @param { Value } y {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2616,7 +2466,6 @@ declare class Decimal { * @since 18 */ static mul(x: Value, y: Value): Decimal; - static mul(x: Value, y: Value): Decimal; /** * Return a new Decimal whose value is `x` divided by `y`, rounded to `precision` significant @@ -2624,8 +2473,6 @@ declare class Decimal { * * @param { Value } x {number | string | Decimal} * @param { Value } y {number | string | Decimal} - * @param { Value } x {number | string | Decimal} - * @param { Value } y {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2641,8 +2488,6 @@ declare class Decimal { * * @param { Value } x {number | string | Decimal} * @param { Value } y {number | string | Decimal} - * @param { Value } x {number | string | Decimal} - * @param { Value } y {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2651,11 +2496,9 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static div(x: Value, y: Value): Decimal; - static div(x: Value, y: Value): Decimal; /** * Return a new Decimal whose value is `x` modulo `y`, rounded to `precision` significant digits @@ -2663,8 +2506,6 @@ declare class Decimal { * * @param { Value } x {number | string | Decimal} * @param { Value } y {number | string | Decimal} - * @param { Value } x {number | string | Decimal} - * @param { Value } y {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2680,8 +2521,6 @@ declare class Decimal { * * @param { Value } x {number | string | Decimal} * @param { Value } y {number | string | Decimal} - * @param { Value } x {number | string | Decimal} - * @param { Value } y {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2690,18 +2529,15 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static mod(x: Value, y: Value): Decimal; - static mod(x: Value, y: Value): Decimal; /** * Return a new Decimal whose value is the square root of `n`, rounded to `precision` significant * digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2716,7 +2552,6 @@ declare class Decimal { * digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2725,18 +2560,15 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static sqrt(n: Value): Decimal; - static sqrt(n: Value): Decimal; /** * Return a new Decimal whose value is the cube root of `n`, rounded to `precision` significant * digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2751,7 +2583,6 @@ declare class Decimal { * digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2760,11 +2591,9 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static cbrt(n: Value): Decimal; - static cbrt(n: Value): Decimal; /** * Return a new Decimal whose value is `base` raised to the power `exponent`, rounded to precision @@ -2772,8 +2601,6 @@ declare class Decimal { * * @param { Value } base {number | string | Decimal} The base. * @param { Value } exponent {number | string | Decimal} The exponent. - * @param { Value } base {number | string | Decimal} The base. - * @param { Value } exponent {number | string | Decimal} The exponent. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2790,8 +2617,6 @@ declare class Decimal { * * @param { Value } base {number | string | Decimal} The base. * @param { Value } exponent {number | string | Decimal} The exponent. - * @param { Value } base {number | string | Decimal} The base. - * @param { Value } exponent {number | string | Decimal} The exponent. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2801,18 +2626,15 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static pow(base: Value, exponent: Value): Decimal; - static pow(base: Value, exponent: Value): Decimal; /** * Return a new Decimal whose value is the natural exponential of `n`, rounded to `precision` * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2828,7 +2650,6 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2838,11 +2659,9 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static exp(n: Value): Decimal; - static exp(n: Value): Decimal; /** * Return a new Decimal whose value is the log of `n` to the base `base`, rounded to `precision` @@ -2850,8 +2669,6 @@ declare class Decimal { * * @param { Value } n {number | string | Decimal} * @param { Value } base {number | string | Decimal} - * @param { Value } n {number | string | Decimal} - * @param { Value } base {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2868,8 +2685,6 @@ declare class Decimal { * * @param { Value } n {number | string | Decimal} * @param { Value } base {number | string | Decimal} - * @param { Value } n {number | string | Decimal} - * @param { Value } base {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2879,18 +2694,15 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static log(n: Value, base: Value): Decimal; - static log(n: Value, base: Value): Decimal; /** * Return a new Decimal whose value is the natural logarithm of `n`, rounded to `precision` * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2906,7 +2718,6 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2916,18 +2727,15 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static ln(n: Value): Decimal; - static ln(n: Value): Decimal; /** * Return a new Decimal whose value is the base 2 logarithm of `n`, rounded to `precision` * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2943,7 +2751,6 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2953,18 +2760,15 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static log2(n: Value): Decimal; - static log2(n: Value): Decimal; /** * Return a new Decimal whose value is the base 10 logarithm of `n`, rounded to `precision` * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2980,7 +2784,6 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -2990,18 +2793,15 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static log10(n: Value): Decimal; - static log10(n: Value): Decimal; /** * Return a new Decimal whose value is the cosine of `n`, rounded to `precision` significant * digits using rounding mode `rounding` * * @param { Value } n {number | string | Decimal} A value in radians. - * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3016,7 +2816,6 @@ declare class Decimal { * digits using rounding mode `rounding` * * @param { Value } n {number | string | Decimal} A value in radians. - * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3025,18 +2824,15 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static cos(n: Value): Decimal; - static cos(n: Value): Decimal; /** * Return a new Decimal whose value is the sine of `n`, rounded to `precision` significant digits * using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. - * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3051,7 +2847,6 @@ declare class Decimal { * using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. - * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3060,18 +2855,15 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static sin(n: Value): Decimal; - static sin(n: Value): Decimal; /** * Return a new Decimal whose value is the tangent of `n`, rounded to `precision` significant * digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. - * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3086,7 +2878,6 @@ declare class Decimal { * digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. - * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3095,18 +2886,15 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static tan(n: Value): Decimal; - static tan(n: Value): Decimal; /** * Return a new Decimal whose value is the hyperbolic cosine of `n`, rounded to precision * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. - * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3121,7 +2909,6 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. - * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3130,18 +2917,15 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static cosh(n: Value): Decimal; - static cosh(n: Value): Decimal; /** * Return a new Decimal whose value is the hyperbolic sine of `n`, rounded to `precision` * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3156,7 +2940,6 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3165,18 +2948,15 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static sinh(n: Value): Decimal; - static sinh(n: Value): Decimal; /** * Return a new Decimal whose value is the hyperbolic tangent of `n`, rounded to `precision` * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. - * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3191,7 +2971,6 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. - * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3200,17 +2979,14 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static tanh(n: Value): Decimal; - static tanh(n: Value): Decimal; /** * Return a new Decimal whose value is the arccosine in radians of `n`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3225,7 +3001,6 @@ declare class Decimal { * Return a new Decimal whose value is the arccosine in radians of `n`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3235,18 +3010,15 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static acos(n: Value): Decimal; - static acos(n: Value): Decimal; /** * Return a new Decimal whose value is the arcsine in radians of `n`, rounded to `precision` * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3262,7 +3034,6 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3272,18 +3043,15 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static asin(n: Value): Decimal; - static asin(n: Value): Decimal; /** * Return a new Decimal whose value is the arctangent in radians of `n`, rounded to `precision` * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3299,7 +3067,6 @@ declare class Decimal { * significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3309,18 +3076,15 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static atan(n: Value): Decimal; - static atan(n: Value): Decimal; /** * Return a new Decimal whose value is the inverse of the hyperbolic cosine of `n`, rounded to * `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3336,7 +3100,6 @@ declare class Decimal { * `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3346,18 +3109,15 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static acosh(n: Value): Decimal; - static acosh(n: Value): Decimal; /** * Return a new Decimal whose value is the inverse of the hyperbolic sine of `n`, rounded to * `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. - * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3373,7 +3133,6 @@ declare class Decimal { * `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. - * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3383,18 +3142,15 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static asinh(n: Value): Decimal; - static asinh(n: Value): Decimal; /** * Return a new Decimal whose value is the inverse of the hyperbolic tangent of `n`, rounded to * `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. - * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3410,7 +3166,6 @@ declare class Decimal { * `precision` significant digits using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} A value in radians. - * @param { Value } n {number | string | Decimal} A value in radians. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3420,11 +3175,9 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static atanh(n: Value): Decimal; - static atanh(n: Value): Decimal; /** * Return a new Decimal whose value is the arctangent in radians of `y/x` in the range -pi to pi @@ -3432,8 +3185,6 @@ declare class Decimal { * * @param { Value } y {number | string | Decimal} The y-coordinate. * @param { Value } x {number | string | Decimal} The x-coordinate. - * @param { Value } y {number | string | Decimal} The y-coordinate. - * @param { Value } x {number | string | Decimal} The x-coordinate. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3450,8 +3201,6 @@ declare class Decimal { * * @param { Value } y {number | string | Decimal} The y-coordinate. * @param { Value } x {number | string | Decimal} The x-coordinate. - * @param { Value } y {number | string | Decimal} The y-coordinate. - * @param { Value } x {number | string | Decimal} The x-coordinate. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3461,18 +3210,15 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static atan2(y: Value, x: Value): Decimal; - static atan2(y: Value, x: Value): Decimal; /** * Return a new Decimal whose value is the square root of the sum of the squares of the arguments, * rounded to `precision` significant digits using rounding mode `rounding`. * * @param { Value[] } n {number | string | Decimal} Decimal - * @param { Value[] } n {number | string | Decimal} Decimal * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3487,7 +3233,6 @@ declare class Decimal { * rounded to `precision` significant digits using rounding mode `rounding`. * * @param { Value[] } n {number | string | Decimal} Decimal - * @param { Value[] } n {number | string | Decimal} Decimal * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3499,13 +3244,11 @@ declare class Decimal { * @since 18 */ static hypot(...n: Value[]): Decimal; - static hypot(...n: Value[]): Decimal; /** * Return a new Decimal whose value is the maximum of the arguments. * * @param { Value[] } n {number | string | Decimal} - * @param { Value[] } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3519,7 +3262,6 @@ declare class Decimal { * Return a new Decimal whose value is the maximum of the arguments. * * @param { Value[] } n {number | string | Decimal} - * @param { Value[] } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3531,13 +3273,11 @@ declare class Decimal { * @since 18 */ static max(...n: Value[]): Decimal; - static max(...n: Value[]): Decimal; /** * Return a new Decimal whose value is the minimum of the arguments. * * @param { Value[] } n {number | string | Decimal} - * @param { Value[] } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3551,7 +3291,6 @@ declare class Decimal { * Return a new Decimal whose value is the minimum of the arguments. * * @param { Value[] } n {number | string | Decimal} - * @param { Value[] } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3563,7 +3302,6 @@ declare class Decimal { * @since 18 */ static min(...n: Value[]): Decimal; - static min(...n: Value[]): Decimal; /** * Returns a new Decimal with a random value equal to or greater than 0 and less than 1. @@ -3593,7 +3331,6 @@ declare class Decimal { * `significantDigits` significant digits (or less if trailing zeros are produced). * * @param { Value } significantDigits {number} Significant digits. Integer, 0 to MAX_DIGITS inclusive. - * @param { Value } significantDigits {number} Significant digits. Integer, 0 to MAX_DIGITS inclusive. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3609,7 +3346,6 @@ declare class Decimal { * `significantDigits` significant digits (or less if trailing zeros are produced). * * @param { Value } significantDigits {number} Significant digits. Integer, 0 to MAX_DIGITS inclusive. - * @param { Value } significantDigits {number} Significant digits. Integer, 0 to MAX_DIGITS inclusive. * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3632,7 +3368,6 @@ declare class Decimal { * NaN otherwise * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3662,13 +3397,11 @@ declare class Decimal { * @since 18 */ static sign(n: Value): number; - static sign(n: Value): number; /** * Return a new Decimal whose value is `n` rounded to an integer using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3682,7 +3415,6 @@ declare class Decimal { * Return a new Decimal whose value is `n` rounded to an integer using rounding mode `rounding`. * * @param { Value } n {number | string | Decimal} - * @param { Value } n {number | string | Decimal} * @returns { Decimal } the Decimal type * @throws { BusinessError } 401 - Parameter error. Possible causes: * 1. Incorrect parameter types; @@ -3694,7 +3426,6 @@ declare class Decimal { * @since 18 */ static round(n: Value): Decimal; - static round(n: Value): Decimal; /** * Configures the 'global' settings for this particular Decimal constructor. @@ -3743,8 +3474,7 @@ declare class Decimal { * @syscap SystemCapability.Utils.Lang * @crossplatform * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 18 */ static set(config: DecimalConfig): void; diff --git a/diff.patch b/diff.patch deleted file mode 100644 index d1ada7da71..0000000000 --- a/diff.patch +++ /dev/null @@ -1,111883 +0,0 @@ -diff --git a/ CODEOWNERS b/ CODEOWNERS -new file mode 100644 -index 000000000..0865e7945 ---- /dev/null -+++ b/ CODEOWNERS -@@ -0,0 +1,36 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+[base api] -+api/@ohos.base.d.ets @majiajun518 -+api/@ohos.base.d.ts @majiajun518 -+ -+[通用模块] -+build-tools/ @wangcaoyu @txdyyangbo @wanghanghui @Gpangjiaxue -+BUILD.gn @wangcaoyu @txdyyangbo @wanghanghui @Gpangjiaxue -+bundle.json @wangcaoyu @txdyyangbo @wanghanghui @Gpangjiaxue -+exists_path.py @wangcaoyu @txdyyangbo @wanghanghui @Gpangjiaxue -+ohos_copy_ets.py @wangcaoyu @txdyyangbo @wanghanghui @Gpangjiaxue -+process_internal.py @wangcaoyu @txdyyangbo @wanghanghui @Gpangjiaxue -+ -+[API裁剪工具] -+build-tools/delete_systemapi_plugin.js @wangcaoyu -+ -+[API打包工具] -+build-tools/handleApiFiles.js @wangzhiyusss -+arkui_transformer.py -+ -+[int转number工具] -+build-tools/intToNumber.js @wangzhiyusss -diff --git a/BUILD.gn b/BUILD.gn -index e3e163856..c51605870 100644 ---- a/BUILD.gn -+++ b/BUILD.gn -@@ -22,33 +22,18 @@ import("interface_config.gni") - # 全局变量方法见 https://gitee.com/openharmony/build/blob/master/docs/cmake%E8%BD%ACgn%E6%8C%87%E5%AF%BC%E6%96%87%E6%A1%A3.md#gn%E5%B8%B8%E7%94%A8%E7%9A%84%E5%86%85%E7%BD%AE%E5%8F%98%E9%87%8F - - # 特殊场景没有拷贝interface接口信息,强基之后源码仓api不能直接使用,需要进行处理 --exists_path_tools = "//interface/sdk-js/exists_path.py" --exists_path_args = [ -- "--path", -- rebase_path(interface_sdk_path_ets1, root_build_dir), --] --has_interface_file = -- exec_script(exists_path_tools, exists_path_args, "trim string") -- --if (has_interface_file != "True") { -- arkts_sdk_config_parser = "//build/ohos/sdk/parse_interface_sdk.py" -+action("ohos_base_split") { -+ script = "//build/ohos/sdk/parse_interface_sdk.py" - ohos_sdk_arkts_description_file = -- "//out/sdk-interface/ohos_sdk_pub_description_std.json" -- if (host_os == "mac") { -- node_path = "//prebuilts/build-tools/common/nodejs/node-v16.20.2-darwin-x64/bin/node" -- npm_path = "//prebuilts/build-tools/common/nodejs/node-v16.20.2-darwin-x64/bin/npm" -- } else { -- node_path = "//prebuilts/build-tools/common/nodejs/node-v16.20.2-linux-x64/bin/node" -- npm_path = "//prebuilts/build-tools/common/nodejs/node-v16.20.2-linux-x64/bin/npm" -- } -- arkts_sdk_args = [ -+ "${interface_sdk_path}/ohos_sdk_pub_description_std.json" -+ args = [ - "--sdk-description-file", - rebase_path("//build/ohos/sdk/ohos_sdk_description_std.json", - root_build_dir), - "--root-build-dir", - rebase_path("//", root_build_dir), - "--node-js", -- rebase_path(node_path, root_build_dir), -+ rebase_path(nodejs, root_build_dir), - "--output-arkts-sdk-desc-file", - rebase_path(ohos_sdk_arkts_description_file, root_build_dir), - "--sdk-build-public", -@@ -56,14 +41,17 @@ if (has_interface_file != "True") { - "--sdk-build-arkts", - "${sdk_build_arkts}", - "--npm-path", -- rebase_path(npm_path, root_build_dir), -+ rebase_path(npm, root_build_dir), -+ "--output-interface-sdk", -+ rebase_path(interface_sdk_path, root_build_dir), - ] -- exec_script(arkts_sdk_config_parser, arkts_sdk_args) -+ outputs = [ "${root_out_dir}/sdk-interface" ] - } - - template("ohos_copy_internal") { - forward_variables_from(invoker, "*") - iv_input = invoker.iv_input -+ _module_info_target = "${target_name}_info" - - # fullSDK中api路径 - input_project_dir = interface_sdk_path_ets1 -@@ -73,14 +61,18 @@ template("ohos_copy_internal") { - - # 调用build/templates/common/copy.gni中的ohos_copy方法 - # 将处理完成的文件输出到中间产物对应位置 out/sdk/obj/interface/sdk-js/${target_name} -- ohos_copy(target_name) { -+ action_with_pydeps(target_name) { - # 该脚本根据传入的remove文件进行input文件规则检查,过滤不需要的文件 - # remove文件没有对应$target_name的属性 则全部输出 - # remove文件有对应$target_name的属性 保留base中的文件; - # 删除global_remove中的文件; - # ispublic为真,删除sdk_build_public_remove文件。 -- process_script = "//interface/sdk-js/process_internal.py" -- process_arguments = [ -+ deps = [ ":ohos_base_split" ] -+ deps += [ ":$_module_info_target" ] -+ inputs = [] -+ outputs = [ target_out_dir + "/${sdk_type}/${target_name}" ] -+ script = "//interface/sdk-js/process_internal.py" -+ args = [ - "--input", - rebase_path(iv_input, root_build_dir), - "--project-dir", -@@ -93,14 +85,18 @@ template("ohos_copy_internal") { - "${sdk_build_public}", - "--name", - "${target_name}", -+ "--output", -+ rebase_path(target_out_dir + "/${sdk_type}/${target_name}", -+ root_build_dir), - ] -- -- # 执行脚本 -- sources = exec_script(process_script, process_arguments, "value") -- outputs = -- [ target_out_dir + "/${sdk_type}/${target_name}/{{source_file_part}}" ] -- module_source_dir = target_out_dir + "/${sdk_type}/${target_name}" -+ } -+ _target_name = target_name -+ generate_module_info(_module_info_target) { -+ module_type = "jsdoc" - module_install_name = "" -+ module_name = _target_name -+ module_source_dir = target_out_dir + "/${sdk_type}/${_target_name}" -+ install_enable = false - } - } - -@@ -117,7 +113,9 @@ template("ohos_declaration_template") { - input_api_dir = input_project_dir + "/api" - - action_with_pydeps(target_name) { -- inputs = [ input_project_dir + "/api" ] -+ deps = [ ":ohos_base_split" ] -+ deps += [ ":$_module_info_target" ] -+ inputs = [] - outputs = [ root_out_dir + "/ohos_declaration/${sdk_type}/${target_name}" ] - - # 处理api文件下全部文件,过滤特定文件 -@@ -130,11 +128,6 @@ template("ohos_declaration_template") { - root_out_dir + "/ohos_declaration/${sdk_type}/${target_name}/", - root_build_dir), - ] -- if (defined(deps)) { -- deps += [ ":$_module_info_target" ] -- } else { -- deps = [ ":$_module_info_target" ] -- } - } - _target_name = target_name - generate_module_info(_module_info_target) { -@@ -201,7 +194,7 @@ ohos_copy_internal("ets_component") { - # ets1.2/arkui/component执行脚本 - ohos_copy_internal("ets_component2") { - sdk_type = "ets2" -- iv_input = "//out/arkui_transformer_api" -+ iv_input = interface_sdk_path + "/arkui_transformer_api" - } - - # ets/kits执行脚本 -@@ -323,16 +316,6 @@ action("ohos_ets_api_arkui_tmp") { - deps = [ ":ohos_ets_api_tmp" ] - script = "//interface/sdk-js/arkui_transformer.py" - -- if (host_os == "mac") { -- node_path = "//prebuilts/build-tools/common/nodejs/node-v16.20.2-darwin-x64/bin/node" -- npm_path = -- "//prebuilts/build-tools/common/nodejs/node-v16.20.2-darwin-x64/bin/npm" -- } else { -- node_path = -- "//prebuilts/build-tools/common/nodejs/node-v16.20.2-linux-x64/bin/node" -- npm_path = -- "//prebuilts/build-tools/common/nodejs/node-v16.20.2-linux-x64/bin/npm" -- } - args = [ - "--input", - rebase_path(ohos_ets_api_tmp_path + "/@internal/component/ets", -@@ -342,9 +325,9 @@ action("ohos_ets_api_arkui_tmp") { - "--source_root_dir", - rebase_path("//", root_build_dir), - "--npm-path", -- rebase_path(npm_path, root_build_dir), -+ rebase_path(npm, root_build_dir), - "--node-js", -- rebase_path(node_path, root_build_dir), -+ rebase_path(nodejs, root_build_dir), - ] - outputs = [ "$ohos_ets_api_arkui_tmp_path" ] - } -@@ -375,3 +358,55 @@ ohos_copy("ohos_ets_api") { - part_name = "sdk" - subsystem_name = "sdk" - } -+ -+action("install_tsc_declgen") { -+ deps = [ -+ ":ohos_base_split" -+ ] -+ external_deps = [ -+ "runtime_core:declgen_ts2sts_compile_declgen" -+ ] -+ script="run_compile_declgen.py" -+ args = [ -+ "--root-build-dir", -+ rebase_path("//", root_build_dir), -+ "--current-os-dir", -+ current_os, -+ "--output-interface-sdk", -+ rebase_path(interface_sdk_path, root_build_dir), -+ "--tool-dir", -+ rebase_path( -+ "${root_out_dir}/obj/arkcompiler/runtime_core/static_core/plugins/ets/tools/declgen_ts2sts/panda-declgen-1.0.0.tgz"), -+ "--node-js", -+ rebase_path(nodejs, root_build_dir), -+ ] -+ outputs = [ "${interface_sdk_path}/ets1.1interop" ] -+} -+ -+action("gen_api_check_plugin") { -+ deps = [ -+ "//developtools/ace_ets2bundle/arkui-plugins:ui_plugin" -+ ] -+ script = "build_api_check_plugin.py" -+ args = [ -+ "--source_path", -+ rebase_path(get_path_info("./build-tools/compiler-plugins/api-check-plugin-static", "abspath")), -+ "--output_path", -+ rebase_path("$target_gen_dir"), -+ "--npm", -+ rebase_path(npm), -+ ] -+ outputs = [ "$target_gen_dir" ] -+} -+ -+ohos_copy("api_check_plugin") { -+ deps = [ -+ ":gen_api_check_plugin" -+ ] -+ sources = [ -+ rebase_path("$target_gen_dir") -+ ] -+ outputs = [ target_out_dir + "/$target_name" ] -+ module_source_dir = target_out_dir + "/$target_name" -+ module_install_name = "" -+} -\ No newline at end of file -diff --git a/api/@internal/component/ets/action_sheet.d.ts b/api/@internal/component/ets/action_sheet.d.ts -index 166a48deb..97d673685 100644 ---- a/api/@internal/component/ets/action_sheet.d.ts -+++ b/api/@internal/component/ets/action_sheet.d.ts -@@ -166,10 +166,20 @@ declare interface DismissDialogAction { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - dismiss: Callback; -+ -+ /** -+ * Defines dialog dismiss function. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ dismiss(): void; - - /** - * Dismiss reason type. -diff --git a/api/@internal/component/ets/alert_dialog.d.ts b/api/@internal/component/ets/alert_dialog.d.ts -index 047b8a924..d608e158c 100644 ---- a/api/@internal/component/ets/alert_dialog.d.ts -+++ b/api/@internal/component/ets/alert_dialog.d.ts -@@ -27,6 +27,7 @@ import { WordBreak, DialogButtonStyle, BorderStyle } from './enums'; - import { Rectangle, BlurStyle, Callback, TransitionEffect, ShadowOptions, ShadowStyle, HoverModeAreaType, DismissReason, - BackgroundBlurStyleOptions, BackgroundEffectOptions } from './common'; - import { LevelOrder, ImmersiveMode, LevelMode } from '../../@ohos.promptAction'; -+import { DismissDialogAction } from './actionSheet'; - /*** endif */ - - /** -@@ -1307,8 +1308,7 @@ declare interface AlertDialogParamWithConfirm extends AlertDialogParam { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - declare interface DismissDialogAction { - /** -@@ -1318,8 +1318,7 @@ declare interface DismissDialogAction { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - dismiss: Callback; - -@@ -1330,8 +1329,7 @@ declare interface DismissDialogAction { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - reason: DismissReason; - } -diff --git a/api/@internal/component/ets/alphabet_indexer.d.ts b/api/@internal/component/ets/alphabet_indexer.d.ts -index c8003ca0f..1ab96b346 100644 ---- a/api/@internal/component/ets/alphabet_indexer.d.ts -+++ b/api/@internal/component/ets/alphabet_indexer.d.ts -@@ -19,7 +19,7 @@ - */ - - /*** if arkts 1.2 */ --import { CommonMethod, BlurStyle } from './common' -+import { CommonMethod, BlurStyle, Bindable } from './common' - import { ResourceColor, Length, Position } from './units' - import { Font } from './units' - /*** endif */ -@@ -180,10 +180,20 @@ interface AlphabetIndexerOptions { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - selected: number; -+ /** -+ * ID of the selected item. -+ * -+ * @type { number | Bindable } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ selected: number | Bindable; - } - - /** -@@ -905,10 +915,21 @@ declare class AlphabetIndexerAttribute extends CommonMethod } index -+ * @returns { AlphabetIndexerAttribute } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ selected(index: number | Bindable): AlphabetIndexerAttribute; - - /** - * Position of the pop-up windows, relative to the midpoint of the top border of the indexer bar. -diff --git a/api/@internal/component/ets/calendar.d.ts b/api/@internal/component/ets/calendar.d.ts -index 90c32e3de..bf5216137 100644 ---- a/api/@internal/component/ets/calendar.d.ts -+++ b/api/@internal/component/ets/calendar.d.ts -@@ -18,11 +18,6 @@ - * @kit ArkUI - */ - --/*** if arkts 1.2 */ --import { ResourceColor } from './units' --import { Axis } from './enums' --/*** endif */ -- - /** - * Provides a monthly view component to display information such as date, shift break, and schedule. - * -@@ -38,8 +33,8 @@ import { Axis } from './enums' - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - interface CalendarDay { - /** -@@ -59,8 +54,8 @@ interface CalendarDay { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - index: number; - -@@ -81,8 +76,8 @@ interface CalendarDay { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - lunarMonth: string; - -@@ -101,8 +96,8 @@ interface CalendarDay { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - lunarDay: string; - -@@ -121,8 +116,8 @@ interface CalendarDay { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - dayMark: string; - -@@ -141,8 +136,8 @@ interface CalendarDay { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - dayMarkValue: string; - -@@ -161,8 +156,8 @@ interface CalendarDay { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - year: number; - -@@ -181,8 +176,8 @@ interface CalendarDay { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - month: number; - -@@ -201,8 +196,8 @@ interface CalendarDay { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - day: number; - -@@ -221,8 +216,8 @@ interface CalendarDay { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - isFirstOfLunar: boolean; - -@@ -243,8 +238,8 @@ interface CalendarDay { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - hasSchedule: boolean; - -@@ -263,8 +258,8 @@ interface CalendarDay { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - markLunarDay: boolean; - } -@@ -284,8 +279,8 @@ interface CalendarDay { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - interface MonthData { - /** -@@ -303,8 +298,8 @@ interface MonthData { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - year: number; - -@@ -323,8 +318,8 @@ interface MonthData { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - month: number; - -@@ -343,8 +338,8 @@ interface MonthData { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - data: CalendarDay[]; - } -@@ -364,8 +359,8 @@ interface MonthData { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - interface CurrentDayStyle { - /** -@@ -383,8 +378,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - dayColor?: ResourceColor; - -@@ -403,8 +398,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - lunarColor?: ResourceColor; - -@@ -423,8 +418,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - markLunarColor?: ResourceColor; - -@@ -443,8 +438,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - dayFontSize?: number; - -@@ -463,8 +458,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - lunarDayFontSize?: number; - -@@ -483,8 +478,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - dayHeight?: number; - -@@ -503,8 +498,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - dayWidth?: number; - -@@ -523,8 +518,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - gregorianCalendarHeight?: number; - -@@ -543,8 +538,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - dayYAxisOffset?: number; - -@@ -563,8 +558,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - lunarDayYAxisOffset?: number; - -@@ -583,8 +578,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - underscoreXAxisOffset?: number; - -@@ -603,8 +598,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - underscoreYAxisOffset?: number; - -@@ -623,8 +618,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - scheduleMarkerXAxisOffset?: number; - -@@ -643,8 +638,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - scheduleMarkerYAxisOffset?: number; - -@@ -663,8 +658,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - colSpace?: number; - -@@ -683,8 +678,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - dailyFiveRowSpace?: number; - -@@ -703,8 +698,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - dailySixRowSpace?: number; - -@@ -723,8 +718,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - lunarHeight?: number; - -@@ -743,8 +738,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - underscoreWidth?: number; - -@@ -763,8 +758,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - underscoreLength?: number; - -@@ -783,8 +778,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - scheduleMarkerRadius?: number; - -@@ -803,8 +798,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - boundaryRowOffset?: number; - -@@ -823,8 +818,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - boundaryColOffset?: number; - } -@@ -844,8 +839,8 @@ interface CurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - interface NonCurrentDayStyle { - /** -@@ -863,8 +858,8 @@ interface NonCurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - nonCurrentMonthDayColor?: ResourceColor; - -@@ -883,8 +878,8 @@ interface NonCurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - nonCurrentMonthLunarColor?: ResourceColor; - -@@ -903,8 +898,8 @@ interface NonCurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - nonCurrentMonthWorkDayMarkColor?: ResourceColor; - -@@ -923,8 +918,8 @@ interface NonCurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - nonCurrentMonthOffDayMarkColor?: ResourceColor; - } -@@ -944,8 +939,8 @@ interface NonCurrentDayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - interface TodayStyle { - /** -@@ -963,8 +958,8 @@ interface TodayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - focusedDayColor?: ResourceColor; - -@@ -983,8 +978,8 @@ interface TodayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - focusedLunarColor?: ResourceColor; - -@@ -1003,8 +998,8 @@ interface TodayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - focusedAreaBackgroundColor?: ResourceColor; - -@@ -1023,8 +1018,8 @@ interface TodayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - focusedAreaRadius?: number; - } -@@ -1044,8 +1039,8 @@ interface TodayStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - interface WeekStyle { - /** -@@ -1063,8 +1058,8 @@ interface WeekStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - weekColor?: ResourceColor; - -@@ -1083,8 +1078,8 @@ interface WeekStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - weekendDayColor?: ResourceColor; - -@@ -1103,8 +1098,8 @@ interface WeekStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - weekendLunarColor?: ResourceColor; - -@@ -1123,8 +1118,8 @@ interface WeekStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - weekFontSize?: number; - -@@ -1143,8 +1138,8 @@ interface WeekStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - weekHeight?: number; - -@@ -1163,8 +1158,8 @@ interface WeekStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - weekWidth?: number; - -@@ -1183,8 +1178,8 @@ interface WeekStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - weekAndDayRowSpace?: number; - } -@@ -1204,8 +1199,8 @@ interface WeekStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - interface WorkStateStyle { - /** -@@ -1223,8 +1218,8 @@ interface WorkStateStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - workDayMarkColor?: ResourceColor; - -@@ -1243,8 +1238,8 @@ interface WorkStateStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - offDayMarkColor?: ResourceColor; - -@@ -1263,8 +1258,8 @@ interface WorkStateStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - workDayMarkSize?: number; - -@@ -1283,8 +1278,8 @@ interface WorkStateStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - offDayMarkSize?: number; - -@@ -1303,8 +1298,8 @@ interface WorkStateStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - workStateWidth?: number; - -@@ -1323,8 +1318,8 @@ interface WorkStateStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - workStateHorizontalMovingDistance?: number; - -@@ -1343,8 +1338,8 @@ interface WorkStateStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - workStateVerticalMovingDistance?: number; - } -@@ -1364,8 +1359,8 @@ interface WorkStateStyle { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - declare interface CalendarSelectedDate { - /** -@@ -1383,8 +1378,8 @@ declare interface CalendarSelectedDate { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - year: number; - -@@ -1403,8 +1398,8 @@ declare interface CalendarSelectedDate { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - month: number; - -@@ -1423,8 +1418,8 @@ declare interface CalendarSelectedDate { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - day: number; - } -@@ -1444,8 +1439,8 @@ declare interface CalendarSelectedDate { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - declare interface CalendarRequestedData { - /** -@@ -1463,8 +1458,8 @@ declare interface CalendarRequestedData { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - year: number; - -@@ -1483,8 +1478,8 @@ declare interface CalendarRequestedData { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - month: number; - -@@ -1503,8 +1498,8 @@ declare interface CalendarRequestedData { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - currentYear: number; - -@@ -1523,8 +1518,8 @@ declare interface CalendarRequestedData { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - currentMonth: number; - -@@ -1543,59 +1538,12 @@ declare interface CalendarRequestedData { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - monthState: number; - } - --/** -- * Defines the struct of DateOptions. -- * -- * @interface DateOptions -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @systemapi -- * @form -- * @since 20 -- * @arkts 1.2 -- */ --interface DateOptions { -- /** -- * Gregorian calendar year. -- * -- * @type { number } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @systemapi -- * @form -- * @since 20 -- * @arkts 1.2 -- */ -- year: number; -- -- /** -- * Gregorian calendar month. -- * -- * @type { number } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @systemapi -- * @form -- * @since 20 -- * @arkts 1.2 -- */ -- month: number; -- -- /** -- * Gregorian calendar day. -- * -- * @type { number } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @systemapi -- * @form -- * @since 20 -- * @arkts 1.2 -- */ -- day: number --} - /** - * Calendar controller. - * -@@ -1609,8 +1557,8 @@ interface DateOptions { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - declare class CalendarController { - /** -@@ -1626,8 +1574,8 @@ declare class CalendarController { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - constructor(); - -@@ -1645,20 +1593,10 @@ declare class CalendarController { - * @systemapi - * @form - * @since 10 -+ * @deprecated since 20 - */ - backToToday(); - -- /** -- * Back to day. -- * -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @systemapi -- * @form -- * @since 20 -- * @arkts 1.2 -- */ -- backToToday():void; -- - /** - * To the specified element. - * -@@ -1675,90 +1613,9 @@ declare class CalendarController { - * @systemapi - * @form - * @since 10 -+ * @deprecated since 20 - */ - goTo(value: { year: number; month: number; day: number }); -- /** -- * To the specified element. -- * -- * @param { CalendarSelectedDate } date -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @systemapi -- * @form -- * @since 20 -- * @arkts 1.2 -- */ -- goTo(date: CalendarSelectedDate): void; --} -- --/** -- * Defines the struct of CalendarRequestedMonths. -- * -- * @interface CalendarRequestedMonths -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @systemapi -- * @form -- * @since 20 -- * @arkts 1.2 -- */ --declare interface CalendarRequestedMonths { -- /** -- * Default selected year/month/day. -- * @type { CalendarSelectedDate } date -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @systemapi -- * @form -- * @since 20 -- * @arkts 1.2 -- */ -- date: CalendarSelectedDate; -- -- /** -- * Dates contained in the current month. -- * -- * @type { MonthData } currentData -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @systemapi -- * @form -- * @since 20 -- * @arkts 1.2 -- */ -- currentData: MonthData; -- -- /** -- * Dates contained in the previous month. -- * -- * @type { MonthData } preData -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @systemapi -- * @form -- * @since 20 -- * @arkts 1.2 -- */ -- preData: MonthData; -- -- /** -- * Dates contained in the next month. -- * -- * @type { MonthData } nextData -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @systemapi -- * @form -- * @since 20 -- * @arkts 1.2 -- */ -- nextData: MonthData; -- -- /** -- * Calendar controller. -- * -- * @type { ?CalendarController } controller -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @systemapi -- * @form -- * @since 20 -- * @arkts 1.2 -- */ -- controller?: CalendarController; - } - - /** -@@ -1776,8 +1633,8 @@ declare interface CalendarRequestedMonths { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - interface CalendarInterface { - /** -@@ -1798,6 +1655,7 @@ interface CalendarInterface { - * @systemapi - * @form - * @since 10 -+ * @deprecated since 20 - */ - (value: { - date: { year: number; month: number; day: number }; -@@ -1806,19 +1664,6 @@ interface CalendarInterface { - nextData: MonthData; - controller?: CalendarController; - }): CalendarAttribute; -- -- /** -- * Set value. -- * -- * @param { CalendarRequestedMonths } value -- * @returns { CalendarAttribute } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @systemapi -- * @form -- * @since 20 -- * @arkts 1.2 -- */ -- (value: CalendarRequestedMonths): CalendarAttribute; - } - - /** -@@ -1830,8 +1675,8 @@ interface CalendarInterface { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - declare class CalendarAttribute { - /** -@@ -1851,8 +1696,8 @@ declare class CalendarAttribute { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - showLunar(value: boolean): CalendarAttribute; - -@@ -1873,8 +1718,8 @@ declare class CalendarAttribute { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - showHoliday(value: boolean): CalendarAttribute; - -@@ -1895,8 +1740,8 @@ declare class CalendarAttribute { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - needSlide(value: boolean): CalendarAttribute; - -@@ -1917,8 +1762,8 @@ declare class CalendarAttribute { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - startOfWeek(value: number): CalendarAttribute; - -@@ -1939,8 +1784,8 @@ declare class CalendarAttribute { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - offDays(value: number): CalendarAttribute; - -@@ -1961,8 +1806,8 @@ declare class CalendarAttribute { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - direction(value: Axis): CalendarAttribute; - -@@ -1983,8 +1828,8 @@ declare class CalendarAttribute { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - currentDayStyle(value: CurrentDayStyle): CalendarAttribute; - -@@ -2005,8 +1850,8 @@ declare class CalendarAttribute { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - nonCurrentDayStyle(value: NonCurrentDayStyle): CalendarAttribute; - -@@ -2027,8 +1872,8 @@ declare class CalendarAttribute { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - todayStyle(value: TodayStyle): CalendarAttribute; - -@@ -2049,8 +1894,8 @@ declare class CalendarAttribute { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - weekStyle(value: WeekStyle): CalendarAttribute; - -@@ -2071,8 +1916,8 @@ declare class CalendarAttribute { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - workStateStyle(value: WorkStateStyle): CalendarAttribute; - -@@ -2093,8 +1938,8 @@ declare class CalendarAttribute { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - onSelectChange(event: (event: CalendarSelectedDate) => void): CalendarAttribute; - -@@ -2115,8 +1960,8 @@ declare class CalendarAttribute { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @form -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 -+ * @deprecated since 20 - */ - onRequestData( - event: (event: CalendarRequestedData) => void, -@@ -2137,6 +1982,7 @@ declare class CalendarAttribute { - * @systemapi - * @form - * @since 10 -+ * @deprecated since 20 - */ - declare const Calendar: CalendarInterface; - -@@ -2154,5 +2000,6 @@ declare const Calendar: CalendarInterface; - * @systemapi - * @form - * @since 10 -+ * @deprecated since 20 - */ - declare const CalendarInstance: CalendarAttribute; -diff --git a/api/@internal/component/ets/checkbox.d.ts b/api/@internal/component/ets/checkbox.d.ts -index 859d3b493..d1d796b17 100644 ---- a/api/@internal/component/ets/checkbox.d.ts -+++ b/api/@internal/component/ets/checkbox.d.ts -@@ -19,7 +19,7 @@ - */ - - /*** if arkts 1.2 */ --import { CommonConfiguration, Callback, CommonMethod, ContentModifier, Optional } from './common'; -+import { CommonConfiguration, Callback, CommonMethod, ContentModifier, Optional, Bindable } from './common'; - import { CustomBuilder } from './builder'; - import { ResourceColor, MarkStyle } from './units'; - import { CheckBoxShape } from './enums'; -@@ -365,8 +365,7 @@ declare class CheckboxAttribute extends CommonMethod { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - select(value: boolean): CheckboxAttribute; - -@@ -379,11 +378,24 @@ declare class CheckboxAttribute extends CommonMethod { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 18 - */ - select(isSelected: Optional): CheckboxAttribute; - -+ /** -+ * setting whether checkbox is selected. -+ * -+ * @param { boolean | undefined | Bindable } isSelected -+ * @returns { CheckboxAttribute } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ select(isSelected: boolean | undefined | Bindable): CheckboxAttribute; -+ - /** - * setting the display color of checkbox. - * -diff --git a/api/@internal/component/ets/checkboxgroup.d.ts b/api/@internal/component/ets/checkboxgroup.d.ts -index bee7deec0..8864f9d76 100644 ---- a/api/@internal/component/ets/checkboxgroup.d.ts -+++ b/api/@internal/component/ets/checkboxgroup.d.ts -@@ -19,7 +19,7 @@ - */ - - /*** if arkts 1.2 */ --import { CommonMethod, Optional } from './common'; -+import { CommonMethod, Optional, Bindable } from './common'; - import { ResourceColor, MarkStyle } from './units'; - import { CheckBoxShape } from './enums'; - /*** endif */ -@@ -506,8 +506,7 @@ declare class CheckboxGroupAttribute extends CommonMethod): CheckboxGroupAttribute; - -+ /** -+ * setting whether all checkbox is selected. -+ * -+ * @param { boolean| undefined|Bindable } isAllSelected -+ * @returns { CheckboxGroupAttribute } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ selectAll(isAllSelected: boolean | undefined | Bindable): CheckboxGroupAttribute; -+ - /** - * setting the display color of checkbox. - * -diff --git a/api/@internal/component/ets/common.d.ts b/api/@internal/component/ets/common.d.ts -index fdc08b8fd..06d6ff3bd 100644 ---- a/api/@internal/component/ets/common.d.ts -+++ b/api/@internal/component/ets/common.d.ts -@@ -19,19 +19,20 @@ - */ - - /*** if arkts 1.2 */ --import Context from '../../application/Context'; -+import OriginalContext from '../../application/Context'; - import { Resource } from '../../global/resource'; - import pointer from '../../@ohos.multimodalInput.pointer'; - import image from '../../@ohos.multimedia.image'; - import unifiedDataChannel from '../../@ohos.data.unifiedDataChannel'; - import promptAction from '../../@ohos.promptAction'; - import uniformTypeDescriptor from '../../@ohos.data.uniformTypeDescriptor'; -+import Want from '../../@ohos.app.ability.Want'; - import { IntentionCode } from '../../@ohos.multimodalInput.intentionCode'; - import { SymbolGlyphModifier } from '../../arkui/SymbolGlyphModifier'; - import { CircleShape, EllipseShape, PathShape, RectShape } from '../../@ohos.arkui.shape'; - import uiObserver from '../../@ohos.arkui.observer'; --import { UIContext } from '../../@ohos.arkui.UIContext'; --import { DrawContext, LengthMetrics } from '../../arkui/Graphics'; -+import { UIContext as _UIContext } from '../../@ohos.arkui.UIContext'; -+import { DrawContext as _DrawContext, LengthMetrics } from '../../arkui/Graphics'; - import uiEffect from '../../@ohos.graphics.uiEffect'; - import { FocusBoxStyle, FocusPriority } from './focus'; - import { ComponentContent } from '../../arkui/ComponentContent'; -@@ -65,8 +66,9 @@ import { CircleAttribute } from './circle'; - import { RectAttribute } from './rect'; - import { PathAttribute } from './path'; - import { EllipseAttribute } from './ellipse'; --import { LocalStorage } from '../stateManagement/storages/localStorage'; --import { CustomBuilder } from './builder'; -+import { LocalStorage } from '../stateManagement/storage/localStorage'; -+import { CustomBuilder, WrappedBuilder } from './builder'; -+import curves from '../../@ohos.curves'; - /*** endif */ - - /** -@@ -1514,6 +1516,19 @@ declare interface ReuseOptions { - */ - declare type Context = import('../api/application/Context').default; - -+/** -+ * Export Context. -+ * -+ * @typedef { OriginalContext } Context -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @stagemodelonly -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+export type Context = OriginalContext; -+ - /** - * Post Card Action. - * -@@ -3869,8 +3884,7 @@ declare interface AnimateParam { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - interface ICurve { - /** -@@ -3904,12 +3918,24 @@ interface ICurve { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - interpolate(fraction: number): number; - } - -+/** -+ * Interface for curve object. -+ * -+ * @typedef { curves.ICurve } ICurve -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+export type ICurve = curves.ICurve; -+ - /** - * Defines the motion path options. - * -@@ -7227,7 +7253,6 @@ declare class TransitionEffect { - * Disables the transition effect - * - * @type { TransitionEffect } -- * @readonly - * @static - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform -@@ -7236,13 +7261,12 @@ declare class TransitionEffect { - * @since 20 - * @arkts 1.2 - */ -- static readonly IDENTITY: TransitionEffect; -+ static get IDENTITY(): TransitionEffect; - - /** - * Specifies a transition effect with transparency of 0, which is equivalent to TransitionEffect.opacity(0). - * - * @type { TransitionEffect } -- * @readonly - * @static - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform -@@ -7251,13 +7275,12 @@ declare class TransitionEffect { - * @since 20 - * @arkts 1.2 - */ -- static readonly OPACITY: TransitionEffect; -+ static get OPACITY(): TransitionEffect; - - /** - * Defines a slide transition effect - * - * @type { TransitionEffect } -- * @readonly - * @static - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform -@@ -7266,7 +7289,7 @@ declare class TransitionEffect { - * @since 20 - * @arkts 1.2 - */ -- static readonly SLIDE: TransitionEffect; -+ static get SLIDE(): TransitionEffect; - - /** - * Specify a transition effect where the element enters by shrinking first and then expanding as it slides in from the right, -@@ -7275,7 +7298,6 @@ declare class TransitionEffect { - * The default animation duration is set to 600ms, and the specified animation curve is cubicBezierCurve(0.24, 0.0, 0.50, 1.0). - * - * @type { TransitionEffect } -- * @readonly - * @static - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform -@@ -7284,7 +7306,7 @@ declare class TransitionEffect { - * @since 20 - * @arkts 1.2 - */ -- static readonly SLIDE_SWITCH: TransitionEffect; -+ static get SLIDE_SWITCH(): TransitionEffect; - - /** - * Creates a translate transition effect -@@ -13195,6 +13217,17 @@ declare type Summary = unifiedDataChannel.Summary; - */ - declare type UniformDataType = import('../api/@ohos.data.uniformTypeDescriptor').default.UniformDataType; - -+/** -+ * Import the UniformDataType type object for ui component. -+ * -+ * @typedef { uniformTypeDescriptor.UniformDataType } UniformDataType -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+declare type UniformDataType = uniformTypeDescriptor.UniformDataType; -+ - /** - * Import the GetDataParams type object for ui component. - * -@@ -13207,15 +13240,16 @@ declare type UniformDataType = import('../api/@ohos.data.uniformTypeDescriptor') - declare type DataSyncOptions = import('../api/@ohos.data.unifiedDataChannel').default.GetDataParams; - - /** -- * Import the UniformDataType type object for ui component. -+ * Import the GetDataParams type object for ui component. - * -- * @typedef { uniformTypeDescriptor.UniformDataType } UniformDataType -+ * @typedef { unifiedDataChannel.GetDataParams } GetDataParams - * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ --declare type UniformDataType = uniformTypeDescriptor.UniformDataType; -+declare type DataSyncOptions = unifiedDataChannel.GetDataParams; - - /** - * Enum for Drag Result. -@@ -14481,7 +14515,8 @@ declare interface DragEvent { - * @throws { BusinessError } 190003 - Operation no allowed for current pharse. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - startDataLoading(options: DataSyncOptions): string; - } -@@ -15640,6 +15675,43 @@ declare interface SpringBackAction { - springBack: VoidCallback; - } - -+ -+/** -+ * Defines the detent array of a single length. -+ * -+ * @typedef { [SheetSize | Length] } SingleLengthDetent -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+declare type SingleLengthDetent = [SheetSize | Length]; -+ -+/** -+ * Defines the detent array of a two-length. -+ * -+ * @typedef { [(SheetSize | Length), SheetSize | Length | undefined] } DoubleLengthDetents -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+declare type DoubleLengthDetents = [(SheetSize | Length), SheetSize | Length | undefined]; -+ -+/** -+ * Defines the detent array of a three-length. -+ * -+ * @typedef { [(SheetSize | Length), SheetSize | Length | undefined, SheetSize | Length | undefined] } TripleLengthDetents -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+declare type TripleLengthDetents = [(SheetSize | Length), SheetSize | Length | undefined, SheetSize | Length | undefined]; -+ - /** - * Component sheet options - * -@@ -15747,14 +15819,14 @@ declare interface SheetOptions extends BindOptions { - /** - * Defines sheet detents - * -- * @type { ?[(SheetSize | Length), (SheetSize | Length)?, (SheetSize | Length)?] } -+ * @type { ?(SingleLengthDetent | DoubleLengthDetents | TripleLengthDetents) } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ -- detents?: [(SheetSize | Length), SheetSize | Length | undefined, SheetSize | Length | undefined]; -+ detents?: SingleLengthDetent | DoubleLengthDetents | TripleLengthDetents; - - /** - * Defines sheet background blur Style -@@ -16647,11 +16719,21 @@ declare interface DismissPopupAction { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - dismiss: Callback; - -+ /** -+ * Defines popup dismiss function -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ dismiss(): void; -+ - /** - * Defines popup dismiss reason - * -@@ -17156,14 +17238,14 @@ declare interface PopupButton { - /** - * action - * -- * @type { Callback } -+ * @type { VoidCallback } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ -- action: Callback; -+ action: VoidCallback; - } - - /** -@@ -26800,11 +26882,25 @@ declare class CommonMethod { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - bindContentCover(isShow: boolean, builder: CustomBuilder, type?: ModalTransition): T; - -+ /** -+ * Bind content cover -+ * -+ * @param { boolean | Bindable} isShow - true means display content, false means hide content. -+ * @param { CustomBuilder } builder - the content to be displayed. -+ * @param { ModalTransition } [type] - transition type. -+ * @returns { T } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ bindContentCover(isShow: boolean | Bindable, builder: CustomBuilder, type?: ModalTransition): T; -+ - /** - * Bind content cover - * -@@ -26826,10 +26922,24 @@ declare class CommonMethod { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 -+ */ -+ bindContentCover(isShow: boolean , builder: CustomBuilder, options?: ContentCoverOptions): T; -+ -+ /** -+ * Bind content cover -+ * -+ * @param { boolean | Bindable } isShow - true means display content, false means hide content. -+ * @param { CustomBuilder } builder - the content to be displayed. -+ * @param { ContentCoverOptions } [options] - options of content cover. -+ * @returns { T } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 - */ -- bindContentCover(isShow: boolean, builder: CustomBuilder, options?: ContentCoverOptions): T; -+ bindContentCover(isShow: boolean | Bindable, builder: CustomBuilder, options?: ContentCoverOptions): T; - - /** - * Bind sheet -@@ -26852,11 +26962,26 @@ declare class CommonMethod { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 -+ * @arkts 1.1 - */ - bindSheet(isShow: boolean, builder: CustomBuilder, options?: SheetOptions): T; - -+ /** -+ * Bind sheet -+ * -+ * @param { boolean | Bindable} isShow - true means display sheet, false means hide sheet. -+ * @param { CustomBuilder } builder - the sheet to be displayed. -+ * @param { SheetOptions } [options] - options of sheet. -+ * @returns { T } - template type -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ bindSheet(isShow: boolean | Bindable, builder: CustomBuilder, options?: SheetOptions): T; -+ - /** - * Sets styles for component state. - * -@@ -26974,7 +27099,7 @@ declare class CommonMethod { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'17','1.2':'20'} - * @arkts 1.1&1.2 - */ - onVisibleAreaApproximateChange(options: VisibleAreaEventOptions, event: VisibleAreaChangeCallback | undefined): void; -@@ -28643,8 +28768,7 @@ declare class CommonShapeMethod extends CommonMethod { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - declare interface LinearGradient { - /** -@@ -28669,8 +28793,7 @@ declare interface LinearGradient { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - angle?: number | string; - /** -@@ -28695,8 +28818,7 @@ declare interface LinearGradient { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - direction?: GradientDirection; - /** -@@ -28730,8 +28852,7 @@ declare interface LinearGradient { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - colors: Array<[ResourceColor, number]>; - /** -@@ -28756,8 +28877,7 @@ declare interface LinearGradient { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - repeating?: boolean; - } -@@ -29552,6 +29672,19 @@ declare type RouterPageInfo = uiObserver.RouterPageInfo; - */ - declare type UIContext = import('../api/@ohos.arkui.UIContext').UIContext; - -+/** -+ * UIContext. -+ * -+ * @typedef { _UIContext } UIContext -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @stagemodelonly -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+export type UIContext = _UIContext; -+ - /** - * DrawContext - * -@@ -29563,6 +29696,19 @@ declare type UIContext = import('../api/@ohos.arkui.UIContext').UIContext; - */ - declare type DrawContext = import('../api/arkui/Graphics').DrawContext; - -+/** -+ * DrawContext. -+ * -+ * @typedef { _DrawContext } DrawContext -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @stagemodelonly -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+export type DrawContext = _DrawContext; -+ - /** - * VisualEffect - * -@@ -31742,17 +31888,6 @@ declare interface LightSource { - * @since 12 - */ - declare function wrapBuilder(builder: (...args: Args) => void): WrappedBuilder; --/** -- * Defining wrapBuilder function. -- * @param { function } builder -- * @returns { WrappedBuilder } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ --declare function wrapBuilder>(builder: (args: Args) => void): WrappedBuilder; - - /** - * Defines the WrappedBuilder class. -@@ -31801,37 +31936,6 @@ declare class WrappedBuilder { - - - --/** -- * Defines the WrappedBuilder class. -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ --declare class WrappedBuilder> { -- -- /** -- * @type { function } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ -- builder: (args: Args) => void; -- -- /** -- * @param { function } builder -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ -- constructor(builder: (args: Args) => void); --} -- - - /** - * Defines the overall animation parameters of the keyframe animation. -@@ -32609,6 +32713,36 @@ declare interface DateRange { - end?: Date; - } - -+/** -+ * Indicates the information when the provider of the embedded UI is terminated. -+ * -+ * @interface TerminationInfo -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ * @arkts 1.2 -+ */ -+declare interface TerminationInfo { -+ /** -+ * Defines the termination code. -+ * -+ * @type { number } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ code: number; -+ -+ /** -+ * Defines the additional termination information. -+ * -+ * @type { ?Want } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ want?: Want; -+} -+ - /** - * Defines the format for displaying dates and times. - * -@@ -32664,3 +32798,15 @@ export declare interface Bindable { - * @arkts 1.2 - */ - export declare function $$(value: T): Bindable; -+ -+/** -+ * Apply style function on this CommonMethod. -+ * -+ * @param { T } this -+ * @param { CustomStyles } customStyles -+ * @returns { T } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ * @arkts 1.2 -+ */ -+export declare function applyStyles(this: T, customStyles: CustomStyles): T; -diff --git a/api/@internal/component/ets/custom_dialog_controller.d.ts b/api/@internal/component/ets/custom_dialog_controller.d.ts -index 9d3c60c4a..959dcc2ea 100644 ---- a/api/@internal/component/ets/custom_dialog_controller.d.ts -+++ b/api/@internal/component/ets/custom_dialog_controller.d.ts -@@ -24,12 +24,14 @@ import { - DismissReason, BackgroundBlurStyleOptions, BackgroundEffectOptions - } from './common'; - import { CustomBuilder } from './builder'; -+import { ExtendableComponent } from './extendableComponent'; - import { DialogAlignment } from './alertDialog'; - import { Offset, ResourceColor, Dimension, BorderRadiuses, EdgeWidths, EdgeColors, EdgeStyles } from './units'; - import { BorderStyle } from './enums'; - import { LengthMetrics } from '../Graphics'; - import { LevelMode, LevelOrder, ImmersiveMode } from '../../@ohos.promptAction'; - import { CustomBuilder } from './builder'; -+import { DismissDialogAction } from './actionSheet'; - /*** endif */ - - /** -@@ -87,14 +89,14 @@ declare interface CustomDialogControllerOptions { - /** - * Custom builder function. - * -- * @type { CustomBuilder } -+ * @type { CustomBuilder | ExtendableComponent } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ -- builder: CustomBuilder; -+ builder: CustomBuilder | ExtendableComponent; - - /** - * Defines the cancel function. -@@ -711,8 +713,7 @@ declare interface CustomDialogControllerOptions { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - declare interface DismissDialogAction { - /** -@@ -722,8 +723,7 @@ declare interface DismissDialogAction { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - dismiss: Callback; - -@@ -734,8 +734,7 @@ declare interface DismissDialogAction { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - reason: DismissReason; - } -diff --git a/api/@internal/component/ets/embedded_component.d.ts b/api/@internal/component/ets/embedded_component.d.ts -index 618d27c36..1dca4bf8e 100644 ---- a/api/@internal/component/ets/embedded_component.d.ts -+++ b/api/@internal/component/ets/embedded_component.d.ts -@@ -21,7 +21,7 @@ - /*** if arkts 1.2 */ - import Want from '../../@ohos.app.ability.Want' - import { Callback, ErrorCallback ,BusinessError} from '../../@ohos.base' --import { CommonMethod } from './common' -+import { CommonMethod, TerminationInfo } from './common' - import { EmbeddedType } from './enums' - /*** endif */ - -@@ -100,36 +100,6 @@ declare interface TerminationInfo { - want?: import('../api/@ohos.app.ability.Want').default; - } - --/** -- * Indicates the information when the provider of the embedded UI is terminated. -- * -- * @interface TerminationInfo -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @since 20 -- * @arkts 1.2 -- */ --declare interface TerminationInfo { -- /** -- * Defines the termination code. -- * -- * @type { number } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @since 20 -- * @arkts 1.2 -- */ -- code: number; -- -- /** -- * Defines the additional termination information. -- * -- * @type { ?Want } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @since 20 -- * @arkts 1.2 -- */ -- want?: Want; --} -- - /** - * Define the attribute functions of EmbeddedComponent. - * -@@ -177,7 +147,7 @@ declare class EmbeddedComponentAttribute extends CommonMethod } callback - * @returns { EmbeddedComponentAttribute } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -diff --git a/api/@internal/component/ets/enums.d.ts b/api/@internal/component/ets/enums.d.ts -index 9b7534ff6..d5ba928cc 100644 ---- a/api/@internal/component/ets/enums.d.ts -+++ b/api/@internal/component/ets/enums.d.ts -@@ -18,6 +18,10 @@ - * @kit ArkUI - */ - -+/*** if arkts 1.2 */ -+import curves from '../../@ohos.curves'; -+/*** endif */ -+ - /** - * common enum of the checkbox shape - * -@@ -1844,8 +1848,7 @@ declare enum AnimationStatus { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - declare enum Curve { - /** -@@ -1876,8 +1879,7 @@ declare enum Curve { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - Linear, - -@@ -1909,8 +1911,7 @@ declare enum Curve { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - Ease, - -@@ -1942,8 +1943,7 @@ declare enum Curve { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - EaseIn, - -@@ -1975,8 +1975,7 @@ declare enum Curve { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - EaseOut, - -@@ -2008,8 +2007,7 @@ declare enum Curve { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - EaseInOut, - -@@ -2041,8 +2039,7 @@ declare enum Curve { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - FastOutSlowIn, - -@@ -2074,8 +2071,7 @@ declare enum Curve { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - LinearOutSlowIn, - -@@ -2107,8 +2103,7 @@ declare enum Curve { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - FastOutLinearIn, - -@@ -2140,8 +2135,7 @@ declare enum Curve { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - ExtremeDeceleration, - -@@ -2173,8 +2167,7 @@ declare enum Curve { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - Sharp, - -@@ -2206,8 +2199,7 @@ declare enum Curve { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - Rhythm, - -@@ -2239,8 +2231,7 @@ declare enum Curve { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - Smooth, - -@@ -2272,12 +2263,24 @@ declare enum Curve { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - Friction, - } - -+/** -+ * enum Curve. -+ * -+ * @typedef { curves.Curve } Curve -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+export type Curve = curves.Curve; -+ - /** - * Sets the state before and after the animation starts. - * -diff --git a/api/@internal/component/ets/form_component.d.ts b/api/@internal/component/ets/form_component.d.ts -index 076170cab..8b2d7bc66 100644 ---- a/api/@internal/component/ets/form_component.d.ts -+++ b/api/@internal/component/ets/form_component.d.ts -@@ -21,11 +21,12 @@ - import { CommonMethod,Callback } from './common'; - import Want from '../../@ohos.app.ability.Want'; - import { Visibility } from './enums' -+import { VoidCallback } from './units'; - /*** endif */ - /** - * Defines the FormDimension enum. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @since arkts {'1.1':'7','1.2':'20'} -@@ -40,7 +41,7 @@ declare enum FormDimension { - * @since arkts {'1.1':'7','1.2':'20'} - * @arkts 1.1&1.2 - */ -- Dimension_1_2, -+ Dimension_1_2 = 0, - - /** - * 2 x 2 cards -@@ -50,7 +51,7 @@ declare enum FormDimension { - * @since arkts {'1.1':'7','1.2':'20'} - * @arkts 1.1&1.2 - */ -- Dimension_2_2, -+ Dimension_2_2 = 1, - - /** - * 2 x 4 cards -@@ -60,7 +61,7 @@ declare enum FormDimension { - * @since arkts {'1.1':'7','1.2':'20'} - * @arkts 1.1&1.2 - */ -- Dimension_2_4, -+ Dimension_2_4 = 2, - - /** - * 4 x 4 cards -@@ -70,17 +71,17 @@ declare enum FormDimension { - * @since arkts {'1.1':'7','1.2':'20'} - * @arkts 1.1&1.2 - */ -- Dimension_4_4, -+ Dimension_4_4 = 3, - - /** - * 2 x 1 cards - * - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since arkts {'1.1':'9','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 -+ * @deprecated since 20 - */ -- Dimension_2_1, -+ Dimension_2_1 = 4, - - /** - * 1 x 1 cards -@@ -101,7 +102,7 @@ declare enum FormDimension { - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- DIMENSION_6_4, -+ DIMENSION_6_4 = 7, - - /** - * 2 x 3 cards used for wearable devices -@@ -121,23 +122,13 @@ declare enum FormDimension { - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 - */ -- DIMENSION_3_3 = 9, -- -- /** -- * 3 x 4 cards used for tv devices -- * -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @systemapi -- * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 -- */ -- DIMENSION_3_4 = 10, -+ DIMENSION_3_3 = 9 - } - - /** - * Defines the FormRenderingMode enum. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} -@@ -169,7 +160,7 @@ declare enum FormRenderingMode { - /** - * Defines the FormShape enum. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} -@@ -210,13 +201,13 @@ declare interface FormInfo { - /** - * The id the form. - * -- * @type { number | string } -+ * @type { long | string } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- id: number | string; -+ id: long | string; - - /** - * The name of the form. -@@ -297,7 +288,7 @@ declare interface FormInfo { - /** - * The want of the form. - * -- * @type { ?import('../api/@ohos.app.ability.Want').default } -+ * @type { ?Want } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @since 20 -@@ -342,7 +333,7 @@ interface FormComponentInterface { - * Set a new value. - * - * @param { { -- * id: number; -+ * id: long; - * name: string; - * bundle: string; - * ability: string; -@@ -400,13 +391,13 @@ interface FormCallbackInfo { - /** - * The id of the form. - * -- * @type { number } -+ * @type { long } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- id: number; -+ id: long; - - /** - * The string id of the form. -@@ -420,67 +411,72 @@ interface FormCallbackInfo { - idString: string; - } - /** -- * Defines the FormCallbackInfo. -+ * Defines the size of Form. - * - * @interface FormSize - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since 20 -- * @arkts 1.2 -+ * @since arkts{ '1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface FormSize { - /** -- * The string id of the form. -+ * The width of the form. -+ * Anonymous Object Rectification - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since 20 -- * @arkts 1.2 -+ * @since arkts{ '1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- width: number; -+ width: double; - /** -- * The string id of the form. -+ * The height of the form. -+ * Anonymous Object Rectification - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since 20 -- * @arkts 1.2 -+ * @since arkts{ '1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- height: number; -+ height: double; - } - - /** -- * Defines the FormCallbackInfo. -+ * Defines error information for card loading. - * -- * @interface FormError -+ * @typedef ErrorInformation - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since 20 -- * @arkts 1.2 -+ * @since arkts{ '1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ --interface FormError { -+interface ErrorInformation { - /** -- * The string id of the form. -+ * Error code. -+ * Anonymous Object Rectification - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since 20 -- * @arkts 1.2 -+ * @since arkts{ '1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- errcode: number; -+ errcode: int; -+ - /** -- * The string id of the form. -+ * Error information. -+ * Anonymous Object Rectification - * -- * @type { number } -+ * @type { string } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since 20 -- * @arkts 1.2 -+ * @since arkts{ '1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- msg: string -+ msg: string; - } - - /** -@@ -500,19 +496,17 @@ declare class FormComponentAttribute extends CommonMethod void): FormComponentAttribute; -- - /** - * Card loading error. - * -- * @param { Callback } callback -+ * @param { Callback } callback - * @returns { FormComponentAttribute } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since 20 -- * @arkts 1.2 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- onError(callback: Callback): FormComponentAttribute; -+ onError(callback: Callback): FormComponentAttribute; - - /** - * Card to be redirected. -@@ -617,19 +609,18 @@ declare class FormComponentAttribute extends CommonMethod void): FormComponentAttribute; -- - /** - * Card to be redirected. -+ * Anonymous Object Rectification - * -- * @param { function } callback -+ * @param { Callback } callback - * @returns { FormComponentAttribute } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since 20 -- * @arkts 1.2 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- onRouter(callback: Callback): FormComponentAttribute; -+ onRouter(callback: Callback): FormComponentAttribute; - - /** - * Uninstall Card. -@@ -659,10 +650,19 @@ declare class FormComponentAttribute extends CommonMethod void): FormComponentAttribute; -+ onLoad(callback: VoidCallback): FormComponentAttribute; - } - - /** -diff --git a/api/@internal/component/ets/grid.d.ts b/api/@internal/component/ets/grid.d.ts -index 7a5f2d275..7e1cf1ef8 100644 ---- a/api/@internal/component/ets/grid.d.ts -+++ b/api/@internal/component/ets/grid.d.ts -@@ -1356,17 +1356,17 @@ declare class GridAttribute extends ScrollableCommonMethod { - * @atomicservice - * @since 11 - */ -- onScrollFrameBegin(event: (offset: number, state: ScrollState) => { offsetRemain: number }): GridAttribute; -- - /** - * Called when scrolling begin each frame. -+ * Anonymous Object Rectification. - * -- * @param { OnScrollFrameBeginCallback } event -- * @returns { GridAttribute } -+ * @param { OnScrollFrameBeginCallback } event - callback function, triggered when the scrolling begin each frame. -+ * @returns { GridAttribute } Returns the instance of the GridAttribute. - * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform - * @atomicservice - * @since 20 -- * @arkts 1.2 -+ * @arkts 1.1&1.2 - */ - onScrollFrameBegin(event: OnScrollFrameBeginCallback): GridAttribute; - -diff --git a/api/@internal/component/ets/image.d.ts b/api/@internal/component/ets/image.d.ts -index e6263095e..ba0171248 100644 ---- a/api/@internal/component/ets/image.d.ts -+++ b/api/@internal/component/ets/image.d.ts -@@ -1130,8 +1130,7 @@ declare class ImageAttribute extends CommonMethod { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - fillColor(value: ResourceColor): ImageAttribute; - -@@ -1143,8 +1142,7 @@ declare class ImageAttribute extends CommonMethod { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'15','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - fillColor(color: ResourceColor | ColorContent): ImageAttribute; - -diff --git a/api/@internal/component/ets/image_span.d.ts b/api/@internal/component/ets/image_span.d.ts -index 3bce91cbb..5c5ec3031 100644 ---- a/api/@internal/component/ets/image_span.d.ts -+++ b/api/@internal/component/ets/image_span.d.ts -@@ -22,7 +22,7 @@ - import { ResourceStr, ColorFilter} from './units'; - import { BaseSpan } from './span'; - import { ImageSpanAlignment, ImageFit } from './enums'; --import { ImageErrorCallback } from './image'; -+import { ImageErrorCallback, DrawingColorFilter } from './image'; - import { PixelMap } from './common'; - import image from '../../@ohos.multimedia.image'; - /*** endif */ -@@ -118,7 +118,8 @@ declare class ImageSpanAttribute extends BaseSpan { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - colorFilter(filter: ColorFilter | DrawingColorFilter): ImageSpanAttribute; - -diff --git a/api/@internal/component/ets/lazy_grid_layout.d.ts b/api/@internal/component/ets/lazy_grid_layout.d.ts -index cea509445..cd34f5b29 100644 ---- a/api/@internal/component/ets/lazy_grid_layout.d.ts -+++ b/api/@internal/component/ets/lazy_grid_layout.d.ts -@@ -18,6 +18,12 @@ - * @kit ArkUI - */ - -+ -+/*** if arkts 1.2 */ -+import { CommonMethod } from './common'; -+import { LengthMetrics } from '../Graphics'; -+/*** endif */ -+ - /** - * Defines the lazy vertical grid layout component. - * -@@ -25,7 +31,8 @@ - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface LazyVGridLayoutInterface { - /** -@@ -35,7 +42,8 @@ interface LazyVGridLayoutInterface { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - (): LazyVGridLayoutAttribute; - } -@@ -47,30 +55,33 @@ interface LazyVGridLayoutInterface { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare class LazyGridLayoutAttribute extends CommonMethod { - /** - * The spacing between rows. - * -- * @param { Length } value -+ * @param { LengthMetrics } value - * @returns { T } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - rowsGap(value: LengthMetrics): T; - - /** - * The spacing between columns. - * -- * @param { Length } value -+ * @param { LengthMetrics } value - * @returns { T } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - columnsGap(value: LengthMetrics): T; - } -@@ -82,7 +93,8 @@ declare class LazyGridLayoutAttribute extends CommonMethod { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare class LazyVGridLayoutAttribute extends LazyGridLayoutAttribute { - /** -@@ -93,7 +105,8 @@ declare class LazyVGridLayoutAttribute extends LazyGridLayoutAttribute { - * @atomicservice - * @since 11 - */ -- onScrollFrameBegin(event: (offset: number, state: ScrollState) => { offsetRemain: number }): ListAttribute; -- - /** - * Called when scrolling begin each frame. -+ * Anonymous Object Rectification. - * -- * @param { OnScrollFrameBeginCallback } event -- * @returns { ListAttribute } -+ * @param { OnScrollFrameBeginCallback } event - callback function, triggered when the scrolling begin each frame. -+ * @returns { ListAttribute } Returns the instance of the ListAttribute. - * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform - * @form - * @atomicservice - * @since 20 -- * @arkts 1.2 -+ * @arkts 1.1&1.2 - */ - onScrollFrameBegin(event: OnScrollFrameBeginCallback): ListAttribute; - -diff --git a/api/@internal/component/ets/list_item.d.ts b/api/@internal/component/ets/list_item.d.ts -index e5149aa59..914f1fd99 100644 ---- a/api/@internal/component/ets/list_item.d.ts -+++ b/api/@internal/component/ets/list_item.d.ts -@@ -19,7 +19,7 @@ - */ - - /*** if arkts 1.2 */ --import { CommonMethod } from './common'; -+import { CommonMethod, Bindable } from './common'; - import { CustomBuilder } from './builder' - import { Length } from './units'; - import { ComponentContent } from '../ComponentContent' -@@ -814,11 +814,25 @@ declare class ListItemAttribute extends CommonMethod { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - selected(value: boolean): ListItemAttribute; - -+ /** -+ * Called when judging whether it is selected. -+ * This parameter supports $$ for two-way binding of variables. -+ * -+ * @param { boolean | Bindable } value - if the listItem is selected. -+ * @returns { ListItemAttribute } the attribute of the listItem. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ selected(value: boolean | Bindable): ListItemAttribute; -+ - /** - * Sets the action item that appears when the list item slides in the cross axis direction of the list. - * -diff --git a/api/@internal/component/ets/menu_item.d.ts b/api/@internal/component/ets/menu_item.d.ts -index f03be8699..f83ad5a4e 100644 ---- a/api/@internal/component/ets/menu_item.d.ts -+++ b/api/@internal/component/ets/menu_item.d.ts -@@ -20,7 +20,7 @@ - - /*** if arkts 1.2 */ - import { ResourceStr, Font, ResourceColor } from './units'; --import { CommonMethod } from './common'; -+import { CommonMethod, Bindable } from './common'; - import { CustomBuilder } from './builder'; - import { SymbolGlyphModifier } from '../../arkui/SymbolGlyphModifier'; - /*** endif */ -@@ -317,11 +317,24 @@ declare class MenuItemAttribute extends CommonMethod { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - selected(value: boolean): MenuItemAttribute; - -+ /** -+ * Setting whether menuItem is selected. -+ * -+ * @param { boolean | undefined | Bindable } value -+ * @returns { MenuItemAttribute } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ selected(value: boolean | undefined | Bindable): MenuItemAttribute; -+ -+ - /** - * Whether the relevant check icon is displayed when a menu item is selected. - * -diff --git a/api/@internal/component/ets/nav_destination.d.ts b/api/@internal/component/ets/nav_destination.d.ts -index a32de22d2..9c55c6bb5 100644 ---- a/api/@internal/component/ets/nav_destination.d.ts -+++ b/api/@internal/component/ets/nav_destination.d.ts -@@ -947,7 +947,18 @@ declare class NavDestinationAttribute extends CommonMethod>): NavDestinationAttribute; -+ /** -+ * Invoked when pop to the navDestination with result. -+ * -+ * @param {Optional>} callback - Indicates callback when pop to the navDestination with result. -+ * @returns {NavDestinationAttribute} -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.1&1.2 -+ */ -+ onResult(callback: Optional>): NavDestinationAttribute; - - /** - * Sets the different mode of NavDestination. -diff --git a/api/@internal/component/ets/navigation.d.ts b/api/@internal/component/ets/navigation.d.ts -index 44888a325..ada4780ea 100644 ---- a/api/@internal/component/ets/navigation.d.ts -+++ b/api/@internal/component/ets/navigation.d.ts -@@ -23,7 +23,7 @@ import window from '../../@ohos.window'; - import { Resource } from '../../global/resource'; - import { TextModifier } from '../../arkui/TextModifier'; - import { LengthMetrics } from '../../arkui/Graphics'; --import { Callback, BlurStyle, CommonMethod, Optional, LayoutSafeAreaType, LayoutSafeAreaEdge, BackgroundEffectOptions, BackgroundBlurStyleOptions, PixelMap } from './common' -+import { Callback, BlurStyle, CommonMethod, Optional, LayoutSafeAreaType, LayoutSafeAreaEdge, BackgroundEffectOptions, BackgroundBlurStyleOptions, PixelMap, Bindable } from './common' - import { CustomBuilder, PageMapBuilder } from './builder' - import { Length, ResourceStr, ResourceColor, Dimension, VoidCallback } from './units' - import { TitleHeight } from './enums' -@@ -2651,11 +2651,23 @@ declare class NavigationAttribute extends CommonMethod { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - navBarWidth(value: Length): NavigationAttribute; - -+ /** -+ * Sets the width of navigation bar. -+ * -+ * @param { Length | Bindable } value -+ * @returns { NavigationAttribute } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ navBarWidth(value: Length | Bindable): NavigationAttribute; -+ - /** - * Sets the position of navigation bar. - * -diff --git a/api/@internal/component/ets/page_transition.d.ts b/api/@internal/component/ets/page_transition.d.ts -index 5c7380cc7..cef1ce53a 100644 ---- a/api/@internal/component/ets/page_transition.d.ts -+++ b/api/@internal/component/ets/page_transition.d.ts -@@ -19,8 +19,8 @@ - */ - - /*** if arkts 1.2 */ --import { ICurve, TranslateOptions, ScaleOptions } from './common' --import { Curve } from './enums' -+import { ICurve, TranslateOptions, ScaleOptions } from './common'; -+import { Curve } from './enums'; - /*** endif */ - - /** -@@ -756,7 +756,6 @@ interface PageTransitionEnterInterface extends CommonTransition): ParticleAttribute; --} - --/** -- * Defines Particle Component. -- * -- * @param { Particles } particles - Particle infomation. -- * @returns { ParticleAttribute } Returns the particle attribute. -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ --@memo --@ComponentBuilder --export declare function Particle( -- particles: Particles --): ParticleAttribute -+ /** -+ * create a particle array. -+ * -+ * @param { Particles } particles - Array of particles. -+ * @returns { ParticleAttribute } Returns the particle attribute. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ (particles: Particles): ParticleAttribute; -+} - - /** - * Enumerates the particle types. -diff --git a/api/@internal/component/ets/paste_button.d.ts b/api/@internal/component/ets/paste_button.d.ts -index 3eba6bab9..97927fefc 100644 ---- a/api/@internal/component/ets/paste_button.d.ts -+++ b/api/@internal/component/ets/paste_button.d.ts -@@ -273,8 +273,6 @@ interface PasteButtonInterface { - (options: PasteButtonOptions): PasteButtonAttribute; - } - -- -- - /** - * Callback function when the paste button is clicked. - * -diff --git a/api/@internal/component/ets/plugin_component.d.ts b/api/@internal/component/ets/plugin_component.d.ts -index e2bf44475..e37e81b0b 100644 ---- a/api/@internal/component/ets/plugin_component.d.ts -+++ b/api/@internal/component/ets/plugin_component.d.ts -@@ -57,11 +57,12 @@ interface PluginComponentTemplate { - - /** - * Define options used to construct a plugin component. -+ * AnonyMous Object Rectification - * - * @interface PluginComponentOptions - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since arkts {'1.1':'14','1.2':'20'} -+ * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 - */ - declare interface PluginComponentOptions { -@@ -70,29 +71,55 @@ declare interface PluginComponentOptions { - * @type { PluginComponentTemplate } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since arkts {'1.1':'9','1.2':'20'} -+ * @since 9 -+ */ -+ /** -+ * Plugin component template. -+ * AnonyMous Object Rectification -+ * @type { PluginComponentTemplate } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @systemapi -+ * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 - */ - template: PluginComponentTemplate; - - /** - * Plugin component data. -+ * @type { any } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @systemapi -+ * @since 9 -+ */ -+ /** -+ * Plugin component data. -+ * AnonyMous Object Rectification -+ * @type { any } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @systemapi -+ * @since 18 -+ */ -+ data: any; -+ /** -+ * Plugin component data. -+ * AnonyMous Object Rectification - * @type { Object|undefined|null } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since arkts {'1.1':'9','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 20 -+ * @arkts 1.2 - */ - data: Object|undefined|null; - } - - /** - * Data provided when an error occurs. -+ * AnonyMous Object Rectification - * - * @interface PluginErrorData - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since arkts {'1.1':'14','1.2':'20'} -+ * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 - */ - declare interface PluginErrorData { -@@ -101,7 +128,15 @@ declare interface PluginErrorData { - * @type { number } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since arkts {'1.1':'9','1.2':'20'} -+ * @since 9 -+ */ -+ /** -+ * Error code. -+ * AnonyMous Object Rectification -+ * @type { number } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @systemapi -+ * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 - */ - errcode: number; -@@ -111,7 +146,15 @@ declare interface PluginErrorData { - * @type { string } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since arkts {'1.1':'9','1.2':'20'} -+ * @since 9 -+ */ -+ /** -+ * Error message. -+ * AnonyMous Object Rectification -+ * @type { string } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @systemapi -+ * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 - */ - msg: string; -@@ -119,27 +162,17 @@ declare interface PluginErrorData { - - /** - * Callback invoked when an error occurs. -+ * AnonyMous Object Rectification - * - * @typedef { function } PluginErrorCallback - * @param { PluginErrorData } info - Plugin error data - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare type PluginErrorCallback = (info: PluginErrorData) => void; - --/** -- * Callback invoked when an error occurs. -- * -- * @typedef { function } PluginErrorCallback -- * @param { PluginErrorData } info - Plugin error data -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @systemapi -- * @since 20 -- * @arkts 1.2 -- */ --type PluginErrorCallback = (info: PluginErrorData) => void -- - /** - * Provides plugin component. - * -@@ -161,12 +194,13 @@ interface PluginComponentInterface { - */ - /** - * Called when setting the plugin. -+ * AnonyMous Object Rectification - * - * @param { PluginComponentOptions } options - Plugin component options - * @returns { PluginComponentAttribute } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since arkts {'1.1':'14','1.2':'20'} -+ * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 - */ - (options: PluginComponentOptions): PluginComponentAttribute; -@@ -193,12 +227,13 @@ declare class PluginComponentAttribute extends CommonMethod { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - checked(value: boolean): RadioAttribute; - -@@ -468,11 +467,24 @@ declare class RadioAttribute extends CommonMethod { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 18 - */ - checked(isChecked: Optional): RadioAttribute; - -+ /** -+ * Called when the radio box is selected. -+ * -+ * @param { boolean | undefined | Bindable } isChecked -+ * @returns { RadioAttribute } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ checked(isChecked: boolean | undefined | Bindable): RadioAttribute; -+ - /** - * Called when the radio box selection status changes. - * -diff --git a/api/@internal/component/ets/rating.d.ts b/api/@internal/component/ets/rating.d.ts -index eebfbdb74..6ba182244 100644 ---- a/api/@internal/component/ets/rating.d.ts -+++ b/api/@internal/component/ets/rating.d.ts -@@ -19,7 +19,7 @@ - */ - - /*** if arkts 1.2 */ --import { CommonConfiguration,Callback,CommonMethod,Optional,ContentModifier } from './common' -+import { CommonConfiguration, Callback, CommonMethod, Optional, ContentModifier, Bindable } from './common' - import { ResourceStr } from './units'; - /*** endif */ - -@@ -67,11 +67,23 @@ declare interface RatingOptions { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - rating: number; - -+ /** -+ * Rating option. -+ * -+ * @type { number | undefined | Bindable } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ rating: number | undefined | Bindable; -+ - /** - * Indicator option. - * -diff --git a/api/@internal/component/ets/refresh.d.ts b/api/@internal/component/ets/refresh.d.ts -index 8cb9cfd8d..567a72565 100644 ---- a/api/@internal/component/ets/refresh.d.ts -+++ b/api/@internal/component/ets/refresh.d.ts -@@ -19,7 +19,7 @@ - */ - - /*** if arkts 1.2 */ --import { Callback, Optional, CommonMethod } from './common' -+import { Callback, Optional, CommonMethod, Bindable } from './common' - import { CustomBuilder } from './builder' - import { ResourceStr } from './units' - import { ComponentContent } from '../ComponentContent' -@@ -223,10 +223,21 @@ interface RefreshOptions { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - refreshing: boolean; -+ /** -+ * Whether the current component is being refreshed. -+ * This parameter supports $$ for two-way binding of variables. -+ * -+ * @type { boolean | Bindable } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ refreshing: boolean | Bindable; - - /** - * Distance to the top of the parent component from the component that -diff --git a/api/@internal/component/ets/rich_editor.d.ts b/api/@internal/component/ets/rich_editor.d.ts -index 0527a3ca8..a9d833953 100644 ---- a/api/@internal/component/ets/rich_editor.d.ts -+++ b/api/@internal/component/ets/rich_editor.d.ts -@@ -21,7 +21,7 @@ - /*** if arkts 1.2 */ - import { ShadowOptions, ClickEvent, SelectionOptions, CommonMethod, Callback, HapticFeedbackMode, RectResult, HoverEvent, PixelMap } from './common'; - import { CustomBuilder } from './builder'; --import { ResourceColor, Length, ResourceStr, Dimension, Margin, BorderRadiuses, Font } from './units'; -+import { ResourceColor, Length, ResourceStr, Dimension, Margin, BorderRadiuses, Font, VoidCallback } from './units'; - import { FontStyle, FontWeight, TextAlign, WordBreak, LineBreakStrategy, ImageSpanAlignment, ImageFit, ResponseType, CopyOptions, BarState } from './enums'; - import { DecorationStyleInterface, StyledString, MutableStyledString } from './styledString'; - import { Resource } from './../../../api/global/resource'; -@@ -731,10 +731,21 @@ declare interface PasteEvent { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - preventDefault?: Callback; -+ -+ /** -+ * Override system paste event. -+ * -+ * @type { ?VoidCallback } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ preventDefault?: VoidCallback; - } - - /** -@@ -3062,11 +3073,22 @@ declare interface SelectionMenuOptions { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - onDisappear?: Callback; - -+ /** -+ * Callback function when the selection menu disappears. -+ * -+ * @type { ?VoidCallback } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ onDisappear?: VoidCallback; -+ - /** - * Menu type, default value is MenuType.SELECTION_MENU. - * -@@ -3715,11 +3737,23 @@ declare class RichEditorAttribute extends CommonMethod { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - onReady(callback: Callback): RichEditorAttribute; - -+ /** -+ * Called when on ready. -+ * -+ * @param { VoidCallback } callback - The triggered function when rich editor is ready. -+ * @returns { RichEditorAttribute } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ onReady(callback: VoidCallback): RichEditorAttribute; -+ - /** - * Called when the content is selected. - * -@@ -3896,11 +3930,23 @@ declare class RichEditorAttribute extends CommonMethod { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - onDeleteComplete(callback: Callback): RichEditorAttribute; - -+ /** -+ * Notify that the deletion has been completed -+ * -+ * @param { VoidCallback } callback - The triggered function when text content has been deleted. -+ * @returns { RichEditorAttribute } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ onDeleteComplete(callback: VoidCallback): RichEditorAttribute; -+ - /** - * Allow replication. - * -@@ -4314,10 +4360,21 @@ declare interface CutEvent { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - preventDefault?: Callback; -+ -+ /** -+ * Prevent system cut event. -+ * -+ * @type { ?VoidCallback } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ preventDefault?: VoidCallback; - } - - /** -@@ -4337,10 +4394,21 @@ declare interface CopyEvent { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - preventDefault?: Callback; -+ -+ /** -+ * Prevent system cut event. -+ * -+ * @type { ?VoidCallback } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ preventDefault?: VoidCallback; - } - - /** -diff --git a/api/@internal/component/ets/save_button.d.ts b/api/@internal/component/ets/save_button.d.ts -index 0c370416c..931bed2ff 100644 ---- a/api/@internal/component/ets/save_button.d.ts -+++ b/api/@internal/component/ets/save_button.d.ts -@@ -275,7 +275,8 @@ declare enum SaveDescription { - * - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SAVE_ALL = 12 - } -diff --git a/api/@internal/component/ets/search.d.ts b/api/@internal/component/ets/search.d.ts -index 1e598d043..42f355266 100644 ---- a/api/@internal/component/ets/search.d.ts -+++ b/api/@internal/component/ets/search.d.ts -@@ -19,7 +19,7 @@ - */ - - /*** if arkts 1.2 */ --import { TextContentControllerBase, SelectionOptions,Callback,CommonMethod,Optional,TextDecorationOptions } from './common'; -+import { TextContentControllerBase, SelectionOptions,Callback,CommonMethod,Optional,TextDecorationOptions, Bindable } from './common'; - import { CustomBuilder } from './builder'; - import { ResourceStr,Length,ResourceColor ,Dimension,Font} from './units'; - import { CaretStyle, EditableTextOnChangeCallback, InsertValue, DeleteValue, EditMenuOptions,KeyboardAppearance,EditableTextChangeValue,AutoCapitalizationMode } from './textCommon'; -@@ -352,11 +352,21 @@ declare interface SearchOptions { - * @type { ?string } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - value?: string; - -+ /** -+ * Text input in the search text box. -+ * -+ * @type { ?(string | Bindable)} -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ value?: string | Bindable; -+ - /** - * Text displayed when there is no input. - * -diff --git a/api/@internal/component/ets/security_component.d.ts b/api/@internal/component/ets/security_component.d.ts -index 59fcccef6..4b9df7a79 100644 ---- a/api/@internal/component/ets/security_component.d.ts -+++ b/api/@internal/component/ets/security_component.d.ts -@@ -28,17 +28,18 @@ import { Resource } from '../../global/resource'; - /** - * Enumerates the layout direction of the icon and text. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @since 10 - */ - /** - * Enumerates the layout direction of the icon and text. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare enum SecurityComponentLayoutDirection { - /** -@@ -52,7 +53,8 @@ declare enum SecurityComponentLayoutDirection { - * - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - HORIZONTAL = 0, - -@@ -67,38 +69,8 @@ declare enum SecurityComponentLayoutDirection { - * - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since 11 -- */ -- VERTICAL = 1 --} -- --/** -- * Enumerates the layout direction of the icon and text. -- * -- * @enum { int } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ --declare enum SecurityComponentLayoutDirection { -- /** -- * Horizontal layout. -- * -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ -- HORIZONTAL = 0, -- -- /** -- * Vertical layout. -- * -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - VERTICAL = 1 - } -@@ -278,22 +250,11 @@ declare class SecurityComponentMethod { - /** - * Font weight of the inner text. - * -- * @param { number | FontWeight | string } value - Indicates the font weight of the text in the security component. -+ * @param { int | FontWeight | string } value - Indicates the font weight of the text in the security component. - * @returns { T } Returns the attribute of the security component. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @since 10 - */ -- /** -- * Font weight of the inner text. -- * -- * @param { number | FontWeight | string } value - Indicates the font weight of the text in the security component. -- * @returns { T } Returns the attribute of the security component. -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @atomicservice -- * @since 11 -- */ -- fontWeight(value: number | FontWeight | string): T; -- - /** - * Font weight of the inner text. - * -@@ -301,8 +262,8 @@ declare class SecurityComponentMethod { - * @returns { T } Returns the attribute of the security component. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since 20 -- * @arkts 1.2 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - fontWeight(value: int | FontWeight | string): T; - -@@ -473,7 +434,8 @@ declare class SecurityComponentMethod { - * @returns { T } Returns the attribute of the security component. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - borderRadius(radius: Dimension | BorderRadiuses): T; - -@@ -676,62 +638,62 @@ declare class SecurityComponentMethod { - /** - * Sets the minimum font scale factor for text. - * -- * @param { number | Resource } scale Minimum font scale factor to set. -+ * @param { double | Resource } scale Minimum font scale factor to set. - * @returns { T } Returns the attributes of the security component. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- minFontScale(scale: number | Resource): T; -+ minFontScale(scale: double | Resource): T; - - /** - * Sets the maximum font scale factor for text. - * -- * @param { number | Resource } scale Maximum font scale factor to set. -+ * @param { double | Resource } scale Maximum font scale factor to set. - * @returns { T } Returns the attributes of the security component. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- maxFontScale(scale: number | Resource): T; -+ maxFontScale(scale: double | Resource): T; - - /** - * Called when the maximum number of lines of text is set. - * -- * @param { number } line -+ * @param { int } line - * @returns { T } Returns the attribute of the security component. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- maxLines(line: number): T; -+ maxLines(line: int): T; - - /** - * Called when the minimum font size of the font is set. - * -- * @param { number | string | Resource } minSize -+ * @param { double | string | Resource } minSize - * @returns { T } Returns the attribute of the security component. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- minFontSize(minSize: number | string | Resource): T; -+ minFontSize(minSize: double | string | Resource): T; - - /** - * Called when the maximum font size of the font is set. - * -- * @param { number | string | Resource } maxSize -+ * @param { double | string | Resource } maxSize - * @returns { T } Returns the attribute of the security component. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- maxFontSize(maxSize: number | string | Resource): T; -+ maxFontSize(maxSize: double | string | Resource): T; - - /** - * Called when the height adaptive policy is set. -diff --git a/api/@internal/component/ets/select.d.ts b/api/@internal/component/ets/select.d.ts -index 2786be794..fd64fb960 100644 ---- a/api/@internal/component/ets/select.d.ts -+++ b/api/@internal/component/ets/select.d.ts -@@ -19,7 +19,7 @@ - */ - - /*** if arkts 1.2 */ --import { CommonConfiguration, CommonMethod, ContentModifier, Optional, BlurStyle } from './common'; -+import { CommonConfiguration, CommonMethod, ContentModifier, Optional, BlurStyle, Bindable } from './common'; - import { ControlSize } from './button'; - import { DividerOptions } from './textPicker'; - import { ResourceStr, Dimension, EdgeOutlineWidths, ResourceColor, EdgeColors, Resource, Font, Length, Offset, DividerStyleOptions } from './units'; -@@ -434,8 +434,7 @@ declare class SelectAttribute extends CommonMethod { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - selected(value: number | Resource): SelectAttribute; - -@@ -447,11 +446,24 @@ declare class SelectAttribute extends CommonMethod { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 18 - */ - selected(numCount: Optional): SelectAttribute; - -+ /** -+ * Sets the serial number of the select item, starting from 0. -+ * -+ * @param { number | Resource | undefined | Bindable | Bindable } numCount - the serial number of the select item. -+ * @returns { SelectAttribute } the attribute of the select. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ selected(numCount: number | Resource | undefined | Bindable | Bindable): SelectAttribute; -+ -+ - /** - * Sets the text display of the select button itself. - * -@@ -477,8 +489,7 @@ declare class SelectAttribute extends CommonMethod { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - value(value: ResourceStr): SelectAttribute; - -@@ -490,11 +501,23 @@ declare class SelectAttribute extends CommonMethod { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 18 - */ - value(resStr: Optional): SelectAttribute; - -+ /** -+ * Sets the text display of the select button itself. -+ * -+ * @param { ResourceStr | undefined | Bindable | Bindable } resStr - the text display of the select button itself. -+ * @returns { SelectAttribute } the attribute of the select. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ value(resStr: ResourceStr | undefined | Bindable | Bindable): SelectAttribute; -+ - /** - * Sets the text properties of the select button itself. - * -diff --git a/api/@internal/component/ets/sidebar.d.ts b/api/@internal/component/ets/sidebar.d.ts -index 4a79fdd13..cbb6b4f08 100644 ---- a/api/@internal/component/ets/sidebar.d.ts -+++ b/api/@internal/component/ets/sidebar.d.ts -@@ -21,7 +21,7 @@ - /*** if arkts 1.2 */ - import { Resource } from '../../global/resource' - import { Length, ResourceColor, Dimension } from './units' --import { CommonMethod, PixelMap } from './common' -+import { CommonMethod, PixelMap, Bindable } from './common' - /*** endif */ - - /** -@@ -708,11 +708,23 @@ declare class SideBarContainerAttribute extends CommonMethod } value -+ * @returns { SideBarContainerAttribute } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ showSideBar(value: boolean | Bindable): SideBarContainerAttribute; -+ - /** - * Callback controlButton function when setting the style of button - * -@@ -831,11 +843,24 @@ declare class SideBarContainerAttribute extends CommonMethod } value -+ * @returns { SideBarContainerAttribute } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ sideBarWidth(value: number | Bindable): SideBarContainerAttribute; -+ - /** - * Sets the min length of sidebar. - * default value is 200vp. -diff --git a/api/@internal/component/ets/slider.d.ts b/api/@internal/component/ets/slider.d.ts -index 908777a4c..5a69bfc54 100644 ---- a/api/@internal/component/ets/slider.d.ts -+++ b/api/@internal/component/ets/slider.d.ts -@@ -19,7 +19,7 @@ - */ - - /*** if arkts 1.2 */ --import { CommonMethod, CommonConfiguration, ContentModifier, Optional } from './common'; -+import { CommonMethod, CommonConfiguration, ContentModifier, Optional, Bindable } from './common'; - import { Axis, CrownSensitivity } from './enums'; - import { ResourceStr, ResourceColor, Length, Dimension, SizeOptions } from './units'; - import { CircleAttribute } from './circle'; -@@ -462,11 +462,23 @@ declare interface SliderOptions { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - value?: number; - -+ /** -+ * Current value of Slider. -+ * -+ * @type { ?(number| undefined | Bindable) } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ value?: number | undefined | Bindable; -+ - /** - * Sets the min value of Slider. - * -diff --git a/api/@internal/component/ets/stepper.d.ts b/api/@internal/component/ets/stepper.d.ts -index fc536b6f9..222293c3a 100644 ---- a/api/@internal/component/ets/stepper.d.ts -+++ b/api/@internal/component/ets/stepper.d.ts -@@ -19,31 +19,42 @@ - */ - - /*** if arkts 1.2 */ --import { CommonMethod } from './common' -+import { Bindable, CommonMethod } from './common' - /*** endif */ - - /** -- * Declare the StepperOptionalIndex. -+ * Declare the StepperOptions. - * -- * @interface StepperOptionalIndex -+ * @interface StepperOptions - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 20 -- * @arkts 1.2 -+ * @arkts 1.1&1.2 - */ --interface StepperOptionalIndex { -+interface StepperOptions { - /** -- * Get stepper index. -+ * Set the stepper index. - * - * @type { ?number } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 20 -+ */ -+ index?: number; -+ -+ /** -+ * Set the stepper index. -+ * -+ * @type { ?(number | Bindable) } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.2 - */ -- index?: number -+ index?: number | Bindable; - } - - /** -@@ -99,20 +110,19 @@ interface StepperInterface { - * @atomicservice - * @since 11 - */ -- (value?: { index?: number }): StepperAttribute; -- - /** - * Called when the stepper component is used. - * -- * @param { StepperOptionalIndex } value -+ * Anonymous Object Rectification. -+ * @param { StepperOptions } value - * @returns { StepperAttribute } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 20 -- * @arkts 1.2 -+ * @arkts 1.1&1.2 - */ -- (value?: StepperOptionalIndex): StepperAttribute; -+ (value?: StepperOptions): StepperAttribute; - } - - /** -diff --git a/api/@internal/component/ets/styled_string.d.ts b/api/@internal/component/ets/styled_string.d.ts -index 6ee3e215e..e0426caf2 100644 ---- a/api/@internal/component/ets/styled_string.d.ts -+++ b/api/@internal/component/ets/styled_string.d.ts -@@ -1194,6 +1194,19 @@ UserDataSpan | BackgroundColorStyle; - * @arkts 1.1&1.2 - */ - declare class MutableStyledString extends StyledString { -+ /** -+ * constructor. -+ * -+ * @param { string | ImageAttachment | CustomSpan } value - indicates the current object value of the MutableStyledString. -+ * @param { Array } [styles] - indicates the SpanStyle objects. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ constructor(value: string | ImageAttachment | CustomSpan, styles?: Array); -+ - /** - * Replace the string of the specified range. - * -diff --git a/api/@internal/component/ets/swiper.d.ts b/api/@internal/component/ets/swiper.d.ts -index 66df0bdc0..357f1d17c 100644 ---- a/api/@internal/component/ets/swiper.d.ts -+++ b/api/@internal/component/ets/swiper.d.ts -@@ -20,7 +20,7 @@ - - /*** if arkts 1.2 */ - import { IndicatorComponentController } from './indicatorcomponent'; --import { CommonMethod, Callback, ICurve, Optional } from './common'; -+import { CommonMethod, Callback, ICurve, Optional, Bindable } from './common'; - import { EdgeEffect, Curve, PageFlipMode } from './enums'; - import { Length, LengthMetrics, VoidCallback, ResourceColor, VP, Font } from './units'; - /*** endif */ -@@ -1582,10 +1582,22 @@ declare class SwiperAttribute extends CommonMethod { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - index(value: number): SwiperAttribute; -+ /** -+ * Called when the index value of the displayed subcomponent is set in the container. -+ * -+ * @param { number | Bindable } value -+ * @returns { SwiperAttribute } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ index(value: number | Bindable): SwiperAttribute; - - /** - * Called when setting whether the subcomponent plays automatically. -diff --git a/api/@internal/component/ets/tabs.d.ts b/api/@internal/component/ets/tabs.d.ts -index 015fabcf2..1e9092cc8 100644 ---- a/api/@internal/component/ets/tabs.d.ts -+++ b/api/@internal/component/ets/tabs.d.ts -@@ -19,7 +19,7 @@ - */ - - /*** if arkts 1.2 */ --import { BackgroundBlurStyleOptions, BackgroundEffectOptions, BlurStyle, Callback, CommonMethod, Optional, TranslateOptions, DividerStyle } from './common'; -+import { BackgroundBlurStyleOptions, BackgroundEffectOptions, BlurStyle, Callback, CommonMethod, Optional, TranslateOptions, DividerStyle, Bindable } from './common'; - import { EdgeEffect, PageFlipMode } from './enums'; - import { Dimension, Length, ResourceColor } from './units'; - import { CommonModifier } from "../CommonModifier"; -@@ -537,10 +537,20 @@ declare interface TabsOptions { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - index?: number; -+ /** -+ * Set the index of the currently displayed tab. -+ * -+ * @type { ?(number | Bindable) } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ index?: number | Bindable; - - /** - * Set the Tabs controller. -diff --git a/api/@internal/component/ets/text_area.d.ts b/api/@internal/component/ets/text_area.d.ts -index 9fa8c3aad..57f9fa267 100644 ---- a/api/@internal/component/ets/text_area.d.ts -+++ b/api/@internal/component/ets/text_area.d.ts -@@ -27,7 +27,7 @@ import { BarState, CopyOptions, FontStyle, FontWeight, LineBreakStrategy, TextCo - import { EnterKeyType, SubmitEvent, ContentType } from './textInput'; - import { Dimension, Font, Length, LengthMetrics, ResourceColor, ResourceStr } from './units'; - import { InputCounterOptions, TextContentControllerBase, SelectionOptions, -- TextDecorationOptions, CommonMethod, Callback, Optional } from './common'; -+ TextDecorationOptions, CommonMethod, Callback, Optional, Bindable } from './common'; - import { CustomBuilder } from './builder'; - import { Resource } from '../../global/resource'; - /*** endif */ -@@ -235,11 +235,22 @@ declare interface TextAreaOptions { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - text?: ResourceStr; - -+ /** -+ * Sets the current value of TextArea. -+ * -+ * @type { ?(ResourceStr | Bindable | Bindable | Bindable) } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ text?: ResourceStr | Bindable | Bindable | Bindable; -+ - /** - * Called when the position of the insertion cursor is set. - * -diff --git a/api/@internal/component/ets/text_common.d.ts b/api/@internal/component/ets/text_common.d.ts -index bb0a8e515..a48d13b89 100644 ---- a/api/@internal/component/ets/text_common.d.ts -+++ b/api/@internal/component/ets/text_common.d.ts -@@ -1214,6 +1214,35 @@ declare interface TextMenuItem { - labelInfo?: ResourceStr; - } - -+/** -+ * Callback function when the selection menu create. -+ * -+ * @typedef { function } OnCreateMenuCallback -+ * @param { Array } menuItems - currently displayed menu items. -+ * @returns { Array } Return the menu items will displayed after operations. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+type OnCreateMenuCallback = (menuItems: Array) => Array; -+ -+/** -+ * Invoke upon clicking an item, capable of intercepting the default system menu execution behavior. -+ * -+ * @typedef { function } OnMenuItemClickCallback -+ * @param { TextMenuItem } menuItem - current default menu. -+ * @param { TextRange } range - current selected range. -+ * @returns { boolean } - Return True, the event is consumed, false otherwise. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+type OnMenuItemClickCallback = (menuItem: TextMenuItem, range: TextRange) => boolean -+ - /** - * EditMenuOptions - * -@@ -1233,8 +1262,7 @@ declare interface EditMenuOptions { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - onCreateMenu(menuItems: Array): Array; - /** -@@ -1246,10 +1274,33 @@ declare interface EditMenuOptions { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - onMenuItemClick(menuItem: TextMenuItem, range: TextRange): boolean; -+ -+ /** -+ * Passes the default menu, invokes before every display to generate a menu for triggering click events. -+ * -+ * @type { OnCreateMenuCallback } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ onCreateMenu: OnCreateMenuCallback; -+ -+ /** -+ * Invoke upon clicking an item, capable of intercepting the default system menu execution behavior. -+ * -+ * @type { OnMenuItemClickCallback } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ onMenuItemClick: OnMenuItemClickCallback; - } - - /** -diff --git a/api/@internal/component/ets/text_input.d.ts b/api/@internal/component/ets/text_input.d.ts -index fd0d0a454..c58a08349 100644 ---- a/api/@internal/component/ets/text_input.d.ts -+++ b/api/@internal/component/ets/text_input.d.ts -@@ -20,7 +20,7 @@ - - /*** if arkts 1.2 */ - import { CancelButtonSymbolOptions, CancelButtonOptions } from "./search"; --import { Callback, CommonMethod, TextContentControllerBase, SelectionOptions, InputCounterOptions, TextDecorationOptions , Optional} from "./common"; -+import { Callback, CommonMethod, TextContentControllerBase, SelectionOptions, InputCounterOptions, TextDecorationOptions, Optional, Bindable} from "./common"; - import { CustomBuilder } from './builder'; - import { BarState, LineBreakStrategy, TextAlign, FontStyle, FontWeight, WordBreak, TextOverflow, - CopyOptions, TextHeightAdaptivePolicy, TextContentStyle, EllipsisMode } from './enums'; -@@ -1078,11 +1078,22 @@ declare interface TextInputOptions { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - text?: ResourceStr; - -+ /** -+ * Sets the current value of TextInput. -+ * -+ * @type { ?(ResourceStr | Bindable | Bindable | Bindable) } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ text?: ResourceStr | Bindable | Bindable | Bindable; -+ - /** - * Called when the position of the insertion cursor is set. - * -diff --git a/api/@internal/component/ets/toggle.d.ts b/api/@internal/component/ets/toggle.d.ts -index 2f63ae351..e57982116 100644 ---- a/api/@internal/component/ets/toggle.d.ts -+++ b/api/@internal/component/ets/toggle.d.ts -@@ -21,7 +21,7 @@ - /*** if arkts 1.2 */ - import { Resource } from '../../global/resource'; - import { ResourceColor } from './units'; --import { CommonConfiguration, Callback, CommonMethod, ContentModifier } from './common'; -+import { CommonConfiguration, Callback, CommonMethod, ContentModifier, Bindable } from './common'; - /*** endif */ - - /** -@@ -351,10 +351,22 @@ declare interface ToggleOptions { - * @crossplatform - * @form - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - isOn?: boolean -+ -+ /** -+ * Whether the toggle is on. -+ * -+ * @type { ?(boolean | undefined | Bindable) } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ isOn?: boolean | undefined | Bindable - } - - /** -diff --git a/api/@internal/component/ets/ui_extension_component.d.ts b/api/@internal/component/ets/ui_extension_component.d.ts -index eac19b4aa..297e762f2 100644 ---- a/api/@internal/component/ets/ui_extension_component.d.ts -+++ b/api/@internal/component/ets/ui_extension_component.d.ts -@@ -20,8 +20,8 @@ - - /*** if arkts 1.2 */ - import Want from '../../@ohos.app.ability.Want' --import { Callback, ErrorCallback,BusinessError } from '../../@ohos.base' --import { CommonMethod } from './common' -+import { Callback, ErrorCallback, BusinessError } from '../../@ohos.base' -+import { CommonMethod, TerminationInfo } from './common' - import { ComponentContent } from '../ComponentContent' - /*** endif */ - -@@ -61,14 +61,16 @@ declare enum DpiFollowStrategy { - * @enum { number } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare enum WindowModeFollowStrategy { - /** - * Followed the host Window Mode. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FOLLOW_HOST_WINDOW_MODE = 0, - -@@ -76,9 +78,10 @@ declare enum WindowModeFollowStrategy { - * Followed the UIExtensionAbility. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- FOLLOW_UI_EXTENSION_ABILITY_WINDOW_MODE = 1, -+ FOLLOW_UI_EXTENSION_ABILITY_WINDOW_MODE = 1 - } - - /** -@@ -147,7 +150,8 @@ declare interface UIExtensionOptions { - * @default WindowModeFollowStrategy.FOLLOW_UI_EXTENSION_ABILITY_WINDOW_MODE - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - windowModeFollowStrategy?: WindowModeFollowStrategy; - } -@@ -182,41 +186,9 @@ declare interface TerminationInfo { - want?: import('../api/@ohos.app.ability.Want').default; - } - --/** -- * Indicates the information when the provider of the embedded UI is terminated. -- * -- * @interface TerminationInfo -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @systemapi -- * @since 20 -- * @arkts 1.2 -- */ --declare interface TerminationInfo { -- /** -- * Defines the termination code. -- * -- * @type { number } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @systemapi -- * @since 20 -- * @arkts 1.2 -- */ -- code: number; -- -- /** -- * Defines the additional termination information. -- * -- * @type { ?Want } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @systemapi -- * @since 20 -- * @arkts 1.2 -- */ -- want?: Want; --} -- - /** - * Get Callback from @ohos.base. -+ * AnonyMous Object Rectification - * - * @typedef { import('../api/@ohos.base').Callback> } - * @syscap SystemCapability.ArkUI.ArkUI.Full -@@ -254,11 +226,11 @@ declare interface UIExtensionProxy { - * @param { object } data - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 - */ - /** - * This function is for sending data to the UIExtensionAbility. -+ * AnonyMous Object Rectification - * - * @param { Record } data - * @syscap SystemCapability.ArkUI.ArkUI.Full -@@ -273,7 +245,7 @@ declare interface UIExtensionProxy { - * - * @param { object } data - data send to the UIExtensionAbility - * @returns { object } data - data transferred from the UIExtensionAbility -- * @throws { BusinessError } 100011 - No callback has been registered to response this request. -+ * @throws { BusinessError } 100011 - No callback has been registered to respond to this request. - * @throws { BusinessError } 100012 - Transferring data failed. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -@@ -281,10 +253,11 @@ declare interface UIExtensionProxy { - */ - /** - * This function is for sending data to the UIExtensionAbility and waiting the result in blocking mode. -+ * AnonyMous Object Rectification - * - * @param { Record } data - Data send to the UIExtensionAbility. - * @returns { Record } data - Data transferred from the UIExtensionAbility. -- * @throws { BusinessError } 100011 - No callback has been registered to response this request. -+ * @throws { BusinessError } 100011 - No callback has been registered to respond to this request. - * @throws { BusinessError } 100012 - Transferring data failed. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi -@@ -304,6 +277,7 @@ declare interface UIExtensionProxy { - */ - /** - * Register the listener that watches for async data receiver callback being registered by UIExtensionAbility. -+ * AnonyMous Object Rectification - * - * @param { 'asyncReceiverRegister' } type - Indicates the type of event. - * @param { Callback } callback - Callback of the listened event. -@@ -325,6 +299,7 @@ declare interface UIExtensionProxy { - */ - /** - * Register the listener that watches for sync data receiver callback being registered by UIExtensionAbility. -+ * AnonyMous Object Rectification - * - * @param { 'syncReceiverRegister' } type - Indicates the type of event. - * @param { Callback } callback - Callback of the listened event. -@@ -346,6 +321,7 @@ declare interface UIExtensionProxy { - */ - /** - * Deregisters the listener that watches for async data receiver callback being registered by UIExtensionAbility. -+ * AnonyMous Object Rectification - * - * @param { 'asyncReceiverRegister' } type - Type of the listened event. - * @param { Callback } [callback] - Callback of the listened event. -@@ -367,6 +343,7 @@ declare interface UIExtensionProxy { - */ - /** - * Deregisters the listener that watches for sync data receiver callback being registered by UIExtensionAbility. -+ * AnonyMous Object Rectification - * - * @param { 'syncReceiverRegister' } type - Type of the listened event. - * @param { Callback } [callback] - Callback of the listened event. -@@ -419,9 +396,10 @@ interface UIExtensionComponentInterface { - * Construct the UIExtensionComponent.
    - * Called when the UIExtensionComponent is used. - * -- * @param { import('../api/@ohos.app.ability.Want').default } want - indicates the want of UIExtensionAbility -+ * @param { Want } want - indicates the want of UIExtensionAbility - * @param { UIExtensionOptions } [options] - Construction configuration of UIExtensionComponentAttribute - * @returns { UIExtensionComponentAttribute } -+ * @throws { BusinessError } 202 - Non-system applications are not allowed to use system APIs. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @since 20 -@@ -457,10 +435,11 @@ declare class UIExtensionComponentAttribute extends CommonMethod } callback -- * - callback called when remote UIExtensionAbility object is -- *
    ready for receive data -+ * callback called when remote UIExtensionAbility object is ready for receive data -+ * -+ * @param { Callback } callback - * @returns { UIExtensionComponentAttribute } -+ * @throws { BusinessError } 202 - Non-system applications are not allowed to use system APIs. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @since 20 -@@ -479,6 +458,8 @@ declare class UIExtensionComponentAttribute extends CommonMethod } callback - * @returns { UIExtensionComponentAttribute } -+ * @throws { BusinessError } 202 - Non-system applications are not allowed to use system APIs. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @systemapi - * @since 20 -@@ -563,7 +546,8 @@ declare class UIExtensionComponentAttribute extends CommonMethod): UIExtensionComponentAttribute; - } -diff --git a/api/@internal/component/ets/units.d.ts b/api/@internal/component/ets/units.d.ts -index ec261a011..9c05110c4 100644 ---- a/api/@internal/component/ets/units.d.ts -+++ b/api/@internal/component/ets/units.d.ts -@@ -66,7 +66,7 @@ declare type Resource = import('../api/global/resource').Resource; - /** - * Defines the data type of the interface restriction. - * -- * @typedef { import('../api/global/resource').Resource } Resource -+ * @typedef { _Resource } Resource - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @form -diff --git a/api/@internal/component/ets/water_flow.d.ts b/api/@internal/component/ets/water_flow.d.ts -index ff94c420d..937e7eb9b 100644 ---- a/api/@internal/component/ets/water_flow.d.ts -+++ b/api/@internal/component/ets/water_flow.d.ts -@@ -800,17 +800,17 @@ declare class WaterFlowAttribute extends ScrollableCommonMethod { offsetRemain: number }): WaterFlowAttribute; -- - /** - * Called when scrolling begin each frame. -+ * Anonymous Object Rectification. - * -- * @param { OnScrollFrameBeginCallback } event -+ * @param { OnScrollFrameBeginCallback } event - callback function, triggered when the scrolling begin each frame. - * @returns { WaterFlowAttribute } the attribute of the water flow. - * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform - * @atomicservice - * @since 20 -- * @arkts 1.2 -+ * @arkts 1.1&1.2 - */ - onScrollFrameBegin(event: OnScrollFrameBeginCallback): WaterFlowAttribute; - -diff --git a/api/@internal/component/ets/web.d.ts b/api/@internal/component/ets/web.d.ts -index 66dce2587..dc279cd7d 100644 ---- a/api/@internal/component/ets/web.d.ts -+++ b/api/@internal/component/ets/web.d.ts -@@ -30,15 +30,14 @@ import { CopyOptions, NestedScrollMode } from './enums'; - /*** endif */ - - /** --* Provides methods for controlling the web controller. --* --* @typedef { webview.WebviewController } --* @syscap SystemCapability.Web.Webview.Core --* @crossplatform --* @atomicservice --* @since 20 --* @arkts 1.2 --*/ -+ * Provides methods for controlling the web controller. -+ * -+ * @typedef { webview.WebviewController } -+ * @syscap SystemCapability.Web.Webview.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ - type WebviewController = webview.WebviewController; - - /** -@@ -2309,7 +2308,7 @@ declare enum ProtectedResourceType { - * - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ - SENSOR = 'TYPE_SENSOR' -@@ -4966,7 +4965,6 @@ declare interface WebOptions { - * @type { WebviewController } - * @syscap SystemCapability.Web.Webview.Core - * @crossplatform -- * @atomicservice - * @since 20 - * @arkts 1.2 - */ -@@ -5046,7 +5044,7 @@ declare interface ScriptItem { - * @type { string } - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ - script: string; -@@ -5057,7 +5055,7 @@ declare interface ScriptItem { - * @type { Array } - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ - scriptRules: Array; -@@ -5717,14 +5715,14 @@ declare interface OnProgressChangeEvent { - /** - * The new progress of the page. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Web.Webview.Core - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- newProgress: number; -+ newProgress: int; - } - - /** -@@ -6299,7 +6297,7 @@ declare interface OnShowFileSelectorEvent { - * @syscap SystemCapability.Web.Webview.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ - result: FileSelectorResult; -@@ -6311,7 +6309,7 @@ declare interface OnShowFileSelectorEvent { - * @syscap SystemCapability.Web.Webview.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ - fileSelector: FileSelectorParam; -@@ -6643,7 +6641,7 @@ declare interface OnSslErrorEventReceiveEvent { - * - * @type { ?Array } - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'18', '1.2':'20'} -+ * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 - */ - certChainData?: Array; -@@ -6828,7 +6826,6 @@ declare interface OnFaviconReceivedEvent { - * - * @type { image.PixelMap } - * @syscap SystemCapability.Web.Webview.Core -- * @atomicservice - * @since 20 - * @arkts 1.2 - */ -@@ -6999,7 +6996,16 @@ declare interface OnOverScrollEvent { - * @typedef JavaScriptProxy - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+/** -+ * Defines the JavaScript object to be injected. -+ * -+ * @typedef JavaScriptProxy -+ * @syscap SystemCapability.Web.Webview.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - declare interface JavaScriptProxy { -@@ -7009,7 +7015,16 @@ declare interface JavaScriptProxy { - * @type { object } - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Objects participating in registration. -+ * -+ * @type { object } -+ * @syscap SystemCapability.Web.Webview.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - object: object; -@@ -7021,7 +7036,17 @@ declare interface JavaScriptProxy { - * @type { string } - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * The name of the registered object, which is consistent with the -+ * object name called in the window. -+ * -+ * @type { string } -+ * @syscap SystemCapability.Web.Webview.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - name: string; -@@ -7033,7 +7058,17 @@ declare interface JavaScriptProxy { - * @type { Array } - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * The method of the application side JavaScript object participating -+ * in the registration. -+ * -+ * @type { Array } -+ * @syscap SystemCapability.Web.Webview.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - methodList: Array; -@@ -7046,24 +7081,44 @@ declare interface JavaScriptProxy { - * @atomicservice - * @since 12 - */ -+ /** -+ * Controller. -+ * -+ * @type { WebController | WebviewController } -+ * @syscap SystemCapability.Web.Webview.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ - controller: WebController | WebviewController; -+ - /** - * Controller. - * - * @type { WebviewController } - * @syscap SystemCapability.Web.Webview.Core -- * @atomicservice -+ * @crossplatform - * @since 20 - * @arkts 1.2 - */ - controller: WebviewController; -+ - /** - * The async method of the application side JavaScript object participating in the registration. - * - * @type { ?Array } - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * The async method of the application side JavaScript object participating in the registration. -+ * -+ * @type { ?Array } -+ * @syscap SystemCapability.Web.Webview.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - asyncMethodList?: Array; -@@ -7518,7 +7573,17 @@ declare class WebAttribute extends CommonMethod { - * @returns { WebAttribute } - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Injects the JavaScript object into window and invoke the function in window. -+ * -+ * @param { JavaScriptProxy } javaScriptProxy - The JavaScript object to be injected. -+ * @returns { WebAttribute } -+ * @syscap SystemCapability.Web.Webview.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - javaScriptProxy(javaScriptProxy: JavaScriptProxy): WebAttribute; -@@ -9812,11 +9877,21 @@ declare class WebAttribute extends CommonMethod { - - /** - * Set the custom text menu. -+ * The Web component custom menu extension item interface allows users to set the extension item's text content, icon, and callback method. -+ * -+ *

    API Note:
    -+ * This interface only supports selecting plain text. When the selected content contains images and other non-text content, -+ * garbled characters will be displayed in the action information. -+ *

    - * - * @param { Array } expandedMenuOptions - Customize text menu options. -+ * The number of menu items, the content size of the menu, and the startIcon -+ * icon size are consistent with the ArkUI Menu component. - * @returns { WebAttribute } - * @syscap SystemCapability.Web.Webview.Core - * @since 12 -+ * @deprecated since 20 -+ * @useinstead ohos.web.WebAttribute#editMenuOptions - */ - selectionMenuOptions(expandedMenuOptions: Array): WebAttribute; - -@@ -10122,6 +10197,7 @@ declare interface SslErrorEvent { - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice - * @since 12 -+ * @deprecated since 20 - */ - declare interface ExpandedMenuItemOptions { - /** -@@ -10131,6 +10207,7 @@ declare interface ExpandedMenuItemOptions { - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice - * @since 12 -+ * @deprecated since 20 - */ - content: ResourceStr; - -@@ -10141,6 +10218,7 @@ declare interface ExpandedMenuItemOptions { - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice - * @since 12 -+ * @deprecated since 20 - */ - startIcon?: ResourceStr; - -@@ -10151,6 +10229,7 @@ declare interface ExpandedMenuItemOptions { - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice - * @since 12 -+ * @deprecated since 20 - */ - action: (selectedText: {plainText: string}) => void; - } -diff --git a/api/@ohos.InputMethodSubtype.d.ts b/api/@ohos.InputMethodSubtype.d.ts -index 0291b403d..1cb08c348 100644 ---- a/api/@ohos.InputMethodSubtype.d.ts -+++ b/api/@ohos.InputMethodSubtype.d.ts -@@ -41,13 +41,13 @@ export default interface InputMethodSubtype { - /** - * The label id of input method subtype. - * -- * @type { ?number } -+ * @type { ?double } - * @readonly - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly labelId?: number; -+ readonly labelId?: double; - - /** - * The name of input method. -@@ -118,13 +118,13 @@ export default interface InputMethodSubtype { - /** - * The icon id of input method subtype. - * -- * @type { ?number } -+ * @type { ?double } - * @readonly - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly iconId?: number; -+ readonly iconId?: double; - - /** - * The extra info of input method subtype. -diff --git a/api/@ohos.PiPWindow.d.ts b/api/@ohos.PiPWindow.d.ts -index 463f21fdd..f8a9524ab 100644 ---- a/api/@ohos.PiPWindow.d.ts -+++ b/api/@ohos.PiPWindow.d.ts -@@ -90,8 +90,7 @@ declare namespace PiPWindow { - * @throws { BusinessError } 801 - Capability not supported. Failed to call the API due to limited device capabilities. - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - function create(config: PiPConfiguration): Promise; - -@@ -111,7 +110,6 @@ declare namespace PiPWindow { - * @syscap SystemCapability.Window.SessionManager - * @atomicservice - * @since 12 -- * @arkts 1.1 - */ - function create(config: PiPConfiguration, contentNode: typeNode.XComponent): Promise; - -@@ -1067,8 +1065,7 @@ declare namespace PiPWindow { - * @param { boolean } enable - Enable auto start picture-in-picture when back home - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - setAutoStartEnabled(enable: boolean): void; - -@@ -1089,8 +1086,7 @@ declare namespace PiPWindow { - * 2. Incorrect parameter types. - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - updateContentSize(width: number, height: number): void; - -@@ -1103,8 +1099,7 @@ declare namespace PiPWindow { - * 3. Parameter verification failed - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - updatePiPControlStatus(controlType: PiPControlType, status: PiPControlStatus): void; - -@@ -1133,8 +1128,7 @@ declare namespace PiPWindow { - * 3. Parameter verification failed - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - setPiPControlEnabled(controlType: PiPControlType, enabled: boolean): void; - -@@ -1145,8 +1139,7 @@ declare namespace PiPWindow { - * @throws { BusinessError } 1300014 - PiP internal error. - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since arkts {'1.1':'15', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - getPiPWindowInfo(): Promise; - -@@ -1163,8 +1156,7 @@ declare namespace PiPWindow { - * @param { function } callback - Used to handle {'stateChange'} command - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - on(type: 'stateChange', callback: (state: PiPState, reason: string) => void): void; - -@@ -1179,8 +1171,7 @@ declare namespace PiPWindow { - * @param { 'stateChange' } type - Used to unregister listener for {'stateChange'} command - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - off(type: 'stateChange'): void; - -@@ -1198,8 +1189,7 @@ declare namespace PiPWindow { - * @param { ControlPanelActionEventCallback } callback - Used to handle {'controlPanelActionEvent'} command. - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - on(type: 'controlPanelActionEvent', callback: ControlPanelActionEventCallback): void; - -@@ -1214,8 +1204,7 @@ declare namespace PiPWindow { - * @param { 'controlPanelActionEvent' } type - Used to unregister listener for {'controlPanelActionEvent'} command - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - off(type: 'controlPanelActionEvent'): void; - -@@ -1226,8 +1215,7 @@ declare namespace PiPWindow { - * @param { Callback } callback - Used to handle {'controlEvent'} command. - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - on(type: 'controlEvent', callback: Callback): void; - -@@ -1237,8 +1225,7 @@ declare namespace PiPWindow { - * @param { Callback } callback - Used to handle {'controlEvent'} command. - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - off(type: 'controlEvent', callback?: Callback): void; - -@@ -1255,8 +1242,7 @@ declare namespace PiPWindow { - * @throws { BusinessError } 1300014 - PiP internal error. - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since arkts {'1.1':'15', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - on(type: 'pipWindowSizeChange', callback: Callback): void; - -@@ -1273,8 +1259,7 @@ declare namespace PiPWindow { - * @throws { BusinessError } 1300014 - PiP internal error. - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since arkts {'1.1':'15', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - off(type: 'pipWindowSizeChange', callback?: Callback): void; - -@@ -1286,8 +1271,7 @@ declare namespace PiPWindow { - * @throws { BusinessError } 1300014 - PiP internal error. - * @syscap SystemCapability.Window.SessionManager - * @systemapi Hide this for inner system use -- * @since arkts {'1.1':'18', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 18 - * @test - */ - isPiPSupported(): boolean; -diff --git a/api/@ohos.UiTest.d.ts b/api/@ohos.UiTest.d.ts -index f162e358f..b45551deb 100755 ---- a/api/@ohos.UiTest.d.ts -+++ b/api/@ohos.UiTest.d.ts -@@ -79,8 +79,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - EQUALS = 0, - /** -@@ -105,8 +105,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - CONTAINS = 1, - /** -@@ -131,8 +131,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - STARTS_WITH = 2, - /** -@@ -157,8 +157,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - ENDS_WITH = 3, - /** -@@ -167,8 +167,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - REG_EXP = 4, - /** -@@ -177,8 +177,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - REG_EXP_ICASE = 5, - } -@@ -723,8 +723,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - FULLSCREEN = 0, - /** -@@ -740,8 +740,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - PRIMARY = 1, - /** -@@ -757,8 +757,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - SECONDARY = 2, - /** -@@ -774,8 +774,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - FLOATING = 3, - } -@@ -810,8 +810,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - LEFT = 0, - /** -@@ -827,8 +827,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - RIGHT = 1, - /** -@@ -844,8 +844,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - UP = 2, - /** -@@ -861,8 +861,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - DOWN = 3, - /** -@@ -878,8 +878,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - LEFT_UP = 4, - /** -@@ -895,8 +895,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - LEFT_DOWN = 5, - /** -@@ -912,8 +912,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - RIGHT_UP = 6, - /** -@@ -929,8 +929,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - RIGHT_DOWN = 7, - } -@@ -965,8 +965,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - ROTATION_0 = 0, - /** -@@ -982,8 +982,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - ROTATION_90 = 1, - /** -@@ -999,8 +999,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - ROTATION_180 = 2, - /** -@@ -1016,8 +1016,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - ROTATION_270 = 3, - } -@@ -1421,8 +1421,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - declare interface UIElementInfo { - /** -@@ -1440,8 +1440,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - readonly bundleName: string; - /** -@@ -1459,8 +1459,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - readonly type: string; - /** -@@ -1478,8 +1478,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - readonly text: string; - } -@@ -1499,8 +1499,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - declare interface UIEventObserver { - /** -@@ -1522,8 +1522,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - once(type: 'toastShow', callback: Callback): void; - -@@ -1546,8 +1546,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - once(type: 'dialogShow', callback: Callback): void; - } -@@ -1600,8 +1600,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - LEFT = 0, - /** -@@ -1626,8 +1626,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - RIGHT = 1, - /** -@@ -1652,8 +1652,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - UP = 2, - /** -@@ -1678,8 +1678,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - DOWN = 3, - } -@@ -1714,8 +1714,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - MOUSE_BUTTON_LEFT = 0, - /** -@@ -1731,8 +1731,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - MOUSE_BUTTON_RIGHT = 1, - /** -@@ -1748,8 +1748,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - MOUSE_BUTTON_MIDDLE = 2, - } -@@ -1760,8 +1760,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - declare interface TouchPadSwipeOptions { - /** -@@ -1770,8 +1770,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - stay?: boolean; - -@@ -1781,8 +1781,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - speed?: number; - } -@@ -1844,8 +1844,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - text(txt: string, pattern?: MatchPattern): On; - -@@ -1880,8 +1880,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - id(id: string): On; - -@@ -1916,8 +1916,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - type(tp: string): On; - -@@ -1952,8 +1952,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - clickable(b?: boolean): On; - -@@ -1988,8 +1988,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - longClickable(b?: boolean): On; - -@@ -2024,8 +2024,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - scrollable(b?: boolean): On; - -@@ -2060,8 +2060,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - enabled(b?: boolean): On; - -@@ -2096,8 +2096,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - focused(b?: boolean): On; - -@@ -2132,8 +2132,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - selected(b?: boolean): On; - -@@ -2168,8 +2168,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - checked(b?: boolean): On; - -@@ -2204,8 +2204,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - checkable(b?: boolean): On; - -@@ -2231,8 +2231,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - isBefore(on: On): On; - -@@ -2258,8 +2258,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - isAfter(on: On): On; - -@@ -2285,8 +2285,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - within(on: On): On; - -@@ -2309,8 +2309,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - inWindow(bundleName: string): On; - -@@ -2324,8 +2324,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - description(val: string, pattern?: MatchPattern): On; - /** -@@ -2338,8 +2338,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - id(id: string, pattern: MatchPattern): On; - /** -@@ -2352,8 +2352,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - type(tp: string, pattern: MatchPattern): On; - /** -@@ -2366,8 +2366,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - hint(val: string, pattern?: MatchPattern): On; - } -@@ -2394,8 +2394,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - declare class Component { - /** -@@ -2429,8 +2429,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - click(): Promise; - -@@ -2465,8 +2465,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - doubleClick(): Promise; - -@@ -2501,8 +2501,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - longClick(): Promise; - -@@ -2537,8 +2537,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - getId(): Promise; - -@@ -2573,8 +2573,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - getText(): Promise; - -@@ -2609,8 +2609,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - getType(): Promise; - -@@ -2645,8 +2645,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - isClickable(): Promise; - -@@ -2681,8 +2681,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - isLongClickable(): Promise; - -@@ -2717,8 +2717,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - isScrollable(): Promise; - -@@ -2753,8 +2753,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - isEnabled(): Promise; - -@@ -2789,8 +2789,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - isFocused(): Promise; - -@@ -2825,8 +2825,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - isSelected(): Promise; - -@@ -2861,8 +2861,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - isChecked(): Promise; - -@@ -2897,8 +2897,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - isCheckable(): Promise; - -@@ -2939,8 +2939,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - inputText(text: string): Promise; - -@@ -2975,8 +2975,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - clearText(): Promise; - -@@ -3017,8 +3017,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - scrollToTop(speed?: number): Promise; - -@@ -3059,8 +3059,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - scrollToBottom(speed?: number): Promise; - -@@ -3095,8 +3095,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - getBounds(): Promise; - -@@ -3131,8 +3131,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - getBoundsCenter(): Promise; - -@@ -3159,8 +3159,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - dragTo(target: Component): Promise; - -@@ -3188,8 +3188,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - pinchOut(scale: number): Promise; - -@@ -3217,8 +3217,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - pinchIn(scale: number): Promise; - -@@ -3231,8 +3231,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - getDescription(): Promise; - /** -@@ -3244,8 +3244,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - getHint(): Promise; - -@@ -3302,8 +3302,8 @@ - * @crossplatform - * @atomicservice - * @since 20 -- * @arkts 1.2 - * @test -+ * @arkts 1.2 - */ - scrollSearch(on: On): Promise; - -@@ -3331,13 +3331,14 @@ - * @param { boolean } [vertical] - Whether the swipe direction is vertical, default is true. - * @param { number } [offset] - Offset from the swipe start/end point to the component border, default is 80. - * @returns { Promise } the found result,or null if not found. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17000002 - The async function is not called with await. - * @throws { BusinessError } 17000004 - The window or component is invisible or destroyed. - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since 20 -- * @arkts 1.2 - * @test -+ * @arkts 1.2 - */ - scrollSearch(on: On, vertical?: boolean, offset?: number): Promise; - } -@@ -3367,8 +3368,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - declare class Driver { - /** -@@ -3399,8 +3400,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - static create(): Driver; - -@@ -3438,8 +3439,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - delayMs(duration: number): Promise; - -@@ -3485,12 +3486,13 @@ - * - * @param { On } on - the attribute requirements of the target {@link Component}. - * @returns { Promise } the first matched {@link Component} or undefined. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17000002 - The async function is not called with await. - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since 20 -- * @arkts 1.2 - * @test -+ * @arkts 1.2 - */ - findComponent(on: On): Promise; - -@@ -3523,12 +3525,13 @@ - * - * @param { WindowFilter } filter - the filer condition of the target {@link UiWindow}. - * @returns { Promise } the first matched {@link UiWindow} or undefined. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17000002 - The async function is not called with await. - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since 20 -- * @arkts 1.2 - * @test -+ * @arkts 1.2 - */ - findWindow(filter: WindowFilter): Promise; - -@@ -3564,12 +3567,13 @@ - * @param { On } on - the attribute requirements of the target {@link Component}. - * @param { number } time - duration of finding in milliseconds, not less than 0. - * @returns { Promise } the first matched {@link Component} or undefined. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17000002 - The async function is not called with await. - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since 20 -- * @arkts 1.2 - * @test -+ * @arkts 1.2 - */ - waitForComponent(on: On, time: number): Promise; - -@@ -3616,12 +3620,13 @@ - * - * @param { On } on - the attribute requirements of the target {@link Component}. - * @returns { Promise | null> } the matched {@link Component}s list. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17000002 - The async function is not called with await. - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since 20 -- * @arkts 1.2 - * @test -+ * @arkts 1.2 - */ - findComponents(on: On): Promise | null>; - -@@ -3662,8 +3667,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - assertComponentExist(on: On): Promise; - -@@ -3695,8 +3700,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - pressBack(): Promise; - -@@ -3722,8 +3727,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - triggerKey(keyCode: number): Promise; - -@@ -3753,8 +3758,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - triggerCombineKeys(key0: number, key1: number, key2?: number): Promise; - -@@ -3795,8 +3800,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - click(x: number, y: number): Promise; - -@@ -3837,8 +3842,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - doubleClick(x: number, y: number): Promise; - -@@ -3879,8 +3884,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - longClick(x: number, y: number): Promise; - -@@ -3930,8 +3935,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - swipe(startx: number, starty: number, endx: number, endy: number, speed?: number): Promise; - -@@ -3964,8 +3969,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - drag(startx: number, starty: number, endx: number, endy: number, speed?: number): Promise; - -@@ -3990,8 +3995,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - screenCap(savePath: string): Promise; - -@@ -4016,8 +4021,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - setDisplayRotation(rotation: DisplayRotation): Promise; - -@@ -4038,8 +4043,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - getDisplayRotation(): Promise; - -@@ -4064,8 +4069,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - setDisplayRotationEnabled(enabled: boolean): Promise; - -@@ -4086,8 +4091,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - getDisplaySize(): Promise; - -@@ -4108,8 +4113,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - getDisplayDensity(): Promise; - -@@ -4130,8 +4135,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - wakeUpDisplay(): Promise; - -@@ -4152,8 +4157,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - pressHome(): Promise; - -@@ -4180,8 +4185,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - waitForIdle(idleTime: number, timeout: number): Promise; - -@@ -4228,8 +4233,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - fling(from: Point, to: Point, stepLen: number, speed: number): Promise; - -@@ -4257,8 +4262,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - injectMultiPointerAction(pointers: PointerMatrix, speed?: number): Promise; - -@@ -4299,8 +4304,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - fling(direction: UiDirection, speed: number): Promise; - -@@ -4331,8 +4336,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - mouseClick(p: Point, btnId: MouseButton, key1?: number, key2?: number): Promise; - -@@ -4357,8 +4362,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - mouseMoveTo(p: Point): Promise; - -@@ -4391,9 +4396,11 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ -+ mouseScroll(p: Point, down: boolean, d: number, key1?: number, key2?: number): Promise; -+ - /** - * The mouse wheel scrolls the specified cell at the specified position, and press the specified key simultaneously if necessary. - * -@@ -4409,8 +4416,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -+ * @test - * @arkts 1.1&1.2 -- * @test - */ - mouseScroll(p: Point, down: boolean, d: number, key1?: number, key2?: number, speed?: number): Promise; - -@@ -4437,8 +4444,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - screenCapture(savePath: string, rect?: Rect): Promise; - -@@ -4459,8 +4466,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - createUIEventObserver(): UIEventObserver; - -@@ -4477,8 +4484,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - mouseDoubleClick(p: Point, btnId: MouseButton, key1?: number, key2?: number): Promise; - -@@ -4495,8 +4502,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - mouseLongClick(p: Point, btnId: MouseButton, key1?: number, key2?: number): Promise; - -@@ -4512,8 +4519,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - mouseMoveWithTrack(from: Point, to: Point, speed?: number): Promise; - -@@ -4529,8 +4536,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - mouseDrag(from: Point, to: Point, speed?: number): Promise; - -@@ -4545,8 +4552,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - inputText(p: Point, text: string): Promise; - -@@ -4562,8 +4569,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - touchPadMultiFingerSwipe(fingers: number, direction: UiDirection, options?: TouchPadSwipeOptions): Promise; - -@@ -4576,8 +4583,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - penClick(point: Point): Promise; - -@@ -4591,8 +4598,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - penLongClick(point: Point, pressure?: number): Promise; - -@@ -4605,8 +4612,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - penDoubleClick(point: Point): Promise; - -@@ -4622,8 +4629,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - penSwipe(startPoint: Point, endPoint: Point, speed?: number, pressure?: number): Promise; - -@@ -4638,8 +4645,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - injectPenPointerAction(pointers: PointerMatrix, speed?: number, pressure?: number): Promise; - } -@@ -4655,8 +4662,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - declare class UiWindow { - /** -@@ -4678,8 +4685,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - getBundleName(): Promise; - -@@ -4703,8 +4710,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - getBounds(): Promise; - -@@ -4727,8 +4734,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - getTitle(): Promise; - -@@ -4751,8 +4758,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - getWindowMode(): Promise; - -@@ -4775,8 +4782,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - isFocused(): Promise; - -@@ -4822,8 +4829,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - focus(): Promise; - -@@ -4854,8 +4861,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - moveTo(x: number, y: number): Promise; - -@@ -4888,8 +4895,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - resize(wide: number, height: number, direction: ResizeDirection): Promise; - -@@ -4914,8 +4921,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - split(): Promise; - -@@ -4940,8 +4947,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - maximize(): Promise; - -@@ -4966,8 +4973,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - minimize(): Promise; - -@@ -4992,8 +4999,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - resume(): Promise; - -@@ -5018,8 +5025,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - close(): Promise; - -@@ -5032,8 +5039,8 @@ - * @syscap SystemCapability.Test.UiTest - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - isActive(): Promise; - } -@@ -5054,8 +5061,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - declare class PointerMatrix { - /** -@@ -5080,8 +5087,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - static create(fingers: number, steps: number): PointerMatrix; - -@@ -5107,8 +5114,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - setPoint(finger: number, step: number, point: Point): void; - } -@@ -5138,8 +5145,8 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 - * @test -+ * @arkts 1.1&1.2 - */ - declare const ON: On; - -diff --git a/api/@ohos.WorkSchedulerExtensionAbility.d.ts b/api/@ohos.WorkSchedulerExtensionAbility.d.ts -index 7b64c003c..8bd479689 100644 ---- a/api/@ohos.WorkSchedulerExtensionAbility.d.ts -+++ b/api/@ohos.WorkSchedulerExtensionAbility.d.ts -@@ -28,7 +28,8 @@ import { WorkSchedulerExtensionContext as _WorkSchedulerExtensionContext } from - * @typedef { _WorkSchedulerExtensionContext } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export type WorkSchedulerExtensionContext = _WorkSchedulerExtensionContext; - -@@ -37,7 +38,8 @@ export type WorkSchedulerExtensionContext = _WorkSchedulerExtensionContext; - * - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export default class WorkSchedulerExtensionAbility { - /** -@@ -46,7 +48,8 @@ export default class WorkSchedulerExtensionAbility { - * @type { WorkSchedulerExtensionContext } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - context: WorkSchedulerExtensionContext; - -@@ -56,7 +59,8 @@ export default class WorkSchedulerExtensionAbility { - * @param {workScheduler.WorkInfo} work - The info of work. - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onWorkStart(work: workScheduler.WorkInfo): void; - -@@ -66,7 +70,8 @@ export default class WorkSchedulerExtensionAbility { - * @param {workScheduler.WorkInfo} work - The info of work. - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onWorkStop(work: workScheduler.WorkInfo): void; - } -diff --git a/api/@ohos.ability.errorCode.d.ts b/api/@ohos.ability.errorCode.d.ts -index bf6f1e727..83418a702 100644 ---- a/api/@ohos.ability.errorCode.d.ts -+++ b/api/@ohos.ability.errorCode.d.ts -@@ -23,14 +23,16 @@ - * - * @enum { number } - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 6 -+ * @since arkts {'1.1':'6', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum ErrorCode { - /** - * Permission denied. - * - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 6 -+ * @since arkts {'1.1':'6', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PERMISSION_DENY = -3, - -@@ -38,7 +40,8 @@ export enum ErrorCode { - * Ability not found. - * - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 6 -+ * @since arkts {'1.1':'6', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ABILITY_NOT_FOUND = -2, - -@@ -46,7 +49,8 @@ export enum ErrorCode { - * Invalid parameter. - * - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 6 -+ * @since arkts {'1.1':'6', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INVALID_PARAMETER = -1, - -@@ -54,7 +58,8 @@ export enum ErrorCode { - * No error. - * - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 6 -+ * @since arkts {'1.1':'6', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NO_ERROR = 0 - } -diff --git a/api/@ohos.ability.screenLockFileManager.d.ts b/api/@ohos.ability.screenLockFileManager.d.ts -index b6ff1876f..ee9bcbd85 100644 ---- a/api/@ohos.ability.screenLockFileManager.d.ts -+++ b/api/@ohos.ability.screenLockFileManager.d.ts -@@ -23,7 +23,8 @@ - * - * @namespace screenLockFileManager - * @syscap SystemCapability.Security.ScreenLockFileManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace screenLockFileManager { - /** -@@ -31,14 +32,16 @@ declare namespace screenLockFileManager { - * - * @enum { number } - * @syscap SystemCapability.Security.ScreenLockFileManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum DataType { - /** - * Media photo and video data. - * - * @syscap SystemCapability.Security.ScreenLockFileManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MEDIA_DATA = 0x00000001, - -@@ -46,7 +49,8 @@ declare namespace screenLockFileManager { - * All data type. - * - * @syscap SystemCapability.Security.ScreenLockFileManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ALL_DATA = 0xffffffff - } -@@ -56,14 +60,16 @@ declare namespace screenLockFileManager { - * - * @enum { number } - * @syscap SystemCapability.Security.ScreenLockFileManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum AccessStatus { - /** - * Acquire the access of data failed. - * - * @syscap SystemCapability.Security.ScreenLockFileManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ACCESS_DENIED = -1, - -@@ -71,7 +77,8 @@ declare namespace screenLockFileManager { - * Acquire the access of data success. - * - * @syscap SystemCapability.Security.ScreenLockFileManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ACCESS_GRANTED = 0 - } -@@ -81,14 +88,16 @@ declare namespace screenLockFileManager { - * - * @enum { number } - * @syscap SystemCapability.Security.ScreenLockFileManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum ReleaseStatus { - /** - * Release the access of data failed. - * - * @syscap SystemCapability.Security.ScreenLockFileManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RELEASE_DENIED = -1, - -@@ -96,7 +105,8 @@ declare namespace screenLockFileManager { - * Release the access of data success. - * - * @syscap SystemCapability.Security.ScreenLockFileManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RELEASE_GRANTED = 0 - } -@@ -106,14 +116,16 @@ declare namespace screenLockFileManager { - * - * @enum { number } - * @syscap SystemCapability.Security.ScreenLockFileManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum KeyStatus { - /** - * The application is not enabled the data protection under lock screen. - * - * @syscap SystemCapability.Security.ScreenLockFileManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEY_NOT_EXIST = -2, - -@@ -121,7 +133,8 @@ declare namespace screenLockFileManager { - * AppKey has been released. - * - * @syscap SystemCapability.Security.ScreenLockFileManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEY_RELEASED = -1, - -@@ -129,7 +142,8 @@ declare namespace screenLockFileManager { - * AppKey exists. - * - * @syscap SystemCapability.Security.ScreenLockFileManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEY_EXIST = 0 - } -@@ -143,7 +157,8 @@ declare namespace screenLockFileManager { - * @throws { BusinessError } 29300003 - The application is not enabled the data protection under lock screen. - * @throws { BusinessError } 29300004 - File access is denied. - * @syscap SystemCapability.Security.ScreenLockFileManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function acquireAccess(): AccessStatus; - -@@ -163,7 +178,8 @@ declare namespace screenLockFileManager { - * @throws { BusinessError } 29300004 - File access is denied. - * @syscap SystemCapability.Security.ScreenLockFileManager - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function acquireAccess(dataType: DataType): AccessStatus; - -@@ -176,7 +192,8 @@ declare namespace screenLockFileManager { - * @throws { BusinessError } 29300003 - The application is not enabled the data protection under lock screen. - * @throws { BusinessError } 29300005 - File access was not acquired. - * @syscap SystemCapability.Security.ScreenLockFileManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function releaseAccess(): ReleaseStatus; - -@@ -196,7 +213,8 @@ declare namespace screenLockFileManager { - * @throws { BusinessError } 29300005 - File access was not acquired. - * @syscap SystemCapability.Security.ScreenLockFileManager - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function releaseAccess(dataType: DataType): ReleaseStatus; - -@@ -207,7 +225,8 @@ declare namespace screenLockFileManager { - * @throws { BusinessError } 801 - The specified SystemCapability name was not found. - * @throws { BusinessError } 29300002 - The system ability work abnormally. - * @syscap SystemCapability.Security.ScreenLockFileManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function queryAppKeyState(): KeyStatus; - -@@ -225,7 +244,8 @@ declare namespace screenLockFileManager { - * @throws { BusinessError } 29300002 - The system ability work abnormally. - * @syscap SystemCapability.Security.ScreenLockFileManager - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function queryAppKeyState(dataType: DataType): KeyStatus; - } -diff --git a/api/@ohos.abilityAccessCtrl.d.ts b/api/@ohos.abilityAccessCtrl.d.ts -index aea2e98aa..6da3b2bd3 100644 ---- a/api/@ohos.abilityAccessCtrl.d.ts -+++ b/api/@ohos.abilityAccessCtrl.d.ts -@@ -22,9 +22,6 @@ import { AsyncCallback, Callback } from './@ohos.base'; - import { Permissions } from './permissions'; - import type _Context from './application/Context'; - import type _PermissionRequestResult from './security/PermissionRequestResult'; --/*** if arkts 1.1 */ --import { int } from '@ohos.base'; --/*** endif */ - - /** - * @namespace abilityAccessCtrl -@@ -93,13 +90,14 @@ declare namespace abilityAccessCtrl { - /** - * Checks whether a specified application has been granted the given permission. - * -- * @param { number } tokenID - Token ID of the application. -+ * @param { int } tokenID - Token ID of the application. - * @param { Permissions } permissionName - Name of the permission to be verified. The Permissions type supports only valid permission names. - * @returns { Promise } Returns permission verify result. - * @syscap SystemCapability.Security.AccessToken -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- verifyAccessToken(tokenID: number, permissionName: Permissions): Promise; -+ verifyAccessToken(tokenID: int, permissionName: Permissions): Promise; - - /** - * Checks whether a specified application has been granted the given permission. -@@ -297,9 +295,9 @@ declare namespace abilityAccessCtrl { - * Grants a specified user_grant permission to the given application. - * - * @permission ohos.permission.GRANT_SENSITIVE_PERMISSIONS -- * @param { number } tokenID - Token ID of the application. -+ * @param { int } tokenID - Token ID of the application. - * @param { Permissions } permissionName - Name of the permission to be granted. -- * @param { number } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. -+ * @param { int } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. - * @returns { Promise } The promise returned by the function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.GRANT_SENSITIVE_PERMISSIONS". -@@ -312,17 +310,18 @@ declare namespace abilityAccessCtrl { - * @throws { BusinessError } 12100007 - The service is abnormal. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 8 -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- grantUserGrantedPermission(tokenID: number, permissionName: Permissions, permissionFlags: number): Promise; -+ grantUserGrantedPermission(tokenID: int, permissionName: Permissions, permissionFlags: int): Promise; - - /** - * Grants a specified user_grant permission to the given application. - * - * @permission ohos.permission.GRANT_SENSITIVE_PERMISSIONS -- * @param { number } tokenID - Token ID of the application. -+ * @param { int } tokenID - Token ID of the application. - * @param { Permissions } permissionName - Name of the permission to be granted. -- * @param { number } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. -+ * @param { int } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. - * @param { AsyncCallback } callback - Asynchronous callback interface. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.GRANT_SENSITIVE_PERMISSIONS". -@@ -335,12 +334,13 @@ declare namespace abilityAccessCtrl { - * @throws { BusinessError } 12100007 - The service is abnormal. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 8 -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - grantUserGrantedPermission( -- tokenID: number, -+ tokenID: int, - permissionName: Permissions, -- permissionFlags: number, -+ permissionFlags: int, - callback: AsyncCallback - ): void; - -@@ -348,9 +348,9 @@ declare namespace abilityAccessCtrl { - * Revoke a specified user_grant permission to the given application. - * - * @permission ohos.permission.REVOKE_SENSITIVE_PERMISSIONS -- * @param { number } tokenID - Token ID of the application. -+ * @param { int } tokenID - Token ID of the application. - * @param { Permissions } permissionName - Name of the permission to be revoked. -- * @param { number } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. -+ * @param { int } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. - * @returns { Promise } The promise returned by the function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS". -@@ -363,17 +363,18 @@ declare namespace abilityAccessCtrl { - * @throws { BusinessError } 12100007 - The service is abnormal. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 8 -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- revokeUserGrantedPermission(tokenID: number, permissionName: Permissions, permissionFlags: number): Promise; -+ revokeUserGrantedPermission(tokenID: int, permissionName: Permissions, permissionFlags: int): Promise; - - /** - * Revoke a specified user_grant permission to the given application. - * - * @permission ohos.permission.REVOKE_SENSITIVE_PERMISSIONS -- * @param { number } tokenID - Token ID of the application. -+ * @param { int } tokenID - Token ID of the application. - * @param { Permissions } permissionName - Name of the permission to be revoked. -- * @param { number } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. -+ * @param { int } permissionFlags - Flags of permission state. This parameter can be 1 or 2 or 64. - * @param { AsyncCallback } callback - Asynchronous callback interface. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS". -@@ -386,12 +387,13 @@ declare namespace abilityAccessCtrl { - * @throws { BusinessError } 12100007 - The service is abnormal. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 8 -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - revokeUserGrantedPermission( -- tokenID: number, -+ tokenID: int, - permissionName: Permissions, -- permissionFlags: number, -+ permissionFlags: int, - callback: AsyncCallback - ): void; - -@@ -399,9 +401,9 @@ declare namespace abilityAccessCtrl { - * Queries specified permission flags of the given application. - * - * @permission ohos.permission.GET_SENSITIVE_PERMISSIONS or ohos.permission.GRANT_SENSITIVE_PERMISSIONS or ohos.permission.REVOKE_SENSITIVE_PERMISSIONS -- * @param { number } tokenID - Token ID of the application. -+ * @param { int } tokenID - Token ID of the application. - * @param { Permissions } permissionName - Name of the permission to be get. -- * @returns { Promise } Return permission flags. -+ * @returns { Promise } Return permission flags. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission specified below. - * @throws { BusinessError } 202 - Not System App. Interface caller is not a system app. -@@ -412,9 +414,10 @@ declare namespace abilityAccessCtrl { - * @throws { BusinessError } 12100007 - The service is abnormal. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 8 -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getPermissionFlags(tokenID: number, permissionName: Permissions): Promise; -+ getPermissionFlags(tokenID: int, permissionName: Permissions): Promise; - - /** - * Set the toggle status of one permission flag. -@@ -431,7 +434,8 @@ declare namespace abilityAccessCtrl { - * @throws { BusinessError } 12100007 - The service is abnormal. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setPermissionRequestToggleStatus(permissionName: Permissions, status: PermissionRequestToggleStatus): Promise; - -@@ -449,26 +453,28 @@ declare namespace abilityAccessCtrl { - * @throws { BusinessError } 12100007 - The service is abnormal. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getPermissionRequestToggleStatus(permissionName: Permissions): Promise; - - /** - * Queries permission management version. - * -- * @returns { Promise } Return permission version. -+ * @returns { Promise } Return permission version. - * @throws { BusinessError } 202 - Not System App. Interface caller is not a system app. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getVersion(): Promise; -+ getVersion(): Promise; - - /** - * Queries permissions status of the given application. - * - * @permission ohos.permission.GET_SENSITIVE_PERMISSIONS -- * @param { number } tokenID - Token ID of the application. -+ * @param { int } tokenID - Token ID of the application. - * @param { Array } permissionList - Indicates the list of permissions to be queried. This parameter cannot be null or empty. - * @returns { Promise> } Return permission status. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. -@@ -479,16 +485,17 @@ declare namespace abilityAccessCtrl { - * @throws { BusinessError } 12100007 - The service is abnormal. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getPermissionsStatus(tokenID: number, permissionList: Array): Promise>; -+ getPermissionsStatus(tokenID: int, permissionList: Array): Promise>; - - /** - * Registers a permission state callback so that the application can be notified upon specified permission state of specified applications changes. - * - * @permission ohos.permission.GET_SENSITIVE_PERMISSIONS - * @param { 'permissionStateChange' } type - Event type. -- * @param { Array } tokenIDList - A list of permissions that specify the permissions to be listened on. The value in the list can be: -+ * @param { Array } tokenIDList - A list of permissions that specify the permissions to be listened on. The value in the list can be: - *
    {@code empty} - Indicates that the application can be notified if the specified permission state of any applications changes. - *
    {@code non-empty} - Indicates that the application can only be notified if the specified permission state of the specified applications change. - * @param { Array } permissionList - A list of permissions that specify the permissions to be listened on. The value in the list can be: -@@ -505,11 +512,12 @@ declare namespace abilityAccessCtrl { - * @throws { BusinessError } 12100008 - Out of memory. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on( - type: 'permissionStateChange', -- tokenIDList: Array, -+ tokenIDList: Array, - permissionList: Array, - callback: Callback - ): void; -@@ -529,7 +537,8 @@ declare namespace abilityAccessCtrl { - * @throws { BusinessError } 12100007 - The service is abnormal. - * @syscap SystemCapability.Security.AccessToken - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on( - type: 'selfPermissionStateChange', -@@ -542,7 +551,7 @@ declare namespace abilityAccessCtrl { - * - * @permission ohos.permission.GET_SENSITIVE_PERMISSIONS - * @param { 'permissionStateChange' } type - Event type. -- * @param { Array } tokenIDList - A list of permissions that specify the permissions to be listened on. -+ * @param { Array } tokenIDList - A list of permissions that specify the permissions to be listened on. - * It should correspond to the value registered by function of "on", whose type is "permissionStateChange". - * @param { Array } permissionList - A list of permissions that specify the permissions to be listened on. - * It should correspond to the value registered by function of "on", whose type is "permissionStateChange". -@@ -556,11 +565,12 @@ declare namespace abilityAccessCtrl { - * @throws { BusinessError } 12100008 - Out of memory. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off( - type: 'permissionStateChange', -- tokenIDList: Array, -+ tokenIDList: Array, - permissionList: Array, - callback?: Callback - ): void; -@@ -578,7 +588,8 @@ declare namespace abilityAccessCtrl { - * @throws { BusinessError } 12100007 - The service is abnormal. - * @syscap SystemCapability.Security.AccessToken - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off( - type: 'selfPermissionStateChange', -@@ -621,14 +632,15 @@ declare namespace abilityAccessCtrl { - * @syscap SystemCapability.Security.AccessToken - * @stagemodelonly - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - requestGlobalSwitch(context: Context, type: SwitchType): Promise; - - /** - * Starts the permission manager page of an application. - * -- * @param { number } tokenID - Token ID of the application. -+ * @param { int } tokenID - Token ID of the application. - * @returns { Promise } The promise returned by the function. - * @throws { BusinessError } 202 - Not System App. Interface caller is not a system app. - * @throws { BusinessError } 12100002 - The specified tokenID does not exist. -@@ -636,9 +648,10 @@ declare namespace abilityAccessCtrl { - * @syscap SystemCapability.Security.AccessToken - * @systemapi - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- requestPermissionOnApplicationSetting(tokenID: number): Promise; -+ requestPermissionOnApplicationSetting(tokenID: int): Promise; - } - - /** -@@ -825,8 +838,8 @@ declare namespace abilityAccessCtrl { - * - * @enum { int } - * @syscap SystemCapability.Security.AccessToken -- * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - export enum PermissionStatus { -@@ -834,8 +847,8 @@ declare namespace abilityAccessCtrl { - * permission has been denied, only can change it in settings - * - * @syscap SystemCapability.Security.AccessToken -- * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - DENIED = -1, -@@ -843,8 +856,8 @@ declare namespace abilityAccessCtrl { - * permission has been granted - * - * @syscap SystemCapability.Security.AccessToken -- * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - GRANTED = 0, -@@ -852,8 +865,8 @@ declare namespace abilityAccessCtrl { - * permission is not determined - * - * @syscap SystemCapability.Security.AccessToken -- * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - NOT_DETERMINED = 1, -@@ -861,8 +874,8 @@ declare namespace abilityAccessCtrl { - * permission is invalid - * - * @syscap SystemCapability.Security.AccessToken -- * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - INVALID = 2, -@@ -870,8 +883,8 @@ declare namespace abilityAccessCtrl { - * permission has been restricted - * - * @syscap SystemCapability.Security.AccessToken -- * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - RESTRICTED = 3 -diff --git a/api/@ohos.accessibility.config.d.ets b/api/@ohos.accessibility.config.d.ets -deleted file mode 100644 -index bd0ec9a64..000000000 ---- a/api/@ohos.accessibility.config.d.ets -+++ /dev/null -@@ -1,112 +0,0 @@ --/* -- * Copyright (C) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --/** -- * @file -- * @kit AccessibilityKit -- */ -- --import { AccessibilityError } from './@ohos.accessibility'; -- --/** -- * Configuration of the accessibility. -- * -- * @namespace config -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @systemapi -- * @since 20 -- */ --declare namespace config { -- /** -- * Indicates the configuration of high-contrast text. -- * -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @systemapi -- * @since 20 -- */ -- const highContrastText: HighContrastTextConfig; -- /** -- * Indicates setting and getting in configuration. -- * -- * @typedef HighContrastTextConfig -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @systemapi -- * @since 20 -- */ -- class HighContrastTextConfig { -- /** -- * Setting configuration value. -- * -- * @permission ohos.permission.WRITE_ACCESSIBILITY_CONFIG -- * @param { boolean } value Indicates the value. -- * @returns { Promise } -- * @throws { BusinessError } 201 - Permission verification failed. -- * The application does not have the permission required to call the API. -- * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. -- * @throws { BusinessError } 401 - Input parameter error. Possible causes: -- * 1. Mandatory parameters are left unspecified; -- * 2. Incorrect parameter types; -- * 3. Parameter verification failed. -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @systemapi -- * @since 20 -- */ -- set(value: boolean): Promise; -- -- /** -- * Setting configuration value. -- * -- * @permission ohos.permission.WRITE_ACCESSIBILITY_CONFIG -- * @param { boolean } value Indicates the value. -- * @param { AsyncCallback } callback -- * @throws { BusinessError } 201 - Permission verification failed. -- * The application does not have the permission required to call the API. -- * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. -- * @throws { BusinessError } 401 - Input parameter error. Possible causes: -- * 1. Mandatory parameters are left unspecified; -- * 2. Incorrect parameter types; -- * 3. Parameter verification failed. -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @systemapi -- * @since 20 -- */ -- set(value: boolean, callback: (err: AccessibilityError) => void): void; -- -- /** -- * Getting configuration value. -- * -- * @returns { Promise } -- * @throws { BusinessError } 201 - Permission verification failed. -- * The application does not have the permission required to call the API. -- * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @systemapi -- * @since 20 -- */ -- get(): Promise; -- -- /** -- * Getting configuration value. -- * -- * @param { AsyncCallback } callback -- * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @systemapi -- * @since 20 -- */ -- get(callback:(err: AccessibilityError, data: boolean) => void): void; -- } --} --export default config; -diff --git a/api/@ohos.accessibility.config.d.ts b/api/@ohos.accessibility.config.d.ts -index 70f86c013..a777285c2 100644 ---- a/api/@ohos.accessibility.config.d.ts -+++ b/api/@ohos.accessibility.config.d.ts -@@ -27,7 +27,8 @@ import type { AsyncCallback, Callback } from './@ohos.base'; - * @namespace config - * @syscap SystemCapability.BarrierFree.Accessibility.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace config { - /** -@@ -57,11 +58,13 @@ declare namespace config { - /** - * Indicates the configuration of high-contrast text. - * -+ * @type { Config } - * @syscap SystemCapability.BarrierFree.Accessibility.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- var highContrastText: Config; -+ let highContrastText: Config; - /** - * Indicates the configuration of invert color. - * -@@ -361,7 +364,8 @@ declare namespace config { - * @typedef Config - * @syscap SystemCapability.BarrierFree.Accessibility.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Config { - /** -@@ -379,7 +383,8 @@ declare namespace config { - * 3. Parameter verification failed. - * @syscap SystemCapability.BarrierFree.Accessibility.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - set(value: T): Promise; - -@@ -398,7 +403,8 @@ declare namespace config { - * 3. Parameter verification failed. - * @syscap SystemCapability.BarrierFree.Accessibility.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - set(value: T, callback: AsyncCallback): void; - -@@ -411,7 +417,8 @@ declare namespace config { - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @syscap SystemCapability.BarrierFree.Accessibility.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - get(): Promise; - -@@ -422,7 +429,8 @@ declare namespace config { - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @syscap SystemCapability.BarrierFree.Accessibility.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - get(callback: AsyncCallback): void; - -diff --git a/api/@ohos.accessibility.d.ets b/api/@ohos.accessibility.d.ets -deleted file mode 100644 -index f737eaa5b..000000000 ---- a/api/@ohos.accessibility.d.ets -+++ /dev/null -@@ -1,389 +0,0 @@ --/* -- * Copyright (C) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --/** -- * @file -- * @kit AccessibilityKit -- */ -- --import { Callback } from './@ohos.base'; -- --/** -- * Defines the error interface. -- * -- * @extends Error -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 20 -- */ --export declare class AccessibilityError extends Error { -- constructor(code: int, message: string); -- code: int; --} -- --/** -- * Defines the basic callback. -- * -- * @typedef { AccessibilityCallback } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 20 -- */ --type AccessibilityCallback = (err: AccessibilityError, data?: T) => void; -- --/** -- * Accessibility -- * -- * @namespace accessibility -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ --/** -- * Accessibility -- * -- * @namespace accessibility -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @atomicservice -- * @since 11 -- */ --declare namespace accessibility { -- /** -- * The action that the ability can execute. -- * value range: { 'accessibilityFocus' | 'clearAccessibilityFocus' | 'focus' | 'clearFocus' | 'clearSelection' | -- * 'click' | 'longClick' | 'cut' | 'copy' | 'paste' | 'select' | 'setText' | 'delete' | -- * 'scrollForward' | 'scrollBackward' | 'setSelection' } -- * -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ -- /** -- * The action that the ability can execute. -- * value range: { 'accessibilityFocus' | 'clearAccessibilityFocus' | 'focus' | 'clearFocus' | 'clearSelection' | -- * 'click' | 'longClick' | 'cut' | 'copy' | 'paste' | 'select' | 'setText' | 'delete' | -- * 'scrollForward' | 'scrollBackward' | 'setSelection' | 'setCursorPosition' | 'home' | -- * 'back' | 'recentTask' | 'notificationCenter' | 'controlCenter' | 'common' } -- * -- * @typedef {'accessibilityFocus' | 'clearAccessibilityFocus' | 'focus' | 'clearFocus' | 'clearSelection' | 'click' | -- * 'longClick' | 'cut' | 'copy' | 'paste' | 'select' | 'setText' | 'delete' | 'scrollForward' | 'scrollBackward' | -- * 'setSelection' | 'setCursorPosition' | 'home' | 'back' | 'recentTask' | 'notificationCenter' | -- * 'controlCenter' | 'common'} -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 12 -- */ -- type Action = 'accessibilityFocus' | 'clearAccessibilityFocus' | 'focus' | 'clearFocus' | 'clearSelection' | -- 'click' | 'longClick' | 'cut' | 'copy' | 'paste' | 'select' | 'setText' | 'delete' | -- 'scrollForward' | 'scrollBackward' | 'setSelection' | 'setCursorPosition' | 'home' | -- 'back' | 'recentTask' | 'notificationCenter' | 'controlCenter' | 'common'; -- -- /** -- * The type of the accessibility event. -- * windowsChange/windowContentChange/windowStateChange/announcement/notificationChange/textTraversedAtMove -- * value range: { 'accessibilityFocus' | 'accessibilityFocusClear' | -- * 'click' | 'longClick' | 'focus' | 'select' | 'hoverEnter' | 'hoverExit' | -- * 'textUpdate' | 'textSelectionUpdate' | 'scroll' } -- * -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ -- /** -- * The type of the accessibility event. -- * windowsChange/windowContentChange/windowStateChange/announcement/notificationChange/textTraversedAtMove -- * value range: { 'accessibilityFocus' | 'accessibilityFocusClear' | -- * 'click' | 'longClick' | 'focus' | 'select' | 'hoverEnter' | 'hoverExit' | -- * 'textUpdate' | 'textSelectionUpdate' | 'scroll' | 'requestFocusForAccessibility' | -- * 'announceForAccessibility' } -- * -- * @typedef {'accessibilityFocus' | 'accessibilityFocusClear' | 'click' | 'longClick' | 'focus' | 'select' | -- * 'hoverEnter' | 'hoverExit' | 'textUpdate' | 'textSelectionUpdate' | 'scroll' | 'requestFocusForAccessibility' | -- * 'announceForAccessibility'} -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 12 -- */ -- type EventType = 'accessibilityFocus' | 'accessibilityFocusClear' | -- 'click' | 'longClick' | 'focus' | 'select' | 'hoverEnter' | 'hoverExit' | -- 'textUpdate' | 'textSelectionUpdate' | 'scroll' | 'requestFocusForAccessibility' | -- 'announceForAccessibility'; -- -- /** -- * The change type of the windowsChange event. -- * It's used when received the {@code windowsChange} event. -- * -- * @typedef {'add' | 'remove' | 'bounds' | 'active' | 'focus'} -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ -- type WindowUpdateType = 'add' | 'remove' | 'bounds' | 'active' | 'focus'; -- -- /** -- * The type of the observer. -- * -- * @typedef {'accessibilityStateChange' | 'touchGuideStateChange' | 'screenReaderStateChange'} -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ -- type ObserverEventType = 'accessibilityStateChange' | 'touchGuideStateChange' | 'screenReaderStateChange'; -- -- /** -- * The granularity of text move. -- * -- * @typedef {'char' | 'word' | 'line' | 'page' | 'paragraph'} -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 20 -- */ -- type TextMoveUnit = 'char' | 'word' | 'line' | 'page' | 'paragraph'; -- -- /** -- * Checks whether accessibility ability is enabled. -- * -- * @returns { boolean } Returns true if the accessibility is enabled; returns false otherwise. -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 10 -- */ -- /** -- * Checks whether accessibility ability is enabled. -- * -- * @returns { boolean } Returns true if the accessibility is enabled; returns false otherwise. -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @atomicservice -- * @since 11 -- */ -- function isOpenAccessibilitySync(): boolean; -- -- /** -- * Checks touch browser ability (which is used by talkback) is enabled. -- * -- * @returns { boolean } Returns true if the touch browser is enabled; returns false otherwise. -- * @syscap SystemCapability.BarrierFree.Accessibility.Vision -- * @since 10 -- */ -- /** -- * Checks touch browser ability (which is used by talkback) is enabled. -- * -- * @returns { boolean } Returns true if the touch browser is enabled; returns false otherwise. -- * @syscap SystemCapability.BarrierFree.Accessibility.Vision -- * @atomicservice -- * @since 11 -- */ -- function isOpenTouchGuideSync(): boolean; -- -- /** -- * Send accessibility event. -- * -- * @param { EventInfo } event The object of the accessibility {@code EventInfo} . -- * @param { AccessibilityCallback } callback Asynchronous callback interface. -- * @throws { BusinessError } 401 - Input parameter error. Possible causes: -- * 1. Mandatory parameters are left unspecified; -- * 2. Incorrect parameter types; -- * 3. Parameter verification failed. -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 9 -- */ -- function sendAccessibilityEvent(event: EventInfo, callback: AccessibilityCallback): void; -- -- /** -- * Send accessibility event. -- * -- * @param { EventInfo } event The object of the accessibility {@code EventInfo} . -- * @returns { Promise } Returns {@code true} if success ; returns {@code false} otherwise. -- * @throws { BusinessError } 401 - Input parameter error. Possible causes: -- * 1. Mandatory parameters are left unspecified; -- * 2. Incorrect parameter types; -- * 3. Parameter verification failed. -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 9 -- */ -- function sendAccessibilityEvent(event: EventInfo): Promise; -- -- /** -- * Register the observe. -- * -- * @param { ObserverEventType } type state event type. -- * @param { Callback } callback Asynchronous callback interface. -- * @throws { BusinessError } 401 - Input parameter error. Possible causes: -- * 1. Mandatory parameters are left unspecified; -- * 2. Incorrect parameter types; -- * 3. Parameter verification failed. -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ -- function on(type: ObserverEventType, callback: Callback): void; -- -- /** -- * Unregister the observe. -- * -- * @param { ObserverEventType } type state event type -- * @param { Callback } callback Asynchronous callback interface. -- * @throws { BusinessError } 401 - Input parameter error. Possible causes: -- * 1. Mandatory parameters are left unspecified; -- * 2. Incorrect parameter types; -- * 3. Parameter verification failed. -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ -- function off(type: ObserverEventType, callback?: Callback): void; -- -- /** -- * Indicates the info of events. -- * -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ -- class EventInfo { -- /** -- * A constructor used to create a EventInfo object. -- * -- * @param { EventType } type - The type of the accessibility event. -- * @param { string } bundleName - The name of the bundle. -- * @param { Action } triggerAction - The action that the ability can execute. -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 11 -- */ -- constructor(type: EventType, bundleName: string, triggerAction: Action); -- /** -- * The type of an accessibility event. -- * @type { EventType } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ -- public type: EventType; -- -- /** -- * The type of the window change event. -- * @type { ?WindowUpdateType } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ -- public windowUpdateType?: WindowUpdateType; -- -- /** -- * The bundle name of the target application. -- * @type { string } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ -- public bundleName: string; -- -- /** -- * The type of the event source component,such as button, chart. -- * @type { ?string } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ -- public componentType?: string; -- -- /** -- * The page id of the event source. -- * @type { ?number } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ -- public pageId?: number; -- -- /** -- * The accessibility event description. -- * @type { ?string } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ -- public description?: string; -- -- /** -- * The action that triggers the accessibility event, for example, clicking or focusing a view. -- * @type { Action } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ -- public triggerAction: Action; -- -- /** -- * The movement step used for reading texts. -- * @type { ?TextMoveUnit } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ -- public textMoveUnit?: TextMoveUnit; -- -- /** -- * The content list. -- * @type { ?Array } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ -- public contents?: Array; -- -- /** -- * The content changed before. -- * @type { ?string } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ -- public lastContent?: string; -- -- /** -- * The start index of listed items on the screen. -- * @type { ?number } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ -- public beginIndex?: number; -- -- /** -- * The index of the current item on the screen. -- * @type { ?number } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ -- public currentIndex?: number; -- -- /** -- * The end index of listed items on the screen. -- * @type { ?number } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ -- public endIndex?: number; -- -- /** -- * The total of the items, talkback used it when scroll. -- * @type { ?number } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -- */ -- public itemCount?: number; -- -- /** -- * The id of element. -- * @type { ?number } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 12 -- */ -- public elementId?: number; -- -- /** -- * The content of announce accessibility text. -- * @type { ?string } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 12 -- */ -- public textAnnouncedForAccessibility?: string; -- -- /** -- * The customized element id. -- * @type { ?string } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 12 -- */ -- public customId?: string; -- } --} --export default accessibility; -\ No newline at end of file -diff --git a/api/@ohos.accessibility.d.ts b/api/@ohos.accessibility.d.ts -index b8de1bc19..1e6d92042 100644 ---- a/api/@ohos.accessibility.d.ts -+++ b/api/@ohos.accessibility.d.ts -@@ -35,7 +35,8 @@ import { Resource } from './global/resource'; - * @namespace accessibility - * @syscap SystemCapability.BarrierFree.Accessibility.Core - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace accessibility { - /** -@@ -73,7 +74,8 @@ declare namespace accessibility { - * - * @typedef {'accessibilityFocus' | 'clearAccessibilityFocus' | 'focus' | 'clearFocus' | 'clearSelection' | 'click' | 'longClick' | 'cut' | 'copy' | 'paste' | 'select' | 'setText' | 'delete' | 'scrollForward' | 'scrollBackward' | 'setSelection' | 'setCursorPosition' | 'home' | 'back' | 'recentTask' | 'notificationCenter' | 'controlCenter' | 'common'} - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type Action = 'accessibilityFocus' | 'clearAccessibilityFocus' | 'focus' | 'clearFocus' | 'clearSelection' | - 'click' | 'longClick' | 'cut' | 'copy' | 'paste' | 'select' | 'setText' | 'delete' | -@@ -113,7 +115,8 @@ declare namespace accessibility { - * - * @typedef {'accessibilityFocus' | 'accessibilityFocusClear' | 'click' | 'longClick' | 'focus' | 'select' | 'hoverEnter' | 'hoverExit' | 'textUpdate' | 'textSelectionUpdate' | 'scroll' | 'requestFocusForAccessibility' | 'announceForAccessibility' | 'requestFocusForAccessibilityNotInterrupt' | 'announceForAccessibilityNotInterrupt' | 'scrolling'} - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type EventType = 'accessibilityFocus' | 'accessibilityFocusClear' | - 'click' | 'longClick' | 'focus' | 'select' | 'hoverEnter' | 'hoverExit' | -@@ -127,7 +130,8 @@ declare namespace accessibility { - * - * @typedef {'add' | 'remove' | 'bounds' | 'active' | 'focus'} - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type WindowUpdateType = 'add' | 'remove' | 'bounds' | 'active' | 'focus'; - -@@ -160,7 +164,8 @@ declare namespace accessibility { - * - * @typedef {'char' | 'word' | 'line' | 'page' | 'paragraph'} - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type TextMoveUnit = 'char' | 'word' | 'line' | 'page' | 'paragraph'; - -@@ -199,7 +204,8 @@ declare namespace accessibility { - * @returns { boolean } Returns true if the accessibility is enabled; returns false otherwise. - * @syscap SystemCapability.BarrierFree.Accessibility.Core - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isOpenAccessibilitySync(): boolean; - -@@ -238,7 +244,8 @@ declare namespace accessibility { - * @returns { boolean } Returns true if the touch browser is enabled; returns false otherwise. - * @syscap SystemCapability.BarrierFree.Accessibility.Vision - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isOpenTouchGuideSync(): boolean; - -@@ -365,7 +372,8 @@ declare namespace accessibility { - * 2. Incorrect parameter types; - * 3. Parameter verification failed. - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function sendAccessibilityEvent(event: EventInfo, callback: AsyncCallback): void; - -@@ -379,7 +387,8 @@ declare namespace accessibility { - * 2. Incorrect parameter types; - * 3. Parameter verification failed. - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function sendAccessibilityEvent(event: EventInfo): Promise; - -@@ -393,7 +402,8 @@ declare namespace accessibility { - * 2. Incorrect parameter types; - * 3. Parameter verification failed. - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'accessibilityStateChange', callback: Callback): void; - -@@ -407,7 +417,8 @@ declare namespace accessibility { - * 2. Incorrect parameter types; - * 3. Parameter verification failed. - * @syscap SystemCapability.BarrierFree.Accessibility.Vision -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'touchGuideStateChange', callback: Callback): void; - -@@ -420,7 +431,8 @@ declare namespace accessibility { - * 2. Incorrect parameter types; - * 3. Parameter verification failed. - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'screenReaderStateChange', callback: Callback): void; - -@@ -434,7 +446,8 @@ declare namespace accessibility { - * 2. Incorrect parameter types; - * 3. Parameter verification failed. - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'accessibilityStateChange', callback?: Callback): void; - -@@ -448,7 +461,8 @@ declare namespace accessibility { - * 2. Incorrect parameter types; - * 3. Parameter verification failed. - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'touchGuideStateChange', callback?: Callback): void; - -@@ -461,7 +475,8 @@ declare namespace accessibility { - * 2. Incorrect parameter types; - * 3. Parameter verification failed. - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'screenReaderStateChange', callback?: Callback): void; - -@@ -733,7 +748,8 @@ declare namespace accessibility { - * Indicates the info of events. - * - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class EventInfo { - /** -@@ -751,14 +767,16 @@ declare namespace accessibility { - * @param { string } bundleName - The name of the bundle. - * @param { Action } triggerAction - The action that the ability can execute. - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - constructor(type: EventType, bundleName: string, triggerAction: Action); - /** - * The type of an accessibility event. - * @type { EventType } - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type: EventType; - -@@ -766,7 +784,8 @@ declare namespace accessibility { - * The type of the window change event. - * @type { ?WindowUpdateType } - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - windowUpdateType?: WindowUpdateType; - -@@ -774,7 +793,8 @@ declare namespace accessibility { - * The bundle name of the target application. - * @type { string } - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - bundleName: string; - -@@ -782,7 +802,8 @@ declare namespace accessibility { - * The type of the event source component,such as button, chart. - * @type { ?string } - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - componentType?: string; - -@@ -798,7 +819,8 @@ declare namespace accessibility { - * The accessibility event description. - * @type { ?string } - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - description?: string; - -@@ -806,7 +828,8 @@ declare namespace accessibility { - * The action that triggers the accessibility event, for example, clicking or focusing a view. - * @type { Action } - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - triggerAction: Action; - -@@ -814,7 +837,8 @@ declare namespace accessibility { - * The movement step used for reading texts. - * @type { ?TextMoveUnit } - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - textMoveUnit?: TextMoveUnit; - -@@ -822,7 +846,8 @@ declare namespace accessibility { - * The content list. - * @type { ?Array } - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - contents?: Array; - -@@ -830,7 +855,8 @@ declare namespace accessibility { - * The content changed before. - * @type { ?string } - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - lastContent?: string; - -@@ -878,7 +904,8 @@ declare namespace accessibility { - * The content of announce accessibility text. - * @type { ?string } - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - textAnnouncedForAccessibility?: string; - -@@ -894,7 +921,8 @@ declare namespace accessibility { - * The customized element id. - * @type { ?string } - * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - customId?: string; - } -diff --git a/api/@ohos.app.ability.ActionExtensionAbility.d.ts b/api/@ohos.app.ability.ActionExtensionAbility.d.ts -index 8ef2dfd94..bfa54a6e0 100644 ---- a/api/@ohos.app.ability.ActionExtensionAbility.d.ts -+++ b/api/@ohos.app.ability.ActionExtensionAbility.d.ts -@@ -26,7 +26,8 @@ import UIExtensionAbility from './@ohos.app.ability.UIExtensionAbility'; - * @extends UIExtensionAbility - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export default class ActionExtensionAbility extends UIExtensionAbility { - } -\ No newline at end of file -diff --git a/api/@ohos.app.ability.ApplicationStateChangeCallback.d.ts b/api/@ohos.app.ability.ApplicationStateChangeCallback.d.ts -index ec7e69fc2..f26e63dd9 100644 ---- a/api/@ohos.app.ability.ApplicationStateChangeCallback.d.ts -+++ b/api/@ohos.app.ability.ApplicationStateChangeCallback.d.ts -@@ -43,7 +43,7 @@ - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ --declare class ApplicationStateChangeCallback { -+export default class ApplicationStateChangeCallback { - /** - * Called back when the state of the application changes to foreground. - * -@@ -95,6 +95,4 @@ declare class ApplicationStateChangeCallback { - * @since 18 - */ - onApplicationBackground(): void; --} -- --export default ApplicationStateChangeCallback; -\ No newline at end of file -+} -\ No newline at end of file -diff --git a/api/@ohos.app.ability.AtomicServiceOptions.d.ts b/api/@ohos.app.ability.AtomicServiceOptions.d.ts -index 9168a95e2..694576fe1 100644 ---- a/api/@ohos.app.ability.AtomicServiceOptions.d.ts -+++ b/api/@ohos.app.ability.AtomicServiceOptions.d.ts -@@ -27,7 +27,8 @@ import StartOptions from './@ohos.app.ability.StartOptions'; - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export default class AtomicServiceOptions extends StartOptions { - /** -@@ -37,7 +38,8 @@ export default class AtomicServiceOptions extends StartOptions { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - flags?: number; - -@@ -48,7 +50,8 @@ export default class AtomicServiceOptions extends StartOptions { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - parameters?: Record; - } -\ No newline at end of file -diff --git a/api/@ohos.app.ability.DriverExtensionAbility.d.ts b/api/@ohos.app.ability.DriverExtensionAbility.d.ts -index e2573372e..bd373b2c2 100644 ---- a/api/@ohos.app.ability.DriverExtensionAbility.d.ts -+++ b/api/@ohos.app.ability.DriverExtensionAbility.d.ts -@@ -27,7 +27,8 @@ import _DriverExtensionContext from './application/DriverExtensionContext'; - * - * @typedef { _DriverExtensionContext } - * @syscap SystemCapability.Driver.ExternalDevice -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export type DriverExtensionContext = _DriverExtensionContext; - -@@ -35,16 +36,18 @@ export type DriverExtensionContext = _DriverExtensionContext; - * class of driver extension ability. - * @syscap SystemCapability.Driver.ExternalDevice - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ --export default class DriverExtensionAbility { -+declare class DriverExtensionAbility { - /** - * Indicates driver extension ability context. - * - * @type { DriverExtensionContext } - * @syscap SystemCapability.Driver.ExternalDevice - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - context: DriverExtensionContext; - -@@ -53,7 +56,8 @@ export default class DriverExtensionAbility { - * @param { Want } want - Indicates the want of created driver extension. - * @syscap SystemCapability.Driver.ExternalDevice - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onInit(want: Want): void; - -@@ -61,7 +65,8 @@ export default class DriverExtensionAbility { - * Called back before a driver extension is destroyed. - * @syscap SystemCapability.Driver.ExternalDevice - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onRelease(): void; - -@@ -71,7 +76,8 @@ export default class DriverExtensionAbility { - * @returns { rpc.RemoteObject | Promise } Rpc remoteObject. - * @syscap SystemCapability.Driver.ExternalDevice - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onConnect(want: Want): rpc.RemoteObject | Promise; - -@@ -85,6 +91,17 @@ export default class DriverExtensionAbility { - */ - onDisconnect(want: Want): void | Promise; - -+ /** -+ * Called back when all abilities connected to a driver extension are disconnected. -+ * @param { Want } want - Indicates disconnection information about the driver extension. -+ * @returns { undefined | Promise } -+ * @syscap SystemCapability.Driver.ExternalDevice -+ * @stagemodelonly -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ onDisconnect(want: Want): undefined | Promise; -+ - /** - * Called when dump client information is required. - * It is recommended that developers don't DUMP sensitive information. -@@ -92,7 +109,17 @@ export default class DriverExtensionAbility { - * @returns { Array } The dump info array. - * @syscap SystemCapability.Driver.ExternalDevice - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onDump(params: Array): Array; - } -+ -+/** -+ * class of driver extension ability. -+ * @syscap SystemCapability.Driver.ExternalDevice -+ * @stagemodelonly -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+export default DriverExtensionAbility; -diff --git a/api/@ohos.app.ability.EnvironmentCallback.d.ts b/api/@ohos.app.ability.EnvironmentCallback.d.ts -index a501cb684..5c1e00bae 100644 ---- a/api/@ohos.app.ability.EnvironmentCallback.d.ts -+++ b/api/@ohos.app.ability.EnvironmentCallback.d.ts -@@ -37,7 +37,7 @@ import { Configuration } from './@ohos.app.ability.Configuration'; - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ --declare class EnvironmentCallback { -+export default class EnvironmentCallback { - /** - * Called when the system configuration is updated. - * -@@ -77,5 +77,4 @@ declare class EnvironmentCallback { - * @since 11 - */ - onMemoryLevel(level: AbilityConstant.MemoryLevel): void; --} --export default EnvironmentCallback; -\ No newline at end of file -+} -\ No newline at end of file -diff --git a/api/@ohos.app.ability.PrintExtensionAbility.d.ts b/api/@ohos.app.ability.PrintExtensionAbility.d.ts -index ce61e8acf..eccc0acff 100644 ---- a/api/@ohos.app.ability.PrintExtensionAbility.d.ts -+++ b/api/@ohos.app.ability.PrintExtensionAbility.d.ts -@@ -18,7 +18,7 @@ - * @kit BasicServicesKit - */ - --import type Want from './@ohos.application.Want'; -+import type Want from './@ohos.app.ability.Want'; - import type print from './@ohos.print'; - - /** -@@ -26,16 +26,18 @@ import type print from './@ohos.print'; - * - * @syscap SystemCapability.Print.PrintFramework - * @stagemodelonly -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ --export default class PrintExtensionAbility { -+declare class PrintExtensionAbility { - - /** - * Called once to initialize the extensionAbility. - * @param { Want } want - call print page want params. - * @syscap SystemCapability.Print.PrintFramework - * @stagemodelonly -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onCreate(want: Want): void; - -@@ -43,7 +45,8 @@ export default class PrintExtensionAbility { - * Called once to start to discover the printers connected with the device. - * @syscap SystemCapability.Print.PrintFramework - * @stagemodelonly -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onStartDiscoverPrinter(): void; - -@@ -51,7 +54,8 @@ export default class PrintExtensionAbility { - * Called once to stop discovering the printer. - * @syscap SystemCapability.Print.PrintFramework - * @stagemodelonly -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onStopDiscoverPrinter(): void; - -@@ -60,7 +64,8 @@ export default class PrintExtensionAbility { - * @param { number } printerId - connect the printerId. - * @syscap SystemCapability.Print.PrintFramework - * @stagemodelonly -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onConnectPrinter(printerId: number): void; - -@@ -69,7 +74,8 @@ export default class PrintExtensionAbility { - * @param { number } printerId - connect the printerId. - * @syscap SystemCapability.Print.PrintFramework - * @stagemodelonly -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onDisconnectPrinter(printerId: number): void; - -@@ -80,7 +86,8 @@ export default class PrintExtensionAbility { - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. - * @stagemodelonly -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onStartPrintJob(jobInfo: print.PrintJob): void; - -@@ -91,7 +98,8 @@ export default class PrintExtensionAbility { - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. - * @stagemodelonly -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onCancelPrintJob(jobInfo: print.PrintJob): void; - -@@ -103,7 +111,8 @@ export default class PrintExtensionAbility { - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. - * @stagemodelonly -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onRequestPrinterCapability(printerId: number): print.PrinterCapability; - -@@ -115,7 +124,8 @@ export default class PrintExtensionAbility { - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. - * @stagemodelonly -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onRequestPreview(jobInfo: print.PrintJob): string; - -@@ -123,7 +133,10 @@ export default class PrintExtensionAbility { - * Called once to finalize the extensionAbility. - * @syscap SystemCapability.Print.PrintFramework - * @stagemodelonly -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onDestroy(): void; - } -+ -+export default PrintExtensionAbility; -\ No newline at end of file -diff --git a/api/@ohos.app.ability.ServiceExtensionAbility.d.ts b/api/@ohos.app.ability.ServiceExtensionAbility.d.ts -index ec6aefcd7..d165ae8b8 100644 ---- a/api/@ohos.app.ability.ServiceExtensionAbility.d.ts -+++ b/api/@ohos.app.ability.ServiceExtensionAbility.d.ts -@@ -193,7 +193,8 @@ declare class ServiceExtensionAbility { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onDump(params: Array): Array; - } -diff --git a/api/@ohos.app.ability.ShareExtensionAbility.d.ts b/api/@ohos.app.ability.ShareExtensionAbility.d.ts -index 8f6013e83..bcedcbbf4 100644 ---- a/api/@ohos.app.ability.ShareExtensionAbility.d.ts -+++ b/api/@ohos.app.ability.ShareExtensionAbility.d.ts -@@ -26,7 +26,8 @@ import UIExtensionAbility from './@ohos.app.ability.UIExtensionAbility'; - * @extends UIExtensionAbility - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export default class ShareExtensionAbility extends UIExtensionAbility { - } -\ No newline at end of file -diff --git a/api/@ohos.app.ability.UIAbility.d.ts b/api/@ohos.app.ability.UIAbility.d.ts -index 5d9649d4d..7e26b75a9 100644 ---- a/api/@ohos.app.ability.UIAbility.d.ts -+++ b/api/@ohos.app.ability.UIAbility.d.ts -@@ -147,8 +147,7 @@ export interface Caller { - * @throws { BusinessError } 16000050 - Internal error. - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @stagemodelonly -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - call(method: string, data: rpc.Parcelable): Promise; - -@@ -539,10 +538,6 @@ declare class UIAbility extends Ability { - */ - /** - * Called back before an ability is destroyed. -- * After the onDestroy() lifecycle callback is executed, the application may exit. Consequently, -- * the asynchronous function (for example, asynchronously writing data to the database) in onDestroy() may fail to be executed. -- * You can use the asynchronous lifecycle to ensure that the subsequent lifecycle continues only after the -- * asynchronous function in onDestroy() finishes the execution. - * - * @returns { void | Promise } the promise returned by the function. - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore -@@ -620,7 +615,8 @@ declare class UIAbility extends Ability { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @stagemodelonly - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onWillForeground(): void; - -@@ -630,7 +626,8 @@ declare class UIAbility extends Ability { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @stagemodelonly - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onDidForeground(): void; - -@@ -667,7 +664,8 @@ declare class UIAbility extends Ability { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @stagemodelonly - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onWillBackground(): void; - -@@ -677,7 +675,8 @@ declare class UIAbility extends Ability { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @stagemodelonly - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onDidBackground(): void; - -@@ -735,8 +734,8 @@ declare class UIAbility extends Ability { - * @since 10 - */ - /** -- * Called when a UIAbility instance that has undergone the following states is started again: -- * started in the foreground, running in the foreground, and switched to the background. -+ * Called when the launch mode of an ability is set to singleton. -+ * This happens when you re-launch an ability that has been at the top of the ability stack. - * - * @param { Want } want - Indicates the want info of ability. - * @param { AbilityConstant.LaunchParam } launchParam - Indicates the launch parameters. -@@ -768,7 +767,8 @@ declare class UIAbility extends Ability { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @stagemodelonly - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onDump(params: Array): Array; - -diff --git a/api/@ohos.app.ability.UIExtensionContentSession.d.ts b/api/@ohos.app.ability.UIExtensionContentSession.d.ts -index c9f134923..c7d739ee3 100644 ---- a/api/@ohos.app.ability.UIExtensionContentSession.d.ts -+++ b/api/@ohos.app.ability.UIExtensionContentSession.d.ts -@@ -17,8 +17,9 @@ - * @file - * @kit AbilityKit - */ -- --import { AbilityResult } from './ability/abilityResult'; -+/*** if arkts 1.1 */ -+import type { AbilityResult } from './ability/abilityResult'; -+/*** endif */ - import type AbilityStartCallback from './application/AbilityStartCallback'; - import type { AsyncCallback } from './@ohos.base'; - import type Want from './@ohos.app.ability.Want'; -@@ -26,6 +27,7 @@ import type StartOptions from './@ohos.app.ability.StartOptions'; - import type uiExtensionHost from './@ohos.uiExtensionHost'; - import type uiExtension from './@ohos.arkui.uiExtension'; - /*** if arkts 1.2 */ -+import { AbilityResult } from './ability/abilityResult'; - import { LocalStorage } from './@ohos.arkui.stateManagement'; - /*** endif */ - -diff --git a/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts b/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts -index cc5d65241..73a423a81 100644 ---- a/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts -+++ b/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts -@@ -21,10 +21,8 @@ - import { AbilityDelegator as _AbilityDelegator } from './application/AbilityDelegator'; - import { AbilityDelegatorArgs as _AbilityDelegatorArgs } from './application/abilityDelegatorArgs'; - import { AbilityMonitor as _AbilityMonitor } from './application/AbilityMonitor'; --import { ShellCmdResult as _ShellCmdResult } from './application/shellCmdResult'; --/*** if arkts 1.1 */ - import { AbilityStageMonitor as _AbilityStageMonitor } from './application/AbilityStageMonitor'; --/*** endif */ -+import { ShellCmdResult as _ShellCmdResult } from './application/shellCmdResult'; - /** - * A global register used to store the AbilityDelegator and AbilityDelegatorArgs objects registered - * during application startup. -@@ -152,7 +150,8 @@ declare namespace abilityDelegatorRegistry { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum AbilityLifecycleState { - /** -@@ -174,7 +173,8 @@ declare namespace abilityDelegatorRegistry { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - UNINITIALIZED, - -@@ -197,7 +197,8 @@ declare namespace abilityDelegatorRegistry { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CREATE, - -@@ -220,7 +221,8 @@ declare namespace abilityDelegatorRegistry { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FOREGROUND, - -@@ -243,7 +245,8 @@ declare namespace abilityDelegatorRegistry { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BACKGROUND, - -@@ -266,7 +269,8 @@ declare namespace abilityDelegatorRegistry { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DESTROY - } -@@ -374,7 +378,8 @@ declare namespace abilityDelegatorRegistry { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export type AbilityStageMonitor = _AbilityStageMonitor; - } -diff --git a/api/@ohos.app.ability.abilityManager.d.ts b/api/@ohos.app.ability.abilityManager.d.ts -index bbff3e824..2502f3fe0 100644 ---- a/api/@ohos.app.ability.abilityManager.d.ts -+++ b/api/@ohos.app.ability.abilityManager.d.ts -@@ -20,12 +20,12 @@ - - import { AsyncCallback } from './@ohos.base'; - import { ElementName } from './bundleManager/ElementName'; -+import { AbilityRunningInfo as _AbilityRunningInfo } from './application/AbilityRunningInfo'; -+import { ExtensionRunningInfo as _ExtensionRunningInfo } from './application/ExtensionRunningInfo'; - /*** if arkts 1.1 */ - import { AbilityResult } from './ability/abilityResult'; - import { Configuration } from './@ohos.app.ability.Configuration'; - import Context from './application/Context'; --import { AbilityRunningInfo as _AbilityRunningInfo } from './application/AbilityRunningInfo'; --import { ExtensionRunningInfo as _ExtensionRunningInfo } from './application/ExtensionRunningInfo'; - import * as _AbilityForegroundStateObserver from './application/AbilityForegroundStateObserver'; - import * as _AbilityStateData from './application/AbilityStateData'; - /*** endif */ -@@ -48,14 +48,16 @@ declare namespace abilityManager { - * - * @enum { number } - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum AbilityState { - /** - * Ability is initialized. - * - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INITIAL = 0, - -@@ -63,7 +65,8 @@ declare namespace abilityManager { - * Ability is in the state of getting focus. - * - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FOCUS = 2, - -@@ -71,7 +74,8 @@ declare namespace abilityManager { - * Ability is in the foreground state. - * - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FOREGROUND = 9, - -@@ -79,7 +83,8 @@ declare namespace abilityManager { - * Ability is in the background state. - * - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BACKGROUND = 10, - -@@ -87,7 +92,8 @@ declare namespace abilityManager { - * Ability is in the process of scheduling at the foreground. - * - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FOREGROUNDING = 11, - -@@ -95,7 +101,8 @@ declare namespace abilityManager { - * Ability is in the process of scheduling in the background. - * - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BACKGROUNDING = 12 - } -@@ -107,7 +114,8 @@ declare namespace abilityManager { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum UserStatus { - /** -@@ -116,7 +124,8 @@ declare namespace abilityManager { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ASSERT_TERMINATE = 0, - -@@ -126,7 +135,8 @@ declare namespace abilityManager { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ASSERT_CONTINUE = 1, - -@@ -136,7 +146,8 @@ declare namespace abilityManager { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ASSERT_RETRY = 2 - } -@@ -248,7 +259,8 @@ declare namespace abilityManager { - * @returns { Promise> } Returns the array of AbilityRunningInfo. - * @throws { BusinessError } 16000050 - Internal error. - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAbilityRunningInfos(): Promise>; - -@@ -265,7 +277,8 @@ declare namespace abilityManager { - * @throws { BusinessError } 16000050 - Internal error. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAbilityRunningInfos(callback: AsyncCallback>): void; - -@@ -434,7 +447,8 @@ declare namespace abilityManager { - * @throws { BusinessError } 16000050 - Internal error. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getForegroundUIAbilities(callback: AsyncCallback>): void; - -@@ -528,7 +542,8 @@ declare namespace abilityManager { - * @typedef { _AbilityRunningInfo } - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export type AbilityRunningInfo = _AbilityRunningInfo; - -@@ -558,7 +573,8 @@ declare namespace abilityManager { - * @typedef { _ExtensionRunningInfo } - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export type ExtensionRunningInfo = _ExtensionRunningInfo; - -diff --git a/api/@ohos.app.ability.appManager.d.ts b/api/@ohos.app.ability.appManager.d.ts -index 15be7af19..ed30a9e39 100644 ---- a/api/@ohos.app.ability.appManager.d.ts -+++ b/api/@ohos.app.ability.appManager.d.ts -@@ -35,7 +35,6 @@ import * as _AbilityFirstFrameStateData from './application/AbilityFirstFrameSta - import _ApplicationStateObserver from './application/ApplicationStateObserver'; - import _AbilityStateData from './application/AbilityStateData'; - import _AppStateData from './application/AppStateData'; --import _ProcessData from './application/ProcessData'; - /*** endif */ - /** - * This module provides the function of app manager service. -@@ -547,7 +546,8 @@ declare namespace appManager { - * @throws { BusinessError } 16000050 - Internal error. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function killProcessWithAccount(bundleName: string, accountId: number): Promise; - -@@ -567,7 +567,8 @@ declare namespace appManager { - * @throws { BusinessError } 16000050 - Internal error. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function killProcessWithAccount(bundleName: string, accountId: number, clearPageStack: boolean, appIndex?: number): - Promise; -@@ -603,7 +604,8 @@ declare namespace appManager { - * @throws { BusinessError } 16000050 - Internal error. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function killProcessWithAccount(bundleName: string, accountId: number, callback: AsyncCallback): void; - -@@ -890,7 +892,8 @@ declare namespace appManager { - * @throws { BusinessError } 16000050 - Internal error. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getRunningProcessInformationByBundleType( - bundleType: bundleManager.BundleType): Promise>; -@@ -935,7 +938,8 @@ declare namespace appManager { - * @throws { BusinessError } 16000050 - Internal error. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isSharedBundleRunning(bundleName: string, versionCode: number): Promise; - -@@ -954,7 +958,8 @@ declare namespace appManager { - * @throws { BusinessError } 16000050 - Internal error. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isSharedBundleRunning(bundleName: string, versionCode: number, callback: AsyncCallback): void; - -@@ -969,7 +974,8 @@ declare namespace appManager { - * @throws { BusinessError } 16000050 - Internal error. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getProcessMemoryByPid(pid: number): Promise; - -@@ -984,7 +990,8 @@ declare namespace appManager { - * @throws { BusinessError } 16000050 - Internal error. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getProcessMemoryByPid(pid: number, callback: AsyncCallback): void; - -@@ -1145,7 +1152,8 @@ declare namespace appManager { - * @throws { BusinessError } 16000050 - Internal error. - * @throws { BusinessError } 16000073 - The app clone index is invalid. - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isAppRunning(bundleName: string, appCloneIndex?: number): Promise; - -@@ -1200,7 +1208,8 @@ declare namespace appManager { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi - * @stagemodelonly -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSupportedProcessCachePids(bundleName : string): Promise>; - -@@ -1224,7 +1233,8 @@ declare namespace appManager { - * @throws { BusinessError } 16300010 - The target application is not attached to status bar. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setKeepAliveForBundle(bundleName: string, userId: number, enable: boolean): Promise; - -@@ -1243,7 +1253,8 @@ declare namespace appManager { - * @throws { BusinessError } 16000050 - Internal error. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getKeepAliveBundles(type: KeepAliveAppType, userId?: number): Promise>; - -@@ -1261,7 +1272,8 @@ declare namespace appManager { - * @throws { BusinessError } 16000050 - Internal error. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function killProcessesInBatch(pids: Array): Promise; - -@@ -1363,17 +1375,6 @@ declare namespace appManager { - */ - export type ProcessData = _ProcessData.default; - -- /** -- * The class of a process information. -- * -- * @typedef { _ProcessData.default } -- * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @systemapi -- * @since 20 -- * @arkts 1.2 -- */ -- export type ProcessData = _ProcessData; -- - /** - * The ability first frame state observer. - * -diff --git a/api/@ohos.app.ability.application.d.ts b/api/@ohos.app.ability.application.d.ts -index 38c7e2113..d34e6188b 100644 ---- a/api/@ohos.app.ability.application.d.ts -+++ b/api/@ohos.app.ability.application.d.ts -@@ -92,7 +92,8 @@ declare namespace application { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export function getApplicationContext(): ApplicationContext; - } -diff --git a/api/@ohos.app.ability.autoFillManager.d.ts b/api/@ohos.app.ability.autoFillManager.d.ts -index 2530bbcc6..b18eefefd 100644 ---- a/api/@ohos.app.ability.autoFillManager.d.ts -+++ b/api/@ohos.app.ability.autoFillManager.d.ts -@@ -317,7 +317,7 @@ declare namespace autoFillManager { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @stagemodelonly -- * @since 11 -+ * @since 12 - */ - export type AutoFillPopupConfig = _AutoFillPopupConfig.default; - -@@ -328,7 +328,7 @@ declare namespace autoFillManager { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @stagemodelonly -- * @since 11 -+ * @since 12 - */ - export type PopupSize = _AutoFillPopupConfig.PopupSize; - -diff --git a/api/@ohos.app.ability.dataUriUtils.d.ts b/api/@ohos.app.ability.dataUriUtils.d.ts -index cdaa9b52b..63ba6905b 100644 ---- a/api/@ohos.app.ability.dataUriUtils.d.ts -+++ b/api/@ohos.app.ability.dataUriUtils.d.ts -@@ -23,7 +23,8 @@ - * - * @namespace dataUriUtils - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace dataUriUtils { - /** -@@ -34,7 +35,8 @@ declare namespace dataUriUtils { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getId(uri: string): number; - -@@ -47,7 +49,8 @@ declare namespace dataUriUtils { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function attachId(uri: string, id: number): string; - -@@ -59,7 +62,8 @@ declare namespace dataUriUtils { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function deleteId(uri: string): string; - -@@ -72,7 +76,8 @@ declare namespace dataUriUtils { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function updateId(uri: string, id: number): string; - } -diff --git a/api/@ohos.app.ability.errorManager.d.ts b/api/@ohos.app.ability.errorManager.d.ts -index 0cfab9798..fba090a7e 100644 ---- a/api/@ohos.app.ability.errorManager.d.ts -+++ b/api/@ohos.app.ability.errorManager.d.ts -@@ -37,6 +37,16 @@ import { LoopObserver as _LoopObserver } from './application/LoopObserver'; - * @atomicservice - * @since 11 - */ -+/** -+ * This module provides the function of error manager. -+ * -+ * @namespace errorManager -+ * @syscap SystemCapability.Ability.AbilityRuntime.Core -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - declare namespace errorManager { - /** - * Register error observer. -@@ -46,7 +56,7 @@ declare namespace errorManager { - * @returns { number } Returns the number code of the observer. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. -- * @throws { BusinessError } 16000003 - Id does not exist. -+ * @throws { BusinessError } 16000003 - The specified ID does not exist. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 9 - */ -@@ -63,6 +73,21 @@ declare namespace errorManager { - * @atomicservice - * @since 11 - */ -+ /** -+ * Register error observer. -+ * -+ * @param { 'error' } type - error. -+ * @param { ErrorObserver } observer - The error observer. -+ * @returns { number } Returns the number code of the observer. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ * 2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 16000003 - The specified ID does not exist. -+ * @syscap SystemCapability.Ability.AbilityRuntime.Core -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - function on(type: 'error', observer: ErrorObserver): number; - - /** -@@ -73,7 +98,7 @@ declare namespace errorManager { - * @param { AsyncCallback } callback - The callback of off. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. -- * @throws { BusinessError } 16000003 - Id does not exist. -+ * @throws { BusinessError } 16000003 - The specified ID does not exist. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 9 - */ -@@ -90,6 +115,21 @@ declare namespace errorManager { - * @atomicservice - * @since 11 - */ -+ /** -+ * Unregister error observer. -+ * -+ * @param { 'error' } type - error. -+ * @param { number } observerId - Indicates the number code of the observer. -+ * @param { AsyncCallback } callback - The callback of off. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ * 2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 16000003 - The specified ID does not exist. -+ * @syscap SystemCapability.Ability.AbilityRuntime.Core -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - function off(type: 'error', observerId: number, callback: AsyncCallback): void; - - /** -@@ -100,7 +140,7 @@ declare namespace errorManager { - * @returns { Promise } The promise returned by the function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. -- * @throws { BusinessError } 16000003 - Id does not exist. -+ * @throws { BusinessError } 16000003 - The specified ID does not exist. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 9 - */ -@@ -117,6 +157,21 @@ declare namespace errorManager { - * @atomicservice - * @since 11 - */ -+ /** -+ * Unregister error observer. -+ * -+ * @param { 'error' } type - error. -+ * @param { number } observerId - Indicates the number code of the observer. -+ * @returns { Promise } The promise returned by the function. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ * 2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 16000003 - The specified ID does not exist. -+ * @syscap SystemCapability.Ability.AbilityRuntime.Core -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - function off(type: 'error', observerId: number): Promise; - - /** -@@ -272,6 +327,22 @@ declare namespace errorManager { - * @atomicservice - * @since 12 - */ -+ /** -+ * Register loop observer. This function can only by called from main thread, -+ * and if call this function multiple times, the last -+ * modification will overwrite the previous one. -+ * -+ * @param { 'loopObserver' } type - loopObserver. -+ * @param { number } timeout - Indicates timeout(ms) value of loop observer. -+ * @param { LoopObserver } observer - The loop observer. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ * 2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Ability.AbilityRuntime.Core -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - function on(type: 'loopObserver', timeout: number, observer: LoopObserver): void; - - /** -@@ -285,6 +356,19 @@ declare namespace errorManager { - * @atomicservice - * @since 12 - */ -+ /** -+ * Unregister loop observer. This function can only by called from main thread. -+ * -+ * @param { 'loopObserver' } type - loopObserver. -+ * @param { LoopObserver } observer - The loop observer. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ * 2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Ability.AbilityRuntime.Core -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - function off(type: 'loopObserver', observer?: LoopObserver): void; - - /** -@@ -294,11 +378,25 @@ declare namespace errorManager { - * @param { UnhandledRejectionObserver } observer - The unhandled rejection observer. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. -- * @throws { BusinessError } 16200001 - If the caller is invalid. -+ * @throws { BusinessError } 16200001 - The caller has been released. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @atomicservice - * @since 12 - */ -+ /** -+ * Register unhandled rejection observer. -+ * -+ * @param { 'unhandledRejection' } type - 'unhandledRejection'. -+ * @param { UnhandledRejectionObserver } observer - The unhandled rejection observer. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ * 2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 16200001 - The caller has been released. -+ * @syscap SystemCapability.Ability.AbilityRuntime.Core -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - function on(type: 'unhandledRejection', observer: UnhandledRejectionObserver): void; - - /** -@@ -308,12 +406,27 @@ declare namespace errorManager { - * @param { UnhandledRejectionObserver } [observer] - the registered observer - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. -- * @throws { BusinessError } 16200001 - If the caller is invalid. -+ * @throws { BusinessError } 16200001 - The caller has been released. - * @throws { BusinessError } 16300004 - If the observer does not exist - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @atomicservice - * @since 12 - */ -+ /** -+ * Unregister unhandled rejection observer. -+ * -+ * @param { 'unhandledRejection' } type - error. -+ * @param { UnhandledRejectionObserver } [observer] - the registered observer -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ * 2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 16200001 - The caller has been released. -+ * @throws { BusinessError } 16300004 - If the observer does not exist -+ * @syscap SystemCapability.Ability.AbilityRuntime.Core -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - function off(type: 'unhandledRejection', observer?: UnhandledRejectionObserver): void; - - /** -@@ -361,6 +474,16 @@ declare namespace errorManager { - * @atomicservice - * @since 11 - */ -+ /** -+ * The observer will be called by system when an error occurs. -+ * -+ * @typedef { _ErrorObserver.default } -+ * @syscap SystemCapability.Ability.AbilityRuntime.Core -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - export type ErrorObserver = _ErrorObserver.default; - /** - * The observer will be called when application main thread execute timeout. -@@ -370,6 +493,16 @@ declare namespace errorManager { - * @atomicservice - * @since 12 - */ -+ /** -+ * The observer will be called when application main thread execute timeout. -+ * -+ * @typedef { _LoopObserver } -+ * @syscap SystemCapability.Ability.AbilityRuntime.Core -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - export type LoopObserver = _LoopObserver; - /** - * The observer will be called by system when an unhandled rejection occurs. -@@ -381,6 +514,18 @@ declare namespace errorManager { - * @atomicservice - * @since 12 - */ -+ /** -+ * The observer will be called by system when an unhandled rejection occurs. -+ * -+ * @typedef { function } -+ * { Error | any } reason - the reason of the rejection, typically of Error type -+ * { Promise } promise - the promise that is rejected -+ * @syscap SystemCapability.Ability.AbilityRuntime.Core -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - export type UnhandledRejectionObserver = (reason: Error | any, promise: Promise) => void; - /** - * The observer will be called by system when freeze happens. -diff --git a/api/@ohos.app.ability.wantAgent.d.ts b/api/@ohos.app.ability.wantAgent.d.ts -index b2076bb03..d66164801 100644 ---- a/api/@ohos.app.ability.wantAgent.d.ts -+++ b/api/@ohos.app.ability.wantAgent.d.ts -@@ -219,7 +219,7 @@ declare namespace wantAgent { - * Cancel a WantAgent. Only the application that creates the WantAgent can cancel it. - * - * @param { WantAgent } agent - Indicates the WantAgent. -- * @returns { Promise } The promise returned by the export function. -+ * @returns { Promise } The promise returned by the function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types. - * @throws { BusinessError } 16000007 - Service busy, there are concurrent tasks, waiting for retry. -@@ -231,7 +231,7 @@ declare namespace wantAgent { - * Cancel a WantAgent. Only the application that creates the WantAgent can cancel it. - * - * @param { WantAgent } agent - Indicates the WantAgent. -- * @returns { Promise } The promise returned by the export function. -+ * @returns { Promise } The promise returned by the function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types. - * @throws { BusinessError } 16000007 - Service busy. There are concurrent tasks. Try again later. -diff --git a/api/@ohos.app.form.FormExtensionAbility.d.ts b/api/@ohos.app.form.FormExtensionAbility.d.ts -index cbd0d1bd9..45c4805d4 100644 ---- a/api/@ohos.app.form.FormExtensionAbility.d.ts -+++ b/api/@ohos.app.form.FormExtensionAbility.d.ts -@@ -173,7 +173,7 @@ declare class FormExtensionAbility { - /** - * Called when the form provider receives form events from the system. - * -- * @param { Record } newStatus - Indicates the form events occurred. The key in the {@code Map} -+ * @param { Record } newStatus - Indicates the form events occurred. The key in the {@code Map} - * object indicates the form ID, and the value indicates the event - * type, which can be either - * {@link formInfo#VisibilityType#FORM_VISIBLE} or -@@ -187,7 +187,7 @@ declare class FormExtensionAbility { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- onChangeFormVisibility(newStatus: Record): void; -+ onChangeFormVisibility(newStatus: Record): void; - - /** - * Called when a specified message event defined by the form provider is triggered. This method is valid only for -diff --git a/api/@ohos.app.form.formHost.d.ts b/api/@ohos.app.form.formHost.d.ts -index 6911d97e5..9ddda125f 100644 ---- a/api/@ohos.app.form.formHost.d.ts -+++ b/api/@ohos.app.form.formHost.d.ts -@@ -617,7 +617,7 @@ declare namespace formHost { - * - * @permission ohos.permission.REQUIRE_FORM - * @param { Array } formIds - Indicates the specified form id. -- * @param { AsyncCallback } callback - The callback is used to return the number of invalid forms deleted -+ * @param { AsyncCallback } callback - The callback is used to return the number of invalid forms deleted - * by the Form Manager Service. - * @throws { BusinessError } 201 - Permissions denied. - * @throws { BusinessError } 202 - The application is not a system application. -@@ -630,7 +630,7 @@ declare namespace formHost { - * @systemapi - * @since 9 - */ -- function deleteInvalidForms(formIds: Array, callback: AsyncCallback): void; -+ function deleteInvalidForms(formIds: Array, callback: AsyncCallback): void; - - /** - * Deletes invalid forms of the application in the Form Manager Service based on the list of. -@@ -638,7 +638,7 @@ declare namespace formHost { - * - * @permission ohos.permission.REQUIRE_FORM - * @param { Array } formIds - Indicates the specified form id. -- * @returns { Promise } Returns the number of invalid forms deleted by the Form Manager Service. -+ * @returns { Promise } Returns the number of invalid forms deleted by the Form Manager Service. - * @throws { BusinessError } 201 - Permissions denied. - * @throws { BusinessError } 202 - The application is not a system application. - * @throws { BusinessError } 401 - Parameter error. Possible causes: -@@ -650,7 +650,7 @@ declare namespace formHost { - * @systemapi - * @since 9 - */ -- function deleteInvalidForms(formIds: Array): Promise; -+ function deleteInvalidForms(formIds: Array): Promise; - - /** - * Obtains the Form state. -diff --git a/api/@ohos.app.form.formInfo.d.ts b/api/@ohos.app.form.formInfo.d.ts -index 18ca442af..eef4683c2 100644 ---- a/api/@ohos.app.form.formInfo.d.ts -+++ b/api/@ohos.app.form.formInfo.d.ts -@@ -140,13 +140,13 @@ declare namespace formInfo { - /** - * Obtains the displayName resource id of this form. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Ability.Form - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- displayNameId: number; -+ displayNameId: int; - - /** - * Obtains the description of this form. -@@ -169,20 +169,20 @@ declare namespace formInfo { - /** - * Obtains the description id of this form. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Ability.Form - * @since 10 - */ - /** - * Obtains the description id of this form. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Ability.Form - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- descriptionId: number; -+ descriptionId: int; - - /** - * Obtains the type of this form. Currently, JS forms are supported. -@@ -233,8 +233,8 @@ declare namespace formInfo { - * @type { ColorMode } - * @syscap SystemCapability.Ability.Form - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 -+ * @deprecated since 20 - */ - colorMode: ColorMode; - -@@ -331,56 +331,56 @@ declare namespace formInfo { - /** - * Obtains the updateDuration. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Ability.Form - * @since 9 - */ - /** - * Obtains the updateDuration. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Ability.Form - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- updateDuration: number; -+ updateDuration: int; - - /** - * Obtains the default grid style of this form. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Ability.Form - * @since 9 - */ - /** - * Obtains the default grid style of this form. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Ability.Form - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- defaultDimension: number; -+ defaultDimension: int; - - /** - * Obtains the grid styles supported by this form. - * -- * @type { Array } -+ * @type { Array } - * @syscap SystemCapability.Ability.Form - * @since 9 - */ - /** - * Obtains the grid styles supported by this form. - * -- * @type { Array } -+ * @type { Array } - * @syscap SystemCapability.Ability.Form - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- supportDimensions: Array; -+ supportDimensions: Array; - - /** - * Obtains the custom data defined in this form. -@@ -433,18 +433,18 @@ declare namespace formInfo { - /** - * Obtains the shape supported by this form. - * -- * @type { Array } -+ * @type { Array } - * @syscap SystemCapability.Ability.Form - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- supportedShapes: Array; -+ supportedShapes: Array; - - /** - * Indicates the form previewImage IDs map corresponds to the \"supportDimensions\". - * -- * @type { ?Array } -+ * @type { ?Array } - * @readonly - * @syscap SystemCapability.Ability.Form - * @systemapi -@@ -452,7 +452,7 @@ declare namespace formInfo { - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly previewImages?: Array; -+ readonly previewImages?: Array; - - /** - * Indicates whether the form uses a blur background provided by the form host. -@@ -482,7 +482,7 @@ declare namespace formInfo { - /** - * Rendering mode. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Ability.Form - * @systemapi - * @since arkts {'1.1':'18', '1.2':'20'} -@@ -521,14 +521,14 @@ declare namespace formInfo { - /** - * Type of form. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Ability.Form - * @since 9 - */ - /** - * Type of form. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Ability.Form - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} -@@ -571,18 +571,18 @@ declare namespace formInfo { - /** - * Color mode. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Ability.Form - * @since 9 - */ - /** - * Color mode. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Ability.Form - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 -+ * @deprecated since 20 - */ - enum ColorMode { - /** -@@ -596,8 +596,8 @@ declare namespace formInfo { - * - * @syscap SystemCapability.Ability.Form - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 -+ * @deprecated since 20 - */ - MODE_AUTO = -1, - -@@ -612,8 +612,8 @@ declare namespace formInfo { - * - * @syscap SystemCapability.Ability.Form - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 -+ * @deprecated since 20 - */ - MODE_DARK = 0, - -@@ -628,8 +628,8 @@ declare namespace formInfo { - * - * @syscap SystemCapability.Ability.Form - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 -+ * @deprecated since 20 - */ - MODE_LIGHT = 1 - } -@@ -691,14 +691,14 @@ declare namespace formInfo { - /** - * Provides state about a form. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Ability.Form - * @since 9 - */ - /** - * Provides state about a form. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Ability.Form - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} -@@ -1236,38 +1236,38 @@ declare namespace formInfo { - * optional supportedDimensions that used to ask getFormsInfo to return - * form infos with the same supportedDimensions. - * -- * @type { ?Array } -+ * @type { ?Array } - * @syscap SystemCapability.Ability.Form - * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- supportedDimensions?: Array; -+ supportedDimensions?: Array; - - /** - * optional supportedShapes that used to ask getFormsInfo to return - * form infos with the same supportedShapes. - * -- * @type { ?Array } -+ * @type { ?Array } - * @syscap SystemCapability.Ability.Form - * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- supportedShapes?: Array; -+ supportedShapes?: Array; - } - - /** - * Defines the FormDimension enum. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Ability.Form - * @since 9 - */ - /** - * Defines the FormDimension enum. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Ability.Form - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} -@@ -1304,7 +1304,7 @@ declare namespace formInfo { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- Dimension_2_2, -+ Dimension_2_2 = 2, - - /** - * 2 x 4 form -@@ -1320,7 +1320,7 @@ declare namespace formInfo { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- Dimension_2_4, -+ Dimension_2_4 = 3, - - /** - * 4 x 4 form -@@ -1336,7 +1336,7 @@ declare namespace formInfo { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- Dimension_4_4, -+ Dimension_4_4 = 4, - - /** - * 2 x 1 form -@@ -1349,10 +1349,10 @@ declare namespace formInfo { - * - * @syscap SystemCapability.Ability.Form - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 -+ * @deprecated since 20 - */ -- Dimension_2_1, -+ Dimension_2_1 = 5, - - /** - * 1 x 1 form -@@ -1392,23 +1392,13 @@ declare namespace formInfo { - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- DIMENSION_3_3 = 9, -- -- /** -- * 3 x 4 form used for tv devices -- * -- * @syscap SystemCapability.Ability.Form -- * @atomicservice -- * @since arkts {'1.1':'18', '1.2':'20'} -- * @arkts 1.1&1.2 -- */ -- DIMENSION_3_4 = 10 -+ DIMENSION_3_3 = 9 - } - - /** - * Defines the FormShape enum. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Ability.Form - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} -@@ -1439,14 +1429,14 @@ declare namespace formInfo { - /** - * The visibility of a form. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Ability.Form - * @since 9 - */ - /** - * The visibility of a form. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Ability.Form - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} -@@ -1515,14 +1505,14 @@ declare namespace formInfo { - /** - * Indicates the launch reason of a form. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Ability.Form - * @since 10 - */ - /** - * Indicates the launch reason of a form. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Ability.Form - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} -@@ -1600,7 +1590,7 @@ declare namespace formInfo { - /** - * The error code of publish form. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Ability.Form - * @systemapi - * @stagemodelonly -@@ -1843,15 +1833,15 @@ declare namespace formInfo { - /** - * Obtains the grid style of this form. - * -- * @type { number } -- * @readonly -+ * @type { int } - * @default - -+ * @readonly - * @syscap SystemCapability.Ability.Form - * @systemapi - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly dimension: number; -+ readonly dimension: int; - - /** - * Obtains the stage of form use. -@@ -1895,7 +1885,7 @@ declare namespace formInfo { - /** - * The stage of form use. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Ability.Form - * @systemapi - * @since arkts {'1.1':'11', '1.2':'20'} -@@ -1925,7 +1915,7 @@ declare namespace formInfo { - /** - * Defines the FormLocation enum. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Ability.Form - * @systemapi - * @since 12 -@@ -1933,7 +1923,7 @@ declare namespace formInfo { - /** - * Defines the FormLocation enum. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Ability.Form - * @since 20 - * @arkts 1.1&1.2 -diff --git a/api/@ohos.app.form.formProvider.d.ts b/api/@ohos.app.form.formProvider.d.ts -index a8a5583f4..f8bb55d0a 100644 ---- a/api/@ohos.app.form.formProvider.d.ts -+++ b/api/@ohos.app.form.formProvider.d.ts -@@ -46,7 +46,7 @@ declare namespace formProvider { - * Set next update time for a specified form. - * - * @param { string } formId - Indicates the form ID. -- * @param { number } minute - Indicates duration minute before next update. -+ * @param { int } minute - Indicates duration minute before next update. - * @param { AsyncCallback } callback - The callback of setFormNextRefreshTime. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. -@@ -64,7 +64,7 @@ declare namespace formProvider { - * Set next update time for a specified form. - * - * @param { string } formId - Indicates the form ID. -- * @param { number } minute - Indicates duration minute before next update. -+ * @param { int } minute - Indicates duration minute before next update. - * @param { AsyncCallback } callback - The callback of setFormNextRefreshTime. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. -@@ -80,13 +80,13 @@ declare namespace formProvider { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function setFormNextRefreshTime(formId: string, minute: number, callback: AsyncCallback): void; -+ function setFormNextRefreshTime(formId: string, minute: int, callback: AsyncCallback): void; - - /** - * Set next update time for a specified form. - * - * @param { string } formId - Indicates the form ID. -- * @param { number } minute - Indicates duration minute before next update. -+ * @param { int } minute - Indicates duration minute before next update. - * @returns { Promise } The promise returned by the function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. -@@ -104,7 +104,7 @@ declare namespace formProvider { - * Set next update time for a specified form. - * - * @param { string } formId - Indicates the form ID. -- * @param { number } minute - Indicates duration minute before next update. -+ * @param { int } minute - Indicates duration minute before next update. - * @returns { Promise } The promise returned by the function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. -@@ -120,7 +120,7 @@ declare namespace formProvider { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function setFormNextRefreshTime(formId: string, minute: number): Promise; -+ function setFormNextRefreshTime(formId: string, minute: int): Promise; - - /** - * Update a specified form. -@@ -386,8 +386,6 @@ declare namespace formProvider { - * - * @param { string } formId - Indicates the form ID. - * @returns { Promise } Returns the formInfo. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: -- * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. - * @throws { BusinessError } 16500050 - IPC connection error. - * @throws { BusinessError } 16500100 - Failed to obtain the configuration information. - * @throws { BusinessError } 16501000 - An internal functional error occurred. -@@ -434,8 +432,6 @@ declare namespace formProvider { - * Client to communication with FormManagerService. - * - * @param { Want } want - The want of the form to open. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: -- * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. - * @throws { BusinessError } 16500050 - IPC connection error. - * @throws { BusinessError } 16500100 - Failed to obtain the configuration information. - * @throws { BusinessError } 16501000 - An internal functional error occurred. -diff --git a/api/@ohos.application.AccessibilityExtensionAbility.d.ets b/api/@ohos.application.AccessibilityExtensionAbility.d.ets -deleted file mode 100644 -index 184e82be0..000000000 ---- a/api/@ohos.application.AccessibilityExtensionAbility.d.ets -+++ /dev/null -@@ -1,61 +0,0 @@ --/* -- * Copyright (c) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"), -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --/** -- * @file -- * @kit AccessibilityKit -- */ -- --/** -- * Indicates rectangle. -- * -- * @typedef Rect -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 20 -- */ --export class Rect { -- /** -- * The left position of Rect -- * -- * @type { number } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 9 -- */ -- left: number; -- /** -- * The top position of Rect -- * -- * @type { number } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 9 -- */ -- top: number; -- /** -- * The width position of Rect -- * -- * @type { number } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 9 -- */ -- width: number; -- /** -- * The height position of Rect -- * -- * @type { number } -- * @syscap SystemCapability.BarrierFree.Accessibility.Core -- * @since 9 -- */ -- height: number; --} -\ No newline at end of file -diff --git a/api/@ohos.application.BackupExtensionAbility.d.ets b/api/@ohos.application.BackupExtensionAbility.d.ets -deleted file mode 100644 -index f15261306..000000000 ---- a/api/@ohos.application.BackupExtensionAbility.d.ets -+++ /dev/null -@@ -1,78 +0,0 @@ --/* -- * Copyright (c) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- -- --/** -- * Describe bundle version -- * -- * @interface BundleVersion -- * @syscap SystemCapability.FileManagement.StorageService.Backup -- * @StageModelOnly -- * @since 20 -- */ --export interface BundleVersion { -- /** -- * Indicates bundle's version code. -- * -- * @type { number } -- * @syscap SystemCapability.FileManagement.StorageService.Backup -- * @StageModelOnly -- * @since 20 -- */ -- code: number; -- -- /** -- * Indicates bundle's version name. -- * -- * @type { string } -- * @syscap SystemCapability.FileManagement.StorageService.Backup -- * @StageModelOnly -- * @since 20 -- */ -- name: string; --} -- --/** -- * Class to be override for backup extension ability. -- * -- * @syscap SystemCapability.FileManagement.StorageService.Backup -- * @StageModelOnly -- * @since 20 -- */ --declare class BackupExtensionAbility { -- -- /** -- * Callback to be called when the backup procedure is started. -- * Developer could override this method to build files to be backup. -- * -- * @syscap SystemCapability.FileManagement.StorageService.Backup -- * @StageModelOnly -- * @since 20 -- */ -- onBackup(): void; -- -- /** -- * Callback to be called when the restore procedure is started. -- * Developer could override this method to restore from copies for various bundle versions. -- * -- * @param { BundleVersion } bundleVersion Bundle version to be restore. -- * @syscap SystemCapability.FileManagement.StorageService.Backup -- * @StageModelOnly -- * @since 20 -- */ -- onRestore(bundleVersion: BundleVersion): void; --} -- --export default BackupExtensionAbility; -\ No newline at end of file -diff --git a/api/@ohos.application.BackupExtensionAbility.d.ts b/api/@ohos.application.BackupExtensionAbility.d.ts -index dc96d9865..8dede0274 100644 ---- a/api/@ohos.application.BackupExtensionAbility.d.ts -+++ b/api/@ohos.application.BackupExtensionAbility.d.ts -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2024 Huawei Device Co., Ltd. -+ * Copyright (c) 2024-2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at -@@ -18,7 +18,9 @@ - * @kit CoreFileKit - */ - -+/*** if arkts 1.1 */ - import type BackupExtensionContext from './@ohos.file.BackupExtensionContext'; -+/*** endif */ - - /** - * Describe bundle version -@@ -26,7 +28,8 @@ import type BackupExtensionContext from './@ohos.file.BackupExtensionContext'; - * @interface BundleVersion - * @syscap SystemCapability.FileManagement.StorageService.Backup - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface BundleVersion { - /** -@@ -35,7 +38,8 @@ export interface BundleVersion { - * @type { number } - * @syscap SystemCapability.FileManagement.StorageService.Backup - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - code: number; - -@@ -45,7 +49,8 @@ export interface BundleVersion { - * @type { string } - * @syscap SystemCapability.FileManagement.StorageService.Backup - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - name: string; - } -@@ -55,9 +60,10 @@ export interface BundleVersion { - * - * @syscap SystemCapability.FileManagement.StorageService.Backup - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ --export default class BackupExtensionAbility { -+declare class BackupExtensionAbility { - /** - * Indicates backup extension ability context. - * -@@ -82,7 +88,8 @@ export default class BackupExtensionAbility { - * - * @syscap SystemCapability.FileManagement.StorageService.Backup - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onBackup(): void; - -@@ -107,7 +114,8 @@ export default class BackupExtensionAbility { - * @param { BundleVersion } bundleVersion Bundle version to be restore. - * @syscap SystemCapability.FileManagement.StorageService.Backup - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onRestore(bundleVersion: BundleVersion): void; - -@@ -149,3 +157,5 @@ export default class BackupExtensionAbility { - */ - onProcess(): string; - } -+ -+export default BackupExtensionAbility; -diff --git a/api/@ohos.application.DataShareExtensionAbility.d.ts b/api/@ohos.application.DataShareExtensionAbility.d.ts -index 4dc30e550..177444235 100644 ---- a/api/@ohos.application.DataShareExtensionAbility.d.ts -+++ b/api/@ohos.application.DataShareExtensionAbility.d.ts -@@ -42,7 +42,8 @@ type UpdateOperation = dataShare.UpdateOperation; - * @syscap SystemCapability.DistributedDataManager.DataShare.Provider - * @systemapi - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export default class DataShareExtensionAbility { - /** -@@ -52,7 +53,8 @@ export default class DataShareExtensionAbility { - * @syscap SystemCapability.DistributedDataManager.DataShare.Provider - * @systemapi - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - context: ExtensionContext; - -@@ -64,7 +66,8 @@ export default class DataShareExtensionAbility { - * @syscap SystemCapability.DistributedDataManager.DataShare.Provider - * @systemapi - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onCreate?(want: Want, callback: AsyncCallback): void; - -@@ -92,7 +95,8 @@ export default class DataShareExtensionAbility { - * @syscap SystemCapability.DistributedDataManager.DataShare.Provider - * @systemapi - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - update?( - uri: string, -@@ -126,7 +130,8 @@ export default class DataShareExtensionAbility { - * @syscap SystemCapability.DistributedDataManager.DataShare.Provider - * @systemapi - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - delete?(uri: string, predicates: dataSharePredicates.DataSharePredicates, callback: AsyncCallback): void; - -@@ -143,7 +148,8 @@ export default class DataShareExtensionAbility { - * @syscap SystemCapability.DistributedDataManager.DataShare.Provider - * @systemapi - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - query?( - uri: string, -@@ -161,7 +167,8 @@ export default class DataShareExtensionAbility { - * @syscap SystemCapability.DistributedDataManager.DataShare.Provider - * @systemapi - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - batchInsert?(uri: string, valueBuckets: Array, callback: AsyncCallback): void; - -diff --git a/api/@ohos.application.StaticSubscriberExtensionAbility.d.ts b/api/@ohos.application.StaticSubscriberExtensionAbility.d.ts -index 07be8e330..c30016377 100644 ---- a/api/@ohos.application.StaticSubscriberExtensionAbility.d.ts -+++ b/api/@ohos.application.StaticSubscriberExtensionAbility.d.ts -@@ -21,6 +21,9 @@ - /*** if arkts 1.1 */ - import { CommonEventData } from './commonEvent/commonEventData'; - /*** endif */ -+/*** if arkts 1.2 */ -+import { CommonEventData } from './commonEvent/commonEventData'; -+/*** endif */ - import StaticSubscriberExtensionContext from './@ohos.application.StaticSubscriberExtensionContext'; - - /** -@@ -52,7 +55,8 @@ declare class StaticSubscriberExtensionAbility { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onReceiveEvent(event: CommonEventData): void; - } -diff --git a/api/@ohos.application.StaticSubscriberExtensionContext.d.ts b/api/@ohos.application.StaticSubscriberExtensionContext.d.ts -index 8cbab8cd8..d0b3c4977 100644 ---- a/api/@ohos.application.StaticSubscriberExtensionContext.d.ts -+++ b/api/@ohos.application.StaticSubscriberExtensionContext.d.ts -@@ -22,6 +22,10 @@ - import { AsyncCallback } from './@ohos.base'; - import Want from './@ohos.app.ability.Want'; - /*** endif */ -+/*** if arkts 1.2 */ -+import { AsyncCallback } from './@ohos.base'; -+import Want from './@ohos.app.ability.Want'; -+/*** endif */ - import ExtensionContext from './application/ExtensionContext'; - - /** -@@ -63,7 +67,8 @@ declare class StaticSubscriberExtensionContext extends ExtensionContext { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - startAbility(want: Want, callback: AsyncCallback): void; - -@@ -95,7 +100,8 @@ declare class StaticSubscriberExtensionContext extends ExtensionContext { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - startAbility(want: Want): Promise; - } -diff --git a/api/@ohos.application.formError.d.ts b/api/@ohos.application.formError.d.ts -index 2bdd74bd9..e0a3fd469 100644 ---- a/api/@ohos.application.formError.d.ts -+++ b/api/@ohos.application.formError.d.ts -@@ -30,7 +30,7 @@ declare namespace formError { - /** - * Error of form. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Ability.Form - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 -diff --git a/api/@ohos.arkui.UIContext.d.ts b/api/@ohos.arkui.UIContext.d.ts -index f225d686d..fb9e2e9d1 100644 ---- a/api/@ohos.arkui.UIContext.d.ts -+++ b/api/@ohos.arkui.UIContext.d.ts -@@ -49,13 +49,13 @@ import { - } from './arkui/component/common'; - import { CustomBuilder } from './arkui/component/builder'; - import { GestureEvent, GestureRecognizer } from './arkui/component/gesture'; --import { ResourceStr, SizeOptions } from './arkui/component/units'; -+import { ResourceStr, SizeOptions, VoidCallback } from './arkui/component/units'; - import { Nullable, Color, FontStyle, WidthBreakpoint, HeightBreakpoint, PixelRoundMode } from './arkui/component/enums'; - import { TimePickerDialogOptions } from './arkui/component/timePicker'; - import { AlertDialogParamWithConfirm, AlertDialogParamWithButtons, AlertDialogParamWithOptions } from './arkui/component/alertDialog'; - import { ActionSheetOptions } from './arkui/component/actionSheet'; - import { TextPickerDialogOptions } from './arkui/component/textPicker'; --import { LocalStorage } from '@ohos.arkui.stateManagement'; -+import { LocalStorage } from './arkui/stateManagement/storage/localStorage'; - import { DatePickerDialogOptions } from './arkui/component/datePicker'; - import { TabsController } from './arkui/component/tabs'; - import { Scroller } from './arkui/component/scroll'; -@@ -1083,7 +1083,7 @@ export declare class PromptAction { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts { '1.1':'13','1.2':'20' } -+ * @since arkts { '1.1':'18','1.2':'20' } - * @arkts 1.1&1.2 - */ - openToast(options: promptAction.ShowToastOptions): Promise; -@@ -1097,10 +1097,11 @@ export declare class PromptAction { - *
    2. Incorrect parameters types. - *
    3. Parameter verification failed. - * @throws { BusinessError } 100001 - Internal error. -+ * @throws { BusinessError } 103401 - Cannot find the toast. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts { '1.1':'13','1.2':'20' } -+ * @since arkts { '1.1':'18','1.2':'20' } - * @arkts 1.1&1.2 - */ - closeToast(toastId: number): void; -@@ -1328,7 +1329,8 @@ export declare class PromptAction { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts { '1.1':'12','1.2':'20' } -+ * @arkts 1.1&1.2 - */ - closeCustomDialog(dialogContent: ComponentContent): Promise; - -@@ -1653,14 +1655,24 @@ export interface OverlayManagerOptions { - */ - renderRootOverlay?: boolean; - -+/** -+ * Set whether support backPressed event or not. -+ * -+ * @type { ?boolean } -+ * @default false -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @atomicservice -+ * @since 19 -+ */ - /** - * Set whether support backPressed event or not. - * - * @type { ?boolean } -- * @default true -+ * @default false - * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform - * @atomicservice -- * @since arkts { '1.1':'15','1.2':'20' } -+ * @since 20 - * @arkts 1.1&1.2 - */ - enableBackPressedEvent?: boolean; -@@ -2665,7 +2677,7 @@ export declare class SwiperDynamicSyncScene extends DynamicSyncScene { - * @extends DynamicSyncScene - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since arkts { '1.1':'13','1.2':'20' } -+ * @since arkts { '1.1':'14','1.2':'20' } - * @arkts 1.1&1.2 - */ - export declare class MarqueeDynamicSyncScene extends DynamicSyncScene { -@@ -2675,7 +2687,7 @@ export declare class MarqueeDynamicSyncScene extends DynamicSyncScene { - * @readonly - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since arkts { '1.1':'13','1.2':'20' } -+ * @since arkts { '1.1':'14','1.2':'20' } - * @arkts 1.1&1.2 - */ - readonly type: MarqueeDynamicSyncSceneType; -@@ -4400,6 +4412,18 @@ export declare class UIContext { - * @arkts 1.1&1.2 - */ - static destroyUIContextWithoutWindow(): void; -+ -+ /** -+ * Thread-safe UI state variables updates interface. -+ * -+ * @param { VoidCallback } callback - The callback function to be executed in the UI thread. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ setUIStates(callback: VoidCallback): void; - } - - /** -@@ -4502,7 +4526,7 @@ export const enum SwiperDynamicSyncSceneType { - * @enum { number } MarqueeDynamicSyncSceneType - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since arkts { '1.1':'13','1.2':'20' } -+ * @since arkts { '1.1':'14','1.2':'20' } - * @arkts 1.1&1.2 - */ - export const enum MarqueeDynamicSyncSceneType { -@@ -4511,7 +4535,7 @@ export const enum MarqueeDynamicSyncSceneType { - * - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since arkts { '1.1':'13','1.2':'20' } -+ * @since arkts { '1.1':'14','1.2':'20' } - * @arkts 1.1&1.2 - */ - ANIMATION = 1 -diff --git a/api/@ohos.arkui.advanced.SplitLayout.d.ets b/api/@ohos.arkui.advanced.SplitLayout.d.ets -index d32452e04..0544d4f48 100644 ---- a/api/@ohos.arkui.advanced.SplitLayout.d.ets -+++ b/api/@ohos.arkui.advanced.SplitLayout.d.ets -@@ -17,10 +17,12 @@ - * @file - * @kit ArkUI - */ -- -- -- -- -+/*** if arkts 1.2 */ -+import { ResourceStr } from './arkui/component/units'; -+import { State, Prop } from './arkui/stateManagement/decorator'; -+import { Component } from './arkui/component/customComponent'; -+import { BuilderParam, Builder } from './arkui/component/builder'; -+/*** endif */ - - /** - * Declare SplitLayout.The SplitLayout is used for upper and lower graphic layouts. -@@ -31,7 +33,8 @@ - * Declare SplitLayout.The SplitLayout is used for upper and lower graphic layouts. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since 11 -+ * @since arkts{ '1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - @Component - export declare struct SplitLayout { -@@ -46,9 +49,10 @@ export declare struct SplitLayout { - * @type { container: () => void }. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since 11 -+ * @since arkts{ '1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- @BuilderParam container: () => void; -+ @BuilderParam container: () => void; - - /** - * Image in the layout. -@@ -61,7 +65,8 @@ export declare struct SplitLayout { - * @type { ResourceStr }. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since 11 -+ * @since arkts{ '1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - @State mainImage: ResourceStr; - -@@ -76,7 +81,8 @@ export declare struct SplitLayout { - * @type { ResourceStr }. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since 11 -+ * @since arkts{ '1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - @Prop primaryText: ResourceStr; - -@@ -91,7 +97,8 @@ export declare struct SplitLayout { - * @type { ?ResourceStr }. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since 11 -+ * @since arkts{ '1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - @Prop secondaryText?: ResourceStr; - -@@ -106,7 +113,17 @@ export declare struct SplitLayout { - * @type { ?ResourceStr }. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since 11 -+ * @since arkts{ '1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - @Prop tertiaryText?: ResourceStr; --} -\ No newline at end of file -+ -+ /** -+ * The method to build component. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ @Builder build(): void; -+} -diff --git a/api/@ohos.arkui.advanced.SwipeRefresher.d.ets b/api/@ohos.arkui.advanced.SwipeRefresher.d.ets -index 25e3b6a78..38e115e87 100644 ---- a/api/@ohos.arkui.advanced.SwipeRefresher.d.ets -+++ b/api/@ohos.arkui.advanced.SwipeRefresher.d.ets -@@ -17,6 +17,12 @@ - * @file - * @kit ArkUI - */ -+/*** if arkts 1.2 */ -+import { ResourceStr } from './arkui/component/units'; -+import { Prop } from './arkui/stateManagement/decorator'; -+import { Component } from './arkui/component/customComponent'; -+import { Builder } from './arkui/component/builder'; -+/*** endif */ - - /** - * Declare component SwipeRefresher -@@ -27,7 +33,8 @@ - * Declare component SwipeRefresher - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since 11 -+ * @since arkts{ '1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - @Component - export declare struct SwipeRefresher { -@@ -39,12 +46,13 @@ export declare struct SwipeRefresher { - */ - /** - * Sets the content when loading. -- * @type { string } -+ * @type { ?ResourceStr } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since 11 -+ * @since arkts{ '1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- @Prop content?: string; -+ @Prop content?: ResourceStr; - - /** - * Whether the component is loading. -@@ -57,7 +65,17 @@ export declare struct SwipeRefresher { - * type { boolean } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since 11 -+ * @since arkts{ '1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - @Prop isLoading: boolean; --} -\ No newline at end of file -+ -+ /** -+ * The method to build component. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ @Builder build(): void; -+} -diff --git a/api/@ohos.arkui.component.d.ets b/api/@ohos.arkui.component.d.ets -index 547e4afd9..a0fe3c237 100644 ---- a/api/@ohos.arkui.component.d.ets -+++ b/api/@ohos.arkui.component.d.ets -@@ -20,6 +20,7 @@ - */ - - export * from './arkui/UserView'; -+export * from './arkui/component/animation'; - export * from './arkui/component/customComponent'; - export * from './arkui/component/common'; - export * from './arkui/component/column'; -@@ -35,7 +36,6 @@ export * from './arkui/component/badge'; - export * from './arkui/component/blank'; - export * from './arkui/component/builder'; - export * from './arkui/component/button'; --export * from './arkui/component/calendar'; - export * from './arkui/component/calendarPicker'; - export * from './arkui/component/canvas'; - export * from './arkui/component/checkbox'; -@@ -56,6 +56,7 @@ export * from './arkui/component/effectComponent'; - export * from './arkui/component/ellipse'; - export * from './arkui/component/embeddedComponent'; - export * from './arkui/component/enums'; -+export * from './arkui/component/extendableComponent'; - export * from './arkui/component/flex'; - export * from './arkui/component/flowItem'; - export * from './arkui/component/focus'; -@@ -153,3 +154,5 @@ export * from './arkui/component/windowScene'; - export * from './arkui/component/withTheme'; - export * from './arkui/component/xcomponent'; - export * from './arkui/component/resources'; -+export * from './arkui/component/lazyGridLayout'; -+export * from './arkui/component/pageTransition'; -diff --git a/api/@ohos.arkui.componentSnapshot.d.ts b/api/@ohos.arkui.componentSnapshot.d.ts -index be481f562..9d76a2482 100644 ---- a/api/@ohos.arkui.componentSnapshot.d.ts -+++ b/api/@ohos.arkui.componentSnapshot.d.ts -@@ -19,11 +19,11 @@ - */ - - /*** if arkts 1.2 */ --import { CustomBuilder } from './arkui/component/builder' -+import { CustomBuilder } from './arkui/component/builder'; - /*** endif */ - - import { AsyncCallback } from './@ohos.base'; --import image from './@ohos.multimedia.image' -+import image from './@ohos.multimedia.image'; - - /** - * This module allows developers to export snapshot image from a component or a custom builder. -@@ -254,9 +254,9 @@ declare namespace componentSnapshot { - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 - * @deprecated since 18 - * @useinstead ohos.arkui.UIContext.ComponentSnapshot#get -+ * @arkts 1.1&1.2 - */ - function get(id: string, callback: AsyncCallback, options?: SnapshotOptions): void; - -@@ -289,9 +289,9 @@ declare namespace componentSnapshot { - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 - * @deprecated since 18 - * @useinstead ohos.arkui.UIContext.ComponentSnapshot#get -+ * @arkts 1.1&1.2 - */ - function get(id: string, options?: SnapshotOptions): Promise; - -@@ -328,9 +328,9 @@ declare namespace componentSnapshot { - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 - * @deprecated since 18 - * @useinstead ohos.arkui.UIContext.ComponentSnapshot#createFromBuilder -+ * @arkts 1.1&1.2 - */ - function createFromBuilder(builder: CustomBuilder, callback: AsyncCallback, - delay?: number, checkImageStatus?: boolean, options?: SnapshotOptions): void; -@@ -368,9 +368,9 @@ declare namespace componentSnapshot { - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 - * @deprecated since 18 - * @useinstead ohos.arkui.UIContext.ComponentSnapshot#createFromBuilder -+ * @arkts 1.1&1.2 - */ - function createFromBuilder(builder: CustomBuilder, delay?: number, - checkImageStatus?: boolean, options?: SnapshotOptions): Promise; -diff --git a/api/@ohos.arkui.dragController.d.ts b/api/@ohos.arkui.dragController.d.ts -index cee6f7f5a..8c83754ef 100644 ---- a/api/@ohos.arkui.dragController.d.ts -+++ b/api/@ohos.arkui.dragController.d.ts -@@ -20,7 +20,7 @@ - - /*** if arkts 1.2 */ - import { DragEvent, DragPreviewOptions, DragItemInfo, ICurve } from './arkui/component/common'; --import { CustomBuilder } from './arkui/component/builder' -+import { CustomBuilder } from './arkui/component/builder'; - import { TouchPoint, ResourceColor } from './arkui/component/units'; - import { Curve } from './arkui/component/enums'; - /*** endif */ -@@ -703,11 +703,12 @@ declare namespace dragController { - * Execute a drag event. - * @param { CustomBuilder | DragItemInfo } custom - Object used for prompts displayed when the object is dragged. - * @param { DragInfo } dragInfo - Information about the drag event. -- * @param { AsyncCallback<{ event: DragEvent, extraParams: string }> } callback - Callback that contains the drag event information. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: -- *
    1. Mandatory parameters are left unspecified. -- *
    2. Incorrect parameters types. -- *
    3. Parameter verification failed. -+ * @param { AsyncCallback<{ event: DragEvent, extraParams: string }> } callback - Callback that contains the drag -+ * event information. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: -+ *
    1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameters types. -+ *
    3. Parameter verification failed. - * @throws { BusinessError } 100001 - Internal handling failed. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @since 10 -@@ -717,45 +718,45 @@ declare namespace dragController { - * @param { CustomBuilder | DragItemInfo } custom - Object used for prompts displayed when the object is dragged. - * @param { DragInfo } dragInfo - Information about the drag event. - * @param { AsyncCallback } callback - Callback that contains the drag event information. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: -- *
    1. Mandatory parameters are left unspecified. -- *
    2. Incorrect parameters types. -- *
    3. Parameter verification failed. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: -+ *
    1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameters types. -+ *
    3. Parameter verification failed. - * @throws { BusinessError } 100001 - Internal handling failed. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice - * @since 12 -- */ -+ */ - /** - * Execute a drag event. - * @param { CustomBuilder | DragItemInfo } custom - Object used for prompts displayed when the object is dragged. - * @param { DragInfo } dragInfo - Information about the drag event. - * @param { AsyncCallback } callback - Callback that contains the drag event information. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: -- *
    1. Mandatory parameters are left unspecified. -- *
    2. Incorrect parameters types. -- *
    3. Parameter verification failed. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: -+ *
    1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameters types. -+ *
    3. Parameter verification failed. - * @throws { BusinessError } 100001 - Internal handling failed. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 -- * @deprecated since 18 -+ * @deprecated since 18 - * @useinstead ohos.arkui.UIContext.DragController#executeDrag -+ * @arkts 1.1&1.2 - */ - function executeDrag(custom: CustomBuilder | DragItemInfo, dragInfo: DragInfo, -- callback: AsyncCallback): void; -+ callback: AsyncCallback): void; - - /** - * Execute a drag event. - * @param { CustomBuilder | DragItemInfo } custom - Object used for prompts displayed when the object is dragged. - * @param { DragInfo } dragInfo - Information about the drag event. - * @returns { Promise<{ event: DragEvent, extraParams: string }> } A Promise with the drag event information. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: -- *
    1. Mandatory parameters are left unspecified. -- *
    2. Incorrect parameters types. -- *
    3. Parameter verification failed. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: -+ *
    1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameters types. -+ *
    3. Parameter verification failed. - * @throws { BusinessError } 100001 - Internal handling failed. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @since 10 -@@ -765,10 +766,10 @@ declare namespace dragController { - * @param { CustomBuilder | DragItemInfo } custom - Object used for prompts displayed when the object is dragged. - * @param { DragInfo } dragInfo - Information about the drag event. - * @returns { Promise } A Promise with the drag event information. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: -- *
    1. Mandatory parameters are left unspecified. -- *
    2. Incorrect parameters types. -- *
    3. Parameter verification failed. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: -+ *
    1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameters types. -+ *
    3. Parameter verification failed. - * @throws { BusinessError } 100001 - Internal handling failed. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -@@ -779,18 +780,18 @@ declare namespace dragController { - * @param { CustomBuilder | DragItemInfo } custom - Object used for prompts displayed when the object is dragged. - * @param { DragInfo } dragInfo - Information about the drag event. - * @returns { Promise } A Promise with the drag event information. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: -- *
    1. Mandatory parameters are left unspecified. -- *
    2. Incorrect parameters types. -- *
    3. Parameter verification failed. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: -+ *
    1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameters types. -+ *
    3. Parameter verification failed. - * @throws { BusinessError } 100001 - Internal handling failed. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 - * @deprecated since 18 - * @useinstead ohos.arkui.UIContext.DragController#executeDrag -+ * @arkts 1.1&1.2 - */ - function executeDrag(custom: CustomBuilder | DragItemInfo, dragInfo: DragInfo): Promise; - -@@ -798,13 +799,13 @@ declare namespace dragController { - * Create one drag action object, which can be used for starting drag later or monitoring - * the drag status after drag started. - * @param { Array } customArray - Objects used for prompts -- * displayed when the objects are dragged. -+ * displayed when the objects are dragged. - * @param { DragInfo } dragInfo - Information about the drag event. - * @returns { DragAction } one drag action object -- * @throws { BusinessError } 401 - Parameter error. Possible causes: -- *
    1. Mandatory parameters are left unspecified. -- *
    2. Incorrect parameters types. -- *
    3. Parameter verification failed. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: -+ *
    1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameters types. -+ *
    3. Parameter verification failed. - * @throws { BusinessError } 100001 - Internal handling failed. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @since 11 -@@ -813,13 +814,13 @@ declare namespace dragController { - * Create one drag action object, which can be used for starting drag later or monitoring - * the drag status after drag started. - * @param { Array } customArray - Objects used for prompts -- * displayed when the objects are dragged. -+ * displayed when the objects are dragged. - * @param { DragInfo } dragInfo - Information about the drag event. - * @returns { DragAction } one drag action object -- * @throws { BusinessError } 401 - Parameter error. Possible causes: -- *
    1. Mandatory parameters are left unspecified. -- *
    2. Incorrect parameters types. -- *
    3. Parameter verification failed. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: -+ *
    1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameters types. -+ *
    3. Parameter verification failed. - * @throws { BusinessError } 100001 - Internal handling failed. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -@@ -829,21 +830,21 @@ declare namespace dragController { - * Create one drag action object, which can be used for starting drag later or monitoring - * the drag status after drag started. - * @param { Array } customArray - Objects used for prompts -- * displayed when the objects are dragged. -+ * displayed when the objects are dragged. - * @param { DragInfo } dragInfo - Information about the drag event. - * @returns { DragAction } one drag action object -- * @throws { BusinessError } 401 - Parameter error. Possible causes: -- *
    1. Mandatory parameters are left unspecified. -- *
    2. Incorrect parameters types. -- *
    3. Parameter verification failed. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: -+ *
    1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameters types. -+ *
    3. Parameter verification failed. - * @throws { BusinessError } 100001 - Internal handling failed. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 - * @deprecated since 18 - * @useinstead ohos.arkui.UIContext.DragController#createDragAction -+ * @arkts 1.1&1.2 - */ - function createDragAction(customArray: Array, dragInfo: DragInfo): DragAction; - -@@ -867,9 +868,9 @@ declare namespace dragController { - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 - * @deprecated since 18 - * @useinstead ohos.arkui.UIContext.DragController#getDragPreview -+ * @arkts 1.1&1.2 - */ - function getDragPreview(): DragPreview; - -diff --git a/api/@ohos.arkui.drawableDescriptor.d.ts b/api/@ohos.arkui.drawableDescriptor.d.ts -index ef04461b6..2f02fe826 100644 ---- a/api/@ohos.arkui.drawableDescriptor.d.ts -+++ b/api/@ohos.arkui.drawableDescriptor.d.ts -@@ -75,10 +75,21 @@ export declare class DrawableDescriptor { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - getPixelMap(): image.PixelMap; -+ -+ /** -+ * Get pixelMap of drawable image. -+ * -+ * @returns { image.PixelMap | undefined } Return the PixelMap of the calling DrawableDescriptor object. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ getPixelMap(): image.PixelMap | undefined; - } - - /** -@@ -146,11 +157,22 @@ export declare class LayeredDrawableDescriptor extends DrawableDescriptor { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - getForeground(): DrawableDescriptor; - -+ /** -+ * Get DrawableDescriptor for the foreground. -+ * -+ * @returns { DrawableDescriptor | undefined } Return the DrawableDescriptor object of foreground. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ getForeground(): DrawableDescriptor | undefined; -+ - /** - * Get DrawableDescriptor for the background. - * -@@ -173,11 +195,22 @@ export declare class LayeredDrawableDescriptor extends DrawableDescriptor { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - getBackground(): DrawableDescriptor; - -+ /** -+ * Get DrawableDescriptor for the background. -+ * -+ * @returns { DrawableDescriptor | undefined } Return the DrawableDescriptor object of background. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ getBackground(): DrawableDescriptor | undefined; -+ - /** - * Get DrawableDescriptor for the mask. - * -@@ -200,11 +233,22 @@ export declare class LayeredDrawableDescriptor extends DrawableDescriptor { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - getMask(): DrawableDescriptor; - -+ /** -+ * Get DrawableDescriptor for the mask. -+ * -+ * @returns { DrawableDescriptor | undefined } Return the DrawableDescriptor object of mask. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ getMask(): DrawableDescriptor | undefined; -+ - - /** - * Get the clip path info of the adaptive icon mask. -@@ -265,7 +309,7 @@ export declare class PixelMapDrawableDescriptor extends DrawableDescriptor { - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ --interface AnimationOptions { -+export declare interface AnimationOptions { - /** - * The duration of animation playback once. - * -diff --git a/api/@ohos.arkui.inspector.d.ts b/api/@ohos.arkui.inspector.d.ts -index 8bea3d962..11f62dbe9 100644 ---- a/api/@ohos.arkui.inspector.d.ts -+++ b/api/@ohos.arkui.inspector.d.ts -@@ -174,6 +174,7 @@ declare namespace inspector { - * @crossplatform - * @atomicservice - * @since 20 -+ * @test - * @arkts 1.2 - */ - function getInspectorByKey(id: string): string; -@@ -186,8 +187,8 @@ declare namespace inspector { - * @crossplatform - * @atomicservice - * @since 20 -- * @arkts 1.2 - * @test -+ * @arkts 1.2 - */ - function getInspectorTree(): Object; - -@@ -202,10 +203,40 @@ declare namespace inspector { - * @crossplatform - * @atomicservice - * @since 20 -- * @arkts 1.2 - * @test -+ * @arkts 1.2 - */ - function sendEventByKey(id: string, action: number, params: string): boolean; - } - - export default inspector; -+/** -+ * export function getInspectorByKey from inspector namespace and provide it for kit ArkUI. -+ * @constant -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+export const GETINSPECTORBYKEY = inspector.getInspectorByKey; -+/** -+ * export function getInspectorTree from inspector namespace and provide it for kit ArkUI. -+ * @constant -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+export const GETINSPECTORTREE = inspector.getInspectorTree; -+/** -+ * export function sendEventByKey from inspector namespace and provide it for kit ArkUI. -+ * @constant -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+export const SENDEVENTBYKEY = inspector.sendEventByKey; -\ No newline at end of file -diff --git a/api/@ohos.arkui.shape.d.ts b/api/@ohos.arkui.shape.d.ts -index ebcc33c66..3274f282b 100644 ---- a/api/@ohos.arkui.shape.d.ts -+++ b/api/@ohos.arkui.shape.d.ts -@@ -33,7 +33,7 @@ import { Position, ResourceColor, Length, SizeOptions } from './arkui/component/ - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ --interface ShapeSize { -+export interface ShapeSize { - /** - * Defines the width of Shape. - * @type { ? (number | string) } -@@ -69,7 +69,7 @@ interface ShapeSize { - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ --interface RectShapeOptions extends ShapeSize { -+export interface RectShapeOptions extends ShapeSize { - /** - * Defines the corner radius of the RectShape. - * @type { ? (number | string | Array) } -@@ -94,7 +94,7 @@ interface RectShapeOptions extends ShapeSize { - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ --interface RoundRectShapeOptions extends ShapeSize { -+export interface RoundRectShapeOptions extends ShapeSize { - /** - * Defines the width of the corner radius for RectShape. - * @type { ? (number | string) } -@@ -129,7 +129,7 @@ interface RoundRectShapeOptions extends ShapeSize { - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ --interface PathShapeOptions { -+export interface PathShapeOptions { - /** - * Defines the commands for drawing the PathShape. - * @type { ?string } -diff --git a/api/@ohos.arkui.stateManagement.d.ets b/api/@ohos.arkui.stateManagement.d.ets -index 9a6caa8f8..1684309c3 100644 ---- a/api/@ohos.arkui.stateManagement.d.ets -+++ b/api/@ohos.arkui.stateManagement.d.ets -@@ -19,21 +19,9 @@ - * @arkts 1.2 - */ - --export * from './arkui/stateManagement/common'; -+export * from './arkui/stateManagement/decorator'; - export * from './arkui/stateManagement/runtime'; --export * from './arkui/stateManagement/storage'; --export * from './arkui/stateManagement/base/backingValue'; --export * from './arkui/stateManagement/base/decoratorBase'; --export * from './arkui/stateManagement/base/iObservedObject'; --export * from './arkui/stateManagement/base/mutableStateMeta'; --export * from './arkui/stateManagement/decorators/decoratorState'; --export * from './arkui/stateManagement/decorators/decoratorLink'; --export * from './arkui/stateManagement/decorators/decoratorObjectLink'; --export * from './arkui/stateManagement/decorators/decoratorProp'; --export * from './arkui/stateManagement/decorators/decoratorProvide'; --export * from './arkui/stateManagement/decorators/decoratorConsume'; --export * from './arkui/stateManagement/decorators/decoratorStorageLink'; --export * from './arkui/stateManagement/decorators/decoratorStorageProp'; --export * from './arkui/stateManagement/decorators/decoratorWatch'; --export * from './arkui/stateManagement/storages/appStorage'; --export * from './arkui/stateManagement/storages/localStorage'; -\ No newline at end of file -+export * from './arkui/stateManagement/storage/appStorage'; -+export * from './arkui/stateManagement/storage/localStorage'; -+export * from './arkui/stateManagement/utils'; -+export * from './arkui/stateManagement/storage/storageProperty'; -\ No newline at end of file -diff --git a/api/@ohos.base.d.ets b/api/@ohos.base.d.ets -index 39f9d3995..0f7d42b99 100644 ---- a/api/@ohos.base.d.ets -+++ b/api/@ohos.base.d.ets -@@ -51,7 +51,7 @@ export type ErrorCallback = (err: T)=> void; - * @atomicservice - * @since 20 - */ --export type AsyncCallback = (err: BusinessError, data: T)=> void; -+export type AsyncCallback = (err: BusinessError | null, data: T | undefined)=> void; - - /** - * Defines the error interface. -diff --git a/api/@ohos.base.d.ts b/api/@ohos.base.d.ts -index d56214a16..05e1f0301 100644 ---- a/api/@ohos.base.d.ts -+++ b/api/@ohos.base.d.ts -@@ -290,51 +290,4 @@ export interface BusinessError extends Error { - * @since 12 - */ - data?: T; --} -- --/** -- * In ArkTS 1.1, using int is equivalent to using number -- * -- * @typedef { number } -- * @syscap SystemCapability.Base -- * @crossplatform -- * @form -- * @atomicservice -- * @since 20 -- */ --export type int = number; -- --/** -- * In ArkTS 1.1, using double is equivalent to using number -- * -- * @typedef { number } -- * @syscap SystemCapability.Base -- * @crossplatform -- * @form -- * @atomicservice -- * @since 20 -- */ --export type double = number; --/** -- * In ArkTS 1.1, using float is equivalent to using number -- * -- * @typedef { number } -- * @syscap SystemCapability.Base -- * @crossplatform -- * @form -- * @atomicservice -- * @since 20 -- */ --export type float = number; -- --/** -- * In ArkTS 1.1, using long is equivalent to using number -- * -- * @typedef { number } -- * @syscap SystemCapability.Base -- * @crossplatform -- * @form -- * @atomicservice -- * @since 20 -- */ --export type long = number; -+} -\ No newline at end of file -diff --git a/api/@ohos.batteryInfo.d.ets b/api/@ohos.batteryInfo.d.ets -index a5585c54f..533aefc59 100644 ---- a/api/@ohos.batteryInfo.d.ets -+++ b/api/@ohos.batteryInfo.d.ets -@@ -16,6 +16,7 @@ - /** - * @file - * @kit BasicServicesKit -+ * @arkts 1.2 - */ - - /** -@@ -79,8 +80,8 @@ declare namespace batteryInfo { - /** - * Battery state of charge (SoC) of the current device, in percent. - * -+ * @returns { int } Returns the battery state of charge (SoC) of the current device, in percent. - * @syscap SystemCapability.PowerManager.BatteryManager.Core -- * @atomicservice - * @since 20 - */ - function batterySOC(): int; -@@ -88,8 +89,8 @@ declare namespace batteryInfo { - /** - * Battery charging status of the current device. - * -+ * @returns { BatteryChargeState } Returns the battery charging status of the current device. - * @syscap SystemCapability.PowerManager.BatteryManager.Core -- * @atomicservice - * @since 20 - */ - function chargingStatus(): BatteryChargeState; -@@ -97,6 +98,7 @@ declare namespace batteryInfo { - /** - * Battery health state of the current device. - * -+ * @returns { BatteryHealthState } Returns the battery health state of the current device. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ -@@ -105,6 +107,7 @@ declare namespace batteryInfo { - /** - * Charger type of the current device. - * -+ * @returns { BatteryPluggedType } Returns the charger type of the current device. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ -@@ -113,6 +116,7 @@ declare namespace batteryInfo { - /** - * Battery voltage of the current device, in µV. - * -+ * @returns { int } Returns the battery voltage of the current device, in µV. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ -@@ -121,6 +125,7 @@ declare namespace batteryInfo { - /** - * Battery technology of the current device. - * -+ * @returns { string } Returns the battery technology of the current device. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ -@@ -129,6 +134,7 @@ declare namespace batteryInfo { - /** - * Battery temperature of the current device, in 0.1℃. - * -+ * @returns { int } Returns the battery temperature of the current device, in 0.1℃. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ -@@ -137,6 +143,7 @@ declare namespace batteryInfo { - /** - * Battery present state of the current device. - * -+ * @returns { boolean } Returns true if the battery is present; returns false if the battery is absent. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ -@@ -145,6 +152,7 @@ declare namespace batteryInfo { - /** - * Battery capacity level of the current device. - * -+ * @returns { BatteryCapacityLevel } Returns the battery capacity level of the current device. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ -@@ -153,6 +161,7 @@ declare namespace batteryInfo { - /** - * Estimated remaining time for the current device to be fully charged, in ms. - * -+ * @returns { long } Returns the estimated remaining time for the current device to be fully charged, in ms. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @systemapi - * @since 20 -@@ -162,6 +171,7 @@ declare namespace batteryInfo { - /** - * Battery total energy of the current device, in mAh. - * -+ * @returns { int } Returns the battery total energy of the current device, in mAh. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @systemapi - * @since 20 -@@ -171,6 +181,7 @@ declare namespace batteryInfo { - /** - * Battery immediate current of the current device, in mA. - * -+ * @returns { int } Returns the battery immediate current of the current device, in mA. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @since 20 - */ -@@ -179,6 +190,7 @@ declare namespace batteryInfo { - /** - * Battery remaining energy of the current device, in mAh. - * -+ * @returns { int } Returns the battery remaining energy of the current device, in mAh. - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @systemapi - * @since 20 -diff --git a/api/@ohos.batteryStatistics.d.ts b/api/@ohos.batteryStatistics.d.ts -index 906cb9645..1ccd48e00 100644 ---- a/api/@ohos.batteryStatistics.d.ts -+++ b/api/@ohos.batteryStatistics.d.ts -@@ -16,6 +16,7 @@ - /** - * @file - * @kit BasicServicesKit -+ * @arkts 1.1&1.2 - */ - - import { AsyncCallback, BusinessError } from './@ohos.base'; -@@ -26,88 +27,108 @@ import { AsyncCallback, BusinessError } from './@ohos.base'; - * @namespace batteryStats - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace batteryStats { - /** - * Describes the consumption type. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum ConsumptionType { -- /** Indicates an invalid consumption type -+ /** -+ * Indicates an invalid consumption type. - * - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 -- */ -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - CONSUMPTION_TYPE_INVALID = -17, - -- /** Indicates the battery power consumption generated by APP -+ /** -+ * Indicates the battery power consumption generated by APP. - * - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 -- */ -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - CONSUMPTION_TYPE_APP, - -- /** Indicates the battery power consumption generated by bluetooth -+ /** -+ * Indicates the battery power consumption generated by bluetooth. - * - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 -- */ -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - CONSUMPTION_TYPE_BLUETOOTH, - -- /** Indicates the battery power consumption generated when the CPU is idle -+ /** -+ * Indicates the battery power consumption generated when the CPU is idle. - * - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 -- */ -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - CONSUMPTION_TYPE_IDLE, - -- /** Indicates the battery power consumption generated when phone call is active -+ /** -+ * Indicates the battery power consumption generated when phone call is active. - * - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 -- */ -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - CONSUMPTION_TYPE_PHONE, - -- /** Indicates the battery power consumption generated by radio -+ /** -+ * Indicates the battery power consumption generated by radio. - * - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 -- */ -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - CONSUMPTION_TYPE_RADIO, - -- /** Indicates the battery power consumption generated by screen -+ /** -+ * Indicates the battery power consumption generated by screen. - * - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 -- */ -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - CONSUMPTION_TYPE_SCREEN, - -- /** Indicates the battery power consumption generated by user -+ /** -+ * Indicates the battery power consumption generated by user. - * - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 -- */ -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - CONSUMPTION_TYPE_USER, - -- /** Indicates the battery power consumption generated by WIFI -+ /** -+ * Indicates the battery power consumption generated by WIFI. - * - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 -- */ -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - CONSUMPTION_TYPE_WIFI - } - -@@ -119,7 +140,8 @@ declare namespace batteryStats { - * @throws { BusinessError } 4600101 - Failed to connect to the service. - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getBatteryStats(): Promise>; - -@@ -133,67 +155,72 @@ declare namespace batteryStats { - * @throws { BusinessError } 4600101 - Failed to connect to the service. - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getBatteryStats(callback: AsyncCallback>): void; - - /** - * Obtains power consumption information(mAh) for a given uid. - * -- * @param { number } uid Indicates the uid. -- * @returns { number } Power consumption information(mAh). -+ * @param { int } uid Indicates the uid. -+ * @returns { double } Power consumption information(mAh). - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. - * @throws { BusinessError } 4600101 - Failed to connect to the service. - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getAppPowerValue(uid: number): number; -+ function getAppPowerValue(uid: int): double; - - /** - * Obtains power consumption information(Percent) for a given uid. - * -- * @param { number } uid Indicates the uid. -- * @returns { number } Power consumption information(Percent). -+ * @param { int } uid Indicates the uid. -+ * @returns { double } Power consumption information(Percent). - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. - * @throws { BusinessError } 4600101 - Failed to connect to the service. - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getAppPowerPercent(uid: number): number; -+ function getAppPowerPercent(uid: int): double; - - /** - * Obtains power consumption information(mAh) for a given type. - * - * @param { ConsumptionType } type Indicates the hardware type. - * the ConsumptionType type is an enumeration class. -- * @returns { number } Power consumption information(mAh). -+ * @returns { double } Power consumption information(mAh). - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. - * @throws { BusinessError } 4600101 - Failed to connect to the service. - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getHardwareUnitPowerValue(type: ConsumptionType): number; -+ function getHardwareUnitPowerValue(type: ConsumptionType): double; - - /** - * Obtains power consumption information(Percent) for a given type. - * - * @param { ConsumptionType } type Indicates the hardware type. - * the ConsumptionType type is an enumeration class. -- * @returns { number } Power consumption information(Percent). -+ * @returns { double } Power consumption information(Percent). - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. - * @throws { BusinessError } 4600101 - Failed to connect to the service. - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getHardwareUnitPowerPercent(type: ConsumptionType): number; -+ function getHardwareUnitPowerPercent(type: ConsumptionType): double; - - /** - * Contains power consumption information of a device. -@@ -202,35 +229,42 @@ declare namespace batteryStats { - * @typedef BatteryStatsInfo - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface BatteryStatsInfo { -- /** The uid related with the power consumption info. -+ /** -+ * The uid related with the power consumption info. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 -- */ -- uid: number; -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ uid: int; - -- /** The type related with the power consumption info. -+ /** -+ * The type related with the power consumption info. - * - * @type { ConsumptionType } - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 -- */ -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - type: ConsumptionType; - -- /** The power consumption value(mAh). -+ /** -+ * The power consumption value(mAh). - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 -- */ -- power: number; -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ power: double; - } - } - -@@ -240,6 +274,7 @@ declare namespace batteryStats { - * @namespace batteryStats - * @syscap SystemCapability.PowerManager.BatteryStatistics - * @systemapi -- * @since 8 --*/ -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - export default batteryStats; -diff --git a/api/@ohos.bluetooth.a2dp.d.ts b/api/@ohos.bluetooth.a2dp.d.ts -index a4403cf13..6e2402d56 100644 ---- a/api/@ohos.bluetooth.a2dp.d.ts -+++ b/api/@ohos.bluetooth.a2dp.d.ts -@@ -43,7 +43,8 @@ declare namespace a2dp { - * - * @typedef { baseProfile.BaseProfile } BaseProfile - * @syscap SystemCapability.Communication.Bluetooth.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type BaseProfile = baseProfile.BaseProfile; - -diff --git a/api/@ohos.bluetooth.access.d.ts b/api/@ohos.bluetooth.access.d.ts -index e04cf930b..d2e5946d9 100644 ---- a/api/@ohos.bluetooth.access.d.ts -+++ b/api/@ohos.bluetooth.access.d.ts -@@ -288,8 +288,7 @@ declare namespace access { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 18 - */ - function on(type: 'stateChange', callback: Callback): void; - -@@ -336,8 +335,7 @@ declare namespace access { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - function off(type: 'stateChange', callback?: Callback): void; - -diff --git a/api/@ohos.bluetooth.baseProfile.d.ts b/api/@ohos.bluetooth.baseProfile.d.ts -index ad71f8481..27764959f 100644 ---- a/api/@ohos.bluetooth.baseProfile.d.ts -+++ b/api/@ohos.bluetooth.baseProfile.d.ts -@@ -425,8 +425,7 @@ declare namespace baseProfile { - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - on(type: 'connectionStateChange', callback: Callback): void; - -diff --git a/api/@ohos.bluetooth.ble.d.ts b/api/@ohos.bluetooth.ble.d.ts -index c0cc1c722..3cdf87fc4 100644 ---- a/api/@ohos.bluetooth.ble.d.ts -+++ b/api/@ohos.bluetooth.ble.d.ts -@@ -570,8 +570,7 @@ declare namespace ble { - * @throws { BusinessError } 2900099 - Operation failed. - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - function stopAdvertising(advertisingId: number, callback: AsyncCallback): void; - -@@ -608,8 +607,7 @@ declare namespace ble { - * @throws { BusinessError } 2900099 - Operation failed. - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - function stopAdvertising(advertisingId: number): Promise; - -@@ -640,8 +638,7 @@ declare namespace ble { - * @throws { BusinessError } 2900099 - Operation failed. - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - function on(type: 'advertisingStateChange', callback: Callback): void; - -@@ -672,8 +669,7 @@ declare namespace ble { - * @throws { BusinessError } 2900099 - Operation failed. - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - function off(type: 'advertisingStateChange', callback?: Callback): void; - -@@ -720,8 +716,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - function on(type: 'BLEDeviceFind', callback: Callback>): void; - -@@ -768,8 +763,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - function off(type: 'BLEDeviceFind', callback?: Callback>): void; - -@@ -1159,8 +1153,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - on(type: 'characteristicRead', callback: Callback): void; - -@@ -1204,8 +1197,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - off(type: 'characteristicRead', callback?: Callback): void; - -@@ -1249,8 +1241,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - on(type: 'characteristicWrite', callback: Callback): void; - -@@ -1294,8 +1285,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - off(type: 'characteristicWrite', callback?: Callback): void; - -@@ -1339,8 +1329,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - on(type: 'descriptorRead', callback: Callback): void; - -@@ -1384,8 +1373,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - off(type: 'descriptorRead', callback?: Callback): void; - -@@ -1429,8 +1417,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - on(type: 'descriptorWrite', callback: Callback): void; - -@@ -1474,8 +1461,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - off(type: 'descriptorWrite', callback?: Callback): void; - -@@ -1519,8 +1505,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - on(type: 'connectionStateChange', callback: Callback): void; - -@@ -1564,8 +1549,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - off(type: 'connectionStateChange', callback?: Callback): void; - -@@ -1594,8 +1578,7 @@ declare namespace ble { - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - on(type: 'BLEMtuChange', callback: Callback): void; - -@@ -1624,8 +1607,7 @@ declare namespace ble { - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - off(type: 'BLEMtuChange', callback?: Callback): void; - } -@@ -1925,8 +1907,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - getServices(callback: AsyncCallback>): void; - -@@ -1973,8 +1954,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - getServices(): Promise>; - -@@ -2242,8 +2222,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - writeCharacteristicValue( - characteristic: BLECharacteristic, -@@ -2303,8 +2282,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - writeCharacteristicValue(characteristic: BLECharacteristic, writeType: GattWriteType): Promise; - -@@ -2357,8 +2335,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - writeDescriptorValue(descriptor: BLEDescriptor, callback: AsyncCallback): void; - -@@ -2411,8 +2388,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - writeDescriptorValue(descriptor: BLEDescriptor): Promise; - -@@ -2441,8 +2417,7 @@ declare namespace ble { - * @throws { BusinessError } 2900099 - Operation failed. - * @syscap SystemCapability.Communication.Bluetooth.Core - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - getRssiValue(callback: AsyncCallback): void; - -@@ -2471,8 +2446,7 @@ declare namespace ble { - * @throws { BusinessError } 2900099 - Operation failed. - * @syscap SystemCapability.Communication.Bluetooth.Core - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - getRssiValue(): Promise; - -@@ -2557,8 +2531,7 @@ declare namespace ble { - * @throws { BusinessError } 2900099 - Operation failed. - * @syscap SystemCapability.Communication.Bluetooth.Core - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - setCharacteristicChangeNotification( - characteristic: BLECharacteristic, -@@ -2599,8 +2572,7 @@ declare namespace ble { - * @throws { BusinessError } 2900099 - Operation failed. - * @syscap SystemCapability.Communication.Bluetooth.Core - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - setCharacteristicChangeNotification(characteristic: BLECharacteristic, enable: boolean): Promise; - -@@ -2707,8 +2679,7 @@ declare namespace ble { - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.Communication.Bluetooth.Core - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - on(type: 'BLECharacteristicChange', callback: Callback): void; - -@@ -2737,8 +2708,7 @@ declare namespace ble { - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.Communication.Bluetooth.Core - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - off(type: 'BLECharacteristicChange', callback?: Callback): void; - -@@ -2782,8 +2752,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - on(type: 'BLEConnectionStateChange', callback: Callback): void; - -@@ -2827,8 +2796,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - off(type: 'BLEConnectionStateChange', callback?: Callback): void; - -@@ -2872,8 +2840,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - on(type: 'BLEMtuChange', callback: Callback): void; - -@@ -2917,8 +2884,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - off(type: 'BLEMtuChange', callback?: Callback): void; - } -@@ -2992,8 +2958,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'15','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - on(type: 'BLEDeviceFind', callback: Callback): void; - /** -@@ -3010,8 +2975,7 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'15','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - off(type: 'BLEDeviceFind', callback?: Callback): void; - } -@@ -3951,7 +3915,8 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface DescriptorReadRequest { - /** -@@ -4125,7 +4090,8 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface DescriptorWriteRequest { - /** -@@ -5131,7 +5097,8 @@ declare namespace ble { - * @typedef AdvertisingStateChangeInfo - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface AdvertisingStateChangeInfo { - /** -@@ -5348,7 +5315,8 @@ declare namespace ble { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ScanFilter { - /** -@@ -6147,7 +6115,8 @@ declare namespace ble { - * @enum { number } - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum AdvertisingState { - /** -@@ -6161,21 +6130,24 @@ declare namespace ble { - * - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - STARTED = 1, - /** - * advertising temporarily enabled. - * - * @syscap SystemCapability.Communication.Bluetooth.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ENABLED = 2, - /** - * advertising temporarily disabled. - * - * @syscap SystemCapability.Communication.Bluetooth.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DISABLED = 3, - /** -@@ -6189,7 +6161,8 @@ declare namespace ble { - * - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - STOPPED = 4 - } -diff --git a/api/@ohos.bluetooth.connection.d.ts b/api/@ohos.bluetooth.connection.d.ts -index 219ca1502..ee61698e2 100644 ---- a/api/@ohos.bluetooth.connection.d.ts -+++ b/api/@ohos.bluetooth.connection.d.ts -@@ -1369,8 +1369,7 @@ declare namespace connection { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - function on(type: 'bluetoothDeviceFind', callback: Callback>): void; - -@@ -1411,8 +1410,7 @@ declare namespace connection { - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - function off(type: 'bluetoothDeviceFind', callback?: Callback>): void; - -@@ -1443,8 +1441,7 @@ declare namespace connection { - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 2900099 - Operation failed. - * @syscap SystemCapability.Communication.Bluetooth.Core -- * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 18 - */ - function on(type: 'discoveryResult', callback: Callback>): void; - -@@ -1471,8 +1468,7 @@ declare namespace connection { - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 2900099 - Operation failed. - * @syscap SystemCapability.Communication.Bluetooth.Core -- * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 18 - */ - function off(type: 'discoveryResult', callback?: Callback>): void; - -@@ -1503,8 +1499,7 @@ declare namespace connection { - * @throws { BusinessError } 2900099 - Operation failed. - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - function on(type: 'bondStateChange', callback: Callback): void; - -@@ -1535,8 +1530,7 @@ declare namespace connection { - * @throws { BusinessError } 2900099 - Operation failed. - * @syscap SystemCapability.Communication.Bluetooth.Core - * @crossplatform -- * @since arkts {'1.1':'13','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - function off(type: 'bondStateChange', callback?: Callback): void; - -@@ -1552,8 +1546,7 @@ declare namespace connection { - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 2900099 - Operation failed. - * @syscap SystemCapability.Communication.Bluetooth.Core -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 - */ - function on(type: 'pinRequired', callback: Callback): void; - -@@ -1569,8 +1562,7 @@ declare namespace connection { - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 2900099 - Operation failed. - * @syscap SystemCapability.Communication.Bluetooth.Core -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 - */ - function off(type: 'pinRequired', callback?: Callback): void; - -@@ -1583,8 +1575,7 @@ declare namespace connection { - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 2900099 - Operation failed. - * @syscap SystemCapability.Communication.Bluetooth.Core -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - function on(type: 'batteryChange', callback: Callback): void; - -@@ -1597,8 +1588,7 @@ declare namespace connection { - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 2900099 - Operation failed. - * @syscap SystemCapability.Communication.Bluetooth.Core -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - function off(type: 'batteryChange', callback?: Callback): void; - -@@ -1676,7 +1666,8 @@ declare namespace connection { - * - * @typedef PinRequiredParam - * @syscap SystemCapability.Communication.Bluetooth.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PinRequiredParam { - /** -@@ -2066,7 +2057,8 @@ declare namespace connection { - * - * @typedef DiscoveryResult - * @syscap SystemCapability.Communication.Bluetooth.Core -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface DiscoveryResult { - /** -@@ -2141,7 +2133,8 @@ declare namespace connection { - * - * @typedef BatteryInfo - * @syscap SystemCapability.Communication.Bluetooth.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface BatteryInfo { - /** -diff --git a/api/@ohos.bluetooth.hfp.d.ts b/api/@ohos.bluetooth.hfp.d.ts -index 62dfaacc3..53e4c633c 100644 ---- a/api/@ohos.bluetooth.hfp.d.ts -+++ b/api/@ohos.bluetooth.hfp.d.ts -@@ -34,7 +34,8 @@ declare namespace hfp { - * - * @typedef { baseProfile.BaseProfile } BaseProfile - * @syscap SystemCapability.Communication.Bluetooth.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type BaseProfile = baseProfile.BaseProfile; - -diff --git a/api/@ohos.bluetooth.hid.d.ts b/api/@ohos.bluetooth.hid.d.ts -index b31f161d1..7375d0374 100644 ---- a/api/@ohos.bluetooth.hid.d.ts -+++ b/api/@ohos.bluetooth.hid.d.ts -@@ -34,7 +34,8 @@ declare namespace hid { - * - * @typedef { baseProfile.BaseProfile } BaseProfile - * @syscap SystemCapability.Communication.Bluetooth.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type BaseProfile = baseProfile.BaseProfile; - -diff --git a/api/@ohos.brightness.d.ts b/api/@ohos.brightness.d.ts -index 86a55c05f..1545fa73d 100644 ---- a/api/@ohos.brightness.d.ts -+++ b/api/@ohos.brightness.d.ts -@@ -20,9 +20,6 @@ - */ - - import { BusinessError } from './@ohos.base'; --/*** if arkts 1.1 */ --import { int } from './@ohos.base'; --/*** endif */ - - /** - * Provides interfaces to control the power of display. -diff --git a/api/@ohos.buffer.d.ts b/api/@ohos.buffer.d.ts -index 5052e2092..785e34994 100644 ---- a/api/@ohos.buffer.d.ts -+++ b/api/@ohos.buffer.d.ts -@@ -2390,6 +2390,18 @@ declare namespace buffer { - */ - toJSON(): Object; - -+ /** -+ * Converts this Buffer instance into a JsonElement. -+ * -+ * @returns { jsonx.JsonElement } A new JsonElement containing the Buffer -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ toJSON(): jsonx.JsonElement; -+ - /** - * Decodes buf to a string according to the specified character encoding in encoding - * -@@ -3538,30 +3550,20 @@ declare namespace buffer { - writeUIntLE(value: number, offset: number, byteLength: number): number; - - /** -- * Returns the byte at the specified index. -+ * Returns the item at that index. - * -- * @param { number } index - byte index to read -- * @returns { number | undefined } Returns the byte value at `index` -+ * @param { number } index - The zero-based index of the desired code unit. -+ * Throws error if index < 0 or index >= buffer.length. -+ * @returns { number } The element in the buffer matching the given index. -+ * @throws { BusinessError } 10200001 - The value of index is out of range. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ -- $_get(index: number): number | undefined; -+ [index: number]: number; - -- /** -- * Sets the byte at the specified index. -- * -- * @param { number } index – byte index to write -- * @param { number } value – byte value (0–255) -- * @syscap SystemCapability.Utils.Lang -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ -- $_set(index: number, value: number): void; - } - - /** -diff --git a/api/@ohos.bundle.appControl.d.ts b/api/@ohos.bundle.appControl.d.ts -index 33a6f0d8b..b0fd173c6 100644 ---- a/api/@ohos.bundle.appControl.d.ts -+++ b/api/@ohos.bundle.appControl.d.ts -@@ -19,7 +19,12 @@ - */ - - import { AsyncCallback } from './@ohos.base'; -+/*** if arkts 1.1 */ -+import type { ElementName } from './bundleManager/ElementName'; -+/*** endif */ -+/*** if arkts 1.2 */ - import { ElementName } from './bundleManager/ElementName'; -+/*** endif */ - import Want from './@ohos.app.ability.Want'; - - /** -@@ -28,16 +33,18 @@ import Want from './@ohos.app.ability.Want'; - * @namespace appControl - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace appControl { - /** - * Indicates the ability component type. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum ComponentType { - /** -@@ -45,7 +52,8 @@ declare namespace appControl { - * - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - UI_ABILITY = 1, - -@@ -54,7 +62,8 @@ declare namespace appControl { - * - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - UI_EXTENSION = 2 - } -@@ -62,10 +71,11 @@ declare namespace appControl { - /** - * Indicates the ability component type when uninstalled. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum UninstallComponentType { - /** -@@ -73,7 +83,8 @@ declare namespace appControl { - * - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EXTENSION = 1, - } -@@ -81,10 +92,11 @@ declare namespace appControl { - /** - * Indicates when to intercept the specified application. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum DisposedType { - /** -@@ -92,7 +104,8 @@ declare namespace appControl { - * - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BLOCK_APPLICATION = 1, - /** -@@ -100,7 +113,8 @@ declare namespace appControl { - * - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BLOCK_ABILITY = 2, - /** -@@ -108,7 +122,8 @@ declare namespace appControl { - * - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NON_BLOCK = 3 - } -@@ -116,10 +131,11 @@ declare namespace appControl { - /** - * Indicates the strategy to intercept the specified application. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum ControlType { - /** -@@ -127,7 +143,8 @@ declare namespace appControl { - * - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ALLOWED_LIST = 1, - /** -@@ -135,7 +152,8 @@ declare namespace appControl { - * - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DISALLOWED_LIST = 2 - } -@@ -146,7 +164,8 @@ declare namespace appControl { - * @typedef DisposedRule - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface DisposedRule { - /** -@@ -155,7 +174,8 @@ declare namespace appControl { - * @type { Want } - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - want: Want; - -@@ -165,7 +185,8 @@ declare namespace appControl { - * @type { ComponentType } - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - componentType: ComponentType; - -@@ -175,7 +196,8 @@ declare namespace appControl { - * @type { DisposedType } - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - disposedType: DisposedType; - -@@ -185,7 +207,8 @@ declare namespace appControl { - * @type { ControlType } - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - controlType: ControlType; - -@@ -195,19 +218,21 @@ declare namespace appControl { - * @type { Array } - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- elementList: Array ; -+ elementList: Array; - - /** - * Indicates priority of the rule. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- priority: number; -+ priority: int; - } - - /** -@@ -216,7 +241,8 @@ declare namespace appControl { - * @typedef UninstallDisposedRule - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface UninstallDisposedRule { - /** -@@ -225,7 +251,8 @@ declare namespace appControl { - * @type { Want } - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - want: Want; - -@@ -235,19 +262,21 @@ declare namespace appControl { - * @type { UninstallComponentType } - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - uninstallComponentType: UninstallComponentType; - - /** - * Indicates priority of the rule. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- priority: number; -+ priority: int; - } - - /** -@@ -264,7 +293,8 @@ declare namespace appControl { - * @throws { BusinessError } 17700005 - The specified app ID is empty string. - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setDisposedStatus(appId: string, disposedWant: Want, callback: AsyncCallback): void; - -@@ -282,7 +312,8 @@ declare namespace appControl { - * @throws { BusinessError } 17700005 - The specified app ID is empty string. - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setDisposedStatus(appId: string, disposedWant: Want): Promise; - -@@ -299,7 +330,8 @@ declare namespace appControl { - * @throws { BusinessError } 17700005 - The specified app ID is empty string. - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setDisposedStatusSync(appId: string, disposedWant: Want): void; - -@@ -316,7 +348,8 @@ declare namespace appControl { - * @throws { BusinessError } 17700005 - The specified app ID is empty string. - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getDisposedStatus(appId: string, callback: AsyncCallback): void; - -@@ -333,7 +366,8 @@ declare namespace appControl { - * @throws { BusinessError } 17700005 - The specified app ID is empty string. - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getDisposedStatus(appId: string): Promise; - -@@ -350,7 +384,8 @@ declare namespace appControl { - * @throws { BusinessError } 17700005 - The specified app ID is empty string. - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getDisposedStatusSync(appId: string): Want; - -@@ -367,7 +402,8 @@ declare namespace appControl { - * @throws { BusinessError } 17700005 - The specified app ID is empty string. - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function deleteDisposedStatus(appId: string, callback: AsyncCallback): void; - -@@ -384,7 +420,8 @@ declare namespace appControl { - * @throws { BusinessError } 17700005 - The specified app ID is empty string. - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function deleteDisposedStatus(appId: string): Promise; - -@@ -407,7 +444,7 @@ declare namespace appControl { - * - * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS - * @param { string } appId - Indicates the app ID of the application. -- * @param { number } [appIndex] Indicates the index of clone app. -+ * @param { int } [appIndex] Indicates the index of clone app. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -@@ -416,9 +453,10 @@ declare namespace appControl { - * @throws { BusinessError } 17700061 - AppIndex is not in the valid range. - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function deleteDisposedStatusSync(appId: string, appIndex?: number): void; -+ function deleteDisposedStatusSync(appId: string, appIndex?: int): void; - - /** - * Obtains the disposed rule of a specified bundle. -@@ -440,7 +478,7 @@ declare namespace appControl { - * - * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS - * @param { string } appId - Indicates the app ID of the application. -- * @param { number } [appIndex] Indicates the index of clone app. -+ * @param { int } [appIndex] Indicates the index of clone app. - * @returns { DisposedRule } Returns the disposed rule of a specified bundle. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. -@@ -450,9 +488,10 @@ declare namespace appControl { - * @throws { BusinessError } 17700061 - AppIndex is not in the valid range. - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getDisposedRule(appId: string, appIndex?: number): DisposedRule; -+ function getDisposedRule(appId: string, appIndex?: int): DisposedRule; - - /** - * Sets the disposed rule of a specified bundle. -@@ -475,7 +514,7 @@ declare namespace appControl { - * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS - * @param { string } appId - Indicates the app ID of the application. - * @param { DisposedRule } rule - Indicates the disposed rule of a specified bundle. -- * @param { number } [appIndex] Indicates the index of clone app. -+ * @param { int } [appIndex] Indicates the index of clone app. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -@@ -484,9 +523,10 @@ declare namespace appControl { - * @throws { BusinessError } 17700061 - AppIndex is not in the valid range. - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function setDisposedRule(appId: string, rule: DisposedRule, appIndex?: number): void; -+ function setDisposedRule(appId: string, rule: DisposedRule, appIndex?: int): void; - - /** - * Sets the uninstall disposed rule of a specified bundle. -@@ -494,7 +534,7 @@ declare namespace appControl { - * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS - * @param { string } appIdentifier - Indicates the appIdentifier of the application. - * @param { UninstallDisposedRule } rule - Indicates the uninstall disposed rule of a specified bundle. -- * @param { number } [appIndex] Indicates the index of clone app. -+ * @param { int } [appIndex] Indicates the index of clone app. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -@@ -504,16 +544,17 @@ declare namespace appControl { - * @throws { BusinessError } 17700075 - The specified bundleName of want is not the same with caller. - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function setUninstallDisposedRule(appIdentifier: string, rule: UninstallDisposedRule, appIndex?: number): void; -+ function setUninstallDisposedRule(appIdentifier: string, rule: UninstallDisposedRule, appIndex?: int): void; - - /** - * Obtains the uninstall disposed rule of a specified bundle. - * - * @permission ohos.permission.GET_DISPOSED_APP_STATUS or ohos.permission.MANAGE_DISPOSED_APP_STATUS - * @param { string } appIdentifier - Indicates the appIdentifier of the application. -- * @param { number } [appIndex] Indicates the index of clone app. -+ * @param { int } [appIndex] Indicates the index of clone app. - * @returns { UninstallDisposedRule } Returns the uninstall disposed rule of a specified bundle. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. -@@ -523,16 +564,17 @@ declare namespace appControl { - * @throws { BusinessError } 17700074 - The specified appIdentifier is invalid. - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getUninstallDisposedRule(appIdentifier: string, appIndex?: number): UninstallDisposedRule; -+ function getUninstallDisposedRule(appIdentifier: string, appIndex?: int): UninstallDisposedRule; - - /** - * Delete the uninstall disposed rule of a specified bundle. - * - * @permission ohos.permission.MANAGE_DISPOSED_APP_STATUS - * @param { string } appIdentifier - Indicates the appIdentifier of the application. -- * @param { number } [appIndex] Indicates the index of clone app. -+ * @param { int } [appIndex] Indicates the index of clone app. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied. A non-system application is not allowed to call a system API. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -@@ -541,9 +583,10 @@ declare namespace appControl { - * @throws { BusinessError } 17700074 - The specified appIdentifier is invalid. - * @syscap SystemCapability.BundleManager.BundleFramework.AppControl - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function deleteUninstallDisposedRule(appIdentifier: string, appIndex?: number): void; -+ function deleteUninstallDisposedRule(appIdentifier: string, appIndex?: int): void; - } - - export default appControl; -diff --git a/api/@ohos.bundle.appDomainVerify.d.ts b/api/@ohos.bundle.appDomainVerify.d.ts -index 972f9cfab..a28a83468 100644 ---- a/api/@ohos.bundle.appDomainVerify.d.ts -+++ b/api/@ohos.bundle.appDomainVerify.d.ts -@@ -13,7 +13,8 @@ - * @syscap SystemCapability.BundleManager.AppDomainVerify - * @systemapi - * @stagemodelonly -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace appDomainVerify { - -@@ -30,7 +31,8 @@ declare namespace appDomainVerify { - * @syscap SystemCapability.BundleManager.AppDomainVerify - * @systemapi - * @stagemodelonly -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function queryAssociatedDomains(bundleName: string): string[]; - -@@ -46,7 +48,8 @@ declare namespace appDomainVerify { - * @syscap SystemCapability.BundleManager.AppDomainVerify - * @systemapi - * @stagemodelonly -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function queryAssociatedBundleNames(domain: string): string[]; - } -diff --git a/api/@ohos.bundle.bundleManager.d.ts b/api/@ohos.bundle.bundleManager.d.ts -index d1093417e..49d445121 100644 ---- a/api/@ohos.bundle.bundleManager.d.ts -+++ b/api/@ohos.bundle.bundleManager.d.ts -@@ -22,12 +22,12 @@ import { AsyncCallback } from './@ohos.base'; - import { Metadata as _Metadata } from './bundleManager/Metadata'; - import { ElementName as _ElementName } from './bundleManager/ElementName'; - import Want from './@ohos.app.ability.Want'; --/*** if arkts 1.1 */ --import type { ApplicationInfo as _ApplicationInfo, ModuleMetadata as _ModuleMetadata, -- PreinstalledApplicationInfo as _PreinstalledApplicationInfo } from './bundleManager/ApplicationInfo'; - import { PermissionDef as _PermissionDef } from './bundleManager/PermissionDef'; - import { PluginBundleInfo as _PluginBundleInfo, PluginModuleInfo as _PluginModuleInfo} from './bundleManager/PluginBundleInfo'; - import { SharedBundleInfo as _SharedBundleInfo } from './bundleManager/SharedBundleInfo'; -+/*** if arkts 1.1 */ -+import type { ApplicationInfo as _ApplicationInfo, ModuleMetadata as _ModuleMetadata, -+ PreinstalledApplicationInfo as _PreinstalledApplicationInfo } from './bundleManager/ApplicationInfo'; - import type { RecoverableApplicationInfo as _RecoverableApplicationInfo } from './bundleManager/RecoverableApplicationInfo'; - import * as _AbilityInfo from './bundleManager/AbilityInfo'; - import * as _AppProvisionInfo from './bundleManager/AppProvisionInfo'; -@@ -39,7 +39,9 @@ import * as _Skill from './bundleManager/Skill'; - /*** if arkts 1.2 */ - import { ApplicationInfo as _ApplicationInfo, ModuleMetadata as _ModuleMetadata, - PreinstalledApplicationInfo as _PreinstalledApplicationInfo } from './bundleManager/ApplicationInfo'; -+import { RecoverableApplicationInfo as _RecoverableApplicationInfo } from './bundleManager/RecoverableApplicationInfo'; - import { AbilityInfo as _AbilityInfo, WindowSize as _WindowSize } from './bundleManager/AbilityInfo'; -+import { AppProvisionInfo as _AppProvisionInfo, Validity as _Validity } from './bundleManager/AppProvisionInfo'; - import { BundleInfo as _BundleInfo, UsedScene as _UsedScene, ReqPermissionDetail as _ReqPermissionDetail, - SignatureInfo as _SignatureInfo, AppCloneIdentity as _AppCloneIdentity } from './bundleManager/BundleInfo'; - import { HapModuleInfo as _HapModuleInfo, PreloadItem as _PreloadItem, Dependency as _Dependency, -@@ -82,11 +84,22 @@ declare namespace bundleManager { - */ - /** - * Used to query the enumeration value of bundleInfo. Multiple values can be passed in the form. -+ * Multiple value input, such as GET_BUNDLE_INFO_DEFAULT | GET_BUNDLE_INFO_WITH_APPLICATION. - * - * @enum { number } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Used to query the enumeration value of bundleInfo. Multiple values can be passed in the form. -+ * Multiple value input, such as GET_BUNDLE_INFO_DEFAULT | GET_BUNDLE_INFO_WITH_APPLICATION. -+ * -+ * @enum { int } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - enum BundleFlag { -@@ -103,7 +116,16 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Used to obtain the default bundleInfo. The obtained bundleInfo does not contain information of -+ * signatureInfo, applicationInfo, hapModuleInfo, ability, extensionAbility and permission. -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - GET_BUNDLE_INFO_DEFAULT = 0x00000000, -@@ -120,7 +142,16 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Used to obtain the bundleInfo containing applicationInfo. The obtained bundleInfo does not -+ * contain the information of signatureInfo, hapModuleInfo, ability, extensionAbility and permission. -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - GET_BUNDLE_INFO_WITH_APPLICATION = 0x00000001, -@@ -137,33 +168,56 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Used to obtain the bundleInfo containing hapModuleInfo. The obtained bundleInfo does not -+ * contain the information of signatureInfo, applicationInfo, ability, extensionAbility and permission. -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - GET_BUNDLE_INFO_WITH_HAP_MODULE = 0x00000002, - /** - * Used to obtain the bundleInfo containing ability. The obtained bundleInfo does not - * contain the information of signatureInfo, applicationInfo, extensionAbility and permission. -- * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE. -+ * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE, -+ * such as GET_BUNDLE_INFO_WITH_ABILITY | GET_BUNDLE_INFO_WITH_HAP_MODULE. - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since 9 - */ -+ /** -+ * Used to obtain the bundleInfo containing ability. The obtained bundleInfo does not -+ * contain the information of signatureInfo, applicationInfo, extensionAbility and permission. -+ * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE, -+ * such as GET_BUNDLE_INFO_WITH_ABILITY | GET_BUNDLE_INFO_WITH_HAP_MODULE. -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @atomicservice -+ * @since 11 -+ */ - /** - * Used to obtain the bundleInfo containing ability. The obtained bundleInfo does not - * contain the information of signatureInfo, applicationInfo, extensionAbility and permission. - * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE. -+ * such as GET_BUNDLE_INFO_WITH_ABILITY | GET_BUNDLE_INFO_WITH_HAP_MODULE. - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 20 - * @arkts 1.1&1.2 - */ - GET_BUNDLE_INFO_WITH_ABILITY = 0x00000004, - /** - * Used to obtain the bundleInfo containing extensionAbility. The obtained bundleInfo does not - * contain the information of signatureInfo, applicationInfo, ability and permission. -- * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE. -+ * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE, -+ * such as GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY | GET_BUNDLE_INFO_WITH_HAP_MODULE. - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since 9 -@@ -171,7 +225,8 @@ declare namespace bundleManager { - /** - * Used to obtain the bundleInfo containing extensionAbility. The obtained bundleInfo does not - * contain the information of signatureInfo, applicationInfo, ability and permission. -- * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE. -+ * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE, -+ * such as GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY | GET_BUNDLE_INFO_WITH_HAP_MODULE. - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -@@ -192,26 +247,51 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Used to obtain the bundleInfo containing permission. The obtained bundleInfo does not -+ * contain the information of signatureInfo, applicationInfo, hapModuleInfo, extensionAbility and ability. -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - GET_BUNDLE_INFO_WITH_REQUESTED_PERMISSION = 0x00000010, - /** - * Used to obtain the metadata contained in applicationInfo, moduleInfo and abilityInfo. - * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_APPLICATION, -- * GET_BUNDLE_INFO_WITH_HAP_MODULE, GET_BUNDLE_INFO_WITH_ABILITIES, GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY. -+ * GET_BUNDLE_INFO_WITH_HAP_MODULE, GET_BUNDLE_INFO_WITH_ABILITY, GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY. - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since 9 - */ -+ /** -+ * Used to obtain the metadata contained in applicationInfo, moduleInfo, abilityInfo and extensionAbility. -+ * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_APPLICATION, -+ * GET_BUNDLE_INFO_WITH_HAP_MODULE, GET_BUNDLE_INFO_WITH_ABILITY, GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY, -+ * such as GET_BUNDLE_INFO_WITH_APPLICATION | GET_BUNDLE_INFO_WITH_METADATA -+ * or GET_BUNDLE_INFO_WITH_HAP_MODULE | GET_BUNDLE_INFO_WITH_ABILITY | GET_BUNDLE_INFO_WITH_METADATA -+ * or GET_BUNDLE_INFO_WITH_HAP_MODULE | GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY | GET_BUNDLE_INFO_WITH_METADATA. -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @atomicservice -+ * @since 11 -+ */ - /** - * Used to obtain the metadata contained in applicationInfo, moduleInfo and abilityInfo. - * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_APPLICATION, -- * GET_BUNDLE_INFO_WITH_HAP_MODULE, GET_BUNDLE_INFO_WITH_ABILITIES, GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY. -+ * GET_BUNDLE_INFO_WITH_HAP_MODULE, GET_BUNDLE_INFO_WITH_ABILITY, GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY, -+ * such as GET_BUNDLE_INFO_WITH_APPLICATION | GET_BUNDLE_INFO_WITH_METADATA -+ * or GET_BUNDLE_INFO_WITH_HAP_MODULE | GET_BUNDLE_INFO_WITH_ABILITY | GET_BUNDLE_INFO_WITH_METADATA -+ * or GET_BUNDLE_INFO_WITH_HAP_MODULE | GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY | GET_BUNDLE_INFO_WITH_METADATA. - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 20 - * @arkts 1.1&1.2 - */ - GET_BUNDLE_INFO_WITH_METADATA = 0x00000020, -@@ -230,7 +310,17 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Used to obtain the default bundleInfo containing disabled application and ability. -+ * The obtained bundleInfo does not contain information of signatureInfo, applicationInfo, -+ * hapModuleInfo, ability, extensionAbility and permission. -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - GET_BUNDLE_INFO_WITH_DISABLE = 0x00000040, -@@ -247,14 +337,24 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Used to obtain the bundleInfo containing signatureInfo. The obtained bundleInfo does not -+ * contain the information of applicationInfo, hapModuleInfo, extensionAbility, ability and permission. -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - GET_BUNDLE_INFO_WITH_SIGNATURE_INFO = 0x00000080, - /** - * Used to obtain the bundleInfo containing menu configuration in hapModuleInfo. - * The obtained bundleInfo does not contain the information of applicationInfo, extensionAbility, ability and permission. -- * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE. -+ * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE, -+ * such as GET_BUNDLE_INFO_WITH_MENU | GET_BUNDLE_INFO_WITH_HAP_MODULE - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -@@ -265,7 +365,8 @@ declare namespace bundleManager { - /** - * Used to obtain the bundleInfo containing router map configuration in hapModuleInfo. - * The obtained bundleInfo does not contain the information of applicationInfo, extensionAbility, ability and permission. -- * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE. -+ * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE, -+ * such as GET_BUNDLE_INFO_WITH_ROUTER_MAP | GET_BUNDLE_INFO_WITH_HAP_MODULE - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -@@ -276,7 +377,9 @@ declare namespace bundleManager { - /** - * Used to obtain the skillInfo contained in abilityInfo and extensionInfo. - * It can't be used alone, it needs to be used with GET_BUNDLE_INFO_WITH_HAP_MODULE, -- * GET_BUNDLE_INFO_WITH_ABILITIES, GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY. -+ * GET_BUNDLE_INFO_WITH_ABILITY, GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY, -+ * such as GET_BUNDLE_INFO_WITH_SKILL | GET_BUNDLE_INFO_WITH_HAP_MODULE | GET_BUNDLE_INFO_WITH_ABILITY -+ * or GET_BUNDLE_INFO_WITH_SKILL | GET_BUNDLE_INFO_WITH_HAP_MODULE | GET_BUNDLE_INFO_WITH_EXTENSION_ABILITY - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -@@ -295,7 +398,9 @@ declare namespace bundleManager { - */ - GET_BUNDLE_INFO_ONLY_WITH_LAUNCHER_ABILITY = 0x00001000, - /** -- * Used to obtain the bundleInfo only if any user installed -+ * Used to obtain the bundle information of an application installed by any user. -+ * It must be used together with GET_BUNDLE_INFO_WITH_APPLICATION. -+ * It is valid only in the {@link getBundleInfo} and {@link getAllBundleInfo} APIs. - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -@@ -318,7 +423,7 @@ declare namespace bundleManager { - /** - * Used to query the enumeration value of applicationInfo. Multiple values can be passed in the form. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} -@@ -370,7 +475,15 @@ declare namespace bundleManager { - * @enum { number } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since arkts {'1.1':'9', '1.2':'20'} -+ * @since 9 -+ */ -+ /** -+ * Used to query the enumeration value of abilityInfo. Multiple values can be passed in the form. -+ * -+ * @enum { int } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - enum AbilityFlag { -@@ -380,7 +493,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since arkts {'1.1':'9', '1.2':'20'} -+ * @since 9 -+ */ -+ /** -+ * Used to obtain the default abilityInfo. The obtained abilityInfo does not contain the information of -+ * permission, metadata and disabled abilityInfo. -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - GET_ABILITY_INFO_DEFAULT = 0x00000000, -@@ -389,7 +510,14 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since arkts {'1.1':'9', '1.2':'20'} -+ * @since 9 -+ */ -+ /** -+ * Used to obtain the abilityInfo containing permission. -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - GET_ABILITY_INFO_WITH_PERMISSION = 0x00000001, -@@ -398,7 +526,14 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since arkts {'1.1':'9', '1.2':'20'} -+ * @since 9 -+ */ -+ /** -+ * Used to obtain the abilityInfo containing applicationInfo. -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - GET_ABILITY_INFO_WITH_APPLICATION = 0x00000002, -@@ -407,7 +542,14 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since arkts {'1.1':'9', '1.2':'20'} -+ * @since 9 -+ */ -+ /** -+ * Used to obtain the abilityInfo containing metadata. -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - GET_ABILITY_INFO_WITH_METADATA = 0x00000004, -@@ -416,7 +558,14 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since arkts {'1.1':'9', '1.2':'20'} -+ * @since 9 -+ */ -+ /** -+ * Used to obtain the abilityInfo containing disabled abilityInfo. -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - GET_ABILITY_INFO_WITH_DISABLE = 0x00000008, -@@ -432,7 +581,14 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Used to obtain the abilityInfo only for system app. -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - GET_ABILITY_INFO_ONLY_SYSTEM_APP = 0x00000010, -@@ -441,7 +597,14 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Used to obtain the abilityInfo with domain verification. -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - GET_ABILITY_INFO_WITH_APP_LINKING = 0x00000040, -@@ -450,7 +613,14 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Used to obtain the abilityInfo with Skill -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - GET_ABILITY_INFO_WITH_SKILL = 0x00000080, -@@ -459,7 +629,7 @@ declare namespace bundleManager { - /** - * Used to query the enumeration value of ExtensionAbilityInfo. Multiple values can be passed in the form. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} -@@ -524,7 +694,7 @@ declare namespace bundleManager { - /** - * This enumeration value is used to identify various types of extension ability - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} -@@ -535,8 +705,7 @@ declare namespace bundleManager { - * Indicates extension info with type of form - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Indicates extension info with type of form -@@ -768,7 +937,7 @@ declare namespace bundleManager { - * Indicates extension info with type of distributed - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core -- * @since arkts {'1.1':'18', '1.2':'20'} -+ * @since 20 - * @arkts 1.1&1.2 - */ - DISTRIBUTED = 28, -@@ -796,7 +965,16 @@ declare namespace bundleManager { - * @enum { number } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * PermissionGrantState -+ * -+ * @enum { int } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - export enum PermissionGrantState { -@@ -811,7 +989,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * PERMISSION_DENIED -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - PERMISSION_DENIED = -1, -@@ -827,7 +1013,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * PERMISSION_GRANTED -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - PERMISSION_GRANTED = 0 -@@ -846,7 +1040,16 @@ declare namespace bundleManager { - * @enum { number } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Support window mode -+ * -+ * @enum { int } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - export enum SupportWindowMode { -@@ -861,7 +1064,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates supported window mode of full screen mode -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - FULL_SCREEN = 0, -@@ -876,7 +1087,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates supported window mode of split mode -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - SPLIT = 1, -@@ -891,7 +1110,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates supported window mode of floating mode -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - FLOATING = 2 -@@ -915,7 +1142,7 @@ declare namespace bundleManager { - /** - * Launch type - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform - * @atomicservice -@@ -982,7 +1209,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates that the ability can have specified instances -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - SPECIFIED = 2 -@@ -1038,7 +1273,16 @@ declare namespace bundleManager { - * @enum { number } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Display orientation -+ * -+ * @enum { int } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - export enum DisplayOrientation { -@@ -1053,7 +1297,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates that the system automatically determines the display orientation -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - UNSPECIFIED, -@@ -1069,7 +1321,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the landscape orientation -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - LANDSCAPE, -@@ -1085,7 +1345,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the portrait orientation -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - PORTRAIT, -@@ -1101,7 +1369,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the page ability orientation is the same as that of the nearest ability in the stack -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - FOLLOW_RECENT, -@@ -1117,7 +1393,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the inverted landscape orientation -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - LANDSCAPE_INVERTED, -@@ -1133,7 +1417,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the inverted portrait orientation -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - PORTRAIT_INVERTED, -@@ -1149,7 +1441,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the orientation can be auto-rotated -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - AUTO_ROTATION, -@@ -1165,7 +1465,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the landscape orientation rotated with sensor -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - AUTO_ROTATION_LANDSCAPE, -@@ -1181,7 +1489,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the portrait orientation rotated with sensor -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - AUTO_ROTATION_PORTRAIT, -@@ -1197,7 +1513,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the sensor restricted mode -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - AUTO_ROTATION_RESTRICTED, -@@ -1213,7 +1537,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the sensor landscape restricted mode -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - AUTO_ROTATION_LANDSCAPE_RESTRICTED, -@@ -1229,7 +1561,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the sensor portrait restricted mode -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - AUTO_ROTATION_PORTRAIT_RESTRICTED, -@@ -1245,7 +1585,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the locked orientation mode -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - LOCKED, -@@ -1284,7 +1632,16 @@ declare namespace bundleManager { - * @enum { number } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates module type -+ * -+ * @enum { int } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - export enum ModuleType { -@@ -1299,7 +1656,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates entry type -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - ENTRY = 1, -@@ -1314,7 +1679,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates feature type -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - FEATURE = 2, -@@ -1329,7 +1702,15 @@ declare namespace bundleManager { - * - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates shared type -+ * -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - SHARED = 3 -@@ -1345,7 +1726,7 @@ declare namespace bundleManager { - /** - * Indicates bundle type - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} -@@ -1392,7 +1773,7 @@ declare namespace bundleManager { - /** - * Shared bundle compatible policy - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} -@@ -1419,7 +1800,7 @@ declare namespace bundleManager { - /** - * This enumeration value is used to identify various types of JSON profile. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi - * @since arkts {'1.1':'11', '1.2':'20'} -@@ -1440,7 +1821,7 @@ declare namespace bundleManager { - /** - * This enumeration value is used to identify the distribution type of application. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} -@@ -1523,7 +1904,7 @@ declare namespace bundleManager { - /** - * This enumeration value is used to identify various types of extension ability - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 -@@ -1558,7 +1939,7 @@ declare namespace bundleManager { - /** - * This enumeration value is used to identify various flags of application - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} -@@ -1620,10 +2001,21 @@ declare namespace bundleManager { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Obtains own bundleInfo. -+ * -+ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. -+ * @returns { Promise } The result of getting the bundle info. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ -- function getBundleInfoForSelf(bundleFlags: number): Promise; -+ function getBundleInfoForSelf(bundleFlags: int): Promise; - - /** - * Obtains own bundleInfo. -@@ -1642,10 +2034,21 @@ declare namespace bundleManager { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Obtains own bundleInfo. -+ * -+ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. -+ * @param { AsyncCallback } callback - The callback of getting bundle info result. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ -- function getBundleInfoForSelf(bundleFlags: number, callback: AsyncCallback): void; -+ function getBundleInfoForSelf(bundleFlags: int, callback: AsyncCallback): void; - - /** - * Obtains own bundleInfo. -@@ -1664,17 +2067,28 @@ declare namespace bundleManager { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Obtains own bundleInfo. -+ * -+ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. -+ * @returns { BundleInfo } The result of getting the bundle info. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ -- function getBundleInfoForSelfSync(bundleFlags: number): BundleInfo; -+ function getBundleInfoForSelfSync(bundleFlags: int): BundleInfo; - - /** - * Obtains bundleInfo based on bundleName, bundleFlags. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { string } bundleName - Indicates the application bundle name to be queried. -- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. -+ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. - * @param { AsyncCallback } callback - The callback of getting bundle info result. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -@@ -1684,15 +2098,15 @@ declare namespace bundleManager { - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getBundleInfo(bundleName: string, bundleFlags: number, callback: AsyncCallback): void; -+ function getBundleInfo(bundleName: string, bundleFlags: int, callback: AsyncCallback): void; - - /** - * Obtains bundleInfo based on bundleName, bundleFlags and userId. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { string } bundleName - Indicates the application bundle name to be queried. -- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. -- * @param { number } userId - Indicates the user ID or do not pass user ID. -+ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. -+ * @param { int } userId - Indicates the user ID or do not pass user ID. - * @param { AsyncCallback } callback - The callback of getting bundle info result. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -@@ -1704,15 +2118,15 @@ declare namespace bundleManager { - * @arkts 1.1&1.2 - */ - function getBundleInfo(bundleName: string, -- bundleFlags: number, userId: number, callback: AsyncCallback): void; -+ bundleFlags: int, userId: int, callback: AsyncCallback): void; - - /** - * Obtains bundleInfo based on bundleName, bundleFlags and userId. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { string } bundleName - Indicates the application bundle name to be queried. -- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. -- * @param { number } userId - Indicates the user ID or do not pass user ID. -+ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. -+ * @param { int } userId - Indicates the user ID or do not pass user ID. - * @returns { Promise } The result of getting the bundle info. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -@@ -1723,14 +2137,14 @@ declare namespace bundleManager { - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getBundleInfo(bundleName: string, bundleFlags: number, userId?: number): Promise; -+ function getBundleInfo(bundleName: string, bundleFlags: int, userId?: int): Promise; - - /** - * Obtains application info based on a given bundle name. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { string } bundleName - Indicates the application bundle name to be queried. -- * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. -+ * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. - * @param { AsyncCallback } callback - The callback of getting application info result. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -1742,15 +2156,15 @@ declare namespace bundleManager { - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getApplicationInfo(bundleName: string, appFlags: number, callback: AsyncCallback): void; -+ function getApplicationInfo(bundleName: string, appFlags: int, callback: AsyncCallback): void; - - /** - * Obtains application info based on a given bundle name. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { string } bundleName - Indicates the application bundle name to be queried. -- * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. -- * @param { number } userId - Indicates the user ID or do not pass user ID. -+ * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. -+ * @param { int } userId - Indicates the user ID or do not pass user ID. - * @param { AsyncCallback } callback - The callback of getting application info result. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -1764,15 +2178,15 @@ declare namespace bundleManager { - * @arkts 1.1&1.2 - */ - function getApplicationInfo(bundleName: string, -- appFlags: number, userId: number, callback: AsyncCallback): void; -+ appFlags: int, userId: int, callback: AsyncCallback): void; - - /** - * Obtains application info based on a given bundle name. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { string } bundleName - Indicates the application bundle name to be queried. -- * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. -- * @param { number } userId - Indicates the user ID or do not pass user ID. -+ * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. -+ * @param { int } userId - Indicates the user ID or do not pass user ID. - * @returns { Promise } The result of getting the application info. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -1785,13 +2199,13 @@ declare namespace bundleManager { - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getApplicationInfo(bundleName: string, appFlags: number, userId?: number): Promise; -+ function getApplicationInfo(bundleName: string, appFlags: int, userId?: int): Promise; - - /** - * Obtains BundleInfo of all bundles available in the system. - * - * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST -- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. -+ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. - * @param { AsyncCallback> } callback - The callback of getting a list of BundleInfo objects. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -1801,14 +2215,14 @@ declare namespace bundleManager { - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getAllBundleInfo(bundleFlags: number, callback: AsyncCallback>): void; -+ function getAllBundleInfo(bundleFlags: int, callback: AsyncCallback>): void; - - /** - * Obtains BundleInfo of all bundles available in the system. - * - * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST -- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. -- * @param { number } userId - Indicates the user id. -+ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. -+ * @param { int } userId - Indicates the user id. - * @param { AsyncCallback> } callback - The callback of getting a list of BundleInfo objects. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -1819,14 +2233,14 @@ declare namespace bundleManager { - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getAllBundleInfo(bundleFlags: number, userId: number, callback: AsyncCallback>): void; -+ function getAllBundleInfo(bundleFlags: int, userId: int, callback: AsyncCallback>): void; - - /** - * Obtains BundleInfo of all bundles available in the system. - * - * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST -- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. -- * @param { number } userId - Indicates the user id. -+ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo that will be returned. -+ * @param { int } userId - Indicates the user id. - * @returns { Promise> } Returns a list of BundleInfo objects. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -1837,13 +2251,13 @@ declare namespace bundleManager { - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getAllBundleInfo(bundleFlags: number, userId?: number): Promise>; -+ function getAllBundleInfo(bundleFlags: int, userId?: int): Promise>; - - /** - * Obtains information about all installed applications of a specified user. - * - * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST -- * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. -+ * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. - * @param { AsyncCallback> } callback - The callback of getting a list of ApplicationInfo objects. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -1853,14 +2267,14 @@ declare namespace bundleManager { - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getAllApplicationInfo(appFlags: number, callback: AsyncCallback>): void; -+ function getAllApplicationInfo(appFlags: int, callback: AsyncCallback>): void; - - /** - * Obtains information about all installed applications of a specified user. - * - * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST -- * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. -- * @param { number } userId - Indicates the user ID or do not pass user ID. -+ * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. -+ * @param { int } userId - Indicates the user ID or do not pass user ID. - * @param { AsyncCallback> } callback - The callback of getting a list of ApplicationInfo objects. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -1871,15 +2285,15 @@ declare namespace bundleManager { - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getAllApplicationInfo(appFlags: number, -- userId: number, callback: AsyncCallback>): void; -+ function getAllApplicationInfo(appFlags: int, -+ userId: int, callback: AsyncCallback>): void; - - /** - * Obtains information about all installed applications of a specified user. - * - * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST -- * @param { number } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. -- * @param { number } userId - Indicates the user ID or do not pass user ID. -+ * @param { int } appFlags {@link ApplicationFlag} - Indicates the flag used to specify information contained in the ApplicationInfo objects that will be returned. -+ * @param { int } userId - Indicates the user ID or do not pass user ID. - * @returns { Promise> } Returns a list of ApplicationInfo objects. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -1890,14 +2304,14 @@ declare namespace bundleManager { - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getAllApplicationInfo(appFlags: number, userId?: number): Promise>; -+ function getAllApplicationInfo(appFlags: int, userId?: int): Promise>; - - /** - * Query the AbilityInfo by the given Want. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { Want } want - Indicates the Want containing the application bundle name to be queried. -- * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. -+ * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. - * @param { AsyncCallback> } callback - The callback of querying ability info result. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -1912,15 +2326,15 @@ declare namespace bundleManager { - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function queryAbilityInfo(want: Want, abilityFlags: number, callback: AsyncCallback>): void; -+ function queryAbilityInfo(want: Want, abilityFlags: int, callback: AsyncCallback>): void; - - /** - * Query the AbilityInfo by the given Want. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { Want } want - Indicates the Want containing the application bundle name to be queried. -- * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. -- * @param { number } userId - userId Indicates the user ID. -+ * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. -+ * @param { int } userId - userId Indicates the user ID. - * @param { AsyncCallback> } callback - The callback of querying ability info result. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -1937,15 +2351,15 @@ declare namespace bundleManager { - * @arkts 1.1&1.2 - */ - function queryAbilityInfo(want: Want, -- abilityFlags: number, userId: number, callback: AsyncCallback>): void; -+ abilityFlags: int, userId: int, callback: AsyncCallback>): void; - - /** - * Query the AbilityInfo by the given Want. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { Want } want - Indicates the Want containing the application bundle name to be queried. -- * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. -- * @param { number } userId - userId Indicates the user ID. -+ * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. -+ * @param { int } userId - userId Indicates the user ID. - * @returns { Promise> } Returns a list of AbilityInfo objects. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -1961,15 +2375,15 @@ declare namespace bundleManager { - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function queryAbilityInfo(want: Want, abilityFlags: number, userId?: number): Promise>; -+ function queryAbilityInfo(want: Want, abilityFlags: int, userId?: int): Promise>; - - /** - * Query the AbilityInfo by the given Want Array. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { Array } wants - Indicates the Want Array containing the application bundle name to be queried. -- * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. -- * @param { number } [userId] - userId Indicates the user ID. -+ * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. -+ * @param { int } [userId] - userId Indicates the user ID. - * @returns { Promise> } Returns a list of AbilityInfo objects. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -1985,15 +2399,15 @@ declare namespace bundleManager { - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function queryAbilityInfo(wants: Array, abilityFlags: number, userId?: number): Promise>; -+ function queryAbilityInfo(wants: Array, abilityFlags: int, userId?: int): Promise>; - - /** - * Query the AbilityInfo by the given Want. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { Want } want - Indicates the Want containing the application bundle name to be queried. -- * @param { number } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. -- * @param { number } userId - userId Indicates the user ID. -+ * @param { int } abilityFlags {@link AbilityFlag} - Indicates the flag used to specify information contained in the AbilityInfo objects that will be returned. -+ * @param { int } userId - userId Indicates the user ID. - * @returns { Array } Returns a list of AbilityInfo objects. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -2009,7 +2423,7 @@ declare namespace bundleManager { - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function queryAbilityInfoSync(want: Want, abilityFlags: number, userId?: number): Array; -+ function queryAbilityInfoSync(want: Want, abilityFlags: int, userId?: int): Array; - - /** - * Query extension info of by utilizing a Want. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. -@@ -2017,7 +2431,7 @@ declare namespace bundleManager { - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { Want } want - Indicates the Want containing the application bundle name to be queried. - * @param { ExtensionAbilityType } extensionAbilityType - Indicates ExtensionAbilityType. -- * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the -+ * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the - * ExtensionAbilityInfo objects that will be returned. - * @param { AsyncCallback> } callback - The callback of querying extension ability info result. - * @throws { BusinessError } 201 - Permission denied. -@@ -2033,7 +2447,7 @@ declare namespace bundleManager { - * @arkts 1.1&1.2 - */ - function queryExtensionAbilityInfo(want: Want, extensionAbilityType: ExtensionAbilityType, -- extensionAbilityFlags: number, callback: AsyncCallback>): void; -+ extensionAbilityFlags: int, callback: AsyncCallback>): void; - - /** - * Query extension info of by utilizing a Want. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. -@@ -2041,9 +2455,9 @@ declare namespace bundleManager { - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { Want } want - Indicates the Want containing the application bundle name to be queried. - * @param { ExtensionAbilityType } extensionAbilityType - Indicates ExtensionAbilityType. -- * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the -+ * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the - * ExtensionAbilityInfo objects that will be returned. -- * @param { number } userId - Indicates the user ID. -+ * @param { int } userId - Indicates the user ID. - * @param { AsyncCallback> } callback - The callback of querying extension ability info result. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -2059,7 +2473,7 @@ declare namespace bundleManager { - * @arkts 1.1&1.2 - */ - function queryExtensionAbilityInfo(want: Want, extensionAbilityType: ExtensionAbilityType, -- extensionAbilityFlags: number, userId: number, callback: AsyncCallback>): void; -+ extensionAbilityFlags: int, userId: int, callback: AsyncCallback>): void; - - /** - * Query the ExtensionAbilityInfo by the given Want. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. -@@ -2067,9 +2481,9 @@ declare namespace bundleManager { - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { Want } want - Indicates the Want containing the application bundle name to be queried. - * @param { ExtensionAbilityType } extensionAbilityType - Indicates ExtensionAbilityType. -- * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the -+ * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the - * ExtensionAbilityInfo objects that will be returned. -- * @param { number } userId - Indicates the user ID. -+ * @param { int } userId - Indicates the user ID. - * @returns { Promise> } Returns a list of ExtensionAbilityInfo objects. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -2085,7 +2499,7 @@ declare namespace bundleManager { - * @arkts 1.1&1.2 - */ - function queryExtensionAbilityInfo(want: Want, extensionAbilityType: ExtensionAbilityType, -- extensionAbilityFlags: number, userId?: number): Promise>; -+ extensionAbilityFlags: int, userId?: int): Promise>; - - /** - * Query the ExtensionAbilityInfo by the given Want. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. -@@ -2093,9 +2507,9 @@ declare namespace bundleManager { - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { Want } want - Indicates the Want containing the application bundle name to be queried. - * @param { ExtensionAbilityType } extensionAbilityType - Indicates ExtensionAbilityType. -- * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the -+ * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the - * ExtensionAbilityInfo objects that will be returned. -- * @param { number } userId - Indicates the user ID. -+ * @param { int } userId - Indicates the user ID. - * @returns { Array } Returns a list of ExtensionAbilityInfo objects. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -2111,7 +2525,7 @@ declare namespace bundleManager { - * @arkts 1.1&1.2 - */ - function queryExtensionAbilityInfoSync(want: Want, extensionAbilityType: ExtensionAbilityType, -- extensionAbilityFlags: number, userId?: number): Array; -+ extensionAbilityFlags: int, userId?: int): Array; - - /** - * Query the ExtensionAbilityInfo by the given Want. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. -@@ -2119,9 +2533,9 @@ declare namespace bundleManager { - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { Want } want - Indicates the Want containing the application bundle name to be queried. - * @param { string } extensionAbilityType - Indicates extensionAbilityType. -- * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the -+ * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the - * ExtensionAbilityInfo objects that will be returned. -- * @param { number } userId - Indicates the user ID. -+ * @param { int } userId - Indicates the user ID. - * @returns { Array } Returns a list of ExtensionAbilityInfo objects. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -2137,16 +2551,16 @@ declare namespace bundleManager { - * @arkts 1.1&1.2 - */ - function queryExtensionAbilityInfoSync(want: Want, extensionAbilityType: string, -- extensionAbilityFlags: number, userId?: number): Array; -+ extensionAbilityFlags: int, userId?: int): Array; - - /** - * Query the ExtensionAbilityInfo by extension ability type. ohos.permission.GET_BUNDLE_INFO_PRIVILEGED is required for cross user access. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { string } extensionAbilityType - Indicates ExtensionAbilityType. -- * @param { number } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the -+ * @param { int } extensionAbilityFlags {@link ExtensionAbilityFlag} - Indicates the flag used to specify information contained in the - * ExtensionAbilityInfo objects that will be returned. -- * @param { number } userId - Indicates the user ID. -+ * @param { int } userId - Indicates the user ID. - * @returns { Array } Returns a list of ExtensionAbilityInfo objects. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -2159,14 +2573,14 @@ declare namespace bundleManager { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function queryExtensionAbilityInfoSync(extensionAbilityType: string, extensionAbilityFlags: number, -- userId?: number): Array; -+ function queryExtensionAbilityInfoSync(extensionAbilityType: string, extensionAbilityFlags: int, -+ userId?: int): Array; - - /** - * Obtains bundle name by the given uid. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO -- * @param { number } uid - Indicates the UID of an application. -+ * @param { int } uid - Indicates the UID of an application. - * @param { AsyncCallback } callback - The callback of getting bundle name. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -@@ -2175,13 +2589,13 @@ declare namespace bundleManager { - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getBundleNameByUid(uid: number, callback: AsyncCallback): void; -+ function getBundleNameByUid(uid: int, callback: AsyncCallback): void; - - /** - * Obtains bundle name by the given uid. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO -- * @param { number } uid - Indicates the UID of an application. -+ * @param { int } uid - Indicates the UID of an application. - * @returns { Promise } Returns the bundle name. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -@@ -2190,13 +2604,13 @@ declare namespace bundleManager { - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getBundleNameByUid(uid: number): Promise; -+ function getBundleNameByUid(uid: int): Promise; - - /** - * Obtains bundle name by the given uid. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO -- * @param { number } uid - Indicates the UID of an application. -+ * @param { int } uid - Indicates the UID of an application. - * @returns { string } Returns the bundle name. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -@@ -2205,7 +2619,7 @@ declare namespace bundleManager { - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getBundleNameByUidSync(uid: number): string; -+ function getBundleNameByUidSync(uid: int): string; - - /** - * Obtains information about an application bundle contained in an ohos Ability Package (HAP). -@@ -2213,7 +2627,7 @@ declare namespace bundleManager { - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { string } hapFilePath - Indicates the path storing the HAP. - * The path should be the relative path to the data directory of the current application. -- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. -+ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. - * @param { AsyncCallback } callback - The callback of getting bundle archive info result. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -2221,9 +2635,10 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700022 - The hapFilePath is invalid. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getBundleArchiveInfo(hapFilePath: string, bundleFlags: number, callback: AsyncCallback): void; -+ function getBundleArchiveInfo(hapFilePath: string, bundleFlags: int, callback: AsyncCallback): void; - - /** - * Obtains information about an application bundle contained in an ohos Ability Package (HAP). -@@ -2231,7 +2646,7 @@ declare namespace bundleManager { - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { string } hapFilePath - Indicates the path storing the HAP. - * The path should be the relative path to the data directory of the current application. -- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. -+ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. - * @returns { Promise } Returns the BundleInfo object. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -2239,9 +2654,10 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700022 - The hapFilePath is invalid. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getBundleArchiveInfo(hapFilePath: string, bundleFlags: number): Promise; -+ function getBundleArchiveInfo(hapFilePath: string, bundleFlags: int): Promise; - - /** - * Obtains information about an application bundle contained in an ohos Ability Package (HAP). -@@ -2249,7 +2665,7 @@ declare namespace bundleManager { - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { string } hapFilePath - Indicates the path storing the HAP. - * The path should be the relative path to the data directory of the current application. -- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. -+ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object to be returned. - * @returns { BundleInfo } Returns the BundleInfo object. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -2257,9 +2673,10 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700022 - The hapFilePath is invalid. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getBundleArchiveInfoSync(hapFilePath: string, bundleFlags: number): BundleInfo; -+ function getBundleArchiveInfoSync(hapFilePath: string, bundleFlags: int): BundleInfo; - - /** - * Clears cache data of a specified application. -@@ -2274,7 +2691,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700030 - The specified bundle does not support clearing of cache files. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function cleanBundleCacheFiles(bundleName: string, callback: AsyncCallback): void; - -@@ -2291,7 +2709,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700030 - The specified bundle does not support clearing of cache files. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function cleanBundleCacheFiles(bundleName: string): Promise; - -@@ -2300,7 +2719,7 @@ declare namespace bundleManager { - * - * @permission ohos.permission.REMOVE_CACHE_FILES - * @param { string } bundleName - Indicates the bundle name of the application whose cache data is to be cleaned. -- * @param { number } appIndex - Indicates the index of clone app. -+ * @param { int } appIndex - Indicates the index of clone app. - * @returns { Promise } Clean bundle cache files result - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -2310,22 +2729,24 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700061 - AppIndex not in valid range. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function cleanBundleCacheFiles(bundleName: string, appIndex: number): Promise; -+ function cleanBundleCacheFiles(bundleName: string, appIndex: int): Promise; - - /** - * Get the all bundle cache size of the current user. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED -- * @returns { Promise } Returns all bundle cache size. -+ * @returns { Promise } Returns all bundle cache size. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getAllBundleCacheSize(): Promise; -+ function getAllBundleCacheSize(): Promise; - - /** - * Clean all bundle cache files of the current user, does not include the currently running program. -@@ -2336,7 +2757,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function cleanAllBundleCache(): Promise; - -@@ -2345,7 +2767,7 @@ declare namespace bundleManager { - * - * @permission ohos.permission.CHANGE_ABILITY_ENABLED_STATE - * @param { string } bundleName - Indicates the bundle name of the application. -- * @param { number } appIndex - Indicates the index of clone app. -+ * @param { int } appIndex - Indicates the index of clone app. - * @param { boolean } isEnabled - The value true means to enable it, and the value false means to disable it. - * @returns { Promise } set app enabled result. - * @throws { BusinessError } 201 - Permission denied. -@@ -2358,7 +2780,7 @@ declare namespace bundleManager { - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function setApplicationEnabled(bundleName: string, appIndex: number, isEnabled: boolean): Promise; -+ function setApplicationEnabled(bundleName: string, appIndex: int, isEnabled: boolean): Promise; - - /** - * Sets whether to enable a specified application. -@@ -2418,7 +2840,7 @@ declare namespace bundleManager { - * - * @permission ohos.permission.CHANGE_ABILITY_ENABLED_STATE - * @param { AbilityInfo } info - Indicates information about the ability to set. -- * @param { number } appIndex - Indicates the index of clone app. -+ * @param { int } appIndex - Indicates the index of clone app. - * @param { boolean } isEnabled - The value true means to enable it, and the value false means to disable it. - * @returns { Promise } set ability enabled result. - * @throws { BusinessError } 201 - Permission denied. -@@ -2432,7 +2854,7 @@ declare namespace bundleManager { - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function setAbilityEnabled(info: AbilityInfo, appIndex: number, isEnabled: boolean): Promise; -+ function setAbilityEnabled(info: AbilityInfo, appIndex: int, isEnabled: boolean): Promise; - - /** - * Sets whether to enable a specified ability. -@@ -2494,7 +2916,7 @@ declare namespace bundleManager { - * Checks whether a specified application is enabled. - * - * @param { string } bundleName - Indicates the bundle name of the application. -- * @param { number } appIndex - Indicates the index of clone app. -+ * @param { int } appIndex - Indicates the index of clone app. - * @returns { Promise } Returns true if the application is enabled; returns false otherwise. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -@@ -2505,7 +2927,7 @@ declare namespace bundleManager { - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function isApplicationEnabled(bundleName: string, appIndex: number): Promise; -+ function isApplicationEnabled(bundleName: string, appIndex: int): Promise; - - /** - * Checks whether a specified application is enabled. -@@ -2556,7 +2978,7 @@ declare namespace bundleManager { - * Checks whether a specified ability is enabled. - * - * @param { AbilityInfo } info - Indicates information about the ability to check. -- * @param { number } appIndex - Indicates the index of clone app. -+ * @param { int } appIndex - Indicates the index of clone app. - * @returns { Promise } Returns true if the ability is enabled; returns false otherwise. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -@@ -2568,7 +2990,7 @@ declare namespace bundleManager { - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function isAbilityEnabled(info: AbilityInfo, appIndex: number): Promise; -+ function isAbilityEnabled(info: AbilityInfo, appIndex: int): Promise; - - /** - * Checks whether a specified ability is enabled. -@@ -2625,7 +3047,7 @@ declare namespace bundleManager { - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { string } bundleName - Indicates the bundle name of the application. -- * @param { number } userId - Indicates the user ID or do not pass user ID. -+ * @param { int } userId - Indicates the user ID or do not pass user ID. - * @param { AsyncCallback } callback - The callback for starting the application's main ability. - * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.GET_BUNDLE_INFO_PRIVILEGED'. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -2638,7 +3060,7 @@ declare namespace bundleManager { - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getLaunchWantForBundle(bundleName: string, userId: number, callback: AsyncCallback): void; -+ function getLaunchWantForBundle(bundleName: string, userId: int, callback: AsyncCallback): void; - - /** - * Obtains the Want for starting the main ability of an application based on the -@@ -2667,7 +3089,7 @@ declare namespace bundleManager { - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { string } bundleName - Indicates the bundle name of the application. -- * @param { number } userId - Indicates the user ID or do not pass user ID. -+ * @param { int } userId - Indicates the user ID or do not pass user ID. - * @returns { Promise } the Want for starting the application's main ability. - * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.GET_BUNDLE_INFO_PRIVILEGED'. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -2680,7 +3102,7 @@ declare namespace bundleManager { - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getLaunchWantForBundle(bundleName: string, userId?: number): Promise; -+ function getLaunchWantForBundle(bundleName: string, userId?: int): Promise; - - /** - * Obtains the Want for starting the main ability of an application based on the -@@ -2689,7 +3111,7 @@ declare namespace bundleManager { - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { string } bundleName - Indicates the bundle name of the application. -- * @param { number } userId - Indicates the user ID or do not pass user ID. -+ * @param { int } userId - Indicates the user ID or do not pass user ID. - * @returns { Want } the Want for starting the application's main ability. - * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.GET_BUNDLE_INFO_PRIVILEGED'. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -2702,7 +3124,7 @@ declare namespace bundleManager { - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getLaunchWantForBundleSync(bundleName: string, userId?: number): Want; -+ function getLaunchWantForBundleSync(bundleName: string, userId?: int): Want; - - /** - * Obtains the Want for starting the main ability of own application. -@@ -2713,7 +3135,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700072 - The launch want is not found. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since 13 -+ * @since arkts {'1.1':'13', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getLaunchWant(): Want; - -@@ -2748,7 +3171,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700029 - The specified ability is disabled. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getProfileByAbility(moduleName: string, abilityName: string, metadataName: string, callback: AsyncCallback>): void; - -@@ -2783,7 +3207,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700029 - The specified ability is disabled. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getProfileByAbility(moduleName: string, abilityName: string, metadataName?: string): Promise>; - -@@ -2818,7 +3243,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700029 - The specified ability is disabled. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getProfileByAbilitySync(moduleName: string, abilityName: string, metadataName?: string): Array; - -@@ -2851,7 +3277,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700026 - The specified bundle is disabled. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getProfileByExtensionAbility(moduleName: string, extensionAbilityName: string, metadataName: string, callback: AsyncCallback>): void; - -@@ -2884,7 +3311,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700026 - The specified bundle is disabled. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getProfileByExtensionAbility(moduleName: string, extensionAbilityName: string, metadataName?: string): Promise>; - -@@ -2917,7 +3345,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700026 - The specified bundle is disabled. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getProfileByExtensionAbilitySync(moduleName: string, extensionAbilityName: string, metadataName?: string): Array; - -@@ -2933,7 +3362,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700006 - The specified permission is not found. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getPermissionDef(permissionName: string, callback: AsyncCallback): void; - -@@ -2949,7 +3379,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700006 - The specified permission is not found. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getPermissionDef(permissionName: string): Promise; - -@@ -2965,7 +3396,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700006 - The specified permission is not found. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getPermissionDefSync(permissionName: string): PermissionDef; - -@@ -3046,8 +3478,8 @@ declare namespace bundleManager { - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { string } bundleName - Indicates the application bundle name to be queried. -- * @param { number } applicationFlags - Indicates the flag used to specify information contained in the ApplicationInfo object that will be returned. -- * @param { number } userId - Indicates the user ID or do not pass user ID. -+ * @param { int } applicationFlags - Indicates the flag used to specify information contained in the ApplicationInfo object that will be returned. -+ * @param { int } userId - Indicates the user ID or do not pass user ID. - * @returns { ApplicationInfo } - Returns the ApplicationInfo object. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -3060,14 +3492,14 @@ declare namespace bundleManager { - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getApplicationInfoSync(bundleName: string, applicationFlags: number, userId: number): ApplicationInfo; -+ function getApplicationInfoSync(bundleName: string, applicationFlags: int, userId: int): ApplicationInfo; - - /** - * Obtains applicationInfo based on a given bundleName and bundleFlags. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { string } bundleName - Indicates the application bundle name to be queried. -- * @param { number } applicationFlags - Indicates the flag used to specify information contained in the ApplicationInfo object that will be returned. -+ * @param { int } applicationFlags - Indicates the flag used to specify information contained in the ApplicationInfo object that will be returned. - * @returns { ApplicationInfo } - Returns the ApplicationInfo object. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -3079,15 +3511,15 @@ declare namespace bundleManager { - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getApplicationInfoSync(bundleName: string, applicationFlags: number): ApplicationInfo; -+ function getApplicationInfoSync(bundleName: string, applicationFlags: int): ApplicationInfo; - - /** - * Obtains bundleInfo based on bundleName, bundleFlags and userId. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { string } bundleName - Indicates the application bundle name to be queried. -- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object that will be returned. -- * @param { number } userId - Indicates the user ID or do not pass user ID. -+ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object that will be returned. -+ * @param { int } userId - Indicates the user ID or do not pass user ID. - * @returns { BundleInfo } - Returns the BundleInfo object. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -@@ -3098,14 +3530,14 @@ declare namespace bundleManager { - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getBundleInfoSync(bundleName: string, bundleFlags: number, userId: number): BundleInfo; -+ function getBundleInfoSync(bundleName: string, bundleFlags: int, userId: int): BundleInfo; - - /** - * Obtains bundleInfo based on bundleName, bundleFlags. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { string } bundleName - Indicates the application bundle name to be queried. -- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object that will be returned. -+ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo object that will be returned. - * @returns { BundleInfo } - Returns the BundleInfo object. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -@@ -3115,7 +3547,7 @@ declare namespace bundleManager { - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getBundleInfoSync(bundleName: string, bundleFlags: number): BundleInfo; -+ function getBundleInfoSync(bundleName: string, bundleFlags: int): BundleInfo; - - /** - * Obtains SharedBundleInfo of all shared bundle available in the system. -@@ -3126,7 +3558,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAllSharedBundleInfo(callback: AsyncCallback>): void; - -@@ -3139,7 +3572,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAllSharedBundleInfo(): Promise>; - -@@ -3157,7 +3591,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700002 - The specified moduleName is not found. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSharedBundleInfo(bundleName: string, moduleName: string, callback: AsyncCallback>): void; - -@@ -3175,7 +3610,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700002 - The specified moduleName is not found. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSharedBundleInfo(bundleName: string, moduleName: string): Promise>; - -@@ -3192,7 +3628,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700001 - The specified bundleName is not found. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAppProvisionInfo(bundleName: string, callback: AsyncCallback): void; - -@@ -3201,7 +3638,7 @@ declare namespace bundleManager { - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { string } bundleName - Indicates the bundle name of the application to which the ability belongs. -- * @param { number } userId - Indicates the user ID or do not pass user ID. -+ * @param { int } userId - Indicates the user ID or do not pass user ID. - * @param { AsyncCallback } callback - Indicates the callback of getting AppProvisionInfo result. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -3211,16 +3648,17 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700004 - The specified user ID is not found. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getAppProvisionInfo(bundleName: string, userId: number, callback: AsyncCallback): void; -+ function getAppProvisionInfo(bundleName: string, userId: int, callback: AsyncCallback): void; - - /** - * Obtains the profile file information of a specified bundle. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { string } bundleName - Indicates the bundle name of the application to which the ability belongs. -- * @param { number } userId - Indicates the user ID or do not pass user ID. -+ * @param { int } userId - Indicates the user ID or do not pass user ID. - * @returns { Promise } Returns the AppProvisionInfo object. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -3230,16 +3668,17 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700004 - The specified user ID is not found. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getAppProvisionInfo(bundleName: string, userId?: number): Promise; -+ function getAppProvisionInfo(bundleName: string, userId?: int): Promise; - - /** - * Obtains the profile file information of a specified bundle. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { string } bundleName - Indicates the bundle name of the application to which the ability belongs. -- * @param { number } userId - Indicates the user ID or do not pass user ID. -+ * @param { int } userId - Indicates the user ID or do not pass user ID. - * @returns { AppProvisionInfo } Returns the AppProvisionInfo object. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -3249,9 +3688,10 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700004 - The specified user ID is not found. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getAppProvisionInfoSync(bundleName: string, userId?: number): AppProvisionInfo; -+ function getAppProvisionInfoSync(bundleName: string, userId?: int): AppProvisionInfo; - - /** - * Obtains the distribution type specified during bundle installation. -@@ -3283,7 +3723,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700001 - The specified bundleName is not found. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAdditionalInfo(bundleName: string): string; - -@@ -3313,7 +3754,7 @@ declare namespace bundleManager { - * @param { ProfileType } profileType - Indicates the type of profile to be obtained. - * @param { string } bundleName - Indicates the name of the bundle to which the profile belongs. - * @param { string } moduleName - Indicates the name of the module to which the profile belongs. -- * @param { number } userId - Indicates the user ID or do not pass user ID. -+ * @param { int } userId - Indicates the user ID or do not pass user ID. - * @returns { string } Returns string in json-format of the designated profile. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -3325,9 +3766,10 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700026 - The specified bundle is disabled. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getJsonProfile(profileType: ProfileType, bundleName: string, moduleName?: string, userId?: number): string; -+ function getJsonProfile(profileType: ProfileType, bundleName: string, moduleName?: string, userId?: int): string; - - /** - * Get extend resources. -@@ -3342,7 +3784,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700303 - Failed to obtain extended resources. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getExtResource(bundleName: string): Promise>; - -@@ -3361,7 +3804,25 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700304 - Failed to enable the dynamic icon. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Enable dynamic icon. -+ * -+ * @permission ohos.permission.ACCESS_DYNAMIC_ICON -+ * @param { string } bundleName - Indicates the bundleName. -+ * @param { string } moduleName - Indicates the moduleName for extend resource. -+ * @returns { Promise } Returns enableDynamicIcon result. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -+ * @throws { BusinessError } 17700001 - The specified bundleName is not found. -+ * @throws { BusinessError } 17700002 - The specified moduleName is not found. -+ * @throws { BusinessError } 17700304 - Failed to enable the dynamic icon. -+ * @throws { BusinessError } 17700307 - Dynamic icons cannot take effect due to existing custom themes. -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @systemapi -+ * @since 20 - * @arkts 1.1&1.2 - */ - function enableDynamicIcon(bundleName: string, moduleName: string): Promise; -@@ -3379,7 +3840,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700305 - Failed to disable the dynamic icon. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function disableDynamicIcon(bundleName: string): Promise; - -@@ -3427,7 +3889,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700201 - Failed to verify the abc file. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function verifyAbc(abcPaths: Array, deleteOriginalFiles: boolean, callback: AsyncCallback): void; - -@@ -3457,7 +3920,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700201 - Failed to verify the abc file. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function verifyAbc(abcPaths: Array, deleteOriginalFiles: boolean): Promise; - -@@ -3470,7 +3934,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getRecoverableApplicationInfo(callback: AsyncCallback>): void; - -@@ -3483,7 +3948,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getRecoverableApplicationInfo(): Promise>; - -@@ -3501,7 +3967,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700053 - The caller is not AppGallery. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setAdditionalInfo(bundleName: string, additionalInfo: string): void; - -@@ -3529,7 +3996,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700202 - Failed to delete the abc file. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function deleteAbc(abcPath: string): Promise; - -@@ -3543,7 +4011,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700056 - The scheme of the specified link is not in the querySchemes. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function canOpenLink(link: string): boolean; - -@@ -3556,7 +4025,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAllPreinstalledApplicationInfo(): Promise>; - -@@ -3573,7 +4043,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700059 - The specified developerId is invalid. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAllBundleInfoByDeveloperId(developerId: string): Array; - -@@ -3581,16 +4052,17 @@ declare namespace bundleManager { - * Get a list of developedId by distribution type. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED -- * @param { number } appDistributionType - Indicates the distribution type of the application, and if not passed in, it gets all the developerId. -+ * @param { int } appDistributionType - Indicates the distribution type of the application, and if not passed in, it gets all the developerId. - * @returns { Array } Returns a list of developerId. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getDeveloperIds(appDistributionType?: number): Array; -+ function getDeveloperIds(appDistributionType?: int): Array; - - /** - * Switch uninstall state of a specified application. -@@ -3605,7 +4077,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700060 - The specified application cannot be uninstalled. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function switchUninstallState(bundleName: string, state: boolean): void; - -@@ -3613,23 +4086,24 @@ declare namespace bundleManager { - * Get the SignatureInfo of the application through UID. - * - * @permission ohos.permission.GET_SIGNATURE_INFO -- * @param { number } uid - Indicates the UID of an application. -+ * @param { int } uid - Indicates the UID of an application. - * @returns { SignatureInfo } The result of getting the signature info. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 17700021 - The uid is not found. - * @syscap SystemCapability.BundleManager.BundleFramework.Core -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getSignatureInfo(uid: number): SignatureInfo; -+ function getSignatureInfo(uid: int): SignatureInfo; - - /** - * Get the BundleInfo of the specified MultiIsolation App. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { string } bundleName - Indicates the application bundle name to be queried. -- * @param { number } appIndex - Indicates the index of clone app. -- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. -- * @param { number } [userId] - Indicates the user ID, If the user id is not specified, the current user id is used by default. -+ * @param { int } appIndex - Indicates the index of clone app. -+ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. -+ * @param { int } [userId] - Indicates the user ID, If the user id is not specified, the current user id is used by default. - * @returns { Promise } Returns A BundleInfo Of MultiApp Mode. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -3643,15 +4117,15 @@ declare namespace bundleManager { - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getAppCloneBundleInfo(bundleName: string, appIndex: number, bundleFlags: number, userId?: number): Promise; -+ function getAppCloneBundleInfo(bundleName: string, appIndex: int, bundleFlags: int, userId?: int): Promise; - - /** - * Get all BundleInfo of clone app. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { string } bundleName - Indicates the application bundle name to be queried. -- * @param { number } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. -- * @param { number } [userId] - Indicates the user ID, If the user id is not specified, the current user id is used by default. -+ * @param { int } bundleFlags {@link BundleFlag} - Indicates the flag used to specify information contained in the BundleInfo objects that will be returned. -+ * @param { int } [userId] - Indicates the user ID, If the user id is not specified, the current user id is used by default. - * @returns { Promise> } Returns BundleInfo Arrays Of MultiApp Mode. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -3661,15 +4135,16 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700026 - The specified bundle and clone apps are all disabled. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getAllAppCloneBundleInfo(bundleName: string, bundleFlags: number, userId?: number): Promise>; -+ function getAllAppCloneBundleInfo(bundleName: string, bundleFlags: int, userId?: int): Promise>; - - /** - * Obtains AppCloneIdentity contains bundleName and appIndex by the given uid. The application requires to be a system application when requesting the permission of ohos.permission.GET_BUNDLE_INFO. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO -- * @param { number } uid - Indicates the UID of an application. -+ * @param { int } uid - Indicates the UID of an application. - * @returns { Promise } Returns the clone Identity contains bundleName and appIndex. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -@@ -3678,14 +4153,14 @@ declare namespace bundleManager { - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getAppCloneIdentity(uid: number): Promise; -+ function getAppCloneIdentity(uid: int): Promise; - - /** - * Get all plugin info of host application. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { string } hostBundleName - Indicates the host application bundle name to be queried. -- * @param { number } [userId] - Indicates the user ID or do not pass user ID. -+ * @param { int } [userId] - Indicates the user ID or do not pass user ID. - * @returns { Promise> } Returns PluginBundleInfo Arrays. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -3693,13 +4168,14 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700004 - The specified user ID is not found. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getAllPluginInfo(hostBundleName: string, userId?: number): Promise>; -+ function getAllPluginInfo(hostBundleName: string, userId?: int): Promise>; - - /** - * Migrate files from the source paths to the destination path. -- * -+ * - * @permission ohos.permission.MIGRATE_DATA - * @param { Array } sourcePaths - Indicates the source paths to be migrated. - * @param { string } destinationPath - Target path for data migration. -@@ -3715,7 +4191,8 @@ declare namespace bundleManager { - * @throws { BusinessError } 17700086 - System error occurred during copy execution. - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function migrateData(sourcePaths: Array, destinationPath: string): Promise; - -@@ -3732,7 +4209,16 @@ declare namespace bundleManager { - * @typedef { _ApplicationInfo } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Obtains configuration information about an application. -+ * -+ * @typedef { _ApplicationInfo } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - export type ApplicationInfo = _ApplicationInfo; -@@ -3750,7 +4236,16 @@ declare namespace bundleManager { - * @typedef { _ModuleMetadata } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the metadata information about a module. -+ * -+ * @typedef { _ModuleMetadata } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - export type ModuleMetadata = _ModuleMetadata; -@@ -3768,7 +4263,16 @@ declare namespace bundleManager { - * @typedef { _Metadata } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the Metadata. -+ * -+ * @typedef { _Metadata } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - export type Metadata = _Metadata; -@@ -3788,6 +4292,15 @@ declare namespace bundleManager { - * @atomicservice - * @since 11 - */ -+ /** -+ * Obtains configuration information about a bundle. -+ * -+ * @typedef { _BundleInfo.BundleInfo } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ - export type BundleInfo = _BundleInfo.BundleInfo; - - /** -@@ -3795,7 +4308,7 @@ declare namespace bundleManager { - * - * @typedef { _BundleInfo } - * @syscap SystemCapability.BundleManager.BundleFramework.Core -- * @atomicservice -+ * @crossplatform - * @since 20 - * @arkts 1.2 - */ -@@ -3816,6 +4329,15 @@ declare namespace bundleManager { - * @atomicservice - * @since 11 - */ -+ /** -+ * The scene which is used. -+ * -+ * @typedef { _BundleInfo.UsedScene } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ - export type UsedScene = _BundleInfo.UsedScene; - - /** -@@ -3823,7 +4345,7 @@ declare namespace bundleManager { - * - * @typedef { _UsedScene } - * @syscap SystemCapability.BundleManager.BundleFramework.Core -- * @atomicservice -+ * @crossplatform - * @since 20 - * @arkts 1.2 - */ -@@ -3844,6 +4366,15 @@ declare namespace bundleManager { - * @atomicservice - * @since 11 - */ -+ /** -+ * Indicates the required permissions details defined in file config.json. -+ * -+ * @typedef { _BundleInfo.ReqPermissionDetail } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ - export type ReqPermissionDetail = _BundleInfo.ReqPermissionDetail; - - /** -@@ -3851,7 +4382,7 @@ declare namespace bundleManager { - * - * @typedef { _ReqPermissionDetail } - * @syscap SystemCapability.BundleManager.BundleFramework.Core -- * @atomicservice -+ * @crossplatform - * @since 20 - * @arkts 1.2 - */ -@@ -3872,6 +4403,15 @@ declare namespace bundleManager { - * @atomicservice - * @since 11 - */ -+ /** -+ * Indicates the SignatureInfo. -+ * -+ * @typedef { _BundleInfo.SignatureInfo } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ - export type SignatureInfo = _BundleInfo.SignatureInfo; - - /** -@@ -3879,7 +4419,7 @@ declare namespace bundleManager { - * - * @typedef { _SignatureInfo } - * @syscap SystemCapability.BundleManager.BundleFramework.Core -- * @atomicservice -+ * @crossplatform - * @since 20 - * @arkts 1.2 - */ -@@ -3919,6 +4459,15 @@ declare namespace bundleManager { - * @atomicservice - * @since 11 - */ -+ /** -+ * Obtains configuration information about a module. -+ * -+ * @typedef { _HapModuleInfo.HapModuleInfo } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ - export type HapModuleInfo = _HapModuleInfo.HapModuleInfo; - - /** -@@ -3926,6 +4475,7 @@ declare namespace bundleManager { - * - * @typedef { _HapModuleInfo } - * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 -@@ -4003,7 +4553,6 @@ declare namespace bundleManager { - * - * @typedef { _RouterItem} - * @syscap SystemCapability.BundleManager.BundleFramework.Core -- * @atomicservice - * @since 20 - * @arkts 1.2 - */ -@@ -4045,6 +4594,15 @@ declare namespace bundleManager { - * @atomicservice - * @since 11 - */ -+ /** -+ * Obtains configuration information about an ability. -+ * -+ * @typedef { _AbilityInfo.AbilityInfo } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ - export type AbilityInfo = _AbilityInfo.AbilityInfo; - - /** -@@ -4052,6 +4610,7 @@ declare namespace bundleManager { - * - * @typedef { _AbilityInfo } - * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 -@@ -4059,27 +4618,37 @@ declare namespace bundleManager { - export type AbilityInfo = _AbilityInfo; - - /** -- * Contains basic Ability information. Indicates the window size.. -+ * Contains basic Ability information. Indicates the window size. - * - * @typedef { _AbilityInfo.WindowSize } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since 9 - */ - /** -- * Contains basic Ability information. Indicates the window size.. -+ * Contains basic Ability information. Indicates the window size. - * - * @typedef { _AbilityInfo.WindowSize } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice - * @since 11 - */ -+ /** -+ * Contains basic Ability information. Indicates the window size. -+ * -+ * @typedef { _AbilityInfo.WindowSize } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ - export type WindowSize = _AbilityInfo.WindowSize; - - /** -- * Contains basic Ability information. Indicates the window size.. -+ * Contains basic Ability information. Indicates the window size. - * - * @typedef { _WindowSize } - * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 -@@ -4120,7 +4689,8 @@ declare namespace bundleManager { - * @typedef { _PermissionDef } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export type PermissionDef = _PermissionDef; - -@@ -4148,7 +4718,8 @@ declare namespace bundleManager { - * @typedef { _SharedBundleInfo } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export type SharedBundleInfo = _SharedBundleInfo; - -@@ -4162,6 +4733,17 @@ declare namespace bundleManager { - */ - export type AppProvisionInfo = _AppProvisionInfo.AppProvisionInfo; - -+ /** -+ * Obtains profile file information about a bundle. -+ * -+ * @typedef { _AppProvisionInfo } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @systemapi -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ export type AppProvisionInfo = _AppProvisionInfo; -+ - /** - * Obtains profile file validity about a bundle. - * -@@ -4172,13 +4754,25 @@ declare namespace bundleManager { - */ - export type Validity = _AppProvisionInfo.Validity; - -+ /** -+ * Obtains profile file validity about a bundle. -+ * -+ * @typedef { _Validity } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @systemapi -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ export type Validity = _Validity; -+ - /** - * Obtains information about a recoverable preinstalled application. - * - * @typedef { _RecoverableApplicationInfo } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export type RecoverableApplicationInfo = _RecoverableApplicationInfo; - -@@ -4241,7 +4835,8 @@ declare namespace bundleManager { - * @typedef { _PluginBundleInfo } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export type PluginBundleInfo = _PluginBundleInfo; - -@@ -4251,7 +4846,8 @@ declare namespace bundleManager { - * @typedef { _PluginModuleInfo } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export type PluginModuleInfo = _PluginModuleInfo; - } -diff --git a/api/@ohos.bundle.bundleMonitor.d.ts b/api/@ohos.bundle.bundleMonitor.d.ts -index 889a0cb43..99dc6d7c8 100644 ---- a/api/@ohos.bundle.bundleMonitor.d.ts -+++ b/api/@ohos.bundle.bundleMonitor.d.ts -@@ -54,25 +54,25 @@ declare namespace bundleMonitor { - /** - * The user id - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly userId: number; -+ readonly userId: int; - /** - * The app index of clone app - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly appIndex: number; -+ readonly appIndex: int; - } - - /** -diff --git a/api/@ohos.bundle.bundleResourceManager.d.ts b/api/@ohos.bundle.bundleResourceManager.d.ts -index f9fb98101..0969cb52a 100644 ---- a/api/@ohos.bundle.bundleResourceManager.d.ts -+++ b/api/@ohos.bundle.bundleResourceManager.d.ts -@@ -42,7 +42,7 @@ declare namespace bundleResourceManager { - /** - * Used to query the enumeration value of resource info. Multiple values can be passed in the form. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.BundleFramework.Resource - * @systemapi - * @since arkts {'1.1':'11', '1.2':'20'} -@@ -106,7 +106,7 @@ declare namespace bundleResourceManager { - * - * @permission ohos.permission.GET_BUNDLE_RESOURCES - * @param { string } bundleName - Indicates the bundle name of the application. -- * @param { number } resourceFlags - Indicates the flag used to specify information contained in the BundleResourceInfo object that will be returned. -+ * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo object that will be returned. - * @returns { BundleResourceInfo } Returns the BundleResourceInfo object. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -117,15 +117,15 @@ declare namespace bundleResourceManager { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getBundleResourceInfo(bundleName: string, resourceFlags?: number): BundleResourceInfo; -+ function getBundleResourceInfo(bundleName: string, resourceFlags?: int): BundleResourceInfo; - - /** - * Obtains the BundleResourceInfo of a specified bundle. Default resourceFlag is GET_RESOURCE_INFO_ALL. - * - * @permission ohos.permission.GET_BUNDLE_RESOURCES - * @param { string } bundleName - Indicates the bundle name of the application. -- * @param { number } [resourceFlags] - Indicates the flag used to specify information contained in the BundleResourceInfo object that will be returned. -- * @param { number } [appIndex] - Indicates the index of the bundle. -+ * @param { int } [resourceFlags] {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo object that will be returned. -+ * @param { int } [appIndex] - Indicates the index of the bundle,The default value is 0. - * @returns { BundleResourceInfo } Returns the BundleResourceInfo object. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -137,14 +137,14 @@ declare namespace bundleResourceManager { - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getBundleResourceInfo(bundleName: string, resourceFlags?: number, appIndex?: number): BundleResourceInfo; -+ function getBundleResourceInfo(bundleName: string, resourceFlags?: int, appIndex?: int): BundleResourceInfo; - - /** - * Obtains the LauncherAbilityResourceInfo of a specified bundle. Default resourceFlag is GET_RESOURCE_INFO_ALL. - * - * @permission ohos.permission.GET_BUNDLE_RESOURCES - * @param { string } bundleName - Indicates the bundle name of the application. -- * @param { number } resourceFlags - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo object that will be returned. -+ * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo object that will be returned. - * @returns { Array } Returns a list of LauncherAbilityResourceInfo objects. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -155,16 +155,16 @@ declare namespace bundleResourceManager { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: number): Array; -+ function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: int): Array; - - /** - * Obtains the LauncherAbilityResourceInfo of a specified bundle. Default resourceFlag is GET_RESOURCE_INFO_ALL. - * - * @permission ohos.permission.GET_BUNDLE_RESOURCES - * @param { string } bundleName - Indicates the bundle name of the application. -- * @param { number } [resourceFlags] - Indicates the flag used to specify information -+ * @param { int } [resourceFlags] {@link ResourceFlag} - Indicates the flag used to specify information - *
    contained in the LauncherAbilityResourceInfo object that will be returned. -- * @param { number } [appIndex] - Indicates the index of the bundle. -+ * @param { int } [appIndex] - Indicates the index of the bundle,The default value is 0. - * @returns { Array } Returns a list of LauncherAbilityResourceInfo objects. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -176,13 +176,13 @@ declare namespace bundleResourceManager { - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: number, appIndex?: number): Array; -+ function getLauncherAbilityResourceInfo(bundleName: string, resourceFlags?: int, appIndex?: int): Array; - - /** - * Obtains BundleResourceInfo of all bundles available in the system. - * - * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST and ohos.permission.GET_BUNDLE_RESOURCES -- * @param { number } resourceFlags - Indicates the flag used to specify information contained in the BundleResourceInfo that will be returned. -+ * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo that will be returned. - * @param { AsyncCallback> } callback - The callback of getting a list of BundleResourceInfo objects. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -192,13 +192,13 @@ declare namespace bundleResourceManager { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getAllBundleResourceInfo(resourceFlags: number, callback: AsyncCallback>): void; -+ function getAllBundleResourceInfo(resourceFlags: int, callback: AsyncCallback>): void; - - /** - * Obtains BundleResourceInfo of all bundles available in the system. - * - * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST and ohos.permission.GET_BUNDLE_RESOURCES -- * @param { number } resourceFlags - Indicates the flag used to specify information contained in the BundleResourceInfo that will be returned. -+ * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the BundleResourceInfo that will be returned. - * @returns { Promise> } Returns a list of BundleResourceInfo objects. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -208,13 +208,13 @@ declare namespace bundleResourceManager { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getAllBundleResourceInfo(resourceFlags: number): Promise>; -+ function getAllBundleResourceInfo(resourceFlags: int): Promise>; - - /** - * Obtains LauncherAbilityResourceInfo of all launcher abilities available in the system. - * - * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST and ohos.permission.GET_BUNDLE_RESOURCES -- * @param { number } resourceFlags - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo that will be returned. -+ * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo that will be returned. - * @param { AsyncCallback> } callback - The callback of getting a list of LauncherAbilityResourceInfo objects. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -224,13 +224,13 @@ declare namespace bundleResourceManager { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getAllLauncherAbilityResourceInfo(resourceFlags: number, callback: AsyncCallback>): void; -+ function getAllLauncherAbilityResourceInfo(resourceFlags: int, callback: AsyncCallback>): void; - - /** - * Obtains LauncherAbilityResourceInfo of all launcher abilities available in the system. - * - * @permission ohos.permission.GET_INSTALLED_BUNDLE_LIST and ohos.permission.GET_BUNDLE_RESOURCES -- * @param { number } resourceFlags - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo that will be returned. -+ * @param { int } resourceFlags {@link ResourceFlag} - Indicates the flag used to specify information contained in the LauncherAbilityResourceInfo that will be returned. - * @returns { Promise> } Returns a list of LauncherAbilityResourceInfo objects. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -240,7 +240,7 @@ declare namespace bundleResourceManager { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getAllLauncherAbilityResourceInfo(resourceFlags: number): Promise>; -+ function getAllLauncherAbilityResourceInfo(resourceFlags: int): Promise>; - - /** - * Obtains resource info of a bundle. -diff --git a/api/@ohos.bundle.defaultAppManager.d.ts b/api/@ohos.bundle.defaultAppManager.d.ts -index 7ee73e02f..c402034e9 100644 ---- a/api/@ohos.bundle.defaultAppManager.d.ts -+++ b/api/@ohos.bundle.defaultAppManager.d.ts -@@ -27,78 +27,89 @@ import { ElementName } from './bundleManager/ElementName'; - * - * @namespace defaultAppManager - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace defaultAppManager { - /** - * The constant for application type. - * -- * @enum { number } -+ * @enum { string } - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum ApplicationType { - /** - * Default browser identifier. - * - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BROWSER = 'Web Browser', - /** - * Default image identifier. - * - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - IMAGE = 'Image Gallery', - /** - * Default audio identifier. - * - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AUDIO = 'Audio Player', - /** - * Default video identifier. - * - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - VIDEO = 'Video Player', - /** - * Default PDF identifier. - * - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PDF = 'PDF Viewer', - /** - * Default word identifier. - * - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WORD = 'Word Viewer', - /** - * Default excel identifier. - * - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EXCEL = 'Excel Viewer', - /** - * Default PPT identifier. - * - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PPT = 'PPT Viewer', - /** - * Default email identifier. - * - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EMAIL = 'Email' - } -@@ -111,7 +122,8 @@ declare namespace defaultAppManager { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isDefaultApplication(type: string, callback: AsyncCallback): void; - -@@ -123,7 +135,8 @@ declare namespace defaultAppManager { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isDefaultApplication(type: string): Promise; - -@@ -135,7 +148,8 @@ declare namespace defaultAppManager { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isDefaultApplicationSync(type: string): boolean; - -@@ -144,7 +158,7 @@ declare namespace defaultAppManager { - * - * @permission ohos.permission.GET_DEFAULT_APPLICATION - * @param { string } type - Application type or a file type that conforms to media type format. -- * @param { number } userId - Indicates the id for the user. -+ * @param { int } userId - Indicates the id for the user. - * @param { AsyncCallback } callback - The callback of the BundleInfo object result. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -155,9 +169,10 @@ declare namespace defaultAppManager { - * @throws { BusinessError } 17700025 - The specified type is invalid. - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getDefaultApplication(type: string, userId: number, callback: AsyncCallback): void; -+ function getDefaultApplication(type: string, userId: int, callback: AsyncCallback): void; - - /** - * Get default application based on type. -@@ -173,7 +188,8 @@ declare namespace defaultAppManager { - * @throws { BusinessError } 17700025 - The specified type is invalid. - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getDefaultApplication(type: string, callback: AsyncCallback): void; - -@@ -182,7 +198,7 @@ declare namespace defaultAppManager { - * - * @permission ohos.permission.GET_DEFAULT_APPLICATION - * @param { string } type - Application type or a file type that conforms to media type format. -- * @param { number } userId - Indicates the id for the user. -+ * @param { int } userId - Indicates the id for the user. - * @returns { Promise } Return the BundleInfo object. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -193,16 +209,17 @@ declare namespace defaultAppManager { - * @throws { BusinessError } 17700025 - The specified type is invalid. - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getDefaultApplication(type: string, userId?: number): Promise; -+ function getDefaultApplication(type: string, userId?: int): Promise; - - /** - * Get default application based on type. - * - * @permission ohos.permission.GET_DEFAULT_APPLICATION - * @param { string } type - Application type or a file type that conforms to media type format. -- * @param { number } userId - Indicates the id for the user. -+ * @param { int } userId - Indicates the id for the user. - * @returns { BundleInfo } Return the BundleInfo object. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -213,9 +230,10 @@ declare namespace defaultAppManager { - * @throws { BusinessError } 17700025 - The specified type is invalid. - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getDefaultApplicationSync(type: string, userId?: number): BundleInfo; -+ function getDefaultApplicationSync(type: string, userId?: int): BundleInfo; - - /** - * Set default application based on type. -@@ -223,7 +241,7 @@ declare namespace defaultAppManager { - * @permission ohos.permission.SET_DEFAULT_APPLICATION - * @param { string } type - Application type or a file type that conforms to media type format. - * @param { ElementName } elementName - Uniquely identifies an ability or extensionAbility. -- * @param { number } userId - Indicates the id for the user. -+ * @param { int } userId - Indicates the id for the user. - * @param { AsyncCallback } callback - The callback of setting default application result. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -234,10 +252,11 @@ declare namespace defaultAppManager { - * @throws { BusinessError } 17700028 - The specified ability does not match the type. - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setDefaultApplication(type: string, -- elementName: ElementName, userId: number, callback: AsyncCallback): void; -+ elementName: ElementName, userId: int, callback: AsyncCallback): void; - - /** - * Set default application based on type. -@@ -254,7 +273,8 @@ declare namespace defaultAppManager { - * @throws { BusinessError } 17700028 - The specified ability does not match the type. - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setDefaultApplication(type: string, elementName: ElementName, callback: AsyncCallback): void; - -@@ -264,7 +284,7 @@ declare namespace defaultAppManager { - * @permission ohos.permission.SET_DEFAULT_APPLICATION - * @param { string } type - Application type or a file type that conforms to media type format. - * @param { ElementName } elementName - Uniquely identifies an ability or extensionAbility. -- * @param { number } userId - Indicates the id for the user. -+ * @param { int } userId - Indicates the id for the user. - * @returns { Promise } The result of setting default application. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -275,9 +295,10 @@ declare namespace defaultAppManager { - * @throws { BusinessError } 17700028 - The specified ability does not match the type. - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function setDefaultApplication(type: string, elementName: ElementName, userId?: number): Promise; -+ function setDefaultApplication(type: string, elementName: ElementName, userId?: int): Promise; - - /** - * Set default application based on type. -@@ -285,7 +306,7 @@ declare namespace defaultAppManager { - * @permission ohos.permission.SET_DEFAULT_APPLICATION - * @param { string } type - Application type or a file type that conforms to media type format. - * @param { ElementName } elementName - Uniquely identifies an ability or extensionAbility. -- * @param { number } userId - Indicates the id for the user. -+ * @param { int } userId - Indicates the id for the user. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -@@ -295,16 +316,17 @@ declare namespace defaultAppManager { - * @throws { BusinessError } 17700028 - The specified ability does not match the type. - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function setDefaultApplicationSync(type: string, elementName: ElementName, userId?: number): void; -+ function setDefaultApplicationSync(type: string, elementName: ElementName, userId?: int): void; - - /** - * Reset default application based on type. - * - * @permission ohos.permission.SET_DEFAULT_APPLICATION - * @param { string } type - Application type or a file type that conforms to media type format. -- * @param { number } userId - Indicates the id for the user. -+ * @param { int } userId - Indicates the id for the user. - * @param { AsyncCallback } callback - The callback of resetting default application result. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -314,9 +336,10 @@ declare namespace defaultAppManager { - * @throws { BusinessError } 17700025 - The specified type is invalid. - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function resetDefaultApplication(type: string, userId: number, callback: AsyncCallback): void; -+ function resetDefaultApplication(type: string, userId: int, callback: AsyncCallback): void; - - /** - * Reset default application based on type. -@@ -331,7 +354,8 @@ declare namespace defaultAppManager { - * @throws { BusinessError } 17700025 - The specified type is invalid. - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function resetDefaultApplication(type: string, callback: AsyncCallback): void; - -@@ -340,7 +364,7 @@ declare namespace defaultAppManager { - * - * @permission ohos.permission.SET_DEFAULT_APPLICATION - * @param { string } type - Application type or a file type that conforms to media type format. -- * @param { number } userId - Indicates the id for the user. -+ * @param { int } userId - Indicates the id for the user. - * @returns { Promise } The result of resetting default application. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -350,16 +374,17 @@ declare namespace defaultAppManager { - * @throws { BusinessError } 17700025 - The specified type is invalid. - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function resetDefaultApplication(type: string, userId?: number): Promise; -+ function resetDefaultApplication(type: string, userId?: int): Promise; - - /** - * Reset default application based on type. - * - * @permission ohos.permission.SET_DEFAULT_APPLICATION - * @param { string } type - Application type or a file type that conforms to media type format. -- * @param { number } userId - Indicates the id for the user. -+ * @param { int } userId - Indicates the id for the user. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -@@ -368,9 +393,10 @@ declare namespace defaultAppManager { - * @throws { BusinessError } 17700025 - The specified type is invalid. - * @syscap SystemCapability.BundleManager.BundleFramework.DefaultApp - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function resetDefaultApplicationSync(type: string, userId?: number): void; -+ function resetDefaultApplicationSync(type: string, userId?: int): void; - } - - export default defaultAppManager; -diff --git a/api/@ohos.bundle.distributedBundleManager.d.ts b/api/@ohos.bundle.distributedBundleManager.d.ts -index bc13c960d..a85231f93 100644 ---- a/api/@ohos.bundle.distributedBundleManager.d.ts -+++ b/api/@ohos.bundle.distributedBundleManager.d.ts -@@ -28,7 +28,8 @@ import { RemoteAbilityInfo as _RemoteAbilityInfo } from './bundleManager/RemoteA - * @namespace distributedBundleManager - * @syscap SystemCapability.BundleManager.DistributedBundleFramework - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace distributedBundleManager { - /** -@@ -47,7 +48,8 @@ declare namespace distributedBundleManager { - * @throws { BusinessError } 17700027 - The distributed service is not running. - * @syscap SystemCapability.BundleManager.DistributedBundleFramework - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getRemoteAbilityInfo(elementName: ElementName, callback: AsyncCallback): void; - -@@ -67,7 +69,8 @@ declare namespace distributedBundleManager { - * @throws { BusinessError } 17700027 - The distributed service is not running. - * @syscap SystemCapability.BundleManager.DistributedBundleFramework - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getRemoteAbilityInfo(elementName: ElementName): Promise; - -@@ -87,7 +90,8 @@ declare namespace distributedBundleManager { - * @throws { BusinessError } 17700027 - The distributed service is not running. - * @syscap SystemCapability.BundleManager.DistributedBundleFramework - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getRemoteAbilityInfo(elementNames: Array, - callback: AsyncCallback>): void; -@@ -108,7 +112,8 @@ declare namespace distributedBundleManager { - * @throws { BusinessError } 17700027 - The distributed service is not running. - * @syscap SystemCapability.BundleManager.DistributedBundleFramework - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getRemoteAbilityInfo(elementNames: Array): Promise>; - -@@ -129,7 +134,8 @@ declare namespace distributedBundleManager { - * @throws { BusinessError } 17700027 - The distributed service is not running. - * @syscap SystemCapability.BundleManager.DistributedBundleFramework - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getRemoteAbilityInfo(elementName: ElementName, - locale: string, callback: AsyncCallback): void; -@@ -151,7 +157,8 @@ declare namespace distributedBundleManager { - * @throws { BusinessError } 17700027 - The distributed service is not running. - * @syscap SystemCapability.BundleManager.DistributedBundleFramework - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getRemoteAbilityInfo(elementName: ElementName, locale: string): Promise; - -@@ -172,7 +179,8 @@ declare namespace distributedBundleManager { - * @throws { BusinessError } 17700027 - The distributed service is not running. - * @syscap SystemCapability.BundleManager.DistributedBundleFramework - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getRemoteAbilityInfo(elementNames: Array, - locale: string, callback: AsyncCallback>): void; -@@ -194,7 +202,8 @@ declare namespace distributedBundleManager { - * @throws { BusinessError } 17700027 - The distributed service is not running. - * @syscap SystemCapability.BundleManager.DistributedBundleFramework - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getRemoteAbilityInfo(elementNames: Array, locale: string): Promise>; - -@@ -204,7 +213,8 @@ declare namespace distributedBundleManager { - * @typedef { _RemoteAbilityInfo } - * @syscap SystemCapability.BundleManager.DistributedBundleFramework - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export type RemoteAbilityInfo = _RemoteAbilityInfo; - } -diff --git a/api/@ohos.bundle.freeInstall.d.ts b/api/@ohos.bundle.freeInstall.d.ts -index 12a62c887..c1814b7b4 100644 ---- a/api/@ohos.bundle.freeInstall.d.ts -+++ b/api/@ohos.bundle.freeInstall.d.ts -@@ -43,7 +43,7 @@ declare namespace freeInstall { - /** - * Used to set the enumeration value of upgrading for free installation. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} -@@ -82,7 +82,7 @@ declare namespace freeInstall { - /** - * Used to query the enumeration value of bundlePackInfo. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.BundleFramework - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} -diff --git a/api/@ohos.bundle.installer.d.ts b/api/@ohos.bundle.installer.d.ts -index 4a42437b1..386909ce9 100644 ---- a/api/@ohos.bundle.installer.d.ts -+++ b/api/@ohos.bundle.installer.d.ts -@@ -1673,7 +1673,7 @@ declare namespace installer { - * @permission ohos.permission.INSTALL_CLONE_BUNDLE - * @param { string } bundleName - Indicates the path where the HAP of the application is stored. - * @param { CreateAppCloneParam } [createAppCloneParam] Indicates the optional params of create clone app. -- * @returns { Promise } Return the appIndex of the clone application. -+ * @returns { Promise } Return the appIndex of the clone application. - * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.INSTALL_CLONE_BUNDLE'. - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -@@ -1686,7 +1686,7 @@ declare namespace installer { - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- createAppClone(bundleName: string, createAppCloneParam?: CreateAppCloneParam): Promise; -+ createAppClone(bundleName: string, createAppCloneParam?: CreateAppCloneParam): Promise; - - /** - * Destroy clone instance for an application. -@@ -1734,12 +1734,11 @@ declare namespace installer { - * - * @permission ohos.permission.UNINSTALL_CLONE_BUNDLE - * @param { string } bundleName - Indicates the bundleName of clone app. -- * @param { number } appIndex - Indicates the clone application's index. -- * @param { number | DestroyAppCloneParam } [options] - Indicates other parameters required for the uninstallation. -+ * @param { int } appIndex - Indicates the clone application's index. -+ * @param { int | DestroyAppCloneParam } [options] - Indicates other parameters required for the uninstallation. - * @returns { Promise } - * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.UNINSTALL_CLONE_BUNDLE'. - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. - * @throws { BusinessError } 17700001 - The specified bundleName cannot be found or the bundle is not installed by the specified user. - * @throws { BusinessError } 17700004 - The userId is invalid. - * @throws { BusinessError } 17700061 - AppIndex not in valid range. -@@ -1749,7 +1748,7 @@ declare namespace installer { - * @since 20 - * @arkts 1.2 - */ -- destroyAppClone(bundleName: string, appIndex: number, options?: number | DestroyAppCloneParam): Promise; -+ destroyAppClone(bundleName: string, appIndex: int, options?: int | DestroyAppCloneParam): Promise; - - /** - * Install application by bundle name with specified user. -@@ -1773,8 +1772,8 @@ declare namespace installer { - * - * @permission ohos.permission.INSTALL_BUNDLE - * @param { string } bundleName - Indicates the bundle name of application. -- * @param { number } [userId] - userId Indicates the user ID. -- * @returns { Promise } -+ * @param { int } [userId] - userId Indicates the user ID. -+ * @returns { Promise } the promise returned by the function. - * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.INSTALL_BUNDLE'. - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -@@ -1788,7 +1787,7 @@ declare namespace installer { - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- installPreexistingApp(bundleName: string, userId?: number): Promise; -+ installPreexistingApp(bundleName: string, userId?: int): Promise; - - /** - * Install plugin for host application. -@@ -1797,7 +1796,7 @@ declare namespace installer { - * @param { string } hostBundleName - Indicates the bundle name of host application. - * @param { Array } pluginFilePaths - Indicates the file paths of plugin. - * @param { PluginParam } [pluginParam] - Indicates parameters required for install plugin. -- * @returns { Promise } -+ * @returns { Promise } the promise returned by the function. - * @throws { BusinessError } 201 - Calling interface without permission 'ohos.permission.INSTALL_PLUGIN_BUNDLE'. - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @throws { BusinessError } 17700001 - The specified hostBundleName cannot be found or the bundle is not installed by the specified user. -@@ -1806,6 +1805,7 @@ declare namespace installer { - * @throws { BusinessError } 17700011 - Failed to install the plugin because the plugin signature fails to be verified. - * @throws { BusinessError } 17700012 - Failed to install the plugin because the HSP path is invalid or the HSP is too large. - * @throws { BusinessError } 17700015 - Failed to install the plugin because they have different configuration information. -+ * @throws { BusinessError } 17700016 - Failed to install the plugin because of insufficient system disk space. - * @throws { BusinessError } 17700017 - Failed to install the plugin since the version of the plugin to install is too early. - * @throws { BusinessError } 17700048 - Failed to install the plugin because the code signature verification is failed. - * @throws { BusinessError } 17700052 - Failed to install the plugin because debug bundle cannot be installed under non-developer mode. -@@ -1989,24 +1989,24 @@ declare namespace installer { - /** - * Indicates the user id - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- userId?: number; -+ userId?: int; - - /** - * Indicates the installation type. The value 0x00 means normal installation, 0x01 means overwrite installation, and 0x10 means installation-free. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- installFlag?: number; -+ installFlag?: int; - - /** - * Indicates whether the param has data -@@ -2033,13 +2033,13 @@ declare namespace installer { - /** - * Indicates the deadline of the crowdtesting bundle - * -- * @type { ?number } -+ * @type { ?long } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- crowdtestDeadline?: number; -+ crowdtestDeadline?: long; - - /** - * Indicates the shared bundle dir paths. -@@ -2132,13 +2132,13 @@ declare namespace installer { - /** - * Indicates the shared version code. If default, indicates that all version sharing bundles are uninstalled - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- versionCode?: number; -+ versionCode?: int; - } - - /** -@@ -2154,23 +2154,23 @@ declare namespace installer { - /** - * Indicates the user id - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- userId?: number; -+ userId?: int; - /** - * Indicates the appIndex of MultiApp - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- appIndex?: number; -+ appIndex?: int; - } - - /** -@@ -2186,13 +2186,13 @@ declare namespace installer { - /** - * Indicates the user id - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi - * @since arkts {'1.1':'15', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- userId?: number; -+ userId?: int; - /** - * Indicates parameters. - * -@@ -2218,13 +2218,13 @@ declare namespace installer { - /** - * Indicates the user id. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- userId?: number; -+ userId?: int; - - /** - * Indicates parameters. -diff --git a/api/@ohos.bundle.launcherBundleManager.d.ts b/api/@ohos.bundle.launcherBundleManager.d.ts -index a58824451..962c25397 100644 ---- a/api/@ohos.bundle.launcherBundleManager.d.ts -+++ b/api/@ohos.bundle.launcherBundleManager.d.ts -@@ -21,9 +21,7 @@ - import { AsyncCallback } from './@ohos.base'; - import { LauncherAbilityInfo as _LauncherAbilityInfo } from './bundleManager/LauncherAbilityInfo'; - import { ShortcutInfo as _ShortcutInfo, ShortcutWant as _ShortcutWant, ParameterItem as _ParameterItem } from './bundleManager/ShortcutInfo'; --/*** if arkts 1.1 */ --import { StartOptions } from './@ohos.app.ability.StartOptions'; --/*** endif */ -+import StartOptions from './@ohos.app.ability.StartOptions'; - - /** - * Launcher bundle manager. -@@ -39,7 +37,7 @@ declare namespace launcherBundleManager { - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { string } bundleName - Indicates the application bundle name to be queried. -- * @param { number } userId - Indicates the id for the user. -+ * @param { int } userId - Indicates the id for the user. - * @param { AsyncCallback> } callback -The callback of the LauncherAbilityInfo object result. - * @throws { BusinessError } 201 - Verify permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -53,14 +51,14 @@ declare namespace launcherBundleManager { - * @arkts 1.1&1.2 - */ - function getLauncherAbilityInfo(bundleName: string, -- userId: number, callback: AsyncCallback>): void; -+ userId: int, callback: AsyncCallback>): void; - - /** - * Obtains launcher abilities info based on a given bundleName and userId. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { string } bundleName - Indicates the application bundle name to be queried. -- * @param { number } userId - Indicates the id for the user. -+ * @param { int } userId - Indicates the id for the user. - * @returns { Promise> } the LauncherAbilityInfo object. - * @throws { BusinessError } 201 - Verify permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -73,14 +71,14 @@ declare namespace launcherBundleManager { - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getLauncherAbilityInfo(bundleName: string, userId: number): Promise>; -+ function getLauncherAbilityInfo(bundleName: string, userId: int): Promise>; - - /** - * Obtains launcher abilities info based on a given bundleName and userId. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED - * @param { string } bundleName - Indicates the application bundle name to be queried. -- * @param { number } userId - Indicates the id for the user. -+ * @param { int } userId - Indicates the id for the user. - * @returns { Array } the LauncherAbilityInfo object. - * @throws { BusinessError } 201 - Verify permission denied. - * @throws { BusinessError } 801 - Capability not support. -@@ -90,13 +88,13 @@ declare namespace launcherBundleManager { - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getLauncherAbilityInfoSync(bundleName: string, userId: number): Array; -+ function getLauncherAbilityInfoSync(bundleName: string, userId: int): Array; - - /** - * Obtains launcher abilities info based on a given userId. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED -- * @param { number } userId - Indicates the id for the user. -+ * @param { int } userId - Indicates the id for the user. - * @param { AsyncCallback> } callback -The callback of the LauncherAbilityInfo object result. - * @throws { BusinessError } 201 - Verify permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -108,13 +106,13 @@ declare namespace launcherBundleManager { - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getAllLauncherAbilityInfo(userId: number, callback: AsyncCallback>): void; -+ function getAllLauncherAbilityInfo(userId: int, callback: AsyncCallback>): void; - - /** - * Obtains launcher abilities info based on a given userId. - * - * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED -- * @param { number } userId - Indicates the id for the user. -+ * @param { int } userId - Indicates the id for the user. - * @returns { Promise> } the LauncherAbilityInfo object. - * @throws { BusinessError } 201 - Verify permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -126,7 +124,7 @@ declare namespace launcherBundleManager { - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getAllLauncherAbilityInfo(userId: number): Promise>; -+ function getAllLauncherAbilityInfo(userId: int): Promise>; - - /** - * Obtains shortcut info based on a given bundleName. -@@ -186,9 +184,9 @@ declare namespace launcherBundleManager { - /** - * Obtains shortcut info based on bundleName and userId. - * -- * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED -+ * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED or ohos.permission.GET_BUNDLE_INFO - * @param { string } bundleName - Indicates the application bundle name to be queried. -- * @param { number } userId - Indicates the user ID. -+ * @param { int } userId - Indicates the user ID. - * @returns { Array } the LauncherShortcutInfo object. - * @throws { BusinessError } 201 - Verify permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -201,7 +199,7 @@ declare namespace launcherBundleManager { - * @since arkts {'1.1':'13', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getShortcutInfoSync(bundleName: string, userId: number): Array; -+ function getShortcutInfoSync(bundleName: string, userId: int): Array; - - /** - * Starts shortcut. -@@ -217,28 +215,11 @@ declare namespace launcherBundleManager { - * @throws { BusinessError } 17700065 - The specified shortcut want in shortcut info is not supported to be started. - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function startShortcut(shortcutInfo: ShortcutInfo, options?: StartOptions): Promise; - -- /** -- * Starts shortcut. -- * -- * @permission ohos.permission.START_SHORTCUT -- * @param { ShortcutInfo } shortcutInfo - Indicates the shortcut info which contains shortcut want. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 201 - Verify permission denied. -- * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. -- * @throws { BusinessError } 801 - Capability not support. -- * @throws { BusinessError } 17700065 - The specified shortcut want in shortcut info is not supported to be started. -- * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -- * @systemapi -- * @since 20 -- * @arkts 1.2 -- */ -- function startShortcut(shortcutInfo: ShortcutInfo): Promise; -- - /** - * Contains basic launcher Ability information, which uniquely identifies an LauncherAbilityInfo. - * -@@ -255,7 +236,14 @@ declare namespace launcherBundleManager { - * @typedef { _ShortcutInfo } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'9', '1.2':'20'} -+ * @since 9 -+ */ -+ /** -+ * Provides information about a shortcut, including the shortcut ID and label. -+ * -+ * @typedef { _ShortcutInfo } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - export type ShortcutInfo = _ShortcutInfo; -@@ -265,7 +253,14 @@ declare namespace launcherBundleManager { - * @typedef { _ShortcutWant } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'9', '1.2':'20'} -+ * @since 9 -+ */ -+ /** -+ * Obtains information about the ability that a shortcut will start. -+ * -+ * @typedef { _ShortcutWant } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - export type ShortcutWant = _ShortcutWant; -@@ -275,7 +270,14 @@ declare namespace launcherBundleManager { - * @typedef { _ParameterItem } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Indicates the custom parameters in shortcut want. -+ * -+ * @typedef { _ParameterItem } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - export type ParameterItem = _ParameterItem; -diff --git a/api/@ohos.bundle.shortcutManager.d.ts b/api/@ohos.bundle.shortcutManager.d.ts -index df987404e..e4dc6ea6d 100644 ---- a/api/@ohos.bundle.shortcutManager.d.ts -+++ b/api/@ohos.bundle.shortcutManager.d.ts -@@ -26,7 +26,14 @@ import { ShortcutInfo as _ShortcutInfo, ShortcutWant as _ShortcutWant, Parameter - * @namespace shortcutManager - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+/** -+ * Desktop shortcut bundle manager. -+ * -+ * @namespace shortcutManager -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - declare namespace shortcutManager { -@@ -35,7 +42,7 @@ declare namespace shortcutManager { - * - * @permission ohos.permission.MANAGE_SHORTCUTS - * @param { ShortcutInfo } shortcutInfo - Indicates the shortcut info which contains shortcut want. -- * @param { number } userId - Indicates the id for the user. -+ * @param { int } userId - Indicates the id for the user. - * @returns { Promise } the promise returned by the function. - * @throws { BusinessError } 201 - Verify permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -50,14 +57,14 @@ declare namespace shortcutManager { - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function addDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: number): Promise; -+ function addDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: int): Promise; - - /** - * Delete desktop shortcut info. - * - * @permission ohos.permission.MANAGE_SHORTCUTS - * @param { ShortcutInfo } shortcutInfo - Indicates the shortcut info which contains shortcut want. -- * @param { number } userId - Indicates the id for the user. -+ * @param { int } userId - Indicates the id for the user. - * @returns { Promise } the promise returned by the function. - * @throws { BusinessError } 201 - Verify permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -68,13 +75,13 @@ declare namespace shortcutManager { - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function deleteDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: number): Promise; -+ function deleteDesktopShortcutInfo(shortcutInfo: ShortcutInfo, userId: int): Promise; - - /** - * Get all desktop shortcut info. - * - * @permission ohos.permission.MANAGE_SHORTCUTS -- * @param { number } userId - Indicates the id for the user. -+ * @param { int } userId - Indicates the id for the user. - * @returns { Promise> } the LauncherShortcutInfo object. - * @throws { BusinessError } 201 - Verify permission denied. - * @throws { BusinessError } 202 - Permission denied, non-system app called system api. -@@ -85,7 +92,7 @@ declare namespace shortcutManager { - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getAllDesktopShortcutInfo(userId: number): Promise>; -+ function getAllDesktopShortcutInfo(userId: int): Promise>; - - /** - * Provides information about a shortcut, including the shortcut ID and label. -@@ -93,7 +100,14 @@ declare namespace shortcutManager { - * @typedef { _ShortcutInfo } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Provides information about a shortcut, including the shortcut ID and label. -+ * -+ * @typedef { _ShortcutInfo } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - export type ShortcutInfo = _ShortcutInfo; -@@ -103,7 +117,14 @@ declare namespace shortcutManager { - * @typedef { _ShortcutWant } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Obtains information about the ability that a shortcut will start. -+ * -+ * @typedef { _ShortcutWant } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - export type ShortcutWant = _ShortcutWant; -@@ -113,7 +134,14 @@ declare namespace shortcutManager { - * @typedef { _ParameterItem } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Indicates the custom parameters in shortcut want. -+ * -+ * @typedef { _ParameterItem } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - export type ParameterItem = _ParameterItem; -diff --git a/api/@ohos.charger.d.ts b/api/@ohos.charger.d.ts -index 215a92866..1c8ecd419 100644 ---- a/api/@ohos.charger.d.ts -+++ b/api/@ohos.charger.d.ts -@@ -32,7 +32,7 @@ declare namespace charger { - /** - * Indicates the type of the charger plugged-in. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.PowerManager.BatteryManager.Core - * @systemapi - * @since arkts {'1.1':'10', '1.2':'20'} -diff --git a/api/@ohos.cooperate.d.ets b/api/@ohos.cooperate.d.ets -deleted file mode 100644 -index 09ffd038e..000000000 ---- a/api/@ohos.cooperate.d.ets -+++ /dev/null -@@ -1,724 +0,0 @@ --/* -- * Copyright (c) 2023-2024 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --/** -- * @file -- * @kit DistributedServiceKit -- */ -- --import { AsyncCallback } from './@ohos.base'; --import { Callback } from './@ohos.base'; -- --/** -- * Implements screen hopping operation management. -- * -- * @namespace cooperate -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- */ --declare namespace cooperate { -- /** -- * Enumerates screen hopping message notifications. -- * -- * @enum { number } -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- * @deprecated since 11 -- * @useinstead cooperate#CooperateState -- */ -- enum CooperateMsg { -- /** -- * Preparing for screen hopping. -- * -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- * @deprecated since 11 -- * @useinstead cooperate.CooperateState#COOPERATE_PREPARE -- */ -- COOPERATE_PREPARE = 0, -- -- /** -- * Canceling the preparation for screen hopping. -- * -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- * @deprecated since 11 -- * @useinstead cooperate.CooperateState#COOPERATE_UNPREPARE -- */ -- COOPERATE_UNPREPARE = 1, -- -- /** -- * Starting screen hopping. -- * -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- * @deprecated since 11 -- * @useinstead cooperate.CooperateState#COOPERATE_ACTIVATE -- */ -- COOPERATE_ACTIVATE = 2, -- -- /** -- * Success in starting screen hopping. -- * -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- * @deprecated since 11 -- * @useinstead cooperate.CooperateState#COOPERATE_ACTIVATE_SUCCESS -- */ -- COOPERATE_ACTIVATE_SUCCESS = 3, -- -- /** -- * Failure to start screen hopping. -- * -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- * @deprecated since 11 -- * @useinstead cooperate.CooperateState#COOPERATE_ACTIVATE_FAILURE -- */ -- COOPERATE_ACTIVATE_FAIL = 4, -- -- /** -- * Success in stopping screen hopping. -- * -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- * @deprecated since 11 -- * @useinstead cooperate.CooperateState#COOPERATE_DEACTIVATE_SUCCESS -- */ -- COOPERATE_DEACTIVATE_SUCCESS = 5, -- -- /** -- * Failure to stop screen hopping. -- * -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- * @deprecated since 11 -- * @useinstead cooperate.CooperateState#COOPERATE_DEACTIVATE_FAILURE -- */ -- COOPERATE_DEACTIVATE_FAIL = 6, -- -- /** -- * Inter-device session disconnected. -- * -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- * @deprecated since 11 -- * @useinstead cooperate.CooperateState#COOPERATE_SESSION_DISCONNECTED -- */ -- COOPERATE_SESSION_DISCONNECTED = 7, -- } -- -- /** -- * Enumerates the screen hopping states. -- * -- * @enum { number } -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- enum CooperateState { -- /** -- * Preparing for screen hopping. -- * -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- COOPERATE_PREPARE = 0, -- -- /** -- * Canceling the preparation for screen hopping. -- * -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- COOPERATE_UNPREPARE = 1, -- -- /** -- * Starting screen hopping. -- * -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- COOPERATE_ACTIVATE = 2, -- -- /** -- * Success in starting screen hopping. -- * -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- COOPERATE_ACTIVATE_SUCCESS = 3, -- -- /** -- * Failure to start screen hopping. -- * -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- COOPERATE_ACTIVATE_FAILURE = 4, -- -- /** -- * Success in stopping screen hopping. -- * -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- COOPERATE_DEACTIVATE_SUCCESS = 5, -- -- /** -- * Failure to stop screen hopping. -- * -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- COOPERATE_DEACTIVATE_FAILURE = 6, -- -- /** -- * Inter-device session disconnected. -- * -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- COOPERATE_SESSION_DISCONNECTED = 7, -- } -- -- /** -- * Defines a screen hopping message. -- * -- * @interface CooperateMessage -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- interface CooperateMessage { -- /** -- * Descriptor of the target device for screen hopping. -- * -- * @type { string } -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- networkId: string; -- -- /** -- * Screen hopping state. -- * -- * @type { CooperateState } -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- state: CooperateState; -- } -- -- /** -- * MouseLocation -- * -- * @typedef MouseLocation -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 12 -- */ -- interface MouseLocation { -- /** -- * The mouse pointer is located at the X coordinate on the screen. -- * -- * @type { number } -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 12 -- */ -- displayX: number; -- -- /** -- * The mouse pointer is located at the Y coordinate on the screen. -- * -- * @type { number } -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 12 -- */ -- displayY: number; -- -- /** -- * Screen width. -- * -- * @type { number } -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 12 -- */ -- displayWidth: number; -- -- /** -- * Screen height. -- * -- * @type { number } -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 12 -- */ -- displayHeight: number; -- } -- -- /** -- * Prepares for screen hopping. -- * -- * @param { AsyncCallback } callback Asynchronous callback used to return the operation result. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- * @deprecated since 11 -- * @useinstead cooperate#prepareCooperate -- */ -- function prepare(callback: AsyncCallback): void; -- -- /** -- * Prepares for screen hopping. -- * -- * @returns { Promise } the promise returned by the function. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error.Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- * @deprecated since 11 -- * @useinstead cooperate#prepareCooperate -- */ -- function prepare(): Promise; -- -- /** -- * Prepares for screen hopping. -- * -- * @permission ohos.permission.COOPERATE_MANAGER -- * @param { AsyncCallback } callback - Asynchronous callback used to return the operation result. -- * @throws {BusinessError} 201 - Permission denied. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- function prepareCooperate(callback: AsyncCallback): void; -- -- /** -- * Prepares for screen hopping. -- * -- * @permission ohos.permission.COOPERATE_MANAGER -- * @returns { Promise } the promise returned by the function. -- * @throws {BusinessError} 201 - Permission denied. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- function prepareCooperate(): Promise; -- -- /** -- * Cancels the preparation for screen hopping. -- * -- * @param { AsyncCallback } callback Asynchronous callback used to return the operation result. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- * @deprecated since 11 -- * @useinstead cooperate#unprepareCooperate -- */ -- function unprepare(callback: AsyncCallback): void; -- -- /** -- * Cancels the preparation for screen hopping. -- * -- * @returns { Promise } the promise returned by the function. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- * @deprecated since 11 -- * @useinstead cooperate#unprepareCooperate -- */ -- function unprepare(): Promise; -- -- /** -- * Cancels the preparation for screen hopping. -- * -- * @permission ohos.permission.COOPERATE_MANAGER -- * @param { AsyncCallback } callback - Asynchronous callback used to return the operation result. -- * @throws {BusinessError} 201 - Permission denied. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- function unprepareCooperate(callback: AsyncCallback): void; -- -- /** -- * Cancels the preparation for screen hopping. -- * -- * @permission ohos.permission.COOPERATE_MANAGER -- * @returns { Promise } the promise returned by the function. -- * @throws {BusinessError} 201 - Permission denied. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- function unprepareCooperate(): Promise; -- -- /** -- * Starts screen hopping. -- * -- * @param { string } targetNetworkId Descriptor of the target device for screen hopping. -- * @param { number } inputDeviceId Identifier of the input device for screen hopping. -- * @param { AsyncCallback } callback Asynchronous callback used to return the operation result. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @throws {BusinessError} 20900001 - Operation failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- * @deprecated since 11 -- * @useinstead cooperate#activateCooperate -- */ -- function activate(targetNetworkId: string, inputDeviceId: number, callback: AsyncCallback): void; -- -- /** -- * Starts screen hopping. -- * -- * @param { string } targetNetworkId Descriptor of the target device for screen hopping. -- * @param { number }inputDeviceId Identifier of the input device for screen hopping. -- * @returns { Promise } the promise returned by the function. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @throws {BusinessError} 20900001 - Operation failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- * @deprecated since 11 -- * @useinstead cooperate#activateCooperate -- */ -- function activate(targetNetworkId: string, inputDeviceId: number): Promise; -- -- /** -- * Starts screen hopping. -- * -- * @permission ohos.permission.COOPERATE_MANAGER -- * @param { string } targetNetworkId - Descriptor of the target device for screen hopping. -- * @param { number } inputDeviceId - Identifier of the input device for screen hopping. -- * @param { AsyncCallback } callback - Asynchronous callback used to return the operation result. -- * @throws {BusinessError} 201 - Permission denied. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @throws {BusinessError} 20900001 - Operation failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- function activateCooperate(targetNetworkId: string, inputDeviceId: number, callback: AsyncCallback): void; -- -- /** -- * Starts screen hopping. -- * -- * @permission ohos.permission.COOPERATE_MANAGER -- * @param { string } targetNetworkId - Descriptor of the target device for screen hopping. -- * @param { number }inputDeviceId - Identifier of the input device for screen hopping. -- * @returns { Promise } the promise returned by the function. -- * @throws {BusinessError} 201 - Permission denied. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @throws {BusinessError} 20900001 - Operation failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- function activateCooperate(targetNetworkId: string, inputDeviceId: number): Promise; -- -- /** -- * Stops screen hopping. -- * -- * @param { boolean } isUnchained Whether the cross-device link is unchained. -- * @param { AsyncCallback } callback Asynchronous callback used to return the operation result. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- * @deprecated since 11 -- * @useinstead cooperate#deactivateCooperate -- */ -- function deactivate(isUnchained: boolean, callback: AsyncCallback): void; -- -- /** -- * Stops screen hopping. -- * -- * @param { boolean } isUnchained Whether the cross-device link is unchained. -- * @returns { Promise } the promise returned by the function. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- * @deprecated since 11 -- * @useinstead cooperate#deactivateCooperate -- */ -- function deactivate(isUnchained: boolean): Promise; -- -- /** -- * Stops screen hopping. -- * -- * @permission ohos.permission.COOPERATE_MANAGER -- * @param { boolean } isUnchained - Whether the cross-device link is unchained. -- * @param { AsyncCallback } callback - Asynchronous callback used to return the operation result. -- * @throws {BusinessError} 201 - Permission denied. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- function deactivateCooperate(isUnchained: boolean, callback: AsyncCallback): void; -- -- /** -- * Stops screen hopping. -- * -- * @permission ohos.permission.COOPERATE_MANAGER -- * @param { boolean } isUnchained - Whether the cross-device link is unchained. -- * @returns { Promise } the promise returned by the function. -- * @throws {BusinessError} 201 - Permission denied. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- function deactivateCooperate(isUnchained: boolean): Promise; -- -- /** -- * Obtains the screen hopping status. -- * -- * @param { string } networkId Descriptor of the target device for screen hopping. -- * @param { AsyncCallback } callback Asynchronous callback used to return the screen hopping status. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- * @deprecated since 11 -- * @useinstead cooperate#getCooperateSwitchState -- */ -- function getCrossingSwitchState(networkId: string, callback: AsyncCallback): void; -- -- /** -- * Obtains the status of the screen hopping switch. -- * -- * @param { string } networkId Descriptor of the target device for screen hopping. -- * @returns { Promise } Returns {@code true} the screen hopping status; -- * returns {@code false} otherwise. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- * @deprecated since 11 -- * @useinstead cooperate#getCooperateSwitchState -- */ -- function getCrossingSwitchState(networkId: string): Promise; -- -- -- /** -- * Obtains the screen hopping status. -- * -- * @permission ohos.permission.COOPERATE_MANAGER -- * @param { string } networkId - Descriptor of the target device for screen hopping. -- * @param { AsyncCallback } callback - Asynchronous callback used to return the screen hopping status. -- * @throws {BusinessError} 201 - Permission denied. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- function getCooperateSwitchState(networkId: string, callback: AsyncCallback): void; -- -- /** -- * Obtains the status of the screen hopping switch. -- * -- * @permission ohos.permission.COOPERATE_MANAGER -- * @param { string } networkId - Descriptor of the target device for screen hopping. -- * @returns { Promise } Returns {@code true} the screen hopping status; -- * returns {@code false} otherwise. -- * @throws {BusinessError} 201 - Permission denied. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- function getCooperateSwitchState(networkId: string): Promise; -- -- /** -- * Enables listening for screen hopping status change events. -- * -- * @param { 'cooperate' } type Change type. -- * @param { Callback<{ networkId: string, msg: CooperateMsg }> } callback Asynchronous callback used to -- *
    return the screen hopping status change event. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- * @deprecated since 11 -- * @useinstead cooperate#on -- */ -- interface CooperateEvent { -- networkId: string; -- msg: CooperateMsg; -- } -- type Callback = (data: T) => void; -- -- function on(type: 'cooperate', callback: Callback): void; -- -- /** -- * Disables listening for screen hopping status change events. -- * -- * @param { 'cooperate' } type Change type. -- * @param { Callback } callback Callback for which listening -- *
    is disabled. If this parameter is not specified, listening will be disabled for all registered callbacks. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 10 -- * @deprecated since 11 -- * @useinstead cooperate#on -- */ -- function off(type: 'cooperate', callback?: Callback): void; -- -- /** -- * Enables listening for screen hopping status change events. -- * -- * @permission ohos.permission.COOPERATE_MANAGER -- * @param { 'cooperateMessage' } type - Change type. -- * @param { Callback } callback - Asynchronous callback used to -- *
    return the screen hopping status change event. -- * @throws {BusinessError} 201 - Permission denied. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- function on(type: 'cooperateMessage', callback: Callback): void; -- -- /** -- * Disables listening for screen hopping status change events. -- * -- * @permission ohos.permission.COOPERATE_MANAGER -- * @param { 'cooperateMessage' } type - Change type. -- * @param { Callback } [callback] - Callback for which listening -- *
    is disabled. If this parameter is not specified, listening will be disabled for all registered callbacks. -- * @throws {BusinessError} 201 - Permission denied. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes:1.Incorrect parameter types.2.Parameter -- *
    verification failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 11 -- */ -- function off(type: 'cooperateMessage', callback?: Callback): void; -- -- /** -- * Enables listening for mouse pointer position information on the specified device. -- * -- * @permission ohos.permission.COOPERATE_MANAGER -- * @param { 'cooperateMouse' } type - Event type, which is **cooperateMouse**. -- * @param { string } networkId - Specified device. -- * @param { Callback } callback - Callback for receiving reported events. -- * @throws {BusinessError} 201 - Permission denied. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 12 -- */ -- function on(type: 'cooperateMouse', networkId: string, callback: Callback): void; -- -- /** -- * Disables listening for mouse pointer position information on the specified device. -- * -- * @permission ohos.permission.COOPERATE_MANAGER -- * @param { 'cooperateMouse' } type - Event type, which is **cooperateMouse**. -- * @param { string } networkId - Specified device. -- * @param { Callback } [callback] - Callback for receiving reported events. -- *
    If no callback is specified, listening will be disabled for all **cooperateMouse** events of the device -- * specified by **networkId**. -- * @throws {BusinessError} 201 - Permission denied. -- * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -- *
    2.Incorrect parameter types.3.Parameter verification failed. -- * @syscap SystemCapability.Msdp.DeviceStatus.Cooperate -- * @systemapi Hide this for inner system use. -- * @since 12 -- */ -- function off(type: 'cooperateMouse', networkId: string, callback?: Callback): void; -- --} -- --export default cooperate; -diff --git a/api/@ohos.curves.d.ts b/api/@ohos.curves.d.ts -index 54fd46f76..e0f9054ed 100644 ---- a/api/@ohos.curves.d.ts -+++ b/api/@ohos.curves.d.ts -@@ -40,7 +40,17 @@ - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -+ * @since 11 -+ */ -+/** -+ * Contains interpolator functions such as initialization, third-order Bezier curves, and spring curves. -+ * -+ * @namespace curves -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - declare namespace curves { -@@ -66,10 +76,20 @@ declare namespace curves { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * enum Curve. -+ * -+ * @enum { number } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ -- enum Curve { -+ export enum Curve { - /** - * Linear. Indicates that the animation has the same velocity from start to finish. - * -@@ -89,7 +109,16 @@ declare namespace curves { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Linear. Indicates that the animation has the same velocity from start to finish. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - Linear, -@@ -115,7 +144,17 @@ declare namespace curves { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Ease. Indicates that the animation starts at a low speed, then speeds up, and slows down before the end, -+ * CubicBezier(0.25, 0.1, 0.25, 1.0). -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - Ease, -@@ -138,7 +177,16 @@ declare namespace curves { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * EaseIn. Indicates that the animation starts at a low speed, Cubic Bezier (0.42, 0.0, 1.0, 1.0). -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - EaseIn, -@@ -161,7 +209,16 @@ declare namespace curves { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * EaseOut. Indicates that the animation ends at low speed, CubicBezier (0.0, 0.0, 0.58, 1.0). -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - EaseOut, -@@ -184,7 +241,16 @@ declare namespace curves { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * EaseInOut. Indicates that the animation starts and ends at low speed, CubicBezier (0.42, 0.0, 0.58, 1.0). -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - EaseInOut, -@@ -207,7 +273,16 @@ declare namespace curves { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * FastOutSlowIn. Standard curve, cubic-bezier (0.4, 0.0, 0.2, 1.0). -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - FastOutSlowIn, -@@ -230,7 +305,16 @@ declare namespace curves { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * LinearOutSlowIn. Deceleration curve, cubic-bezier (0.0, 0.0, 0.2, 1.0). -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - LinearOutSlowIn, -@@ -253,7 +337,16 @@ declare namespace curves { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * FastOutLinearIn. Acceleration curve, cubic-bezier (0.4, 0.0, 1.0, 1.0). -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - FastOutLinearIn, -@@ -276,7 +369,16 @@ declare namespace curves { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * ExtremeDeceleration. Abrupt curve, cubic-bezier (0.0, 0.0, 0.0, 1.0). -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - ExtremeDeceleration, -@@ -299,7 +401,16 @@ declare namespace curves { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Sharp. Sharp curves, cubic-bezier (0.33, 0.0, 0.67, 1.0). -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - Sharp, -@@ -322,7 +433,16 @@ declare namespace curves { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Rhythm. Rhythmic curve, cubic-bezier (0.7, 0.0, 0.2, 1.0). -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - Rhythm, -@@ -345,7 +465,16 @@ declare namespace curves { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Smooth. Smooth curves, cubic-bezier (0.4, 0.0, 0.4, 1.0). -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - Smooth, -@@ -368,7 +497,16 @@ declare namespace curves { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Friction. Damping curves, CubicBezier (0.2, 0.0, 0.2, 1.0). -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - Friction, -@@ -396,10 +534,20 @@ declare namespace curves { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Interface for curve object. -+ * -+ * @interface ICurve -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ -- interface ICurve { -+ export interface ICurve { - /** - * Get curve value by fraction. - * -@@ -428,7 +576,19 @@ declare namespace curves { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Get curve value by fraction. -+ * -+ * @param { number } fraction -Indicates the current normalized time parameter. Value range: [0, 1]. -+ * Note: If the value is less than 0, it will be processed as 0. If the value is greater than 1, 1 is used. -+ * @returns { number } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - interpolate(fraction: number): number; -@@ -462,7 +622,7 @@ declare namespace curves { - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- function initCurve(curve?: Curve): ICurve; -+ export function initCurve(curve?: Curve): ICurve; - - /** - * Initializes the interpolator curve when called. -@@ -507,7 +667,7 @@ declare namespace curves { - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- function stepsCurve(count: number, end: boolean): ICurve; -+ export function stepsCurve(count: number, end: boolean): ICurve; - - /** - * Constructs a custom curve when called. -@@ -529,7 +689,7 @@ declare namespace curves { - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- function customCurve(interpolate: (fraction: number) => number): ICurve; -+ export function customCurve(interpolate: (fraction: number) => number): ICurve; - - /** - * Constructs a step curve when called. -@@ -586,7 +746,7 @@ declare namespace curves { - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- function cubicBezierCurve(x1: number, y1: number, x2: number, y2: number): ICurve; -+ export function cubicBezierCurve(x1: number, y1: number, x2: number, y2: number): ICurve; - - /** - * Constructs a third-order Bezier curve when called. -@@ -642,7 +802,7 @@ declare namespace curves { - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- function springCurve(velocity: number, mass: number, stiffness: number, damping: number): ICurve; -+ export function springCurve(velocity: number, mass: number, stiffness: number, damping: number): ICurve; - - /** - * Constructs a spring curve when called. -@@ -704,7 +864,7 @@ declare namespace curves { - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- function springMotion(response?: number, dampingFraction?: number, overlapDuration?: number): ICurve; -+ export function springMotion(response?: number, dampingFraction?: number, overlapDuration?: number): ICurve; - - /** - * Constructs a responsive spring motion when called. -@@ -750,7 +910,7 @@ declare namespace curves { - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- function responsiveSpringMotion(response?: number, dampingFraction?: number, overlapDuration?: number): ICurve; -+ export function responsiveSpringMotion(response?: number, dampingFraction?: number, overlapDuration?: number): ICurve; - - /** - * Constructs an interpolating spring curve when called, the animation duration can not be specified manually, -@@ -790,7 +950,7 @@ declare namespace curves { - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- function interpolatingSpring(velocity: number, mass: number, stiffness: number, damping: number): ICurve; -+ export function interpolatingSpring(velocity: number, mass: number, stiffness: number, damping: number): ICurve; - } - - export default curves; -diff --git a/api/@ohos.data.DataShareResultSet.d.ts b/api/@ohos.data.DataShareResultSet.d.ts -index e49354024..e6778af93 100644 ---- a/api/@ohos.data.DataShareResultSet.d.ts -+++ b/api/@ohos.data.DataShareResultSet.d.ts -@@ -161,7 +161,8 @@ export default interface DataShareResultSet { - * @syscap SystemCapability.DistributedDataManager.DataShare.Core - * @systemapi - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - goToLastRow(): boolean; - -@@ -173,7 +174,8 @@ export default interface DataShareResultSet { - * @syscap SystemCapability.DistributedDataManager.DataShare.Core - * @systemapi - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - goToNextRow(): boolean; - -@@ -254,7 +256,8 @@ export default interface DataShareResultSet { - * @syscap SystemCapability.DistributedDataManager.DataShare.Core - * @systemapi - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getLong(columnIndex: number): number; - -diff --git a/api/@ohos.data.dataShare.d.ts b/api/@ohos.data.dataShare.d.ts -index e7136c1f1..76ea197d7 100644 ---- a/api/@ohos.data.dataShare.d.ts -+++ b/api/@ohos.data.dataShare.d.ts -@@ -67,7 +67,8 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - waitTime?: number; - } -@@ -272,8 +273,8 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since arkts {'1.1':'10', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface RdbDataChangeNode { - /** -@@ -320,8 +321,8 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since arkts {'1.1':'10', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PublishedDataChangeNode { - /** -@@ -454,8 +455,7 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - interface UpdateOperation { - /** -@@ -465,8 +465,7 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - values: ValuesBucket; - -@@ -477,8 +476,7 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - predicates: dataSharePredicates.DataSharePredicates; - } -@@ -730,7 +728,8 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - addTemplate(uri: string, subscriberId: string, template: Template): void; - -@@ -760,7 +759,8 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - delTemplate(uri: string, subscriberId: string): void; - -@@ -794,7 +794,8 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on( - type: 'rdbDataChange', -@@ -833,7 +834,8 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off( - type: 'rdbDataChange', -@@ -872,7 +874,8 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on( - type: 'publishedDataChange', -@@ -911,7 +914,8 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off( - type: 'publishedDataChange', -@@ -950,7 +954,8 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - publish( - data: Array, -@@ -987,7 +992,8 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - publish( - data: Array, -@@ -1025,7 +1031,8 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - publish(data: Array, bundleName: string, version?: number): Promise>; - -@@ -1117,7 +1124,8 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - insert(uri: string, value: ValuesBucket, callback: AsyncCallback): void; - -@@ -1149,7 +1157,8 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - insert(uri: string, value: ValuesBucket): Promise; - -@@ -1181,7 +1190,8 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - delete(uri: string, predicates: dataSharePredicates.DataSharePredicates, callback: AsyncCallback): void; - -@@ -1213,7 +1223,8 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - delete(uri: string, predicates: dataSharePredicates.DataSharePredicates): Promise; - -@@ -1418,7 +1429,8 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - batchInsert(uri: string, values: Array, callback: AsyncCallback): void; - -@@ -1448,7 +1460,8 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - batchInsert(uri: string, values: Array): Promise; - -@@ -1660,7 +1673,8 @@ declare namespace dataShare { - * @syscap SystemCapability.DistributedDataManager.DataShare.Consumer - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - close(): Promise; - } -diff --git a/api/@ohos.data.dataSharePredicates.d.ts b/api/@ohos.data.dataSharePredicates.d.ts -index 1c681b680..ce6158b83 100644 ---- a/api/@ohos.data.dataSharePredicates.d.ts -+++ b/api/@ohos.data.dataSharePredicates.d.ts -@@ -217,7 +217,8 @@ declare namespace dataSharePredicates { - * @syscap SystemCapability.DistributedDataManager.DataShare.Core - * @systemapi - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isNull(field: string): DataSharePredicates; - -@@ -230,7 +231,8 @@ declare namespace dataSharePredicates { - * @syscap SystemCapability.DistributedDataManager.DataShare.Core - * @systemapi - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isNotNull(field: string): DataSharePredicates; - -@@ -292,7 +294,8 @@ declare namespace dataSharePredicates { - * @syscap SystemCapability.DistributedDataManager.DataShare.Core - * @systemapi - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - between(field: string, low: ValueType, high: ValueType): DataSharePredicates; - -@@ -362,7 +365,8 @@ declare namespace dataSharePredicates { - * @syscap SystemCapability.DistributedDataManager.DataShare.Core - * @systemapi - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - lessThanOrEqualTo(field: string, value: ValueType): DataSharePredicates; - -diff --git a/api/@ohos.data.distributedKVStore.d.ets b/api/@ohos.data.distributedKVStore.d.ets -deleted file mode 100644 -index 6c459e422..000000000 ---- a/api/@ohos.data.distributedKVStore.d.ets -+++ /dev/null -@@ -1,3150 +0,0 @@ --/* -- * Copyright (c) 2022 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --/** -- * @file -- * @kit ArkData -- */ -- --import { AsyncCallback, Callback } from './@ohos.base'; --import { ValuesBucket } from './@ohos.data.ValuesBucket'; --import dataSharePredicates from './@ohos.data.dataSharePredicates'; --import BaseContext from './application/BaseContext'; -- --/** -- * Provider interfaces to create a {@link KVManager} instance. -- * -- * @namespace distributedKVStore -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ --declare namespace distributedKVStore { -- /** -- * Provides configuration information to create a {@link KVManager} instance, -- * which includes the caller's package name and ability or hap context. -- * -- * @interface KVManagerConfig -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- export interface KVManagerConfig { -- /** -- * Indicates the bundleName -- * -- * @type { string } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- bundleName: string; -- -- /** -- * Indicates the ability or hap context -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * if swap the area, you should close all the KV store and use the new Context to create the KVManager -- * @since 9 -- */ -- /** -- * Indicates the ability or hap context -- * -- * @type { BaseContext } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * if swap the area, you should close all the KV store and use the new BaseContext to create the KVManager -- * @since 10 -- */ -- context: BaseContext; -- } -- -- /** -- * KVStore constants -- * -- * @interface Constants -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- export interface Constants { -- /** -- * Max key length is 1024. -- * -- * @type { number } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- readonly MAX_KEY_LENGTH: number; -- -- /** -- * Max value length is 4194303. -- * -- * @type { number } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- readonly MAX_VALUE_LENGTH: number; -- -- /** -- * Max device coordinate key length is 896. -- * -- * @type { number } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- readonly MAX_KEY_LENGTH_DEVICE: number; -- -- /** -- * Max store id length is 128. -- * -- * @type { number } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- readonly MAX_STORE_ID_LENGTH: number; -- -- /** -- * Max query length is 512000. -- * -- * @type { number } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- readonly MAX_QUERY_LENGTH: number; -- -- /** -- * Max batch operation size is 128. -- * -- * @type { number } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- readonly MAX_BATCH_SIZE: number; -- } -- -- /** -- * Indicates the {@code ValueType}. -- *

    {@code ValueType} is obtained based on the value. -- * -- * @enum { number } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- export enum ValueType { -- /** -- * Indicates that the value type is string. -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- STRING, -- -- /** -- * Indicates that the value type is int. -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- INTEGER, -- -- /** -- * Indicates that the value type is float. -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- FLOAT, -- -- /** -- * Indicates that the value type is byte array. -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- BYTE_ARRAY, -- -- /** -- * Indicates that the value type is boolean. -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- BOOLEAN, -- -- /** -- * Indicates that the value type is double. -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- DOUBLE -- } -- -- /** -- * Obtains {@code Value} objects stored in a {@link SingleKVStore} or {@link DeviceKVStore} database. -- * -- * @interface Value -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- export interface Value { -- /** -- * Indicates the value type -- * -- * @type { ValueType } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- * @see ValueType -- */ -- type: ValueType; -- -- /** -- * Indicates the value -- * -- * @type { Uint8Array | string | number | boolean } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- value: Uint8Array | string | number | boolean; -- } -- -- /** -- * Provides key-value pairs stored in the distributedKVStore. -- * -- * @interface Entry -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- export interface Entry { -- /** -- * Indicates the key -- * -- * @type { string } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- key: string; -- -- /** -- * Indicates the value -- * -- * @type { Value } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- value: Value; -- } -- -- /** -- * Receive notifications of all data changes, including data insertion, update, and deletion. -- *

    If you have subscribed to {@code SingleKVStore} or {@code DeviceKVStore}, you will receive -- * data change notifications and obtain the changed data from the parameters in callback methods -- * upon data insertion, update or deletion. -- * -- * @interface ChangeNotification -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- export interface ChangeNotification { -- /** -- * Indicates data insertion records. -- * -- * @type { Entry[] } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- insertEntries: Entry[]; -- -- /** -- * Indicates data update records. -- * -- * @type { Entry[] } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- updateEntries: Entry[]; -- -- /** -- * Indicates data deletion records. -- * -- * @type { Entry[] } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- deleteEntries: Entry[]; -- -- /** -- * Indicates the device id which brings the data change. -- * -- * @type { string } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- deviceId: string; -- } -- -- /** -- * Indicates the database synchronization mode. -- * -- * @enum { number } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- export enum SyncMode { -- /** -- * Indicates that data is only pulled from the remote end. -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- PULL_ONLY, -- -- /** -- * Indicates that data is only pushed from the local end. -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- PUSH_ONLY, -- -- /** -- * Indicates that data is pushed from the local end, and then pulled from the remote end. -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- PUSH_PULL -- } -- -- /** -- * Describes the subscription type. -- * -- * @enum { number } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- export enum SubscribeType { -- /** -- * Subscription to local data changes -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- SUBSCRIBE_TYPE_LOCAL, -- -- /** -- * Subscription to remote data changes -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- SUBSCRIBE_TYPE_REMOTE, -- -- /** -- * Subscription to both local and remote data changes -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- SUBSCRIBE_TYPE_ALL -- } -- -- /** -- * Describes the KVStore type. -- * -- * @enum { number } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- export enum KVStoreType { -- /** -- * Device-collaboration database, as specified by {@code DeviceKVStore} -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- DEVICE_COLLABORATION, -- -- /** -- * Single-version database, as specified by {@code SingleKVStore} -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- SINGLE_VERSION -- } -- -- /** -- * Describes the KVStore security level. -- * -- * @enum { number } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- export enum SecurityLevel { -- /** -- * S1: means the db is in the low security level -- * There are some low impact when the data is leaked. -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- S1, -- -- /** -- * S2: means the db is in the middle security level -- * There are some major impact when the data is leaked. -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- S2, -- -- /** -- * S3: means the db is in the high security level -- * There are some severity impact when the data is leaked. -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- S3, -- -- /** -- * S4: means the db is in the critical security level -- * There are some critical impact when the data is leaked. -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- S4 -- } -- -- /** -- * Provides configuration options to create a {@code SingleKVStore} or {@code DeviceKVStore}. -- * -- * @interface Options -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- export interface Options { -- /** -- * Indicates whether to create a database when the database file does not exist -- * -- * @type { ?boolean } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- createIfMissing?: boolean; -- -- /** -- * Indicates whether database files to be encrypted -- * -- * @type { ?boolean } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- encrypt?: boolean; -- -- /** -- * Indicates whether to back up database files -- * -- * @type { ?boolean } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- backup?: boolean; -- -- /** -- * Indicates whether database files are automatically synchronized -- * -- * @permission ohos.permission.DISTRIBUTED_DATASYNC -- * @type { ?boolean } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- autoSync?: boolean; -- -- /** -- * Indicates the database type -- * -- * @type { ?KVStoreType } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- kvStoreType?: KVStoreType; -- -- /** -- * Indicates the database security level -- * -- * @type { SecurityLevel } -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- securityLevel: SecurityLevel; -- -- /** -- * Indicates the database schema -- * -- * @type { ?Schema } -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- schema?: Schema; -- } -- -- /** -- * Represents the database schema. -- * You can set the schema object in options when create or open the database. -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- export class Schema { -- /** -- * A constructor used to create a Schema instance. -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- constructor(); -- -- /** -- * Indicates the root json object. -- * -- * @type { FieldNode } -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- root: FieldNode; -- -- /** -- * Indicates the string array of json. -- * -- * @type { Array } -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- indexes: Array; -- -- /** -- * Indicates the mode of schema. -- * -- * @type { number } -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- mode: number; -- -- /** -- * Indicates the skip size of schema. -- * -- * @type { number } -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- skip: number; -- } -- -- /** -- * Represents a node of a {@link Schema} instance. -- *

    With a {@link Schema} instance, you can define the value fields which stored in the database. -- *

    A FieldNode of the {@link Schema} instance is either a leaf or a non-leaf node. -- *

    The leaf node must have a value; the non-leaf node must have a child {@code FieldNode}. -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- export class FieldNode { -- /** -- * A constructor used to create a FieldNode instance with the specified field. -- * name Indicates the field node name. -- * -- * @param { string } name - It can not be empty. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- constructor(name: string); -- -- /** -- * Adds a child node to this {@code FieldNode}. -- *

    Add a child node to makes this node a non-leaf node and field value will be ignored if it has a child node. -- * -- * @param { FieldNode } child - The field node to append. -- * @returns { boolean } Returns true if the child node is successfully added to this {@code FieldNode} and false otherwise. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- appendChild(child: FieldNode): boolean; -- -- /** -- * Indicates the default value of field node. -- * -- * @type { string } -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- // default: string; // TODO: add this field -- -- /** -- * Indicates the nullable of database field. -- * -- * @type { boolean } -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- nullable: boolean; -- -- /** -- * Indicates the type of value. -- * -- * @type { number } -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- type: number; -- } -- -- /** -- * Provides methods to operate the result set of the {@code SingleKVStore} or {@code DeviceKVStore} database. -- *

    The result set is created by using the {@code getResultSet} method in the {@code SingleKVStore} or -- * {@code DeviceKVStore} class. This interface also provides methods to move the data read -- * position in the result set. -- * -- * @interface KVStoreResultSet -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- export interface KVStoreResultSet { -- /** -- * Obtains the number of lines in a result set. -- * -- * @returns { number } Returns the number of lines. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getCount(): number; -- -- /** -- * Obtains the current read position in a result set. -- * -- * @returns { number } Returns the current read position. The read position starts with 0. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getPosition(): number; -- -- /** -- * Moves the read position to the first line. -- *

    If the result set is empty, false is returned. -- * -- * @returns { boolean } Returns true if the operation succeeds; return false otherwise. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- moveToFirst(): boolean; -- -- /** -- * Moves the read position to the last line. -- *

    If the result set is empty, false is returned. -- * -- * @returns { boolean } Returns true if the operation succeeds; return false otherwise. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- moveToLast(): boolean; -- -- /** -- * Moves the read position to the next line. -- *

    If the result set is empty or the data in the last line is being read, false is returned. -- * -- * @returns { boolean } Returns true if the operation succeeds; return false otherwise. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- moveToNext(): boolean; -- -- /** -- * Moves the read position to the previous line. -- *

    If the result set is empty or the data in the first line is being read, false is returned. -- * -- * @returns { boolean } Returns true if the operation succeeds; return false otherwise. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- moveToPrevious(): boolean; -- -- /** -- * Moves the read position by a relative offset to the current position. -- * -- * @param { number } offset - Indicates the relative offset to the current position. A negative offset indicates moving -- * backwards, and a positive offset indicates moving forwards. For example, if the current position is entry 1 and -- * this offset is 2, the destination position will be entry 3; if the current position is entry 3 and this offset is -2, -- * the destination position will be entry 1. The valid final position after moving forwards starts with 0. If the -- * final position is invalid, false will be returned. -- * @returns { boolean } Returns true if the operation succeeds; return false otherwise. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- move(offset: number): boolean; -- -- /** -- * Moves the read position from 0 to an absolute position. -- * -- * @param { number } position - Indicates the absolute position. -- * @returns { boolean } Returns true if the operation succeeds; return false otherwise. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- moveToPosition(position: number): boolean; -- -- /** -- * Checks whether the read position is the first line. -- * -- * @returns { boolean } Returns true if the read position is the first line; returns false otherwise. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- isFirst(): boolean; -- -- /** -- * Checks whether the read position is the last line. -- * -- * @returns { boolean } Returns true if the read position is the last line; returns false otherwise. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- isLast(): boolean; -- -- /** -- * Checks whether the read position is before the last line. -- * -- * @returns { boolean } Returns true if the read position is before the first line; returns false otherwise. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- isBeforeFirst(): boolean; -- -- /** -- * Checks whether the read position is after the last line. -- * -- * @returns { boolean } Returns true if the read position is after the last line; returns false otherwise. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- isAfterLast(): boolean; -- -- /** -- * Obtains a key-value pair. -- * -- * @returns { Entry } Returns a key-value pair. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getEntry(): Entry; -- } -- -- /** -- * Represents a database query using predicates. -- *

    This class provides a constructor used to create a {@code Query} instance, which is used to query data -- * matching specified conditions in the database. -- *

    This class also provides methods to add predicates to the {@code Query} instance. -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- export class Query { -- /** -- * A constructor used to create a Query instance. -- * -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- constructor(); -- -- /** -- * Resets this {@code Query} object. -- * -- * @returns { Query } Returns the reset {@code Query} object. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- reset(): Query; -- -- /** -- * Constructs a {@code Query} object to query entries with the specified field whose value is equal to the specified long value. -- * -- * @param { string } field - Indicates the field, which cannot contain ^. -- * @param { number | string | boolean } value - Indicates the value to be compared. -- * @returns { Query } Returns the {@coed Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- equalTo(field: string, value: number | string | boolean): Query; -- -- /** -- * Constructs a {@code Query} object to query entries with the specified field whose value is not equal to the specified int value. -- * -- * @param { string } field - Indicates the field, which cannot contain ^. -- * @param { number | string | boolean } value - Indicates the value to be compared. -- * @returns { Query } Returns the {@coed Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- notEqualTo(field: string, value: number | string | boolean): Query; -- -- /** -- * Constructs a {@code Query} object to query entries with the specified field whose value is greater than or equal to the -- * specified int value. -- * -- * @param { string } field - Indicates the field, which cannot contain ^. -- * @param { number | string | boolean } value - Indicates the value to be compared. -- * @returns { Query } Returns the {@coed Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- greaterThan(field: string, value: number | string | boolean): Query; -- -- /** -- * Constructs a {@code Query} object to query entries with the specified field whose value is less than the specified int value. -- * -- * @param { string } field - Indicates the field, which cannot contain ^. -- * @param { number | string } value - Indicates the value to be compared. -- * @returns { Query } Returns the {@coed Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- lessThan(field: string, value: number | string): Query; -- -- /** -- * Constructs a {@code Query} object to query entries with the specified field whose value is greater than or -- * equal to the specified int value. -- * -- * @param { string } field - Indicates the field, which cannot contain ^. -- * @param { number | string } value - Indicates the value to be compared. -- * @returns { Query } Returns the {@coed Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- greaterThanOrEqualTo(field: string, value: number | string): Query; -- -- /** -- * Constructs a {@code Query} object to query entries with the specified field whose value is less than or equal to the -- * specified int value. -- * -- * @param { string } field - Indicates the field, which cannot contain ^. -- * @param { number | string } value - Indicates the value to be compared. -- * @returns { Query } Returns the {@coed Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- lessThanOrEqualTo(field: string, value: number | string): Query; -- -- /** -- * Constructs a {@code Query} object to query entries with the specified field whose value is null. -- * -- * @param { string } field - Indicates the field, which cannot contain ^. -- * @returns { Query } Returns the {@coed Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- isNull(field: string): Query; -- -- /** -- * Constructs a {@code Query} object to query entries with the specified field whose value is within the specified int value list. -- * -- * @param { string } field - Indicates the field, which cannot contain ^. -- * @param { number[] } valueList - Indicates the int value list. -- * @returns { Query } Returns the {@coed Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- inNumber(field: string, valueList: number[]): Query; -- -- /** -- * Constructs a {@code Query} object to query entries with the specified field whose value is within the specified string value list. -- * -- * @param { string } field - Indicates the field, which cannot contain ^. -- * @param { string[] } valueList - Indicates the string value list. -- * @returns { Query } Returns the {@coed Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- inString(field: string, valueList: string[]): Query; -- -- /** -- * Constructs a {@code Query} object to query entries with the specified field whose value is not within the specified int value list. -- * -- * @param { string } field - Indicates the field, which cannot contain ^. -- * @param { number[] } valueList - Indicates the int value list. -- * @returns { Query } Returns the {@coed Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- notInNumber(field: string, valueList: number[]): Query; -- -- /** -- * Constructs a {@code Query} object to query entries with the specified field whose value is not within the specified string value list. -- * -- * @param { string } field - Indicates the field, which cannot contain ^. -- * @param { string[] } valueList - Indicates the string value list. -- * @returns { Query } Returns the {@coed Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- notInString(field: string, valueList: string[]): Query; -- -- /** -- * Constructs a {@code Query} object to query entries with the specified field whose value is similar to the specified string value. -- * -- * @param { string } field - Indicates the field, which cannot contain ^. -- * @param { string } value - Indicates the string value. -- * @returns { Query } Returns the {@coed Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- like(field: string, value: string): Query; -- -- /** -- * Constructs a {@code Query} object to query entries with the specified field whose value is not similar to the specified string value. -- * -- * @param { string } field - Indicates the field, which cannot contain ^. -- * @param { string } value - Indicates the string value. -- * @returns { Query } Returns the {@coed Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- unlike(field: string, value: string): Query; -- -- /** -- * Constructs a {@code Query} object with the and condition. -- *

    Multiple predicates should be connected using the and or or condition. -- * -- * @returns { Query } Returns the {@coed Query} object. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- and(): Query; -- -- /** -- * Constructs a {@code Query} object with the or condition. -- *

    Multiple predicates should be connected using the and or or condition. -- * -- * @returns { Query } Returns the {@coed Query} object. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- or(): Query; -- -- /** -- * Constructs a {@code Query} object to sort the query results in ascending order. -- * -- * @param { string } field - Indicates the field, which cannot contain ^. -- * @returns { Query } Returns the {@coed Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- orderByAsc(field: string): Query; -- -- /** -- * Constructs a {@code Query} object to sort the query results in descending order. -- * -- * @param { string } field - Indicates the field, which cannot contain ^. -- * @returns { Query } Returns the {@coed Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- orderByDesc(field: string): Query; -- -- /** -- * Constructs a {@code Query} object to specify the number of results and the start position. -- * -- * @param { number } total - Indicates the number of results. -- * @param { number } offset - Indicates the start position. -- * @returns { Query } Returns the {@coed Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- limit(total: number, offset: number): Query; -- -- /** -- * Creates a {@code Query} condition with a specified field that is not null. -- * -- * @param { string } field - Indicates the specified field. -- * @returns { Query } Returns the {@coed Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- isNotNull(field: string): Query; -- -- /** -- * Creates a query condition group with a left bracket. -- *

    Multiple query conditions in an {@code Query} object can be grouped. The query conditions in a group can be used as a -- * whole to combine with other query conditions. -- * -- * @returns { Query } Returns the {@coed Query} object. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- beginGroup(): Query; -- -- /** -- * Creates a query condition group with a right bracket. -- *

    Multiple query conditions in an {@code Query} object can be grouped. The query conditions in a group can be used as a -- * whole to combine with other query conditions. -- * -- * @returns { Query } Returns the {@coed Query} object. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- endGroup(): Query; -- -- /** -- * Creates a query condition with a specified key prefix. -- * -- * @param { string } prefix - Indicates the specified key prefix. -- * @returns { Query } Returns the {@coed Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- prefixKey(prefix: string): Query; -- -- /** -- * Sets a specified index that will be preferentially used for query. -- * -- * @param { string } index - Indicates the index to set. -- * @returns { Query } Returns the {@coed Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- setSuggestIndex(index: string): Query; -- -- /** -- * Add device ID key prefix.Used by {@code DeviceKVStore}. -- * -- * @param { string } deviceId - Specify device id to query from, It can not be empty. -- * @returns { Query } Returns the {@code Query} object with device ID prefix added. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- deviceId(deviceId: string): Query; -- -- /** -- * Get a String that represents this {@code Query}. -- *

    The String would be parsed to DB query format. -- * The String length should be no longer than 500kb. -- * -- * @returns { string } String representing this {@code Query}. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getSqlLike(): string; -- } -- -- /** -- * Provides methods related to single-version distributed databases. -- *

    To create a {@code SingleKVStore} database, -- * you can use the {@link data.distributed.common.KVManager#getKVStore​(Options, String)} method -- * with {@code KVStoreType} set to {@code SINGLE_VERSION} for the input parameter {@code Options}. -- * This database synchronizes data to other databases in time sequence. -- * The {@code SingleKVStore} database does not support -- * synchronous transactions, or data search using snapshots. -- * -- * @interface SingleKVStore -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- export interface SingleKVStore { -- /** -- * Writes a key-value pair of the string type into the {@code SingleKVStore} database. -- *

    If you do not want to synchronize this key-value pair to other devices, set the write option in the local database. -- * -- * @param { string } key - Indicates the key. Length must be less than {@code MAX_KEY_LENGTH}. -- * Spaces before and after the key will be cleared. -- * @param { Uint8Array | string | number | boolean } value - Indicates the value to be inserted. -- * @param { AsyncCallback } callback - the callback of put. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- /** -- * Writes a key-value pair of the string type into the {@code SingleKVStore} database. -- *

    If you do not want to synchronize this key-value pair to other devices, set the write option in the local database. -- * -- * @param { string } key - Indicates the key. Length must be less than {@code MAX_KEY_LENGTH}. -- * Spaces before and after the key will be cleared. -- * @param { Uint8Array | string | number | boolean } value - Indicates the value to be inserted. -- * @param { AsyncCallback } callback - the callback of put. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 10 -- */ -- put(key: string, value: Uint8Array | string | number | boolean, callback: AsyncCallback): void; -- -- /** -- * Writes a key-value pair of the string type into the {@code SingleKVStore} database. -- *

    If you do not want to synchronize this key-value pair to other devices, set the write option in the local database. -- * -- * @param { string } key - Indicates the key. Length must be less than {@code MAX_KEY_LENGTH}. -- * Spaces before and after the key will be cleared. -- * @param { Uint8Array | string | number | boolean } value - Indicates the value to be inserted. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- /** -- * Writes a key-value pair of the string type into the {@code SingleKVStore} database. -- *

    If you do not want to synchronize this key-value pair to other devices, set the write option in the local database. -- * -- * @param { string } key - Indicates the key. Length must be less than {@code MAX_KEY_LENGTH}. -- * Spaces before and after the key will be cleared. -- * @param { Uint8Array | string | number | boolean } value - Indicates the value to be inserted. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 10 -- */ -- put(key: string, value: Uint8Array | string | number | boolean): Promise; -- -- /** -- * Inserts key-value pairs into the {@code SingleKVStore} database in batches. -- * -- * @param { Entry[] } entries - Indicates the key-value pairs to be inserted in batches. -- * @param { AsyncCallback } callback - the callback of putBatch. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- /** -- * Inserts key-value pairs into the {@code SingleKVStore} database in batches. -- * -- * @param { Entry[] } entries - Indicates the key-value pairs to be inserted in batches. -- * @param { AsyncCallback } callback - the callback of putBatch. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 10 -- */ -- putBatch(entries: Entry[], callback: AsyncCallback): void; -- -- /** -- * Inserts key-value pairs into the {@code SingleKVStore} database in batches. -- * -- * @param { Entry[] } entries - Indicates the key-value pairs to be inserted in batches. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- /** -- * Inserts key-value pairs into the {@code SingleKVStore} database in batches. -- * -- * @param { Entry[] } entries - Indicates the key-value pairs to be inserted in batches. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 10 -- */ -- putBatch(entries: Entry[]): Promise; -- -- /** -- * Writes values of ValuesBucket type into the {@code SingleKVStore} database. -- * -- * @param { Array } value - Indicates the ValuesBucket array to be inserted. -- * @param { AsyncCallback } callback - the callback of putBatch. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @systemapi -- * @StageModelOnly -- * @since 9 -- */ -- /** -- * Writes values of ValuesBucket type into the {@code SingleKVStore} database. -- * -- * @param { Array } value - Indicates the ValuesBucket array to be inserted. -- * @param { AsyncCallback } callback - the callback of putBatch. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @systemapi -- * @StageModelOnly -- * @since 10 -- */ -- putBatch(value: Array, callback: AsyncCallback): void; -- -- /** -- * Writes values of ValuesBucket type into the {@code SingleKVStore} database. -- * -- * @param { Array } value - Indicates the ValuesBucket array to be inserted. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @systemapi -- * @StageModelOnly -- * @since 9 -- */ -- /** -- * Writes values of ValuesBucket type into the {@code SingleKVStore} database. -- * -- * @param { Array } value - Indicates the ValuesBucket array to be inserted. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @systemapi -- * @StageModelOnly -- * @since 10 -- */ -- putBatch(value: Array): Promise; -- -- /** -- * Deletes the key-value pair based on a specified key. -- * -- * @param { string } key - Indicates the key. Length must be less than {@code MAX_KEY_LENGTH}. -- * Spaces before and after the key will be cleared. -- * @param { AsyncCallback } callback - the callback of delete. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- /** -- * Deletes the key-value pair based on a specified key. -- * -- * @param { string } key - Indicates the key. Length must be less than {@code MAX_KEY_LENGTH}. -- * Spaces before and after the key will be cleared. -- * @param { AsyncCallback } callback - the callback of delete. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 10 -- */ -- delete(key: string, callback: AsyncCallback): void; -- -- /** -- * Deletes the key-value pair based on a specified key. -- * -- * @param { string } key - Indicates the key. Length must be less than {@code MAX_KEY_LENGTH}. -- * Spaces before and after the key will be cleared. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- /** -- * Deletes the key-value pair based on a specified key. -- * -- * @param { string } key - Indicates the key. Length must be less than {@code MAX_KEY_LENGTH}. -- * Spaces before and after the key will be cleared. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 10 -- */ -- delete(key: string): Promise; -- -- /** -- * Deletes the key-value pairs based on the dataSharePredicates. -- * -- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the dataSharePredicates. -- * @param { AsyncCallback } callback - the callback of delete. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider -- * @systemapi -- * @StageModelOnly -- * @since 9 -- */ -- /** -- * Deletes the key-value pairs based on the dataSharePredicates. -- * -- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the dataSharePredicates. -- * @param { AsyncCallback } callback - the callback of delete. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. -- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider -- * @systemapi -- * @StageModelOnly -- * @since 10 -- */ -- delete(predicates: dataSharePredicates.DataSharePredicates, callback: AsyncCallback): void; -- -- /** -- * Deletes the key-value pairs based on the dataSharePredicates. -- * -- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the dataSharePredicates. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider -- * @systemapi -- * @StageModelOnly -- * @since 9 -- */ -- /** -- * Deletes the key-value pairs based on the dataSharePredicates. -- * -- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the dataSharePredicates. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. -- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider -- * @systemapi -- * @StageModelOnly -- * @since 10 -- */ -- delete(predicates: dataSharePredicates.DataSharePredicates): Promise; -- -- /** -- * Deletes key-value pairs in batches from the {@code SingleKVStore} database. -- * -- * @param { string[] } keys - Indicates the key-value pairs to be deleted in batches, It can not be empty. -- * @param { AsyncCallback } callback - the callback of deleteBatch. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- /** -- * Deletes key-value pairs in batches from the {@code SingleKVStore} database. -- * -- * @param { string[] } keys - Indicates the key-value pairs to be deleted in batches, It can not be empty. -- * @param { AsyncCallback } callback - the callback of deleteBatch. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 10 -- */ -- deleteBatch(keys: string[], callback: AsyncCallback): void; -- -- /** -- * Deletes key-value pairs in batches from the {@code SingleKVStore} database. -- * -- * @param { string[] } keys - Indicates the key-value pairs to be deleted in batches, It can not be empty. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- /** -- * Deletes key-value pairs in batches from the {@code SingleKVStore} database. -- * -- * @param { string[] } keys - Indicates the key-value pairs to be deleted in batches, It can not be empty. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 10 -- */ -- deleteBatch(keys: string[]): Promise; -- -- /** -- * Removes data of the specified device from current database. This method is used to remove only the data -- * synchronized from remote devices. This operation does not synchronize data to other databases or affect -- * subsequent data synchronization. -- * -- * @param { string } deviceId - Identifies the device whose data is to be removed and the value cannot be the current device ID. -- * @param { AsyncCallback } callback - the callback of removeDeviceData. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Parameter verification failed. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- removeDeviceData(deviceId: string, callback: AsyncCallback): void; -- -- /** -- * Removes data of the specified device from current database. This method is used to remove only the data -- * synchronized from remote devices. This operation does not synchronize data to other databases or affect -- * subsequent data synchronization. -- * -- * @param { string } deviceId - Identifies the device whose data is to be removed and the value cannot be the current device ID. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Parameter verification failed. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- removeDeviceData(deviceId: string): Promise; -- -- /** -- * Obtains the value of a specified key. -- * -- * @param { string } key - Indicates the key. The length must be less than {@code MAX_KEY_LENGTH}. -- * @param { AsyncCallback } callback - -- * {Uint8Array|string|boolean|number}: the returned value specified by the key. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100004 - Not found. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- get(key: string, callback: AsyncCallback): void; -- -- /** -- * Obtains the value of a specified key. -- * -- * @param { string } key - Indicates the key. The length must be less than {@code MAX_KEY_LENGTH}. -- * @returns { Promise } -- * {Uint8Array|string|boolean|number}: the returned value specified by the key. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100004 - Not found. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- get(key: string): Promise; -- -- /** -- * Obtains all key-value pairs that match a specified key prefix. -- * -- * @param { string } keyPrefix - Indicates the key prefix to match. -- * @param { AsyncCallback } callback - {Entry[]}: the list of all key-value pairs -- * that match the specified key prefix. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getEntries(keyPrefix: string, callback: AsyncCallback): void; -- -- /** -- * Obtains all key-value pairs that match a specified key prefix. -- * -- * @param { string } keyPrefix - Indicates the key prefix to match. -- * @returns { Promise } {Entry[]}: the list of all key-value pairs that match the -- * specified key prefix. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getEntries(keyPrefix: string): Promise; -- -- /** -- * Obtains the list of key-value pairs matching the specified {@code Query} object. -- * -- * @param { Query } query - Indicates the {@code Query} object. -- * @param { AsyncCallback } callback - {Entry[]}: the list of all key-value pairs -- * matching the specified {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getEntries(query: Query, callback: AsyncCallback): void; -- -- /** -- * Obtains the list of key-value pairs matching the specified {@code Query} object. -- * -- * @param { Query } query - Indicates the {@code Query} object. -- * @returns { Promise } {Entry[]}: the list of all key-value pairs matching the -- * specified {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getEntries(query: Query): Promise; -- -- /** -- * Obtains the result set with a specified prefix from a {@code SingleKVStore} database. The {@code KVStoreResultSet} -- * object can be used to query all key-value pairs that meet the search criteria. Each {@code SingleKVStore} -- * instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. If you have created -- * four objects, calling this method will return a failure. Therefore, you are advised to call the closeResultSet -- * method to close unnecessary {@code KVStoreResultSet} objects in a timely manner. -- * -- * @param { string } keyPrefix - Indicates the key prefix to match. -- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified keyPrefix. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- /** -- * Obtains the result set with a specified prefix from a {@code SingleKVStore} database. The {@code KVStoreResultSet} -- * object can be used to query all key-value pairs that meet the search criteria. Each {@code SingleKVStore} -- * instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. If you have created -- * four objects, calling this method will return a failure. Therefore, you are advised to call the closeResultSet -- * method to close unnecessary {@code KVStoreResultSet} objects in a timely manner. -- * -- * @param { string } keyPrefix - Indicates the key prefix to match. -- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified keyPrefix. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100001 - Over max limits. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 10 -- */ -- getResultSet(keyPrefix: string, callback: AsyncCallback): void; -- -- /** -- * Obtains the result set with a specified prefix from a {@code SingleKVStore} database. The {@code KVStoreResultSet} -- * object can be used to query all key-value pairs that meet the search criteria. Each {@code SingleKVStore} -- * instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. If you have created -- * four objects, calling this method will return a failure. Therefore, you are advised to call the closeResultSet -- * method to close unnecessary {@code KVStoreResultSet} objects in a timely manner. -- * -- * @param { string } keyPrefix - Indicates the key prefix to match. -- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified keyPrefix. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- /** -- * Obtains the result set with a specified prefix from a {@code SingleKVStore} database. The {@code KVStoreResultSet} -- * object can be used to query all key-value pairs that meet the search criteria. Each {@code SingleKVStore} -- * instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. If you have created -- * four objects, calling this method will return a failure. Therefore, you are advised to call the closeResultSet -- * method to close unnecessary {@code KVStoreResultSet} objects in a timely manner. -- * -- * @param { string } keyPrefix - Indicates the key prefix to match. -- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified keyPrefix. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100001 - Over max limits. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 10 -- */ -- getResultSet(keyPrefix: string): Promise; -- -- /** -- * Obtains the {@code KVStoreResultSet} object matching the specified {@code Query} object. -- * -- * @param { Query } query - Indicates the {@code Query} object. -- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- /** -- * Obtains the {@code KVStoreResultSet} object matching the specified {@code Query} object. -- * -- * @param { Query } query - Indicates the {@code Query} object. -- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100001 - Over max limits. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 10 -- */ -- getResultSet(query: Query, callback: AsyncCallback): void; -- -- /** -- * Obtains the {@code KVStoreResultSet} object matching the specified {@code Query} object. -- * -- * @param { Query } query - Indicates the {@code Query} object. -- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- /** -- * Obtains the {@code KVStoreResultSet} object matching the specified {@code Query} object. -- * -- * @param { Query } query - Indicates the {@code Query} object. -- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100001 - Over max limits. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 10 -- */ -- getResultSet(query: Query): Promise; -- -- /** -- * Obtains the KVStoreResultSet object matching the specified predicate object. -- * -- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the datasharePredicates. -- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified {@code dataSharePredicates.DataSharePredicates} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider -- * @systemapi -- * @StageModelOnly -- * @since 9 -- */ -- /** -- * Obtains the KVStoreResultSet object matching the specified predicate object. -- * -- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the datasharePredicates. -- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified {@code dataSharePredicates.DataSharePredicates} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. -- * @throws { BusinessError } 15100001 - Over max limits. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider -- * @systemapi -- * @StageModelOnly -- * @since 10 -- */ -- getResultSet(predicates: dataSharePredicates.DataSharePredicates, callback: AsyncCallback): void; -- -- /** -- * Obtains the KVStoreResultSet object matching the specified predicate object. -- * -- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the datasharePredicates. -- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified {@code dataSharePredicates.DataSharePredicates} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider -- * @systemapi -- * @StageModelOnly -- * @since 9 -- */ -- /** -- * Obtains the KVStoreResultSet object matching the specified predicate object. -- * -- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the datasharePredicates. -- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified {@code dataSharePredicates.DataSharePredicates} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. -- * @throws { BusinessError } 15100001 - Over max limits. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider -- * @systemapi -- * @StageModelOnly -- * @since 10 -- */ -- getResultSet(predicates: dataSharePredicates.DataSharePredicates): Promise; -- -- /** -- * Closes a {@code KVStoreResultSet} object returned by getResultSet method. -- * -- * @param { KVStoreResultSet } resultSet - Indicates the {@code KVStoreResultSet} object to close. -- * @param { AsyncCallback } callback - the callback of closeResultSet. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- closeResultSet(resultSet: KVStoreResultSet, callback: AsyncCallback): void; -- -- /** -- * Closes a {@code KVStoreResultSet} object returned by getResultSet method. -- * -- * @param { KVStoreResultSet } resultSet - Indicates the {@code KVStoreResultSet} object to close. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- closeResultSet(resultSet: KVStoreResultSet): Promise; -- -- /** -- * Obtains the number of results matching the specified {@code Query} object. -- * -- * @param { Query } query - Indicates the {@code Query} object. -- * @param { AsyncCallback } callback - {number}: the number of results matching the -- * specified {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getResultSize(query: Query, callback: AsyncCallback): void; -- -- /** -- * Obtains the number of results matching the specified {@code Query} object. -- * -- * @param { Query } query - Indicates the {@code Query} object. -- * @returns { Promise } {number}: the number of results matching the specified -- * {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getResultSize(query: Query): Promise; -- -- /** -- * Backs up a database in the specified filename. -- * -- * @param { string } file - Indicates the database backup filename, It can not be empty and -- * The length must be less than {@code MAX_KEY_LENGTH}. -- * @param { AsyncCallback } callback - the callback of backup. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Parameter verification failed. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- backup(file: string, callback: AsyncCallback): void; -- -- /** -- * Backs up a database in the specified filename. -- * -- * @param { string } file - Indicates the database backup filename, It can not be empty and -- * The length must be less than {@code MAX_KEY_LENGTH}. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Parameter verification failed. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- backup(file: string): Promise; -- -- /** -- * Restores a database from a specified database file. -- * -- * @param { string } file - Indicates the database backup filename, It can not be empty and -- * The length must be less than {@code MAX_KEY_LENGTH}. -- * @param { AsyncCallback } callback - the callback of restore. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Parameter verification failed. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- restore(file: string, callback: AsyncCallback): void; -- -- /** -- * Restores a database from a specified database file. -- * -- * @param { string } file - Indicates the database backup filename, It can not be empty and -- * The length must be less than {@code MAX_KEY_LENGTH}. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Parameter verification failed. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- restore(file: string): Promise; -- -- /** -- * Delete database backup files based on the specified filenames. -- * -- * @param { Array } files - Indicates the backup filenames to be deleted, It can not be empty and -- * The length must be less than {@code MAX_KEY_LENGTH}. -- * @param { AsyncCallback> } callback - {Array<[string, number]>}: -- * the list of backup file and it's corresponding delete result which 0 means delete success -- * and otherwise failed. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- deleteBackup(files: Array, callback: AsyncCallback>): void; -- -- /** -- * Delete database backup files based on the specified filenames. -- * -- * @param { Array } files - Indicates the backup filenames to be deleted, It can not be empty and -- * The length must be less than {@code MAX_KEY_LENGTH}. -- * @returns { Promise> } {Array<[string, number]>}: the list of backup -- * file and it's corresponding delete result which 0 means delete success and otherwise failed. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- deleteBackup(files: Array): Promise>; -- -- /** -- * Starts a transaction operation in the {@code SingleKVStore} database. -- *

    After the database transaction is started, you can submit or roll back the operation. -- * -- * @param { AsyncCallback } callback - the callback of startTransaction. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- /** -- * Starts a transaction operation in the {@code SingleKVStore} database. -- *

    After the database transaction is started, you can submit or roll back the operation. -- * -- * @param { AsyncCallback } callback - the callback of startTransaction. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 10 -- */ -- startTransaction(callback: AsyncCallback): void; -- -- /** -- * Starts a transaction operation in the {@code SingleKVStore} database. -- *

    After the database transaction is started, you can submit or roll back the operation. -- * -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- /** -- * Starts a transaction operation in the {@code SingleKVStore} database. -- *

    After the database transaction is started, you can submit or roll back the operation. -- * -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 10 -- */ -- startTransaction(): Promise; -- -- /** -- * Submits a transaction operation in the {@code SingleKVStore} database. -- * -- * @param { AsyncCallback } callback - the callback of commit. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- commit(callback: AsyncCallback): void; -- -- /** -- * Submits a transaction operation in the {@code SingleKVStore} database. -- * -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- commit(): Promise; -- -- /** -- * Rolls back a transaction operation in the {@code SingleKVStore} database. -- * -- * @param { AsyncCallback } callback - the callback of rollback. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- rollback(callback: AsyncCallback): void; -- -- /** -- * Rolls back a transaction operation in the {@code SingleKVStore} database. -- * -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- rollback(): Promise; -- -- /** -- * Sets whether to enable synchronization. -- * -- * @param { boolean } enabled - Specifies whether to enable synchronization. The value true -- * means to enable synchronization, and false means the opposite. -- * @param { AsyncCallback } callback - the callback of enableSync. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- enableSync(enabled: boolean, callback: AsyncCallback): void; -- -- /** -- * Sets whether to enable synchronization. -- * -- * @param { boolean } enabled - Specifies whether to enable synchronization. The value true -- * means to enable synchronization, and false means the opposite. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- enableSync(enabled: boolean): Promise; -- -- /** -- * Sets synchronization range labels. -- *

    The labels determine the devices with which data will be synchronized. -- * -- * @param { string[] } localLabels - Indicates the synchronization labels of the local device. -- * @param { string[] } remoteSupportLabels - Indicates the labels of the devices with which -- * data will be synchronized. -- * @param { AsyncCallback } callback - the callback of setSyncRange. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- setSyncRange(localLabels: string[], remoteSupportLabels: string[], callback: AsyncCallback): void; -- -- /** -- * Sets synchronization range labels. -- *

    The labels determine the devices with which data will be synchronized. -- * -- * @param { string[] } localLabels - Indicates the synchronization labels of the local device. -- * @param { string[] } remoteSupportLabels - Indicates the labels of the devices with which -- * data will be synchronized. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- setSyncRange(localLabels: string[], remoteSupportLabels: string[]): Promise; -- -- /** -- * Sets the default delay allowed for database synchronization -- * -- * @param { number } defaultAllowedDelayMs - Indicates the default delay allowed for the -- * database synchronization, in milliseconds. -- * @param { AsyncCallback } callback - the callback of setSyncParam. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- setSyncParam(defaultAllowedDelayMs: number, callback: AsyncCallback): void; -- -- /** -- * Sets the default delay allowed for database synchronization -- * -- * @param { number } defaultAllowedDelayMs - Indicates the default delay allowed for the -- * database synchronization, in milliseconds. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- setSyncParam(defaultAllowedDelayMs: number): Promise; -- -- /** -- * Synchronize the database to the specified devices with the specified delay allowed. -- * -- * @permission ohos.permission.DISTRIBUTED_DATASYNC -- * @param { string[] } deviceIds - Indicates the list of devices to which to synchronize the database. -- * @param { SyncMode } mode - Indicates the synchronization mode. The value can be {@code PUSH}, -- * {@code PULL}, or {@code PUSH_PULL}. -- * @param { number } delayMs - Indicates the delay allowed for the synchronization, in milliseconds. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100004 - Not found. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- sync(deviceIds: string[], mode: SyncMode, delayMs?: number): void; -- -- /** -- * Synchronize the database to the specified devices with the specified delay allowed. -- * -- * @permission ohos.permission.DISTRIBUTED_DATASYNC -- * @param { string[] } deviceIds - Indicates the list of devices to which to synchronize the database. -- * @param { Query } query - Indicates the {@code Query} object. -- * @param { SyncMode } mode - Indicates the synchronization mode. The value can be {@code PUSH}, -- * {@code PULL}, or {@code PUSH_PULL}. -- * @param { number } delayMs - Indicates the delay allowed for the synchronization, in milliseconds. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100004 - Not found. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- sync(deviceIds: string[], query: Query, mode: SyncMode, delayMs?: number): void; -- -- /** -- * Register a callback to the database and when data in the distributed database has changed, -- * the callback will be invoked. -- * -- * @param { 'dataChange' } event - Subscribed event name, fixed as 'dataChange', indicates the data change event. -- * @param { SubscribeType } type - Indicates the subscription type, which is defined in {@code SubscribeType}. -- * @param { Callback } listener - {ChangeNotification}: the {@code ChangeNotification} -- * object indicates the data change events in the distributed database. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100001 - Over max limits. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- /** -- * Register a callback to the database and when data in the distributed database has changed, -- * the callback will be invoked. -- * -- * @param { 'dataChange' } event - Subscribed event name, fixed as 'dataChange', indicates the data change event. -- * @param { SubscribeType } type - Indicates the subscription type, which is defined in {@code SubscribeType}. -- * @param { Callback } listener - {ChangeNotification}: the {@code ChangeNotification} -- * object indicates the data change events in the distributed database. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100001 - Over max limits. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 10 -- */ -- on(event: 'dataChange', type: SubscribeType, listener: Callback): void; -- -- /** -- * Register a databases synchronization callback to the database. -- *

    Sync result is returned through asynchronous callback. -- * -- * @param { 'syncComplete' } event - Subscribed event name, fixed as 'syncComplete', indicates the synchronization completion event. -- * @param { Callback> } syncCallback - {Array<[string, number]>}: the -- * deviceId and it's corresponding synchronization result which 0 means synchronization success -- * and otherwise failed. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- on(event: 'syncComplete', syncCallback: Callback>): void; -- -- /** -- * Unsubscribe from the SingleKVStore database based on the specified subscribeType and listener. -- * -- * @param { 'dataChange' } event - The unsubscribe event name, fixed as 'dataChange', indicates the data change event. -- * @param { Callback } listener - {ChangeNotification}: the {@code ChangeNotification} -- * object indicates the data change events in the distributed database. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- off(event: 'dataChange', listener?: Callback): void; -- -- /** -- * Unregister the database synchronization callback. -- * -- * @param { 'syncComplete' } event - The unsubscribe event name, fixed as 'syncComplete', indicates the synchronization completion event. -- * @param { Callback> } syncCallback - {Array<[string, number]>}: the -- * deviceId and it's corresponding synchronization result which 0 means synchronization success -- * and otherwise failed. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- off(event: 'syncComplete', syncCallback?: Callback>): void; -- -- /** -- * Get the security level of the database. -- * -- * @param { AsyncCallback } callback - {SecurityLevel}: the {@code SecurityLevel} -- * object indicates the security level of the database. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getSecurityLevel(callback: AsyncCallback): void; -- -- /** -- * Get the security level of the database. -- * -- * @returns { Promise } {SecurityLevel}: the {@code SecurityLevel} object indicates -- * the security level of the database. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getSecurityLevel(): Promise; -- } -- -- /** -- * Provides methods related to device-collaboration distributed databases. -- *

    To create a {@code DeviceKVStore} database, you can use the {@link data.distributed.common.KVManager.getKVStore(Options, String)} -- * method with {@code KVStoreType} set to {@code DEVICE_COLLABORATION} for the input parameter Options. This database manages distributed -- * data by device, and cannot modify data synchronized from remote devices. When an application writes a key-value pair entry -- * into the database, the system automatically adds the ID of the device running the application to the key. -- * -- * @interface DeviceKVStore -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- export interface DeviceKVStore extends SingleKVStore { -- /** -- * Obtains the value matching the local device ID and specified key. -- * -- * @param { string } key - Indicates the key. The length must be less than {@code MAX_KEY_LENGTH}. -- * @param { AsyncCallback } callback - -- * {Uint8Array|string|boolean|number}: the returned value specified by the local device ID and specified key. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100004 - Not found. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- get(key: string, callback: AsyncCallback): void; -- -- /** -- * Obtains the value matching the local device ID and specified key. -- * -- * @param { string } key - Indicates the key. The length must be less than {@code MAX_KEY_LENGTH}. -- * @returns { Promise } -- * {Uint8Array|string|boolean|number}: the returned value specified by the local device ID and specified key. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100004 - Not found. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- get(key: string): Promise; -- -- /** -- * Obtains the value matching a specified device ID and key. -- * -- * @param { string } deviceId - Indicates the device to be queried. -- * @param { string } key - Indicates the key of the value to be queried. The length must be less than {@code MAX_KEY_LENGTH}. -- * @param { AsyncCallback } callback - -- * {boolean | string | number | Uint8Array}: the returned value specified by the deviceId and key. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100004 - Not found. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- get(deviceId: string, key: string, callback: AsyncCallback): void; -- -- /** -- * Obtains the value matching a specified device ID and key. -- * -- * @param { string } deviceId - Indicates the device to be queried. -- * @param { string } key - Indicates the key of the value to be queried. The length must be less than {@code MAX_KEY_LENGTH}. -- * @returns { Promise } -- * {Uint8Array|string|boolean|number}: the returned value specified by the deviceId and key. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100004 - Not found. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- get(deviceId: string, key: string): Promise; -- -- /** -- * Obtains all key-value pairs that match the local device ID and specified key prefix. -- * -- * @param { string } keyPrefix - Indicates the key prefix to match. -- * @param { AsyncCallback } callback - {Entry[]}: the list of all key-value pairs -- * that match the local device ID and specified key prefix. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getEntries(keyPrefix: string, callback: AsyncCallback): void; -- -- /** -- * Obtains all key-value pairs that match the local device ID and specified key prefix. -- * -- * @param { string } keyPrefix - Indicates the key prefix to match. -- * @returns { Promise } {Entry[]}: the list of all key-value pairs that match the -- * local device ID and specified key prefix. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getEntries(keyPrefix: string): Promise; -- -- /** -- * Obtains all key-value pairs matching a specified device ID and key prefix. -- * -- * @param { string } deviceId - Identifies the device whose data is to be queried. -- * @param { string } keyPrefix - Indicates the key prefix to match. -- * @param { AsyncCallback } callback - {Entry[]}: the list of all key-value pairs -- * that match the specified deviceId and key prefix. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- getEntries(deviceId: string, keyPrefix: string, callback: AsyncCallback): void; -- -- /** -- * Obtains all key-value pairs matching a specified device ID and key prefix. -- * -- * @param { string } deviceId - Identifies the device whose data is to be queried. -- * @param { string } keyPrefix - Indicates the key prefix to match. -- * @returns { Promise } {Entry[]}: the list of all key-value pairs that match the -- * specified deviceId and key prefix. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- getEntries(deviceId: string, keyPrefix: string): Promise; -- -- /** -- * Obtains the list of key-value pairs matching the local device ID and specified {@code Query} object. -- * -- * @param { Query } query - Indicates the {@code Query} object. -- * @param { AsyncCallback } callback - {Entry[]}: the list of all key-value pairs -- * matching the local device ID and specified {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getEntries(query: Query, callback: AsyncCallback): void; -- -- /** -- * Obtains the list of key-value pairs matching the local device ID and specified {@code Query} object. -- * -- * @param { Query } query - Indicates the {@code Query} object. -- * @returns { Promise } {Entry[]}: the list of all key-value pairs matching the local device ID and -- * specified {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getEntries(query: Query): Promise; -- -- /** -- * Obtains the list of key-value pairs matching a specified device ID and {@code Query} object. -- * -- * @param { string } deviceId - Indicates the ID of the device to which the key-value pairs belong. -- * @param { Query } query - Indicates the {@code Query} object. -- * @param { AsyncCallback } callback - {Entry[]}: the list of all key-value pairs -- * matching the specified deviceId and {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- getEntries(deviceId: string, query: Query, callback: AsyncCallback): void; -- -- /** -- * Obtains the list of key-value pairs matching a specified device ID and {@code Query} object. -- * -- * @param { string } deviceId - Indicates the ID of the device to which the key-value pairs belong. -- * @param { Query } query - Indicates the {@code Query} object. -- * @returns { Promise } {Entry[]}: the list of all key-value pairs matching the -- * specified deviceId and {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- getEntries(deviceId: string, query: Query): Promise; -- -- /** -- * Obtains the result set with the local device ID and specified prefix from a {@code DeviceKVStore} database. -- * The {@code KVStoreResultSet} object can be used to query all key-value pairs that meet the search criteria. -- * Each {@code DeviceKVStore} instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. -- * If you have created four objects, calling this method will return a failure. Therefore, you are advised to -- * call the closeResultSet method to close unnecessary {@code KVStoreResultSet} objects in a timely manner. -- * -- * @param { string } keyPrefix - Indicates the key prefix to match. -- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the local device ID and specified keyPrefix. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- /** -- * Obtains the result set with the local device ID and specified prefix from a {@code DeviceKVStore} database. -- * The {@code KVStoreResultSet} object can be used to query all key-value pairs that meet the search criteria. -- * Each {@code DeviceKVStore} instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. -- * If you have created four objects, calling this method will return a failure. Therefore, you are advised to -- * call the closeResultSet method to close unnecessary {@code KVStoreResultSet} objects in a timely manner. -- * -- * @param { string } keyPrefix - Indicates the key prefix to match. -- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the local device ID and specified keyPrefix. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100001 - Over max limits. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 10 -- */ -- getResultSet(keyPrefix: string, callback: AsyncCallback): void; -- -- /** -- * Obtains the result set with the local device ID and specified prefix from a {@code DeviceKVStore} database. -- * The {@code KVStoreResultSet} object can be used to query all key-value pairs that meet the search criteria. -- * Each {@code DeviceKVStore} instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. -- * If you have created four objects, calling this method will return a failure. Therefore, you are advised to -- * call the closeResultSet method to close unnecessary {@code KVStoreResultSet} objects in a timely manner. -- * -- * @param { string } keyPrefix - Indicates the key prefix to match. -- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the local device ID and specified keyPrefix. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- /** -- * Obtains the result set with the local device ID and specified prefix from a {@code DeviceKVStore} database. -- * The {@code KVStoreResultSet} object can be used to query all key-value pairs that meet the search criteria. -- * Each {@code DeviceKVStore} instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. -- * If you have created four objects, calling this method will return a failure. Therefore, you are advised to -- * call the closeResultSet method to close unnecessary {@code KVStoreResultSet} objects in a timely manner. -- * -- * @param { string } keyPrefix - Indicates the key prefix to match. -- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the local device ID and specified keyPrefix. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100001 - Over max limits. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 10 -- */ -- getResultSet(keyPrefix: string): Promise; -- -- /** -- * Obtains the {@code KVStoreResultSet} object matching the specified device ID and key prefix. -- *

    The {@code KVStoreResultSet} object can be used to query all key-value pairs that meet the search criteria. Each {@code DeviceKVStore} -- * instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. If you have created four objects, -- * calling this method will return a failure. Therefore, you are advised to call the closeResultSet method to close unnecessary -- * {@code KVStoreResultSet} objects in a timely manner. -- * -- * @param { string } deviceId - Identifies the device whose data is to be queried. -- * @param { string } keyPrefix - Indicates the key prefix to match. -- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified deviceId and keyPrefix. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- /** -- * Obtains the {@code KVStoreResultSet} object matching the specified device ID and key prefix. -- *

    The {@code KVStoreResultSet} object can be used to query all key-value pairs that meet the search criteria. Each {@code DeviceKVStore} -- * instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. If you have created four objects, -- * calling this method will return a failure. Therefore, you are advised to call the closeResultSet method to close unnecessary -- * {@code KVStoreResultSet} objects in a timely manner. -- * -- * @param { string } deviceId - Identifies the device whose data is to be queried. -- * @param { string } keyPrefix - Indicates the key prefix to match. -- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified deviceId and keyPrefix. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100001 - Over max limits. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 10 -- */ -- getResultSet(deviceId: string, keyPrefix: string, callback: AsyncCallback): void; -- -- /** -- * Obtains the {@code KVStoreResultSet} object matching the specified device ID and key prefix. -- *

    The {@code KVStoreResultSet} object can be used to query all key-value pairs that meet the search criteria. Each {@code DeviceKVStore} -- * instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. If you have created four objects, -- * calling this method will return a failure. Therefore, you are advised to call the closeResultSet method to close unnecessary -- * {@code KVStoreResultSet} objects in a timely manner. -- * -- * @param { string } deviceId - Identifies the device whose data is to be queried. -- * @param { string } keyPrefix - Indicates the key prefix to match. -- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified deviceId and keyPrefix. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- /** -- * Obtains the {@code KVStoreResultSet} object matching the specified device ID and key prefix. -- *

    The {@code KVStoreResultSet} object can be used to query all key-value pairs that meet the search criteria. Each {@code DeviceKVStore} -- * instance can have a maximum of four {@code KVStoreResultSet} objects at the same time. If you have created four objects, -- * calling this method will return a failure. Therefore, you are advised to call the closeResultSet method to close unnecessary -- * {@code KVStoreResultSet} objects in a timely manner. -- * -- * @param { string } deviceId - Identifies the device whose data is to be queried. -- * @param { string } keyPrefix - Indicates the key prefix to match. -- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified deviceId and keyPrefix. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100001 - Over max limits. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 10 -- */ -- getResultSet(deviceId: string, keyPrefix: string): Promise; -- -- /** -- * Obtains the {@code KVStoreResultSet} object matching the local device ID and specified {@code Query} object. -- * -- * @param { Query } query - Indicates the {@code Query} object. -- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the local device ID and specified {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- /** -- * Obtains the {@code KVStoreResultSet} object matching the local device ID and specified {@code Query} object. -- * -- * @param { Query } query - Indicates the {@code Query} object. -- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the local device ID and specified {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100001 - Over max limits. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 10 -- */ -- getResultSet(query: Query, callback: AsyncCallback): void; -- -- /** -- * Obtains the {@code KVStoreResultSet} object matching the local device ID and specified {@code Query} object. -- * -- * @param { Query } query - Indicates the {@code Query} object. -- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the local device ID and specified {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- /** -- * Obtains the {@code KVStoreResultSet} object matching the local device ID and specified {@code Query} object. -- * -- * @param { Query } query - Indicates the {@code Query} object. -- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the local device ID and specified {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100001 - Over max limits. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 10 -- */ -- getResultSet(query: Query): Promise; -- -- /** -- * Obtains the {@code KVStoreResultSet} object matching a specified device ID and {@code Query} object. -- * -- * @param { string } deviceId - Indicates the ID of the device to which the {@code KVStoreResultSet} object belongs. -- * @param { Query } query - Indicates the {@code Query} object. -- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified deviceId and {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- /** -- * Obtains the {@code KVStoreResultSet} object matching a specified device ID and {@code Query} object. -- * -- * @param { string } deviceId - Indicates the ID of the device to which the {@code KVStoreResultSet} object belongs. -- * @param { Query } query - Indicates the {@code Query} object. -- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified deviceId and {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100001 - Over max limits. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 10 -- */ -- getResultSet(deviceId: string, query: Query, callback: AsyncCallback): void; -- -- /** -- * Obtains the {@code KVStoreResultSet} object matching a specified device ID and {@code Query} object. -- * -- * @param { string } deviceId - Indicates the ID of the device to which the {@code KVStoreResultSet} object belongs. -- * @param { Query } query - Indicates the {@code Query} object. -- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified deviceId and {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- /** -- * Obtains the {@code KVStoreResultSet} object matching a specified device ID and {@code Query} object. -- * -- * @param { string } deviceId - Indicates the ID of the device to which the {@code KVStoreResultSet} object belongs. -- * @param { Query } query - Indicates the {@code Query} object. -- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified deviceId and {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100001 - Over max limits. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 10 -- */ -- getResultSet(deviceId: string, query: Query): Promise; -- -- /** -- * Obtains the KVStoreResultSet object matching the local device ID and specified predicate object. -- * -- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the datasharePredicates. -- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the local device ID and specified {@code dataSharePredicates.DataSharePredicates} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider -- * @systemapi -- * @StageModelOnly -- * @since 9 -- */ -- /** -- * Obtains the KVStoreResultSet object matching the local device ID and specified predicate object. -- * -- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the datasharePredicates. -- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the local device ID and specified {@code dataSharePredicates.DataSharePredicates} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. -- * @throws { BusinessError } 15100001 - Over max limits. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider -- * @systemapi -- * @StageModelOnly -- * @since 10 -- */ -- getResultSet(predicates: dataSharePredicates.DataSharePredicates, callback: AsyncCallback): void; -- -- /** -- * Obtains the KVStoreResultSet object matching the local device ID and specified predicate object. -- * -- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the datasharePredicates. -- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the local device ID and specified {@code dataSharePredicates.DataSharePredicates} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider -- * @systemapi -- * @StageModelOnly -- * @since 9 -- */ -- /** -- * Obtains the KVStoreResultSet object matching the local device ID and specified predicate object. -- * -- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the datasharePredicates. -- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the local device ID and specified {@code dataSharePredicates.DataSharePredicates} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. -- * @throws { BusinessError } 15100001 - Over max limits. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider -- * @systemapi -- * @StageModelOnly -- * @since 10 -- */ -- getResultSet(predicates: dataSharePredicates.DataSharePredicates): Promise; -- -- /** -- * Obtains the KVStoreResultSet object matching a specified Device ID and Predicate object. -- * -- * @param { string } deviceId Indicates the ID of the device to which the results belong. -- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the dataSharePredicates. -- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified deviceId and {@code dataSharePredicates.DataSharePredicates} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider -- * @systemapi -- * @StageModelOnly -- * @since 9 -- */ -- /** -- * Obtains the KVStoreResultSet object matching a specified Device ID and Predicate object. -- * -- * @param { string } deviceId Indicates the ID of the device to which the results belong. -- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the dataSharePredicates. -- * @param { AsyncCallback } callback - {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified deviceId and {@code dataSharePredicates.DataSharePredicates} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. -- * @throws { BusinessError } 15100001 - Over max limits. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider -- * @systemapi -- * @StageModelOnly -- * @since 10 -- */ -- getResultSet( -- deviceId: string, -- predicates: dataSharePredicates.DataSharePredicates, -- callback: AsyncCallback -- ): void; -- -- /** -- * Obtains the KVStoreResultSet object matching a specified Device ID and Predicate object. -- * -- * @param { string } deviceId Indicates the ID of the device to which the results belong. -- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the dataSharePredicates. -- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified deviceId and {@code dataSharePredicates.DataSharePredicates} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider -- * @systemapi -- * @StageModelOnly -- * @since 9 -- */ -- /** -- * Obtains the KVStoreResultSet object matching a specified Device ID and Predicate object. -- * -- * @param { string } deviceId Indicates the ID of the device to which the results belong. -- * @param { dataSharePredicates.DataSharePredicates } predicates - Indicates the dataSharePredicates. -- * @returns { Promise } {KVStoreResultSet}: the {@code KVStoreResultSet} -- * object matching the specified deviceId and {@code dataSharePredicates.DataSharePredicates} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 202 - Permission verification failed, application which is not a system application uses system API. -- * @throws { BusinessError } 15100001 - Over max limits. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.DataShare.Provider -- * @systemapi -- * @StageModelOnly -- * @since 10 -- */ -- getResultSet(deviceId: string, predicates: dataSharePredicates.DataSharePredicates): Promise; -- -- /** -- * Obtains the number of results matching the local device ID and specified {@code Query} object. -- * -- * @param { Query } query - Indicates the {@code Query} object. -- * @param { AsyncCallback } callback - {number}: the number of results matching the -- * local device ID and specified {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getResultSize(query: Query, callback: AsyncCallback): void; -- -- /** -- * Obtains the number of results matching the local device ID and specified {@code Query} object. -- * -- * @param { Query } query - Indicates the {@code Query} object. -- * @returns { Promise } {number}: the number of results matching the local device ID and specified -- * {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getResultSize(query: Query): Promise; -- -- /** -- * Obtains the number of results matching a specified device ID and {@code Query} object. -- * -- * @param { string } deviceId - Indicates the ID of the device to which the results belong. -- * @param { Query } query - Indicates the {@code Query} object. -- * @param { AsyncCallback } callback - {number}: the number of results matching the -- * specified deviceId and {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- getResultSize(deviceId: string, query: Query, callback: AsyncCallback): void; -- -- /** -- * Obtains the number of results matching a specified device ID and {@code Query} object. -- * -- * @param { string } deviceId - Indicates the ID of the device to which the results belong. -- * @param { Query } query - Indicates the {@code Query} object. -- * @returns { Promise } {number}: the number of results matching the specified -- * deviceId and {@code Query} object. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @throws { BusinessError } 15100005 - Database or result set already closed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- getResultSize(deviceId: string, query: Query): Promise; -- } -- -- /** -- * Creates a {@link KVManager} instance based on the configuration information. -- *

    You must pass {@link KVManagerConfig} to provide configuration information -- * to create a {@link KVManager} instance. -- * -- * @param { KVManagerConfig } config - Indicates the KVStore configuration information, -- * including the package name and context, and package name can not be empty. -- * @returns { KVManager } : the {@code KVManager} instance. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- export function createKVManager(config: KVManagerConfig): KVManager; -- -- /** -- * Provides interfaces to manage a {@code SingleKVStore} database, including obtaining, closing, and deleting the {@code SingleKVStore}. -- * -- * @interface KVManager -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- export interface KVManager { -- /** -- * Creates and obtains a KVStore database by specifying {@code Options} and {@code storeId}. -- * -- * @param { string } storeId - Identifies the KVStore database. The value of this parameter must be unique -- * for the same application, and different applications can share the same value. The storeId can consist -- * of only letters, digits, and underscores (_), and cannot exceed 128 characters. -- * @param { Options } options - Indicates the {@code Options} object used for creating and -- * obtaining the KVStore database. -- * @param { AsyncCallback } callback - {T}: the {@code SingleKVStore} or {@code DeviceKVStore} instance. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @throws { BusinessError } 15100002 - Open existed database with changed options. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getKVStore(storeId: string, options: Options, callback: AsyncCallback): void; -- -- /** -- * Creates and obtains a KVStore database by specifying {@code Options} and {@code storeId}. -- * -- * @param { string } storeId - Identifies the KVStore database. The value of this parameter must be unique -- * for the same application, and different applications can share the same value. The storeId can consist -- * of only letters, digits, and underscores (_), and cannot exceed 128 characters. -- * @param { Options } options - Indicates the {@code Options} object used for creating and -- * obtaining the KVStore database. -- * @returns { Promise } {T}: the {@code SingleKVStore} or {@code DeviceKVStore} instance. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @throws { BusinessError } 15100002 - Open existed database with changed options. -- * @throws { BusinessError } 15100003 - Database corrupted. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getKVStore(storeId: string, options: Options): Promise; -- -- /** -- * Closes the KVStore database. -- *

    Warning: This method is not thread-safe. If you call this method to stop a KVStore database that is running, your -- * thread may crash. -- *

    The KVStore database to close must be an object created by using the {@code getKVStore} method. Before using this -- * method, release the resources created for the database, for example, {@code KVStoreResultSet} for KVStore, otherwise -- * closing the database will fail. -- * -- * @param { string } appId - Identifies the application that the database belong to, and cannot exceed 256 characters. -- * @param { string } storeId - Identifies the KVStore database to close. The storeId can consist of only letters, digits, -- * and underscores (_), and cannot exceed 128 characters. -- * @param { AsyncCallback } callback - the callback of closeKVStore. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- closeKVStore(appId: string, storeId: string, callback: AsyncCallback): void; -- -- /** -- * Closes the KVStore database. -- *

    Warning: This method is not thread-safe. If you call this method to stop a KVStore database that is running, your -- * thread may crash. -- *

    The KVStore database to close must be an object created by using the {@code getKVStore} method. Before using this -- * method, release the resources created for the database, for example, {@code KVStoreResultSet} for KVStore, otherwise -- * closing the database will fail. -- * -- * @param { string } appId - Identifies the application that the database belong to, and cannot exceed 256 characters. -- * @param { string } storeId - Identifies the KVStore database to close. The storeId can consist of only letters, digits, -- * and underscores (_), and cannot exceed 128 characters. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- closeKVStore(appId: string, storeId: string): Promise; -- -- /** -- * Deletes the KVStore database identified by storeId. -- *

    Before using this method, close all KVStore instances in use that are identified by the same storeId. -- *

    You can use this method to delete a KVStore database not in use. After the database is deleted, all its data will be -- * lost. -- * -- * @param { string } appId - Identifies the application that the database belong to, and cannot exceed 256 characters. -- * @param { string } storeId - Identifies the KVStore database to delete. The storeId can consist of only letters, digits, -- * and underscores (_), and cannot exceed 128 characters. -- * @param { AsyncCallback } callback - the callback of deleteKVStore. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Parameter verification failed. -- * @throws { BusinessError } 15100004 - Not found. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- deleteKVStore(appId: string, storeId: string, callback: AsyncCallback): void; -- -- /** -- * Deletes the KVStore database identified by storeId. -- *

    Before using this method, close all KVStore instances in use that are identified by the same storeId. -- *

    You can use this method to delete a KVStore database not in use. After the database is deleted, all its data will be -- * lost. -- * -- * @param { string } appId - Identifies the application that the database belong to, and cannot exceed 256 characters. -- * @param { string } storeId - Identifies the KVStore database to delete. The storeId can consist of only letters, digits, -- * and underscores (_), and cannot exceed 128 characters. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Parameter verification failed. -- * @throws { BusinessError } 15100004 - Not found. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- deleteKVStore(appId: string, storeId: string): Promise; -- -- /** -- * Obtains the storeId of all KVStore databases that are created by using the {@code getKVStore} method and not deleted by -- * calling the {@code deleteKVStore} method. -- * -- * @param { string } appId - Identifies the application that obtains the databases, and cannot exceed 256 characters. -- * @param { AsyncCallback } callback - {string[]}: the storeId of all created KVStore databases. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getAllKVStoreId(appId: string, callback: AsyncCallback): void; -- -- /** -- * Obtains the storeId of all KVStore databases that are created by using the {@code getKVStore} method and not deleted by -- * calling the {@code deleteKVStore} method. -- * -- * @param { string } appId - Identifies the application that obtains the databases, and cannot exceed 256 characters. -- * @returns { Promise } {string[]}: the storeId of all created KVStore databases. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified. -- *
    2.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -- */ -- getAllKVStoreId(appId: string): Promise; -- -- /** -- * Register a death callback to get notification when the data manager service is terminated. -- *

    If the data manager service is terminated,you need to re-subscribe to data change notifications and synchronization -- * completion notifications, and calling the sync method will return a failure. -- * -- * @param { 'distributedDataServiceDie' } event - Subscribed event name, fixed as 'distributedDataServiceDie', as a service status change events. -- * @param { Callback } deathCallback - callback to be invoked when the data manager service is terminated. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- on(event: 'distributedDataServiceDie', deathCallback: Callback): void; -- -- /** -- * Unregister the death callback. Not notification will be received when the data manager service is terminated. -- *

    The unregistered death callback must be a registered death callback of the database. If no death callback parameter -- * is passed, all database death callbacks will be unregistered. -- * -- * @param { 'distributedDataServiceDie' } event - Unsubscribe event name, fixed as 'distributedDataServiceDie', as a service status change events. -- * @param { Callback } deathCallback - the data manager service is terminated callback which has been registered. -- * @throws { BusinessError } 401 - Parameter error.Possible causes:1.Mandatory parameters are left unspecified; -- *
    2.Incorrect parameters types; -- *
    3.Parameter verification failed. -- * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -- */ -- off(event: 'distributedDataServiceDie', deathCallback?: Callback): void; -- } --} -- --export default distributedKVStore; -\ No newline at end of file -diff --git a/api/@ohos.data.distributedKVStore.d.ts b/api/@ohos.data.distributedKVStore.d.ts -index c62187db2..7569b6bcb 100644 ---- a/api/@ohos.data.distributedKVStore.d.ts -+++ b/api/@ohos.data.distributedKVStore.d.ts -@@ -28,7 +28,8 @@ import BaseContext from './application/BaseContext'; - * - * @namespace distributedKVStore - * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace distributedKVStore { - /** -@@ -37,7 +38,8 @@ declare namespace distributedKVStore { - * - * @interface KVManagerConfig - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface KVManagerConfig { - /** -@@ -45,7 +47,8 @@ declare namespace distributedKVStore { - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - bundleName: string; - -@@ -54,7 +57,8 @@ declare namespace distributedKVStore { - * - * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * if swap the area, you should close all the KV store and use the new Context to create the KVManager -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - /** - * Indicates the ability or hap context -@@ -62,7 +66,8 @@ declare namespace distributedKVStore { - * @type { BaseContext } - * @syscap SystemCapability.DistributedDataManager.KVStore.Core - * if swap the area, you should close all the KV store and use the new BaseContext to create the KVManager -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - context: BaseContext; - } -@@ -368,14 +373,16 @@ declare namespace distributedKVStore { - * - * @enum { number } - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum KVStoreType { - /** - * Device-collaboration database, as specified by {@code DeviceKVStore} - * - * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DEVICE_COLLABORATION, - -@@ -383,7 +390,8 @@ declare namespace distributedKVStore { - * Single-version database, as specified by {@code SingleKVStore} - * - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SINGLE_VERSION - } -@@ -393,7 +401,8 @@ declare namespace distributedKVStore { - * - * @enum { number } - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum SecurityLevel { - /** -@@ -401,7 +410,8 @@ declare namespace distributedKVStore { - * There are some low impact when the data is leaked. - * - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - S1, - -@@ -410,7 +420,8 @@ declare namespace distributedKVStore { - * There are some major impact when the data is leaked. - * - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - S2, - -@@ -419,7 +430,8 @@ declare namespace distributedKVStore { - * There are some severity impact when the data is leaked. - * - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - S3, - -@@ -428,7 +440,8 @@ declare namespace distributedKVStore { - * There are some critical impact when the data is leaked. - * - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - S4 - } -@@ -438,7 +451,8 @@ declare namespace distributedKVStore { - * - * @interface Options - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Options { - /** -@@ -446,7 +460,8 @@ declare namespace distributedKVStore { - * - * @type { ?boolean } - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - createIfMissing?: boolean; - -@@ -455,7 +470,8 @@ declare namespace distributedKVStore { - * - * @type { ?boolean } - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - encrypt?: boolean; - -@@ -464,7 +480,8 @@ declare namespace distributedKVStore { - * - * @type { ?boolean } - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - backup?: boolean; - -@@ -474,7 +491,8 @@ declare namespace distributedKVStore { - * @permission ohos.permission.DISTRIBUTED_DATASYNC - * @type { ?boolean } - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - autoSync?: boolean; - -@@ -483,7 +501,8 @@ declare namespace distributedKVStore { - * - * @type { ?KVStoreType } - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - kvStoreType?: KVStoreType; - -@@ -492,7 +511,8 @@ declare namespace distributedKVStore { - * - * @type { SecurityLevel } - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * arkts 1.1&1.2 - */ - securityLevel: SecurityLevel; - -@@ -501,7 +521,8 @@ declare namespace distributedKVStore { - * - * @type { ?Schema } - * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - schema?: Schema; - } -@@ -511,7 +532,8 @@ declare namespace distributedKVStore { - * You can set the schema object in options when create or open the database. - * - * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class Schema { - /** -@@ -566,7 +588,8 @@ declare namespace distributedKVStore { - *

    The leaf node must have a value; the non-leaf node must have a child {@code FieldNode}. - * - * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class FieldNode { - /** -@@ -1163,7 +1186,8 @@ declare namespace distributedKVStore { - * @throws { BusinessError } 15100005 - Database or result set already closed. - * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - put(key: string, value: Uint8Array | string | number | boolean, callback: AsyncCallback): void; - -@@ -1198,7 +1222,8 @@ declare namespace distributedKVStore { - * @throws { BusinessError } 15100005 - Database or result set already closed. - * @throws { BusinessError } 14800047 - The WAL file size exceeds the default limit. - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - put(key: string, value: Uint8Array | string | number | boolean): Promise; - -@@ -1551,7 +1576,8 @@ declare namespace distributedKVStore { - * @throws { BusinessError } 15100004 - Not found. - * @throws { BusinessError } 15100005 - Database or result set already closed. - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - get(key: string, callback: AsyncCallback): void; - -@@ -1568,7 +1594,8 @@ declare namespace distributedKVStore { - * @throws { BusinessError } 15100004 - Not found. - * @throws { BusinessError } 15100005 - Database or result set already closed. - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - get(key: string): Promise; - -@@ -1898,7 +1925,8 @@ declare namespace distributedKVStore { - *
    2.Parameter verification failed. - * @throws { BusinessError } 15100005 - Database or result set already closed. - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - backup(file: string, callback: AsyncCallback): void; - -@@ -1912,7 +1940,8 @@ declare namespace distributedKVStore { - *
    2.Parameter verification failed. - * @throws { BusinessError } 15100005 - Database or result set already closed. - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - backup(file: string): Promise; - -@@ -2296,7 +2325,8 @@ declare namespace distributedKVStore { - * @throws { BusinessError } 15100004 - Not found. - * @throws { BusinessError } 15100005 - Database or result set already closed. - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - get(key: string, callback: AsyncCallback): void; - -@@ -2313,7 +2343,8 @@ declare namespace distributedKVStore { - * @throws { BusinessError } 15100004 - Not found. - * @throws { BusinessError } 15100005 - Database or result set already closed. - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - get(key: string): Promise; - -@@ -2331,7 +2362,8 @@ declare namespace distributedKVStore { - * @throws { BusinessError } 15100004 - Not found. - * @throws { BusinessError } 15100005 - Database or result set already closed. - * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - get(deviceId: string, key: string, callback: AsyncCallback): void; - -@@ -2349,7 +2381,8 @@ declare namespace distributedKVStore { - * @throws { BusinessError } 15100004 - Not found. - * @throws { BusinessError } 15100005 - Database or result set already closed. - * @syscap SystemCapability.DistributedDataManager.KVStore.DistributedKVStore -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - get(deviceId: string, key: string): Promise; - -@@ -2972,7 +3005,8 @@ declare namespace distributedKVStore { - *
    2.Incorrect parameters types; - *
    3.Parameter verification failed. - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function createKVManager(config: KVManagerConfig): KVManager; - -@@ -2981,14 +3015,15 @@ declare namespace distributedKVStore { - * - * @interface KVManager - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface KVManager { - /** - * Creates and obtains a KVStore database by specifying {@code Options} and {@code storeId}. - * - * @param { string } storeId - Identifies the KVStore database. The value of this parameter must be unique -- * for the same application, and different applications can share the same value. The storeId can consist -+ * for the same application, and different applications can share the same value. The storeId can consist - * of only letters, digits, and underscores (_), and cannot exceed 128 characters. - * @param { Options } options - Indicates the {@code Options} object used for creating and - * obtaining the KVStore database. -@@ -2999,7 +3034,8 @@ declare namespace distributedKVStore { - * @throws { BusinessError } 15100002 - Open existed database with changed options. - * @throws { BusinessError } 15100003 - Database corrupted. - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getKVStore(storeId: string, options: Options, callback: AsyncCallback): void; - -@@ -3007,7 +3043,7 @@ declare namespace distributedKVStore { - * Creates and obtains a KVStore database by specifying {@code Options} and {@code storeId}. - * - * @param { string } storeId - Identifies the KVStore database. The value of this parameter must be unique -- * for the same application, and different applications can share the same value. The storeId can consist -+ * for the same application, and different applications can share the same value. The storeId can consist - * of only letters, digits, and underscores (_), and cannot exceed 128 characters. - * @param { Options } options - Indicates the {@code Options} object used for creating and - * obtaining the KVStore database. -@@ -3018,7 +3054,8 @@ declare namespace distributedKVStore { - * @throws { BusinessError } 15100002 - Open existed database with changed options. - * @throws { BusinessError } 15100003 - Database corrupted. - * @syscap SystemCapability.DistributedDataManager.KVStore.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getKVStore(storeId: string, options: Options): Promise; - -@@ -3138,6 +3175,7 @@ declare namespace distributedKVStore { - on(event: 'distributedDataServiceDie', deathCallback: Callback): void; - - /** -+ * Unregister the death callback. Not notification will be received when the data manager service is terminated. - * Unregister the death callback. Not notification will be received when the data manager service is terminated. - *

    The unregistered death callback must be a registered death callback of the database. If no death callback parameter - * is passed, all database death callbacks will be unregistered. -diff --git a/api/@ohos.data.preferences.d.ts b/api/@ohos.data.preferences.d.ts -index e7ef45815..68f281e1f 100644 ---- a/api/@ohos.data.preferences.d.ts -+++ b/api/@ohos.data.preferences.d.ts -@@ -113,7 +113,8 @@ declare namespace preferences { - * @syscap SystemCapability.DistributedDataManager.Preferences.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const MAX_KEY_LENGTH: number; - -@@ -147,7 +148,8 @@ declare namespace preferences { - * @syscap SystemCapability.DistributedDataManager.Preferences.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const MAX_VALUE_LENGTH: number; - -@@ -157,7 +159,8 @@ declare namespace preferences { - * @enum { number } - * @syscap SystemCapability.DistributedDataManager.Preferences.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum StorageType { - /** -@@ -165,7 +168,8 @@ declare namespace preferences { - * - * @syscap SystemCapability.DistributedDataManager.Preferences.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - XML = 0, - -@@ -174,7 +178,8 @@ declare namespace preferences { - * - * @syscap SystemCapability.DistributedDataManager.Preferences.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - GSKV - } -@@ -242,7 +247,8 @@ declare namespace preferences { - * @type { ?(StorageType | null | undefined) } - * @syscap SystemCapability.DistributedDataManager.Preferences.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - storageType?: StorageType | null | undefined; - } -@@ -1802,7 +1808,8 @@ declare namespace preferences { - * @syscap SystemCapability.DistributedDataManager.Preferences.Core - * @crossplatform - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - flushSync(): void; - -@@ -1841,7 +1848,8 @@ declare namespace preferences { - * @syscap SystemCapability.DistributedDataManager.Preferences.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'change', callback: Callback): void; - -@@ -1869,7 +1877,8 @@ declare namespace preferences { - * @throws { BusinessError } 15500019 - Failed to obtain the subscription service. - * @syscap SystemCapability.DistributedDataManager.Preferences.Core - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'multiProcessChange', callback: Callback): void; - -@@ -1885,7 +1894,8 @@ declare namespace preferences { - * @throws { BusinessError } 15500000 - Inner error. - * @syscap SystemCapability.DistributedDataManager.Preferences.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'dataChange', keys: Array, callback: Callback>): void; - -@@ -1924,7 +1934,8 @@ declare namespace preferences { - * @syscap SystemCapability.DistributedDataManager.Preferences.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'change', callback?: Callback): void; - -@@ -1950,7 +1961,8 @@ declare namespace preferences { - * @throws { BusinessError } 15500000 - Inner error. - * @syscap SystemCapability.DistributedDataManager.Preferences.Core - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'multiProcessChange', callback?: Callback): void; - -@@ -1966,7 +1978,8 @@ declare namespace preferences { - * @throws { BusinessError } 15500000 - Inner error. - * @syscap SystemCapability.DistributedDataManager.Preferences.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'dataChange', keys: Array, callback?: Callback>): void; - } -diff --git a/api/@ohos.data.relationalStore.d.ts b/api/@ohos.data.relationalStore.d.ts -index e1d3b94b0..87880840f 100644 ---- a/api/@ohos.data.relationalStore.d.ts -+++ b/api/@ohos.data.relationalStore.d.ts -@@ -1703,7 +1703,8 @@ declare namespace relationalStore { - * @enum { number } - * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core - * @crossplatform -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum ColumnType { - /** -@@ -1711,7 +1712,8 @@ declare namespace relationalStore { - * - * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core - * @crossplatform -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NULL, - -@@ -1722,7 +1724,8 @@ declare namespace relationalStore { - * - * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core - * @crossplatform -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INTEGER, - -@@ -1731,7 +1734,8 @@ declare namespace relationalStore { - * - * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core - * @crossplatform -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - REAL, - -@@ -1740,7 +1744,8 @@ declare namespace relationalStore { - * - * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core - * @crossplatform -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TEXT, - -@@ -1749,7 +1754,8 @@ declare namespace relationalStore { - * - * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core - * @crossplatform -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BLOB, - -@@ -1758,7 +1764,8 @@ declare namespace relationalStore { - * - * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core - * @crossplatform -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ASSET, - -@@ -1767,7 +1774,8 @@ declare namespace relationalStore { - * - * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core - * @crossplatform -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ASSETS, - -@@ -1776,7 +1784,8 @@ declare namespace relationalStore { - * - * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core - * @crossplatform -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FLOAT_VECTOR, - -@@ -1785,7 +1794,8 @@ declare namespace relationalStore { - * - * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core - * @crossplatform -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - UNLIMITED_INT, - } -@@ -2943,7 +2953,8 @@ declare namespace relationalStore { - * @throws { BusinessError } 14800034 - SQLite: Library used incorrectly. - * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core - * @crossplatform -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getColumnType(columnIdentifier: number | string): Promise; - -@@ -2976,7 +2987,8 @@ declare namespace relationalStore { - * @throws { BusinessError } 14800034 - SQLite: Library used incorrectly. - * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core - * @crossplatform -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getColumnTypeSync(columnIdentifier: number | string): ColumnType; - -diff --git a/api/@ohos.data.sendableRelationalStore.d.ets b/api/@ohos.data.sendableRelationalStore.d.ets -index f626f6eb4..b354d0419 100644 ---- a/api/@ohos.data.sendableRelationalStore.d.ets -+++ b/api/@ohos.data.sendableRelationalStore.d.ets -@@ -18,6 +18,7 @@ - * @kit ArkData - */ - -+import collections from '../arkts/@arkts.collections'; - import lang from '../arkts/@arkts.lang'; - import relationalStore from './@ohos.data.relationalStore'; - -@@ -98,31 +99,31 @@ declare namespace sendableRelationalStore { - /** - * Defines multiple assets in a column. - * -- * @typedef { Array } Assets -+ * @typedef { collections.Array } Assets - * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core - * @since 12 - */ -- type Assets = Array; -+ type Assets = collections.Array; - - /** - * Defines the types of the value in a KV pair. - * -- * @typedef { null | number | string | boolean | Uint8Array | Asset | Assets | -- * Float32Array | bigint } ValueType -+ * @typedef { null | number | string | boolean | collections.Uint8Array | Asset | Assets | -+ * collections.Float32Array | bigint } ValueType - * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core - * @since 12 - */ -- type ValueType = null | number | string | boolean | Uint8Array | Asset | Assets | -- Float32Array | bigint; -+ type ValueType = null | number | string | boolean | collections.Uint8Array | Asset | Assets | -+ collections.Float32Array | bigint; - - /** - * Defines the data stored in KV pairs in a ValuesBucket object. - * -- * @typedef { Map } ValuesBucket -+ * @typedef { collections.Map } ValuesBucket - * @syscap SystemCapability.DistributedDataManager.RelationalStore.Core - * @since 12 - */ -- type ValuesBucket = Map; -+ type ValuesBucket = collections.Map; - - /** - * Defines NonSendableBucket for convenience. -@@ -196,4 +197,4 @@ declare namespace sendableRelationalStore { - function toSendableAsset(asset: NonSendableAsset): Asset; - } - --export default sendableRelationalStore; -+export default sendableRelationalStore; -\ No newline at end of file -diff --git a/api/@ohos.data.unifiedDataChannel.d.ts b/api/@ohos.data.unifiedDataChannel.d.ts -index aec114e79..5ff539649 100644 ---- a/api/@ohos.data.unifiedDataChannel.d.ts -+++ b/api/@ohos.data.unifiedDataChannel.d.ts -@@ -53,24 +53,21 @@ declare namespace unifiedDataChannel { - * @enum { number } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - enum ShareOptions { - /** - * IN_APP indicates that only use in the same app is allowed. - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - IN_APP, - /** - * CROSS_APP indicates that use in any app in this device is allowed. - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - CROSS_APP - } -@@ -83,8 +80,7 @@ declare namespace unifiedDataChannel { - * @returns { UnifiedData } Return the UnifiedData required. - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - type GetDelayData = (type: string) => UnifiedData; - -@@ -111,8 +107,7 @@ declare namespace unifiedDataChannel { - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - class UnifiedDataProperties { - /** -@@ -120,8 +115,7 @@ declare namespace unifiedDataChannel { - * @type { ?Record } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - extras?: Record; - -@@ -130,8 +124,7 @@ declare namespace unifiedDataChannel { - * @type { ?string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - tag?: string; - /** -@@ -140,8 +133,7 @@ declare namespace unifiedDataChannel { - * @readonly - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - readonly timestamp?: Date; - /** -@@ -150,8 +142,7 @@ declare namespace unifiedDataChannel { - * @type { ?ShareOptions } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - shareOptions?: ShareOptions; - -@@ -160,8 +151,7 @@ declare namespace unifiedDataChannel { - * @type { ?GetDelayData } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - getDelayData?: GetDelayData; - } -@@ -441,7 +431,8 @@ declare namespace unifiedDataChannel { - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getType(): string; - -@@ -506,7 +497,8 @@ declare namespace unifiedDataChannel { - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getValue(): ValueType; - -@@ -579,7 +571,8 @@ declare namespace unifiedDataChannel { - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class Text extends UnifiedRecord { - /** -@@ -606,92 +599,85 @@ declare namespace unifiedDataChannel { - * @since 14 - */ - details?: Record; -- } - -- /** -- * Describe the unified plain text data -- * -- * @extends Text -- * @syscap SystemCapability.DistributedDataManager.UDMF.Core -- * @since 10 -- */ -- /** -- * Describe the unified plain text data -- * -- * @extends Text -- * @syscap SystemCapability.DistributedDataManager.UDMF.Core -- * @atomicservice -- * @since 11 -- */ -- /** -- * Describe the unified plain text data -- * -- * @extends Text -- * @syscap SystemCapability.DistributedDataManager.UDMF.Core -- * @crossplatform -- * @atomicservice -- * @since 14 -- */ -- class PlainText extends Text { - /** -- * Indicates the content of text -+ * Indicates the details of unified text - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the content of text -+ * Indicates the details of unified text - * -- * @type { string } -+ * @type { ?Record } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** -- * Indicates the content of text -+ * Indicates the details of unified text - * -- * @type { string } -+ * @type { ?Record } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ -- textContent: string; - /** -- * Indicates the abstract of text -+ * Indicates the details of unified text -+ * -+ * @returns { Record | undefined } the details of unified text -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get details(): Record | undefined; -+ -+ /** -+ * Indicates the details of unified text - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the abstract of text -+ * Indicates the details of unified text - * -- * @type { ?string } -+ * @type { ?Record } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** -- * Indicates the abstract of text -+ * Indicates the details of unified text - * -- * @type { ?string } -+ * @type { ?Record } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ -- abstract?: string; -+ /** -+ * Indicates the details of unified text -+ * -+ * @param { Record } the details of unified text -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set details(value: Record); - } - - /** -- * Describe the unified link data -+ * Describe the unified plain text data - * - * @extends Text - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Describe the unified link data -+ * Describe the unified plain text data - * - * @extends Text - * @syscap SystemCapability.DistributedDataManager.UDMF.Core -@@ -699,23 +685,24 @@ declare namespace unifiedDataChannel { - * @since 11 - */ - /** -- * Describe the unified link data -+ * Describe the unified plain text data - * - * @extends Text - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- class Hyperlink extends Text { -+ class PlainText extends Text { - /** -- * Indicates the url of a link -+ * Indicates the content of text - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the url of a link -+ * Indicates the content of text - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core -@@ -723,7 +710,7 @@ declare namespace unifiedDataChannel { - * @since 11 - */ - /** -- * Indicates the url of a link -+ * Indicates the content of text - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core -@@ -731,66 +718,50 @@ declare namespace unifiedDataChannel { - * @atomicservice - * @since 14 - */ -- url: string; -+ textContent: string; -+ - /** -- * Indicates the description of a link -+ * Indicates the content of text - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the description of a link -+ * Indicates the content of text - * -- * @type { ?string } -+ * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** -- * Indicates the description of a link -+ * Indicates the content of text - * -- * @type { ?string } -+ * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since 14 - */ -- description?: string; -- } -+ /** -+ * Indicates the content of text -+ * -+ * @returns { string } the content of text -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get textContent(): string; - -- /** -- * Describe the unified html data -- * -- * @extends Text -- * @syscap SystemCapability.DistributedDataManager.UDMF.Core -- * @since 10 -- */ -- /** -- * Describe the unified html data -- * -- * @extends Text -- * @syscap SystemCapability.DistributedDataManager.UDMF.Core -- * @atomicservice -- * @since 11 -- */ -- /** -- * Describe the unified html data -- * -- * @extends Text -- * @syscap SystemCapability.DistributedDataManager.UDMF.Core -- * @crossplatform -- * @atomicservice -- * @since 14 -- */ -- class HTML extends Text { - /** -- * Indicates the content of html, with html tags -+ * Indicates the content of text - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the content of html, with html tags -+ * Indicates the content of text - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core -@@ -798,7 +769,7 @@ declare namespace unifiedDataChannel { - * @since 11 - */ - /** -- * Indicates the content of html, with html tags -+ * Indicates the content of text - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core -@@ -806,15 +777,25 @@ declare namespace unifiedDataChannel { - * @atomicservice - * @since 14 - */ -- htmlContent: string; - /** -- * Indicates the plain content of html -+ * Indicates the content of text -+ * -+ * @param { string } the content of text -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set textContent(value: string); -+ -+ /** -+ * Indicates the abstract of text - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the plain content of html -+ * Indicates the abstract of text - * - * @type { ?string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core -@@ -822,7 +803,7 @@ declare namespace unifiedDataChannel { - * @since 11 - */ - /** -- * Indicates the plain content of html -+ * Indicates the abstract of text - * - * @type { ?string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core -@@ -830,68 +811,90 @@ declare namespace unifiedDataChannel { - * @atomicservice - * @since 14 - */ -- plainContent?: string; -+ abstract?: string; -+ -+ /** -+ * Indicates the abstract of text -+ * -+ * @returns { string | undefined } the abstract of text -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get textAbstract(): string | undefined; -+ -+ /** -+ * Indicates the abstract of text -+ * -+ * @param { string } the abstract of text -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set textAbstract(value: string); - } - - /** -- * Describe the unified file data -+ * Describe the unified link data - * -- * @extends UnifiedRecord -+ * @extends Text - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Describe the unified file data -+ * Describe the unified link data - * -- * @extends UnifiedRecord -+ * @extends Text - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** -- * Describe the unified file data -+ * Describe the unified link data - * -- * @extends UnifiedRecord -+ * @extends Text - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- class File extends UnifiedRecord { -+ class Hyperlink extends Text { - /** -- * Indicates the details of unified File -+ * Indicates the url of a link - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the details of unified File -+ * Indicates the url of a link - * -- * @type { ?Record } -+ * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** -- * Indicates the details of unified File -+ * Indicates the url of a link - * -- * @type { ?Record } -+ * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'14', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 14 - */ -- details?: Record; -+ url: string; -+ - /** -- * Indicates the uri of file -+ * Indicates the url of a link - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the uri of file -+ * Indicates the url of a link - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core -@@ -899,52 +902,33 @@ declare namespace unifiedDataChannel { - * @since 11 - */ - /** -- * Indicates the uri of file -+ * Indicates the url of a link - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'14', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 14 - */ -- uri: string; -- } -+ /** -+ * Indicates the url of a link -+ * -+ * @returns { string } the url of a link -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get url(): string; - -- /** -- * Describe the unified image data -- * -- * @extends File -- * @syscap SystemCapability.DistributedDataManager.UDMF.Core -- * @since 10 -- */ -- /** -- * Describe the unified image data -- * -- * @extends File -- * @syscap SystemCapability.DistributedDataManager.UDMF.Core -- * @atomicservice -- * @since 11 -- */ -- /** -- * Describe the unified image data -- * -- * @extends File -- * @syscap SystemCapability.DistributedDataManager.UDMF.Core -- * @crossplatform -- * @atomicservice -- * @since arkts {'1.1':'14', '1.2':'20'} -- * @arkts 1.1&1.2 -- */ -- class Image extends File { - /** -- * Indicates the uri of image -+ * Indicates the url of a link - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the uri of image -+ * Indicates the url of a link - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core -@@ -952,52 +936,153 @@ declare namespace unifiedDataChannel { - * @since 11 - */ - /** -- * Indicates the uri of image -+ * Indicates the url of a link - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'14', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 14 - */ -- imageUri: string; -+ /** -+ * Indicates the url of a link -+ * -+ * @param { string } the url of a link -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set url(value: string); -+ -+ /** -+ * Indicates the description of a link -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the description of a link -+ * -+ * @type { ?string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the description of a link -+ * -+ * @type { ?string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ description?: string; -+ -+ /** -+ * Indicates the description of a link -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the description of a link -+ * -+ * @type { ?string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the description of a link -+ * -+ * @type { ?string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ /** -+ * Indicates the description of a link -+ * -+ * @returns { string | undefined } the description of a link. -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get description(): string | undefined; -+ -+ /** -+ * Indicates the description of a link. -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the description of a link -+ * -+ * @type { ?string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the description of a link -+ * -+ * @type { ?string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ /** -+ * Indicates the description of a link -+ * -+ * @param { string } the description of a link -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set description(value: string); - } - - /** -- * Describe the unified video data -+ * Describe the unified html data - * -- * @extends File -+ * @extends Text - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Describe the unified video data -+ * Describe the unified html data - * -- * @extends File -+ * @extends Text - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ - /** -- * Describe the unified video data -+ * Describe the unified html data - * -- * @extends File -+ * @extends Text - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- class Video extends File { -+ class HTML extends Text { - /** -- * Indicates the uri of video -+ * Indicates the content of html, with html tags - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the uri of video -+ * Indicates the content of html, with html tags - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core -@@ -1005,51 +1090,24 @@ declare namespace unifiedDataChannel { - * @since 11 - */ - /** -- * Indicates the uri of video -+ * Indicates the content of html, with html tags - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'14', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 14 - */ -- videoUri: string; -- } -+ htmlContent: string; - -- /** -- * Describe the unified audio data -- * -- * @extends File -- * @syscap SystemCapability.DistributedDataManager.UDMF.Core -- * @since 10 -- */ -- /** -- * Describe the unified audio data -- * -- * @extends File -- * @syscap SystemCapability.DistributedDataManager.UDMF.Core -- * @atomicservice -- * @since 11 -- */ -- /** -- * Describe the unified audio data -- * -- * @extends File -- * @syscap SystemCapability.DistributedDataManager.UDMF.Core -- * @crossplatform -- * @atomicservice -- * @since 14 -- */ -- class Audio extends File { - /** -- * Indicates the uri of audio -+ * Indicates the content of html, with html tags - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the uri of audio -+ * Indicates the content of html, with html tags - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core -@@ -1057,7 +1115,7 @@ declare namespace unifiedDataChannel { - * @since 11 - */ - /** -- * Indicates the uri of audio -+ * Indicates the content of html, with html tags - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core -@@ -1065,42 +1123,25 @@ declare namespace unifiedDataChannel { - * @atomicservice - * @since 14 - */ -- audioUri: string; -- } -+ /** -+ * Indicates the content of html, with html tags -+ * -+ * @returns { string } the content of html -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get htmlContent(): string; - -- /** -- * Describe the unified folder data -- * -- * @extends File -- * @syscap SystemCapability.DistributedDataManager.UDMF.Core -- * @since 10 -- */ -- /** -- * Describe the unified folder data -- * -- * @extends File -- * @syscap SystemCapability.DistributedDataManager.UDMF.Core -- * @atomicservice -- * @since 11 -- */ -- /** -- * Describe the unified folder data -- * -- * @extends File -- * @syscap SystemCapability.DistributedDataManager.UDMF.Core -- * @crossplatform -- * @atomicservice -- * @since 14 -- */ -- class Folder extends File { - /** -- * Indicates the uri of folder -+ * Indicates the content of html, with html tags - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the uri of folder -+ * Indicates the content of html, with html tags - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core -@@ -1108,7 +1149,7 @@ declare namespace unifiedDataChannel { - * @since 11 - */ - /** -- * Indicates the uri of folder -+ * Indicates the content of html, with html tags - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core -@@ -1116,232 +1157,1607 @@ declare namespace unifiedDataChannel { - * @atomicservice - * @since 14 - */ -- folderUri: string; -- } -+ /** -+ * Indicates the content of html, with html tags -+ * -+ * @param { string } the content of html -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set htmlContent(value: string); - -- /** -- * Describe system defined type data(this kind of data is provided and bound to OpenHarmony, -- * also can be parsed by system provided API) -- * -- * @extends UnifiedRecord -- * @syscap SystemCapability.DistributedDataManager.UDMF.Core -- * @since 10 -- */ -- /** -- * Describe system defined type data(this kind of data is provided and bound to OpenHarmony, -- * also can be parsed by system provided API) -- * -- * @extends UnifiedRecord -- * @syscap SystemCapability.DistributedDataManager.UDMF.Core -- * @atomicservice -- * @since 11 -- */ -- class SystemDefinedRecord extends UnifiedRecord { - /** -- * Indicates the details of system defined data -+ * Indicates the plain content of html - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the details of system defined data -+ * Indicates the plain content of html - * -- * @type { ?Record } -+ * @type { ?string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ -- details?: Record; -- } -+ /** -+ * Indicates the plain content of html -+ * -+ * @type { ?string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ plainContent?: string; - -- /** -- * Describe system defined form data(this kind of data is provided and bound to OpenHarmony, -- * also can be parsed by system provided API) -- * -- * @extends SystemDefinedRecord -- * @syscap SystemCapability.DistributedDataManager.UDMF.Core -- * @since 10 -- */ -- /** -- * Describe system defined form data(this kind of data is provided and bound to OpenHarmony, -+ /** -+ * Indicates the plain content of html -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the plain content of html -+ * -+ * @type { ?string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the plain content of html -+ * -+ * @type { ?string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ /** -+ * Indicates the plain content of html -+ * -+ * @returns { string | undefined } the plain content of html -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get plainContent(): string | undefined; -+ -+ /** -+ * Indicates the plain content of html -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the plain content of html -+ * -+ * @type { ?string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the plain content of html -+ * -+ * @type { ?string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ /** -+ * Indicates the plain content of html -+ * -+ * @param { string } the plain content of html -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set plainContent(value: string); -+ } -+ -+ /** -+ * Describe the unified file data -+ * -+ * @extends UnifiedRecord -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Describe the unified file data -+ * -+ * @extends UnifiedRecord -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Describe the unified file data -+ * -+ * @extends UnifiedRecord -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ class File extends UnifiedRecord { -+ /** -+ * Indicates the details of unified File -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the details of unified File -+ * -+ * @type { ?Record } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the details of unified File -+ * -+ * @type { ?Record } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ details?: Record; -+ -+ /** -+ * Indicates the details of unified File -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the details of unified File -+ * -+ * @type { ?Record } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the details of unified File -+ * -+ * @type { ?Record } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ /** -+ * Indicates the details of unified File -+ * -+ * @returns { Record | undefined } the details of unified File -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get details(): Record | undefined; -+ -+ /** -+ * Indicates the details of unified File -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the details of unified File -+ * -+ * @type { ?Record } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the details of unified File -+ * -+ * @type { ?Record } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ /** -+ * Indicates the details of unified File -+ * -+ * @param { Record } the details of unified File -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set details(value: Record); -+ -+ /** -+ * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * URI of the local file or online file. The local file URI can be obtained using the getUriFromPath function. -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ uri: string; -+ -+ /** -+ * Indicates the uri of file -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the uri of file -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the uri of file -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ /** -+ * Indicates the uri of file -+ * -+ * @returns { string } the uri of file -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get uri(): string; -+ -+ /** -+ * Indicates the uri of file -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the uri of file -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the uri of file -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ /** -+ * Indicates the uri of file -+ * -+ * @param { string } the uri of file -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set uri(value: string); -+ } -+ -+ /** -+ * Describe the unified image data -+ * -+ * @extends File -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Describe the unified image data -+ * -+ * @extends File -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Describe the unified image data -+ * -+ * @extends File -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ class Image extends File { -+ /** -+ * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * URI of the local image or online image. The local image URI can be obtained using the getUriFromPath function. -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ imageUri: string; -+ -+ /** -+ * Indicates the uri of image -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the uri of image -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the uri of image -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ /** -+ * Indicates the uri of image -+ * -+ * @returns { string } the uri of image -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get imageUri(): string; -+ -+ /** -+ * Indicates the uri of image -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the uri of image -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the uri of image -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ /** -+ * Indicates the uri of image -+ * -+ * @param { string } the uri of image -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set imageUri(value: string); -+ } -+ -+ /** -+ * Describe the unified video data -+ * -+ * @extends File -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Describe the unified video data -+ * -+ * @extends File -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Describe the unified video data -+ * -+ * @extends File -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ class Video extends File { -+ /** -+ * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * URI of the local video or online video. The local video URI can be obtained using the getUriFromPath function. -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ videoUri: string; -+ -+ /** -+ * Indicates the uri of video -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the uri of video -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the uri of video -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ /** -+ * Indicates the uri of video -+ * -+ * @returns { string } the uri of video -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get videoUri(): string; -+ -+ /** -+ * Indicates the uri of video -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the uri of video -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the uri of video -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ /** -+ * Indicates the uri of video -+ * -+ * @param { string } the uri of video -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set videoUri(value: string); -+ } -+ -+ /** -+ * Describe the unified audio data -+ * -+ * @extends File -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Describe the unified audio data -+ * -+ * @extends File -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Describe the unified audio data -+ * -+ * @extends File -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ class Audio extends File { -+ /** -+ * URI of the local audio or online audio. The local audio URI can be obtained using the getUriFromPath function. -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * URI of the local audio or online audio. The local audio URI can be obtained using the getUriFromPath function. -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * URI of the local audio or online audio. The local audio URI can be obtained using the getUriFromPath function. -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ audioUri: string; -+ -+ /** -+ * Indicates the uri of audio -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the uri of audio -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the uri of audio -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ /** -+ * Indicates the uri of audio -+ * -+ * @returns { string } the uri of audio -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get audioUri(): string; -+ -+ /** -+ * Indicates the uri of audio -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the uri of audio -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the uri of audio -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ /** -+ * Indicates the uri of audio -+ * -+ * @param { string } the uri of audio -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set audioUri(value: string); -+ } -+ -+ /** -+ * Describe the unified folder data -+ * -+ * @extends File -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Describe the unified folder data -+ * -+ * @extends File -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Describe the unified folder data -+ * -+ * @extends File -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ class Folder extends File { -+ /** -+ * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * URI of the local folder or online folder. The local folder URI can be obtained using the getUriFromPath function. -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ folderUri: string; -+ -+ /** -+ * Indicates the uri of folder -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the uri of folder -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the uri of folder -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ /** -+ * Indicates the uri of folder -+ * -+ * @returns { string } the uri of folder -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get folderUri(): string; -+ -+ /** -+ * Indicates the uri of folder -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the uri of folder -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the uri of folder -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 14 -+ */ -+ /** -+ * Indicates the uri of folder -+ * -+ * @param { string } the uri of folder -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set folderUri(value: string); -+ } -+ -+ /** -+ * Describe system defined type data(this kind of data is provided and bound to OpenHarmony, -+ * also can be parsed by system provided API) -+ * -+ * @extends UnifiedRecord -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Describe system defined type data(this kind of data is provided and bound to OpenHarmony, -+ * also can be parsed by system provided API) -+ * -+ * @extends UnifiedRecord -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ class SystemDefinedRecord extends UnifiedRecord { -+ /** -+ * Indicates the details of system defined data -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the details of system defined data -+ * -+ * @type { ?Record } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ details?: Record; -+ -+ /** -+ * Indicates the details of system defined data -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the details of system defined data -+ * -+ * @type { ?Record } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the details of system defined data -+ * -+ * @returns { Record | undefined } the details of system defined data -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get details(): Record | undefined; -+ -+ /** -+ * Indicates the details of system defined data -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the details of system defined data -+ * -+ * @type { ?Record } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the details of system defined data -+ * -+ * @param { Record } the details of system defined data -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set details(value: Record); -+ } -+ -+ /** -+ * Describe system defined form data(this kind of data is provided and bound to OpenHarmony, -+ * also can be parsed by system provided API) -+ * -+ * @extends SystemDefinedRecord -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Describe system defined form data(this kind of data is provided and bound to OpenHarmony, -+ * also can be parsed by system provided API) -+ * -+ * @extends SystemDefinedRecord -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ class SystemDefinedForm extends SystemDefinedRecord { -+ /** -+ * Indicates the id of form -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the id of form -+ * -+ * @type { number } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ formId: number; -+ -+ /** -+ * Indicates the id of form -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the id of form -+ * -+ * @type { number } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the id of form -+ * -+ * @returns { number } the id of form -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get formId(): number; -+ -+ /** -+ * Indicates the id of form -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the id of form -+ * -+ * @type { number } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the id of form -+ * -+ * @param { number } the id of form -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set formId(value: number); -+ -+ /** -+ * Indicates the name of form -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the name of form -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ formName: string; -+ -+ /** -+ * Indicates the name of form -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the name of form -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the name of form -+ * -+ * @returns { string } the name of form -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get formName(): string; -+ -+ /** -+ * Indicates the name of form -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the name of form -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the name of form -+ * -+ * @param { string } the name of form -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set formName(value: string); -+ -+ /** -+ * Indicates the bundle name of form -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the bundle name of form -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ bundleName: string; -+ -+ /** -+ * Indicates the bundle name of form -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the bundle name of form -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the bundle name of form -+ * -+ * @returns { string } the bundle name of form -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get bundleName(): string; -+ -+ /** -+ * Indicates the bundle name of form -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the bundle name of form -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the bundle name of form -+ * -+ * @param { string } the bundle name of form -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set bundleName(value: string); -+ -+ /** -+ * Indicates the ability name of form -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the ability name of form -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ abilityName: string; -+ -+ /** -+ * Indicates the ability name of form -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the ability name of form -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the ability name of form -+ * -+ * @returns { string } the ability name of form -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get abilityName(): string; -+ -+ /** -+ * Indicates the ability name of form -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the ability name of form -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the ability name of form -+ * -+ * @param { string } the ability name of form -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set abilityName(value: string); -+ -+ /** -+ * Indicates the module of form -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the module of form -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ module: string; -+ -+ /** -+ * Indicates the module of form -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the module of form -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the module of form -+ * -+ * @returns { string } the module of form -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get module(): string; -+ -+ /** -+ * Indicates the module of form -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the module of form -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the module of form -+ * -+ * @param { string } the module of form -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set module(value: string); -+ } -+ -+ /** -+ * Describe system defined app item data(this kind of data is provided and bound to OpenHarmony, -+ * also can be parsed by system provided API) -+ * -+ * @extends SystemDefinedRecord -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Describe system defined app item data(this kind of data is provided and bound to OpenHarmony, - * also can be parsed by system provided API) - * - * @extends SystemDefinedRecord - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- class SystemDefinedForm extends SystemDefinedRecord { -+ class SystemDefinedAppItem extends SystemDefinedRecord { -+ /** -+ * Indicates the app id -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the app id -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ appId: string; -+ -+ /** -+ * Indicates the app id -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the app id -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the app id -+ * -+ * @returns { string } the app id -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get appId(): string; -+ -+ /** -+ * Indicates the app id -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the app id -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the app id -+ * -+ * @param { string } the app id -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set appId(value: string); -+ -+ /** -+ * Indicates the app name -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the app name -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ appName: string; -+ -+ /** -+ * Indicates the app name -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the app name -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the app name -+ * -+ * @returns { string } the app name -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get appName(): string; -+ -+ /** -+ * Indicates the app name -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the app name -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the app name -+ * -+ * @param { string } the app name -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set appName(value: string); -+ -+ /** -+ * Indicates the id of app icon -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the id of app icon -+ * -+ * @type { string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ appIconId: string; -+ - /** -- * Indicates the id of form -+ * Indicates the id of app icon - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the id of form -+ * Indicates the id of app icon - * -- * @type { number } -+ * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ -- formId: number; - /** -- * Indicates the name of form -+ * Indicates the id of app icon -+ * -+ * @returns { string } the id of app icon -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get appIconId(): string; -+ -+ /** -+ * Indicates the id of app icon - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the name of form -+ * Indicates the id of app icon - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ -- formName: string; - /** -- * Indicates the bundle name of form -+ * Indicates the id of app icon -+ * -+ * @param { string } the id of app icon -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set appIconId(value: string); -+ -+ /** -+ * Indicates the id of app label - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the bundle name of form -+ * Indicates the id of app label - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ -- bundleName: string; -+ appLabelId: string; -+ - /** -- * Indicates the ability name of form -+ * Indicates the id of app label - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the ability name of form -+ * Indicates the id of app label - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ -- abilityName: string; - /** -- * Indicates the module of form -+ * Indicates the id of app label -+ * -+ * @returns { string } the id of app label -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get appLabelId(): string; -+ -+ /** -+ * Indicates the id of app label - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the module of form -+ * Indicates the id of app label - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ -- module: string; -- } -+ /** -+ * Indicates the id of app label -+ * -+ * @param { string } the id of app label -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set appLabelId(value: string); - -- /** -- * Describe system defined app item data(this kind of data is provided and bound to OpenHarmony, -- * also can be parsed by system provided API) -- * -- * @extends SystemDefinedRecord -- * @syscap SystemCapability.DistributedDataManager.UDMF.Core -- * @since 10 -- */ -- /** -- * Describe system defined app item data(this kind of data is provided and bound to OpenHarmony, -- * also can be parsed by system provided API) -- * -- * @extends SystemDefinedRecord -- * @syscap SystemCapability.DistributedDataManager.UDMF.Core -- * @atomicservice -- * @since 11 -- */ -- class SystemDefinedAppItem extends SystemDefinedRecord { - /** -- * Indicates the app id -+ * Indicates the bundle name of app - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the app id -+ * Indicates the bundle name of app - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ -- appId: string; -+ bundleName: string; -+ - /** -- * Indicates the app name -+ * Indicates the bundle name of app - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the app name -+ * Indicates the bundle name of app - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ -- appName: string; - /** -- * Indicates the id of app icon -+ * Indicates the bundle name of app -+ * -+ * @returns { string } the bundle name of app -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get bundleName(): string; -+ -+ /** -+ * Indicates the bundle name of app - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the id of app icon -+ * Indicates the bundle name of app - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ -- appIconId: string; - /** -- * Indicates the id of app label -+ * Indicates the bundle name of app -+ * -+ * @param { string } the bundle name of app -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set bundleName(value: string); -+ -+ /** -+ * Indicates the ability name of app - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the id of app label -+ * Indicates the ability name of app - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ -- appLabelId: string; -+ abilityName: string; -+ - /** -- * Indicates the bundle name of app -+ * Indicates the ability name of app - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @since 10 - */ - /** -- * Indicates the bundle name of app -+ * Indicates the ability name of app - * - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice - * @since 11 - */ -- bundleName: string; -+ /** -+ * Indicates the ability name of app -+ * -+ * @returns { string } the ability name of app -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get abilityName(): string; -+ - /** - * Indicates the ability name of app - * -@@ -1356,7 +2772,15 @@ declare namespace unifiedDataChannel { - * @atomicservice - * @since 11 - */ -- abilityName: string; -+ /** -+ * Indicates the ability name of app -+ * -+ * @param { string } the ability name of app -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set abilityName(value: string); - } - - /** -@@ -1374,7 +2798,8 @@ declare namespace unifiedDataChannel { - * @extends SystemDefinedRecord - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class SystemDefinedPixelMap extends SystemDefinedRecord { - /** -@@ -1392,6 +2817,54 @@ declare namespace unifiedDataChannel { - * @since 11 - */ - rawData: Uint8Array; -+ -+ /** -+ * Indicates the raw data of pixel map -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the raw data of pixel map -+ * -+ * @type { Uint8Array } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the raw data of pixel map -+ * -+ * @returns { Uint8Array } the raw data of pixel map -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get rawData(): Uint8Array; -+ -+ /** -+ * Indicates the raw data of pixel map -+ * -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 10 -+ */ -+ /** -+ * Indicates the raw data of pixel map -+ * -+ * @type { Uint8Array } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 11 -+ */ -+ /** -+ * Indicates the raw data of pixel map -+ * -+ * @param { Uint8Array } the raw data of pixel map -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set rawData(value: Uint8Array); - } - - /** -@@ -1459,7 +2932,8 @@ declare namespace unifiedDataChannel { - * @enum { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum Intention { - /** -@@ -1473,7 +2947,8 @@ declare namespace unifiedDataChannel { - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DATA_HUB = 'DataHub', - -@@ -1509,7 +2984,16 @@ declare namespace unifiedDataChannel { - * @atomicservice - * @since 11 - */ -- type Options = { -+ /** -+ * Describe the optional arguments of data operation -+ * -+ * @typedef { Options } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.1&1.2 -+ */ -+ interface Options { - /** - * Indicates the target Intention - * -@@ -1523,6 +3007,15 @@ declare namespace unifiedDataChannel { - * @atomicservice - * @since 11 - */ -+ /** -+ * Indicates the target Intention -+ * -+ * @type { ?Intention } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.1&1.2 -+ */ - intention?: Intention; - - /** -@@ -1538,8 +3031,17 @@ declare namespace unifiedDataChannel { - * @atomicservice - * @since 11 - */ -+ /** -+ * Indicates the unique identifier of target UnifiedData -+ * -+ * @type { ?string } -+ * @syscap SystemCapability.DistributedDataManager.UDMF.Core -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.1&1.2 -+ */ - key?: string; -- }; -+ } - - /** - * Defines the types of file conflict options when getting data from the UDMF. -@@ -1547,7 +3049,8 @@ declare namespace unifiedDataChannel { - * @enum { number } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum FileConflictOptions { - /** -@@ -1555,7 +3058,8 @@ declare namespace unifiedDataChannel { - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - OVERWRITE, - -@@ -1564,7 +3068,8 @@ declare namespace unifiedDataChannel { - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SKIP - } -@@ -1575,7 +3080,8 @@ declare namespace unifiedDataChannel { - * @enum { number } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum ProgressIndicator { - /** -@@ -1583,7 +3089,8 @@ declare namespace unifiedDataChannel { - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NONE, - -@@ -1592,7 +3099,8 @@ declare namespace unifiedDataChannel { - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DEFAULT - } -@@ -1603,7 +3111,8 @@ declare namespace unifiedDataChannel { - * @enum { number } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum ListenerStatus { - /** -@@ -1611,7 +3120,8 @@ declare namespace unifiedDataChannel { - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FINISHED = 0, - -@@ -1620,7 +3130,8 @@ declare namespace unifiedDataChannel { - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PROCESSING, - -@@ -1629,7 +3140,8 @@ declare namespace unifiedDataChannel { - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CANCELED, - -@@ -1638,7 +3150,8 @@ declare namespace unifiedDataChannel { - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INNER_ERROR = 200, - -@@ -1647,7 +3160,8 @@ declare namespace unifiedDataChannel { - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INVALID_PARAMETERS, - -@@ -1656,7 +3170,8 @@ declare namespace unifiedDataChannel { - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DATA_NOT_FOUND, - -@@ -1665,7 +3180,8 @@ declare namespace unifiedDataChannel { - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SYNC_FAILED, - -@@ -1674,7 +3190,8 @@ declare namespace unifiedDataChannel { - * - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - COPY_FILE_FAILED, - } -@@ -1685,7 +3202,8 @@ declare namespace unifiedDataChannel { - * @interface ProgressInfo - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ProgressInfo { - /** -@@ -1694,7 +3212,8 @@ declare namespace unifiedDataChannel { - * @type { number } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - progress: number; - -@@ -1704,7 +3223,8 @@ declare namespace unifiedDataChannel { - * @type { ListenerStatus } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - status: ListenerStatus; - } -@@ -1717,7 +3237,8 @@ declare namespace unifiedDataChannel { - * @param { UnifiedData | null } data - Data obtained when the progress reaches 100%. - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type DataProgressListener = (progressInfo: ProgressInfo, data: UnifiedData | null) => void; - -@@ -1727,7 +3248,8 @@ declare namespace unifiedDataChannel { - * @interface GetDataParams - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface GetDataParams { - /** -@@ -1736,7 +3258,8 @@ declare namespace unifiedDataChannel { - * @type { ProgressIndicator } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - progressIndicator: ProgressIndicator; - -@@ -1746,7 +3269,8 @@ declare namespace unifiedDataChannel { - * @type { DataProgressListener } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - dataProgressListener: DataProgressListener; - -@@ -1756,7 +3280,8 @@ declare namespace unifiedDataChannel { - * @type { string } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - destUri?: string; - -@@ -1766,7 +3291,8 @@ declare namespace unifiedDataChannel { - * @type { FileConflictOptions } - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - fileConflictOptions?: FileConflictOptions; - } -@@ -1792,7 +3318,8 @@ declare namespace unifiedDataChannel { - *
    2.Incorrect parameters types. - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function insertData(options: Options, data: UnifiedData, callback: AsyncCallback): void; - -@@ -1817,7 +3344,8 @@ declare namespace unifiedDataChannel { - *
    2.Incorrect parameters types. - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function insertData(options: Options, data: UnifiedData): Promise; - -@@ -1890,7 +3418,8 @@ declare namespace unifiedDataChannel { - *
    2.Incorrect parameters types. - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function queryData(options: Options, callback: AsyncCallback>): void; - -@@ -1913,7 +3442,8 @@ declare namespace unifiedDataChannel { - *
    2.Incorrect parameters types. - * @syscap SystemCapability.DistributedDataManager.UDMF.Core - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function queryData(options: Options): Promise>; - -diff --git a/api/@ohos.deviceInfo.d.ets b/api/@ohos.deviceInfo.d.ets -index 0977a3373..0297a224d 100644 ---- a/api/@ohos.deviceInfo.d.ets -+++ b/api/@ohos.deviceInfo.d.ets -@@ -1,6 +1,6 @@ - /* -- * Copyright (c) 2021 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"), - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * -@@ -12,6 +12,7 @@ - * See the License for the specific language governing permissions and - * limitations under the License. - */ -+ - /** - * @file - * @kit BasicServicesKit -@@ -20,11 +21,11 @@ - /** - * A static class pertaining to the product information. - * -- * @namespace deviceInfo -+ * @class deviceInfo - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform -- * @atomicservice - * @since 20 -+ * @arkts 1.2 - */ - declare class deviceInfo { - -@@ -36,8 +37,8 @@ declare class deviceInfo { - * - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform -- * @atomicservice - * @since 20 -+ * @arkts 1.2 - */ - static get deviceType(): string; - -@@ -48,6 +49,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get manufacture(): string; - -@@ -58,6 +60,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get brand(): string; - -@@ -68,6 +71,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get marketName(): string; - -@@ -78,6 +82,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get productSeries(): string; - -@@ -88,8 +93,8 @@ declare class deviceInfo { - * - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform -- * @atomicservice - * @since 20 -+ * @arkts 1.2 - */ - static get productModel(): string; - -@@ -98,8 +103,8 @@ declare class deviceInfo { - * - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform -- * @atomicservice - * @since 20 -+ * @arkts 1.2 - */ - static get productModelAlias(): string; - -@@ -110,6 +115,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get softwareModel(): string; - -@@ -120,6 +126,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get hardwareModel(): string; - -@@ -130,6 +137,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get hardwareProfile(): string; - -@@ -140,6 +148,7 @@ declare class deviceInfo { - * - * @syscap SystemCapability.Startup.SystemInfo - * @since 20 -+ * @arkts 1.2 - */ - static get serial(): string; - -@@ -150,6 +159,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get bootloaderVersion(): string; - -@@ -160,6 +170,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get abiList(): string; - -@@ -170,6 +181,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get securityPatchTag(): string; - -@@ -180,6 +192,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get displayVersion(): string; - -@@ -190,6 +203,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get incrementalVersion(): string; - -@@ -202,6 +216,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get osReleaseType(): string; - -@@ -212,8 +227,8 @@ declare class deviceInfo { - * - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform -- * @atomicservice - * @since 20 -+ * @arkts 1.2 - */ - static get osFullName(): string; - -@@ -225,6 +240,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get majorVersion(): int; - -@@ -237,6 +253,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get seniorVersion(): int; - -@@ -248,6 +265,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get featureVersion(): int; - -@@ -259,6 +277,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get buildVersion(): int; - -@@ -269,8 +288,8 @@ declare class deviceInfo { - * - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform -- * @atomicservice - * @since 20 -+ * @arkts 1.2 - */ - static get sdkApiVersion(): int; - -@@ -281,6 +300,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get firstApiVersion(): int; - -@@ -291,6 +311,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get versionId(): string; - -@@ -301,6 +322,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get buildType(): string; - -@@ -311,6 +333,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get buildUser(): string; - -@@ -321,6 +344,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get buildHost(): string; - -@@ -331,6 +355,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get buildTime(): string; - -@@ -341,6 +366,7 @@ declare class deviceInfo { - * @syscap SystemCapability.Startup.SystemInfo - * @crossplatform - * @since 20 -+ * @arkts 1.2 - */ - static get buildRootHash(): string; - -@@ -351,6 +377,7 @@ declare class deviceInfo { - * - * @syscap SystemCapability.Startup.SystemInfo - * @since 20 -+ * @arkts 1.2 - */ - static get udid(): string; - -@@ -363,6 +390,7 @@ declare class deviceInfo { - * - * @syscap SystemCapability.Startup.SystemInfo - * @since 20 -+ * @arkts 1.2 - */ - static get distributionOSName(): string; - -@@ -375,6 +403,7 @@ declare class deviceInfo { - * - * @syscap SystemCapability.Startup.SystemInfo - * @since 20 -+ * @arkts 1.2 - */ - static get distributionOSVersion(): string; - -@@ -387,6 +416,7 @@ declare class deviceInfo { - * - * @syscap SystemCapability.Startup.SystemInfo - * @since 20 -+ * @arkts 1.2 - */ - static get distributionOSApiVersion(): int; - -@@ -397,6 +427,7 @@ declare class deviceInfo { - * - * @syscap SystemCapability.Startup.SystemInfo - * @since 20 -+ * @arkts 1.2 - */ - static get distributionOSApiName(): string; - -@@ -409,6 +440,7 @@ declare class deviceInfo { - * - * @syscap SystemCapability.Startup.SystemInfo - * @since 20 -+ * @arkts 1.2 - */ - static get distributionOSReleaseType(): string; - -@@ -430,6 +462,7 @@ declare class deviceInfo { - * - * @syscap SystemCapability.Startup.SystemInfo - * @since 20 -+ * @arkts 1.2 - */ - static get ODID(): string; - -@@ -439,7 +472,28 @@ declare class deviceInfo { - * @permission ohos.permission.ACCESS_DISK_PHY_INFO - * @syscap SystemCapability.Startup.SystemInfo - * @since 20 -+ * @arkts 1.2 - */ - static get diskSN(): string; -+ -+ /** -+ * Obtains the sdk minor api version -+ * -+ * @syscap SystemCapability.Startup.SystemInfo -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ static get sdkMinorApiVersion(): int; -+ -+ /** -+ * Obtains the sdk patch api version -+ * -+ * @syscap SystemCapability.Startup.SystemInfo -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ static get sdkPatchApiVersion(): int; - } - export default deviceInfo; -diff --git a/api/@ohos.deviceStatus.dragInteraction.d.ts b/api/@ohos.deviceStatus.dragInteraction.d.ts -index 7beaaf44f..c9a2540e6 100644 ---- a/api/@ohos.deviceStatus.dragInteraction.d.ts -+++ b/api/@ohos.deviceStatus.dragInteraction.d.ts -@@ -26,7 +26,8 @@ import { Callback } from './@ohos.base'; - * @namespace dragInteraction - * @syscap SystemCapability.Msdp.DeviceStatus.Drag - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace dragInteraction { - /** -@@ -35,7 +36,8 @@ declare namespace dragInteraction { - * @enum { number } - * @syscap SystemCapability.Msdp.DeviceStatus.Drag - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum DragState { - /** -@@ -43,7 +45,8 @@ declare namespace dragInteraction { - * - * @syscap SystemCapability.Msdp.DeviceStatus.Drag - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MSG_DRAG_STATE_START = 1, - -@@ -52,7 +55,8 @@ declare namespace dragInteraction { - * - * @syscap SystemCapability.Msdp.DeviceStatus.Drag - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MSG_DRAG_STATE_STOP = 2, - -@@ -61,7 +65,8 @@ declare namespace dragInteraction { - * - * @syscap SystemCapability.Msdp.DeviceStatus.Drag - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MSG_DRAG_STATE_CANCEL = 3, - } -@@ -72,7 +77,8 @@ declare namespace dragInteraction { - * @interface Summary - * @syscap SystemCapability.Msdp.DeviceStatus.Drag - * @systemapi Hide this for inner system use. -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Summary { - /** -@@ -81,19 +87,21 @@ declare namespace dragInteraction { - * @type { string } - * @syscap SystemCapability.Msdp.DeviceStatus.Drag - * @systemapi Hide this for inner system use. -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - dataType: string; - - /** - * Data length of the dragged object. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Msdp.DeviceStatus.Drag - * @systemapi Hide this for inner system use. -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- dataSize: number; -+ dataSize: int; - } - - /** -@@ -117,7 +125,8 @@ declare namespace dragInteraction { - *
    2.Incorrect parameter types.3.Parameter verification failed. - * @syscap SystemCapability.Msdp.DeviceStatus.Drag - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'drag', callback: Callback): void; - -@@ -144,7 +153,8 @@ declare namespace dragInteraction { - *
    2.Incorrect parameter types.3.Parameter verification failed. - * @syscap SystemCapability.Msdp.DeviceStatus.Drag - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'drag', callback?: Callback): void; - -@@ -155,7 +165,8 @@ declare namespace dragInteraction { - * @throws {BusinessError} 202 - Permission verification failed. A non-system application calls a system API. - * @syscap SystemCapability.Msdp.DeviceStatus.Drag - * @systemapi Hide this for inner system use. -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getDataSummary(): Array

    ; - -diff --git a/api/@ohos.distributedHardware.mechanicManager.d.ts b/api/@ohos.distributedHardware.mechanicManager.d.ts -new file mode 100644 -index 000000000..5703aac77 ---- /dev/null -+++ b/api/@ohos.distributedHardware.mechanicManager.d.ts -@@ -0,0 +1,878 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"), -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+/** -+ * @file -+ * @kit MechanicKit -+ * @arkts 1.1&1.2 -+ */ -+ -+import type { Callback } from './@ohos.base'; -+ -+/** -+ * Provides capabilities for controlling and interacting with mechanical devices connected to this device. -+ * The capabilities cover connection management, control, and monitoring. -+ * -+ * @namespace mechanicManager -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ -+declare namespace mechanicManager { -+ -+ /** -+ * Subscribes to device attachment state change events. -+ * @param { 'attachStateChange' } type Event type. -+ * @param { Callback } callback Callback used to return the state change. -+ * @throws { BusinessError } 33300001 - Service exception. -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ function on(type: 'attachStateChange', callback: Callback): void; -+ -+ /** -+ * Unsubscribes from device attachment state change events. -+ * @param { 'attachStateChange' } type Event type. -+ * @param { Callback } [callback] Callback used to return the state change. -+ * @throws { BusinessError } 33300001 - Service exception. -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ function off(type: 'attachStateChange', callback?: Callback): void; -+ -+ /** -+ * Obtain the list of connected mechanical devices. -+ * @returns { MechInfo[] } List of connected mechanical devices. -+ * @throws { BusinessError } 33300001 - Service exception. -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ function getAttachedMechDevices(): MechInfo[]; -+ -+ /** -+ * Sets a user operation. -+ * @param { Operation } operation Operation type. -+ * @param { string } mac MAC address. -+ * @param { string } params Operation parameters. -+ * @throws { BusinessError } 202 - Not system application. -+ * @throws { BusinessError } 33300001 - Service exception. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ function setUserOperation(operation: Operation, mac: string, params: string): void; -+ -+ /** -+ * Enables or disables camera tracking. -+ * @param { boolean } isEnabled Whether to enable camera tracking. -+ * @throws { BusinessError } 33300001 - Service exception. -+ * @throws { BusinessError } 33300002 - Device not connected. -+ * @throws { BusinessError } 33300003 - Device not supported. -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ -+ function setCameraTrackingEnabled(isEnabled: boolean): void; -+ -+ /** -+ * Checks whether camera tracking is enabled for this mechanical device. -+ * @returns { boolean } Enabled status. The value true means that camera tracking is enabled, and false means -+ * the opposite. -+ * @throws { BusinessError } 33300001 - Service exception. -+ * @throws { BusinessError } 33300002 - Device not connected. -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ -+ function getCameraTrackingEnabled(): boolean; -+ -+ /** -+ * Subscribes to tracking events. -+ * @param { 'trackingStateChange' } type Event type. -+ * @param { Callback } callback Callback used to return the tracking event information. -+ * @throws { BusinessError } 33300001 - Service exception. -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ function on(type: 'trackingStateChange', callback: Callback): void; -+ -+ /** -+ * Unsubscribes from tracking events. -+ * @param { 'trackingStateChange' } type Event type. -+ * @param { Callback } [callback] Callback used to return the tracking event information. -+ * @throws { BusinessError } 33300001 - Service exception. -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ function off(type: 'trackingStateChange', callback?: Callback): void; -+ -+ /** -+ * Sets the camera tracking layout for this mechanical device. -+ * @param { CameraTrackingLayout } trackingLayout Camera tracking layout. -+ * @throws { BusinessError } 202 - Not system application. -+ * @throws { BusinessError } 33300001 - Service exception. -+ * @throws { BusinessError } 33300002 - Device not connected. -+ * @throws { BusinessError } 33300003 - Device not supported. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ -+ function setCameraTrackingLayout(trackingLayout: CameraTrackingLayout): void; -+ -+ /** -+ * Obtains the camera tracking layout of this mechanical device. -+ * @returns { CameraTrackingLayout } Camera tracking layout obtained. -+ * @throws { BusinessError } 33300001 - Service exception. -+ * @throws { BusinessError } 33300002 - Device not connected. -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ function getCameraTrackingLayout(): CameraTrackingLayout; -+ -+ /** -+ * Rotates a mechanical device to the relative angles. -+ * @param { int } mechId ID of the mechanical device. -+ * @param { RotationAngles } angles Relative angles. -+ * @param { int } duration Rotation duration. Unit: millisecond. -+ * @returns { Promise } Promise that return the execution result. -+ * @throws { BusinessError } 202 - Not system application. -+ * @throws { BusinessError } 33300001 - Service exception. -+ * @throws { BusinessError } 33300002 - Device not connected. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ -+ function rotate(mechId: int, angles: RotationAngles, duration: int): Promise; -+ -+ /** -+ * Rotates a mechanical device to the absolute angles. -+ * @param { int } mechId ID of the mechanical device. -+ * @param { EulerAngles } angles Absolute angles. -+ * @param { int } duration Rotation duration. Unit: millisecond. -+ * @returns { Promise } Promise that return the execution result. -+ * @throws { BusinessError } 202 - Not system application. -+ * @throws { BusinessError } 33300001 - Service exception. -+ * @throws { BusinessError } 33300002 - Device not connected. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ -+ function rotateToEulerAngles(mechId: int, angles: EulerAngles, duration: int): Promise; -+ -+ /** -+ * Obtains the maximum continuous rotation duration of a mechanical device. -+ * -+ * @param { int } mechId ID of the mechanical device. -+ * @returns { int } Maximum rotation duration. Unit: millisecond. -+ * @throws { BusinessError } 202 - Not system application. -+ * @throws { BusinessError } 33300001 - Service exception. -+ * @throws { BusinessError } 33300002 - Device not connected. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ function getMaxRotationTime(mechId: int): int; -+ -+ /** -+ * Obtains the maximum rotation speed of a mechanical device. -+ * -+ * @param { int } mechId ID of the mechanical device. -+ * @returns { RotationSpeed } Maximum speed. Only the absolute value of the speed is returned. -+ * @throws { BusinessError } 202 - Not system application. -+ * @throws { BusinessError } 33300001 - Service exception. -+ * @throws { BusinessError } 33300002 - Device not connected. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ function getMaxRotationSpeed(mechId: int): RotationSpeed; -+ -+ /** -+ * Rotates a mechanical device at the specified speed. -+ * @param { int } mechId ID of the mechanical device. -+ * @param { RotationSpeed } speed Rotation speed. -+ * @param { int } duration Rotation duration. Unit: millisecond. -+ * @returns { Promise } Promise that return the execution result. -+ * @throws { BusinessError } 202 - Not system application. -+ * @throws { BusinessError } 33300001 - Service exception. -+ * @throws { BusinessError } 33300002 - Device not connected. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ function rotateBySpeed(mechId: int, speed: RotationSpeed, duration: int): Promise; -+ -+ /** -+ * Stops a mechanical device from moving. -+ * @param { int } mechId ID of the mechanical device. -+ * @returns { Promise } Promise that returns no value. -+ * @throws { BusinessError } 202 - Not system application. -+ * @throws { BusinessError } 33300001 - Service exception. -+ * @throws { BusinessError } 33300002 - Device not connected. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ function stopMoving(mechId: int): Promise; -+ -+ /** -+ * Obtains the current angles of a mechanical device. -+ * @param { int } mechId ID of the mechanical device. -+ * @returns { EulerAngles } Rotation angles. -+ * @throws { BusinessError } 202 - Not system application. -+ * @throws { BusinessError } 33300001 - Service exception. -+ * @throws { BusinessError } 33300002 - Device not connected. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ -+ function getCurrentAngles(mechId: int): EulerAngles; -+ -+ /** -+ * Obtains the maximum rotation angles relative to the reference point for the specified mechanical device. -+ * -+ * @param { int } mechId ID of the mechanical device. -+ * @returns { RotationLimits } Maximum rotation angles. -+ * @throws { BusinessError } 202 - Not system application. -+ * @throws { BusinessError } 33300001 - Service exception. -+ * @throws { BusinessError } 33300002 - Device not connected. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ -+ function getRotationLimits(mechId: int): RotationLimits; -+ -+ /** -+ * Obtains the status of the rotation axes. -+ * @param { int } mechId ID of the mechanical device. -+ * @returns { RotationAxesStatus } Rotation axis status. -+ * @throws { BusinessError } 202 - Not system application. -+ * @throws { BusinessError } 33300001 - Service exception. -+ * @throws { BusinessError } 33300002 - Device not connected. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ function getRotationAxesStatus(mechId: int): RotationAxesStatus; -+ -+ -+ /** -+ * Register a listener for axis state changes. -+ * The status of the rotation axis changes dynamically, which needs to be monitored. -+ * -+ * @param { 'rotationAxesStatusChange' } type - Event type. -+ * @param { Callback } callback - Rotate axis state changes callback. -+ * @throws { BusinessError } 202 - Not system application. -+ * @throws { BusinessError } 33300001 - Service exception. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ function on(type: 'rotationAxesStatusChange', callback: Callback): void; -+ -+ /** -+ * Unregister a listener for axis state changes. -+ * -+ * @param { 'rotationAxesStatusChange' } type - Event type. -+ * @param { Callback } [callback] - Rotate axis state changes callback. -+ * @throws { BusinessError } 202 - Not system application. -+ * @throws { BusinessError } 33300001 - Service exception. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ function off(type: 'rotationAxesStatusChange', callback?: Callback): void; -+ -+ /** -+ * Mechanical device information. -+ * @typedef MechInfo -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ export interface MechInfo { -+ /** -+ * ID of the mechanical device. -+ * @type { int } -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ mechId: int; -+ -+ -+ /** -+ * Type of the mechanical device. -+ * @type { MechDeviceType } -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ mechDeviceType: MechDeviceType; -+ -+ /** -+ * Name of the mechanical device. -+ * @type { string } -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ mechName: string; -+ } -+ -+ -+ /** -+ * The rotion angles, relative to the current position. -+ * @typedef RotationAngles -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ export interface RotationAngles { -+ /** -+ * Yaw angle, ranging from -2π to 2*π, measured in radians. -+ * @type { ?double } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ -+ yaw?: double; -+ -+ /** -+ * Roll angle, ranging from -2π to 2*π, measured in radians. -+ * @type { ?double } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ -+ roll?: double; -+ -+ /** -+ * Pitch angle, ranging from -2π to 2*π, measured in radians. -+ * @type { ?double } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ -+ pitch?: double; -+ } -+ -+ /** -+ * Absolute euler angles relative to the home position. -+ * -+ * @typedef EulerAngles -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ export interface EulerAngles { -+ /** -+ * Yaw angle, ranging from -π to π, measured in radians. -+ * @type { ?double } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ -+ yaw?: double; -+ -+ /** -+ * Roll angle, ranging from -π to π, measured in radians. -+ * @type { ?double } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ -+ roll?: double; -+ -+ /** -+ * Pitch angle, ranging from -π to π, measured in radians. -+ * @type { ?double } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ -+ pitch?: double; -+ } -+ -+ /** -+ * Rotational speed. A negative value indicates a clockwise rotation, and a positive value indicates a -+ * counterclockwise rotation. -+ * @typedef RotationSpeed -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ -+ export interface RotationSpeed { -+ /** -+ * Yaw speed, measured in radians per second. -+ * @type { ?double } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ -+ yawSpeed?: double; -+ -+ /** -+ * Roll speed, measured in radians per second. -+ * @type { ?double } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ -+ rollSpeed?: double; -+ -+ /** -+ * Pitch speed, measured in radians per second. -+ * @type { ?double } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ -+ pitchSpeed?: double; -+ } -+ -+ -+ /** -+ * Rotation angle limits relative to the reference point. -+ * @typedef RotationLimits -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ -+ export interface RotationLimits { -+ /** -+ * Maximum yaw rotation angles in the negative direction, ranging from -2*Math.PI to 0, measured in radians. -+ * If the value is less than or equal to -2*Math.PI, there is no restriction. -+ * @type { double } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ negativeYawMax: double; -+ -+ /** -+ * Maximum yaw rotation angles in the positive direction, ranging from 0 to 2*Math.PI, measured in radians. -+ * If the value is greater than or equal to 2*Math.PI, there is no restriction. -+ * @type { double } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ positiveYawMax: double; -+ -+ /** -+ * Maximum roll rotation angles in the negative direction, ranging from -2*Math.PI to 0, measured in radians. -+ * If the value is less than or equal to -2*Math.PI, there is no restriction. -+ * @type { double } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ negativeRollMax: double; -+ -+ /** -+ * Maximum roll rotation angles in the positive direction, ranging from 0 to 2*Math.PI, measured in radians. -+ * If the value is greater than or equal to 2*Math.PI, there is no restriction. -+ * @type { double } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ positiveRollMax: double; -+ -+ /** -+ * Maximum pitch rotation angles in the negative direction, ranging from -2*Math.PI to 0, measured in radians. -+ * If the value is less than or equal to -2*Math.PI, there is no restriction. -+ * @type { double } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ negativePitchMax: double; -+ -+ /** -+ * Maximum pitch rotation angles in the positive direction, ranging from 0 to 2*Math.PI, measured in radians. -+ * If the value is greater than or equal to 2*Math.PI, there is no restriction. -+ * @type { double } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ positivePitchMax: double; -+ } -+ -+ /** -+ * Rotation axes status -+ * -+ * @typedef RotationAxesStatus -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ export interface RotationAxesStatus { -+ /** -+ * Whether the yaw axis is enabled. -+ * @type { boolean } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ yawEnabled: boolean; -+ -+ /** -+ * Whether the roll axis is enabled. -+ * @type { boolean } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ rollEnabled: boolean; -+ -+ /** -+ * Whether the pitch axis is enabled. -+ * @type { boolean } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ pitchEnabled: boolean; -+ -+ /** -+ * Whether the yaw axis is limited. -+ * @type { ?RotationAxisLimited } RotationAxisLimited -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ yawLimited?: RotationAxisLimited; -+ -+ /** -+ * Whether the roll axis is limited. -+ * @type { ?RotationAxisLimited } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ rollLimited?: RotationAxisLimited; -+ -+ /** -+ * Whether the pitch axis is limited. -+ * @type { ?RotationAxisLimited } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ pitchLimited?: RotationAxisLimited; -+ } -+ -+ /** -+ * Enumerates the rotation axis limit states. -+ * @enum { number } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ export enum RotationAxisLimited { -+ /** -+ * Not limited. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ NOT_LIMITED = 0, -+ -+ /** -+ * Negative limited. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ NEGATIVE_LIMITED = 1, -+ -+ /** -+ * Positive limited. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ POSITIVE_LIMITED = 2, -+ } -+ -+ /** -+ * Rotation axes state change information. -+ * @typedef RotationAxesStateChangeInfo -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ export interface RotationAxesStateChangeInfo { -+ /** -+ * ID of the mechanical device. -+ * @type { int } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ mechId: int; -+ -+ /** -+ * Rotate axis status. -+ * @type { RotationAxesStatus } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ status: RotationAxesStatus, -+ } -+ -+ /** -+ * Tracking event callback info. -+ * -+ * @typedef TrackingEventInfo -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ export interface TrackingEventInfo { -+ /** -+ * Tracking event. -+ * @type { TrackingEvent } Tracking event. -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ event: TrackingEvent; -+ } -+ -+ /** -+ * Callback information about the device attachment state change. -+ * @typedef AttachStateChangeInfo -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ export interface AttachStateChangeInfo { -+ -+ /** -+ * Device attachment state. -+ * @type { AttachState } -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ state: AttachState; -+ -+ /** -+ * Mechanical device information. -+ * @type { MechInfo } -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ mechInfo: MechInfo, -+ } -+ -+ /** -+ * Enumerates the user operations. -+ * @enum { number } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ export enum Operation { -+ /** -+ * Connection operation. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ CONNECT = 0, -+ -+ /** -+ * Disconnection operation. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ DISCONNECT = 1 -+ } -+ -+ /** -+ * Enumerates the tracking events. -+ * @enum { number } -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ -+ export enum TrackingEvent { -+ /** -+ * Camera tracking enabled by user. -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ CAMERA_TRACKING_USER_ENABLED = 0, -+ -+ /** -+ * Camera tracking disabled by user. -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ CAMERA_TRACKING_USER_DISABLED = 1, -+ -+ /** -+ * Camera tracking layout changed. You can call getCameraTrackingLayout to obtain the new layout. -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ CAMERA_TRACKING_LAYOUT_CHANGED = 2, -+ } -+ -+ /** -+ * Rotation execution results. -+ * -+ * @enum { number } -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ export enum Result { -+ /** -+ * Rotation completed. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ COMPLETED = 0, -+ -+ /** -+ * Rotation was interrupted. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ INTERRUPTED = 1, -+ -+ /** -+ * Device reached limitation. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ LIMITED = 2, -+ -+ /** -+ * Rotation time out. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ TIMEOUT = 3, -+ -+ /** -+ * Rotation failed due to system error. -+ * @syscap SystemCapability.Mechanic.Core -+ * @systemapi -+ * @since 20 -+ */ -+ SYSTEM_ERROR = 100 -+ } -+ -+ /** -+ * Enumerates the mechanical device types. -+ * @enum { number } -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ -+ export enum MechDeviceType { -+ /** -+ * Gimbal device. -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ -+ GIMBAL_DEVICE = 0 -+ } -+ -+ /** -+ * Device attach states. -+ * -+ * @enum { number } -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ export enum AttachState { -+ -+ /** -+ * Device attached. -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ ATTACHED = 0, -+ -+ /** -+ * Device detached. -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ DETACHED = 1 -+ } -+ -+ /** -+ * Enumerates the camera tracking layouts. -+ * @enum { number } -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ export enum CameraTrackingLayout { -+ /** -+ * Default layout. -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ DEFAULT = 0, -+ -+ /** -+ * Left-side layout. -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ LEFT = 1, -+ -+ /** -+ * Middle layout. -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ MIDDLE = 2, -+ -+ /** -+ * Right-side layout. -+ * @syscap SystemCapability.Mechanic.Core -+ * @since 20 -+ */ -+ RIGHT = 3 -+ } -+ -+} -+ -+export default mechanicManager; -\ No newline at end of file -diff --git a/api/@ohos.driver.deviceManager.d.ts b/api/@ohos.driver.deviceManager.d.ts -index d2f07bd2e..df0effd0d 100644 ---- a/api/@ohos.driver.deviceManager.d.ts -+++ b/api/@ohos.driver.deviceManager.d.ts -@@ -26,21 +26,23 @@ import type rpc from './@ohos.rpc'; - * - * @namespace deviceManager - * @syscap SystemCapability.Driver.ExternalDevice -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace deviceManager { - /** - * Query the external device list. - * - * @permission ohos.permission.ACCESS_EXTENSIONAL_DEVICE_DRIVER -- * @param { number } busType - The bus type of device to be queried. -+ * @param { int } busType - The bus type of device to be queried. - * @returns { Array> } External device list. - * @throws { BusinessError } 201 - The permission check failed. - * @throws { BusinessError } 22900001 - ExternalDeviceManager service exception or busType parameter error. - * @syscap SystemCapability.Driver.ExternalDevice -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function queryDevices(busType?: number): Array>; -+ function queryDevices(busType?: int): Array>; - - /** - * Bind the device based on the device information returned by queryDevices(). -@@ -161,7 +163,7 @@ declare namespace deviceManager { - * Queries external device information. - * - * @permission ohos.permission.ACCESS_EXTENSIONAL_DEVICE_DRIVER -- * @param { number } deviceId - ID of device to query. -+ * @param { long } deviceId - ID of device to query. - * @returns { Array> } Device information obtained. - * @throws { BusinessError } 201 - The permission check failed. - * @throws { BusinessError } 202 - Permission denied. A non-system application cannot call a system API. -@@ -169,9 +171,10 @@ declare namespace deviceManager { - * @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function queryDeviceInfo(deviceId?: number): Array>; -+ function queryDeviceInfo(deviceId?: long): Array>; - - /** - * Queries driver information. -@@ -185,53 +188,58 @@ declare namespace deviceManager { - * @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function queryDriverInfo(driverUid?: string): Array>; - -- /** -- * Bind the device based on the device information returned by queryDevices(). -- * -- * @permission ohos.permission.ACCESS_DDK_DRIVERS -- * @param { number } deviceId - Device id on the device list returned by queryDevices(). -- * @param { AsyncCallback } onDisconnect - Callback is invoked when device is disconnected after bind -- * success. -- * @returns { Promise } Indicates the bind result including device ID and remote object. -- * @throws { BusinessError } 201 - The permission check failed. -- * @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. -- * @throws { BusinessError } 26300002 - Service not allowed. -- * @syscap SystemCapability.Driver.ExternalDevice -- * @since 18 -- */ -- function bindDriverWithDeviceId(deviceId: number, onDisconnect: AsyncCallback): Promise; -+/** -+* Bind the device based on the device information returned by queryDevices(). -+* -+* @permission ohos.permission.ACCESS_DDK_DRIVERS -+* @param { long } deviceId - Device id on the device list returned by queryDevices(). -+* @param { AsyncCallback } onDisconnect - Callback is invoked when device is disconnected after bind -+* success. -+* @returns { Promise } Indicates the bind result including device ID and remote object. -+* @throws { BusinessError } 201 - The permission check failed. -+* @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. -+* @throws { BusinessError } 26300002 - The driver service does not allow any client to bind. -+* @syscap SystemCapability.Driver.ExternalDevice -+* @since arkts{ '1.1':'19','1.2':'20'} -+* @arkts 1.1&1.2 -+*/ -+ function bindDriverWithDeviceId(deviceId: long, onDisconnect: AsyncCallback): Promise; - -- /** -- * Unbind the device based on the device information returned by queryDevices(). -- * -- * @permission ohos.permission.ACCESS_DDK_DRIVERS -- * @param { number } deviceId - Device id on the device list returned by queryDevices(). -- * @returns { Promise } - Indicates the unbind result invoked when unbind is finished. -- * @throws { BusinessError } 201 - The permission check failed. -- * @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. -- * @throws { BusinessError } 26300003 - There is no binding relationship. -- * @syscap SystemCapability.Driver.ExternalDevice -- * @since 18 -- */ -- function unbindDriverWithDeviceId(deviceId: number): Promise; -+/** -+* Unbind the device based on the device information returned by queryDevices(). -+* -+* @permission ohos.permission.ACCESS_DDK_DRIVERS -+* @param { long } deviceId - Device id on the device list returned by queryDevices(). -+* @returns { Promise } - Indicates the unbind result invoked when unbind is finished. -+* @throws { BusinessError } 201 - The permission check failed. -+* @throws { BusinessError } 26300001 - ExternalDeviceManager service exception. -+* @throws { BusinessError } 26300003 - There is no binding relationship. -+* @syscap SystemCapability.Driver.ExternalDevice -+* @since arkts{ '1.1':'19','1.2':'20'} -+* @arkts 1.1&1.2 -+*/ -+ function unbindDriverWithDeviceId(deviceId: long): Promise; - - /** - * Enumerates the bus types. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Driver.ExternalDevice -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum BusType { - /** - * USB device type - * - * @syscap SystemCapability.Driver.ExternalDevice -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - USB = 1, - } -@@ -241,7 +249,8 @@ declare namespace deviceManager { - * - * @typedef Device - * @syscap SystemCapability.Driver.ExternalDevice -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Device { - /** -@@ -249,25 +258,28 @@ declare namespace deviceManager { - * - * @type { BusType } - * @syscap SystemCapability.Driver.ExternalDevice -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - busType: BusType; - - /** - * Device ID. - * -- * @type { number } -+ * @type { long } - * @syscap SystemCapability.Driver.ExternalDevice -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- deviceId: number; -+ deviceId: long; - - /** - * Description of the device. - * - * @type { string } - * @syscap SystemCapability.Driver.ExternalDevice -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - description: string; - } -@@ -278,26 +290,29 @@ declare namespace deviceManager { - * @typedef USBDevice - * @extends Device - * @syscap SystemCapability.Driver.ExternalDevice -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface USBDevice extends Device { - /** - * Vendor ID. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Driver.ExternalDevice -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- vendorId: number; -+ vendorId: int; - - /** - * Product ID. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Driver.ExternalDevice -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- productId: number; -+ productId: int; - } - - /** -@@ -305,24 +320,27 @@ declare namespace deviceManager { - * - * @typedef RemoteDeviceDriver - * @syscap SystemCapability.Driver.ExternalDevice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface RemoteDeviceDriver { - /** - * Device ID. - * -- * @type { number } -+ * @type { long } - * @syscap SystemCapability.Driver.ExternalDevice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- deviceId: number; -+ deviceId: long; - - /** - * Remote driver object. - * - * @type { rpc.IRemoteObject } - * @syscap SystemCapability.Driver.ExternalDevice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - remote: rpc.IRemoteObject; - } -@@ -333,48 +351,53 @@ declare namespace deviceManager { - * @typedef USBInterfaceDesc - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface USBInterfaceDesc { - /** - * Interface number. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- bInterfaceNumber: number; -+ bInterfaceNumber: int; - - /** - * Interface class code. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- bClass: number; -+ bClass: int; - - /** - * Interface subclass code. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- bSubClass: number; -+ bSubClass: int; - - /** - * Interface protocol. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- bProtocol: number; -+ bProtocol: int; - } - - -@@ -384,18 +407,20 @@ declare namespace deviceManager { - * @typedef DeviceInfo - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface DeviceInfo { - /** - * Device ID. - * -- * @type { number } -+ * @type { long } - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- deviceId: number; -+ deviceId: long; - - /** - * Whether the device has a matched driver. -@@ -403,7 +428,8 @@ declare namespace deviceManager { - * @type { boolean } - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isDriverMatched: boolean; - -@@ -413,7 +439,8 @@ declare namespace deviceManager { - * @type { ?string } - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - driverUid?: string; - } -@@ -425,28 +452,31 @@ declare namespace deviceManager { - * @extends DeviceInfo - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface USBDeviceInfo extends DeviceInfo { - /** - * Vendor ID. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- vendorId: number; -+ vendorId: int; - - /** - * Product ID. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- productId: number; -+ productId: int; - - /** - * List of USB interface descriptors. -@@ -454,7 +484,8 @@ declare namespace deviceManager { - * @type { Array> } - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interfaceDescList: Array>; - } -@@ -465,7 +496,8 @@ declare namespace deviceManager { - * @typedef DriverInfo - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface DriverInfo { - /** -@@ -474,7 +506,8 @@ declare namespace deviceManager { - * @type { BusType } - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - busType: BusType; - -@@ -484,7 +517,8 @@ declare namespace deviceManager { - * @type { string } - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - driverUid: string; - -@@ -494,7 +528,8 @@ declare namespace deviceManager { - * @type { string } - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - driverName: string; - -@@ -504,7 +539,8 @@ declare namespace deviceManager { - * @type { string } - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - driverVersion: string; - -@@ -514,7 +550,8 @@ declare namespace deviceManager { - * @type { string } - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - driverSize: string; - -@@ -524,7 +561,8 @@ declare namespace deviceManager { - * @type { string } - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - description: string; - } -@@ -536,28 +574,31 @@ declare namespace deviceManager { - * @extends DriverInfo - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface USBDriverInfo extends DriverInfo { - /** - * IDs of supported products. - * -- * @type { Array } -+ * @type { Array } - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- productIdList: Array; -+ productIdList: Array; - - /** - * IDs of supported vendors. - * -- * @type { Array } -+ * @type { Array } - * @syscap SystemCapability.Driver.ExternalDevice - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- vendorIdList: Array; -+ vendorIdList: Array; - } - } - -diff --git a/api/@ohos.effectKit.d.ts b/api/@ohos.effectKit.d.ts -index 301e96c28..269b7cfe6 100644 ---- a/api/@ohos.effectKit.d.ts -+++ b/api/@ohos.effectKit.d.ts -@@ -1,776 +1,800 @@ --/* --* Copyright (c) 2022 Huawei Device Co., Ltd. --* Licensed under the Apache License, Version 2.0 (the "License"); --* you may not use this file except in compliance with the License. --* You may obtain a copy of the License at --* --* http://www.apache.org/licenses/LICENSE-2.0 --* --* Unless required by applicable law or agreed to in writing, software --* distributed under the License is distributed on an "AS IS" BASIS, --* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --* See the License for the specific language governing permissions and --* limitations under the License. --*/ -- --/** -- * @file -- * @kit ArkGraphics2D -- */ -- --/*** if arkts 1.1 */ --import { AsyncCallback } from './@ohos.base'; --import image from './@ohos.multimedia.image'; --/*** endif */ --/*** if arkts 1.2 */ --import image from './@ohos.multimedia.image'; --/*** endif */ -- --/** -- * @namespace effectKit -- * @since 9 -- */ --/** -- * @namespace effectKit -- * @form -- * @atomicservice -- * @since 12 -- */ --/** -- * @namespace effectKit -- * @crossplatform -- * @form -- * @atomicservice -- * @since arkts {'1.1':'14', '1.2':'20'} -- * @arkts 1.1&1.2 -- */ -- --declare namespace effectKit { -- -- /** -- * The Filter of FilterChain. -- * @typedef Filter -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 9 -- */ -- /** -- * The Filter of FilterChain. -- * @typedef Filter -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * The Filter of FilterChain. -- * @typedef Filter -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since arkts {'1.1':'14', '1.2':'20'} -- * @arkts 1.1&1.2 -- */ -- interface Filter { -- -- /** -- * A blur effect is added to the image. -- * @param { number } radius - The degree of blur, the value is measured in pixels. -- * @returns { Filter } Filters for the current effect have been added. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 9 -- */ -- /** -- * A blur effect is added to the image. -- * @param { number } radius - The degree of blur, the value is measured in pixels. -- * @returns { Filter } Filters for the current effect have been added. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * A blur effect is added to the image. -- * @param { number } radius - The degree of blur, the value is measured in pixels. -- * @returns { Filter } Filters for the current effect have been added. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since arkts {'1.1':'14', '1.2':'20'} -- * @arkts 1.1&1.2 -- */ -- blur(radius: number): Filter; -- -- /** -- * A blur effect is added to the image. -- * @param { number } radius - The degree of blur, the value is measured in pixels. -- * @param { TileMode } tileMode - The tile mode of blur. -- * @returns { Filter } Filters for the current effect have been added. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 14 -- */ -- blur(radius: number, tileMode: TileMode): Filter; -- -- /** -- * A Brightness effect is added to the image. -- * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. -- * @returns { Filter } Filters for the current effect have been added. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 9 -- */ -- /** -- * A Brightness effect is added to the image. -- * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. -- * @returns { Filter } Filters for the current effect have been added. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * A Brightness effect is added to the image. -- * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. -- * @returns { Filter } Filters for the current effect have been added. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since 14 -- */ -- brightness(bright: number): Filter; -- -- /** -- * A Grayscale effect is added to the image. -- * @returns { Filter } Filters for the current effect have been added. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 9 -- */ -- /** -- * A Grayscale effect is added to the image. -- * @returns { Filter } Filters for the current effect have been added. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * A Grayscale effect is added to the image. -- * @returns { Filter } Filters for the current effect have been added. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since 14 -- */ -- grayscale(): Filter; -- -- /** -- * A invert effect is added to the image. -- * @returns { Filter } Filters for the current effect have been added. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -- */ -- /** -- * A invert effect is added to the image. -- * @returns { Filter } Filters for the current effect have been added. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @since 14 -- */ -- invert(): Filter; -- -- /** -- * A custom effect is added to the image. -- * -- * @param { Array } colorMatrix - A matrix of 5x4 size for create effect filter. -- * @returns { Filter } Filters for the current effect have been added. -- * @throws { BusinessError } 401 - Input parameter error. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -- */ -- /** -- * A custom effect is added to the image. -- * -- * @param { Array } colorMatrix - A matrix of 5x4 size for create effect filter. -- * @returns { Filter } Filters for the current effect have been added. -- * @throws { BusinessError } 401 - Input parameter error. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @since 14 -- */ -- setColorMatrix(colorMatrix: Array): Filter; -- -- /** -- * Gets the PixelMap where all filter effects have been added to the image. -- * @returns { image.PixelMap } image.PixelMap. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 9 -- * @deprecated since 11 -- * @useinstead effectKit.Filter#getEffectPixelMap -- */ -- getPixelMap(): image.PixelMap; -- -- /** -- * Gets the PixelMap where all filter effects have been added to the image. -- * @returns { Promise } - returns the PixelMap generated. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 11 -- */ -- /** -- * Gets the PixelMap where all filter effects have been added to the image. -- * @returns { Promise } - returns the PixelMap generated. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * Gets the PixelMap where all filter effects have been added to the image. -- * @returns { Promise } - returns the PixelMap generated. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since arkts {'1.1':'14', '1.2':'20'} -- * @arkts 1.1&1.2 -- */ -- getEffectPixelMap(): Promise; -- } -- -- /** -- * The color picker of an image. -- * @typedef ColorPicker -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 9 -- */ -- /** -- * The color picker of an image. -- * @typedef ColorPicker -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * The color picker of an image. -- * @typedef ColorPicker -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since 14 -- */ -- interface ColorPicker { -- -- /** -- * get main color of an image -- * @returns { Promise } returns the MainColor generated. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 9 -- */ -- /** -- * get main color of an image -- * @returns { Promise } returns the MainColor generated. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * get main color of an image -- * @returns { Promise } returns the MainColor generated. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since 14 -- */ -- getMainColor(): Promise; -- -- /** -- * get main color of an image -- * @returns { Color } Main color picked in the image. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 9 -- */ -- /** -- * get main color of an image -- * @returns { Color } Main color picked in the image. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * get main color of an image -- * @returns { Color } Main color picked in the image. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since 14 -- */ -- getMainColorSync(): Color; -- -- /** -- * Get largest proportion color of an image -- * @returns { Color } Largest proportion color picked in the image. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 10 -- */ -- /** -- * Get largest proportion color of an image -- * @returns { Color } Largest proportion color picked in the image. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * Get largest proportion color of an image -- * @returns { Color } Largest proportion color picked in the image. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since 14 -- */ -- getLargestProportionColor(): Color; -- -- /** -- * Get top proportion color of an image -- * @param { number } colorCount - The number of colors to require, the value is 1 to 10. -- * @returns { Array } An array of feature colors sorted by proportion, with a size equal to -- * the minimum of colorCount and the actual number of extracted feature colors. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * Get top proportion color of an image -- * @param { number } colorCount - The number of colors to require, the value is 1 to 10. -- * @returns { Array } An array of feature colors sorted by proportion, with a size equal to -- * the minimum of colorCount and the actual number of extracted feature colors. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since 14 -- */ -- getTopProportionColors(colorCount: number): Array; -- -- /** -- * Get highest saturation color of an image -- * @returns { Color } Highest saturation color picked in the image. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 10 -- */ -- /** -- * Get highest saturation color of an image -- * @returns { Color } Highest saturation color picked in the image. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * Get highest saturation color of an image -- * @returns { Color } Highest saturation color picked in the image. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since 14 -- */ -- getHighestSaturationColor(): Color; -- -- /** -- * Get average color of an image -- * @returns { Color } Average color calculated in the image. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 10 -- */ -- /** -- * Get average color of an image -- * @returns { Color } Average color calculated in the image. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * Get average color of an image -- * @returns { Color } Average color calculated in the image. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since 14 -- */ -- getAverageColor(): Color; -- -- /** -- * Determine whether the color is black or white or gray -- * @param { number } color - The 32 bit ARGB color to discriminate. -- * @returns { boolean } Result of judging black, white and gray. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 10 -- */ -- /** -- * Determine whether the color is black or white or gray -- * @param { number } color - The 32 bit ARGB color to discriminate. -- * @returns { boolean } Result of judging black, white and gray. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * Determine whether the color is black or white or gray -- * @param { number } color - The 32 bit ARGB color to discriminate. -- * @returns { boolean } Result of judging black, white and gray. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since 14 -- */ -- isBlackOrWhiteOrGrayColor(color: number): boolean; -- } -- -- /** -- * The color param. -- * @typedef Color -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 9 -- */ -- /** -- * The color param. -- * @typedef Color -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * The color param. -- * @typedef Color -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since 14 -- */ -- interface Color { -- -- /** -- * Red -- * @type { number } -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 9 -- */ -- /** -- * Red -- * @type { number } -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * Red -- * @type { number } -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since 14 -- */ -- red: number; -- -- /** -- * Green -- * @type { number } -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 9 -- */ -- /** -- * Green -- * @type { number } -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * Green -- * @type { number } -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since 14 -- */ -- green: number; -- -- /** -- * Blue -- * @type { number } -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 9 -- */ -- /** -- * Blue -- * @type { number } -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * Blue -- * @type { number } -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since 14 -- */ -- blue: number; -- -- /** -- * Alpha -- * @type { number } -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 9 -- */ -- /** -- * Alpha -- * @type { number } -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * Alpha -- * @type { number } -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since 14 -- */ -- alpha: number; -- } -- -- /** -- * Create a FilterChain to add multiple effects to an image. -- * @param { image.PixelMap } source - the source pixelmap. -- * @returns { Filter } Returns the head node of FilterChain. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 9 -- */ -- /** -- * Create a FilterChain to add multiple effects to an image. -- * @param { image.PixelMap } source - the source pixelmap. -- * @returns { Filter } Returns the head node of FilterChain. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * Create a FilterChain to add multiple effects to an image. -- * @param { image.PixelMap } source - the source pixelmap. -- * @returns { Filter } Returns the head node of FilterChain. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since arkts {'1.1':'14', '1.2':'20'} -- * @arkts 1.1&1.2 -- */ -- function createEffect(source: image.PixelMap): Filter; -- -- /** -- * Create a color picker to get color of an image. -- * @param { image.PixelMap } source - the source pixelmap. -- * @returns { Promise } - returns the ColorPicker generated. -- * @throws { BusinessError } 401 - Input parameter error. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 9 -- */ -- /** -- * Create a color picker to get color of an image. -- * @param { image.PixelMap } source - the source pixelmap. -- * @returns { Promise } - returns the ColorPicker generated. -- * @throws { BusinessError } 401 - Input parameter error. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * Create a color picker to get color of an image. -- * @param { image.PixelMap } source - the source pixelmap. -- * @returns { Promise } - returns the ColorPicker generated. -- * @throws { BusinessError } 401 - Input parameter error. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since 14 -- */ -- function createColorPicker(source: image.PixelMap): Promise; -- -- /** -- * Create a color picker to get color of an image. -- * @param { image.PixelMap } source - the source pixelmap. -- * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, -- * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. -- * @returns { Promise } - returns the ColorPicker generated. -- * @throws { BusinessError } 401 - Input parameter error. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 10 -- */ -- /** -- * Create a color picker to get color of an image. -- * @param { image.PixelMap } source - the source pixelmap. -- * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, -- * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. -- * @returns { Promise } - returns the ColorPicker generated. -- * @throws { BusinessError } 401 - Input parameter error. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * Create a color picker to get color of an image. -- * @param { image.PixelMap } source - the source pixelmap. -- * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, -- * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. -- * @returns { Promise } - returns the ColorPicker generated. -- * @throws { BusinessError } 401 - Input parameter error. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since 14 -- */ -- function createColorPicker(source: image.PixelMap, region: Array): Promise; -- -- /** -- * Create a color picker to get color of an image. -- * @param { image.PixelMap } source - the source pixelmap. -- * @param { AsyncCallback } callback - the callback of createColorPicker. -- * @throws { BusinessError } 401 - Input parameter error. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 9 -- */ -- /** -- * Create a color picker to get color of an image. -- * @param { image.PixelMap } source - the source pixelmap. -- * @param { AsyncCallback } callback - the callback of createColorPicker. -- * @throws { BusinessError } 401 - Input parameter error. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * Create a color picker to get color of an image. -- * @param { image.PixelMap } source - the source pixelmap. -- * @param { AsyncCallback } callback - the callback of createColorPicker. -- * @throws { BusinessError } 401 - Input parameter error. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since 14 -- */ -- function createColorPicker(source: image.PixelMap, callback: AsyncCallback): void; -- -- /** -- * Create a color picker to get color of an image. -- * @param { image.PixelMap } source - the source pixelmap. -- * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, -- * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. -- * @param { AsyncCallback } callback - the callback of createColorPicker. -- * @throws { BusinessError } 401 - Input parameter error. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 10 -- */ -- /** -- * Create a color picker to get color of an image. -- * @param { image.PixelMap } source - the source pixelmap. -- * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, -- * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. -- * @param { AsyncCallback } callback - the callback of createColorPicker. -- * @throws { BusinessError } 401 - Input parameter error. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @form -- * @atomicservice -- * @since 12 -- */ -- /** -- * Create a color picker to get color of an image. -- * @param { image.PixelMap } source - the source pixelmap. -- * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, -- * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. -- * @param { AsyncCallback } callback - the callback of createColorPicker. -- * @throws { BusinessError } 401 - Input parameter error. -- * @syscap SystemCapability.Multimedia.Image.Core -- * @crossplatform -- * @form -- * @atomicservice -- * @since 14 -- */ -- function createColorPicker(source: image.PixelMap, region: Array, callback: AsyncCallback): void; -- -- /** -- * TileMode enumeration description -- * -- * @enum { number } -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 14 -- */ -- enum TileMode { -- /** -- * Clamp mode. -- * -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 14 -- */ -- CLAMP = 0, -- -- /** -- * Repeat mode. -- * -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 14 -- */ -- REPEAT = 1, -- -- /** -- * Mirror mode. -- * -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 14 -- */ -- MIRROR = 2, -- -- /** -- * Decal mode. -- * -- * @syscap SystemCapability.Multimedia.Image.Core -- * @since 14 -- */ -- DECAL = 3, -- } --} -- --export default effectKit; -+/* -+* Copyright (c) 2022 Huawei Device Co., Ltd. -+* Licensed under the Apache License, Version 2.0 (the "License"); -+* you may not use this file except in compliance with the License. -+* You may obtain a copy of the License at -+* -+* http://www.apache.org/licenses/LICENSE-2.0 -+* -+* Unless required by applicable law or agreed to in writing, software -+* distributed under the License is distributed on an "AS IS" BASIS, -+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+* See the License for the specific language governing permissions and -+* limitations under the License. -+*/ -+ -+/** -+ * @file -+ * @kit ArkGraphics2D -+ */ -+ -+ -+import { AsyncCallback } from './@ohos.base'; -+import image from './@ohos.multimedia.image'; -+ -+ -+/** -+ * @namespace effectKit -+ * @since 9 -+ */ -+/** -+ * @namespace effectKit -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+/** -+ * @namespace effectKit -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ -+declare namespace effectKit { -+ -+ /** -+ * The Filter of FilterChain. -+ * @typedef Filter -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 9 -+ */ -+ /** -+ * The Filter of FilterChain. -+ * @typedef Filter -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * The Filter of FilterChain. -+ * @typedef Filter -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ interface Filter { -+ -+ /** -+ * A blur effect is added to the image. -+ * @param { number } radius - The degree of blur, the value is measured in pixels. -+ * @returns { Filter } Filters for the current effect have been added. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 9 -+ */ -+ /** -+ * A blur effect is added to the image. -+ * @param { number } radius - The degree of blur, the value is measured in pixels. -+ * @returns { Filter } Filters for the current effect have been added. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * A blur effect is added to the image. -+ * @param { number } radius - The degree of blur, the value is measured in pixels. -+ * @returns { Filter } Filters for the current effect have been added. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ blur(radius: number): Filter; -+ -+ /** -+ * A blur effect is added to the image. -+ * @param { number } radius - The degree of blur, the value is measured in pixels. -+ * @param { TileMode } tileMode - The tile mode of blur. -+ * @returns { Filter } Filters for the current effect have been added. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ blur(radius: number, tileMode: TileMode): Filter; -+ -+ /** -+ * A Brightness effect is added to the image. -+ * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. -+ * @returns { Filter } Filters for the current effect have been added. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 9 -+ */ -+ /** -+ * A Brightness effect is added to the image. -+ * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. -+ * @returns { Filter } Filters for the current effect have been added. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * A Brightness effect is added to the image. -+ * @param { number } bright - The degree of light and darkness,the value range is 0 to 1. -+ * @returns { Filter } Filters for the current effect have been added. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ brightness(bright: number): Filter; -+ -+ /** -+ * A Grayscale effect is added to the image. -+ * @returns { Filter } Filters for the current effect have been added. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 9 -+ */ -+ /** -+ * A Grayscale effect is added to the image. -+ * @returns { Filter } Filters for the current effect have been added. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * A Grayscale effect is added to the image. -+ * @returns { Filter } Filters for the current effect have been added. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ grayscale(): Filter; -+ -+ /** -+ * A invert effect is added to the image. -+ * @returns { Filter } Filters for the current effect have been added. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 12 -+ */ -+ /** -+ * A invert effect is added to the image. -+ * @returns { Filter } Filters for the current effect have been added. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ invert(): Filter; -+ -+ /** -+ * A custom effect is added to the image. -+ * -+ * @param { Array } colorMatrix - A matrix of 5x4 size for create effect filter. -+ * @returns { Filter } Filters for the current effect have been added. -+ * @throws { BusinessError } 401 - Input parameter error. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 12 -+ */ -+ /** -+ * A custom effect is added to the image. -+ * -+ * @param { Array } colorMatrix - A matrix of 5x4 size for create effect filter. -+ * @returns { Filter } Filters for the current effect have been added. -+ * @throws { BusinessError } 401 - Input parameter error. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ setColorMatrix(colorMatrix: Array): Filter; -+ -+ /** -+ * Gets the PixelMap where all filter effects have been added to the image. -+ * @returns { image.PixelMap } image.PixelMap. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 9 -+ * @deprecated since 11 -+ * @useinstead effectKit.Filter#getEffectPixelMap -+ */ -+ getPixelMap(): image.PixelMap; -+ -+ /** -+ * Gets the PixelMap where all filter effects have been added to the image. -+ * @returns { Promise } - returns the PixelMap generated. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 11 -+ */ -+ /** -+ * Gets the PixelMap where all filter effects have been added to the image. -+ * @returns { Promise } - returns the PixelMap generated. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * Gets the PixelMap where all filter effects have been added to the image. -+ * @returns { Promise } - returns the PixelMap generated. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ getEffectPixelMap(): Promise; -+ } -+ -+ /** -+ * The color picker of an image. -+ * @typedef ColorPicker -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 9 -+ */ -+ /** -+ * The color picker of an image. -+ * @typedef ColorPicker -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * The color picker of an image. -+ * @typedef ColorPicker -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ interface ColorPicker { -+ -+ /** -+ * get main color of an image -+ * @returns { Promise } returns the MainColor generated. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 9 -+ */ -+ /** -+ * get main color of an image -+ * @returns { Promise } returns the MainColor generated. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * get main color of an image -+ * @returns { Promise } returns the MainColor generated. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ getMainColor(): Promise; -+ -+ /** -+ * get main color of an image -+ * @returns { Color } Main color picked in the image. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 9 -+ */ -+ /** -+ * get main color of an image -+ * @returns { Color } Main color picked in the image. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * get main color of an image -+ * @returns { Color } Main color picked in the image. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ getMainColorSync(): Color; -+ -+ /** -+ * Get largest proportion color of an image -+ * @returns { Color } Largest proportion color picked in the image. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 10 -+ */ -+ /** -+ * Get largest proportion color of an image -+ * @returns { Color } Largest proportion color picked in the image. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * Get largest proportion color of an image -+ * @returns { Color } Largest proportion color picked in the image. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ getLargestProportionColor(): Color; -+ -+ /** -+ * Get top proportion color of an image -+ * @param { number } colorCount - The number of colors to require, the value is 1 to 10. -+ * @returns { Array } An array of feature colors sorted by proportion, with a size equal to -+ * the minimum of colorCount and the actual number of extracted feature colors. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * Get top proportion color of an image -+ * @param { number } colorCount - The number of colors to require, the value is 1 to 10. -+ * @returns { Array } An array of feature colors sorted by proportion, with a size equal to -+ * the minimum of colorCount and the actual number of extracted feature colors. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ getTopProportionColors(colorCount: number): Array; -+ -+ /** -+ * Get highest saturation color of an image -+ * @returns { Color } Highest saturation color picked in the image. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 10 -+ */ -+ /** -+ * Get highest saturation color of an image -+ * @returns { Color } Highest saturation color picked in the image. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * Get highest saturation color of an image -+ * @returns { Color } Highest saturation color picked in the image. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ getHighestSaturationColor(): Color; -+ -+ /** -+ * Get average color of an image -+ * @returns { Color } Average color calculated in the image. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 10 -+ */ -+ /** -+ * Get average color of an image -+ * @returns { Color } Average color calculated in the image. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * Get average color of an image -+ * @returns { Color } Average color calculated in the image. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ getAverageColor(): Color; -+ -+ /** -+ * Determine whether the color is black or white or gray -+ * @param { number } color - The 32 bit ARGB color to discriminate. -+ * @returns { boolean } Result of judging black, white and gray. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 10 -+ */ -+ /** -+ * Determine whether the color is black or white or gray -+ * @param { number } color - The 32 bit ARGB color to discriminate. -+ * @returns { boolean } Result of judging black, white and gray. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * Determine whether the color is black or white or gray -+ * @param { number } color - The 32 bit ARGB color to discriminate. -+ * @returns { boolean } Result of judging black, white and gray. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ isBlackOrWhiteOrGrayColor(color: number): boolean; -+ } -+ -+ /** -+ * The color param. -+ * @typedef Color -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 9 -+ */ -+ /** -+ * The color param. -+ * @typedef Color -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * The color param. -+ * @typedef Color -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ interface Color { -+ -+ /** -+ * Red -+ * @type { number } -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 9 -+ */ -+ /** -+ * Red -+ * @type { number } -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * Red -+ * @type { number } -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ red: number; -+ -+ /** -+ * Green -+ * @type { number } -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 9 -+ */ -+ /** -+ * Green -+ * @type { number } -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * Green -+ * @type { number } -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ green: number; -+ -+ /** -+ * Blue -+ * @type { number } -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 9 -+ */ -+ /** -+ * Blue -+ * @type { number } -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * Blue -+ * @type { number } -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ blue: number; -+ -+ /** -+ * Alpha -+ * @type { number } -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 9 -+ */ -+ /** -+ * Alpha -+ * @type { number } -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * Alpha -+ * @type { number } -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ alpha: number; -+ } -+ -+ /** -+ * Create a FilterChain to add multiple effects to an image. -+ * @param { image.PixelMap } source - the source pixelmap. -+ * @returns { Filter } Returns the head node of FilterChain. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 9 -+ */ -+ /** -+ * Create a FilterChain to add multiple effects to an image. -+ * @param { image.PixelMap } source - the source pixelmap. -+ * @returns { Filter } Returns the head node of FilterChain. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * Create a FilterChain to add multiple effects to an image. -+ * @param { image.PixelMap } source - the source pixelmap. -+ * @returns { Filter } Returns the head node of FilterChain. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ function createEffect(source: image.PixelMap): Filter; -+ -+ /** -+ * Create a color picker to get color of an image. -+ * @param { image.PixelMap } source - the source pixelmap. -+ * @returns { Promise } - returns the ColorPicker generated. -+ * @throws { BusinessError } 401 - Input parameter error. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 9 -+ */ -+ /** -+ * Create a color picker to get color of an image. -+ * @param { image.PixelMap } source - the source pixelmap. -+ * @returns { Promise } - returns the ColorPicker generated. -+ * @throws { BusinessError } 401 - Input parameter error. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * Create a color picker to get color of an image. -+ * @param { image.PixelMap } source - the source pixelmap. -+ * @returns { Promise } - returns the ColorPicker generated. -+ * @throws { BusinessError } 401 - Input parameter error. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ function createColorPicker(source: image.PixelMap): Promise; -+ -+ /** -+ * Create a color picker to get color of an image. -+ * @param { image.PixelMap } source - the source pixelmap. -+ * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, -+ * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. -+ * @returns { Promise } - returns the ColorPicker generated. -+ * @throws { BusinessError } 401 - Input parameter error. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 10 -+ */ -+ /** -+ * Create a color picker to get color of an image. -+ * @param { image.PixelMap } source - the source pixelmap. -+ * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, -+ * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. -+ * @returns { Promise } - returns the ColorPicker generated. -+ * @throws { BusinessError } 401 - Input parameter error. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * Create a color picker to get color of an image. -+ * @param { image.PixelMap } source - the source pixelmap. -+ * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, -+ * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. -+ * @returns { Promise } - returns the ColorPicker generated. -+ * @throws { BusinessError } 401 - Input parameter error. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ function createColorPicker(source: image.PixelMap, region: Array): Promise; -+ -+ /** -+ * Create a color picker to get color of an image. -+ * @param { image.PixelMap } source - the source pixelmap. -+ * @param { AsyncCallback } callback - the callback of createColorPicker. -+ * @throws { BusinessError } 401 - Input parameter error. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 9 -+ */ -+ /** -+ * Create a color picker to get color of an image. -+ * @param { image.PixelMap } source - the source pixelmap. -+ * @param { AsyncCallback } callback - the callback of createColorPicker. -+ * @throws { BusinessError } 401 - Input parameter error. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * Create a color picker to get color of an image. -+ * @param { image.PixelMap } source - the source pixelmap. -+ * @param { AsyncCallback } callback - the callback of createColorPicker. -+ * @throws { BusinessError } 401 - Input parameter error. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ function createColorPicker(source: image.PixelMap, callback: AsyncCallback): void; -+ -+ /** -+ * Create a color picker to get color of an image. -+ * @param { image.PixelMap } source - the source pixelmap. -+ * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, -+ * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. -+ * @param { AsyncCallback } callback - the callback of createColorPicker. -+ * @throws { BusinessError } 401 - Input parameter error. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since 10 -+ */ -+ /** -+ * Create a color picker to get color of an image. -+ * @param { image.PixelMap } source - the source pixelmap. -+ * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, -+ * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. -+ * @param { AsyncCallback } callback - the callback of createColorPicker. -+ * @throws { BusinessError } 401 - Input parameter error. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @form -+ * @atomicservice -+ * @since 12 -+ */ -+ /** -+ * Create a color picker to get color of an image. -+ * @param { image.PixelMap } source - the source pixelmap. -+ * @param { Array } region - contains 4 elements, represents the region's left, top, right, bottom coordinates, -+ * default is [0, 0, 1, 1], represents the region of color picker is the whole pixelMap. -+ * @param { AsyncCallback } callback - the callback of createColorPicker. -+ * @throws { BusinessError } 401 - Input parameter error. -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ function createColorPicker(source: image.PixelMap, region: Array, callback: AsyncCallback): void; -+ -+ /** -+ * TileMode enumeration description -+ * -+ * @enum { number } -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ enum TileMode { -+ /** -+ * Clamp mode. -+ * -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ CLAMP = 0, -+ -+ /** -+ * Repeat mode. -+ * -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ REPEAT = 1, -+ -+ /** -+ * Mirror mode. -+ * -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ MIRROR = 2, -+ -+ /** -+ * Decal mode. -+ * -+ * @syscap SystemCapability.Multimedia.Image.Core -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ DECAL = 3, -+ } -+} -+ -+export default effectKit; -diff --git a/api/@ohos.enterprise.adminManager.d.ts b/api/@ohos.enterprise.adminManager.d.ts -index 6cae1cec8..08db01378 100644 ---- a/api/@ohos.enterprise.adminManager.d.ts -+++ b/api/@ohos.enterprise.adminManager.d.ts -@@ -27,7 +27,8 @@ import common from '@ohos.app.ability.common'; - * - * @namespace adminManager - * @syscap SystemCapability.Customization.EnterpriseDeviceManager -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace adminManager { - /** -@@ -36,7 +37,8 @@ declare namespace adminManager { - * @typedef EnterpriseInfo - * @syscap SystemCapability.Customization.EnterpriseDeviceManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface EnterpriseInfo { - /** -@@ -45,7 +47,8 @@ declare namespace adminManager { - * @type { string } - * @syscap SystemCapability.Customization.EnterpriseDeviceManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - name: string; - -@@ -55,7 +58,8 @@ declare namespace adminManager { - * @type { string } - * @syscap SystemCapability.Customization.EnterpriseDeviceManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - description: string; - } -@@ -426,7 +430,8 @@ declare namespace adminManager { - * @syscap SystemCapability.Customization.EnterpriseDeviceManager - * @systemapi - * @stagemodelonly -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getEnterpriseInfo(admin: Want, callback: AsyncCallback): void; - -@@ -442,7 +447,8 @@ declare namespace adminManager { - * @syscap SystemCapability.Customization.EnterpriseDeviceManager - * @systemapi - * @stagemodelonly -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getEnterpriseInfo(admin: Want): Promise; - -@@ -664,7 +670,8 @@ declare namespace adminManager { - * @syscap SystemCapability.Customization.EnterpriseDeviceManager - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSuperAdmin(): Promise; - -diff --git a/api/@ohos.enterprise.securityManager.d.ts b/api/@ohos.enterprise.securityManager.d.ts -index db5ccc687..f0cb9d144 100644 ---- a/api/@ohos.enterprise.securityManager.d.ts -+++ b/api/@ohos.enterprise.securityManager.d.ts -@@ -27,7 +27,8 @@ import type image from './@ohos.multimedia.image'; - * @namespace securityManager - * @syscap SystemCapability.Customization.EnterpriseDeviceManager - * @stagemodelonly -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace securityManager { - /** -@@ -273,7 +274,8 @@ declare namespace securityManager { - * @syscap SystemCapability.Customization.EnterpriseDeviceManager - * @systemapi - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getPasswordPolicy(): PasswordPolicy; - -@@ -394,7 +396,8 @@ declare namespace securityManager { - * @typedef PasswordPolicy - * @syscap SystemCapability.Customization.EnterpriseDeviceManager - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface PasswordPolicy { - /** -@@ -403,19 +406,21 @@ declare namespace securityManager { - * @type { ?string } - * @syscap SystemCapability.Customization.EnterpriseDeviceManager - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - complexityRegex?: string; - - /** - * Period of validity - * -- * @type { ?number } -+ * @type { ?long } - * @syscap SystemCapability.Customization.EnterpriseDeviceManager - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- validityPeriod?: number; -+ validityPeriod?: long; - - /** - * Other supplementary description -@@ -423,7 +428,8 @@ declare namespace securityManager { - * @type { ?string } - * @syscap SystemCapability.Customization.EnterpriseDeviceManager - * @stagemodelonly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - additionalDescription?: string; - } -diff --git a/api/@ohos.events.emitter.d.ts b/api/@ohos.events.emitter.d.ts -index a36debc31..978f1ab1e 100644 ---- a/api/@ohos.events.emitter.d.ts -+++ b/api/@ohos.events.emitter.d.ts -@@ -544,10 +544,9 @@ declare namespace emitter { - /** - * Data carried by the event. - * -- * @type { ?object } -+ * @type { ?Record } - * @syscap SystemCapability.Notification.Emitter - * @crossplatform -- * @atomicservice - * @since 20 - * @arkts 1.2 - */ -diff --git a/api/@ohos.file.hash.d.ts b/api/@ohos.file.hash.d.ts -index 60bf4c044..223286ef7 100644 ---- a/api/@ohos.file.hash.d.ts -+++ b/api/@ohos.file.hash.d.ts -@@ -133,7 +133,8 @@ declare namespace hash { - * @throws { BusinessError } 13900020 - Invalid argument - * @throws { BusinessError } 13900042 - Unknown error - * @syscap SystemCapability.FileManagement.File.FileIO -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function createHash(algorithm: string): HashStream; - } -diff --git a/api/@ohos.file.keyManager.d.ets b/api/@ohos.file.keyManager.d.ets -deleted file mode 100644 -index 574722d98..000000000 ---- a/api/@ohos.file.keyManager.d.ets -+++ /dev/null -@@ -1,46 +0,0 @@ --/* -- * Copyright (c) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --/** -- * @file -- * @kit CoreFileKit -- */ -- --/** -- * Provides filesystem KeyManager APIs. -- * -- * @namespace keyManager -- * @syscap SystemCapability.FileManagement.StorageService.Encryption -- * @since 20 -- */ --declare namespace keyManager { -- /** -- * Initiate the deactivation of user key for the specified user when user screen is locked. -- * -- * @permission ohos.permission.STORAGE_MANAGER_CRYPT -- * @param { int } userId -- * @throws { BusinessError } 201 - Permission verification failed. -- * @throws { BusinessError } 202 - The caller is not a system application. -- * @throws { BusinessError } 13600001 - IPC error. -- * @throws { BusinessError } 13600008 - No such object. Possible causes: Cannot find userkey for the specified user. -- * input parameter userId < 100 or userId > 10736. -- * @syscap SystemCapability.FileManagement.StorageService.Encryption -- * @systemapi -- * @since 20 -- */ -- function deactivateUserKeyId(userId: int):void; -- } -- -- export default keyManager; -\ No newline at end of file -diff --git a/api/@ohos.file.keyManager.d.ts b/api/@ohos.file.keyManager.d.ts -index 058ad8dd9..dd72db4b8 100644 ---- a/api/@ohos.file.keyManager.d.ts -+++ b/api/@ohos.file.keyManager.d.ts -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2024 Huawei Device Co., Ltd. -+ * Copyright (c) 2024-2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at -@@ -16,6 +16,7 @@ - /** - * @file - * @kit CoreFileKit -+ * @arkts 1.1&1.2 - */ - - /** -@@ -23,7 +24,7 @@ - * - * @namespace keyManager - * @syscap SystemCapability.FileManagement.StorageService.Encryption -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} - */ - declare namespace keyManager { - /** -@@ -40,7 +41,7 @@ declare namespace keyManager { - * @throws { BusinessError } 13600009 - User ID out of range. Possible causes: input parameter userId < 100 or userId > 10736. - * @syscap SystemCapability.FileManagement.StorageService.Encryption - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} - */ - function deactivateUserKey(userId: number):void; - } -diff --git a/api/@ohos.file.photoAccessHelper.d.ts b/api/@ohos.file.photoAccessHelper.d.ts -index 21877e4f2..1aa25fd03 100644 ---- a/api/@ohos.file.photoAccessHelper.d.ts -+++ b/api/@ohos.file.photoAccessHelper.d.ts -@@ -259,7 +259,8 @@ declare namespace photoAccessHelper { - * @enum { number } ThumbnailVisibility - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum ThumbnailVisibility { - /** -@@ -267,7 +268,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INVISIBLE = 0, - /** -@@ -275,7 +277,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - VISIBLE = 1 - } -@@ -331,7 +334,8 @@ declare namespace photoAccessHelper { - * Asset exists in local device and cloud - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LOCAL_AND_CLOUD = 3 - } -@@ -495,7 +499,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ANALYSIS_SEARCH_INDEX = 16 - } -@@ -615,7 +620,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - COLOR_STYLE_PHOTO = 12 - } -@@ -1053,7 +1059,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class MediaAssetManager { - /** -@@ -1071,7 +1078,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @static - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - static requestImage( - context: Context, -@@ -1119,7 +1127,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @static - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - static requestImageData( - context: Context, -@@ -1161,7 +1170,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @static - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - static requestMovingPhoto( - context: Context, -@@ -1183,7 +1193,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @static - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - static cancelRequest(context: Context, requestId: string): Promise; - -@@ -1222,7 +1233,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @static - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - static requestVideoFile( - context: Context, -@@ -1259,7 +1271,8 @@ declare namespace photoAccessHelper { - * @static - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - static loadMovingPhoto( - context: Context, -@@ -1624,7 +1637,8 @@ declare namespace photoAccessHelper { - *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getThumbnailData(type: ThumbnailType): Promise; - /** -@@ -1754,7 +1768,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getExif(callback: AsyncCallback): void; - /** -@@ -1787,7 +1802,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getExif(): Promise; - /** -@@ -1803,7 +1819,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setPending(pendingState: boolean, callback: AsyncCallback): void; - /** -@@ -1819,7 +1836,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setPending(pendingState: boolean): Promise; - /** -@@ -1834,7 +1852,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isEdited(callback: AsyncCallback): void; - /** -@@ -1849,7 +1868,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isEdited(): Promise; - /** -@@ -1864,7 +1884,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - requestEditData(callback: AsyncCallback): void; - /** -@@ -1879,7 +1900,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - requestEditData(): Promise; - /** -@@ -1894,7 +1916,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getEditData(): Promise; - /** -@@ -1909,7 +1932,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - Internal system error. It is recommended to retry and check the logs. - *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - clone(title: string): Promise; - /** -@@ -1924,7 +1948,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - requestSource(callback: AsyncCallback): void; - /** -@@ -1939,7 +1964,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - requestSource(): Promise; - /** -@@ -1973,7 +1999,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - commitEditedAsset(editData: string, uri: string): Promise; - /** -@@ -2003,7 +2030,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - revertToOriginal(): Promise; - /** -@@ -2051,7 +2079,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - cancelPhotoRequest(requestId: string): void; - /** -@@ -2068,7 +2097,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - Internal system error - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getKeyFrameThumbnail(beginFrameTimeMs: number, type: ThumbnailType): Promise; - } -@@ -2503,7 +2533,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - THUMBNAIL_VISIBLE = 'thumbnail_visible', - /** -@@ -2511,7 +2542,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - IS_CE_AUTO = 'is_auto', - /** -@@ -2519,7 +2551,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - OWNER_ALBUM_ID = 'owner_album_id', - /** -@@ -2527,14 +2560,16 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - IS_RECENT_SHOW = 'is_recent_show', - /** - * Suffix of the asset, read only - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MEDIA_SUFFIX = 'media_suffix' - -@@ -2592,7 +2627,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ALBUM_LPATH = 'lpath', - /** -@@ -2600,7 +2636,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BUNDLE_NAME = 'bundle_name', - /** -@@ -2608,7 +2645,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DATE_MODIFIED = 'date_modified', - } -@@ -2867,7 +2905,8 @@ declare namespace photoAccessHelper { - * @interface PhotoCreationSource - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PhotoCreationSource { - /** -@@ -2876,7 +2915,8 @@ declare namespace photoAccessHelper { - * @type { ?string } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - bundleName?: string; - /** -@@ -2885,7 +2925,8 @@ declare namespace photoAccessHelper { - * @type { ?string } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - appName?: string; - /** -@@ -2894,7 +2935,8 @@ declare namespace photoAccessHelper { - * @type { ?string } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - appId?: string; - /** -@@ -2903,7 +2945,8 @@ declare namespace photoAccessHelper { - * @type { ?number } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - tokenId?: number; - } -@@ -2973,7 +3016,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @crossplatform -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isAfterLast(): boolean; - /** -@@ -3105,7 +3149,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @crossplatform -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getLastObject(callback: AsyncCallback): void; - /** -@@ -3129,7 +3174,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @crossplatform -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getLastObject(): Promise; - /** -@@ -3313,7 +3359,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SOURCE = 2048, - /** -@@ -3704,7 +3751,8 @@ declare namespace photoAccessHelper { - * @readonly - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly lpath?: string; - /** -@@ -3850,7 +3898,8 @@ declare namespace photoAccessHelper { - * @readonly - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly dateAdded?: number; - /** -@@ -3860,7 +3909,8 @@ declare namespace photoAccessHelper { - * @readonly - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly dateModified?: number; - /** -@@ -4696,7 +4746,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - Internal system error - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getDataAnalysisProgress(analysisType: AnalysisType): Promise; - /** -@@ -4969,7 +5020,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail. - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - saveGalleryFormInfo(info: GalleryFormInfo): Promise; - /** -@@ -4985,7 +5037,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail. - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - removeFormInfo(info: FormInfo, callback: AsyncCallback): void; - /** -@@ -5001,7 +5054,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail. - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - removeFormInfo(info: FormInfo): Promise; - /** -@@ -5017,7 +5071,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail. - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - removeGalleryFormInfo(info: GalleryFormInfo): Promise; - /** -@@ -5033,7 +5088,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail. - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - updateGalleryFormInfo(info: GalleryFormInfo): Promise; - /** -@@ -5083,7 +5139,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - Internal system error - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - grantPhotoUrisPermission( - tokenId: number, -@@ -5126,7 +5183,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - Internal system error - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - cancelPhotoUriPermission(tokenId: number, uri: string, photoPermissionType: PhotoPermissionType): Promise; - /** -@@ -5143,7 +5201,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - Internal system error - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - startThumbnailCreationTask(predicate: dataSharePredicates.DataSharePredicates, callback: AsyncCallback): number; - /** -@@ -5175,7 +5234,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - Internal system error - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSharedPhotoAssets(options: FetchOptions): Array; - /** -@@ -5187,7 +5247,8 @@ declare namespace photoAccessHelper { - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14000011 - Internal system error. It is recommended to retry and check the logs. - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSupportedPhotoFormats(photoType: PhotoType): Promise>; - /** -@@ -5203,7 +5264,8 @@ declare namespace photoAccessHelper { - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - startAssetAnalysis(type: AnalysisType, assetUris?: Array): Promise; - /** -@@ -5219,7 +5281,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getAlbumsByIds(albumIds: Array): Promise>; - /** -@@ -5238,7 +5301,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - Internal system error - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - createAssetsForAppWithAlbum(source: PhotoCreationSource, albumUri: string, isAuthorized: boolean, - photoCreationConfigs: Array): Promise>; -@@ -5250,7 +5314,8 @@ declare namespace photoAccessHelper { - * @interface GalleryFormInfo - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface GalleryFormInfo { - /** -@@ -5259,7 +5324,8 @@ declare namespace photoAccessHelper { - * @type { string } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - formId: string; - /** -@@ -5268,7 +5334,8 @@ declare namespace photoAccessHelper { - * @type { ?Array } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - assetUris?: Array; - } -@@ -5434,7 +5501,8 @@ declare namespace photoAccessHelper { - * @type { Array } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - sharedPhotoAssets: Array; - /** -@@ -5443,7 +5511,8 @@ declare namespace photoAccessHelper { - * @type { Array } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - sharedAlbumAssets: Array; - /** -@@ -5452,7 +5521,8 @@ declare namespace photoAccessHelper { - * @type { Array } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - sharedExtraPhotoAssets: Array; - } -@@ -6084,7 +6154,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - constructor(compatibleFormat: string, formatVersion: string); - -@@ -6177,7 +6248,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRIVATE_MOVING_PHOTO_METADATA = 5 - } -@@ -6779,7 +6851,8 @@ declare namespace photoAccessHelper { - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14000011 - Internal system error - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setOrientation(orientation: number): void; - -@@ -6831,7 +6904,8 @@ declare namespace photoAccessHelper { - * @static - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - static deleteLocalAssetsPermanently(context: Context, assets: Array): Promise; - } -@@ -6916,7 +6990,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - System inner fail - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setIsRecentShow(isRencentShow: boolean): void; - } -@@ -7535,7 +7610,8 @@ declare namespace photoAccessHelper { - * @type { number } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - thumbnailModifiedMs?: number; - /** -@@ -7544,7 +7620,8 @@ declare namespace photoAccessHelper { - * @type { ThumbnailVisibility } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - thumbnailVisible: ThumbnailVisibility; - } -@@ -7555,7 +7632,8 @@ declare namespace photoAccessHelper { - * @interface SharedAlbumAsset - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface SharedAlbumAsset { - /** -@@ -7564,7 +7642,8 @@ declare namespace photoAccessHelper { - * @type { number } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - albumId: number; - /** -@@ -7573,7 +7652,8 @@ declare namespace photoAccessHelper { - * @type { AlbumType } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - albumType: AlbumType; - /** -@@ -7582,7 +7662,8 @@ declare namespace photoAccessHelper { - * @type { AlbumSubtype } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - albumSubType: AlbumSubtype; - /** -@@ -7591,7 +7672,8 @@ declare namespace photoAccessHelper { - * @type { string } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - albumName: string; - /** -@@ -7600,7 +7682,8 @@ declare namespace photoAccessHelper { - * @type { string } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - coverUri: string; - /** -@@ -7609,7 +7692,8 @@ declare namespace photoAccessHelper { - * @type { number } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - count: number; - /** -@@ -7618,7 +7702,8 @@ declare namespace photoAccessHelper { - * @type { number } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - imageCount: number; - /** -@@ -7627,7 +7712,8 @@ declare namespace photoAccessHelper { - * @type { number } - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - videoCount: number; - } -@@ -7878,7 +7964,8 @@ declare namespace photoAccessHelper { - * @extends MediaAlbumChangeRequest - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class MediaAnalysisAlbumChangeRequest extends MediaAlbumChangeRequest { - /** -@@ -7890,7 +7977,8 @@ declare namespace photoAccessHelper { - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - constructor(album: Album); - -@@ -7908,7 +7996,8 @@ declare namespace photoAccessHelper { - *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setOrderPosition(assets: Array, position: Array): void; - } -@@ -7918,7 +8007,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class AnalysisAlbum { - /** -@@ -7930,7 +8020,8 @@ declare namespace photoAccessHelper { - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - constructor(album: Album); - /** -@@ -7947,7 +8038,8 @@ declare namespace photoAccessHelper { - *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getOrderPosition(assets: Array): Promise>; - } -@@ -8007,7 +8099,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - Internal system error - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getHighlightResource(resourceUri: string): Promise; - -@@ -8025,7 +8118,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - Internal system error - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setHighlightUserActionData(type: HighlightUserActionType, actionData: number): Promise; - -@@ -8043,7 +8137,8 @@ declare namespace photoAccessHelper { - *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setSubTitle(subTitle: string): Promise; - -@@ -8063,7 +8158,8 @@ declare namespace photoAccessHelper { - * @static - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - static deleteHighlightAlbums(context: Context, albums: Array): Promise; - } -@@ -8271,7 +8367,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - Internal system error - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - submitCloudEnhancementTasks( - photoAssets: Array, -@@ -8343,7 +8440,8 @@ declare namespace photoAccessHelper { - * @throws { BusinessError } 14000011 - Internal system error - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - queryCloudEnhancementTaskState(photoAsset: PhotoAsset): Promise; - -@@ -8435,7 +8533,8 @@ declare namespace photoAccessHelper { - * @enum { number } CloudMediaAssetTaskStatus - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum CloudMediaAssetTaskStatus { - /** -@@ -8443,7 +8542,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DOWNLOADING = 0, - /** -@@ -8451,7 +8551,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PAUSED = 1, - /** -@@ -8459,7 +8560,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - IDLE = 2 - } -@@ -8470,7 +8572,8 @@ declare namespace photoAccessHelper { - * @enum { number } CloudMediaTaskPauseCause - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum CloudMediaTaskPauseCause { - /** -@@ -8478,7 +8581,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NO_PAUSE = 0, - /** -@@ -8486,7 +8590,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TEMPERATURE_LIMIT = 1, - /** -@@ -8494,7 +8599,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ROM_LIMIT = 2, - /** -@@ -8502,7 +8608,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NETWORK_FLOW_LIMIT = 3, - /** -@@ -8510,7 +8617,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WIFI_UNAVAILABLE = 4, - /** -@@ -8518,7 +8626,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - POWER_LIMIT = 5, - /** -@@ -8526,7 +8635,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BACKGROUND_TASK_UNAVAILABLE = 6, - /** -@@ -8534,7 +8644,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FREQUENT_USER_REQUESTS = 7, - /** -@@ -8542,7 +8653,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CLOUD_ERROR = 8, - /** -@@ -8550,7 +8662,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - USER_PAUSED = 9 - } -@@ -8561,7 +8674,8 @@ declare namespace photoAccessHelper { - * @interface CloudMediaAssetStatus - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface CloudMediaAssetStatus { - /** -@@ -8571,7 +8685,8 @@ declare namespace photoAccessHelper { - * @readonly - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly taskStatus: CloudMediaAssetTaskStatus; - /** -@@ -8581,7 +8696,8 @@ declare namespace photoAccessHelper { - * @readonly - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly taskInfo: string; - /** -@@ -8591,7 +8707,8 @@ declare namespace photoAccessHelper { - * @readonly - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly errorCode: CloudMediaTaskPauseCause; - } -@@ -8602,7 +8719,8 @@ declare namespace photoAccessHelper { - * @enum { number } CloudMediaDownloadType - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum CloudMediaDownloadType { - /** -@@ -8610,7 +8728,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DOWNLOAD_FORCE = 0, - /** -@@ -8618,7 +8737,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DOWNLOAD_GENTLE = 1 - } -@@ -8629,7 +8749,8 @@ declare namespace photoAccessHelper { - * @enum { number } CloudMediaRetainType - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum CloudMediaRetainType { - /** -@@ -8637,7 +8758,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RETAIN_FORCE = 0 - } -@@ -8647,7 +8769,8 @@ declare namespace photoAccessHelper { - * - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class CloudMediaAssetManager { - /** -@@ -8663,7 +8786,8 @@ declare namespace photoAccessHelper { - * @static - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - static getCloudMediaAssetManagerInstance(context: Context): CloudMediaAssetManager; - -@@ -8681,7 +8805,8 @@ declare namespace photoAccessHelper { - *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - startDownloadCloudMedia(downloadType: CloudMediaDownloadType): Promise; - -@@ -8696,7 +8821,8 @@ declare namespace photoAccessHelper { - *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - pauseDownloadCloudMedia(): Promise; - -@@ -8711,7 +8837,8 @@ declare namespace photoAccessHelper { - *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - cancelDownloadCloudMedia(): Promise; - -@@ -8729,7 +8856,8 @@ declare namespace photoAccessHelper { - *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - retainCloudMediaAsset(retainType: CloudMediaRetainType): Promise; - -@@ -8744,7 +8872,8 @@ declare namespace photoAccessHelper { - *
    Possible causes: 1. Database corrupted; 2. The file system is abnormal; 3. The IPC request timed out. - * @syscap SystemCapability.FileManagement.PhotoAccessHelper.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getCloudMediaAssetStatus(): Promise; - } -diff --git a/api/@ohos.file.storageStatistics.d.ets b/api/@ohos.file.storageStatistics.d.ets -deleted file mode 100644 -index 671082770..000000000 ---- a/api/@ohos.file.storageStatistics.d.ets -+++ /dev/null -@@ -1,224 +0,0 @@ --/* -- * Copyright (C) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --/** -- * @file -- * @kit CoreFileKit -- */ -- --import { AsyncCallback, Callback } from './@ohos.base'; -- --/** -- * Provides filesystem statistics APIs. -- * -- * @namespace storageStatistics -- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 20 -- */ --declare namespace storageStatistics { -- /** -- * Get the free size. -- * -- * @param { AsyncCallback } callback - callback -- * @throws { BusinessError } 13600001 - Permission Denied.Possible causes: -- * May need permission ohos.permission.STORAGE_MANAGER. -- * @throws { BusinessError } 13900042 - Unknown error. -- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 20 -- */ -- function getFreeSize(callback: AsyncCallback): void; -- -- /** -- * Get the free size. -- * -- * @returns { Promise } return Promise -- * @throws { BusinessError } 13600001 - Permission Denied.Possible causes: -- * May need permission ohos.permission.STORAGE_MANAGER. -- * @throws { BusinessError } 13900042 - Unknown error. -- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 20 -- */ -- function getFreeSize(): Promise; -- -- /** -- * Get the total size. -- * -- * @param { AsyncCallback } callback - callback -- * @throws { BusinessError } 13600001 - Permission Denied.Possible causes: -- * May need permission ohos.permission.STORAGE_MANAGER. -- * @throws { BusinessError } 13900042 - Unknown error. -- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 20 -- */ -- function getTotalSize(callback: AsyncCallback): void; -- -- /** -- * Get the total size. -- * -- * @returns { Promise } return Promise -- * @throws { BusinessError } 13600001 - Permission Denied.Possible causes: -- * May need permission ohos.permission.STORAGE_MANAGER. -- * @throws { BusinessError } 13900042 - Unknown error. -- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 20 -- */ -- function getTotalSize(): Promise; -- -- /** -- * Get the current bundle statistics. -- * -- * @param { AsyncCallback } callback - callback -- * @throws { BusinessError } 13600001 - Permission Denied.Possible causes: -- * May need permission ohos.permission.STORAGE_MANAGER. -- * @throws { BusinessError } 13900042 - Unknown error. -- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 20 -- */ -- function getCurrentBundleStats(callback: AsyncCallback): void; -- -- /** -- * Get the current bundle statistics. -- * -- * @returns { Promise } return Promise -- * @throws { BusinessError } 13600001 - Permission Denied.Possible causes: -- * May need permission ohos.permission.STORAGE_MANAGER. -- * @throws { BusinessError } 13900042 - Unknown error. -- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 20 -- */ -- function getCurrentBundleStats(): Promise; -- -- /** -- * Get the user storage statistics. -- * -- * @permission ohos.permission.STORAGE_MANAGER -- * @returns { Promise } return Promise -- * @throws { BusinessError } 201 - Permission verification failed. -- * @throws { BusinessError } 202 - The caller is not a system application. -- * @throws { BusinessError } 13600001 - IPC error. -- * @throws { BusinessError } 13900042 - Unknown error. -- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @systemapi -- * @since 20 -- */ -- function getUserStorageStats(): Promise; -- -- /** -- * Get the user storage statistics. -- * -- * @permission ohos.permission.STORAGE_MANAGER -- * @param { AsyncCallback } callback - callback -- * @throws { BusinessError } 201 - Permission verification failed. -- * @throws { BusinessError } 202 - The caller is not a system application. -- * @throws { BusinessError } 13600001 - IPC error. -- * @throws { BusinessError } 13900042 - Unknown error. -- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @systemapi -- * @since 20 -- */ -- function getUserStorageStats(callback: AsyncCallback): void; -- -- /** -- * Get the user storage statistics. -- * -- * @permission ohos.permission.STORAGE_MANAGER -- * @param { long } userId - The id of the user -- * @returns { Promise } return Promise -- * @throws { BusinessError } 201 - Permission verification failed. -- * @throws { BusinessError } 202 - The caller is not a system application. -- * @throws { BusinessError } 13600001 - IPC error. -- * @throws { BusinessError } 13600009 - User if out of range. -- * @throws { BusinessError } 13900042 - Unknown error. -- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @systemapi -- * @since 20 -- */ -- function getUserStorageStats(userId: long): Promise; -- -- /** -- * Get the user storage statistics. -- * -- * @permission ohos.permission.STORAGE_MANAGER -- * @param { long } userId - The id of the user -- * @param { AsyncCallback } callback - callback -- * @throws { BusinessError } 201 - Permission verification failed. -- * @throws { BusinessError } 202 - The caller is not a system application. -- * @throws { BusinessError } 13600001 - IPC error. -- * @throws { BusinessError } 13600009 - User if out of range. -- * @throws { BusinessError } 13900042 - Unknown error. -- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @systemapi -- * @since 20 -- */ -- function getUserStorageStats(userId: long, callback: AsyncCallback): void; -- -- /** -- * Get the bundle statistics. -- * -- * @interface BundleStats -- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 20 -- */ -- export interface BundleStats { -- /** -- * The size of application installation data. -- * -- * @type { long } -- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 20 -- */ -- appSize: long; -- -- /** -- * The size of application cache data. -- * -- * @type { long } -- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 20 -- */ -- cacheSize: long; -- -- /** -- * The size of application local data, distributed data and database data. -- * -- * @type { long } -- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 20 -- */ -- dataSize: long; -- } -- -- /** -- * Get the user storage statistics. -- * -- * @interface StorageStats -- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @systemapi -- * @since 20 -- */ -- export interface StorageStats { -- /** -- * The total size of device. -- * -- * @type { long } -- * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @systemapi -- * @since 20 -- */ -- total: long; -- } --} -- --export default storageStatistics; -\ No newline at end of file -diff --git a/api/@ohos.file.storageStatistics.d.ts b/api/@ohos.file.storageStatistics.d.ts -index 0bcb09387..2320239d5 100644 ---- a/api/@ohos.file.storageStatistics.d.ts -+++ b/api/@ohos.file.storageStatistics.d.ts -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2022-2023 Huawei Device Co., Ltd. -+ * Copyright (C) 2022-2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at -@@ -25,7 +25,8 @@ import { AsyncCallback, Callback } from './@ohos.base'; - * - * @namespace storageStatistics - * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 8 -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace storageStatistics { - /** -@@ -112,7 +113,8 @@ parameters are left unspecified; - * - * @interface BundleStats - * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface BundleStats { - /** -@@ -120,7 +122,8 @@ parameters are left unspecified; - * - * @type { number } - * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - appSize: number; - -@@ -129,7 +132,8 @@ parameters are left unspecified; - * - * @type { number } - * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - cacheSize: number; - -@@ -138,7 +142,8 @@ parameters are left unspecified; - * - * @type { number } - * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - dataSize: number; - } -@@ -225,7 +230,8 @@ parameters are left unspecified; - * @throws { BusinessError } 13600001 - IPC error. - * @throws { BusinessError } 13900042 - Unknown error. - * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getCurrentBundleStats(callback: AsyncCallback): void; - -@@ -238,7 +244,8 @@ parameters are left unspecified; - * @throws { BusinessError } 13600001 - IPC error. - * @throws { BusinessError } 13900042 - Unknown error. - * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getCurrentBundleStats(): Promise; - -@@ -282,7 +289,8 @@ parameters are left unspecified; - * @interface StorageStats - * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface StorageStats { - /** -@@ -291,7 +299,8 @@ parameters are left unspecified; - * @type { number } - * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - total: number; - -@@ -360,7 +369,8 @@ parameters are left unspecified; - * @throws { BusinessError } 13900042 - Unknown error. - * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getUserStorageStats(): Promise; - -@@ -378,7 +388,8 @@ parameters are left unspecified; - * @throws { BusinessError } 13900042 - Unknown error. - * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getUserStorageStats(callback: AsyncCallback): void; - -@@ -398,7 +409,8 @@ parameters are left unspecified; - * @throws { BusinessError } 13900042 - Unknown error. - * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getUserStorageStats(userId: number): Promise; - -@@ -418,7 +430,8 @@ parameters are left unspecified; - * @throws { BusinessError } 13900042 - Unknown error. - * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getUserStorageStats(userId: number, callback: AsyncCallback): void; - -@@ -446,7 +459,8 @@ parameters are left unspecified; - * @throws { BusinessError } 13600001 - IPC error. - * @throws { BusinessError } 13900042 - Unknown error. - * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getTotalSize(callback: AsyncCallback): void; - -@@ -472,7 +486,8 @@ parameters are left unspecified; - * @throws { BusinessError } 13600001 - IPC error. - * @throws { BusinessError } 13900042 - Unknown error. - * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getTotalSize(): Promise; - -@@ -526,7 +541,8 @@ parameters are left unspecified; - * @throws { BusinessError } 13600001 - IPC error. - * @throws { BusinessError } 13900042 - Unknown error. - * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getFreeSize(callback: AsyncCallback): void; - -@@ -552,7 +568,8 @@ parameters are left unspecified; - * @throws { BusinessError } 13600001 - IPC error. - * @throws { BusinessError } 13900042 - Unknown error. - * @syscap SystemCapability.FileManagement.StorageService.SpatialStatistics -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getFreeSize(): Promise; - -diff --git a/api/@ohos.file.volumeManager.d.ets b/api/@ohos.file.volumeManager.d.ets -deleted file mode 100644 -index 8b9370070..000000000 ---- a/api/@ohos.file.volumeManager.d.ets -+++ /dev/null -@@ -1,127 +0,0 @@ --/* -- * Copyright (C) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --/** -- * @file -- * @kit CoreFileKit -- */ -- --import { AsyncCallback, Callback } from './@ohos.base'; -- --/** -- * Provides volumemanager statistics APIs -- * -- * @namespace volumeManager -- * @syscap SystemCapability.FileManagement.StorageService.Volume -- * @systemapi -- * @since 20 -- */ --declare namespace volumeManager { -- /** -- * Get All Volumes -- * -- * @interface Volume -- * @syscap SystemCapability.FileManagement.StorageService.Volume -- * @systemapi -- * @since 20 -- */ -- export interface Volume { -- /** -- * Universally unique identifier of volume. -- * -- * @type { string } -- * @syscap SystemCapability.FileManagement.StorageService.Volume -- * @systemapi -- * @since 20 -- */ -- uuid: string; -- -- /** -- * The label of the volume. -- * -- * @type { string } -- * @syscap SystemCapability.FileManagement.StorageService.Volume -- * @systemapi -- * @since 20 -- */ -- description: string; -- } -- -- /** -- * Get the volume by uuid. -- * -- * @permission ohos.permission.STORAGE_MANAGER -- * @param { string } uuid - The uuid of volume -- * @param { AsyncCallback } callback - callback -- * @throws { BusinessError } 201 - Permission verification failed. -- * @throws { BusinessError } 202 - The caller is not a system application. -- * @throws { BusinessError } 13600001 - IPC error. -- * @throws { BusinessError } 13600008 - No such object. -- * @throws { BusinessError } 13900042 - Unknown error. -- * @syscap SystemCapability.FileManagement.StorageService.Volume -- * @systemapi -- * @since 20 -- */ -- function getVolumeByUuid(uuid: string, callback: AsyncCallback): void; -- -- /** -- * Get the volume by uuid. -- * -- * @permission ohos.permission.STORAGE_MANAGER -- * @param { string } uuid - The uuid of volume -- * @returns { Promise } return Promise -- * @throws { BusinessError } 201 - Permission verification failed. -- * @throws { BusinessError } 202 - The caller is not a system application. -- * @throws { BusinessError } 13600001 - IPC error. -- * @throws { BusinessError } 13600008 - No such object. -- * @throws { BusinessError } 13900042 - Unknown error. -- * @syscap SystemCapability.FileManagement.StorageService.Volume -- * @systemapi -- * @since 20 -- */ -- function getVolumeByUuid(uuid: string): Promise; -- -- /** -- * Get All Volumes -- * -- * @permission ohos.permission.STORAGE_MANAGER -- * @param { AsyncCallback> } callback - callback -- * @throws { BusinessError } 201 - Permission verification failed. -- * @throws { BusinessError } 202 - The caller is not a system application. -- * @throws { BusinessError } 13600001 - IPC error. -- * @throws { BusinessError } 13900042 - Unknown error. -- * @syscap SystemCapability.FileManagement.StorageService.Volume -- * @systemapi -- * @since 20 -- */ -- function getAllVolumes(callback: AsyncCallback>): void; -- -- /** -- * Get All Volumes -- * -- * @permission ohos.permission.STORAGE_MANAGER -- * @returns { Promise> } return Promise -- * @throws { BusinessError } 201 - Permission verification failed. -- * @throws { BusinessError } 202 - The caller is not a system application. -- * @throws { BusinessError } 13600001 - IPC error. -- * @throws { BusinessError } 13900042 - Unknown error. -- * @syscap SystemCapability.FileManagement.StorageService.Volume -- * @systemapi -- * @since 20 -- */ -- function getAllVolumes(): Promise>; --} -- -- export default volumeManager; -\ No newline at end of file -diff --git a/api/@ohos.file.volumeManager.d.ts b/api/@ohos.file.volumeManager.d.ts -index 87377b269..1b90ba7c3 100644 ---- a/api/@ohos.file.volumeManager.d.ts -+++ b/api/@ohos.file.volumeManager.d.ts -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2022-2023 Huawei Device Co., Ltd. -+ * Copyright (C) 2022-2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at -@@ -26,7 +26,8 @@ import { AsyncCallback, Callback } from './@ohos.base'; - * @namespace volumeManager - * @syscap SystemCapability.FileManagement.StorageService.Volume - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace volumeManager { - /** -@@ -35,7 +36,8 @@ declare namespace volumeManager { - * @interface Volume - * @syscap SystemCapability.FileManagement.StorageService.Volume - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface Volume { - /** -@@ -54,7 +56,8 @@ declare namespace volumeManager { - * @type { string } - * @syscap SystemCapability.FileManagement.StorageService.Volume - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - uuid: string; - -@@ -74,7 +77,8 @@ declare namespace volumeManager { - * @type { string } - * @syscap SystemCapability.FileManagement.StorageService.Volume - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - description: string; - -@@ -131,7 +135,8 @@ parameters are left unspecified; - * @throws { BusinessError } 13900042 - Unknown error. - * @syscap SystemCapability.FileManagement.StorageService.Volume - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAllVolumes(callback: AsyncCallback>): void; - -@@ -148,7 +153,8 @@ parameters are left unspecified; - * @throws { BusinessError } 13900042 - Unknown error. - * @syscap SystemCapability.FileManagement.StorageService.Volume - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAllVolumes(): Promise>; - -@@ -260,7 +266,8 @@ parameters are left unspecified; - * @throws { BusinessError } 13900042 - Unknown error. - * @syscap SystemCapability.FileManagement.StorageService.Volume - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getVolumeByUuid(uuid: string, callback: AsyncCallback): void; - -@@ -280,7 +287,8 @@ parameters are left unspecified; - * @throws { BusinessError } 13900042 - Unknown error. - * @syscap SystemCapability.FileManagement.StorageService.Volume - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getVolumeByUuid(uuid: string): Promise; - -diff --git a/api/@ohos.fileshare.d.ets b/api/@ohos.fileshare.d.ets -deleted file mode 100644 -index 49dfdd581..000000000 ---- a/api/@ohos.fileshare.d.ets -+++ /dev/null -@@ -1,160 +0,0 @@ --/* -- * Copyright (C) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --/** -- * @file -- * @kit CoreFileKit -- */ -- --import { AsyncCallback, Callback } from './@ohos.base'; --import type wantConstant from './@ohos.app.ability.wantConstant'; -- --/** -- * Provides fileshare APIS -- * -- * @namespace fileShare -- * @syscap SystemCapability.FileManagement.AppFileService -- * @since 20 -- */ --declare namespace fileShare { -- /** -- * Enumerates the uri operate mode types. -- * -- * @enum { int } OperationMode -- * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 20 -- */ -- export enum OperationMode { -- /** -- * Indicates read permissions. -- * -- * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 20 -- */ -- READ_MODE = 0b1, -- -- /** -- * Indicates write permissions. -- * -- * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 20 -- */ -- WRITE_MODE = 0b10, -- } -- -- /** -- * Policy information to manager permissions on a URI. -- * -- * @interface PolicyInfo -- * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 20 -- */ -- export interface PolicyInfo { -- /** -- * Indicates the uri of the policy information. -- * -- * @type { string } -- * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 20 -- */ -- uri: string; -- -- /** -- * Indicates the mode of operation for the URI, example { OperationMode.READ_MODE } or { OperationMode.READ_MODE | OperationMode.WRITE_MODE } -- * -- * @type { int } -- * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 20 -- */ -- operationMode: int; -- } -- -- /** -- * Enable the URI that have been permanently authorized -- * -- * @permission ohos.permission.FILE_ACCESS_PERSIST -- * @param { Array } policies - Policy information to grant permission on URIs. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 201 - Permission verification failed, usually the result returned by VerifyAccessToken. -- * @throws { BusinessError } 801 - Capability not supported. -- * @throws { BusinessError } 13900001 - Operation not permitted. -- * @throws { BusinessError } 13900042 - Out of memory -- * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 20 -- */ -- function activatePermission(policies: Array): Promise; -- -- /** -- * Stop the authorized URI that has been enabled -- * -- * @permission ohos.permission.FILE_ACCESS_PERSIST -- * @param { Array } policies - Policy information to grant permission on URIs. -- * @returns { Promise } the promise returned by the function. -- * @throws { BusinessError } 201 - Permission verification failed, usually the result returned by VerifyAccessToken. -- * @throws { BusinessError } 801 - Capability not supported. -- * @throws { BusinessError } 13900001 - Operation not permitted. -- * @throws { BusinessError } 13900042 - Out of memory -- * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 20 -- */ -- function deactivatePermission(policies: Array): Promise; -- -- /** -- * Provides grant uri permission for app -- * -- * @permission ohos.permission.WRITE_MEDIA -- * @param { string } uri uri -- * @param { string } bundleName bundleName -- * @param { wantConstant.Flags } flag wantConstant.Flags.FLAG_AUTH_READ_URI_PERMISSION -- * or wantConstant.Flags.FLAG_AUTH_WRITE_URI_PERMISSION -- * @param { AsyncCallback } callback -- * @throws { BusinessError } 201 - Permission verification failed -- * @throws { BusinessError } 202 - The caller is not a system application -- * @throws { BusinessError } 401 - The input parameter is invalid.Possible causes: -- * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. -- * @throws { BusinessError } 143000001 - IPC error -- * @syscap SystemCapability.FileManagement.AppFileService -- * @systemapi -- * @since 20 -- */ -- function grantUriPermission( -- uri: string, -- bundleName: string, -- flag: wantConstant.Flags, -- callback: AsyncCallback -- ): void; -- -- /** -- * Provides grant uri permission for app -- * -- * @permission ohos.permission.WRITE_MEDIA -- * @param { string } uri uri -- * @param { string } bundleName bundleName -- * @param { wantConstant.Flags } flag wantConstant.Flags.FLAG_AUTH_READ_URI_PERMISSION -- * or wantConstant.Flags.FLAG_AUTH_WRITE_URI_PERMISSION -- * @returns { Promise } no callback return Promise otherwise return void -- * @throws { BusinessError } 201 - Permission verification failed -- * @throws { BusinessError } 202 - The caller is not a system application -- * @throws { BusinessError } 401 - The input parameter is invalid.Possible causes: -- * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. -- * @throws { BusinessError } 143000001 - IPC error -- * @syscap SystemCapability.FileManagement.AppFileService -- * @systemapi -- * @since 20 -- */ -- function grantUriPermission(uri: string, bundleName: string, flag: wantConstant.Flags): Promise; --} -- --export default fileShare; -diff --git a/api/@ohos.fileshare.d.ts b/api/@ohos.fileshare.d.ts -index 728df25c8..2189b2e97 100644 ---- a/api/@ohos.fileshare.d.ts -+++ b/api/@ohos.fileshare.d.ts -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2022-2024 Huawei Device Co., Ltd. -+ * Copyright (C) 2022-2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at -@@ -18,15 +18,21 @@ - * @kit CoreFileKit - */ - -+/*** if arkts 1.1 */ - import type { AsyncCallback, Callback } from './@ohos.base'; - import type wantConstant from './@ohos.ability.wantConstant'; -- -+/*** endif */ -+/*** if arkts 1.2 */ -+import { AsyncCallback, Callback } from './@ohos.base'; -+import type wantConstant from './@ohos.app.ability.wantConstant'; -+/*** endif */ - /** - * Provides fileshare APIS - * - * @namespace fileShare - * @syscap SystemCapability.FileManagement.AppFileService -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace fileShare { - /** -@@ -34,14 +40,16 @@ declare namespace fileShare { - * - * @enum { number } OperationMode - * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum OperationMode { - /** - * Indicates read permissions. - * - * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - READ_MODE = 0b1, - -@@ -49,7 +57,8 @@ declare namespace fileShare { - * Indicates write permissions. - * - * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WRITE_MODE = 0b10, - } -@@ -136,7 +145,8 @@ declare namespace fileShare { - * - * @interface PolicyInfo - * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface PolicyInfo { - /** -@@ -144,7 +154,8 @@ declare namespace fileShare { - * - * @type { string } - * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - uri: string; - -@@ -153,7 +164,8 @@ declare namespace fileShare { - * - * @type { number } - * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - operationMode: number; - } -@@ -163,7 +175,8 @@ declare namespace fileShare { - * - * @interface PathPolicyInfo - * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface PathPolicyInfo { - /** -@@ -171,7 +184,8 @@ declare namespace fileShare { - * - * @type { string } - * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - path: string; - -@@ -180,7 +194,8 @@ declare namespace fileShare { - * - * @type { OperationMode } - * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - operationMode: OperationMode; - } -@@ -190,14 +205,16 @@ declare namespace fileShare { - * - * @enum { number } policyType - * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum PolicyType { - /** - * Indicates that the policy is temporary. - * - * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TEMPORARY_TYPE = 0, - -@@ -205,7 +222,8 @@ declare namespace fileShare { - * Indicates that the policy is persistent. - * - * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PERSISTENT_TYPE = 1, - } -@@ -225,7 +243,8 @@ declare namespace fileShare { - * @throws { BusinessError } 143000001 - IPC error - * @syscap SystemCapability.FileManagement.AppFileService - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function grantUriPermission( - uri: string, -@@ -249,7 +268,8 @@ declare namespace fileShare { - * @throws { BusinessError } 143000001 - IPC error - * @syscap SystemCapability.FileManagement.AppFileService - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function grantUriPermission(uri: string, bundleName: string, flag: wantConstant.Flags): Promise; - -@@ -300,7 +320,8 @@ declare namespace fileShare { - * @throws { BusinessError } 13900001 - Operation not permitted. - * @throws { BusinessError } 13900042 - Unknown error - * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function activatePermission(policies: Array): Promise; - -@@ -317,7 +338,8 @@ declare namespace fileShare { - * @throws { BusinessError } 13900001 - Operation not permitted. - * @throws { BusinessError } 13900042 - Unknown error - * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function deactivatePermission(policies: Array): Promise; - -@@ -341,7 +363,7 @@ declare namespace fileShare { - * Check permissions for the path. - * - * @permission ohos.permission.CHECK_SANDBOX_POLICY -- * @param { number } tokenID - Token ID of the application. -+ * @param { int } tokenID - Token ID of the application. - * @param { Array } policies - Policy information to check on paths. - * @param { PolicyType } policyType - Persistent or temporary type. - * @returns { Promise> } Returns the permission state of paths. -@@ -352,9 +374,10 @@ declare namespace fileShare { - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.FileManagement.AppFileService.FolderAuthorization - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function checkPathPermission(tokenID: number, policies: Array, policyType: PolicyType): Promise>; -+ function checkPathPermission(tokenID: int, policies: Array, policyType: PolicyType): Promise>; - } - - export default fileShare; -diff --git a/api/@ohos.geoLocationManager.d.ts b/api/@ohos.geoLocationManager.d.ts -index 1ffde8333..0fb15eed0 100644 ---- a/api/@ohos.geoLocationManager.d.ts -+++ b/api/@ohos.geoLocationManager.d.ts -@@ -18,9 +18,6 @@ - * @kit LocationKit - */ - --/*** if arkts 1.1 */ --import { int, double } from './@ohos.base'; --/*** endif */ - import { AsyncCallback, Callback } from './@ohos.base'; - /*** if arkts 1.1 */ - import { WantAgent } from '@ohos.wantAgent'; -@@ -112,7 +109,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301100 - The location switch is off. - * @syscap SystemCapability.Location.Location.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'locationChange', request: LocationRequest | ContinuousLocationRequest, - callback: Callback): void; -@@ -160,7 +158,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @syscap SystemCapability.Location.Location.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'locationChange', callback?: Callback): void; - -@@ -176,7 +175,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @syscap SystemCapability.Location.Location.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'locationError', callback: Callback): void; - -@@ -192,7 +192,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @syscap SystemCapability.Location.Location.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'locationError', callback?: Callback): void; - -@@ -205,7 +206,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.on('locationEnabledChange')} due to limited device capabilities. - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @syscap SystemCapability.Location.Location.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'locationEnabledChange', callback: Callback): void; - -@@ -218,7 +220,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.off('locationEnabledChange')} due to limited device capabilities. - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @syscap SystemCapability.Location.Location.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'locationEnabledChange', callback?: Callback): void; - -@@ -251,7 +254,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @throws { BusinessError } 3301100 - The location switch is off. - * @syscap SystemCapability.Location.Location.Gnss -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'cachedGnssLocationsChange', request: CachedGnssLocationsRequest, callback: Callback>): void; - -@@ -282,7 +286,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @throws { BusinessError } 3301100 - The location switch is off. - * @syscap SystemCapability.Location.Location.Gnss -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'cachedGnssLocationsChange', callback?: Callback>): void; - -@@ -298,7 +303,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @throws { BusinessError } 3301100 - The location switch is off. - * @syscap SystemCapability.Location.Location.Gnss -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'satelliteStatusChange', callback: Callback): void; - -@@ -314,7 +320,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @throws { BusinessError } 3301100 - The location switch is off. - * @syscap SystemCapability.Location.Location.Gnss -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'satelliteStatusChange', callback?: Callback): void; - -@@ -330,7 +337,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @throws { BusinessError } 3301100 - The location switch is off. - * @syscap SystemCapability.Location.Location.Gnss -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'nmeaMessage', callback: Callback): void; - -@@ -346,7 +354,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @throws { BusinessError } 3301100 - The location switch is off. - * @syscap SystemCapability.Location.Location.Gnss -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'nmeaMessage', callback?: Callback): void; - -@@ -396,7 +405,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @throws { BusinessError } 3301500 - Failed to query the area information. - * @syscap SystemCapability.Location.Location.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'countryCodeChange', callback: Callback): void; - -@@ -410,7 +420,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @throws { BusinessError } 3301500 - Failed to query the area information. - * @syscap SystemCapability.Location.Location.Core -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'countryCodeChange', callback?: Callback): void; - -@@ -429,7 +440,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301800 - Failed to start WiFi or Bluetooth scanning. - * @syscap SystemCapability.Location.Location.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'locatingRequiredDataChange', config: LocatingRequiredDataConfig, callback: Callback>): void; - -@@ -445,7 +457,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.off('locatingRequiredDataChange')} due to limited device capabilities. - * @syscap SystemCapability.Location.Location.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'locatingRequiredDataChange', callback?: Callback>): void; - -@@ -460,7 +473,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @syscap SystemCapability.Location.Location.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'locationIconStatusChange', callback: Callback): void; - -@@ -475,7 +489,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @syscap SystemCapability.Location.Location.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'locationIconStatusChange', callback?: Callback): void; - -@@ -491,7 +506,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @throws { BusinessError } 3301100 - The location switch is off. - * @syscap SystemCapability.Location.Location.Core -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'bluetoothScanResultChange', callback: Callback): void; - -@@ -506,7 +522,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 801 - Capability not supported. Failed to call ${geoLocationManager.on('locatingRequiredDataChange')} due to limited device capabilities. - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @syscap SystemCapability.Location.Location.Core -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'bluetoothScanResultChange', callback?: Callback): void; - -@@ -669,7 +686,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301200 - Failed to obtain the geographical location. - * @syscap SystemCapability.Location.Location.Core - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getLastLocation(): Location; - -@@ -690,7 +708,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @syscap SystemCapability.Location.Location.Core - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isLocationEnabled(): boolean; - -@@ -734,7 +753,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @syscap SystemCapability.Location.Location.Core - * @systemapi -- * @since 20 -+ * @since arkts {'1.1':'20','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function enableLocation(callback: AsyncCallback): void; - -@@ -762,7 +782,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @syscap SystemCapability.Location.Location.Core - * @systemapi -- * @since 20 -+ * @since arkts {'1.1':'20','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function enableLocation(): Promise; - -@@ -804,7 +825,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @syscap SystemCapability.Location.Location.Core - * @systemapi -- * @since 20 -+ * @since arkts {'1.1':'20','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function disableLocation(): void; - -@@ -849,7 +871,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @throws { BusinessError } 3301300 - Reverse geocoding query failed. - * @syscap SystemCapability.Location.Location.Geocoder -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAddressesFromLocation(request: ReverseGeoCodeRequest, callback: AsyncCallback>): void; - -@@ -863,7 +886,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @throws { BusinessError } 3301300 - Reverse geocoding query failed. - * @syscap SystemCapability.Location.Location.Geocoder -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAddressesFromLocation(request: ReverseGeoCodeRequest): Promise>; - -@@ -1194,7 +1218,8 @@ declare namespace geoLocationManager { - * @throws { BusinessError } 3301000 - The location service is unavailable. - * @syscap SystemCapability.Location.Location.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isLocationPrivacyConfirmed(type: LocationPrivacyType): boolean; - -@@ -1369,7 +1394,8 @@ declare namespace geoLocationManager { - * - * @typedef SatelliteStatusInfo - * @syscap SystemCapability.Location.Location.Gnss -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface SatelliteStatusInfo { - /** -@@ -1377,7 +1403,8 @@ declare namespace geoLocationManager { - * - * @type { number } - * @syscap SystemCapability.Location.Location.Gnss -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - satellitesNumber: number; - -@@ -1386,7 +1413,8 @@ declare namespace geoLocationManager { - * - * @type { Array } - * @syscap SystemCapability.Location.Location.Gnss -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - satelliteIds: Array; - -@@ -1395,7 +1423,8 @@ declare namespace geoLocationManager { - * - * @type { Array } - * @syscap SystemCapability.Location.Location.Gnss -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - carrierToNoiseDensitys: Array; - -@@ -1404,7 +1433,8 @@ declare namespace geoLocationManager { - * - * @type { Array } - * @syscap SystemCapability.Location.Location.Gnss -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - altitudes: Array; - -@@ -1413,7 +1443,8 @@ declare namespace geoLocationManager { - * - * @type { Array } - * @syscap SystemCapability.Location.Location.Gnss -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - azimuths: Array; - -@@ -1422,7 +1453,8 @@ declare namespace geoLocationManager { - * - * @type { Array } - * @syscap SystemCapability.Location.Location.Gnss -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - carrierFrequencies: Array; - -@@ -1431,7 +1463,8 @@ declare namespace geoLocationManager { - * - * @type { ?Array } - * @syscap SystemCapability.Location.Location.Gnss -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - satelliteConstellation?: Array; - -@@ -1440,7 +1473,8 @@ declare namespace geoLocationManager { - * - * @type { ?Array } - * @syscap SystemCapability.Location.Location.Gnss -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - satelliteAdditionalInfo?: Array; - } -@@ -1450,7 +1484,8 @@ declare namespace geoLocationManager { - * - * @typedef CachedGnssLocationsRequest - * @syscap SystemCapability.Location.Location.Gnss -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface CachedGnssLocationsRequest { - /** -@@ -1458,7 +1493,8 @@ declare namespace geoLocationManager { - * - * @type { number } - * @syscap SystemCapability.Location.Location.Gnss -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - reportingPeriodSec: number; - -@@ -1467,7 +1503,8 @@ declare namespace geoLocationManager { - * - * @type { boolean } - * @syscap SystemCapability.Location.Location.Gnss -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - wakeUpCacheQueueFull: boolean; - } -@@ -2118,38 +2155,38 @@ declare namespace geoLocationManager { - /** - * Accuracy requirements for reporting locations. - * -- * @type { ?double } -+ * @type { ?number } - * @syscap SystemCapability.Location.Location.Core - * @since 9 - */ - /** - * Accuracy requirements for reporting locations. - * -- * @type { ?double } -+ * @type { ?number } - * @syscap SystemCapability.Location.Location.Core - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- maxAccuracy?: double; -+ maxAccuracy?: number; - - /** - * Timeout interval of a single location request. - * -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Location.Location.Core - * @since 9 - */ - /** - * Timeout interval of a single location request. - * -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Location.Location.Core - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- timeoutMs?: int; -+ timeoutMs?: number; - } - - /** -@@ -2249,13 +2286,13 @@ declare namespace geoLocationManager { - /** - * Timeout of a single location request, in milliseconds. - * -- * @type { int } -+ * @type { number } - * @syscap SystemCapability.Location.Location.Core - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- locatingTimeoutMs: int; -+ locatingTimeoutMs: number; - } - - /** -@@ -2280,7 +2317,7 @@ declare namespace geoLocationManager { - * A positive value indicates north latitude, - * and a negative value indicates south latitude. - * -- * @type { double } -+ * @type { number } - * @syscap SystemCapability.Location.Location.Core - * @since 9 - */ -@@ -2289,20 +2326,20 @@ declare namespace geoLocationManager { - * A positive value indicates north latitude, - * and a negative value indicates south latitude. - * -- * @type { double } -+ * @type { number } - * @syscap SystemCapability.Location.Location.Core - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- latitude: double; -+ latitude: number; - - /** - * Indicates Longitude information. - * A positive value indicates east longitude , - * and a negative value indicates west longitude. - * -- * @type { double } -+ * @type { number } - * @syscap SystemCapability.Location.Location.Core - * @since 9 - */ -@@ -2311,121 +2348,121 @@ declare namespace geoLocationManager { - * A positive value indicates east longitude , - * and a negative value indicates west longitude. - * -- * @type { double } -+ * @type { number } - * @syscap SystemCapability.Location.Location.Core - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- longitude: double; -+ longitude: number; - - /** - * Indicates location altitude, in meters. - * -- * @type { double } -+ * @type { number } - * @syscap SystemCapability.Location.Location.Core - * @since 9 - */ - /** - * Indicates location altitude, in meters. - * -- * @type { double } -+ * @type { number } - * @syscap SystemCapability.Location.Location.Core - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- altitude: double; -+ altitude: number; - - /** - * Indicates location accuracy, in meters. - * -- * @type { double } -+ * @type { number } - * @syscap SystemCapability.Location.Location.Core - * @since 9 - */ - /** - * Indicates location accuracy, in meters. - * -- * @type { double } -+ * @type { number } - * @syscap SystemCapability.Location.Location.Core - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- accuracy: double; -+ accuracy: number; - - /** - * Indicates speed, in m/s. - * -- * @type { double } -+ * @type { number } - * @syscap SystemCapability.Location.Location.Core - * @since 9 - */ - /** - * Indicates speed, in m/s. - * -- * @type { double } -+ * @type { number } - * @syscap SystemCapability.Location.Location.Core - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- speed: double; -+ speed: number; - - /** - * Indicates location timestamp in the UTC format. - * -- * @type { int } -+ * @type { number } - * @syscap SystemCapability.Location.Location.Core - * @since 9 - */ - /** - * Indicates location timestamp in the UTC format. - * -- * @type { int } -+ * @type { number } - * @syscap SystemCapability.Location.Location.Core - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- timeStamp: int; -+ timeStamp: number; - - /** - * Indicates direction information. - * -- * @type { double } -+ * @type { number } - * @syscap SystemCapability.Location.Location.Core - * @since 9 - */ - /** - * Indicates direction information. - * -- * @type { double } -+ * @type { number } - * @syscap SystemCapability.Location.Location.Core - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- direction: double; -+ direction: number; - - /** - * Indicates location timestamp since boot. - * -- * @type { int } -+ * @type { number } - * @syscap SystemCapability.Location.Location.Core - * @since 9 - */ - /** - * Indicates location timestamp since boot. - * -- * @type { int } -+ * @type { number } - * @syscap SystemCapability.Location.Location.Core - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- timeSinceBoot: int; -+ timeSinceBoot: number; - - /** - * Indicates additional information. -@@ -2459,20 +2496,20 @@ declare namespace geoLocationManager { - /** - * Indicates the amount of additional descriptive information. - * -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Location.Location.Core - * @since 9 - */ - /** - * Indicates the amount of additional descriptive information. - * -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Location.Location.Core - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- additionSize?: int; -+ additionSize?: number; - - /** - * Indicates whether it is an mock location. -@@ -2488,46 +2525,46 @@ declare namespace geoLocationManager { - /** - * Indicates vertical position accuracy in meters. - * -- * @type { ?double } -+ * @type { ?number } - * @syscap SystemCapability.Location.Location.Core - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- altitudeAccuracy?: double; -+ altitudeAccuracy?: number; - - /** - * Indicates speed accuracy in meter per seconds. - * -- * @type { ?double } -+ * @type { ?number } - * @syscap SystemCapability.Location.Location.Core - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- speedAccuracy?: double; -+ speedAccuracy?: number; - - /** - * Indicates direction accuracy in degrees. - * -- * @type { ?double } -+ * @type { ?number } - * @syscap SystemCapability.Location.Location.Core - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- directionAccuracy?: double; -+ directionAccuracy?: number; - - /** - * Time uncertainty Of timeSinceBoot in nanosecond. - * -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Location.Location.Core - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- uncertaintyOfTimeSinceBoot?: int; -+ uncertaintyOfTimeSinceBoot?: number; - - /** - * Indicates the source of the location. -@@ -2812,7 +2849,7 @@ declare namespace geoLocationManager { - /** - * Enum for the source of the location. - * -- * @enum { int } -+ * @enum { number } - * @syscap SystemCapability.Location.Location.Core - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} -@@ -3163,7 +3200,7 @@ declare namespace geoLocationManager { - /** - * Enum for user activity scenario. - * -- * @enum { int } -+ * @enum { number } - * @syscap SystemCapability.Location.Location.Core - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} -@@ -3214,7 +3251,7 @@ declare namespace geoLocationManager { - /** - * Enum for locating priority. - * -- * @enum { int } -+ * @enum { number } - * @syscap SystemCapability.Location.Location.Core - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} -@@ -3245,14 +3282,14 @@ declare namespace geoLocationManager { - /** - * Enum for location priority. - * -- * @enum { int } -+ * @enum { number } - * @syscap SystemCapability.Location.Location.Core - * @since 9 - */ - /** - * Enum for location priority. - * -- * @enum { int } -+ * @enum { number } - * @syscap SystemCapability.Location.Location.Core - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -@@ -3327,14 +3364,14 @@ declare namespace geoLocationManager { - /** - * Enum for location scenario. - * -- * @enum { int } -+ * @enum { number } - * @syscap SystemCapability.Location.Location.Core - * @since 9 - */ - /** - * Enum for location scenario. - * -- * @enum { int } -+ * @enum { number } - * @syscap SystemCapability.Location.Location.Core - * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} -diff --git a/api/@ohos.graphics.colorSpaceManager.d.ts b/api/@ohos.graphics.colorSpaceManager.d.ts -index 474e97d31..dbb4be075 100644 ---- a/api/@ohos.graphics.colorSpaceManager.d.ts -+++ b/api/@ohos.graphics.colorSpaceManager.d.ts -@@ -461,7 +461,6 @@ declare namespace colorSpaceManager { - */ - LINEAR_SRGB = 24, - -- /*** if arkts 1.1 */ - /** - * PRIMARIES_BT709 | TRANSFUNC_LINEAR - * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core -@@ -473,21 +472,9 @@ declare namespace colorSpaceManager { - * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} - */ - LINEAR_BT709 = LINEAR_SRGB, -- /*** endif */ -- /*** if arkts 1.2 */ -- /** -- * PRIMARIES_BT709 | TRANSFUNC_LINEAR -- * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ -- LINEAR_BT709 = 24, -- /*** endif */ - - /** - * PRIMARIES_BT2020 | TRANSFUNC_LINEAR -@@ -504,7 +491,6 @@ declare namespace colorSpaceManager { - */ - LINEAR_BT2020 = 25, - -- /*** if arkts 1.1 */ - /** - * PRIMARIES_SRGB | TRANSFUNC_SRGB | RANGE_FULL - * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core -@@ -516,23 +502,10 @@ declare namespace colorSpaceManager { - * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} - */ - DISPLAY_SRGB = SRGB, -- /*** endif */ -- /*** if arkts 1.2 */ -- /** -- * PRIMARIES_SRGB | TRANSFUNC_SRGB | RANGE_FULL -- * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ -- DISPLAY_SRGB = 4, -- /*** endif */ - -- /*** if arkts 1.1 */ - /** - * PRIMARIES_P3_D65 | TRANSFUNC_SRGB | RANGE_FULL - * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core -@@ -544,23 +517,10 @@ declare namespace colorSpaceManager { - * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} - */ - DISPLAY_P3_SRGB = DISPLAY_P3, -- /*** endif */ -- /*** if arkts 1.2 */ -- /** -- * PRIMARIES_P3_D65 | TRANSFUNC_SRGB | RANGE_FULL -- * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ -- DISPLAY_P3_SRGB = 3, -- /*** endif */ - -- /*** if arkts 1.1 */ - /** - * PRIMARIES_P3_D65 | TRANSFUNC_HLG | RANGE_FULL - * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core -@@ -572,23 +532,10 @@ declare namespace colorSpaceManager { - * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} - */ - DISPLAY_P3_HLG = P3_HLG, -- /*** endif */ -- /*** if arkts 1.2 */ -- /** -- * PRIMARIES_P3_D65 | TRANSFUNC_HLG | RANGE_FULL -- * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ -- DISPLAY_P3_HLG = 11, -- /*** endif */ - -- /*** if arkts 1.1 */ - /** - * PRIMARIES_DISPLAY_P3 | TRANSFUNC_PQ | RANGE_FULL - * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core -@@ -600,21 +547,9 @@ declare namespace colorSpaceManager { - * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} - */ - DISPLAY_P3_PQ = P3_PQ, -- /*** endif */ -- /*** if arkts 1.2 */ -- /** -- * PRIMARIES_DISPLAY_P3 | TRANSFUNC_PQ | RANGE_FULL -- * @syscap SystemCapability.Graphic.Graphic2D.ColorManager.Core -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ -- DISPLAY_P3_PQ = 12, -- /*** endif */ - - /** - * Indicates a customized color space. -diff --git a/api/@ohos.graphics.common2D.d.ets b/api/@ohos.graphics.common2D.d.ets -deleted file mode 100644 -index eb61337df..000000000 ---- a/api/@ohos.graphics.common2D.d.ets -+++ /dev/null -@@ -1,145 +0,0 @@ --/* -- * Copyright (c) 2023 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --/** -- * @file -- * @kit ArkGraphics2D -- */ --/** -- * The date structure that provides the basis for graphics. -- * -- * @namespace common2D -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ --declare namespace common2D { -- /** -- * Provide a description in the form of color ARGB. -- * @typedef Color -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- export interface Color { -- /** -- * Alpha component of color, from 0 to 255. -- * @type { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- alpha: number; -- /** -- * Red component of color, from 0 to 255. -- * @type { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- red: number; -- /** -- * Green component of color, from 0 to 255. -- * @type { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- green: number; -- /** -- * Blue component of color, from 0 to 255. -- * @type { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- blue: number; -- } -- -- /** -- * Provides the definition of the rectangle. -- * @typedef Rect -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- export interface Rect { -- /** -- * Left Position of Rectangle. -- * @type { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- left: number; -- /** -- * Top side position of the rectangle -- * @type { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- top: number; -- /** -- * Right Position of Rectangle. -- * @type { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- right: number; -- /** -- * Position of the bottom side of the rectangle. -- * @type { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- bottom: number; -- } -- -- /** -- * Coordinates in the font layout. -- * @typedef Point -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export interface Point { -- /** -- * X-axis coordinate. -- * @type { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- x: number; -- -- /** -- * Y-axis coordinate. -- * @type { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- y: number; -- } -- -- /** -- * Provides the definition of the point in 3D. -- * -- * @typedef Point3d -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export interface Point3d extends Point { -- /** -- * Z-axis coordinate. -- * @type { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- z: number; -- } -- --} -- --export default common2D; -\ No newline at end of file -diff --git a/api/@ohos.graphics.common2D.d.ts b/api/@ohos.graphics.common2D.d.ts -index 0ed515ac7..42fe461d2 100644 ---- a/api/@ohos.graphics.common2D.d.ts -+++ b/api/@ohos.graphics.common2D.d.ts -@@ -22,42 +22,48 @@ - * - * @namespace common2D - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace common2D { - /** - * Provide a description in the form of color ARGB. - * @typedef Color - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Color { - /** - * Alpha component of color, from 0 to 255. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - alpha: number; - /** - * Red component of color, from 0 to 255. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - red: number; - /** - * Green component of color, from 0 to 255. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - green: number; - /** - * Blue component of color, from 0 to 255. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - blue: number; - } -@@ -66,35 +72,40 @@ declare namespace common2D { - * Provides the definition of the rectangle. - * @typedef Rect - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Rect { - /** - * Left Position of Rectangle. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - left: number; - /** - * Top side position of the rectangle - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - top: number; - /** - * Right Position of Rectangle. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - right: number; - /** - * Position of the bottom side of the rectangle. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - bottom: number; - } -@@ -103,14 +114,16 @@ declare namespace common2D { - * Coordinates in the font layout. - * @typedef Point - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Point { - /** - * X-axis coordinate. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - x: number; - -@@ -118,7 +131,8 @@ declare namespace common2D { - * Y-axis coordinate. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - y: number; - } -diff --git a/api/@ohos.graphics.drawing.d.ets b/api/@ohos.graphics.drawing.d.ets -deleted file mode 100644 -index 4e139eb54..000000000 ---- a/api/@ohos.graphics.drawing.d.ets -+++ /dev/null -@@ -1,3708 +0,0 @@ --/* -- * Copyright (c) 2023-2024 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --/** -- * @file -- * @kit ArkGraphics2D -- */ -- --import type image from './@ohos.multimedia.image'; --import type common2D from './@ohos.graphics.common2D'; -- --/** -- * Provides functions such as 2D graphics rendering, text drawing, and image display. -- * -- * @namespace drawing -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ --declare namespace drawing { -- /** -- * Enumerate blending modes for colors. -- * Blend is a operation that use 4 components(red, green, blue, alpha) to generate -- * a new color from two colors(source, destination). -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- export enum BlendMode { -- /** -- * Disable 4 regions(red, green, blue, alpha) -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- CLEAR = 0, -- /** -- * Use components of the source -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- SRC = 1, -- /** -- * Use components of the destination -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- DST = 2, -- /** -- * The source is placed above the destination. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- SRC_OVER = 3, -- /** -- * The Destination is placed above the source. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- DST_OVER = 4, -- /** -- * Use source replaces the destination, and will not exceed the boundaries of the destination -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- SRC_IN = 5, -- /** -- * Use destination, and will not exceed the boundaries of the source -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- DST_IN = 6, -- /** -- * Source is use in outside of the boundaries of the destination. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- SRC_OUT = 7, -- /** -- * Destination is use in outside of the boundaries of the source. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- DST_OUT = 8, -- /** -- * Source which overlaps the destination will replaces the destination. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- SRC_ATOP = 9, -- /** -- * Destination which overlaps the source will replaces the source. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- DST_ATOP = 10, -- /** -- * Combine regions where source and destination do not overlap. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- XOR = 11, -- /** -- * The sum of the source and destination. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- PLUS = 12, -- /** -- * All components are multiplied. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- MODULATE = 13, -- /** -- * Multiply the complement values of the background and source color values, -- * and then complement the result. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- SCREEN = 14, -- /** -- * Multiplies or screens the colors, depending on destination -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- OVERLAY = 15, -- /** -- * Choose a darker background and source color. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- DARKEN = 16, -- /** -- * Choose a lighter background and source color. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- LIGHTEN = 17, -- /** -- * Brightens destination color to reflect the source color. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- COLOR_DODGE = 18, -- /** -- * Darkens destination color to reflect the source color. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- COLOR_BURN = 19, -- /** -- * Multiplies or screens the colors, depending on source -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- HARD_LIGHT = 20, -- /** -- * Lightens or Darkens the colors, depending on the source. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- SOFT_LIGHT = 21, -- /** -- * Subtract the darker of the two colors from the brighter color. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- DIFFERENCE = 22, -- /** -- * Produces an effect similar to difference mode, but with lower contrast. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- EXCLUSION = 23, -- /** -- * Multiply the source color by the destination color and replace the destination. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- MULTIPLY = 24, -- /** -- * Use the hue of the source and the saturation and brightness of the destination. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- HUE = 25, -- /** -- * Use the saturation of the source and the hue and brightness of the destination. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- SATURATION = 26, -- /** -- * Use the hue and saturation of the source and the brightness of the destination. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- COLOR = 27, -- /** -- * Use the brightness of the source and the hue and saturation of the destination. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- LUMINOSITY = 28, -- } -- -- /** -- * Enumerates direction for adding closed contours. -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export enum PathDirection { -- /** -- * Clockwise direction for adding closed contours. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- CLOCKWISE = 0, -- -- /** -- * Counter-clockwise direction for adding closed contours. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- COUNTER_CLOCKWISE = 1, -- } -- -- /** -- * Enumerates fill type of path. -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export enum PathFillType { -- /** -- * Specifies that "inside" is computed by a non-zero sum of signed edge crossings. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- WINDING = 0, -- -- /** -- * Specifies that "inside" is computed by an odd number of edge crossings. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- EVEN_ODD = 1, -- -- /** -- * Same as winding, but draws outside of the path, rather than inside. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- INVERSE_WINDING = 2, -- -- /** -- * Same as evenOdd, but draws outside of the path, rather than inside. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- INVERSE_EVEN_ODD = 3, -- } -- -- /** -- * Enumerate path measure flags for matrix. -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export enum PathMeasureMatrixFlags { -- /** -- * Gets position. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- GET_POSITION_MATRIX = 0, -- /** -- * Gets tangent. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- GET_TANGENT_MATRIX = 1, -- /** -- * Gets both position and tangent. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- GET_POSITION_AND_TANGENT_MATRIX = 2, -- } -- -- /** -- * Provides the definition of the roundRect. -- * -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export class RoundRect { -- /** -- * Creates a simple round rect with the same four corner radii. -- * @param { common2D.Rect } rect - Indicates the Rect object. -- * @param { number } xRadii - Indicates the corner radii on x-axis. -- * @param { number } yRadii - Indicates the corner radii on y-axis. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- constructor(rect: common2D.Rect, xRadii: number, yRadii: number); -- -- /** -- * Sets the radiusX and radiusY for a specific corner position. -- * @param { CornerPos } pos - Indicates the corner radius position. -- * @param { number } x - Indicates the corner radius on x-axis. -- * @param { number } y - Indicates the corner radius on y-axis. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setCorner(pos: CornerPos, x: number, y: number): void; -- -- /** -- * Gets a point with the values of x-axis and y-axis of the selected corner radius. -- * @param { CornerPos } pos - Indicates the corner radius position. -- * @returns { common2D.Point } Returns a point with the values of x-axis and y-axis of the corner radius. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getCorner(pos: CornerPos): common2D.Point; -- -- /** -- * Translates round rect by (dx, dy). -- * @param { number } dx - Indicates the offsets added to rect left and rect right. -- * @param { number } dy - Indicates the offsets added to rect top and rect bottom. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- offset(dx: number, dy: number): void; -- } -- -- /** -- * Enumerates of operations when two paths are combined. -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export enum PathOp { -- /** -- * Difference operation. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- DIFFERENCE = 0, -- -- /** -- * Intersect operation. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- INTERSECT = 1, -- -- /** -- * Union operation. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- UNION = 2, -- -- /** -- * Xor operation. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- XOR = 3, -- -- /** -- * Reverse difference operation. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- REVERSE_DIFFERENCE = 4, -- } -- -- /** -- * Describes a path object. -- * -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- export class Path { -- /** -- * Creates a Path. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- constructor(); -- -- /** -- * Creates a Path from other path. -- * @param { Path } path - the path to copy content from. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- constructor(path: Path); -- -- /** -- * Sets the start point of a path -- * @param { number } x - Indicates the x coordinate of the start point. -- * @param { number } y - Indicates the y coordinate of the start point. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- moveTo(x: number, y: number): void; -- -- /** -- * Draws a line segment from the last point of a path to the target point. -- * @param { number } x - Indicates the x coordinate of the target point. -- * @param { number } y - Indicates the y coordinate of the target point. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- lineTo(x: number, y: number): void; -- -- /** -- * This is done by using angle arc mode. In this mode, a rectangle that encloses an ellipse is specified first, -- * and then a start angle and a sweep angle are specified. -- * The arc is a portion of the ellipse defined by the start angle and the sweep angle. -- * By default, a line segment from the last point of the path to the start point of the arc is also added. -- * @param { number } x1 - Indicates the x coordinate of the upper left corner of the rectangle. -- * @param { number } y1 - Indicates the y coordinate of the upper left corner of the rectangle. -- * @param { number } x2 - Indicates the x coordinate of the lower right corner of the rectangle. -- * @param { number } y2 - Indicates the y coordinate of the lower right corner of the rectangle. -- * @param { number } startDeg - Indicates the start angle, in degrees. -- * @param { number } sweepDeg - Indicates the angle to sweep, in degrees. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- arcTo(x1: number, y1: number, x2: number, y2: number, startDeg: number, sweepDeg: number): void; -- -- /** -- * Draws a quadratic Bezier curve from the last point of a path to the target point. -- * @param { number } ctrlX - Indicates the x coordinate of the control point. -- * @param { number } ctrlY - Indicates the y coordinate of the control point. -- * @param { number } endX - Indicates the x coordinate of the target point. -- * @param { number } endY - Indicates the y coordinate of the target point. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- quadTo(ctrlX: number, ctrlY: number, endX: number, endY: number): void; -- -- /** -- * Draws a conic from the last point of a path to the target point. -- * @param { number } ctrlX - Indicates the x coordinate of the control point. -- * @param { number } ctrlY - Indicates the y coordinate of the control point. -- * @param { number } endX - Indicates the x coordinate of the target point. -- * @param { number } endY - Indicates the y coordinate of the target point. -- * @param { number } weight - Indicates the weight of added conic. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- conicTo(ctrlX: number, ctrlY: number, endX: number, endY: number, weight: number): void; -- -- /** -- * Draws a cubic Bezier curve from the last point of a path to the target point. -- * @param { number } ctrlX1 - Indicates the x coordinate of the first control point. -- * @param { number } ctrlY1 - Indicates the y coordinate of the first control point. -- * @param { number } ctrlX2 - Indicates the x coordinate of the second control point. -- * @param { number } ctrlY2 - Indicates the y coordinate of the second control point. -- * @param { number } endX - Indicates the x coordinate of the target point. -- * @param { number } endY - Indicates the y coordinate of the target point. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- cubicTo(ctrlX1: number, ctrlY1: number, ctrlX2: number, ctrlY2: number, endX: number, endY: number): void; -- -- /** -- * Sets the relative starting point of a path. -- * @param { number } dx - Indicates the x coordinate of the relative starting point. -- * @param { number } dy - Indicates the y coordinate of the relative starting point. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- rMoveTo(dx: number, dy: number): void; -- -- /** -- * Draws a line segment from the last point of a path to the relative target point. -- * @param { number } dx - Indicates the x coordinate of the relative target point. -- * @param { number } dy - Indicates the y coordinate of the relative target point. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- rLineTo(dx: number, dy: number): void; -- -- /** -- * Draws a quadratic bezier curve from the last point of a path to the relative target point. -- * @param { number } dx1 - Indicates the x coordinate of the relative control point. -- * @param { number } dy1 - Indicates the y coordinate of the relative control point. -- * @param { number } dx2 - Indicates the x coordinate of the relative target point. -- * @param { number } dy2 - Indicates the y coordinate of the relative target point. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- rQuadTo(dx1: number, dy1: number, dx2: number, dy2: number): void; -- -- /** -- * Draws a conic from the last point of a path to the relative target point. -- * @param { number } ctrlX - Indicates the x coordinate of the relative control point. -- * @param { number } ctrlY - Indicates the y coordinate of the relative control point. -- * @param { number } endX - Indicates the x coordinate of the relative target point. -- * @param { number } endY - Indicates the y coordinate of the relative target point. -- * @param { number } weight - Indicates the weight of added conic. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- rConicTo(ctrlX: number, ctrlY: number, endX: number, endY: number, weight: number): void; -- -- /** -- * Draws a cubic bezier curve from the last point of a path to the relative target point. -- * @param { number } ctrlX1 - Indicates the x coordinate of the first relative control point. -- * @param { number } ctrlY1 - Indicates the y coordinate of the first relative control point. -- * @param { number } ctrlX2 - Indicates the x coordinate of the second relative control point. -- * @param { number } ctrlY2 - Indicates the y coordinate of the second relative control point. -- * @param { number } endX - Indicates the x coordinate of the relative target point. -- * @param { number } endY - Indicates the y coordinate of the relative target point. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- rCubicTo(ctrlX1: number, ctrlY1: number, ctrlX2: number, ctrlY2: number, endX: number, endY: number): void; -- -- /** -- * Adds contour created from point array, adding (count - 1) line segments. -- * @param { Array } points - Indicates the point array. -- * @param { boolean } close - Indicates Whether to add lines that connect the end and start. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- addPolygon(points: Array, close: boolean): void; -- -- /** -- * Combines two paths. -- * @param { Path } path - Indicates the Path object. -- * @param { PathOp } pathOp - Indicates the operator to apply path. -- * @returns { boolean } boolean - Returns true if constructed path is not empty; returns false otherwise. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- op(path: Path, pathOp: PathOp): boolean; -- -- /** -- * Appends arc to path, as the start of new contour. -- * Arc added is part of ellipse bounded by oval, from startAngle through sweepAngle. -- * @param { common2D.Rect } rect - The bounds of the arc is described by a rect. -- * @param { number } startAngle - Indicates the starting angle of arc in degrees. -- * @param { number } sweepAngle - Indicates the sweep, in degrees. Positive is clockwise. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- addArc(rect: common2D.Rect, startAngle: number, sweepAngle: number): void; -- -- /** -- * Adds a circle to the path, and wound in the specified direction. -- * @param { number } x - Indicates the x coordinate of the center of the circle. -- * @param { number } y - Indicates the y coordinate of the center of the circle. -- * @param { number } radius - Indicates the radius of the circle. -- * @param { PathDirection } pathDirection - The default value is CLOCKWISE. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- addCircle(x: number, y: number, radius: number, pathDirection?: PathDirection): void; -- -- /** -- * Adds a oval to the path, defined by the rect, and wound in the specified direction. -- * @param { common2D.Rect } rect - The bounds of the oval is described by a rect. -- * @param { number } start - Indicates the index of initial point of ellipse. -- * @param { PathDirection } pathDirection - The default value is CLOCKWISE. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- addOval(rect: common2D.Rect, start: number, pathDirection?: PathDirection): void; -- -- /** -- * Adds a new contour to the path, defined by the rect, and wound in the specified direction. -- * @param { common2D.Rect } rect - Indicates the Rect object. -- * @param { PathDirection } pathDirection - The default value is CLOCKWISE. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- addRect(rect: common2D.Rect, pathDirection?: PathDirection): void; -- -- /** -- * Adds a new contour to the path, defined by the round rect, and wound in the specified direction. -- * @param { RoundRect } roundRect - Indicates the RoundRect object. -- * @param { PathDirection } pathDirection - The default value is CLOCKWISE. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- addRoundRect(roundRect: RoundRect, pathDirection?: PathDirection): void; -- -- /** -- * Appends src path to path, transformed by matrix. -- * @param { Path } path - Indicates the Path object. -- * @param { Matrix | null } matrix - Indicates transform applied to path. The default value is null. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- addPath(path: Path, matrix?: Matrix | null): void; -- -- /** -- * Path is replaced by transformed data. -- * @param { Matrix } matrix - Indicates transform applied to path. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- transform(matrix: Matrix): void; -- -- /** -- * Returns the status that point (x, y) is contained by path. -- * @param { number } x - Indicates the x-axis value of containment test. -- * @param { number } y - Indicates the y-axis value of containment test. -- * @returns { boolean } Returns true if the point (x, y) is contained by path; returns false otherwise. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- contains(x: number, y: number): boolean; -- -- /** -- * Sets fill type, the rule used to fill path. -- * @param { PathFillType } pathFillType - Indicates the enum path fill type. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setFillType(pathFillType: PathFillType): void; -- -- /** -- * Gets the smallest bounding box that contains the path. -- * @returns { common2D.Rect } Rect object. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getBounds(): common2D.Rect; -- -- /** -- * Closes a path. A line segment from the start point to the last point of the path is added. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- close(): void; -- -- /** -- * Offsets point array by (dx, dy). Path is replaced by offset data. -- * @param { number } dx - Indicates offset added to dst path x-axis coordinates. -- * @param { number } dy - Indicates offset added to dst path y-axis coordinates. -- * @returns { Path } Returns a new Path object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- offset(dx: number, dy: number): Path; -- -- /** -- * Resets path data. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- reset(): void; -- -- /** -- * Get path length. -- * @param { boolean } forceClosed - Whether to close the Path. -- * @returns { number } Return path length. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getLength(forceClosed: boolean): number; -- -- /** -- * Gets the position and tangent of the distance from the starting position of the path. -- * -- * @param { boolean } forceClosed - Whether to close the path. -- * @param { number } distance - The distance from the start of the path, should be greater than 0 -- * and less than 'GetLength()'. -- * @param { common2D.Point } position - Sets to the position of distance from the starting position of the path. -- * @param { common2D.Point } tangent - Sets to the tangent of distance from the starting position of the path. -- * @returns { boolean } - Returns true if succeeded, otherwise false. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getPositionAndTangent(forceClosed: boolean, distance: number, position: common2D.Point, -- tangent: common2D.Point): boolean; -- -- /** -- * Determines whether the current contour is closed. -- * -- * @returns { boolean } - Returns true if the current contour is closed, otherwise false. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- isClosed(): boolean; -- -- /** -- * Computes the corresponding matrix at the specified distance. -- * -- * @param { boolean } forceClosed - Whether to close the path. -- * @param { number } distance - The distance from the start of the path. -- * @param { Matrix } matrix - Indicates the pointer to an Matrix object. -- * @param { PathMeasureMatrixFlags } flags - Indicates what should be returned in the matrix. -- * @returns { boolean } - Returns false if there is no path, or a zero-length path was specified, -- * in which case matrix is unchanged. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: Mandatory parameters are left unspecified. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getMatrix(forceClosed: boolean, distance: number, matrix: Matrix, flags: PathMeasureMatrixFlags): boolean; -- -- /** -- * Parses the SVG format string that describes the drawing path, and sets the path. -- * -- * @param { string } str - A string in SVG format that describes the drawing path. -- * @returns { boolean } true if build succeeded, otherwise false. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: Mandatory parameters are left unspecified. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- buildFromSvgString(str: string): boolean; -- } -- -- /** -- * Enumerates of scale to fit flags, selects if an array of points are drawn as discrete points, -- * as lines, or as an open polygon. -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export enum PointMode { -- /** -- * Draws each point separately. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- POINTS = 0, -- -- /** -- * Draws each pair of points as a line segment. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- LINES = 1, -- -- /** -- * Draws the array of points as a open polygon. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- POLYGON = 2, -- } -- -- /** -- * Enumerates storage filter mode. -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export enum FilterMode { -- /** -- * Single sample point (nearest neighbor). -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- FILTER_MODE_NEAREST = 0, -- -- /** -- * Interpolate between 2x2 sample points (bilinear interpolation). -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- FILTER_MODE_LINEAR = 1, -- } -- -- /** -- * Enumerates of shadow flags. -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export enum ShadowFlag { -- /** -- * Use no shadow flags. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- NONE = 0, -- -- /** -- * The occluding object is transparent. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- TRANSPARENT_OCCLUDER = 1, -- -- /** -- * No need to analyze shadows. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- GEOMETRIC_ONLY = 2, -- -- /** -- * Use all shadow flags. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- ALL = 3, -- } -- -- /** -- * Provides an interface to the drawing, and samplingOptions used when sampling from the image. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export class SamplingOptions { -- /** -- * Constructor for the samplingOptions. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- constructor(); -- /** -- * Constructor for the samplingOptions with filter mode. -- * @param { FilterMode } filterMode - Storage filter mode. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- constructor(filterMode: FilterMode); -- } -- -- /** -- * Provides an interface to the drawing, and how to clip and transform the drawing. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- export class Canvas { -- /** -- * Constructor for the Canvas. -- * @param { image.PixelMap } pixelmap - PixelMap. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- constructor(pixelmap: image.PixelMap); -- -- /** -- * If rectangle is stroked, use pen to stroke width describes the line thickness, -- * else use brush to fill the rectangle. -- * @param { common2D.Rect } rect - Rectangle to draw. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- drawRect(rect: common2D.Rect): void; -- -- /** -- * If rectangle is stroked, use pen to stroke width describes the line thickness, -- * else use brush to fill the rectangle. -- * @param { number } left - Indicates the left position of the rectangle. -- * @param { number } top - Indicates the top position of the rectangle. -- * @param { number } right - Indicates the right position of the rectangle. -- * @param { number } bottom - Indicates the bottom position of the rectangle. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- drawRect(left: number, top: number, right: number, bottom: number): void; -- -- /** -- * Draws a RoundRect. -- * @param { RoundRect } roundRect - Indicates the RectRound object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- drawRoundRect(roundRect: RoundRect): void; -- -- /** -- * Draws a nested RoundRect. -- * @param { RoundRect } outer - Indicates the outer RectRound object. -- * @param { RoundRect } inner - Indicates the inner RectRound object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- drawNestedRoundRect(outer: RoundRect, inner: RoundRect): void; -- -- /** -- * Fills clipped canvas area with brush. -- * @param { Brush } brush - Indicates the Brush object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- drawBackground(brush: Brush): void; -- -- /** -- * Draws an offset spot shadow and outlining ambient shadow for the given path with circular light. -- * @param { Path } path - Indicates the Path object. -- * @param { common2D.Point3d } planeParams - Represents z offset of the occluder from the canvas based on x and y. -- * @param { common2D.Point3d } devLightPos - Represents the position of the light relative to the canvas. -- * @param { number } lightRadius - The radius of the circular light. -- * @param { common2D.Color } ambientColor - Ambient shadow's color. -- * @param { common2D.Color } spotColor - Spot shadow's color. -- * @param { ShadowFlag } flag - Indicates the flag to control opaque occluder, shadow, and light position. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- drawShadow(path: Path, planeParams: common2D.Point3d, devLightPos: common2D.Point3d, lightRadius: number, -- ambientColor: common2D.Color, spotColor: common2D.Color, flag: ShadowFlag) : void; -- -- /** -- * Draws an offset spot shadow and outlining ambient shadow for the given path with circular light. -- * In this function, the input of the parameter 'ambientColor' and 'spotColor' should be number -- * @param { Path } path - Indicates the Path object. -- * @param { common2D.Point3d } planeParams - Represents z offset of the occluder from the canvas based on x and y. -- * @param { common2D.Point3d } devLightPos - Represents the position of the light relative to the canvas. -- * @param { number } lightRadius - The radius of the circular light. -- * @param { number } ambientColor - Ambient shadow's color represented by ARGB color of hexadecimal format. -- * @param { number } spotColor - Spot shadow's color represented by ARGB color of hexadecimal format. -- * @param { ShadowFlag } flag - Indicates the flag to control opaque occluder, shadow, and light position. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 13 -- */ -- drawShadow(path: Path, planeParams: common2D.Point3d, devLightPos: common2D.Point3d, lightRadius: number, -- ambientColor: number, spotColor: number, flag: ShadowFlag) : void; -- -- /** -- * If radius is zero or less, nothing is drawn. If circle is stroked, use pen to -- * stroke width describes the line thickness, else use brush to fill the circle. -- * @param { number } x - X coordinate of the circle center. -- * @param { number } y - Y coordinate of the circle center. -- * @param { number } radius - The radius of the circle must be greater than 0. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- drawCircle(x: number, y: number, radius: number): void; -- -- /** -- * Draw a pixelmap, with the upper left corner at (left, top). -- * @param { image.PixelMap } pixelmap - PixelMap. -- * @param { number } left - Left side of image. -- * @param { number } top - Top side of image. -- * @throws { BusinessError } 401 - Parameter error. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- /** -- * Draw a pixelmap, with the upper left corner at (left, top). -- * @param { image.PixelMap } pixelmap - PixelMap. -- * @param { number } left - Left side of image. -- * @param { number } top - Top side of image. -- * @param { SamplingOptions } samplingOptions - SamplingOptions used to describe the sampling mode. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- drawImage(pixelmap: image.PixelMap, left: number, top: number, samplingOptions?: SamplingOptions): void; -- -- /** -- * Draws the specified source image onto the canvas, -- * scaled and translated to the destination rectangle. -- * @param { image.PixelMap } pixelmap - The source image. -- * @param { common2D.Rect } dstRect - The area of destination canvas. -- * @param { SamplingOptions } samplingOptions - SamplingOptions used to describe the sampling mode. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- drawImageRect(pixelmap: image.PixelMap, dstRect: common2D.Rect, samplingOptions?: SamplingOptions): void; -- -- /** -- * Draws the specified source rectangle of the image onto the canvas, -- * scaled and translated to the destination rectangle. -- * @param { image.PixelMap } pixelmap - The source image. -- * @param { common2D.Rect } srcRect - The area of source image. -- * @param { common2D.Rect } dstRect - The area of destination canvas. -- * @param { SamplingOptions } samplingOptions - SamplingOptions used to describe the sampling mode. -- * @param { SrcRectConstraint } constraint - Constraint type. The default value is STRICT. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- drawImageRectWithSrc(pixelmap: image.PixelMap, srcRect: common2D.Rect, dstRect: common2D.Rect, -- samplingOptions?: SamplingOptions, constraint?: SrcRectConstraint): void; -- -- /** -- * Fills clip with color color. Mode determines how ARGB is combined with destination. -- * @param { common2D.Color } color - The range of color channels must be [0, 255]. -- * @param { BlendMode } blendMode - Used to combine source color and destination. The default value is SRC_OVER. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- drawColor(color: common2D.Color, blendMode?: BlendMode): void; -- -- /** -- * Fills clip with the specified ARGB color of hexadecimal format. -- * @param { number } color - Number must be ARGB color of hexadecimal format. -- * @param { BlendMode } blendMode - Used to combine source color and destination. The default value is SRC_OVER. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 13 -- */ -- drawColor(color: number, blendMode?: BlendMode): void; -- -- /** -- * Fills the clipped rectangle with the specified ARGB color. -- * @param { number } alpha - Alpha channel of color. The range of alpha must be [0, 255]. -- * @param { number } red - Red channel of color. The range of red must be [0, 255]. -- * @param { number } green - Green channel of color. The range of green must be [0, 255]. -- * @param { number } blue - Blue channel of color. The range of blue must be [0, 255]. -- * @param { BlendMode } blendMode - Used to combine source color and destination. The default value is SRC_OVER. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- drawColor(alpha: number, red: number, green: number, blue: number, blendMode?: BlendMode): void; -- -- /** -- * Draws an oval. -- * @param { common2D.Rect } oval - The bounds of the oval is described by a rect. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- drawOval(oval: common2D.Rect): void; -- -- /** -- * Draws an arc. -- * @param { common2D.Rect } arc - The bounds of the arc is described by a rect. -- * @param { number } startAngle - Indicates the startAngle of the arc. -- * @param { number } sweepAngle - Indicates the sweepAngle of the arc. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- drawArc(arc: common2D.Rect, startAngle: number, sweepAngle: number): void; -- -- /** -- * Draw a point. -- * @param { number } x - X coordinate position of the point. -- * @param { number } y - Y coordinate position of the point. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- drawPoint(x: number, y: number): void; -- -- /** -- * Draws point array as separate point, line segment or open polygon according to given point mode. -- * @param { Array } points - Points array. -- * @param { PointMode } mode - Draws points enum method. The default value is POINTS. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- drawPoints(points: Array, mode?: PointMode): void; -- -- /** -- * Draws a path. -- * @param { Path } path - Path to draw. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- drawPath(path: Path): void; -- -- /** -- * Draws line segment from startPt to endPt. -- * @param { number } x0 - X coordinate of the start point of the line segment. -- * @param { number } y0 - Y coordinate of the start point of the line segment. -- * @param { number } x1 - X coordinate of the end point of the line segment. -- * @param { number } y1 - Y coordinate of the end point of the line segment. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- drawLine(x0: number, y0: number, x1: number, y1: number): void; -- -- /** -- * Draws a single character. -- * @param { string } text - A string containing only a single character. -- * @param { Font } font - Font object. -- * @param { number } x - X coordinate of the single character start point. -- * @param { number } y - Y coordinate of the single character start point. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- drawSingleCharacter(text: string, font: Font, x: number, y: number): void; -- -- /** -- * Draws a textBlob -- * @param { TextBlob } blob - TextBlob to draw. -- * @param { number } x - X coordinate of the text start point. -- * @param { number } y - Y coordinate of the text start point. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- drawTextBlob(blob: TextBlob, x: number, y: number): void; -- -- /** -- * Draws the pixelmap base on the mesh which is evenly distributed across the pixelmap. -- * @param { image.PixelMap } pixelmap - The pixelmap to draw using the mesh. -- * @param { number } meshWidth - The number of columns in the mesh. -- * @param { number } meshHeight - The number of rows in the mesh. -- * @param { Array } vertices - Array of vertices, specifying where the mesh should be drawn. -- * @param { number } vertOffset - Number of vert elements to skip before drawing. -- * @param { Array } colors - Array of colors, specifying a color at each vertex. -- * @param { number } colorOffset - Number of color elements to skip before drawing. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- drawPixelMapMesh(pixelmap: image.PixelMap, meshWidth: number, meshHeight: number, -- vertices: Array, vertOffset: number, colors: Array, colorOffset: number): void; -- -- /** -- * Draws a region. -- * @param { Region } region - Region object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- drawRegion(region: Region): void; -- -- /** -- * Set pen to a canvas. -- * @param { Pen } pen - object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- attachPen(pen: Pen): void; -- -- /** -- * Set brush to a canvas. -- * @param { Brush } brush - Object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- attachBrush(brush: Brush): void; -- -- /** -- * Unset pen to a canvas. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- detachPen(): void; -- -- /** -- * Unset brush to a canvas. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- detachBrush(): void; -- -- /** -- * Saves the current canvas status (canvas matrix) to the top of the stack. -- * @returns { number } Return the number of saved states. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- save(): number; -- -- /** -- * Saves matrix and clip, and allocates a bitmap for subsequent drawing. -- * Calling restore discards changes to matrix and clip, and draws the bitmap. -- * @param { common2D.Rect | null} rect - Optional layer size. The default value is null. -- * @param { Brush | null} brush - Optional brush effect used to draw the layer. The default value is null. -- * @returns { number } Return the number of saved states before this call. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: Mandatory parameters are left unspecified. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- saveLayer(rect?: common2D.Rect | null, brush?: Brush | null): number; -- -- /** -- * Clears a canvas by using a specified color. -- * @param { common2D.Color } color - Indicates the color, which is a 32-bit (ARGB) variable. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- clear(color: common2D.Color): void; -- -- /** -- * Clears a canvas by using a specified color represented by ARGB color of hexadecimal format. -- * @param { number } color - Number must be ARGB color of hexadecimal format. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 13 -- */ -- clear(color: number): void; -- -- /** -- * Restores the canvas status (canvas matrix) saved on the top of the stack. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- restore(): void; -- -- /** -- * Restores the specific number of the canvas status (canvas matrix) saved in the stack. -- * @param { number } count - Depth of state stack to restore. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- restoreToCount(count: number): void; -- -- /** -- * Gets the number of the canvas status (canvas matrix) saved in the stack. -- * @returns { number } Return represent depth of save state stack. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getSaveCount(): number; -- -- /** -- * Gets the width of a canvas. -- * @returns { number } Return the width of a canvas. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getWidth(): number; -- -- /** -- * Gets the height of a canvas. -- * @returns { number } Return the height of a canvas. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getHeight(): number; -- -- /** -- * Gets the bounds of clip of a canvas. -- * @returns { common2D.Rect } Rect object. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getLocalClipBounds(): common2D.Rect; -- -- /** -- * Gets a 3x3 matrix of the transform from local coordinates to 'device'. -- * @returns { Matrix } Matrix object. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getTotalMatrix(): Matrix; -- -- /** -- * Scales by sx on the x-axis and sy on the y-axis. -- * @param { number } sx - Indicates the amount to scale on x-axis. -- * @param { number } sy - Indicates the amount to scale on y-axis. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- scale(sx: number, sy: number): void; -- -- /** -- * Skews by sx on the x-axis and sy on the y-axis. -- * @param { number } sx - Indicates the value skew transformation on x-axis. -- * @param { number } sy - Indicates the value skew transformation on y-axis. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- skew(sx: number, sy: number) : void; -- -- /** -- * Rotates by degrees, positive degrees rotates clockwise. -- * @param { number } degrees - Indicates the amount to rotate, in degrees. -- * @param { number } sx - Indicates the x-axis value of the point to rotate about. -- * @param { number } sy - Indicates the y-axis value of the point to rotate about. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- rotate(degrees: number, sx: number, sy: number) : void; -- -- /** -- * Translates by dx along the x-axis and dy along the y-axis. -- * @param { number } dx - Indicates the distance to translate on x-axis. -- * @param { number } dy - Indicates the distance to translate on y-axis. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- translate(dx: number, dy: number): void; -- -- /** -- * Replaces the clipping area with the intersection or difference of the current clipping area and path, -- * and use a clipping edge that is aliased or anti-aliased. -- * @param { Path } path - To combine with clip. -- * @param { ClipOp } clipOp - Indicates the operation to apply to clip. The default value is intersect. -- * @param { boolean } doAntiAlias - True if clip is to be anti-aliased. The default value is false. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- clipPath(path: Path, clipOp?: ClipOp, doAntiAlias?: boolean): void; -- -- /** -- * Replaces the clipping area with the intersection or difference between the -- * current clipping area and Rect, and use a clipping edge that is aliased or anti-aliased. -- * @param { common2D.Rect } rect - To combine with clipping area. -- * @param { ClipOp } clipOp - Indicates the operation to apply to clip. The default value is intersect. -- * @param { boolean } doAntiAlias - True if clip is to be anti-aliased. The default value is false. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- clipRect(rect: common2D.Rect, clipOp?: ClipOp, doAntiAlias?: boolean): void; -- -- /** -- * Uses the passed matrix to transforming the geometry, then use existing matrix. -- * @param { Matrix } matrix - Declares functions related to the matrix object in the drawing module. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- concatMatrix(matrix: Matrix): void; -- -- /** -- * Replace the clipping area with the intersection or difference of the -- * current clipping area and Region, and use a clipping edge that is aliased or anti-aliased. -- * @param { Region } region - Region object. -- * @param { ClipOp } clipOp - Indicates the operation to apply to clip. The default value is intersect. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- clipRegion(region: Region, clipOp?: ClipOp): void; -- -- /** -- * Replaces the clipping area with the intersection or difference between the -- * current clipping area and RoundRect, and use a clipping edge that is aliased or anti-aliased. -- * @param { RoundRect } roundRect - To combine with clipping area. -- * @param { ClipOp } clipOp - Indicates the operation to apply to clip. The default value is intersect. -- * @param { boolean } doAntiAlias - True if clip is to be anti-aliased. The default value is false. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- clipRoundRect(roundRect: RoundRect, clipOp?: ClipOp, doAntiAlias?: boolean): void; -- -- /** -- * Checks whether the drawable area is empty. -- * @returns { boolean } Returns true if drawable area is empty. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- isClipEmpty(): boolean; -- -- /** -- * Sets matrix of canvas. -- * @param { Matrix } matrix - Declares functions related to the matrix object in the drawing module. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setMatrix(matrix: Matrix): void; -- -- /** -- * Sets matrix of canvas to the identity matrix. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- resetMatrix(): void; -- } -- -- /** -- * Enumerates clip operations. -- * -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export enum ClipOp { -- /** -- * Clips with difference. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- DIFFERENCE = 0, -- /** -- * Clips with intersection. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- INTERSECT = 1, -- } -- -- /** -- * Provide a description of the type and position of the text. -- * @typedef TextBlobRunBuffer -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- export interface TextBlobRunBuffer { -- /** -- * Text model. -- * @type { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- glyph: number; -- /** -- * X-coordinate of the text start point. -- * @type { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- positionX: number; -- /** -- * Y-coordinate of the text start point. -- * @type { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- positionY: number; -- } -- -- /** -- * Encoding type of the description text. -- * -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- export enum TextEncoding { -- /** -- * Use 1 byte to represent UTF-8 or ASCII -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- TEXT_ENCODING_UTF8 = 0, -- /** -- * Use 2 bytes to represent most of unicode -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- TEXT_ENCODING_UTF16 = 1, -- /** -- * Use 4 bytes to represent all unicode. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- TEXT_ENCODING_UTF32 = 2, -- /** -- * Use 2 bytes to represent the glyph index. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- TEXT_ENCODING_GLYPH_ID = 3, -- } -- -- /** -- * Provide a description of the text -- * -- * class TextBlob -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- export class TextBlob { -- /** -- * Create a textblob from a string -- * @param { string } text - Drawn glyph content. -- * @param { Font } font - Specify text size, font, text scale, etc. -- * @param { TextEncoding } encoding - The default value is TEXT_ENCODING_UTF8. -- * @returns { TextBlob } TextBlob object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @static -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- static makeFromString(text: string, font: Font, encoding?: TextEncoding): TextBlob; -- -- /** -- * Create a textblob from a string, each element of which is located at the given positions. -- * @param { string } text - Drawn glyph content. -- * @param { number } len - string length, value must equal to points length. -- * @param { common2D.Point[] } points - Position coordinates of a textblob elements. -- * @param { Font } font - Specify text size, font, text scale, etc. -- * @returns { TextBlob } TextBlob object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @static -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- static makeFromPosText(text: string, len: number, points: common2D.Point[], font: Font): TextBlob; -- -- /** -- * Creating a textblob object based on RunBuffer information -- * @param { Array } pos - The array of TextBlobRunBuffer. -- * @param { Font } font - Font used for this run. -- * @param { common2D.Rect } bounds - Optional run bounding box. The default value is null; -- * @returns { TextBlob } TextBlob object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @static -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- static makeFromRunBuffer(pos: Array, font: Font, bounds?: common2D.Rect): TextBlob; -- -- /** -- * Returns the bounding rectangle shape -- * @returns { common2D.Rect } Rect object. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- bounds(): common2D.Rect; -- -- /** -- * Returns an unique identifier for a textblob. -- * @returns { number } Unique ID. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- uniqueID(): number; -- } -- -- /** -- * The Typeface class specifies the typeface and intrinsic style of a font. -- * -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- export class Typeface { -- /** -- * Get the family name for this typeface. -- * @returns { string } Family name. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- getFamilyName(): string; -- -- /** -- * Generate typeface from file. -- * @param { string } filePath - file path for typeface. -- * @returns { Typeface } Typeface. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- static makeFromFile(filePath: string): Typeface; -- } -- -- /** -- * Enumerates text edging types. -- * -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export enum FontEdging { -- /** -- * Uses anti aliasing, default value. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- ALIAS = 0, -- -- /** -- * Uses sub-pixel anti aliasing. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- ANTI_ALIAS = 1, -- -- /** -- * Uses sub-pixel anti aliasing and enable sub-pixel localization. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- SUBPIXEL_ANTI_ALIAS = 2, -- } -- -- /** -- * Enumerates text hinting types. -- * -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export enum FontHinting { -- /** -- * Not use text hinting. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- NONE = 0, -- -- /** -- * Uses slight text hinting. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- SLIGHT = 1, -- -- /** -- * Uses normal text hinting. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- NORMAL = 2, -- -- /** -- * Uses full text hinting. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- FULL = 3, -- } -- -- /** -- * Font controls options applied when drawing and measuring text. -- * -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- export class Font { -- /** -- * Requests, but does not require, that glyphs respect sub-pixel positioning. -- * @param { boolean } isSubpixel - Setting for sub-pixel positioning. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- enableSubpixel(isSubpixel: boolean): void; -- -- /** -- * Increases stroke width when creating glyph bitmaps to approximate a bold typeface. -- * @param { boolean } isEmbolden - Setting for bold approximation. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- enableEmbolden(isEmbolden: boolean): void; -- -- /** -- * Requests linearly scalable font and glyph metrics. -- * @param { boolean } isLinearMetrics - Setting for linearly scalable font and glyph metrics. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- enableLinearMetrics(isLinearMetrics: boolean): void; -- -- /** -- * Sets text size in points. Has no effect if textSize is not greater than or equal to zero. -- * @param { number } textSize - Typographic height of text. The height of the text must be greater than 0. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- setSize(textSize: number): void; -- -- /** -- * Obtains the text size. -- * @returns { number } Text size. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- getSize(): number; -- -- /** -- * Sets Typeface to font. -- * @param { Typeface } typeface - Font and style used to draw text. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- setTypeface(typeface: Typeface): void; -- -- /** -- * Get Typeface to font. -- * @returns { Typeface } Typeface. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- getTypeface(): Typeface; -- -- /** -- * Get fontMetrics associated with typeface. -- * @returns { FontMetrics } The fontMetrics value returned to the caller. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- getMetrics(): FontMetrics; -- -- /** -- * Measure a single character. -- * @param { string } text - A string containing only a single character. -- * @returns { number } The width of the single character. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- measureSingleCharacter(text: string): number; -- /** -- * Measure the width of text. -- * @param { string } text - Text Symbol Content. -- * @param { TextEncoding } encoding - Encoding format. -- * @returns { number } The width of text. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- measureText(text: string, encoding: TextEncoding): number; -- -- /** -- * Sets text scale on x-axis to font. -- * @param { number } scaleX - Text scaleX. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setScaleX(scaleX: number): void; -- -- /** -- * Sets text skew on x-axis to font. -- * @param { number } skewX - Text skewX. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setSkewX(skewX: number): void; -- -- /** -- * Sets the edging effect to font. -- * @param { FontEdging } edging - Text edging. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setEdging(edging: FontEdging): void; -- -- /** -- * Sets the hinting pattern to font. -- * @param { FontHinting } hinting - Text hinting. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setHinting(hinting: FontHinting): void; -- -- /** -- * Calculates number of glyphs represented by text. -- * @param { string } text - Indicates the character storage encoded with text encoding. -- * @returns { number } Returns the count of text. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- countText(text: string): number; -- -- /** -- * Sets whether the font baselines and pixels alignment when the transformation matrix is ​​axis aligned. -- * @param { boolean } isBaselineSnap - Indicates whether the font baselines and pixels alignment. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setBaselineSnap(isBaselineSnap: boolean): void; -- -- /** -- * Gets whether the font baselines and pixels alignment when the transformation matrix is ​​axis aligned. -- * @returns { boolean } Returns true if the font baselines and pixels alignment; returns false otherwise. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- isBaselineSnap(): boolean; -- -- /** -- * Sets whether to use bitmaps instead of outlines in the object. -- * @param { boolean } isEmbeddedBitmaps - Indicates whether to use bitmaps instead of outlines. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setEmbeddedBitmaps(isEmbeddedBitmaps: boolean): void; -- -- /** -- * Gets whether to use bitmaps instead of outlines in the object. -- * @returns { boolean } if using bitmaps instead of outlines; returns false otherwise. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- isEmbeddedBitmaps(): boolean; -- -- /** -- * Sets whether the font outline is automatically adjusted. -- * @param { boolean } isForceAutoHinting - Indicates whether the font outline is automatically adjusted. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setForceAutoHinting(isForceAutoHinting: boolean): void; -- -- /** -- * Gets whether the font outline is automatically adjusted. -- * @returns { boolean } Returns true if the font outline is automatically adjusted; returns false otherwise. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- isForceAutoHinting(): boolean; -- -- /** -- * Retrieves the advance for each glyph in glyphs. -- * @param { Array } glyphs - Array of glyph indices to be measured. -- * @returns { Array } Returns the width of each character in a string. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getWidths(glyphs: Array): Array; -- -- /** -- * Gets storage for glyph indexes. -- * @param { string } text - Indicates the character storage encoded with text encoding. -- * @param { number } glyphCount - The number of glyph. The default value is the result of calling countText. -- * @returns { Array } Returns the storage for glyph indices. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- textToGlyphs(text: string, glyphCount?: number): Array; -- -- /** -- * Returns true if glyphs may be drawn at sub-pixel offsets. -- * @returns { boolean } True if glyphs may be drawn at sub-pixel offsets. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- isSubpixel(): boolean; -- /** -- * Returns true if font and glyph metrics are requested to be linearly scalable. -- * @returns { boolean } True if font and glyph metrics are requested to be linearly scalable. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- isLinearMetrics(): boolean; -- /** -- * Returns text skew on x-axis. -- * @returns { number } Additional shear on x-axis relative to y-axis. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getSkewX(): number; -- /** -- * Gets whether to increase the stroke width to approximate bold fonts. -- * @returns { boolean } Returns true to increase the stroke width to approximate bold fonts; -- * returns false otherwise. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- isEmbolden(): boolean; -- /** -- * Returns text scale on x-axis. -- * @returns { number } Text horizontal scale. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getScaleX(): number; -- /** -- * Gets font hinting pattern. -- * @returns { FontHinting } Font hinting level. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getHinting(): FontHinting; -- /** -- * Gets font edge pixels pattern. -- * @returns { FontEdging } Edge pixels pattern. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getEdging(): FontEdging; -- /** -- * Create path object of specified Glyph. -- * @param { number } index - the index of Glyphs. -- * @returns { Path } The path object for specified glyph, undefined if not found. -- * Note: Path use y-axis-goes-down system, y axis is inverted to the y-axis-goes-up system. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 14 -- */ -- createPathForGlyph(index: number): Path; -- /** -- * Retrieves the bounding rect for each glyph in glyphs. -- * @param { Array } glyphs - Indicates the array of glyph indices to be measured. -- * @returns { Array } Returns bounds for each glyph relative to (0, 0). -- * Note: 1. Rect use y-axis-goes-down system, y axis is inverted to the y-axis-goes-up system. -- *
    2. Rect use two points(left-bottom & right-top) to describe the bound. -- *
    3. The bound rect will be snap to integral boundaries. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 14 -- */ -- getBounds(glyphs: Array): Array; -- /** -- * Get path of text. -- * @param { string } text - Indicates the character storage encoded with text encoding. -- * @param { number } byteLength - Indicates the byte length of the text. -- * @param { number } x - Indicates X coordinate for the starting position of the text within the drawing area. -- * @param { number } y - Indicates Y coordinate for the starting position of the text within the drawing area. -- * @returns { Path } The path object for Glyph. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 14 -- */ -- getTextPath(text: string, byteLength: number, x: number, y: number): Path; -- } -- -- /** -- * Indicate when certain metrics are valid; the underline or strikeout metrics may be valid and zero. -- * Fonts with embedded bitmaps may not have valid underline or strikeout metrics. -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export enum FontMetricsFlags { -- /** -- * Set if underlineThickness of FontMetrics is valid. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- UNDERLINE_THICKNESS_VALID = 1 << 0, -- -- /** -- * Set if underlinePosition of FontMetrics is valid. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- UNDERLINE_POSITION_VALID = 1 << 1, -- -- /** -- * Set if strikethroughThickness of FontMetrics is valid. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- STRIKETHROUGH_THICKNESS_VALID = 1 << 2, -- -- /** -- * Set if strikethroughPosition of FontMetrics is valid. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- STRIKETHROUGH_POSITION_VALID = 1 << 3, -- -- /** -- * set if top, bottom, xMin, xMax of FontMetrics invalid. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- BOUNDS_INVALID = 1 << 4, -- } -- -- /** -- * The metrics of an Font. -- * @typedef FontMetrics -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- export interface FontMetrics { -- /** -- * Indicating which metrics are valid. -- * @type { ?FontMetricsFlags } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- flags?: FontMetricsFlags; -- -- /** -- * Maximum range above the glyph bounding box. -- * @type { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- top: number; -- /** -- * Distance Retained Above Baseline. -- * @type { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- ascent: number; -- /** -- * The distance that remains below the baseline. -- * @type { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- descent: number; -- /** -- * Maximum range below the glyph bounding box. -- * @type { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- bottom: number; -- /** -- * Line Spacing. -- * @type { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- leading: number; -- /** -- * Average character width, zero if unknown. -- * @type { ?number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- avgCharWidth?: number; -- -- /** -- * Maximum character width, zero if unknown. -- * @type { ?number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- maxCharWidth?: number; -- -- /** -- * Greatest extent to left of origin of any glyph bounding box, typically negative; deprecated with variable fonts. -- * @type { ?number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- xMin?: number; -- -- /** -- * Greatest extent to right of origin of any glyph bounding box, typically positive; -- * deprecated with variable fonts. -- * @type { ?number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- xMax?: number; -- -- /** -- * Height of lower-case 'x', zero if unknown, typically negative. -- * @type { ?number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- xHeight?: number; -- -- /** -- * Height of an upper-case letter, zero if unknown, typically negative. -- * @type { ?number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- capHeight?: number; -- -- /** -- * Underline thickness. -- * @type { ?number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- underlineThickness?: number; -- -- /** -- * Distance from baseline to top of stroke, typically positive. -- * @type { ?number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- underlinePosition?: number; -- -- /** -- * Strikethrough thickness. -- * @type { ?number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- strikethroughThickness?: number; -- -- /** -- * Distance from baseline to bottom of stroke, typically negative. -- * @type { ?number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- strikethroughPosition?: number; -- } -- -- /** -- * Lattice is the class for dividing an image into grids. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export class Lattice { -- /** -- * Divide an image into a rectangular grid. Grid entries on even columns and even rows are fixed; -- * these entries are always drawn at their original size if the destination is large enough. If the destination -- * side is too small to hold the fixed entries, all fixed entries are scaled down to fit. -- * The grid entries not on even columns and rows are scaled to fit the remaining space, if any. -- * @param { Array } xDivs - X coordinate of values used to divide the image. -- * @param { Array } yDivs - Y coordinate of values used to divide the image. -- * @param { number } fXCount - Number of x coordinates. Must be >= 0. -- * @param { number } fYCount - Number of y coordinates. Must be >= 0. -- * @param { common2D.Rect | null } fBounds - Source bounds to draw from. The default value is null. -- * @param { Array | null } fRectTypes - Array of fill types. The default value is null. -- * @param { Array | null } fColors - Array of colors. The default value is null. -- * @returns { Lattice } Lattice object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @static -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- static createImageLattice(xDivs: Array, yDivs: Array, fXCount: number, fYCount: number, -- fBounds?: common2D.Rect | null, fRectTypes?: Array | null, fColors?: Array | null): Lattice; -- } -- -- /** -- * Enumerate rect types. Optional setting per rectangular grid entry to make it transparent, -- * or to fill the grid entry with a color. only used in Lattice. -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export enum RectType { -- /** -- * Draws image into lattice rect. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- DEFAULT = 0, -- -- /** -- * Skips lattice rect by making it transparent. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- TRANSPARENT = 1, -- -- /** -- * Draws one of fColors into lattice rect. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- FIXEDCOLOR = 2 -- } -- -- /** -- * MaskFilter is the class for object that perform transformations on an alpha-channel mask before drawing it. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export class MaskFilter { -- /** -- * Makes a MaskFilter with a blur effect. -- * @param { BlurType } blurType - Indicates the blur type. -- * @param { number } sigma - Indicates the standard deviation of the Gaussian blur to apply. Must be > 0. -- * @returns { MaskFilter } MaskFilter object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @static -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- static createBlurMaskFilter(blurType: BlurType, sigma: number): MaskFilter; -- } -- -- /** -- * Defines a PathEffect, which is used to affects stroked paths. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export class PathEffect { -- /** -- * Makes a dash PathEffect. -- * @param { Array } intervals - Array of ON and OFF distances. Must contain an even number of entries (>=2), -- * with the even indices specifying the "on" intervals, and the odd indices specifying the "off" intervals. -- * @param { number } phase - Offset into the intervals array. -- * @returns { PathEffect } PathEffect object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @static -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- static createDashPathEffect(intervals: Array, phase: number): PathEffect; -- -- /** -- * Makes a corner PathEffect. -- * @param { number } radius - Indicates the radius of the tangent circle at the corners of the path. -- * The radius must be greater than 0. -- * @returns { PathEffect } PathEffect object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @static -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- static createCornerPathEffect(radius: number): PathEffect; -- } -- -- /** -- * Describes a shader effect object. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export class ShaderEffect { -- /** -- * Creates an ShaderEffect object that generates a shader with single color. -- * @param { number } color - Indicates the color used by the shader. -- * @returns { ShaderEffect } Returns the shader with single color ShaderEffect object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- static createColorShader(color: number): ShaderEffect; -- -- /** -- * Creates an ShaderEffect object that generates a linear gradient between the two specified points. -- * @param { common2D.Point } startPt - Indicates the start point for the gradient. -- * @param { common2D.Point } endPt - Indicates the end point for the gradient. -- * @param { Array } colors - Indicates the colors to be distributed between the two points. -- * @param { TileMode } mode - Indicates the tile mode. -- * @param { Array | null } pos - Indicates the relative position of each corresponding color -- *
    in the colors array. The default value is empty for uniform distribution. -- * @param { Matrix | null } matrix - Indicates the Matrix object. The default value is null. -- * @returns { ShaderEffect } Returns a linear gradient ShaderEffect object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- static createLinearGradient(startPt: common2D.Point, endPt: common2D.Point, colors: Array, -- mode: TileMode, pos?: Array | null, matrix?: Matrix | null): ShaderEffect; -- -- /** -- * Creates an ShaderEffect object that generates a radial gradient given the center and radius. -- * @param { common2D.Point } centerPt - Indicates the center of the circle for the gradient. -- * @param { number } radius - Indicates the radius of the circle for this gradient. -- * @param { Array } colors - Indicates the colors to be distributed between the two points. -- * @param { TileMode } mode - Indicates the tile mode. -- * @param { Array | null } pos - Indicates the relative position of each corresponding color -- *
    in the colors array. The default value is empty for uniform distribution. -- * @param { Matrix | null } matrix - Indicates the Matrix object. The default value is null. -- * @returns { ShaderEffect } Returns a radial gradient ShaderEffect object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- static createRadialGradient(centerPt: common2D.Point, radius: number, colors: Array, -- mode: TileMode, pos?: Array | null, matrix?: Matrix | null): ShaderEffect; -- -- /** -- * Creates an ShaderEffect object that generates a sweep gradient given a center. -- * @param { common2D.Point } centerPt - Indicates the center of the circle for the gradient. -- * @param { Array } colors - Indicates the colors to be distributed between the two points. -- * @param { TileMode } mode - Indicates the tile mode. -- * @param { number } startAngle - The starting angle of the gradient. -- * @param { number } endAngle - The ending angle of the gradient. -- * @param { Array | null } pos - Indicates the relative position of each corresponding color -- *
    in the colors array. The default value is empty for uniform distribution. -- * @param { Matrix | null } matrix - Indicates the Matrix object. The default value is null. -- * @returns { ShaderEffect } Returns a sweep gradient ShaderEffect object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- static createSweepGradient(centerPt: common2D.Point, colors: Array, -- mode: TileMode, startAngle: number, endAngle: number, pos?: Array | null, -- matrix?: Matrix | null): ShaderEffect; -- -- /** -- * Creates an ShaderEffect object that generates a conical gradient given two circles. -- * @param { common2D.Point } startPt - Indicates the center of the start circle for the gradient. -- * @param { number } startRadius - Indicates the radius of the start circle for this gradient. -- * @param { common2D.Point } endPt - Indicates the center of the end circle for the gradient. -- * @param { number } endRadius - Indicates the radius of the end circle for this gradient. -- * @param { Array } colors - Indicates the colors to be distributed between the two points. -- * @param { TileMode } mode - Indicates the tile mode. -- * @param { Array | null } pos - Indicates the relative position of each corresponding color -- *
    in the colors array. The default value is empty for uniform distribution. -- * @param { Matrix | null } matrix - Indicates the Matrix object. The default value is null. -- * @returns { ShaderEffect } Returns a conical gradient ShaderEffect object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- static createConicalGradient(startPt: common2D.Point, startRadius: number, endPt: common2D.Point, -- endRadius: number, colors: Array, mode: TileMode, -- pos?: Array | null, matrix?: Matrix | null): ShaderEffect; -- } -- -- /** -- * Enumerates tile modes that describe an image or texture. -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export enum TileMode { -- /** -- * Replicate the edge color if the shader effect draws outside of its original bounds. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- CLAMP = 0, -- -- /** -- * Repeat the shader effect image horizontally and vertically. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- REPEAT = 1, -- -- /** -- * Repeat the shader effect image horizontally and vertically, alternating mirror images -- * so that adjacent images always seam. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- MIRROR = 2, -- -- /** -- * Only draw within the original domain, return transparent-black everywhere else. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- DECAL = 3, -- } -- -- /** -- * Defines a ShadowLayer, which is used to specify the color, blur radius, and offset of the shadow. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export class ShadowLayer { -- /** -- * Makes a new ShadowLayer. -- * -- * @param { number } blurRadius - The blur radius of the shadow. The blur radius must be greater than 0. -- * @param { number } x - The offset point on x-axis. -- * @param { number } y - The offset point on y-axis. -- * @param { common2D.Color } color - The shadow color. The range of color channels must be [0, 255]. -- * @returns { ShadowLayer } ShadowLayer object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @static -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- static create(blurRadius: number, x: number, y: number, color: common2D.Color): ShadowLayer; -- -- /** -- * Makes a new ShadowLayer with the specified ARGB color of hexadecimal format. -- * -- * @param { number } blurRadius - The blur radius of the shadow. The blur radius must be greater than 0. -- * @param { number } x - The offset point on x-axis. -- * @param { number } y - The offset point on y-axis. -- * @param { number } color - The shadow color. Number must be ARGB color of hexadecimal format. -- * @returns { ShadowLayer } ShadowLayer object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @static -- * @syscap SystemCapability.Graphics.Drawing -- * @since 13 -- */ -- static create(blurRadius: number, x: number, y: number, color: number): ShadowLayer; -- } -- -- /** -- * ColorFilters are optional objects in the drawing pipeline. -- * -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- export class ColorFilter { -- /** -- * Makes a color filter with the given color and blend mode. -- * @param { common2D.Color } color - The range of color channels must be [0, 255]. -- * @param { BlendMode } mode - BlendMode. -- * @returns { ColorFilter } Colorfilter object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @static -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- static createBlendModeColorFilter(color: common2D.Color, mode: BlendMode): ColorFilter; -- -- /** -- * Makes a color filter with the given ARGB color of hexadecimal format and blend mode. -- * @param { number } color - Number must be ARGB color of hexadecimal format. -- * @param { BlendMode } mode - BlendMode. -- * @returns { ColorFilter } Colorfilter object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @static -- * @syscap SystemCapability.Graphics.Drawing -- * @since 13 -- */ -- static createBlendModeColorFilter(color: number, mode: BlendMode): ColorFilter; -- -- /** -- * Create a color filter consisting of two filters. -- * @param { ColorFilter } outer - The filter is used next. -- * @param { ColorFilter } inner - The filter is used first. -- * @returns { ColorFilter } Colorfilter object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @static -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- static createComposeColorFilter(outer: ColorFilter, inner: ColorFilter): ColorFilter; -- /** -- * Makes a color filter that converts between linear colors and sRGB colors. -- * @returns { ColorFilter } Colorfilter object. -- * @static -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- static createLinearToSRGBGamma(): ColorFilter; -- /** -- * Makes a color filter that converts between sRGB colors and linear colors. -- * @returns { ColorFilter } Colorfilter object. -- * @static -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- static createSRGBGammaToLinear(): ColorFilter; -- /** -- * Makes a color filter that multiplies the luma of its input into the alpha channel, -- * and sets the red, green, and blue channels to zero. -- * @returns { ColorFilter } Colorfilter. -- * @static -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- static createLumaColorFilter(): ColorFilter; -- /** -- * Makes a color filter with a 5x4 color matrix -- * @param { Array } matrix - Indicates the matrix, which is represented as a number array of length 20. -- * @returns { ColorFilter } Colorfilter object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @static -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- static createMatrixColorFilter(matrix: Array): ColorFilter; -- } -- -- /** -- * ImageFilters are optional objects in the drawing pipeline. -- * -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export class ImageFilter { -- /** -- * Makes an ImageFilter object that blurs its input by the separate X and Y sigmas. -- * @param { number } sigmaX - Indicates the Gaussian sigma value for blurring along the X axis. Must be > 0. -- * @param { number } sigmaY - Indicates the Gaussian sigma value for blurring along the Y axis. Must be > 0. -- * @param { TileMode } tileMode - Indicates the tile mode applied at edges. -- * @param { ImageFilter | null } imageFilter - Indicates the input filter that is blurred, -- * uses source bitmap if this is null. -- * @returns { ImageFilter } ImageFilter object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @static -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- static createBlurImageFilter(sigmaX: number, sigmaY: number, -- tileMode: TileMode, imageFilter?: ImageFilter | null): ImageFilter; -- /** -- * Makes an ImageFilter object that applies the color filter to the input. -- * @param { ColorFilter } colorFilter - Indicates the color filter that transforms the input image. -- * @param { ImageFilter | null } imageFilter - Indicates the input filter, -- * or uses the source bitmap if this is null. -- * @returns { ImageFilter } ImageFilter object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @static -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- static createFromColorFilter(colorFilter: ColorFilter, imageFilter?: ImageFilter | null): ImageFilter; -- } -- /** -- * Enumerate join styles. The join style defines the shape of the joins of a -- * polyline segment drawn by the pen. -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export enum JoinStyle { -- /** -- * Miter corner. If the angle of a polyline is small, its miter length may be inappropriate. -- * In this case, you need to use the miter limit to limit the miter length. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- MITER_JOIN = 0, -- -- /** -- * Round corner. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- ROUND_JOIN = 1, -- -- /** -- * Bevel corner. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- BEVEL_JOIN = 2 -- } -- -- /** -- * Enumerates cap styles of a pen. The cap style defines -- * the style of both ends of a segment drawn by the pen. -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export enum CapStyle { -- /** -- * No cap style. Both ends of the segment are cut off square. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- FLAT_CAP = 0, -- -- /** -- * Square cap style. Both ends have a square, the height of which -- * is half of the width of the segment, with the same width. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- SQUARE_CAP = 1, -- -- /** -- * Round cap style. Both ends have a semicircle centered, the diameter of which -- * is the same as the width of the segment. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- ROUND_CAP = 2 -- } -- -- /** -- * Enumerates blur type. -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export enum BlurType { -- /** -- * Fuzzy inside and outside. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- NORMAL = 0, -- -- /** -- * Solid inside, fuzzy outside. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- SOLID = 1, -- -- /** -- * Nothing inside, fuzzy outside. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- OUTER = 2, -- -- /** -- * Fuzzy inside, nothing outside. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- INNER = 3 -- } -- -- /** -- * Provides settings for strokes during drawing. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- export class Pen { -- /** -- * Constructor for the pen. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- constructor(); -- -- /** -- * Constructor for the pen from an existing pen object pen. -- * @param { Pen } pen - Indicates the Pen object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- constructor(pen: Pen); -- -- /** -- * Sets the stroke miter limit for a polyline drawn by a pen. -- * @param { number } miter - Indicates a variable that describes the miter limit. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setMiterLimit(miter: number): void; -- -- /** -- * Obtains the stroke miter limit of a polyline drawn by a pen. -- * @returns { number } Returns the miter limit. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getMiterLimit(): number; -- -- /** -- * Sets the shaderEffect for a pen. -- * @param { ShaderEffect } shaderEffect - Indicates the ShaderEffect object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setShaderEffect(shaderEffect: ShaderEffect): void; -- -- /** -- * Set the color of the pen. -- * @param { common2D.Color } color - The range of color channels must be [0, 255]. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- setColor(color: common2D.Color): void; -- -- /** -- * Set the specified ARGB color of hexadecimal format to the pen. -- * @param { number } color - Number must be ARGB color of hexadecimal format. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 13 -- */ -- setColor(color: number): void; -- -- /** -- * Set the AGRB color of the pen. -- * @param { number } alpha - Alpha channel of color. The range of alpha must be [0, 255]. -- * @param { number } red - Red channel of color. The range of red must be [0, 255]. -- * @param { number } green - Green channel of color. The range of green must be [0, 255]. -- * @param { number } blue - Blue channel of color. The range of blue must be [0, 255]. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setColor(alpha: number, red: number, green: number, blue: number): void; -- -- /** -- * Obtains the color of a pen. The color is used by the pen to outline a shape. -- * @returns { common2D.Color } Returns a 32-bit (ARGB) variable that describes the color. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getColor(): common2D.Color; -- -- /** -- * Obtains the color of a pen. The color is used by the pen to outline a shape. -- * @returns { number } Returns a 32-bit (ARGB) variable that describes the color of hexadecimal format. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 13 -- */ -- getHexColor(): number; -- -- /** -- * Sets the thickness of the pen used by the paint to outline the shape. -- * -- * @param { number } width - Zero thickness for hairline; greater than zero for pen thickness. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- setStrokeWidth(width: number): void; -- -- /** -- * Obtains the thickness of a pen. This thickness determines the width of the outline of a shape. -- * @returns { number } Returns the thickness. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getWidth(): number; -- -- /** -- * Requests, but does not require, that edge pixels draw opaque or with partial transparency. -- * @param { boolean } aa - Setting for antialiasing. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- setAntiAlias(aa: boolean): void; -- -- /** -- * Checks whether anti-aliasing is enabled for a pen. If anti-aliasing is enabled, -- * edges will be drawn with partial transparency. -- * @returns { boolean } Returns true if the anti-aliasing is enabled; returns false otherwise. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- isAntiAlias(): boolean; -- -- /** -- * Replaces alpha, leaving RGB -- * -- * @param { number } alpha - Alpha channel of color. The range of alpha must be [0, 255]. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- setAlpha(alpha: number): void; -- -- /** -- * Obtains the alpha of a pen. The alpha is used by the pen to outline a shape. -- * @returns { number } Returns a 8-bit variable that describes the alpha. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getAlpha(): number; -- -- /** -- * Sets ColorFilter to pen -- * -- * @param { ColorFilter } filter - ColorFilter to apply to subsequent draw. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- setColorFilter(filter: ColorFilter): void; -- /** -- * Gets ColorFilter of pen -- * @returns { ColorFilter } ColorFilter. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getColorFilter(): ColorFilter; -- /** -- * Sets ImageFilter to pen -- * @param { ImageFilter | null } filter - ImageFilter to apply to subsequent draw. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setImageFilter(filter: ImageFilter | null): void; -- /** -- * Sets MaskFilter to pen. -- * -- * @param { MaskFilter } filter - MaskFilter to apply to subsequent draw. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setMaskFilter(filter: MaskFilter): void; -- -- /** -- * Sets PathEffect to pen. -- * -- * @param { PathEffect } effect - PathEffect to apply to subsequent draw. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setPathEffect(effect: PathEffect): void; -- -- /** -- * Sets ShadowLayer to pen. -- * -- * @param { ShadowLayer } shadowLayer - ShadowLayer to apply to subsequent draw. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setShadowLayer(shadowLayer: ShadowLayer): void; -- -- /** -- * Sets a blender that implements the specified blendmode enum. -- * -- * @param { BlendMode } mode - Blendmode. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- setBlendMode(mode: BlendMode): void; -- -- /** -- * Request color distribution error. -- * -- * @param { boolean } dither - Whether the color is distributed incorrectly. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- setDither(dither: boolean): void; -- -- /** -- * Sets the JoinStyle for a pen. -- * -- * @param { JoinStyle } style - The JoinStyle. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setJoinStyle(style: JoinStyle): void; -- -- /** -- * Obtains the JoinStyle of a pen. -- * -- * @returns { JoinStyle } The JoinStyle. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getJoinStyle(): JoinStyle; -- -- /** -- * Sets the CapStyle for a pen. -- * -- * @param { CapStyle } style - The CapStyle. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setCapStyle(style: CapStyle): void; -- -- /** -- * Obtains the CapStyle of a pen. -- * -- * @returns { CapStyle } The CapStyle. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getCapStyle(): CapStyle; -- -- /** -- * Resets all pen contents to their initial values. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- reset(): void; -- /** -- * Obtains the filled equivalent of the src path. -- * -- * @param { Path } src - The path read to create a filled version. -- * @param { Path } dst - The resulting path (may be the same as src). -- * @returns { boolean } true if the path should be filled, -- * or false if it should be drawn with a hairline (width == 0) -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getFillPath(src: Path, dst: Path): boolean; -- } -- -- /** -- * Provides settings for brush fill when drawing. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- export class Brush { -- /** -- * Constructor for the Brush. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- constructor(); -- -- /** -- * Constructor for the Brush from an existing brush object brush. -- * @param { Brush } brush - Indicates the Brush object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- constructor(brush: Brush); -- -- /** -- * Set the color of the brush. -- * @param { common2D.Color } color - The range of color channels must be [0, 255]. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- setColor(color: common2D.Color): void; -- -- /** -- * Set the specified ARGB color of hexadecimal format to the brush. -- * @param { number } color - Number must be ARGB color of hexadecimal format. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 13 -- */ -- setColor(color: number): void; -- -- /** -- * Set the ARGB color of the brush. -- * @param { number } alpha - Alpha channel of color. The range of alpha must be [0, 255]. -- * @param { number } red - Red channel of color. The range of red must be [0, 255]. -- * @param { number } green - Green channel of color. The range of green must be [0, 255]. -- * @param { number } blue - Blue channel of color. The range of blue must be [0, 255]. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setColor(alpha: number, red: number, green: number, blue: number): void; -- -- /** -- * Obtains the color of a brush. The color is used by the brush to fill in a shape. -- * @returns { common2D.Color } Returns a 32-bit (ARGB) variable that describes the color. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getColor(): common2D.Color; -- -- /** -- * Obtains the color of a brush. The color is used by the brush to fill in a shape. -- * @returns { number } Returns a 32-bit (ARGB) variable that describes the color of hexadecimal format. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 13 -- */ -- getHexColor(): number; -- -- /** -- * Requests, but does not require, that edge pixels draw opaque or with partial transparency. -- * @param { boolean } aa - Setting for antialiasing. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- setAntiAlias(aa: boolean): void; -- -- /** -- * Checks whether anti-aliasing is enabled for a brush. If anti-aliasing is enabled, -- * edges will be drawn with partial transparency. -- * @returns { boolean } Returns true if anti-aliasing is enabled; returns false otherwise. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- isAntiAlias(): boolean; -- -- /** -- * Replaces alpha, leaving RGB -- * @param { number } alpha - Alpha channel of color. The range of alpha must be [0, 255]. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- setAlpha(alpha: number): void; -- -- /** -- * Obtains the alpha of a brush. The alpha is used by the brush to fill in a shape. -- * @returns { number } Returns a 8-bit variable that describes the alpha. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getAlpha(): number; -- -- /** -- * Sets ColorFilter to brush -- * @param { ColorFilter } filter - ColorFilter to apply to subsequent draw. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- setColorFilter(filter: ColorFilter): void; -- -- /** -- * Gets ColorFilter of brush -- * @returns { ColorFilter } ColorFilter. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getColorFilter(): ColorFilter; -- /** -- * Sets ImageFilter to brush -- * @param { ImageFilter | null } filter - ImageFilter to apply to subsequent draw. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setImageFilter(filter: ImageFilter | null): void; -- /** -- * Sets MaskFilter to brush. -- * @param { MaskFilter } filter - MaskFilter to apply to subsequent draw. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setMaskFilter(filter: MaskFilter): void; -- -- /** -- * Sets ShadowLayer to brush. -- * -- * @param { ShadowLayer } shadowLayer - ShadowLayer painting. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setShadowLayer(shadowLayer: ShadowLayer): void; -- -- /** -- * Sets the shaderEffect for a brush. -- * @param { ShaderEffect } shaderEffect - Indicates the ShaderEffect object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setShaderEffect(shaderEffect: ShaderEffect): void; -- -- /** -- * Sets a blender that implements the specified blendmode enum. -- * @param { BlendMode } mode - Blendmode. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -- */ -- setBlendMode(mode: BlendMode): void; -- -- /** -- * Resets all brush contents to their initial values. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- reset(): void; -- } -- -- /** -- * Declares functions related to the matrix object in the drawing module. -- * -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export class Matrix { -- /** -- * Creates an identity matrix. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- constructor(); -- -- /** -- * Sets matrix to rotate by degrees about a pivot point at (px, py). -- * @param { number } degree - Indicates the angle of axes relative to upright axes. -- * @param { number } px - Indicates the pivot on x-axis. -- * @param { number } py - Indicates the pivot on y-axis. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setRotation(degree: number, px: number, py: number): void; -- -- /** -- * Sets matrix to scale by sx and sy, about a pivot point at (px, py). -- * @param { number } sx - Indicates the horizontal scale factor. -- * @param { number } sy - Indicates the vertical scale factor. -- * @param { number } px - Indicates the pivot on x-axis. -- * @param { number } py - Indicates the pivot on y-axis. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setScale(sx: number, sy: number, px: number, py: number): void; -- -- /** -- * Sets matrix to translate by (dx, dy). -- * @param { number } dx - Indicates the horizontal translation. -- * @param { number } dy - Indicates the vertical translation. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setTranslation(dx: number, dy: number): void; -- -- /** -- * Sets the params for a matrix. -- * @param { Array } values - Each value in the array represents the following parameters: -- * values[0] - horizontal scale factor to store. -- * values[1] - horizontal skew factor to store. -- * values[2] - horizontal translation to store. -- * values[3] - vertical skew factor to store. -- * values[4] - vertical scale factor to store. -- * values[5] - vertical translation to store. -- * values[6] - input x-axis values perspective factor to store. -- * values[7] - input y-axis values perspective factor to store. -- * values[8] - perspective scale factor to store. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setMatrix(values: Array): void; -- -- /** -- * Sets matrix total to matrix a multiplied by matrix b. -- * @param { Matrix } matrix - Indicates the Matrix object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- preConcat(matrix: Matrix): void; -- -- /** -- * Returns true if the first matrix equals the second matrix. -- * @param { Matrix } matrix - Indicates the Matrix object. -- * @returns { Boolean } Returns true if the two matrices are equal; returns false otherwise. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- isEqual(matrix: Matrix): Boolean; -- -- /** -- * Sets inverse to reciprocal matrix, returning true if matrix can be inverted. -- * @param { Matrix } matrix - Indicates the Matrix object. -- * @returns { Boolean } Returns true if matrix can be inverted; returns false otherwise. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- invert(matrix: Matrix): Boolean; -- -- /** -- * Returns true if matrix is identity. -- * @returns { Boolean } Returns true if matrix is identity; returns false otherwise. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- isIdentity(): Boolean; -- -- /** -- * Get one matrix value. Index is between the range of 0-8. -- * @param { number } index - one of 0-8 -- * @returns { number } Returns value corresponding to index.Returns 0 if out of range. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getValue(index: number): number; -- /** -- * Sets matrix to matrix multiplied by matrix constructed from rotating by degrees around pivot point (px, py). -- * This can be thought of as rotating around a pivot point after applying matrix. -- * @param { number } degree - Indicates the angle of axes relative to upright axes. -- * @param { number } px - Indicates the pivot on x-axis. -- * @param { number } py - Indicates the pivot on y-axis. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- postRotate(degree: number, px: number, py: number): void; -- /** -- * Sets matrix to matrix multiplied by matrix constructed from scaling by (sx, sy) relative to pivot point (px, py). -- * This can be thought of as scaling relative to a pivot point after applying matrix. -- * @param { number } sx - Indicates the horizontal scale factor. -- * @param { number } sy - Indicates the vertical scale factor. -- * @param { number } px - Indicates the pivot on x-axis. -- * @param { number } py - Indicates the pivot on y-axis. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- postScale(sx: number, sy: number, px: number, py: number): void; -- /** -- * Sets matrix to matrix multiplied by matrix constructed from translation (dx, dy). -- * This can be thought of as moving the point to be mapped after applying matrix. -- * @param { number } dx - Indicates the horizontal translation. -- * @param { number } dy - Indicates the vertical translation. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- postTranslate(dx: number, dy: number): void; -- /** -- * Sets matrix to matrix multiplied by matrix constructed from rotating by degrees around pivot point (px, py). -- * This can be thought of as rotating around a pivot point before applying matrix. -- * @param { number } degree - Indicates the angle of axes relative to upright axes. -- * @param { number } px - Indicates the pivot on x-axis. -- * @param { number } py - Indicates the pivot on y-axis. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- preRotate(degree: number, px: number, py: number): void; -- /** -- * Sets matrix to matrix multiplied by matrix constructed from scaling by (sx, sy) relative to pivot point (px, py). -- * This can be thought of as scaling relative to a pivot point before applying matrix. -- * @param { number } sx - Indicates the horizontal scale factor. -- * @param { number } sy - Indicates the vertical scale factor. -- * @param { number } px - Indicates the pivot on x-axis. -- * @param { number } py - Indicates the pivot on y-axis. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- preScale(sx: number, sy: number, px: number, py: number): void; -- /** -- * Sets matrix to matrix multiplied by matrix constructed from translation (dx, dy). -- * This can be thought of as moving the point to be mapped before applying matrix. -- * @param { number } dx - Indicates the horizontal translation. -- * @param { number } dy - Indicates the vertical translation. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- preTranslate(dx: number, dy: number): void; -- /** -- * Reset matrix to identity. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- reset(): void; -- /** -- * Maps src array of length count to dst array of equal or greater length. -- * This can be thought of as moving the point to be mapped before applying matrix. -- * @param { Array } src - points to transform. -- * @returns { Array } Return mapped points array. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- mapPoints(src: Array): Array; -- /** -- * Return nine scalar values contained by Matrix. -- * @returns { Array } nine scalar values contained by Matrix. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- getAll(): Array; -- /** -- * Sets dst to bounds of src corners mapped by matrix transformation. -- * @param { common2D.Rect } dst - Rect to map from. -- * @param { common2D.Rect } src - Rect to map to. -- * @returns { boolean } Returns true if the mapped src is equal to the dst; returns false is not equal. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- mapRect(dst: common2D.Rect, src: common2D.Rect): boolean; -- /** -- * Sets matrix to scale and translate src rect to dst rect. -- * @param { common2D.Rect } src - Rect to map from. -- * @param { common2D.Rect } dst - Rect to map to. -- * @param { ScaleToFit } scaleToFit - Describes how matrix is constructed to map one rect to another. -- * @returns { boolean } Returns true if dst is empty, and sets matrix to: -- | 0 0 0 | -- | 0 0 0 | -- | 0 0 1 |. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setRectToRect(src: common2D.Rect, dst: common2D.Rect, scaleToFit: ScaleToFit): boolean; -- /** -- * Sets Matrix to map src to dst. Count must be zero or greater, and four or less. -- * @param { Array } src - Point to map from -- * @param { Array } dst - Point to map to -- * @param { number } count - Number of Point in src and dst -- * @returns { boolean } Returns true if Matrix was constructed successfully -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setPolyToPoly(src: Array, dst: Array, count: number): boolean; -- } -- -- /** -- * Describes a scale-to-fit values. -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export enum ScaleToFit { -- /** -- * Scales in x and y to fill destination Rect. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- FILL_SCALE_TO_FIT = 0, -- -- /** -- * Scales and aligns to left and top. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- START_SCALE_TO_FIT = 1, -- -- /** -- * Scales and aligns to center. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- CENTER_SCALE_TO_FIT = 2, -- -- /** -- * Scales and aligns to right and bottom. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- END_SCALE_TO_FIT = 3 -- } -- -- /** -- * Describes a region object. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export class Region { -- /** -- * Determines whether the test point is in the region. -- * @param { number } x - Indicates the x coordinate of the point. The parameter must be an integer. -- * @param { number } y - Indicates the y coordinate of the point. The parameter must be an integer. -- * @returns { boolean } Returns true if (x, y) is inside region; returns false otherwise. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- isPointContained(x: number, y:number): boolean; -- -- /** -- * Determines whether other region is in the region. -- * @param { Region } other - Other region object. -- * @returns { boolean } Returns true if other region is completely inside the region object; -- *
    returns false otherwise. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- isRegionContained(other: Region): boolean; -- -- /** -- * Replaces region with the result of region op region. -- * @param { Region } region - Region object. -- * @param { RegionOp } regionOp - Operation type. -- * @returns { boolean } Returns true if replaced region is not empty; returns false otherwise. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- op(region: Region, regionOp: RegionOp): boolean; -- -- /** -- * Determines whether rect and region does not intersect. -- * @param { number } left - Left position of rectangle. The parameter must be an integer. -- * @param { number } top - Top position of rectangle. The parameter must be an integer. -- * @param { number } right - Right position of rectangle. The parameter must be an integer. -- * @param { number } bottom - Bottom position of rectangle. The parameter must be an integer. -- * @returns { boolean } Returns true if rect and region is not intersect; returns false otherwise. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- quickReject(left: number, top: number, right: number, bottom: number): boolean; -- -- /** -- * Sets the region to match outline of path within clip. -- * @param { Path } path - Providing outline. -- * @param { Region } clip - Region object. -- * @returns { boolean } Returns true if constructed region is not empty; returns false otherwise. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setPath(path: Path, clip: Region): boolean; -- -- /** -- * Sets a rect to region. -- * @param { number } left - Left position of rectangle. The parameter must be an integer. -- * @param { number } top - Top position of rectangle. The parameter must be an integer. -- * @param { number } right - Right position of rectangle. The parameter must be an integer. -- * @param { number } bottom - Bottom position of rectangle. The parameter must be an integer. -- * @returns { boolean } Returns true if constructed region is not empty; returns false otherwise. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- setRect(left: number, top: number, right: number, bottom: number): boolean; -- } -- -- /** -- * Enumerates of operations when two regions are combined. -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export enum RegionOp { -- /** -- * Difference operation. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- DIFFERENCE = 0, -- -- /** -- * Intersect operation. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- INTERSECT = 1, -- -- /** -- * Union operation. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- UNION = 2, -- -- /** -- * Xor operation. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- XOR = 3, -- -- /** -- * Reverse difference operation. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- REVERSE_DIFFERENCE = 4, -- -- /** -- * Replace operation. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- REPLACE = 5 -- } -- -- /** -- * Enumerates of corner radius position. -- * -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export enum CornerPos { -- /** -- * Index of top-left corner radius. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- TOP_LEFT_POS = 0, -- -- /** -- * Index of top-right corner radius. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- TOP_RIGHT_POS = 1, -- -- /** -- * Index of bottom-right corner radius. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- BOTTOM_RIGHT_POS = 2, -- -- /** -- * Index of bottom-left corner radius. -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- BOTTOM_LEFT_POS = 3 -- } -- -- /** -- * Enumeration defines the constraint type. -- * -- * @enum { number } -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- export enum SrcRectConstraint { -- -- /** -- * Using sampling only inside bounds in a slower manner. -- * -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- STRICT = 0, -- -- /** -- * Using sampling outside bounds in a faster manner. -- * -- * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -- */ -- FAST = 1 -- } --} -- --export default drawing; -diff --git a/api/@ohos.graphics.drawing.d.ts b/api/@ohos.graphics.drawing.d.ts -index 78e6e1272..42ca6d301 100644 ---- a/api/@ohos.graphics.drawing.d.ts -+++ b/api/@ohos.graphics.drawing.d.ts -@@ -27,7 +27,8 @@ import { Resource } from './global/resource'; - * - * @namespace drawing - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace drawing { - /** -@@ -36,182 +37,212 @@ declare namespace drawing { - * a new color from two colors(source, destination). - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum BlendMode { - /** - * Disable 4 regions(red, green, blue, alpha) - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CLEAR = 0, - /** - * Use components of the source - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SRC = 1, - /** - * Use components of the destination - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DST = 2, - /** - * The source is placed above the destination. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SRC_OVER = 3, - /** - * The Destination is placed above the source. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DST_OVER = 4, - /** - * Use source replaces the destination, and will not exceed the boundaries of the destination - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SRC_IN = 5, - /** - * Use destination, and will not exceed the boundaries of the source - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DST_IN = 6, - /** - * Source is use in outside of the boundaries of the destination. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SRC_OUT = 7, - /** - * Destination is use in outside of the boundaries of the source. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DST_OUT = 8, - /** - * Source which overlaps the destination will replaces the destination. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SRC_ATOP = 9, - /** - * Destination which overlaps the source will replaces the source. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DST_ATOP = 10, - /** - * Combine regions where source and destination do not overlap. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - XOR = 11, - /** - * The sum of the source and destination. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PLUS = 12, - /** - * All components are multiplied. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MODULATE = 13, - /** - * Multiply the complement values of the background and source color values, - * and then complement the result. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SCREEN = 14, - /** - * Multiplies or screens the colors, depending on destination - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - OVERLAY = 15, - /** - * Choose a darker background and source color. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DARKEN = 16, - /** - * Choose a lighter background and source color. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LIGHTEN = 17, - /** - * Brightens destination color to reflect the source color. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - COLOR_DODGE = 18, - /** - * Darkens destination color to reflect the source color. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - COLOR_BURN = 19, - /** - * Multiplies or screens the colors, depending on source - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - HARD_LIGHT = 20, - /** - * Lightens or Darkens the colors, depending on the source. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SOFT_LIGHT = 21, - /** - * Subtract the darker of the two colors from the brighter color. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DIFFERENCE = 22, - /** - * Produces an effect similar to difference mode, but with lower contrast. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EXCLUSION = 23, - /** - * Multiply the source color by the destination color and replace the destination. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MULTIPLY = 24, - /** - * Use the hue of the source and the saturation and brightness of the destination. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - HUE = 25, - /** - * Use the saturation of the source and the hue and brightness of the destination. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SATURATION = 26, - /** - * Use the hue and saturation of the source and the brightness of the destination. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - COLOR = 27, - /** - * Use the brightness of the source and the hue and saturation of the destination. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LUMINOSITY = 28, - } -@@ -305,7 +336,8 @@ declare namespace drawing { - * Provides the definition of the roundRect. - * - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class RoundRect { - /** -@@ -316,7 +348,8 @@ declare namespace drawing { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - constructor(rect: common2D.Rect, xRadii: number, yRadii: number); - -@@ -359,41 +392,47 @@ declare namespace drawing { - * Enumerates of operations when two paths are combined. - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PathOp { - /** - * Difference operation. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DIFFERENCE = 0, - - /** - * Intersect operation. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INTERSECT = 1, - - /** - * Union operation. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - UNION = 2, - - /** - * Xor operation. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - XOR = 3, - - /** - * Reverse difference operation. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - REVERSE_DIFFERENCE = 4, - } -@@ -459,14 +498,16 @@ declare namespace drawing { - * Describes a pathIterator object. - * - * @syscap SystemCapability.Graphics.Drawing -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class PathIterator { - /** - * Creates a pathIterator with path. - * @param { Path } path - the path is used to create PathIterator. - * @syscap SystemCapability.Graphics.Drawing -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - constructor(path: Path); - -@@ -514,13 +555,15 @@ declare namespace drawing { - * Describes a path object. - * - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class Path { - /** - * Creates a Path. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - constructor(); - -@@ -528,7 +571,8 @@ declare namespace drawing { - * Creates a Path from other path. - * @param { Path } path - the path to copy content from. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - constructor(path: Path); - -@@ -568,7 +612,8 @@ declare namespace drawing { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - arcTo(x1: number, y1: number, x2: number, y2: number, startDeg: number, sweepDeg: number): void; - -@@ -834,7 +879,8 @@ declare namespace drawing { - /** - * Resets path data. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - reset(): void; - -@@ -956,20 +1002,23 @@ declare namespace drawing { - * Enumerates storage filter mode. - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum FilterMode { - /** - * Single sample point (nearest neighbor). - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FILTER_MODE_NEAREST = 0, - - /** - * Interpolate between 2x2 sample points (bilinear interpolation). - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FILTER_MODE_LINEAR = 1, - } -@@ -1013,13 +1062,15 @@ declare namespace drawing { - /** - * Provides an interface to the drawing, and samplingOptions used when sampling from the image. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class SamplingOptions { - /** - * Constructor for the samplingOptions. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - constructor(); - /** -@@ -1028,7 +1079,8 @@ declare namespace drawing { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - constructor(filterMode: FilterMode); - } -@@ -1036,7 +1088,8 @@ declare namespace drawing { - /** - * Provides an interface to the drawing, and how to clip and transform the drawing. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class Canvas { - /** -@@ -1045,7 +1098,8 @@ declare namespace drawing { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - constructor(pixelmap: image.PixelMap); - -@@ -1056,7 +1110,8 @@ declare namespace drawing { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - drawRect(rect: common2D.Rect): void; - -@@ -1070,7 +1125,8 @@ declare namespace drawing { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - drawRect(left: number, top: number, right: number, bottom: number): void; - -@@ -1215,7 +1271,8 @@ declare namespace drawing { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - drawImageRect(pixelmap: image.PixelMap, dstRect: common2D.Rect, samplingOptions?: SamplingOptions): void; - -@@ -1388,7 +1445,8 @@ declare namespace drawing { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - drawPixelMapMesh(pixelmap: image.PixelMap, meshWidth: number, meshHeight: number, - vertices: Array, vertOffset: number, colors: Array, colorOffset: number): void; -@@ -1419,7 +1477,8 @@ declare namespace drawing { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - attachBrush(brush: Brush): void; - -@@ -1433,7 +1492,8 @@ declare namespace drawing { - /** - * Unset brush to a canvas. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - detachBrush(): void; - -@@ -1453,7 +1513,8 @@ declare namespace drawing { - * @returns { number } Return the number of saved states before this call. - * @throws { BusinessError } 401 - Parameter error. Possible causes: Mandatory parameters are left unspecified. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - saveLayer(rect?: common2D.Rect | null, brush?: Brush | null): number; - -@@ -1480,7 +1541,8 @@ declare namespace drawing { - /** - * Restores the canvas status (canvas matrix) saved on the top of the stack. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - restore(): void; - -@@ -1564,7 +1626,8 @@ declare namespace drawing { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - rotate(degrees: number, sx: number, sy: number) : void; - -@@ -1693,19 +1756,22 @@ declare namespace drawing { - * - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum ClipOp { - /** - * Clips with difference. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DIFFERENCE = 0, - /** - * Clips with intersection. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INTERSECT = 1, - } -@@ -1846,7 +1912,8 @@ declare namespace drawing { - * The Typeface class specifies the typeface and intrinsic style of a font. - * - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class Typeface { - /** -@@ -1864,7 +1931,8 @@ declare namespace drawing { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - static makeFromFile(filePath: string): Typeface; - -@@ -1951,7 +2019,8 @@ declare namespace drawing { - * Font controls options applied when drawing and measuring text. - * - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class Font { - /** -@@ -1990,7 +2059,8 @@ declare namespace drawing { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setSize(textSize: number): void; - -@@ -2008,7 +2078,8 @@ declare namespace drawing { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setTypeface(typeface: Typeface): void; - -@@ -2024,7 +2095,8 @@ declare namespace drawing { - * Get fontMetrics associated with typeface. - * @returns { FontMetrics } The fontMetrics value returned to the caller. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getMetrics(): FontMetrics; - -@@ -2333,7 +2405,8 @@ declare namespace drawing { - * The metrics of an Font. - * @typedef FontMetrics - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface FontMetrics { - /** -@@ -2348,35 +2421,40 @@ declare namespace drawing { - * Maximum range above the glyph bounding box. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - top: number; - /** - * Distance Retained Above Baseline. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ascent: number; - /** - * The distance that remains below the baseline. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - descent: number; - /** - * Maximum range below the glyph bounding box. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - bottom: number; - /** - * Line Spacing. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - leading: number; - /** -@@ -2463,7 +2541,8 @@ declare namespace drawing { - /** - * Lattice is the class for dividing an image into grids. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class Lattice { - /** -@@ -2483,7 +2562,8 @@ declare namespace drawing { - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @static - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - static createImageLattice(xDivs: Array, yDivs: Array, fXCount: number, fYCount: number, - fBounds?: common2D.Rect | null, fRectTypes?: Array | null, fColors?: Array | null): Lattice; -@@ -2516,27 +2596,31 @@ declare namespace drawing { - * or to fill the grid entry with a color. only used in Lattice. - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum RectType { - /** - * Draws image into lattice rect. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DEFAULT = 0, - - /** - * Skips lattice rect by making it transparent. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TRANSPARENT = 1, - - /** - * Draws one of fColors into lattice rect. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FIXEDCOLOR = 2 - } -@@ -2852,7 +2936,8 @@ declare namespace drawing { - * ColorFilters are optional objects in the drawing pipeline. - * - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class ColorFilter { - /** -@@ -2864,7 +2949,8 @@ declare namespace drawing { - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @static - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - static createBlendModeColorFilter(color: common2D.Color, mode: BlendMode): ColorFilter; - -@@ -2877,7 +2963,8 @@ declare namespace drawing { - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @static - * @syscap SystemCapability.Graphics.Drawing -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - static createBlendModeColorFilter(color: common2D.Color | number, mode: BlendMode): ColorFilter; - -@@ -3072,13 +3159,15 @@ declare namespace drawing { - /** - * Provides settings for strokes during drawing. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class Pen { - /** - * Constructor for the pen. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - constructor(); - -@@ -3088,7 +3177,8 @@ declare namespace drawing { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - constructor(pen: Pen); - -@@ -3293,7 +3383,8 @@ declare namespace drawing { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setBlendMode(mode: BlendMode): void; - -@@ -3351,7 +3442,8 @@ declare namespace drawing { - /** - * Resets all pen contents to their initial values. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - reset(): void; - /** -@@ -3371,13 +3463,15 @@ declare namespace drawing { - /** - * Provides settings for brush fill when drawing. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class Brush { - /** - * Constructor for the Brush. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - constructor(); - -@@ -3387,7 +3481,8 @@ declare namespace drawing { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - constructor(brush: Brush); - -@@ -3540,14 +3635,16 @@ declare namespace drawing { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Graphics.Drawing -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setBlendMode(mode: BlendMode): void; - - /** - * Resets all brush contents to their initial values. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - reset(): void; - } -@@ -3556,13 +3653,15 @@ declare namespace drawing { - * Declares functions related to the matrix object in the drawing module. - * - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class Matrix { - /** - * Creates an identity matrix. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - constructor(); - -@@ -3746,7 +3845,8 @@ declare namespace drawing { - /** - * Reset matrix to identity. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - reset(): void; - /** -@@ -3846,7 +3946,8 @@ declare namespace drawing { - /** - * Describes a region object. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class Region { - /** -@@ -3930,48 +4031,55 @@ declare namespace drawing { - * Enumerates of operations when two regions are combined. - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum RegionOp { - /** - * Difference operation. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DIFFERENCE = 0, - - /** - * Intersect operation. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INTERSECT = 1, - - /** - * Union operation. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - UNION = 2, - - /** - * Xor operation. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - XOR = 3, - - /** - * Reverse difference operation. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - REVERSE_DIFFERENCE = 4, - - /** - * Replace operation. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - REPLACE = 5 - } -diff --git a/api/@ohos.graphics.text.d.ts b/api/@ohos.graphics.text.d.ts -index 5cfa44d68..9f77d04d1 100755 ---- a/api/@ohos.graphics.text.d.ts -+++ b/api/@ohos.graphics.text.d.ts -@@ -16,7 +16,6 @@ - /** - * @file - * @kit ArkGraphics2D -- * @arkts 1.1&1.2 - */ - import type drawing from './@ohos.graphics.drawing'; - import type common2D from './@ohos.graphics.common2D'; -@@ -30,6 +29,7 @@ import { Resource } from './global/resource'; - * @namespace text - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace text { - -@@ -38,12 +38,14 @@ declare namespace text { - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum TextAlign { - /** - * Use the left side of the text as a reference line for alignment. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LEFT = 0, - -@@ -51,6 +53,7 @@ declare namespace text { - * Use the right side of the text as a reference line for alignment. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RIGHT = 1, - -@@ -58,6 +61,7 @@ declare namespace text { - * Use the midpoint line the text as a reference line for alignment. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CENTER = 2, - -@@ -65,6 +69,7 @@ declare namespace text { - * Align the text at the start and end of the line. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - JUSTIFY = 3, - -@@ -72,6 +77,7 @@ declare namespace text { - * Align text from start, based on the direction of text, such as left-to-right or right-to-left. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - START = 4, - -@@ -79,6 +85,7 @@ declare namespace text { - * Align text from end, based on the direction of text, such as left-to-right or right-to-left, opposite to START. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - END = 5, - } -@@ -88,12 +95,14 @@ declare namespace text { - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum TextDirection { - /** - * The text is oriented from right to left. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RTL, - -@@ -101,6 +110,7 @@ declare namespace text { - * The text is oriented from left to right. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LTR, - } -@@ -110,12 +120,14 @@ declare namespace text { - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum BreakStrategy { - /** - * The segmentation strategy is greedy. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - GREEDY, - -@@ -123,6 +135,7 @@ declare namespace text { - * The segmentation strategy is high quality. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - HIGH_QUALITY, - -@@ -130,6 +143,7 @@ declare namespace text { - * The segmentation strategy is balanced. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BALANCED, - } -@@ -139,12 +153,14 @@ declare namespace text { - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum WordBreak { - /** - * Normal word break strategy. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NORMAL, - -@@ -152,6 +168,7 @@ declare namespace text { - * Breaks word by character. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BREAK_ALL, - -@@ -159,6 +176,7 @@ declare namespace text { - * Breaks word by phrase. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BREAK_WORD, - -@@ -166,6 +184,7 @@ declare namespace text { - * Breaks word by hyphen. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BREAK_HYPHEN, - } -@@ -175,6 +194,7 @@ declare namespace text { - * @typedef Decoration - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Decoration { - /** -@@ -182,6 +202,7 @@ declare namespace text { - * @type { ?TextDecorationType } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - textDecoration?: TextDecorationType; - -@@ -190,6 +211,7 @@ declare namespace text { - * @type { ?common2D.Color } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - color?: common2D.Color; - -@@ -198,6 +220,7 @@ declare namespace text { - * @type { ?TextDecorationStyle } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - decorationStyle?: TextDecorationStyle; - -@@ -206,6 +229,7 @@ declare namespace text { - * @type { ?number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - decorationThicknessScale?: number; - } -@@ -215,12 +239,14 @@ declare namespace text { - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum TextDecorationType { - /** - * There are no text decoration. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NONE, - -@@ -228,6 +254,7 @@ declare namespace text { - * There is a decoration line below the text. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - UNDERLINE, - -@@ -235,6 +262,7 @@ declare namespace text { - * There is a decoration line above the text. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - OVERLINE, - -@@ -242,6 +270,7 @@ declare namespace text { - * There is a decoration line through the middle of the text. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LINE_THROUGH, - } -@@ -251,12 +280,14 @@ declare namespace text { - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum TextDecorationStyle { - /** - * Decoration line is solid line. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SOLID, - -@@ -264,6 +295,7 @@ declare namespace text { - * Decoration line is double line. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DOUBLE, - -@@ -271,6 +303,7 @@ declare namespace text { - * Decoration line is dotted line. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DOTTED, - -@@ -278,6 +311,7 @@ declare namespace text { - * Decoration line is dashed line. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DASHED, - -@@ -285,6 +319,7 @@ declare namespace text { - * Decoration line is wavy line. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WAVY, - } -@@ -294,12 +329,14 @@ declare namespace text { - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum FontWeight { - /** - * Thin - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - W100, - -@@ -307,6 +344,7 @@ declare namespace text { - * Extra-light - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - W200, - -@@ -314,6 +352,7 @@ declare namespace text { - * Light - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - W300, - -@@ -321,6 +360,7 @@ declare namespace text { - * Normal/Regular - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - W400, - -@@ -328,6 +368,7 @@ declare namespace text { - * Medium - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - W500, - -@@ -335,6 +376,7 @@ declare namespace text { - * Semi-bold - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - W600, - -@@ -342,6 +384,7 @@ declare namespace text { - * Bold - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - W700, - -@@ -349,6 +392,7 @@ declare namespace text { - * Extra-bold - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - W800, - -@@ -356,6 +400,7 @@ declare namespace text { - * Black - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - W900, - } -@@ -365,12 +410,14 @@ declare namespace text { - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum FontStyle { - /** - * Upright font type. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NORMAL, - -@@ -378,6 +425,7 @@ declare namespace text { - * Slant font. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ITALIC, - -@@ -385,6 +433,7 @@ declare namespace text { - * Oblique font. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - OBLIQUE, - } -@@ -394,12 +443,14 @@ declare namespace text { - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum FontWidth { - /** - * Ultra condensed font width. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ULTRA_CONDENSED = 1, - -@@ -407,6 +458,7 @@ declare namespace text { - * Extra condensed font width. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EXTRA_CONDENSED = 2, - -@@ -414,6 +466,7 @@ declare namespace text { - * Condensed font width. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CONDENSED = 3, - -@@ -421,6 +474,7 @@ declare namespace text { - * Semi condensed font width. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SEMI_CONDENSED = 4, - -@@ -428,6 +482,7 @@ declare namespace text { - * Normal font width. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NORMAL = 5, - -@@ -435,6 +490,7 @@ declare namespace text { - * Semi expanded font width. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SEMI_EXPANDED = 6, - -@@ -442,6 +498,7 @@ declare namespace text { - * Expanded font width. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EXPANDED = 7, - -@@ -449,6 +506,7 @@ declare namespace text { - * Extra expanded font width. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EXTRA_EXPANDED = 8, - -@@ -456,6 +514,7 @@ declare namespace text { - * Ultra expanded font width. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ULTRA_EXPANDED = 9, - } -@@ -465,12 +524,14 @@ declare namespace text { - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum TextHeightBehavior { - /** - * Both ascend of first row and last row style. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ALL = 0x0, - -@@ -478,6 +539,7 @@ declare namespace text { - * Forbidding ascend of first row style. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DISABLE_FIRST_ASCENT = 0x1, - -@@ -485,6 +547,7 @@ declare namespace text { - * Forbidding ascend of last row style. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DISABLE_LAST_ASCENT = 0x2, - -@@ -492,6 +555,7 @@ declare namespace text { - * Neither ascend of first row nor last row style. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DISABLE_ALL = 0x1 | 0x2, - } -@@ -501,6 +565,7 @@ declare namespace text { - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum TextBaseline { - /** -@@ -508,6 +573,7 @@ declare namespace text { - * with the base of lowercase letters. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ALPHABETIC, - -@@ -516,6 +582,7 @@ declare namespace text { - * where the baseline aligns with the center of characters. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - IDEOGRAPHIC, - } -@@ -525,12 +592,14 @@ declare namespace text { - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum EllipsisMode { - /** - * The ellipsis is shown in the start of text. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - START, - -@@ -538,6 +607,7 @@ declare namespace text { - * The ellipsis is shown in the middle of text. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MIDDLE, - -@@ -545,6 +615,7 @@ declare namespace text { - * The ellipsis is shown in the end of text. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - END, - } -@@ -554,6 +625,7 @@ declare namespace text { - * @typedef TextShadow - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface TextShadow { - /** -@@ -561,6 +633,7 @@ declare namespace text { - * @type { ?common2D.Color } The color of text shadow - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - color?: common2D.Color; - /** -@@ -568,6 +641,7 @@ declare namespace text { - * @type { ?common2D.Point } The point of shadow - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - point?: common2D.Point; - /** -@@ -575,6 +649,7 @@ declare namespace text { - * @type { ?number } The value about radius of blur, it type is "double" - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - blurRadius?: number; - } -@@ -584,6 +659,7 @@ declare namespace text { - * @typedef RectStyle - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface RectStyle { - /** -@@ -591,6 +667,7 @@ declare namespace text { - * @type { common2D.Color } The color of rect style - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - color: common2D.Color; - -@@ -599,6 +676,7 @@ declare namespace text { - * @type { number } it is double type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - leftTopRadius: number; - -@@ -607,6 +685,7 @@ declare namespace text { - * @type { number } it is double type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - rightTopRadius: number; - -@@ -615,6 +694,7 @@ declare namespace text { - * @type { number } it is double type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - rightBottomRadius: number; - -@@ -623,6 +703,7 @@ declare namespace text { - * @type { number } it is double type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - leftBottomRadius: number; - } -@@ -632,6 +713,7 @@ declare namespace text { - * @typedef FontFeature - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface FontFeature { - /** -@@ -639,6 +721,7 @@ declare namespace text { - * @type { string } feature name - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - name: string; - /** -@@ -646,6 +729,7 @@ declare namespace text { - * @type { number } feature value - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - value: number; - } -@@ -655,6 +739,7 @@ declare namespace text { - * @typedef FontVariation - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface FontVariation { - /** -@@ -662,6 +747,7 @@ declare namespace text { - * @type { string } variation axis - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - axis: string; - /** -@@ -669,6 +755,7 @@ declare namespace text { - * @type { number } variation value - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - value: number; - } -@@ -678,6 +765,7 @@ declare namespace text { - * @typedef TextStyle - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface TextStyle { - -@@ -686,6 +774,7 @@ declare namespace text { - * @type { ?Decoration } decoration for text - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - decoration?: Decoration; - -@@ -694,6 +783,7 @@ declare namespace text { - * @type { ?common2D.Color } it is uint32_t type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - color?: common2D.Color; - -@@ -702,6 +792,7 @@ declare namespace text { - * @type { ?FontWeight } it is uint32_t type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - fontWeight?: FontWeight; - -@@ -710,6 +801,7 @@ declare namespace text { - * @type { ?FontStyle } it is uint32_t type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - fontStyle?: FontStyle; - -@@ -718,6 +810,7 @@ declare namespace text { - * @type { ?TextBaseline } it is uint32_t type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - baseline?: TextBaseline; - -@@ -726,6 +819,7 @@ declare namespace text { - * @type { ?Array } fontfamily gather - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - fontFamilies?: Array; - -@@ -734,6 +828,7 @@ declare namespace text { - * @type { ?number } it is double type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - fontSize?: number; - -@@ -742,6 +837,7 @@ declare namespace text { - * @type { ?number } it is double type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - letterSpacing?: number; - -@@ -750,6 +846,7 @@ declare namespace text { - * @type { ?number } it is double type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - wordSpacing?: number; - -@@ -758,6 +855,7 @@ declare namespace text { - * @type { ?number } it is double type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - heightScale?: number; - -@@ -766,6 +864,7 @@ declare namespace text { - * @type { ?boolean } it is boolean type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - halfLeading?: boolean; - -@@ -775,6 +874,7 @@ declare namespace text { - * @type { ?boolean } it is boolean type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - heightOnly?: boolean; - -@@ -783,6 +883,7 @@ declare namespace text { - * @type { ?string } it is u16string type data. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ellipsis?: string; - -@@ -791,6 +892,7 @@ declare namespace text { - * @type { ?EllipsisMode } Ellipsis mode. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ellipsisMode?: EllipsisMode; - -@@ -799,6 +901,7 @@ declare namespace text { - * @type { ?string } it is string type data. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - locale?: string; - -@@ -807,6 +910,7 @@ declare namespace text { - * @type { ?number } it is double type data. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - baselineShift?: number; - -@@ -815,6 +919,7 @@ declare namespace text { - * @type { ?Array } A collection of font features. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - fontFeatures?: Array; - -@@ -823,6 +928,7 @@ declare namespace text { - * @type { ?Array } textShadow gather. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - textShadows?: Array; - -@@ -831,6 +937,7 @@ declare namespace text { - * @type { ?RectStyle } rect style for text. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - backgroundRect?: RectStyle; - -@@ -839,6 +946,7 @@ declare namespace text { - * @type { ?Array } A collection of font variations. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - fontVariations?: Array; - } -@@ -847,6 +955,7 @@ declare namespace text { - * Provides the basis for graphics. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class FontCollection { - /** -@@ -854,6 +963,7 @@ declare namespace text { - * @returns { FontCollection } The FontCollection object. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - static getGlobalInstance(): FontCollection; - -@@ -863,6 +973,7 @@ declare namespace text { - * @param { string | Resource } path - the path of the font file. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - loadFontSync(name: string, path: string | Resource): void; - -@@ -875,6 +986,7 @@ declare namespace text { - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - loadFont(name: string, path: string | Resource): Promise; - -@@ -882,6 +994,7 @@ declare namespace text { - * Clear font caches. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - clearCaches(): void; - } -@@ -891,6 +1004,7 @@ declare namespace text { - * @typedef StrutStyle - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface StrutStyle { - /** -@@ -898,6 +1012,7 @@ declare namespace text { - * @type { ?Array } fontfamily gather - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - fontFamilies?: Array; - -@@ -906,6 +1021,7 @@ declare namespace text { - * @type { ?FontStyle } it is uint32_t type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - fontStyle?: FontStyle; - -@@ -914,6 +1030,7 @@ declare namespace text { - * @type { ?FontWidth } it is uint32_t type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - fontWidth?: FontWidth; - -@@ -922,6 +1039,7 @@ declare namespace text { - * @type { ?FontWeight } it is uint32_t type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - fontWeight?: FontWeight; - -@@ -930,6 +1048,7 @@ declare namespace text { - * @type { ?number } it is double type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - fontSize?: number; - -@@ -938,6 +1057,7 @@ declare namespace text { - * @type { ?number } it is double type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - height?: number; - -@@ -946,6 +1066,7 @@ declare namespace text { - * @type { ?number } it is double type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - leading?: number; - -@@ -954,6 +1075,7 @@ declare namespace text { - * @type { ?boolean } it is boolean type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - forceHeight?: boolean; - -@@ -962,6 +1084,7 @@ declare namespace text { - * @type { ?boolean } it is boolean type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enabled?: boolean; - -@@ -970,6 +1093,7 @@ declare namespace text { - * @type { ?boolean } it is boolean type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - heightOverride?: boolean; - -@@ -978,6 +1102,7 @@ declare namespace text { - * @type { ?boolean } it is boolean type data - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - halfLeading?: boolean; - } -@@ -987,6 +1112,7 @@ declare namespace text { - * @typedef ParagraphStyle - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ParagraphStyle { - /** -@@ -994,6 +1120,7 @@ declare namespace text { - * @type { ?TextStyle } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - textStyle?: TextStyle; - -@@ -1002,6 +1129,7 @@ declare namespace text { - * @type { ?TextDirection } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - textDirection?: TextDirection; - -@@ -1010,6 +1138,7 @@ declare namespace text { - * @type { ?TextAlign } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - align?: TextAlign; - -@@ -1018,6 +1147,7 @@ declare namespace text { - * @type { ?WordBreak } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - wordBreak?: WordBreak; - -@@ -1026,6 +1156,7 @@ declare namespace text { - * @type { ?number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - maxLines?: number; - -@@ -1034,6 +1165,7 @@ declare namespace text { - * @type { ?BreakStrategy } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - breakStrategy?: BreakStrategy; - -@@ -1042,6 +1174,7 @@ declare namespace text { - * @type { ?StrutStyle } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - strutStyle?: StrutStyle; - -@@ -1050,6 +1183,7 @@ declare namespace text { - * @type { ?TextHeightBehavior } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - textHeightBehavior?: TextHeightBehavior; - -@@ -1061,6 +1195,7 @@ declare namespace text { - * @type { ?TextTab } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - tab?: TextTab; - } -@@ -1069,13 +1204,13 @@ declare namespace text { - * Where to vertically align the placeholder relative to the surrounding text. - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - enum PlaceholderAlignment { - /** - * Match the baseline of the placeholder with the baseline. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - OFFSET_AT_BASELINE, - -@@ -1083,7 +1218,7 @@ declare namespace text { - * Align the bottom edge of the placeholder with the baseline such that the placeholder - * sits on top of the baseline. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - ABOVE_BASELINE, - -@@ -1091,7 +1226,7 @@ declare namespace text { - * Align the top edge of the placeholder with the baseline specified in such that the placeholder - * hangs below the baseline. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - BELOW_BASELINE, - -@@ -1099,7 +1234,7 @@ declare namespace text { - * Align the top edge of the placeholder with the top edge of the font. When the placeholder is very tall, - * the extra space will hang from the top and extend through the bottom of the line. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - TOP_OF_ROW_BOX, - -@@ -1107,7 +1242,7 @@ declare namespace text { - * Align the bottom edge of the placeholder with the bottom edge of the text. When the placeholder is very tall, - * the extra space will rise from the bottom and extend through the top of the line. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - BOTTOM_OF_ROW_BOX, - -@@ -1115,7 +1250,7 @@ declare namespace text { - * Align the middle of the placeholder with the middle of the text.When the placeholder is very tall, - * the extra space will grow equally from the top and bottom of the line. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - CENTER_OF_ROW_BOX, - } -@@ -1124,14 +1259,14 @@ declare namespace text { - * Provide a description of placeholder scope in creating typography. - * @typedef PlaceholderSpan - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - interface PlaceholderSpan { - /** - * The width of the placeholder. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - width: number; - -@@ -1139,7 +1274,7 @@ declare namespace text { - * The height of the placeholder. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - height: number; - -@@ -1147,7 +1282,7 @@ declare namespace text { - * Alignment mode of placeholder. - * @type { PlaceholderAlignment } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - align: PlaceholderAlignment; - -@@ -1155,7 +1290,7 @@ declare namespace text { - * Baseline of placeholder. - * @type { TextBaseline } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - baseline: TextBaseline; - -@@ -1163,7 +1298,7 @@ declare namespace text { - * Baseline offset of placeholder. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - baselineOffset: number; - } -@@ -1172,14 +1307,14 @@ declare namespace text { - * Provides the definition of the range. - * @typedef Range - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - interface Range { - /** - * Left index. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - start: number; - -@@ -1187,7 +1322,7 @@ declare namespace text { - * Right index. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - end: number; - } -@@ -1196,41 +1331,41 @@ declare namespace text { - * An enumeration of system font types. - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'14','1.2':'20'} -+ * @since 14 - */ - enum SystemFontType { - /** - * All font types. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'14','1.2':'20'} -+ * @since 14 - */ - ALL = 1 << 0, - - /** - * System generic font type. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'14','1.2':'20'} -+ * @since 14 - */ - GENERIC = 1 << 1, - - /** - * Stylish font type. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'14','1.2':'20'} -+ * @since 14 - */ - STYLISH = 1 << 2, - - /** - * Installed font types. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'14','1.2':'20'} -+ * @since 14 - */ - INSTALLED = 1 << 3, - - /** - * Customized font types. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - CUSTOMIZED = 1 << 4, - } -@@ -1239,14 +1374,14 @@ declare namespace text { - * Font descriptor - * @typedef FontDescriptor - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'14','1.2':'20'} -+ * @since 14 - */ - interface FontDescriptor { - /** - * Font file path - * @type { ?string } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'14','1.2':'20'} -+ * @since 14 - */ - path?: string; - -@@ -1254,7 +1389,7 @@ declare namespace text { - * Font postScript name - * @type { ?string } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'14','1.2':'20'} -+ * @since 14 - */ - postScriptName?: string; - -@@ -1262,7 +1397,7 @@ declare namespace text { - * Full font name - * @type { ?string } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'14','1.2':'20'} -+ * @since 14 - */ - fullName?: string; - -@@ -1270,7 +1405,7 @@ declare namespace text { - * Font family name - * @type { ?string } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'14','1.2':'20'} -+ * @since 14 - */ - fontFamily?: string; - -@@ -1278,7 +1413,7 @@ declare namespace text { - * Font subfamily name - * @type { ?string } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'14','1.2':'20'} -+ * @since 14 - */ - fontSubfamily?: string; - -@@ -1286,7 +1421,7 @@ declare namespace text { - * Font weight - * @type { ?FontWeight } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'14','1.2':'20'} -+ * @since 14 - */ - weight?: FontWeight; - -@@ -1294,7 +1429,7 @@ declare namespace text { - * Font width - * @type { ?number } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'14','1.2':'20'} -+ * @since 14 - */ - width?: number; - -@@ -1302,7 +1437,7 @@ declare namespace text { - * Font slant, non-0 means italic. - * @type { ?number } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'14','1.2':'20'} -+ * @since 14 - */ - italic?: number; - -@@ -1310,7 +1445,7 @@ declare namespace text { - * Whether the font is monospaced - * @type { ?boolean } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'14','1.2':'20'} -+ * @since 14 - */ - monoSpace?: boolean; - -@@ -1318,7 +1453,7 @@ declare namespace text { - * Whether to support symbols - * @type { ?boolean } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'14','1.2':'20'} -+ * @since 14 - */ - symbolic?: boolean; - } -@@ -1327,6 +1462,7 @@ declare namespace text { - * A paragraph retains the size and position of each glyph in the text and can be efficiently resized and painted. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class Paragraph { - /** -@@ -1334,6 +1470,7 @@ declare namespace text { - * @param { number } width - Control how wide the text is allowed to be. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - layoutSync(width: number): void; - -@@ -1344,7 +1481,7 @@ declare namespace text { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - layout(width: number): Promise; - -@@ -1355,6 +1492,7 @@ declare namespace text { - * @param { number } y - Represents the Y-axis position on the canvas. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - paint(canvas: drawing.Canvas, x: number, y: number): void; - -@@ -1366,6 +1504,7 @@ declare namespace text { - * @param { number } vOffset - Vertical offset along the path. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - paintOnPath(canvas: drawing.Canvas, path: drawing.Path, hOffset: number, vOffset: number): void; - -@@ -1373,7 +1512,7 @@ declare namespace text { - * Get max width of horizontal space this paragraph occupied. - * @returns { number } Max width of horizontal space. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getMaxWidth(): number; - -@@ -1381,7 +1520,7 @@ declare namespace text { - * Get height of horizontal space this paragraph occupies. - * @returns { number } Height of horizontal space this paragraph occupies. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getHeight(): number; - -@@ -1390,6 +1529,7 @@ declare namespace text { - * @returns { number } The longest line of horizontal space this paragraph occupies. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getLongestLine(): number; - -@@ -1398,7 +1538,7 @@ declare namespace text { - * of indent. - * @returns { number } The longest line with indent of horizontal space this paragraph occupies. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'13','1.2':'20'} -+ * @since 13 - */ - getLongestLineWithIndent(): number; - -@@ -1406,7 +1546,7 @@ declare namespace text { - * Get the min intrinsic width of horizontal space this paragraph occupies. - * @returns { number } The min intrinsic width of horizontal space this paragraph occupies. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getMinIntrinsicWidth(): number; - -@@ -1414,7 +1554,7 @@ declare namespace text { - * Get the max intrinsic width. - * @returns { number } Intrinsic Width. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getMaxIntrinsicWidth(): number; - -@@ -1422,7 +1562,7 @@ declare namespace text { - * Get the alphabetic baseline. - * @returns { number } Alphabetic Baseline. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getAlphabeticBaseline(): number; - -@@ -1430,7 +1570,7 @@ declare namespace text { - * Get the ideographic baseline. - * @returns { number } Ideographic Baseline. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getIdeographicBaseline(): number; - -@@ -1441,7 +1581,7 @@ declare namespace text { - * @param { RectHeightStyle } heightStyle - Height style to set. - * @returns { Array } The rects for range. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getRectsForRange(range: Range, widthStyle: RectWidthStyle, heightStyle: RectHeightStyle): Array; - -@@ -1449,7 +1589,7 @@ declare namespace text { - * Get the rects for placeholders. - * @returns { Array } The rects for placeholders. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getRectsForPlaceholders(): Array; - -@@ -1459,7 +1599,7 @@ declare namespace text { - * @param { number } y - the positionY of typography to set. - * @returns { PositionWithAffinity } TextBlob object. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getGlyphPositionAtCoordinate(x: number, y: number): PositionWithAffinity; - -@@ -1468,7 +1608,7 @@ declare namespace text { - * @param { number } offset - offset value - * @returns { Range } The range value returned to the caller. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getWordBoundary(offset: number): Range; - -@@ -1476,7 +1616,7 @@ declare namespace text { - * Get line count. - * @returns { number } The line count value returned to the caller. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getLineCount(): number; - -@@ -1485,7 +1625,7 @@ declare namespace text { - * @param { number } line - line number - * @returns { number } The line height value returned to the caller. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getLineHeight(line: number): number; - -@@ -1494,7 +1634,7 @@ declare namespace text { - * @param { number } line - line number - * @returns { number } The line width value returned to the caller. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getLineWidth(line: number): number; - -@@ -1502,7 +1642,7 @@ declare namespace text { - * Return whether it exceed the maximum lines of typography. - * @returns { boolean } The true indicates exceeding, the false indicates not exceeding. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - didExceedMaxLines(): boolean; - -@@ -1510,7 +1650,7 @@ declare namespace text { - * Get the text lines of paragraph. - * @returns { Array } the tuple of TextLine. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getTextLines(): Array; - -@@ -1520,7 +1660,7 @@ declare namespace text { - * @param { boolean } includeSpaces - indicates if the whitespaces should be included - * @returns { Range } The range of text. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getActualTextRange(lineNumber: number, includeSpaces: boolean): Range; - -@@ -1529,6 +1669,7 @@ declare namespace text { - * @returns { Array } Array of line metrics. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getLineMetrics(): Array; - -@@ -1538,6 +1679,7 @@ declare namespace text { - * @returns { LineMetrics | undefined } line metrics. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getLineMetrics(lineNumber: number): LineMetrics | undefined; - } -@@ -1545,7 +1687,7 @@ declare namespace text { - /** - * Provides the abilities to typeset by line. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - class LineTypeset { - /** -@@ -1556,7 +1698,7 @@ declare namespace text { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - getLineBreak(startIndex: number, width: number): number; - -@@ -1568,7 +1710,7 @@ declare namespace text { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - createLine(startIndex: number, count: number): TextLine; - } -@@ -1577,14 +1719,14 @@ declare namespace text { - * Box that contain text. - * @typedef TextBox - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - interface TextBox{ - /** - * Rect of text box. - * @type { common2D.Rect } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - rect: common2D.Rect; - -@@ -1592,7 +1734,7 @@ declare namespace text { - * Text direction. - * @type { TextDirection } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - direction: TextDirection; - } -@@ -1601,14 +1743,14 @@ declare namespace text { - * Position and affinity. - * @typedef PositionWithAffinity - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - interface PositionWithAffinity { - /** - * Position of text. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - position: number; - -@@ -1616,7 +1758,7 @@ declare namespace text { - * Affinity of text. - * @type { Affinity } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - affinity: Affinity; - } -@@ -1625,20 +1767,20 @@ declare namespace text { - * Enumerates rect width style. - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - enum RectWidthStyle { - /** - * Tight width. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - TIGHT, - - /** - * Max width. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - MAX, - } -@@ -1647,13 +1789,13 @@ declare namespace text { - * Enumerates rect height style. - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - enum RectHeightStyle { - /** - * Provide tight bounding boxes that fit heights per run. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - TIGHT, - -@@ -1661,35 +1803,35 @@ declare namespace text { - * The height of the boxes will be the maximum height of all runs in the line. All rects in the same - * line will be the same height. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - MAX, - - /** - * The top and bottom of each rect will cover half of the space above and half of the space below the line. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - INCLUDE_LINE_SPACE_MIDDLE, - - /** - * The line spacing will be added to the top of the rect. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - INCLUDE_LINE_SPACE_TOP, - - /** - * The line spacing will be added to the bottom of the rect. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - INCLUDE_LINE_SPACE_BOTTOM, - - /** - * The height of the boxes will be calculated by text strut. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - STRUT, - } -@@ -1700,20 +1842,20 @@ declare namespace text { - * closer to. - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - enum Affinity { - /** - * The position has affinity for the upstream side of the text position. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - - UPSTREAM, - /** - * The position has affinity for the downstream side of the text position. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - DOWNSTREAM, - } -@@ -1722,6 +1864,7 @@ declare namespace text { - * Builds a Paragraph containing text with the given styling information. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class ParagraphBuilder { - /** -@@ -1730,6 +1873,7 @@ declare namespace text { - * @param { FontCollection } fontCollection - Font collection {@link FontCollection} - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - constructor(paragraphStyle: ParagraphStyle, fontCollection: FontCollection); - -@@ -1738,6 +1882,7 @@ declare namespace text { - * @param { TextStyle } textStyle - Text style {@link TextStyle} - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - pushStyle(textStyle: TextStyle): void; - -@@ -1745,6 +1890,7 @@ declare namespace text { - * Remove a style from the stack. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - popStyle(): void; - -@@ -1753,6 +1899,7 @@ declare namespace text { - * @param { string } text - Text string - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - addText(text: string): void; - -@@ -1760,7 +1907,7 @@ declare namespace text { - * Add placeholder. - * @param { PlaceholderSpan } placeholderSpan - Placeholder Span {@link PlaceholderSpan} - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - addPlaceholder(placeholderSpan: PlaceholderSpan): void; - -@@ -1769,6 +1916,7 @@ declare namespace text { - * @returns { Paragraph } The paragraph value returned to the caller. - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - build(): Paragraph; - -@@ -1776,7 +1924,7 @@ declare namespace text { - * Create LineTypeset object. - * @returns { LineTypeset } The LineTypeset value returned to the caller. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - buildLineTypeset(): LineTypeset; - -@@ -1784,7 +1932,7 @@ declare namespace text { - * Add symbolId. - * @param { number } symbolId - Symbol Id - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - addSymbol(symbolId: number): void; - } -@@ -1793,14 +1941,14 @@ declare namespace text { - * Provides the definition of the typographic bounds. - * @typedef TypographicBounds - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - interface TypographicBounds { - /** - * Distance Retained Above Baseline. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - ascent: number; - -@@ -1808,7 +1956,7 @@ declare namespace text { - * The distance that remains below the baseline. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - descent: number; - -@@ -1816,7 +1964,7 @@ declare namespace text { - * Line Spacing. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - leading: number; - -@@ -1824,7 +1972,7 @@ declare namespace text { - * The total width of the typesetting border. - * @type { number } - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - width: number; - } -@@ -1840,21 +1988,21 @@ declare namespace text { - * @returns { boolean } The return value of the user-defined callback function. If false is returned, the traversal - * continues. If true is returned, the traversal stops. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - type CaretOffsetsCallback = (offset: number, index: number, leadingEdge: boolean) => boolean; - - /** - * The structure of text line that provides the basis of paragraph for graphics. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - class TextLine { - /** - * Get the count of glyphs. - * @returns { number } The counts of glyphs. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getGlyphCount(): number; - -@@ -1862,7 +2010,7 @@ declare namespace text { - * Get the range of text line. - * @returns { Range } The range of text. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getTextRange(): Range; - -@@ -1870,7 +2018,7 @@ declare namespace text { - * Get the glyph runs of text line. - * @returns { Array } The tuple of glyph runs of text. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getGlyphRuns(): Array; - -@@ -1880,7 +2028,7 @@ declare namespace text { - * @param { number } x - Represents the X-axis position on the canvas. - * @param { number } y - Represents the Y-axis position on the canvas. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - paint(canvas: drawing.Canvas, x: number, y: number): void; - -@@ -1893,7 +2041,7 @@ declare namespace text { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - createTruncatedLine(width: number, ellipsisMode: EllipsisMode, ellipsis: string): TextLine; - -@@ -1901,7 +2049,7 @@ declare namespace text { - * Gets the text line typographic bounds. - * @returns { TypographicBounds } The text line of typographic bounds. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - getTypographicBounds(): TypographicBounds; - -@@ -1909,7 +2057,7 @@ declare namespace text { - * Gets the text line image bounds. - * @returns { common2D.Rect } Rect of text line. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - getImageBounds(): common2D.Rect; - -@@ -1917,7 +2065,7 @@ declare namespace text { - * Gets the tail space width. - * @returns { number } The tail space width. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - getTrailingSpaceWidth(): number; - -@@ -1928,7 +2076,7 @@ declare namespace text { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - getStringIndexForPosition(point: common2D.Point): number; - -@@ -1939,7 +2087,7 @@ declare namespace text { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - getOffsetForStringIndex(index: number): number; - -@@ -1949,7 +2097,7 @@ declare namespace text { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - enumerateCaretOffsets(callback: CaretOffsetsCallback): void; - -@@ -1964,7 +2112,7 @@ declare namespace text { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - getAlignmentOffset(alignmentFactor: number, alignmentWidth: number): number; - } -@@ -1972,14 +2120,14 @@ declare namespace text { - /** - * Independent rendering of text layout. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - class Run { - /** - * Gets the number of glyph. - * @returns { number } The number of glyph. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getGlyphCount(): number; - -@@ -1987,7 +2135,7 @@ declare namespace text { - * Gets the glyph identifier for each character. - * @returns { Array } Glyph identifier. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getGlyphs(): Array; - -@@ -1999,7 +2147,7 @@ declare namespace text { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - getGlyphs(range: Range): Array; - -@@ -2007,7 +2155,7 @@ declare namespace text { - * Gets the font position offset. - * @returns { Array } The position of the font in the layout. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getPositions(): Array; - -@@ -2019,7 +2167,7 @@ declare namespace text { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - getPositions(range: Range): Array; - -@@ -2027,7 +2175,7 @@ declare namespace text { - * Gets the font position offset array. - * @returns { Array } The position offset of the font in the layout. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getOffsets(): Array; - -@@ -2035,7 +2183,7 @@ declare namespace text { - * Gets the font object instance. - * @returns { drawing.Font } The font object instance. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - getFont(): drawing.Font; - -@@ -2045,7 +2193,7 @@ declare namespace text { - * @param { number } x - Represents the X-axis position on the canvas. - * @param { number } y - Represents the Y-axis position on the canvas. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 - */ - paint(canvas: drawing.Canvas, x: number, y: number): void; - -@@ -2057,7 +2205,7 @@ declare namespace text { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - getStringIndices(range?: Range): Array; - -@@ -2065,7 +2213,7 @@ declare namespace text { - * Gets the run glyph location and length. - * @returns { Range } The run of glyph location and length, Range.start is location, Range.end is length. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - getStringRange(): Range; - -@@ -2073,7 +2221,7 @@ declare namespace text { - * Gets the run typographic bounds. - * @returns { TypographicBounds } The run of typographic bounds. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - getTypographicBounds(): TypographicBounds; - -@@ -2081,7 +2229,7 @@ declare namespace text { - * Gets the run image bounds. - * @returns { common2D.Rect } The run rect bounds. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - getImageBounds(): common2D.Rect; - } -@@ -2091,6 +2239,7 @@ declare namespace text { - * @typedef RunMetrics - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface RunMetrics { - /** -@@ -2098,6 +2247,7 @@ declare namespace text { - * @type { TextStyle } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - textStyle: TextStyle; - -@@ -2106,6 +2256,7 @@ declare namespace text { - * @type { drawing.FontMetrics } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - fontMetrics: drawing.FontMetrics; - } -@@ -2115,6 +2266,7 @@ declare namespace text { - * @typedef LineMetrics - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface LineMetrics { - /** -@@ -2122,6 +2274,7 @@ declare namespace text { - * @type { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - startIndex: number; - -@@ -2130,6 +2283,7 @@ declare namespace text { - * @type { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - endIndex: number; - -@@ -2138,6 +2292,7 @@ declare namespace text { - * @type { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ascent: number; - -@@ -2146,6 +2301,7 @@ declare namespace text { - * @type { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - descent: number; - -@@ -2154,6 +2310,7 @@ declare namespace text { - * @type { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - height: number; - -@@ -2162,6 +2319,7 @@ declare namespace text { - * @type { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - width: number; - -@@ -2170,6 +2328,7 @@ declare namespace text { - * @type { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - left: number; - -@@ -2178,6 +2337,7 @@ declare namespace text { - * @type { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - baseline: number; - -@@ -2186,6 +2346,7 @@ declare namespace text { - * @type { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - lineNumber: number; - -@@ -2194,6 +2355,7 @@ declare namespace text { - * @type { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - topHeight: number; - -@@ -2204,6 +2366,7 @@ declare namespace text { - * @type { Map } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - runMetrics: Map; - } -@@ -2215,7 +2378,7 @@ declare namespace text { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'14','1.2':'20'} -+ * @since 14 - */ - function getSystemFontFullNamesByType(fontType: SystemFontType): Promise>; - -@@ -2228,7 +2391,7 @@ declare namespace text { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'14','1.2':'20'} -+ * @since 14 - */ - function getFontDescriptorByFullName(fullName: string, fontType: SystemFontType): Promise; - -@@ -2241,7 +2404,7 @@ declare namespace text { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Graphics.Drawing -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since 18 - */ - function matchFontDescriptors(desc: FontDescriptor): Promise>; - -@@ -2250,6 +2413,7 @@ declare namespace text { - * @typedef TextTab - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface TextTab { - /** -@@ -2258,6 +2422,7 @@ declare namespace text { - * @type { TextAlign } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - alignment: TextAlign; - -@@ -2266,6 +2431,7 @@ declare namespace text { - * @type { number } - * @syscap SystemCapability.Graphics.Drawing - * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - location: number; - } -diff --git a/api/@ohos.graphics.uiEffect.d.ts b/api/@ohos.graphics.uiEffect.d.ts -index b30a33873..daa434171 100644 ---- a/api/@ohos.graphics.uiEffect.d.ts -+++ b/api/@ohos.graphics.uiEffect.d.ts -@@ -44,7 +44,8 @@ declare namespace uiEffect { - * @returns { Filter } - * @syscap SystemCapability.Graphics.Drawing - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - pixelStretch(stretchSizes: Array, tileMode: TileMode): Filter; - -@@ -54,7 +55,8 @@ declare namespace uiEffect { - * @param { number } blurRadius - * @returns { Filter } - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - blur(blurRadius: number): Filter; - -@@ -71,7 +73,8 @@ declare namespace uiEffect { - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @syscap SystemCapability.Graphics.Drawing - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - waterRipple(progress: number, waveCount: number, x: number, y: number, rippleMode: WaterRippleMode): Filter; - -@@ -85,7 +88,8 @@ declare namespace uiEffect { - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @syscap SystemCapability.Graphics.Drawing - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - flyInFlyOutEffect(degree: number, flyMode: FlyMode): Filter; - -@@ -100,7 +104,8 @@ declare namespace uiEffect { - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @syscap SystemCapability.Graphics.Drawing - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - distort(distortionK: number): Filter; - } -@@ -111,7 +116,8 @@ declare namespace uiEffect { - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum TileMode { - /** -@@ -119,7 +125,8 @@ declare namespace uiEffect { - * - * @syscap SystemCapability.Graphics.Drawing - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CLAMP = 0, - -@@ -128,7 +135,8 @@ declare namespace uiEffect { - * - * @syscap SystemCapability.Graphics.Drawing - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - REPEAT = 1, - -@@ -137,7 +145,8 @@ declare namespace uiEffect { - * - * @syscap SystemCapability.Graphics.Drawing - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MIRROR = 2, - -@@ -146,7 +155,8 @@ declare namespace uiEffect { - * - * @syscap SystemCapability.Graphics.Drawing - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DECAL = 3, - } -@@ -157,7 +167,8 @@ declare namespace uiEffect { - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum WaterRippleMode { - /** -@@ -165,7 +176,8 @@ declare namespace uiEffect { - * - * @syscap SystemCapability.Graphics.Drawing - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SMALL2MEDIUM_RECV = 0, - -@@ -174,7 +186,8 @@ declare namespace uiEffect { - * - * @syscap SystemCapability.Graphics.Drawing - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SMALL2MEDIUM_SEND = 1, - -@@ -183,7 +196,8 @@ declare namespace uiEffect { - * - * @syscap SystemCapability.Graphics.Drawing - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SMALL2SMALL = 2, - -@@ -192,7 +206,8 @@ declare namespace uiEffect { - * - * @syscap SystemCapability.Graphics.Drawing - * @systemapi -- * @since 17 -+ * @since arkts {'1.1':'17', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MINI_RECV = 3, - } -@@ -203,7 +218,8 @@ declare namespace uiEffect { - * @enum { number } - * @syscap SystemCapability.Graphics.Drawing - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum FlyMode { - /** -@@ -211,7 +227,8 @@ declare namespace uiEffect { - * - * @syscap SystemCapability.Graphics.Drawing - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BOTTOM = 0, - -@@ -220,7 +237,8 @@ declare namespace uiEffect { - * - * @syscap SystemCapability.Graphics.Drawing - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TOP = 1, - } -@@ -357,7 +375,8 @@ declare namespace uiEffect { - * Create a Filter to add multiple effects to the component. - * @returns { Filter } Returns the head node of Filter. - * @syscap SystemCapability.Graphics.Drawing -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function createFilter(): Filter; - -diff --git a/api/@ohos.hiSysEvent.d.ets b/api/@ohos.hiSysEvent.d.ets -deleted file mode 100644 -index 4b89b7719..000000000 ---- a/api/@ohos.hiSysEvent.d.ets -+++ /dev/null -@@ -1,559 +0,0 @@ --/* -- * Copyright (c) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --/** -- * @file -- * @kit PerformanceAnalysisKit -- */ -- --import { AsyncCallback } from './@ohos.base'; -- --/** -- * Provides the system event logging function for applications to log the fault, statistical, security, -- * and user behavior events reported during running. Based on event information, -- * you will be able to analyze the running status of applications. -- * -- * @namespace hiSysEvent -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ --declare namespace hiSysEvent { -- /** -- * Enumerate system event types. -- * -- * @enum {number} -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- export enum EventType { -- /** -- * Fault event -- * -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- FAULT = 1, -- -- /** -- * Statistic event -- * -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- STATISTIC = 2, -- -- /** -- * Security event -- * -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- SECURITY = 3, -- -- /** -- * System behavior event -- * -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- BEHAVIOR = 4 -- } -- -- /** -- * Definition of written system event information. -- * -- * @interface SysEventInfo -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- export interface SysEventInfo { -- /** -- * The domain of the event. -- * -- * @type { string } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- domain: string; -- -- /** -- * The name of the event. -- * -- * @type { string } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- name: string; -- -- /** -- * The type of the event. -- * -- * @type { EventType } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- eventType: EventType; -- -- /** -- * The params of the event. -- * -- * @type { object } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 9 -- */ -- /** -- * The params of the event. -- * -- * @type { ?object } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 12 -- */ -- /** -- * The params of the event. -- * -- * @type { ?Record } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- params?: Record; -- } -- -- /** -- * Write system event. -- * -- * @param {SysEventInfo} info - system event information to be written. -- * @returns {Promise} - Return Promise -- * @throws {BusinessError} 401 - Parameter error. Possible causes: -- * 1. Mandatory parameters are left unspecified. -- * 2. Incorrect parameter types. -- * 3. Parameter verification failed. -- * @throws {BusinessError} 11200001 - Invalid event domain. -- * @throws {BusinessError} 11200002 - Invalid event name. -- * @throws {BusinessError} 11200003 - Abnormal environment. -- * @throws {BusinessError} 11200004 - The event length exceeds the limit. -- * @throws {BusinessError} 11200051 - Invalid event parameter. -- * @throws {BusinessError} 11200052 - The size of the event parameter of the string type exceeds the limit. -- * @throws {BusinessError} 11200053 - The number of event parameters exceeds the limit. -- * @throws {BusinessError} 11200054 - The number of event parameters of the array type exceeds the limit. -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- export function write(info: SysEventInfo): Promise; -- -- /** -- * Write system event. -- * -- * @param {SysEventInfo} info - system event information to be written. -- * @param {AsyncCallback} callback - callback function. -- * @throws {BusinessError} 401 - Parameter error. Possible causes: -- * 1. Mandatory parameters are left unspecified. -- * 2. Incorrect parameter types. -- * 3. Parameter verification failed. -- * @throws {BusinessError} 11200001 - Invalid event domain. -- * @throws {BusinessError} 11200002 - Invalid event name. -- * @throws {BusinessError} 11200003 - Abnormal environment. -- * @throws {BusinessError} 11200004 - The event length exceeds the limit. -- * @throws {BusinessError} 11200051 - Invalid event parameter. -- * @throws {BusinessError} 11200052 - The size of the event parameter of the string type exceeds the limit. -- * @throws {BusinessError} 11200053 - The number of event parameters exceeds the limit. -- * @throws {BusinessError} 11200054 - The number of event parameters of the array type exceeds the limit. -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- export function write(info: SysEventInfo, callback: AsyncCallback): void; -- -- /** -- * Enumerate search system event rule type. -- * -- * @enum {number} -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- export enum RuleType { -- /** -- * Whole word match -- * -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- WHOLE_WORD = 1, -- -- /** -- * Prefix match -- * -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- PREFIX = 2, -- -- /** -- * Regular match -- * -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- REGULAR = 3 -- } -- -- /** -- * Definition listener rule for system event information. -- * -- * @interface WatchRule -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- export interface WatchRule { -- /** -- * The domain of the event. -- * -- * @type { string } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- domain: string; -- -- /** -- * The name of the event. -- * -- * @type { string } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- name: string; -- -- /** -- * The tag of the event. -- * -- * @type { string } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- /** -- * The tag of the event. -- * -- * @type { ?string } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- tag?: string; -- -- /** -- * The rule of match system event -- * -- * @type { RuleType } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- ruleType: RuleType; -- } -- -- /** -- * Definition watcher for system event information. -- * -- * @interface Watcher -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- export interface Watcher { -- /** -- * Rule of filter system event -- * -- * @type { WatchRule[] } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- rules: WatchRule[]; -- -- /** -- * Receive system event. -- * -- * @type { function } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- onEvent: (info: SysEventInfo) => void; -- -- /** -- * Hisysevent service shutdown. -- * -- * @type { function } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- onServiceDied: () => void; -- } -- -- /** -- * Definition arguments for query system event information. -- * -- * @interface QueryArg -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- export interface QueryArg { -- /** -- * Begin time -- * -- * @type { number } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- beginTime: number; -- -- /** -- * End time -- * -- * @type { number } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- endTime: number; -- -- /** -- * Max number of receive system event -- * -- * @type { number } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- maxEvents: number; -- -- /** -- * Begin sequence -- * -- * @type { ?number } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- fromSeq?: number; -- -- /** -- * End sequence -- * -- * @type { ?number } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- toSeq?: number; -- } -- -- /** -- * Definition event for query system event information -- * -- * @interface QueryRule -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- export interface QueryRule { -- /** -- * The domain of the event -- * -- * @type { string } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- domain: string; -- -- /** -- * List of event name -- * -- * @type { string[] } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- names: string[]; -- -- /** -- * Extra parameter condition of event -- * -- * @type { ?string } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- condition?: string; -- } -- -- /** -- * Definition query result handler -- * -- * @interface Querier -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- export interface Querier { -- /** -- * Handle query result, the query result will be send in several times. -- * -- * @type { function } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- onQuery: (infos: SysEventInfo[]) => void; -- -- /** -- * Notify querier execute query has finished. -- * -- * @type { function } -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- onComplete: (reason: number, total: number) => void; -- } -- -- /** -- * Add watcher to watch system event -- * -- * @permission ohos.permission.READ_DFX_SYSEVENT -- * @param {Watcher} watcher watch system event -- * @throws {BusinessError} 201 - Permission denied. An attempt was made to read system event forbidden by permission: -- * ohos.permission.READ_DFX_SYSEVENT. -- * @throws {BusinessError} 202 - System API is not allowed called by Non-system application. -- * @throws {BusinessError} 11200101 - The number of watchers exceeds the limit. -- * @throws {BusinessError} 11200102 - The number of watch rules exceeds the limit. -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- export function addWatcher(watcher: Watcher): void; -- -- /** -- * Remove watcher -- * -- * @permission ohos.permission.READ_DFX_SYSEVENT -- * @param {Watcher} watcher watch system event -- * @throws {BusinessError} 201 - Permission denied. An attempt was made to read system event forbidden by permission: -- * ohos.permission.READ_DFX_SYSEVENT. -- * @throws {BusinessError} 202 - System API is not allowed called by Non-system application. -- * @throws {BusinessError} 11200201 - The watcher does not exist. -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- export function removeWatcher(watcher: Watcher): void; -- -- /** -- * Query system event -- * -- * @permission ohos.permission.READ_DFX_SYSEVENT -- * @param {QueryArg} queryArg common arguments of query system event -- * @param {QueryRule[]} rules rule of query system event -- * @param {Querier} querier receive query result -- * @throws {BusinessError} 201 - Permission denied. An attempt was made to read system event forbidden by permission: -- * ohos.permission.READ_DFX_SYSEVENT. -- * @throws {BusinessError} 202 - System API is not allowed called by Non-system application. -- * @throws {BusinessError} 11200301 - The number of query rules exceeds the limit. -- * @throws {BusinessError} 11200302 - Invalid query rule. -- * @throws {BusinessError} 11200303 - The number of concurrent queriers exceeds the limit. -- * @throws {BusinessError} 11200304 - The query frequency exceeds the limit. -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- export function query(queryArg: QueryArg, rules: QueryRule[], querier: Querier): void; -- -- /** -- * Export system event -- * -- * @permission ohos.permission.READ_DFX_SYSEVENT -- * @param {QueryArg} queryArg common arguments of query system event -- * @param {QueryRule[]} rules rule of query system event -- * @returns {number} return hiview receive task time. -- * @throws {BusinessError} 201 - Permission denied. An attempt was made to read system event forbidden by permission: -- * ohos.permission.READ_DFX_SYSEVENT. -- * @throws {BusinessError} 202 - System API is not allowed called by Non-system application. -- * @throws {BusinessError} 11200301 - The number of query rules exceeds the limit. -- * @throws {BusinessError} 11200302 - Invalid query rule. -- * @throws {BusinessError} 11200304 – The query frequency exceeds the limit. -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- export function exportSysEvents(queryArg: QueryArg, rules: QueryRule[]): number; -- -- /** -- * Subscribe system event -- * -- * @permission ohos.permission.READ_DFX_SYSEVENT -- * @param {QueryRule[]} rules rule of subscribe system event -- * @returns {number} return hiview receive task time. -- * @throws {BusinessError} 201 - Permission denied. An attempt was made to read system event forbidden by permission: -- * ohos.permission.READ_DFX_SYSEVENT. -- * @throws {BusinessError} 202 - System API is not allowed called by Non-system application. -- * @throws {BusinessError} 11200301 - The number of query rules exceeds the limit. -- * @throws {BusinessError} 11200302 - Invalid query rule. -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- export function subscribe(rules: QueryRule[]): number; -- -- /** -- * Unsubscribe system event -- * -- * @permission ohos.permission.READ_DFX_SYSEVENT -- * @throws {BusinessError} 201 - Permission denied. An attempt was made to read system event forbidden by permission: -- * ohos.permission.READ_DFX_SYSEVENT. -- * @throws {BusinessError} 202 - System API is not allowed called by Non-system application. -- * @throws {BusinessError} 11200305 – Unsubscription failed. -- * @syscap SystemCapability.HiviewDFX.HiSysEvent -- * @systemapi hide for inner use -- * @since 20 -- */ -- export function unsubscribe(): void; --} -- --export default hiSysEvent; -diff --git a/api/@ohos.hiSysEvent.d.ts b/api/@ohos.hiSysEvent.d.ts -index f4401ee2f..2a08c051c 100644 ---- a/api/@ohos.hiSysEvent.d.ts -+++ b/api/@ohos.hiSysEvent.d.ts -@@ -28,7 +28,8 @@ import { AsyncCallback } from './@ohos.base'; - * @namespace hiSysEvent - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace hiSysEvent { - /** -@@ -37,7 +38,8 @@ declare namespace hiSysEvent { - * @enum {number} - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum EventType { - /** -@@ -45,7 +47,8 @@ declare namespace hiSysEvent { - * - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FAULT = 1, - -@@ -54,7 +57,8 @@ declare namespace hiSysEvent { - * - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - STATISTIC = 2, - -@@ -63,7 +67,8 @@ declare namespace hiSysEvent { - * - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SECURITY = 3, - -@@ -72,7 +77,8 @@ declare namespace hiSysEvent { - * - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BEHAVIOR = 4 - } -@@ -83,7 +89,8 @@ declare namespace hiSysEvent { - * @interface SysEventInfo - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface SysEventInfo { - /** -@@ -92,7 +99,8 @@ declare namespace hiSysEvent { - * @type { string } - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - domain: string; - -@@ -102,7 +110,8 @@ declare namespace hiSysEvent { - * @type { string } - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - name: string; - -@@ -112,7 +121,8 @@ declare namespace hiSysEvent { - * @type { EventType } - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - eventType: EventType; - -@@ -130,7 +140,8 @@ declare namespace hiSysEvent { - * @type { ?object } - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - params?: object; - } -@@ -154,7 +165,8 @@ declare namespace hiSysEvent { - * @throws {BusinessError} 11200054 - The number of event parameters of the array type exceeds the limit. - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function write(info: SysEventInfo): Promise; - -@@ -177,7 +189,8 @@ declare namespace hiSysEvent { - * @throws {BusinessError} 11200054 - The number of event parameters of the array type exceeds the limit. - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function write(info: SysEventInfo, callback: AsyncCallback): void; - -@@ -187,7 +200,8 @@ declare namespace hiSysEvent { - * @enum {number} - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum RuleType { - /** -@@ -195,7 +209,8 @@ declare namespace hiSysEvent { - * - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WHOLE_WORD = 1, - -@@ -204,7 +219,8 @@ declare namespace hiSysEvent { - * - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PREFIX = 2, - -@@ -213,7 +229,8 @@ declare namespace hiSysEvent { - * - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - REGULAR = 3 - } -@@ -224,7 +241,8 @@ declare namespace hiSysEvent { - * @interface WatchRule - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface WatchRule { - /** -@@ -233,7 +251,8 @@ declare namespace hiSysEvent { - * @type { string } - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - domain: string; - -@@ -243,7 +262,8 @@ declare namespace hiSysEvent { - * @type { string } - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - name: string; - -@@ -261,7 +281,8 @@ declare namespace hiSysEvent { - * @type { ?string } - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - tag?: string; - -@@ -271,7 +292,8 @@ declare namespace hiSysEvent { - * @type { RuleType } - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ruleType: RuleType; - } -@@ -282,7 +304,8 @@ declare namespace hiSysEvent { - * @interface Watcher - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Watcher { - /** -@@ -291,7 +314,8 @@ declare namespace hiSysEvent { - * @type { WatchRule[] } - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - rules: WatchRule[]; - -@@ -301,7 +325,8 @@ declare namespace hiSysEvent { - * @type { function } - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onEvent: (info: SysEventInfo) => void; - -@@ -311,7 +336,8 @@ declare namespace hiSysEvent { - * @type { function } - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onServiceDied: () => void; - } -@@ -322,7 +348,8 @@ declare namespace hiSysEvent { - * @interface QueryArg - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface QueryArg { - /** -@@ -331,7 +358,8 @@ declare namespace hiSysEvent { - * @type { number } - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - beginTime: number; - -@@ -341,7 +369,8 @@ declare namespace hiSysEvent { - * @type { number } - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - endTime: number; - -@@ -351,7 +380,8 @@ declare namespace hiSysEvent { - * @type { number } - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - maxEvents: number; - -@@ -361,7 +391,8 @@ declare namespace hiSysEvent { - * @type { ?number } - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - fromSeq?: number; - -@@ -371,7 +402,8 @@ declare namespace hiSysEvent { - * @type { ?number } - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - toSeq?: number; - } -@@ -382,7 +414,8 @@ declare namespace hiSysEvent { - * @interface QueryRule - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface QueryRule { - /** -@@ -391,7 +424,8 @@ declare namespace hiSysEvent { - * @type { string } - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - domain: string; - -@@ -401,7 +435,8 @@ declare namespace hiSysEvent { - * @type { string[] } - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - names: string[]; - -@@ -411,7 +446,8 @@ declare namespace hiSysEvent { - * @type { ?string } - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - condition?: string; - } -@@ -422,7 +458,8 @@ declare namespace hiSysEvent { - * @interface Querier - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Querier { - /** -@@ -431,7 +468,8 @@ declare namespace hiSysEvent { - * @type { function } - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onQuery: (infos: SysEventInfo[]) => void; - -@@ -441,7 +479,8 @@ declare namespace hiSysEvent { - * @type { function } - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onComplete: (reason: number, total: number) => void; - } -@@ -461,7 +500,8 @@ declare namespace hiSysEvent { - * @throws {BusinessError} 11200102 - The number of watch rules exceeds the limit. - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function addWatcher(watcher: Watcher): void; - -@@ -479,7 +519,8 @@ declare namespace hiSysEvent { - * @throws {BusinessError} 11200201 - The watcher does not exist. - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function removeWatcher(watcher: Watcher): void; - -@@ -502,7 +543,8 @@ declare namespace hiSysEvent { - * @throws {BusinessError} 11200304 - The query frequency exceeds the limit. - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function query(queryArg: QueryArg, rules: QueryRule[], querier: Querier): void; - -@@ -524,7 +566,8 @@ declare namespace hiSysEvent { - * @throws {BusinessError} 11200304 – The query frequency exceeds the limit. - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function exportSysEvents(queryArg: QueryArg, rules: QueryRule[]): number; - -@@ -544,7 +587,8 @@ declare namespace hiSysEvent { - * @throws {BusinessError} 11200302 - Invalid query rule. - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function subscribe(rules: QueryRule[]): number; - -@@ -561,7 +605,8 @@ declare namespace hiSysEvent { - * @throws {BusinessError} 11200305 – Unsubscription failed. - * @syscap SystemCapability.HiviewDFX.HiSysEvent - * @systemapi hide for inner use -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function unsubscribe(): void; - } -diff --git a/api/@ohos.hiTraceChain.d.ets b/api/@ohos.hiTraceChain.d.ets -deleted file mode 100644 -index 720a7bb6c..000000000 ---- a/api/@ohos.hiTraceChain.d.ets -+++ /dev/null -@@ -1,342 +0,0 @@ --/* -- * Copyright (c) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --/** -- * @file -- * @kit PerformanceAnalysisKit -- */ -- --/** -- * Provides APIs to implement call chain tracing throughout a service process. -- * With HiTrace, you can quickly obtain the run log for the call chain of a -- * specified service process and locate faults in cross-device, cross-process, -- * or cross-thread communications. -- * -- * @namespace hiTraceChain -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ --declare namespace hiTraceChain { -- /** -- * Enumerate trace flag -- * -- * @enum { number } -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- export enum HiTraceFlag { -- /** -- * Default value -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- DEFAULT = 0, -- -- /** -- * Trace sync and async call. default: trace sync call only. -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- INCLUDE_ASYNC = 1, -- -- /** -- * Do not create child span. default: create child span. -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- DONOT_CREATE_SPAN = 1 << 1, -- -- /** -- * Output tracepoint info in span. default: do not output tracepoint info. -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- TP_INFO = 1 << 2, -- -- /** -- * Do not output begin and end info. default: output begin and end info. -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- NO_BE_INFO = 1 << 3, -- -- /** -- * Do not add id to log. default: add id to log. -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- DISABLE_LOG = 1 << 4, -- -- /** -- * The trace is triggered by fault. -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- FAILURE_TRIGGER = 1 << 5, -- -- /** -- * Output device-to-device tracepoint info in span only. default: do not output device-to-device tracepoint info. -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- D2D_TP_INFO = 1 << 6 -- } -- -- /** -- * Enumerate trace point type -- * -- * @enum { number } -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- export enum HiTraceTracepointType { -- /** -- * Client send -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- CS = 0, -- -- /** -- * Client receive -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- CR = 1, -- -- /** -- * Server send -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- SS = 2, -- -- /** -- * Server receive -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- SR = 3, -- -- /** -- * General info -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- GENERAL = 4 -- } -- -- /** -- * Enumerate trace communication mode -- * -- * @enum { number } -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- export enum HiTraceCommunicationMode { -- /** -- * Unspecified -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- DEFAULT = 0, -- -- /** -- * Thread-to-thread -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- THREAD = 1, -- -- /** -- * Process-to-process -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- PROCESS = 2, -- -- /** -- * Device-to-device -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- DEVICE = 3 -- } -- -- /** -- * Trace id, for tracing process. -- * -- * @interface HiTraceId -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- export interface HiTraceId { -- /** -- * Chain id. -- * -- * @type { bigint } -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- chainId: bigint; -- -- /** -- * Span id. -- * -- * @type { ?number } -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- spanId?: number; -- -- /** -- * Parent span id. -- * -- * @type { ?number } -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- parentSpanId?: number; -- -- /** -- * Trace flag. -- * -- * @type { ?number } -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- flags?: number; -- } -- -- /** -- * Start tracing a process impl. -- * -- * @param { string } name Process name. -- * @param { number } flags Trace function flag. -- * @returns { HiTraceId } Valid if first call, otherwise invalid. -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- export function begin(name: string, flags?: number): HiTraceId; -- -- /** -- * Stop process tracing and clear trace id of current thread if the given trace -- * id is valid, otherwise do nothing. -- * -- * @param { HiTraceId } id The trace id that need to stop. -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- export function end(id: HiTraceId): void; -- -- /** -- * Get trace id of current thread, and return a invalid trace id if no -- * trace id belong to current thread -- * -- * @returns { HiTraceId } Valid if current thread have a trace id, otherwise invalid. -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- export function getId(): HiTraceId; -- -- /** -- * Set id as trace id of current thread. Do nothing if id is invalid. -- * -- * @param { HiTraceId } id Set id as trace id of current thread. -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- export function setId(id: HiTraceId): void; -- -- /** -- * Clear trace id of current thread and set it invalid. -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- export function clearId(): void; -- -- /** -- * Create a new span id according to the trace id of current thread. -- * -- * @returns { HiTraceId } A valid span trace id. Otherwise trace id of current thread if do not allow create span. -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- export function createSpan(): HiTraceId; -- -- /** -- * Print hitrace info, include trace id info. -- * -- * @param { HiTraceCommunicationMode } mode Trace communication mode. -- * @param { HiTraceTracepointType } type Trace info type. -- * @param { HiTraceId } id Trace id that need to print. -- * @param { string } msg Customized info that need to print. -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- export function tracepoint(mode: HiTraceCommunicationMode, -- type: HiTraceTracepointType, id: HiTraceId, msg?: string): void; -- -- /** -- * Judge whether the trace id is valid or not. -- * -- * @param { HiTraceId } id Trace id that need to judge. -- * @returns { boolean } True for a valid trace id, otherwise false. -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- export function isValid(id: HiTraceId): boolean; -- -- /** -- * Judge whether the trace id has enabled a trace flag or not. -- * -- * @param { HiTraceId } id Trace id that need to judge. -- * @param { HiTraceFlag } flag Trace flag that need to judge. -- * @returns { boolean } true if the trace id has enabled the flag. -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- export function isFlagEnabled(id: HiTraceId, flag: HiTraceFlag): boolean; -- -- /** -- * Enable the designative trace flag for the trace id. -- * -- * @param { HiTraceId } id Trace id that need to enable a flag. -- * @param { HiTraceFlag } flag the designative trace flag that need to be enabled in the trace id. -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- export function enableFlag(id: HiTraceId, flag: HiTraceFlag): void; --} -- --export default hiTraceChain; -diff --git a/api/@ohos.hiTraceChain.d.ts b/api/@ohos.hiTraceChain.d.ts -index 0e3c01da1..e10a356cd 100644 ---- a/api/@ohos.hiTraceChain.d.ts -+++ b/api/@ohos.hiTraceChain.d.ts -@@ -26,7 +26,8 @@ - * - * @namespace hiTraceChain - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace hiTraceChain { - /** -@@ -34,14 +35,16 @@ declare namespace hiTraceChain { - * - * @enum { number } - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum HiTraceFlag { - /** - * Default value - * - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DEFAULT = 0, - -@@ -49,7 +52,8 @@ declare namespace hiTraceChain { - * Trace sync and async call. default: trace sync call only. - * - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INCLUDE_ASYNC = 1, - -@@ -57,7 +61,8 @@ declare namespace hiTraceChain { - * Do not create child span. default: create child span. - * - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DONOT_CREATE_SPAN = 1 << 1, - -@@ -65,7 +70,8 @@ declare namespace hiTraceChain { - * Output tracepoint info in span. default: do not output tracepoint info. - * - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TP_INFO = 1 << 2, - -@@ -73,7 +79,8 @@ declare namespace hiTraceChain { - * Do not output begin and end info. default: output begin and end info. - * - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NO_BE_INFO = 1 << 3, - -@@ -81,7 +88,8 @@ declare namespace hiTraceChain { - * Do not add id to log. default: add id to log. - * - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DISABLE_LOG = 1 << 4, - -@@ -89,7 +97,8 @@ declare namespace hiTraceChain { - * The trace is triggered by fault. - * - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FAILURE_TRIGGER = 1 << 5, - -@@ -97,7 +106,8 @@ declare namespace hiTraceChain { - * Output device-to-device tracepoint info in span only. default: do not output device-to-device tracepoint info. - * - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - D2D_TP_INFO = 1 << 6 - } -@@ -107,14 +117,16 @@ declare namespace hiTraceChain { - * - * @enum { number } - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum HiTraceTracepointType { - /** - * Client send - * - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CS = 0, - -@@ -122,7 +134,8 @@ declare namespace hiTraceChain { - * Client receive - * - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CR = 1, - -@@ -130,7 +143,8 @@ declare namespace hiTraceChain { - * Server send - * - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SS = 2, - -@@ -138,7 +152,8 @@ declare namespace hiTraceChain { - * Server receive - * - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SR = 3, - -@@ -146,7 +161,8 @@ declare namespace hiTraceChain { - * General info - * - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - GENERAL = 4 - } -@@ -156,14 +172,16 @@ declare namespace hiTraceChain { - * - * @enum { number } - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum HiTraceCommunicationMode { - /** - * Unspecified - * - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DEFAULT = 0, - -@@ -171,7 +189,8 @@ declare namespace hiTraceChain { - * Thread-to-thread - * - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - THREAD = 1, - -@@ -179,7 +198,8 @@ declare namespace hiTraceChain { - * Process-to-process - * - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PROCESS = 2, - -@@ -187,7 +207,8 @@ declare namespace hiTraceChain { - * Device-to-device - * - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DEVICE = 3 - } -@@ -197,7 +218,8 @@ declare namespace hiTraceChain { - * - * @interface HiTraceId - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface HiTraceId { - /** -@@ -205,7 +227,8 @@ declare namespace hiTraceChain { - * - * @type { bigint } - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - chainId: bigint; - -@@ -214,7 +237,8 @@ declare namespace hiTraceChain { - * - * @type { ?number } - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - spanId?: number; - -@@ -223,7 +247,8 @@ declare namespace hiTraceChain { - * - * @type { ?number } - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - parentSpanId?: number; - -@@ -232,7 +257,8 @@ declare namespace hiTraceChain { - * - * @type { ?number } - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - flags?: number; - } -@@ -244,7 +270,8 @@ declare namespace hiTraceChain { - * @param { number } flags Trace function flag. - * @returns { HiTraceId } Valid if first call, otherwise invalid. - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function begin(name: string, flags?: number): HiTraceId; - -@@ -254,7 +281,8 @@ declare namespace hiTraceChain { - * - * @param { HiTraceId } id The trace id that need to stop. - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function end(id: HiTraceId): void; - -@@ -264,7 +292,8 @@ declare namespace hiTraceChain { - * - * @returns { HiTraceId } Valid if current thread have a trace id, otherwise invalid. - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getId(): HiTraceId; - -@@ -273,7 +302,8 @@ declare namespace hiTraceChain { - * - * @param { HiTraceId } id Set id as trace id of current thread. - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setId(id: HiTraceId): void; - -@@ -281,7 +311,8 @@ declare namespace hiTraceChain { - * Clear trace id of current thread and set it invalid. - * - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function clearId(): void; - -@@ -290,7 +321,8 @@ declare namespace hiTraceChain { - * - * @returns { HiTraceId } A valid span trace id. Otherwise trace id of current thread if do not allow create span. - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function createSpan(): HiTraceId; - -@@ -302,7 +334,8 @@ declare namespace hiTraceChain { - * @param { HiTraceId } id Trace id that need to print. - * @param { string } msg Customized info that need to print. - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function tracepoint(mode: HiTraceCommunicationMode, type: HiTraceTracepointType, id: HiTraceId, msg?: string): void; - -@@ -312,7 +345,8 @@ declare namespace hiTraceChain { - * @param { HiTraceId } id Trace id that need to judge. - * @returns { boolean } True for a valid trace id, otherwise false. - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isValid(id: HiTraceId): boolean; - -@@ -323,7 +357,8 @@ declare namespace hiTraceChain { - * @param { HiTraceFlag } flag Trace flag that need to judge. - * @returns { boolean } true if the trace id has enabled the flag. - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isFlagEnabled(id: HiTraceId, flag: HiTraceFlag): boolean; - -@@ -333,7 +368,8 @@ declare namespace hiTraceChain { - * @param { HiTraceId } id Trace id that need to enable a flag. - * @param { HiTraceFlag } flag the designative trace flag that need to be enabled in the trace id. - * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function enableFlag(id: HiTraceId, flag: HiTraceFlag): void; - } -diff --git a/api/@ohos.hiTraceMeter.d.ets b/api/@ohos.hiTraceMeter.d.ets -deleted file mode 100644 -index 86bab093e..000000000 ---- a/api/@ohos.hiTraceMeter.d.ets -+++ /dev/null -@@ -1,308 +0,0 @@ --/* -- * Copyright (C) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --/** -- * @file -- * @kit PerformanceAnalysisKit -- */ -- --/** -- * Provides interfaces to trace a task for performance measure, the logs can be capture by the -- * bytrace cmdline available on the device. -- * -- *

    This interfaces trace the start, end, and value changes of key processes that last for at least 3 ms. -- * -- *

    Example: -- * Track the beginning of a context: -- *

    {@code
    -- * hiTraceMeter.startTrace("checkName", 111);
    -- * }
    -- * Track the end of a context: -- *
    {@code
    -- * hiTraceMeter.finishTrace("checkName", 111);
    -- * }
    -- * To trace the number of layers, which is 3: -- *
    {@code
    -- * hiTraceMeter.traceByValue("curLayer", 3);
    -- * }
    -- * -- *

    Each {@code startTrace} matches one {@code finishTrace}, and they must have the same name -- * and taskId. -- * -- * @namespace hiTraceMeter -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ --/** -- * Provides interfaces to trace a task for performance measure, the logs can be capture by the -- * hitrace cmdline on the device. -- * -- *

    This interfaces trace the start, end, and value changes of key processes that last for at least 3 ms. -- * -- *

    Example: -- * Track the beginning of a context: -- *

    {@code
    -- * hiTraceMeter.startAsyncTrace(hiTraceMeter.HiTraceOutputLevel.COMMERCIAL, "checkName", 111, "test", "key=value");
    -- * }
    -- * Track the end of a context: -- *
    {@code
    -- * hiTraceMeter.finishAsyncTrace(hiTraceMeter.HiTraceOutputLevel.COMMERCIAL, "checkName", 111);
    -- * }
    -- * To trace the number of layers, which is 3: -- *
    {@code
    -- * hiTraceMeter.traceByValue(hiTraceMeter.HiTraceOutputLevel.COMMERCIAL, "curLayer", 3);
    -- * }
    -- * -- *

    Each {@code startTrace} matches one {@code finishTrace}, and they must have the same name -- * and taskId. -- * -- *

    Each {@code startSyncTrace} matches one {@code finishSyncTrace}, and they must have the same -- * level and name. -- * -- *

    Each {@code startAsyncTrace} matches one {@code finishAsyncTrace}, and they must have the same -- * level, name and taskId. -- * -- * @namespace hiTraceMeter -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @atomicservice -- * @since 19 -- */ --declare namespace hiTraceMeter { -- -- /** -- * Enumerates the HiTrace output levels. The output level threshold system parameter determines -- * the minimum output trace. -- * -- * @enum { number } -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @atomicservice -- * @since 19 -- */ -- export enum HiTraceOutputLevel { -- /** -- * Ouput level only for debug usage. -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @atomicservice -- * @since 19 -- */ -- DEBUG = 0, -- -- /** -- * Output level for log version usage. -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @atomicservice -- * @since 19 -- */ -- INFO = 1, -- -- /** -- * Output level for log version usage, with higher priority than INFO. -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @atomicservice -- * @since 19 -- */ -- CRITICAL = 2, -- -- /** -- * Output level for nolog version usage. -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @atomicservice -- * @since 19 -- */ -- COMMERCIAL = 3, -- -- /** -- * Output level range limit. -- * -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @atomicservice -- * @since 19 -- */ -- MAX = 3 -- } -- -- /** -- * Records a trace marking it as the start of a task, can with the expected completion time between -- * startTrace and finishTrace. -- * -- * This method is invoked at the start of a transaction to indicate that a task has started, whose name -- * is specified by {@code name}, and the taskId is used to distinguish the tasks. It must be followed by -- * {@link #finishTrace}, the name and taskId need to be the same. -- * -- * @param { string } name Indicates the task name. -- * @param { number } taskId The unique id used to distinguish the tasks and match with the id in follow finishTrace. -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- /** -- * Records a trace marking it as the start of a task, can with the expected completion time between -- * startTrace and finishTrace. -- * -- * This method is invoked at the start of a transaction to indicate that a task has started, whose name -- * is specified by {@code name}, and the taskId is used to distinguish the tasks. It must be followed by -- * {@link #finishTrace}, the name and taskId need to be the same. -- * -- * @param { string } name Indicates the task name. -- * @param { number } taskId The unique id used to distinguish the tasks and match with the id in follow finishTrace. -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @atomicservice -- * @since 19 -- */ -- export function startTrace(name: string, taskId: number): void; -- -- /** -- * Records a trace and marks it as the end of a task. -- * -- * This method is invoked at the end of a transaction to indicate that a task has ended, whose name -- * is specified by {@code name}. This method must be invoked after the the startTrace. -- * -- * @param { string } name Indicates the task name. It must be the same with the {@code name} of startTrace. -- * @param { number } taskId The unique id used to distinguish the tasks and must be the same with the . -- * {@code taskId} of startTrace. -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- /** -- * Records a trace and marks it as the end of a task. -- * -- * This method is invoked at the end of a transaction to indicate that a task has ended, whose name -- * is specified by {@code name}. This method must be invoked after {@link #startTrace}. -- * -- * @param { string } name Indicates the task name. It must be the same with the {@code name} of startTrace. -- * @param { number } taskId The unique id used to distinguish the tasks and must be the same with the -- * {@code taskId} of startTrace. -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @atomicservice -- * @since 19 -- */ -- export function finishTrace(name: string, taskId: number): void; -- -- /** -- * Records a trace for generating a count, such as clock pulse and the number of layers. -- * -- * @param { string } name Indicates the name used to identify the count. -- * @param { number } count Indicates the number of the count. -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @since 8 -- */ -- /** -- * Records a trace for generating a count, such as clock pulse and the number of layers. -- * -- * @param { string } name Indicates the name used to identify the count. -- * @param { number } count Indicates the number of the count. -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @atomicservice -- * @since 19 -- */ -- export function traceByValue(name: string, count: number): void; -- -- /** -- * Records a trace marking it as the start of a task. -- * -- * This method is invoked at the start of a transaction to indicate that a task has started, whose name -- * is specified by {@code name}, and the taskId is used to distinguish the tasks. It must be followed by -- * {@link #finishSyncTrace}, called by the same thread with the same level. -- * -- * @param { HiTraceOutputLevel } level Indicates trace output priority level. -- * @param { string } name Indicates the task name. -- * @param { string } customArgs Indicates key=value pair to be output in trace; multiple pairs should use comma -- * as separator. -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @atomicservice -- * @since 19 -- */ -- export function startSyncTrace(level: HiTraceOutputLevel, name: string, customArgs?: string): void; -- -- /** -- * Records a trace and marks it as the end of a task. -- * -- * This method is invoked at the end of a transaction to indicate that the nearest running task tracked by -- * startSyncTrace that has yet to be marked by finishSyncTrace, has ended. -- * This method must be invoked after {@link #startSyncTrace}, called by the same thread with the same level. -- * -- * @param { HiTraceOutputLevel } level Indicates trace output priority level. -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @atomicservice -- * @since 19 -- */ -- export function finishSyncTrace(level: HiTraceOutputLevel): void; -- -- /** -- * Records a trace marking it as the start of a task. -- * -- * This method is invoked at the start of a transaction to indicate that a task has started, whose name -- * is specified by {@code name}, and the taskId is used to distinguish the tasks. It must be followed by a -- * corresponding {@link #finishAsyncTrace}, with the same level, name, and taskId. -- * -- * @param { HiTraceOutputLevel } level Indicates trace output priority level. -- * @param { string } name Indicates the task name. -- * @param { number } taskId The unique id used to distinguish the task and match with the id of the -- * corresponding finishAsyncTrace. -- * @param { string } customCategory Indicates the label to aggregate asynchronous task display. -- * @param { string } customArgs Indicates key=value pair to be output in trace; multiple pairs should use comma -- * as Separator. -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @atomicservice -- * @since 19 -- */ -- export function startAsyncTrace(level: HiTraceOutputLevel, name: string, taskId: number, customCategory: string, -- customArgs?: string): void; -- -- /** -- * Records a trace and marks it as the end of a task. -- * -- * This method is invoked at the end of a transaction to indicate that a task has ended, whose name is specified -- * by {@code name}. This method must be invoked after {@link #startAsyncTrace}, with the same level, name, -- * and taskId. It is not required to be invoked by the same thread calling startAsyncTrace. -- * -- * @param { HiTraceOutputLevel } level Indicates trace output priority level. -- * @param { string } name Indicates the task name. -- * @param { number } taskId The unique id used to distinguish the task and match with the id of the corresponding -- * startAsyncTrace. -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @atomicservice -- * @since 19 -- */ -- export function finishAsyncTrace(level: HiTraceOutputLevel, name: string, taskId: number): void; -- -- /** -- * Records a trace for generating a count, such as clock pulse and the number of layers. -- * -- * @param { HiTraceOutputLevel } level Indicates trace output priority level. -- * @param { string } name Indicates the name used to identify the count. -- * @param { number } count Indicates the number of the count. -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @atomicservice -- * @since 19 -- */ -- export function traceByValue(level: HiTraceOutputLevel, name: string, count: number): void; -- -- /** -- * Return whether the current process is allowed to output trace. -- * -- * @returns { boolean } The status of whether the current process is allowed to output trace. -- * @syscap SystemCapability.HiviewDFX.HiTrace -- * @atomicservice -- * @since 19 -- */ -- export function isTraceEnabled(): boolean; -- --} -- --export default hiTraceMeter; -\ No newline at end of file -diff --git a/api/@ohos.hiTraceMeter.d.ts b/api/@ohos.hiTraceMeter.d.ts -index a203466d0..6b1a88c15 100644 ---- a/api/@ohos.hiTraceMeter.d.ts -+++ b/api/@ohos.hiTraceMeter.d.ts -@@ -47,41 +47,95 @@ - */ - /** - * Provides interfaces to trace a task for performance measure, the logs can be capture by the -- * bytrace cmdline available on the device. -+ * hitrace cmdline on the device. - * - *

    This interfaces trace the start, end, and value changes of key processes that last for at least 3 ms. - * - *

    Example: - * Track the beginning of a context: - *

    {@code
    -- * hiTraceMeter.startTrace("checkName", 111);
    -+ * hiTraceMeter.startAsyncTrace(hiTraceMeter.HiTraceOutputLevel.COMMERCIAL, "checkName", 111, "test", "key=value");
    -  * }
    - * Track the end of a context: - *
    {@code
    -- * hiTraceMeter.finishTrace("checkName", 111);
    -+ * hiTraceMeter.finishAsyncTrace(hiTraceMeter.HiTraceOutputLevel.COMMERCIAL, "checkName", 111);
    -  * }
    - * To trace the number of layers, which is 3: - *
    {@code
    -- * hiTraceMeter.traceByValue("curLayer", 3);
    -+ * hiTraceMeter.traceByValue(hiTraceMeter.HiTraceOutputLevel.COMMERCIAL, "curLayer", 3);
    -+ * }
    -+ * -+ *

    Each {@code startTrace} matches one {@code finishTrace}, and they must have the same name -+ * and taskId. -+ * -+ *

    Each {@code startSyncTrace} matches one {@code finishSyncTrace}, and they must have the same -+ * level and name. -+ * -+ *

    Each {@code startAsyncTrace} matches one {@code finishAsyncTrace}, and they must have the same -+ * level, name and taskId. -+ * -+ * @namespace hiTraceMeter -+ * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @atomicservice -+ * @since 19 -+ */ -+/** -+ * Provides interfaces to trace a task for performance measure, the logs can be capture by the -+ * hitrace cmdline on the device. -+ * -+ *

    This interfaces trace the start, end, and value changes of key processes that last for at least 3 ms. -+ * -+ *

    Example: -+ * Track the beginning of a context: -+ *

    {@code
    -+ * hiTraceMeter.startAsyncTrace(hiTraceMeter.HiTraceOutputLevel.COMMERCIAL, "checkName", 111, "test", "key=value");
    -+ * }
    -+ * Track the end of a context: -+ *
    {@code
    -+ * hiTraceMeter.finishAsyncTrace(hiTraceMeter.HiTraceOutputLevel.COMMERCIAL, "checkName", 111);
    -+ * }
    -+ * To trace the number of layers, which is 3: -+ *
    {@code
    -+ * hiTraceMeter.traceByValue(hiTraceMeter.HiTraceOutputLevel.COMMERCIAL, "curLayer", 3);
    -  * }
    - * - *

    Each {@code startTrace} matches one {@code finishTrace}, and they must have the same name - * and taskId. - * -+ *

    Each {@code startSyncTrace} matches one {@code finishSyncTrace}, and they must have the same -+ * level and name. -+ * -+ *

    Each {@code startAsyncTrace} matches one {@code finishAsyncTrace}, and they must have the same -+ * level, name and taskId. -+ * - * @namespace hiTraceMeter - * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @crossplatform - * @atomicservice -- * @since 18 -+ * @since 20 -+ * @arkts 1.1&1.2 - */ - declare namespace hiTraceMeter { - - /** -- * Enumerates the HiTrace output levels. The output level threshold system parameter determines the minimum output trace. -+ * Enumerates the HiTrace output levels. The output level threshold system parameter determines -+ * the minimum output trace. -+ * -+ * @enum { number } -+ * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @atomicservice -+ * @since 19 -+ */ -+ /** -+ * Enumerates the HiTrace output levels. The output level threshold system parameter determines -+ * the minimum output trace. - * - * @enum { number } - * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @crossplatform - * @atomicservice -- * @since 18 -+ * @since 20 -+ * @arkts 1.1&1.2 - */ - enum HiTraceOutputLevel { - /** -@@ -89,34 +143,70 @@ declare namespace hiTraceMeter { - * - * @syscap SystemCapability.HiviewDFX.HiTrace - * @atomicservice -- * @since 18 -+ * @since 19 -+ */ -+ /** -+ * Ouput level only for debug usage. -+ * -+ * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.1&1.2 - */ - DEBUG = 0, - - /** -- * Output level for beta version usage. -+ * Output level for log version usage. -+ * -+ * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @atomicservice -+ * @since 19 -+ */ -+ /** -+ * Output level for log version usage. - * - * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @crossplatform - * @atomicservice -- * @since 18 -+ * @since 20 -+ * @arkts 1.1&1.2 - */ - INFO = 1, - - /** -- * Output level for beta version usage, with higher priority than INFO. -+ * Output level for log version usage, with higher priority than INFO. -+ * -+ * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @atomicservice -+ * @since 19 -+ */ -+ /** -+ * Output level for log version usage, with higher priority than INFO. - * - * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @crossplatform - * @atomicservice -- * @since 18 -+ * @since 20 -+ * @arkts 1.1&1.2 - */ - CRITICAL = 2, - - /** -- * Output level for commercial version usage. -+ * Output level for nolog version usage. -+ * -+ * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @atomicservice -+ * @since 19 -+ */ -+ /** -+ * Output level for nolog version usage. - * - * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @crossplatform - * @atomicservice -- * @since 18 -+ * @since 20 -+ * @arkts 1.1&1.2 - */ - COMMERCIAL = 3, - -@@ -125,7 +215,16 @@ declare namespace hiTraceMeter { - * - * @syscap SystemCapability.HiviewDFX.HiTrace - * @atomicservice -- * @since 18 -+ * @since 19 -+ */ -+ /** -+ * Output level range limit. -+ * -+ * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.1&1.2 - */ - MAX = COMMERCIAL - } -@@ -155,7 +254,23 @@ declare namespace hiTraceMeter { - * @param { number } taskId The unique id used to distinguish the tasks and match with the id in follow finishTrace. - * @syscap SystemCapability.HiviewDFX.HiTrace - * @atomicservice -- * @since 18 -+ * @since 19 -+ */ -+ /** -+ * Records a trace marking it as the start of a task, can with the expected completion time between -+ * startTrace and finishTrace. -+ * -+ * This method is invoked at the start of a transaction to indicate that a task has started, whose name -+ * is specified by {@code name}, and the taskId is used to distinguish the tasks. It must be followed by -+ * {@link #finishTrace}, the name and taskId need to be the same. -+ * -+ * @param { string } name Indicates the task name. -+ * @param { number } taskId The unique id used to distinguish the tasks and match with the id in follow finishTrace. -+ * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.1&1.2 - */ - function startTrace(name: string, taskId: number): void; - -@@ -175,14 +290,29 @@ declare namespace hiTraceMeter { - * Records a trace and marks it as the end of a task. - * - * This method is invoked at the end of a transaction to indicate that a task has ended, whose name -- * is specified by {@code name}. This method must be invoked after the the startTrace. -+ * is specified by {@code name}. This method must be invoked after {@link #startTrace}. - * - * @param { string } name Indicates the task name. It must be the same with the {@code name} of startTrace. -- * @param { number } taskId The unique id used to distinguish the tasks and must be the same with the . -+ * @param { number } taskId The unique id used to distinguish the tasks and must be the same with the - * {@code taskId} of startTrace. - * @syscap SystemCapability.HiviewDFX.HiTrace - * @atomicservice -- * @since 18 -+ * @since 19 -+ */ -+ /** -+ * Records a trace and marks it as the end of a task. -+ * -+ * This method is invoked at the end of a transaction to indicate that a task has ended, whose name -+ * is specified by {@code name}. This method must be invoked after {@link #startTrace}. -+ * -+ * @param { string } name Indicates the task name. It must be the same with the {@code name} of startTrace. -+ * @param { number } taskId The unique id used to distinguish the tasks and must be the same with the -+ * {@code taskId} of startTrace. -+ * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.1&1.2 - */ - function finishTrace(name: string, taskId: number): void; - -@@ -201,7 +331,18 @@ declare namespace hiTraceMeter { - * @param { number } count Indicates the number of the count. - * @syscap SystemCapability.HiviewDFX.HiTrace - * @atomicservice -- * @since 18 -+ * @since 19 -+ */ -+ /** -+ * Records a trace for generating a count, such as clock pulse and the number of layers. -+ * -+ * @param { string } name Indicates the name used to identify the count. -+ * @param { number } count Indicates the number of the count. -+ * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.1&1.2 - */ - function traceByValue(name: string, count: number): void; - -@@ -214,11 +355,28 @@ declare namespace hiTraceMeter { - * - * @param { HiTraceOutputLevel } level Indicates trace output priority level. - * @param { string } name Indicates the task name. -- * @param { string } customArgs Indicates key=value pair to be outputed in trace; multiple pairs should use comma -- * as seperator. -+ * @param { string } [customArgs] Indicates key=value pair to be output in trace; multiple pairs should use comma -+ * as separator. -+ * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @atomicservice -+ * @since 19 -+ */ -+ /** -+ * Records a trace marking it as the start of a task. -+ * -+ * This method is invoked at the start of a transaction to indicate that a task has started, whose name -+ * is specified by {@code name}, and the taskId is used to distinguish the tasks. It must be followed by -+ * {@link #finishSyncTrace}, called by the same thread with the same level. -+ * -+ * @param { HiTraceOutputLevel } level Indicates trace output priority level. -+ * @param { string } name Indicates the task name. -+ * @param { string } [customArgs] Indicates key=value pair to be output in trace; multiple pairs should use comma -+ * as separator. - * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @crossplatform - * @atomicservice -- * @since 18 -+ * @since 20 -+ * @arkts 1.1&1.2 - */ - function startSyncTrace(level: HiTraceOutputLevel, name: string, customArgs?: string): void; - -@@ -227,12 +385,26 @@ declare namespace hiTraceMeter { - * - * This method is invoked at the end of a transaction to indicate that the nearest running task tracked by - * startSyncTrace that has yet to be marked by finishSyncTrace, has ended. -- * This method must be invoked after the the {@link #startSyncTrace}, by the same thread. -+ * This method must be invoked after {@link #startSyncTrace}, called by the same thread with the same level. -+ * -+ * @param { HiTraceOutputLevel } level Indicates trace output priority level. -+ * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @atomicservice -+ * @since 19 -+ */ -+ /** -+ * Records a trace and marks it as the end of a task. -+ * -+ * This method is invoked at the end of a transaction to indicate that the nearest running task tracked by -+ * startSyncTrace that has yet to be marked by finishSyncTrace, has ended. -+ * This method must be invoked after {@link #startSyncTrace}, called by the same thread with the same level. - * - * @param { HiTraceOutputLevel } level Indicates trace output priority level. - * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @crossplatform - * @atomicservice -- * @since 18 -+ * @since 20 -+ * @arkts 1.1&1.2 - */ - function finishSyncTrace(level: HiTraceOutputLevel): void; - -@@ -245,28 +417,69 @@ declare namespace hiTraceMeter { - * - * @param { HiTraceOutputLevel } level Indicates trace output priority level. - * @param { string } name Indicates the task name. -- * @param { number } taskId The unique id used to distinguish the task and match with the id of the corresponding finishAsyncTrace. -+ * @param { number } taskId The unique id used to distinguish the task and match with the id of the -+ * corresponding finishAsyncTrace. - * @param { string } customCategory Indicates the label to aggregate asynchronous task display. -- * @param { string } customArgs Indicates key=value pair to be outputed in trace; multiple pairs should use comma as seperator. -+ * @param { string } [customArgs] Indicates key=value pair to be output in trace; multiple pairs should use comma -+ * as Separator. - * @syscap SystemCapability.HiviewDFX.HiTrace - * @atomicservice -- * @since 18 -+ * @since 19 - */ -- function startAsyncTrace(level: HiTraceOutputLevel, name: string, taskId: number, customCategory: string, customArgs?: string): void; -+ /** -+ * Records a trace marking it as the start of a task. -+ * -+ * This method is invoked at the start of a transaction to indicate that a task has started, whose name -+ * is specified by {@code name}, and the taskId is used to distinguish the tasks. It must be followed by a -+ * corresponding {@link #finishAsyncTrace}, with the same level, name, and taskId. -+ * -+ * @param { HiTraceOutputLevel } level Indicates trace output priority level. -+ * @param { string } name Indicates the task name. -+ * @param { number } taskId The unique id used to distinguish the task and match with the id of the -+ * corresponding finishAsyncTrace. -+ * @param { string } customCategory Indicates the label to aggregate asynchronous task display. -+ * @param { string } [customArgs] Indicates key=value pair to be output in trace; multiple pairs should use comma -+ * as Separator. -+ * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.1&1.2 -+ */ -+ function startAsyncTrace(level: HiTraceOutputLevel, name: string, taskId: number, customCategory: string, -+ customArgs?: string): void; - - /** - * Records a trace and marks it as the end of a task. - * - * This method is invoked at the end of a transaction to indicate that a task has ended, whose name is specified -- * by {@code name}. This method must be invoked after the the {@link #startAsyncTrace}, with the same level, name, and taskId. -- * It is not required to be invoked by the same thread calling startAsyncTrace. -+ * by {@code name}. This method must be invoked after {@link #startAsyncTrace}, with the same level, name, -+ * and taskId. It is not required to be invoked by the same thread calling startAsyncTrace. - * - * @param { HiTraceOutputLevel } level Indicates trace output priority level. - * @param { string } name Indicates the task name. -- * @param { number } taskId The unique id used to distinguish the task and match with the id of the corresponding startAsyncTrace. -+ * @param { number } taskId The unique id used to distinguish the task and match with the id of the corresponding -+ * startAsyncTrace. - * @syscap SystemCapability.HiviewDFX.HiTrace - * @atomicservice -- * @since 18 -+ * @since 19 -+ */ -+ /** -+ * Records a trace and marks it as the end of a task. -+ * -+ * This method is invoked at the end of a transaction to indicate that a task has ended, whose name is specified -+ * by {@code name}. This method must be invoked after {@link #startAsyncTrace}, with the same level, name, -+ * and taskId. It is not required to be invoked by the same thread calling startAsyncTrace. -+ * -+ * @param { HiTraceOutputLevel } level Indicates trace output priority level. -+ * @param { string } name Indicates the task name. -+ * @param { number } taskId The unique id used to distinguish the task and match with the id of the corresponding -+ * startAsyncTrace. -+ * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.1&1.2 - */ - function finishAsyncTrace(level: HiTraceOutputLevel, name: string, taskId: number): void; - -@@ -278,7 +491,19 @@ declare namespace hiTraceMeter { - * @param { number } count Indicates the number of the count. - * @syscap SystemCapability.HiviewDFX.HiTrace - * @atomicservice -- * @since 18 -+ * @since 19 -+ */ -+ /** -+ * Records a trace for generating a count, such as clock pulse and the number of layers. -+ * -+ * @param { HiTraceOutputLevel } level Indicates trace output priority level. -+ * @param { string } name Indicates the name used to identify the count. -+ * @param { number } count Indicates the number of the count. -+ * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.1&1.2 - */ - function traceByValue(level: HiTraceOutputLevel, name: string, count: number): void; - -@@ -288,10 +513,19 @@ declare namespace hiTraceMeter { - * @returns { boolean } The status of whether the current process is allowed to output trace. - * @syscap SystemCapability.HiviewDFX.HiTrace - * @atomicservice -- * @since 18 -+ * @since 19 -+ */ -+ /** -+ * Return whether the current process is allowed to output trace. -+ * -+ * @returns { boolean } The status of whether the current process is allowed to output trace. -+ * @syscap SystemCapability.HiviewDFX.HiTrace -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.1&1.2 - */ - function isTraceEnabled(): boolean; -- - } - - export default hiTraceMeter; -diff --git a/api/@ohos.hichecker.d.ets b/api/@ohos.hichecker.d.ets -deleted file mode 100644 -index cd96d7e8c..000000000 ---- a/api/@ohos.hichecker.d.ets -+++ /dev/null -@@ -1,157 +0,0 @@ --/* -- * Copyright (c) 2022 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --/** -- * @file -- * @kit PerformanceAnalysisKit -- */ -- --/** -- * This module provides the capability to check bad code usage. -- * -- * @namespace hichecker -- * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 8 -- */ --declare namespace hichecker { -- /** -- * The caution rule print log. -- * -- * @constant -- * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 8 -- */ -- const RULE_CAUTION_PRINT_LOG: bigint = 9223372036854775808n; // 1 << 63 -- -- /** -- * The caution rule trigger crash. -- * -- * @constant -- * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 8 -- */ -- const RULE_CAUTION_TRIGGER_CRASH: bigint = 4611686018427387904n; // 1 << 62 -- -- /** -- * The thread rule check slow process. -- * -- * @constant -- * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 8 -- */ -- const RULE_THREAD_CHECK_SLOW_PROCESS: bigint = 1n; -- -- /** -- * The process rule check slow event. -- * -- * @constant -- * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 20 -- */ -- const RULE_CHECK_SLOW_EVENT: bigint = 4294967296n; // 1 << 32 -- -- /** -- * The process rule check ability connection leak. -- * -- * @constant -- * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 8 -- */ -- const RULE_CHECK_ABILITY_CONNECTION_LEAK: bigint = 8589934592n; // 1 << 33 -- -- /** -- * The process rule check ability Arkui performance -- * -- * @constant -- * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 11 -- */ -- const RULE_CHECK_ARKUI_PERFORMANCE: bigint = 17179869184n; // 1 << 34 -- -- /** -- * add one or more rule. -- * -- * @param { bigint } rule -- * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 8 -- * @deprecated since 9 -- * @useinstead ohos.hichecker/hichecker#addCheckRule -- */ -- function addRule(rule: bigint): void; -- -- /** -- * remove one or more rule. -- * -- * @param { bigint } rule -- * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 8 -- * @deprecated since 9 -- * @useinstead ohos.hichecker/hichecker#removeCheckRule -- */ -- function removeRule(rule: bigint): void; -- -- /** -- * get added rule -- * -- * @returns { bigint } all added thread rule and process rule. -- * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 8 -- */ -- function getRule(): bigint; -- -- /** -- * whether the query rule is added -- * -- * @param { bigint } rule -- * @returns { boolean } the result of whether the query rule is added. -- * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 8 -- * @deprecated since 9 -- * @useinstead ohos.hichecker/hichecker#containsCheckRule -- */ -- function contains(rule: bigint): boolean; -- -- /** -- * Add one or more rule. -- * -- * @param { bigint } rule -- * @throws { BusinessError } 401 - the parameter check failed, only one bigint type parameter is needed -- * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 9 -- */ -- function addCheckRule(rule: bigint): void; -- -- /** -- * Remove one or more rule. -- * -- * @param { bigint } rule -- * @throws { BusinessError } 401 - the parameter check failed, only one bigint type parameter is needed -- * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 9 -- */ -- function removeCheckRule(rule: bigint): void; -- -- /** -- * Whether the query rule is added -- * -- * @param { bigint } rule -- * @returns { boolean } the result of whether the query rule is added. -- * @throws { BusinessError } 401 - the parameter check failed, only one bigint type parameter is needed -- * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 9 -- */ -- function containsCheckRule(rule: bigint): boolean; --} --export default hichecker; -diff --git a/api/@ohos.hichecker.d.ts b/api/@ohos.hichecker.d.ts -index 22e2a89fd..ca1a68ee5 100644 ---- a/api/@ohos.hichecker.d.ts -+++ b/api/@ohos.hichecker.d.ts -@@ -23,7 +23,8 @@ - * - * @namespace hichecker - * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace hichecker { - /** -@@ -31,45 +32,50 @@ declare namespace hichecker { - * - * @constant - * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- const RULE_CAUTION_PRINT_LOG: 9223372036854775808n; // 1 << 63 -+ const RULE_CAUTION_PRINT_LOG = 9223372036854775808n; // 1 << 63 - - /** - * The caution rule trigger crash. - * - * @constant - * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- const RULE_CAUTION_TRIGGER_CRASH: 4611686018427387904n; // 1 << 62 -+ const RULE_CAUTION_TRIGGER_CRASH = 4611686018427387904n; // 1 << 62 - - /** - * The thread rule check slow process. - * - * @constant - * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- const RULE_THREAD_CHECK_SLOW_PROCESS: 1n; -+ const RULE_THREAD_CHECK_SLOW_PROCESS = 1n; - - /** - * The process rule check ability connection leak. - * - * @constant - * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- const RULE_CHECK_ABILITY_CONNECTION_LEAK: 8589934592n; // 1 << 33 -+ const RULE_CHECK_ABILITY_CONNECTION_LEAK = 8589934592n; // 1 << 33 - - /** - * The process rule check ability Arkui performance - * - * @constant - * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- const RULE_CHECK_ARKUI_PERFORMANCE: 17179869184n; // 1 << 34 -+ const RULE_CHECK_ARKUI_PERFORMANCE = 17179869184n; // 1 << 34 - - /** - * add one or more rule. -@@ -98,7 +104,8 @@ declare namespace hichecker { - * - * @returns { bigint } all added thread rule and process rule. - * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getRule(): bigint; - -@@ -120,7 +127,8 @@ declare namespace hichecker { - * @param { bigint } rule - * @throws { BusinessError } 401 - the parameter check failed, only one bigint type parameter is needed - * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function addCheckRule(rule: bigint): void; - -@@ -130,7 +138,8 @@ declare namespace hichecker { - * @param { bigint } rule - * @throws { BusinessError } 401 - the parameter check failed, only one bigint type parameter is needed - * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function removeCheckRule(rule: bigint): void; - -@@ -141,7 +150,8 @@ declare namespace hichecker { - * @returns { boolean } the result of whether the query rule is added. - * @throws { BusinessError } 401 - the parameter check failed, only one bigint type parameter is needed - * @syscap SystemCapability.HiviewDFX.HiChecker -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function containsCheckRule(rule: bigint): boolean; - } -diff --git a/api/@ohos.hidebug.d.ets b/api/@ohos.hidebug.d.ets -deleted file mode 100644 -index 543c7ded1..000000000 ---- a/api/@ohos.hidebug.d.ets -+++ /dev/null -@@ -1,601 +0,0 @@ --/* --* Copyright (C) 2025 Huawei Device Co., Ltd. --* Licensed under the Apache License, Version 2.0 (the "License"); --* you may not use this file except in compliance with the License. --* You may obtain a copy of the License at --* --* http://www.apache.org/licenses/LICENSE-2.0 --* --* Unless required by applicable law or agreed to in writing, software --* distributed under the License is distributed on an "AS IS" BASIS, --* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --* See the License for the specific language governing permissions and --* limitations under the License. --*/ -- --/** -- * @file -- * @kit PerformanceAnalysisKit -- */ -- --/** -- * Provide interfaces related to debugger access and obtaining CPU, -- * memory and other virtual machine information during runtime for JS programs -- * -- * @namespace hidebug -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- --/** -- * Provide interfaces related to debugger access and obtaining CPU, -- * memory and other virtual machine information during runtime for JS programs -- * -- * @namespace hidebug -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @atomicservice -- * @since 20 -- */ -- --declare namespace hidebug { -- /** -- * Get total native heap memory size -- * -- * @returns { bigint } Returns total native heap memory size. -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- export function getNativeHeapSize(): bigint; -- -- /** -- * Get Native heap memory allocation size. -- * @returns { bigint } Returns native heap memory allocation size. -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- export function getNativeHeapAllocatedSize(): bigint; -- -- /** -- * Get Native heap memory free size -- * -- * @returns { bigint } Returns native heap memory free size. -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- export function getNativeHeapFreeSize(): bigint; -- -- /** -- * Get the virtual set size memory of the application process -- * -- * @returns { bigint } Returns application process virtual set size memory information. -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- export function getVss(): bigint; -- -- /** -- * Get application process proportional set size memory information -- * -- * @returns { bigint } Returns application process proportional set size memory information. -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- export function getPss(): bigint; -- -- /** -- * Obtains the size of the shared dirty memory of a process. -- * -- * @returns { bigint } Returns the size of the shared dirty memory. -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- export function getSharedDirty(): bigint; -- -- /** -- * Obtains the size of the private dirty memory of a process. -- * @returns { bigint } Returns the size of the private dirty memory. -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- export function getPrivateDirty(): bigint; -- -- /** -- * Obtains the cpu usage percent of a process. -- * -- * @returns { number } Returns the cpu usage of a process. -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- export function getCpuUsage(): number; -- -- /** -- * Get a debugging dump of a system service by service id. -- * It need dump permission. -- * This API can be called only by system application. -- * -- * @permission ohos.permission.DUMP -- * @param { number } serviceid - Indicates the id of the service ability. -- * @param { number } fd - The file descriptor. -- * @param { Array } args - The args list of the system ability dump interface. -- * @throws {BusinessError} 401 - the parameter check failed, Possible causes: -- * 1.the parameter type error -- * 2.the args parameter is not string array -- * @throws {BusinessError} 11400101 - ServiceId invalid. The system ability does not exist. -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- export function getServiceDump(serviceid: number, fd: number, args: Array): void; -- -- /** -- * Obtains the cpu usage of system. -- * -- * @returns { number } Returns the cpu usage of system. -- * @throws { BusinessError } 11400104 - The status of the system CPU usage is abnormal. -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- export function getSystemCpuUsage(): number; -- -- /** -- * Application CPU usage of thread. -- * -- * @interface ThreadCpuUsage -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- export interface ThreadCpuUsage { -- /** -- * Thread id -- * -- * @type { number } -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -- */ -- threadId: number; -- /** -- * Cpu usage of thread -- * -- * @type { number } -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -- */ -- cpuUsage: number; -- } -- -- /** -- * Get the CPU usage of all threads in the application. -- * -- * @returns { ThreadCpuUsage[] } Returns the CPU usage of all threads in the application. -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- export function getAppThreadCpuUsage(): ThreadCpuUsage[]; -- -- /** -- * System memory information -- * -- * @interface SystemMemInfo -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- export interface SystemMemInfo { -- /** -- * Total system memory size, in kilobyte -- * -- * @type { bigint } -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- totalMem: bigint; -- /** -- * System free memory size, in kilobyte -- * -- * @type { bigint } -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- freeMem: bigint; -- /** -- * System available memory size, in kilobyte -- * -- * @type { bigint } -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- availableMem: bigint; -- } -- -- /** -- * Obtains the system memory size. -- * -- * @returns { SystemMemInfo } Returns system memory size. -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- export function getSystemMemInfo(): SystemMemInfo; -- -- /** -- * Application process native memory information. -- * -- * @interface NativeMemInfo -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- export interface NativeMemInfo { -- /** -- * Process proportional set size memory, in kilobyte -- * -- * @type { bigint } -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- pss: bigint; -- /** -- * Virtual set size memory, in kilobyte -- * -- * @type { bigint } -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- vss: bigint; -- /** -- * Resident set size, in kilobyte -- * -- * @type { bigint } -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- rss: bigint; -- /** -- * The size of the shared dirty memory, in kilobyte -- * -- * @type { bigint } -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- sharedDirty: bigint; -- /** -- * The size of the private dirty memory, in kilobyte -- * -- * @type { bigint } -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- privateDirty: bigint; -- /** -- * The size of the shared clean memory, in kilobyte -- * -- * @type { bigint } -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- sharedClean: bigint; -- /** -- * The size of the private clean memory, in kilobyte -- * -- * @type { bigint } -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- privateClean: bigint; -- } -- -- /** -- * Obtains the memory information of application process. -- * -- * @returns { NativeMemInfo } Returns the native memory of a process. -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- export function getAppNativeMemInfo(): NativeMemInfo; -- -- /** -- * Enum for trace flag -- * -- * @enum { number } -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- export enum TraceFlag { -- /** -- * Only capture main thread trace -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- MAIN_THREAD = 1, -- /** -- * Capture all thread trace -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- ALL_THREADS = 2 -- } -- -- /** -- * Provide trace tags -- * -- * @namespace tags -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- export namespace tags { -- /** -- * Ability Manager tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const ABILITY_MANAGER: number; -- /** -- * ARKUI development framework tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const ARKUI: number; -- /** -- * ARK tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const ARK: number; -- /** -- * Bluetooth tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const BLUETOOTH: number; -- /** -- * Common library subsystem tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const COMMON_LIBRARY: number; -- /** -- * Distributed hardware device manager tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const DISTRIBUTED_HARDWARE_DEVICE_MANAGER: number; -- /** -- * Distributed audio tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const DISTRIBUTED_AUDIO: number; -- /** -- * Distributed camera tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const DISTRIBUTED_CAMERA: number; -- /** -- * Distributed data manager module tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const DISTRIBUTED_DATA: number; -- /** -- * Distributed hardware framework tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const DISTRIBUTED_HARDWARE_FRAMEWORK: number; -- /** -- * Distributed input tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const DISTRIBUTED_INPUT: number; -- /** -- * Distributed screen tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const DISTRIBUTED_SCREEN: number; -- /** -- * Distributed scheduler tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const DISTRIBUTED_SCHEDULER: number; -- /** -- * FFRT tasks. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const FFRT: number; -- /** -- * File management tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const FILE_MANAGEMENT: number; -- /** -- * Global resource manager tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const GLOBAL_RESOURCE_MANAGER: number; -- /** -- * Graphics module tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const GRAPHICS: number; -- /** -- * HDF subsystem tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const HDF: number; -- /** -- * MISC module tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const MISC: number; -- /** -- * Multimodal input module tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const MULTIMODAL_INPUT: number; -- /** -- * Net tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const NET: number; -- /** -- * Notification module tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const NOTIFICATION: number; -- /** -- * NWeb tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const NWEB: number; -- /** -- * OHOS generic tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const OHOS: number; -- /** -- * Power manager tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const POWER_MANAGER: number; -- /** -- * RPC tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const RPC: number; -- /** -- * SA tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const SAMGR: number; -- /** -- * Window manager tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const WINDOW_MANAGER: number; -- /** -- * Audio module tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const AUDIO: number; -- /** -- * Camera module tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const CAMERA: number; -- /** -- * Image module tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const IMAGE: number; -- /** -- * Media module tag. -- * -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- const MEDIA: number; -- } -- -- /** -- * Start capture application trace. -- * -- * @param { number[] } tags - Tag of trace. -- * @param { TraceFlag } flag - Trace flag. -- * @param { number } limitSize - Max size of trace file, in bytes, the max is 500MB. -- * @returns { string } Returns absolute path of the trace file. -- * @throws { BusinessError } 401 - Invalid argument, Possible causes: -- * 1.The limit parameter is too small -- * 2.The parameter is not within the enumeration type -- * 3.The parameter type error or parameter order error -- * @throws { BusinessError } 11400102 - Capture trace already enabled. -- * @throws { BusinessError } 11400103 - No write permission on the file. -- * @throws { BusinessError } 11400104 - Abnormal trace status. -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- export function startAppTraceCapture(tags: number[], flag: TraceFlag, limitSize: number): string; -- -- /** -- * Stop capture application trace. -- * -- * @throws { BusinessError } 11400104 - The status of the trace is abnormal -- * @throws { BusinessError } 11400105 - No capture trace running -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 20 -- */ -- export function stopAppTraceCapture(): void; -- -- /** -- * Get the graphics memory of application -- * -- * @returns { Promise } Returns the graphics memory of application, in kilobyte. -- * @throws { BusinessError } 11400104 - Failed to get the application memory due to a remote exception. -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @atomicservice -- * @since 20 -- */ -- export function getGraphicsMemory(): Promise; -- -- /** -- * Get the graphics memory of application -- * -- * @returns { number } Returns the graphics memory of application, in kilobyte. -- * @throws { BusinessError } 11400104 - Failed to get the application memory due to a remote exception. -- * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @atomicservice -- * @since 20 -- */ -- export function getGraphicsMemorySync(): number; --} --export default hidebug; -diff --git a/api/@ohos.hidebug.d.ts b/api/@ohos.hidebug.d.ts -index 329efe1e9..7e2212fa5 100644 ---- a/api/@ohos.hidebug.d.ts -+++ b/api/@ohos.hidebug.d.ts -@@ -28,93 +28,114 @@ - */ - - /** -- * Provide interfaces related to debugger access and obtaining CPU, -- * memory and other virtual machine information during runtime for JS programs -+ * This module provides multiple methods for debugging and profiling applications. With these methods, you can obtain -+ * memory, CPU, GPU, and GC data, collect process trace and profiler data, and dump VM heap snapshots. Since most APIs -+ * of this module are both performance-consuming and time-consuming, and are defined based on the HiDebug module, -+ * you are advised to use these APIs only during the application debugging and profiling phases. If the APIs are -+ * required in other scenarios, evaluate the impact of the APIs on application performance. - * - * @namespace hidebug - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- - declare namespace hidebug { - /** -- * Get total native heap memory size -+ * Obtains the total number of bytes occupied by the total space (the sum of uordblks and fordblks obtained from -+ * mallinfo) held by a process, which is measured by the memory allocator. - * -- * @returns { bigint } Returns total native heap memory size. -+ * @returns { bigint } Returns the total number of bytes occupied by the total space. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getNativeHeapSize(): bigint; - - /** -- * Get Native heap memory allocation size. -- * @returns { bigint } Returns native heap memory allocation size. -+ * Obtains the total number of bytes occupied by the total allocated space (uordblks obtained from mallinfo) held by -+ * a process, which is measured by the memory allocator. -+ * @returns { bigint } Returns the total number of bytes occupied by the total allocated space. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getNativeHeapAllocatedSize(): bigint; - - /** -- * Get Native heap memory free size -+ * Obtains the total number of bytes occupied by the total free space (fordblks obtained from mallinfo) -+ * held by a process, which is measured by the memory allocator. - * -- * @returns { bigint } Returns native heap memory free size. -+ * @returns { bigint } Returns the size of the memory occupied by the free normal blocks held by the process, in bytes. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getNativeHeapFreeSize(): bigint; - - /** -- * Get the virtual set size memory of the application process -+ * Obtains the virtual set size used by the application process. This API is implemented by multiplying the value of -+ * size (number of memory pages) in the /proc/{pid}/statm node by the page size (4 KB per page). - * -- * @returns { bigint } Returns application process virtual set size memory information. -+ * @returns { bigint } Returns the virtual set size used by the application process, in KB. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getVss(): bigint; - - /** -- * Get application process proportional set size memory information -+ * Obtains the size of the physical memory actually used by the application process. This API is implemented by -+ * summing up the values of **Pss** and **SwapPss** in the /proc/{pid}/smaps_rollup** node. - * -- * @returns { bigint } Returns application process proportional set size memory information. -+ * @returns { bigint } Returns the size of the physical memory actually used by the application process, in KB. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getPss(): bigint; - - /** -- * Obtains the size of the shared dirty memory of a process. -+ * Obtains the size of the shared dirty memory of a process. This API is implemented by reading the value of -+ * Shared_Dirty in the /proc/{pid}/smaps_rollup node. - * -- * @returns { bigint } Returns the size of the shared dirty memory. -+ * @returns { bigint } Returns the size of the shared dirty memory of the process, in KB. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSharedDirty(): bigint; - - /** -- * Obtains the size of the private dirty memory of a process. -- * @returns { bigint } Returns the size of the private dirty memory. -+ * Obtains the size of the private dirty memory of a process. This API is implemented by reading the value of -+ * Private_Dirty in the /proc/{pid}/smaps_rollup node. -+ * -+ * @returns { bigint } Returns the size of the private dirty memory of the process, in KB. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getPrivateDirty(): bigint; - - /** -- * Obtains the cpu usage percent of a process. -+ * Obtains the CPU usage of a process. - * -- * @returns { number } Returns the cpu usage of a process. -+ * @returns { number } Returns the CPU usage of the process. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getCpuUsage(): number; - - /** -- * Start CPU Profiling. -- * The input parameter is a user-defined file name, excluding the file suffix. -- * The generated file is in the files folder under the application directory. -- * Such as "/data/accounts/account_0/appdata/[package name]/files/cpuprofiler-xxx.json" - * -- * @param { string } filename - Indicates the user-defined file name, excluding the file suffix. -+ * Starts the VM profiling method. startProfiling(filename: string) and stopProfiling() are called in pairs. -+ * startProfiling(filename: string) always occurs before stopProfiling(). You are advised not to call either of these -+ * methods repeatedly. Otherwise, an exception may occur. The generated file is in the files folder under the -+ * application directory. Such as "/data/accounts/account_0/appdata/[package name]/files/cpuprofiler-xxx.json" -+ * -+ * @param { string } filename - User-defined file name of the sampling data. The .json file is generated -+ * in the files directory of the application based on the specified file name. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 8 - * @deprecated since 9 -@@ -123,8 +144,9 @@ declare namespace hidebug { - function startProfiling(filename: string): void; - - /** -- * Stop CPU Profiling. -- * It takes effect only when the CPU profiler is turned on -+ * Stops the VM profiling method. stopProfiling() and startProfiling(filename: string) are called in pairs. -+ * startProfiling(filename: string) always occurs before stopProfiling(). You are advised not to call either of these -+ * methods repeatedly. Otherwise, an exception may occur. It takes effect only when the CPU profiler is turned on. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 8 -@@ -134,10 +156,10 @@ declare namespace hidebug { - function stopProfiling(): void; - - /** -- * Dump JS Virtual Machine Heap Snapshot. -+ * Exports the VM heap data and generates a filename.heapsnapshot file. - * The input parameter is a user-defined file name, excluding the file suffix. - * The generated file is in the files folder under the application directory. -- * Such as "/data/accounts/account_0/appdata/[package name]/files/xxx.heapsnapshot" -+ * Such as "/data/accounts/account_0/appdata/[package name]/files/xxx.heapsnapshot". - * - * @param { string } filename - Indicates the user-defined file name, excluding the file suffix. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -@@ -148,72 +170,80 @@ declare namespace hidebug { - function dumpHeapData(filename: string): void; - - /** -- * Start CPU Profiling. -- * The input parameter is a user-defined file name, excluding the file suffix. -- * The generated file is in the files folder under the application directory. -+ * Starts the VM profiling method. startJsCpuProfiling(filename: string) and stopJsCpuProfiling() are called in pairs. -+ * startJsCpuProfiling(filename: string) always occurs before stopJsCpuProfiling(). You are advised not to call either -+ * of these methods repeatedly. Otherwise, an exception may occur. - * -- * @param { string } filename - Indicates the user-defined file name, excluding the file suffix. -+ * @param { string } filename - User-defined heap file name. The .heapsnapshot file is generated in the files -+ * directory of the application based on the specified file name. - * @throws {BusinessError} 401 - the parameter check failed, Parameter type error - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function startJsCpuProfiling(filename: string): void; - - /** -- * Stop CPU Profiling. -- * It takes effect only when the CPU profiler is turned on -+ * Stops the VM profiling method. stopJsCpuProfiling() and startJsCpuProfiling(filename: string) are called in pairs. -+ * startJsCpuProfiling() always occurs before stopJsCpuProfiling(). You are advised not to call either of these -+ * methods repeatedly. Otherwise, an exception may occur. It takes effect only when the CPU profiler is turned on - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function stopJsCpuProfiling(): void; - - /** -- * Dump JS Virtual Machine Heap Snapshot. -+ * Exports the heap data. - * The input parameter is a user-defined file name, excluding the file suffix. - * The generated file is in the files folder under the application directory. - * -- * @param { string } filename - Indicates the user-defined file name, excluding the file suffix. -- * @throws {BusinessError} 401 - the parameter check failed, Parameter type error -+ * @param { string } filename - User-defined file name of the sampling data. The .heapsnapshot file is generated -+ * in the files directory of the application based on the specified file name. -+ * @throws {BusinessError} 401 - the parameter check failed, Parameter type error. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @since 9 - */ - function dumpJsHeapData(filename: string): void; - - /** -- * Get a debugging dump of a system service by service id. -+ * Obtains system service information. - * It need dump permission. - * This API can be called only by system application. - * - * @permission ohos.permission.DUMP -- * @param { number } serviceid - Indicates the id of the service ability. -- * @param { number } fd - The file descriptor. -- * @param { Array } args - The args list of the system ability dump interface. -- * @throws {BusinessError} 401 - the parameter check failed, Possible causes: -+ * @param { number } serviceid - Obtains the system service information based on the specified service ID. -+ * @param { number } fd - File descriptor to which data is written by the API. -+ * @param { Array } args - Parameter list of the Dump API of the system service. -+ * @throws {BusinessError} 401 - the parameter check failed,Possible causes: - * 1.the parameter type error -- * 2.the args parameter is not string array -+ * 2.the args parameter is not string array. - * @throws {BusinessError} 11400101 - ServiceId invalid. The system ability does not exist. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getServiceDump(serviceid: number, fd: number, args: Array): void; - - /** -- * Obtains the cpu usage of system. -+ * Obtains the CPU usage of the system. - * -- * @returns { number } Returns the cpu usage of system. -+ * @returns { number } Returns the CPU usage of the system. - * @throws { BusinessError } 11400104 - The status of the system CPU usage is abnormal. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSystemCpuUsage(): number; - - /** -- * Application CPU usage of thread. -+ * Describes the CPU usage of a thread. - * - * @interface ThreadCpuUsage - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ThreadCpuUsage { - /** -@@ -221,505 +251,585 @@ declare namespace hidebug { - * - * @type { number } - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - threadId: number; - /** -- * Cpu usage of thread -+ * CPU usage of the thread. - * - * @type { number } - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - cpuUsage: number; - } - - /** -- * Get the CPU usage of all threads in the application. -+ * Obtains the CPU usage of application threads. - * -- * @returns { ThreadCpuUsage[] } Returns the CPU usage of all threads in the application. -+ * @returns { ThreadCpuUsage[] } Returns the CPU usage of all threads of the current application process. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAppThreadCpuUsage(): ThreadCpuUsage[]; - - /** -- * System memory information -+ * Describes the system memory information, including the total memory, free memory, and available memory. - * - * @interface SystemMemInfo - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface SystemMemInfo { - /** -- * Total system memory size, in kilobyte -+ * Total memory of the system, in KB. The value of this parameter is obtained by reading the value of -+ * MemTotal in the /proc/meminfo node. - * - * @type { bigint } - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - totalMem: bigint; - /** -- * System free memory size, in kilobyte -+ * Free memory of the system, in KB. The value of this parameter is obtained by reading the value of -+ * MemFree in the /proc/meminfo node. - * - * @type { bigint } - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - freeMem: bigint; - /** -- * System available memory size, in kilobyte -+ * Available memory of the system, in KB. The value of this parameter is obtained by reading the value of -+ * MemAvailable in the /proc/meminfo node. - * - * @type { bigint } - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - availableMem: bigint; - } - - /** -- * Obtains the system memory size. -+ * Obtains system memory information. This API is implemented by reading data from the /proc/meminfo node. - * -- * @returns { SystemMemInfo } Returns system memory size. -+ * @returns { SystemMemInfo } Returns the system memory information. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSystemMemInfo(): SystemMemInfo; - - /** -- * Application process native memory information. -+ * Describes memory information of the application process. - * - * @interface NativeMemInfo - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface NativeMemInfo { - /** -- * Process proportional set size memory, in kilobyte -+ * Size of the occupied physical memory (including the proportionally allocated memory occupied by the shared -+ * library), in KB. The value of this parameter is obtained by summing up the values of Pss and SwapPss in the -+ * /proc/{pid}/smaps_rollup node. - * - * @type { bigint } - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - pss: bigint; - /** -- * Virtual set size memory, in kilobyte -+ * Size of the occupied virtual memory (including the memory occupied by the shared library), in KB. The value of -+ * this parameter is obtained by multiplying the value of size (number of memory pages) in the /proc/{pid}/statm -+ * node by the page size (4 KB per page). - * - * @type { bigint } - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - vss: bigint; - /** -- * Resident set size, in kilobyte -+ * Size of the occupied physical memory (including the memory occupied by the shared library), in KB. -+ * The value of this parameter is obtained by reading the value of Rss in the /proc/{pid}/smaps_rollup node. - * - * @type { bigint } - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - rss: bigint; - /** -- * The size of the shared dirty memory, in kilobyte -+ * Size of the shared dirty memory, in KB. The value of this parameter is obtained by reading the value of -+ * Shared_Dirty in the /proc/{pid}/smaps_rollup node. - * - * @type { bigint } - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - sharedDirty: bigint; - /** -- * The size of the private dirty memory, in kilobyte -+ * Size of the private dirty memory, in KB. The value of this parameter is obtained by reading the value of -+ * Private_Dirty in the /proc/{pid}/smaps_rollup node. - * - * @type { bigint } - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - privateDirty: bigint; - /** -- * The size of the shared clean memory, in kilobyte -+ * Size of the shared clean memory, in KB. The value of this parameter is obtained by reading the value of -+ * Shared_Clean in the /proc/{pid}/smaps_rollup node. - * - * @type { bigint } - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - sharedClean: bigint; - /** -- * The size of the private clean memory, in kilobyte -+ * Size of the private clean memory, in KB. The value of this parameter is obtained by reading the value of -+ * Private_Clean in the /proc/{pid}/smaps_rollup node. - * - * @type { bigint } - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - privateClean: bigint; - } - - /** -- * Obtains the memory information of application process. -+ * Obtains the memory information of the application process. This API is implemented by reading data from the -+ * /proc/{pid}/smaps_rollup and /proc/{pid}/statm node. - * -- * @returns { NativeMemInfo } Returns the native memory of a process. -+ * @returns { NativeMemInfo } Returns the memory information of the application process. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAppNativeMemInfo(): NativeMemInfo; - - /** -- * Application process memory limit -+ * Defines the memory limit of the application process. - * - * @interface MemoryLimit - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MemoryLimit { - /** -- * The limit of the application process's resident set, in kilobyte -+ * Limit on the resident set size, in KB. - * - * @type { bigint } - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - rssLimit: bigint; - /** -- * The limit of the application process's virtual memory, in kilobyte -+ * Limit on the virtual memory size, in KB. - * - * @type { bigint } - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - vssLimit: bigint; - /** -- * The limit of the js vm heap size of current virtual machine, in kilobyte -+ * Limit on the JS VM heap size of the calling thread, in KB. - * - * @type { bigint } - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - vmHeapLimit: bigint; - /** -- * The limit of the total js vm heap size of process, in kilobyte -+ * Size limit of the JS heap memory of the process, in KB. - * - * @type { bigint } - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - vmTotalHeapSize: bigint; - } - - /** -- * Obtains the memory limit of application process. -+ * Obtains the memory limit of an application process. - * -- * @returns { MemoryLimit } Returns memory limit of application. -+ * @returns { MemoryLimit } Returns the memory limit of the application process. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAppMemoryLimit(): MemoryLimit; - - /** -- * The memory information of application virtual machine. -+ * Describes the VM memory information. - * - * @interface VMMemoryInfo - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface VMMemoryInfo { - /** -- * Total size of current virtual machine Heap, in kilobyte -+ * Total heap size of the current VM, in KB. - * - * @type { bigint } - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - totalHeap: bigint; - /** -- * Used size of current virtual machine Heap, in kilobyte -+ * Heap size used by the current VM, in KB. - * - * @type { bigint } - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - heapUsed: bigint; - /** -- * All array object size of current virtual machine, in kilobyte -+ * Size of all array objects of the current VM, in KB. - * - * @type { bigint } - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - allArraySize: bigint; - } - - /** -- * Obtains the memory information of application virtual machine. -+ * Obtains VM memory information. - * -- * @returns { VMMemoryInfo } Returns memory information of application virtual machine. -+ * @returns { VMMemoryInfo } Returns the VM memory information. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAppVMMemoryInfo(): VMMemoryInfo; - - /** -- * Enum for trace flag -+ * Describes types of trace collection threads, including the main thread and all threads. - * - * @enum { number } - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum TraceFlag { - /** -- * Only capture main thread trace -+ * The main thread of the application. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MAIN_THREAD = 1, - /** -- * Capture all thread trace -+ * All threads of the application. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ALL_THREADS = 2 - } - - /** -- * Provide trace tags -+ * Enumerates the tags used in trace collection. - * - * @namespace tags - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - namespace tags { - /** -- * Ability Manager tag. -+ * Ability Manager tag. The corresponding HiTrace command is tagName:ability. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const ABILITY_MANAGER: number; - /** -- * ARKUI development framework tag. -+ * ArkUI development framework. The corresponding HiTrace command is tagName:ace. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const ARKUI: number; - /** -- * ARK tag. -+ * JSVM VM. The corresponding HiTrace command is tagName:ark. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const ARK: number; - /** -- * Bluetooth tag. -+ * Bluetooth. The corresponding HiTrace command is tagName:bluetooth. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const BLUETOOTH: number; - /** -- * Common library subsystem tag. -+ * Common library subsystem. The corresponding HiTrace command is tagName:commonlibrary. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const COMMON_LIBRARY: number; - /** -- * Distributed hardware device manager tag. -+ * Distributed hardware device management. The corresponding HiTrace command is tagName:devicemanager. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const DISTRIBUTED_HARDWARE_DEVICE_MANAGER: number; - /** -- * Distributed audio tag. -+ * Distributed audio. The corresponding HiTrace command is tagName:daudio. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const DISTRIBUTED_AUDIO: number; - /** -- * Distributed camera tag. -+ * Distributed camera. The corresponding HiTrace command is tagName:dcamera. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const DISTRIBUTED_CAMERA: number; - /** -- * Distributed data manager module tag. -+ * Distributed data management. The corresponding HiTrace command is tagName:distributeddatamgr. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const DISTRIBUTED_DATA: number; - /** -- * Distributed hardware framework tag. -+ * Distributed hardware framework. The corresponding HiTrace command is tagName:dhfwk. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const DISTRIBUTED_HARDWARE_FRAMEWORK: number; - /** -- * Distributed input tag. -+ * Distributed input. The corresponding HiTrace command is tagName:dinput. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const DISTRIBUTED_INPUT: number; - /** -- * Distributed screen tag. -+ * Distributed screen. The corresponding HiTrace command is tagName:dscreen. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const DISTRIBUTED_SCREEN: number; - /** -- * Distributed scheduler tag. -+ * Distributed scheduler. The corresponding HiTrace command is tagName:dsched. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const DISTRIBUTED_SCHEDULER: number; - /** -- * FFRT tasks. -+ * FFRT task. The corresponding HiTrace command is tagName:ffrt. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const FFRT: number; - /** -- * File management tag. -+ * File management system. The corresponding HiTrace command is tagName:filemanagement. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const FILE_MANAGEMENT: number; - /** -- * Global resource manager tag. -+ * Global resource management. The corresponding HiTrace command is tagName:gresource. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const GLOBAL_RESOURCE_MANAGER: number; - /** -- * Graphics module tag. -+ * Graphics module. The corresponding HiTrace command is tagName:graphic. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const GRAPHICS: number; - /** -- * HDF subsystem tag. -+ * HDF subsystem. The corresponding HiTrace command is tagName:hdf. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const HDF: number; - /** -- * MISC module tag. -+ * MISC module. The corresponding HiTrace command is tagName:misc. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const MISC: number; - /** -- * Multimodal input module tag. -+ * Multi-modal input module. The corresponding HiTrace command is tagName:multimodalinput. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const MULTIMODAL_INPUT: number; - /** -- * Net tag. -+ * Network. The corresponding HiTrace command is tagName:net. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const NET: number; - /** -- * Notification module tag. -+ * Notification module. The corresponding HiTrace command is tagName:notification. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const NOTIFICATION: number; - /** -- * NWeb tag. -+ * Nweb. The corresponding HiTrace command is tagName:nweb. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const NWEB: number; - /** -- * OHOS generic tag. -+ * OHOS. The corresponding HiTrace command is tagName:ohos. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const OHOS: number; - /** -- * Power manager tag. -+ * Power management. The corresponding HiTrace command is tagName:power. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const POWER_MANAGER: number; - /** -- * RPC tag. -+ * RPC. The corresponding HiTrace command is tagName:rpc. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const RPC: number; - /** -- * SA tag. -+ * System capability management. The corresponding HiTrace command is tagName:samgr. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const SAMGR: number; - /** -- * Window manager tag. -+ * Window management. The corresponding HiTrace command is tagName:window. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const WINDOW_MANAGER: number; - /** -- * Audio module tag. -+ * Audio module. The corresponding HiTrace command is tagName:zaudio. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const AUDIO: number; - /** -- * Camera module tag. -+ * Camera module. The corresponding HiTrace command is tagName:zcamera. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const CAMERA: number; - /** -- * Image module tag. -+ * Image module. The corresponding HiTrace command is tagName:zimage. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const IMAGE: number; - /** -- * Media module tag. -+ * Media module. The corresponding HiTrace command is tagName:zmedia. - * - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const MEDIA: number; - } - - /** -- * Start capture application trace. -+ * Starts automatic trace collection in a specified scope. This API is a supplement to the HiTrace module. -+ * The performance consumption during trace collection increases with the collection scope. Therefore, before -+ * using this API, you are advised to run the hitrace command to capture trace logs and select the key scope -+ * of trace collection to improve the API performance. - * -- * @param { number[] } tags - Tag of trace. -- * @param { TraceFlag } flag - Trace flag. -- * @param { number } limitSize - Max size of trace file, in bytes, the max is 500MB. -- * @returns { string } Returns absolute path of the trace file. -+ * @param { number[] } tags - Scope for trace collection. For details, see tags. -+ * @param { TraceFlag } flag - For details, see TraceFlag. -+ * @param { number } limitSize - Limit on the trace file size, in bytes. The maximum size of a single file is 500 MB. -+ * @returns { string } Returns the path of the trace file. - * @throws { BusinessError } 401 - Invalid argument, Possible causes: - * 1.The limit parameter is too small - * 2.The parameter is not within the enumeration type -@@ -728,54 +838,60 @@ declare namespace hidebug { - * @throws { BusinessError } 11400103 - No write permission on the file. - * @throws { BusinessError } 11400104 - Abnormal trace status. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function startAppTraceCapture(tags: number[], flag: TraceFlag, limitSize: number): string; - - /** -- * Stop capture application trace. -+ * Stops application trace collection. Use startAppTraceCapture() to start collection before calling this API. -+ * If this API is called before trace collection or it is repeatedly called, an exception will occur. - * -- * @throws { BusinessError } 11400104 - The status of the trace is abnormal -- * @throws { BusinessError } 11400105 - No capture trace running -+ * @throws { BusinessError } 11400104 - The status of the trace is abnormal. -+ * @throws { BusinessError } 11400105 - No capture trace running. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function stopAppTraceCapture(): void; - - /** -- * Collection statistics. -+ * Describes the key-value pair used to store GC statistics. This type does not support multi-thread operations. -+ * If this type is operated by multiple threads at the same time in an application, use a lock for it. - * - * @typedef { Record } GcStats - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type GcStats = Record; - - /** -- * Get the garbage collection statistics. -+ * Obtains all system GC statistics. - * -- * @returns { GcStats } Returns garbage collection statistics. -+ * @returns { GcStats } Returns the system GC statistics. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getVMRuntimeStats(): GcStats; - - /** -- * Get the garbage collection statistics by statistical item. -+ * Obtains the specified system GC statistics based on parameters. - * - * @param { string } item - statistical item. -- * @returns { number } Returns garbage collection statistics. -+ * @returns { number } Returns the item of the GC statistics to be obtained. - * @throws { BusinessError } 401 - Possible causes: - * 1. Invalid parameter, a string parameter required. - * 2. Invalid parameter, unknown property. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getVMRuntimeStat(item: string): number; - - /** -- * Set the resource limitation of application.Please note that this function is only valid -- * when the developer options switch of setting is turned on. -+ * Sets the number of FDs, number of threads, JS memory, or native memory limit of the application. - * - * @param { string } type - resource type. It could be pss_memory、js_heap、fd、or thread. - * @param { number } value - For different resource type, values could have different meaning: -@@ -799,48 +915,52 @@ declare namespace hidebug { - function setAppResourceLimit(type: string, value: number, enableDebugLog: boolean): void; - - /** -- * Judge if the application is in debugged state, including either in arkui layer or native layer debugged state. -+ * Obtains the debugging state of an application process. If the Ark or native layer of the application process is in -+ * debugging state, true is returned. Otherwise, false is returned. - * -- * @returns { boolean } true if the application is debugged. -+ * @returns { boolean } true if the application is in the debugging state. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isDebugState(): boolean; - - /** -- * Get the graphics memory of application -+ * Obtains the size of the GPU memory. This API uses a promise to return the result. - * -- * @returns { Promise } Returns the graphics memory of application, in kilobyte. -+ * @returns { Promise } Returns the size of the GPU memory, in KB. - * @throws { BusinessError } 11400104 - Failed to get the application memory due to a remote exception. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getGraphicsMemory(): Promise; - - /** -- * Get the graphics memory of application -+ * Obtains the size of the GPU memory synchronously. - * -- * @returns { number } Returns the graphics memory of application, in kilobyte. -+ * @returns { number } Returns the size of the GPU memory, in KB. - * @throws { BusinessError } 11400104 - Failed to get the application memory due to a remote exception. - * @syscap SystemCapability.HiviewDFX.HiProfiler.HiDebug - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getGraphicsMemorySync(): number; - - /** -- * Dump the raw heap snapshot of the JavaScript Virtual Machine for the current thread. -- * -+ * Dumps the original heap snapshot of the VM for the current thread. The API uses a promise to return the path of the -+ * .rawheap file. You can use rawheap-translator to convert the generated file into a .heapsnapshot file for parsing. - * The generated file will be stored in a folder within the application directory. However, since this file is usually - * large, the system imposes restrictions on the frequency and number of calls to this function. Consequently, you - * might fail to obtain the dump file due to quota limitations. These failures will persist until the quota is - * regularly refreshed by the system. Therefore, it is advisable to delete the file immediately after you have - * finished processing it. Moreover, it is recommended that you use this function in the gray - release version. - * -- * @param { boolean } needGC - Whether do GC before dump, default is true. -- * @returns { Promise } Returns the full path of raw heap snapshot file. -- * @throws { BusinessError } 401 - Invalid parameter. -+ * @param { boolean } needGC - Whether GC is required when a heap snapshot is dumped. The default value is true. -+ * If this parameter is not specified, GC is triggered before dumping. -+ * @returns { Promise } Returns the path of the generated snapshot file. - * @throws { BusinessError } 11400106 - Quota exceeded. - * @throws { BusinessError } 11400107 - Fork operation failed. - * @throws { BusinessError } 11400108 - Failed to wait for the child process to finish. -diff --git a/api/@ohos.hilog.d.ets b/api/@ohos.hilog.d.ets -deleted file mode 100644 -index 5d72df5cb..000000000 ---- a/api/@ohos.hilog.d.ets -+++ /dev/null -@@ -1,414 +0,0 @@ --/* -- * Copyright (c) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --/** -- * @file -- * @kit PerformanceAnalysisKit -- */ -- --/** --* Provides interfaces to generate system logs. --* --* @namespace hilog --* @syscap SystemCapability.HiviewDFX.HiLog --* @since 7 --*/ --/** --* Provides interfaces to generate system logs. --* --* @namespace hilog --* @syscap SystemCapability.HiviewDFX.HiLog --* @crossplatform --* @since 10 --*/ --/** --* Provides interfaces to generate system logs. --* --* @namespace hilog --* @syscap SystemCapability.HiviewDFX.HiLog --* @crossplatform --* @atomicservice --* @since 11 --*/ --declare namespace hilog { -- -- /** -- * Outputs debug-level logs. -- * -- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -- * if the value exceeds the range, logs cannot be printed. -- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -- * @param { string } format Indicates the log format string. -- * @param { any[] }args Indicates the log parameters. -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @since 7 -- */ -- /** -- * Outputs debug-level logs. -- * -- * * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -- * if the value exceeds the range, logs cannot be printed. -- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -- * @param { string } format Indicates the log format string. -- * @param { any[] }args Indicates the log parameters. -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @since 10 -- */ -- /** -- * Outputs debug-level logs. -- * -- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -- * if the value exceeds the range, logs cannot be printed. -- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -- * @param { string } format Indicates the log format string. -- * @param { any[] }args Indicates the log parameters. -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @atomicservice -- * @since 11 -- */ -- export function debug(domain: number, tag: string, format: string, -- ...args: (int | boolean | number | string | bigint | Object | undefined | null)[]): void; -- -- /** -- * Outputs info-level logs. -- * -- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -- * if the value exceeds the range, logs cannot be printed. -- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -- * @param { string } format Indicates the log format string. -- * @param { any[] }args Indicates the log parameters. -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @since 7 -- */ -- /** -- * Outputs info-level logs. -- * -- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -- * if the value exceeds the range, logs cannot be printed. -- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -- * @param { string } format Indicates the log format string. -- * @param { any[] }args Indicates the log parameters. -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @since 10 -- */ -- /** -- * Outputs info-level logs. -- * -- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -- * if the value exceeds the range, logs cannot be printed. -- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -- * @param { string } format Indicates the log format string. -- * @param { any[] }args Indicates the log parameters. -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @atomicservice -- * @since 11 -- */ -- export function info(domain: number, tag: string, format: string, -- ...args: (int | boolean | number | string | bigint | Object | undefined | null)[]): void; -- -- /** -- * Outputs warning-level logs. -- * -- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -- * if the value exceeds the range, logs cannot be printed. -- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -- * @param { string } format Indicates the log format string. -- * @param { any[] }args Indicates the log parameters. -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @since 7 -- */ -- /** -- * Outputs warning-level logs. -- * -- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -- * if the value exceeds the range, logs cannot be printed. -- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -- * @param { string } format Indicates the log format string. -- * @param { any[] }args Indicates the log parameters. -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @since 10 -- */ -- /** -- * Outputs warning-level logs. -- * -- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -- * if the value exceeds the range, logs cannot be printed. -- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -- * @param { string } format Indicates the log format string. -- * @param { any[] }args Indicates the log parameters. -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @atomicservice -- * @since 11 -- */ -- export function warn(domain: number, tag: string, format: string, -- ...args: (int | boolean | number | string | bigint | Object | undefined | null)[]): void; -- -- /** -- * Outputs error-level logs. -- * -- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -- * if the value exceeds the range, logs cannot be printed. -- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -- * @param { string } format Indicates the log format string. -- * @param { any[] }args Indicates the log parameters. -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @since 7 -- */ -- /** -- * Outputs error-level logs. -- * -- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -- * if the value exceeds the range, logs cannot be printed. -- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -- * @param { string } format Indicates the log format string. -- * @param { any[] }args Indicates the log parameters. -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @since 10 -- */ -- /** -- * Outputs error-level logs. -- * -- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -- * if the value exceeds the range, logs cannot be printed. -- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -- * @param { string } format Indicates the log format string. -- * @param { any[] }args Indicates the log parameters. -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @atomicservice -- * @since 11 -- */ -- export function error(domain: number, tag: string, format: string, -- ...args: (int | boolean | number | string | bigint | Object | undefined | null)[]): void; -- -- /** -- * Outputs fatal-level logs. -- * -- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -- * if the value exceeds the range, logs cannot be printed. -- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -- * @param { string } format Indicates the log format string. -- * @param { any[] }args Indicates the log parameters. -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @since 7 -- */ -- /** -- * Outputs fatal-level logs. -- * -- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -- * if the value exceeds the range, logs cannot be printed. -- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -- * @param { string } format Indicates the log format string. -- * @param { any[] }args Indicates the log parameters. -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @since 10 -- */ -- /** -- * Outputs fatal-level logs. -- * -- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -- * if the value exceeds the range, logs cannot be printed. -- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -- * @param { string } format Indicates the log format string. -- * @param { any[] }args Indicates the log parameters. -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @atomicservice -- * @since 11 -- */ -- export function fatal(domain: number, tag: string, format: string, -- ...args: (int | boolean | number | string | bigint | Object | undefined | null)[]): void; -- -- /** -- * Checks whether logs of the specified tag, and level can be printed. -- * -- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -- * if the value exceeds the range, logs cannot be printed. -- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -- * @param { LogLevel } level log level -- * @returns { boolean } -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @since 7 -- */ -- /** -- * Checks whether logs of the specified tag, and level can be printed. -- * -- * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -- * if the value exceeds the range, logs cannot be printed. -- * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -- * @param { LogLevel } level log level -- * @returns { boolean } -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @atomicservice -- * @since 11 -- */ -- export function isLoggable(domain: number, tag: string, level: LogLevel): boolean; -- -- /** -- * Sets the lowest log level of the current application process. -- * -- * @param { LogLevel } level log level -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @atomicservice -- * @since 15 -- */ -- export function setMinLogLevel(level: LogLevel): void; -- -- /** -- * Log level define -- * -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @since 7 -- */ -- /** -- * Log level define -- * -- * @enum { number } -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @since 10 -- */ -- /** -- * Log level define -- * -- * @enum { number } -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @atomicservice -- * @since 11 -- */ -- export enum LogLevel { -- /** -- * DEBUG Log level define -- * -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @since 7 -- */ -- /** -- * DEBUG Log level define -- * -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @since 10 -- */ -- /** -- * DEBUG Log level define -- * -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @atomicservice -- * @since 11 -- */ -- DEBUG = 3, -- /** -- * INFO Log level define -- * -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @since 7 -- */ -- /** -- * INFO Log level define -- * -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @since 10 -- */ -- /** -- * INFO Log level define -- * -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @atomicservice -- * @since 11 -- */ -- INFO = 4, -- /** -- * WARN Log level define -- * -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @since 7 -- */ -- /** -- * WARN Log level define -- * -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @since 10 -- */ -- /** -- * WARN Log level define -- * -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @atomicservice -- * @since 11 -- */ -- WARN = 5, -- /** -- * ERROR Log level define -- * -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @since 7 -- */ -- /** -- * ERROR Log level define -- * -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @since 10 -- */ -- /** -- * ERROR Log level define -- * -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @atomicservice -- * @since 11 -- */ -- ERROR = 6, -- /** -- * FATAL Log level define -- * -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @since 7 -- */ -- /** -- * FATAL Log level define -- * -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @since 10 -- */ -- /** -- * FATAL Log level define -- * -- * @syscap SystemCapability.HiviewDFX.HiLog -- * @crossplatform -- * @atomicservice -- * @since 11 -- */ -- FATAL = 7 -- } --} -- --export default hilog; -diff --git a/api/@ohos.hilog.d.ts b/api/@ohos.hilog.d.ts -index 34fa026ba..998320202 100644 ---- a/api/@ohos.hilog.d.ts -+++ b/api/@ohos.hilog.d.ts -@@ -16,32 +16,34 @@ - /** - * @file - * @kit PerformanceAnalysisKit -+ * @arkts 1.1&1.2 - */ - - /** --* Provides interfaces to generate system logs. --* --* @namespace hilog --* @syscap SystemCapability.HiviewDFX.HiLog --* @since 7 --*/ -+ * Provides interfaces to generate system logs. -+ * -+ * @namespace hilog -+ * @syscap SystemCapability.HiviewDFX.HiLog -+ * @since 7 -+ */ - /** --* Provides interfaces to generate system logs. --* --* @namespace hilog --* @syscap SystemCapability.HiviewDFX.HiLog --* @crossplatform --* @since 10 --*/ -+ * Provides interfaces to generate system logs. -+ * -+ * @namespace hilog -+ * @syscap SystemCapability.HiviewDFX.HiLog -+ * @crossplatform -+ * @since 10 -+ */ - /** --* Provides interfaces to generate system logs. --* --* @namespace hilog --* @syscap SystemCapability.HiviewDFX.HiLog --* @crossplatform --* @atomicservice --* @since 11 --*/ -+ * Provides interfaces to generate system logs. -+ * -+ * @namespace hilog -+ * @syscap SystemCapability.HiviewDFX.HiLog -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - declare namespace hilog { - - /** -@@ -80,7 +82,21 @@ declare namespace hilog { - * @atomicservice - * @since 11 - */ -- function debug(domain: number, tag: string, format: string, ...args: any[]): void; -+ /** -+ * Outputs debug-level logs. -+ * -+ * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -+ * if the value exceeds the range, logs cannot be printed. -+ * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -+ * @param { string } format Indicates the log format string. -+ * @param { (Object | undefined | null)[] }args Indicates the log parameters. -+ * @syscap SystemCapability.HiviewDFX.HiLog -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.1&1.2 -+ */ -+ function debug(domain: number, tag: string, format: string, ...args: (Object | undefined | null)[]): void; - - /** - * Outputs info-level logs. -@@ -118,7 +134,21 @@ declare namespace hilog { - * @atomicservice - * @since 11 - */ -- function info(domain: number, tag: string, format: string, ...args: any[]): void; -+ /** -+ * Outputs info-level logs. -+ * -+ * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -+ * if the value exceeds the range, logs cannot be printed. -+ * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -+ * @param { string } format Indicates the log format string. -+ * @param { (Object | undefined | null)[] }args Indicates the log parameters. -+ * @syscap SystemCapability.HiviewDFX.HiLog -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.1&1.2 -+ */ -+ function info(domain: number, tag: string, format: string, ...args: (Object | undefined | null)[]): void; - - /** - * Outputs warning-level logs. -@@ -156,7 +186,21 @@ declare namespace hilog { - * @atomicservice - * @since 11 - */ -- function warn(domain: number, tag: string, format: string, ...args: any[]): void; -+ /** -+ * Outputs warning-level logs. -+ * -+ * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -+ * if the value exceeds the range, logs cannot be printed. -+ * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -+ * @param { string } format Indicates the log format string. -+ * @param { (Object | undefined | null)[] }args Indicates the log parameters. -+ * @syscap SystemCapability.HiviewDFX.HiLog -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.1&1.2 -+ */ -+ function warn(domain: number, tag: string, format: string, ...args: (Object | undefined | null)[]): void; - - /** - * Outputs error-level logs. -@@ -194,7 +238,21 @@ declare namespace hilog { - * @atomicservice - * @since 11 - */ -- function error(domain: number, tag: string, format: string, ...args: any[]): void; -+ /** -+ * Outputs error-level logs. -+ * -+ * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -+ * if the value exceeds the range, logs cannot be printed. -+ * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -+ * @param { string } format Indicates the log format string. -+ * @param { (Object | undefined | null)[] }args Indicates the log parameters. -+ * @syscap SystemCapability.HiviewDFX.HiLog -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.1&1.2 -+ */ -+ function error(domain: number, tag: string, format: string, ...args: (Object | undefined | null)[]): void; - - /** - * Outputs fatal-level logs. -@@ -232,7 +290,21 @@ declare namespace hilog { - * @atomicservice - * @since 11 - */ -- function fatal(domain: number, tag: string, format: string, ...args: any[]): void; -+ /** -+ * Outputs fatal-level logs. -+ * -+ * @param { number } domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFF -+ * if the value exceeds the range, logs cannot be printed. -+ * @param { string } tag Identifies the log tag, length cannot exceed 32 bytes, the excess part will be truncated. -+ * @param { string } format Indicates the log format string. -+ * @param { (Object | undefined | null)[] }args Indicates the log parameters. -+ * @syscap SystemCapability.HiviewDFX.HiLog -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.1&1.2 -+ */ -+ function fatal(domain: number, tag: string, format: string, ...args: (Object | undefined | null)[]): void; - - /** - * Checks whether logs of the specified tag, and level can be printed. -@@ -255,7 +327,8 @@ declare namespace hilog { - * @returns { boolean } - * @syscap SystemCapability.HiviewDFX.HiLog - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isLoggable(domain: number, tag: string, level: LogLevel): boolean; - -@@ -265,7 +338,8 @@ declare namespace hilog { - * @param { LogLevel } level log level - * @syscap SystemCapability.HiviewDFX.HiLog - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setMinLogLevel(level: LogLevel): void; - -@@ -290,7 +364,8 @@ declare namespace hilog { - * @syscap SystemCapability.HiviewDFX.HiLog - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum LogLevel { - /** -@@ -312,7 +387,8 @@ declare namespace hilog { - * @syscap SystemCapability.HiviewDFX.HiLog - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DEBUG = 3, - /** -@@ -334,7 +410,8 @@ declare namespace hilog { - * @syscap SystemCapability.HiviewDFX.HiLog - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INFO = 4, - /** -@@ -356,7 +433,8 @@ declare namespace hilog { - * @syscap SystemCapability.HiviewDFX.HiLog - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WARN = 5, - /** -@@ -378,7 +456,8 @@ declare namespace hilog { - * @syscap SystemCapability.HiviewDFX.HiLog - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ERROR = 6, - /** -@@ -400,7 +479,8 @@ declare namespace hilog { - * @syscap SystemCapability.HiviewDFX.HiLog - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FATAL = 7 - } -diff --git a/api/@ohos.hiviewdfx.hiAppEvent.d.ets b/api/@ohos.hiviewdfx.hiAppEvent.d.ets -deleted file mode 100644 -index c990aed68..000000000 ---- a/api/@ohos.hiviewdfx.hiAppEvent.d.ets -+++ /dev/null -@@ -1,1395 +0,0 @@ --/* -- * Copyright (c) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --/** -- * @file -- * @kit PerformanceAnalysisKit -- */ -- --import { AsyncCallback } from '@ohos.base'; -- --/** -- * Provides the event logging function for applications to log the fault, statistical, security, -- * and user behavior events reported during running. Based on event information, -- * you will be able to analyze the running status of applications. -- * -- * @namespace hiAppEvent -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ --/** -- * Provides the event logging function for applications to log the fault, statistical, security, -- * and user behavior events reported during running. Based on event information, -- * you will be able to analyze the running status of applications. -- * -- * @namespace hiAppEvent -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ --declare namespace hiAppEvent { -- /** -- * Enumerate application event types. -- * -- * @enum { number } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Enumerate application event types. -- * -- * @enum { number } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export enum EventType { -- /** -- * Fault event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Fault event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- FAULT = 1, -- -- /** -- * Statistic event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Statistic event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- STATISTIC = 2, -- -- /** -- * Security event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Security event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- SECURITY = 3, -- -- /** -- * User behavior event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * User behavior event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- BEHAVIOR = 4 -- } -- -- /** -- * Preset domain. -- * -- * @namespace domain -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export namespace domain { -- /** -- * the domain of operating system. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- const OS: string; -- } -- -- /** -- * Preset event. -- * -- * @namespace event -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Preset event. -- * -- * @namespace event -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 11 -- */ -- export namespace event { -- /** -- * User login event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * User login event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- const USER_LOGIN: string; -- -- /** -- * User logout event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * User logout event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- const USER_LOGOUT: string; -- -- /** -- * Distributed service event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Distributed service event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- const DISTRIBUTED_SERVICE_START: string; -- -- /** -- * crash event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- const APP_CRASH: string; -- -- /** -- * freeze event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- const APP_FREEZE: string; -- -- /** -- * launch event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- const APP_LAUNCH: string; -- -- /** -- * scroll jank event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- const SCROLL_JANK: string; -- -- /** -- * cpu usage high event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- const CPU_USAGE_HIGH: string; -- -- /** -- * battery usage event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- const BATTERY_USAGE: string; -- -- /** -- * resource overlimit event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- const RESOURCE_OVERLIMIT: string; -- -- /** -- * address sanitizer event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- const ADDRESS_SANITIZER: string; -- -- /** -- * main thread jank event. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- const MAIN_THREAD_JANK: string; -- } -- -- /** -- * Preset param. -- * -- * @namespace param -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Preset param. -- * -- * @namespace param -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export namespace param { -- /** -- * User id. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * User id. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- const USER_ID: string; -- -- /** -- * Distributed service name. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Distributed service name. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- const DISTRIBUTED_SERVICE_NAME: string; -- -- /** -- * Distributed service instance id. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Distributed service instance id. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- const DISTRIBUTED_SERVICE_INSTANCE_ID: string; -- } -- -- /** -- * Application event logging configuration interface. -- * -- * @param { ConfigOption } config Application event logging configuration item object. -- * @throws { BusinessError } 401 - Parameter error. -- * @throws { BusinessError } 11103001 - Invalid max storage quota value. -- * @static -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Application event logging configuration interface. -- * -- * @param { ConfigOption } config Application event logging configuration item object. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @throws { BusinessError } 11103001 - Invalid max storage quota value. -- * @static -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export function configure(config: ConfigOption): void; -- -- /** -- * Describe the options for the configuration. -- * -- * @interface ConfigOption -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Describe the options for the configuration. -- * -- * @interface ConfigOption -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export interface ConfigOption { -- /** -- * Configuration item: application event logging switch. -- * -- * @type { ?boolean } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Configuration item: application event logging switch. -- * -- * @type { ?boolean } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- disable?: boolean; -- -- /** -- * Configuration item: event file directory storage quota size. -- * -- * @type { ?string } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Configuration item: event file directory storage quota size. -- * -- * @type { ?string } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- maxStorage?: string; -- } -- -- /** -- * Definition of written application event information. -- * -- * @interface AppEventInfo -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Definition of written application event information. -- * -- * @interface AppEventInfo -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export interface AppEventInfo { -- /** -- * The domain of the event. -- * -- * @type { string } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * The domain of the event. -- * -- * @type { string } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- domain: string; -- -- /** -- * The name of the event. -- * -- * @type { string } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * The name of the event. -- * -- * @type { string } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- name: string; -- -- /** -- * The type of the event. -- * -- * @type { EventType } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * The type of the event. -- * -- * @type { EventType } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- eventType: EventType; -- -- /** -- * The params of the event. -- * -- * @type { Record } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * The params of the event. -- * -- * @type { Record } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- params: Record; -- } -- -- /** -- * Write application event. -- * -- * @param { AppEventInfo } info Application event information to be written. -- * @returns { Promise } Return Promise. -- * @throws { BusinessError } 401 - Parameter error. -- * @throws { BusinessError } 11100001 - Function disabled. -- * @throws { BusinessError } 11101001 - Invalid event domain. -- * @throws { BusinessError } 11101002 - Invalid event name. -- * @throws { BusinessError } 11101003 - Invalid number of event parameters. -- * @throws { BusinessError } 11101004 - Invalid string length of the event parameter. -- * @throws { BusinessError } 11101005 - Invalid event parameter name. -- * @throws { BusinessError } 11101006 - Invalid array length of the event parameter. -- * @static -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Write application event. -- * -- * @param { AppEventInfo } info Application event information to be written. -- * @returns { Promise } Return Promise. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @throws { BusinessError } 11100001 - Function disabled. -- * @throws { BusinessError } 11101001 - Invalid event domain. -- * @throws { BusinessError } 11101002 - Invalid event name. -- * @throws { BusinessError } 11101003 - Invalid number of event parameters. -- * @throws { BusinessError } 11101004 - Invalid string length of the event parameter. -- * @throws { BusinessError } 11101005 - Invalid event parameter name. -- * @throws { BusinessError } 11101006 - Invalid array length of the event parameter. -- * @static -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export function write(info: AppEventInfo): Promise; -- -- /** -- * Write application event. -- * -- * @param { AppEventInfo } info Application event information to be written. -- * @param { AsyncCallback } callback Callback function. -- * @throws { BusinessError } 401 - Parameter error. -- * @throws { BusinessError } 11100001 - Function disabled. -- * @throws { BusinessError } 11101001 - Invalid event domain. -- * @throws { BusinessError } 11101002 - Invalid event name. -- * @throws { BusinessError } 11101003 - Invalid number of event parameters. -- * @throws { BusinessError } 11101004 - Invalid string length of the event parameter. -- * @throws { BusinessError } 11101005 - Invalid event parameter name. -- * @throws { BusinessError } 11101006 - Invalid array length of the event parameter. -- * @static -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Write application event. -- * -- * @param { AppEventInfo } info Application event information to be written. -- * @param { AsyncCallback } callback Callback function. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @throws { BusinessError } 11100001 - Function disabled. -- * @throws { BusinessError } 11101001 - Invalid event domain. -- * @throws { BusinessError } 11101002 - Invalid event name. -- * @throws { BusinessError } 11101003 - Invalid number of event parameters. -- * @throws { BusinessError } 11101004 - Invalid string length of the event parameter. -- * @throws { BusinessError } 11101005 - Invalid event parameter name. -- * @throws { BusinessError } 11101006 - Invalid array length of the event parameter. -- * @static -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export function write(info: AppEventInfo, callback: AsyncCallback): void; -- -- /** -- * Indicates possible parameter types. -- * -- * @typedef {number | string | boolean | Array} -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- type ParamType = number | string | boolean | Array; -- -- /** -- * It is used to set custom parameters for events, including both system-subscribed events and custom events. -- * Existing parameter will be overwritten, and non-existing parameter will be created. -- * -- * @param { Record } params The parameters of the event. -- * @param { string } domain The domain of the event. -- * @param { string } name The name of the event. -- * @returns { Promise } Return Promise. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @throws { BusinessError } 11101007 - The number of parameter keys exceeds the limit. -- * @static -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export function setEventParam(params: Record, domain: string, name?: string): Promise; -- -- /** -- * Set the config for the os event. -- * -- * @param { string } name The name of the os event. -- * @param { Record } config The config info of the os event. -- * @returns { Promise } Return Promise. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3.Parameter verification failed. -- * @static -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export function setEventConfig(name: string, config: Record): Promise; -- -- /** -- * Definition of the read event package. -- * -- * @interface AppEventPackage -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Definition of the read event package. -- * -- * @interface AppEventPackage -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export interface AppEventPackage { -- /** -- * The id of the package. -- * -- * @type { number } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * The id of the package. -- * -- * @type { number } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- packageId: number; -- -- /** -- * The number of events contained in the package. -- * -- * @type { number } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * The number of events contained in the package. -- * -- * @type { number } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- row: number; -- -- /** -- * The total size of events contained in the package. -- * -- * @type { number } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * The total size of events contained in the package. -- * -- * @type { number } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- size: number; -- -- /** -- * The events data contained in the package. -- * -- * @type { string[] } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * The events data contained in the package. -- * -- * @type { string[] } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- data: string[]; -- -- /** -- * The event json format data contained in the package. -- * -- * @type { Array } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- appEventInfos: Array; -- } -- -- /** -- * Definition of event holder object, which is used to read the event data monitored by the watcher. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Definition of event holder object, which is used to read the event data monitored by the watcher. -- * -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export class AppEventPackageHolder { -- /** -- * Constructor for AppEventPackageHolder. -- * -- * @param { string } watcherName Name of the watcher to read. -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Constructor for AppEventPackageHolder. -- * -- * @param { string } watcherName Name of the watcher to read. -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- constructor(watcherName: string); -- -- /** -- * Set the threshold size per read. -- * -- * @param { number } size Threshold size. -- * @throws { BusinessError } 401 - Parameter error. -- * @throws { BusinessError } 11104001 - Invalid size value. -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Set the threshold size per read. -- * -- * @param { number } size Threshold size. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @throws { BusinessError } 11104001 - Invalid size value. -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- setSize(size: number): void; -- -- /** -- * Set the number of rows per read. -- * -- * @param { number } size Row size. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @throws { BusinessError } 11104001 - Invalid size value. -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- setRow(size: number): void; -- -- /** -- * Read the event data monitored by the watcher. -- * -- * @returns { AppEventPackage } The read event package. -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Read the event data monitored by the watcher. -- * -- * @returns { AppEventPackage } The read event package. -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- takeNext(): AppEventPackage; -- } -- -- /** -- * Definition of the condition for triggering callback when the watcher monitors event data. -- * -- * @interface TriggerCondition -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Definition of the condition for triggering callback when the watcher monitors event data. -- * -- * @interface TriggerCondition -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export interface TriggerCondition { -- /** -- * The number of write events that trigger callback. -- * -- * @type { ?number } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * The number of write events that trigger callback. -- * -- * @type { ?number } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- row?: number; -- -- /** -- * The size of write events that trigger callback. -- * -- * @type { ?number } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * The size of write events that trigger callback. -- * -- * @type { ?number } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- size?: number; -- -- /** -- * The interval for triggering callback. -- * -- * @type { ?number } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * The interval for triggering callback. -- * -- * @type { ?number } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- timeOut?: number; -- } -- -- /** -- * Definition of event filter object, which is used to filter events monitored by the watcher. -- * -- * @interface AppEventFilter -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Definition of event filter object, which is used to filter events monitored by the watcher. -- * -- * @interface AppEventFilter -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export interface AppEventFilter { -- /** -- * The name of the event domain to be monitored by the watcher. -- * -- * @type { string } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * The name of the event domain to be monitored by the watcher. -- * -- * @type { string } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- domain: string; -- -- /** -- * The types of the events to be monitored by the watcher. -- * -- * @type { ?EventType[] } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * The types of the events to be monitored by the watcher. -- * -- * @type { ?EventType[] } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- eventTypes?: EventType[]; -- -- /** -- * The names of the events to be monitored by the watcher. -- * -- * @type { ?string[] } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- names?: string[]; -- } -- -- /** -- * Definition of event group. -- * -- * @interface AppEventGroup -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export interface AppEventGroup { -- /** -- * The name of the event. -- * -- * @type { string } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- name: string; -- -- /** -- * The event array which is group by the name. -- * -- * @type { Array } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- appEventInfos: Array; -- } -- -- /** -- * Definition of event watcher object, which is used to monitor written event data. -- * -- * @interface Watcher -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Definition of event watcher object, which is used to monitor written event data. -- * -- * @interface Watcher -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export interface Watcher { -- /** -- * The name of watcher. -- * -- * @type { string } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * The name of watcher. -- * -- * @type { string } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- name: string; -- -- /** -- * The condition for triggering callback. -- * -- * @type { ?TriggerCondition } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * The condition for triggering callback. -- * -- * @type { ?TriggerCondition } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- triggerCondition?: TriggerCondition; -- -- /** -- * The event filters for monitoring events. -- * -- * @type { ?AppEventFilter[] } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * The event filters for monitoring events. -- * -- * @type { ?AppEventFilter[] } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- appEventFilters?: AppEventFilter[]; -- -- /** -- * The callback function of watcher. -- * -- * @type { ?function } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * The callback function of watcher. -- * -- * @type { ?function } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- onTrigger?: (curRow: number, curSize: number, holder: AppEventPackageHolder) => void; -- -- /** -- * The callback function, when watcher receive the event. -- * -- * @type { ?function } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- onReceive?: (domain: string, appEventGroups: Array) => void; -- } -- -- /** -- * Add event watcher. -- * -- * @param { Watcher } watcher Watcher object for monitoring events. -- * @returns { AppEventPackageHolder } Holder object, which is used to read the monitoring data of the watcher. -- * @throws { BusinessError } 401 - Parameter error. -- * @throws { BusinessError } 11102001 - Invalid watcher name. -- * @throws { BusinessError } 11102002 - Invalid filtering event domain. -- * @throws { BusinessError } 11102003 - Invalid row value. -- * @throws { BusinessError } 11102004 - Invalid size value. -- * @throws { BusinessError } 11102005 - Invalid timeout value. -- * @static -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Add event watcher. -- * -- * @param { Watcher } watcher Watcher object for monitoring events. -- * @returns { AppEventPackageHolder } Holder object, which is used to read the monitoring data of the watcher. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @throws { BusinessError } 11102001 - Invalid watcher name. -- * @throws { BusinessError } 11102002 - Invalid filtering event domain. -- * @throws { BusinessError } 11102003 - Invalid row value. -- * @throws { BusinessError } 11102004 - Invalid size value. -- * @throws { BusinessError } 11102005 - Invalid timeout value. -- * @static -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export function addWatcher(watcher: Watcher): AppEventPackageHolder; -- -- /** -- * Remove event watcher. -- * -- * @param { Watcher } watcher Watcher object for monitoring events. -- * @throws { BusinessError } 401 - Parameter error. -- * @throws { BusinessError } 11102001 - Invalid watcher name. -- * @static -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Remove event watcher. -- * -- * @param { Watcher } watcher Watcher object for monitoring events. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @throws { BusinessError } 11102001 - Invalid watcher name. -- * @static -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export function removeWatcher(watcher: Watcher): void; -- -- /** -- * Clear all local logging data of the application. -- * -- * @static -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @since 20 -- */ -- /** -- * Clear all local logging data of the application. -- * -- * @static -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export function clearData(): void; -- -- /** -- * Set user ID. -- * -- * @param { string } name The key of the user ID. -- * @param { string } value The value of the user ID. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @static -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export function setUserId(name: string, value: string): void; -- -- /** -- * Get user ID. -- * -- * @param { string } name The key of the user ID. -- * @returns { string } the user ID value. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @static -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export function getUserId(name: string): string; -- -- /** -- * Set user property. -- * -- * @param { string } name The key of the user property. -- * @param { string } value The value of the user property. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @static -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export function setUserProperty(name: string, value: string): void; -- -- /** -- * Get user property. -- * -- * @param { string } name The key of the user property. -- * @returns { string } the user property value. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @static -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export function getUserProperty(name: string): string; -- -- /** -- * Describe the event config to be reported by processor. -- * -- * @interface AppEventReportConfig -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export interface AppEventReportConfig { -- /** -- * The domain of the event. -- * -- * @type { ?string } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- domain?: string; -- -- /** -- * The name of the event. -- * -- * @type { ?string } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- name?: string; -- -- /** -- * The realtime report event. -- * -- * @type { ?boolean } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- isRealTime?: boolean; -- } -- -- /** -- * Definition of the processor. -- * -- * @interface Processor -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export interface Processor { -- /** -- * The name of the processor. -- * -- * @type { string } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- name: string; -- -- /** -- * The processor enable the developer to debug. -- * -- * @type { ?boolean } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- debugMode?: boolean; -- -- /** -- * The server location which used for the processor to receive the data, defined by the processor. -- * -- * @type { ?string } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- routeInfo?: string; -- -- /** -- * The app ID is provided by the processor. -- * -- * @type { ?string } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- appId?: string; -- -- /** -- * The processor report the event when start. -- * -- * @type { ?boolean } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- onStartReport?: boolean; -- -- /** -- * The processor report the event when the application onBackground. -- * -- * @type { ?boolean } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- onBackgroundReport?: boolean; -- -- /** -- * The processor report the event according to the period. -- * -- * @type { ?number } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- periodReport?: int; -- -- /** -- * The processor report the event according to the batch size. -- * -- * @type { ?number } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- batchReport?: int; -- -- /** -- * The user ID names which the processor can report. -- * -- * @type { ?string[] } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- userIds?: string[]; -- -- /** -- * The user property names which the processor can report. -- * -- * @type { ?string[] } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- userProperties?: string[]; -- -- /** -- * The events which the processor can report. -- * -- * @type { ?AppEventReportConfig[] } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- eventConfigs?: AppEventReportConfig[]; -- -- /** -- * The processor config id. -- * -- * @type { ?number } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- configId?: int; -- -- /** -- * The processor set custom config data. -- * -- * @type { ?Record } -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- customConfigs?: Record; -- } -- -- /** -- * Add the processor, who can report the event. -- * -- * @param { Processor } processor The instance which report the event -- * @returns { number } The processor unique ID. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @static -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export function addProcessor(processor: Processor): number; -- -- /** -- * Remove the processor. -- * -- * @param { number } id The processor unique ID. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types. -- * @static -- * @syscap SystemCapability.HiviewDFX.HiAppEvent -- * @atomicservice -- * @since 20 -- */ -- export function removeProcessor(id: number): void; --} -- --export default hiAppEvent; -diff --git a/api/@ohos.hiviewdfx.hiAppEvent.d.ts b/api/@ohos.hiviewdfx.hiAppEvent.d.ts -index 182510902..481980b23 100644 ---- a/api/@ohos.hiviewdfx.hiAppEvent.d.ts -+++ b/api/@ohos.hiviewdfx.hiAppEvent.d.ts -@@ -37,7 +37,8 @@ import type { AsyncCallback } from './@ohos.base'; - * @namespace hiAppEvent - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace hiAppEvent { - /** -@@ -53,7 +54,8 @@ declare namespace hiAppEvent { - * @enum { number } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum EventType { - /** -@@ -67,7 +69,8 @@ declare namespace hiAppEvent { - * - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FAULT = 1, - -@@ -82,7 +85,8 @@ declare namespace hiAppEvent { - * - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - STATISTIC = 2, - -@@ -97,7 +101,8 @@ declare namespace hiAppEvent { - * - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SECURITY = 3, - -@@ -112,7 +117,8 @@ declare namespace hiAppEvent { - * - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BEHAVIOR = 4 - } -@@ -123,7 +129,8 @@ declare namespace hiAppEvent { - * @namespace domain - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - namespace domain { - /** -@@ -131,7 +138,8 @@ declare namespace hiAppEvent { - * - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const OS: string; - } -@@ -149,7 +157,8 @@ declare namespace hiAppEvent { - * @namespace event - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - namespace event { - /** -@@ -163,7 +172,8 @@ declare namespace hiAppEvent { - * - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const USER_LOGIN: string; - -@@ -178,7 +188,8 @@ declare namespace hiAppEvent { - * - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const USER_LOGOUT: string; - -@@ -193,7 +204,8 @@ declare namespace hiAppEvent { - * - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const DISTRIBUTED_SERVICE_START: string; - -@@ -202,7 +214,8 @@ declare namespace hiAppEvent { - * - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const APP_CRASH: string; - -@@ -211,7 +224,8 @@ declare namespace hiAppEvent { - * - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const APP_FREEZE: string; - -@@ -220,7 +234,8 @@ declare namespace hiAppEvent { - * - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const APP_LAUNCH: string; - -@@ -229,7 +244,8 @@ declare namespace hiAppEvent { - * - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const SCROLL_JANK: string; - -@@ -238,7 +254,8 @@ declare namespace hiAppEvent { - * - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const CPU_USAGE_HIGH: string; - -@@ -247,7 +264,8 @@ declare namespace hiAppEvent { - * - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const BATTERY_USAGE: string; - -@@ -256,7 +274,8 @@ declare namespace hiAppEvent { - * - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const RESOURCE_OVERLIMIT: string; - -@@ -265,7 +284,8 @@ declare namespace hiAppEvent { - * - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const ADDRESS_SANITIZER: string; - -@@ -274,7 +294,8 @@ declare namespace hiAppEvent { - * - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const MAIN_THREAD_JANK: string; - } -@@ -292,7 +313,8 @@ declare namespace hiAppEvent { - * @namespace param - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - namespace param { - /** -@@ -306,7 +328,8 @@ declare namespace hiAppEvent { - * - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const USER_ID: string; - -@@ -321,7 +344,8 @@ declare namespace hiAppEvent { - * - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const DISTRIBUTED_SERVICE_NAME: string; - -@@ -336,7 +360,8 @@ declare namespace hiAppEvent { - * - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - const DISTRIBUTED_SERVICE_INSTANCE_ID: string; - } -@@ -361,7 +386,8 @@ declare namespace hiAppEvent { - * @static - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function configure(config: ConfigOption): void; - -@@ -378,7 +404,8 @@ declare namespace hiAppEvent { - * @interface ConfigOption - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ConfigOption { - /** -@@ -394,7 +421,8 @@ declare namespace hiAppEvent { - * @type { ?boolean } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - disable?: boolean; - -@@ -411,7 +439,8 @@ declare namespace hiAppEvent { - * @type { ?string } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - maxStorage?: string; - } -@@ -429,7 +458,8 @@ declare namespace hiAppEvent { - * @interface AppEventInfo - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface AppEventInfo { - /** -@@ -445,7 +475,8 @@ declare namespace hiAppEvent { - * @type { string } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - domain: string; - -@@ -462,7 +493,8 @@ declare namespace hiAppEvent { - * @type { string } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - name: string; - -@@ -479,7 +511,8 @@ declare namespace hiAppEvent { - * @type { EventType } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - eventType: EventType; - -@@ -496,7 +529,8 @@ declare namespace hiAppEvent { - * @type { object } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - params: object; - } -@@ -535,7 +569,8 @@ declare namespace hiAppEvent { - * @static - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function write(info: AppEventInfo): Promise; - -@@ -573,7 +608,8 @@ declare namespace hiAppEvent { - * @static - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function write(info: AppEventInfo, callback: AsyncCallback): void; - -@@ -583,7 +619,8 @@ declare namespace hiAppEvent { - * @typedef {number | string | boolean | Array} - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type ParamType = number | string | boolean | Array; - -@@ -601,7 +638,8 @@ declare namespace hiAppEvent { - * @static - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setEventParam(params: Record, domain: string, name?: string): Promise; - -@@ -616,7 +654,8 @@ declare namespace hiAppEvent { - * @static - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setEventConfig(name: string, config: Record): Promise; - -@@ -633,7 +672,8 @@ declare namespace hiAppEvent { - * @interface AppEventPackage - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface AppEventPackage { - /** -@@ -649,7 +689,8 @@ declare namespace hiAppEvent { - * @type { number } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - packageId: number; - -@@ -666,7 +707,8 @@ declare namespace hiAppEvent { - * @type { number } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - row: number; - -@@ -683,7 +725,8 @@ declare namespace hiAppEvent { - * @type { number } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - size: number; - -@@ -700,7 +743,8 @@ declare namespace hiAppEvent { - * @type { string[] } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - data: string[]; - -@@ -710,7 +754,8 @@ declare namespace hiAppEvent { - * @type { Array } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - appEventInfos: Array; - } -@@ -726,7 +771,8 @@ declare namespace hiAppEvent { - * - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class AppEventPackageHolder { - /** -@@ -742,7 +788,8 @@ declare namespace hiAppEvent { - * @param { string } watcherName Name of the watcher to read. - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - constructor(watcherName: string); - -@@ -764,7 +811,8 @@ declare namespace hiAppEvent { - * @throws { BusinessError } 11104001 - Invalid size value. - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setSize(size: number): void; - -@@ -777,7 +825,8 @@ declare namespace hiAppEvent { - * @throws { BusinessError } 11104001 - Invalid size value. - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setRow(size: number): void; - -@@ -794,7 +843,8 @@ declare namespace hiAppEvent { - * @returns { AppEventPackage } The read event package. - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - takeNext(): AppEventPackage; - } -@@ -812,7 +862,8 @@ declare namespace hiAppEvent { - * @interface TriggerCondition - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface TriggerCondition { - /** -@@ -828,7 +879,8 @@ declare namespace hiAppEvent { - * @type { ?number } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - row?: number; - -@@ -845,7 +897,8 @@ declare namespace hiAppEvent { - * @type { ?number } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - size?: number; - -@@ -862,7 +915,8 @@ declare namespace hiAppEvent { - * @type { ?number } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - timeOut?: number; - } -@@ -880,7 +934,8 @@ declare namespace hiAppEvent { - * @interface AppEventFilter - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface AppEventFilter { - /** -@@ -896,7 +951,8 @@ declare namespace hiAppEvent { - * @type { string } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - domain: string; - -@@ -913,7 +969,8 @@ declare namespace hiAppEvent { - * @type { ?EventType[] } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - eventTypes?: EventType[]; - -@@ -923,7 +980,8 @@ declare namespace hiAppEvent { - * @type { ?string[] } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - names?: string[]; - } -@@ -934,7 +992,8 @@ declare namespace hiAppEvent { - * @interface AppEventGroup - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface AppEventGroup { - /** -@@ -943,7 +1002,8 @@ declare namespace hiAppEvent { - * @type { string } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - name: string; - -@@ -953,7 +1013,8 @@ declare namespace hiAppEvent { - * @type { Array } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - appEventInfos: Array; - } -@@ -971,7 +1032,8 @@ declare namespace hiAppEvent { - * @interface Watcher - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Watcher { - /** -@@ -987,7 +1049,8 @@ declare namespace hiAppEvent { - * @type { string } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - name: string; - -@@ -1004,7 +1067,8 @@ declare namespace hiAppEvent { - * @type { ?TriggerCondition } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - triggerCondition?: TriggerCondition; - -@@ -1021,7 +1085,8 @@ declare namespace hiAppEvent { - * @type { ?AppEventFilter[] } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - appEventFilters?: AppEventFilter[]; - -@@ -1038,7 +1103,8 @@ declare namespace hiAppEvent { - * @type { ?function } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onTrigger?: (curRow: number, curSize: number, holder: AppEventPackageHolder) => void; - -@@ -1048,7 +1114,8 @@ declare namespace hiAppEvent { - * @type { ?function } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onReceive?: (domain: string, appEventGroups: Array) => void; - } -@@ -1083,7 +1150,8 @@ declare namespace hiAppEvent { - * @static - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function addWatcher(watcher: Watcher): AppEventPackageHolder; - -@@ -1107,7 +1175,8 @@ declare namespace hiAppEvent { - * @static - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function removeWatcher(watcher: Watcher): void; - -@@ -1124,7 +1193,8 @@ declare namespace hiAppEvent { - * @static - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function clearData(): void; - -@@ -1138,7 +1208,8 @@ declare namespace hiAppEvent { - * @static - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setUserId(name: string, value: string): void; - -@@ -1152,7 +1223,8 @@ declare namespace hiAppEvent { - * @static - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getUserId(name: string): string; - -@@ -1166,7 +1238,8 @@ declare namespace hiAppEvent { - * @static - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setUserProperty(name: string, value: string): void; - -@@ -1180,7 +1253,8 @@ declare namespace hiAppEvent { - * @static - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getUserProperty(name: string): string; - -@@ -1190,7 +1264,8 @@ declare namespace hiAppEvent { - * @interface AppEventReportConfig - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface AppEventReportConfig { - /** -@@ -1199,7 +1274,8 @@ declare namespace hiAppEvent { - * @type { ?string } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - domain?: string; - -@@ -1209,7 +1285,8 @@ declare namespace hiAppEvent { - * @type { ?string } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - name?: string; - -@@ -1219,7 +1296,8 @@ declare namespace hiAppEvent { - * @type { ?boolean } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isRealTime?: boolean; - } -@@ -1230,7 +1308,8 @@ declare namespace hiAppEvent { - * @interface Processor - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Processor { - /** -@@ -1239,7 +1318,8 @@ declare namespace hiAppEvent { - * @type { string } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - name: string; - -@@ -1249,7 +1329,8 @@ declare namespace hiAppEvent { - * @type { ?boolean } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - debugMode?: boolean; - -@@ -1259,7 +1340,8 @@ declare namespace hiAppEvent { - * @type { ?string } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - routeInfo?: string; - -@@ -1269,7 +1351,8 @@ declare namespace hiAppEvent { - * @type { ?string } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - appId?: string; - -@@ -1279,7 +1362,8 @@ declare namespace hiAppEvent { - * @type { ?boolean } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onStartReport?: boolean; - -@@ -1289,7 +1373,8 @@ declare namespace hiAppEvent { - * @type { ?boolean } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onBackgroundReport?: boolean; - -@@ -1299,7 +1384,8 @@ declare namespace hiAppEvent { - * @type { ?number } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - periodReport?: number; - -@@ -1309,7 +1395,8 @@ declare namespace hiAppEvent { - * @type { ?number } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - batchReport?: number; - -@@ -1319,7 +1406,8 @@ declare namespace hiAppEvent { - * @type { ?string[] } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - userIds?: string[]; - -@@ -1329,7 +1417,8 @@ declare namespace hiAppEvent { - * @type { ?string[] } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - userProperties?: string[]; - -@@ -1339,7 +1428,8 @@ declare namespace hiAppEvent { - * @type { ?AppEventReportConfig[] } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - eventConfigs?: AppEventReportConfig[]; - -@@ -1349,7 +1439,8 @@ declare namespace hiAppEvent { - * @type { ?number } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - configId?: number; - -@@ -1359,7 +1450,8 @@ declare namespace hiAppEvent { - * @type { ?Record } - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - customConfigs?: Record; - } -@@ -1374,7 +1466,8 @@ declare namespace hiAppEvent { - * @static - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function addProcessor(processor: Processor): number; - -@@ -1387,7 +1480,8 @@ declare namespace hiAppEvent { - * @static - * @syscap SystemCapability.HiviewDFX.HiAppEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function removeProcessor(id: number): void; - } -diff --git a/api/@ohos.i18n.d.ts b/api/@ohos.i18n.d.ts -index bf4e0fbbd..79c6acc5d 100644 ---- a/api/@ohos.i18n.d.ts -+++ b/api/@ohos.i18n.d.ts -@@ -3892,11 +3892,11 @@ declare namespace i18n { - * - * @param { intl.NumberFormat | SimpleNumberFormat } numberFormat - Indicates the number format object that used to format number. - * @param { StyledNumberFormatOptions } [ options ] - Indicates the options used to format the number. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Global.I18n - * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 -+ * @deprecated since 20 - */ - constructor(numberFormat: intl.NumberFormat | SimpleNumberFormat, options?: StyledNumberFormatOptions); - -diff --git a/api/@ohos.inputMethod.d.ts b/api/@ohos.inputMethod.d.ts -index 9edc69070..5577361e8 100644 ---- a/api/@ohos.inputMethod.d.ts -+++ b/api/@ohos.inputMethod.d.ts -@@ -17,7 +17,7 @@ - * @file - * @kit IMEKit - */ --import type { Callback, AsyncCallback, /*** if arkts 1.1 */int /*** endif */} from './@ohos.base'; -+import type { Callback, AsyncCallback } from './@ohos.base'; - import InputMethodSubtype from './@ohos.InputMethodSubtype'; - /*** if arkts 1.1 */ - import type { ElementName } from './bundleManager/ElementName'; -@@ -1478,13 +1478,13 @@ declare namespace inputMethod { - /** - * The label id of input method - * -- * @type { ?number } -+ * @type { ?double } - * @readonly - * @syscap SystemCapability.MiscServices.InputMethodFramework -- * @since arkts {'1.1':'9', '1.2':'20'} -+ * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly labelId?: number; -+ readonly labelId?: double; - - /** - * The icon of input method -@@ -1500,13 +1500,13 @@ declare namespace inputMethod { - /** - * The icon id of input method - * -- * @type { ?number } -+ * @type { ?double } - * @readonly - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly iconId?: number; -+ readonly iconId?: double; - - /** - * The extra info of input method -@@ -1911,42 +1911,42 @@ declare namespace inputMethod { - /** - * Indicates the left point of the cursor info and must be absolute coordinate of the physical screen. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- left: number; -+ left: double; - - /** - * Indicates the top point of the cursor info and must be absolute coordinate of the physical screen. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- top: number; -+ top: double; - - /** - * Indicates the width point of the cursor info. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- width: number; -+ width: double; - - /** - * Indicates the height point of the cursor info. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- height: number; -+ height: double; - } - - /** -@@ -2087,22 +2087,22 @@ declare namespace inputMethod { - /** - * Indicates the width of the input window. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- width: number; -+ width: double; - - /** - * Indicates the height of the input window. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- height: number; -+ height: double; - } - - /** -diff --git a/api/@ohos.inputMethodList.d.ets b/api/@ohos.inputMethodList.d.ets -index 3d83cd762..81d1fc6fd 100644 ---- a/api/@ohos.inputMethodList.d.ets -+++ b/api/@ohos.inputMethodList.d.ets -@@ -18,9 +18,6 @@ - * @kit IMEKit - */ - --import { Resource } from './global/resource'; --import { CustomDialogController } from './arkui/component/customDialogController' -- - /** - * Define pattern options of keyboard. - * -@@ -87,10 +84,8 @@ export interface Pattern { - * @syscap SystemCapability.MiscServices.InputMethodFramework - * @since 11 - */ --/** -- * @CustomDialog -- */ --declare interface InputMethodListDialog { -+@CustomDialog -+export declare struct InputMethodListDialog { - /** - * Sets the controller. - * -@@ -107,5 +102,4 @@ declare interface InputMethodListDialog { - * @since 11 - */ - patternOptions?: PatternOptions; --} --export InputMethodListDialog; -\ No newline at end of file -+} -\ No newline at end of file -diff --git a/api/@ohos.logLibrary.d.ets b/api/@ohos.logLibrary.d.ets -deleted file mode 100644 -index a1c3f1b3a..000000000 ---- a/api/@ohos.logLibrary.d.ets -+++ /dev/null -@@ -1,192 +0,0 @@ --/* -- * Copyright (c) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --/** -- * @file -- * @kit PerformanceAnalysisKit -- */ -- --import type { AsyncCallback } from './@ohos.base'; -- --/** -- * @namespace logLibrary -- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary -- * @systemapi -- * @since 20 -- */ --declare namespace logLibrary { -- /** -- * Log file entry -- * -- * @typedef LogEntry -- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary -- * @systemapi -- * @since 20 -- */ -- export interface LogEntry { -- /** -- * Log file name -- * -- * @type { string } -- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary -- * @systemapi -- * @since 20 -- */ -- name: string; -- -- /** -- * File modification time, expressed by the number of seconds elapsed from 1970-01-01 -- * -- * @type { number } -- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary -- * @systemapi -- * @since 20 -- */ -- mtime: number; -- -- /** -- * Log file size, byte -- * -- * @type { number } -- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary -- * @systemapi -- * @since 20 -- */ -- size: number; -- } -- -- /** -- * List all log names of log type -- * -- * @permission ohos.permission.READ_HIVIEW_SYSTEM -- * @param { string } logType - Log type -- * @returns { LogEntry[] } Return LogEntry[] -- * @throws { BusinessError } 201 - Permission denied -- * @throws { BusinessError } 202 - Permission denied, non-system app called system api -- * @throws { BusinessError } 401 - Invalid argument. Possible causes: -- *
    1. Mandatory parameters are left unspecified. -- *
    2. Incorrect parameter types. -- *
    3. Parameter verification failed. -- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary -- * @systemapi -- * @since 20 -- */ -- export function list(logType: string): LogEntry[]; -- -- /** -- * Copy log to dest path -- * -- * @permission ohos.permission.READ_HIVIEW_SYSTEM -- * @param { string } logType - Log type -- * @param { string } logName - Log name -- * @param { string } dest - Log path under hiview sandbox of HAP -- * @returns { Promise } Return Promise -- * @throws { BusinessError } 201 - Permission denied -- * @throws { BusinessError } 202 - Permission denied, non-system app called system api -- * @throws { BusinessError } 401 - Invalid argument. Possible causes: -- *
    1. Mandatory parameters are left unspecified. -- *
    2. Incorrect parameter types. -- *
    3. Parameter verification failed. -- * @throws { BusinessError } 21300001 - Source file does not exists -- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary -- * @systemapi -- * @since 20 -- */ -- export function copy(logType: string, logName: string, dest: string): Promise; -- -- /** -- * Copy log to dest path -- * -- * @permission ohos.permission.READ_HIVIEW_SYSTEM -- * @param { string } logType - Log type -- * @param { string } logName - Log name -- * @param { string } dest - Log path under hiview sandbox of HAP -- * @param { AsyncCallback } callback - After finish copy log will callback -- * @throws { BusinessError } 201 - Permission denied -- * @throws { BusinessError } 202 - Permission denied, non-system app called system api -- * @throws { BusinessError } 401 - Invalid argument. Possible causes: -- *
    1. Mandatory parameters are left unspecified. -- *
    2. Incorrect parameter types. -- *
    3. Parameter verification failed. -- * @throws { BusinessError } 21300001 - Source file does not exists -- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary -- * @systemapi -- * @since 20 -- */ -- export function copy(logType: string, logName: string, dest: string, callback: AsyncCallback): void; -- -- /** -- * Move log to dest path -- * -- * @permission ohos.permission.WRITE_HIVIEW_SYSTEM -- * @param { string } logType - Log type -- * @param { string } logName - Log name -- * @param { string } dest - Log path under hiview sandbox of HAP -- * @returns { Promise } Return Promise -- * @throws { BusinessError } 201 - Permission denied -- * @throws { BusinessError } 202 - Permission denied, non-system app called system api -- * @throws { BusinessError } 401 - Invalid argument. Possible causes: -- *
    1. Mandatory parameters are left unspecified. -- *
    2. Incorrect parameter types. -- *
    3. Parameter verification failed. -- * @throws { BusinessError } 21300001 - Source file does not exists -- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary -- * @systemapi -- * @since 20 -- */ -- export function move(logType: string, logName: string, dest: string): Promise; -- -- /** -- * Move log to dest path -- * -- * @permission ohos.permission.WRITE_HIVIEW_SYSTEM -- * @param { string } logType - Log type -- * @param { string } logName - Log name -- * @param { string } dest - Log path under hiview sandbox of HAP -- * @param { AsyncCallback } callback - After finish move log will callback -- * @throws { BusinessError } 201 - Permission denied -- * @throws { BusinessError } 202 - Permission denied, non-system app called system api -- * @throws { BusinessError } 401 - Invalid argument. Possible causes: -- *
    1. Mandatory parameters are left unspecified. -- *
    2. Incorrect parameter types. -- *
    3. Parameter verification failed. -- * @throws { BusinessError } 21300001 - Source file does not exists -- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary -- * @systemapi -- * @since 20 -- */ -- export function move(logType: string, logName: string, dest: string, callback: AsyncCallback): void; -- -- /** -- * Delete the log based on log name and log type -- * -- * @permission ohos.permission.WRITE_HIVIEW_SYSTEM -- * @param { string } logType - Log type -- * @param { string } logName - Log name -- * @throws { BusinessError } 201 - Permission denied -- * @throws { BusinessError } 202 - Permission denied, non-system app called system api -- * @throws { BusinessError } 401 - Invalid argument. Possible causes: -- *
    1. Mandatory parameters are left unspecified. -- *
    2. Incorrect parameter types. -- *
    3. Parameter verification failed. -- * @throws { BusinessError } 21300001 - Source file does not exists -- * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary -- * @systemapi -- * @since 20 -- */ -- export function remove(logType: string, logName: string): void; --} -- --export default logLibrary; -diff --git a/api/@ohos.logLibrary.d.ts b/api/@ohos.logLibrary.d.ts -index e73e661af..f6ce0a56b 100644 ---- a/api/@ohos.logLibrary.d.ts -+++ b/api/@ohos.logLibrary.d.ts -@@ -24,7 +24,8 @@ import type { AsyncCallback } from './@ohos.base'; - * @namespace logLibrary - * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace logLibrary { - /** -@@ -33,7 +34,8 @@ declare namespace logLibrary { - * @typedef LogEntry - * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface LogEntry { - /** -@@ -42,7 +44,8 @@ declare namespace logLibrary { - * @type { string } - * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - name: string; - -@@ -52,7 +55,8 @@ declare namespace logLibrary { - * @type { number } - * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - mtime: number; - -@@ -62,7 +66,8 @@ declare namespace logLibrary { - * @type { number } - * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - size: number; - } -@@ -81,7 +86,8 @@ declare namespace logLibrary { - *
    3. Parameter verification failed. - * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function list(logType: string): LogEntry[]; - -@@ -102,7 +108,8 @@ declare namespace logLibrary { - * @throws { BusinessError } 21300001 - Source file does not exists - * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function copy(logType: string, logName: string, dest: string): Promise; - -@@ -123,7 +130,8 @@ declare namespace logLibrary { - * @throws { BusinessError } 21300001 - Source file does not exists - * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function copy(logType: string, logName: string, dest: string, callback: AsyncCallback): void; - -@@ -144,7 +152,8 @@ declare namespace logLibrary { - * @throws { BusinessError } 21300001 - Source file does not exists - * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function move(logType: string, logName: string, dest: string): Promise; - -@@ -165,7 +174,8 @@ declare namespace logLibrary { - * @throws { BusinessError } 21300001 - Source file does not exists - * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function move(logType: string, logName: string, dest: string, callback: AsyncCallback): void; - -@@ -184,7 +194,8 @@ declare namespace logLibrary { - * @throws { BusinessError } 21300001 - Source file does not exists - * @syscap SystemCapability.HiviewDFX.Hiview.LogLibrary - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function remove(logType: string, logName: string): void; - } -diff --git a/api/@ohos.matrix4.d.ts b/api/@ohos.matrix4.d.ts -index 697edb1b7..079963f1b 100644 ---- a/api/@ohos.matrix4.d.ts -+++ b/api/@ohos.matrix4.d.ts -@@ -69,7 +69,7 @@ declare namespace matrix4 { - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- interface TranslateOption { -+ export interface TranslateOption { - /** - * Indicates the translation distance of the x-axis, in px. - * -@@ -177,7 +177,7 @@ declare namespace matrix4 { - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- interface ScaleOption { -+ export interface ScaleOption { - /** - * Zoom factor of the x-axis. - * -@@ -339,7 +339,7 @@ declare namespace matrix4 { - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- interface RotateOption { -+ export interface RotateOption { - /** - * Axis of rotation vector x coordinate. - * -@@ -643,7 +643,7 @@ declare namespace matrix4 { - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- interface Matrix4Transit { -+ export interface Matrix4Transit { - /** - * Copy function of Matrix, which can copy a copy of the current matrix object. - * -diff --git a/api/@ohos.multimedia.audio.d.ts b/api/@ohos.multimedia.audio.d.ts -index 6389c9884..4e9a3a755 100644 ---- a/api/@ohos.multimedia.audio.d.ts -+++ b/api/@ohos.multimedia.audio.d.ts -@@ -825,6 +825,20 @@ declare namespace audio { - * @arkts 1.1&1.2 - */ - USB_DEVICE = 25, -+ /** -+ * HDMI device, such as HDMI, ARC, eARC -+ * @syscap SystemCapability.Multimedia.Audio.Device -+ * @since arkts {'1.1':'19','1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ HDMI = 27, -+ /** -+ * Line connected digital output device, such as s/pdif -+ * @syscap SystemCapability.Multimedia.Audio.Device -+ * @since arkts {'1.1':'19','1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ LINE_DIGITAL = 28, - /** - * Distributed virtualization audio device. - * @syscap SystemCapability.Multimedia.Audio.Device -diff --git a/api/@ohos.multimedia.avCastPickerParam.d.ts b/api/@ohos.multimedia.avCastPickerParam.d.ts -index a98cb4282..6cc41b8d7 100644 ---- a/api/@ohos.multimedia.avCastPickerParam.d.ts -+++ b/api/@ohos.multimedia.avCastPickerParam.d.ts -@@ -29,7 +29,8 @@ - * @enum { number } - * @syscap SystemCapability.Multimedia.AVSession.AVCast - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export declare enum AVCastPickerState { - /** -@@ -64,7 +65,8 @@ export declare enum AVCastPickerState { - * @enum { number } - * @syscap SystemCapability.Multimedia.AVSession.AVCast - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export declare enum AVCastPickerStyle { - /** -@@ -89,7 +91,8 @@ export declare enum AVCastPickerStyle { - * @enum { number } - * @syscap SystemCapability.Multimedia.AVSession.AVCast - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export declare enum AVCastPickerColorMode { - /** -diff --git a/api/@ohos.multimedia.avsession.d.ts b/api/@ohos.multimedia.avsession.d.ts -index 3fb8470f7..18cb86367 100644 ---- a/api/@ohos.multimedia.avsession.d.ts -+++ b/api/@ohos.multimedia.avsession.d.ts -@@ -19,7 +19,7 @@ - */ - - import type { ErrorCallback, AsyncCallback, Callback } from './@ohos.base'; --import { WantAgent } from './@ohos.wantAgent'; -+import { WantAgent } from './@ohos.app.ability.wantAgent'; - import { KeyEvent } from './@ohos.multimodalInput.keyEvent'; - import { ElementName } from './bundleManager/ElementName'; - import image from './@ohos.multimedia.image'; -diff --git a/api/@ohos.multimedia.camera.d.ts b/api/@ohos.multimedia.camera.d.ts -index 12a3abe04..bb136d7cd 100644 ---- a/api/@ohos.multimedia.camera.d.ts -+++ b/api/@ohos.multimedia.camera.d.ts -@@ -53,7 +53,7 @@ declare namespace camera { - /** - * Enum for camera status. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 -@@ -99,7 +99,7 @@ declare namespace camera { - /** - * Enum for fold status. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 -@@ -138,7 +138,8 @@ declare namespace camera { - * - * @typedef Profile - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Profile { - /** -@@ -147,7 +148,8 @@ declare namespace camera { - * @type { CameraFormat } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly format: CameraFormat; - -@@ -157,7 +159,8 @@ declare namespace camera { - * @type { Size } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly size: Size; - } -@@ -167,28 +170,31 @@ declare namespace camera { - * - * @typedef FrameRateRange - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface FrameRateRange { - /** - * Min frame rate. - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly min: number; -+ readonly min: int; - - /** - * Max frame rate. - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly max: number; -+ readonly max: int; - } - - /** -@@ -197,7 +203,8 @@ declare namespace camera { - * @extends Profile - * @typedef VideoProfile - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface VideoProfile extends Profile { - /** -@@ -206,7 +213,8 @@ declare namespace camera { - * @type { FrameRateRange } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly frameRateRange: FrameRateRange; - } -@@ -216,7 +224,8 @@ declare namespace camera { - * - * @typedef CameraOutputCapability - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface CameraOutputCapability { - /** -@@ -225,7 +234,8 @@ declare namespace camera { - * @type { Array } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly previewProfiles: Array; - -@@ -235,7 +245,8 @@ declare namespace camera { - * @type { Array } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly photoProfiles: Array; - -@@ -245,7 +256,8 @@ declare namespace camera { - * @type { Array } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly videoProfiles: Array; - -@@ -256,7 +268,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly depthProfiles: Array; - -@@ -266,7 +279,8 @@ declare namespace camera { - * @type { Array } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly supportedMetadataObjectTypes: Array; - } -@@ -274,16 +288,18 @@ declare namespace camera { - /** - * Enum for camera error code. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum CameraErrorCode { - /** - * Parameter missing or parameter type incorrect. - * - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INVALID_ARGUMENT = 7400101, - -@@ -291,7 +307,8 @@ declare namespace camera { - * Operation not allowed. - * - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - OPERATION_NOT_ALLOWED = 7400102, - -@@ -299,7 +316,8 @@ declare namespace camera { - * Session not config. - * - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SESSION_NOT_CONFIG = 7400103, - -@@ -307,7 +325,8 @@ declare namespace camera { - * Session not running. - * - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SESSION_NOT_RUNNING = 7400104, - -@@ -315,7 +334,8 @@ declare namespace camera { - * Session config locked. - * - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SESSION_CONFIG_LOCKED = 7400105, - -@@ -323,7 +343,8 @@ declare namespace camera { - * Device setting locked. - * - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DEVICE_SETTING_LOCKED = 7400106, - -@@ -331,7 +352,8 @@ declare namespace camera { - * Can not use camera cause of conflict. - * - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CONFLICT_CAMERA = 7400107, - -@@ -339,7 +361,8 @@ declare namespace camera { - * Camera disabled cause of security reason. - * - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DEVICE_DISABLED = 7400108, - -@@ -347,7 +370,8 @@ declare namespace camera { - * Can not use camera cause of preempted. - * - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DEVICE_PREEMPTED = 7400109, - -@@ -355,7 +379,8 @@ declare namespace camera { - * Unresolved conflicts with current configurations. - * - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - UNRESOLVED_CONFLICTS_WITH_CURRENT_CONFIGURATIONS = 7400110, - -@@ -364,7 +389,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DEVICE_FREQUENTLY_SWITCHED = 7400111, - -@@ -373,7 +399,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CAMERA_LENS_RETRACTED = 7400112, - -@@ -381,7 +408,8 @@ declare namespace camera { - * Camera service fatal error. - * - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SERVICE_FATAL_ERROR = 7400201 - } -@@ -389,7 +417,7 @@ declare namespace camera { - /** - * Enum for restore parameter. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} -@@ -440,35 +468,35 @@ declare namespace camera { - /** - * Skin smooth level value for restore. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- skinSmoothLevel: number; -+ skinSmoothLevel: int; - - /** - * Face slender value for restore. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- faceSlender: number; -+ faceSlender: int; - - /** - * Skin tone value for restore. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- skinTone: number; -+ skinTone: int; - } - - /** -@@ -477,7 +505,8 @@ declare namespace camera { - * @typedef PrelaunchConfig - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PrelaunchConfig { - /** -@@ -486,7 +515,8 @@ declare namespace camera { - * @type { CameraDevice } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - cameraDevice: CameraDevice; - -@@ -496,19 +526,21 @@ declare namespace camera { - * @type { ?RestoreParamType } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - restoreParamType?: RestoreParamType; - - /** - * Begin active time. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- activeTime?: number; -+ activeTime?: int; - - /** - * Setting parameter. -@@ -516,7 +548,8 @@ declare namespace camera { - * @type { ?SettingParam } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - settingParam?: SettingParam; - } -@@ -535,7 +568,8 @@ declare namespace camera { - * - * @returns { Array } An array of supported cameras. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSupportedCameras(): Array; - -@@ -557,7 +591,8 @@ declare namespace camera { - * @param { CameraDevice } camera - Camera device. - * @returns { Array } An array of supported scene mode of camera. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSupportedSceneModes(camera: CameraDevice): Array; - -@@ -568,7 +603,8 @@ declare namespace camera { - * @param { SceneMode } mode - Scene mode. - * @returns { CameraOutputCapability } The camera output capability. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSupportedOutputCapability(camera: CameraDevice, mode: SceneMode): CameraOutputCapability; - -@@ -577,7 +613,8 @@ declare namespace camera { - * - * @returns { boolean } Is camera muted. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isCameraMuted(): boolean; - -@@ -596,7 +633,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isCameraMuteSupported(): boolean; - -@@ -623,7 +661,8 @@ declare namespace camera { - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - muteCameraPersistent(mute: boolean, type: PolicyType): void; - -@@ -647,7 +686,8 @@ declare namespace camera { - * @throws { BusinessError } 7400102 - Operation not allowed. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - createCameraInput(camera: CameraDevice): CameraInput; - -@@ -673,7 +713,8 @@ declare namespace camera { - * @throws { BusinessError } 7400102 - Operation not allowed. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - createCameraInput(position: CameraPosition, type: CameraType): CameraInput; - -@@ -696,7 +737,8 @@ declare namespace camera { - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - createPreviewOutput(profile: Profile, surfaceId: string): PreviewOutput; - -@@ -710,7 +752,8 @@ declare namespace camera { - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - createPreviewOutput(surfaceId: string): PreviewOutput; - -@@ -751,7 +794,8 @@ declare namespace camera { - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - createPhotoOutput(profile?: Profile): PhotoOutput; - -@@ -774,7 +818,8 @@ declare namespace camera { - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - createVideoOutput(profile: VideoProfile, surfaceId: string): VideoOutput; - -@@ -788,7 +833,8 @@ declare namespace camera { - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - createVideoOutput(surfaceId: string): VideoOutput; - -@@ -809,7 +855,8 @@ declare namespace camera { - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - createMetadataOutput(metadataObjectTypes: Array): MetadataOutput; - -@@ -822,7 +869,8 @@ declare namespace camera { - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - createDepthDataOutput(profile: DepthProfile): DepthDataOutput; - -@@ -848,7 +896,8 @@ declare namespace camera { - * 3. Parameter verification failed. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - createSession(mode: SceneMode): T; - -@@ -858,7 +907,8 @@ declare namespace camera { - * @param { 'cameraStatus' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the camera status change. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'cameraStatus', callback: AsyncCallback): void; - -@@ -868,7 +918,8 @@ declare namespace camera { - * @param { 'cameraStatus' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the camera status change. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'cameraStatus', callback?: AsyncCallback): void; - -@@ -878,7 +929,8 @@ declare namespace camera { - * @param { 'foldStatusChanged' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the fold status change. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'foldStatusChange', callback: AsyncCallback): void; - -@@ -888,7 +940,8 @@ declare namespace camera { - * @param { 'foldStatusChanged' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the fold status change. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'foldStatusChange', callback?: AsyncCallback): void; - -@@ -909,7 +962,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'cameraMute', callback: AsyncCallback): void; - -@@ -930,7 +984,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'cameraMute', callback?: AsyncCallback): void; - -@@ -955,7 +1010,8 @@ declare namespace camera { - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isPrelaunchSupported(camera: CameraDevice): boolean; - -@@ -983,7 +1039,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setPrelaunchConfig(prelaunchConfig: PrelaunchConfig): void; - -@@ -1028,7 +1085,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - preSwitchCamera(cameraId: string): void; - -@@ -1053,7 +1111,8 @@ declare namespace camera { - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - createDeferredPreviewOutput(profile?: Profile): PreviewOutput; - -@@ -1062,7 +1121,8 @@ declare namespace camera { - * - * @returns { boolean } this value that specifies whether the device has a torch. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isTorchSupported(): boolean; - -@@ -1071,7 +1131,8 @@ declare namespace camera { - * @param { TorchMode } mode - torch mode. - * @returns { boolean } is torch mode supported. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isTorchModeSupported(mode: TorchMode): boolean; - -@@ -1080,7 +1141,8 @@ declare namespace camera { - * - * @returns { TorchMode } torch mode. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getTorchMode(): TorchMode; - -@@ -1100,7 +1162,8 @@ declare namespace camera { - * @throws { BusinessError } 7400102 - Operation not allowed. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setTorchMode(mode: TorchMode): void; - -@@ -1110,7 +1173,8 @@ declare namespace camera { - * @param { 'torchStatusChange' } type - Event type - * @param { AsyncCallback } callback - Callback used to return the torch status change - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'torchStatusChange', callback: AsyncCallback): void; - -@@ -1120,7 +1184,8 @@ declare namespace camera { - * @param { 'torchStatusChange' } type - Event type - * @param { AsyncCallback } callback - Callback used to return the torch status change - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'torchStatusChange', callback?: AsyncCallback): void; - } -@@ -1130,7 +1195,8 @@ declare namespace camera { - * - * @typedef TorchStatusInfo - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface TorchStatusInfo { - /** -@@ -1139,7 +1205,8 @@ declare namespace camera { - * @type { boolean } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly isTorchAvailable: boolean; - -@@ -1149,25 +1216,27 @@ declare namespace camera { - * @type { boolean } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly isTorchActive: boolean; - - /** - * the current torch brightness level. - * -- * @type { number } -+ * @type { double } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly torchLevel: number; -+ readonly torchLevel: double; - } - - /** - * Enum for torch mode. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 -@@ -1206,7 +1275,8 @@ declare namespace camera { - * - * @typedef CameraStatusInfo - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface CameraStatusInfo { - /** -@@ -1214,7 +1284,8 @@ declare namespace camera { - * - * @type { CameraDevice } - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - camera: CameraDevice; - -@@ -1223,7 +1294,8 @@ declare namespace camera { - * - * @type { CameraStatus } - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - status: CameraStatus; - } -@@ -1233,7 +1305,8 @@ declare namespace camera { - * - * @typedef FoldStatusInfo - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface FoldStatusInfo { - /** -@@ -1242,7 +1315,8 @@ declare namespace camera { - * @type { Array } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly supportedCameras: Array; - -@@ -1252,7 +1326,8 @@ declare namespace camera { - * @type { FoldStatus } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly foldStatus: FoldStatus; - } -@@ -1260,14 +1335,14 @@ declare namespace camera { - /** - * Enum for camera position. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since 10 - */ - /** - * Enum for camera position. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} -@@ -1342,7 +1417,7 @@ declare namespace camera { - /** - * Enum for camera type. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 -@@ -1397,7 +1472,7 @@ declare namespace camera { - /** - * Enum for camera connection type. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 -@@ -1434,7 +1509,7 @@ declare namespace camera { - /** - * Enum for remote camera device type. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi - * @since 10 -@@ -1442,7 +1517,7 @@ declare namespace camera { - /** - * Enum for remote camera device type. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 -@@ -1502,7 +1577,8 @@ declare namespace camera { - * - * @typedef CameraDevice - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface CameraDevice { - /** -@@ -1511,7 +1587,8 @@ declare namespace camera { - * @type { string } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly cameraId: string; - -@@ -1521,7 +1598,8 @@ declare namespace camera { - * @type { CameraPosition } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly cameraPosition: CameraPosition; - -@@ -1531,7 +1609,8 @@ declare namespace camera { - * @type { CameraType } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly cameraType: CameraType; - -@@ -1541,7 +1620,8 @@ declare namespace camera { - * @type { ConnectionType } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly connectionType: ConnectionType; - -@@ -1560,7 +1640,8 @@ declare namespace camera { - * @type { string } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly hostDeviceName: string; - -@@ -1579,19 +1660,21 @@ declare namespace camera { - * @type { HostDeviceType } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly hostDeviceType: HostDeviceType; - - /** - * Camera sensor orientation attribute. - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly cameraOrientation: number; -+ readonly cameraOrientation: int; - - /** - * Camera device retractable attribute -@@ -1600,7 +1683,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly isRetractable?: boolean; - } -@@ -1617,22 +1701,22 @@ declare namespace camera { - /** - * Height. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- height: number; -+ height: int; - - /** - * Width. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- width: number; -+ width: int; - } - - /** -@@ -1647,22 +1731,22 @@ declare namespace camera { - /** - * x co-ordinate - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- x: number; -+ x: double; - - /** - * y co-ordinate - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- y: number; -+ y: double; - } - - /** -@@ -1670,7 +1754,8 @@ declare namespace camera { - * - * @interface CameraInput - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface CameraInput { - /** -@@ -1681,7 +1766,8 @@ declare namespace camera { - * @throws { BusinessError } 7400108 - Camera disabled cause of security reason. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - open(callback: AsyncCallback): void; - -@@ -1694,7 +1780,8 @@ declare namespace camera { - * @throws { BusinessError } 7400108 - Camera disabled cause of security reason. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - open(): Promise; - -@@ -1707,7 +1794,8 @@ declare namespace camera { - * @throws { BusinessError } 7400108 - Camera disabled cause of security reason. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - open(isSecureEnabled: boolean): Promise; - -@@ -1717,7 +1805,8 @@ declare namespace camera { - * @param { AsyncCallback } callback - Callback used to return the result. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - close(callback: AsyncCallback): void; - -@@ -1727,23 +1816,25 @@ declare namespace camera { - * @returns { Promise } Promise used to return the result. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - close(): Promise; - - /** - * Delay close camera. - * -- * @param { number } time - delay time for turning off camera. -+ * @param { int } time - delay time for turning off camera. - * @returns { Promise } Promise used to return the result. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- closeDelayed(time: number): Promise; -+ closeDelayed(time: int): Promise; - - /** - * Subscribes to error events. -@@ -1752,7 +1843,8 @@ declare namespace camera { - * @param { CameraDevice } camera - Camera device. - * @param { ErrorCallback } callback - Callback used to get the camera input errors. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', camera: CameraDevice, callback: ErrorCallback): void; - -@@ -1763,7 +1855,8 @@ declare namespace camera { - * @param { CameraDevice } camera - Camera device. - * @param { ErrorCallback } callback - Callback used to get the camera input errors. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', camera: CameraDevice, callback?: ErrorCallback): void; - -@@ -1775,7 +1868,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'cameraOcclusionDetection', callback: AsyncCallback): void; - -@@ -1787,7 +1881,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'cameraOcclusionDetection', callback?: AsyncCallback): void; - -@@ -1803,7 +1898,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - controlAuxiliary(auxiliaryType: AuxiliaryType, auxiliaryStatus: AuxiliaryStatus): Promise; - } -@@ -1811,7 +1907,7 @@ declare namespace camera { - /** - * Enumerates the camera scene modes. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 -@@ -1988,7 +2084,7 @@ declare namespace camera { - /** - * Enum for camera format type. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 -@@ -2082,7 +2178,7 @@ declare namespace camera { - /** - * Enum for flash mode. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 -@@ -2131,7 +2227,8 @@ declare namespace camera { - * @typedef LcdFlashStatus - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface LcdFlashStatus { - /** -@@ -2141,20 +2238,22 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly isLcdFlashNeeded: boolean; - - /** - * Compensate value for lcd flash. - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly lcdCompensation: number; -+ readonly lcdCompensation: int; - } - - /** -@@ -2162,7 +2261,8 @@ declare namespace camera { - * - * @interface FlashQuery - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface FlashQuery { - /** -@@ -2180,7 +2280,8 @@ declare namespace camera { - * @returns { boolean } The flash light support status. - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - hasFlash(): boolean; - -@@ -2201,7 +2302,8 @@ declare namespace camera { - * @returns { boolean } Is the flash mode supported. - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isFlashModeSupported(flashMode: FlashMode): boolean; - -@@ -2213,7 +2315,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isLcdFlashSupported(): boolean; - } -@@ -2224,7 +2327,8 @@ declare namespace camera { - * @extends FlashQuery - * @interface Flash - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Flash extends FlashQuery { - /** -@@ -2233,7 +2337,8 @@ declare namespace camera { - * @returns { FlashMode } The current flash mode. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getFlashMode(): FlashMode; - -@@ -2243,7 +2348,8 @@ declare namespace camera { - * @param { FlashMode } flashMode - Target flash mode. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setFlashMode(flashMode: FlashMode): void; - -@@ -2255,7 +2361,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enableLcdFlash(enabled: boolean): void; - } -@@ -2263,7 +2370,7 @@ declare namespace camera { - /** - * Enum for exposure mode. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 -@@ -2310,10 +2417,11 @@ declare namespace camera { - /** - * Enum for exposure metering mode. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum ExposureMeteringMode { - /** -@@ -2321,7 +2429,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MATRIX = 0, - -@@ -2330,7 +2439,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CENTER = 1, - -@@ -2339,7 +2449,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SPOT = 2 - } -@@ -2349,7 +2460,8 @@ declare namespace camera { - * - * @interface AutoExposureQuery - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface AutoExposureQuery { - /** -@@ -2369,14 +2481,15 @@ declare namespace camera { - * @returns { boolean } Is the exposure mode supported. - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isExposureModeSupported(aeMode: ExposureMode): boolean; - - /** - * Query the exposure compensation range. - * -- * @returns { Array } The array of compensation range. -+ * @returns { Array } The array of compensation range. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 -@@ -2385,12 +2498,13 @@ declare namespace camera { - * Query the exposure compensation range. - * Move to AutoExposureQuery interface from AutoExposure interface since 12. - * -- * @returns { Array } The array of compensation range. -+ * @returns { Array } The array of compensation range. - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getExposureBiasRange(): Array; -+ getExposureBiasRange(): Array; - - /** - * Checks whether a specified exposure metering mode is supported. -@@ -2402,7 +2516,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isExposureMeteringModeSupported(aeMeteringMode: ExposureMeteringMode): boolean; - } -@@ -2413,7 +2528,8 @@ declare namespace camera { - * @extends AutoExposureQuery - * @interface AutoExposure - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface AutoExposure extends AutoExposureQuery { - /** -@@ -2422,7 +2538,8 @@ declare namespace camera { - * @returns { ExposureMode } The current exposure mode. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getExposureMode(): ExposureMode; - -@@ -2432,7 +2549,8 @@ declare namespace camera { - * @param { ExposureMode } aeMode - Exposure mode - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setExposureMode(aeMode: ExposureMode): void; - -@@ -2442,7 +2560,8 @@ declare namespace camera { - * @returns { Point } The current metering point. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getMeteringPoint(): Point; - -@@ -2452,24 +2571,26 @@ declare namespace camera { - * @param { Point } point - metering point - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setMeteringPoint(point: Point): void; - - /** - * Query the exposure compensation range. - * -- * @returns { Array } The array of compensation range. -+ * @returns { Array } The array of compensation range. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getExposureBiasRange(): Array; -+ getExposureBiasRange(): Array; - - /** - * Set exposure compensation. - * -- * @param { number } exposureBias - Exposure compensation -+ * @param { double } exposureBias - Exposure compensation - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 -@@ -2477,23 +2598,25 @@ declare namespace camera { - /** - * Set exposure compensation. - * -- * @param { number } exposureBias - Exposure compensation -+ * @param { double } exposureBias - Exposure compensation - * @throws { BusinessError } 7400102 - Operation not allowed. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- setExposureBias(exposureBias: number): void; -+ setExposureBias(exposureBias: double): void; - - /** - * Query the exposure value. - * -- * @returns { number } The exposure value. -+ * @returns { double } The exposure value. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getExposureValue(): number; -+ getExposureValue(): double; - - /** - * Gets current exposure metering mode. -@@ -2503,7 +2626,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getExposureMeteringMode(): ExposureMeteringMode; - -@@ -2516,7 +2640,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setExposureMeteringMode(aeMeteringMode: ExposureMeteringMode): void; - } -@@ -2524,7 +2649,7 @@ declare namespace camera { - /** - * Enum for focus mode. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 -@@ -2570,7 +2695,7 @@ declare namespace camera { - /** - * Enum for focus state. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 -@@ -2607,10 +2732,11 @@ declare namespace camera { - /** - * Enum for focus range type. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum FocusRangeType { - /** -@@ -2618,7 +2744,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AUTO = 0, - -@@ -2627,7 +2754,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NEAR = 1 - } -@@ -2635,10 +2763,11 @@ declare namespace camera { - /** - * Enum for focus driven type. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum FocusDrivenType { - /** -@@ -2646,7 +2775,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AUTO = 0, - -@@ -2655,7 +2785,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FACE = 1 - } -@@ -2663,10 +2794,11 @@ declare namespace camera { - /** - * Enum for focus tracking mode. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum FocusTrackingMode { - /** -@@ -2674,7 +2806,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AUTO = 0 - } -@@ -2685,7 +2818,8 @@ declare namespace camera { - * @typedef FocusTrackingInfo - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface FocusTrackingInfo { - /** -@@ -2694,7 +2828,8 @@ declare namespace camera { - * @type { FocusTrackingMode } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - trackingMode: FocusTrackingMode; - -@@ -2704,7 +2839,8 @@ declare namespace camera { - * @type { Rect } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - trackingRegion: Rect; - } -@@ -2714,7 +2850,8 @@ declare namespace camera { - * - * @interface FocusQuery - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface FocusQuery { - /** -@@ -2734,7 +2871,8 @@ declare namespace camera { - * @returns { boolean } Is the focus mode supported. - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isFocusModeSupported(afMode: FocusMode): boolean; - -@@ -2762,7 +2900,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isFocusRangeTypeSupported(type: FocusRangeType): boolean; - -@@ -2778,7 +2917,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isFocusDrivenTypeSupported(type: FocusDrivenType): boolean; - } -@@ -2789,7 +2929,8 @@ declare namespace camera { - * @extends FocusQuery - * @interface Focus - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Focus extends FocusQuery { - /** -@@ -2798,7 +2939,8 @@ declare namespace camera { - * @returns { FocusMode } The current focus mode. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getFocusMode(): FocusMode; - -@@ -2808,7 +2950,8 @@ declare namespace camera { - * @param { FocusMode } afMode - Target focus mode. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setFocusMode(afMode: FocusMode): void; - -@@ -2818,7 +2961,8 @@ declare namespace camera { - * @param { Point } point - Target focus point. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setFocusPoint(point: Point): void; - -@@ -2828,19 +2972,21 @@ declare namespace camera { - * @returns { Point } The current focus point. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getFocusPoint(): Point; - - /** - * Gets current focal length. - * -- * @returns { number } The current focal point. -+ * @returns { double } The current focal point. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getFocalLength(): number; -+ getFocalLength(): double; - - /** - * Gets current focus assist. -@@ -2863,7 +3009,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setFocusAssist(enabled: boolean): void; - -@@ -2875,7 +3022,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getFocusRange(): FocusRangeType; - -@@ -2892,7 +3040,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setFocusRange(type: FocusRangeType): void; - -@@ -2904,7 +3053,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getFocusDriven(): FocusDrivenType; - -@@ -2921,7 +3071,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setFocusDriven(type: FocusDrivenType): void; - } -@@ -2932,42 +3083,46 @@ declare namespace camera { - * @interface ManualFocus - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ManualFocus { - /** - * Gets current focus distance. - * -- * @returns { number } The current focus distance. -+ * @returns { double } The current focus distance. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getFocusDistance(): number; -+ getFocusDistance(): double; - - /** - * Sets focus distance. - * -- * @param { number } distance - Focus distance -+ * @param { double } distance - Focus distance - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- setFocusDistance(distance: number): void; -+ setFocusDistance(distance: double): void; - } - - /** - * Enumerates the camera white balance modes. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum WhiteBalanceMode { - /** -@@ -2975,7 +3130,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AUTO = 0, - -@@ -2984,7 +3140,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CLOUDY = 1, - -@@ -2993,7 +3150,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INCANDESCENT = 2, - -@@ -3002,7 +3160,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FLUORESCENT = 3, - -@@ -3011,7 +3170,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DAYLIGHT = 4, - -@@ -3020,7 +3180,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MANUAL = 5, - -@@ -3029,7 +3190,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LOCKED = 6 - } -@@ -3040,7 +3202,8 @@ declare namespace camera { - * @interface WhiteBalanceQuery - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface WhiteBalanceQuery { - /** -@@ -3053,21 +3216,23 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isWhiteBalanceModeSupported(mode: WhiteBalanceMode): boolean; - - /** - * Query the white balance mode range. - * -- * @returns { Array } The array of white balance mode range. -+ * @returns { Array } The array of white balance mode range. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getWhiteBalanceRange(): Array; -+ getWhiteBalanceRange(): Array; - } - - /** -@@ -3077,7 +3242,8 @@ declare namespace camera { - * @interface WhiteBalance - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface WhiteBalance extends WhiteBalanceQuery { - /** -@@ -3088,7 +3254,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getWhiteBalanceMode(): WhiteBalanceMode; - -@@ -3101,34 +3268,37 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setWhiteBalanceMode(mode: WhiteBalanceMode): void; - - /** - * Gets current white balance. - * -- * @returns { number } The current white balance. -+ * @returns { int } The current white balance. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getWhiteBalance(): number; -+ getWhiteBalance(): int; - - /** - * Sets white balance. - * -- * @param { number } whiteBalance - White balance. -+ * @param { int } whiteBalance - White balance. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- setWhiteBalance(whiteBalance: number): void; -+ setWhiteBalance(whiteBalance: int): void; - } - - /** -@@ -3137,7 +3307,8 @@ declare namespace camera { - * @interface ManualIsoQuery - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ManualIsoQuery { - /** -@@ -3148,21 +3319,23 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isManualIsoSupported(): boolean; - - /** - * Get the ISO range. - * -- * @returns { Array } The array of ISO range. -+ * @returns { Array } The array of ISO range. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getIsoRange(): Array; -+ getIsoRange(): Array; - } - - /** -@@ -3172,48 +3345,53 @@ declare namespace camera { - * @interface ManualIso - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ManualIso extends ManualIsoQuery { - /** - * Gets current ISO. - * -- * @returns { number } The current ISO. -+ * @returns { int } The current ISO. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getIso(): number; -+ getIso(): int; - - /** - * Sets ISO. - * -- * @param { number } iso - ISO -+ * @param { int } iso - ISO - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- setIso(iso: number): void; -+ setIso(iso: int): void; - } - - /** - * Enum for smooth zoom mode. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum SmoothZoomMode { - /** - * Normal zoom mode. - * - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NORMAL = 0 - } -@@ -3223,17 +3401,19 @@ declare namespace camera { - * - * @typedef SmoothZoomInfo - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface SmoothZoomInfo { - /** - * The duration of smooth zoom. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- duration: number; -+ duration: int; - } - - /** -@@ -3242,30 +3422,33 @@ declare namespace camera { - * @typedef ZoomPointInfo - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ZoomPointInfo { - /** - * The zoom ratio value. - * -- * @type { number } -+ * @type { double } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly zoomRatio: number; -+ readonly zoomRatio: double; - - /** - * The equivalent focal Length. - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly equivalentFocalLength: number; -+ readonly equivalentFocalLength: int; - } - - /** -@@ -3273,13 +3456,14 @@ declare namespace camera { - * - * @interface ZoomQuery - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ZoomQuery { - /** - * Gets all supported zoom ratio range. - * -- * @returns { Array } The zoom ratio range. -+ * @returns { Array } The zoom ratio range. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 -@@ -3288,12 +3472,13 @@ declare namespace camera { - * Gets all supported zoom ratio range. - * Move to ZoomQuery interface from Zoom since 12. - * -- * @returns { Array } The zoom ratio range. -+ * @returns { Array } The zoom ratio range. - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getZoomRatioRange(): Array; -+ getZoomRatioRange(): Array; - - /** - * Gets all important zoom ratio infos. -@@ -3303,7 +3488,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getZoomPointInfos(): Array; - } -@@ -3314,13 +3500,14 @@ declare namespace camera { - * @extends ZoomQuery - * @interface Zoom - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Zoom extends ZoomQuery { - /** - * Gets zoom ratio. - * -- * @returns { number } The zoom ratio value. -+ * @returns { double } The zoom ratio value. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @since 11 -@@ -3328,34 +3515,37 @@ declare namespace camera { - /** - * Gets zoom ratio. - * -- * @returns { number } The zoom ratio value. -+ * @returns { double } The zoom ratio value. - * @throws { BusinessError } 7400103 - Session not config. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getZoomRatio(): number; -+ getZoomRatio(): double; - - /** - * Sets zoom ratio. - * -- * @param { number } zoomRatio - Target zoom ratio. -+ * @param { double } zoomRatio - Target zoom ratio. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- setZoomRatio(zoomRatio: number): void; -+ setZoomRatio(zoomRatio: double): void; - - /** - * Sets target zoom ratio by smooth method. - * -- * @param { number } targetRatio - Target zoom ratio. -+ * @param { double } targetRatio - Target zoom ratio. - * @param { SmoothZoomMode } mode - Smooth zoom mode. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- setSmoothZoom(targetRatio: number, mode?: SmoothZoomMode): void; -+ setSmoothZoom(targetRatio: double, mode?: SmoothZoomMode): void; - - /** - * Notify device to prepare for zoom. -@@ -3364,7 +3554,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - prepareZoom(): void; - -@@ -3375,7 +3566,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - unprepareZoom(): void; - } -@@ -3383,7 +3575,7 @@ declare namespace camera { - /** - * Enum for video stabilization mode. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 -@@ -3440,7 +3632,8 @@ declare namespace camera { - * - * @interface StabilizationQuery - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface StabilizationQuery { - /** -@@ -3460,7 +3653,8 @@ declare namespace camera { - * @returns { boolean } Is video stabilization mode supported. - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isVideoStabilizationModeSupported(vsMode: VideoStabilizationMode): boolean; - } -@@ -3471,7 +3665,8 @@ declare namespace camera { - * @extends StabilizationQuery - * @interface Stabilization - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Stabilization extends StabilizationQuery { - /** -@@ -3480,7 +3675,8 @@ declare namespace camera { - * @returns { VideoStabilizationMode } The current video stabilization mode. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getActiveVideoStabilizationMode(): VideoStabilizationMode; - -@@ -3490,7 +3686,8 @@ declare namespace camera { - * @param { VideoStabilizationMode } mode - video stabilization mode to set. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setVideoStabilizationMode(mode: VideoStabilizationMode): void; - } -@@ -3498,10 +3695,11 @@ declare namespace camera { - /** - * Enumerates the camera portrait theme types. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PortraitThemeType { - /** -@@ -3509,7 +3707,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NATURAL = 0, - -@@ -3518,7 +3717,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DELICATE = 1, - -@@ -3527,7 +3727,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - STYLISH = 2 - } -@@ -3535,7 +3736,7 @@ declare namespace camera { - /** - * Enumerates the camera beauty effect types. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi - * @since arkts {'1.1':'10','1.2':'20'} -@@ -3589,7 +3790,8 @@ declare namespace camera { - * @interface BeautyQuery - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface BeautyQuery { - /** -@@ -3611,7 +3813,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSupportedBeautyTypes(): Array; - -@@ -3619,7 +3822,7 @@ declare namespace camera { - * Gets the specific beauty effect type range. - * - * @param { BeautyType } type - The type of beauty effect. -- * @returns { Array } The array of the specific beauty effect range. -+ * @returns { Array } The array of the specific beauty effect range. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -@@ -3631,14 +3834,15 @@ declare namespace camera { - * Move to BeautyQuery from Beauty since 12. - * - * @param { BeautyType } type - The type of beauty effect. -- * @returns { Array } The array of the specific beauty effect range. -+ * @returns { Array } The array of the specific beauty effect range. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getSupportedBeautyRange(type: BeautyType): Array; -+ getSupportedBeautyRange(type: BeautyType): Array; - - /** - * Gets supported portrait theme type. -@@ -3648,7 +3852,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSupportedPortraitThemeTypes(): Array; - -@@ -3660,7 +3865,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isPortraitThemeSupported(): boolean; - } -@@ -3672,34 +3878,37 @@ declare namespace camera { - * @interface Beauty - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Beauty extends BeautyQuery { - /** - * Gets the beauty effect in use. - * - * @param { BeautyType } type - The type of beauty effect. -- * @returns { number } the beauty effect in use. -+ * @returns { int } the beauty effect in use. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getBeauty(type: BeautyType): number; -+ getBeauty(type: BeautyType): int; - - /** - * Sets a beauty effect for a camera device. - * - * @param { BeautyType } type - The type of beauty effect. -- * @param { number } value The number of beauty effect. -+ * @param { int } value The number of beauty effect. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- setBeauty(type: BeautyType, value: number): void; -+ setBeauty(type: BeautyType, value: int): void; - - /** - * Sets a portrait theme type for a camera device. -@@ -3710,7 +3919,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setPortraitThemeType(type: PortraitThemeType): void; - } -@@ -3721,7 +3931,8 @@ declare namespace camera { - * @typedef EffectSuggestion - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface EffectSuggestion { - -@@ -3733,7 +3944,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isEffectSuggestionSupported(): boolean; - -@@ -3746,7 +3958,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enableEffectSuggestion(enabled: boolean): void; - -@@ -3758,7 +3971,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSupportedEffectSuggestionTypes(): Array; - -@@ -3772,7 +3986,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setEffectSuggestionStatus(status: Array): void; - -@@ -3786,7 +4001,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - updateEffectSuggestion(type: EffectSuggestionType, enabled: boolean): void; - } -@@ -3794,10 +4010,11 @@ declare namespace camera { - /** - * Enumerates the camera color effect types. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum ColorEffectType { - /** -@@ -3805,7 +4022,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NORMAL = 0, - -@@ -3814,7 +4032,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BRIGHT = 1, - -@@ -3823,7 +4042,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SOFT = 2, - -@@ -3832,7 +4052,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BLACK_WHITE = 3 - } -@@ -3840,10 +4061,11 @@ declare namespace camera { - /** - * Enum for policy type - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PolicyType { - /** -@@ -3851,7 +4073,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRIVACY = 1, - } -@@ -3862,7 +4085,8 @@ declare namespace camera { - * @interface ColorEffectQuery - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ColorEffectQuery { - /** -@@ -3884,7 +4108,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSupportedColorEffects(): Array; - } -@@ -3896,7 +4121,8 @@ declare namespace camera { - * @interface ColorEffect - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ColorEffect extends ColorEffectQuery { - /** -@@ -3907,7 +4133,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getColorEffect(): ColorEffectType; - -@@ -3919,7 +4146,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setColorEffect(type: ColorEffectType): void; - } -@@ -3929,7 +4157,8 @@ declare namespace camera { - * - * @interface ColorManagementQuery - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ColorManagementQuery { - /** -@@ -3938,7 +4167,8 @@ declare namespace camera { - * @returns { Array } The array of the supported color space for the session. - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSupportedColorSpaces(): Array; - } -@@ -3949,7 +4179,8 @@ declare namespace camera { - * @extends ColorManagementQuery - * @interface ColorManagement - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ColorManagement extends ColorManagementQuery { - /** -@@ -3958,7 +4189,8 @@ declare namespace camera { - * @returns { colorSpaceManager.ColorSpace } Current color space. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getActiveColorSpace(): colorSpaceManager.ColorSpace; - -@@ -3971,7 +4203,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setColorSpace(colorSpace: colorSpaceManager.ColorSpace): void; - } -@@ -3981,7 +4214,8 @@ declare namespace camera { - * - * @interface AutoDeviceSwitchQuery - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface AutoDeviceSwitchQuery { - /** -@@ -3990,7 +4224,8 @@ declare namespace camera { - * @returns { boolean } Is auto device switch supported. - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isAutoDeviceSwitchSupported(): boolean; - } -@@ -4001,7 +4236,8 @@ declare namespace camera { - * @extends AutoDeviceSwitchQuery - * @interface AutoDeviceSwitch - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface AutoDeviceSwitch extends AutoDeviceSwitchQuery { - /** -@@ -4015,7 +4251,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enableAutoDeviceSwitch(enabled: boolean): void; - } -@@ -4025,7 +4262,8 @@ declare namespace camera { - * - * @typedef AutoDeviceSwitchStatus - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface AutoDeviceSwitchStatus { - /** -@@ -4034,7 +4272,8 @@ declare namespace camera { - * @type { boolean } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly isDeviceSwitched: boolean; - -@@ -4044,7 +4283,8 @@ declare namespace camera { - * @type { boolean } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly isDeviceCapabilityChanged: boolean; - } -@@ -4055,7 +4295,8 @@ declare namespace camera { - * @interface MacroQuery - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MacroQuery { - /** -@@ -4075,7 +4316,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isMacroSupported(): boolean; - } -@@ -4087,7 +4329,8 @@ declare namespace camera { - * @interface Macro - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Macro extends MacroQuery { - /** -@@ -4109,7 +4352,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enableMacro(enabled: boolean): void; - } -@@ -4117,10 +4361,11 @@ declare namespace camera { - /** - * Enum for usage type used in capture session. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum UsageType { - /** -@@ -4128,7 +4373,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BOKEH = 0 - } -@@ -4138,7 +4384,8 @@ declare namespace camera { - * - * @interface Session - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Session { - /** -@@ -4154,7 +4401,8 @@ declare namespace camera { - * @throws { BusinessError } 7400105 - Session config locked. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - beginConfig(): void; - -@@ -4165,7 +4413,8 @@ declare namespace camera { - * @throws { BusinessError } 7400102 - Operation not allowed. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - commitConfig(callback: AsyncCallback): void; - -@@ -4176,7 +4425,8 @@ declare namespace camera { - * @throws { BusinessError } 7400102 - Operation not allowed. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - commitConfig(): Promise; - -@@ -4187,7 +4437,8 @@ declare namespace camera { - * @param { CameraInput } cameraInput - Target camera input to add. - * @returns { boolean } You can add the input into the session. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - canAddInput(cameraInput: CameraInput): boolean; - -@@ -4212,7 +4463,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - addInput(cameraInput: CameraInput): void; - -@@ -4237,7 +4489,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - removeInput(cameraInput: CameraInput): void; - -@@ -4248,7 +4501,8 @@ declare namespace camera { - * @param { CameraOutput } cameraOutput - Target camera output to add. - * @returns { boolean } You can add the output into the session. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - canAddOutput(cameraOutput: CameraOutput): boolean; - -@@ -4273,7 +4527,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - addOutput(cameraOutput: CameraOutput): void; - -@@ -4298,7 +4553,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - removeOutput(cameraOutput: CameraOutput): void; - -@@ -4319,7 +4575,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - start(callback: AsyncCallback): void; - -@@ -4340,7 +4597,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - start(): Promise; - -@@ -4350,7 +4608,8 @@ declare namespace camera { - * @param { AsyncCallback } callback - Callback used to return the result. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - stop(callback: AsyncCallback): void; - -@@ -4360,7 +4619,8 @@ declare namespace camera { - * @returns { Promise } Promise used to return the result. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - stop(): Promise; - -@@ -4370,7 +4630,8 @@ declare namespace camera { - * @param { AsyncCallback } callback - Callback used to return the result. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - release(callback: AsyncCallback): void; - -@@ -4380,7 +4641,8 @@ declare namespace camera { - * @returns { Promise } Promise used to return the result. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - release(): Promise; - -@@ -4396,7 +4658,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setUsage(usage: UsageType, enabled: boolean): void; - -@@ -4410,7 +4673,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getCameraOutputCapabilities(camera: CameraDevice): Array; - } -@@ -4988,16 +5252,18 @@ declare namespace camera { - * Types of preconfig, which used to configure session conveniently. - * Preconfig type contains common use cases of camera output. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PreconfigType { - /** - * 720P output for preconfig. - * - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRECONFIG_720P = 0, - -@@ -5005,7 +5271,8 @@ declare namespace camera { - * 1080P output for preconfig. - * - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRECONFIG_1080P = 1, - -@@ -5013,7 +5280,8 @@ declare namespace camera { - * 4K output for preconfig. - * - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRECONFIG_4K = 2, - -@@ -5021,7 +5289,8 @@ declare namespace camera { - * high quality output for preconfig. - * - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRECONFIG_HIGH_QUALITY = 3 - } -@@ -5029,16 +5298,18 @@ declare namespace camera { - /** - * The aspect ratios of preconfig, which used to configure session conveniently. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PreconfigRatio { - /** - * Aspect ratio 1:1 for preconfig. - * - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRECONFIG_RATIO_1_1 = 0, - -@@ -5046,7 +5317,8 @@ declare namespace camera { - * Aspect ratio 4:3 for preconfig. - * - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRECONFIG_RATIO_4_3 = 1, - -@@ -5054,7 +5326,8 @@ declare namespace camera { - * Aspect ratio 16:9 for preconfig. - * - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRECONFIG_RATIO_16_9 = 2 - } -@@ -5062,10 +5335,11 @@ declare namespace camera { - /** - * Enum for feature type used in scene detection. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum SceneFeatureType { - /** -@@ -5073,7 +5347,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MOON_CAPTURE_BOOST = 0, - -@@ -5082,7 +5357,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TRIPOD_DETECTION = 1, - -@@ -5091,7 +5367,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LOW_LIGHT_BOOST = 2 - } -@@ -5102,7 +5379,8 @@ declare namespace camera { - * @typedef SceneFeatureDetectionResult - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface SceneFeatureDetectionResult { - /** -@@ -5112,7 +5390,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly featureType: SceneFeatureType; - -@@ -5123,7 +5402,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly detected: boolean; - } -@@ -5131,10 +5411,11 @@ declare namespace camera { - /** - * Enum for tripod status. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum TripodStatus { - /** -@@ -5142,7 +5423,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INVALID = 0, - -@@ -5151,7 +5433,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ACTIVE = 1, - -@@ -5160,7 +5443,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ENTERING = 2, - -@@ -5169,7 +5453,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EXITING = 3, - } -@@ -5181,7 +5466,8 @@ declare namespace camera { - * @interface TripodDetectionResult - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface TripodDetectionResult extends SceneFeatureDetectionResult { - /** -@@ -5191,7 +5477,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly tripodStatus: TripodStatus; - } -@@ -5202,7 +5489,8 @@ declare namespace camera { - * @interface SceneDetectionQuery - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface SceneDetectionQuery { - /** -@@ -5214,7 +5502,8 @@ declare namespace camera { - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isSceneFeatureSupported(type: SceneFeatureType): boolean; - } -@@ -5226,7 +5515,8 @@ declare namespace camera { - * @interface SceneDetection - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface SceneDetection extends SceneDetectionQuery { - /** -@@ -5238,7 +5528,8 @@ declare namespace camera { - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enableSceneFeature(type: SceneFeatureType, enabled: boolean): void; - } -@@ -5259,7 +5550,8 @@ declare namespace camera { - * @interface PhotoSessionForSys - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PhotoSessionForSys extends PhotoSession, Beauty, ColorEffect, ColorManagement, Macro, SceneDetection, EffectSuggestion, DepthFusion { - } -@@ -5277,7 +5569,8 @@ declare namespace camera { - * @extends Session, Flash, AutoExposure, Focus, Zoom, ColorManagement, AutoDeviceSwitch - * @interface PhotoSession - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PhotoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorManagement, AutoDeviceSwitch { - /** -@@ -5290,7 +5583,8 @@ declare namespace camera { - * @returns { boolean } Whether the choosed preconfig type can be used. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - canPreconfig(preconfigType: PreconfigType, preconfigRatio?: PreconfigRatio): boolean; - -@@ -5303,7 +5597,8 @@ declare namespace camera { - * default value {@link PreconfigRatio#PRECONFIG_RATIO_4_3} - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - preconfig(preconfigType: PreconfigType, preconfigRatio?: PreconfigRatio): void; - -@@ -5313,7 +5608,8 @@ declare namespace camera { - * @param { 'error' } type - Event type. - * @param { ErrorCallback } callback - Callback used to get the capture session errors. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -5323,7 +5619,8 @@ declare namespace camera { - * @param { 'error' } type - Event type. - * @param { ErrorCallback } callback - Callback used to get the capture session errors. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - -@@ -5333,7 +5630,8 @@ declare namespace camera { - * @param { 'focusStateChange' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the focus state change. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'focusStateChange', callback: AsyncCallback): void; - -@@ -5343,7 +5641,8 @@ declare namespace camera { - * @param { 'focusStateChange' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the focus state change. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'focusStateChange', callback?: AsyncCallback): void; - -@@ -5353,7 +5652,8 @@ declare namespace camera { - * @param { 'smoothZoomInfoAvailable' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the zoom info. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; - -@@ -5363,7 +5663,8 @@ declare namespace camera { - * @param { 'smoothZoomInfoAvailable' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the zoom info. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; - -@@ -5375,7 +5676,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'macroStatusChanged', callback: AsyncCallback): void; - -@@ -5387,7 +5689,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'macroStatusChanged', callback?: AsyncCallback): void; - -@@ -5400,7 +5703,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'featureDetection', featureType: SceneFeatureType, callback: AsyncCallback): void; - -@@ -5413,7 +5717,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'featureDetection', featureType: SceneFeatureType, callback?: AsyncCallback): void; - -@@ -5424,7 +5729,8 @@ declare namespace camera { - * @param { AsyncCallback } callback - Callback used to return the result. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'effectSuggestionChange', callback: AsyncCallback): void; - -@@ -5435,7 +5741,8 @@ declare namespace camera { - * @param { AsyncCallback } callback - Callback used to return the result. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'effectSuggestionChange', callback?: AsyncCallback): void; - -@@ -5445,7 +5752,8 @@ declare namespace camera { - * @param { 'autoDeviceSwitchStatusChange' } type - Event type. - * @param { AsyncCallback } callback - Callback used to return the result. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'autoDeviceSwitchStatusChange', callback: AsyncCallback): void; - -@@ -5455,7 +5763,8 @@ declare namespace camera { - * @param { 'autoDeviceSwitchStatusChange' } type - Event type. - * @param { AsyncCallback } callback - Callback used to return the result. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'autoDeviceSwitchStatusChange', callback?: AsyncCallback): void; - -@@ -5467,7 +5776,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'lcdFlashStatus', callback: AsyncCallback): void; - -@@ -5479,7 +5789,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'lcdFlashStatus', callback?: AsyncCallback): void; - -@@ -5492,7 +5803,8 @@ declare namespace camera { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. 2.Incorrect parameter types. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSessionFunctions(outputCapability: CameraOutputCapability): Array; - -@@ -5503,7 +5815,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSessionConflictFunctions(): Array; - } -@@ -5524,7 +5837,8 @@ declare namespace camera { - * @interface VideoSessionForSys - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface VideoSessionForSys extends VideoSession, Beauty, ColorEffect, ColorManagement, Macro, Aperture, ColorReservation { - } -@@ -5532,16 +5846,18 @@ declare namespace camera { - /** - * Enum for quality prioritization. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum QualityPrioritization { - /** - * High quality priority. - * - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - HIGH_QUALITY = 0, - -@@ -5549,7 +5865,8 @@ declare namespace camera { - * Power balance priority. - * - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - POWER_BALANCE = 1 - } -@@ -5568,7 +5885,8 @@ declare namespace camera { - * @interface VideoSession - * @extends AutoDeviceSwitch - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface VideoSession extends Session, Flash, AutoExposure, Focus, Zoom, Stabilization, ColorManagement, AutoDeviceSwitch { - /** -@@ -5581,7 +5899,8 @@ declare namespace camera { - * @returns { boolean } Whether the choosed preconfig type can be used. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - canPreconfig(preconfigType: PreconfigType, preconfigRatio?: PreconfigRatio): boolean; - -@@ -5594,7 +5913,8 @@ declare namespace camera { - * default value {@link PreconfigRatio#PRECONFIG_RATIO_16_9}. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - preconfig(preconfigType: PreconfigType, preconfigRatio?: PreconfigRatio): void; - -@@ -5604,7 +5924,8 @@ declare namespace camera { - * @param { 'error' } type - Event type. - * @param { ErrorCallback } callback - Callback used to get the capture session errors. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -5614,7 +5935,8 @@ declare namespace camera { - * @param { 'error' } type - Event type. - * @param { ErrorCallback } callback - Callback used to get the capture session errors. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - -@@ -5624,7 +5946,8 @@ declare namespace camera { - * @param { 'focusStateChange' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the focus state change. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'focusStateChange', callback: AsyncCallback): void; - -@@ -5634,7 +5957,8 @@ declare namespace camera { - * @param { 'focusStateChange' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the focus state change. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'focusStateChange', callback?: AsyncCallback): void; - -@@ -5644,7 +5968,8 @@ declare namespace camera { - * @param { 'smoothZoomInfoAvailable' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the zoom info. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; - -@@ -5654,7 +5979,8 @@ declare namespace camera { - * @param { 'smoothZoomInfoAvailable' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the zoom info. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; - -@@ -5666,7 +5992,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'macroStatusChanged', callback: AsyncCallback): void; - -@@ -5678,7 +6005,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'macroStatusChanged', callback?: AsyncCallback): void; - -@@ -5690,7 +6018,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'lcdFlashStatus', callback: AsyncCallback): void; - -@@ -5702,7 +6031,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'lcdFlashStatus', callback?: AsyncCallback): void; - -@@ -5712,7 +6042,8 @@ declare namespace camera { - * @param { 'autoDeviceSwitchStatusChange' } type - Event type. - * @param { AsyncCallback } callback - Callback used to return the result. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'autoDeviceSwitchStatusChange', callback: AsyncCallback): void; - -@@ -5722,7 +6053,8 @@ declare namespace camera { - * @param { 'autoDeviceSwitchStatusChange' } type - Event type. - * @param { AsyncCallback } callback - Callback used to return the result. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'autoDeviceSwitchStatusChange', callback?: AsyncCallback): void; - -@@ -5734,7 +6066,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'focusTrackingInfoAvailable', callback: Callback): void; - -@@ -5746,7 +6079,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'focusTrackingInfoAvailable', callback?: Callback): void; - -@@ -5759,7 +6093,8 @@ declare namespace camera { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. 2.Incorrect parameter types. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSessionFunctions(outputCapability: CameraOutputCapability): Array; - -@@ -5770,7 +6105,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSessionConflictFunctions(): Array; - -@@ -5785,7 +6121,8 @@ declare namespace camera { - * 3. Parameter verification failed. - * @throws { BusinessError } 7400103 - Session not config. The session has not been committed or configured. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setQualityPrioritization(quality : QualityPrioritization) : void; - -@@ -5797,7 +6134,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'lightStatusChange', callback: AsyncCallback): void; - -@@ -5809,7 +6147,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'lightStatusChange', callback?: AsyncCallback): void; - } -@@ -5817,10 +6156,11 @@ declare namespace camera { - /** - * Enum for the camera light status. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum LightStatus { - /** -@@ -5828,7 +6168,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NORMAL = 0, - -@@ -5837,7 +6178,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INSUFFICIENT = 1 - } -@@ -5845,10 +6187,11 @@ declare namespace camera { - /** - * Enumerates the camera portrait effects. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PortraitEffect { - /** -@@ -5856,7 +6199,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - OFF = 0, - -@@ -5865,7 +6209,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CIRCLES = 1, - -@@ -5874,7 +6219,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - HEART = 2, - -@@ -5883,7 +6229,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ROTATED = 3, - -@@ -5892,7 +6239,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - STUDIO = 4, - -@@ -5901,7 +6249,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - THEATER = 5 - } -@@ -5912,7 +6261,8 @@ declare namespace camera { - * @interface PortraitQuery - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PortraitQuery { - /** -@@ -5944,7 +6294,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSupportedPortraitEffects(): Array; - } -@@ -5956,7 +6307,8 @@ declare namespace camera { - * @interface Portrait - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Portrait extends PortraitQuery { - /** -@@ -5977,7 +6329,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getPortraitEffect(): PortraitEffect; - -@@ -5999,7 +6352,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setPortraitEffect(effect: PortraitEffect): void; - } -@@ -6010,30 +6364,33 @@ declare namespace camera { - * @typedef ZoomRange - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ZoomRange { - /** - * Min zoom value. - * -- * @type { number } -+ * @type { double } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly min: number; -+ readonly min: double; - - /** - * Max zoom value. - * -- * @type { number } -+ * @type { double } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly max: number; -+ readonly max: double; - } - - /** -@@ -6042,7 +6399,8 @@ declare namespace camera { - * @typedef PhysicalAperture - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PhysicalAperture { - /** -@@ -6051,19 +6409,21 @@ declare namespace camera { - * @type { ZoomRange } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - zoomRange: ZoomRange; - - /** - * The supported physical apertures. - * -- * @type { Array } -+ * @type { Array } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- apertures: Array; -+ apertures: Array; - } - - /** -@@ -6072,13 +6432,14 @@ declare namespace camera { - * @interface ApertureQuery - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ApertureQuery { - /** - * Gets the supported virtual apertures. - * -- * @returns { Array } The array of supported virtual apertures. -+ * @returns { Array } The array of supported virtual apertures. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -@@ -6089,14 +6450,15 @@ declare namespace camera { - * Gets the supported virtual apertures. - * Move to ApertureQuery interface from Aperture since 12. - * -- * @returns { Array } The array of supported virtual apertures. -+ * @returns { Array } The array of supported virtual apertures. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getSupportedVirtualApertures(): Array; -+ getSupportedVirtualApertures(): Array; - - /** - * Gets the supported physical apertures. -@@ -6117,7 +6479,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSupportedPhysicalApertures(): Array; - } -@@ -6129,56 +6492,61 @@ declare namespace camera { - * @interface Aperture - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Aperture extends ApertureQuery { - /** - * Gets current virtual aperture value. - * -- * @returns { number } The current virtual aperture value. -+ * @returns { double } The current virtual aperture value. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getVirtualAperture(): number; -+ getVirtualAperture(): double; - - /** - * Sets virtual aperture value. - * -- * @param { number } aperture - virtual aperture value -+ * @param { double } aperture - virtual aperture value - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- setVirtualAperture(aperture: number): void; -+ setVirtualAperture(aperture: double): void; - - /** - * Gets current physical aperture value. - * -- * @returns { number } The current physical aperture value. -+ * @returns { double } The current physical aperture value. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getPhysicalAperture(): number; -+ getPhysicalAperture(): double; - - /** - * Sets physical aperture value. - * -- * @param { number } aperture - physical aperture value -+ * @param { double } aperture - physical aperture value - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- setPhysicalAperture(aperture: number): void; -+ setPhysicalAperture(aperture: double): void; - } - - /** -@@ -6188,7 +6556,8 @@ declare namespace camera { - * @interface PortraitPhotoSession - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PortraitPhotoSession extends Session, Flash, AutoExposure, Focus, Zoom, Beauty, ColorEffect, ColorManagement, Portrait, Aperture { - /** -@@ -6198,7 +6567,8 @@ declare namespace camera { - * @param { ErrorCallback } callback - Callback used to get the capture session errors. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -6209,7 +6579,8 @@ declare namespace camera { - * @param { ErrorCallback } callback - Callback used to get the capture session errors. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - -@@ -6220,7 +6591,8 @@ declare namespace camera { - * @param { AsyncCallback } callback - Callback used to get the focus state change. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'focusStateChange', callback: AsyncCallback): void; - -@@ -6231,7 +6603,8 @@ declare namespace camera { - * @param { AsyncCallback } callback - Callback used to get the focus state change. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'focusStateChange', callback?: AsyncCallback): void; - -@@ -6242,7 +6615,8 @@ declare namespace camera { - * @param { AsyncCallback } callback - Callback used to get the zoom info. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; - -@@ -6253,7 +6627,8 @@ declare namespace camera { - * @param { AsyncCallback } callback - Callback used to get the zoom info. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; - -@@ -6265,7 +6640,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'lcdFlashStatus', callback: AsyncCallback): void; - -@@ -6277,7 +6653,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'lcdFlashStatus', callback?: AsyncCallback): void; - -@@ -6290,7 +6667,8 @@ declare namespace camera { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. 2.Incorrect parameter types. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSessionFunctions(outputCapability: CameraOutputCapability): Array; - -@@ -6301,7 +6679,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSessionConflictFunctions(): Array; - } -@@ -6313,7 +6692,8 @@ declare namespace camera { - * @interface ApertureVideoSession - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ApertureVideoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorEffect, Aperture { - /** -@@ -6324,7 +6704,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -6336,7 +6717,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - -@@ -6348,7 +6730,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'focusStateChange', callback: AsyncCallback): void; - -@@ -6360,7 +6743,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'focusStateChange', callback?: AsyncCallback): void; - -@@ -6372,7 +6756,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; - -@@ -6384,7 +6769,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; - } -@@ -6395,7 +6781,8 @@ declare namespace camera { - * @interface ManualExposureQuery - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ManualExposureQuery { - /** -@@ -6430,13 +6817,14 @@ declare namespace camera { - * @interface ManualExposure - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ManualExposure extends ManualExposureQuery { - /** - * Gets current exposure value. - * -- * @returns { number } The current exposure value. -+ * @returns { int } The current exposure value. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -@@ -6446,20 +6834,21 @@ declare namespace camera { - /** - * Gets current exposure value. - * -- * @returns { number } The current exposure value. -+ * @returns { int } The current exposure value. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getExposure(): number; -+ getExposure(): int; - - /** - * Sets Exposure value. - * -- * @param { number } exposure - Exposure value -+ * @param { int } exposure - Exposure value - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -@@ -6469,15 +6858,16 @@ declare namespace camera { - /** - * Sets Exposure value. - * -- * @param { number } exposure - Exposure value -+ * @param { int } exposure - Exposure value - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400102 - Operation not allowed. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- setExposure(exposure: number): void; -+ setExposure(exposure: int): void; - } - - /** -@@ -6487,7 +6877,8 @@ declare namespace camera { - * @interface NightPhotoSession - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface NightPhotoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorEffect, Beauty, ColorManagement, ManualExposure { - /** -@@ -6497,7 +6888,8 @@ declare namespace camera { - * @param { ErrorCallback } callback - Callback used to get the capture session errors. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -6508,7 +6900,8 @@ declare namespace camera { - * @param { ErrorCallback } callback - Callback used to get the capture session errors. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - -@@ -6519,7 +6912,8 @@ declare namespace camera { - * @param { AsyncCallback } callback - Callback used to get the focus state change. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'focusStateChange', callback: AsyncCallback): void; - -@@ -6530,7 +6924,8 @@ declare namespace camera { - * @param { AsyncCallback } callback - Callback used to get the focus state change. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'focusStateChange', callback?: AsyncCallback): void; - -@@ -6541,7 +6936,8 @@ declare namespace camera { - * @param { AsyncCallback } callback - Callback used to get the zoom info. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; - -@@ -6552,7 +6948,8 @@ declare namespace camera { - * @param { AsyncCallback } callback - Callback used to get the zoom info. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; - -@@ -6564,7 +6961,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'lcdFlashStatus', callback: AsyncCallback): void; - -@@ -6576,7 +6974,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'lcdFlashStatus', callback?: AsyncCallback): void; - } -@@ -6587,19 +6986,21 @@ declare namespace camera { - * @typedef IsoInfo - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface IsoInfo { - /** - * ISO value. - * -- * @type { ?number } -+ * @type { ?int } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly iso?: number; -+ readonly iso?: int; - } - - /** -@@ -6608,19 +7009,21 @@ declare namespace camera { - * @typedef ExposureInfo - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ExposureInfo { - /** - * Exposure time value. - * -- * @type { ?number } -+ * @type { ?int } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly exposureTime?: number; -+ readonly exposureTime?: int; - } - - /** -@@ -6629,19 +7032,21 @@ declare namespace camera { - * @typedef ApertureInfo - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ApertureInfo { - /** - * Aperture value. - * -- * @type { ?number } -+ * @type { ?double } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly aperture?: number; -+ readonly aperture?: double; - } - - /** -@@ -6650,19 +7055,21 @@ declare namespace camera { - * @typedef LuminationInfo - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface LuminationInfo { - /** - * Lumination value. - * -- * @type { ?number } -+ * @type { ?double } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly lumination?: number; -+ readonly lumination?: double; - } - - /** -@@ -6671,7 +7078,8 @@ declare namespace camera { - * @interface ProfessionalPhotoSession - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ProfessionalPhotoSession extends Session, AutoExposure, ManualExposure, Focus, ManualFocus, WhiteBalance, ManualIso, Flash, Zoom, ColorEffect, Aperture { - /** -@@ -6682,7 +7090,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -6694,7 +7103,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - -@@ -6706,7 +7116,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'focusStateChange', callback: AsyncCallback): void; - -@@ -6718,7 +7129,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'focusStateChange', callback?: AsyncCallback): void; - -@@ -6730,7 +7142,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; - -@@ -6742,7 +7155,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; - -@@ -6754,7 +7168,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'isoInfoChange', callback: AsyncCallback): void; - -@@ -6766,7 +7181,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'isoInfoChange', callback?: AsyncCallback): void; - -@@ -6778,7 +7194,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'exposureInfoChange', callback: AsyncCallback): void; - -@@ -6790,7 +7207,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'exposureInfoChange', callback?: AsyncCallback): void; - -@@ -6802,7 +7220,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'apertureInfoChange', callback: AsyncCallback): void; - -@@ -6814,7 +7233,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'apertureInfoChange', callback?: AsyncCallback): void; - -@@ -6826,7 +7246,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'luminationInfoChange', callback: AsyncCallback): void; - -@@ -6838,7 +7259,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'luminationInfoChange', callback?: AsyncCallback): void; - } -@@ -6850,7 +7272,8 @@ declare namespace camera { - * @interface ProfessionalVideoSession - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ProfessionalVideoSession extends Session, AutoExposure, ManualExposure, Focus, ManualFocus, WhiteBalance, ManualIso, Flash, Zoom, ColorEffect, Aperture { - /** -@@ -6861,7 +7284,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -6873,7 +7297,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - -@@ -6885,7 +7310,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'focusStateChange', callback: AsyncCallback): void; - -@@ -6897,7 +7323,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'focusStateChange', callback?: AsyncCallback): void; - -@@ -6909,7 +7336,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; - -@@ -6921,7 +7349,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; - -@@ -6933,7 +7362,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'isoInfoChange', callback: AsyncCallback): void; - -@@ -6945,7 +7375,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'isoInfoChange', callback?: AsyncCallback): void; - -@@ -6957,7 +7388,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'exposureInfoChange', callback: AsyncCallback): void; - -@@ -6969,7 +7401,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'exposureInfoChange', callback?: AsyncCallback): void; - -@@ -6981,7 +7414,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'apertureInfoChange', callback: AsyncCallback): void; - -@@ -6993,7 +7427,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'apertureInfoChange', callback?: AsyncCallback): void; - -@@ -7005,7 +7440,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'luminationInfoChange', callback: AsyncCallback): void; - -@@ -7017,7 +7453,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'luminationInfoChange', callback?: AsyncCallback): void; - } -@@ -7025,10 +7462,11 @@ declare namespace camera { - /** - * Enum for slow motion status. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum SlowMotionStatus { - /** -@@ -7036,7 +7474,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DISABLED = 0, - -@@ -7045,7 +7484,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - READY = 1, - -@@ -7054,7 +7494,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - VIDEO_START = 2, - -@@ -7063,7 +7504,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - VIDEO_DONE = 3, - -@@ -7072,7 +7514,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FINISHED = 4 - } -@@ -7084,7 +7527,8 @@ declare namespace camera { - * @interface SlowMotionVideoSession - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface SlowMotionVideoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorEffect { - /** -@@ -7095,7 +7539,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -7107,7 +7552,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - -@@ -7119,7 +7565,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'focusStateChange', callback: AsyncCallback): void; - -@@ -7131,7 +7578,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'focusStateChange', callback?: AsyncCallback): void; - -@@ -7143,7 +7591,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; - -@@ -7155,7 +7604,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; - -@@ -7167,7 +7617,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isSlowMotionDetectionSupported(): boolean; - -@@ -7180,7 +7631,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setSlowMotionDetectionArea(area: Rect): void; - -@@ -7192,7 +7644,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'slowMotionStatus', callback: AsyncCallback): void; - -@@ -7204,7 +7657,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'slowMotionStatus', callback?: AsyncCallback): void; - } -@@ -7216,7 +7670,8 @@ declare namespace camera { - * @interface HighResolutionPhotoSession - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface HighResolutionPhotoSession extends Session, AutoExposure, Focus { - /** -@@ -7227,7 +7682,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -7239,7 +7695,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - -@@ -7251,7 +7708,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'focusStateChange', callback: AsyncCallback): void; - -@@ -7263,7 +7721,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'focusStateChange', callback?: AsyncCallback): void; - } -@@ -7293,7 +7752,8 @@ declare namespace camera { - * @interface MacroPhotoSession - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MacroPhotoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorEffect, ManualFocus, DepthFusion, ColorManagement { - /** -@@ -7304,7 +7764,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -7316,7 +7777,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - -@@ -7328,7 +7790,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'focusStateChange', callback: AsyncCallback): void; - -@@ -7340,7 +7803,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'focusStateChange', callback?: AsyncCallback): void; - -@@ -7352,7 +7816,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; - -@@ -7364,7 +7829,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; - } -@@ -7385,7 +7851,8 @@ declare namespace camera { - * @interface MacroVideoSession - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MacroVideoSession extends Session, Flash, AutoExposure, Focus, Zoom, ColorEffect, ManualFocus, ColorManagement { - /** -@@ -7396,7 +7863,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -7408,7 +7876,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - -@@ -7420,7 +7889,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'focusStateChange', callback: AsyncCallback): void; - -@@ -7432,7 +7902,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'focusStateChange', callback?: AsyncCallback): void; - -@@ -7444,7 +7915,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; - -@@ -7456,7 +7928,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; - } -@@ -7467,7 +7940,8 @@ declare namespace camera { - * @extends Session, Flash, AutoExposure, Focus, Zoom - * @interface SecureSession - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface SecureSession extends Session, Flash, AutoExposure, Focus, Zoom { - /** -@@ -7478,7 +7952,8 @@ declare namespace camera { - * @throws { BusinessError } 7400102 - Operation not allowed. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - addSecureOutput(previewOutput: PreviewOutput): void; - -@@ -7488,7 +7963,8 @@ declare namespace camera { - * @param { 'error' } type - Event type. - * @param { ErrorCallback } callback - Callback used to get the capture session errors. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -7498,7 +7974,8 @@ declare namespace camera { - * @param { 'error' } type - Event type. - * @param { ErrorCallback } callback - Callback used to get the capture session errors. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - -@@ -7508,7 +7985,8 @@ declare namespace camera { - * @param { 'focusStateChange' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the focus state change. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'focusStateChange', callback: AsyncCallback): void; - -@@ -7518,7 +7996,8 @@ declare namespace camera { - * @param { 'focusStateChange' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the focus state change. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'focusStateChange', callback?: AsyncCallback): void; - } -@@ -7530,7 +8009,8 @@ declare namespace camera { - * @interface LightPaintingPhotoSession - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface LightPaintingPhotoSession extends Session, Flash, Focus, Zoom, ColorEffect { - /** -@@ -7541,7 +8021,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -7553,7 +8034,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - -@@ -7565,7 +8047,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'focusStateChange', callback: AsyncCallback): void; - -@@ -7577,7 +8060,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'focusStateChange', callback?: AsyncCallback): void; - -@@ -7589,7 +8073,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; - -@@ -7601,7 +8086,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; - -@@ -7613,7 +8099,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getLightPaintingType(): LightPaintingType; - -@@ -7626,7 +8113,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setLightPaintingType(type: LightPaintingType): void; - -@@ -7638,7 +8126,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSupportedLightPaintingTypes(): Array; - } -@@ -7650,7 +8139,8 @@ declare namespace camera { - * @interface QuickShotPhotoSession - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface QuickShotPhotoSession extends Session, AutoExposure, ColorEffect, ColorManagement, EffectSuggestion, Flash, Focus, Zoom { - /** -@@ -7661,7 +8151,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -7673,7 +8164,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - -@@ -7685,7 +8177,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'effectSuggestionChange', callback: AsyncCallback): void; - -@@ -7697,7 +8190,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'effectSuggestionChange', callback?: AsyncCallback): void; - -@@ -7709,7 +8203,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'focusStateChange', callback: AsyncCallback): void; - -@@ -7721,7 +8216,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'focusStateChange', callback?: AsyncCallback): void; - -@@ -7733,7 +8229,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'smoothZoomInfoAvailable', callback: AsyncCallback): void; - -@@ -7745,7 +8242,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'smoothZoomInfoAvailable', callback?: AsyncCallback): void; - } -@@ -7757,7 +8255,8 @@ declare namespace camera { - * @interface PanoramaPhotoSession - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PanoramaPhotoSession extends Session, Focus, AutoExposure, WhiteBalance, ColorEffect { - /** -@@ -7768,7 +8267,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -7780,7 +8280,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - -@@ -7792,7 +8293,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'focusStateChange', callback: AsyncCallback): void; - -@@ -7804,7 +8306,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'focusStateChange', callback?: AsyncCallback): void; - } -@@ -7816,7 +8319,8 @@ declare namespace camera { - * @interface FluorescencePhotoSession - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface FluorescencePhotoSession extends Session, AutoExposure, Focus, Zoom { - /** -@@ -7827,7 +8331,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -7839,7 +8344,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - -@@ -7851,7 +8357,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'focusStateChange', callback: AsyncCallback): void; - -@@ -7863,7 +8370,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'focusStateChange', callback?: AsyncCallback): void; - } -@@ -7875,7 +8383,8 @@ declare namespace camera { - * @interface PhotoFunctions - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PhotoFunctions extends FlashQuery, AutoExposureQuery, ManualExposureQuery, FocusQuery, ZoomQuery, BeautyQuery, ColorEffectQuery, ColorManagementQuery, MacroQuery, SceneDetectionQuery { - } -@@ -7887,7 +8396,8 @@ declare namespace camera { - * @interface VideoFunctions - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface VideoFunctions extends FlashQuery, AutoExposureQuery, ManualExposureQuery, FocusQuery, ZoomQuery, StabilizationQuery, BeautyQuery, ColorEffectQuery, ColorManagementQuery, MacroQuery, SceneDetectionQuery { - } -@@ -7899,7 +8409,8 @@ declare namespace camera { - * @interface PortraitPhotoFunctions - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PortraitPhotoFunctions extends FlashQuery, AutoExposureQuery, FocusQuery, ZoomQuery, BeautyQuery, ColorEffectQuery, ColorManagementQuery, PortraitQuery, ApertureQuery, SceneDetectionQuery { - } -@@ -7911,7 +8422,8 @@ declare namespace camera { - * @interface PhotoConflictFunctions - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PhotoConflictFunctions extends ZoomQuery, MacroQuery { - } -@@ -7923,7 +8435,8 @@ declare namespace camera { - * @interface VideoConflictFunctions - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface VideoConflictFunctions extends ZoomQuery, MacroQuery { - } -@@ -7935,7 +8448,8 @@ declare namespace camera { - * @extends ZoomQuery, PortraitQuery, ApertureQuery - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PortraitPhotoConflictFunctions extends ZoomQuery, PortraitQuery, ApertureQuery { - } -@@ -7945,7 +8459,8 @@ declare namespace camera { - * - * @interface CameraOutput - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface CameraOutput { - /** -@@ -7954,7 +8469,8 @@ declare namespace camera { - * @param { AsyncCallback } callback - Callback used to return the result. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - release(callback: AsyncCallback): void; - -@@ -7964,7 +8480,8 @@ declare namespace camera { - * @returns { Promise } Promise used to return the result. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - release(): Promise; - } -@@ -7983,24 +8500,24 @@ declare namespace camera { - * Status of the sketch stream. - * 0 is stop, and 1 is start. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- status: number; -+ status: int; - - /** - * The zoom ratio of the sketch stream. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- sketchRatio: number; -+ sketchRatio: double; - } - - /** -@@ -8009,7 +8526,8 @@ declare namespace camera { - * @extends CameraOutput - * @interface PreviewOutput - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PreviewOutput extends CameraOutput { - /** -@@ -8064,7 +8582,8 @@ declare namespace camera { - * @param { 'frameStart' } type - Event type. - * @param { AsyncCallback } callback - Callback used to return the result. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'frameStart', callback: AsyncCallback): void; - -@@ -8074,7 +8593,8 @@ declare namespace camera { - * @param { 'frameStart' } type - Event type. - * @param { AsyncCallback } callback - Callback used to return the result. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'frameStart', callback?: AsyncCallback): void; - -@@ -8084,7 +8604,8 @@ declare namespace camera { - * @param { 'frameEnd' } type - Event type. - * @param { AsyncCallback } callback - Callback used to return the result. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'frameEnd', callback: AsyncCallback): void; - -@@ -8094,7 +8615,8 @@ declare namespace camera { - * @param { 'frameEnd' } type - Event type. - * @param { AsyncCallback } callback - Callback used to return the result. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'frameEnd', callback?: AsyncCallback): void; - -@@ -8104,7 +8626,8 @@ declare namespace camera { - * @param { 'error' } type - Event type. - * @param { ErrorCallback } callback - Callback used to get the preview output errors. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -8114,7 +8637,8 @@ declare namespace camera { - * @param { 'error' } type - Event type. - * @param { ErrorCallback } callback - Callback used to get the preview output errors. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - -@@ -8123,28 +8647,31 @@ declare namespace camera { - * - * @returns { Array } The array of supported frame rate range. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getSupportedFrameRates(): Array -+ getSupportedFrameRates(): Array; - - /** - * Set a frame rate range. - * -- * @param { number } minFps - Minimum frame rate per second. -- * @param { number } maxFps - Maximum frame rate per second. -+ * @param { int } minFps - Minimum frame rate per second. -+ * @param { int } maxFps - Maximum frame rate per second. - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @throws { BusinessError } 7400110 - Unresolved conflicts with current configurations. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- setFrameRate(minFps: number, maxFps: number): void -+ setFrameRate(minFps: int, maxFps: int): void; - - /** - * Get active frame rate range which has been set before. - * - * @returns { FrameRateRange } The active frame rate range. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getActiveFrameRate(): FrameRateRange; - -@@ -8154,21 +8681,23 @@ declare namespace camera { - * @returns { Profile } The current preconfig type. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getActiveProfile(): Profile; - - /** - * Gets the preview rotation angle. - * -- * @param { number } displayRotation - The current display rotation angle. -+ * @param { int } displayRotation - The current display rotation angle. - * @returns { ImageRotation } The preview rotation angle. - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getPreviewRotation(displayRotation: number): ImageRotation; -+ getPreviewRotation(displayRotation: int): ImageRotation; - - /** - * Sets the preview rotation angle. -@@ -8178,7 +8707,8 @@ declare namespace camera { - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setPreviewRotation(previewRotation: ImageRotation, isDisplayLocked?: boolean): void; - -@@ -8199,7 +8729,8 @@ declare namespace camera { - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - addDeferredSurface(surfaceId: string): void; - -@@ -8210,21 +8741,23 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isSketchSupported(): boolean; - - /** - * Gets the specific zoom ratio when sketch stream open. - * -- * @returns { number } The specific zoom ratio of sketch. -+ * @returns { double } The specific zoom ratio of sketch. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getSketchRatio(): number; -+ getSketchRatio(): double; - - /** - * Enable sketch for camera. -@@ -8246,7 +8779,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enableSketch(enabled: boolean): void; - -@@ -8270,7 +8804,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - attachSketchSurface(surfaceId: string): void; - -@@ -8282,7 +8817,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'sketchStatusChanged', callback: AsyncCallback): void; - -@@ -8294,7 +8830,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'sketchStatusChanged', callback?: AsyncCallback): void; - } -@@ -8302,10 +8839,11 @@ declare namespace camera { - /** - * Enum for effect suggestion. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum EffectSuggestionType { - /** -@@ -8313,7 +8851,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EFFECT_SUGGESTION_NONE = 0, - /** -@@ -8321,7 +8860,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EFFECT_SUGGESTION_PORTRAIT = 1, - /** -@@ -8329,7 +8869,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EFFECT_SUGGESTION_FOOD = 2, - -@@ -8338,7 +8879,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EFFECT_SUGGESTION_SKY = 3, - -@@ -8347,7 +8889,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EFFECT_SUGGESTION_SUNRISE_SUNSET = 4 - } -@@ -8357,7 +8900,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class EffectSuggestionStatus { - /** -@@ -8366,7 +8910,8 @@ declare namespace camera { - * @type { EffectSuggestionType } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type: EffectSuggestionType; - /** -@@ -8375,7 +8920,8 @@ declare namespace camera { - * @type { boolean } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - status: boolean; - } -@@ -8383,7 +8929,7 @@ declare namespace camera { - /** - * Enumerates the image rotation angles. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 -@@ -8438,38 +8984,38 @@ declare namespace camera { - /** - * Latitude. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- latitude: number; -+ latitude: double; - - /** - * Longitude. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- longitude: number; -+ longitude: double; - - /** - * Altitude. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- altitude: number; -+ altitude: double; - } - - /** - * Enumerates the image quality levels. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 -@@ -8556,7 +9102,7 @@ declare namespace camera { - /** - * Enumerates the delivery image types. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi - * @since arkts {'1.1':'11','1.2':'20'} -@@ -8599,7 +9145,8 @@ declare namespace camera { - * - * @typedef Photo - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Photo { - /** -@@ -8647,7 +9194,8 @@ declare namespace camera { - * @typedef DeferredPhotoProxy - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface DeferredPhotoProxy { - /** -@@ -8676,7 +9224,7 @@ declare namespace camera { - /** - * Enumerates the camera video codec type. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 -@@ -8707,7 +9255,8 @@ declare namespace camera { - * @extends CameraOutput - * @interface PhotoOutput - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PhotoOutput extends CameraOutput { - /** -@@ -8717,7 +9266,8 @@ declare namespace camera { - * @throws { BusinessError } 7400104 - Session not running. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - capture(callback: AsyncCallback): void; - -@@ -8728,7 +9278,8 @@ declare namespace camera { - * @throws { BusinessError } 7400104 - Session not running. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - capture(): Promise; - -@@ -8741,7 +9292,8 @@ declare namespace camera { - * @throws { BusinessError } 7400104 - Session not running. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - capture(setting: PhotoCaptureSetting, callback: AsyncCallback): void; - -@@ -8766,7 +9318,8 @@ declare namespace camera { - * @throws { BusinessError } 7400104 - Session not running. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - capture(setting: PhotoCaptureSetting): Promise; - -@@ -8781,7 +9334,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - burstCapture(setting: PhotoCaptureSetting): Promise; - -@@ -8806,7 +9360,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isRawDeliverySupported(): boolean; - -@@ -8835,7 +9390,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isDeferredImageDeliverySupported(type: DeferredDeliveryImageType): boolean; - -@@ -8850,7 +9406,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isDeferredImageDeliveryEnabled(type: DeferredDeliveryImageType): boolean; - -@@ -8864,7 +9421,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - deferImageDelivery(type: DeferredDeliveryImageType): void; - -@@ -8877,7 +9435,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isDepthDataDeliverySupported(): boolean; - -@@ -8891,7 +9450,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enableDepthDataDelivery(enabled: boolean): void; - -@@ -8901,7 +9461,8 @@ declare namespace camera { - * @returns { Array } An array of supported video codec types for moving photo. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSupportedMovingPhotoVideoCodecTypes(): Array; - -@@ -8911,7 +9472,8 @@ declare namespace camera { - * @param { VideoCodecType } codecType - Codec type for moving photo. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setMovingPhotoVideoCodecType(codecType: VideoCodecType): void; - -@@ -8984,7 +9546,8 @@ declare namespace camera { - * - * @returns { boolean } Is the mirror supported. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isMirrorSupported(): boolean; - -@@ -8996,7 +9559,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enableMirror(enabled: boolean): void; - -@@ -9030,7 +9594,8 @@ declare namespace camera { - * @param { 'captureStartWithInfo' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the capture start info. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'captureStartWithInfo', callback: AsyncCallback): void; - -@@ -9040,7 +9605,8 @@ declare namespace camera { - * @param { 'captureStartWithInfo' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the capture start info. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'captureStartWithInfo', callback?: AsyncCallback): void; - -@@ -9050,7 +9616,8 @@ declare namespace camera { - * @param { 'frameShutter' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the frame shutter information. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'frameShutter', callback: AsyncCallback): void; - -@@ -9060,7 +9627,8 @@ declare namespace camera { - * @param { 'frameShutter' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the frame shutter information. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'frameShutter', callback?: AsyncCallback): void; - -@@ -9070,7 +9638,8 @@ declare namespace camera { - * @param { 'frameShutterEnd' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the frame shutter end information. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'frameShutterEnd', callback: AsyncCallback): void; - -@@ -9080,7 +9649,8 @@ declare namespace camera { - * @param { 'frameShutterEnd' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the frame shutter end information. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'frameShutterEnd', callback?: AsyncCallback): void; - -@@ -9090,7 +9660,8 @@ declare namespace camera { - * @param { 'captureEnd' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the capture end information. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'captureEnd', callback: AsyncCallback): void; - -@@ -9100,7 +9671,8 @@ declare namespace camera { - * @param { 'captureEnd' } type - Event type. - * @param { AsyncCallback } callback - Callback used to get the capture end information. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'captureEnd', callback?: AsyncCallback): void; - -@@ -9110,7 +9682,8 @@ declare namespace camera { - * @param { 'captureReady' } type - Event type. - * @param { AsyncCallback } callback - Callback used to notice capture ready. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'captureReady', callback: AsyncCallback): void; - -@@ -9120,7 +9693,8 @@ declare namespace camera { - * @param { 'captureReady' } type - Event type. - * @param { AsyncCallback } callback - Callback used to notice capture ready. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'captureReady', callback?: AsyncCallback): void; - -@@ -9128,21 +9702,23 @@ declare namespace camera { - * Subscribes estimated capture duration event callback. - * - * @param { 'estimatedCaptureDuration' } type - Event type. -- * @param { AsyncCallback } callback - Callback used to notify the estimated capture duration (in milliseconds). -+ * @param { AsyncCallback } callback - Callback used to notify the estimated capture duration (in milliseconds). - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- on(type: 'estimatedCaptureDuration', callback: AsyncCallback): void; -+ on(type: 'estimatedCaptureDuration', callback: AsyncCallback): void; - - /** - * Unsubscribes from estimated capture duration event callback. - * - * @param { 'estimatedCaptureDuration' } type - Event type. -- * @param { AsyncCallback } callback - Callback used to notify the estimated capture duration (in milliseconds). -+ * @param { AsyncCallback } callback - Callback used to notify the estimated capture duration (in milliseconds). - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- off(type: 'estimatedCaptureDuration', callback?: AsyncCallback): void; -+ off(type: 'estimatedCaptureDuration', callback?: AsyncCallback): void; - - /** - * Subscribes to error events. -@@ -9150,7 +9726,8 @@ declare namespace camera { - * @param { 'error' } type - Event type. - * @param { ErrorCallback } callback - Callback used to get the photo output errors. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -9160,7 +9737,8 @@ declare namespace camera { - * @param { 'error' } type - Event type. - * @param { ErrorCallback } callback - Callback used to get the photo output errors. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - -@@ -9170,7 +9748,8 @@ declare namespace camera { - * @returns { Profile } The current preconfig type. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getActiveProfile(): Profile; - -@@ -9193,7 +9772,8 @@ declare namespace camera { - * @throws { BusinessError } 7400104 - session is not running. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isQuickThumbnailSupported(): boolean; - -@@ -9222,7 +9802,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enableQuickThumbnail(enabled: boolean): void; - -@@ -9259,7 +9840,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isAutoHighQualityPhotoSupported(): boolean; - -@@ -9273,7 +9855,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enableAutoHighQualityPhoto(enabled: boolean): void; - -@@ -9285,7 +9868,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isAutoCloudImageEnhancementSupported(): boolean; - -@@ -9298,7 +9882,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enableAutoCloudImageEnhancement(enabled: boolean): void; - -@@ -9308,7 +9893,8 @@ declare namespace camera { - * @returns { boolean } TRUE if the moving photo is supported. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isMovingPhotoSupported(): boolean; - -@@ -9321,21 +9907,23 @@ declare namespace camera { - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enableMovingPhoto(enabled: boolean): void; - - /** - * Gets the photo rotation angle. - * -- * @param { number } deviceDegree - The current device rotation degree. -+ * @param { int } deviceDegree - The current device rotation degree. - * @returns { ImageRotation } The photo rotation angle. - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getPhotoRotation(deviceDegree: number): ImageRotation; -+ getPhotoRotation(deviceDegree: int): ImageRotation; - - /** - * Confirm if offline processing is supported. -@@ -9345,7 +9933,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isOfflineSupported(): boolean; - -@@ -9357,7 +9946,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enableOffline(): void; - -@@ -9370,7 +9960,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'offlineDeliveryFinished', callback: AsyncCallback): void; - -@@ -9383,7 +9974,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'offlineDeliveryFinished', callback?: AsyncCallback): void - } -@@ -9400,21 +9992,21 @@ declare namespace camera { - /** - * Capture id. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- captureId: number; -+ captureId: int; - /** - * Timestamp for frame. - * -- * @type { number } -+ * @type { long } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- timestamp: number; -+ timestamp: long; - } - - /** -@@ -9429,12 +10021,12 @@ declare namespace camera { - /** - * Capture id. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- captureId: number; -+ captureId: int; - } - - /** -@@ -9449,21 +10041,21 @@ declare namespace camera { - /** - * Capture id. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- captureId: number; -+ captureId: int; - /** - * Time(in milliseconds) is the shutter time for the photo. - * -- * @type { number } -+ * @type { long } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- time: number; -+ time: long; - } - - /** -@@ -9478,21 +10070,21 @@ declare namespace camera { - /** - * Capture id. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- captureId: number; -+ captureId: int; - /** - * Frame count. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- frameCount: number; -+ frameCount: int; - } - - /** -@@ -9501,7 +10093,8 @@ declare namespace camera { - * @typedef DeferredVideoEnhancementInfo - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface DeferredVideoEnhancementInfo { - /** -@@ -9511,7 +10104,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly isDeferredVideoEnhancementAvailable: boolean; - /** -@@ -9521,7 +10115,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly videoId?: string; - } -@@ -9532,7 +10127,8 @@ declare namespace camera { - * @extends CameraOutput - * @interface VideoOutput - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface VideoOutput extends CameraOutput { - /** -@@ -9542,7 +10138,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - start(callback: AsyncCallback): void; - -@@ -9553,7 +10150,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - start(): Promise; - -@@ -9562,7 +10160,8 @@ declare namespace camera { - * - * @param { AsyncCallback } callback - Callback used to return the result. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - stop(callback: AsyncCallback): void; - -@@ -9571,7 +10170,8 @@ declare namespace camera { - * - * @returns { Promise } Promise used to return the result. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - stop(): Promise; - -@@ -9589,7 +10189,8 @@ declare namespace camera { - * - * @returns { boolean } Is video mirror supported. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isMirrorSupported(): boolean; - -@@ -9611,7 +10212,8 @@ declare namespace camera { - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enableMirror(enabled: boolean): void; - -@@ -9620,42 +10222,46 @@ declare namespace camera { - * - * @returns { Array } The array of supported frame rate range. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSupportedFrameRates(): Array - - /** - * Set a frame rate range. - * -- * @param { number } minFps - Minimum frame rate per second. -- * @param { number } maxFps - Maximum frame rate per second. -+ * @param { int } minFps - Minimum frame rate per second. -+ * @param { int } maxFps - Maximum frame rate per second. - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @throws { BusinessError } 7400110 - Unresolved conflicts with current configurations. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- setFrameRate(minFps: number, maxFps: number): void -+ setFrameRate(minFps: int, maxFps: int): void; - - /** - * Get active frame rate range which has been set before. - * - * @returns { FrameRateRange } The active frame rate range. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getActiveFrameRate(): FrameRateRange; - - /** - * Gets the video rotation angle. - * -- * @param { number } deviceDegree - The current device rotation degree. -+ * @param { int } deviceDegree - The current device rotation degree. - * @returns { ImageRotation } The video rotation angle. - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getVideoRotation(deviceDegree: number): ImageRotation; -+ getVideoRotation(deviceDegree: int): ImageRotation; - - /** - * Confirm if auto deferred video enhancement is supported in the specific device. -@@ -9665,7 +10271,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isAutoDeferredVideoEnhancementSupported(): boolean; - -@@ -9677,7 +10284,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isAutoDeferredVideoEnhancementEnabled(): boolean; - -@@ -9690,7 +10298,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enableAutoDeferredVideoEnhancement(enabled: boolean): void; - -@@ -9701,7 +10310,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSupportedRotations(): Array; - -@@ -9712,7 +10322,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isRotationSupported(): boolean; - -@@ -9724,7 +10335,8 @@ declare namespace camera { - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setRotation(rotation: ImageRotation): void; - -@@ -9735,7 +10347,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isAutoVideoFrameRateSupported(): boolean; - -@@ -9748,7 +10361,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enableAutoVideoFrameRate(enabled: boolean): void; - -@@ -9760,7 +10374,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'deferredVideoEnhancementInfo', callback: AsyncCallback): void; - -@@ -9772,7 +10387,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'deferredVideoEnhancementInfo', callback?: AsyncCallback): void; - -@@ -9782,7 +10398,8 @@ declare namespace camera { - * @param { 'frameStart' } type - Event type. - * @param { AsyncCallback } callback - Callback used to return the result. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'frameStart', callback: AsyncCallback): void; - -@@ -9792,7 +10409,8 @@ declare namespace camera { - * @param { 'frameStart' } type - Event type. - * @param { AsyncCallback } callback - Callback used to return the result. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'frameStart', callback?: AsyncCallback): void; - -@@ -9802,7 +10420,8 @@ declare namespace camera { - * @param { 'frameEnd' } type - Event type. - * @param { AsyncCallback } callback - Callback used to return the result. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'frameEnd', callback: AsyncCallback): void; - -@@ -9812,7 +10431,8 @@ declare namespace camera { - * @param { 'frameEnd' } type - Event type. - * @param { AsyncCallback } callback - Callback used to return the result. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'frameEnd', callback?: AsyncCallback): void; - -@@ -9822,7 +10442,8 @@ declare namespace camera { - * @param { 'error' } type - Event type. - * @param { ErrorCallback } callback - Callback used to get the video output errors. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -9832,7 +10453,8 @@ declare namespace camera { - * @param { 'error' } type - Event type. - * @param { ErrorCallback } callback - Callback used to get the video output errors. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - -@@ -9842,7 +10464,8 @@ declare namespace camera { - * @returns { VideoProfile } The current preconfig type. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getActiveProfile(): VideoProfile; - -@@ -9853,7 +10476,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSupportedVideoMetaTypes(): Array; - -@@ -9866,7 +10490,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - attachMetaSurface(surfaceId: string, type: VideoMetaType): void; - } -@@ -9874,17 +10499,19 @@ declare namespace camera { - /** - * Video meta type. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum VideoMetaType { - /** - * Video meta type for storing maker info. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - VIDEO_META_MAKER_INFO = 0, - } -@@ -9892,7 +10519,7 @@ declare namespace camera { - /** - * Metadata object type. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 -@@ -9981,10 +10608,11 @@ declare namespace camera { - /** - * Enum for light painting tabletype. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum LightPaintingType { - /** -@@ -9992,7 +10620,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TRAFFIC_TRAILS = 0, - -@@ -10001,7 +10630,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - STAR_TRAILS = 1, - -@@ -10010,7 +10640,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SILKY_WATER = 2, - -@@ -10019,7 +10650,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LIGHT_GRAFFITI = 3 - } -@@ -10036,48 +10668,49 @@ declare namespace camera { - /** - * X coordinator of top left point. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- topLeftX: number; -+ topLeftX: double; - /** - * Y coordinator of top left point. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- topLeftY: number; -+ topLeftY: double; - /** - * Width of this rectangle. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- width: number; -+ width: double; - /** - * Height of this rectangle. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Camera.Core - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- height: number; -+ height: double; - } - - /** - * Enum for emotion type. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum Emotion { - /** -@@ -10085,7 +10718,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NEUTRAL = 0, - -@@ -10094,7 +10728,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SADNESS = 1, - -@@ -10103,7 +10738,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SMILE = 2, - -@@ -10112,7 +10748,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SURPRISE = 3 - } -@@ -10122,7 +10759,8 @@ declare namespace camera { - * - * @typedef MetadataObject - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MetadataObject { - /** -@@ -10131,47 +10769,52 @@ declare namespace camera { - * @type { MetadataObjectType } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly type: MetadataObjectType; - /** - * Metadata object timestamp in milliseconds. - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly timestamp: number; -+ readonly timestamp: int; - /** - * The axis-aligned bounding box of detected metadata object. - * - * @type { Rect } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly boundingBox: Rect; - /** - * Metadata object id. - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly objectId: number; -+ readonly objectId: int; - /** - * Confidence for the detected type. - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly confidence: number; -+ readonly confidence: int; - } - - /** -@@ -10181,7 +10824,8 @@ declare namespace camera { - * @extends MetadataObject - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MetadataFaceObject extends MetadataObject { - /** -@@ -10191,7 +10835,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly leftEyeBoundingBox: Rect; - -@@ -10202,7 +10847,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly rightEyeBoundingBox: Rect; - -@@ -10213,53 +10859,58 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly emotion: Emotion; - - /** - * Emotion confidence. - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly emotionConfidence: number; -+ readonly emotionConfidence: int; - - /** - * Pitch angle for face. - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly pitchAngle: number; -+ readonly pitchAngle: int; - - /** - * Yaw angle for face. - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly yawAngle: number; -+ readonly yawAngle: int; - - /** - * Roll angle for face. - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly rollAngle: number; -+ readonly rollAngle: int; - } - - /** -@@ -10269,7 +10920,8 @@ declare namespace camera { - * @extends MetadataObject - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MetadataHumanBodyObject extends MetadataObject { - } -@@ -10281,7 +10933,8 @@ declare namespace camera { - * @extends MetadataObject - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MetadataCatFaceObject extends MetadataObject { - /** -@@ -10291,7 +10944,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly leftEyeBoundingBox: Rect; - -@@ -10302,7 +10956,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly rightEyeBoundingBox: Rect; - } -@@ -10314,7 +10969,8 @@ declare namespace camera { - * @extends MetadataObject - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MetadataCatBodyObject extends MetadataObject { - } -@@ -10326,7 +10982,8 @@ declare namespace camera { - * @extends MetadataObject - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MetadataDogFaceObject extends MetadataObject { - /** -@@ -10336,7 +10993,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly leftEyeBoundingBox: Rect; - -@@ -10347,7 +11005,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly rightEyeBoundingBox: Rect; - } -@@ -10359,7 +11018,8 @@ declare namespace camera { - * @extends MetadataObject - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MetadataDogBodyObject extends MetadataObject { - } -@@ -10371,7 +11031,8 @@ declare namespace camera { - * @extends MetadataObject - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MetadataSalientDetectionObject extends MetadataObject { - } -@@ -10383,7 +11044,8 @@ declare namespace camera { - * @typedef MetadataBarcodeObject - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MetadataBarcodeObject extends MetadataObject { - } -@@ -10394,7 +11056,8 @@ declare namespace camera { - * @typedef CameraOcclusionDetectionResult - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface CameraOcclusionDetectionResult { - /** -@@ -10404,7 +11067,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly isCameraOccluded: boolean; - -@@ -10415,7 +11079,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly isCameraLensDirty: boolean; - } -@@ -10426,7 +11091,8 @@ declare namespace camera { - * @extends CameraOutput - * @interface MetadataOutput - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MetadataOutput extends CameraOutput { - /** -@@ -10436,7 +11102,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - start(callback: AsyncCallback): void; - -@@ -10447,7 +11114,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - start(): Promise; - -@@ -10456,7 +11124,8 @@ declare namespace camera { - * - * @param { AsyncCallback } callback - Callback used to return the result. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - stop(callback: AsyncCallback): void; - -@@ -10465,7 +11134,8 @@ declare namespace camera { - * - * @returns { Promise } Promise used to return the result. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - stop(): Promise; - -@@ -10479,7 +11149,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - addMetadataObjectTypes(types: Array): void; - -@@ -10493,7 +11164,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - removeMetadataObjectTypes(types: Array): void; - -@@ -10503,7 +11175,8 @@ declare namespace camera { - * @param { 'metadataObjectsAvailable' } type - Event type. - * @param { AsyncCallback> } callback - Callback used to get the available metadata objects. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'metadataObjectsAvailable', callback: AsyncCallback>): void; - -@@ -10513,7 +11186,8 @@ declare namespace camera { - * @param { 'metadataObjectsAvailable' } type - Event type. - * @param { AsyncCallback> } callback - Callback used to get the available metadata objects. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'metadataObjectsAvailable', callback?: AsyncCallback>): void; - -@@ -10523,7 +11197,8 @@ declare namespace camera { - * @param { 'error' } type - Event type. - * @param { ErrorCallback } callback - Callback used to get the video output errors. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -10533,7 +11208,8 @@ declare namespace camera { - * @param { 'error' } type - Event type. - * @param { ErrorCallback } callback - Callback used to get the video output errors. - * @syscap SystemCapability.Multimedia.Camera.Core -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - } -@@ -10541,10 +11217,11 @@ declare namespace camera { - /** - * Enumerates the timelapse recording state. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum TimeLapseRecordState { - /** -@@ -10552,7 +11229,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - IDLE = 0, - -@@ -10561,7 +11239,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RECORDING = 1 - } -@@ -10569,10 +11248,11 @@ declare namespace camera { - /** - * Enumerates the timelapse preview type. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum TimeLapsePreviewType { - /** -@@ -10580,7 +11260,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DARK = 1, - -@@ -10589,7 +11270,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LIGHT = 2 - } -@@ -10600,7 +11282,8 @@ declare namespace camera { - * @typedef TryAEInfo - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface TryAEInfo { - /** -@@ -10610,7 +11293,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly isTryAEDone: boolean; - -@@ -10621,7 +11305,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly isTryAEHintNeeded?: boolean; - -@@ -10632,20 +11317,22 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly previewType?: TimeLapsePreviewType; - - /** - * Timelapse capture interval. - * -- * @type { ?number } -+ * @type { ?int } - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly captureInterval?: number; -+ readonly captureInterval?: int; - } - - /** -@@ -10655,7 +11342,8 @@ declare namespace camera { - * @interface TimeLapsePhotoSession - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface TimeLapsePhotoSession extends Session, Focus, ManualFocus, AutoExposure, ManualExposure, ManualIso, WhiteBalance, Zoom, ColorEffect { - /** -@@ -10666,7 +11354,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -10678,7 +11367,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - -@@ -10690,7 +11380,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'focusStateChange', callback: AsyncCallback): void; - -@@ -10702,7 +11393,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'focusStateChange', callback?: AsyncCallback): void; - -@@ -10714,7 +11406,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'isoInfoChange', callback: AsyncCallback): void; - -@@ -10726,7 +11419,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'isoInfoChange', callback?: AsyncCallback): void; - -@@ -10738,7 +11432,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'exposureInfoChange', callback: AsyncCallback): void; - -@@ -10750,7 +11445,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'exposureInfoChange', callback?: AsyncCallback): void; - -@@ -10762,7 +11458,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'luminationInfoChange', callback: AsyncCallback): void; - -@@ -10774,7 +11471,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'luminationInfoChange', callback?: AsyncCallback): void; - -@@ -10786,7 +11484,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isTryAENeeded(): boolean; - -@@ -10798,7 +11497,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - startTryAE(): void; - -@@ -10810,7 +11510,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - stopTryAE(): void; - -@@ -10822,7 +11523,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'tryAEInfoChange', callback: AsyncCallback): void; - -@@ -10834,46 +11536,50 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'tryAEInfoChange', callback?: AsyncCallback): void; - - /** - * Gets supported timelapse interval range. - * -- * @returns { Array } Timelapse interval range. -+ * @returns { Array } Timelapse interval range. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getSupportedTimeLapseIntervalRange(): Array; -+ getSupportedTimeLapseIntervalRange(): Array; - - /** - * Gets the timelapse interval in use. - * -- * @returns { number } the timelapse interval in use. -+ * @returns { int } the timelapse interval in use. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getTimeLapseInterval(): number; -+ getTimeLapseInterval(): int; - - /** - * Sets a timelapse interval for a camera device. - * -- * @param { number } interval The timelapse interval. -+ * @param { int } interval The timelapse interval. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400101 - Parameter missing or parameter type incorrect. - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- setTimeLapseInterval(interval: number): void; -+ setTimeLapseInterval(interval: int): void; - - /** - * Gets the timelapse recording state in use. -@@ -10896,7 +11602,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setTimeLapseRecordState(state: TimeLapseRecordState): void; - -@@ -10921,7 +11628,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setTimeLapsePreviewType(type: TimeLapsePreviewType): void; - } -@@ -10929,7 +11637,7 @@ declare namespace camera { - /** - * Enum for Depth Data Accuracy. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} -@@ -10960,7 +11668,7 @@ declare namespace camera { - /** - * Enum for Depth Data Quality Level. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi - * @since arkts {'1.1':'13','1.2':'20'} -@@ -11004,7 +11712,8 @@ declare namespace camera { - * @interface DepthProfile - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface DepthProfile { - /** -@@ -11014,7 +11723,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly format: CameraFormat; - -@@ -11025,7 +11735,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly dataAccuracy: DepthDataAccuracy; - -@@ -11036,7 +11747,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly size: Size; - } -@@ -11047,7 +11759,8 @@ declare namespace camera { - * @interface DepthData. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface DepthData { - /** -@@ -11057,7 +11770,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly format: CameraFormat; - -@@ -11079,7 +11793,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly qualityLevel: DepthDataQualityLevel; - -@@ -11090,7 +11805,8 @@ declare namespace camera { - * @readonly - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly dataAccuracy: DepthDataAccuracy; - -@@ -11113,7 +11829,8 @@ declare namespace camera { - * @interface DepthDataOutput - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface DepthDataOutput extends CameraOutput { - /** -@@ -11125,7 +11842,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - start(): Promise; - -@@ -11138,7 +11856,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - stop(): Promise; - -@@ -11150,7 +11869,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'depthDataAvailable', callback: AsyncCallback): void; - -@@ -11162,7 +11882,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'depthDataAvailable', callback?: AsyncCallback): void; - -@@ -11174,7 +11895,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -11186,7 +11908,8 @@ declare namespace camera { - * @throws { BusinessError } 202 - Not System Application. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'error', callback?: ErrorCallback): void; - } -@@ -11197,7 +11920,8 @@ declare namespace camera { - * @interface DepthFusionQuery - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface DepthFusionQuery { - /** -@@ -11208,21 +11932,23 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isDepthFusionSupported(): boolean; - - /** - * Query the depth fusion threshold. - * -- * @returns { Array } The depth fusion threshold. -+ * @returns { Array } The depth fusion threshold. - * @throws { BusinessError } 202 - Not System Application. - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getDepthFusionThreshold(): Array; -+ getDepthFusionThreshold(): Array; - } - - /** -@@ -11232,7 +11958,8 @@ declare namespace camera { - * @interface DepthFusion - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface DepthFusion extends DepthFusionQuery { - /** -@@ -11243,7 +11970,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isDepthFusionEnabled(): boolean; - -@@ -11257,7 +11985,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enableDepthFusion(enabled: boolean): void; - } -@@ -11265,10 +11994,11 @@ declare namespace camera { - /** - * Enum for auxiliary type. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum AuxiliaryType { - /** -@@ -11276,7 +12006,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CONTRACT_LENS = 0 - } -@@ -11284,10 +12015,11 @@ declare namespace camera { - /** - * Enum for auxiliary status. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum AuxiliaryStatus { - /** -@@ -11295,7 +12027,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LOCKED = 0, - -@@ -11304,7 +12037,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ON = 1, - -@@ -11313,7 +12047,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - OFF = 2 - } -@@ -11321,10 +12056,11 @@ declare namespace camera { - /** - * Enum for color reservation type. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum ColorReservationType { - /** -@@ -11332,7 +12068,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NONE = 0, - -@@ -11341,7 +12078,8 @@ declare namespace camera { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PORTRAIT = 1 - } -@@ -11352,7 +12090,8 @@ declare namespace camera { - * @interface ColorReservationQuery - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ColorReservationQuery { - /** -@@ -11363,7 +12102,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSupportedColorReservationTypes(): Array; - } -@@ -11375,7 +12115,8 @@ declare namespace camera { - * @interface ColorReservation - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ColorReservation extends ColorReservationQuery { - /** -@@ -11386,7 +12127,8 @@ declare namespace camera { - * @throws { BusinessError } 7400103 - Session not config, only throw in session usage. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getColorReservation(): ColorReservationType; - -@@ -11403,7 +12145,8 @@ declare namespace camera { - * @throws { BusinessError } 7400201 - Camera service fatal error. - * @syscap SystemCapability.Multimedia.Camera.Core - * @systemapi -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setColorReservation(type: ColorReservationType): void; - } -diff --git a/api/@ohos.multimedia.cameraPicker.d.ts b/api/@ohos.multimedia.cameraPicker.d.ts -index 0aaf06ab6..e77efbbae 100644 ---- a/api/@ohos.multimedia.cameraPicker.d.ts -+++ b/api/@ohos.multimedia.cameraPicker.d.ts -@@ -30,7 +30,8 @@ import type camera from './@ohos.multimedia.camera'; - * @namespace cameraPicker - * @syscap SystemCapability.Multimedia.Camera.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace cameraPicker { - -@@ -45,7 +46,8 @@ declare namespace cameraPicker { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class PickerProfile { - /** -@@ -61,7 +63,8 @@ declare namespace cameraPicker { - * @type { camera.CameraPosition } - * @syscap SystemCapability.Multimedia.Camera.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - cameraPosition: camera.CameraPosition; - -@@ -78,7 +81,8 @@ declare namespace cameraPicker { - * @type { ?string } - * @syscap SystemCapability.Multimedia.Camera.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - saveUri?: string; - -@@ -92,12 +96,13 @@ declare namespace cameraPicker { - /** - * The max duration of the video. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- videoDuration?: number; -+ videoDuration?: int; - } - - /** -@@ -113,7 +118,8 @@ declare namespace cameraPicker { - * @enum { string } - * @syscap SystemCapability.Multimedia.Camera.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PickerMediaType { - /** -@@ -127,7 +133,8 @@ declare namespace cameraPicker { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PHOTO = 'photo', - -@@ -142,7 +149,8 @@ declare namespace cameraPicker { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - VIDEO = 'video' - } -@@ -158,7 +166,8 @@ declare namespace cameraPicker { - * - * @syscap SystemCapability.Multimedia.Camera.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class PickerResult { - /** -@@ -171,12 +180,13 @@ declare namespace cameraPicker { - /** - * The result code. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Camera.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- resultCode: number; -+ resultCode: int; - - /** - * The result saved uri. -@@ -191,7 +201,8 @@ declare namespace cameraPicker { - * @type { string } - * @syscap SystemCapability.Multimedia.Camera.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - resultUri: string; - -@@ -208,7 +219,8 @@ declare namespace cameraPicker { - * @type { PickerMediaType } - * @syscap SystemCapability.Multimedia.Camera.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - mediaType: PickerMediaType; - } -@@ -232,7 +244,8 @@ declare namespace cameraPicker { - * @returns { Promise } pick result. - * @syscap SystemCapability.Multimedia.Camera.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function pick(context: Context, mediaTypes: Array, pickerProfile: PickerProfile): Promise; - } -diff --git a/api/@ohos.multimedia.drm.d.ts b/api/@ohos.multimedia.drm.d.ts -index e58565cb8..bcd02832a 100644 ---- a/api/@ohos.multimedia.drm.d.ts -+++ b/api/@ohos.multimedia.drm.d.ts -@@ -29,7 +29,8 @@ - * @namespace drm - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace drm { - /** -@@ -43,7 +44,8 @@ declare namespace drm { - * @enum { number } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum DrmErrorCode { - /** -@@ -55,7 +57,8 @@ declare namespace drm { - * All unknown errors. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ERROR_UNKNOWN = 24700101, - /** -@@ -67,7 +70,8 @@ declare namespace drm { - * Meet max MediaKeySystem num limit. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MAX_SYSTEM_NUM_REACHED = 24700103, - /** -@@ -79,7 +83,8 @@ declare namespace drm { - * Meet max MediaKeySession num limit. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MAX_SESSION_NUM_REACHED = 24700104, - /** -@@ -91,7 +96,8 @@ declare namespace drm { - * Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SERVICE_FATAL_ERROR = 24700201 - } -@@ -107,7 +113,8 @@ declare namespace drm { - * @enum { string } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PreDefinedConfigName { - /** -@@ -119,7 +126,8 @@ declare namespace drm { - * Config name vendor - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CONFIG_DEVICE_VENDOR = 'vendor', - /** -@@ -131,7 +139,8 @@ declare namespace drm { - * Config name version - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CONFIG_DEVICE_VERSION = 'version', - /** -@@ -143,7 +152,8 @@ declare namespace drm { - * Config name description - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CONFIG_DEVICE_DESCRIPTION = 'description', - /** -@@ -155,7 +165,8 @@ declare namespace drm { - * Config name algorithms - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CONFIG_DEVICE_ALGORITHMS = 'algorithms', - /** -@@ -167,7 +178,8 @@ declare namespace drm { - * Config name deviceUniqueId - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CONFIG_DEVICE_UNIQUE_ID = 'deviceUniqueId', - /** -@@ -179,7 +191,8 @@ declare namespace drm { - * Config name maxSessionNum - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CONFIG_SESSION_MAX = 'maxSessionNum', - /** -@@ -191,7 +204,8 @@ declare namespace drm { - * Config name currentSessionNum - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CONFIG_SESSION_CURRENT = 'currentSessionNum', - } -@@ -207,7 +221,8 @@ declare namespace drm { - * @enum { number } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum MediaKeyType { - /** -@@ -219,7 +234,8 @@ declare namespace drm { - * Offline media key type. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MEDIA_KEY_TYPE_OFFLINE = 0, - /** -@@ -231,7 +247,8 @@ declare namespace drm { - * Online media key type. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MEDIA_KEY_TYPE_ONLINE, - } -@@ -247,7 +264,8 @@ declare namespace drm { - * @enum { number } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum OfflineMediaKeyStatus { - /** -@@ -259,7 +277,8 @@ declare namespace drm { - * Offline media key status unknown. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - OFFLINE_MEDIA_KEY_STATUS_UNKNOWN = 0, - /** -@@ -271,7 +290,8 @@ declare namespace drm { - * Offline media key status usable. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - OFFLINE_MEDIA_KEY_STATUS_USABLE = 1, - /** -@@ -283,7 +303,8 @@ declare namespace drm { - * Offline media key status inactive. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - OFFLINE_MEDIA_KEY_STATUS_INACTIVE = 2, - } -@@ -299,7 +320,8 @@ declare namespace drm { - * @enum { number } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum CertificateStatus { - /** -@@ -311,7 +333,8 @@ declare namespace drm { - * Device already provisioned. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CERT_STATUS_PROVISIONED = 0, - /** -@@ -323,7 +346,8 @@ declare namespace drm { - * Device not provisioned. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CERT_STATUS_NOT_PROVISIONED, - /** -@@ -335,7 +359,8 @@ declare namespace drm { - * Cert already expired. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CERT_STATUS_EXPIRED, - /** -@@ -347,7 +372,8 @@ declare namespace drm { - * Certs are invalid. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CERT_STATUS_INVALID, - /** -@@ -359,7 +385,8 @@ declare namespace drm { - * Get certs status failed. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CERT_STATUS_UNAVAILABLE, - } -@@ -375,7 +402,8 @@ declare namespace drm { - * @enum { number } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum MediaKeyRequestType { - /** -@@ -387,7 +415,8 @@ declare namespace drm { - * Media key request type unknown. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MEDIA_KEY_REQUEST_TYPE_UNKNOWN = 0, - /** -@@ -399,7 +428,8 @@ declare namespace drm { - * Media key request type initial. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MEDIA_KEY_REQUEST_TYPE_INITIAL = 1, - /** -@@ -411,7 +441,8 @@ declare namespace drm { - * Media key request type renewal. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MEDIA_KEY_REQUEST_TYPE_RENEWAL = 2, - /** -@@ -423,7 +454,8 @@ declare namespace drm { - * Media key request type release. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MEDIA_KEY_REQUEST_TYPE_RELEASE = 3, - /** -@@ -435,7 +467,8 @@ declare namespace drm { - * Media key request type none. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MEDIA_KEY_REQUEST_TYPE_NONE = 4, - /** -@@ -447,7 +480,8 @@ declare namespace drm { - * Media key request type update. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MEDIA_KEY_REQUEST_TYPE_UPDATE = 5, - } -@@ -463,7 +497,8 @@ declare namespace drm { - * @enum { number } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum ContentProtectionLevel { - /** -@@ -475,7 +510,8 @@ declare namespace drm { - * Device decrypt and decode type unknown. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CONTENT_PROTECTION_LEVEL_UNKNOWN = 0, - /** -@@ -487,7 +523,8 @@ declare namespace drm { - * Device using software level. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CONTENT_PROTECTION_LEVEL_SW_CRYPTO, - /** -@@ -499,7 +536,8 @@ declare namespace drm { - * Device using hardware level. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CONTENT_PROTECTION_LEVEL_HW_CRYPTO, - /** -@@ -511,7 +549,8 @@ declare namespace drm { - * Device using enhanced hardware level. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CONTENT_PROTECTION_LEVEL_ENHANCED_HW, - /** -@@ -523,7 +562,8 @@ declare namespace drm { - * Max mode. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CONTENT_PROTECTION_LEVEL_MAX, - } -@@ -539,7 +579,8 @@ declare namespace drm { - * @interface ProvisionRequest - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ProvisionRequest { - /** -@@ -553,7 +594,8 @@ declare namespace drm { - * @type { Uint8Array } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - data: Uint8Array; - /** -@@ -567,7 +609,8 @@ declare namespace drm { - * @type { string } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - defaultURL: string; - } -@@ -583,7 +626,8 @@ declare namespace drm { - * @interface OptionsData - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface OptionsData { - /** -@@ -597,7 +641,8 @@ declare namespace drm { - * @type { string } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - name: string; - /** -@@ -611,7 +656,8 @@ declare namespace drm { - * @type { string } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - value: string; - } -@@ -627,7 +673,8 @@ declare namespace drm { - * @interface MediaKeyRequest - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MediaKeyRequest { - /** -@@ -641,7 +688,8 @@ declare namespace drm { - * @type { MediaKeyRequestType } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - mediaKeyRequestType: MediaKeyRequestType; - /** -@@ -655,7 +703,8 @@ declare namespace drm { - * @type { Uint8Array } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - data: Uint8Array; - /** -@@ -669,7 +718,8 @@ declare namespace drm { - * @type { string } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - defaultURL: string; - } -@@ -685,7 +735,8 @@ declare namespace drm { - * @interface EventInfo - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface EventInfo { - /** -@@ -699,7 +750,8 @@ declare namespace drm { - * @type { Uint8Array } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - info: Uint8Array; - /** -@@ -713,7 +765,8 @@ declare namespace drm { - * @type { string } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - extraInfo: string; - } -@@ -729,7 +782,8 @@ declare namespace drm { - * @interface StatisticKeyValue - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface StatisticKeyValue { - /** -@@ -743,7 +797,8 @@ declare namespace drm { - * @type { string } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - name: string; - /** -@@ -757,7 +812,8 @@ declare namespace drm { - * @type { string } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - value: string; - } -@@ -773,7 +829,8 @@ declare namespace drm { - * @interface MediaKeyStatus - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MediaKeyStatus { - /** -@@ -787,7 +844,8 @@ declare namespace drm { - * @type { string } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - name: string; - /** -@@ -801,7 +859,8 @@ declare namespace drm { - * @type { string } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - value: string; - } -@@ -817,7 +876,8 @@ declare namespace drm { - * @interface KeysInfo - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface KeysInfo { - /** -@@ -831,7 +891,8 @@ declare namespace drm { - * @type { Uint8Array } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - keyId: Uint8Array; - /** -@@ -845,7 +906,8 @@ declare namespace drm { - * @type { string } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - value: string; - } -@@ -861,7 +923,8 @@ declare namespace drm { - * @interface MediaKeySystemInfo - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MediaKeySystemInfo { - /** -@@ -875,7 +938,8 @@ declare namespace drm { - * @type { string } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - uuid: string; - /** -@@ -889,7 +953,8 @@ declare namespace drm { - * @type { Uint8Array } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - pssh: Uint8Array; - } -@@ -905,7 +970,8 @@ declare namespace drm { - * @interface MediaKeySystemDescription - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MediaKeySystemDescription { - /** -@@ -919,7 +985,8 @@ declare namespace drm { - * @type { string } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - name: string; - /** -@@ -933,7 +1000,8 @@ declare namespace drm { - * @type { string } - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - uuid: string; - } -@@ -959,7 +1027,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getMediaKeySystemUuid(name: string): string; - -@@ -978,7 +1047,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getMediaKeySystems(): MediaKeySystemDescription[]; - -@@ -1009,6 +1079,21 @@ declare namespace drm { - */ - function createMediaKeySystem(name: string): MediaKeySystem; - -+ /** -+ * Creates a MediaKeySystem instance. -+ * @param { string } name - Used to point a Digital Right Management solution. -+ * @returns { MediaKeySystem | undefined } The MediaKeySystem instance or undefined. -+ * @throws { BusinessError } 401 - The parameter check failed. Possibly because: -+ * 1.Mandatory parameters are left unspecified. 2.Parameter verification failed. -+ * @throws { BusinessError } 24700101 - All unknown errors. -+ * @throws { BusinessError } 24700103 - Meet max MediaKeySystem num limit. -+ * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. -+ * @syscap SystemCapability.Multimedia.Drm.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ function createMediaKeySystem(name: string): MediaKeySystem | undefined; -+ - /** - * Judge whether a system that specifies name, mimetype and content protection level is supported. - * @param { string } name - Used to point a Digital Right Management solution. -@@ -1036,7 +1121,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isMediaKeySystemSupported(name: string, mimeType: string, level: ContentProtectionLevel): boolean; - -@@ -1065,7 +1151,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isMediaKeySystemSupported(name: string, mimeType: string): boolean; - -@@ -1092,7 +1179,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isMediaKeySystemSupported(name: string): boolean; - -@@ -1109,7 +1197,8 @@ declare namespace drm { - * @interface MediaKeySystem - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MediaKeySystem { - /** -@@ -1135,7 +1224,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getConfigurationString(configName: string): string; - -@@ -1162,7 +1252,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setConfigurationString(configName: string, value: string): void; - -@@ -1187,7 +1278,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getConfigurationByteArray(configName: string): Uint8Array; - -@@ -1214,7 +1306,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setConfigurationByteArray(configName: string, value: Uint8Array): void; - -@@ -1235,7 +1328,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getStatistics(): StatisticKeyValue[]; - -@@ -1254,7 +1348,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getMaxContentProtectionLevel(): ContentProtectionLevel; - -@@ -1273,7 +1368,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - generateKeySystemRequest(): Promise; - -@@ -1300,7 +1396,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - processKeySystemResponse(response: Uint8Array): Promise; - -@@ -1319,7 +1416,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getCertificateStatus(): CertificateStatus; - -@@ -1342,7 +1440,8 @@ declare namespace drm { - * @throws { BusinessError } 24700101 - All unknown errors. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'keySystemRequired', callback: (eventInfo: EventInfo) => void): void; - -@@ -1365,7 +1464,8 @@ declare namespace drm { - * @throws { BusinessError } 24700101 - All unknown errors. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'keySystemRequired', callback?: (eventInfo: EventInfo) => void): void; - -@@ -1398,6 +1498,22 @@ declare namespace drm { - */ - createMediaKeySession(level: ContentProtectionLevel): MediaKeySession; - -+ /** -+ * Create a MediaKeySession instance with level. -+ * @param { ContentProtectionLevel} level - Used to specify the content protection level. -+ * @returns { MediaKeySession | undefined } A MediaKeySession instance or undefined. -+ * @throws { BusinessError } 401 - The parameter check failed. Possibly because: -+ * 1.Mandatory parameters are left unspecified. 2.The param level exceeds reasonable range, -+ * please use value in ContentProtectionLevel. -+ * @throws { BusinessError } 24700101 - All unknown errors. -+ * @throws { BusinessError } 24700104 - Meet max MediaKeySession num limit. -+ * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. -+ * @syscap SystemCapability.Multimedia.Drm.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ createMediaKeySession(level: ContentProtectionLevel): MediaKeySession | undefined; -+ - /** - * Create a MediaKeySession instance. - * @returns { MediaKeySession } A MediaKeySession instance. -@@ -1419,6 +1535,18 @@ declare namespace drm { - */ - createMediaKeySession(): MediaKeySession; - -+ /** -+ * Create a MediaKeySession instance. -+ * @returns { MediaKeySession | undefined } A MediaKeySession instance or undefined -+ * @throws { BusinessError } 24700101 - All unknown errors. -+ * @throws { BusinessError } 24700104 - Meet max MediaKeySession num limit. -+ * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. -+ * @syscap SystemCapability.Multimedia.Drm.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ createMediaKeySession(): MediaKeySession | undefined; -+ - /** - * Get the list of offline MediaKeyIds. - * @returns { Uint8Array[] } The list of offline MediaKeyIds. -@@ -1434,7 +1562,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getOfflineMediaKeyIds(): Uint8Array[]; - -@@ -1461,7 +1590,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getOfflineMediaKeyStatus(mediaKeyId: Uint8Array): OfflineMediaKeyStatus; - -@@ -1484,7 +1614,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - clearOfflineMediaKeys(mediaKeyId: Uint8Array): void; - /** -@@ -1500,7 +1631,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - destroy(): void; - } -@@ -1518,7 +1650,8 @@ declare namespace drm { - * @interface MediaKeySession - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MediaKeySession { - -@@ -1541,7 +1674,7 @@ declare namespace drm { - * Generate the media key request. - * @param { string } mimeType - Media type. - * @param { Uint8Array } initData - PSSH info. -- * @param { number } mediaKeyType - Offline or online. -+ * @param { int } mediaKeyType - Offline or online. - * @param { OptionsData[] } options - Optional data the application set to drm framework. - * @returns { Promise } Promise with MediaKeyRequest used to return the result. - * @throws { BusinessError } 401 -The parameter check failed. Possibly because: -@@ -1551,9 +1684,10 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- generateMediaKeyRequest(mimeType: string, initData: Uint8Array, mediaKeyType: number, options?: OptionsData[]): Promise; -+ generateMediaKeyRequest(mimeType: string, initData: Uint8Array, mediaKeyType: int, options?: OptionsData[]): Promise; - - /** - * Process the response corresponding to the media key request obtained by the application. -@@ -1578,7 +1712,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - processMediaKeyResponse(response: Uint8Array): Promise; - -@@ -1597,7 +1732,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - checkMediaKeyStatus(): MediaKeyStatus[]; - -@@ -1614,7 +1750,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - clearMediaKeys(): void; - -@@ -1643,7 +1780,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - generateOfflineReleaseRequest(mediaKeyId: Uint8Array): Promise; - -@@ -1672,7 +1810,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - processOfflineReleaseResponse(mediaKeyId: Uint8Array, response: Uint8Array): Promise; - -@@ -1699,7 +1838,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - restoreOfflineMediaKeys(mediaKeyId: Uint8Array): Promise; - -@@ -1718,7 +1858,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getContentProtectionLevel(): ContentProtectionLevel; - -@@ -1745,7 +1886,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - requireSecureDecoderModule(mimeType: string): boolean; - -@@ -1770,7 +1912,8 @@ declare namespace drm { - * @throws { BusinessError } 24700101 - All unknown errors. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'keyRequired', callback: (eventInfo: EventInfo) => void): void; - -@@ -1795,7 +1938,8 @@ declare namespace drm { - * @throws { BusinessError } 24700101 - All unknown errors. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'keyRequired', callback?: (eventInfo: EventInfo) => void): void; - -@@ -1820,7 +1964,8 @@ declare namespace drm { - * @throws { BusinessError } 24700101 - All unknown errors. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'keyExpired', callback: (eventInfo: EventInfo) => void): void; - -@@ -1845,7 +1990,8 @@ declare namespace drm { - * @throws { BusinessError } 24700101 - All unknown errors. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'keyExpired', callback?: (eventInfo: EventInfo) => void): void; - -@@ -1870,7 +2016,8 @@ declare namespace drm { - * @throws { BusinessError } 24700101 - All unknown errors. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'vendorDefined', callback: (eventInfo: EventInfo) => void): void; - -@@ -1895,7 +2042,8 @@ declare namespace drm { - * @throws { BusinessError } 24700101 - All unknown errors. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * arkts 1.1&1.2 - */ - off(type: 'vendorDefined', callback?: (eventInfo: EventInfo) => void): void; - -@@ -1920,7 +2068,8 @@ declare namespace drm { - * @throws { BusinessError } 24700101 - All unknown errors. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'expirationUpdate', callback: (eventInfo: EventInfo) => void): void; - -@@ -1945,7 +2094,8 @@ declare namespace drm { - * @throws { BusinessError } 24700101 - All unknown errors. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'expirationUpdate', callback?: (eventInfo: EventInfo) => void): void; - -@@ -1970,7 +2120,8 @@ declare namespace drm { - * @throws { BusinessError } 24700101 - All unknown errors. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'keysChange', callback: (keyInfo: KeysInfo[], newKeyAvailable: boolean) => void): void; - -@@ -1995,7 +2146,8 @@ declare namespace drm { - * @throws { BusinessError } 24700101 - All unknown errors. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'keysChange', callback?: (keyInfo: KeysInfo[], newKeyAvailable: boolean) => void): void; - -@@ -2012,7 +2164,8 @@ declare namespace drm { - * @throws { BusinessError } 24700201 - Fatal service error, for example, service died. - * @syscap SystemCapability.Multimedia.Drm.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - destroy(): void; - -diff --git a/api/@ohos.multimedia.image.d.ts b/api/@ohos.multimedia.image.d.ts -index 8d12a3fcd..8c6ec44f3 100644 ---- a/api/@ohos.multimedia.image.d.ts -+++ b/api/@ohos.multimedia.image.d.ts -@@ -22,9 +22,6 @@ import { AsyncCallback } from './@ohos.base'; - import type colorSpaceManager from './@ohos.graphics.colorSpaceManager'; - import type resourceManager from './@ohos.resourceManager'; - import type rpc from './@ohos.rpc'; --/*** if arkts 1.1 */ --import { int, double, float } from './@ohos.base'; --/*** endif */ - - /** - * @namespace image -@@ -52,14 +49,14 @@ declare namespace image { - /** - * Enumerates pixel map formats. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @since 7 - */ - /** - * Enumerates pixel map formats. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @since 10 -@@ -67,7 +64,7 @@ declare namespace image { - /** - * Enumerates pixel map formats. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @atomicservice -@@ -76,7 +73,7 @@ declare namespace image { - /** - * Enumerates pixel map formats. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form -@@ -473,7 +470,7 @@ declare namespace image { - /** - * Enumerates image resolution quality. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @systemapi - * @since arkts {'1.1':'12','1.2':'20'} -@@ -550,14 +547,14 @@ declare namespace image { - /** - * Height - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @since 6 - */ - /** - * Height - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @since 10 -@@ -565,7 +562,7 @@ declare namespace image { - /** - * Height - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @atomicservice -@@ -587,14 +584,14 @@ declare namespace image { - /** - * Width - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @since 6 - */ - /** - * Width - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @since 10 -@@ -602,7 +599,7 @@ declare namespace image { - /** - * Width - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @atomicservice -@@ -2498,7 +2495,7 @@ declare namespace image { - /** - * Enum for image formats. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 -@@ -2526,14 +2523,14 @@ declare namespace image { - /** - * Enumerates alpha types. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * Enumerates alpha types. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @since 10 -@@ -2541,7 +2538,7 @@ declare namespace image { - /** - * Enumerates alpha types. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @atomicservice -@@ -2550,7 +2547,7 @@ declare namespace image { - /** - * Enumerates alpha types. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @form -@@ -2695,7 +2692,7 @@ declare namespace image { - /** - * Enumerates decoding dynamic range. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 -@@ -2732,7 +2729,7 @@ declare namespace image { - /** - * Enumerates packing dynamic range. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 -@@ -2945,7 +2942,7 @@ declare namespace image { - /** - * The component type of image. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Image.ImageReceiver - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 -@@ -2991,7 +2988,7 @@ declare namespace image { - /** - * Enumerates the HDR metadata types that need to be stored in Pixelmap. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 -@@ -3037,7 +3034,7 @@ declare namespace image { - /** - * Value for HDR_METADATA_TYPE. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 -@@ -3083,7 +3080,7 @@ declare namespace image { - /** - * Type of allocator used to allocate memory of a PixelMap. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 -@@ -3193,14 +3190,14 @@ declare namespace image { - /** - * x-coordinate at the upper left corner of the image. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @since 7 - */ - /** - * x-coordinate at the upper left corner of the image. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @since 10 -@@ -3208,7 +3205,7 @@ declare namespace image { - /** - * x-coordinate at the upper left corner of the image. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @atomicservice -@@ -3230,14 +3227,14 @@ declare namespace image { - /** - * y-coordinate at the upper left corner of the image. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @since 7 - */ - /** - * y-coordinate at the upper left corner of the image. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @since 10 -@@ -3245,7 +3242,7 @@ declare namespace image { - /** - * y-coordinate at the upper left corner of the image. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @atomicservice -@@ -3526,14 +3523,14 @@ declare namespace image { - /** - * Indicates image default density. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * Indicates image default density. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @since 10 -@@ -3541,7 +3538,7 @@ declare namespace image { - /** - * Indicates image default density. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @atomicservice -@@ -3563,7 +3560,7 @@ declare namespace image { - /** - * The number of byte per row. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @atomicservice - * @since 11 -@@ -3631,7 +3628,7 @@ declare namespace image { - /** - * Enumerates the strategies for executing the cropping and scaling operations when both desiredSize and desiredRegion are specified. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 -@@ -3712,14 +3709,14 @@ declare namespace image { - /** - * Quality of the target image. The value is an integer ranging from 0 to 100. A larger value indicates better. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.ImagePacker - * @since 6 - */ - /** - * Quality of the target image. The value is an integer ranging from 0 to 100. A larger value indicates better. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.ImagePacker - * @crossplatform - * @since 10 -@@ -3740,7 +3737,7 @@ declare namespace image { - * BufferSize of the target image. - * If this bufferSize is less than or equal to 0, it will be converted to 10MB. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.Multimedia.Image.ImagePacker - * @since 9 - */ -@@ -3748,7 +3745,7 @@ declare namespace image { - * BufferSize of the target image. - * If this bufferSize is less than or equal to 0, it will be converted to 10MB. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.Multimedia.Image.ImagePacker - * @crossplatform - * @since 10 -@@ -3792,46 +3789,51 @@ declare namespace image { - * - * @typedef PackingOptionsForSequence - * @syscap SystemCapability.Multimedia.Image.ImagePacker -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PackingOptionsForSequence { - /** - * Specify the number of frames. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.ImagePacker -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- frameCount: number; -+ frameCount: int; - - /** - * Specify the delay time for each frame of the dynamic image. - * If the length is less than frameCount, the missing parts will be filling with the last value - * -- * @type { Array } -+ * @type { Array } - * @syscap SystemCapability.Multimedia.Image.ImagePacker -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- delayTimeList: Array; -+ delayTimeList: Array; - - /** - * Specify the disposal types of each frame in the image sequence packing. - * -- * @type { ?Array } -+ * @type { ?Array } - * @syscap SystemCapability.Multimedia.Image.ImagePacker -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- disposalTypes?: Array; -+ disposalTypes?: Array; - - /** - * Specify the number of times the loop should, the range is [0, 65535] - * If this loop is equal to 0, it will be infinite loop. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.Multimedia.Image.ImagePacker -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- loopCount?: number; -+ loopCount?: int; - } - - /** -@@ -3969,14 +3971,14 @@ declare namespace image { - /** - * Number of image frames. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.Multimedia.Image.ImageSource - * @since 7 - */ - /** - * Number of image frames. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.Multimedia.Image.ImageSource - * @crossplatform - * @since 10 -@@ -3984,7 +3986,7 @@ declare namespace image { - /** - * Number of image frames. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.Multimedia.Image.ImageSource - * @crossplatform - * @atomicservice -@@ -4006,14 +4008,14 @@ declare namespace image { - /** - * Sampling ratio of the image pixel map. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.Multimedia.Image.ImageSource - * @since 7 - */ - /** - * Sampling ratio of the image pixel map. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.Multimedia.Image.ImageSource - * @crossplatform - * @since 10 -@@ -4021,7 +4023,7 @@ declare namespace image { - /** - * Sampling ratio of the image pixel map. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.Multimedia.Image.ImageSource - * @crossplatform - * @atomicservice -@@ -4043,14 +4045,14 @@ declare namespace image { - /** - * Rotation angle of the image pixel map. The value ranges from 0 to 360. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.Multimedia.Image.ImageSource - * @since 7 - */ - /** - * Rotation angle of the image pixel map. The value ranges from 0 to 360. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.Multimedia.Image.ImageSource - * @crossplatform - * @since 10 -@@ -4058,7 +4060,7 @@ declare namespace image { - /** - * Rotation angle of the image pixel map. The value ranges from 0 to 360. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.Multimedia.Image.ImageSource - * @crossplatform - * @atomicservice -@@ -4232,14 +4234,14 @@ declare namespace image { - /** - * The density for image pixel map. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.Multimedia.Image.ImageSource - * @since 9 - */ - /** - * The density for image pixel map. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.Multimedia.Image.ImageSource - * @crossplatform - * @since 10 -@@ -4247,7 +4249,7 @@ declare namespace image { - /** - * The density for image pixel map. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.Multimedia.Image.ImageSource - * @crossplatform - * @atomicservice -@@ -4634,14 +4636,14 @@ declare namespace image { - /** - * The density for ImageSource. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @since 9 - */ - /** - * The density for ImageSource. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @since 10 -@@ -4649,7 +4651,7 @@ declare namespace image { - /** - * The density for ImageSource. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core - * @crossplatform - * @atomicservice -@@ -4748,80 +4750,89 @@ declare namespace image { - * - * @typedef HdrStaticMetadata - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface HdrStaticMetadata { - /** - * The X-coordinate of the primary colors. The length of the array is three. Store in the order of r, g, b. - * -- * @type { Array } -+ * @type { Array } - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- displayPrimariesX: Array; -+ displayPrimariesX: Array; - - /** - * The Y-coordinate of the primary colors. The length of the array is three. Store in the order of r, g, b. - * -- * @type { Array } -+ * @type { Array } - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- displayPrimariesY: Array; -+ displayPrimariesY: Array; - - /** - * The X-coordinate of the white point value. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- whitePointX: number; -+ whitePointX: double; - - /** - * The Y-coordinate of the white point value. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- whitePointY: number; -+ whitePointY: double; - - /** - * Max luminance. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- maxLuminance: number; -+ maxLuminance: double; - - /** - * Min luminance. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- minLuminance: number; -+ minLuminance: double; - - /** - * Maximum brightness of displayed content. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- maxContentLightLevel: number; -+ maxContentLightLevel: double; - - /** - * Maximum average brightness of displayed content. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- maxFrameAverageLightLevel: number; -+ maxFrameAverageLightLevel: double; - } - - /** -@@ -4829,53 +4840,59 @@ declare namespace image { - * - * @typedef GainmapChannel - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface GainmapChannel { - /** - * The per-component max gain map values. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- gainmapMax: number; -+ gainmapMax: double; - - /** - * The per-component min gain map values. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- gainmapMin: number; -+ gainmapMin: double; - - /** - * The per-component gamma values. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- gamma: number; -+ gamma: double; - - /** - * The per-component baseline offset. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- baseOffset: number; -+ baseOffset: double; - - /** - * The per-component alternate offset. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- alternateOffset: number; -+ alternateOffset: double; - } - - /** -@@ -4883,69 +4900,77 @@ declare namespace image { - * - * @typedef HdrGainmapMetadata - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface HdrGainmapMetadata { - /** - * The version used by the writer. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- writerVersion: number; -+ writerVersion: int; - - /** - * The minimum version a parser needs to understand. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- miniVersion: number; -+ miniVersion: int; - - /** - * The number of gain map channels, with a value of 1 or 3. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- gainmapChannelCount: number; -+ gainmapChannelCount: int; - - /** - * Indicate whether to use the color space of the base image. - * - * @type { boolean } - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - useBaseColorFlag: boolean; - - /** - * The baseline hdr headroom. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- baseHeadroom: number; -+ baseHeadroom: double; - - /** - * The alternate hdr headroom. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- alternateHeadroom: number; -+ alternateHeadroom: double; - - /** - * The per-channel metadata. - * - * @type { Array } - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - channels: Array; - } -@@ -4955,7 +4980,8 @@ declare namespace image { - * - * @typedef {HdrMetadataType | HdrStaticMetadata | ArrayBuffer | HdrGainmapMetadata} HdrMetadataValue - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type HdrMetadataValue = HdrMetadataType | HdrStaticMetadata | ArrayBuffer | HdrGainmapMetadata; - -@@ -5133,8 +5159,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; - -@@ -5261,7 +5286,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise): void; - -@@ -5778,7 +5807,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; - -@@ -5818,7 +5848,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise): void; - -@@ -5979,7 +6010,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; - -@@ -6023,7 +6055,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise): void; - -@@ -6048,7 +6081,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the operation result. If the operation fails, an error message is returned. - * @throws { BusinessError } 62980137 - Invalid image operation. - * @syscap SystemCapability.Multimedia.Image.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - toSdr(): Promise; - -@@ -6245,14 +6279,15 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise): void; - -@@ -7147,7 +7185,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; - -@@ -7162,7 +7201,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; - -@@ -7353,7 +7393,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; - -@@ -7361,7 +7402,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise - -@@ -7412,7 +7457,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise - -@@ -7424,7 +7470,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } - * @syscap SystemCapability.Multimedia.Image.ImageSource -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - desiredAuxiliaryPictures: Array; - } -@@ -8389,7 +8442,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise> } A Promise instance used to return the array. -+ * @returns { Promise> } A Promise instance used to return the array. - * @throws { BusinessError } 62980096 - The operation failed. - * @throws { BusinessError } 62980110 - The image source data is incorrect. - * @throws { BusinessError } 62980111 - The image source data is incomplete. -@@ -8430,7 +8483,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise> } callback Callback used to return the array. -+ * @param { AsyncCallback> } callback Callback used to return the array. - * @throws { BusinessError } 62980096 - The operation failed. - * @throws { BusinessError } 62980110 - The image source data is incorrect. - * @throws { BusinessError } 62980111 - The image source data is incomplete. -@@ -8471,21 +8524,22 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise> } A Promise instance used to return the array. -+ * @returns { Promise> } A Promise instance used to return the array. - * @throws { BusinessError } 62980096 - The operation failed. - * @throws { BusinessError } 62980101 - The image data is abnormal. - * @throws { BusinessError } 62980137 - Invalid media operation. - * @throws { BusinessError } 62980149 - Invalid MIME type for the image source. - * @syscap SystemCapability.Multimedia.Image.ImageSource - * @crossplatform -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getDisposalTypeList(): Promise>; -+ getDisposalTypeList(): Promise>; - - /** - * Obtains the count of frame in an image. This method uses a promise to return the number. - * -- * @returns { Promise } A Promise instance used to return the number. -+ * @returns { Promise } A Promise instance used to return the number. - * @throws { BusinessError } 62980096 - The operation failed. - * @throws { BusinessError } 62980110 - The image source data is incorrect. - * @throws { BusinessError } 62980111 - The image source data is incomplete. -@@ -8503,7 +8557,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the number. -+ * @returns { Promise } A Promise instance used to return the number. - * @throws { BusinessError } 62980096 - The operation failed. - * @throws { BusinessError } 62980110 - The image source data is incorrect. - * @throws { BusinessError } 62980111 - The image source data is incomplete. -@@ -8516,14 +8570,15 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; -+ getFrameCount(): Promise; - - /** - * Obtains the count of frame in an image. This method uses a callback to return the number. - * -- * @param { AsyncCallback } callback Callback used to return the number. -+ * @param { AsyncCallback } callback Callback used to return the number. - * @throws { BusinessError } 62980096 - The operation failed. - * @throws { BusinessError } 62980110 - The image source data is incorrect. - * @throws { BusinessError } 62980111 - The image source data is incomplete. -@@ -8541,7 +8596,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback used to return the number. -+ * @param { AsyncCallback } callback Callback used to return the number. - * @throws { BusinessError } 62980096 - The operation failed. - * @throws { BusinessError } 62980110 - The image source data is incorrect. - * @throws { BusinessError } 62980111 - The image source data is incomplete. -@@ -8554,9 +8609,10 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise): void; -+ getFrameCount(callback: AsyncCallback): void; - - /** - * Obtains the value of a property in an image with the specified index. This method uses a -@@ -8843,14 +8899,15 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the property value. - * @syscap SystemCapability.Multimedia.Image.ImageSource - * @crossplatform -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- updateData(buf: ArrayBuffer, isFinished: boolean, offset: number, length: number): Promise; -+ updateData(buf: ArrayBuffer, isFinished: boolean, offset: int, length: int): Promise; - - /** - * Update the data in the incremental ImageSource. -@@ -8880,18 +8937,19 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback to return the operation result. - * @syscap SystemCapability.Multimedia.Image.ImageSource - * @crossplatform -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - updateData( - buf: ArrayBuffer, - isFinished: boolean, -- offset: number, -- length: number, -+ offset: int, -+ length: int, - callback: AsyncCallback - ): void; - -@@ -8941,7 +8999,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise - -@@ -9086,7 +9145,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; - -@@ -9184,7 +9244,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise; - -@@ -9199,7 +9260,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise, options: PackingOptionsForSequence): Promise; - -@@ -9299,7 +9361,7 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } pixelmapSequence PixelMaps to be encoded. -- * @param { number } fd File descriptor of the output encoded file. -+ * @param { int } fd File descriptor of the output encoded file. - * @param { PackingOptionsForSequence } options Options for image packing. - * @returns { Promise } void. - * @throws { BusinessError } 401 - Parameter error.Possible causes: 1.Mandatory parameters are left unspecified. -@@ -9307,9 +9369,10 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise, fd: number, options: PackingOptionsForSequence): Promise; -+ packToFileFromPixelmapSequence(pixelmapSequence: Array, fd: int, options: PackingOptionsForSequence): Promise; - - /** - * Releases an ImagePacker instance and uses a callback to return the result. -@@ -9443,13 +9506,13 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback used to return the next image. - * @syscap SystemCapability.Multimedia.Image.ImageReceiver -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readNextImage(callback: AsyncCallback): void; - -@@ -9592,7 +9656,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the next image. - * @syscap SystemCapability.Multimedia.Image.ImageReceiver -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readNextImage(): Promise; - -@@ -9675,7 +9740,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback to return the operation result. - * @syscap SystemCapability.Multimedia.Image.ImageCreator -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - dequeueImage(callback: AsyncCallback): void; - -@@ -9684,29 +9750,32 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } A Promise instance used to return the operation result. - * @syscap SystemCapability.Multimedia.Image.ImageCreator -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - dequeueImage(): Promise; - - /** - * Queue buffer to dirty queue and uses a callback to return the result. - * -- * @param { Image } interface -+ * @param { Image } image - * @param { AsyncCallback } callback Callback to return the operation result. - * @syscap SystemCapability.Multimedia.Image.ImageCreator -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- queueImage(interface: Image, callback: AsyncCallback): void; -+ queueImage(image: Image, callback: AsyncCallback): void; - - /** - * Queue buffer to dirty queue and uses a promise to return the result. - * -- * @param { Image } interface -+ * @param { Image } image - * @returns { Promise } A Promise instance used to return the operation result. - * @syscap SystemCapability.Multimedia.Image.ImageCreator -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- queueImage(interface: Image): Promise; -+ queueImage(image: Image): Promise; - - /** - * Subscribe callback when releasing buffer -@@ -9714,7 +9783,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback used to return the operation result. - * @syscap SystemCapability.Multimedia.Image.ImageCreator -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'imageRelease', callback: AsyncCallback): void; - -@@ -9724,7 +9794,8 @@ function createUnpremultipliedPixelMap(src: PixelMap, dst: PixelMap): Promise } callback Callback to be removed. - * @syscap SystemCapability.Multimedia.Image.ImageCreator -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'imageRelease', callback?: AsyncCallback): void; - -diff --git a/api/@ohos.multimedia.media.d.ts b/api/@ohos.multimedia.media.d.ts -index ba9645edc..1a7954a8b 100644 ---- a/api/@ohos.multimedia.media.d.ts -+++ b/api/@ohos.multimedia.media.d.ts -@@ -18,12 +18,12 @@ - * @kit MediaKit - */ - --import { ErrorCallback, AsyncCallback, Callback, BusinessError } from './@ohos.base'; -+import { ErrorCallback, AsyncCallback, Callback } from './@ohos.base'; - import audio from "./@ohos.multimedia.audio"; - import photoAccessHelper from './@ohos.file.photoAccessHelper'; --import image from './@ohos.multimedia.image'; --import { SoundPool as _SoundPool } from './multimedia/soundPool'; --import { PlayParameters as _PlayParameters } from './multimedia/soundPool'; -+import type image from './@ohos.multimedia.image'; -+import type { SoundPool as _SoundPool } from './multimedia/soundPool'; -+import type { PlayParameters as _PlayParameters } from './multimedia/soundPool'; - import type drm from './@ohos.multimedia.drm'; - - /** -@@ -66,10 +66,20 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - function createAVPlayer(callback: AsyncCallback): void; -+ /** -+ * Creates an AVPlayer instance. -+ * @param { AsyncCallback } callback - used to return AVPlayer instance if the operation is successful; returns null otherwise. -+ * @throws { BusinessError } 5400101 - No memory. Return by callback. -+ * @syscap SystemCapability.Multimedia.Media.AVPlayer -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ function createAVPlayer(callback: AsyncCallback): void; - - /** - * Creates an AVPlayer instance. -@@ -93,10 +103,20 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - function createAVPlayer(): Promise; -+ /** -+ * Creates an AVPlayer instance. -+ * @returns { Promise } A Promise instance used to return AVPlayer instance if the operation is successful; returns null otherwise. -+ * @throws { BusinessError } 5400101 - No memory. Return by promise. -+ * @syscap SystemCapability.Multimedia.Media.AVPlayer -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ function createAVPlayer(): Promise; - - /** - * Creates an AVRecorder instance. -@@ -111,10 +131,19 @@ declare namespace media { - * @throws { BusinessError } 5400101 - No memory. Return by callback. - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @crossplatform -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - function createAVRecorder(callback: AsyncCallback): void; -+ /** -+ * Creates an AVRecorder instance. -+ * @param { AsyncCallback } callback - used to return AVRecorder instance if the operation is successful; returns null otherwise. -+ * @throws { BusinessError } 5400101 - No memory. Return by callback. -+ * @syscap SystemCapability.Multimedia.Media.AVRecorder -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ function createAVRecorder(callback: AsyncCallback): void; - - /** - * Creates an AVRecorder instance. -@@ -130,10 +159,20 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - function createAVRecorder(): Promise; -+ /** -+ * Creates an AVRecorder instance. -+ * @returns { Promise } A Promise instance used to return AVRecorder instance if the operation is successful; returns null otherwise. -+ * @throws { BusinessError } 5400101 - No memory. Return by promise. -+ * @syscap SystemCapability.Multimedia.Media.AVRecorder -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ function createAVRecorder(): Promise; - - /** - * Creates an AudioPlayer instance. -@@ -179,6 +218,20 @@ declare namespace media { - * @since 13 - */ - function createMediaSourceWithUrl(url: string, headers?: Record): MediaSource; -+ /** -+ * Create MediaSource from url. -+ * @param { string } url : The location for the media source. -+ * @param { Record } [headers] : Headers attached to network request while player request data. -+ * @returns { MediaSource | undefined } MediaSource instance if the operation is successful; returns null otherwise. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameter types. 3.Parameter verification failed. -+ * @throws { BusinessError } 5400101 - No memory. -+ * @syscap SystemCapability.Multimedia.Media.Core -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ function createMediaSourceWithUrl(url: string, headers?: Record): MediaSource | undefined; - - /** - * Create media source from media stream array. -@@ -190,6 +243,17 @@ declare namespace media { - * @since 18 - */ - function createMediaSourceWithStreamData(streams: Array): MediaSource; -+ /** -+ * Create media source from media stream array. -+ * @param { Array } streams - The player uses it to get stream source info. -+ * @returns { MediaSource | undefined } MediaSource instance if the operation is successful; returns null otherwise. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -+ * @syscap SystemCapability.Multimedia.Media.Core -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ function createMediaSourceWithStreamData(streams: Array): MediaSource | undefined; - - /** - * Creates an VideoPlayer instance. -@@ -228,10 +292,21 @@ declare namespace media { - * @throws { BusinessError } 5400101 - No memory. Return by callback. - * @syscap SystemCapability.Multimedia.Media.VideoRecorder - * @systemapi -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - function createVideoRecorder(callback: AsyncCallback): void; -+ /** -+ * The maintenance of this interface has been stopped since version api 9. Please use AVRecorder -+ * Creates an VideoRecorder instance. -+ * @param { AsyncCallback } callback - used to return AudioPlayer instance if the operation is successful; returns null otherwise. -+ * @throws { BusinessError } 202 - Not System App. -+ * @throws { BusinessError } 5400101 - No memory. Return by callback. -+ * @syscap SystemCapability.Multimedia.Media.VideoRecorder -+ * @systemapi -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ function createVideoRecorder(callback: AsyncCallback): void; - - /** - * The maintenance of this interface has been stopped since version api 9. Please use AVRecorder -@@ -250,40 +325,77 @@ declare namespace media { - * @throws { BusinessError } 5400101 - No memory. Return by promise. - * @syscap SystemCapability.Multimedia.Media.VideoRecorder - * @systemapi -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - function createVideoRecorder(): Promise; -+ /** -+ * The maintenance of this interface has been stopped since version api 9. Please use AVRecorder -+ * Creates an VideoRecorder instance. -+ * @returns { Promise } A Promise instance used to return VideoRecorder instance if the operation is successful; returns null otherwise. -+ * @throws { BusinessError } 202 - Not System App. -+ * @throws { BusinessError } 5400101 - No memory. Return by promise. -+ * @syscap SystemCapability.Multimedia.Media.VideoRecorder -+ * @systemapi -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ function createVideoRecorder(): Promise; - - /** - * Creates a soundPool instance. - * -- * @param {int} maxStreams The maximum number of simultaneous streams for this soundPool instance -+ * @param {number} maxStreams The maximum number of simultaneous streams for this soundPool instance - * @param {audio.AudioRendererInfo} audioRenderInfo Audio renderer information - * @param {AsyncCallback} callback Callback used to return soundPool instance if the operation is successful; returns null otherwise. - * @throws { BusinessError } 5400101 - No memory. Return by callback. - * @syscap SystemCapability.Multimedia.Media.SoundPool -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 - */ - function createSoundPool( -- maxStreams: int, -+ maxStreams: number, - audioRenderInfo: audio.AudioRendererInfo, - callback: AsyncCallback - ): void; -+ /** -+ * Creates a soundPool instance. -+ * -+ * @param {number} maxStreams The maximum number of simultaneous streams for this soundPool instance -+ * @param {audio.AudioRendererInfo} audioRenderInfo Audio renderer information -+ * @param {AsyncCallback} callback Callback used to return soundPool instance if the operation is successful; returns null otherwise. -+ * @throws { BusinessError } 5400101 - No memory. Return by callback. -+ * @syscap SystemCapability.Multimedia.Media.SoundPool -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ function createSoundPool( -+ maxStreams: number, -+ audioRenderInfo: audio.AudioRendererInfo, -+ callback: AsyncCallback -+ ): void; - - /** - * Creates a soundPool instance. - * -- * @param {int} maxStreams The maximum number of simultaneous streams for this soundPool instance -+ * @param {number} maxStreams The maximum number of simultaneous streams for this soundPool instance - * @param {audio.AudioRendererInfo} audioRenderInfo Audio renderer information - * @returns {Promise} A Promise instance used to return SoundPool instance if the operation is successful; returns null otherwise. - * @throws { BusinessError } 5400101 - No memory. Return by promise. - * @syscap SystemCapability.Multimedia.Media.SoundPool -- * @since arkts {'1.1':'10','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 10 - */ -- function createSoundPool(maxStreams: int, audioRenderInfo: audio.AudioRendererInfo): Promise; -+ function createSoundPool(maxStreams: number, audioRenderInfo: audio.AudioRendererInfo): Promise; -+ /** -+ * Creates a soundPool instance. -+ * -+ * @param {number} maxStreams The maximum number of simultaneous streams for this soundPool instance -+ * @param {audio.AudioRendererInfo} audioRenderInfo Audio renderer information -+ * @returns {Promise} A Promise instance used to return SoundPool instance if the operation is successful; returns null otherwise. -+ * @throws { BusinessError } 5400101 - No memory. Return by promise. -+ * @syscap SystemCapability.Multimedia.Media.SoundPool -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ function createSoundPool(maxStreams: number, audioRenderInfo: audio.AudioRendererInfo): Promise; - - /** - * Creates an AVScreenCaptureRecorder instance. -@@ -291,10 +403,19 @@ declare namespace media { - * returns null otherwise. - * @throws { BusinessError } 5400101 - No memory. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - function createAVScreenCaptureRecorder(): Promise; -+ /** -+ * Creates an AVScreenCaptureRecorder instance. -+ * @returns { Promise } A Promise instance used to return AVScreenCaptureRecorder instance if the operation is successful; -+ * returns null otherwise. -+ * @throws { BusinessError } 5400101 - No memory. Return by promise. -+ * @syscap SystemCapability.Multimedia.Media.AVScreenCapture -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ function createAVScreenCaptureRecorder(): Promise; - - /** - * Report user choice back to AVScreenCapture server -@@ -307,7 +428,8 @@ declare namespace media { - * @throws { BusinessError } 5400101 - No memory. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function reportAVScreenCaptureUserChoice(sessionId: number, choice: string): Promise; - -@@ -317,10 +439,19 @@ declare namespace media { - * @returns {Promise} A Promise instance used to return AVTranscoder instance if the operation is successful; returns null otherwise. - * @throws { BusinessError } 5400101 - No memory. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVTranscoder -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - function createAVTranscoder(): Promise; -+ /** -+ * Creates a AVTranscoder instance. -+ * -+ * @returns {Promise} A Promise instance used to return AVTranscoder instance if the operation is successful; returns null otherwise. -+ * @throws { BusinessError } 5400101 - No memory. Return by promise. -+ * @syscap SystemCapability.Multimedia.Media.AVTranscoder -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ function createAVTranscoder(): Promise; - - /** - * Get the ScreenCaptureMonitor instance -@@ -331,10 +462,22 @@ declare namespace media { - * @throws { BusinessError } 5400101 - No memory. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @systemapi -- * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 18 - */ - function getScreenCaptureMonitor(): Promise; -+ /** -+ * Get the ScreenCaptureMonitor instance -+ * -+ * @returns { Promise } A Promise instance used to return ScreenCaptureMonitor instance if the operation is successful; -+ * returns null otherwise. -+ * @throws { BusinessError } 202 - Not System App. -+ * @throws { BusinessError } 5400101 - No memory. Return by promise. -+ * @syscap SystemCapability.Multimedia.Media.AVScreenCapture -+ * @systemapi -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ function getScreenCaptureMonitor(): Promise; - - /** - * Manages and plays sound. Before calling an SoundPool method, you must use createSoundPool() -@@ -441,10 +584,20 @@ declare namespace media { - * @throws { BusinessError } 5400101 - No memory. Returned by promise. - * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor - * @crossplatform -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - function createAVMetadataExtractor(): Promise; -+ /** -+ * Creates an AVMetadataExtractor instance. -+ * @returns { Promise } A Promise instance used to return AVMetadataExtractor instance -+ * if the operation is successful; returns null otherwise. -+ * @throws { BusinessError } 5400101 - No memory. Returned by promise. -+ * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ function createAVMetadataExtractor(): Promise; - - /** - * Creates an AVMetadataExtractor instance. -@@ -461,10 +614,20 @@ declare namespace media { - * @throws { BusinessError } 5400101 - No memory. Returned by callback. - * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor - * @crossplatform -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - function createAVMetadataExtractor(callback: AsyncCallback): void; -+ /** -+ * Creates an AVMetadataExtractor instance. -+ * @param { AsyncCallback } callback - Callback used to return AVMetadataExtractor instance -+ * if the operation is successful; returns null otherwise. -+ * @throws { BusinessError } 5400101 - No memory. Returned by callback. -+ * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ function createAVMetadataExtractor(callback: AsyncCallback): void; - - /** - * Creates an AVImageGenerator instance. -@@ -472,10 +635,19 @@ declare namespace media { - * if the operation is successful; returns null otherwise. - * @throws { BusinessError } 5400101 - No memory. Returned by promise. - * @syscap SystemCapability.Multimedia.Media.AVImageGenerator -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - function createAVImageGenerator(): Promise; -+ /** -+ * Creates an AVImageGenerator instance. -+ * @returns { Promise } A Promise instance used to return AVImageGenerator instance -+ * if the operation is successful; returns null otherwise. -+ * @throws { BusinessError } 5400101 - No memory. Returned by promise. -+ * @syscap SystemCapability.Multimedia.Media.AVImageGenerator -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ function createAVImageGenerator(): Promise; - - /** - * Creates an AVImageGenerator instance. -@@ -483,10 +655,19 @@ declare namespace media { - * if the operation is successful; returns null otherwise. - * @throws { BusinessError } 5400101 - No memory. Returned by callback. - * @syscap SystemCapability.Multimedia.Media.AVImageGenerator -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - function createAVImageGenerator(callback: AsyncCallback): void; -+ /** -+ * Creates an AVImageGenerator instance. -+ * @param { AsyncCallback } callback - Callback used to return AVImageGenerator instance -+ * if the operation is successful; returns null otherwise. -+ * @throws { BusinessError } 5400101 - No memory. Returned by callback. -+ * @syscap SystemCapability.Multimedia.Media.AVImageGenerator -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ function createAVImageGenerator(callback: AsyncCallback): void; - - /** - * Fetch media meta data or audio art picture from source. Before calling an AVMetadataExtractor method, -@@ -552,10 +733,20 @@ declare namespace media { - * @throws { BusinessError } 5400106 - Unsupported format. Returned by callback. - * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor - * @crossplatform -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - fetchMetadata(callback: AsyncCallback): void; -+ /** -+ * It will extract the resource to fetch media meta data info. -+ * @param { AsyncCallback } callback - A callback instance used to return when fetchMetadata completed. -+ * @throws { BusinessError } 5400102 - Operation not allowed. Returned by callback. -+ * @throws { BusinessError } 5400106 - Unsupported format. Returned by callback. -+ * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ fetchMetadata(callback: AsyncCallback): void; - - /** - * It will extract the resource to fetch media meta data info. -@@ -572,10 +763,20 @@ declare namespace media { - * @throws { BusinessError } 5400106 - Unsupported format. Returned by promise. - * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor - * @crossplatform -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - fetchMetadata(): Promise; -+ /** -+ * It will extract the resource to fetch media meta data info. -+ * @returns { Promise } A Promise instance used to return when fetchMetadata completed. -+ * @throws { BusinessError } 5400102 - Operation not allowed. Returned by promise. -+ * @throws { BusinessError } 5400106 - Unsupported format. Returned by promise. -+ * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ fetchMetadata(): Promise; - - /** - * It will extract the audio resource to fetch an album cover. -@@ -594,8 +795,7 @@ declare namespace media { - * @throws { BusinessError } 5400106 - Unsupported format. Returned by callback. - * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor - * @crossplatform -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - fetchAlbumCover(callback: AsyncCallback): void; - -@@ -614,8 +814,7 @@ declare namespace media { - * @throws { BusinessError } 5400106 - Unsupported format. Returned by promise. - * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor - * @crossplatform -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - fetchAlbumCover(): Promise; - -@@ -628,7 +827,8 @@ declare namespace media { - * @throws { BusinessError } 5400106 - Unsupported format. Returned by promise. - * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getTimeByFrameIndex(index: number): Promise; - -@@ -641,7 +841,8 @@ declare namespace media { - * @throws { BusinessError } 5400106 - Unsupported format. Returned by promise. - * @syscap SystemCapability.Multimedia.Media.AVMetadataExtractor - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getFrameIndexByTime(timeUs: number): Promise; - -@@ -1084,7 +1285,7 @@ declare namespace media { - - /** - * It will fetch a picture at @timeUs from the given video resource. -- * @param { long } timeUs - The time expected to fetch picture from the video resource. -+ * @param { number } timeUs - The time expected to fetch picture from the video resource. - * The unit is microsecond(us). - * @param { AVImageQueryOptions } options - The time options about the relationship - * between the given timeUs and a key frame, see @AVImageQueryOptions . -@@ -1094,16 +1295,15 @@ declare namespace media { - * @throws { BusinessError } 5400102 - Operation not allowed. Returned by callback. - * @throws { BusinessError } 5400106 - Unsupported format. Returned by callback. - * @syscap SystemCapability.Multimedia.Media.AVImageGenerator -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ -- fetchFrameByTime(timeUs: long, options: AVImageQueryOptions, param: PixelMapParams, -+ fetchFrameByTime(timeUs: number, options: AVImageQueryOptions, param: PixelMapParams, - callback: AsyncCallback): void; - - /** - * It will decode the given video resource. Then fetch a picture - * at @timeUs according the given @options and @param . -- * @param { long } timeUs - The time expected to fetch picture from the video resource. -+ * @param { number } timeUs - The time expected to fetch picture from the video resource. - * The unit is microsecond(us). - * @param { AVImageQueryOptions } options - The time options about the relationship - * between the given timeUs and a key frame, see @AVImageQueryOptions . -@@ -1113,10 +1313,9 @@ declare namespace media { - * @throws { BusinessError } 5400102 - Operation not allowed. Returned by promise. - * @throws { BusinessError } 5400106 - Unsupported format. Returned by promise. - * @syscap SystemCapability.Multimedia.Media.AVImageGenerator -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ -- fetchFrameByTime(timeUs: long, options: AVImageQueryOptions, param: PixelMapParams): Promise; -+ fetchFrameByTime(timeUs: number, options: AVImageQueryOptions, param: PixelMapParams): Promise; - - /** - * Release resources used for AVImageGenerator. -@@ -1195,22 +1394,22 @@ declare namespace media { - /** - * Expected pixelmap's width, -1 means to keep consistent with the - * original dimensions of the given video resource. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVImageGenerator - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- width?: int; -+ width?: number; - - /** - * Expected pixelmap's width, -1 means to keep consistent with the - * original dimensions of the given video resource. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVImageGenerator - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- height?: int; -+ height?: number; - - /** - * Expected pixelmap's color format, see {@link PixelFormat}. -@@ -1282,7 +1481,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum AVErrorCode { - /** -@@ -1301,7 +1501,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_OK = 0, - -@@ -1321,7 +1522,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_NO_PERMISSION = 201, - -@@ -1341,7 +1543,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_INVALID_PARAMETER = 401, - -@@ -1361,7 +1564,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_UNSUPPORT_CAPABILITY = 801, - -@@ -1381,7 +1585,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_NO_MEMORY = 5400101, - -@@ -1401,7 +1606,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_OPERATE_NOT_PERMIT = 5400102, - -@@ -1421,7 +1627,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_IO = 5400103, - -@@ -1441,7 +1648,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_TIMEOUT = 5400104, - -@@ -1461,7 +1669,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_SERVICE_DIED = 5400105, - -@@ -1481,7 +1690,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_UNSUPPORT_FORMAT = 5400106, - -@@ -1496,7 +1706,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_AUDIO_INTERRUPTED = 5400107, - /** -@@ -1504,7 +1715,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_IO_HOST_NOT_FOUND = 5411001, - /** -@@ -1512,7 +1724,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_IO_CONNECTION_TIMEOUT = 5411002, - /** -@@ -1520,7 +1733,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_IO_NETWORK_ABNORMAL = 5411003, - /** -@@ -1528,7 +1742,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_IO_NETWORK_UNAVAILABLE = 5411004, - /** -@@ -1536,7 +1751,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_IO_NO_PERMISSION = 5411005, - /** -@@ -1544,7 +1760,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_IO_REQUEST_DENIED = 5411006, - /** -@@ -1552,7 +1769,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_IO_RESOURCE_NOT_FOUND = 5411007, - /** -@@ -1561,7 +1779,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_IO_SSL_CLIENT_CERT_NEEDED = 5411008, - /** -@@ -1570,7 +1789,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_IO_SSL_CONNECTION_FAILED = 5411009, - /** -@@ -1578,7 +1798,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_IO_SSL_SERVER_CERT_UNTRUSTED = 5411010, - /** -@@ -1586,14 +1807,16 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_IO_UNSUPPORTED_REQUEST = 5411011, - /** - * Seek continuous unsupported. - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_SEEK_CONTINUOUS_UNSUPPORTED = 5410002, - -@@ -1601,7 +1824,8 @@ declare namespace media { - * Super-resolution unsupported. - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_SUPER_RESOLUTION_UNSUPPORTED = 5410003, - -@@ -1609,7 +1833,8 @@ declare namespace media { - * No PlaybackStrategy set to enable super-resolution feature. - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVERR_SUPER_RESOLUTION_NOT_ENABLED = 5410004, - } -@@ -1643,14 +1868,14 @@ declare namespace media { - /** - * Define the TrackChange Event callback. - * @typedef { function } OnTrackChangeHandler -- * @param { int } index - index number for change Track. -+ * @param { number } index - index number for change Track. - * @param { boolean } isSelected - Target index number for moving elements. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- type OnTrackChangeHandler = (index: int, isSelected: boolean) => void; -+ type OnTrackChangeHandler = (index: number, isSelected: boolean) => void; - - /** - * Defines the OnStateChange callback. -@@ -1671,28 +1896,28 @@ declare namespace media { - * - * @typedef { function } OnBufferingUpdateHandler - * @param { BufferingInfoType } infoType - define the Buffering info Type. -- * @param { int } value - define the value of buffering info type if exist. -+ * @param { number } value - define the value of buffering info type if exist. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- type OnBufferingUpdateHandler = (infoType: BufferingInfoType, value: int) => void; -+ type OnBufferingUpdateHandler = (infoType: BufferingInfoType, value: number) => void; - - /** - * Defines the OnVideoSizeChangeHandler callback. - * - * @typedef { function } OnVideoSizeChangeHandler -- * @param { int } width - Value of video Width. -- * @param { int } height - Value of video Height. -+ * @param { number } width - Value of video Width. -+ * @param { number } height - Value of video Height. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- type OnVideoSizeChangeHandler = (width: int, height: int) => void; -+ type OnVideoSizeChangeHandler = (width: number, height: number) => void; - - /** - * Defines the OnSuperResolutionChanged callback. -@@ -1718,13 +1943,13 @@ declare namespace media { - interface SeiMessage { - /** - * Payload type of SEI message. -- * @type { int } -+ * @type { number } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 - */ -- payloadType: int; -+ payloadType: number; - - /** - * Payload data of SEI message. -@@ -1742,13 +1967,13 @@ declare namespace media { - * - * @typedef { function } OnSeiMessageHandle - * @param { Array } messages - SEI messages. -- * @param { ?int } playbackPosition - playback position. -+ * @param { ?number } playbackPosition - playback position. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 - */ -- type OnSeiMessageHandle = (messages: Array, playbackPosition?: int) => void; -+ type OnSeiMessageHandle = (messages: Array, playbackPosition?: number) => void; - - /** - * Manages and plays media. Before calling an AVPlayer method, you must use createAVPlayer() -@@ -2111,14 +2336,14 @@ declare namespace media { - - /** - * Jumps to the specified playback position. -- * @param { int } timeMs - Playback position to jump, should be in [0, duration]. -+ * @param { number } timeMs - Playback position to jump, should be in [0, duration]. - * @param { SeekMode } mode - See @SeekMode . - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @since 9 - */ - /** - * Jumps to the specified playback position. -- * @param { int } timeMs - Playback position to jump, should be in [0, duration]. -+ * @param { number } timeMs - Playback position to jump, should be in [0, duration]. - * @param { SeekMode } mode - See @SeekMode . - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice -@@ -2126,7 +2351,7 @@ declare namespace media { - */ - /** - * Jumps to the specified playback position. -- * @param { int } timeMs - Playback position to jump, should be in [0, duration]. -+ * @param { number } timeMs - Playback position to jump, should be in [0, duration]. - * @param { SeekMode } mode - See @SeekMode . - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform -@@ -2134,24 +2359,24 @@ declare namespace media { - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- seek(timeMs: int, mode?: SeekMode): void; -+ seek(timeMs: number, mode?: SeekMode): void; - - /** - * Sets the volume. -- * @param { double } volume - Relative volume. The value ranges from 0.00 to 1.00. The value 1 indicates the maximum volume (100%). -+ * @param { number } volume - Relative volume. The value ranges from 0.00 to 1.00. The value 1 indicates the maximum volume (100%). - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @since 9 - */ - /** - * Sets the volume. -- * @param { double } volume - Relative volume. The value ranges from 0.00 to 1.00. The value 1 indicates the maximum volume (100%). -+ * @param { number } volume - Relative volume. The value ranges from 0.00 to 1.00. The value 1 indicates the maximum volume (100%). - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- setVolume(volume: double): void; -+ setVolume(volume: number): void; - - /** - * Get all track infos in MediaDescription, should be called after data loaded callback. -@@ -2213,7 +2438,8 @@ declare namespace media { - * @throws { BusinessError } 5400102 - Operation not allowed. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSelectedTracks(): Promise>; - -@@ -2226,7 +2452,8 @@ declare namespace media { - * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - selectTrack(index: number, mode?: SwitchMode): Promise; - -@@ -2238,7 +2465,8 @@ declare namespace media { - * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - deselectTrack(index: number): Promise; - -@@ -2252,7 +2480,8 @@ declare namespace media { - * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setMediaSource(src: MediaSource, strategy?: PlaybackStrategy): Promise; - -@@ -2269,7 +2498,8 @@ declare namespace media { - * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - addSubtitleFromFd(fd: number, offset?: number, length?: number): Promise; - -@@ -2282,17 +2512,19 @@ declare namespace media { - * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - addSubtitleFromUrl(url: string): Promise; - - /** - * Get statistic infos of current player. -- * @returns { Promise> } Statistic infos of current player. -+ * @returns { Promise } Statistic infos of current player. - * @syscap SystemCapability.Multimedia.Media.AVPlayer -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getPlaybackInfo(): Promise>; -+ getPlaybackInfo(): Promise; - - /** - * Set playback strategy to AVPlayer. -@@ -2302,7 +2534,8 @@ declare namespace media { - * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setPlaybackStrategy(strategy: PlaybackStrategy): Promise; - -@@ -2315,7 +2548,8 @@ declare namespace media { - * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setMediaMuted(mediaType: MediaType, muted: boolean): Promise; - -@@ -2335,7 +2569,8 @@ declare namespace media { - * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setPlaybackRange(startTimeMs: number, endTimeMs: number, mode?: SeekMode) : Promise; - -@@ -2357,7 +2592,8 @@ declare namespace media { - * @throws { BusinessError } 5400102 - Operation not allowed. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getPlaybackPosition() : number; - -@@ -2373,7 +2609,8 @@ declare namespace media { - * Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setSuperResolution(enabled: boolean) : Promise; - -@@ -2391,7 +2628,8 @@ declare namespace media { - * Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setVideoWindowSize(width: number, height: number) : Promise; - -@@ -2494,8 +2732,7 @@ declare namespace media { - * @type { ?audio.InterruptMode } - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - audioInterruptMode?: audio.InterruptMode; - -@@ -2513,8 +2750,7 @@ declare namespace media { - * @type { ?audio.AudioRendererInfo } - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - audioRendererInfo?: audio.AudioRendererInfo; - -@@ -2539,7 +2775,7 @@ declare namespace media { - */ - /** - * Current playback position. -- * @type { int } -+ * @type { number } - * @readonly - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform -@@ -2547,7 +2783,7 @@ declare namespace media { - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly currentTime: int; -+ readonly currentTime: number; - - /** - * Playback duration, When the data source does not support seek, it returns - 1, such as a live broadcast scenario. -@@ -2562,7 +2798,7 @@ declare namespace media { - */ - /** - * Playback duration, When the data source does not support seek, it returns - 1, such as a live broadcast scenario. -- * @type { int } -+ * @type { number } - * @readonly - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform -@@ -2570,7 +2806,7 @@ declare namespace media { - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly duration: int; -+ readonly duration: number; - - /** - * Playback state. -@@ -2618,7 +2854,7 @@ declare namespace media { - */ - /** - * Video width, valid after prepared. -- * @type { int } -+ * @type { number } - * @readonly - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform -@@ -2626,7 +2862,7 @@ declare namespace media { - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly width: int; -+ readonly width: number; - - /** - * Video height, valid after prepared. -@@ -2635,7 +2871,7 @@ declare namespace media { - */ - /** - * Video height, valid after prepared. -- * @type { int } -+ * @type { number } - * @readonly - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform -@@ -2643,7 +2879,7 @@ declare namespace media { - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly height: int; -+ readonly height: number; - - /** - * Video scale type. By default, the {@link #VIDEO_SCALE_TYPE_FIT} will be used, for more -@@ -2700,7 +2936,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setBitrate(bitrate: number): void; - -@@ -2753,8 +2990,7 @@ declare namespace media { - * @param { Callback> } callback - Callback used to listen for the mediaKeySystemInfoUpdate event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - on(type: 'mediaKeySystemInfoUpdate', callback: Callback>): void; - -@@ -2771,8 +3007,7 @@ declare namespace media { - * @param { Callback> } callback - Callback for event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - off(type: 'mediaKeySystemInfoUpdate', callback?: Callback>): void; - -@@ -2829,21 +3064,21 @@ declare namespace media { - /** - * Register listens for media playback volumeChange event. - * @param { 'volumeChange' } type - Type of the playback event to listen for. -- * @param { Callback } callback - Callback used to listen for the playback volume event. -+ * @param { Callback } callback - Callback used to listen for the playback volume event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @since 9 - */ - /** - * Register listens for media playback volumeChange event. - * @param { 'volumeChange' } type - Type of the playback event to listen for. -- * @param { Callback } callback - Callback used to listen for the playback volume event. -+ * @param { Callback } callback - Callback used to listen for the playback volume event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- on(type: 'volumeChange', callback: Callback): void; -+ on(type: 'volumeChange', callback: Callback): void; - /** - * Unregister listens for media playback volumeChange event. - * @param { 'volumeChange' } type - Type of the playback event to listen for. -@@ -2853,13 +3088,13 @@ declare namespace media { - /** - * Unregister listens for media playback volumeChange event. - * @param { 'volumeChange' } type - Type of the playback event to listen for. -- * @param { Callback } callback - Callback used to listen for the playback volume event. -+ * @param { Callback } callback - Callback used to listen for the playback volume event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- off(type: 'volumeChange', callback?: Callback): void; -+ off(type: 'volumeChange', callback?: Callback): void; - /** - * Register listens for media playback endOfStream event. - * @param { 'endOfStream' } type - Type of the playback event to listen for. -@@ -2897,14 +3132,14 @@ declare namespace media { - /** - * Register listens for media playback seekDone event. - * @param { 'seekDone' } type - Type of the playback event to listen for. -- * @param { Callback } callback - Callback used to listen for the playback seekDone event. -+ * @param { Callback } callback - Callback used to listen for the playback seekDone event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @since 9 - */ - /** - * Register listens for media playback seekDone event. - * @param { 'seekDone' } type - Type of the playback event to listen for. -- * @param { Callback } callback - Callback used to listen for the playback seekDone event. -+ * @param { Callback } callback - Callback used to listen for the playback seekDone event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice - * @since 11 -@@ -2912,14 +3147,14 @@ declare namespace media { - /** - * Register listens for media playback seekDone event. - * @param { 'seekDone' } type - Type of the playback event to listen for. -- * @param { Callback } callback - Callback used to listen for the playback seekDone event. -+ * @param { Callback } callback - Callback used to listen for the playback seekDone event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- on(type: 'seekDone', callback: Callback): void; -+ on(type: 'seekDone', callback: Callback): void; - /** - * Unregister listens for media playback seekDone event. - * @param { 'seekDone' } type - Type of the playback event to listen for. -@@ -2936,32 +3171,32 @@ declare namespace media { - /** - * Unregister listens for media playback seekDone event. - * @param { 'seekDone' } type - Type of the playback event to listen for. -- * @param { Callback } callback - Callback used to listen for the playback seekDone event. -+ * @param { Callback } callback - Callback used to listen for the playback seekDone event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- off(type: 'seekDone', callback?: Callback): void; -+ off(type: 'seekDone', callback?: Callback): void; - /** - * Register listens for media playback speedDone event. - * @param { 'speedDone' } type - Type of the playback event to listen for. -- * @param { Callback } callback - Callback used to listen for the playback speedDone event. -+ * @param { Callback } callback - Callback used to listen for the playback speedDone event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @since 9 - */ - /** - * Register listens for media playback speedDone event. - * @param { 'speedDone' } type - Type of the playback event to listen for. -- * @param { Callback } callback - Callback used to listen for the playback speedDone event. -+ * @param { Callback } callback - Callback used to listen for the playback speedDone event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- on(type: 'speedDone', callback: Callback): void; -+ on(type: 'speedDone', callback: Callback): void; - /** - * Unregister listens for media playback speedDone event. - * @param { 'speedDone' } type - Type of the playback event to listen for. -@@ -2971,30 +3206,30 @@ declare namespace media { - /** - * Unregister listens for media playback speedDone event. - * @param { 'speedDone' } type - Type of the playback event to listen for. -- * @param { Callback } callback - Callback used to listen for the playback speedDone event. -+ * @param { Callback } callback - Callback used to listen for the playback speedDone event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- off(type: 'speedDone', callback?: Callback): void; -+ off(type: 'speedDone', callback?: Callback): void; - /** - * Register listens for media playback setBitrateDone event. - * @param { 'bitrateDone' } type - Type of the playback event to listen for. -- * @param { Callback } callback - Callback used to listen for the playback setBitrateDone event. -+ * @param { Callback } callback - Callback used to listen for the playback setBitrateDone event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @since 9 - */ - /** - * Register listens for media playback setBitrateDone event. - * @param { 'bitrateDone' } type - Type of the playback event to listen for. -- * @param { Callback } callback - Callback used to listen for the playback setBitrateDone event. -+ * @param { Callback } callback - Callback used to listen for the playback setBitrateDone event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- on(type: 'bitrateDone', callback: Callback): void; -+ on(type: 'bitrateDone', callback: Callback): void; - /** - * Unregister listens for media playback setBitrateDone event. - * @param { 'bitrateDone' } type - Type of the playback event to listen for. -@@ -3004,23 +3239,23 @@ declare namespace media { - /** - * Unregister listens for media playback setBitrateDone event. - * @param { 'bitrateDone' } type - Type of the playback event to listen for. -- * @param { Callback } callback - Callback used to listen for the playback setBitrateDone event. -+ * @param { Callback } callback - Callback used to listen for the playback setBitrateDone event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- off(type: 'bitrateDone', callback?: Callback): void; -+ off(type: 'bitrateDone', callback?: Callback): void; - /** - * Register listens for media playback timeUpdate event. - * @param { 'timeUpdate' } type - Type of the playback event to listen for. -- * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. -+ * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @since 9 - */ - /** - * Register listens for media playback timeUpdate event. - * @param { 'timeUpdate' } type - Type of the playback event to listen for. -- * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. -+ * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice - * @since 11 -@@ -3028,14 +3263,14 @@ declare namespace media { - /** - * Register listens for media playback timeUpdate event. - * @param { 'timeUpdate' } type - Type of the playback event to listen for. -- * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. -+ * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- on(type: 'timeUpdate', callback: Callback): void; -+ on(type: 'timeUpdate', callback: Callback): void; - /** - * Unregister listens for media playback timeUpdate event. - * @param { 'timeUpdate' } type - Type of the playback event to listen for. -@@ -3052,32 +3287,32 @@ declare namespace media { - /** - * Unregister listens for media playback timeUpdate event. - * @param { 'timeUpdate' } type - Type of the playback event to listen for. -- * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. -+ * @param { Callback } callback - Callback used to listen for the playback timeUpdate event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- off(type: 'timeUpdate', callback?: Callback): void; -+ off(type: 'timeUpdate', callback?: Callback): void; - /** - * Register listens for media playback durationUpdate event. - * @param { 'durationUpdate' } type - Type of the playback event to listen for. -- * @param { Callback } callback - Callback used to listen for the playback durationUpdate event. -+ * @param { Callback } callback - Callback used to listen for the playback durationUpdate event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @since 9 - */ - /** - * Register listens for media playback durationUpdate event. - * @param { 'durationUpdate' } type - Type of the playback event to listen for. -- * @param { Callback } callback - Callback used to listen for the playback durationUpdate event. -+ * @param { Callback } callback - Callback used to listen for the playback durationUpdate event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- on(type: 'durationUpdate', callback: Callback): void; -+ on(type: 'durationUpdate', callback: Callback): void; - /** - * Unregister listens for media playback durationUpdate event. - * @param { 'durationUpdate' } type - Type of the playback event to listen for. -@@ -3087,13 +3322,13 @@ declare namespace media { - /** - * Unregister listens for media playback durationUpdate event. - * @param { 'durationUpdate' } type - Type of the playback event to listen for. -- * @param { Callback } callback - Callback used to listen for the playback durationUpdate event. -+ * @param { Callback } callback - Callback used to listen for the playback durationUpdate event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- off(type: 'durationUpdate', callback?: Callback): void; -+ off(type: 'durationUpdate', callback?: Callback): void; - - /** - * Register listens for video playback buffering events. -@@ -3217,8 +3452,7 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - on(type: 'audioInterrupt', callback: Callback): void; - /** -@@ -3234,8 +3468,7 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - off(type: 'audioInterrupt', callback?: Callback): void; - /** -@@ -3250,14 +3483,14 @@ declare namespace media { - * Register listens for available bitrate list collect completed events for HLS protocol stream playback. - * This event will be reported after the {@link #prepare} called. - * @param { 'availableBitrates' } type - Type of the playback event to listen for. -- * @param { Callback> } callback - Callback used to listen for the playback event return available bitrate list. -+ * @param { Callback> } callback - Callback used to listen for the playback event return available bitrate list. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- on(type: 'availableBitrates', callback: Callback>): void; -+ on(type: 'availableBitrates', callback: Callback>): void; - /** - * Unregister listens for available bitrate list collect completed events for HLS protocol stream playback. - * This event will be reported after the {@link #prepare} called. -@@ -3269,14 +3502,14 @@ declare namespace media { - * Unregister listens for available bitrate list collect completed events for HLS protocol stream playback. - * This event will be reported after the {@link #prepare} called. - * @param { 'availableBitrates' } type - Type of the playback event to listen for. -- * @param { Callback> } callback - Callback used to listen for the playback event return available bitrate list. -+ * @param { Callback> } callback - Callback used to listen for the playback event return available bitrate list. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- off(type: 'availableBitrates', callback?: Callback>): void; -+ off(type: 'availableBitrates', callback?: Callback>): void; - /** - * Register listens for playback error events. - * @param { 'error' } type - Type of the playback error event to listen for. -@@ -3332,7 +3565,7 @@ declare namespace media { - /** - * Register listens for playback error events. - * @param { 'error' } type - Type of the playback error event to listen for. -- * @param { ErrorCallback } callback - Callback used to listen for the playback error event. -+ * @param { ErrorCallback } callback - Callback used to listen for the playback error event. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - The parameter check failed. - * @throws { BusinessError } 801 - Capability not supported. -@@ -3357,9 +3590,8 @@ declare namespace media { - * @atomicservice - * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 -- * @permission - */ -- on(type: 'error', callback: ErrorCallback): void; -+ on(type: 'error', callback: ErrorCallback): void; - /** - * Unregister listens for playback error events. - * @param { 'error' } type - Type of the playback error event to listen for. -@@ -3376,14 +3608,14 @@ declare namespace media { - /** - * Unregister listens for playback error events. - * @param { 'error' } type - Type of the playback error event to listen for. -- * @param { ErrorCallback } callback - Callback used to listen for the playback error event. -+ * @param { ErrorCallback } callback - Callback used to listen for the playback error event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- off(type: 'error', callback?: ErrorCallback): void; -+ off(type: 'error', callback?: ErrorCallback): void; - - /** - * Subscribes output device change event callback. -@@ -3404,8 +3636,7 @@ declare namespace media { - *
    2. Incorrect parameter types. 3.Parameter verification failed. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - on(type: 'audioOutputDeviceChangeWithInfo', callback: Callback): void; - -@@ -3426,8 +3657,7 @@ declare namespace media { - *
    2. Incorrect parameter types. 3.Parameter verification failed. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - off(type: 'audioOutputDeviceChangeWithInfo', callback?: Callback): void; - -@@ -3501,41 +3731,41 @@ declare namespace media { - * Subscrips listener for audio playback amplitude update event. - * In each event, an array of amplitude is reported, large index indicates closer to current time. - * @param { 'amplitudeUpdate' } type - Type of the event to listen for. -- * @param { Callback> } callback - Callback used to listen amplitude update event. -+ * @param { Callback> } callback - Callback used to listen amplitude update event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 - */ -- on(type: 'amplitudeUpdate', callback: Callback>): void -+ on(type: 'amplitudeUpdate', callback: Callback>): void - - /** - * UnSubscrips listener for audio playback amplitude update event - * @param { 'amplitudeUpdate' } type - Type of the event to listen for. -- * @param { Callback> } callback - Callback used to listen amplitude update event. -+ * @param { Callback> } callback - Callback used to listen amplitude update event. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 - */ -- off(type: 'amplitudeUpdate', callback?: Callback>): void -+ off(type: 'amplitudeUpdate', callback?: Callback>): void - - /** - * Subscribes listener for video SEI message event, only for live video streaming. - * Call before the {@link #prepare}, repeated invocation overwrites the last subscribed callback and payload types. - * - * @param { 'seiMessageReceived' } type - Type of the playback event to listen for. -- * @param { Array } payloadTypes - The subscribed payload types of the SEI message. -+ * @param { Array } payloadTypes - The subscribed payload types of the SEI message. - * @param { OnSeiMessageHandle } callback - Callback to listen SEI message event with subscribed payload types. - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 - */ -- on(type: 'seiMessageReceived', payloadTypes: Array, callback: OnSeiMessageHandle): void; -+ on(type: 'seiMessageReceived', payloadTypes: Array, callback: OnSeiMessageHandle): void; - - /** - * Unsubscribes listener for video SEI message event. - * @param { 'seiMessageReceived' } type - Type of the playback event to listen for. -- * @param { Array } payloadTypes - The payload types of the SEI message. -+ * @param { Array } payloadTypes - The payload types of the SEI message. - * Null means unsubscribe all payload types. - - * @param { OnSeiMessageHandle } callback - Callback to listen SEI message event with subscribed payload types. -@@ -3544,7 +3774,7 @@ declare namespace media { - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 - */ -- off(type: 'seiMessageReceived', payloadTypes?: Array, callback?: OnSeiMessageHandle): void; -+ off(type: 'seiMessageReceived', payloadTypes?: Array, callback?: OnSeiMessageHandle): void; - - /** - * Subscribes listener for super-resolution status changed event. -@@ -3600,41 +3830,47 @@ declare namespace media { - * - * @enum { string } - * @syscap SystemCapability.Multimedia.Media.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PlaybackInfoKey { - /** - * IP address of current network stream. - * @syscap SystemCapability.Multimedia.Media.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SERVER_IP_ADDRESS = 'server_ip_address', - - /** - * Average download rate during playing except for suspend downloading. - * @syscap SystemCapability.Multimedia.Media.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVG_DOWNLOAD_RATE = 'average_download_rate', - - /** - * Current download rate of the last second except for suspend downloading. - * @syscap SystemCapability.Multimedia.Media.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DOWNLOAD_RATE = 'download_rate', - - /** - * Boolean value, true for current is downloading, false for suspend downloading. - * @syscap SystemCapability.Multimedia.Media.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - IS_DOWNLOADING = 'is_downloading', - - /** - * Cached duration in milliseconds. - * @syscap SystemCapability.Multimedia.Media.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BUFFER_DURATION = 'buffer_duration', - } -@@ -3829,7 +4065,8 @@ declare namespace media { - * - client should return immediately. - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type SourceOpenCallback = (request: MediaSourceLoadingRequest) => number; - -@@ -3845,7 +4082,8 @@ declare namespace media { - * @returns { void } - client should return immediately. - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type SourceReadCallback = (uuid: number, requestedOffset: number, requestedLength: number) => void; - -@@ -3856,7 +4094,8 @@ declare namespace media { - * @returns { void } - client should return immediately. - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type SourceCloseCallback = (uuid: number) => void; - -@@ -3865,7 +4104,8 @@ declare namespace media { - * @typedef MediaSourceLoader - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MediaSourceLoader { - /** -@@ -3873,7 +4113,8 @@ declare namespace media { - * @type { SourceOpenCallback } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - open: SourceOpenCallback; - -@@ -3882,7 +4123,8 @@ declare namespace media { - * @type { SourceReadCallback } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - read: SourceReadCallback; - -@@ -3891,7 +4133,8 @@ declare namespace media { - * @type { SourceCloseCallback } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - close: SourceCloseCallback; - } -@@ -3901,14 +4144,16 @@ declare namespace media { - * @enum { number } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum LoadingRequestError { - /** - * If reach the resource end, client should return. - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LOADING_ERROR_SUCCESS = 0, - -@@ -3916,7 +4161,8 @@ declare namespace media { - * If resource not ready for access, client should return. - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LOADING_ERROR_NOT_READY = 1, - -@@ -3924,7 +4170,8 @@ declare namespace media { - * If resource url not exist, client should return. - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LOADING_ERROR_NO_RESOURCE = 2, - -@@ -3932,7 +4179,8 @@ declare namespace media { - * If the uuid of resource handle is valid, client should return. - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LOADING_ERROR_INVAID_HANDLE = 3, - -@@ -3940,7 +4188,8 @@ declare namespace media { - * If client has no right to request the resource, client should return. - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LOADING_ERROR_ACCESS_DENIED = 4, - -@@ -3948,7 +4197,8 @@ declare namespace media { - * If access time out, client should return. - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LOADING_ERROR_ACCESS_TIMEOUT = 5, - -@@ -3956,7 +4206,8 @@ declare namespace media { - * If authorization failed, client should return. - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LOADING_ERROR_AUTHORIZE_FAILED = 6, - } -@@ -3986,7 +4237,8 @@ declare namespace media { - * @type { ?Record } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - header?: Record; - -@@ -3995,14 +4247,28 @@ declare namespace media { - * @param { number } uuid - label the resource handle. - * @param { number } offset - current media data position from start of the source. - * @param { ArrayBuffer } buffer - media data buffer which respond to the player. -- * @returns { int } - accept bytes for current read. The value less than zero means failed. -+ * @returns { number } - accept bytes for current read. The value less than zero means failed. - * - 2, means player need current data any more, the client should stop current read process. - * - 3, means player buffer is full, the client should wait for next read. - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice - * @since 18 - */ -- respondData(uuid: number, offset: number, buffer: ArrayBuffer): int; -+ respondData(uuid: number, offset: number, buffer: ArrayBuffer): number; -+ /** -+ * The interface for application used to send requested data to AVPlayer. -+ * @param { number } uuid - label the resource handle. -+ * @param { number } offset - current media data position from start of the source. -+ * @param { ArrayBuffer } buffer - media data buffer which respond to the player. -+ * @returns { number | undefined } - accept bytes for current read. The value less than zero means failed. -+ * - 2, means player need current data any more, the client should stop current read process. -+ * - 3, means player buffer is full, the client should wait for next read. -+ * @syscap SystemCapability.Multimedia.Media.Core -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ respondData(uuid: number, offset: number, buffer: ArrayBuffer): number | undefined; - - /** - * The interface for application used to send respond header to AVPlayer -@@ -4012,7 +4278,8 @@ declare namespace media { - * @param { ?string } [redirectUrl] - redirect url from the http response if exist. - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - respondHeader(uuid: number, header?: Record, redirectUrl?: string): void; - -@@ -4022,7 +4289,8 @@ declare namespace media { - * @param { LoadingRequestError } state - the request state. - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - finishLoading(uuid: number, state: LoadingRequestError): void; - } -@@ -4048,33 +4316,33 @@ declare namespace media { - - /** - * video width. -- * @type { long } -+ * @type { number } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 - */ -- width: long; -+ width: number; - - /** - * video height. -- * @type { long } -+ * @type { number } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 - */ -- height: long; -+ height: number; - - /** - * biterate of this mediaStream. -- * @type { long } -+ * @type { number } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 - */ -- bitrate: long; -+ bitrate: number; - } - - /** -@@ -4083,7 +4351,8 @@ declare namespace media { - * @typedef MediaSource - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface MediaSource { - /** -@@ -4091,7 +4360,8 @@ declare namespace media { - * @param { AVMimeTypes } mimeType - for MediaSource define. see @ AVMimeTypes. - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setMimeType(mimeType: AVMimeTypes): void; - -@@ -4100,7 +4370,8 @@ declare namespace media { - * @param { MediaSourceLoader } resourceLoader - callback function interface set for player use. - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setMediaResourceLoaderDelegate(resourceLoader: MediaSourceLoader): void; - } -@@ -4110,14 +4381,16 @@ declare namespace media { - * @enum { string } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum AVMimeTypes { - /** - * Indicate current file is index file for hls Media. - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - APPLICATION_M3U8 = 'application/m3u8', - } -@@ -4127,7 +4400,8 @@ declare namespace media { - * @typedef PlaybackStrategy - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PlaybackStrategy { - /** -@@ -4135,7 +4409,8 @@ declare namespace media { - * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - preferredWidth?: number; - /** -@@ -4143,7 +4418,8 @@ declare namespace media { - * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - preferredHeight?: number; - /** -@@ -4151,7 +4427,8 @@ declare namespace media { - * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - preferredBufferDuration?: number; - -@@ -4160,7 +4437,8 @@ declare namespace media { - * @type { ?boolean } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - preferredHdr?: boolean; - -@@ -4168,7 +4446,8 @@ declare namespace media { - * mute the specified media stream when playing. - * @type { ?MediaType } - * @syscap SystemCapability.Multimedia.Media.Core -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - mutedMediaType?: MediaType; - -@@ -4177,7 +4456,8 @@ declare namespace media { - * @type { ?string } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - preferredAudioLanguage?: string; - -@@ -4186,7 +4466,8 @@ declare namespace media { - * @type { ?string } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - preferredSubtitleLanguage?: string; - -@@ -4195,7 +4476,8 @@ declare namespace media { - * @type { ?boolean } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - showFirstFrameOnPrepare?: boolean; - -@@ -4204,7 +4486,8 @@ declare namespace media { - * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - preferredBufferDurationForPlaying?: number; - -@@ -4214,7 +4497,8 @@ declare namespace media { - * @type { ?boolean } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enableSuperResolution?: boolean; - -@@ -4224,7 +4508,8 @@ declare namespace media { - * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - thresholdForAutoQuickPlay?: number - } -@@ -4274,14 +4559,14 @@ declare namespace media { - /** - * The file descriptor of audio or video source from file system. The caller - * is responsible to close the file descriptor. -- * @type { int } -+ * @type { number } - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- fd: int -+ fd: number - - /** - * The offset into the file where the data to be read, in bytes. By default, -@@ -4299,14 +4584,14 @@ declare namespace media { - /** - * The offset into the file where the data to be read, in bytes. By default, - * the offset is zero. -- * @type { ?long } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- offset?: long -+ offset?: number - - /** - * The length in bytes of the data to be read. By default, the length is the -@@ -4324,14 +4609,14 @@ declare namespace media { - /** - * The length in bytes of the data to be read. By default, the length is the - * rest of bytes in the file from the offset. -- * @type { ?long } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- length?: long -+ length?: number - } - - /** -@@ -4379,14 +4664,14 @@ declare namespace media { - /** - * Size of the file, -1 means the file size is unknown, in this case, - * seek and setSpeed can't be executed, loop can't be set, and can't replay. -- * @type { long } -+ * @type { number } - * @syscap SystemCapability.Multimedia.Media.AVPlayer - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- fileSize: long; -+ fileSize: number; - /** - * Callback function implemented by users, which is used to fill data. - * buffer - The buffer need to fill. -@@ -4423,7 +4708,7 @@ declare namespace media { - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- callback: (buffer: ArrayBuffer, length: long, pos?: long) => int; -+ callback: (buffer: ArrayBuffer, length: number, pos?: number) => number; - } - - /** -@@ -4439,22 +4724,22 @@ declare namespace media { - interface SubtitleInfo { - /** - * Duration of the text to be displayed, as milliseconds. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- duration?: int; -+ duration?: number; - /** - * Display start time of the text, as milliseconds. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- startTime?: int; -+ startTime?: number; - /** - * Text information of current update event. - * @type { ?string } -@@ -4694,13 +4979,13 @@ declare namespace media { - /** - * Listens for playback error events. - * @param { 'error' } type - Type of the playback error event to listen for. -- * @param { ErrorCallback } callback - Callback used to listen for the playback error event. -+ * @param { ErrorCallback } callback - Callback used to listen for the playback error event. - * @syscap SystemCapability.Multimedia.Media.AudioPlayer - * @since 6 - * @deprecated since 9 - * @useinstead ohos.multimedia.media/media.AVPlayer#event:error - */ -- on(type: 'error', callback: ErrorCallback): void; -+ on(type: 'error', callback: ErrorCallback): void; - } - - /** -@@ -4824,17 +5109,39 @@ declare namespace media { - * @since 11 - */ - getAVRecorderConfig(callback: AsyncCallback): void; -+ /** -+ * Get AVRecorderConfig.it must be called after prepare. -+ * @param { AsyncCallback } callback - Callback used to return the input config in AVRecorderConfig. -+ * @throws { BusinessError } 5400102 - Operate not permit. Return by callback. -+ * @throws { BusinessError } 5400103 - IO error. Return by callback. -+ * @throws { BusinessError } 5400105 - Service died. Return by callback. -+ * @syscap SystemCapability.Multimedia.Media.AVRecorder -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ getAVRecorderConfig(callback: AsyncCallback): void; - - /** - * Get AVRecorderConfig.it must be called after prepare. -- * @returns { Promise } A Promise instance used to return the input config in AVRecorderConfig. -+ * @returns { Promise } A Promise instance used to return the input config in AVRecorderConfig. -+ * @throws { BusinessError } 5400102 - Operate not permit. Return by promise. -+ * @throws { BusinessError } 5400103 - IO error. Return by promise. -+ * @throws { BusinessError } 5400105 - Service died. Return by promise. -+ * @syscap SystemCapability.Multimedia.Media.AVRecorder -+ * @since 11 -+ */ -+ getAVRecorderConfig(): Promise; -+ /** -+ * Get AVRecorderConfig.it must be called after prepare. -+ * @returns { Promise } A Promise instance used to return the input config in AVRecorderConfig. - * @throws { BusinessError } 5400102 - Operate not permit. Return by promise. - * @throws { BusinessError } 5400103 - IO error. Return by promise. - * @throws { BusinessError } 5400105 - Service died. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVRecorder -- * @since 11 -+ * @since 20 -+ * @arkts 1.2 - */ -- getAVRecorderConfig(): Promise; -+ getAVRecorderConfig(): Promise; - - /** - * Get input surface.it must be called between prepare completed and start. -@@ -4843,10 +5150,20 @@ declare namespace media { - * @throws { BusinessError } 5400103 - IO error. Return by callback. - * @throws { BusinessError } 5400105 - Service died. Return by callback. - * @syscap SystemCapability.Multimedia.Media.AVRecorder -- * @since arkts {'1.1':'9','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - getInputSurface(callback: AsyncCallback): void; -+ /** -+ * Get input surface.it must be called between prepare completed and start. -+ * @param { AsyncCallback } callback - Callback used to return the input surface id in string. -+ * @throws { BusinessError } 5400102 - Operate not permit. Return by callback. -+ * @throws { BusinessError } 5400103 - IO error. Return by callback. -+ * @throws { BusinessError } 5400105 - Service died. Return by callback. -+ * @syscap SystemCapability.Multimedia.Media.AVRecorder -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ getInputSurface(callback: AsyncCallback): void; - - /** - * Get input surface. it must be called between prepare completed and start. -@@ -4855,10 +5172,20 @@ declare namespace media { - * @throws { BusinessError } 5400103 - IO error. Return by promise. - * @throws { BusinessError } 5400105 - Service died. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVRecorder -- * @since arkts {'1.1':'9','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - getInputSurface(): Promise; -+ /** -+ * Get input surface. it must be called between prepare completed and start. -+ * @returns { Promise } A Promise instance used to return the input surface id in string. -+ * @throws { BusinessError } 5400102 - Operate not permit. Return by promise. -+ * @throws { BusinessError } 5400103 - IO error. Return by promise. -+ * @throws { BusinessError } 5400105 - Service died. Return by promise. -+ * @syscap SystemCapability.Multimedia.Media.AVRecorder -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ getInputSurface(): Promise; - - /** - * Get input meta surface for specified meta source type. it must be called between prepare completed and start. -@@ -4875,13 +5202,30 @@ declare namespace media { - * @since 12 - */ - getInputMetaSurface(type: MetaSourceType): Promise; -+ /** -+ * Get input meta surface for specified meta source type. it must be called between prepare completed and start. -+ * @param { MetaSourceType } type - Meta source type. -+ * @returns { Promise } A Promise instance used to return the input surface id in string. -+ * @throws { BusinessError } 202 - Called from Non-System applications. Return by promise. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameter types. 3.Parameter verification failed. -+ * @throws { BusinessError } 5400102 - Operate not permit. Return by promise. -+ * @throws { BusinessError } 5400103 - IO error. Return by promise. -+ * @throws { BusinessError } 5400105 - Service died. Return by promise. -+ * @syscap SystemCapability.Multimedia.Media.AVRecorder -+ * @systemapi -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ getInputMetaSurface(type: MetaSourceType): Promise; - - /** - * Check if the avrecorder has watermark capability. - * @returns { Promise } A Promise instance used to return true or false when the function is finished. - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isWatermarkSupported(): Promise; - /** -@@ -4906,7 +5250,8 @@ declare namespace media { - * @throws { BusinessError } 5400103 - IO error. Return by promise. - * @throws { BusinessError } 5400105 - Service died. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVRecorder -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - updateRotation(rotation: number): Promise; - -@@ -4927,7 +5272,8 @@ declare namespace media { - * @throws { BusinessError } 5400105 - Service died. Return by callback. - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @crossplatform -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - start(callback: AsyncCallback): void; - -@@ -4949,7 +5295,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - start(): Promise; - -@@ -5015,7 +5362,8 @@ declare namespace media { - * @throws { BusinessError } 5400105 - Service died. Return by callback. - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @crossplatform -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - resume(callback: AsyncCallback): void; - -@@ -5037,7 +5385,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - resume(): Promise; - -@@ -5191,7 +5540,8 @@ declare namespace media { - * @throws { BusinessError } 5400102 - Operation not allowed. - * @throws { BusinessError } 5400105 - Service died. Return by callback. - * @syscap SystemCapability.Multimedia.Media.AVRecorder -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getAudioCapturerMaxAmplitude(callback: AsyncCallback): void; - -@@ -5201,7 +5551,8 @@ declare namespace media { - * @throws { BusinessError } 5400102 - Operation not allowed. - * @throws { BusinessError } 5400105 - Service died. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVRecorder -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getAudioCapturerMaxAmplitude(): Promise; - -@@ -5211,7 +5562,8 @@ declare namespace media { - * @throws { BusinessError } 5400102 - Operation not allowed. - * @throws { BusinessError } 5400105 - Service died. Return by callback. - * @syscap SystemCapability.Multimedia.Media.AVRecorder -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getAvailableEncoder(callback: AsyncCallback>): void; - -@@ -5221,7 +5573,8 @@ declare namespace media { - * @throws { BusinessError } 5400102 - Operation not allowed. - * @throws { BusinessError } 5400105 - Service died. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVRecorder -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getAvailableEncoder(): Promise>; - -@@ -5249,8 +5602,7 @@ declare namespace media { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. 3.Parameter verification failed. - * @syscap SystemCapability.Multimedia.Media.AVRecorder -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - on(type: 'audioCapturerChange', callback: Callback): void; - -@@ -5324,7 +5676,7 @@ declare namespace media { - /** - * Listens for recording error events. - * @param { 'error' } type - Type of the recording error event to listen for. -- * @param { ErrorCallback } callback - Callback used to listen for the recorder error event. -+ * @param { ErrorCallback } callback - Callback used to listen for the recorder error event. - * @throws { BusinessError } 201 - Permission denied. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. 3.Parameter verification failed. -@@ -5341,9 +5693,8 @@ declare namespace media { - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 -- * @permission - */ -- on(type: 'error', callback: ErrorCallback): void; -+ on(type: 'error', callback: ErrorCallback): void; - - /** - * Cancel Listens for recording stateChange events. -@@ -5372,14 +5723,14 @@ declare namespace media { - /** - * Cancel Listens for recording error events. - * @param { 'error' } type - Type of the recording error event to listen for. -- * @param { ErrorCallback } callback - Callback used to listen for the recorder error event. -+ * @param { ErrorCallback } callback - Callback used to listen for the recorder error event. - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- off(type: 'error', callback?: ErrorCallback): void; -+ off(type: 'error', callback?: ErrorCallback): void; - - /** - * Cancel Listens for recording audioCapturerChange events. -@@ -5392,8 +5743,7 @@ declare namespace media { - * @param { 'audioCapturerChange' } type - Type of the audioCapturerChange event to listen for. - * @param { Callback } callback - Callback used to listen device change event. - * @syscap SystemCapability.Multimedia.Media.AVRecorder -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - off(type: 'audioCapturerChange', callback?: Callback): void; - -@@ -5534,13 +5884,13 @@ declare namespace media { - */ - /** - * Latitude. -- * @type { double } -+ * @type { number } - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- latitude: double; -+ latitude: number; - - /** - * Longitude. -@@ -5549,13 +5899,13 @@ declare namespace media { - */ - /** - * Longitude. -- * @type { double } -+ * @type { number } - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- longitude: double; -+ longitude: number; - } - /** - * Set configures of a watermark to AVRecorder. The position starts at top left corner. -@@ -5563,7 +5913,8 @@ declare namespace media { - * @typedef WatermarkConfig - * @syscap SystemCapability.Multimedia.Media.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface WatermarkConfig { - /** -@@ -5571,7 +5922,8 @@ declare namespace media { - * @type { number } - * @syscap SystemCapability.Multimedia.Media.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - top: number; - /** -@@ -5579,7 +5931,8 @@ declare namespace media { - * @type { number } - * @syscap SystemCapability.Multimedia.Media.Core - * @systemapi -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - left: number; - } -@@ -5708,7 +6061,7 @@ declare namespace media { - * @param { AudioRecorderConfig } config - Recording parameters. - * @throws { BusinessError } 201 - permission denied. - * @syscap SystemCapability.Multimedia.Media.AudioRecorder -- * @since 6 -+ * @since 12 - * @deprecated since 9 - * @useinstead ohos.multimedia.media/media.AVRecorder#prepare - */ -@@ -5784,13 +6137,13 @@ declare namespace media { - /** - * Listens for audio recording error events. - * @param { 'error' } type - Type of the audio recording error event to listen for. -- * @param { ErrorCallback } callback - Callback used to listen for the audio recording error event. -+ * @param { ErrorCallback } callback - Callback used to listen for the audio recording error event. - * @syscap SystemCapability.Multimedia.Media.AudioRecorder - * @since 6 - * @deprecated since 9 - * @useinstead ohos.multimedia.media/media.AVRecorder#on - */ -- on(type: 'error', callback: ErrorCallback): void; -+ on(type: 'error', callback: ErrorCallback): void; - } - - /** -@@ -5898,10 +6251,22 @@ declare namespace media { - * @throws { BusinessError } 5400105 - Service died. Return by callback. - * @syscap SystemCapability.Multimedia.Media.VideoRecorder - * @systemapi -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - getInputSurface(callback: AsyncCallback): void; -+ /** -+ * get input surface.it must be called between prepare completed and start. -+ * @param { AsyncCallback } callback - Callback used to return the input surface id in string. -+ * @throws { BusinessError } 202 - Not System App. -+ * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. -+ * @throws { BusinessError } 5400103 - I/O error. Return by callback. -+ * @throws { BusinessError } 5400105 - Service died. Return by callback. -+ * @syscap SystemCapability.Multimedia.Media.VideoRecorder -+ * @systemapi -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ getInputSurface(callback: AsyncCallback): void; - /** - * get input surface. it must be called between prepare completed and start. - * @returns { Promise } A Promise instance used to return the input surface id in string. -@@ -5921,10 +6286,22 @@ declare namespace media { - * @throws { BusinessError } 5400105 - Service died. Return by promise. - * @syscap SystemCapability.Multimedia.Media.VideoRecorder - * @systemapi -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - getInputSurface(): Promise; -+ /** -+ * get input surface. it must be called between prepare completed and start. -+ * @returns { Promise } A Promise instance used to return the input surface id in string. -+ * @throws { BusinessError } 202 - Not System App. -+ * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. -+ * @throws { BusinessError } 5400103 - I/O error. Return by promise. -+ * @throws { BusinessError } 5400105 - Service died. Return by promise. -+ * @syscap SystemCapability.Multimedia.Media.VideoRecorder -+ * @systemapi -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ getInputSurface(): Promise; - /** - * Starts video recording. - * @param { AsyncCallback } callback - A callback instance used to return when start completed. -@@ -5944,7 +6321,8 @@ declare namespace media { - * @throws { BusinessError } 5400105 - Service died. Return by callback. - * @syscap SystemCapability.Multimedia.Media.VideoRecorder - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - start(callback: AsyncCallback): void; - /** -@@ -5966,7 +6344,8 @@ declare namespace media { - * @throws { BusinessError } 5400105 - Service died. Return by promise. - * @syscap SystemCapability.Multimedia.Media.VideoRecorder - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - start(): Promise; - /** -@@ -6034,7 +6413,8 @@ declare namespace media { - * @throws { BusinessError } 5400105 - Service died. Return by callback. - * @syscap SystemCapability.Multimedia.Media.VideoRecorder - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - resume(callback: AsyncCallback): void; - /** -@@ -6056,7 +6436,8 @@ declare namespace media { - * @throws { BusinessError } 5400105 - Service died. Return by promise. - * @syscap SystemCapability.Multimedia.Media.VideoRecorder - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - resume(): Promise; - /** -@@ -6205,7 +6586,6 @@ declare namespace media { - */ - /** - * Listens for video recording error events. -- * @permission - * @param { 'error' } type - Type of the video recording error event to listen for. - * @param { ErrorCallback } callback - Callback used to listen for the video recording error event. - * @throws { BusinessError } 201 - permission denied. -@@ -6214,7 +6594,8 @@ declare namespace media { - * @throws { BusinessError } 5400105 - Service died. Return by callback. - * @syscap SystemCapability.Multimedia.Media.VideoRecorder - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'error', callback: ErrorCallback): void; - -@@ -6769,13 +7150,13 @@ declare namespace media { - /** - * Listens for playback error events. - * @param { 'error' } type - Type of the playback error event to listen for. -- * @param { ErrorCallback } callback - Callback used to listen for the playback error event. -+ * @param { ErrorCallback } callback - Callback used to listen for the playback error event. - * @syscap SystemCapability.Multimedia.Media.VideoPlayer - * @since 8 - * @deprecated since 9 - * @useinstead ohos.multimedia.media/media.AVPlayer#event:error - */ -- on(type: 'error', callback: ErrorCallback): void; -+ on(type: 'error', callback: ErrorCallback): void; - } - - /** -@@ -7266,25 +7647,25 @@ declare namespace media { - interface VideoRecorderProfile { - /** - * Indicates the audio bit rate. -- * @type { int } -+ * @type { number } - * @readonly - * @syscap SystemCapability.Multimedia.Media.VideoRecorder - * @systemapi - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly audioBitrate: int; -+ readonly audioBitrate: number; - - /** - * Indicates the number of audio channels. -- * @type { int } -+ * @type { number } - * @readonly - * @syscap SystemCapability.Multimedia.Media.VideoRecorder - * @systemapi - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly audioChannels: int; -+ readonly audioChannels: number; - - /** - * Indicates the audio encoding format. -@@ -7299,14 +7680,14 @@ declare namespace media { - - /** - * Indicates the audio sampling rate. -- * @type { int } -+ * @type { number } - * @readonly - * @syscap SystemCapability.Multimedia.Media.VideoRecorder - * @systemapi - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly audioSampleRate: int; -+ readonly audioSampleRate: number; - - /** - * Indicates the output file format. -@@ -7321,14 +7702,14 @@ declare namespace media { - - /** - * Indicates the video bit rate. -- * @type { int } -+ * @type { number } - * @readonly - * @syscap SystemCapability.Multimedia.Media.VideoRecorder - * @systemapi - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly videoBitrate: int; -+ readonly videoBitrate: number; - - /** - * Indicates the video encoding format. -@@ -7343,36 +7724,36 @@ declare namespace media { - - /** - * Indicates the video width. -- * @type { int } -+ * @type { number } - * @readonly - * @syscap SystemCapability.Multimedia.Media.VideoRecorder - * @systemapi - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly videoFrameWidth: int; -+ readonly videoFrameWidth: number; - - /** - * Indicates the video height. -- * @type { int } -+ * @type { number } - * @readonly - * @syscap SystemCapability.Multimedia.Media.VideoRecorder - * @systemapi - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly videoFrameHeight: int; -+ readonly videoFrameHeight: number; - - /** - * Indicates the video frame rate. -- * @type { int } -+ * @type { number } - * @readonly - * @syscap SystemCapability.Multimedia.Media.VideoRecorder - * @systemapi - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly videoFrameRate: int; -+ readonly videoFrameRate: number; - } - - /** -@@ -7592,13 +7973,13 @@ declare namespace media { - /** - * Sets the video rotation angle in output file, and for the file to playback. mp4 support. - * the range of rotation angle should be {0, 90, 180, 270}, default is 0. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.VideoRecorder - * @systemapi - * @since arkts {'1.1':'9','1.2':'20'} - * @arkts 1.1&1.2 - */ -- rotation?: int; -+ rotation?: number; - /** - * geographical location information. - * @type { ?Location } -@@ -7684,12 +8065,12 @@ declare namespace media { - - /** - * audio encoder sample rate collection -- * @type { ?Array } -+ * @type { ?Array } - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- sampleRate?: Array; -+ sampleRate?: Array; - } - - /** -@@ -7703,21 +8084,21 @@ declare namespace media { - interface Range { - /** - * lower limit of the range -- * @type { int } -+ * @type { number } - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- min: int; -+ min: number; - - /** - * upper limit of the range -- * @type { int } -+ * @type { number } - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- max: int; -+ max: number; - } - - /** -@@ -7745,14 +8126,14 @@ declare namespace media { - */ - /** - * Indicates the audio bitrate. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- audioBitrate?: int; -+ audioBitrate?: number; - - /** - * Indicates the number of audio channels. -@@ -7761,14 +8142,14 @@ declare namespace media { - */ - /** - * Indicates the number of audio channels. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- audioChannels?: int; -+ audioChannels?: number; - - /** - * Indicates the audio encoding format. -@@ -7793,14 +8174,14 @@ declare namespace media { - */ - /** - * Indicates the audio sampling rate. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- audioSampleRate?: int; -+ audioSampleRate?: number; - - /** - * Indicates the output file format. -@@ -7825,13 +8206,13 @@ declare namespace media { - */ - /** - * Indicates the video bitrate. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @crossplatform - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- videoBitrate?: int; -+ videoBitrate?: number; - - /** - * Indicates the video encoding format. -@@ -7855,13 +8236,13 @@ declare namespace media { - */ - /** - * Indicates the video width. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @crossplatform - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- videoFrameWidth?: int; -+ videoFrameWidth?: number; - - /** - * Indicates the video height. -@@ -7870,13 +8251,13 @@ declare namespace media { - */ - /** - * Indicates the video height. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @crossplatform - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- videoFrameHeight?: int; -+ videoFrameHeight?: number; - - /** - * Indicates the video frame rate. -@@ -7885,13 +8266,13 @@ declare namespace media { - */ - /** - * Indicates the video frame rate. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @crossplatform - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- videoFrameRate?: int; -+ videoFrameRate?: number; - - /** - * Whether to record HDR video. -@@ -7924,7 +8305,7 @@ declare namespace media { - * @type { ?boolean } - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @systemapi -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 - */ - enableStableQualityMode?: boolean -@@ -8014,44 +8395,34 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.AVRecorder - * @crossplatform - * @atomicservice -- * @since 12 -- */ -- /** -- * File output uri, support a kind of uri now. -- * format like: "fd://" + "context". -- * @type { ?string } -- * @syscap SystemCapability.Multimedia.Media.AVRecorder -- * @crossplatform -- * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- url?: string; -+ url: string; - - /** - * Mode of creating recorder file, details see @FileGenerationMode. - * @type { ?FileGenerationMode } - * @syscap SystemCapability.Multimedia.Media.AVRecorder -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - fileGenerationMode?: FileGenerationMode; - /** - * Sets the video rotation angle in output file, and for the file to playback, mp4 support - * the range of rotation angle should be {0, 90, 180, 270}, default is 0. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVRecorder -- * @since arkts {'1.1':'9','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - * @deprecated since 12 - * @useinstead ohos.multimedia.media/media.AVMetadata#videoOrientation - */ -- rotation?: int; -+ rotation?: number; - /** - * Geographical location information. - * @type { ?Location } - * @syscap SystemCapability.Multimedia.Media.AVRecorder -- * @since arkts {'1.1':'9','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - * @deprecated since 12 - * @useinstead ohos.multimedia.media/media.AVMetadata#location - */ -@@ -8060,16 +8431,18 @@ declare namespace media { - * Set global metadata info. Details see @AVMetadata - * @type { ?AVMetadata } - * @syscap SystemCapability.Multimedia.Media.AVRecorder -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - metadata?: AVMetadata; - /** - * Set the longest duration allowed for current recording. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVRecorder -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- maxDuration?: int; -+ maxDuration?: number; - } - - /** -@@ -8226,7 +8599,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum SwitchMode { - /** -@@ -8234,7 +8608,8 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SMOOTH = 0, - /** -@@ -8242,14 +8617,16 @@ declare namespace media { - * @syscap SystemCapability.Multimedia.Media.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SEGMENT = 1, - /** - * switch to the closest frame of the given timestamp. - * @syscap SystemCapability.Multimedia.Media.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CLOSEST = 2, - } -@@ -8430,19 +8807,22 @@ declare namespace media { - * - * @enum { number } - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum AVScreenCaptureRecordPreset { - /** - * Screen record normal type, h264/aac mp4 - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SCREEN_RECORD_PRESET_H264_AAC_MP4 = 0, - /** - * Screen record high efficient type, h265/aac mp4 - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SCREEN_RECORD_PRESET_H265_AAC_MP4 = 1, - } -@@ -8452,19 +8832,22 @@ declare namespace media { - * - * @enum { number } - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum AVScreenCaptureFillMode { - /** - * Keep the scale the same as that of the original image - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRESERVE_ASPECT_RATIO = 0, - /** - * Fit the configured width and height - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SCALE_TO_FILL = 1, - } -@@ -8568,80 +8951,82 @@ declare namespace media { - interface AVScreenCaptureRecordConfig { - /** - * Indicates record file descriptor. -- * @type { int } -+ * @type { number } - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- fd: int; -+ fd: number; - /** - * Indicates video frame width. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- frameWidth?: int; -+ frameWidth?: number; - /** - * Indicates video frame height. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- frameHeight?: int; -+ frameHeight?: number; - /** - * Indicates video bitrate. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- videoBitrate?: int; -+ videoBitrate?: number; - /** - * Indicates audio sample rate. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- audioSampleRate?: int; -+ audioSampleRate?: number; - /** - * Indicates audio channel count. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- audioChannelCount?: int; -+ audioChannelCount?: number; - /** - * Indicates audio bitrate. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- audioBitrate?: int; -+ audioBitrate?: number; - /** - * Indicates AVScreenCaptureRecordPreset, details see @AVScreenCaptureRecordPreset - * @type { ?AVScreenCaptureRecordPreset } - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - preset?: AVScreenCaptureRecordPreset; - /** - * Indicates the screen to be recorded. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since arkts {'1.1':'15','1.2':'20'} - * @arkts 1.1&1.2 - */ -- displayId?: int; -+ displayId?: number; - /** - * Indicates the fill mode of video, details see @AVScreenCaptureFillMode - * @type { ?AVScreenCaptureFillMode } - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - fillMode?: AVScreenCaptureFillMode; - } -@@ -8665,7 +9050,8 @@ declare namespace media { - * @throws { BusinessError } 5400103 - IO error. Return by promise. - * @throws { BusinessError } 5400105 - Service died. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - init(config: AVScreenCaptureRecordConfig): Promise; - -@@ -8675,7 +9061,8 @@ declare namespace media { - * @throws { BusinessError } 5400103 - IO error. Return by promise. - * @throws { BusinessError } 5400105 - Service died. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - startRecording(): Promise; - -@@ -8685,7 +9072,8 @@ declare namespace media { - * @throws { BusinessError } 5400103 - IO error. Return by promise. - * @throws { BusinessError } 5400105 - Service died. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - stopRecording(): Promise; - -@@ -8696,7 +9084,8 @@ declare namespace media { - * @throws { BusinessError } 5400103 - IO error. Return by promise. - * @throws { BusinessError } 5400105 - Service died. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - skipPrivacyMode(windowIDs: Array): Promise; - -@@ -8707,7 +9096,8 @@ declare namespace media { - * @throws { BusinessError } 5400103 - IO error. Return by promise. - * @throws { BusinessError } 5400105 - Service died. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setMicEnabled(enable: boolean): Promise; - -@@ -8735,16 +9125,15 @@ declare namespace media { - /** - * Listens for AVScreenCaptureRecord info callback. - * @param { 'error' } type - Type of the AVScreenCaptureRecord event to listen for. -- * @param { ErrorCallback } callback - Callback used to listen for the AVScreenCaptureRecord error return. -+ * @param { ErrorCallback } callback - Callback used to listen for the AVScreenCaptureRecord error return. - * @throws { BusinessError } 201 - permission denied. - * @throws { BusinessError } 5400103 - IO error. Return by ErrorCallback. - * @throws { BusinessError } 5400105 - Service died. Return by ErrorCallback. - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 -- * @permission - */ -- on(type: 'error', callback: ErrorCallback): void; -+ on(type: 'error', callback: ErrorCallback): void; - - /** - * Unregister listens for AVScreenCaptureRecord info callback. -@@ -8759,12 +9148,12 @@ declare namespace media { - /** - * Unregister listens for AVScreenCaptureRecord error callback. - * @param { 'error' } type - Type of the AVScreenCaptureRecord event to listen for. -- * @param { ErrorCallback } callback - Callback used to listen for the AVScreenCaptureRecord error return. -+ * @param { ErrorCallback } callback - Callback used to listen for the AVScreenCaptureRecord error return. - * @syscap SystemCapability.Multimedia.Media.AVScreenCapture - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- off(type: 'error', callback?: ErrorCallback): void; -+ off(type: 'error', callback?: ErrorCallback): void; - } - - /** -@@ -8778,12 +9167,12 @@ declare namespace media { - interface AVTranscoderConfig { - /** - * Indicates the audio bitrate. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVTranscoder - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- audioBitrate?: int; -+ audioBitrate?: number; - - /** - * Indicates the audio encoding format. -@@ -8805,12 +9194,12 @@ declare namespace media { - - /** - * Indicates the video bitrate. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVTranscoder - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- videoBitrate?: int; -+ videoBitrate?: number; - - /** - * Indicates the video encoding foramt. -@@ -8823,21 +9212,21 @@ declare namespace media { - - /** - * Indicates the video width. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVTranscoder - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- videoFrameWidth?: int; -+ videoFrameWidth?: number; - - /** - * Indicates the video height. -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.AVTranscoder - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- videoFrameHeight?: int; -+ videoFrameHeight?: number; - } - - /** -@@ -8864,7 +9253,8 @@ declare namespace media { - * Destination media file descriptor. Mainstream media formats are supported. - * @type { number } - * @syscap SystemCapability.Multimedia.Media.AVTranscoder -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - fdDst: number; - -@@ -8889,7 +9279,8 @@ declare namespace media { - * @throws { BusinessError } 5400103 - IO error. Return by promise. - * @throws { BusinessError } 5400105 - Service died. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVTranscoder -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - start(): Promise; - -@@ -8912,7 +9303,8 @@ declare namespace media { - * @throws { BusinessError } 5400103 - IO error. Return by promise. - * @throws { BusinessError } 5400105 - Service died. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVTranscoder -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - resume(): Promise; - -@@ -8923,7 +9315,8 @@ declare namespace media { - * @throws { BusinessError } 5400103 - IO error. Return by promise. - * @throws { BusinessError } 5400105 - Service died. Return by promise. - * @syscap SystemCapability.Multimedia.Media.AVTranscoder -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - cancel(): Promise; - -@@ -8951,7 +9344,7 @@ declare namespace media { - /** - * Register listener for trancoding error event. - * @param { 'error' } type - Type of the event to listen for. -- * @param { ErrorCallback } callback - Callback used to listen for the error event. -+ * @param { ErrorCallback } callback - Callback used to listen for the error event. - * @throws { BusinessError } 401 - The parameter check failed. - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 5400101 - No memory. -@@ -8964,17 +9357,17 @@ declare namespace media { - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- on(type:'error', callback: ErrorCallback):void; -+ on(type:'error', callback: ErrorCallback):void; - - /** - * Register listener for trancoding progressUpdate event. - * @param { 'progressUpdate' } type - Type of the event to listen for. -- * @param { Callback } callback - Callback used to listen for the progressUpdate event. -+ * @param { Callback } callback - Callback used to listen for the progressUpdate event. - * @syscap SystemCapability.Multimedia.Media.AVTranscoder - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- on(type:'progressUpdate', callback: Callback):void; -+ on(type:'progressUpdate', callback: Callback):void; - - /** - * Unregister listener for trancoding complete event. -@@ -8989,22 +9382,22 @@ declare namespace media { - /** - * Unregister listener for trancoding error event. - * @param { 'error' } type - Type of the event to listen for. -- * @param { ErrorCallback } [callback] - Callback used to listen for the error event. -+ * @param { ErrorCallback } [callback] - Callback used to listen for the error event. - * @syscap SystemCapability.Multimedia.Media.AVTranscoder - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- off(type:'error', callback?: ErrorCallback):void; -+ off(type:'error', callback?: ErrorCallback):void; - - /** - * Unregister listener for trancoding progressUpdate event. - * @param { 'progressUpdate' } type - Type of the event to listen for. -- * @param { Callback } [callback] - Callback used to listen for the progressUpdate event. -+ * @param { Callback } [callback] - Callback used to listen for the progressUpdate event. - * @syscap SystemCapability.Multimedia.Media.AVTranscoder - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ -- off(type:'progressUpdate', callback?: Callback):void; -+ off(type:'progressUpdate', callback?: Callback):void; - } - - /** -diff --git a/api/@ohos.multimodalAwareness.roomLocation.d.ts b/api/@ohos.multimodalAwareness.roomLocation.d.ts -new file mode 100644 -index 000000000..c7742f91c ---- /dev/null -+++ b/api/@ohos.multimodalAwareness.roomLocation.d.ts -@@ -0,0 +1,122 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+/** -+ * @file -+ * @kit MultimodalAwarenessKit -+ */ -+ -+import type { Callback } from './@ohos.base'; -+ -+/** -+ * This module provides the capability to subscribe to report the room location result. -+ * @namespace roomLocation -+ * @syscap SystemCapability.MultimodalAwareness.RoomLocation -+ * @systemapi -+ * @since 20 -+ * @arkts 1.1&1.2 -+ */ -+declare namespace roomLocation { -+ /** -+ * Interface for room location result -+ * @interface RoomLocateResponse -+ * @syscap SystemCapability.MultimodalAwareness.RoomLocation -+ * @systemapi -+ * @since 20 -+ * @arkts 1.1&1.2 -+ */ -+ interface RoomLocateResponse { -+ /** -+ * indicates roomId -+ * @type { string } -+ * @syscap SystemCapability.MultimodalAwareness.RoomLocation -+ * @systemapi -+ * @since 20 -+ * @arkts 1.1&1.2 -+ */ -+ roomId: string; -+ /** -+ * indicates errorCode -+ * @type { int } -+ * @syscap SystemCapability.MultimodalAwareness.RoomLocation -+ * @systemapi -+ * @since 20 -+ * @arkts 1.1&1.2 -+ */ -+ errorCode: int; -+ } -+ -+ /** -+ * Subscribe to room-level location result data. -+ * @param { 'onRoomLocated' } type - Indicates the event type. -+ * @param { Callback } callback - Callback location result data. -+ * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. -+ * @throws { BusinessError } 801 - Capability not supported. Function can not work correctly due to -+ * limited device capabilities. -+ * @throws { BusinessError } 33800001 - Service exception. -+ * @throws { BusinessError } 33800002 - Subscription failed. -+ * @syscap SystemCapability.MultimodalAwareness.RoomLocation -+ * @systemapi -+ * @since 20 -+ * @arkts 1.1&1.2 -+ */ -+ function on(type: 'onRoomLocated', callback: Callback): void; -+ -+ /** -+ * Unsubscribe to room-level location result data. -+ * @param { 'onRoomLocated' } type - Indicates the event type. -+ * @param { Callback } [callback] - Callback location result data. -+ * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. -+ * @throws { BusinessError } 801 - Capability not supported. Function can not work correctly due to -+ * limited device capabilities. -+ * @throws { BusinessError } 33800001 - Service exception. -+ * @throws { BusinessError } 33800003 - Unsubscription failed. -+ * @syscap SystemCapability.MultimodalAwareness.RoomLocation -+ * @systemapi -+ * @since 20 -+ * @arkts 1.1&1.2 -+ */ -+ function off(type: 'onRoomLocated', callback?: Callback): void; -+ -+ /** -+ * Get room-level location result data. -+ * @returns { RoomLocateResponse } - Result of room-level location. -+ * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. -+ * @throws { BusinessError } 801 - Capability not supported. Function can not work correctly due to -+ * limited device capabilities. -+ * @throws { BusinessError } 33800005 - Failed to obtain room-level location information. -+ * @syscap SystemCapability.MultimodalAwareness.RoomLocation -+ * @systemapi -+ * @since 20 -+ * @arkts 1.1&1.2 -+ */ -+ function getRoomLocationResult(): RoomLocateResponse; -+ -+ /** -+ * Set devices informations. -+ * @param { string } deviceInfos - Device informations. -+ * @returns { Promise } - Result of setting information. -+ * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. -+ * @throws { BusinessError } 801 - Capability not supported. Function can not work correctly due to -+ * limited device capabilities. -+ * @throws { BusinessError } 33800004 - Failed to set device information. -+ * @syscap SystemCapability.MultimodalAwareness.RoomLocation -+ * @systemapi -+ * @since 20 -+ * @arkts 1.1&1.2 -+ */ -+ function setDeviceInfos(deviceInfos: string): Promise; -+} -+export default roomLocation; -diff --git a/api/@ohos.multimodalInput.gestureEvent.d.ts b/api/@ohos.multimodalInput.gestureEvent.d.ts -index 254168695..d492d4604 100644 ---- a/api/@ohos.multimodalInput.gestureEvent.d.ts -+++ b/api/@ohos.multimodalInput.gestureEvent.d.ts -@@ -42,12 +42,12 @@ export declare interface Pinch { - - /** - * scale -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- scale: number; -+ scale: double; - } - - /** -@@ -72,12 +72,12 @@ export declare interface Rotate { - /** - * Rotate angle - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- angle: number; -+ angle: double; - } - - /** -@@ -100,21 +100,21 @@ export declare interface ThreeFingersSwipe { - - /** - * Coordinate x -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- x: number; -+ x: int; - - /** - * Coordinate y -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- y: number; -+ y: int; - } - - /** -@@ -137,21 +137,21 @@ export declare interface FourFingersSwipe { - - /** - * Coordinate x -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- x: number; -+ x: int; - - /** - * Coordinate y -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- y: number; -+ y: int; - } - - /** -@@ -176,23 +176,23 @@ export declare interface SwipeInward { - - /** - * Coordinate x -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @systemapi hide for inner use - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- x: number; -+ x: int; - - /** - * Coordinate y -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @systemapi hide for inner use - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- y: number; -+ y: int; - } - - /** -diff --git a/api/@ohos.multimodalInput.inputConsumer.d.ts b/api/@ohos.multimodalInput.inputConsumer.d.ts -index f1365af07..1762f29ca 100644 ---- a/api/@ohos.multimodalInput.inputConsumer.d.ts -+++ b/api/@ohos.multimodalInput.inputConsumer.d.ts -@@ -43,24 +43,24 @@ declare namespace inputConsumer { - /** - * The pre-keys that want to subscribe or unsubscribe. - * -- * @type { Array } -+ * @type { Array } - * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @systemapi hide for inner use - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- preKeys: Array; -+ preKeys: Array; - - /** - * The post position key that want to subscribe or unsubscribe. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @systemapi hide for inner use - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- finalKey: number; -+ finalKey: int; - - /** - * The final key press down or up. -@@ -76,13 +76,13 @@ declare namespace inputConsumer { - /** - * Duration of final key press. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.InputConsumer - * @systemapi hide for inner use - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- finalKeyDownDuration: number; -+ finalKeyDownDuration: int; - - /** - * Whether to report repeated key events. By default, the value is true if it is left unspecified. -@@ -101,33 +101,37 @@ declare namespace inputConsumer { - * - * @typedef HotkeyOptions - * @syscap SystemCapability.MultimodalInput.Input.InputConsumer -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface HotkeyOptions { - /** - * Defines modifier keys. One or two modifier keys are supported. - * -- * @type { Array } -+ * @type { Array } - * @syscap SystemCapability.MultimodalInput.Input.InputConsumer -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- preKeys: Array; -+ preKeys: Array; - - /** - * Defines modified keys. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.InputConsumer -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- finalKey: number; -+ finalKey: int; - - /** - * Whether to report repeated key events. By default, the value is true if it is left unspecified. - * - * @type { ?boolean } - * @syscap SystemCapability.MultimodalInput.Input.InputConsumer -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isRepeat?: boolean; - } -@@ -137,34 +141,38 @@ declare namespace inputConsumer { - * - * @typedef KeyPressedConfig - * @syscap SystemCapability.MultimodalInput.Input.InputConsumer -- * @since 16 -+ * @since arkts {'1.1':'16', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface KeyPressedConfig { - /** - * Key value. Currently listening is supported only for KEYCODE_VOLUME_UP and KEYCODE_VOLUME_DOWN keys. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.InputConsumer -- * @since 16 -+ * @since arkts {'1.1':'16', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- key: number; -+ key: int; - - /** - * Key event type. The value 1 indicates key press and the value 2 indicates key release. Currently - * listening is supported only for key press events. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.InputConsumer -- * @since 16 -+ * @since arkts {'1.1':'16', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- action: number; -+ action: int; - - /** - * Whether to report repeated key events. - * - * @type { boolean } - * @syscap SystemCapability.MultimodalInput.Input.InputConsumer -- * @since 16 -+ * @since arkts {'1.1':'16', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isRepeat: boolean; - } -@@ -299,7 +307,8 @@ declare namespace inputConsumer { - * @throws { BusinessError } 4200002 - The hotkey has been used by the system. - * @throws { BusinessError } 4200003 - The hotkey has been subscribed to by another. - * @syscap SystemCapability.MultimodalInput.Input.InputConsumer -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'hotkeyChange', hotkeyOptions: HotkeyOptions, callback: Callback): void; - -@@ -313,7 +322,8 @@ declare namespace inputConsumer { - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.MultimodalInput.Input.InputConsumer -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'hotkeyChange', hotkeyOptions: HotkeyOptions, callback?: Callback): void; - -@@ -328,7 +338,8 @@ declare namespace inputConsumer { - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.MultimodalInput.Input.InputConsumer -- * @since 16 -+ * @since arkts {'1.1':'16', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'keyPressed', options: KeyPressedConfig, callback: Callback): void; - -@@ -341,7 +352,8 @@ declare namespace inputConsumer { - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.MultimodalInput.Input.InputConsumer -- * @since 16 -+ * @since arkts {'1.1':'16', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'keyPressed', callback?: Callback): void; - } -diff --git a/api/@ohos.multimodalInput.inputDevice.d.ts b/api/@ohos.multimodalInput.inputDevice.d.ts -index cd08ee76e..4d9b4ad06 100644 ---- a/api/@ohos.multimodalInput.inputDevice.d.ts -+++ b/api/@ohos.multimodalInput.inputDevice.d.ts -@@ -24,7 +24,6 @@ import type { KeyCode } from './@ohos.multimodalInput.keyCode'; - /*** endif */ - /*** if arkts 1.2 */ - import { Callback, AsyncCallback } from './@ohos.base'; --import { KeyCode } from './@ohos.multimodalInput.keyCode'; - /*** endif */ - - /** -@@ -175,12 +174,12 @@ declare namespace inputDevice { - /** - * ID of the input device for the reported input device event. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.InputDevice - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- deviceId: number; -+ deviceId: int; - } - - /** -@@ -243,52 +242,52 @@ declare namespace inputDevice { - /** - * Maximum value of the data reported on this axis. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.InputDevice - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- max: number; -+ max: int; - - /** - * Minimum value of the data reported on this axis. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.InputDevice - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- min: number; -+ min: int; - - /** - * Fuzz value of the data reported on this axis. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.InputDevice - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- fuzz: number; -+ fuzz: int; - - /** - * Flat value of the data reported on this axis. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.InputDevice - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- flat: number; -+ flat: int; - - /** - * Resolution value of the data reported on this axis. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.InputDevice - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- resolution: number; -+ resolution: int; - } - - /** -@@ -303,12 +302,12 @@ declare namespace inputDevice { - /** - * Id of the input device. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.InputDevice - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- id: number; -+ id: int; - - /** - * Name of the input device. -@@ -344,42 +343,42 @@ declare namespace inputDevice { - /** - * Bus of the input device. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.InputDevice - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- bus: number; -+ bus: int; - - /** - * Product of the input device. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.InputDevice - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- product: number; -+ product: int; - - /** - * Vendor of the input device. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.InputDevice - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- vendor: number; -+ vendor: int; - - /** - * Version of the input device. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.InputDevice - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- version: number; -+ version: int; - - /** - * Physical path of the input device. -diff --git a/api/@ohos.multimodalInput.inputDeviceCooperate.d.ts b/api/@ohos.multimodalInput.inputDeviceCooperate.d.ts -index b0ae78993..e6270c465 100644 ---- a/api/@ohos.multimodalInput.inputDeviceCooperate.d.ts -+++ b/api/@ohos.multimodalInput.inputDeviceCooperate.d.ts -@@ -28,7 +28,6 @@ import { AsyncCallback } from "./@ohos.base"; - * @since 9 - */ - -- - declare namespace inputDeviceCooperate { - /** - * Enumerates mouse traversal events. -diff --git a/api/@ohos.multimodalInput.inputEvent.d.ts b/api/@ohos.multimodalInput.inputEvent.d.ts -index aff223e52..784ef1f92 100644 ---- a/api/@ohos.multimodalInput.inputEvent.d.ts -+++ b/api/@ohos.multimodalInput.inputEvent.d.ts -@@ -23,8 +23,7 @@ - * - * @interface InputEvent - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * InputEvent -@@ -40,84 +39,79 @@ export declare interface InputEvent { - * Unique event ID generated by the server - * @type { number } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Unique event ID generated by the server -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- id: number; -+ id: int; - - /** - * ID of the device that reports the input event - * @type { number } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * ID of the device that reports the input event -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- deviceId: number; -+ deviceId: int; - - /** - * Occurrence time of the input event - * @type { number } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Occurrence time of the input event -- * @type { number } -+ * @type { long } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- actionTime: number; -+ actionTime: long; - - /** - * ID of the target screen - * @type { number } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * ID of the target screen -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- screenId: number; -+ screenId: int; - - /** - * ID of the target window - * @type { number } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * ID of the target window -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- windowId: number; -+ windowId: int; - } -\ No newline at end of file -diff --git a/api/@ohos.multimodalInput.inputEventClient.d.ts b/api/@ohos.multimodalInput.inputEventClient.d.ts -index fc4b4d181..ed7486904 100644 ---- a/api/@ohos.multimodalInput.inputEventClient.d.ts -+++ b/api/@ohos.multimodalInput.inputEventClient.d.ts -@@ -101,7 +101,8 @@ declare namespace inputEventClient { - * @interface TouchEventData - * @syscap SystemCapability.MultimodalInput.Input.InputSimulator - * @systemapi hide for inner use -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface TouchEventData { - /** -@@ -110,7 +111,8 @@ declare namespace inputEventClient { - * @type { TouchEvent } - * @syscap SystemCapability.MultimodalInput.Input.InputSimulator - * @systemapi hide for inner use -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - touchEvent: TouchEvent; - } -diff --git a/api/@ohos.multimodalInput.inputMonitor.d.ts b/api/@ohos.multimodalInput.inputMonitor.d.ts -index e0ddd4572..cfaff18a1 100644 ---- a/api/@ohos.multimodalInput.inputMonitor.d.ts -+++ b/api/@ohos.multimodalInput.inputMonitor.d.ts -@@ -45,7 +45,8 @@ declare namespace inputMonitor { - * @interface TouchEventReceiver - * @syscap SystemCapability.MultimodalInput.Input.InputMonitor - * @systemapi hide for inner use -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface TouchEventReceiver { - /** -diff --git a/api/@ohos.multimodalInput.intentionCode.d.ets b/api/@ohos.multimodalInput.intentionCode.d.ets -deleted file mode 100644 -index 7625a5d19..000000000 ---- a/api/@ohos.multimodalInput.intentionCode.d.ets -+++ /dev/null -@@ -1,246 +0,0 @@ --/* -- * Copyright (c) 2023 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS; -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --/** -- * @file -- * @kit InputKit -- */ -- --/** -- * IntentionCode -- * -- * @enum { number } -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 20 -- */ --/** -- * IntentionCode -- * -- * @enum { number } -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @atomicservice -- * @since 20 -- */ --export declare enum IntentionCode { -- /** -- * INTENTION_UNKNOWN -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 20 -- */ -- /** -- * INTENTION_UNKNOWN -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @atomicservice -- * @since 20 -- */ -- INTENTION_UNKNOWN = -1, -- -- /** -- * INTENTION_UP -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 20 -- */ -- /** -- * INTENTION_UP -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @atomicservice -- * @since 20 -- */ -- INTENTION_UP = 1, -- -- /** -- * INTENTION_DOWN -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 20 -- */ -- /** -- * INTENTION_DOWN -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @atomicservice -- * @since 20 -- */ -- INTENTION_DOWN = 2, -- -- /** -- * INTENTION_LEFT -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 20 -- */ -- /** -- * INTENTION_LEFT -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @atomicservice -- * @since 20 -- */ -- INTENTION_LEFT = 3, -- -- /** -- * INTENTION_RIGHT -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 20 -- */ -- /** -- * INTENTION_RIGHT -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @atomicservice -- * @since 20 -- */ -- INTENTION_RIGHT = 4, -- -- /** -- * INTENTION_SELECT -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 20 -- */ -- /** -- * INTENTION_SELECT -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @atomicservice -- * @since 20 -- */ -- INTENTION_SELECT = 5, -- -- /** -- * INTENTION_ESCAPE -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 20 -- */ -- /** -- * INTENTION_ESCAPE -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @atomicservice -- * @since 20 -- */ -- INTENTION_ESCAPE = 6, -- -- /** -- * INTENTION_BACK -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 20 -- */ -- /** -- * INTENTION_BACK -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @atomicservice -- * @since 20 -- */ -- INTENTION_BACK = 7, -- -- /** -- * INTENTION_FORWARD -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 20 -- */ -- /** -- * INTENTION_FORWARD -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @atomicservice -- * @since 20 -- */ -- INTENTION_FORWARD = 8, -- -- /** -- * INTENTION_MENU -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 20 -- */ -- /** -- * INTENTION_MENU -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @atomicservice -- * @since 20 -- */ -- INTENTION_MENU = 9, -- -- /** -- * INTENTION_PAGE_UP -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 20 -- */ -- /** -- * INTENTION_PAGE_UP -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @atomicservice -- * @since 20 -- */ -- INTENTION_PAGE_UP = 11, -- -- /** -- * INTENTION_PAGE_DOWN -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 20 -- */ -- /** -- * INTENTION_PAGE_DOWN -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @atomicservice -- * @since 20 -- */ -- INTENTION_PAGE_DOWN = 12, -- -- /** -- * INTENTION_ZOOM_OUT -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 20 -- */ -- /** -- * INTENTION_ZOOM_OUT -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @atomicservice -- * @since 20 -- */ -- INTENTION_ZOOM_OUT = 13, -- -- /** -- * INTENTION_ZOOM_IN -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 20 -- */ -- /** -- * INTENTION_ZOOM_IN -- * -- * @syscap SystemCapability.MultimodalInput.Input.Core -- * @atomicservice -- * @since 20 -- */ -- INTENTION_ZOOM_IN = 14 --} -diff --git a/api/@ohos.multimodalInput.intentionCode.d.ts b/api/@ohos.multimodalInput.intentionCode.d.ts -index 79445f8cc..cb47f8ec1 100644 ---- a/api/@ohos.multimodalInput.intentionCode.d.ts -+++ b/api/@ohos.multimodalInput.intentionCode.d.ts -@@ -31,7 +31,8 @@ - * @enum { number } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export declare enum IntentionCode { - /** -@@ -45,7 +46,8 @@ export declare enum IntentionCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INTENTION_UNKNOWN = -1, - -@@ -60,7 +62,8 @@ export declare enum IntentionCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INTENTION_UP = 1, - -@@ -75,7 +78,8 @@ export declare enum IntentionCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INTENTION_DOWN = 2, - -@@ -90,7 +94,8 @@ export declare enum IntentionCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INTENTION_LEFT = 3, - -@@ -105,7 +110,8 @@ export declare enum IntentionCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INTENTION_RIGHT = 4, - -@@ -120,7 +126,8 @@ export declare enum IntentionCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INTENTION_SELECT = 5, - -@@ -135,7 +142,8 @@ export declare enum IntentionCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INTENTION_ESCAPE = 6, - -@@ -150,7 +158,8 @@ export declare enum IntentionCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INTENTION_BACK = 7, - -@@ -165,7 +174,8 @@ export declare enum IntentionCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INTENTION_FORWARD = 8, - -@@ -180,7 +190,8 @@ export declare enum IntentionCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INTENTION_MENU = 9, - -@@ -195,7 +206,8 @@ export declare enum IntentionCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INTENTION_PAGE_UP = 11, - -@@ -210,7 +222,8 @@ export declare enum IntentionCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INTENTION_PAGE_DOWN = 12, - -@@ -225,7 +238,8 @@ export declare enum IntentionCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INTENTION_ZOOM_OUT = 13, - -@@ -240,7 +254,8 @@ export declare enum IntentionCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INTENTION_ZOOM_IN = 14 - } -diff --git a/api/@ohos.multimodalInput.keyCode.d.ts b/api/@ohos.multimodalInput.keyCode.d.ts -index c555f3ff6..6d9a01c1e 100644 ---- a/api/@ohos.multimodalInput.keyCode.d.ts -+++ b/api/@ohos.multimodalInput.keyCode.d.ts -@@ -31,14 +31,16 @@ - * @enum { number } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export declare enum KeyCode { - /** - * KEYCODE_FN - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_FN = 0, - -@@ -46,7 +48,8 @@ export declare enum KeyCode { - * KEYCODE_UNKNOWN - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_UNKNOWN = -1, - -@@ -54,7 +57,8 @@ export declare enum KeyCode { - * KEYCODE_HOME - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_HOME = 1, - -@@ -62,7 +66,8 @@ export declare enum KeyCode { - * KEYCODE_BACK - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BACK = 2, - -@@ -70,7 +75,8 @@ export declare enum KeyCode { - * KEYCODE_SEARCH - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 13 -+ * @since arkts {'1.1':'13', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SEARCH = 9, - -@@ -85,7 +91,8 @@ export declare enum KeyCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MEDIA_PLAY_PAUSE = 10, - -@@ -100,7 +107,8 @@ export declare enum KeyCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MEDIA_STOP = 11, - -@@ -115,7 +123,8 @@ export declare enum KeyCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MEDIA_NEXT = 12, - -@@ -130,7 +139,8 @@ export declare enum KeyCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MEDIA_PREVIOUS = 13, - -@@ -145,7 +155,8 @@ export declare enum KeyCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MEDIA_REWIND = 14, - -@@ -160,7 +171,8 @@ export declare enum KeyCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MEDIA_FAST_FORWARD = 15, - -@@ -168,7 +180,8 @@ export declare enum KeyCode { - * KEYCODE_VOLUME_UP - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_VOLUME_UP = 16, - -@@ -176,7 +189,8 @@ export declare enum KeyCode { - * KEYCODE_VOLUME_DOWN - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_VOLUME_DOWN = 17, - -@@ -184,7 +198,8 @@ export declare enum KeyCode { - * KEYCODE_POWER - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_POWER = 18, - -@@ -192,7 +207,8 @@ export declare enum KeyCode { - * KEYCODE_CAMERA - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_CAMERA = 19, - -@@ -200,7 +216,8 @@ export declare enum KeyCode { - * KEYCODE_VOLUME_MUTE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_VOLUME_MUTE = 22, - -@@ -208,7 +225,8 @@ export declare enum KeyCode { - * KEYCODE_MUTE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MUTE = 23, - -@@ -216,7 +234,8 @@ export declare enum KeyCode { - * KEYCODE_BRIGHTNESS_UP - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BRIGHTNESS_UP = 40, - -@@ -224,7 +243,8 @@ export declare enum KeyCode { - * KEYCODE_BRIGHTNESS_DOWN - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BRIGHTNESS_DOWN = 41, - -@@ -232,7 +252,8 @@ export declare enum KeyCode { - * KEYCODE_0 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_0 = 2000, - -@@ -240,7 +261,8 @@ export declare enum KeyCode { - * KEYCODE_1 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_1 = 2001, - -@@ -248,7 +270,8 @@ export declare enum KeyCode { - * KEYCODE_2 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_2 = 2002, - -@@ -256,7 +279,8 @@ export declare enum KeyCode { - * KEYCODE_3 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_3 = 2003, - -@@ -264,7 +288,8 @@ export declare enum KeyCode { - * KEYCODE_4 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_4 = 2004, - -@@ -272,7 +297,8 @@ export declare enum KeyCode { - * KEYCODE_5 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_5 = 2005, - -@@ -280,7 +306,8 @@ export declare enum KeyCode { - * KEYCODE_6 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_6 = 2006, - -@@ -288,7 +315,8 @@ export declare enum KeyCode { - * KEYCODE_7 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_7 = 2007, - -@@ -296,7 +324,8 @@ export declare enum KeyCode { - * KEYCODE_8 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_8 = 2008, - -@@ -304,7 +333,8 @@ export declare enum KeyCode { - * KEYCODE_9 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_9 = 2009, - -@@ -312,7 +342,8 @@ export declare enum KeyCode { - * KEYCODE_STAR - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_STAR = 2010, - -@@ -320,7 +351,8 @@ export declare enum KeyCode { - * KEYCODE_POUND - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_POUND = 2011, - -@@ -328,7 +360,8 @@ export declare enum KeyCode { - * KEYCODE_DPAD_UP - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_DPAD_UP = 2012, - -@@ -336,7 +369,8 @@ export declare enum KeyCode { - * KEYCODE_DPAD_DOWN - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_DPAD_DOWN = 2013, - -@@ -344,7 +378,8 @@ export declare enum KeyCode { - * KEYCODE_DPAD_LEFT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_DPAD_LEFT = 2014, - -@@ -352,7 +387,8 @@ export declare enum KeyCode { - * KEYCODE_DPAD_RIGHT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_DPAD_RIGHT = 2015, - -@@ -360,7 +396,8 @@ export declare enum KeyCode { - * KEYCODE_DPAD_CENTER - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_DPAD_CENTER = 2016, - -@@ -368,7 +405,8 @@ export declare enum KeyCode { - * KEYCODE_A - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_A = 2017, - -@@ -376,7 +414,8 @@ export declare enum KeyCode { - * KEYCODE_B - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_B = 2018, - -@@ -384,7 +423,8 @@ export declare enum KeyCode { - * KEYCODE_C - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_C = 2019, - -@@ -392,7 +432,8 @@ export declare enum KeyCode { - * KEYCODE_D - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_D = 2020, - -@@ -400,7 +441,8 @@ export declare enum KeyCode { - * KEYCODE_E - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_E = 2021, - -@@ -408,7 +450,8 @@ export declare enum KeyCode { - * KEYCODE_F - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F = 2022, - -@@ -416,7 +459,8 @@ export declare enum KeyCode { - * KEYCODE_G - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_G = 2023, - -@@ -424,7 +468,8 @@ export declare enum KeyCode { - * KEYCODE_H - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_H = 2024, - -@@ -432,7 +477,8 @@ export declare enum KeyCode { - * KEYCODE_I - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_I = 2025, - -@@ -440,7 +486,8 @@ export declare enum KeyCode { - * KEYCODE_J - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_J = 2026, - -@@ -448,7 +495,8 @@ export declare enum KeyCode { - * KEYCODE_K - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_K = 2027, - -@@ -456,7 +504,8 @@ export declare enum KeyCode { - * KEYCODE_L - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_L = 2028, - -@@ -464,7 +513,8 @@ export declare enum KeyCode { - * KEYCODE_M - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_M = 2029, - -@@ -472,7 +522,8 @@ export declare enum KeyCode { - * KEYCODE_N - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_N = 2030, - -@@ -480,7 +531,8 @@ export declare enum KeyCode { - * KEYCODE_O - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_O = 2031, - -@@ -488,7 +540,8 @@ export declare enum KeyCode { - * KEYCODE_P - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_P = 2032, - -@@ -496,7 +549,8 @@ export declare enum KeyCode { - * KEYCODE_Q - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_Q = 2033, - -@@ -504,7 +558,8 @@ export declare enum KeyCode { - * KEYCODE_R - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_R = 2034, - -@@ -512,7 +567,8 @@ export declare enum KeyCode { - * KEYCODE_S - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_S = 2035, - -@@ -520,7 +576,8 @@ export declare enum KeyCode { - * KEYCODE_T - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_T = 2036, - -@@ -528,7 +585,8 @@ export declare enum KeyCode { - * KEYCODE_U - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_U = 2037, - -@@ -536,7 +594,8 @@ export declare enum KeyCode { - * KEYCODE_V - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_V = 2038, - -@@ -544,7 +603,8 @@ export declare enum KeyCode { - * KEYCODE_W - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_W = 2039, - -@@ -552,7 +612,8 @@ export declare enum KeyCode { - * KEYCODE_X - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_X = 2040, - -@@ -560,7 +621,8 @@ export declare enum KeyCode { - * KEYCODE_Y - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_Y = 2041, - -@@ -568,7 +630,8 @@ export declare enum KeyCode { - * KEYCODE_Z - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_Z = 2042, - -@@ -576,7 +639,8 @@ export declare enum KeyCode { - * KEYCODE_COMMA - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_COMMA = 2043, - -@@ -584,7 +648,8 @@ export declare enum KeyCode { - * KEYCODE_PERIOD - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_PERIOD = 2044, - -@@ -592,7 +657,8 @@ export declare enum KeyCode { - * KEYCODE_ALT_LEFT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_ALT_LEFT = 2045, - -@@ -600,7 +666,8 @@ export declare enum KeyCode { - * KEYCODE_ALT_RIGHT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_ALT_RIGHT = 2046, - -@@ -608,7 +675,8 @@ export declare enum KeyCode { - * KEYCODE_SHIFT_LEFT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SHIFT_LEFT = 2047, - -@@ -616,7 +684,8 @@ export declare enum KeyCode { - * KEYCODE_SHIFT_RIGHT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SHIFT_RIGHT = 2048, - -@@ -624,7 +693,8 @@ export declare enum KeyCode { - * KEYCODE_TAB - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_TAB = 2049, - -@@ -632,7 +702,8 @@ export declare enum KeyCode { - * KEYCODE_SPACE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SPACE = 2050, - -@@ -640,7 +711,8 @@ export declare enum KeyCode { - * KEYCODE_SYM - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SYM = 2051, - -@@ -648,7 +720,8 @@ export declare enum KeyCode { - * KEYCODE_EXPLORER - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_EXPLORER = 2052, - -@@ -656,7 +729,8 @@ export declare enum KeyCode { - * KEYCODE_ENVELOPE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_ENVELOPE = 2053, - -@@ -664,7 +738,8 @@ export declare enum KeyCode { - * KEYCODE_ENTER - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_ENTER = 2054, - -@@ -672,7 +747,8 @@ export declare enum KeyCode { - * KEYCODE_DEL - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_DEL = 2055, - -@@ -680,7 +756,8 @@ export declare enum KeyCode { - * KEYCODE_GRAVE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_GRAVE = 2056, - -@@ -688,7 +765,8 @@ export declare enum KeyCode { - * KEYCODE_MINUS - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MINUS = 2057, - -@@ -696,7 +774,8 @@ export declare enum KeyCode { - * KEYCODE_EQUALS - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_EQUALS = 2058, - -@@ -704,7 +783,8 @@ export declare enum KeyCode { - * KEYCODE_LEFT_BRACKET - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_LEFT_BRACKET = 2059, - -@@ -712,7 +792,8 @@ export declare enum KeyCode { - * KEYCODE_RIGHT_BRACKET - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_RIGHT_BRACKET = 2060, - -@@ -720,7 +801,8 @@ export declare enum KeyCode { - * KEYCODE_BACKSLASH - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BACKSLASH = 2061, - -@@ -728,7 +810,8 @@ export declare enum KeyCode { - * KEYCODE_SEMICOLON - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SEMICOLON = 2062, - -@@ -736,7 +819,8 @@ export declare enum KeyCode { - * KEYCODE_APOSTROPHE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_APOSTROPHE = 2063, - -@@ -744,7 +828,8 @@ export declare enum KeyCode { - * KEYCODE_SLASH - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SLASH = 2064, - -@@ -752,7 +837,8 @@ export declare enum KeyCode { - * KEYCODE_AT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_AT = 2065, - -@@ -760,7 +846,8 @@ export declare enum KeyCode { - * KEYCODE_PLUS - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_PLUS = 2066, - -@@ -768,7 +855,8 @@ export declare enum KeyCode { - * KEYCODE_MENU - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MENU = 2067, - -@@ -776,7 +864,8 @@ export declare enum KeyCode { - * KEYCODE_PAGE_UP - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_PAGE_UP = 2068, - -@@ -784,7 +873,8 @@ export declare enum KeyCode { - * KEYCODE_PAGE_DOWN - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_PAGE_DOWN = 2069, - -@@ -792,7 +882,8 @@ export declare enum KeyCode { - * KEYCODE_ESCAPE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_ESCAPE = 2070, - -@@ -800,7 +891,8 @@ export declare enum KeyCode { - * KEYCODE_FORWARD_DEL - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_FORWARD_DEL = 2071, - -@@ -808,7 +900,8 @@ export declare enum KeyCode { - * KEYCODE_CTRL_LEFT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_CTRL_LEFT = 2072, - -@@ -816,7 +909,8 @@ export declare enum KeyCode { - * KEYCODE_CTRL_RIGHT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_CTRL_RIGHT = 2073, - -@@ -824,7 +918,8 @@ export declare enum KeyCode { - * KEYCODE_CAPS_LOCK - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_CAPS_LOCK = 2074, - -@@ -832,7 +927,8 @@ export declare enum KeyCode { - * KEYCODE_SCROLL_LOCK - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SCROLL_LOCK = 2075, - -@@ -840,7 +936,8 @@ export declare enum KeyCode { - * KEYCODE_META_LEFT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_META_LEFT = 2076, - -@@ -848,7 +945,8 @@ export declare enum KeyCode { - * KEYCODE_META_RIGHT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_META_RIGHT = 2077, - -@@ -856,7 +954,8 @@ export declare enum KeyCode { - * KEYCODE_FUNCTION - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_FUNCTION = 2078, - -@@ -864,7 +963,8 @@ export declare enum KeyCode { - * KEYCODE_SYSRQ - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SYSRQ = 2079, - -@@ -872,7 +972,8 @@ export declare enum KeyCode { - * KEYCODE_BREAK - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BREAK = 2080, - -@@ -880,7 +981,8 @@ export declare enum KeyCode { - * KEYCODE_MOVE_HOME - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MOVE_HOME = 2081, - -@@ -888,7 +990,8 @@ export declare enum KeyCode { - * KEYCODE_MOVE_END - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MOVE_END = 2082, - -@@ -896,7 +999,8 @@ export declare enum KeyCode { - * KEYCODE_INSERT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_INSERT = 2083, - -@@ -904,7 +1008,8 @@ export declare enum KeyCode { - * KEYCODE_FORWARD - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_FORWARD = 2084, - -@@ -919,7 +1024,8 @@ export declare enum KeyCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MEDIA_PLAY = 2085, - -@@ -934,7 +1040,8 @@ export declare enum KeyCode { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MEDIA_PAUSE = 2086, - -@@ -942,7 +1049,8 @@ export declare enum KeyCode { - * KEYCODE_MEDIA_CLOSE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MEDIA_CLOSE = 2087, - -@@ -950,7 +1058,8 @@ export declare enum KeyCode { - * KEYCODE_MEDIA_EJECT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MEDIA_EJECT = 2088, - -@@ -958,7 +1067,8 @@ export declare enum KeyCode { - * KEYCODE_MEDIA_RECORD - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MEDIA_RECORD = 2089, - -@@ -966,7 +1076,8 @@ export declare enum KeyCode { - * KEYCODE_F1 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F1 = 2090, - -@@ -974,7 +1085,8 @@ export declare enum KeyCode { - * KEYCODE_F2 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F2 = 2091, - -@@ -982,7 +1094,8 @@ export declare enum KeyCode { - * KEYCODE_F3 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F3 = 2092, - -@@ -990,7 +1103,8 @@ export declare enum KeyCode { - * KEYCODE_F4 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F4 = 2093, - -@@ -998,7 +1112,8 @@ export declare enum KeyCode { - * KEYCODE_F5 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F5 = 2094, - -@@ -1006,7 +1121,8 @@ export declare enum KeyCode { - * KEYCODE_F6 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F6 = 2095, - -@@ -1014,7 +1130,8 @@ export declare enum KeyCode { - * KEYCODE_F7 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F7 = 2096, - -@@ -1022,7 +1139,8 @@ export declare enum KeyCode { - * KEYCODE_F8 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F8 = 2097, - -@@ -1030,7 +1148,8 @@ export declare enum KeyCode { - * KEYCODE_F9 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F9 = 2098, - -@@ -1038,7 +1157,8 @@ export declare enum KeyCode { - * KEYCODE_F10 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F10 = 2099, - -@@ -1046,7 +1166,8 @@ export declare enum KeyCode { - * KEYCODE_F11 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F11 = 2100, - -@@ -1054,7 +1175,8 @@ export declare enum KeyCode { - * KEYCODE_F12 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F12 = 2101, - -@@ -1062,7 +1184,8 @@ export declare enum KeyCode { - * KEYCODE_NUM_LOCK - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUM_LOCK = 2102, - -@@ -1070,7 +1193,8 @@ export declare enum KeyCode { - * KEYCODE_NUMPAD_0 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUMPAD_0 = 2103, - -@@ -1078,7 +1202,8 @@ export declare enum KeyCode { - * KEYCODE_NUMPAD_1 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUMPAD_1 = 2104, - -@@ -1086,7 +1211,8 @@ export declare enum KeyCode { - * KEYCODE_NUMPAD_2 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUMPAD_2 = 2105, - -@@ -1094,7 +1220,8 @@ export declare enum KeyCode { - * KEYCODE_NUMPAD_3 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUMPAD_3 = 2106, - -@@ -1102,7 +1229,8 @@ export declare enum KeyCode { - * KEYCODE_NUMPAD_4 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUMPAD_4 = 2107, - -@@ -1110,7 +1238,8 @@ export declare enum KeyCode { - * KEYCODE_NUMPAD_5 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUMPAD_5 = 2108, - -@@ -1118,7 +1247,8 @@ export declare enum KeyCode { - * KEYCODE_NUMPAD_6 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUMPAD_6 = 2109, - -@@ -1126,7 +1256,8 @@ export declare enum KeyCode { - * KEYCODE_NUMPAD_7 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUMPAD_7 = 2110, - -@@ -1134,7 +1265,8 @@ export declare enum KeyCode { - * KEYCODE_NUMPAD_8 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUMPAD_8 = 2111, - -@@ -1142,7 +1274,8 @@ export declare enum KeyCode { - * KEYCODE_NUMPAD_9 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUMPAD_9 = 2112, - -@@ -1150,7 +1283,8 @@ export declare enum KeyCode { - * KEYCODE_NUMPAD_DIVIDE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUMPAD_DIVIDE = 2113, - -@@ -1158,7 +1292,8 @@ export declare enum KeyCode { - * KEYCODE_NUMPAD_MULTIPLY - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUMPAD_MULTIPLY = 2114, - -@@ -1166,7 +1301,8 @@ export declare enum KeyCode { - * KEYCODE_NUMPAD_SUBTRACT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUMPAD_SUBTRACT = 2115, - -@@ -1174,7 +1310,8 @@ export declare enum KeyCode { - * KEYCODE_NUMPAD_ADD - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUMPAD_ADD = 2116, - -@@ -1182,7 +1319,8 @@ export declare enum KeyCode { - * KEYCODE_NUMPAD_DOT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUMPAD_DOT = 2117, - -@@ -1190,7 +1328,8 @@ export declare enum KeyCode { - * KEYCODE_NUMPAD_COMMA - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUMPAD_COMMA = 2118, - -@@ -1198,7 +1337,8 @@ export declare enum KeyCode { - * KEYCODE_NUMPAD_ENTER - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUMPAD_ENTER = 2119, - -@@ -1206,7 +1346,8 @@ export declare enum KeyCode { - * KEYCODE_NUMPAD_EQUALS - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUMPAD_EQUALS = 2120, - -@@ -1214,7 +1355,8 @@ export declare enum KeyCode { - * KEYCODE_NUMPAD_LEFT_PAREN - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUMPAD_LEFT_PAREN = 2121, - -@@ -1222,7 +1364,8 @@ export declare enum KeyCode { - * KEYCODE_NUMPAD_RIGHT_PAREN - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUMPAD_RIGHT_PAREN = 2122, - -@@ -1230,7 +1373,8 @@ export declare enum KeyCode { - * KEYCODE_VIRTUAL_MULTITASK - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_VIRTUAL_MULTITASK = 2210, - -@@ -1238,7 +1382,8 @@ export declare enum KeyCode { - * KEYCODE_BUTTON_A - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BUTTON_A = 2301, - -@@ -1246,7 +1391,8 @@ export declare enum KeyCode { - * KEYCODE_BUTTON_B - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BUTTON_B = 2302, - -@@ -1254,7 +1400,8 @@ export declare enum KeyCode { - * KEYCODE_BUTTON_X - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BUTTON_X = 2304, - -@@ -1262,7 +1409,8 @@ export declare enum KeyCode { - * KEYCODE_BUTTON_Y - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BUTTON_Y = 2305, - -@@ -1270,7 +1418,8 @@ export declare enum KeyCode { - * KEYCODE_BUTTON_L1 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BUTTON_L1 = 2307, - -@@ -1278,7 +1427,8 @@ export declare enum KeyCode { - * KEYCODE_BUTTON_R1 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BUTTON_R1 = 2308, - -@@ -1286,7 +1436,8 @@ export declare enum KeyCode { - * KEYCODE_BUTTON_L2 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BUTTON_L2 = 2309, - -@@ -1294,7 +1445,8 @@ export declare enum KeyCode { - * KEYCODE_BUTTON_R2 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BUTTON_R2 = 2310, - -@@ -1302,7 +1454,8 @@ export declare enum KeyCode { - * KEYCODE_BUTTON_SELECT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BUTTON_SELECT = 2311, - -@@ -1310,7 +1463,8 @@ export declare enum KeyCode { - * KEYCODE_BUTTON_START - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BUTTON_START = 2312, - -@@ -1318,7 +1472,8 @@ export declare enum KeyCode { - * KEYCODE_BUTTON_MODE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BUTTON_MODE = 2313, - -@@ -1326,7 +1481,8 @@ export declare enum KeyCode { - * KEYCODE_BUTTON_THUMBL - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BUTTON_THUMBL = 2314, - -@@ -1334,7 +1490,8 @@ export declare enum KeyCode { - * KEYCODE_BUTTON_THUMBR - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BUTTON_THUMBR = 2315, - -@@ -1342,7 +1499,8 @@ export declare enum KeyCode { - * KEYCODE_SLEEP - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SLEEP = 2600, - -@@ -1350,7 +1508,8 @@ export declare enum KeyCode { - * KEYCODE_ZENKAKU_HANKAKU - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_ZENKAKU_HANKAKU = 2601, - -@@ -1358,7 +1517,8 @@ export declare enum KeyCode { - * KEYCODE_102ND - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_102ND = 2602, - -@@ -1366,7 +1526,8 @@ export declare enum KeyCode { - * KEYCODE_RO - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_RO = 2603, - -@@ -1374,7 +1535,8 @@ export declare enum KeyCode { - * KEYCODE_KATAKANA - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_KATAKANA = 2604, - -@@ -1382,7 +1544,8 @@ export declare enum KeyCode { - * KEYCODE_HIRAGANA - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_HIRAGANA = 2605, - -@@ -1390,7 +1553,8 @@ export declare enum KeyCode { - * KEYCODE_HENKAN - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_HENKAN = 2606, - -@@ -1398,7 +1562,8 @@ export declare enum KeyCode { - * KEYCODE_KATAKANA_HIRAGANA - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_KATAKANA_HIRAGANA = 2607, - -@@ -1406,7 +1571,8 @@ export declare enum KeyCode { - * KEYCODE_MUHENKAN - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MUHENKAN = 2608, - -@@ -1414,7 +1580,8 @@ export declare enum KeyCode { - * KEYCODE_LINEFEED - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_LINEFEED = 2609, - -@@ -1422,7 +1589,8 @@ export declare enum KeyCode { - * KEYCODE_MACRO - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MACRO = 2610, - -@@ -1430,7 +1598,8 @@ export declare enum KeyCode { - * KEYCODE_NUMPAD_PLUSMINUS - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NUMPAD_PLUSMINUS = 2611, - -@@ -1438,7 +1607,8 @@ export declare enum KeyCode { - * KEYCODE_SCALE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SCALE = 2612, - -@@ -1446,7 +1616,8 @@ export declare enum KeyCode { - * KEYCODE_HANGUEL - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_HANGUEL = 2613, - -@@ -1454,7 +1625,8 @@ export declare enum KeyCode { - * KEYCODE_HANJA - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_HANJA = 2614, - -@@ -1462,7 +1634,8 @@ export declare enum KeyCode { - * KEYCODE_YEN - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_YEN = 2615, - -@@ -1470,7 +1643,8 @@ export declare enum KeyCode { - * KEYCODE_STOP - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_STOP = 2616, - -@@ -1478,7 +1652,8 @@ export declare enum KeyCode { - * KEYCODE_AGAIN - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_AGAIN = 2617, - -@@ -1486,7 +1661,8 @@ export declare enum KeyCode { - * KEYCODE_PROPS - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_PROPS = 2618, - -@@ -1494,7 +1670,8 @@ export declare enum KeyCode { - * KEYCODE_UNDO - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_UNDO = 2619, - -@@ -1502,7 +1679,8 @@ export declare enum KeyCode { - * KEYCODE_COPY - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_COPY = 2620, - -@@ -1510,7 +1688,8 @@ export declare enum KeyCode { - * KEYCODE_OPEN - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_OPEN = 2621, - -@@ -1518,7 +1697,8 @@ export declare enum KeyCode { - * KEYCODE_PASTE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_PASTE = 2622, - -@@ -1526,7 +1706,8 @@ export declare enum KeyCode { - * KEYCODE_FIND - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_FIND = 2623, - -@@ -1534,7 +1715,8 @@ export declare enum KeyCode { - * KEYCODE_CUT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_CUT = 2624, - -@@ -1542,7 +1724,8 @@ export declare enum KeyCode { - * KEYCODE_HELP - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_HELP = 2625, - -@@ -1550,7 +1733,8 @@ export declare enum KeyCode { - * KEYCODE_CALC - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_CALC = 2626, - -@@ -1558,7 +1742,8 @@ export declare enum KeyCode { - * KEYCODE_FILE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_FILE = 2627, - -@@ -1566,7 +1751,8 @@ export declare enum KeyCode { - * KEYCODE_BOOKMARKS - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BOOKMARKS = 2628, - -@@ -1574,7 +1760,8 @@ export declare enum KeyCode { - * KEYCODE_NEXT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NEXT = 2629, - -@@ -1582,7 +1769,8 @@ export declare enum KeyCode { - * KEYCODE_PLAYPAUSE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_PLAYPAUSE = 2630, - -@@ -1590,7 +1778,8 @@ export declare enum KeyCode { - * KEYCODE_PREVIOUS - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_PREVIOUS = 2631, - -@@ -1598,7 +1787,8 @@ export declare enum KeyCode { - * KEYCODE_STOPCD - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_STOPCD = 2632, - -@@ -1606,7 +1796,8 @@ export declare enum KeyCode { - * KEYCODE_CONFIG - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_CONFIG = 2634, - -@@ -1614,7 +1805,8 @@ export declare enum KeyCode { - * KEYCODE_REFRESH - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_REFRESH = 2635, - -@@ -1622,7 +1814,8 @@ export declare enum KeyCode { - * KEYCODE_EXIT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_EXIT = 2636, - -@@ -1630,7 +1823,8 @@ export declare enum KeyCode { - * KEYCODE_EDIT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_EDIT = 2637, - -@@ -1638,7 +1832,8 @@ export declare enum KeyCode { - * KEYCODE_SCROLLUP - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SCROLLUP = 2638, - -@@ -1646,7 +1841,8 @@ export declare enum KeyCode { - * KEYCODE_SCROLLDOWN - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SCROLLDOWN = 2639, - -@@ -1654,7 +1850,8 @@ export declare enum KeyCode { - * KEYCODE_NEW - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NEW = 2640, - -@@ -1662,7 +1859,8 @@ export declare enum KeyCode { - * KEYCODE_REDO - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_REDO = 2641, - -@@ -1670,7 +1868,8 @@ export declare enum KeyCode { - * KEYCODE_CLOSE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_CLOSE = 2642, - -@@ -1678,7 +1877,8 @@ export declare enum KeyCode { - * KEYCODE_PLAY - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_PLAY = 2643, - -@@ -1686,7 +1886,8 @@ export declare enum KeyCode { - * KEYCODE_BASSBOOST - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BASSBOOST = 2644, - -@@ -1694,7 +1895,8 @@ export declare enum KeyCode { - * KEYCODE_PRINT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_PRINT = 2645, - -@@ -1702,7 +1904,8 @@ export declare enum KeyCode { - * KEYCODE_CHAT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_CHAT = 2646, - -@@ -1710,7 +1913,8 @@ export declare enum KeyCode { - * KEYCODE_FINANCE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_FINANCE = 2647, - -@@ -1718,7 +1922,8 @@ export declare enum KeyCode { - * KEYCODE_CANCEL - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_CANCEL = 2648, - -@@ -1726,7 +1931,8 @@ export declare enum KeyCode { - * KEYCODE_KBDILLUM_TOGGLE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_KBDILLUM_TOGGLE = 2649, - -@@ -1734,7 +1940,8 @@ export declare enum KeyCode { - * KEYCODE_KBDILLUM_DOWN - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_KBDILLUM_DOWN = 2650, - -@@ -1742,7 +1949,8 @@ export declare enum KeyCode { - * KEYCODE_KBDILLUM_UP - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_KBDILLUM_UP = 2651, - -@@ -1750,7 +1958,8 @@ export declare enum KeyCode { - * KEYCODE_SEND - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SEND = 2652, - -@@ -1758,7 +1967,8 @@ export declare enum KeyCode { - * KEYCODE_REPLY - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_REPLY = 2653, - -@@ -1766,7 +1976,8 @@ export declare enum KeyCode { - * KEYCODE_FORWARDMAIL - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_FORWARDMAIL = 2654, - -@@ -1774,7 +1985,8 @@ export declare enum KeyCode { - * KEYCODE_SAVE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SAVE = 2655, - -@@ -1782,7 +1994,8 @@ export declare enum KeyCode { - * KEYCODE_DOCUMENTS - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_DOCUMENTS = 2656, - -@@ -1790,7 +2003,8 @@ export declare enum KeyCode { - * KEYCODE_VIDEO_NEXT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_VIDEO_NEXT = 2657, - -@@ -1798,7 +2012,8 @@ export declare enum KeyCode { - * KEYCODE_VIDEO_PREV - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_VIDEO_PREV = 2658, - -@@ -1806,7 +2021,8 @@ export declare enum KeyCode { - * KEYCODE_BRIGHTNESS_CYCLE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BRIGHTNESS_CYCLE = 2659, - -@@ -1814,7 +2030,8 @@ export declare enum KeyCode { - * KEYCODE_BRIGHTNESS_ZERO - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BRIGHTNESS_ZERO = 2660, - -@@ -1822,7 +2039,8 @@ export declare enum KeyCode { - * KEYCODE_DISPLAY_OFF - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_DISPLAY_OFF = 2661, - -@@ -1830,7 +2048,8 @@ export declare enum KeyCode { - * KEYCODE_BTN_MISC - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BTN_MISC = 2662, - -@@ -1838,7 +2057,8 @@ export declare enum KeyCode { - * KEYCODE_GOTO - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_GOTO = 2663, - -@@ -1846,7 +2066,8 @@ export declare enum KeyCode { - * KEYCODE_INFO - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_INFO = 2664, - -@@ -1854,7 +2075,8 @@ export declare enum KeyCode { - * KEYCODE_PROGRAM - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_PROGRAM = 2665, - -@@ -1862,7 +2084,8 @@ export declare enum KeyCode { - * KEYCODE_PVR - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_PVR = 2666, - -@@ -1870,7 +2093,8 @@ export declare enum KeyCode { - * KEYCODE_SUBTITLE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SUBTITLE = 2667, - -@@ -1878,7 +2102,8 @@ export declare enum KeyCode { - * KEYCODE_FULL_SCREEN - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_FULL_SCREEN = 2668, - -@@ -1886,7 +2111,8 @@ export declare enum KeyCode { - * KEYCODE_KEYBOARD - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_KEYBOARD = 2669, - -@@ -1894,7 +2120,8 @@ export declare enum KeyCode { - * KEYCODE_ASPECT_RATIO - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_ASPECT_RATIO = 2670, - -@@ -1902,7 +2129,8 @@ export declare enum KeyCode { - * KEYCODE_PC - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_PC = 2671, - -@@ -1910,7 +2138,8 @@ export declare enum KeyCode { - * KEYCODE_TV - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_TV = 2672, - -@@ -1918,7 +2147,8 @@ export declare enum KeyCode { - * KEYCODE_TV2 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_TV2 = 2673, - -@@ -1926,7 +2156,8 @@ export declare enum KeyCode { - * KEYCODE_VCR - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_VCR = 2674, - -@@ -1934,7 +2165,8 @@ export declare enum KeyCode { - * KEYCODE_VCR2 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_VCR2 = 2675, - -@@ -1942,7 +2174,8 @@ export declare enum KeyCode { - * KEYCODE_SAT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SAT = 2676, - -@@ -1950,7 +2183,8 @@ export declare enum KeyCode { - * KEYCODE_CD - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_CD = 2677, - -@@ -1958,7 +2192,8 @@ export declare enum KeyCode { - * KEYCODE_TAPE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_TAPE = 2678, - -@@ -1966,7 +2201,8 @@ export declare enum KeyCode { - * KEYCODE_TUNER - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_TUNER = 2679, - -@@ -1974,7 +2210,8 @@ export declare enum KeyCode { - * KEYCODE_PLAYER - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_PLAYER = 2680, - -@@ -1982,7 +2219,8 @@ export declare enum KeyCode { - * KEYCODE_DVD - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_DVD = 2681, - -@@ -1990,7 +2228,8 @@ export declare enum KeyCode { - * KEYCODE_AUDIO - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_AUDIO = 2682, - -@@ -1998,7 +2237,8 @@ export declare enum KeyCode { - * KEYCODE_VIDEO - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_VIDEO = 2683, - -@@ -2006,7 +2246,8 @@ export declare enum KeyCode { - * KEYCODE_MEMO - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MEMO = 2684, - -@@ -2014,7 +2255,8 @@ export declare enum KeyCode { - * KEYCODE_CALENDAR - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_CALENDAR = 2685, - -@@ -2022,7 +2264,8 @@ export declare enum KeyCode { - * KEYCODE_RED - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_RED = 2686, - -@@ -2030,7 +2273,8 @@ export declare enum KeyCode { - * KEYCODE_GREEN - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_GREEN = 2687, - -@@ -2038,7 +2282,8 @@ export declare enum KeyCode { - * KEYCODE_YELLOW - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_YELLOW = 2688, - -@@ -2046,7 +2291,8 @@ export declare enum KeyCode { - * KEYCODE_BLUE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BLUE = 2689, - -@@ -2054,7 +2300,8 @@ export declare enum KeyCode { - * KEYCODE_CHANNELUP - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_CHANNELUP = 2690, - -@@ -2062,7 +2309,8 @@ export declare enum KeyCode { - * KEYCODE_CHANNELDOWN - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_CHANNELDOWN = 2691, - -@@ -2070,7 +2318,8 @@ export declare enum KeyCode { - * KEYCODE_LAST - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_LAST = 2692, - -@@ -2078,7 +2327,8 @@ export declare enum KeyCode { - * KEYCODE_RESTART - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_RESTART = 2693, - -@@ -2086,7 +2336,8 @@ export declare enum KeyCode { - * KEYCODE_SLOW - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SLOW = 2694, - -@@ -2094,7 +2345,8 @@ export declare enum KeyCode { - * KEYCODE_SHUFFLE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SHUFFLE = 2695, - -@@ -2102,7 +2354,8 @@ export declare enum KeyCode { - * KEYCODE_VIDEOPHONE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_VIDEOPHONE = 2696, - -@@ -2110,7 +2363,8 @@ export declare enum KeyCode { - * KEYCODE_GAMES - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_GAMES = 2697, - -@@ -2118,7 +2372,8 @@ export declare enum KeyCode { - * KEYCODE_ZOOMIN - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_ZOOMIN = 2698, - -@@ -2126,7 +2381,8 @@ export declare enum KeyCode { - * KEYCODE_ZOOMOUT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_ZOOMOUT = 2699, - -@@ -2134,7 +2390,8 @@ export declare enum KeyCode { - * KEYCODE_ZOOMRESET - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_ZOOMRESET = 2700, - -@@ -2142,7 +2399,8 @@ export declare enum KeyCode { - * KEYCODE_WORDPROCESSOR - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_WORDPROCESSOR = 2701, - -@@ -2150,7 +2408,8 @@ export declare enum KeyCode { - * KEYCODE_EDITOR - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_EDITOR = 2702, - -@@ -2158,7 +2417,8 @@ export declare enum KeyCode { - * KEYCODE_SPREADSHEET - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SPREADSHEET = 2703, - -@@ -2166,7 +2426,8 @@ export declare enum KeyCode { - * KEYCODE_GRAPHICSEDITOR - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_GRAPHICSEDITOR = 2704, - -@@ -2174,7 +2435,8 @@ export declare enum KeyCode { - * KEYCODE_PRESENTATION - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_PRESENTATION = 2705, - -@@ -2182,7 +2444,8 @@ export declare enum KeyCode { - * KEYCODE_DATABASE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_DATABASE = 2706, - -@@ -2190,7 +2453,8 @@ export declare enum KeyCode { - * KEYCODE_NEWS - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_NEWS = 2707, - -@@ -2198,7 +2462,8 @@ export declare enum KeyCode { - * KEYCODE_VOICEMAIL - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_VOICEMAIL = 2708, - -@@ -2206,7 +2471,8 @@ export declare enum KeyCode { - * KEYCODE_ADDRESSBOOK - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_ADDRESSBOOK = 2709, - -@@ -2214,7 +2480,8 @@ export declare enum KeyCode { - * KEYCODE_MESSENGER - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MESSENGER = 2710, - -@@ -2222,7 +2489,8 @@ export declare enum KeyCode { - * KEYCODE_BRIGHTNESS_TOGGLE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BRIGHTNESS_TOGGLE = 2711, - -@@ -2230,7 +2498,8 @@ export declare enum KeyCode { - * KEYCODE_SPELLCHECK - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SPELLCHECK = 2712, - -@@ -2238,7 +2507,8 @@ export declare enum KeyCode { - * KEYCODE_COFFEE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_COFFEE = 2713, - -@@ -2246,7 +2516,8 @@ export declare enum KeyCode { - * KEYCODE_MEDIA_REPEAT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MEDIA_REPEAT = 2714, - -@@ -2254,7 +2525,8 @@ export declare enum KeyCode { - * KEYCODE_IMAGES - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_IMAGES = 2715, - -@@ -2262,7 +2534,8 @@ export declare enum KeyCode { - * KEYCODE_BUTTONCONFIG - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BUTTONCONFIG = 2716, - -@@ -2270,7 +2543,8 @@ export declare enum KeyCode { - * KEYCODE_TASKMANAGER - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_TASKMANAGER = 2717, - -@@ -2278,7 +2552,8 @@ export declare enum KeyCode { - * KEYCODE_JOURNAL - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_JOURNAL = 2718, - -@@ -2286,7 +2561,8 @@ export declare enum KeyCode { - * KEYCODE_CONTROLPANEL - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_CONTROLPANEL = 2719, - -@@ -2294,7 +2570,8 @@ export declare enum KeyCode { - * KEYCODE_APPSELECT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_APPSELECT = 2720, - -@@ -2302,7 +2579,8 @@ export declare enum KeyCode { - * KEYCODE_SCREENSAVER - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SCREENSAVER = 2721, - -@@ -2310,7 +2588,8 @@ export declare enum KeyCode { - * KEYCODE_ASSISTANT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_ASSISTANT = 2722, - -@@ -2318,7 +2597,8 @@ export declare enum KeyCode { - * KEYCODE_KBD_LAYOUT_NEXT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_KBD_LAYOUT_NEXT = 2723, - -@@ -2326,7 +2606,8 @@ export declare enum KeyCode { - * KEYCODE_BRIGHTNESS_MIN - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BRIGHTNESS_MIN = 2724, - -@@ -2334,7 +2615,8 @@ export declare enum KeyCode { - * KEYCODE_BRIGHTNESS_MAX - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BRIGHTNESS_MAX = 2725, - -@@ -2342,7 +2624,8 @@ export declare enum KeyCode { - * KEYCODE_KBDINPUTASSIST_PREV - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_KBDINPUTASSIST_PREV = 2726, - -@@ -2350,7 +2633,8 @@ export declare enum KeyCode { - * KEYCODE_KBDINPUTASSIST_NEXT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_KBDINPUTASSIST_NEXT = 2727, - -@@ -2358,7 +2642,8 @@ export declare enum KeyCode { - * KEYCODE_KBDINPUTASSIST_PREVGROUP - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_KBDINPUTASSIST_PREVGROUP = 2728, - -@@ -2366,7 +2651,8 @@ export declare enum KeyCode { - * KEYCODE_KBDINPUTASSIST_NEXTGROUP - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_KBDINPUTASSIST_NEXTGROUP = 2729, - -@@ -2374,7 +2660,8 @@ export declare enum KeyCode { - * KEYCODE_KBDINPUTASSIST_ACCEPT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_KBDINPUTASSIST_ACCEPT = 2730, - -@@ -2382,7 +2669,8 @@ export declare enum KeyCode { - * KEYCODE_KBDINPUTASSIST_CANCEL - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_KBDINPUTASSIST_CANCEL = 2731, - -@@ -2390,7 +2678,8 @@ export declare enum KeyCode { - * KEYCODE_FRONT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_FRONT = 2800, - -@@ -2398,7 +2687,8 @@ export declare enum KeyCode { - * KEYCODE_SETUP - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SETUP = 2801, - -@@ -2406,7 +2696,8 @@ export declare enum KeyCode { - * KEYCODE_WAKEUP - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_WAKEUP = 2802, - -@@ -2414,7 +2705,8 @@ export declare enum KeyCode { - * KEYCODE_SENDFILE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SENDFILE = 2803, - -@@ -2422,7 +2714,8 @@ export declare enum KeyCode { - * KEYCODE_DELETEFILE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_DELETEFILE = 2804, - -@@ -2430,7 +2723,8 @@ export declare enum KeyCode { - * KEYCODE_XFER - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_XFER = 2805, - -@@ -2438,7 +2732,8 @@ export declare enum KeyCode { - * KEYCODE_PROG1 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_PROG1 = 2806, - -@@ -2446,7 +2741,8 @@ export declare enum KeyCode { - * KEYCODE_PROG2 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_PROG2 = 2807, - -@@ -2454,7 +2750,8 @@ export declare enum KeyCode { - * KEYCODE_MSDOS - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MSDOS = 2808, - -@@ -2462,7 +2759,8 @@ export declare enum KeyCode { - * KEYCODE_SCREENLOCK - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SCREENLOCK = 2809, - -@@ -2470,7 +2768,8 @@ export declare enum KeyCode { - * KEYCODE_DIRECTION_ROTATE_DISPLAY - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_DIRECTION_ROTATE_DISPLAY = 2810, - -@@ -2478,7 +2777,8 @@ export declare enum KeyCode { - * KEYCODE_CYCLEWINDOWS - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_CYCLEWINDOWS = 2811, - -@@ -2486,7 +2786,8 @@ export declare enum KeyCode { - * KEYCODE_COMPUTER - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_COMPUTER = 2812, - -@@ -2494,7 +2795,8 @@ export declare enum KeyCode { - * KEYCODE_EJECTCLOSECD - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_EJECTCLOSECD = 2813, - -@@ -2502,7 +2804,8 @@ export declare enum KeyCode { - * KEYCODE_ISO - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_ISO = 2814, - -@@ -2510,7 +2813,8 @@ export declare enum KeyCode { - * KEYCODE_MOVE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_MOVE = 2815, - -@@ -2518,7 +2822,8 @@ export declare enum KeyCode { - * KEYCODE_F13 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F13 = 2816, - -@@ -2526,7 +2831,8 @@ export declare enum KeyCode { - * KEYCODE_F14 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F14 = 2817, - -@@ -2534,7 +2840,8 @@ export declare enum KeyCode { - * KEYCODE_F15 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F15 = 2818, - -@@ -2542,7 +2849,8 @@ export declare enum KeyCode { - * KEYCODE_F16 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F16 = 2819, - -@@ -2550,7 +2858,8 @@ export declare enum KeyCode { - * KEYCODE_F17 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F17 = 2820, - -@@ -2558,7 +2867,8 @@ export declare enum KeyCode { - * KEYCODE_F18 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F18 = 2821, - -@@ -2566,7 +2876,8 @@ export declare enum KeyCode { - * KEYCODE_F19 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F19 = 2822, - -@@ -2574,7 +2885,8 @@ export declare enum KeyCode { - * KEYCODE_F20 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F20 = 2823, - -@@ -2582,7 +2894,8 @@ export declare enum KeyCode { - * KEYCODE_F21 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F21 = 2824, - -@@ -2590,7 +2903,8 @@ export declare enum KeyCode { - * KEYCODE_F22 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F22 = 2825, - -@@ -2598,7 +2912,8 @@ export declare enum KeyCode { - * KEYCODE_F23 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F23 = 2826, - -@@ -2606,7 +2921,8 @@ export declare enum KeyCode { - * KEYCODE_F24 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_F24 = 2827, - -@@ -2614,7 +2930,8 @@ export declare enum KeyCode { - * KEYCODE_PROG3 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_PROG3 = 2828, - -@@ -2622,7 +2939,8 @@ export declare enum KeyCode { - * KEYCODE_PROG4 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_PROG4 = 2829, - -@@ -2630,7 +2948,8 @@ export declare enum KeyCode { - * KEYCODE_DASHBOARD - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_DASHBOARD = 2830, - -@@ -2638,7 +2957,8 @@ export declare enum KeyCode { - * KEYCODE_SUSPEND - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SUSPEND = 2831, - -@@ -2646,7 +2966,8 @@ export declare enum KeyCode { - * KEYCODE_HP - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_HP = 2832, - -@@ -2654,7 +2975,8 @@ export declare enum KeyCode { - * KEYCODE_SOUND - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SOUND = 2833, - -@@ -2662,7 +2984,8 @@ export declare enum KeyCode { - * KEYCODE_QUESTION - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_QUESTION = 2834, - -@@ -2670,7 +2993,8 @@ export declare enum KeyCode { - * KEYCODE_CONNECT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_CONNECT = 2836, - -@@ -2678,7 +3002,8 @@ export declare enum KeyCode { - * KEYCODE_SPORT - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SPORT = 2837, - -@@ -2686,7 +3011,8 @@ export declare enum KeyCode { - * KEYCODE_SHOP - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SHOP = 2838, - -@@ -2694,7 +3020,8 @@ export declare enum KeyCode { - * KEYCODE_ALTERASE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_ALTERASE = 2839, - -@@ -2702,7 +3029,8 @@ export declare enum KeyCode { - * KEYCODE_SWITCHVIDEOMODE - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_SWITCHVIDEOMODE = 2841, - -@@ -2710,7 +3038,8 @@ export declare enum KeyCode { - * KEYCODE_BATTERY - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BATTERY = 2842, - -@@ -2718,7 +3047,8 @@ export declare enum KeyCode { - * KEYCODE_BLUETOOTH - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BLUETOOTH = 2843, - -@@ -2726,7 +3056,8 @@ export declare enum KeyCode { - * KEYCODE_WLAN - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_WLAN = 2844, - -@@ -2734,7 +3065,8 @@ export declare enum KeyCode { - * KEYCODE_UWB - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_UWB = 2845, - -@@ -2742,7 +3074,8 @@ export declare enum KeyCode { - * KEYCODE_WWAN_WIMAX - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_WWAN_WIMAX = 2846, - -@@ -2750,7 +3083,8 @@ export declare enum KeyCode { - * KEYCODE_RFKILL - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_RFKILL = 2847, - -@@ -2758,7 +3092,8 @@ export declare enum KeyCode { - * KEYCODE_CHANNEL - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_CHANNEL = 3001, - -@@ -2766,7 +3101,8 @@ export declare enum KeyCode { - * KEYCODE_BTN_0 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BTN_0 = 3100, - -@@ -2774,7 +3110,8 @@ export declare enum KeyCode { - * KEYCODE_BTN_1 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BTN_1 = 3101, - -@@ -2782,7 +3119,8 @@ export declare enum KeyCode { - * KEYCODE_BTN_2 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BTN_2 = 3102, - -@@ -2790,7 +3128,8 @@ export declare enum KeyCode { - * KEYCODE_BTN_3 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BTN_3 = 3103, - -@@ -2798,7 +3137,8 @@ export declare enum KeyCode { - * KEYCODE_BTN_4 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BTN_4 = 3104, - -@@ -2806,7 +3146,8 @@ export declare enum KeyCode { - * KEYCODE_BTN_5 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BTN_5 = 3105, - -@@ -2814,7 +3155,8 @@ export declare enum KeyCode { - * KEYCODE_BTN_6 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BTN_6 = 3106, - -@@ -2822,7 +3164,8 @@ export declare enum KeyCode { - * KEYCODE_BTN_7 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BTN_7 = 3107, - -@@ -2830,7 +3173,8 @@ export declare enum KeyCode { - * KEYCODE_BTN_8 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BTN_8 = 3108, - -@@ -2838,7 +3182,8 @@ export declare enum KeyCode { - * KEYCODE_BTN_9 - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_BTN_9 = 3109, - -@@ -2846,7 +3191,8 @@ export declare enum KeyCode { - * KEYCODE_DAGGER_CLICK - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_DAGGER_CLICK = 3211, - -@@ -2854,7 +3200,8 @@ export declare enum KeyCode { - * KEYCODE_DAGGER_DOUBLE_CLICK - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_DAGGER_DOUBLE_CLICK = 3212, - -@@ -2862,7 +3209,8 @@ export declare enum KeyCode { - * KEYCODE_DAGGER_LONG_PRESS - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYCODE_DAGGER_LONG_PRESS = 3213 - } -diff --git a/api/@ohos.multimodalInput.keyEvent.d.ts b/api/@ohos.multimodalInput.keyEvent.d.ts -index a0a510af1..6d192e104 100644 ---- a/api/@ohos.multimodalInput.keyEvent.d.ts -+++ b/api/@ohos.multimodalInput.keyEvent.d.ts -@@ -18,22 +18,15 @@ - * @kit InputKit - */ - --/*** if arkts 1.1 */ --import type { InputEvent } from './@ohos.multimodalInput.inputEvent'; --import type { KeyCode } from './@ohos.multimodalInput.keyCode'; --/*** endif */ --/*** if arkts 1.2 */ - import { InputEvent } from './@ohos.multimodalInput.inputEvent'; --import { KeyCode } from './@ohos.multimodalInput.keyCode'; --/*** endif */ -+import type { KeyCode } from './@ohos.multimodalInput.keyCode'; - - /** - * Action - * - * @enum { number } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Action -@@ -49,8 +42,7 @@ export declare enum Action { - * Cancel key - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Cancel key -@@ -66,8 +58,7 @@ export declare enum Action { - * Down key - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Down key -@@ -83,8 +74,7 @@ export declare enum Action { - * Up key - * - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Up key -@@ -102,8 +92,7 @@ export declare enum Action { - * - * @interface Key - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Key -@@ -119,8 +108,7 @@ export declare interface Key { - * Key code - * @type { KeyCode } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Key code -@@ -136,35 +124,33 @@ export declare interface Key { - * Time when the key is pressed - * @type { number } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Time when the key is pressed -- * @type { number } -+ * @type { long } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- pressedTime: number; -+ pressedTime: long; - - /** - * Device to which the key belongs - * @type { number } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Device to which the key belongs -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- deviceId: number; -+ deviceId: int; - } - - /** -@@ -172,8 +158,7 @@ export declare interface Key { - * - * @interface KeyEvent - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * KeyEvent -@@ -190,8 +175,7 @@ export declare interface KeyEvent extends InputEvent { - * Key action - * @type { Action } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Key action -@@ -207,8 +191,7 @@ export declare interface KeyEvent extends InputEvent { - * Key that has changed - * @type { Key } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Key that has changed -@@ -224,25 +207,23 @@ export declare interface KeyEvent extends InputEvent { - * Unicode character corresponding to the key - * @type { number } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Unicode character corresponding to the key -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- unicodeChar: number; -+ unicodeChar: int; - - /** - * List of pressed keys - * @type { Key[] } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * List of pressed keys -@@ -258,8 +239,7 @@ export declare interface KeyEvent extends InputEvent { - * Whether ctrlKey is being pressed - * @type { boolean } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Whether ctrlKey is being pressed -@@ -275,8 +255,7 @@ export declare interface KeyEvent extends InputEvent { - * Whether altKey is being pressed - * @type { boolean } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Whether altKey is being pressed -@@ -292,8 +271,7 @@ export declare interface KeyEvent extends InputEvent { - * Whether shiftKey is being pressed - * @type { boolean } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Whether shiftKey is being pressed -@@ -309,8 +287,7 @@ export declare interface KeyEvent extends InputEvent { - * Whether logoKey is being pressed - * @type { boolean } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Whether logoKey is being pressed -@@ -326,8 +303,7 @@ export declare interface KeyEvent extends InputEvent { - * Whether fnKey is being pressed - * @type { boolean } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Whether fnKey is being pressed -@@ -343,8 +319,7 @@ export declare interface KeyEvent extends InputEvent { - * Whether capsLock is active - * @type { boolean } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Whether capsLock is active -@@ -360,8 +335,7 @@ export declare interface KeyEvent extends InputEvent { - * Whether numLock is active - * @type { boolean } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Whether numLock is active -@@ -377,8 +351,7 @@ export declare interface KeyEvent extends InputEvent { - * Whether scrollLock is active - * @type { boolean } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - /** - * Whether scrollLock is active -diff --git a/api/@ohos.multimodalInput.mouseEvent.d.ts b/api/@ohos.multimodalInput.mouseEvent.d.ts -index df39f2793..3ad44af0f 100644 ---- a/api/@ohos.multimodalInput.mouseEvent.d.ts -+++ b/api/@ohos.multimodalInput.mouseEvent.d.ts -@@ -24,7 +24,6 @@ import type { KeyCode } from './@ohos.multimodalInput.keyCode'; - /*** endif */ - /*** if arkts 1.2 */ - import { InputEvent } from './@ohos.multimodalInput.inputEvent'; --import { KeyCode } from './@ohos.multimodalInput.keyCode'; - /*** endif */ - - /** -@@ -257,12 +256,12 @@ export declare interface AxisValue { - - /** - * Axis value -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- value: number; -+ value: int; - } - - /** -@@ -332,58 +331,58 @@ export declare interface MouseEvent extends InputEvent { - - /** - * X coordinate of the mouse pointer on the screen -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- screenX: number; -+ screenX: int; - - /** - * Y coordinate of the mouse pointer on the screen -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- screenY: number; -+ screenY: int; - - /** - * X coordinate of the mouse pointer in the window -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- windowX: number; -+ windowX: int; - - /** - * Y coordinate of the mouse pointer in the window -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- windowY: number; -+ windowY: int; - - /** - * X axis offset relative to the previous reported mouse pointer position. When the mouse pointer is at - * the edge of the screen, the value may be less than the difference of the X coordinate reported twice. -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- rawDeltaX: number; -+ rawDeltaX: int; - - /** - * Y axis offset relative to the previous reported mouse pointer position -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- rawDeltaY: number; -+ rawDeltaY: int; - - /** - * Button that is currently pressed or released -@@ -416,8 +415,7 @@ export declare interface MouseEvent extends InputEvent { - * List of pressed keys - * @type { KeyCode[] } - * @syscap SystemCapability.MultimodalInput.Input.Core -- * @since arkts {'1.1':'9', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - pressedKeys: KeyCode[]; - -diff --git a/api/@ohos.multimodalInput.pointer.d.ts b/api/@ohos.multimodalInput.pointer.d.ts -index ea3dfc42f..2951c0bf2 100644 ---- a/api/@ohos.multimodalInput.pointer.d.ts -+++ b/api/@ohos.multimodalInput.pointer.d.ts -@@ -489,21 +489,24 @@ declare namespace pointer { - * - * @enum { number } - * @syscap SystemCapability.MultimodalInput.Input.Pointer -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PrimaryButton { - /** - * Left mouse button - * - * @syscap SystemCapability.MultimodalInput.Input.Pointer -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LEFT = 0, - /** - * Right mouse button - * - * @syscap SystemCapability.MultimodalInput.Input.Pointer -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RIGHT = 1 - } -@@ -513,28 +516,32 @@ declare namespace pointer { - * - * @enum { number } - * @syscap SystemCapability.MultimodalInput.Input.Pointer -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum RightClickType { - /** - * Touchpad right button - * - * @syscap SystemCapability.MultimodalInput.Input.Pointer -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TOUCHPAD_RIGHT_BUTTON = 1, - /** - * Touchpad left button - * - * @syscap SystemCapability.MultimodalInput.Input.Pointer -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TOUCHPAD_LEFT_BUTTON = 2, - /** - * Touchpad two fingers tap - * - * @syscap SystemCapability.MultimodalInput.Input.Pointer -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TOUCHPAD_TWO_FINGER_TAP = 3, - } -@@ -575,14 +582,16 @@ declare namespace pointer { - * - * @interface CursorConfig - * @syscap SystemCapability.MultimodalInput.Input.Pointer -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface CursorConfig { - /** - * followSystem - Whether to adjust the cursor size based on the system settings. - * @type { boolean } - * @syscap SystemCapability.MultimodalInput.Input.Pointer -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - followSystem : boolean; - } -@@ -707,7 +716,7 @@ declare namespace pointer { - /** - * Sets the pointer style. - * -- * @param { number } windowId - Window ID. -+ * @param { int } windowId - Window ID. - * @param { PointerStyle } pointerStyle - Pointer style. - * @param { AsyncCallback } callback - Callback used to return the result. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -@@ -716,12 +725,12 @@ declare namespace pointer { - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function setPointerStyle(windowId: number, pointerStyle: PointerStyle, callback: AsyncCallback): void; -+ function setPointerStyle(windowId: int, pointerStyle: PointerStyle, callback: AsyncCallback): void; - - /** - * Sets the pointer style. - * -- * @param { number } windowId - Window ID. -+ * @param { int } windowId - Window ID. - * @param { PointerStyle } pointerStyle - Pointer style. - * @returns { Promise } Returns the result through a promise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -@@ -730,19 +739,20 @@ declare namespace pointer { - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function setPointerStyle(windowId: number, pointerStyle: PointerStyle): Promise; -+ function setPointerStyle(windowId: int, pointerStyle: PointerStyle): Promise; - - /** - * Sets the pointer style through sync mode. - * -- * @param { number } windowId - Window ID. -+ * @param { int } windowId - Window ID. - * @param { PointerStyle } pointerStyle - Pointer style. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.MultimodalInput.Input.Pointer -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function setPointerStyleSync(windowId: number, pointerStyle: PointerStyle): void; -+ function setPointerStyleSync(windowId: int, pointerStyle: PointerStyle): void; - - /** - * Queries the pointer style. -@@ -771,14 +781,15 @@ declare namespace pointer { - /** - * Queries the pointer style through sync mode. - * -- * @param { number } windowId - Window ID. -+ * @param { int } windowId - Window ID. - * @returns { PointerStyle } Returns the pointerStyle. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.MultimodalInput.Input.Pointer -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getPointerStyleSync(windowId: number): PointerStyle; -+ function getPointerStyleSync(windowId: int): PointerStyle; - - /** - * Sets whether the pointer icon is visible. -diff --git a/api/@ohos.multimodalInput.shortKey.d.ts b/api/@ohos.multimodalInput.shortKey.d.ts -index 8aa54864f..133f86c94 100644 ---- a/api/@ohos.multimodalInput.shortKey.d.ts -+++ b/api/@ohos.multimodalInput.shortKey.d.ts -@@ -66,7 +66,8 @@ export default shortKey; - * @enum { number } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export declare enum FingerprintAction { - /** -@@ -74,7 +75,8 @@ export declare enum FingerprintAction { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DOWN = 0, - -@@ -83,7 +85,8 @@ export declare enum FingerprintAction { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - UP = 1, - -@@ -92,7 +95,8 @@ export declare enum FingerprintAction { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SLIDE = 2, - -@@ -101,7 +105,8 @@ export declare enum FingerprintAction { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RETOUCH = 3, - -@@ -110,7 +115,8 @@ export declare enum FingerprintAction { - * - * @syscap SystemCapability.MultimodalInput.Input.Core - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CLICK = 4, - } -@@ -121,7 +127,8 @@ export declare enum FingerprintAction { - * @interface FingerprintEvent - * @syscap SystemCapability.MultimodalInput.Input.Core - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export declare interface FingerprintEvent { - /** -@@ -130,7 +137,8 @@ export declare interface FingerprintEvent { - * @type { FingerprintAction } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - action: FingerprintAction; - -@@ -144,12 +152,13 @@ export declare interface FingerprintEvent { - * and the horizontal rightward direction stands for the positive direction of the X axis. - * This way, a rectangular coordinate system is constructed. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- distanceX: number; -+ distanceX: double; - - /** - * This value indicates the sliding percentage of the fingerprint key on the Y axis, -@@ -161,10 +170,11 @@ export declare interface FingerprintEvent { - * and the horizontal rightward direction stands for the positive direction of the X axis. - * This way, a rectangular coordinate system is constructed. - * -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- distanceY: number; -+ distanceY: double; - } -\ No newline at end of file -diff --git a/api/@ohos.multimodalInput.touchEvent.d.ts b/api/@ohos.multimodalInput.touchEvent.d.ts -index 1ecef64be..83b125be8 100644 ---- a/api/@ohos.multimodalInput.touchEvent.d.ts -+++ b/api/@ohos.multimodalInput.touchEvent.d.ts -@@ -232,156 +232,156 @@ export declare enum FixedMode { - export declare interface Touch { - /** - * Pointer identifier -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- id: number; -+ id: int; - - /** - * Time stamp when touch is pressed -- * @type { number } -+ * @type { long } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- pressedTime: number; -+ pressedTime: long; - - /** - * X coordinate of the touch position on the screen -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- screenX: number; -+ screenX: int; - - /** - * Y coordinate of the touch position on the screen -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- screenY: number; -+ screenY: int; - - /** - * X coordinate of the touch position in the window -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- windowX: number; -+ windowX: int; - - /** - * Y coordinate of the touch position in the window -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- windowY: number; -+ windowY: int; - - /** - * Pressure value. The value range is [0.0, 1.0]. The value 0.0 indicates that the pressure is not supported. -- * @type { number } -+ * @type { double } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- pressure: number; -+ pressure: double; - - /** - * Width of the contact area when touch is pressed -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- width: number; -+ width: int; - - /** - * Height of the contact area when touch is pressed -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- height: number; -+ height: int; - - /** - * Angle relative to the YZ plane. The value range is [-90, 90]. A positive value indicates a rightward tilt. -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- tiltX: number; -+ tiltX: int; - - /** - * Angle relative to the XZ plane. The value range is [-90, 90]. A positive value indicates a downward tilt. -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- tiltY: number; -+ tiltY: int; - - /** - * Center point X of the tool area -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- toolX: number; -+ toolX: int; - - /** - * Center point Y of the tool area -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- toolY: number; -+ toolY: int; - - /** - * Width of the tool area -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- toolWidth: number; -+ toolWidth: int; - - /** - * Height of the tool area -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- toolHeight: number; -+ toolHeight: int; - - /** - * X coordinate of the input device -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- rawX: number; -+ rawX: int; - - /** - * Y coordinate of the input device -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- rawY: number; -+ rawY: int; - - /** - * Tool type -@@ -394,23 +394,23 @@ export declare interface Touch { - - /** - * fixedDisplayX - Corrected value of the screen x coordinate. -- * @type { number } -+ * @type { ?int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- fixedDisplayX?: number; -+ fixedDisplayX?: int; - - /** - * fixedDisplayY - Corrected value of the screen y coordinate. -- * @type { number } -+ * @type { ?int } - * @syscap SystemCapability.MultimodalInput.Input.Core - * @systemapi Hide this for inner system use. - * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- fixedDisplayY?: number; -+ fixedDisplayY?: int; - } - - /** -diff --git a/api/@ohos.net.connection.d.ts b/api/@ohos.net.connection.d.ts -index e9e78d4ce..b0271a90c 100644 ---- a/api/@ohos.net.connection.d.ts -+++ b/api/@ohos.net.connection.d.ts -@@ -1158,7 +1158,8 @@ declare namespace connection { - * @syscap SystemCapability.Communication.NetManager.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'netAvailable', callback: Callback): void; - -@@ -1174,7 +1175,8 @@ declare namespace connection { - * @param { 'netBlockStatusChange' } type - Indicates Event name. - * @param { Callback } callback - the callback used to return the result. - * @syscap SystemCapability.Communication.NetManager.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'netBlockStatusChange', callback: Callback): void; - -@@ -1200,7 +1202,8 @@ declare namespace connection { - * @syscap SystemCapability.Communication.NetManager.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'netCapabilitiesChange', callback: Callback): void; - -@@ -1216,7 +1219,8 @@ declare namespace connection { - * @param { 'netConnectionPropertiesChange' } type - Indicates Event name. - * @param { Callback } callback - the callback used to return the result. - * @syscap SystemCapability.Communication.NetManager.Core -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'netConnectionPropertiesChange', callback: Callback): void; - -@@ -1242,7 +1246,8 @@ declare namespace connection { - * @syscap SystemCapability.Communication.NetManager.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'netLost', callback: Callback): void; - -@@ -1268,7 +1273,8 @@ declare namespace connection { - * @syscap SystemCapability.Communication.NetManager.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'netUnavailable', callback: Callback): void; - -@@ -1312,7 +1318,8 @@ declare namespace connection { - * @syscap SystemCapability.Communication.NetManager.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - register(callback: AsyncCallback): void; - -@@ -1362,7 +1369,8 @@ declare namespace connection { - * @syscap SystemCapability.Communication.NetManager.Core - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - unregister(callback: AsyncCallback): void; - } -diff --git a/api/@ohos.net.sharing.d.ts b/api/@ohos.net.sharing.d.ts -index 45267f19c..52b5ce3e0 100644 ---- a/api/@ohos.net.sharing.d.ts -+++ b/api/@ohos.net.sharing.d.ts -@@ -410,7 +410,8 @@ declare namespace sharing { - * @throws { BusinessError } 401 - Parameter error. - * @syscap SystemCapability.Communication.NetManager.NetSharing - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'sharingStateChange', callback: Callback): void; - -@@ -424,7 +425,8 @@ declare namespace sharing { - * @throws { BusinessError } 401 - Parameter error. - * @syscap SystemCapability.Communication.NetManager.NetSharing - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'sharingStateChange', callback?: Callback): void; - -@@ -450,7 +452,8 @@ declare namespace sharing { - * @throws { BusinessError } 401 - Parameter error. - * @syscap SystemCapability.Communication.NetManager.NetSharing - * @systemapi Hide this for inner system use. -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'interfaceSharingStateChange', callback: Callback): void; - -@@ -476,7 +479,8 @@ declare namespace sharing { - * @throws { BusinessError } 401 - Parameter error. - * @syscap SystemCapability.Communication.NetManager.NetSharing - * @systemapi Hide this for inner system use. -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'interfaceSharingStateChange', callback?: Callback): void; - -@@ -490,7 +494,8 @@ declare namespace sharing { - * @throws { BusinessError } 401 - Parameter error. - * @syscap SystemCapability.Communication.NetManager.NetSharing - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'sharingUpstreamChange', callback: Callback): void; - -@@ -504,7 +509,8 @@ declare namespace sharing { - * @throws { BusinessError } 401 - Parameter error. - * @syscap SystemCapability.Communication.NetManager.NetSharing - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'sharingUpstreamChange', callback?: Callback): void; - -diff --git a/api/@ohos.nfc.tag.d.ts b/api/@ohos.nfc.tag.d.ts -index 8c6d5ad85..24c7724ae 100644 ---- a/api/@ohos.nfc.tag.d.ts -+++ b/api/@ohos.nfc.tag.d.ts -@@ -29,7 +29,9 @@ import { - } from './tag/nfctech'; - import { NdefMessage as _NdefMessage } from './tag/nfctech'; - import { TagSession as _TagSession } from './tag/tagSession'; -+/*** if arkts 1.1 */ - import type { PacMap } from './ability/dataAbilityHelper'; -+/*** endif */ - import type rpc from './@ohos.rpc'; - import type { AsyncCallback } from './@ohos.base'; - import Want from './@ohos.app.ability.Want'; -@@ -1370,8 +1372,7 @@ declare namespace tag { - * @type { PacMap[] } - * @syscap SystemCapability.Communication.NFC.Tag - * @systemapi hide for inner use. -- * @since arkts {'1.1':'9','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 9 - */ - extrasData: PacMap[]; - -diff --git a/api/@ohos.notificationManager.d.ts b/api/@ohos.notificationManager.d.ts -index 69ab2bbeb..ee9e5e9c8 100644 ---- a/api/@ohos.notificationManager.d.ts -+++ b/api/@ohos.notificationManager.d.ts -@@ -423,7 +423,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 2300007 - Network unreachable. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function publishAsBundle( - request: NotificationRequest, -@@ -458,7 +459,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 2300007 - Network unreachable. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function publishAsBundle(request: NotificationRequest, representativeBundle: string, userId: number): Promise; - -@@ -487,7 +489,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 2300007 - Network unreachable. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function publishAsBundle(representativeBundle: BundleOption, request: NotificationRequest): Promise; - -@@ -601,7 +604,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function cancelAsBundle( - id: number, -@@ -630,7 +634,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function cancelAsBundle(id: number, representativeBundle: string, userId: number): Promise; - -@@ -654,7 +659,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function cancelAsBundle(representativeBundle: BundleOption, id: number): Promise; - -@@ -726,7 +732,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600012 - No memory space. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function addSlot(slot: NotificationSlot, callback: AsyncCallback): void; - -@@ -746,7 +753,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600012 - No memory space. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function addSlot(slot: NotificationSlot): Promise; - -@@ -762,7 +770,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @throws { BusinessError } 1600012 - No memory space. - * @syscap SystemCapability.Notification.Notification -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function addSlot(type: SlotType, callback: AsyncCallback): void; - -@@ -778,7 +787,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @throws { BusinessError } 1600012 - No memory space. - * @syscap SystemCapability.Notification.Notification -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function addSlot(type: SlotType): Promise; - -@@ -798,7 +808,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600012 - No memory space. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function addSlots(slots: Array, callback: AsyncCallback): void; - -@@ -818,7 +829,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600012 - No memory space. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function addSlots(slots: Array): Promise; - -@@ -833,7 +845,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSlot(slotType: SlotType, callback: AsyncCallback): void; - -@@ -848,7 +861,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSlot(slotType: SlotType): Promise; - -@@ -863,7 +877,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSlots(callback: AsyncCallback>): void; - -@@ -875,7 +890,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSlots(): Promise>; - -@@ -891,7 +907,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAllNotificationEnabledBundles(): Promise>; - -@@ -906,7 +923,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function removeSlot(slotType: SlotType, callback: AsyncCallback): void; - -@@ -921,7 +939,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function removeSlot(slotType: SlotType): Promise; - -@@ -935,7 +954,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function removeAllSlots(callback: AsyncCallback): void; - -@@ -947,7 +967,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function removeAllSlots(): Promise; - -@@ -1137,7 +1158,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isNotificationEnabledSync(): boolean; - -@@ -1384,7 +1406,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setSlotByBundle(bundle: BundleOption, slot: NotificationSlot, callback: AsyncCallback): void; - -@@ -1425,7 +1448,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setSlotByBundle(bundle: BundleOption, slot: NotificationSlot): Promise; - -@@ -1508,7 +1532,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSlotByBundle(bundle: BundleOption, slotType: SlotType): Promise; - -@@ -1587,7 +1612,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSlotNumByBundle(bundle: BundleOption, callback: AsyncCallback): void; - -@@ -1626,7 +1652,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSlotNumByBundle(bundle: BundleOption): Promise; - -@@ -1678,7 +1705,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getActiveNotificationCount(callback: AsyncCallback): void; - -@@ -1736,7 +1764,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getActiveNotificationByFilter(filter: NotificationFilter, callback: AsyncCallback): void; - -@@ -1753,7 +1782,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getActiveNotificationByFilter(filter: NotificationFilter): Promise; - -@@ -1768,7 +1798,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function cancelGroup(groupName: string, callback: AsyncCallback): void; - -@@ -1783,7 +1814,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function cancelGroup(groupName: string): Promise; - -@@ -1804,7 +1836,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function removeGroupByBundle(bundle: BundleOption, groupName: string, callback: AsyncCallback): void; - -@@ -1825,7 +1858,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function removeGroupByBundle(bundle: BundleOption, groupName: string): Promise; - -@@ -1864,7 +1898,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600012 - No memory space. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setDoNotDisturbDate(date: DoNotDisturbDate, callback: AsyncCallback): void; - -@@ -1903,7 +1938,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600012 - No memory space. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setDoNotDisturbDate(date: DoNotDisturbDate): Promise; - -@@ -1946,7 +1982,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600012 - No memory space. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setDoNotDisturbDate(date: DoNotDisturbDate, userId: number, callback: AsyncCallback): void; - -@@ -1989,7 +2026,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600012 - No memory space. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setDoNotDisturbDate(date: DoNotDisturbDate, userId: number): Promise; - -@@ -2026,7 +2064,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600012 - No memory space. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getDoNotDisturbDate(callback: AsyncCallback): void; - -@@ -2059,7 +2098,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600012 - No memory space. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getDoNotDisturbDate(): Promise; - -@@ -2100,7 +2140,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600012 - No memory space. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getDoNotDisturbDate(userId: number, callback: AsyncCallback): void; - -@@ -2141,7 +2182,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600012 - No memory space. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getDoNotDisturbDate(userId: number): Promise; - -@@ -2160,7 +2202,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isSupportDoNotDisturbMode(callback: AsyncCallback): void; - -@@ -2176,7 +2219,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isSupportDoNotDisturbMode(): Promise; - -@@ -2191,7 +2235,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isSupportTemplate(templateName: string, callback: AsyncCallback): void; - -@@ -2206,7 +2251,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isSupportTemplate(templateName: string): Promise; - -@@ -2429,7 +2475,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600010 - Distributed operation failed. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setDistributedEnable(enable: boolean, callback: AsyncCallback): void; - -@@ -2468,7 +2515,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600010 - Distributed operation failed. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setDistributedEnable(enable: boolean): Promise; - -@@ -2484,7 +2532,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @throws { BusinessError } 1600010 - Distributed operation failed. - * @syscap SystemCapability.Notification.Notification -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isDistributedEnabled(callback: AsyncCallback): void; - -@@ -2497,7 +2546,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @throws { BusinessError } 1600010 - Distributed operation failed. - * @syscap SystemCapability.Notification.Notification -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isDistributedEnabled(): Promise; - -@@ -2540,7 +2590,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setDistributedEnableByBundle(bundle: BundleOption, enable: boolean, callback: AsyncCallback): void; - -@@ -2583,7 +2634,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setDistributedEnableByBundle(bundle: BundleOption, enable: boolean): Promise; - -@@ -2630,7 +2682,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setDistributedEnabledByBundle(bundle: BundleOption, deviceType: string, enable: boolean): Promise; - -@@ -2673,7 +2726,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isDistributedEnabledByBundle(bundle: BundleOption, callback: AsyncCallback): void; - -@@ -2714,7 +2768,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isDistributedEnabledByBundle(bundle: BundleOption): Promise; - -@@ -2759,7 +2814,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isDistributedEnabledByBundle(bundle: BundleOption, deviceType: string): Promise; - -@@ -2804,7 +2860,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setSmartReminderEnabled(deviceType: string, enable: boolean): Promise; - -@@ -2847,7 +2904,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isSmartReminderEnabled(deviceType: string): Promise; - -@@ -2882,7 +2940,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getDeviceRemindType(callback: AsyncCallback): void; - -@@ -2913,7 +2972,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getDeviceRemindType(): Promise; - -@@ -3235,7 +3295,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600008 - The user does not exist. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setSyncNotificationEnabledWithoutApp(userId: number, enable: boolean, callback: AsyncCallback): void; - -@@ -3276,7 +3337,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600008 - The user does not exist. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setSyncNotificationEnabledWithoutApp(userId: number, enable: boolean): Promise; - -@@ -3296,7 +3358,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600008 - The user does not exist. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSyncNotificationEnabledWithoutApp(userId: number, callback: AsyncCallback): void; - -@@ -3316,7 +3379,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600008 - The user does not exist. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSyncNotificationEnabledWithoutApp(userId: number): Promise; - -@@ -3363,7 +3427,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600012 - No memory space. - * @syscap SystemCapability.Notification.Notification - * @crossplatform -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setBadgeNumber(badgeNumber: number, callback: AsyncCallback): void; - -@@ -3410,7 +3475,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600012 - No memory space. - * @syscap SystemCapability.Notification.Notification - * @crossplatform -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setBadgeNumber(badgeNumber: number): Promise; - -@@ -3451,7 +3517,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setBadgeNumberByBundle(bundle: BundleOption, badgeNumber: number): Promise; - -@@ -3482,7 +3549,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600001 - Internal error. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'checkNotification', callback: (checkInfo: NotificationCheckInfo) => NotificationCheckResult): void; - -@@ -3521,7 +3589,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'checkNotification', checkRequest: NotificationCheckRequest, - callback: (checkInfo: NotificationCheckInfo) => Promise): void; -@@ -3553,7 +3622,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600001 - Internal error. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off( - type: 'checkNotification', -@@ -3839,7 +3909,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setAdditionalConfig(key: string, value: string): Promise; - -@@ -3866,7 +3937,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600018 - the notification settings window is already displayed. - * @syscap SystemCapability.Notification.NotificationSettings - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function openNotificationSettings(context: UIAbilityContext): Promise; - -@@ -3905,7 +3977,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600019 - The do-not-disturb profile does not exist. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getDoNotDisturbProfile(id: number): Promise; - -@@ -3922,7 +3995,8 @@ declare namespace notificationManager { - *
    2. Incorrect parameter types. 3. Parameter verification failed. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setTargetDeviceStatus(deviceType: string, status: number): Promise; - -@@ -3941,7 +4015,8 @@ declare namespace notificationManager { - * @throws { BusinessError } 1600002 - Marshalling or unmarshalling error. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function disableNotificationFeature(disabled:boolean, bundleList: Array): Promise; - -@@ -3959,8 +4034,9 @@ declare namespace notificationManager { - *
    2. Incorrect parameter types. 3. Parameter verification failed. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -- */ -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - function setDistributedEnabledBySlot(slot: SlotType, deviceType: string, enabled: boolean): Promise; - - /** -@@ -3976,8 +4052,9 @@ declare namespace notificationManager { - *
    2. Incorrect parameter types. 3. Parameter verification failed. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 18 -- */ -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - function isDistributedEnabledBySlot(slot: SlotType, deviceType: string): Promise; - - /** -@@ -4019,7 +4096,8 @@ declare namespace notificationManager { - * @type { ?function } - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onResponse?: (notificationId: number, buttonOptions: ButtonOptions) => void; - } -diff --git a/api/@ohos.notificationSubscribe.d.ts b/api/@ohos.notificationSubscribe.d.ts -index 501740853..e6dd76a4d 100644 ---- a/api/@ohos.notificationSubscribe.d.ts -+++ b/api/@ohos.notificationSubscribe.d.ts -@@ -138,7 +138,8 @@ declare namespace notificationSubscribe { - * @throws { BusinessError } 1600012 - No memory space. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function subscribeSelf(subscriber: NotificationSubscriber): Promise; - -@@ -386,7 +387,8 @@ declare namespace notificationSubscribe { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function removeAll(bundle: BundleOption, callback: AsyncCallback): void; - -@@ -404,7 +406,8 @@ declare namespace notificationSubscribe { - * @throws { BusinessError } 1600003 - Failed to connect to the service. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function removeAll(callback: AsyncCallback): void; - -@@ -424,7 +427,8 @@ declare namespace notificationSubscribe { - * @throws { BusinessError } 1600008 - The user does not exist. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function removeAll(userId: number, callback: AsyncCallback): void; - -@@ -444,7 +448,8 @@ declare namespace notificationSubscribe { - * @throws { BusinessError } 1600008 - The user does not exist. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function removeAll(userId: number): Promise; - -@@ -464,7 +469,8 @@ declare namespace notificationSubscribe { - * @throws { BusinessError } 17700001 - The specified bundle name was not found. - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function removeAll(bundle?: BundleOption): Promise; - -diff --git a/api/@ohos.pasteboard.d.ts b/api/@ohos.pasteboard.d.ts -index 9abc116e9..ddd320d4b 100644 ---- a/api/@ohos.pasteboard.d.ts -+++ b/api/@ohos.pasteboard.d.ts -@@ -21,9 +21,7 @@ - import { AsyncCallback } from './@ohos.base'; - import Want from './@ohos.app.ability.Want'; - import image from './@ohos.multimedia.image'; --/*** if arkts 1.1 */ - import unifiedDataChannel from './@ohos.data.unifiedDataChannel'; --/*** endif */ - - /** - * systemPasteboard -@@ -36,7 +34,7 @@ import unifiedDataChannel from './@ohos.data.unifiedDataChannel'; - * @namespace pasteboard - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - declare namespace pasteboard { -@@ -65,11 +63,10 @@ declare namespace pasteboard { - * @constant - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - const MIMETYPE_TEXT_HTML = 'text/html'; -- - /** - * Indicates MIME types of wants. - * @constant -@@ -81,11 +78,9 @@ declare namespace pasteboard { - * @constant - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - const MIMETYPE_TEXT_WANT = 'text/want'; -- - /** - * Indicates MIME types of plain text. - * @constant -@@ -97,11 +92,10 @@ declare namespace pasteboard { - * @constant - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - const MIMETYPE_TEXT_PLAIN = 'text/plain'; -- - /** - * Indicates MIME types of URIs. - * @constant -@@ -113,11 +107,10 @@ declare namespace pasteboard { - * @constant - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - const MIMETYPE_TEXT_URI = 'text/uri'; -- - /** - * Indicates MIME type of PixelMap. - * @constant -@@ -129,8 +122,7 @@ declare namespace pasteboard { - * @constant - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - const MIMETYPE_PIXELMAP = 'pixelMap'; - -@@ -145,7 +137,7 @@ declare namespace pasteboard { - * @typedef { string | image.PixelMap | Want | ArrayBuffer } - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - type ValueType = string | image.PixelMap | Want | ArrayBuffer; -@@ -206,7 +198,7 @@ declare namespace pasteboard { - * @since 9 - */ - /** -- * Creates a PasteData object with MIME type and value. -+ * Creates a PasteData object of the specified type. - * @param { string } mimeType - indicates MIME type of value, its size cannot be greater than 1024 bytes. - * @param { ValueType } value - indicates the content that is set to PasteData. - * @returns { PasteData } a new PasteData object which contains mimeType and value. -@@ -215,7 +207,7 @@ declare namespace pasteboard { - * 3. Parameter verification failed. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - function createData(mimeType: string, value: ValueType): PasteData; -@@ -228,7 +220,7 @@ declare namespace pasteboard { - * 2. Incorrect parameters types; - * 3. Parameter verification failed. - * @syscap SystemCapability.MiscServices.Pasteboard -- * @since arkts {'1.1':'14', '1.2':'20'} -+ * @since arkts {'1.1':'14','1.2':'20'} - * @arkts 1.1&1.2 - */ - function createData(data: Record): PasteData; -@@ -289,10 +281,10 @@ declare namespace pasteboard { - * @since 9 - */ - /** -- * Creates a record object with MIME type and value. -+ * Creates a PasteDataRecord object of the specified type. - * @param { string } mimeType - indicates MIME type of value, its size cannot be greater than 1024 bytes. -- * @param { ValueType } value - content to be saved. -- * @returns { PasteDataRecord } a new PasteDataRecord object which contains mimeType and value. -+ * @param { ValueType } value - Data content of the specified type. -+ * @returns { PasteDataRecord } A new paste data record of a specified type. - * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameters types; - * 3. Parameter verification failed. -@@ -313,7 +305,7 @@ declare namespace pasteboard { - * @returns { SystemPasteboard } The system clipboard object - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - function getSystemPasteboard(): SystemPasteboard; -@@ -329,7 +321,7 @@ declare namespace pasteboard { - * @enum { number } - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - enum ShareOption { -@@ -339,10 +331,10 @@ declare namespace pasteboard { - * @since 9 - */ - /** -- * INAPP indicates that only paste in the same app is allowed. -+ * INAPP indicates that only intra-application pasting is allowed. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - INAPP, -@@ -352,10 +344,10 @@ declare namespace pasteboard { - * @since 9 - */ - /** -- * LOCALDEVICE indicates that paste in any app in this device is allowed. -+ * LOCALDEVICE indicates that paste is allowed in any application. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - LOCALDEVICE, -@@ -365,11 +357,10 @@ declare namespace pasteboard { - * @since 9 - */ - /** -- * CROSSDEVICE indicates that paste in any app across devices is allowed. -+ * CROSSDEVICE indicates that paste is allowed in any application across devices. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - * @deprecated since 12 - */ - CROSSDEVICE -@@ -379,29 +370,28 @@ declare namespace pasteboard { - * Enumerates the patterns allowed in the system pasteboard. - * @enum { number } - * @syscap SystemCapability.MiscServices.Pasteboard -- * @since arkts {'1.1':'13', '1.2':'20'} -+ * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 - */ - enum Pattern { - /** - * URL pattern. - * @syscap SystemCapability.MiscServices.Pasteboard -- * @since arkts {'1.1':'13', '1.2':'20'} -+ * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 - */ - URL = 0, - /** - * Number pattern. - * @syscap SystemCapability.MiscServices.Pasteboard -- * @since arkts {'1.1':'13', '1.2':'20'} -+ * @since arkts {'1.1':'13','1.2':'20'} - * @arkts 1.1&1.2 - */ - NUMBER = 1, - /** - * Email address pattern. - * @syscap SystemCapability.MiscServices.Pasteboard -- * @since arkts {'1.1':'13', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 13 - */ - EMAIL_ADDRESS = 2, - } -@@ -414,11 +404,12 @@ declare namespace pasteboard { - * @since 7 - */ - /** -- * Paste data property. -+ * Defines the properties of all data records on the pasteboard, including the timestamp, data type, pasteable range, -+ * and additional data. The defined properties can be applied to the pasteboard only with the setProperty method. - * @interface PasteDataProperty - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - interface PasteDataProperty { -@@ -465,7 +456,7 @@ declare namespace pasteboard { - * @type { string } - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - tag: string; -@@ -478,14 +469,14 @@ declare namespace pasteboard { - */ - /** - * a timestamp, which indicates when data is written to the system pasteboard. -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly timestamp: number; -+ readonly timestamp: long; - /** - * Checks whether PasteData is set for local access only. - * @type { boolean } -@@ -513,7 +504,7 @@ declare namespace pasteboard { - * @type { ShareOption } - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - shareOption: ShareOption; -@@ -530,7 +521,7 @@ declare namespace pasteboard { - * @interface PasteDataRecord - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - interface PasteDataRecord { -@@ -573,7 +564,7 @@ declare namespace pasteboard { - * @type { string } - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - mimeType: string; -@@ -588,7 +579,7 @@ declare namespace pasteboard { - * @type { string } - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - plainText: string; -@@ -603,7 +594,7 @@ declare namespace pasteboard { - * @type { string } - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - uri: string; -@@ -618,7 +609,8 @@ declare namespace pasteboard { - * @type { image.PixelMap } - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - pixelMap: image.PixelMap; - /** -@@ -670,7 +662,8 @@ declare namespace pasteboard { - * @returns { string } the string returned by the function. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - toPlainText(): string; - -@@ -706,7 +699,8 @@ declare namespace pasteboard { - * 2. Incorrect parameters types; - * 3. Parameter verification failed. - * @syscap SystemCapability.MiscServices.Pasteboard -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getData(type: string): Promise; - } -@@ -722,7 +716,7 @@ declare namespace pasteboard { - * @interface PasteData - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - interface PasteData { -@@ -757,7 +751,7 @@ declare namespace pasteboard { - * @param { PasteDataRecord } record - The content of a new record. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - addRecord(record: PasteDataRecord): void; -@@ -812,7 +806,7 @@ declare namespace pasteboard { - * 3. Parameter verification failed. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - addRecord(mimeType: string, value: ValueType): void; -@@ -828,7 +822,8 @@ declare namespace pasteboard { - * @returns { Array } type of array - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getMimeTypes(): Array; - -@@ -843,7 +838,8 @@ declare namespace pasteboard { - * @returns { string } type of htmltext - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getPrimaryHtml(): string; - -@@ -858,7 +854,8 @@ declare namespace pasteboard { - * @returns { Want } type of want - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getPrimaryWant(): Want; - -@@ -873,7 +870,8 @@ declare namespace pasteboard { - * @returns { string } type of mimetype - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getPrimaryMimeType(): string; - -@@ -888,7 +886,8 @@ declare namespace pasteboard { - * @returns { string } type of text - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getPrimaryText(): string; - -@@ -903,7 +902,8 @@ declare namespace pasteboard { - * @returns { string } type of uri - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getPrimaryUri(): string; - -@@ -933,7 +933,7 @@ declare namespace pasteboard { - * @returns { PasteDataProperty } PasteDataProperty type of PasteDataProperty - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - getProperty(): PasteDataProperty; -@@ -953,7 +953,7 @@ declare namespace pasteboard { - * 2. Incorrect parameters types. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - setProperty(property: PasteDataProperty): void; -@@ -983,17 +983,17 @@ declare namespace pasteboard { - */ - /** - * Gets record by index in PasteData. -- * @param { number } index - indicates the record index in PasteData. -+ * @param { int } index - indicates the record index in PasteData. - * @returns { PasteDataRecord } the record in PasteData with index. - * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameters types. - * @throws { BusinessError } 12900001 - The index is out of the record. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- getRecord(index: number): PasteDataRecord; -+ getRecord(index: int): PasteDataRecord; - - /** - * the number of records in a PasteData object. -@@ -1003,13 +1003,13 @@ declare namespace pasteboard { - */ - /** - * the number of records in a PasteData object. -- * @returns { number } The number of the clipboard contents -+ * @returns { int } The number of the clipboard contents - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ -- getRecordCount(): number; -+ getRecordCount(): int; - - /** - * the user-defined tag of a PasteData object. -@@ -1022,7 +1022,8 @@ declare namespace pasteboard { - * @returns { string } type of tag - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getTag(): string; - -@@ -1097,7 +1098,7 @@ declare namespace pasteboard { - /** - * Replaces a specified record with a new one. - * @param { number } index - indicates the record index in PasteData. -- * @param { PasteDataRecord } record - the content of a new record. -+ * @param { PasteDataRecord } record - the content of the replaced record. - * @returns { boolean } The query returns True on success, or False on failure. - * @syscap SystemCapability.MiscServices.Pasteboard - * @since 7 -@@ -1119,7 +1120,7 @@ declare namespace pasteboard { - /** - * Replaces a specified record with a new one. - * @param { number } index - indicates the record index in PasteData. -- * @param { PasteDataRecord } record - the content of a new record. -+ * @param { PasteDataRecord } record - the content of the replaced record. - * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameters types. - * @throws { BusinessError } 12900001 - The index is out of the record. -@@ -1149,16 +1150,14 @@ declare namespace pasteboard { - * @enum { number } - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'15', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - enum FileConflictOptions { - /** - * OVERWRITE overwrite when destUri has file with same name. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'15', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - OVERWRITE, - -@@ -1166,8 +1165,7 @@ declare namespace pasteboard { - * SKIP skip when destUri has file with same name. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'15', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - SKIP - } -@@ -1177,16 +1175,14 @@ declare namespace pasteboard { - * @enum { number } - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'15', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - enum ProgressIndicator { - /** - * NONE getting data without system default progress indicator. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'15', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - NONE, - -@@ -1194,8 +1190,7 @@ declare namespace pasteboard { - * DEFALUT getting data with system default progress indicator. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'15', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - DEFAULT - } -@@ -1205,8 +1200,7 @@ declare namespace pasteboard { - * @interface ProgressInfo - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'15', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - interface ProgressInfo { - /** -@@ -1214,8 +1208,7 @@ declare namespace pasteboard { - * @type { number } - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'15', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - progress: number; - } -@@ -1225,8 +1218,7 @@ declare namespace pasteboard { - * @typedef { function } ProgressListener - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'15', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - type ProgressListener = (progress: ProgressInfo) => void; - -@@ -1235,16 +1227,14 @@ declare namespace pasteboard { - * @class ProgressSignal - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'15', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - export class ProgressSignal { - /** - * Cancel the paste in progress. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'15', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - cancel(): void; - } -@@ -1254,8 +1244,7 @@ declare namespace pasteboard { - * @interface GetDataParams - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'15', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - interface GetDataParams { - /** -@@ -1264,8 +1253,7 @@ declare namespace pasteboard { - * @default - - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'15', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - destUri?: string; - -@@ -1275,8 +1263,7 @@ declare namespace pasteboard { - * @default FileConflictOptions.OVERWRITE - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'15', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - fileConflictOptions?: FileConflictOptions; - -@@ -1285,8 +1272,7 @@ declare namespace pasteboard { - * @type { ProgressIndicator } - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'15', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - progressIndicator: ProgressIndicator; - -@@ -1296,8 +1282,7 @@ declare namespace pasteboard { - * @default - - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'15', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - progressListener?: ProgressListener; - -@@ -1307,8 +1292,7 @@ declare namespace pasteboard { - * @default - - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'15', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 15 - */ - progressSignal?: ProgressSignal; - } -@@ -1324,7 +1308,7 @@ declare namespace pasteboard { - * @interface SystemPasteboard - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - interface SystemPasteboard { -@@ -1335,7 +1319,8 @@ declare namespace pasteboard { - * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameters types. - * @syscap SystemCapability.MiscServices.Pasteboard -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'update', callback: () => void): void; - -@@ -1347,14 +1332,15 @@ declare namespace pasteboard { - * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameters types. - * @syscap SystemCapability.MiscServices.Pasteboard -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'update', callback?: () => void): void; - - /** - * Checks whether the data is remote. - * @returns { boolean } True is remote data, else false. -- * @throws { BusinessError } 12900005 - Request timed out. -+ * @throws { BusinessError } 12900005 - Excessive processing time for internal data. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice - * @since 11 -@@ -1362,12 +1348,12 @@ declare namespace pasteboard { - isRemoteData(): boolean; - - /** -- * Gets source of data. -- * @returns { string } data source. -- * @throws { BusinessError } 12900005 - Request timed out. -+ * Obtains the application bundle name of the data source. -+ * @returns { string } Application bundle name of the data source. -+ * @throws { BusinessError } 12900005 - Excessive processing time for internal data. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - getDataSource(): string; -@@ -1378,10 +1364,10 @@ declare namespace pasteboard { - * @returns { boolean } if having mimeType in PasteData returns true, else returns false. - * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameters types. -- * @throws { BusinessError } 12900005 - Request timed out. -+ * @throws { BusinessError } 12900005 - Excessive processing time for internal data. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - hasDataType(mimeType: string): boolean; -@@ -1423,7 +1409,7 @@ declare namespace pasteboard { - * 2. Incorrect parameters types. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - clearData(callback: AsyncCallback): void; -@@ -1439,17 +1425,18 @@ declare namespace pasteboard { - * @returns { Promise } the promise returned by the clearData. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - clearData(): Promise; - - /** - * Clears the pasteboard. -- * @throws { BusinessError } 12900005 - Request timed out. -+ * @throws { BusinessError } 12900005 - Excessive processing time for internal data. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - clearDataSync(): void; - -@@ -1480,7 +1467,7 @@ declare namespace pasteboard { - * @param { AsyncCallback } callback - the callback of getData. - * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameters types. -- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. -+ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. - * @syscap SystemCapability.MiscServices.Pasteboard - * @since 9 - */ -@@ -1489,7 +1476,7 @@ declare namespace pasteboard { - * @param { AsyncCallback } callback - the callback of getData. - * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameters types. -- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. -+ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice - * @since 11 -@@ -1502,24 +1489,25 @@ declare namespace pasteboard { - * permission required to call the API. - * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameters types. -- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. -+ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getData(callback: AsyncCallback): void; - - /** - * Gets pastedata from the system pasteboard. - * @returns { Promise } the promise returned by the getData. -- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. -+ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. - * @syscap SystemCapability.MiscServices.Pasteboard - * @since 9 - */ - /** - * Gets pastedata from the system pasteboard. - * @returns { Promise } the promise returned by the getData. -- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. -+ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice - * @since 11 -@@ -1530,17 +1518,18 @@ declare namespace pasteboard { - * @returns { Promise } the promise returned by the getData. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the - * permission required to call the API. -- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. -+ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getData(): Promise; - - /** - * Gets pasteData from the system pasteboard. - * @returns { PasteData } a new PasteData. -- * @throws { BusinessError } 12900005 - Request timed out. -+ * @throws { BusinessError } 12900005 - Excessive processing time for internal data. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice - * @since 11 -@@ -1551,10 +1540,10 @@ declare namespace pasteboard { - * @returns { PasteData } a new PasteData. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the - * permission required to call the API. -- * @throws { BusinessError } 12900005 - Request timed out. -+ * @throws { BusinessError } 12900005 - Excessive processing time for internal data. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 - */ - getDataSync(): PasteData; -@@ -1596,7 +1585,8 @@ declare namespace pasteboard { - * 2. Incorrect parameters types. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - hasData(callback: AsyncCallback): void; - -@@ -1611,17 +1601,19 @@ declare namespace pasteboard { - * @returns { Promise } the promise returned by the function. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - hasData(): Promise; - - /** - * Checks whether there is content in the system pasteboard. - * @returns { boolean } True exists, false does not exist. -- * @throws { BusinessError } 12900005 - Request timed out. -+ * @throws { BusinessError } 12900005 - Excessive processing time for internal data. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - hasDataSync(): boolean; - -@@ -1655,8 +1647,8 @@ declare namespace pasteboard { - * @param { AsyncCallback } callback - the callback of setData. - * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified. - * 2. Incorrect parameters types. -- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. -- * @throws { BusinessError } 12900004 - Replication is prohibited. -+ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. -+ * @throws { BusinessError } 27787278 - Replication is prohibited. - * @syscap SystemCapability.MiscServices.Pasteboard - * @since 9 - */ -@@ -1666,11 +1658,11 @@ declare namespace pasteboard { - * @param { AsyncCallback } callback - the callback of setData. - * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameters types. -- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. -- * @throws { BusinessError } 12900004 - Replication is prohibited. -+ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. -+ * @throws { BusinessError } 27787278 - Replication is prohibited. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - setData(data: PasteData, callback: AsyncCallback): void; -@@ -1681,8 +1673,8 @@ declare namespace pasteboard { - * @returns { Promise } the promise returned by the function. - * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameters types. -- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. -- * @throws { BusinessError } 12900004 - Replication is prohibited. -+ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. -+ * @throws { BusinessError } 27787278 - Replication is prohibited. - * @syscap SystemCapability.MiscServices.Pasteboard - * @since 9 - */ -@@ -1692,11 +1684,11 @@ declare namespace pasteboard { - * @returns { Promise } the promise returned by the function. - * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameters types. -- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. -- * @throws { BusinessError } 12900004 - Replication is prohibited. -+ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. -+ * @throws { BusinessError } 27787278 - Replication is prohibited. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ - setData(data: PasteData): Promise; -@@ -1706,7 +1698,7 @@ declare namespace pasteboard { - * @param { PasteData } data - PasteData will be written to the clipboard. - * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameters types. -- * @throws { BusinessError } 12900005 - Request timed out. -+ * @throws { BusinessError } 12900005 - Excessive processing time for internal data. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice - * @since 11 -@@ -1719,7 +1711,7 @@ declare namespace pasteboard { - * @returns { Promise } the promise returned by the getData. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the - * permission required to call the API. -- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. -+ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice - * @since 12 -@@ -1732,7 +1724,7 @@ declare namespace pasteboard { - * @returns { unifiedDataChannel.UnifiedData } a new UnifiedData. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the - * permission required to call the API. -- * @throws { BusinessError } 12900005 - Request timed out. -+ * @throws { BusinessError } 12900005 - Excessive processing time for internal data. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice - * @since 12 -@@ -1745,8 +1737,8 @@ declare namespace pasteboard { - * @returns { Promise } the promise returned by the function. - * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameters types. -- * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. -- * @throws { BusinessError } 12900004 - Replication is prohibited. -+ * @throws { BusinessError } 27787277 - Another copy or paste operation is in progress. -+ * @throws { BusinessError } 27787278 - Replication is prohibited. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice - * @since 12 -@@ -1758,7 +1750,7 @@ declare namespace pasteboard { - * @param { unifiedDataChannel.UnifiedData } data - Unified data will be written to the pasteboard. - * @throws { BusinessError } 401 - Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameters types. -- * @throws { BusinessError } 12900005 - Request timed out. -+ * @throws { BusinessError } 12900005 - Excessive processing time for internal data. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice - * @since 12 -@@ -1832,7 +1824,8 @@ declare namespace pasteboard { - * @returns { Promise> } Promise used to return the MIME types. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getMimeTypes(): Promise>; - -@@ -1856,10 +1849,10 @@ declare namespace pasteboard { - * permission required to call the API. - * @throws { BusinessError } 401 - Parameter error. - * @throws { BusinessError } 12900003 - Another copy or paste operation is in progress. -- * @throws { BusinessError } 12900007 - Copy file failed. -+ * @throws { BusinessError } 12900007 - Invalid destUri or file system error. - * @throws { BusinessError } 12900008 - Failed to start progress. - * @throws { BusinessError } 12900009 - Progress exits abnormally. -- * @throws { BusinessError } 12900010 - Get pasteData error. -+ * @throws { BusinessError } 12900010 - System error occurred during paste execution. - * @syscap SystemCapability.MiscServices.Pasteboard - * @atomicservice - * @since 15 -diff --git a/api/@ohos.pluginComponent.d.ts b/api/@ohos.pluginComponent.d.ts -index f05f6efee..eeed7375e 100644 ---- a/api/@ohos.pluginComponent.d.ts -+++ b/api/@ohos.pluginComponent.d.ts -@@ -109,7 +109,7 @@ declare namespace pluginComponentManager { - * @atomicservice - * @since 12 - */ -- type KVObject = { [key: string]: number | string | boolean | [] | KVObject } -+ type KVObject = { [key: string]: number | string | boolean | [] | KVObject }; - - /** - * Defines KVObject -@@ -120,7 +120,7 @@ declare namespace pluginComponentManager { - * @since 20 - * @arkts 1.2 - */ -- type KVObject = Record -+ type KVObject = Record; - - /** - * Plugin component push parameters. -diff --git a/api/@ohos.power.d.ts b/api/@ohos.power.d.ts -index 0c92755ea..58792b6ee 100644 ---- a/api/@ohos.power.d.ts -+++ b/api/@ohos.power.d.ts -@@ -19,9 +19,6 @@ - */ - - import { AsyncCallback, BusinessError } from './@ohos.base'; --/*** if arkts 1.1 */ --import { int } from './@ohos.base'; --/*** endif */ - - /** - * Provides interfaces to manage power. -@@ -142,7 +139,7 @@ declare namespace power { - * @throws { BusinessError } 4900101 - Failed to connect to the service. - * @syscap SystemCapability.PowerManager.PowerManager.Core - * @systemapi -- * @since arkts {'1.1':'18', '1.2':'20'} -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function wakeup(detail: string): void; -@@ -179,7 +176,7 @@ declare namespace power { - * @throws { BusinessError } 4900101 - Failed to connect to the service. - * @syscap SystemCapability.PowerManager.PowerManager.Core - * @systemapi -- * @since arkts {'1.1':'18', '1.2':'20'} -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function suspend(isImmediate?: boolean): void; -@@ -264,7 +261,7 @@ declare namespace power { - * @throws { BusinessError } 4900101 - Failed to connect to the service. - * @syscap SystemCapability.PowerManager.PowerManager.Core - * @systemapi -- * @since arkts {'1.1':'18', '1.2':'20'} -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - function hibernate(clearMemory: boolean): void; -@@ -280,21 +277,6 @@ declare namespace power { - * @systemapi - * @since 12 - */ -- /** -- * Sets the timeout duration(ms) for turning off the screen with permission. -- * -- * @permission ohos.permission.POWER_MANAGER -- * @param { number } timeout - Indicates duration(ms) for turning off the screen. The value -1 means restore the default value. -- * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. -- * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Parameter verification failed. -- * @throws { BusinessError } 4900101 - Failed to connect to the service. -- * @syscap SystemCapability.PowerManager.PowerManager.Core -- * @systemapi -- * @since 19 -- */ -- function setScreenOffTime(timeout: number): void; -- - /** - * Sets the timeout duration(ms) for turning off the screen with permission. - * -@@ -306,8 +288,8 @@ declare namespace power { - * @throws { BusinessError } 4900101 - Failed to connect to the service. - * @syscap SystemCapability.PowerManager.PowerManager.Core - * @systemapi -- * @since 20 -- * @arkts 1.2 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setScreenOffTime(timeout: long): void; - -diff --git a/api/@ohos.print.d.ts b/api/@ohos.print.d.ts -index f78f22a71..284eb649e 100644 ---- a/api/@ohos.print.d.ts -+++ b/api/@ohos.print.d.ts -@@ -26,7 +26,8 @@ import type Context from './application/Context'; - * - * @namespace print - * @syscap SystemCapability.Print.PrintFramework -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace print { - -@@ -34,7 +35,8 @@ declare namespace print { - * PrintTask provide event callback. - * @interface PrintTask - * @syscap SystemCapability.Print.PrintFramework -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PrintTask { - /** -@@ -45,7 +47,8 @@ declare namespace print { - * @throws { BusinessError } 201 - the application does not have permission to call this function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'block', callback: Callback): void; - -@@ -57,7 +60,8 @@ declare namespace print { - * @throws { BusinessError } 201 - the application does not have permission to call this function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'succeed', callback: Callback): void; - -@@ -69,7 +73,8 @@ declare namespace print { - * @throws { BusinessError } 201 - the application does not have permission to call this function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'fail', callback: Callback): void; - -@@ -81,7 +86,8 @@ declare namespace print { - * @throws { BusinessError } 201 - the application does not have permission to call this function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'cancel', callback: Callback): void; - -@@ -93,7 +99,8 @@ declare namespace print { - * @throws { BusinessError } 201 - the application does not have permission to call this function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'block', callback?: Callback): void; - -@@ -105,7 +112,8 @@ declare namespace print { - * @throws { BusinessError } 201 - the application does not have permission to call this function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'succeed', callback?: Callback): void; - -@@ -117,7 +125,8 @@ declare namespace print { - * @throws { BusinessError } 201 - the application does not have permission to call this function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'fail', callback?: Callback): void; - -@@ -129,7 +138,8 @@ declare namespace print { - * @throws { BusinessError } 201 - the application does not have permission to call this function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'cancel', callback?: Callback): void; - } -@@ -138,7 +148,8 @@ declare namespace print { - * Third-party application implement this interface to render files to be printed. - * @interface PrintDocumentAdapter - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PrintDocumentAdapter { - -@@ -153,7 +164,8 @@ declare namespace print { - * @throws { BusinessError } 201 - the application does not have permission to call this function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onStartLayoutWrite(jobId: string, oldAttrs: PrintAttributes, newAttrs: PrintAttributes, fd: number, - writeResultCallback: (jobId: string, writeResult: PrintFileCreationState) => void): void; -@@ -166,7 +178,8 @@ declare namespace print { - * @throws { BusinessError } 201 - the application does not have permission to call this function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onJobStateChanged(jobId: string, state: PrintDocumentAdapterState): void; - } -@@ -179,7 +192,8 @@ declare namespace print { - * @throws { BusinessError } 201 - the application does not have permission to call this function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function print(files: Array, callback: AsyncCallback): void; - -@@ -191,7 +205,8 @@ declare namespace print { - * @throws { BusinessError } 201 - the application does not have permission to call this function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function print(files: Array): Promise; - -@@ -204,7 +219,8 @@ declare namespace print { - * @throws { BusinessError } 201 - the application does not have permission to call this function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function print(files: Array, context: Context, callback: AsyncCallback): void; - -@@ -217,7 +233,8 @@ declare namespace print { - * @throws { BusinessError } 201 - the application does not have permission to call this function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function print(files: Array, context: Context): Promise; - -@@ -232,7 +249,8 @@ declare namespace print { - * @throws { BusinessError } 201 - the application does not have permission to call this function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function print(jobName: string, printAdapter: PrintDocumentAdapter, printAttributes: PrintAttributes, - context: Context): Promise; -@@ -241,14 +259,16 @@ declare namespace print { - * defines print attributes. - * @typedef PrintAttributes - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PrintAttributes { - /** - * Copies of document list. - * @type { ?number } - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - copyNumber?: number; - -@@ -256,7 +276,8 @@ declare namespace print { - * Range size to be printed. - * @type { ?PrintPageRange } - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - pageRange?: PrintPageRange; - -@@ -264,7 +285,8 @@ declare namespace print { - * Page size. - * @type { ?(PrintPageSize | PrintPageType) } - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - pageSize?: PrintPageSize | PrintPageType; - -@@ -272,7 +294,8 @@ declare namespace print { - * Print direction. - * @type { ?PrintDirectionMode } - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - directionMode?: PrintDirectionMode; - -@@ -280,7 +303,8 @@ declare namespace print { - * Color mode. - * @type { ?PrintColorMode } - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - colorMode?: PrintColorMode; - -@@ -288,7 +312,8 @@ declare namespace print { - * Duplex mode. - * @type { ?PrintDuplexMode } - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - duplexMode?: PrintDuplexMode; - } -@@ -297,14 +322,16 @@ declare namespace print { - * defines print page range. - * @typedef PrintPageRange - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PrintPageRange { - /** - * Start page of sequence. - * @type { ?number } - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - startPage?: number; - -@@ -312,7 +339,8 @@ declare namespace print { - * End page of sequence. - * @type { ?number } - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - endPage?: number; - -@@ -320,7 +348,8 @@ declare namespace print { - * Discrete page of sequence. - * @type { ?Array } - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - pages?: Array; - } -@@ -330,7 +359,8 @@ declare namespace print { - * @typedef PrintMargin - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PrintMargin { - /** -@@ -338,7 +368,8 @@ declare namespace print { - * @type { ?number } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - top?: number; - -@@ -347,7 +378,8 @@ declare namespace print { - * @type { ?number } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - bottom?: number; - -@@ -356,7 +388,8 @@ declare namespace print { - * @type { ?number } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - left?: number; - -@@ -365,7 +398,8 @@ declare namespace print { - * @type { ?number } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - right?: number; - } -@@ -375,7 +409,8 @@ declare namespace print { - * @typedef PrinterRange - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PrinterRange { - /** -@@ -383,7 +418,8 @@ declare namespace print { - * @type { ?number } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - startPage?: number; - -@@ -392,7 +428,8 @@ declare namespace print { - * @type { ?number } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - endPage?: number; - -@@ -401,7 +438,8 @@ declare namespace print { - * @type { ?Array } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - pages?: Array; - } -@@ -411,7 +449,8 @@ declare namespace print { - * @typedef PreviewAttribute - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PreviewAttribute { - /** -@@ -419,7 +458,8 @@ declare namespace print { - * @type { PrinterRange } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - previewRange: PrinterRange; - -@@ -428,7 +468,8 @@ declare namespace print { - * @type { ?number } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - result?: number; - } -@@ -438,7 +479,8 @@ declare namespace print { - * @typedef PrintResolution - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PrintResolution { - /** -@@ -446,7 +488,8 @@ declare namespace print { - * @type { string } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - id: string; - -@@ -455,7 +498,8 @@ declare namespace print { - * @type { number } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - horizontalDpi: number; - -@@ -464,7 +508,8 @@ declare namespace print { - * @type { number } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - verticalDpi: number; - } -@@ -473,14 +518,16 @@ declare namespace print { - * defines print page size. - * @typedef PrintPageSize - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PrintPageSize { - /** - * Page size id. - * @type { string } - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - id: string; - -@@ -488,7 +535,8 @@ declare namespace print { - * Page size name. - * @type { string } - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - name: string; - -@@ -496,7 +544,8 @@ declare namespace print { - * Unit: millimeter width. - * @type { number } - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - width: number; - -@@ -504,7 +553,8 @@ declare namespace print { - * Unit: millimeter height. - * @type { number } - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - height: number; - } -@@ -514,7 +564,8 @@ declare namespace print { - * @typedef PrinterCapability - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PrinterCapability { - /** -@@ -522,7 +573,8 @@ declare namespace print { - * @type { number } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - colorMode: number; - -@@ -531,7 +583,8 @@ declare namespace print { - * @type { number } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - duplexMode: number; - -@@ -540,7 +593,8 @@ declare namespace print { - * @type { Array } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - pageSize: Array; - -@@ -549,7 +603,8 @@ declare namespace print { - * @type { ?Array } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - resolution?: Array; - -@@ -558,7 +613,8 @@ declare namespace print { - * @type { ?PrintMargin } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - minMargin?: PrintMargin; - -@@ -567,7 +623,8 @@ declare namespace print { - * @type { ?Object } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - options?: Object; - } -@@ -577,7 +634,8 @@ declare namespace print { - * @typedef PrinterInfo - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PrinterInfo { - /** -@@ -585,7 +643,8 @@ declare namespace print { - * @type { string } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - printerId: string; - -@@ -594,7 +653,8 @@ declare namespace print { - * @type { string } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - printerName: string; - -@@ -603,7 +663,8 @@ declare namespace print { - * @type { PrinterState } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - printerState: PrinterState; - -@@ -612,7 +673,8 @@ declare namespace print { - * @type { ?number } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - printerIcon?: number; - -@@ -621,7 +683,8 @@ declare namespace print { - * @type { ?string } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - description?: string; - -@@ -630,7 +693,8 @@ declare namespace print { - * @type { ?PrinterCapability } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - capability?: PrinterCapability; - -@@ -639,7 +703,8 @@ declare namespace print { - * @type { ?Object } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - options?: Object; - } -@@ -649,7 +714,8 @@ declare namespace print { - * @typedef PrintJob - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PrintJob { - /** -@@ -657,7 +723,8 @@ declare namespace print { - * @type { Array } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - fdList: Array; - -@@ -666,7 +733,8 @@ declare namespace print { - * @type { string } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - jobId: string; - -@@ -675,7 +743,8 @@ declare namespace print { - * @type { string } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - printerId: string; - -@@ -684,7 +753,8 @@ declare namespace print { - * @type { PrintJobState } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - jobState: PrintJobState; - -@@ -693,7 +763,8 @@ declare namespace print { - * @type { PrintJobSubState } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - jobSubstate: PrintJobSubState; - -@@ -702,7 +773,8 @@ declare namespace print { - * @type { number } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - copyNumber: number; - -@@ -711,7 +783,8 @@ declare namespace print { - * @type { PrinterRange } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - pageRange: PrinterRange; - -@@ -720,7 +793,8 @@ declare namespace print { - * @type { boolean } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isSequential: boolean; - -@@ -729,7 +803,8 @@ declare namespace print { - * @type { PrintPageSize } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - pageSize: PrintPageSize; - -@@ -738,7 +813,8 @@ declare namespace print { - * @type { boolean } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isLandscape: boolean; - -@@ -747,7 +823,8 @@ declare namespace print { - * @type { number } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - colorMode: number; - -@@ -756,7 +833,8 @@ declare namespace print { - * @type { number } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - duplexMode: number; - -@@ -765,7 +843,8 @@ declare namespace print { - * @type { ?PrintMargin } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - margin?: PrintMargin; - -@@ -774,7 +853,8 @@ declare namespace print { - * @type { ?PreviewAttribute } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - preview?: PreviewAttribute; - -@@ -783,7 +863,8 @@ declare namespace print { - * @type { ?Object } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - options?: Object; - } -@@ -792,27 +873,31 @@ declare namespace print { - * Enumeration of Print Direction Mode. - * @enum { number } PrintDirectionMode - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PrintDirectionMode { - /** - * Automatically select direction. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DIRECTION_MODE_AUTO = 0, - - /** - * Print portrait. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DIRECTION_MODE_PORTRAIT = 1, - - /** - * Print landscape. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DIRECTION_MODE_LANDSCAPE = 2, - } -@@ -821,20 +906,23 @@ declare namespace print { - * Enumeration of Print Color Mode. - * @enum { number } PrintColorMode - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PrintColorMode { - /** - * Print monochrome. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - COLOR_MODE_MONOCHROME = 0, - - /** - * Color printing. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - COLOR_MODE_COLOR = 1, - } -@@ -843,27 +931,31 @@ declare namespace print { - * Enumeration of Print Duplex Mode. - * @enum { number } PrintDuplexMode - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PrintDuplexMode { - /** - * Single side printing. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DUPLEX_MODE_NONE = 0, - - /** - * Long-edge flip-up duplex printing. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DUPLEX_MODE_LONG_EDGE = 1, - - /** - * Short-edge flip-up duplex printing. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DUPLEX_MODE_SHORT_EDGE = 2, - } -@@ -872,90 +964,103 @@ declare namespace print { - * Enumeration of Print Page Type. - * @enum { number } PrintPageType - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PrintPageType { - /** - * A3 page. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PAGE_ISO_A3 = 0, - - /** - * A4 page. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PAGE_ISO_A4 = 1, - - /** - * A5 page. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PAGE_ISO_A5 = 2, - - /** - * B5 page. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PAGE_JIS_B5 = 3, - - /** - * C5 page. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PAGE_ISO_C5 = 4, - - /** - * DL Envelope. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PAGE_ISO_DL = 5, - - /** - * Letter. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PAGE_LETTER = 6, - - /** - * Legal. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PAGE_LEGAL = 7, - - /** - * Photo 4x6. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PAGE_PHOTO_4X6 = 8, - - /** - * Photo 5x7. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PAGE_PHOTO_5X7 = 9, - - /** - * Envelope INT DL. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PAGE_INT_DL_ENVELOPE = 10, - - /** - * Tabloid B. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PAGE_B_TABLOID = 11, - } -@@ -964,41 +1069,47 @@ declare namespace print { - * Enumeration of Print Document Adapter State. - * @enum { number } PrintDocumentAdapterState - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PrintDocumentAdapterState { - /** - * Preview failed. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PREVIEW_DESTROY = 0, - - /** - * Print state is succeed. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_TASK_SUCCEED = 1, - - /** - * Print state is fail. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_TASK_FAIL = 2, - - /** - * Print state is cancel. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_TASK_CANCEL = 3, - - /** - * Print state is block. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_TASK_BLOCK = 4, - } -@@ -1007,27 +1118,31 @@ declare namespace print { - * Enumeration of Print File Creation State. - * @enum { number } PrintFileCreationState - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PrintFileCreationState { - /** - * Print file created success. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_FILE_CREATED = 0, - - /** - * Print file created fail. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_FILE_CREATION_FAILED = 1, - - /** - * Print file created success but unrendered. - * @syscap SystemCapability.Print.PrintFramework -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_FILE_CREATED_UNRENDERED = 2, - } -@@ -1036,48 +1151,55 @@ declare namespace print { - * Enumeration of Printer State. - * @enum { number } PrinterState - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PrinterState { - /** - * New printers arrival. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINTER_ADDED = 0, - - /** - * Printer lost. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINTER_REMOVED = 1, - - /** - * Printer update. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINTER_CAPABILITY_UPDATED = 2, - - /** - * Printer has been connected. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINTER_CONNECTED = 3, - - /** - * Printer has been disconnected. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINTER_DISCONNECTED = 4, - - /** - * Printer is working. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINTER_RUNNING = 5, - } -@@ -1086,41 +1208,47 @@ declare namespace print { - * Enumeration of Print Job State. - * @enum { number } PrintJobState - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PrintJobState { - /** - * Initial state of print job. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_PREPARE = 0, - - /** - * Deliver print job to the printer. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_QUEUED = 1, - - /** - * Executing print job. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_RUNNING = 2, - - /** - * Print job has been blocked. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCKED = 3, - - /** - * Print job completed. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_COMPLETED = 4, - } -@@ -1129,202 +1257,231 @@ declare namespace print { - * Enumeration of Print Job Sub State. - * @enum { number } PrintJobSubState - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PrintJobSubState { - /** - * Print job succeed. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_COMPLETED_SUCCESS = 0, - - /** - * Print job fail. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_COMPLETED_FAILED = 1, - - /** - * Print job has been cancelled. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_COMPLETED_CANCELLED = 2, - - /** - * Print job has been corrupted. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_COMPLETED_FILE_CORRUPTED = 3, - - /** - * Print is offline. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_OFFLINE = 4, - - /** - * Print is occupied by other process. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_BUSY = 5, - - /** - * Print job has been cancelled. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_CANCELLED = 6, - - /** - * Print out of paper. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_OUT_OF_PAPER = 7, - - /** - * Print out of ink. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_OUT_OF_INK = 8, - - /** - * Print out of toner. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_OUT_OF_TONER = 9, - - /** - * Print paper jam. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_JAMMED = 10, - - /** - * Print cover open. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_DOOR_OPEN = 11, - - /** - * Print service request. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_SERVICE_REQUEST = 12, - - /** - * Print low on ink. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_LOW_ON_INK = 13, - - /** - * Print low on toner. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_LOW_ON_TONER = 14, - - /** - * Print really low on ink. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_REALLY_LOW_ON_INK = 15, - - /** - * Print bad certification. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_BAD_CERTIFICATE = 16, - - /** - * Print an error occurred when printing the account. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_ACCOUNT_ERROR = 18, - - /** - * Print the printing permission is abnormal. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_PRINT_PERMISSION_ERROR = 19, - - /** - * Print color printing permission exception. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_PRINT_COLOR_PERMISSION_ERROR = 20, - - /** - * Print the device is not connected to the network. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_NETWORK_ERROR = 21, - - /** - * Print unable to connect to the server. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_SERVER_CONNECTION_ERROR = 22, - - /** - * Print large file exception. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_LARGE_FILE_ERROR = 23, - - /** - * Print file parsing exception. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_FILE_PARSING_ERROR = 24, - - /** - * Print the file conversion is too slow. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_SLOW_FILE_CONVERSION = 25, - - /** - * Print uploading file. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_RUNNING_UPLOADING_FILES = 26, - - /** - * Print converting files. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_RUNNING_CONVERTING_FILES = 27, - - /** - * Print unknown issue. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINT_JOB_BLOCK_UNKNOWN = 99, - } -@@ -1333,76 +1490,87 @@ declare namespace print { - * Enumeration of Print error Code. - * @enum { number } PrintErrorCode - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PrintErrorCode { - /** - * No error. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - E_PRINT_NONE = 0, - - /** - * No permission. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - E_PRINT_NO_PERMISSION = 201, - - /** - * Invalid parameter. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - E_PRINT_INVALID_PARAMETER = 401, - - /** - * Generic failure of print. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - E_PRINT_GENERIC_FAILURE = 13100001, - - /** - * RPC failure. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - E_PRINT_RPC_FAILURE = 13100002, - - /** - * Failure of print service. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - E_PRINT_SERVER_FAILURE = 13100003, - - /** - * Invalid print extension. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - E_PRINT_INVALID_EXTENSION = 13100004, - - /** - * Invalid printer. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - E_PRINT_INVALID_PRINTER = 13100005, - - /** - * Invalid print job. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - E_PRINT_INVALID_PRINT_JOB = 13100006, - - /** - * File i/o error. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - E_PRINT_FILE_IO = 13100007, - } -@@ -1411,27 +1579,31 @@ declare namespace print { - * Enumeration of application event. - * @enum { number } ApplicationEvent - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum ApplicationEvent { - /** - * Application created. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - APPLICATION_CREATED = 0, - - /** - * Application closed for printing started. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - APPLICATION_CLOSED_FOR_STARTED = 1, - - /** - * Application closed for printing canceled. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - APPLICATION_CLOSED_FOR_CANCELED = 2, - } -@@ -1441,7 +1613,8 @@ declare namespace print { - * @typedef PrinterExtensionInfo - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PrinterExtensionInfo { - /** -@@ -1449,7 +1622,8 @@ declare namespace print { - * @type { string } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - extensionId: string; - -@@ -1458,7 +1632,8 @@ declare namespace print { - * @type { string } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - vendorId: string; - -@@ -1467,7 +1642,8 @@ declare namespace print { - * @type { string } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - vendorName: string; - -@@ -1476,7 +1652,8 @@ declare namespace print { - * @type { number } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - vendorIcon: number; - -@@ -1485,7 +1662,8 @@ declare namespace print { - * @type { string } - * @syscap SystemCapability.Print.PrintFramework - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - version: string; - } -@@ -1498,7 +1676,8 @@ declare namespace print { - * @throws { BusinessError } 202 - not system application - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function queryAllPrinterExtensionInfos(callback: AsyncCallback>): void; - -@@ -1510,7 +1689,8 @@ declare namespace print { - * @throws { BusinessError } 202 - not system application - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function queryAllPrinterExtensionInfos(): Promise>; - -@@ -1525,7 +1705,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function startDiscoverPrinter(extensionList: Array, callback: AsyncCallback): void; - -@@ -1540,7 +1721,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function startDiscoverPrinter(extensionList: Array): Promise; - -@@ -1552,7 +1734,8 @@ declare namespace print { - * @throws { BusinessError } 202 - not system application - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function stopDiscoverPrinter(callback: AsyncCallback): void; - -@@ -1564,7 +1747,8 @@ declare namespace print { - * @throws { BusinessError } 202 - not system application - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function stopDiscoverPrinter(): Promise; - -@@ -1578,7 +1762,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function connectPrinter(printerId: string, callback: AsyncCallback): void; - -@@ -1592,7 +1777,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function connectPrinter(printerId: string): Promise; - -@@ -1606,7 +1792,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function disconnectPrinter(printerId: string, callback: AsyncCallback): void; - -@@ -1620,7 +1807,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function disconnectPrinter(printerId: string): Promise; - -@@ -1634,7 +1822,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function queryPrinterCapability(printerId: string, callback: AsyncCallback): void; - -@@ -1648,7 +1837,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function queryPrinterCapability(printerId: string): Promise; - -@@ -1662,7 +1852,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function startPrintJob(jobInfo: PrintJob, callback: AsyncCallback): void; - -@@ -1676,7 +1867,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function startPrintJob(jobInfo: PrintJob): Promise; - -@@ -1690,7 +1882,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function cancelPrintJob(jobId: string, callback: AsyncCallback): void; - -@@ -1704,7 +1897,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function cancelPrintJob(jobId: string): Promise; - -@@ -1718,7 +1912,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function requestPrintPreview(jobInfo: PrintJob, callback: Callback): void; - -@@ -1732,7 +1927,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function requestPrintPreview(jobInfo: PrintJob): Promise; - -@@ -1746,7 +1942,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'printerStateChange', callback: (state: PrinterState, info: PrinterInfo) => void): void; - -@@ -1760,7 +1957,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'printerStateChange', callback?: Callback): void; - -@@ -1774,7 +1972,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'jobStateChange', callback: (state: PrintJobState, job: PrintJob) => void): void; - -@@ -1788,7 +1987,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'jobStateChange', callback?: Callback): void; - -@@ -1802,7 +2002,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'extInfoChange', callback: (extensionId: string, info: string) => void): void; - -@@ -1816,7 +2017,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'extInfoChange', callback?: Callback): void; - -@@ -1830,7 +2032,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function addPrinters(printers: Array, callback: AsyncCallback): void; - -@@ -1844,7 +2047,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function addPrinters(printers: Array): Promise; - -@@ -1858,7 +2062,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function removePrinters(printerIds: Array, callback: AsyncCallback): void; - -@@ -1872,7 +2077,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function removePrinters(printerIds: Array): Promise; - -@@ -1886,7 +2092,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function updatePrinters(printers: Array, callback: AsyncCallback): void; - -@@ -1900,7 +2107,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function updatePrinters(printers: Array): Promise; - -@@ -1915,7 +2123,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function updatePrinterState(printerId: string, state: PrinterState, callback: AsyncCallback): void; - -@@ -1930,7 +2139,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function updatePrinterState(printerId: string, state: PrinterState): Promise; - -@@ -1946,7 +2156,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function updatePrintJobState(jobId: string, state: PrintJobState, subState: PrintJobSubState, callback: AsyncCallback): void; - -@@ -1962,7 +2173,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function updatePrintJobState(jobId: string, state: PrintJobState, subState: PrintJobSubState): Promise; - -@@ -1976,7 +2188,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function updateExtensionInfo(info: string, callback: AsyncCallback): void; - -@@ -1990,7 +2203,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function updateExtensionInfo(info: string): Promise; - -@@ -2002,7 +2216,8 @@ declare namespace print { - * @throws { BusinessError } 202 - not system application - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - * @deprecated since 11 - * @useinstead print#queryPrintJobList - */ -@@ -2016,7 +2231,8 @@ declare namespace print { - * @throws { BusinessError } 202 - not system application - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - * @deprecated since 11 - * @useinstead print#queryPrintJobList - */ -@@ -2030,7 +2246,8 @@ declare namespace print { - * @throws { BusinessError } 202 - not system application - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function queryPrintJobList(callback: AsyncCallback>): void; - -@@ -2042,7 +2259,8 @@ declare namespace print { - * @throws { BusinessError } 202 - not system application - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function queryPrintJobList(): Promise>; - -@@ -2056,7 +2274,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function queryPrintJobById(jobId: string, callback: AsyncCallback): void; - -@@ -2070,7 +2289,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function queryPrintJobById(jobId: string): Promise; - -@@ -2086,7 +2306,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function startGettingPrintFile(jobId: string, printAttributes: PrintAttributes, fd: number, - onFileStateChanged: Callback): void; -@@ -2102,7 +2323,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function notifyPrintService(jobId: string, type: 'spooler_closed_for_cancelled' | 'spooler_closed_for_started', callback: AsyncCallback): void; - -@@ -2117,7 +2339,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 11 -+ * @since arkts {'1.1':'11','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function notifyPrintService(jobId: string, type: 'spooler_closed_for_cancelled' | 'spooler_closed_for_started'): Promise; - -@@ -2129,7 +2352,8 @@ declare namespace print { - * @throws { BusinessError } 202 - not system application - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAddedPrinters(): Promise>; - -@@ -2143,7 +2367,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getPrinterInfoById(printerId: string): Promise; - -@@ -2157,7 +2382,8 @@ declare namespace print { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function notifyPrintServiceEvent(event: ApplicationEvent): Promise; - -@@ -2169,7 +2395,8 @@ declare namespace print { - * @throws { BusinessError } 201 - the application does not have permission to call this function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function addPrinterToDiscovery(printerInformation: PrinterInformation): Promise; - -@@ -2181,7 +2408,8 @@ declare namespace print { - * @throws { BusinessError } 201 - the application does not have permission to call this function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function updatePrinterInDiscovery(printerInformation: PrinterInformation): Promise; - -@@ -2193,7 +2421,8 @@ declare namespace print { - * @throws { BusinessError } 201 - the application does not have permission to call this function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function removePrinterFromDiscovery(printerId: string): Promise; - -@@ -2205,7 +2434,8 @@ declare namespace print { - * @throws { BusinessError } 201 - the application does not have permission to call this function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getPrinterInformationById(printerId: string): Promise; - -@@ -2213,14 +2443,16 @@ declare namespace print { - * defines printer information. - * @typedef PrinterInformation - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PrinterInformation { - /** - * Printer id. - * @type { string } - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - printerId: string; - -@@ -2228,7 +2460,8 @@ declare namespace print { - * Printer name. - * @type { string } - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - printerName: string; - -@@ -2236,7 +2469,8 @@ declare namespace print { - * Current printer status. - * @type { PrinterStatus } - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - printerStatus: PrinterStatus; - -@@ -2244,7 +2478,8 @@ declare namespace print { - * Printer description. - * @type { ?string } - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - description?: string; - -@@ -2252,7 +2487,8 @@ declare namespace print { - * Printer capabilities. - * @type { ?PrinterCapabilities } - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - capability?: PrinterCapabilities; - -@@ -2260,7 +2496,8 @@ declare namespace print { - * Printer uri. - * @type { ?string } - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - uri?: string; - -@@ -2268,7 +2505,8 @@ declare namespace print { - * Printer make. - * @type { ?string } - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - printerMake?: string; - -@@ -2276,7 +2514,8 @@ declare namespace print { - * Detail information in json format. - * @type { ?string } - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - options?: string; - } -@@ -2285,14 +2524,16 @@ declare namespace print { - * defines printer capabilities. - * @typedef PrinterCapabilities - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PrinterCapabilities { - /** - * The page size list supported by the printer. - * @type { Array } - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - supportedPageSizes: Array; - -@@ -2300,7 +2541,8 @@ declare namespace print { - * Array of supported color mode. - * @type { Array } - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - supportedColorModes: Array; - -@@ -2308,7 +2550,8 @@ declare namespace print { - * Array of supported duplex mode. - * @type { Array } - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - supportedDuplexModes: Array; - -@@ -2316,7 +2559,8 @@ declare namespace print { - * Array of supported print media types. - * @type { ?Array } - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - supportedMediaTypes?: Array; - -@@ -2324,7 +2568,8 @@ declare namespace print { - * Array of supported print quality. - * @type { ?Array } - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - supportedQualities?: Array; - -@@ -2332,7 +2577,8 @@ declare namespace print { - * Array of supported print orientation. - * @type { ?Array } - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - supportedOrientations?: Array; - -@@ -2340,7 +2586,8 @@ declare namespace print { - * Advanced capability in json format. - * @type { ?string } - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - options?: string; - } -@@ -2349,27 +2596,31 @@ declare namespace print { - * Enumeration of Print Quality. - * @enum { number } PrintQuality - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PrintQuality { - /** - * Draft quality mode. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - QUALITY_DRAFT = 3, - - /** - * Normal quality mode. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - QUALITY_NORMAL = 4, - - /** - * High quality mode. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - QUALITY_HIGH = 5, - } -@@ -2378,41 +2629,47 @@ declare namespace print { - * Enumeration of Print OrientationMode. - * @enum { number } PrintOrientationMode - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PrintOrientationMode { - /** - * Portrait mode. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ORIENTATION_MODE_PORTRAIT = 0, - - /** - * Landscape mode. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ORIENTATION_MODE_LANDSCAPE= 1, - - /** - * Reverse landscape mode. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ORIENTATION_MODE_REVERSE_LANDSCAPE = 2, - - /** - * Reverse portrait mode. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ORIENTATION_MODE_REVERSE_PORTRAIT = 3, - - /** - * Not specified. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ORIENTATION_MODE_NONE = 4, - } -@@ -2421,27 +2678,31 @@ declare namespace print { - * Enumeration of Printer Status. - * @enum { number } PrinterStatus - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum PrinterStatus { - /** - * Printer idle. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINTER_IDLE = 0, - - /** - * Printer busy. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINTER_BUSY = 1, - - /** - * Printer not available. - * @syscap SystemCapability.Print.PrintFramework -- * @since 14 -+ * @since arkts {'1.1':'14','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PRINTER_UNAVAILABLE = 2, - } -diff --git a/api/@ohos.privacyManager.d.ts b/api/@ohos.privacyManager.d.ts -index 43e9ff36d..747ccfd6d 100644 ---- a/api/@ohos.privacyManager.d.ts -+++ b/api/@ohos.privacyManager.d.ts -@@ -20,9 +20,6 @@ - - import { AsyncCallback, Callback } from './@ohos.base'; - import { Permissions } from './permissions'; --/*** if arkts 1.1 */ --import { int } from '@ohos.base'; --/*** endif */ - - /** - * @namespace privacyManager -@@ -45,7 +42,7 @@ declare namespace privacyManager { - * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. - * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, the permissionName exceeds 256 characters, or the count value is invalid. - * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. -- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. -+ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. - * @throws { BusinessError } 12100007 - The service is abnormal. - * @throws { BusinessError } 12100008 - Out of memory. - * @syscap SystemCapability.Security.AccessToken -@@ -68,7 +65,7 @@ declare namespace privacyManager { - * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, the permissionName exceeds 256 characters, the count value is invalid, - * or usedType in AddPermissionUsedRecordOptions is invalid. - * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. -- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. -+ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. - * @throws { BusinessError } 12100007 - The service is abnormal. - * @throws { BusinessError } 12100008 - Out of memory. - * @syscap SystemCapability.Security.AccessToken -@@ -98,7 +95,7 @@ declare namespace privacyManager { - * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. - * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, the permissionName exceeds 256 characters, or the count value is invalid. - * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. -- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. -+ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. - * @throws { BusinessError } 12100007 - The service is abnormal. - * @throws { BusinessError } 12100008 - Out of memory. - * @syscap SystemCapability.Security.AccessToken -@@ -125,12 +122,13 @@ declare namespace privacyManager { - * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. - * @throws { BusinessError } 12100001 - Invalid parameter. The value of flag in request is invalid. - * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. -- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. -+ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. - * @throws { BusinessError } 12100007 - The service is abnormal. - * @throws { BusinessError } 12100008 - Out of memory. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getPermissionUsedRecord(request: PermissionUsedRequest): Promise; - -@@ -145,12 +143,13 @@ declare namespace privacyManager { - * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. - * @throws { BusinessError } 12100001 - Invalid parameter. The value of flag in request is invalid. - * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. -- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. -+ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. - * @throws { BusinessError } 12100007 - The service is abnormal. - * @throws { BusinessError } 12100008 - Out of memory. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getPermissionUsedRecord( - request: PermissionUsedRequest, -@@ -161,7 +160,7 @@ declare namespace privacyManager { - * Start using sensitive permission. - * - * @permission ohos.permission.PERMISSION_USED_STATS -- * @param { number } tokenID - Token ID of the application. -+ * @param { int } tokenID - Token ID of the application. - * @param { Permissions } permissionName - Name of the permission to be started. - * @returns { Promise } Promise that returns no value. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. -@@ -169,44 +168,46 @@ declare namespace privacyManager { - * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. - * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, the permissionName exceeds 256 characters, or the count value is invalid. - * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. -- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. -+ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. - * @throws { BusinessError } 12100004 - The API is used repeatedly with the same input. - * It means the application specified by the tokenID has been using the specified permission. - * @throws { BusinessError } 12100007 - The service is abnormal. - * @throws { BusinessError } 12100008 - Out of memory. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function startUsingPermission(tokenID: number, permissionName: Permissions): Promise; -+ function startUsingPermission(tokenID: int, permissionName: Permissions): Promise; - - /** - * Start using sensitive permission. - * - * @permission ohos.permission.PERMISSION_USED_STATS -- * @param { number } tokenID - Token ID of the application. -+ * @param { int } tokenID - Token ID of the application. - * @param { Permissions } permissionName - Name of the permission to be started. -- * @param { number } pid - Pid of the application, default -1. -- * @param { PermissionUsedType } usedType - Used type of the permission accessed, default NORMAL_TYPE. -+ * @param { int } [pid] - Pid of the application, default -1. -+ * @param { PermissionUsedType } [usedType] - Used type of the permission accessed, default NORMAL_TYPE. - * @returns { Promise } Promise that returns no value. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.PERMISSION_USED_STATS". - * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. - * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, the permissionName exceeds 256 characters, or the count value is invalid. - * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. -- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. -+ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. - * @throws { BusinessError } 12100004 - The API is used repeatedly with the same input. - * It means the application specified by the tokenID has been using the specified permission. - * @throws { BusinessError } 12100007 - The service is abnormal. - * @throws { BusinessError } 12100008 - Out of memory. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function startUsingPermission( -- tokenID: number, -+ tokenID: int, - permissionName: Permissions, -- pid?: number, -+ pid?: int, - usedType?: PermissionUsedType - ): Promise; - -@@ -214,7 +215,7 @@ declare namespace privacyManager { - * Start using sensitive permission. - * - * @permission ohos.permission.PERMISSION_USED_STATS -- * @param { number } tokenID - Token ID of the application. -+ * @param { int } tokenID - Token ID of the application. - * @param { Permissions } permissionName - Name of the permission to be started. - * @param { AsyncCallback } callback - Asynchronous callback interface. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. -@@ -222,22 +223,23 @@ declare namespace privacyManager { - * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. - * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, the permissionName exceeds 256 characters, or the count value is invalid. - * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. -- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. -+ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. - * @throws { BusinessError } 12100004 - The API is used repeatedly with the same input. - * It means the application specified by the tokenID has been using the specified permission. - * @throws { BusinessError } 12100007 - The service is abnormal. - * @throws { BusinessError } 12100008 - Out of memory. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function startUsingPermission(tokenID: number, permissionName: Permissions, callback: AsyncCallback): void; -+ function startUsingPermission(tokenID: int, permissionName: Permissions, callback: AsyncCallback): void; - - /** - * Stop using sensitive permission. - * - * @permission ohos.permission.PERMISSION_USED_STATS -- * @param { number } tokenID - Token ID of the application. -+ * @param { int } tokenID - Token ID of the application. - * @param { Permissions } permissionName - Name of the permission to be stopped. - * @returns { Promise } Promise that returns no value. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. -@@ -245,48 +247,50 @@ declare namespace privacyManager { - * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. - * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, the permissionName exceeds 256 characters, or the count value is invalid. - * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. -- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. -+ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. - * @throws { BusinessError } 12100004 - The API is not used in pair with 'startUsingPermission'. - * @throws { BusinessError } 12100007 - The service is abnormal. - * @throws { BusinessError } 12100008 - Out of memory. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function stopUsingPermission(tokenID: number, permissionName: Permissions): Promise; -+ function stopUsingPermission(tokenID: int, permissionName: Permissions): Promise; - - /** - * Stop using sensitive permission. - * - * @permission ohos.permission.PERMISSION_USED_STATS -- * @param { number } tokenID - Token ID of the application. -+ * @param { int } tokenID - Token ID of the application. - * @param { Permissions } permissionName - Name of the permission to be stopped. -- * @param { number } pid - Pid of the application, default -1. -+ * @param { int } [pid] - Pid of the application, default -1. - * @returns { Promise } Promise that returns no value. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.PERMISSION_USED_STATS". - * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. - * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, the permissionName exceeds 256 characters, or the count value is invalid. - * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. -- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. -+ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. - * @throws { BusinessError } 12100004 - The API is not used in pair with 'startUsingPermission'. - * @throws { BusinessError } 12100007 - The service is abnormal. - * @throws { BusinessError } 12100008 - Out of memory. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function stopUsingPermission( -- tokenID: number, -+ tokenID: int, - permissionName: Permissions, -- pid?: number -+ pid?: int - ): Promise; - - /** - * Stop using sensitive permission. - * - * @permission ohos.permission.PERMISSION_USED_STATS -- * @param { number } tokenID - Token ID of the application. -+ * @param { int } tokenID - Token ID of the application. - * @param { Permissions } permissionName - Name of the permission to be stopped. - * @param { AsyncCallback } callback - Asynchronous callback interface. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. -@@ -294,15 +298,16 @@ declare namespace privacyManager { - * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. - * @throws { BusinessError } 12100001 - Invalid parameter. The tokenID is 0, the permissionName exceeds 256 characters, or the count value is invalid. - * @throws { BusinessError } 12100002 - The specified tokenID does not exist or refer to an application process. -- * @throws { BusinessError } 12100003 - The specified permission does not exist or is not an user_grant permission. -+ * @throws { BusinessError } 12100003 - The specified permission does not exist or is not a user_grant permission. - * @throws { BusinessError } 12100004 - The API is not used in pair with 'startUsingPermission'. - * @throws { BusinessError } 12100007 - The service is abnormal. - * @throws { BusinessError } 12100008 - Out of memory. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function stopUsingPermission(tokenID: number, permissionName: Permissions, callback: AsyncCallback): void; -+ function stopUsingPermission(tokenID: int, permissionName: Permissions, callback: AsyncCallback): void; - - /** - * Subscribes to the change of active state of the specified permission. -@@ -336,7 +341,7 @@ declare namespace privacyManager { - * @permission ohos.permission.PERMISSION_USED_STATS - * @param { 'activeStateChange' } type - Event type. This parameter cannot change. - * @param { Array } permissionList - Indicates the permission list, which are specified. This parameter cannot be null or empty. -- * @param { Callback } callback - Callback for listening permission change. -+ * @param { Callback } [callback] - Callback for listening permission change. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types. - * @throws { BusinessError } 201 - Permission denied. Interface caller does not have permission "ohos.permission.PERMISSION_USED_STATS". - * @throws { BusinessError } 202 - Not system app. Interface caller is not a system app. -@@ -359,7 +364,7 @@ declare namespace privacyManager { - * Obtains the used type of the permission accessed. - * - * @permission ohos.permission.PERMISSION_USED_STATS -- * @param { number } tokenId - Token ID of the application. By default, all token IDs of the device are returned. -+ * @param { int } tokenId - Token ID of the application. By default, all token IDs of the device are returned. - * @param { Permissions } permissionName - Name of the permission to query. By default, all permissions of the device are returned. - * @returns { Promise> } Promise used to return the information obtained. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Incorrect parameter types. -@@ -370,9 +375,10 @@ declare namespace privacyManager { - * @throws { BusinessError } 12100003 - The input permissionName does not exist. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getPermissionUsedTypeInfos(tokenId?: number, permissionName?: Permissions): Promise>; -+ function getPermissionUsedTypeInfos(tokenId?: int, permissionName?: Permissions): Promise>; - - /** - * Sets the toggle state of permission access records for the current user. -@@ -387,7 +393,8 @@ declare namespace privacyManager { - * @throws { BusinessError } 12100009 - Common inner error. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setPermissionUsedRecordToggleStatus(status: boolean): Promise; - -@@ -401,7 +408,8 @@ declare namespace privacyManager { - * @throws { BusinessError } 12100007 - The service is abnormal. - * @syscap SystemCapability.Security.AccessToken - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getPermissionUsedRecordToggleStatus(): Promise; - -@@ -622,26 +630,26 @@ declare namespace privacyManager { - /** - * The begin time, in milliseconds - * -- * @type { ?int } -+ * @type { ?long } - * @default 0 - * @syscap SystemCapability.Security.AccessToken - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- beginTime?: int; -+ beginTime?: long; - - /** - * The end time, in milliseconds - * -- * @type { ?int } -+ * @type { ?long } - * @default 0 - * @syscap SystemCapability.Security.AccessToken - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- endTime?: int; -+ endTime?: long; - - /** - * The permission usage flag -@@ -668,24 +676,24 @@ declare namespace privacyManager { - /** - * The begin time, in milliseconds - * -- * @type { int } -+ * @type { long } - * @syscap SystemCapability.Security.AccessToken - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- beginTime: int; -+ beginTime: long; - - /** - * The end time, in milliseconds - * -- * @type { int } -+ * @type { long } - * @syscap SystemCapability.Security.AccessToken - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- endTime: int; -+ endTime: long; - - /** - * The list of permission used records of bundle -@@ -811,35 +819,35 @@ declare namespace privacyManager { - /** - * The last access time, in milliseconds - * -- * @type { int } -+ * @type { long } - * @syscap SystemCapability.Security.AccessToken - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- lastAccessTime: int; -+ lastAccessTime: long; - - /** - * The last reject time, in milliseconds - * -- * @type { int } -+ * @type { long } - * @syscap SystemCapability.Security.AccessToken - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- lastRejectTime: int; -+ lastRejectTime: long; - - /** - * The last access duration, in milliseconds - * -- * @type { int } -+ * @type { long } - * @syscap SystemCapability.Security.AccessToken - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- lastAccessDuration: int; -+ lastAccessDuration: long; - - /** - * The list of access records of details -@@ -899,13 +907,13 @@ declare namespace privacyManager { - /** - * Timestamp, in milliseconds - * -- * @type { int } -+ * @type { long } - * @syscap SystemCapability.Security.AccessToken - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- timestamp: int; -+ timestamp: long; - - /** - * The value of successCount or failCount passed in to addPermissionUsedRecord. -@@ -921,13 +929,13 @@ declare namespace privacyManager { - /** - * Access duration, in milliseconds - * -- * @type { int } -+ * @type { long } - * @syscap SystemCapability.Security.AccessToken - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- accessDuration: int; -+ accessDuration: long; - - /** - * Used type of the permission accessed. -diff --git a/api/@ohos.promptAction.d.ts b/api/@ohos.promptAction.d.ts -index b70ac894f..21fac37c3 100644 ---- a/api/@ohos.promptAction.d.ts -+++ b/api/@ohos.promptAction.d.ts -@@ -29,6 +29,7 @@ import { BlurStyle, ShadowOptions, ShadowStyle, HoverModeAreaType, Rectangle, Tr - BackgroundBlurStyleOptions, BackgroundEffectOptions } from './arkui/component/common'; - import { CustomBuilder } from './arkui/component/builder'; - import { DialogAlignment } from './arkui/component/alertDialog'; -+import { DismissDialogAction } from './arkui/component/actionSheet'; - import { BorderStyle,Alignment } from './arkui/component/enums'; - import { Resource } from './global/resource'; - import { LengthMetrics } from './arkui/Graphics'; -@@ -2403,8 +2404,7 @@ declare namespace promptAction { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - export declare interface DismissDialogAction { - /** -@@ -2414,8 +2414,7 @@ export declare interface DismissDialogAction { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - dismiss: Callback; - -@@ -2426,8 +2425,7 @@ export declare interface DismissDialogAction { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - reason: DismissReason; - } -diff --git a/api/@ohos.resourceManager.d.ts b/api/@ohos.resourceManager.d.ts -index 16299a3c4..483da08c7 100644 ---- a/api/@ohos.resourceManager.d.ts -+++ b/api/@ohos.resourceManager.d.ts -@@ -2448,7 +2448,6 @@ declare namespace resourceManager { - * @param { number } resId - Indicates the resource ID. - * @param { (string | number)[] } args - Indicates the formatting string resource parameters. - * @returns { string } The character string corresponding to the resource ID. -- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. - * @throws { BusinessError } 9001001 - Invalid resource ID. - * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. - * @throws { BusinessError } 9001006 - The resource is referenced cyclically. -@@ -2548,13 +2547,11 @@ declare namespace resourceManager { - * @param { Resource } resource - Indicates the resource object. - * @param { (string | number)[] } args - Indicates the formatting string resource parameters. - * @returns { string } The character string corresponding to the resource object. -- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. - * @throws { BusinessError } 9001001 - Invalid resource ID. - * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. - * @throws { BusinessError } 9001006 - The resource is referenced cyclically. - * @throws { BusinessError } 9001007 - Failed to format the resource obtained based on the resource ID. - * @syscap SystemCapability.Global.ResourceManager -- * @stagemodelonly - * @crossplatform - * @atomicservice - * @since 20 -@@ -2643,7 +2640,6 @@ declare namespace resourceManager { - * @param { string } resName - Indicates the resource name. - * @param { (string | number)[] } args - Indicates the formatting string resource parameters. - * @returns { string } The character string corresponding to the resource name. -- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. - * @throws { BusinessError } 9001003 - Invalid resource name. - * @throws { BusinessError } 9001004 - No matching resource is found based on the resource name. - * @throws { BusinessError } 9001006 - The resource is referenced cyclically. -@@ -3219,7 +3215,6 @@ declare namespace resourceManager { - * @param { Array } args - Indicates the formatting string resource parameters. - * @returns { string } The singular-plural character string represented by the ID string - * corresponding to the specified number. -- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. - * @throws { BusinessError } 9001001 - Invalid resource ID. - * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. - * @throws { BusinessError } 9001006 - The resource is referenced cyclically. -@@ -3240,7 +3235,6 @@ declare namespace resourceManager { - * @param { (string | number)[] } args - Indicates the formatting string resource parameters. - * @returns { string } The singular-plural character string represented by the ID string - * corresponding to the specified number. -- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. - * @throws { BusinessError } 9001001 - Invalid resource ID. - * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. - * @throws { BusinessError } 9001006 - The resource is referenced cyclically. -@@ -3262,7 +3256,6 @@ declare namespace resourceManager { - * @param { Array } args - Indicates the formatting string resource parameters. - * @returns { string } The singular-plural character string represented by the ID string - * corresponding to the specified number. -- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. - * @throws { BusinessError } 9001001 - Invalid resource ID. - * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. - * @throws { BusinessError } 9001006 - The resource is referenced cyclically. -@@ -3284,13 +3277,11 @@ declare namespace resourceManager { - * @param { (string | number)[] } args - Indicates the formatting string resource parameters. - * @returns { string } The singular-plural character string represented by the ID string - * corresponding to the specified number. -- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. - * @throws { BusinessError } 9001001 - Invalid resource ID. - * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. - * @throws { BusinessError } 9001006 - The resource is referenced cyclically. - * @throws { BusinessError } 9001007 - Failed to format the resource obtained based on the resource ID. - * @syscap SystemCapability.Global.ResourceManager -- * @stagemodelonly - * @crossplatform - * @atomicservice - * @since 20 -@@ -3307,7 +3298,6 @@ declare namespace resourceManager { - * @param { Array } args - Indicates the formatting string resource parameters. - * @returns { string } The singular-plural character string represented by the name string - * corresponding to the specified number. -- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. - * @throws { BusinessError } 9001003 - Invalid resource name. - * @throws { BusinessError } 9001004 - No matching resource is found based on the resource name. - * @throws { BusinessError } 9001006 - The resource is referenced cyclically. -@@ -3328,7 +3318,6 @@ declare namespace resourceManager { - * @param { (string | number)[] } args - Indicates the formatting string resource parameters. - * @returns { string } The singular-plural character string represented by the name string - * corresponding to the specified number. -- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. - * @throws { BusinessError } 9001003 - Invalid resource name. - * @throws { BusinessError } 9001004 - No matching resource is found based on the resource name. - * @throws { BusinessError } 9001006 - The resource is referenced cyclically. -@@ -3350,7 +3339,6 @@ declare namespace resourceManager { - * @param { Array } args - Indicates the formatting string resource parameters. - * @returns { string } The singular-plural character string represented by the ID string - * corresponding to the specified number. -- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. - * @throws { BusinessError } 9001001 - Invalid resource ID. - * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. - * @throws { BusinessError } 9001006 - The resource is referenced cyclically. -@@ -3371,7 +3359,6 @@ declare namespace resourceManager { - * @param { (string | number)[] } args - Indicates the formatting string resource parameters. - * @returns { string } The singular-plural character string represented by the ID string - * corresponding to the specified number. -- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. - * @throws { BusinessError } 9001001 - Invalid resource ID. - * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. - * @throws { BusinessError } 9001006 - The resource is referenced cyclically. -@@ -3393,7 +3380,6 @@ declare namespace resourceManager { - * @param { Array } args - Indicates the formatting string resource parameters. - * @returns { string } The singular-plural character string represented by the ID string - * corresponding to the specified number. -- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. - * @throws { BusinessError } 9001001 - Invalid resource ID. - * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. - * @throws { BusinessError } 9001006 - The resource is referenced cyclically. -@@ -3415,13 +3401,11 @@ declare namespace resourceManager { - * @param { (string | number)[] } args - Indicates the formatting string resource parameters. - * @returns { string } The singular-plural character string represented by the ID string - * corresponding to the specified number. -- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. - * @throws { BusinessError } 9001001 - Invalid resource ID. - * @throws { BusinessError } 9001002 - No matching resource is found based on the resource ID. - * @throws { BusinessError } 9001006 - The resource is referenced cyclically. - * @throws { BusinessError } 9001007 - Failed to format the resource obtained based on the resource ID. - * @syscap SystemCapability.Global.ResourceManager -- * @stagemodelonly - * @crossplatform - * @atomicservice - * @since 20 -@@ -3438,7 +3422,6 @@ declare namespace resourceManager { - * @param { Array } args - Indicates the formatting string resource parameters. - * @returns { string } The singular-plural character string represented by the name string - * corresponding to the specified number. -- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. - * @throws { BusinessError } 9001003 - Invalid resource name. - * @throws { BusinessError } 9001004 - No matching resource is found based on the resource name. - * @throws { BusinessError } 9001006 - The resource is referenced cyclically. -@@ -3459,7 +3442,6 @@ declare namespace resourceManager { - * @param { (string | number)[] } args - Indicates the formatting string resource parameters. - * @returns { string } The singular-plural character string represented by the name string - * corresponding to the specified number. -- * @throws { BusinessError } 401 - If the input parameter invalid. Possible causes: Incorrect parameter types. - * @throws { BusinessError } 9001003 - Invalid resource name. - * @throws { BusinessError } 9001004 - No matching resource is found based on the resource name. - * @throws { BusinessError } 9001006 - The resource is referenced cyclically. -diff --git a/api/@ohos.resourceschedule.backgroundProcessManager.d.ts b/api/@ohos.resourceschedule.backgroundProcessManager.d.ts -index 8e8c321e1..cf7bd44fb 100644 ---- a/api/@ohos.resourceschedule.backgroundProcessManager.d.ts -+++ b/api/@ohos.resourceschedule.backgroundProcessManager.d.ts -@@ -16,6 +16,7 @@ - /** - * @file - * @kit BackgroundTasksKit -+ * @arkts 1.1&1.2 - */ - - /** -@@ -23,22 +24,25 @@ - * - * @namespace backgroundProcessManager - * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager -- * @since 15 -+ * @since arkts{ '1.1':'17','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace backgroundProcessManager { - /** - * Describes the level of BackgroundProcessManager priority. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager -- * @since 15 -+ * @since arkts{ '1.1':'17','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum ProcessPriority { - /** - * Means the process has stopped working and in the background - * - * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager -- * @since 15 -+ * @since arkts{ '1.1':'17','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PROCESS_BACKGROUND = 1, - -@@ -46,7 +50,8 @@ declare namespace backgroundProcessManager { - * Means the process is working in the background - * - * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager -- * @since 15 -+ * @since arkts{ '1.1':'17','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PROCESS_INACTIVE = 2, - } -@@ -54,26 +59,26 @@ declare namespace backgroundProcessManager { - /** - * Set the priority of process. - * -- * @param { number } pid - Indicates the pid of the process to be set. -+ * @param { int } pid - Indicates the pid of the process to be set. - * @param { ProcessPriority } priority - Indicates the priority to set. Specific priority can be referenced ProcessPriority - * @returns { Promise } The promise returned by the function. - * @throws { BusinessError } 401 - Parameter error. Possible causes: priority is out of range. -- * @throws { BusinessError } 31800001 - remote error. Possible causes: remote is not work. - * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager -- * @since 15 -+ * @since arkts{ '1.1':'17','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function setProcessPriority(pid: number, priority: ProcessPriority): Promise; -+ function setProcessPriority(pid: int, priority: ProcessPriority): Promise; - - /** - * Reset the priority of process. - * -- * @param { number } pid - Indicates the pid of the process to be reset. -+ * @param { int } pid - Indicates the pid of the process to be reset. - * @returns { Promise } The promise returned by the function. -- * @throws { BusinessError } 31800001 - remote error. Possible causes: remote is not work. - * @syscap SystemCapability.Resourceschedule.BackgroundProcessManager -- * @since 15 -+ * @since arkts{ '1.1':'17','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function resetProcessPriority(pid: number): Promise; -+ function resetProcessPriority(pid: int): Promise; - } - - export default backgroundProcessManager; -diff --git a/api/@ohos.resourceschedule.backgroundTaskManager.d.ts b/api/@ohos.resourceschedule.backgroundTaskManager.d.ts -index 30b520de7..32ce9417a 100644 ---- a/api/@ohos.resourceschedule.backgroundTaskManager.d.ts -+++ b/api/@ohos.resourceschedule.backgroundTaskManager.d.ts -@@ -19,7 +19,12 @@ - */ - - import { AsyncCallback, Callback } from './@ohos.base'; --import { WantAgent } from './@ohos.wantAgent'; -+/*** if arkts 1.1 */ -+import { WantAgent } from '@ohos.wantAgent'; -+/*** endif */ -+/*** if arkts 1.2 */ -+import { WantAgent } from '@ohos.app.ability.wantAgent'; -+/*** endif */ - import Context from './application/BaseContext'; - import type notificationManager from './@ohos.notificationManager'; - -@@ -36,7 +41,8 @@ import type notificationManager from './@ohos.notificationManager'; - * @namespace backgroundTaskManager - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace backgroundTaskManager { - /** -@@ -44,7 +50,8 @@ declare namespace backgroundTaskManager { - * - * @interface DelaySuspendInfo - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface DelaySuspendInfo { - /** -@@ -52,7 +59,8 @@ declare namespace backgroundTaskManager { - * - * @type { number } - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - requestId: number; - /** -@@ -60,7 +68,8 @@ declare namespace backgroundTaskManager { - * - * @type { number } - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - actualDelayTime: number; - } -@@ -71,7 +80,8 @@ declare namespace backgroundTaskManager { - * @interface ContinuousTaskNotification - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ContinuousTaskNotification { - /** -@@ -80,7 +90,8 @@ declare namespace backgroundTaskManager { - * @type { notificationManager.SlotType } - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - slotType: notificationManager.SlotType; - /** -@@ -89,7 +100,8 @@ declare namespace backgroundTaskManager { - * @type { notificationManager.ContentType } - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - contentType: notificationManager.ContentType; - /** -@@ -98,14 +110,16 @@ declare namespace backgroundTaskManager { - * @type { number } - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - notificationId: number; - /** - * The continuous task id. - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - continuousTaskId?: number; - } -@@ -115,7 +129,8 @@ declare namespace backgroundTaskManager { - * - * @interface ContinuousTaskCancelInfo - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface ContinuousTaskCancelInfo { - /** -@@ -123,7 +138,8 @@ declare namespace backgroundTaskManager { - * - * @type { ContinuousTaskCancelReason } - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - reason: ContinuousTaskCancelReason; - -@@ -132,7 +148,8 @@ declare namespace backgroundTaskManager { - * - * @type { number } - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - id: number; - } -@@ -150,7 +167,8 @@ declare namespace backgroundTaskManager { - * @throws { BusinessError } 9900001 - Caller information verification failed for a transient task. - * @throws { BusinessError } 9900002 - Transient task verification failed. - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function cancelSuspendDelay(requestId: number): void; - -@@ -168,7 +186,8 @@ declare namespace backgroundTaskManager { - * @throws { BusinessError } 9900001 - Caller information verification failed for a transient task. - * @throws { BusinessError } 9900002 - Transient task verification failed. - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getRemainingDelayTime(requestId: number, callback: AsyncCallback): void; - -@@ -186,7 +205,8 @@ declare namespace backgroundTaskManager { - * @throws { BusinessError } 9900001 - Caller information verification failed for a transient task. - * @throws { BusinessError } 9900002 - Transient task verification failed. - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getRemainingDelayTime(requestId: number): Promise; - -@@ -205,7 +225,8 @@ declare namespace backgroundTaskManager { - * @throws { BusinessError } 9900001 - Caller information verification failed for a transient task. - * @throws { BusinessError } 9900002 - Transient task verification failed. - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.TransientTask -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function requestSuspendDelay(reason: string, callback: Callback): DelaySuspendInfo; - -@@ -254,7 +275,8 @@ declare namespace backgroundTaskManager { - * @throws { BusinessError } 9800007 - Continuous task storage failed. - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function startBackgroundRunning(context: Context, bgMode: BackgroundMode, wantAgent: WantAgent, callback: AsyncCallback): void; - -@@ -303,7 +325,8 @@ declare namespace backgroundTaskManager { - * @throws { BusinessError } 9800007 - Continuous task storage failed. - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function startBackgroundRunning(context: Context, bgMode: BackgroundMode, wantAgent: WantAgent): Promise; - -@@ -328,7 +351,8 @@ declare namespace backgroundTaskManager { - * @throws { BusinessError } 9800007 - Continuous task storage failed. - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function startBackgroundRunning(context: Context, bgModes: string[], wantAgent: WantAgent): Promise; - -@@ -351,7 +375,8 @@ declare namespace backgroundTaskManager { - * @throws { BusinessError } 9800007 - Continuous task storage failed. - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function updateBackgroundRunning(context: Context, bgModes: string[]): Promise; - -@@ -388,7 +413,8 @@ declare namespace backgroundTaskManager { - * @throws { BusinessError } 9800007 - Continuous task storage failed. - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function stopBackgroundRunning(context: Context, callback: AsyncCallback): void; - -@@ -425,7 +451,8 @@ declare namespace backgroundTaskManager { - * @throws { BusinessError } 9800007 - Continuous task storage failed. - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function stopBackgroundRunning(context: Context): Promise; - -@@ -444,7 +471,8 @@ declare namespace backgroundTaskManager { - * @throws { BusinessError } 18700001 - Caller information verification failed for an energy resource request. - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function applyEfficiencyResources(request: EfficiencyResourcesRequest): void; - -@@ -461,7 +489,8 @@ declare namespace backgroundTaskManager { - * @throws { BusinessError } 18700001 - Caller information verification failed for an energy resource request. - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function resetAllEfficiencyResources(): void; - -@@ -475,7 +504,8 @@ declare namespace backgroundTaskManager { - * @throws { BusinessError } 401 - Parameter error. Possible cause: 1. Callback parameter error; - *
    2. Register a exist callback type; 3. Parameter verification failed. - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function on(type: 'continuousTaskCancel', callback: Callback): void; - -@@ -489,7 +519,8 @@ declare namespace backgroundTaskManager { - * @throws { BusinessError } 401 - Parameter error. Possible cause: 1. Callback parameter error; - *
    2. Unregister type has not register; 3. Parameter verification failed. - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function off(type: 'continuousTaskCancel', callback?: Callback): void; - -@@ -506,14 +537,16 @@ declare namespace backgroundTaskManager { - * @enum { number } - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum BackgroundMode { - /** - * data transfer mode - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DATA_TRANSFER = 1, - -@@ -521,14 +554,16 @@ declare namespace backgroundTaskManager { - * audio playback mode - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - /** - * audio playback mode - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AUDIO_PLAYBACK = 2, - -@@ -536,7 +571,8 @@ declare namespace backgroundTaskManager { - * audio recording mode - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AUDIO_RECORDING = 3, - -@@ -544,7 +580,8 @@ declare namespace backgroundTaskManager { - * location mode - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LOCATION = 4, - -@@ -552,7 +589,8 @@ declare namespace backgroundTaskManager { - * bluetooth interaction mode - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BLUETOOTH_INTERACTION = 5, - -@@ -567,7 +605,8 @@ declare namespace backgroundTaskManager { - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MULTI_DEVICE_CONNECTION = 6, - -@@ -576,7 +615,8 @@ declare namespace backgroundTaskManager { - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WIFI_INTERACTION = 7, - -@@ -584,7 +624,8 @@ declare namespace backgroundTaskManager { - * Voice over Internet Phone mode - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - VOIP = 8, - -@@ -593,7 +634,8 @@ declare namespace backgroundTaskManager { - * only supported in particular device - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TASK_KEEPING = 9, - } -@@ -604,7 +646,8 @@ declare namespace backgroundTaskManager { - * @enum { number } - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum ResourceType { - /** -@@ -612,7 +655,8 @@ declare namespace backgroundTaskManager { - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CPU = 1, - -@@ -621,7 +665,8 @@ declare namespace backgroundTaskManager { - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - COMMON_EVENT = 1 << 1, - -@@ -630,7 +675,8 @@ declare namespace backgroundTaskManager { - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TIMER = 1 << 2, - -@@ -639,7 +685,8 @@ declare namespace backgroundTaskManager { - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WORK_SCHEDULER = 1 << 3, - -@@ -648,7 +695,8 @@ declare namespace backgroundTaskManager { - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BLUETOOTH = 1 << 4, - -@@ -657,7 +705,8 @@ declare namespace backgroundTaskManager { - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - GPS = 1 << 5, - -@@ -666,7 +715,8 @@ declare namespace backgroundTaskManager { - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AUDIO = 1 << 6, - -@@ -675,7 +725,8 @@ declare namespace backgroundTaskManager { - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RUNNING_LOCK = 1 << 7, - -@@ -684,7 +735,8 @@ declare namespace backgroundTaskManager { - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SENSOR = 1 << 8 - } -@@ -695,7 +747,8 @@ declare namespace backgroundTaskManager { - * @interface EfficiencyResourcesRequest - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface EfficiencyResourcesRequest { - /** -@@ -704,7 +757,8 @@ declare namespace backgroundTaskManager { - * @type { number } - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - resourceTypes: number; - -@@ -714,7 +768,8 @@ declare namespace backgroundTaskManager { - * @type { boolean } - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isApply: boolean; - -@@ -724,7 +779,8 @@ declare namespace backgroundTaskManager { - * @type { number } - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - timeOut: number; - -@@ -734,7 +790,8 @@ declare namespace backgroundTaskManager { - * @type { ?boolean } - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isPersist?: boolean; - -@@ -744,7 +801,8 @@ declare namespace backgroundTaskManager { - * @type { ?boolean } - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isProcess?: boolean; - -@@ -754,7 +812,8 @@ declare namespace backgroundTaskManager { - * @type { string } - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.EfficiencyResourcesApply - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - reason: string; - } -@@ -764,28 +823,32 @@ declare namespace backgroundTaskManager { - * - * @enum { number } - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum ContinuousTaskCancelReason { - /** - * User cancel. - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - USER_CANCEL = 1, - /** - * System cancel. - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SYSTEM_CANCEL = 2, - /** - * User remove notification. - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - USER_CANCEL_REMOVE_NOTIFICATION = 3, - -@@ -793,7 +856,8 @@ declare namespace backgroundTaskManager { - * Low network speed when request data transfer mode. - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SYSTEM_CANCEL_DATA_TRANSFER_LOW_SPEED = 4, - -@@ -801,7 +865,8 @@ declare namespace backgroundTaskManager { - * Not use avsession when request audio playback mode. - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SYSTEM_CANCEL_AUDIO_PLAYBACK_NOT_USE_AVSESSION = 5, - -@@ -809,7 +874,8 @@ declare namespace backgroundTaskManager { - * Audio is not running when request audio playback mode. - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SYSTEM_CANCEL_AUDIO_PLAYBACK_NOT_RUNNING = 6, - -@@ -817,7 +883,8 @@ declare namespace backgroundTaskManager { - * Audio is not running when request audio recording mode. - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SYSTEM_CANCEL_AUDIO_RECORDING_NOT_RUNNING = 7, - -@@ -825,7 +892,8 @@ declare namespace backgroundTaskManager { - * Not use location when request location mode. - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SYSTEM_CANCEL_NOT_USE_LOCATION = 8, - -@@ -833,7 +901,8 @@ declare namespace backgroundTaskManager { - * Not use bluetooth when request bluetooth interaction mode. - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SYSTEM_CANCEL_NOT_USE_BLUETOOTH = 9, - -@@ -841,7 +910,8 @@ declare namespace backgroundTaskManager { - * Not use multi device when request multi-device connection mode. - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SYSTEM_CANCEL_NOT_USE_MULTI_DEVICE = 10, - -@@ -849,7 +919,8 @@ declare namespace backgroundTaskManager { - * Use some mode illegally. - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 15 -+ * @since arkts {'1.1':'15','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SYSTEM_CANCEL_USE_ILLEGALLY = 11, - } -@@ -859,14 +930,16 @@ declare namespace backgroundTaskManager { - * - * @enum { number } - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum BackgroundSubMode { - /** - * bluetooth car key mode - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CAR_KEY = 1 - } -@@ -876,14 +949,16 @@ declare namespace backgroundTaskManager { - * - * @enum { string } - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum BackgroundModeType { - /** - * subMode type - * - * @syscap SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SUB_MODE = 'subMode' - } -diff --git a/api/@ohos.resourceschedule.systemload.d.ts b/api/@ohos.resourceschedule.systemload.d.ts -index 53ff2a57c..ea6bf44d8 100644 ---- a/api/@ohos.resourceschedule.systemload.d.ts -+++ b/api/@ohos.resourceschedule.systemload.d.ts -@@ -25,7 +25,8 @@ import type { Callback } from './@ohos.base'; - * - * @namespace systemLoad - * @syscap SystemCapability.ResourceSchedule.SystemLoad -- * @since 12 -+ * @since arkts{ '1.1':'12', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - declare namespace systemLoad { - /** -@@ -33,63 +34,72 @@ declare namespace systemLoad { - * - * @enum {number} - * @syscap SystemCapability.ResourceSchedule.SystemLoad -- * @since 12 -+ * @since arkts{ '1.1':'12', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - export enum SystemLoadLevel { - /** - * level low - * - * @syscap SystemCapability.ResourceSchedule.SystemLoad -- * @since 12 -+ * @since arkts{ '1.1':'12', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - LOW = 0, - /** - * level NORMAL - * - * @syscap SystemCapability.ResourceSchedule.SystemLoad -- * @since 12 -+ * @since arkts{ '1.1':'12', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - NORMAL = 1, - /** - * level MEDIUM - * - * @syscap SystemCapability.ResourceSchedule.SystemLoad -- * @since 12 -+ * @since arkts{ '1.1':'12', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - MEDIUM = 2, - /** - * level HIGH - * - * @syscap SystemCapability.ResourceSchedule.SystemLoad -- * @since 12 -+ * @since arkts{ '1.1':'12', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - HIGH = 3, - /** - * level OVERHEATED - * - * @syscap SystemCapability.ResourceSchedule.SystemLoad -- * @since 12 -+ * @since arkts{ '1.1':'12', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - OVERHEATED = 4, - /** - * level WARNING - * - * @syscap SystemCapability.ResourceSchedule.SystemLoad -- * @since 12 -+ * @since arkts{ '1.1':'12', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - WARNING = 5, - /** - * level EMERGENCY - * - * @syscap SystemCapability.ResourceSchedule.SystemLoad -- * @since 12 -+ * @since arkts{ '1.1':'12', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - EMERGENCY = 6, - /** - * level ESCAPE - * - * @syscap SystemCapability.ResourceSchedule.SystemLoad -- * @since 12 -+ * @since arkts{ '1.1':'12', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - ESCAPE = 7 - } -@@ -101,7 +111,8 @@ declare namespace systemLoad { - * @throws { BusinessError } 401 - Parameter error. Possible cause: 1. Callback parameter error; - *
    2. Register a exist callback type; 3. Parameter verification failed. - * @syscap SystemCapability.ResourceSchedule.SystemLoad -- * @since 12 -+ * @since arkts{ '1.1':'12', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function on(type: 'systemLoadChange', callback: Callback): void; - -@@ -112,7 +123,8 @@ declare namespace systemLoad { - * @throws { BusinessError } 401 - Parameter error. Possible cause: 1. Callback parameter error; - *
    2. Unregister type has not register; 3. Parameter verification failed. - * @syscap SystemCapability.ResourceSchedule.SystemLoad -- * @since 12 -+ * @since arkts{ '1.1':'12', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function off(type: 'systemLoadChange', callback?: Callback): void; - -@@ -120,7 +132,8 @@ declare namespace systemLoad { - * @returns { Promise } The promise form returns the SystemLoadLevel result - * Queries the current system level - * @syscap SystemCapability.ResourceSchedule.SystemLoad -- * @since 12 -+ * @since arkts{ '1.1':'12', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function getLevel(): Promise; - } -diff --git a/api/@ohos.resourceschedule.usageStatistics.d.ts b/api/@ohos.resourceschedule.usageStatistics.d.ts -index 216c70f3b..c00b522ae 100644 ---- a/api/@ohos.resourceschedule.usageStatistics.d.ts -+++ b/api/@ohos.resourceschedule.usageStatistics.d.ts -@@ -31,14 +31,16 @@ import { AsyncCallback, Callback } from './@ohos.base'; - * - * @namespace usageStatistics - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - declare namespace usageStatistics { - /** - * @interface BundleStatsInfo - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - interface BundleStatsInfo { - /** -@@ -46,7 +48,8 @@ declare namespace usageStatistics { - * @type { number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - id: number; - -@@ -55,7 +58,8 @@ declare namespace usageStatistics { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - abilityInFgTotalTime?: number; - -@@ -64,7 +68,8 @@ declare namespace usageStatistics { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - abilityPrevAccessTime?: number; - -@@ -73,7 +78,8 @@ declare namespace usageStatistics { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - abilityPrevSeenTime?: number; - -@@ -82,7 +88,8 @@ declare namespace usageStatistics { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - abilitySeenTotalTime?: number; - -@@ -91,7 +98,8 @@ declare namespace usageStatistics { - * @type { ?string } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - bundleName?: string; - -@@ -100,7 +108,8 @@ declare namespace usageStatistics { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - fgAbilityAccessTotalTime?: number; - -@@ -109,7 +118,8 @@ declare namespace usageStatistics { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - fgAbilityPrevAccessTime?: number; - -@@ -119,7 +129,8 @@ declare namespace usageStatistics { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - infosBeginTime?: number; - -@@ -129,7 +140,8 @@ declare namespace usageStatistics { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - infosEndTime?: number; - -@@ -138,7 +150,8 @@ declare namespace usageStatistics { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 15 -+ * @since arkts{ '1.1':'15', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - appIndex?: number; - } -@@ -147,7 +160,8 @@ declare namespace usageStatistics { - * @interface HapFormInfo - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - interface HapFormInfo { - /** -@@ -155,7 +169,8 @@ declare namespace usageStatistics { - * @type { string } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - formName: string; - -@@ -164,7 +179,8 @@ declare namespace usageStatistics { - * @type { number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - formDimension: number; - -@@ -173,7 +189,8 @@ declare namespace usageStatistics { - * @type { number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - formId: number; - -@@ -182,7 +199,8 @@ declare namespace usageStatistics { - * @type { number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - formLastUsedTime: number; - -@@ -191,7 +209,8 @@ declare namespace usageStatistics { - * @type { number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - count: number; - } -@@ -200,7 +219,8 @@ declare namespace usageStatistics { - * @interface HapModuleInfo - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - interface HapModuleInfo { - /** -@@ -208,7 +228,8 @@ declare namespace usageStatistics { - * @type { ?string } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - deviceId?: string; - -@@ -217,7 +238,8 @@ declare namespace usageStatistics { - * @type { string } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - bundleName: string; - -@@ -226,7 +248,8 @@ declare namespace usageStatistics { - * @type { string } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - moduleName: string; - -@@ -235,7 +258,8 @@ declare namespace usageStatistics { - * @type { ?string } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - abilityName?: string; - -@@ -244,7 +268,8 @@ declare namespace usageStatistics { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - appLabelId?: number; - -@@ -253,7 +278,8 @@ declare namespace usageStatistics { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - labelId?: number; - -@@ -262,7 +288,8 @@ declare namespace usageStatistics { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - descriptionId?: number; - -@@ -271,7 +298,8 @@ declare namespace usageStatistics { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - abilityLableId?: number; - -@@ -280,7 +308,8 @@ declare namespace usageStatistics { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - abilityDescriptionId?: number; - -@@ -289,7 +318,8 @@ declare namespace usageStatistics { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - abilityIconId?: number; - -@@ -298,7 +328,8 @@ declare namespace usageStatistics { - * @type { number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - launchedCount: number; - -@@ -307,7 +338,8 @@ declare namespace usageStatistics { - * @type { number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - lastModuleUsedTime: number; - -@@ -316,7 +348,8 @@ declare namespace usageStatistics { - * @type { Array } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - formRecords: Array; - } -@@ -325,7 +358,8 @@ declare namespace usageStatistics { - * @interface DeviceEventStats - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - interface DeviceEventStats { - /** -@@ -333,7 +367,8 @@ declare namespace usageStatistics { - * @type { string } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - name: string; - -@@ -342,7 +377,8 @@ declare namespace usageStatistics { - * @type { number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - eventId: number; - -@@ -351,7 +387,8 @@ declare namespace usageStatistics { - * @type { number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - count: number; - } -@@ -360,7 +397,8 @@ declare namespace usageStatistics { - * @interface BundleEvents - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - interface BundleEvents { - /** -@@ -368,7 +406,8 @@ declare namespace usageStatistics { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - appGroup?: number; - -@@ -377,7 +416,8 @@ declare namespace usageStatistics { - * @type { ?string } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - bundleName?: string; - -@@ -386,7 +426,8 @@ declare namespace usageStatistics { - * @type { ?string } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - indexOfLink?: string; - -@@ -395,7 +436,8 @@ declare namespace usageStatistics { - * @type { ?string } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - nameOfClass?: string; - -@@ -404,7 +446,8 @@ declare namespace usageStatistics { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - eventOccurredTime?: number; - -@@ -413,7 +456,8 @@ declare namespace usageStatistics { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - eventId?: number; - } -@@ -422,7 +466,8 @@ declare namespace usageStatistics { - * @interface AppGroupCallbackInfo - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - interface AppGroupCallbackInfo { - /** -@@ -430,7 +475,8 @@ declare namespace usageStatistics { - * @type { number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - appOldGroup: number; - -@@ -439,7 +485,8 @@ declare namespace usageStatistics { - * @type { number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - appNewGroup: number; - -@@ -448,7 +495,8 @@ declare namespace usageStatistics { - * @type { number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - userId: number; - -@@ -457,7 +505,8 @@ declare namespace usageStatistics { - * @type { number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - changeReason: number; - -@@ -466,7 +515,8 @@ declare namespace usageStatistics { - * @type { string } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - bundleName: string; - } -@@ -491,7 +541,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10000006 - Failed to get the application information. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function isIdleState(bundleName: string, callback: AsyncCallback): void; - -@@ -515,7 +566,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10000006 - Failed to get the application information. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function isIdleState(bundleName: string): Promise; - -@@ -539,7 +591,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10000006 - Failed to get the application information. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts{ '1.1':'10', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function isIdleStateSync(bundleName: string): boolean; - -@@ -564,7 +617,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10100002 - Failed to get the application group information. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryAppGroup(callback: AsyncCallback): void; - -@@ -589,7 +643,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10100002 - Failed to get the application group information. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryAppGroup(): Promise; - -@@ -613,7 +668,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10100002 - Failed to get the application group information. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts{ '1.1':'10', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryAppGroupSync(): number; - -@@ -639,7 +695,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10100002 - Failed to get the application group information. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryAppGroup(bundleName: string, callback: AsyncCallback): void; - -@@ -665,7 +722,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10100002 - Failed to get the application group information. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryAppGroup(bundleName: string): Promise; - -@@ -690,7 +748,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10100002 - Failed to get the application group information. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts{ '1.1':'10', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryAppGroupSync(bundleName: string): number; - -@@ -698,7 +757,8 @@ declare namespace usageStatistics { - * @typedef { Record } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - type BundleStatsMap = Record; - -@@ -723,7 +783,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10000007 - Failed to get the system time. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryBundleStatsInfos(begin: number, end: number, callback: AsyncCallback): void; - -@@ -748,7 +809,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10000007 - Failed to get the system time. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryBundleStatsInfos(begin: number, end: number): Promise; - -@@ -756,7 +818,8 @@ declare namespace usageStatistics { - * @typedef { Record> } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 15 -+ * @since arkts{ '1.1':'15', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - type AppStatsMap = Record>; - -@@ -781,7 +844,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10000007 - Failed to get the system time. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 15 -+ * @since arkts{ '1.1':'15', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryAppStatsInfos(begin: number, end: number): Promise; - -@@ -805,7 +869,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10000007 - Failed to get the system time. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 15 -+ * @since arkts{ '1.1':'15', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryLastUseTime(appInfo: Record>): Promise; - -@@ -815,7 +880,8 @@ declare namespace usageStatistics { - * @enum { number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - export enum IntervalType { - /** -@@ -823,7 +889,8 @@ declare namespace usageStatistics { - * - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - BY_OPTIMIZED = 0, - -@@ -832,7 +899,8 @@ declare namespace usageStatistics { - * - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - BY_DAILY = 1, - -@@ -841,7 +909,8 @@ declare namespace usageStatistics { - * - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - BY_WEEKLY = 2, - -@@ -850,7 +919,8 @@ declare namespace usageStatistics { - * - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - BY_MONTHLY = 3, - -@@ -859,7 +929,8 @@ declare namespace usageStatistics { - * - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - BY_ANNUALLY = 4 - } -@@ -887,7 +958,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10000007 - Failed to get the system time. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryBundleStatsInfoByInterval( - byInterval: IntervalType, -@@ -919,7 +991,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10000007 - Failed to get the system time. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryBundleStatsInfoByInterval( - byInterval: IntervalType, -@@ -948,7 +1021,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10000007 - Failed to get the system time. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryBundleEvents(begin: number, end: number, callback: AsyncCallback>): void; - -@@ -973,7 +1047,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10000007 - Failed to get the system time. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryBundleEvents(begin: number, end: number): Promise>; - -@@ -996,7 +1071,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10000007 - Failed to get the system time. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryCurrentBundleEvents(begin: number, end: number, callback: AsyncCallback>): void; - -@@ -1019,7 +1095,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10000007 - Failed to get the system time. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryCurrentBundleEvents(begin: number, end: number): Promise>; - -@@ -1043,7 +1120,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10000007 - Failed to get the system time. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryModuleUsageRecords(maxNum: number, callback: AsyncCallback>): void; - -@@ -1067,7 +1145,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10000007 - Failed to get the system time. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryModuleUsageRecords(maxNum: number): Promise>; - -@@ -1090,7 +1169,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10000007 - Failed to get the system time. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryModuleUsageRecords(callback: AsyncCallback>): void; - -@@ -1113,7 +1193,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10000007 - Failed to get the system time. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryModuleUsageRecords(): Promise>; - -@@ -1123,7 +1204,8 @@ declare namespace usageStatistics { - * @enum { number } - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - export enum GroupType { - /** -@@ -1131,7 +1213,8 @@ declare namespace usageStatistics { - * - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - ALIVE_GROUP = 10, - -@@ -1140,7 +1223,8 @@ declare namespace usageStatistics { - * - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - DAILY_GROUP = 20, - -@@ -1149,7 +1233,8 @@ declare namespace usageStatistics { - * - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - FIXED_GROUP = 30, - -@@ -1158,7 +1243,8 @@ declare namespace usageStatistics { - * - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - RARE_GROUP = 40, - -@@ -1167,7 +1253,8 @@ declare namespace usageStatistics { - * - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - LIMITED_GROUP = 50, - -@@ -1176,7 +1263,8 @@ declare namespace usageStatistics { - * - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - NEVER_GROUP = 60 - } -@@ -1201,7 +1289,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10100001 - Repeated operation on the application group. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function setAppGroup(bundleName: string, newGroup: GroupType, callback: AsyncCallback): void; - -@@ -1225,7 +1314,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10100001 - Repeated operation on the application group. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function setAppGroup(bundleName: string, newGroup: GroupType): Promise; - -@@ -1248,7 +1338,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10100001 - Repeated operation on the application group. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function registerAppGroupCallBack(groupCallback: Callback, callback: AsyncCallback): void; - -@@ -1271,7 +1362,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10100001 - Repeated operation on the application group. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function registerAppGroupCallBack(groupCallback: Callback): Promise; - -@@ -1292,7 +1384,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10100001 - Repeated operation on the application group. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function unregisterAppGroupCallBack(callback: AsyncCallback): void; - -@@ -1313,7 +1406,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10100001 - Repeated operation on the application group. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.AppGroup - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function unregisterAppGroupCallBack(): Promise; - -@@ -1338,7 +1432,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10000007 - Failed to get the system time. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryDeviceEventStats(begin: number, end: number, callback: AsyncCallback>): void; - -@@ -1363,7 +1458,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10000007 - Failed to get the system time. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryDeviceEventStats(begin: number, end: number): Promise>; - -@@ -1388,7 +1484,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10000007 - Failed to get the system time. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryNotificationEventStats( - begin: number, -@@ -1417,7 +1514,8 @@ declare namespace usageStatistics { - * @throws { BusinessError } 10000007 - Failed to get the system time. - * @syscap SystemCapability.ResourceSchedule.UsageStatistics.App - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts{ '1.1':'9', '1.2':'20' } -+ * @arkts 1.1&1.2 - */ - function queryNotificationEventStats(begin: number, end: number): Promise>; - } -diff --git a/api/@ohos.resourceschedule.workScheduler.d.ts b/api/@ohos.resourceschedule.workScheduler.d.ts -index 32cbeaa68..9a6bc075f 100644 ---- a/api/@ohos.resourceschedule.workScheduler.d.ts -+++ b/api/@ohos.resourceschedule.workScheduler.d.ts -@@ -26,7 +26,8 @@ import { AsyncCallback } from './@ohos.base'; - * @namespace workScheduler - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace workScheduler { - /** -@@ -35,7 +36,8 @@ declare namespace workScheduler { - * @interface WorkInfo - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface WorkInfo { - /** -@@ -44,7 +46,8 @@ declare namespace workScheduler { - * @type { number } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - workId: number; - /** -@@ -53,7 +56,8 @@ declare namespace workScheduler { - * @type { string } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - bundleName: string; - /** -@@ -62,7 +66,8 @@ declare namespace workScheduler { - * @type { string } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - abilityName: string; - /** -@@ -71,7 +76,8 @@ declare namespace workScheduler { - * @type { ?boolean } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isPersisted?: boolean; - /** -@@ -80,7 +86,8 @@ declare namespace workScheduler { - * @type { ?NetworkType } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - networkType?: NetworkType; - /** -@@ -89,7 +96,8 @@ declare namespace workScheduler { - * @type { ?boolean } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isCharging?: boolean; - /** -@@ -98,7 +106,8 @@ declare namespace workScheduler { - * @type { ?ChargingType } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - chargerType?: ChargingType; - /** -@@ -107,7 +116,8 @@ declare namespace workScheduler { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - batteryLevel?: number; - /** -@@ -116,7 +126,8 @@ declare namespace workScheduler { - * @type { ?BatteryStatus } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - batteryStatus?: BatteryStatus; - /** -@@ -125,7 +136,8 @@ declare namespace workScheduler { - * @type { ?StorageRequest } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - storageRequest?: StorageRequest; - /** -@@ -134,7 +146,8 @@ declare namespace workScheduler { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - repeatCycleTime?: number; - /** -@@ -143,7 +156,8 @@ declare namespace workScheduler { - * @type { ?boolean } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isRepeat?: boolean; - /** -@@ -152,7 +166,8 @@ declare namespace workScheduler { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - repeatCount?: number; - /** -@@ -161,7 +176,8 @@ declare namespace workScheduler { - * @type { ?boolean } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isDeepIdle?: boolean; - /** -@@ -170,7 +186,8 @@ declare namespace workScheduler { - * @type { ?number } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - idleWaitTime?: number; - /** -@@ -179,7 +196,8 @@ declare namespace workScheduler { - * @type { ?Record } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - parameters?: Record; - } -@@ -198,7 +216,8 @@ declare namespace workScheduler { - * @throws { BusinessError } 9700005 - Calling startWork failed. - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function startWork(work: WorkInfo): void; - -@@ -215,7 +234,8 @@ declare namespace workScheduler { - * @throws { BusinessError } 9700004 - Check on workInfo failed. - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function stopWork(work: WorkInfo, needCancel?: boolean): void; - -@@ -231,7 +251,8 @@ declare namespace workScheduler { - * @throws { BusinessError } 9700004 - Check on workInfo failed. - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getWorkStatus(workId: number, callback: AsyncCallback): void; - -@@ -247,7 +268,8 @@ declare namespace workScheduler { - * @throws { BusinessError } 9700004 - Check on workInfo failed. - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getWorkStatus(workId: number): Promise; - -@@ -279,7 +301,8 @@ declare namespace workScheduler { - * @throws { BusinessError } 9700003 - System service operation failed. - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function obtainAllWorks(callback: AsyncCallback>): void; - -@@ -294,7 +317,8 @@ declare namespace workScheduler { - * @throws { BusinessError } 9700003 - System service operation failed. - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function obtainAllWorks(): Promise>; - -@@ -308,7 +332,8 @@ declare namespace workScheduler { - * @throws { BusinessError } 9700003 - System service operation failed. - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function stopAndClearWorks(): void; - -@@ -342,7 +367,8 @@ declare namespace workScheduler { - * @throws { BusinessError } 9700004 - Check on workInfo failed. - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isLastWorkTimeOut(workId: number, callback: AsyncCallback): void; - -@@ -358,7 +384,8 @@ declare namespace workScheduler { - * @throws { BusinessError } 9700004 - Check on workInfo failed. - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isLastWorkTimeOut(workId: number): Promise; - -@@ -368,7 +395,8 @@ declare namespace workScheduler { - * @enum { number } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - * @name NetworkType - */ - export enum NetworkType { -@@ -377,7 +405,8 @@ declare namespace workScheduler { - * - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NETWORK_TYPE_ANY = 0, - /** -@@ -385,7 +414,8 @@ declare namespace workScheduler { - * - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NETWORK_TYPE_MOBILE, - /** -@@ -393,7 +423,8 @@ declare namespace workScheduler { - * - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NETWORK_TYPE_WIFI, - /** -@@ -401,7 +432,8 @@ declare namespace workScheduler { - * - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NETWORK_TYPE_BLUETOOTH, - /** -@@ -409,7 +441,8 @@ declare namespace workScheduler { - * - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NETWORK_TYPE_WIFI_P2P, - /** -@@ -417,7 +450,8 @@ declare namespace workScheduler { - * - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NETWORK_TYPE_ETHERNET - } -@@ -428,7 +462,8 @@ declare namespace workScheduler { - * @enum { number } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - * @name ChargingType - */ - export enum ChargingType { -@@ -437,7 +472,8 @@ declare namespace workScheduler { - * - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CHARGING_PLUGGED_ANY = 0, - /** -@@ -445,7 +481,8 @@ declare namespace workScheduler { - * - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CHARGING_PLUGGED_AC, - /** -@@ -453,7 +490,8 @@ declare namespace workScheduler { - * - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CHARGING_PLUGGED_USB, - /** -@@ -461,7 +499,8 @@ declare namespace workScheduler { - * - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CHARGING_PLUGGED_WIRELESS - } -@@ -472,7 +511,8 @@ declare namespace workScheduler { - * @enum { number } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - * @name BatteryStatus - */ - export enum BatteryStatus { -@@ -481,7 +521,8 @@ declare namespace workScheduler { - * - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BATTERY_STATUS_LOW = 0, - /** -@@ -489,7 +530,8 @@ declare namespace workScheduler { - * - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BATTERY_STATUS_OKAY, - /** -@@ -497,7 +539,8 @@ declare namespace workScheduler { - * - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BATTERY_STATUS_LOW_OR_OKAY - } -@@ -508,7 +551,8 @@ declare namespace workScheduler { - * @enum { number } - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - * @name StorageRequest - */ - export enum StorageRequest { -@@ -517,7 +561,8 @@ declare namespace workScheduler { - * - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - STORAGE_LEVEL_LOW = 0, - /** -@@ -525,7 +570,8 @@ declare namespace workScheduler { - * - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - STORAGE_LEVEL_OKAY, - /** -@@ -533,7 +579,8 @@ declare namespace workScheduler { - * - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - STORAGE_LEVEL_LOW_OR_OKAY - } -diff --git a/api/@ohos.rpc.d.ts b/api/@ohos.rpc.d.ts -index b71d77986..a2e0f9c09 100644 ---- a/api/@ohos.rpc.d.ts -+++ b/api/@ohos.rpc.d.ts -@@ -18,9 +18,7 @@ - * @kit IPCKit - */ - --/*** if arkts 1.1 */ - import type { AsyncCallback } from './@ohos.base'; --/*** endif */ - - /** - * This module provides inter process communication capability. -@@ -1181,7 +1179,8 @@ declare namespace rpc { - * - * @returns { MessageSequence } Return the object created. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - static create(): MessageSequence; - -@@ -1189,7 +1188,8 @@ declare namespace rpc { - * Reclaim the {@link MessageSequence} object. - * - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - reclaim(): void; - -@@ -1203,7 +1203,8 @@ declare namespace rpc { - * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. - * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - writeRemoteObject(object: IRemoteObject): void; - -@@ -1214,7 +1215,8 @@ declare namespace rpc { - * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. - * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readRemoteObject(): IRemoteObject; - -@@ -1229,7 +1231,8 @@ declare namespace rpc { - * 4.The number of bytes copied to the buffer is different from the length of the obtained string. - * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - writeInterfaceToken(token: string): void; - -@@ -1256,11 +1259,12 @@ declare namespace rpc { - /** - * Obtains the storage capacity (in bytes) of the {@link MessageSequence} object. - * -- * @returns { number } Return the storage capacity of the {@link MessageSequence} object. -+ * @returns { int } Return the storage capacity of the {@link MessageSequence} object. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getCapacity(): number; -+ getCapacity(): int; - - /** - * Sets the size of data (in bytes) contained in the {@link MessageSequence} object. -@@ -1282,16 +1286,17 @@ declare namespace rpc { - *

    {@code false} is returned if the capacity set in this method is less than - * the size of data contained in the {@link MessageSequence}. - * -- * @param { number } size - Indicates the storage capacity of the {@link MessageSequence} object. -+ * @param { int } size - Indicates the storage capacity of the {@link MessageSequence} object. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.The number of parameters is incorrect; - * 2.The parameter type does not match. - * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. - * @throws { BusinessError } 1900011 - Memory allocation failed. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- setCapacity(size: number): void; -+ setCapacity(size: int): void; - - /** - * Obtains the writable data space (in bytes) in the {@link MessageSequence} object. -@@ -1369,7 +1374,8 @@ declare namespace rpc { - * - * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - writeNoException(): void; - -@@ -1381,7 +1387,8 @@ declare namespace rpc { - * - * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readException(): void; - -@@ -1414,28 +1421,30 @@ declare namespace rpc { - /** - * Writes an integer value into the {@link MessageSequence} object. - * -- * @param { number } val - Indicates the integer value to write. -+ * @param { int } val - Indicates the integer value to write. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.The number of parameters is incorrect; - * 2.The parameter type does not match. - * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- writeInt(val: number): void; -+ writeInt(val: int): void; - - /** - * Writes a long integer value into the {@link MessageSequence} object. - * -- * @param { number } val - Indicates the long integer value to write. -+ * @param { long } val - Indicates the long integer value to write. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.The number of parameters is incorrect; - * 2.The parameter type does not match. - * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- writeLong(val: number): void; -+ writeLong(val: long): void; - - /** - * Writes a floating point value into the {@link MessageSequence} object. -@@ -1472,7 +1481,8 @@ declare namespace rpc { - * 2.The parameter type does not match. - * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - writeBoolean(val: boolean): void; - -@@ -1514,14 +1524,15 @@ declare namespace rpc { - * 2.The parameter type does not match. - * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - writeParcelable(val: Parcelable): void; - - /** - * Writes a byte array into the {@link MessageSequence} object. - * -- * @param { number[] } byteArray - Indicates the byte array to write. -+ * @param { int[] } byteArray - Indicates the byte array to write. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.The parameter is an empty array; - * 2.The number of parameters is incorrect; -@@ -1530,9 +1541,10 @@ declare namespace rpc { - * 5.The type of the element in the array is incorrect. - * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- writeByteArray(byteArray: number[]): void; -+ writeByteArray(byteArray: int[]): void; - - /** - * Writes a short integer array into the {@link MessageSequence} object. -@@ -1557,7 +1569,7 @@ declare namespace rpc { - * Ensure that the data type and size comply with the interface definition. - * Otherwise,data may be truncated. - * -- * @param { number[] } intArray - Indicates the integer array to write. -+ * @param { int[] } intArray - Indicates the integer array to write. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.The parameter is an empty array; - * 2.The number of parameters is incorrect; -@@ -1566,9 +1578,10 @@ declare namespace rpc { - * 5.The type of the element in the array is incorrect. - * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- writeIntArray(intArray: number[]): void; -+ writeIntArray(intArray: int[]): void; - - /** - * Writes a long integer array into the {@link MessageSequence} object. -@@ -1611,7 +1624,7 @@ declare namespace rpc { - * Ensure that the data type and size comply with the interface definition. - * Otherwise,data may be truncated. - * -- * @param { number[] } doubleArray - Indicates the double-precision floating point array to write. -+ * @param { double[] } doubleArray - Indicates the double-precision floating point array to write. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.The parameter is an empty array; - * 2.The number of parameters is incorrect; -@@ -1620,9 +1633,10 @@ declare namespace rpc { - * 5.The type of the element in the array is incorrect. - * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- writeDoubleArray(doubleArray: number[]): void; -+ writeDoubleArray(doubleArray: double[]): void; - - /** - * Writes a boolean array into the {@link MessageSequence} object. -@@ -1637,7 +1651,8 @@ declare namespace rpc { - * 4.The element does not exist in the array. - * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - writeBooleanArray(booleanArray: boolean[]): void; - -@@ -1672,7 +1687,8 @@ declare namespace rpc { - * 5.The number of bytes copied to the buffer is different from the length of the obtained string. - * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - writeStringArray(stringArray: string[]): void; - -@@ -1687,7 +1703,8 @@ declare namespace rpc { - * 4.The element does not exist in the array. - * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - writeParcelableArray(parcelableArray: Parcelable[]): void; - -@@ -1730,22 +1747,24 @@ declare namespace rpc { - /** - * Reads an integer value from the {@link MessageSequence} object. - * -- * @returns { number } Return an integer value. -+ * @returns { int } Return an integer value. - * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readInt(): number; -+ readInt(): int; - - /** - * Reads a long integer value from the {@link MessageSequence} object. - * -- * @returns { number } Return a long integer value. -+ * @returns { long } Return a long integer value. - * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readLong(): number; -+ readLong(): long; - - /** - * Reads a floating point value from the {@link MessageSequence} object. -@@ -1773,7 +1792,8 @@ declare namespace rpc { - * @returns { boolean } Return a boolean value. - * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readBoolean(): boolean; - -@@ -1808,7 +1828,8 @@ declare namespace rpc { - * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. - * @throws { BusinessError } 1900012 - Failed to call the JS callback function. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readParcelable(dataIn: Parcelable): void; - -@@ -1863,26 +1884,28 @@ declare namespace rpc { - /** - * Reads an integer array from the {@link MessageSequence} object. - * -- * @param { number[] } dataIn - Indicates the integer array to read. -+ * @param { int[] } dataIn - Indicates the integer array to read. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.The parameter is an empty array; - * 2.The number of parameters is incorrect; - * 3.The parameter type does not match. - * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readIntArray(dataIn: number[]): void; -+ readIntArray(dataIn: int[]): void; - - /** - * Reads an integer array from the {@link MessageSequence} object. - * -- * @returns { number[] } Return an integer array. -+ * @returns { int[] } Return an integer array. - * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readIntArray(): number[]; -+ readIntArray(): int[]; - - /** - * Reads a long integer array from the {@link MessageSequence} object. -@@ -1935,26 +1958,28 @@ declare namespace rpc { - /** - * Reads a double-precision floating point array from the {@link MessageSequence} object. - * -- * @param { number[] } dataIn - Indicates the double-precision floating point array to read. -+ * @param { double[] } dataIn - Indicates the double-precision floating point array to read. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.The parameter is an empty array; - * 2.The number of parameters is incorrect; - * 3.The parameter type does not match. - * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readDoubleArray(dataIn: number[]): void; -+ readDoubleArray(dataIn: double[]): void; - - /** - * Reads a double-precision floating point array from the {@link MessageSequence} object. - * -- * @returns { number[] } Return a double-precision floating point array. -+ * @returns { double[] } Return a double-precision floating point array. - * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readDoubleArray(): number[]; -+ readDoubleArray(): double[]; - - /** - * Reads a boolean array from the {@link MessageSequence} object. -@@ -1966,7 +1991,8 @@ declare namespace rpc { - * 3.The parameter type does not match. - * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readBooleanArray(dataIn: boolean[]): void; - -@@ -1976,7 +2002,8 @@ declare namespace rpc { - * @returns { boolean[] } Return a boolean array. - * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readBooleanArray(): boolean[]; - -@@ -2014,7 +2041,8 @@ declare namespace rpc { - * 3.The parameter type does not match. - * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readStringArray(dataIn: string[]): void; - -@@ -2024,7 +2052,8 @@ declare namespace rpc { - * @returns { string[] } Return a string array. - * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readStringArray(): string[]; - -@@ -2041,7 +2070,8 @@ declare namespace rpc { - * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. - * @throws { BusinessError } 1900012 - Failed to call the JS callback function. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readParcelableArray(parcelableArray: Parcelable[]): void; - -@@ -2074,14 +2104,16 @@ declare namespace rpc { - /** - * Closes the specified file descriptor. - * -- * @param { number } fd - File descriptor to be closed. -+ * @param { int } fd - File descriptor to be closed. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.The number of parameters is incorrect; - * 2.The parameter type does not match. -+ * @static - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static closeFileDescriptor(fd: number): void; -+ static closeFileDescriptor(fd: int): void; - - /** - * Duplicates the specified file descriptor. -@@ -2110,25 +2142,27 @@ declare namespace rpc { - /** - * Writes a file descriptor to this {@link MessageSequence} object. - * -- * @param { number } fd - File descriptor to wrote. -+ * @param { int } fd - File descriptor to wrote. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.The number of parameters is incorrect; - * 2.The parameter type does not match. - * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- writeFileDescriptor(fd: number): void; -+ writeFileDescriptor(fd: int): void; - - /** - * Reads a file descriptor from this {@link MessageSequence} object. - * -- * @returns { number } Return a file descriptor obtained. -+ * @returns { int } Return a file descriptor obtained. - * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readFileDescriptor(): number; -+ readFileDescriptor(): int; - - /** - * Writes an anonymous shared memory object to this {@link MessageSequence} object. -@@ -2139,7 +2173,8 @@ declare namespace rpc { - * 2.The parameter is not an instance of the Ashmem object. - * @throws { BusinessError } 1900003 - Failed to write data to the shared memory. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - writeAshmem(ashmem: Ashmem): void; - -@@ -2149,7 +2184,8 @@ declare namespace rpc { - * @returns { Ashmem } Return the anonymous share object obtained. - * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readAshmem(): Ashmem; - -@@ -2189,7 +2225,7 @@ declare namespace rpc { - * Writes raw data to this {@link MessageSequence} object. - * - * @param { ArrayBuffer } rawData - Raw data to wrote. -- * @param { number } size - Size of the raw data, in bytes. -+ * @param { int } size - Size of the raw data, in bytes. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.The number of parameters is incorrect; - * 2.The parameter type does not match; -@@ -2199,9 +2235,10 @@ declare namespace rpc { - * 6.The transferred size is greater than the byte length of ArrayBuffer. - * @throws { BusinessError } 1900009 - Failed to write data to the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- writeRawDataBuffer(rawData: ArrayBuffer, size: number): void; -+ writeRawDataBuffer(rawData: ArrayBuffer, size: int): void; - - /** - * Reads raw data from this {@link MessageSequence} object. -@@ -2222,16 +2259,17 @@ declare namespace rpc { - /** - * Reads raw data from this {@link MessageSequence} object. - * -- * @param { number } size - Size of the raw data to read. -+ * @param { int } size - Size of the raw data to read. - * @returns { ArrayBuffer } Return the raw data obtained, in bytes. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.The number of parameters is incorrect; - * 2.The parameter type does not match. - * @throws { BusinessError } 1900010 - Failed to read data from the message sequence. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readRawDataBuffer(size: number): ArrayBuffer; -+ readRawDataBuffer(size: int): ArrayBuffer; - - /** - * Writes the data in an ArrayBuffer object into this {@Link MessageSequence} object. -@@ -2321,7 +2359,8 @@ declare namespace rpc { - * object will be marshalled. - * @returns { boolean } Return {@code true} if the marshalling is successful; return {@code false} otherwise. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - marshalling(dataOut: MessageSequence): boolean; - -@@ -2332,7 +2371,8 @@ declare namespace rpc { - * which the {@code Parcelable} object has been marshalled. - * @returns { boolean } Return {@code true} if the unmarshalling is successful; return {@code false} otherwise. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - unmarshalling(dataIn: MessageSequence): boolean; - } -@@ -2399,26 +2439,29 @@ declare namespace rpc { - * - * @typedef RequestResult - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface RequestResult { - /** - * Error code. 0 indicates successful, otherwise it is failed. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- errCode: number; -+ errCode: int; - - /** - * Message code. It is same as the code in {@link SendRequest} method. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- code: number; -+ code: int; - - /** - * MessageSequence object sent to the peer process. -@@ -2426,7 +2469,8 @@ declare namespace rpc { - * - * @type { MessageSequence } - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - data: MessageSequence; - -@@ -2436,7 +2480,8 @@ declare namespace rpc { - * - * @type { MessageSequence } - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - reply: MessageSequence; - } -@@ -2538,7 +2583,7 @@ declare namespace rpc { - * a promise will be fulfilled when the response to sendMessageRequest is returned, - * and the reply message contains the returned information. - * -- * @param { number } code - Message code called by the request, which is determined by the client and server. -+ * @param { int } code - Message code called by the request, which is determined by the client and server. - * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. - * @param {MessageSequence } data - {@link MessageSequence} object holding the data to send. - * @param {MessageSequence } reply - {@link MessageSequence} object that receives the response. -@@ -2549,10 +2594,11 @@ declare namespace rpc { - * 2.The parameter type does not match; - * 3.Failed to obtain the passed object instance. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - sendMessageRequest( -- code: number, -+ code: int, - data: MessageSequence, - reply: MessageSequence, - options: MessageOption -@@ -2591,7 +2637,7 @@ declare namespace rpc { - * a callback will be invoked when the response to sendMessageRequest is returned, - * and the reply message contains the returned information. - * -- * @param {number } code - Message code called by the request, which is determined by the client and server. -+ * @param {int } code - Message code called by the request, which is determined by the client and server. - * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. - * @param { MessageSequence } data - {@link MessageSequence} object holding the data to send. - * @param { MessageSequence } reply - {@link MessageSequence} object that receives the response. -@@ -2602,10 +2648,11 @@ declare namespace rpc { - * 2.The parameter type does not match; - * 3.Failed to obtain the passed object instance. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - sendMessageRequest( -- code: number, -+ code: int, - data: MessageSequence, - reply: MessageSequence, - options: MessageOption, -@@ -2630,7 +2677,7 @@ declare namespace rpc { - * Register a callback used to receive notifications of the death of a remote object. - * - * @param { DeathRecipient } recipient - Indicates the callback to be registered. -- * @param { number } flags - Indicates the flag of the death notification. -+ * @param { int } flags - Indicates the flag of the death notification. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.The number of parameters is incorrect; - * 2.The parameter type does not match; -@@ -2638,9 +2685,10 @@ declare namespace rpc { - * @throws { BusinessError } 1900005 - Operation allowed only for the proxy object. - * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- registerDeathRecipient(recipient: DeathRecipient, flags: number): void; -+ registerDeathRecipient(recipient: DeathRecipient, flags: int): void; - - /** - * Unregister a callback used to receive notifications of the death of a remote object. -@@ -2660,7 +2708,7 @@ declare namespace rpc { - * Unregister a callback used to receive notifications of the death of a remote object. - * - * @param { DeathRecipient } recipient - Indicates the callback to be unregister. -- * @param { number } flags - Indicates the flag of the death notification. -+ * @param { int } flags - Indicates the flag of the death notification. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.The number of parameters is incorrect; - * 2.The parameter type does not match; -@@ -2668,9 +2716,10 @@ declare namespace rpc { - * @throws { BusinessError } 1900005 - Operation allowed only for the proxy object. - * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- unregisterDeathRecipient(recipient: DeathRecipient, flags: number): void; -+ unregisterDeathRecipient(recipient: DeathRecipient, flags: int): void; - - /** - * Obtains the interface descriptor of an object. -@@ -2701,7 +2750,8 @@ declare namespace rpc { - * - * @returns { boolean } Return {@code true} if the object is dead; return {@code false} otherwise. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isObjectDead(): boolean; - } -@@ -2716,7 +2766,8 @@ declare namespace rpc { - * - * @typedef IRemoteBroker - * @syscap SystemCapability.Communication.IPC.Core -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface IRemoteBroker { - /** -@@ -2725,7 +2776,8 @@ declare namespace rpc { - * @returns { IRemoteObject } Return the RemoteObject if the caller is a RemoteObject; return the IRemoteObject, - * that is, the holder of this RemoteProxy object, if the caller is a RemoteProxy object. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - asObject(): IRemoteObject; - } -@@ -2747,14 +2799,16 @@ declare namespace rpc { - * - * @typedef DeathRecipient - * @syscap SystemCapability.Communication.IPC.Core -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface DeathRecipient { - /** - * Called to perform subsequent operations when a death notification of the remote object is received. - * - * @syscap SystemCapability.Communication.IPC.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onRemoteDied(): void; - } -@@ -2774,24 +2828,26 @@ declare namespace rpc { - /** - * Indicates synchronous call. - * -- * @type { number } -+ * @type { int } - * @default 0 - * @static - * @syscap SystemCapability.Communication.IPC.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static TF_SYNC: number; -+ static TF_SYNC: int; - - /** - * Indicates asynchronous call. - * -- * @type { number } -+ * @type { int } - * @default 1 - * @static - * @syscap SystemCapability.Communication.IPC.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static TF_ASYNC: number; -+ static TF_ASYNC: int; - - /** - * Indicates the sendRequest API for returning the file descriptor. -@@ -2815,24 +2871,25 @@ declare namespace rpc { - /** - * Indicates the wait time for RPC, in seconds. It is NOT used in IPC case. - * -- * @type { number } -+ * @type { int } - * @default 8 - * @static - * @syscap SystemCapability.Communication.IPC.Core -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static TF_WAIT_TIME: number; -+ static TF_WAIT_TIME: int; - - /** - * A constructor used to create a MessageOption instance. - * -- * @param { number } syncFlags - Specifies whether the SendRequest is called synchronously (default) or asynchronously. -- * @param { number } waitTime - Maximum wait time for a RPC call. The default value is TF_WAIT_TIME. -+ * @param { int } syncFlags - Specifies whether the SendRequest is called synchronously (default) or asynchronously. -+ * @param { int } waitTime - Maximum wait time for a RPC call. The default value is TF_WAIT_TIME. - * @syscap SystemCapability.Communication.IPC.Core - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- constructor(syncFlags?: number, waitTime?: number); -+ constructor(syncFlags?: int, waitTime?: int); - - /** - * A constructor used to create a MessageOption instance. -@@ -2877,18 +2934,20 @@ declare namespace rpc { - * @returns { boolean } Return {@code true} if the asynchronous call succeeds; - * return {@code false} if the synchronous call succeeds. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isAsync(): boolean; - - /** - * Sets the SendRequest call flag, which can be synchronous or asynchronous. - * -- * @param { boolean } async - Indicates the call flag, which can be synchronous or asynchronous. -+ * @param { boolean } isAsync - Indicates the call flag, which can be synchronous or asynchronous. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- setAsync(async: boolean): void; -+ setAsync(isAsync: boolean): void; - - /** - * Obtains the maximum wait time for this RPC call. -@@ -2989,7 +3048,7 @@ declare namespace rpc { - *

    This method is implemented by the remote service provider. You need to override this method with - * your own service logic when you are using IPC. - * -- * @param { number } code - Indicates the service request code sent from the peer end. -+ * @param { int } code - Indicates the service request code sent from the peer end. - * @param { MessageSequence } data - Indicates the {@link MessageParcel} object sent from the peer end. - * @param { MessageSequence } reply - Indicates the response message object sent from the remote service. - * The local service writes the response data to the {@link MessageParcel} object. -@@ -3003,7 +3062,7 @@ declare namespace rpc { - * @arkts 1.1&1.2 - */ - onRemoteMessageRequest( -- code: number, -+ code: int, - data: MessageSequence, - reply: MessageSequence, - options: MessageOption -@@ -3075,7 +3134,7 @@ declare namespace rpc { - * a promise will be fulfilled when the response to sendMessageRequest is returned, - * and the reply message contains the returned information. - * -- * @param { number } code - Message code called by the request, which is determined by the client and server. -+ * @param { int } code - Message code called by the request, which is determined by the client and server. - * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. - * @param { MessageSequence } data - {@link MessageSequence} object holding the data to send. - * @param { MessageSequence } reply - {@link MessageSequence} object that receives the response. -@@ -3086,10 +3145,11 @@ declare namespace rpc { - * 2.The parameter type does not match; - * 3.Failed to obtain the passed object instance. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - sendMessageRequest( -- code: number, -+ code: int, - data: MessageSequence, - reply: MessageSequence, - options: MessageOption -@@ -3128,7 +3188,7 @@ declare namespace rpc { - * a callback will be invoked when the response to sendMessageRequest is returned, - * and the reply message contains the returned information. - * -- * @param { number } code - Message code called by the request, which is determined by the client and server. -+ * @param { int } code - Message code called by the request, which is determined by the client and server. - * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. - * @param { MessageSequence } data - {@link MessageSequence} object holding the data to send. - * @param { MessageSequence } reply - {@link MessageSequence} object that receives the response. -@@ -3139,10 +3199,11 @@ declare namespace rpc { - * 2.The parameter type does not match; - * 3.Failed to obtain the passed object instance. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - sendMessageRequest( -- code: number, -+ code: int, - data: MessageSequence, - reply: MessageSequence, - options: MessageOption, -@@ -3152,20 +3213,22 @@ declare namespace rpc { - /** - * Obtains the PID of the {@link RemoteProxy} object. - * -- * @returns { number } Return the PID of the {@link RemoteProxy} object. -+ * @returns { int } Return the PID of the {@link RemoteProxy} object. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getCallingPid(): number; -+ getCallingPid(): int; - - /** - * Obtains the UID of the {@link RemoteProxy} object. - * -- * @returns { number } Return the UID of the {@link RemoteProxy} object. -+ * @returns { int } Return the UID of the {@link RemoteProxy} object. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getCallingUid(): number; -+ getCallingUid(): int; - - /** - * Modifies the description of the current {@code RemoteObject}. -@@ -3310,7 +3373,7 @@ declare namespace rpc { - * Register a callback used to receive death notifications of a remote object. - * - * @param { DeathRecipient } recipient - Indicates the callback to be registered. -- * @param { number } flags - Indicates the flag of the death notification. This is a reserved parameter. -+ * @param { int } flags - Indicates the flag of the death notification. This is a reserved parameter. - * Set it to {@code 0}. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.The number of parameters is incorrect; -@@ -3318,9 +3381,10 @@ declare namespace rpc { - * 3.The callback used to receive remote object death notifications is empty. - * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- registerDeathRecipient(recipient: DeathRecipient, flags: number): void; -+ registerDeathRecipient(recipient: DeathRecipient, flags: int): void; - - /** - * Unregister a callback used to receive death notifications of a remote object. -@@ -3341,7 +3405,7 @@ declare namespace rpc { - * Unregister a callback used to receive death notifications of a remote object. - * - * @param { DeathRecipient } recipient - Indicates the callback to be unregister. -- * @param { number } flags - Indicates the flag of the death notification. This is a reserved parameter. -+ * @param { int } flags - Indicates the flag of the death notification. This is a reserved parameter. - * Set it to {@code 0}. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.The number of parameters is incorrect; -@@ -3349,9 +3413,10 @@ declare namespace rpc { - * 3.The callback used to receive remote object death notifications is empty. - * @throws { BusinessError } 1900008 - The proxy or remote object is invalid. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- unregisterDeathRecipient(recipient: DeathRecipient, flags: number): void; -+ unregisterDeathRecipient(recipient: DeathRecipient, flags: int): void; - - /** - * Queries the interface descriptor of remote object. -@@ -3424,7 +3489,7 @@ declare namespace rpc { - * a promise will be fulfilled when the response to sendMessageRequest is returned, - * and the reply message contains the returned information. - * -- * @param { number } code - Message code called by the request, which is determined by the client and server. -+ * @param { int } code - Message code called by the request, which is determined by the client and server. - * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. - * @param { MessageSequence } data - {@link MessageSequence} object holding the data to send. - * @param { MessageSequence } reply - {@link MessageSequence} object that receives the response. -@@ -3435,10 +3500,11 @@ declare namespace rpc { - * 2.The parameter type does not match; - * 3.Failed to obtain the passed object instance. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - sendMessageRequest( -- code: number, -+ code: int, - data: MessageSequence, - reply: MessageSequence, - options: MessageOption -@@ -3477,7 +3543,7 @@ declare namespace rpc { - * a callback will be invoked when the response to sendRequest is returned, - * and the reply message contains the returned information. - * -- * @param { number } code - Message code called by the request, which is determined by the client and server. -+ * @param { int } code - Message code called by the request, which is determined by the client and server. - * If the method is generated by an IDL tool, the message code is automatically generated by the IDL tool. - * @param { MessageSequence } data - {@link MessageSequence} object holding the data to send. - * @param { MessageSequence } reply - {@link MessageSequence} object that receives the response. -@@ -3488,10 +3554,11 @@ declare namespace rpc { - * 2.The parameter type does not match; - * 3.Failed to obtain the passed object instance. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - sendMessageRequest( -- code: number, -+ code: int, - data: MessageSequence, - reply: MessageSequence, - options: MessageOption, -@@ -3503,7 +3570,8 @@ declare namespace rpc { - * - * @returns { boolean } Return {@code true} if the {@code RemoteObject} is dead; return {@code false} otherwise. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isObjectDead(): boolean; - } -@@ -3517,7 +3585,8 @@ declare namespace rpc { - * peer device IDs, and checking whether the API call is on the same device. - * - * @syscap SystemCapability.Communication.IPC.Core -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class IPCSkeleton { - /** -@@ -3526,7 +3595,8 @@ declare namespace rpc { - * - * @returns { IRemoteObject } Return an {@link IRemoteObject} reference of the registered service. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - static getContextObject(): IRemoteObject; - -@@ -3538,11 +3608,13 @@ declare namespace rpc { - * {@code 0} is returned; if this method is called from the {@link RemoteObject} object, - * the PID of the corresponding {@link RemoteProxy} object is returned. - * -- * @returns { number } Return the PID of the proxy. -+ * @returns { int } Return the PID of the proxy. -+ * @static - * @syscap SystemCapability.Communication.IPC.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static getCallingPid(): number; -+ static getCallingPid(): int; - - /** - * Obtains the UID of a proxy. -@@ -3552,21 +3624,25 @@ declare namespace rpc { - * {@code 0} is returned; if this method is called from the {@link RemoteObject} object, - * the UID of the corresponding {@link RemoteProxy} object is returned. - * -- * @returns { number } Return the UID of the proxy. -+ * @returns { int } Return the UID of the proxy. -+ * @static - * @syscap SystemCapability.Communication.IPC.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static getCallingUid(): number; -+ static getCallingUid(): int; - - /** - * Obtains the TOKENID. - *

    This method is static. - * -- * @returns { number } Return the TOKENID. -+ * @returns { long } Return the TOKENID. -+ * @static - * @syscap SystemCapability.Communication.IPC.Core -- * @since 8 -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static getCallingTokenId(): number; -+ static getCallingTokenId(): long; - - /** - * Obtains the ID of the device where the peer process resides. -@@ -3675,7 +3751,8 @@ declare namespace rpc { - * obtaining the Ashmem size, and setting Ashmem protection. - * - * @syscap SystemCapability.Communication.IPC.Core -- * @since 8 -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - class Ashmem { - /** -@@ -3739,17 +3816,19 @@ declare namespace rpc { - * Creates an Ashmem object with the specified name and size. - * - * @param { string } name - Name of the Ashmem object to create. -- * @param { number } size - Size (in bytes) of the Ashmem object to create. -+ * @param { int } size - Size (in bytes) of the Ashmem object to create. - * @returns { Ashmem } Return the Ashmem object if it is created successfully; return null otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.The number of parameters is incorrect; - * 2.The parameter type does not match; - * 3.The Ashmem name passed is empty; - * 4.The Ashmem size passed is less than or equal to 0. -+ * @static - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static create(name: string, size: number): Ashmem; -+ static create(name: string, size: int): Ashmem; - - /** - * Creates an Ashmem object by copying the file descriptor (FD) of an existing Ashmem object. -@@ -3775,7 +3854,8 @@ declare namespace rpc { - * 2.The passed parameter is not an Ahmem object; - * 3.The ashmem instance for obtaining packaging is empty. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - static create(ashmem: Ashmem): Ashmem; - -@@ -3798,11 +3878,12 @@ declare namespace rpc { - /** - * Obtains the mapped memory size of this Ashmem object. - * -- * @returns { number } Memory size mapped. -+ * @returns { int } Memory size mapped. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 8 -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- getAshmemSize(): number; -+ getAshmemSize(): int; - - /** - * Creates the shared file mapping on the virtual address space of this process. -@@ -3848,7 +3929,8 @@ declare namespace rpc { - * - * @throws { BusinessError } 1900001 - Failed to call mmap. - * @syscap SystemCapability.Communication.IPC.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - mapReadWriteAshmem(): void; - -diff --git a/api/@ohos.runningLock.d.ts b/api/@ohos.runningLock.d.ts -index ebbeb5d2d..7e540367b 100644 ---- a/api/@ohos.runningLock.d.ts -+++ b/api/@ohos.runningLock.d.ts -@@ -19,9 +19,6 @@ - */ - - import { AsyncCallback, BusinessError } from './@ohos.base'; --/*** if arkts 1.1 */ --import { int } from './@ohos.base'; --/*** endif */ - - /** - * Provides a mechanism to prevent the system from hibernating so that the applications can run in the background or -@@ -131,7 +128,7 @@ declare namespace runningLock { - * {@link BACKGROUND} ensures that applications can run in the background. - * {@link PROXIMITY_SCREEN_CONTROL} determines whether to turn on or off the screen based on the proximity sensor. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.PowerManager.PowerManager.Core - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 -@@ -155,7 +152,7 @@ declare namespace runningLock { - * @since arkts {'1.1':'7', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- PROXIMITY_SCREEN_CONTROL -+ PROXIMITY_SCREEN_CONTROL = 2 - } - - /** -@@ -194,7 +191,8 @@ declare namespace runningLock { - * 2. Parameter verification failed. - * @throws { BusinessError } 4900101 - Failed to connect to the service. - * @syscap SystemCapability.PowerManager.PowerManager.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isSupported(type: RunningLockType): boolean; - -diff --git a/api/@ohos.security.cert.d.ts b/api/@ohos.security.cert.d.ts -index adf096ddd..80579c7ef 100644 ---- a/api/@ohos.security.cert.d.ts -+++ b/api/@ohos.security.cert.d.ts -@@ -17,9 +17,6 @@ - * @file - * @kit DeviceCertificateKit - */ --/*** if arkts 1.1 */ --import { int, long } from './@ohos.base'; --/*** endif */ - import type { AsyncCallback } from './@ohos.base'; - import cryptoFramework from './@ohos.security.cryptoFramework'; - -@@ -430,7 +427,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface DataArray { - /** -@@ -455,7 +453,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - data: Array; - } -@@ -575,7 +574,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum CertItemType { - /** -@@ -597,7 +597,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CERT_ITEM_TYPE_TBS = 0, - -@@ -620,7 +621,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CERT_ITEM_TYPE_PUBLIC_KEY = 1, - -@@ -643,7 +645,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CERT_ITEM_TYPE_ISSUER_UNIQUE_ID = 2, - -@@ -666,7 +669,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CERT_ITEM_TYPE_SUBJECT_UNIQUE_ID = 3, - -@@ -689,7 +693,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CERT_ITEM_TYPE_EXTENSIONS = 4 - } -@@ -716,7 +721,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum ExtensionOidType { - /** -@@ -738,7 +744,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EXTENSION_OID_TYPE_ALL = 0, - -@@ -761,7 +768,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EXTENSION_OID_TYPE_CRITICAL = 1, - -@@ -784,7 +792,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EXTENSION_OID_TYPE_UNCRITICAL = 2 - } -@@ -811,7 +820,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum ExtensionEntryType { - /** -@@ -833,7 +843,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EXTENSION_ENTRY_TYPE_ENTRY = 0, - -@@ -856,7 +867,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EXTENSION_ENTRY_TYPE_ENTRY_CRITICAL = 1, - -@@ -879,7 +891,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EXTENSION_ENTRY_TYPE_ENTRY_VALUE = 2 - } -@@ -1077,7 +1090,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum EncodingType { - /** -@@ -1086,7 +1100,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ENCODING_UTF8 = 0 - } -@@ -1352,7 +1367,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - checkValidityWithDate(date: string): void; - -@@ -1378,7 +1394,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getVersion(): int; - -@@ -1418,7 +1435,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getCertSerialNumber(): bigint; - -@@ -1453,7 +1471,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getIssuerName(): DataBlob; - -@@ -1492,7 +1511,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSubjectName(encodingType?: EncodingType): DataBlob; - -@@ -1527,7 +1547,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getNotBeforeTime(): string; - -@@ -1562,7 +1583,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getNotAfterTime(): string; - -@@ -1597,7 +1619,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSignature(): DataBlob; - -@@ -1632,7 +1655,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSignatureAlgName(): string; - -@@ -1667,7 +1691,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSignatureAlgOid(): string; - -@@ -1705,7 +1730,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSignatureAlgParams(): DataBlob; - -@@ -1737,7 +1763,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getKeyUsage(): DataBlob; - -@@ -1772,7 +1799,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getExtKeyUsage(): DataArray; - -@@ -1798,7 +1826,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getBasicConstraints(): int; - -@@ -1833,7 +1862,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSubjectAltNames(): DataArray; - -@@ -1868,7 +1898,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getIssuerAltNames(): DataArray; - -@@ -1912,7 +1943,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getItem(itemType: CertItemType): DataBlob; - -@@ -1941,7 +1973,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - match(param: X509CertMatchParameters): boolean; - -@@ -1955,7 +1988,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getCRLDistributionPoint(): DataArray; - -@@ -1969,7 +2003,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getIssuerX500DistinguishedName(): X500DistinguishedName; - -@@ -1983,7 +2018,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSubjectX500DistinguishedName(): X500DistinguishedName; - -@@ -1997,7 +2033,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - toString(): string; - -@@ -2011,7 +2048,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - hashCode(): Uint8Array; - -@@ -2025,7 +2063,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getExtensionsObject(): CertExtension; - } -@@ -2142,7 +2181,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface CertExtension { - /** -@@ -2176,7 +2216,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getEncoded(): EncodingBlob; - -@@ -2220,7 +2261,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getOidList(valueType: ExtensionOidType): DataArray; - -@@ -2267,7 +2309,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getEntry(valueType: ExtensionEntryType, oid: DataBlob): DataBlob; - -@@ -2308,7 +2351,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - checkCA(): int; - -@@ -2333,7 +2377,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - hasUnsupportedCriticalExtension(): boolean; - } -@@ -2378,7 +2423,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function createCertExtension(inStream: EncodingBlob, callback: AsyncCallback): void; - -@@ -2422,7 +2468,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function createCertExtension(inStream: EncodingBlob): Promise; - -@@ -2523,7 +2570,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface X509CRLEntry { - /** -@@ -2551,7 +2599,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getEncoded(callback: AsyncCallback): void; - -@@ -2580,7 +2629,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getEncoded(): Promise; - -@@ -2605,7 +2655,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSerialNumber(): bigint; - -@@ -2632,7 +2683,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getCertIssuer(): DataBlob; - -@@ -2657,7 +2709,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getRevocationDate(): string; - -@@ -2682,7 +2735,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getExtensions(): DataBlob; - -@@ -2707,7 +2761,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - hasExtensions(): boolean; - -@@ -2721,7 +2776,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getCertIssuerX500DistinguishedName(): X500DistinguishedName; - -@@ -2735,7 +2791,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - toString(): string; - -@@ -2749,7 +2806,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - hashCode(): Uint8Array; - -@@ -2763,7 +2821,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getExtensionsObject(): CertExtension; - } -@@ -3101,7 +3160,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface X509CRL { - /** -@@ -3125,7 +3185,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isRevoked(cert: X509Cert): boolean; - -@@ -3144,7 +3205,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getType(): string; - -@@ -3173,7 +3235,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getEncoded(callback: AsyncCallback): void; - -@@ -3202,7 +3265,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getEncoded(): Promise; - -@@ -3229,7 +3293,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - verify(key: cryptoFramework.PubKey, callback: AsyncCallback): void; - -@@ -3256,7 +3321,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - verify(key: cryptoFramework.PubKey): Promise; - -@@ -3275,7 +3341,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getVersion(): int; - -@@ -3300,7 +3367,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getIssuerName(): DataBlob; - -@@ -3325,7 +3393,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getLastUpdate(): string; - -@@ -3350,7 +3419,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getNextUpdate(): string; - -@@ -3379,7 +3449,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getRevokedCert(serialNumber: bigint): X509CRLEntry; - -@@ -3408,7 +3479,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getRevokedCertWithCert(cert: X509Cert): X509CRLEntry; - -@@ -3435,7 +3507,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getRevokedCerts(callback: AsyncCallback>): void; - -@@ -3462,7 +3535,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getRevokedCerts(): Promise>; - -@@ -3487,7 +3561,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getTBSInfo(): DataBlob; - -@@ -3512,7 +3587,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSignature(): DataBlob; - -@@ -3537,7 +3613,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSignatureAlgName(): string; - -@@ -3562,7 +3639,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSignatureAlgOid(): string; - -@@ -3589,7 +3667,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSignatureAlgParams(): DataBlob; - -@@ -3614,7 +3693,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getExtensions(): DataBlob; - -@@ -3643,7 +3723,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - match(param: X509CRLMatchParameters): boolean; - -@@ -3657,7 +3738,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getIssuerX500DistinguishedName(): X500DistinguishedName; - -@@ -3671,7 +3753,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - toString(): string; - -@@ -3685,7 +3768,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - hashCode(): Uint8Array; - -@@ -3699,7 +3783,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getExtensionsObject(): CertExtension; - } -@@ -3731,7 +3816,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function createX509CRL(inStream: EncodingBlob, callback: AsyncCallback): void; - -@@ -3762,7 +3848,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function createX509CRL(inStream: EncodingBlob): Promise; - -@@ -4004,7 +4091,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum GeneralNameType { - /** -@@ -4013,7 +4101,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - GENERAL_NAME_TYPE_OTHER_NAME = 0, - -@@ -4023,7 +4112,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - GENERAL_NAME_TYPE_RFC822_NAME = 1, - -@@ -4033,7 +4123,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - GENERAL_NAME_TYPE_DNS_NAME = 2, - -@@ -4043,7 +4134,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - GENERAL_NAME_TYPE_X400_ADDRESS = 3, - -@@ -4053,7 +4145,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - GENERAL_NAME_TYPE_DIRECTORY_NAME = 4, - -@@ -4063,7 +4156,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - GENERAL_NAME_TYPE_EDI_PARTY_NAME = 5, - -@@ -4073,7 +4167,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - GENERAL_NAME_TYPE_UNIFORM_RESOURCE_ID = 6, - -@@ -4083,7 +4178,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - GENERAL_NAME_TYPE_IP_ADDRESS = 7, - -@@ -4093,7 +4189,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - GENERAL_NAME_TYPE_REGISTERED_ID = 8 - } -@@ -4105,7 +4202,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface GeneralName { - /** -@@ -4115,7 +4213,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type: GeneralNameType; - -@@ -4126,7 +4225,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - name?: Uint8Array; - } -@@ -4146,7 +4246,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface X509CertMatchParameters { - /** -@@ -4159,7 +4260,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - subjectAlternativeNames?: Array; - -@@ -4173,7 +4275,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - matchAllSubjectAltNames?: boolean; - -@@ -4187,7 +4290,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - authorityKeyIdentifier?: Uint8Array; - -@@ -4202,7 +4306,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - minPathLenConstraint?: int; - -@@ -4227,7 +4332,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - x509Cert?: X509Cert; - -@@ -4252,7 +4358,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - validDate?: string; - -@@ -4277,7 +4384,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - issuer?: Uint8Array; - -@@ -4292,7 +4400,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - extendedKeyUsage?: Array; - -@@ -4307,7 +4416,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - nameConstraints?: Uint8Array; - -@@ -4322,7 +4432,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - certPolicy?: Array; - -@@ -4337,7 +4448,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - privateKeyValid?: string; - -@@ -4364,7 +4476,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - keyUsage?: Array; - -@@ -4389,7 +4502,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - serialNumber?: bigint; - -@@ -4414,7 +4528,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - subject?: Uint8Array; - -@@ -4428,7 +4543,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - subjectKeyIdentifier?: Uint8Array; - -@@ -4453,7 +4569,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - publicKey?: DataBlob; - -@@ -4478,7 +4595,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - publicKeyAlgID?: string; - } -@@ -4498,7 +4616,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface X509CRLMatchParameters { - /** -@@ -4522,7 +4641,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - issuer?: Array; - -@@ -4547,7 +4667,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - x509Cert?: X509Cert; - -@@ -4561,7 +4682,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - updateDateTime?: string; - -@@ -4575,7 +4697,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - maxCRL?: bigint; - -@@ -4589,7 +4712,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - minCRL?: bigint; - } -@@ -4609,7 +4733,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface CertCRLCollection { - /** -@@ -4637,7 +4762,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - selectCerts(param: X509CertMatchParameters): Promise>; - -@@ -4666,7 +4792,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - selectCerts(param: X509CertMatchParameters, callback: AsyncCallback>): void; - -@@ -4695,7 +4822,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - selectCRLs(param: X509CRLMatchParameters): Promise>; - -@@ -4724,7 +4852,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - selectCRLs(param: X509CRLMatchParameters, callback: AsyncCallback>): void; - } -@@ -4754,7 +4883,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function createCertCRLCollection(certs: Array, crls?: Array): CertCRLCollection; - -@@ -4773,7 +4903,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface X509CertChain { - /** -@@ -4799,7 +4930,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getCertList(): Array; - -@@ -4842,7 +4974,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - validate(param: CertChainValidationParameters): Promise; - -@@ -4885,7 +5018,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - validate(param: CertChainValidationParameters, callback: AsyncCallback): void; - -@@ -4899,7 +5033,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - toString(): string; - -@@ -4913,7 +5048,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - hashCode(): Uint8Array; - } -@@ -4945,7 +5081,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function createX509CertChain(inStream: EncodingBlob): Promise; - -@@ -4976,7 +5113,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function createX509CertChain(inStream: EncodingBlob, callback: AsyncCallback): void; - -@@ -5005,7 +5143,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function createX509CertChain(certs: Array): X509CertChain; - -@@ -5028,7 +5167,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function buildX509CertChain(param: CertChainBuildParameters): Promise; - -@@ -5039,7 +5179,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum EncodingBaseFormat { - /** -@@ -5048,7 +5189,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PEM = 0, - -@@ -5058,7 +5200,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DER = 1 - } -@@ -5070,7 +5213,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Pkcs12Data { - /** -@@ -5080,7 +5224,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - privateKey?: string | Uint8Array; - -@@ -5091,7 +5236,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - cert?: X509Cert; - -@@ -5102,7 +5248,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - otherCerts?: Array; - } -@@ -5114,7 +5261,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Pkcs12ParsingConfig { - /** -@@ -5124,7 +5272,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - password: string; - -@@ -5136,7 +5285,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - needsPrivateKey?: boolean; - -@@ -5148,7 +5298,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - privateKeyFormat?: EncodingBaseFormat; - -@@ -5160,7 +5311,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - needsCert?: boolean; - -@@ -5172,7 +5324,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - needsOtherCerts?: boolean; - } -@@ -5192,7 +5345,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function parsePkcs12(data: Uint8Array, config: Pkcs12ParsingConfig): Pkcs12Data; - -@@ -5216,7 +5370,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function createTrustAnchorsWithKeyStore(keystore: Uint8Array, pwd: string): Promise>; - -@@ -5239,7 +5394,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function createX500DistinguishedName(nameStr: string): Promise; - -@@ -5262,7 +5418,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function createX500DistinguishedName(nameDer: Uint8Array): Promise; - -@@ -5273,7 +5430,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface X500DistinguishedName { - /** -@@ -5286,7 +5444,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getName(): string; - -@@ -5303,7 +5462,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getName(type: string): Array; - -@@ -5317,7 +5477,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getEncoded(): EncodingBlob; - } -@@ -5337,7 +5498,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface X509TrustAnchor { - /** -@@ -5355,7 +5517,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CACert?: X509Cert; - -@@ -5374,7 +5537,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CAPubKey?: Uint8Array; - -@@ -5393,7 +5557,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CASubject?: Uint8Array; - -@@ -5404,7 +5569,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - nameConstraints?: Uint8Array; - } -@@ -5416,7 +5582,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum RevocationCheckOptions { - /** -@@ -5425,7 +5592,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - REVOCATION_CHECK_OPTION_PREFER_OCSP = 0, - -@@ -5435,7 +5603,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - REVOCATION_CHECK_OPTION_ACCESS_NETWORK, - -@@ -5447,7 +5616,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - REVOCATION_CHECK_OPTION_FALLBACK_NO_PREFER, - -@@ -5459,7 +5629,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - REVOCATION_CHECK_OPTION_FALLBACK_LOCAL - } -@@ -5471,7 +5642,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum ValidationPolicyType { - /** -@@ -5480,7 +5652,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - VALIDATION_POLICY_TYPE_X509 = 0, - -@@ -5490,7 +5663,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - VALIDATION_POLICY_TYPE_SSL - } -@@ -5502,7 +5676,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum KeyUsageType { - /** -@@ -5511,7 +5686,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYUSAGE_DIGITAL_SIGNATURE = 0, - -@@ -5521,7 +5697,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYUSAGE_NON_REPUDIATION, - -@@ -5531,7 +5708,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYUSAGE_KEY_ENCIPHERMENT, - -@@ -5541,7 +5719,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYUSAGE_DATA_ENCIPHERMENT, - -@@ -5551,7 +5730,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYUSAGE_KEY_AGREEMENT, - -@@ -5561,7 +5741,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYUSAGE_KEY_CERT_SIGN, - -@@ -5571,7 +5752,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYUSAGE_CRL_SIGN, - -@@ -5581,7 +5763,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYUSAGE_ENCIPHER_ONLY, - -@@ -5591,7 +5774,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - KEYUSAGE_DECIPHER_ONLY - } -@@ -5603,7 +5787,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface RevocationCheckParameter { - /** -@@ -5613,7 +5798,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ocspRequestExtension?: Array; - -@@ -5624,7 +5810,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ocspResponderURI?: string; - -@@ -5635,7 +5822,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ocspResponderCert?: X509Cert; - -@@ -5646,7 +5834,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ocspResponses?: Uint8Array; - -@@ -5657,7 +5846,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - crlDownloadURI?: string; - -@@ -5668,7 +5858,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - options?: Array; - -@@ -5680,7 +5871,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ocspDigest?: string; - } -@@ -5700,7 +5892,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface CertChainValidationParameters { - /** -@@ -5718,7 +5911,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - date?: string; - -@@ -5737,7 +5931,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - trustAnchors: Array; - -@@ -5756,7 +5951,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - certCRLs?: Array; - -@@ -5767,7 +5963,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - revocationCheckParam?: RevocationCheckParameter; - -@@ -5778,7 +5975,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - policy?: ValidationPolicyType; - -@@ -5789,7 +5987,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - sslHostname?: string; - -@@ -5800,7 +5999,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - keyUsage?: Array; - } -@@ -5820,7 +6020,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface CertChainValidationResult { - /** -@@ -5840,7 +6041,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly trustAnchor: X509TrustAnchor; - -@@ -5861,7 +6063,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly entityCert: X509Cert; - } -@@ -5873,7 +6076,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface CertChainBuildParameters { - /** -@@ -5883,7 +6087,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - certMatchParameters: X509CertMatchParameters; - -@@ -5894,7 +6099,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - maxLength?: int; - -@@ -5905,7 +6111,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - validationParameters: CertChainValidationParameters; - } -@@ -5917,7 +6124,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface CertChainBuildResult { - /** -@@ -5928,7 +6136,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly certChain: X509CertChain; - -@@ -5940,7 +6149,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly validationResult: CertChainValidationResult; - } -@@ -5952,7 +6162,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum CmsContentType { - /** -@@ -5961,7 +6172,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SIGNED_DATA = 0 - } -@@ -5973,7 +6185,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum CmsContentDataFormat { - /** -@@ -5982,7 +6195,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BINARY = 0, - -@@ -5992,7 +6206,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TEXT = 1 - } -@@ -6004,7 +6219,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum CmsFormat { - /** -@@ -6013,7 +6229,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PEM = 0, - -@@ -6023,7 +6240,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DER = 1 - } -@@ -6035,7 +6253,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface PrivateKeyInfo { - /** -@@ -6045,7 +6264,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - key: string | Uint8Array; - -@@ -6056,7 +6276,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - password?: string; - } -@@ -6068,7 +6289,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface CmsSignerConfig { - /** -@@ -6078,7 +6300,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - mdName: string; - -@@ -6090,7 +6313,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - addCert?: boolean; - -@@ -6102,7 +6326,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - addAttr?: boolean; - -@@ -6114,7 +6339,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - addSmimeCapAttr?: boolean; - } -@@ -6126,7 +6352,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface CmsGeneratorOptions { - /** -@@ -6137,7 +6364,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - contentDataFormat?: CmsContentDataFormat; - -@@ -6149,7 +6377,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - outFormat?: CmsFormat; - -@@ -6161,7 +6390,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isDetached?: boolean; - } -@@ -6173,7 +6403,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface CmsGenerator { - /** -@@ -6191,7 +6422,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - addSigner(cert: X509Cert, keyInfo: PrivateKeyInfo, config: CmsSignerConfig): void; - -@@ -6207,7 +6439,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - addCert(cert: X509Cert): void; - -@@ -6225,7 +6458,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - doFinal(data: Uint8Array, options?: CmsGeneratorOptions): Promise; - -@@ -6243,7 +6477,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - doFinalSync(data: Uint8Array, options?: CmsGeneratorOptions): Uint8Array | string; - } -@@ -6261,7 +6496,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function createCmsGenerator(contentType: CmsContentType): CmsGenerator; - -@@ -6272,7 +6508,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface CsrAttribute { - /** -@@ -6282,7 +6519,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type: string; - -@@ -6293,7 +6531,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - value: string; - } -@@ -6305,7 +6544,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface CsrGenerationConfig { - /** -@@ -6315,7 +6555,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - subject: X500DistinguishedName; - -@@ -6326,7 +6567,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - mdName: string; - -@@ -6337,7 +6579,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - attributes?: Array; - -@@ -6349,7 +6592,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - outFormat?: EncodingBaseFormat; - } -@@ -6369,7 +6613,8 @@ declare namespace cert { - * @syscap SystemCapability.Security.Cert - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function generateCsr(keyInfo: PrivateKeyInfo, config: CsrGenerationConfig): string | Uint8Array; - } -diff --git a/api/@ohos.security.certManager.d.ts b/api/@ohos.security.certManager.d.ts -index 278e77f5c..a2ed59800 100644 ---- a/api/@ohos.security.certManager.d.ts -+++ b/api/@ohos.security.certManager.d.ts -@@ -25,22 +25,25 @@ import type { AsyncCallback } from './@ohos.base'; - * - * @namespace certificateManager - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace certificateManager { - /** - * Enum for result code - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum CMErrorCode { - /** - * Indicates that the application has no permission to call the API. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_ERROR_NO_PERMISSION = 201, - -@@ -49,7 +52,8 @@ declare namespace certificateManager { - * - * @syscap SystemCapability.Security.CertificateManager - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_ERROR_NOT_SYSTEM_APP = 202, - -@@ -57,7 +61,8 @@ declare namespace certificateManager { - * Indicates that the input parameters are invalid. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_ERROR_INVALID_PARAMS = 401, - -@@ -65,7 +70,8 @@ declare namespace certificateManager { - * Indicates that internal error. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_ERROR_GENERIC = 17500001, - -@@ -73,7 +79,8 @@ declare namespace certificateManager { - * Indicates that the certificate does not exist. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_ERROR_NO_FOUND = 17500002, - -@@ -81,7 +88,8 @@ declare namespace certificateManager { - * Indicates that the keystore is in an invalid format or the keystore password is incorrect. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_ERROR_INCORRECT_FORMAT = 17500003, - -@@ -89,7 +97,8 @@ declare namespace certificateManager { - * Indicates that the number of certificates or credentials reaches the maximum allowed. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_ERROR_MAX_CERT_COUNT_REACHED = 17500004, - -@@ -97,7 +106,8 @@ declare namespace certificateManager { - * Indicates that the application is not authorized by the user. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_ERROR_NO_AUTHORIZATION = 17500005, - -@@ -105,7 +115,8 @@ declare namespace certificateManager { - * Indicates that the device enters advanced security mode. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_ERROR_DEVICE_ENTER_ADVSECMODE = 17500007 - } -@@ -115,7 +126,8 @@ declare namespace certificateManager { - * - * @typedef CertInfo - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface CertInfo { - /** -@@ -123,7 +135,8 @@ declare namespace certificateManager { - * - * @type { string } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - uri: string; - -@@ -132,7 +145,8 @@ declare namespace certificateManager { - * - * @type { string } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - certAlias: string; - -@@ -141,7 +155,8 @@ declare namespace certificateManager { - * - * @type { boolean } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - state: boolean; - -@@ -150,7 +165,8 @@ declare namespace certificateManager { - * - * @type { string } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - issuerName: string; - -@@ -159,7 +175,8 @@ declare namespace certificateManager { - * - * @type { string } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - subjectName: string; - -@@ -168,7 +185,8 @@ declare namespace certificateManager { - * - * @type { string } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - serial: string; - -@@ -177,7 +195,8 @@ declare namespace certificateManager { - * - * @type { string } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - notBefore: string; - -@@ -186,7 +205,8 @@ declare namespace certificateManager { - * - * @type { string } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - notAfter: string; - -@@ -195,7 +215,8 @@ declare namespace certificateManager { - * - * @type { string } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - fingerprintSha256: string; - -@@ -204,7 +225,8 @@ declare namespace certificateManager { - * - * @type { Uint8Array } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - cert: Uint8Array; - } -@@ -214,7 +236,8 @@ declare namespace certificateManager { - * - * @typedef CertAbstract - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface CertAbstract { - /** -@@ -222,7 +245,8 @@ declare namespace certificateManager { - * - * @type { string } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - uri: string; - -@@ -231,7 +255,8 @@ declare namespace certificateManager { - * - * @type { string } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - certAlias: string; - -@@ -240,7 +265,8 @@ declare namespace certificateManager { - * - * @type { boolean } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - state: boolean; - -@@ -249,7 +275,8 @@ declare namespace certificateManager { - * - * @type { string } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - subjectName: string; - } -@@ -259,7 +286,8 @@ declare namespace certificateManager { - * - * @typedef Credential - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface Credential { - /** -@@ -267,7 +295,8 @@ declare namespace certificateManager { - * - * @type { string } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type: string; - -@@ -276,7 +305,8 @@ declare namespace certificateManager { - * - * @type { string } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - alias: string; - -@@ -285,34 +315,38 @@ declare namespace certificateManager { - * - * @type { string } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - keyUri: string; - - /** - * Indicates the number of certificates included in the credential. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- certNum: number; -+ certNum: int; - - /** - * Indicates the number of key included in the credential. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- keyNum: number; -+ keyNum: int; - - /** - * Indicates the credential binary data. - * - * @type { Uint8Array } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - credentialData: Uint8Array; - } -@@ -322,7 +356,8 @@ declare namespace certificateManager { - * - * @typedef CredentialAbstract - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface CredentialAbstract { - /** -@@ -330,7 +365,8 @@ declare namespace certificateManager { - * - * @type { string } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type: string; - -@@ -339,7 +375,8 @@ declare namespace certificateManager { - * - * @type { string } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - alias: string; - -@@ -348,7 +385,8 @@ declare namespace certificateManager { - * - * @type { string } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - keyUri: string; - } -@@ -358,7 +396,8 @@ declare namespace certificateManager { - * - * @typedef CMResult - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface CMResult { - /** -@@ -366,7 +405,8 @@ declare namespace certificateManager { - * - * @type { ?Array } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - certList?: Array; - -@@ -375,7 +415,8 @@ declare namespace certificateManager { - * - * @type { ?CertInfo } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - certInfo?: CertInfo; - -@@ -384,7 +425,8 @@ declare namespace certificateManager { - * - * @type { ?Array } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - credentialList?: Array; - -@@ -393,7 +435,8 @@ declare namespace certificateManager { - * - * @type { ?Credential } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - credential?: Credential; - -@@ -402,7 +445,8 @@ declare namespace certificateManager { - * - * @type { ?Array } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - appUidList?: Array; - -@@ -411,7 +455,8 @@ declare namespace certificateManager { - * - * @type { ?string } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - uri?: string; - -@@ -420,7 +465,8 @@ declare namespace certificateManager { - * - * @type { ?Uint8Array } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - outData?: Uint8Array; - } -@@ -428,16 +474,18 @@ declare namespace certificateManager { - /** - * Enum for Key Purpose - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum CmKeyPurpose { - /** - * Indicates that key for signature. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_KEY_PURPOSE_SIGN = 4, - -@@ -445,7 +493,8 @@ declare namespace certificateManager { - * Indicates that key for verify. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_KEY_PURPOSE_VERIFY = 8 - } -@@ -453,16 +502,18 @@ declare namespace certificateManager { - /** - * Enum for Key Digest - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum CmKeyDigest { - /** - * Indicates that key digest is none. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_DIGEST_NONE = 0, - -@@ -470,7 +521,8 @@ declare namespace certificateManager { - * Indicates that key digest is md5. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_DIGEST_MD5 = 1, - -@@ -478,7 +530,8 @@ declare namespace certificateManager { - * Indicates that key digest is sha1. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_DIGEST_SHA1 = 2, - -@@ -486,7 +539,8 @@ declare namespace certificateManager { - * Indicates that key digest is sha224. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_DIGEST_SHA224 = 3, - -@@ -494,7 +548,8 @@ declare namespace certificateManager { - * Indicates that key digest is sha256. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_DIGEST_SHA256 = 4, - -@@ -502,7 +557,8 @@ declare namespace certificateManager { - * Indicates that key digest is sha384. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_DIGEST_SHA384 = 5, - -@@ -510,7 +566,8 @@ declare namespace certificateManager { - * Indicates that key digest is sha512. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_DIGEST_SHA512 = 6, - -@@ -518,7 +575,8 @@ declare namespace certificateManager { - * Indicates that key digest is SM3. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_DIGEST_SM3 = 7 - } -@@ -526,16 +584,18 @@ declare namespace certificateManager { - /** - * Enum for Key Padding - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum CmKeyPadding { - /** - * Indicates that key padding is none. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_PADDING_NONE = 0, - -@@ -543,7 +603,8 @@ declare namespace certificateManager { - * Indicates that key padding is PSS. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_PADDING_PSS = 1, - -@@ -551,7 +612,8 @@ declare namespace certificateManager { - * Indicates that key padding is PKCS1_V1_5. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CM_PADDING_PKCS1_V1_5 = 2 - } -@@ -561,7 +623,8 @@ declare namespace certificateManager { - * - * @typedef CMSignatureSpec - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface CMSignatureSpec { - /** -@@ -569,7 +632,8 @@ declare namespace certificateManager { - * - * @type { CmKeyPurpose } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - purpose: CmKeyPurpose; - -@@ -578,7 +642,8 @@ declare namespace certificateManager { - * - * @type { ?CmKeyPadding } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - padding?: CmKeyPadding; - -@@ -587,7 +652,8 @@ declare namespace certificateManager { - * - * @type { ?CmKeyDigest } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - digest?: CmKeyDigest; - } -@@ -597,7 +663,8 @@ declare namespace certificateManager { - * - * @typedef CMHandle - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface CMHandle { - /** -@@ -605,7 +672,8 @@ declare namespace certificateManager { - * - * @type { Uint8Array } - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - handle: Uint8Array; - } -@@ -641,7 +709,8 @@ declare namespace certificateManager { - * @throws { BusinessError } 17500003 - The keystore is in an invalid format or the keystore password is incorrect. - * @throws { BusinessError } 17500004 - The number of certificates or credentials reaches the maximum allowed. - * @syscap SystemCapability.Security.CertificateManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function installPrivateCertificate( - keystore: Uint8Array, -@@ -681,7 +750,8 @@ declare namespace certificateManager { - * @throws { BusinessError } 17500003 - The keystore is in an invalid format or the keystore password is incorrect. - * @throws { BusinessError } 17500004 - The number of certificates or credentials reaches the maximum allowed. - * @syscap SystemCapability.Security.CertificateManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function installPrivateCertificate(keystore: Uint8Array, keystorePwd: string, certAlias: string): Promise; - -@@ -697,7 +767,8 @@ declare namespace certificateManager { - * @throws { BusinessError } 17500001 - Internal error. - * @throws { BusinessError } 17500002 - The certificate does not exist. - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function uninstallPrivateCertificate(keyUri: string, callback: AsyncCallback): void; - -@@ -713,7 +784,8 @@ declare namespace certificateManager { - * @throws { BusinessError } 17500001 - Internal error. - * @throws { BusinessError } 17500002 - The certificate does not exist. - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function uninstallPrivateCertificate(keyUri: string): Promise; - -@@ -729,7 +801,8 @@ declare namespace certificateManager { - * @throws { BusinessError } 17500001 - Internal error. - * @syscap SystemCapability.Security.CertificateManager - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAllAppPrivateCertificates(callback: AsyncCallback): void; - -@@ -743,7 +816,8 @@ declare namespace certificateManager { - * @throws { BusinessError } 17500001 - Internal error. - * @syscap SystemCapability.Security.CertificateManager - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAllAppPrivateCertificates(): Promise; - -@@ -759,7 +833,8 @@ declare namespace certificateManager { - * @throws { BusinessError } 17500001 - Internal error. - * @throws { BusinessError } 17500002 - The certificate does not exist. - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getPrivateCertificate(keyUri: string, callback: AsyncCallback): void; - -@@ -775,7 +850,8 @@ declare namespace certificateManager { - * @throws { BusinessError } 17500001 - Internal error. - * @throws { BusinessError } 17500002 - The certificate does not exist. - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getPrivateCertificate(keyUri: string): Promise; - -@@ -808,7 +884,8 @@ declare namespace certificateManager { - * @throws { BusinessError } 17500002 - The certificate does not exist. - * @throws { BusinessError } 17500005 - The application is not authorized by the user. - * @syscap SystemCapability.Security.CertificateManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function init(authUri: string, spec: CMSignatureSpec, callback: AsyncCallback): void; - -@@ -841,7 +918,8 @@ declare namespace certificateManager { - * @throws { BusinessError } 17500002 - The certificate does not exist. - * @throws { BusinessError } 17500005 - The application is not authorized by the user. - * @syscap SystemCapability.Security.CertificateManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function init(authUri: string, spec: CMSignatureSpec): Promise; - -@@ -857,7 +935,8 @@ declare namespace certificateManager { - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17500001 - Internal error. - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function update(handle: Uint8Array, data: Uint8Array, callback: AsyncCallback): void; - -@@ -873,7 +952,8 @@ declare namespace certificateManager { - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17500001 - Internal error. - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function update(handle: Uint8Array, data: Uint8Array): Promise; - -@@ -888,7 +968,8 @@ declare namespace certificateManager { - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17500001 - Internal error. - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function finish(handle: Uint8Array, callback: AsyncCallback): void; - -@@ -904,7 +985,8 @@ declare namespace certificateManager { - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17500001 - Internal error. - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function finish(handle: Uint8Array, signature: Uint8Array, callback: AsyncCallback): void; - -@@ -920,7 +1002,8 @@ declare namespace certificateManager { - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17500001 - Internal error. - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function finish(handle: Uint8Array, signature?: Uint8Array): Promise; - -@@ -935,7 +1018,8 @@ declare namespace certificateManager { - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17500001 - Internal error. - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function abort(handle: Uint8Array, callback: AsyncCallback): void; - -@@ -950,7 +1034,8 @@ declare namespace certificateManager { - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17500001 - Internal error. - * @syscap SystemCapability.Security.CertificateManager -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function abort(handle: Uint8Array): Promise; - -@@ -967,7 +1052,8 @@ declare namespace certificateManager { - * @throws { BusinessError } 17500002 - The certificate does not exist. - * @throws { BusinessError } 17500005 - The application is not authorized by the user. - * @syscap SystemCapability.Security.CertificateManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getPublicCertificate(keyUri: string): Promise; - -@@ -982,7 +1068,8 @@ declare namespace certificateManager { - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17500001 - Internal error. - * @syscap SystemCapability.Security.CertificateManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isAuthorizedApp(keyUri: string): Promise; - -@@ -994,7 +1081,8 @@ declare namespace certificateManager { - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. - * @throws { BusinessError } 17500001 - Internal error. - * @syscap SystemCapability.Security.CertificateManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAllUserTrustedCertificates(): Promise; - -@@ -1009,7 +1097,8 @@ declare namespace certificateManager { - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17500001 - Internal error. - * @syscap SystemCapability.Security.CertificateManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAllUserTrustedCertificates(scope: CertScope): Promise; - -@@ -1025,7 +1114,8 @@ declare namespace certificateManager { - * @throws { BusinessError } 17500001 - Internal error. - * @throws { BusinessError } 17500002 - The certificate does not exist. - * @syscap SystemCapability.Security.CertificateManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getUserTrustedCertificate(certUri: string): Promise; - -@@ -1039,7 +1129,8 @@ declare namespace certificateManager { - * @throws { BusinessError } 17500001 - Internal error. - * @syscap SystemCapability.Security.CertificateManager - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAllSystemAppCertificates(): Promise; - -@@ -1051,23 +1142,26 @@ declare namespace certificateManager { - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. - * @throws { BusinessError } 17500001 - Internal error. - * @syscap SystemCapability.Security.CertificateManager -- * @since 13 -+ * @since arkts {'1.1':'13', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getPrivateCertificates(): Promise; - - /** - * Enum for certificate type managed by Certificate Manager. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Security.CertificateManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum CertType { - /** - * Indicates that ca certificate that installed by HarmonyOS system. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CA_CERT_SYSTEM = 0, - -@@ -1075,7 +1169,8 @@ declare namespace certificateManager { - * Indicates that ca certificate that installed by user. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CA_CERT_USER = 1 - } -@@ -1083,9 +1178,10 @@ declare namespace certificateManager { - /** - * Enum for the scope of user ca certificate. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Security.CertificateManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum CertScope { - -@@ -1093,7 +1189,8 @@ declare namespace certificateManager { - * Indicates that the user ca certificate for a current user. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CURRENT_USER = 1, - -@@ -1101,7 +1198,8 @@ declare namespace certificateManager { - * Indicates that the user ca certificate for all users. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - GLOBAL_USER = 2 - } -@@ -1111,7 +1209,8 @@ declare namespace certificateManager { - * - * @typedef CertStoreProperty - * @syscap SystemCapability.Security.CertificateManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface CertStoreProperty { - /** -@@ -1119,7 +1218,8 @@ declare namespace certificateManager { - * - * @type { CertType } - * @syscap SystemCapability.Security.CertificateManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - certType: CertType; - -@@ -1128,7 +1228,8 @@ declare namespace certificateManager { - * - * @type { ?CertScope } - * @syscap SystemCapability.Security.CertificateManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - certScope?: CertScope; - } -@@ -1142,7 +1243,8 @@ declare namespace certificateManager { - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17500001 - Internal error. - * @syscap SystemCapability.Security.CertificateManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getCertificateStorePath(property: CertStoreProperty): string; - -@@ -1161,7 +1263,8 @@ declare namespace certificateManager { - * @throws { BusinessError } 17500004 - Indicates that the number of certificates reaches the maximum allowed. - * @throws { BusinessError } 17500007 - Indicates that the device enters advanced security mode. In this mode, the user CA certificate cannot be installed. - * @syscap SystemCapability.Security.CertificateManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function installUserTrustedCertificateSync(cert: Uint8Array, certScope: CertScope) : CMResult; - -@@ -1176,7 +1279,8 @@ declare namespace certificateManager { - * @throws { BusinessError } 17500001 - Internal error. - * @throws { BusinessError } 17500002 - Indicates that the certificate does not exist. - * @syscap SystemCapability.Security.CertificateManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function uninstallUserTrustedCertificateSync(certUri: string) : void; - -@@ -1196,23 +1300,26 @@ declare namespace certificateManager { - * @throws { BusinessError } 17500003 - The keystore is in an invalid format or the keystore password is incorrect. - * @throws { BusinessError } 17500004 - The number of certificates or credentials reaches the maximum allowed. - * @syscap SystemCapability.Security.CertificateManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function installPrivateCertificate(keystore: Uint8Array, keystorePwd: string, certAlias: string, level: AuthStorageLevel): Promise; - - /** - * Enum for storage authentication level - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Security.CertificateManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum AuthStorageLevel { - /** - * Indicates that the file can be accessed after the device is started. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EL1 = 1, - -@@ -1220,7 +1327,8 @@ declare namespace certificateManager { - * Indicates that the file can be accessed after the device is unlocked for the first time. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EL2 = 2, - -@@ -1228,7 +1336,8 @@ declare namespace certificateManager { - * Indicates that the file can be accessed when the device is unlocked. - * - * @syscap SystemCapability.Security.CertificateManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - EL4 = 4, - } -diff --git a/api/@ohos.security.certManagerDialog.d.ts b/api/@ohos.security.certManagerDialog.d.ts -index 445f047e9..b3de7c203 100644 ---- a/api/@ohos.security.certManagerDialog.d.ts -+++ b/api/@ohos.security.certManagerDialog.d.ts -@@ -26,16 +26,18 @@ import type common from '@ohos.app.ability.common'; - * @namespace certificateManagerDialog - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 13 -+ * @since arkts {'1.1':'13', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace certificateManagerDialog { - /** - * Enum for result code - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 13 -+ * @since arkts {'1.1':'13', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum CertificateDialogErrorCode { - -@@ -44,7 +46,8 @@ declare namespace certificateManagerDialog { - * - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 13 -+ * @since arkts {'1.1':'13', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ERROR_GENERIC = 29700001, - -@@ -53,7 +56,8 @@ declare namespace certificateManagerDialog { - * - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ERROR_OPERATION_CANCELED = 29700002, - -@@ -62,7 +66,8 @@ declare namespace certificateManagerDialog { - * - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ERROR_OPERATION_FAILED = 29700003, - -@@ -71,7 +76,8 @@ declare namespace certificateManagerDialog { - * - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ERROR_DEVICE_NOT_SUPPORTED = 29700004, - -@@ -80,7 +86,8 @@ declare namespace certificateManagerDialog { - * - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ERROR_NOT_COMPLY_SECURITY_POLICY = 29700005, - } -@@ -89,10 +96,11 @@ declare namespace certificateManagerDialog { - /** - * Enum for page type of certificate manager dialog - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 13 -+ * @since arkts {'1.1':'13', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum CertificateDialogPageType { - /** -@@ -100,7 +108,8 @@ declare namespace certificateManagerDialog { - * - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 13 -+ * @since arkts {'1.1':'13', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PAGE_MAIN = 1, - -@@ -109,7 +118,8 @@ declare namespace certificateManagerDialog { - * - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 13 -+ * @since arkts {'1.1':'13', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PAGE_CA_CERTIFICATE = 2, - -@@ -118,7 +128,8 @@ declare namespace certificateManagerDialog { - * - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 13 -+ * @since arkts {'1.1':'13', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PAGE_CREDENTIAL = 3, - -@@ -127,7 +138,8 @@ declare namespace certificateManagerDialog { - * - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 13 -+ * @since arkts {'1.1':'13', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PAGE_INSTALL_CERTIFICATE = 4 - } -@@ -145,7 +157,8 @@ declare namespace certificateManagerDialog { - * @throws { BusinessError } 29700001 - Internal error. - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 13 -+ * @since arkts {'1.1':'13', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function openCertificateManagerDialog(context: common.Context, pageType: CertificateDialogPageType): Promise; - -@@ -154,10 +167,11 @@ declare namespace certificateManagerDialog { - /** - * Enum for certificate type - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum CertificateType { - /** -@@ -165,7 +179,8 @@ declare namespace certificateManagerDialog { - * - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CA_CERT = 1 - } -@@ -173,10 +188,11 @@ declare namespace certificateManagerDialog { - /** - * Enum for certificate scope - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum CertificateScope { - /** -@@ -184,7 +200,8 @@ declare namespace certificateManagerDialog { - * - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NOT_SPECIFIED = 0, - -@@ -193,7 +210,8 @@ declare namespace certificateManagerDialog { - * - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CURRENT_USER = 1, - -@@ -202,7 +220,8 @@ declare namespace certificateManagerDialog { - * - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - GLOBAL_USER = 2, - } -@@ -246,7 +265,8 @@ declare namespace certificateManagerDialog { - * @throws { BusinessError } 29700005 - The operation does not comply with the device security policy, such as the device does not allow users to manage the ca certificate of the global user. - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function openInstallCertificateDialog(context: common.Context, certType: CertificateType, certScope: CertificateScope, cert: Uint8Array): Promise; - -@@ -268,7 +288,8 @@ declare namespace certificateManagerDialog { - * @throws { BusinessError } 29700005 - The operation does not comply with the device security policy, such as the device does not allow users to manage the ca certificate of the global user. - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function openUninstallCertificateDialog(context: common.Context, certType: CertificateType, certUri: string): Promise; - -@@ -278,7 +299,8 @@ declare namespace certificateManagerDialog { - * @typedef CertificateDialogProperty - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface CertificateDialogProperty { - /** -@@ -287,7 +309,8 @@ declare namespace certificateManagerDialog { - * @type { boolean } - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - showInstallButton: boolean; - } -@@ -308,7 +331,8 @@ declare namespace certificateManagerDialog { - * @throws { BusinessError } 29700004 - The API is not supported on this device. - * @syscap SystemCapability.Security.CertificateManagerDialog - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function openCertificateDetailDialog(context: common.Context, cert: Uint8Array, property: CertificateDialogProperty): Promise; - } -diff --git a/api/@ohos.security.cryptoFramework.d.ts b/api/@ohos.security.cryptoFramework.d.ts -index 116a4fbfa..b1670ad96 100644 ---- a/api/@ohos.security.cryptoFramework.d.ts -+++ b/api/@ohos.security.cryptoFramework.d.ts -@@ -17,9 +17,6 @@ - * @file - * @kit CryptoArchitectureKit - */ --/*** if arkts 1.1 */ --import { int, long } from './@ohos.base'; --/*** endif */ - import type { AsyncCallback } from './@ohos.base'; - - /** -diff --git a/api/@ohos.sensor.d.ets b/api/@ohos.sensor.d.ets -index 0963965dc..b1f72f705 100644 ---- a/api/@ohos.sensor.d.ets -+++ b/api/@ohos.sensor.d.ets -@@ -28,163 +28,2088 @@ import { AsyncCallback, Callback } from './@ohos.base'; - * @since 20 - */ - declare namespace sensor { -+ /** -+ * Enum for obtain the type of sensor. -+ * @enum { number } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ enum SensorId { -+ /** -+ * Acceleration sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ ACCELEROMETER = 1, -+ -+ /** -+ * Gyroscope sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ GYROSCOPE = 2, -+ -+ /** -+ * Ambient light sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ AMBIENT_LIGHT = 5, -+ -+ /** -+ * Magnetic field sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ MAGNETIC_FIELD = 6, -+ -+ /** -+ * Barometric pressure sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ BAROMETER = 8, -+ -+ /** -+ * Hall effect sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ HALL = 10, -+ -+ /** -+ * Proximity sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ PROXIMITY = 12, -+ -+ /** -+ * Humidity sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ HUMIDITY = 13, -+ -+ /** -+ * Color sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ COLOR = 14, -+ -+ /** -+ * Sar sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ SAR = 15, -+ -+ /** -+ * Orientation sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ /** -+ * Orientation sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ ORIENTATION = 256, -+ -+ /** -+ * Gravity sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ GRAVITY = 257, -+ -+ /** -+ * Linear acceleration sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ LINEAR_ACCELEROMETER = 258, -+ -+ /** -+ * Rotation vector sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ ROTATION_VECTOR = 259, -+ -+ /** -+ * Ambient temperature sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ AMBIENT_TEMPERATURE = 260, -+ -+ /** -+ * Uncalibrated magnetic field sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ MAGNETIC_FIELD_UNCALIBRATED = 261, -+ -+ /** -+ * Uncalibrated gyroscope sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ GYROSCOPE_UNCALIBRATED = 263, -+ -+ /** -+ * Significant motion sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ SIGNIFICANT_MOTION = 264, -+ -+ /** -+ * Pedometer detection sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ PEDOMETER_DETECTION = 265, -+ -+ /** -+ * Pedometer sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ PEDOMETER = 266, -+ -+ /** -+ * Heart rate sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ HEART_RATE = 278, -+ -+ /** -+ * Wear detection sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ WEAR_DETECTION = 280, -+ -+ /** -+ * Uncalibrated acceleration sensor. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ ACCELEROMETER_UNCALIBRATED = 281 -+ } -+ - /** - * Subscribe to orientation sensor data. -- * @param { SensorId.ORIENTATION } type - Indicate the sensor type to listen for, {@code SensorId.ORIENTATION}. -+ * @param { 'orientationChange' } type - Indicate the sensor type to listen for, {@code SensorId.ORIENTATION}. - * @param { Callback } callback - callback orientation data. - * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14500101 - Service exception. - * @syscap SystemCapability.Sensors.Sensor -- * @atomicservice -+ * @atomicservice -+ * @since 20 -+ */ -+ function on(type: 'orientationChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to color sensor data. -+ * @param { 'colorChange' } type - Indicate the sensor type to listen for, {@code SensorId.COLOR}. -+ * @param { Callback } callback - callback color data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function on(type: 'colorChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to SAR sensor data. -+ * @param { 'sarChange' } type - Indicate the sensor type to listen for, {@code SensorId.SAR}. -+ * @param { Callback } callback - callback sar data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function on(type: 'sarChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to accelerometer sensor data. -+ * @permission ohos.permission.ACCELEROMETER -+ * @param { 'accelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.ACCELEROMETER}. -+ * @param { Callback } callback - callback accelerometer data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ function on(type: 'accelerometerChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to uncalibrated accelerometer sensor data. -+ * @permission ohos.permission.ACCELEROMETER -+ * @param { 'accelerometerUncalibratedChange' } type - Indicate the sensor type to listen for,{@code SensorId.ACCELEROMETER_UNCALIBRATED}. -+ * @param { Callback } callback - callback uncalibrated accelerometer data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function on(type: 'accelerometerUncalibratedChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to ambient light sensor data. -+ * @param { 'ambientLightChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_LIGHT}. -+ * @param { Callback } callback - callback ambient light data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function on(type: 'ambientLightChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to ambient temperature sensor data. -+ * @param { 'ambientTemperatureChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_TEMPERATURE}. -+ * @param { Callback } callback - callback ambient temperature data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function on(type: 'ambientTemperatureChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to barometer sensor data. -+ * @param { 'barometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.BAROMETER}. -+ * @param { Callback } callback - callback barometer data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function on(type: 'barometerChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to gravity sensor data. -+ * @param { 'gravityChange' } type - Indicate the sensor type to listen for, {@code SensorId.GRAVITY}. -+ * @param { Callback } callback - callback gravity data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function on(type: 'gravityChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to gyroscope sensor data. -+ * @permission ohos.permission.GYROSCOPE -+ * @param { 'gyroscopeChange' } type - Indicate the sensor type to listen for, {@code SensorId.GYROSCOPE}. -+ * @param { Callback } callback - callback gyroscope data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ function on(type: 'gyroscopeChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to uncalibrated gyroscope sensor data. -+ * @permission ohos.permission.GYROSCOPE -+ * @param { 'gyroscopeUncalibratedChange' } type - Indicate the sensor type to listen for, {@code SensorId.GYROSCOPE_UNCALIBRATED}. -+ * @param { Callback } callback - callback uncalibrated gyroscope data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function on(type: 'gyroscopeUncalibratedChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to hall sensor data. -+ * @param { 'hallChange' } type - Indicate the sensor type to listen for, {@code SensorId.HALL}. -+ * @param { Callback } callback - callback hall data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function on(type: 'hallChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to heart rate sensor data. -+ * @permission ohos.permission.READ_HEALTH_DATA -+ * @param { 'heartRateChange' } type - Indicate the sensor type to listen for, {@code SensorId.HEART_RATE}. -+ * @param { Callback } callback - callback heart rate data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function on(type: 'heartRateChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to humidity sensor data. -+ * @param { 'humidityChange' } type - Indicate the sensor type to listen for, {@code SensorId.HUMIDITY}. -+ * @param { Callback } callback - callback humidity data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function on(type: 'humidityChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to linear acceleration sensor data. -+ * @permission ohos.permission.ACCELEROMETER -+ * @param { 'linearAccelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.LINEAR_ACCELEROMETER}. -+ * @param { Callback } callback - callback linear accelerometer data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function on(type: 'linearAccelerometerChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to magnetic field sensor data. -+ * @param { 'magneticFieldChange' } type - Indicate the sensor type to listen for, {@code SensorId.MAGNETIC_FIELD}. -+ * @param { Callback } callback - callback magnetic field data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function on(type: 'magneticFieldChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to uncalibrated magnetic field sensor data. -+ * @param { 'magneticFieldUncalibratedChange' } type - Indicate the sensor type to listen for, -+ * {@code SensorId.MAGNETIC_FIELD_UNCALIBRATED}. -+ * @param { Callback } callback - callback uncalibrated magnetic field data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function on(type: 'magneticFieldUncalibratedChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to pedometer sensor data. -+ * @permission ohos.permission.ACTIVITY_MOTION -+ * @param { 'pedometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER}. -+ * @param { Callback } callback - callback pedometer data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function on(type: 'pedometerChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to pedometer detection sensor data. -+ * @permission ohos.permission.ACTIVITY_MOTION -+ * @param { 'pedometerDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER_DETECTION}. -+ * @param { Callback } callback - callback pedometer detection data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function on(type: 'pedometerDetectionChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to proximity sensor data. -+ * @param { 'proximityChange' } type - Indicate the sensor type to listen for, {@code SensorId.PROXIMITY}. -+ * @param { Callback } callback - callback proximity data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function on(type: 'proximityChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to rotation vector sensor data. -+ * @param { 'rotationVectorChange' } type - Indicate the sensor type to listen for, {@code SensorId.ROTATION_VECTOR}. -+ * @param { Callback } callback - callback rotation vector data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function on(type: 'rotationVectorChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to significant motion sensor data. -+ * @param { 'significantMotionChange' } type - Indicate the sensor type to listen for, {@code SensorId.SIGNIFICANT_MOTION}. -+ * @param { Callback } callback - callback significant motion data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function on(type: 'significantMotionChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to wear detection sensor data. -+ * @param { 'wearDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.WEAR_DETECTION}. -+ * @param { Callback } callback - callback wear detection data. -+ * @param { Options } [options] - Optional parameters specifying the interval at which sensor data is reported, {@code Options}. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function on(type: 'wearDetectionChange', callback: Callback, options?: Options): void; -+ -+ /** -+ * Subscribe to orientation sensor data once. -+ * @param { 'orientationChange' } type - Indicate the sensor type to listen for, {@code SensorId.ORIENTATION}. -+ * @param { Callback } callback - callback orientation data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function once(type: 'orientationChange', callback: Callback): void; -+ -+ /** -+ * Subscribe to accelerometer sensor data once. -+ * @permission ohos.permission.ACCELEROMETER -+ * @param { 'accelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.ACCELEROMETER}. -+ * @param { Callback } callback - callback accelerometer data. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function once(type: 'accelerometerChange', callback: Callback): void; -+ -+ /** -+ * Subscribe to uncalibrated accelerometer sensor data once. -+ * @permission ohos.permission.ACCELEROMETER -+ * @param { 'accelerometerUncalibratedChange' } type - Indicate the sensor type to listen for,{@code SensorId.ACCELEROMETER_UNCALIBRATED}. -+ * @param { Callback } callback - callback uncalibrated accelerometer data. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function once(type: 'accelerometerUncalibratedChange', callback: Callback): void; -+ -+ /** -+ * Subscribe to ambient light sensor data once. -+ * @param { 'ambientLightChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_LIGHT}. -+ * @param { Callback } callback - callback ambient light data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function once(type: 'ambientLightChange', callback: Callback): void; -+ -+ /** -+ * Subscribe to ambient temperature sensor data once. -+ * @param { 'ambientTemperatureChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_TEMPERATURE}. -+ * @param { Callback } callback - callback ambient temperature data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function once(type: 'ambientTemperatureChange', callback: Callback): void; -+ -+ /** -+ * Subscribe to barometer sensor data once. -+ * @param { 'barometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.BAROMETER}. -+ * @param { Callback } callback - callback barometer data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function once(type: 'barometerChange', callback: Callback): void; -+ -+ /** -+ * Subscribe to gravity sensor data once. -+ * @param { 'gravityChange' } type - Indicate the sensor type to listen for, {@code SensorId.GRAVITY}. -+ * @param { Callback } callback - callback gravity data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function once(type: 'gravityChange', callback: Callback): void; -+ -+ /** -+ * Subscribe to gyroscope sensor data once. -+ * @permission ohos.permission.GYROSCOPE -+ * @param { 'gyroscopeChange' } type - Indicate the sensor type to listen for, {@code SensorId.GYROSCOPE}. -+ * @param { Callback } callback - callback gyroscope data. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function once(type: 'gyroscopeChange', callback: Callback): void; -+ -+ /** -+ * Subscribe to uncalibrated gyroscope sensor data once. -+ * @permission ohos.permission.GYROSCOPE -+ * @param { 'gyroscopeUncalibratedChange' } type - Indicate the sensor type to listen for,{@code SensorId.GYROSCOPE_UNCALIBRATED}. -+ * @param { Callback } callback - callback uncalibrated gyroscope data. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function once(type: 'gyroscopeUncalibratedChange', callback: Callback): void; -+ -+ /** -+ * Subscribe to hall sensor data once. -+ * @param { 'hallChange' } type - Indicate the sensor type to listen for, {@code SensorId.HALL}. -+ * @param { Callback } callback - callback hall data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function once(type: 'hallChange', callback: Callback): void; -+ -+ /** -+ * Subscribe to heart rate sensor data once. -+ * @permission ohos.permission.READ_HEALTH_DATA -+ * @param { 'heartRateChange' } type - Indicate the sensor type to listen for, {@code SensorId.HEART_RATE}. -+ * @param { Callback } callback - callback heart rate data. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function once(type: 'heartRateChange', callback: Callback): void; -+ -+ /** -+ * Subscribe to humidity sensor data once. -+ * @param { 'humidityChange' } type - Indicate the sensor type to listen for, {@code SensorId.HUMIDITY}. -+ * @param { Callback } callback - callback humidity data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function once(type: 'humidityChange', callback: Callback): void; -+ -+ /** -+ * Subscribe to linear acceleration sensor data once. -+ * @permission ohos.permission.ACCELEROMETER -+ * @param { 'linearAccelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.LINEAR_ACCELEROMETER}. -+ * @param { Callback } callback - callback linear accelerometer data. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function once(type: 'linearAccelerometerChange', callback: Callback): void; -+ -+ /** -+ * Subscribe to magnetic field sensor data once. -+ * @param { 'magneticFieldChange' } type - Indicate the sensor type to listen for, {@code SensorId.MAGNETIC_FIELD}. -+ * @param { Callback } callback - callback magnetic field data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function once(type: 'magneticFieldChange', callback: Callback): void; -+ -+ /** -+ * Subscribe to uncalibrated magnetic field sensor data once. -+ * @param { 'magneticFieldUncalibratedChange' } type - Indicate the sensor type to listen for, -+ * {@code SensorId.MAGNETIC_FIELD_UNCALIBRATED}. -+ * @param { Callback } callback - callback uncalibrated magnetic field data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function once(type: 'magneticFieldUncalibratedChange', callback: Callback): void; -+ -+ /** -+ * Subscribe to pedometer sensor data once. -+ * @permission ohos.permission.ACTIVITY_MOTION -+ * @param { 'pedometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER}. -+ * @param { Callback } callback - callback pedometer data. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function once(type: 'pedometerChange', callback: Callback): void; -+ -+ /** -+ * Subscribe to pedometer detection sensor data once. -+ * @permission ohos.permission.ACTIVITY_MOTION -+ * @param { 'pedometerDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER_DETECTION}. -+ * @param { Callback } callback - callback pedometer detection data. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function once(type: 'pedometerDetectionChange', callback: Callback): void; -+ -+ /** -+ * Subscribe to proximity sensor data once. -+ * @param { 'proximityChange' } type - Indicate the sensor type to listen for, {@code SensorId.PROXIMITY}. -+ * @param { Callback } callback - callback proximity data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function once(type: 'proximityChange', callback: Callback): void; -+ -+ /** -+ * Subscribe to rotation vector sensor data once. -+ * @param { 'rotationVectorChange' } type - Indicate the sensor type to listen for, {@code SensorId.ROTATION_VECTOR}. -+ * @param { Callback } callback - callback rotation vector data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function once(type: 'rotationVectorChange', callback: Callback): void; -+ -+ /** -+ * Subscribe to significant motion sensor data once. -+ * @param { 'significantMotionChange' } type - Indicate the sensor type to listen for, {@code SensorId.SIGNIFICANT_MOTION}. -+ * @param { Callback } callback - callback significant motion data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function once(type: 'significantMotionChange', callback: Callback): void; -+ -+ /** -+ * Subscribe to wear detection sensor data once. -+ * @param { 'wearDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.WEAR_DETECTION}. -+ * @param { Callback } callback - callback wear detection data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function once(type: 'wearDetectionChange', callback: Callback): void; -+ -+ /** -+ * Unsubscribe to orientation sensor data. -+ * @param { 'orientationChange' } type - Indicate the sensor type to listen for, {@code SensorId.ORIENTATION}. -+ * @param { Callback } callback - callback orientation data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ function off(type: 'orientationChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to color sensor data. -+ * @param { 'colorChange' } type - Indicate the sensor type to listen for, {@code SensorId.COLOR}. -+ * @param { Callback } callback - callback color data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function off(type: 'colorChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to sar sensor data. -+ * @param { 'sarChange' } type - Indicate the sensor type to listen for, {@code SensorId.SAR}. -+ * @param { Callback } callback - callback sar data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 202 - Permission check failed. A non-system application uses the system API. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function off(type: 'sarChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to accelerometer sensor data. -+ * @permission ohos.permission.ACCELEROMETER -+ * @param { 'accelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.ACCELEROMETER}. -+ * @param { Callback } callback - callback accelerometer data. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ function off(type: 'accelerometerChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to uncalibrated accelerometer sensor data. -+ * @permission ohos.permission.ACCELEROMETER -+ * @param { 'accelerometerUncalibratedChange' } type - Indicate the sensor type to listen for, -+ * {@code SensorId.ACCELEROMETER_UNCALIBRATED}. -+ * @param { Callback } callback - callback uncalibrated accelerometer data. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function off(type: 'accelerometerUncalibratedChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to ambient light sensor data. -+ * @param { 'ambientLightChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_LIGHT}. -+ * @param { Callback } callback - callback ambient light data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function off(type: 'ambientLightChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to ambient temperature sensor data. -+ * @param { 'ambientTemperatureChange' } type - Indicate the sensor type to listen for, {@code SensorId.AMBIENT_TEMPERATURE}. -+ * @param { Callback } callback - callback ambient temperature data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function off(type: 'ambientTemperatureChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to barometer sensor data. -+ * @param { 'barometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.BAROMETER}. -+ * @param { Callback } callback - callback barometer data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function off(type: 'barometerChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to gravity sensor data. -+ * @param { 'gravityChange' } type - Indicate the sensor type to listen for, {@code SensorId.GRAVITY}. -+ * @param { Callback } callback - callback gravity data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function off(type: 'gravityChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to gyroscope sensor data. -+ * @permission ohos.permission.GYROSCOPE -+ * @param { 'gyroscopeChange' } type - Indicate the sensor type to listen for, {@code SensorId.GYROSCOPE}. -+ * @param { Callback } callback - callback gyroscope data. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ function off(type: 'gyroscopeChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to uncalibrated gyroscope sensor data. -+ * @permission ohos.permission.GYROSCOPE -+ * @param { 'gyroscopeUncalibratedChange' } type - Indicate the sensor type to listen for, {@code SensorId.GYROSCOPE_UNCALIBRATED}. -+ * @param { Callback } callback - callback uncalibrated gyroscope data. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function off(type: 'gyroscopeUncalibratedChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to hall sensor data. -+ * @param { 'hallChange' } type - Indicate the sensor type to listen for, {@code SensorId.HALL}. -+ * @param { Callback } callback - callback hall data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function off(type: 'hallChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to heart rate sensor data. -+ * @permission ohos.permission.READ_HEALTH_DATA -+ * @param { 'heartRateChange' } type - Indicate the sensor type to listen for, {@code SensorId.HEART_RATE}. -+ * @param { Callback } callback - callback heart rate data. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function off(type: 'heartRateChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to humidity sensor data. -+ * @param { 'humidityChange' } type - Indicate the sensor type to listen for, {@code SensorId.HUMIDITY}. -+ * @param { Callback } callback - callback humidity data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function off(type: 'humidityChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to linear acceleration sensor data. -+ * @permission ohos.permission.ACCELEROMETER -+ * @param { 'linearAccelerometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.LINEAR_ACCELEROMETER}. -+ * @param { Callback } callback - callback linear accelerometer data. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function off(type: 'linearAccelerometerChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to magnetic field sensor data. -+ * @param { 'magneticFieldChange' } type - Indicate the sensor type to listen for, {@code SensorId.MAGNETIC_FIELD}. -+ * @param { Callback } callback - callback magnetic field data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function off(type: 'magneticFieldChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to uncalibrated magnetic field sensor data. -+ * @param { 'magneticFieldUncalibratedChange' } type - Indicate the sensor type to listen for, -+ * {@code SensorId.MAGNETIC_FIELD_UNCALIBRATED}. -+ * @param { Callback } callback - callback uncalibrated magnetic field data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function off(type: 'magneticFieldUncalibratedChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to pedometer sensor data. -+ * @permission ohos.permission.ACTIVITY_MOTION -+ * @param { 'pedometerChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER}. -+ * @param { Callback } callback - callback pedometer data. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function off(type: 'pedometerChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to pedometer detection sensor data. -+ * @permission ohos.permission.ACTIVITY_MOTION -+ * @param { 'pedometerDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.PEDOMETER_DETECTION}. -+ * @param { Callback } callback - callback pedometer detection data. -+ * @throws { BusinessError } 201 - Permission denied. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function off(type: 'pedometerDetectionChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to proximity sensor data. -+ * @param { 'proximityChange' } type - Indicate the sensor type to listen for, {@code SensorId.PROXIMITY}. -+ * @param { Callback } callback - callback proximity data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function off(type: 'proximityChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to rotation vector sensor data. -+ * @param { 'rotationVectorChange' } type - Indicate the sensor type to listen for, {@code SensorId.ROTATION_VECTOR}. -+ * @param { Callback } callback - callback rotation vector data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function off(type: 'rotationVectorChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to significant motion sensor data. -+ * @param { 'significantMotionChange' } type - Indicate the sensor type to listen for, {@code SensorId.SIGNIFICANT_MOTION}. -+ * @param { Callback } callback - callback significant motion data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function off(type: 'significantMotionChange', callback?: Callback): void; -+ -+ /** -+ * Unsubscribe to wear detection sensor data. -+ * @param { 'wearDetectionChange' } type - Indicate the sensor type to listen for, {@code SensorId.WEAR_DETECTION}. -+ * @param { Callback } callback - callback wear detection data. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function off(type: 'wearDetectionChange', callback?: Callback): void; -+ -+ /** -+ * Subscribe to the sensor's optional parameters. -+ * @typedef Options -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ interface Options { -+ /** -+ * Sensor event reporting event interval. -+ * @type { ?(number | SensorFrequency) } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ interval?: long | SensorFrequency; -+ } -+ -+ /** -+ * The sensor reporting frequency is divided into three modes. -+ * @typedef {'game' | 'ui' | 'normal'} -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ type SensorFrequency = 'game' | 'ui' | 'normal'; -+ -+ /** -+ * Enumerates the accuracy levels of data reported by a sensor. -+ * @enum { int } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ enum SensorAccuracy { -+ /** -+ * The sensor data is unreliable. It is possible that the sensor does not contact with the device to measure. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ ACCURACY_UNRELIABLE = 0, -+ -+ /** -+ * The sensor data is at a low accuracy level. The data must be calibrated based on the environment before being used. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ ACCURACY_LOW = 1, -+ -+ /** -+ * The sensor data is at a medium accuracy level. You are advised to calibrate the data based on the environment -+ *
    before using it. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ ACCURACY_MEDIUM = 2, -+ -+ /** -+ * The sensor data is at a high accuracy level. The data can be used directly. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ ACCURACY_HIGH = 3 -+ } -+ -+ /** -+ * The basic data structure of the sensor event. -+ * @typedef Response -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ interface Response { -+ /** -+ * The timestamp of the reported sensor data. -+ * @type { long } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ timestamp: long; -+ -+ /** -+ * The accuracy levels of data reported by a sensor. -+ * @type { SensorAccuracy } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ accuracy: SensorAccuracy; -+ } -+ -+ /** -+ * Orientation sensor event data. -+ * @typedef OrientationResponse -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ interface OrientationResponse extends Response { -+ /** -+ * The device rotates at an angle around the Z axis. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ alpha: float; -+ -+ /** -+ * The device rotates at an angle around the X axis. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ beta: float; -+ -+ /** -+ * The device rotates at an angle around the Y axis. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ gamma: float; -+ } -+ -+ /** -+ * Indicates sensor information. -+ * @typedef Sensor -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ interface Sensor { -+ /** -+ * Sensor name. -+ * @type { string } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ sensorName:string; -+ -+ /** -+ * Sensor vendor. -+ * @type { string } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ vendorName:string; -+ -+ /** -+ * Sensor firmware version. -+ * @type { string } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ firmwareVersion:string; -+ -+ /** -+ * Sensor hardware version. -+ * @type { string } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ hardwareVersion:string; -+ -+ /** -+ * Sensor type ID, {@code SensorType}. -+ * @type { int } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ sensorId:int; -+ -+ /** -+ * Maximum measurement range of the sensor. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ maxRange:float; -+ -+ /** -+ * Minimum sample period allowed, in ns. -+ * @type { long } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ minSamplePeriod:long; -+ -+ /** -+ * Maximum sample period allowed, in ns. -+ * @type { long } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ maxSamplePeriod:long; -+ -+ /** -+ * Sensor accuracy. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ precision:float; -+ -+ /** -+ * Sensor power. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ power:float; -+ } -+ -+ /** -+ * Obtains all sensor information on the device. -+ * @param { AsyncCallback> } callback - callback sensor list. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function getSensorList(callback: AsyncCallback>): void; -+ -+ /** -+ * Obtains all sensor information on the device. -+ * @returns { Promise> } Promise used to return the result. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function getSensorList(): Promise>; -+ -+ /** -+ * Indicates geomagnetic field data. -+ * @typedef GeomagneticResponse -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ interface GeomagneticResponse { -+ /** -+ * Geomagnetic x-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ x: float; -+ -+ /** -+ * Geomagnetic y-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ y: float; -+ -+ /** -+ * Geomagnetic z-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ z: float; -+ -+ /** -+ * The Angle between the earth's magnetic field lines and the horizontal plane. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ geomagneticDip: float; -+ -+ /** -+ * The Angle of magnetic north and true north on a horizontal plane. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ deflectionAngle: float; -+ -+ /** -+ * The horizontal strength of the geomagnetic field. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ levelIntensity: float; -+ -+ /** -+ * The total strength of the geomagnetic field. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ totalIntensity: float; -+ } -+ -+ /** -+ * Convert rotation vector to rotation matrix. -+ * @param { Array } rotationVector - rotationVector Indicates the rotation vector. -+ * @param { AsyncCallback> } callback - callback rotation matrix. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function getRotationMatrix(rotationVector: Array, callback: AsyncCallback>): void; -+ -+ /** -+ * Convert rotation vector to rotation matrix. -+ * @param { Array } rotationVector - rotationVector Indicates the rotation vector. -+ * @returns { Promise> } Promise used to return the result. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function getRotationMatrix(rotationVector: Array): Promise>; -+ -+ /** -+ * Indicates the axis of the new coordinate system that coincides with the XY axis of the original coordinate system. -+ * @typedef CoordinatesOptions -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ interface CoordinatesOptions { -+ /** Indicates the axis of the new coordinate system that coincides with the X axis of the original coordinate system. -+ * @type { int } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ x: int; -+ -+ /** Indicates the axis of the new coordinate system that coincides with the Y axis of the original coordinate system. -+ * @type { int } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ y: int; -+ } -+ -+ /** -+ * Computes the device's orientation based on the rotation matrix. -+ * @param { Array } rotationMatrix - rotationMatrix Indicates the rotation matrix. -+ * @param { AsyncCallback> } callback - callback the angle of rotation around the z, x, y axis. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function getOrientation(rotationMatrix: Array, callback: AsyncCallback>): void; -+ -+ /** -+ * Computes the device's orientation based on the rotation matrix. -+ * @param { Array } rotationMatrix - rotationMatrix Indicates the rotation matrix. -+ * @returns { Promise> } Promise used to return the result. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function getOrientation(rotationMatrix: Array): Promise>; -+ -+ /** -+ * Indicates the response of rotation matrix. -+ * @typedef RotationMatrixResponse -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ interface RotationMatrixResponse { -+ /** -+ * rotation matrix. -+ * @type { Array } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ rotation: Array; -+ -+ /** -+ * inclination matrix. -+ * @type { Array } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ inclination: Array -+ } -+ -+ /** -+ * Calculate rotation matrix based on gravity vector and geomagnetic vector. -+ * @param { Array } gravity - gravity Indicates the gravity vector. -+ * @param { Array } geomagnetic - geomagnetic Indicates the geomagnetic vector. -+ * @param { AsyncCallback } callback - callback rotation matrix and inclination matrix. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function getRotationMatrix(gravity: Array, geomagnetic: Array, callback: AsyncCallback): void; -+ -+ /** -+ * Calculate rotation matrix based on gravity vector and geomagnetic vector. -+ * @param { Array } gravity - gravity Indicates the gravity vector. -+ * @param { Array } geomagnetic - geomagnetic Indicates the geomagnetic vector. -+ * @returns { Promise } Promise used to return the result. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -+ *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 14500101 - Service exception. -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ function getRotationMatrix(gravity: Array, geomagnetic: Array): Promise; -+ -+ /** -+ * Acceleration sensor event data. -+ * @typedef AccelerometerResponse -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ interface AccelerometerResponse extends Response { -+ /** -+ * Acceleration x-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ x: float; -+ -+ /** -+ * Acceleration y-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ y: float; -+ -+ /** -+ * Acceleration z-axis component -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ z: float; -+ } -+ -+ /** -+ * Linear acceleration sensor event data. -+ * @typedef LinearAccelerometerResponse -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ interface LinearAccelerometerResponse extends Response { -+ /** -+ * Linear acceleration x-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ x: float; -+ -+ /** -+ * Linear acceleration y-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ y: float; -+ -+ /** -+ * Linear acceleration z-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ z: float; -+ } -+ -+ /** -+ * Acceleration uncalibrated sensor event data. -+ * @typedef AccelerometerUncalibratedResponse -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ interface AccelerometerUncalibratedResponse extends Response { -+ /** -+ * Acceleration uncalibrated x-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ x: float; -+ -+ /** -+ * Acceleration uncalibrated y-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ y: float; -+ -+ /** -+ * Acceleration uncalibrated z-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ z: float; -+ -+ /** -+ * Acceleration uncalibrated x-axis offset. -+ * -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ biasX: float; -+ -+ /** -+ * Acceleration uncalibrated y-axis offset. -+ * -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ biasY: float; -+ -+ /** -+ * Acceleration uncalibrated z-axis offset. -+ * -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ biasZ: float; -+ } -+ -+ /** -+ * Gravity sensor event data. -+ * @typedef GravityResponse -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ interface GravityResponse extends Response { -+ /** -+ * Gravity x-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ x: float; -+ -+ /** -+ * Gravity y-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ y: float; -+ -+ /** -+ * Gravity z-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ z: float; -+ } -+ -+ /** -+ * Rotation vector sensor event data. -+ * @typedef RotationVectorResponse -+ * @syscap SystemCapability.Sensors.Sensor - * @since 20 - */ -- function on(type: 'ORIENTATION', callback: Callback, -- options?: Options): void; -+ interface RotationVectorResponse extends Response { -+ /** -+ * Rotation vector x-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ x: float; -+ -+ /** -+ * Rotation vector y-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ y: float; -+ -+ /** -+ * Rotation vector z-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ z: float; -+ -+ /** -+ * Scalar quantity. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ w: float; -+ } - - /** -- * Unsubscribe to orientation sensor data. -- * @param { SensorId.ORIENTATION } type - Indicate the sensor type to listen for, {@code SensorId.ORIENTATION}. -- * @param { Callback } callback - callback orientation data. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; -- *
    2. Incorrect parameter types; 3. Parameter verification failed. -+ * Gyroscope sensor event data. -+ * @typedef GyroscopeResponse - * @syscap SystemCapability.Sensors.Sensor - * @atomicservice - * @since 20 - */ -- function off(type: 'ORIENTATION', callback?: Callback): void; -+ interface GyroscopeResponse extends Response { -+ /** -+ * Gyroscope x-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ x: float; -+ -+ /** -+ * Gyroscope y-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ y: float; -+ -+ /** -+ * Gyroscope z-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @atomicservice -+ * @since 20 -+ */ -+ z: float; -+ } - - /** -- * Subscribe to the sensor's optional parameters. -- * @typedef Options -+ * Gyroscope uncalibrated sensor event data. -+ * @typedef GyroscopeUncalibratedResponse - * @syscap SystemCapability.Sensors.Sensor -- * @atomicservice - * @since 20 - */ -- interface Options { -+ interface GyroscopeUncalibratedResponse extends Response { - /** -- * Sensor event reporting event interval. -- * @type { ?(number | SensorFrequency) } -+ * Gyroscope uncalibrated x-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ x: float; -+ -+ /** -+ * Gyroscope uncalibrated y-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ y: float; -+ -+ /** -+ * Gyroscope uncalibrated z-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ z: float; -+ -+ /** -+ * Gyroscope uncalibrated x-axis offset. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ biasX: float; -+ -+ /** -+ * Gyroscope uncalibrated y-axis offset. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ biasY: float; -+ -+ /** -+ * Gyroscope uncalibrated z-axis offset. -+ * @type { float } - * @syscap SystemCapability.Sensors.Sensor -- * @atomicservice - * @since 20 - */ -- interval?: number | SensorFrequency; -+ biasZ: float; - } - - /** -- * The sensor reporting frequency is divided into three modes. -- * @typedef {'game' | 'ui' | 'normal'} -+ * Significant motion sensor event data. -+ * @typedef SignificantMotionResponse - * @syscap SystemCapability.Sensors.Sensor -- * @atomicservice - * @since 20 - */ -- type SensorFrequency = 'game' | 'ui' | 'normal'; -+ interface SignificantMotionResponse extends Response { -+ /** -+ * The degree of significant motion. -+ * Whether the device has a significant motion. -+ * The value 1 means that the device has a significant motion, and 0 means the opposite. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ scalar: float; -+ } - - /** -- * Enumerates the accuracy levels of data reported by a sensor. -- * @enum { number } -+ * Proximity sensor event data. -+ * @typedef ProximityResponse - * @syscap SystemCapability.Sensors.Sensor -- * @atomicservice - * @since 20 - */ -- enum SensorAccuracy { -+ interface ProximityResponse extends Response { - /** -- * The sensor data is unreliable. It is possible that the sensor does not contact with the device to measure. -+ * Indicates the degree of proximity, event 0 indicates proximity, and greater than 0 indicates distance. -+ * @type { float } - * @syscap SystemCapability.Sensors.Sensor -- * @atomicservice - * @since 20 - */ -- ACCURACY_UNRELIABLE = 0, -+ distance: float; -+ } - -+ /** -+ * Light sensor event data. -+ * @typedef LightResponse -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ interface LightResponse extends Response { - /** -- * The sensor data is at a low accuracy level. The data must be calibrated based on the environment before being used. -+ * Indicates light intensity, in lux. -+ * @type { float } - * @syscap SystemCapability.Sensors.Sensor -- * @atomicservice - * @since 20 - */ -- ACCURACY_LOW = 1, -+ intensity: float; - - /** -- * The sensor data is at a medium accuracy level. You are advised to calibrate the data based on the environment -- *
    before using it. -+ * Indicates color temperature, in kelvin. -+ * @type { ?float } - * @syscap SystemCapability.Sensors.Sensor -- * @atomicservice - * @since 20 - */ -- ACCURACY_MEDIUM = 2, -+ colorTemperature?: float; - - /** -- * The sensor data is at a high accuracy level. The data can be used directly. -+ * Indicates infrared luminance, in cd/m2. -+ * @type { ?float } - * @syscap SystemCapability.Sensors.Sensor -- * @atomicservice - * @since 20 - */ -- ACCURACY_HIGH = 3 -+ infraredLuminance?: float; - } - - /** -- * The basic data structure of the sensor event. -- * @typedef Response -+ * Hall sensor event data. -+ * @typedef HallResponse - * @syscap SystemCapability.Sensors.Sensor -- * @atomicservice - * @since 20 - */ -- interface Response { -+ interface HallResponse extends Response { - /** -- * The timestamp of the reported sensor data. -- * @type { number } -+ * Indicates hall status, 0 indicates open, and greater than 0 indicates suction. -+ * @type { float } - * @syscap SystemCapability.Sensors.Sensor -- * @atomicservice - * @since 20 - */ -- timestamp: number; -+ status: float; -+ } - -+ /** -+ * Magnetic field sensor event data. -+ * @typedef MagneticFieldResponse -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ interface MagneticFieldResponse extends Response { - /** -- * The accuracy levels of data reported by a sensor. -- * @type { SensorAccuracy } -+ * Magnetic field x-axis component. -+ * @type { float } - * @syscap SystemCapability.Sensors.Sensor -- * @atomicservice - * @since 20 - */ -- accuracy: SensorAccuracy; -+ x: float; -+ -+ /** -+ * Magnetic field y-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ y: float; -+ -+ /** -+ * Magnetic field z-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ z: float; - } - - /** -- * Orientation sensor event data. -- * @typedef OrientationResponse -+ * Magnetic field uncalibrated sensor event data. -+ * @typedef MagneticFieldUncalibratedResponse - * @syscap SystemCapability.Sensors.Sensor -- * @atomicservice - * @since 20 - */ -- interface OrientationResponse extends Response { -+ interface MagneticFieldUncalibratedResponse extends Response { - /** -- * The device rotates at an angle around the Z axis. -- * @type { number } -+ * Magnetic field uncalibrated x-axis component. -+ * @type { float } - * @syscap SystemCapability.Sensors.Sensor -- * @atomicservice - * @since 20 - */ -- alpha: number; -+ x: float; - - /** -- * The device rotates at an angle around the X axis. -- * @type { number } -+ * Magnetic field uncalibrated y-axis component. -+ * @type { float } - * @syscap SystemCapability.Sensors.Sensor -- * @atomicservice - * @since 20 - */ -- beta: number; -+ y: float; - - /** -- * The device rotates at an angle around the Y axis. -- * @type { number } -+ * Magnetic field uncalibrated z-axis component. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ z: float; -+ -+ /** -+ * Magnetic field uncalibrated x-axis offset. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ biasX: float; -+ -+ /** -+ * Magnetic field uncalibrated y-axis offset. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ biasY: float; -+ -+ /** -+ * Magnetic field uncalibrated z-axis offset. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ biasZ: float; -+ } -+ -+ /** -+ * Pedometer sensor event data. -+ * @typedef PedometerResponse -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ interface PedometerResponse extends Response { -+ /** -+ * Indicates the number of steps. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ steps: float; -+ } -+ -+ /** -+ * Humidity sensor event data. -+ * @typedef HumidityResponse -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ interface HumidityResponse extends Response { -+ /** -+ * Indicates the number of humidity. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ humidity: float; -+ } -+ -+ /** -+ * Pedometer detection sensor event data. -+ * @typedef PedometerDetectionResponse -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ interface PedometerDetectionResponse extends Response { -+ /** -+ * Indicates the pedometer detection status, 1 indicates that a walking action has occurred, -+ * and 0 indicates that no movement has occurred. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ scalar: float; -+ } -+ -+ /** -+ * Ambient temperature sensor event data. -+ * @typedef AmbientTemperatureResponse -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ interface AmbientTemperatureResponse extends Response { -+ /** -+ * Indicates ambient temperature, in celsius. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ temperature: float; -+ } -+ -+ /** -+ * Barometer sensor event data. -+ * @typedef BarometerResponse -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ interface BarometerResponse extends Response { -+ /** -+ * Indicates the number of barometer, in hpa. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ pressure: float; -+ } -+ -+ /** -+ * Heart rate sensor event data. -+ * @typedef HeartRateResponse -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ interface HeartRateResponse extends Response { -+ /** -+ * Indicates the number of heart rate. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ heartRate: float; -+ } -+ -+ /** -+ * Wear detection sensor event data. -+ * @typedef WearDetectionResponse -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ interface WearDetectionResponse extends Response { -+ /** -+ * Indicates the status of wear detection, 1 for wearing, 0 for wearing not. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ value: float; -+ } -+ -+ /** -+ * Color sensor event data. -+ * @typedef ColorResponse -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ interface ColorResponse extends Response { -+ /** -+ * Indicates the intensity of light, in lux. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ lightIntensity: float; -+ /** -+ * Indicates the color temperature, in kelvin. -+ * @type { float } -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ colorTemperature: float; -+ } -+ -+ /** -+ * Sar sensor event data. -+ * @typedef SarResponse -+ * @syscap SystemCapability.Sensors.Sensor -+ * @since 20 -+ */ -+ interface SarResponse extends Response { -+ /** -+ * Indicates the specific absorption rate, in W/kg. -+ * @type { float } - * @syscap SystemCapability.Sensors.Sensor -- * @atomicservice - * @since 20 - */ -- gamma: number; -+ absorptionRatio: float; - } - } - -diff --git a/api/@ohos.systemCapability.d.ts b/api/@ohos.systemCapability.d.ts -index 67f5b06f9..553873d7f 100644 ---- a/api/@ohos.systemCapability.d.ts -+++ b/api/@ohos.systemCapability.d.ts -@@ -16,6 +16,7 @@ - /** - * @file - * @kit BasicServicesKit -+ * @arkts 1.1&1.2 - */ - - import { AsyncCallback, Callback } from './@ohos.base'; -diff --git a/api/@ohos.telephony.data.d.ts b/api/@ohos.telephony.data.d.ts -index 259f288bc..22a14f899 100644 ---- a/api/@ohos.telephony.data.d.ts -+++ b/api/@ohos.telephony.data.d.ts -@@ -25,7 +25,8 @@ import type { AsyncCallback } from './@ohos.base'; - * - * @namespace data - * @syscap SystemCapability.Telephony.CellularData -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace data { - /** -@@ -51,7 +52,8 @@ declare namespace data { - * - * @returns { number } Returns default cellular data slot id. - * @syscap SystemCapability.Telephony.CellularData -- * @since 9 -+ * @since arkts {'1.1':'9','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getDefaultCellularDataSlotIdSync(): number; - -@@ -134,7 +136,8 @@ declare namespace data { - *

  • {@code DataConnectState#DATA_STATE_SUSPENDED} - * - * @syscap SystemCapability.Telephony.CellularData -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getCellularDataState(callback: AsyncCallback): void; - -@@ -150,7 +153,8 @@ declare namespace data { - *
  • {@code DataConnectState#DATA_STATE_SUSPENDED} - * - * @syscap SystemCapability.Telephony.CellularData -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getCellularDataState(): Promise; - -@@ -168,7 +172,8 @@ declare namespace data { - * @throws { BusinessError } 8300003 - System internal error. - * @throws { BusinessError } 8300999 - Unknown error. - * @syscap SystemCapability.Telephony.CellularData -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isCellularDataEnabled(callback: AsyncCallback): void; - -@@ -183,7 +188,8 @@ declare namespace data { - * @throws { BusinessError } 8300003 - System internal error. - * @throws { BusinessError } 8300999 - Unknown error. - * @syscap SystemCapability.Telephony.CellularData -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isCellularDataEnabled(): Promise; - -@@ -217,7 +223,8 @@ declare namespace data { - * @throws { BusinessError } 8300999 - Unknown error. - * @syscap SystemCapability.Telephony.CellularData - * @systemapi Hide this for inner system use. -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function enableCellularData(callback: AsyncCallback): void; - -@@ -233,7 +240,8 @@ declare namespace data { - * @throws { BusinessError } 8300999 - Unknown error. - * @syscap SystemCapability.Telephony.CellularData - * @systemapi Hide this for inner system use. -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function enableCellularData(): Promise; - -@@ -252,7 +260,8 @@ declare namespace data { - * @throws { BusinessError } 8300999 - Unknown error. - * @syscap SystemCapability.Telephony.CellularData - * @systemapi Hide this for inner system use. -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function disableCellularData(callback: AsyncCallback): void; - -@@ -268,7 +277,8 @@ declare namespace data { - * @throws { BusinessError } 8300999 - Unknown error. - * @syscap SystemCapability.Telephony.CellularData - * @systemapi Hide this for inner system use. -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function disableCellularData(): Promise; - -@@ -540,14 +550,16 @@ declare namespace data { - * - * @enum { number } - * @syscap SystemCapability.Telephony.CellularData -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum DataFlowType { - /** - * Indicates that there is no uplink or downlink data. - * - * @syscap SystemCapability.Telephony.CellularData -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DATA_FLOW_TYPE_NONE = 0, - -@@ -555,7 +567,8 @@ declare namespace data { - * Indicates that there is only downlink data. - * - * @syscap SystemCapability.Telephony.CellularData -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DATA_FLOW_TYPE_DOWN = 1, - -@@ -563,7 +576,8 @@ declare namespace data { - * Indicates that there is only uplink data. - * - * @syscap SystemCapability.Telephony.CellularData -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DATA_FLOW_TYPE_UP = 2, - -@@ -571,7 +585,8 @@ declare namespace data { - * Indicates that there is uplink and downlink data. - * - * @syscap SystemCapability.Telephony.CellularData -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DATA_FLOW_TYPE_UP_DOWN = 3, - -@@ -579,7 +594,8 @@ declare namespace data { - * Indicates that there is no uplink or downlink data, and the bottom-layer link is in the dormant state. - * - * @syscap SystemCapability.Telephony.CellularData -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DATA_FLOW_TYPE_DORMANT = 4 - } -@@ -589,14 +605,16 @@ declare namespace data { - * - * @enum { number } - * @syscap SystemCapability.Telephony.CellularData -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum DataConnectState { - /** - * Indicates that a cellular data link is unknown. - * - * @syscap SystemCapability.Telephony.CellularData -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DATA_STATE_UNKNOWN = -1, - -@@ -604,7 +622,8 @@ declare namespace data { - * Indicates that a cellular data link is disconnected. - * - * @syscap SystemCapability.Telephony.CellularData -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DATA_STATE_DISCONNECTED = 0, - -@@ -612,7 +631,8 @@ declare namespace data { - * Indicates that a cellular data link is being connected. - * - * @syscap SystemCapability.Telephony.CellularData -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DATA_STATE_CONNECTING = 1, - -@@ -620,7 +640,8 @@ declare namespace data { - * Indicates that a cellular data link is connected. - * - * @syscap SystemCapability.Telephony.CellularData -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DATA_STATE_CONNECTED = 2, - -@@ -628,7 +649,8 @@ declare namespace data { - * Indicates that a cellular data link is suspended. - * - * @syscap SystemCapability.Telephony.CellularData -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DATA_STATE_SUSPENDED = 3 - } -diff --git a/api/@ohos.telephony.esim.d.ts b/api/@ohos.telephony.esim.d.ts -index 26ac5e8a5..33d6143cf 100644 ---- a/api/@ohos.telephony.esim.d.ts -+++ b/api/@ohos.telephony.esim.d.ts -@@ -26,7 +26,8 @@ import type { AsyncCallback } from './@ohos.base'; - * - * @namespace eSIM - * @syscap SystemCapability.Telephony.CoreService.Esim -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace eSIM { - /** -@@ -312,7 +313,8 @@ declare namespace eSIM { - * @throws { BusinessError } 3120002 - System internal error. - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function resetMemory(slotId: number, options?:ResetOption): Promise; - -@@ -868,7 +870,8 @@ declare namespace eSIM { - * @enum { number } - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum ResetOption { - /** -@@ -876,7 +879,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DELETE_OPERATIONAL_PROFILES = 1, - -@@ -885,7 +889,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DELETE_FIELD_LOADED_TEST_PROFILES = 1 << 1, - -@@ -894,7 +899,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESET_DEFAULT_SMDP_ADDRESS = 1 << 2, - } -@@ -960,7 +966,8 @@ declare namespace eSIM { - * @enum { number } - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum ResultCode { - /** -@@ -968,7 +975,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_SOLVABLE_ERRORS = -2, - -@@ -977,7 +985,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_MUST_DISABLE_PROFILE = -1, - -@@ -986,7 +995,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_OK = 0, - -@@ -995,7 +1005,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_GET_EID_FAILED = 201, - -@@ -1004,7 +1015,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_ACTIVATION_CODE_CHANGED = 203, - -@@ -1013,7 +1025,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_ACTIVATION_CODE_INVALID = 204, - -@@ -1022,7 +1035,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_SMDP_ADDRESS_INVALID = 205, - -@@ -1031,7 +1045,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_EUICC_INFO_INVALID = 206, - -@@ -1040,7 +1055,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_TLS_HANDSHAKE_FAILED = 207, - -@@ -1049,7 +1065,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_CERTIFICATE_IO_ERROR = 208, - -@@ -1058,7 +1075,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_CERTIFICATE_RESPONSE_TIMEOUT = 209, - -@@ -1067,7 +1085,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_AUTHENTICATION_FAILED = 210, - -@@ -1076,7 +1095,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_RESPONSE_HTTP_FAILED = 211, - -@@ -1085,7 +1105,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_CONFIRMATION_CODE_INCORRECT = 212, - -@@ -1094,7 +1115,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_EXCEEDED_CONFIRMATION_CODE_TRY_LIMIT = 213, - -@@ -1103,7 +1125,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_NO_PROFILE_ON_SERVER = 214, - -@@ -1112,7 +1135,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_TRANSACTION_ID_INVALID = 215, - -@@ -1121,7 +1145,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_SERVER_ADDRESS_INVALID = 216, - -@@ -1130,7 +1155,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_GET_BOUND_PROFILE_PACKAGE_FAILED = 217, - -@@ -1139,7 +1165,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_USER_CANCEL_DOWNLOAD = 218, - -@@ -1148,7 +1175,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_SERVER_UNAVAILABLE = 220, - -@@ -1157,7 +1185,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_PROFILE_NON_DELETE = 223, - -@@ -1166,7 +1195,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_SMDP_ADDRESS_INCORRECT = 226, - -@@ -1175,7 +1205,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_ANALYZE_AUTHENTICATION_SERVER_RESPONSE_FAILED = 228, - -@@ -1184,7 +1215,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_ANALYZE_AUTHENTICATION_CLIENT_RESPONSE_FAILED = 229, - -@@ -1193,7 +1225,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_ANALYZE_AUTHENTICATION_CLIENT_MATCHING_ID_REFUSED = 231, - -@@ -1202,7 +1235,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_PROFILE_TYPE_ERROR_AUTHENTICATION_STOPPED = 233, - -@@ -1211,7 +1245,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_CARRIER_SERVER_REFUSED_ERRORS = 249, - -@@ -1220,7 +1255,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_CERTIFICATE_INVALID = 251, - -@@ -1229,7 +1265,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_OUT_OF_MEMORY = 263, - -@@ -1238,7 +1275,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_PPR_FORBIDDEN = 268, - -@@ -1247,7 +1285,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_NOTHING_TO_DELETE = 270, - -@@ -1256,7 +1295,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_PPR_NOT_MATCH = 276, - -@@ -1265,7 +1305,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_CAT_BUSY = 283, - -@@ -1274,7 +1315,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_PROFILE_EID_INVALID = 284, - -@@ -1283,7 +1325,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_DOWNLOAD_TIMEOUT = 287, - -@@ -1292,7 +1335,8 @@ declare namespace eSIM { - * - * @syscap SystemCapability.Telephony.CoreService.Esim - * @systemapi Hide this for inner system use. -- * @since 16 -+ * @since arkts {'1.1':'16','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RESULT_SGP_22_OTHER = 400, - } -diff --git a/api/@ohos.telephony.sim.d.ts b/api/@ohos.telephony.sim.d.ts -index 37f1d31d0..c57d6880f 100644 ---- a/api/@ohos.telephony.sim.d.ts -+++ b/api/@ohos.telephony.sim.d.ts -@@ -26,7 +26,8 @@ import type { AsyncCallback } from './@ohos.base'; - * - * @namespace sim - * @syscap SystemCapability.Telephony.CoreService -- * @since 6 -+ * @since arkts {'1.1':'6','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace sim { - /** -@@ -38,7 +39,8 @@ declare namespace sim { - * whether the SIM card in a specified slot is activated. - * Returns {@code true} if the SIM card is activated; returns {@code false} otherwise. - * @syscap SystemCapability.Telephony.CoreService -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isSimActive(slotId: number, callback: AsyncCallback): void; - -@@ -49,7 +51,8 @@ declare namespace sim { - * ranging from {@code 0} to the maximum card slot index number supported by the device. - * @returns { Promise } Returns {@code true} if the SIM card is activated; returns {@code false} otherwise. - * @syscap SystemCapability.Telephony.CoreService -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isSimActive(slotId: number): Promise; - -@@ -60,7 +63,8 @@ declare namespace sim { - * ranging from 0 to the maximum card slots supported by the device. - * @returns { boolean } Returns {@code true} if the SIM card is activated; returns {@code false} otherwise. - * @syscap SystemCapability.Telephony.CoreService -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isSimActiveSync(slotId: number): boolean; - -@@ -73,7 +77,8 @@ declare namespace sim { - * returns {@code 1} if card 2 is used as the default card slot for the voice service; - * returns {@code -1} if no card is available for the voice service. - * @syscap SystemCapability.Telephony.CoreService -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getDefaultVoiceSlotId(callback: AsyncCallback): void; - -@@ -84,7 +89,8 @@ declare namespace sim { - * returns {@code 1} if card 2 is used as the default card slot for the voice service; - * returns {@code -1} if no card is available for the voice service. - * @syscap SystemCapability.Telephony.CoreService -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getDefaultVoiceSlotId(): Promise; - -@@ -141,7 +147,8 @@ declare namespace sim { - * @throws { BusinessError } 8300004 - No SIM card found. - * @throws { BusinessError } 8300999 - Unknown error. - * @syscap SystemCapability.Telephony.CoreService -- * @since 6 -+ * @since arkts {'1.1':'6','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getISOCountryCodeForSim(slotId: number, callback: AsyncCallback): void; - -@@ -160,7 +167,8 @@ declare namespace sim { - * @throws { BusinessError } 8300004 - No SIM card found. - * @throws { BusinessError } 8300999 - Unknown error. - * @syscap SystemCapability.Telephony.CoreService -- * @since 6 -+ * @since arkts {'1.1':'6','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getISOCountryCodeForSim(slotId: number): Promise; - -@@ -313,7 +321,8 @@ declare namespace sim { - * @throws { BusinessError } 8300003 - System internal error. - * @throws { BusinessError } 8300999 - Unknown error. - * @syscap SystemCapability.Telephony.CoreService -- * @since 6 -+ * @since arkts {'1.1':'6','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSimState(slotId: number, callback: AsyncCallback): void; - -@@ -338,7 +347,8 @@ declare namespace sim { - * @throws { BusinessError } 8300003 - System internal error. - * @throws { BusinessError } 8300999 - Unknown error. - * @syscap SystemCapability.Telephony.CoreService -- * @since 6 -+ * @since arkts {'1.1':'6','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSimState(slotId: number): Promise; - -@@ -357,7 +367,8 @@ declare namespace sim { - *
  • {@code SimState#SIM_STATE_LOADED} - * - * @syscap SystemCapability.Telephony.CoreService -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSimStateSync(slotId: number): SimState; - -@@ -704,7 +715,8 @@ declare namespace sim { - * - * @returns { number } Returns the maximum number of SIM card slots. - * @syscap SystemCapability.Telephony.CoreService -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getMaxSimCount(): number; - -@@ -788,7 +800,8 @@ declare namespace sim { - * @throws { BusinessError } 8300003 - System internal error. - * @throws { BusinessError } 8300999 - Unknown error. - * @syscap SystemCapability.Telephony.CoreService -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function hasSimCard(slotId: number, callback: AsyncCallback): void; - -@@ -805,7 +818,8 @@ declare namespace sim { - * @throws { BusinessError } 8300003 - System internal error. - * @throws { BusinessError } 8300999 - Unknown error. - * @syscap SystemCapability.Telephony.CoreService -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function hasSimCard(slotId: number): Promise; - -@@ -838,7 +852,8 @@ declare namespace sim { - * @throws { BusinessError } 8300999 - Unknown error. - * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. - * @syscap SystemCapability.Telephony.CoreService -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSimAccountInfo(slotId: number, callback: AsyncCallback): void; - -@@ -859,7 +874,8 @@ declare namespace sim { - * @throws { BusinessError } 8300999 - Unknown error. - * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. - * @syscap SystemCapability.Telephony.CoreService -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSimAccountInfo(slotId: number): Promise; - -@@ -878,7 +894,8 @@ declare namespace sim { - * @throws { BusinessError } 8300004 - No SIM card found. - * @throws { BusinessError } 8300999 - Unknown error. - * @syscap SystemCapability.Telephony.CoreService -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getActiveSimAccountInfoList(callback: AsyncCallback>): void; - -@@ -893,7 +910,8 @@ declare namespace sim { - * @throws { BusinessError } 8300004 - No SIM card found. - * @throws { BusinessError } 8300999 - Unknown error. - * @syscap SystemCapability.Telephony.CoreService -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getActiveSimAccountInfoList(): Promise>; - -@@ -1230,7 +1248,8 @@ declare namespace sim { - * @throws { BusinessError } 8300999 - Unknown error. - * @syscap SystemCapability.Telephony.CoreService - * @systemapi Hide this for inner system use. -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getOperatorConfigs(slotId: number, callback: AsyncCallback>): void; - -@@ -1252,7 +1271,8 @@ declare namespace sim { - * @throws { BusinessError } 8300999 - Unknown error. - * @syscap SystemCapability.Telephony.CoreService - * @systemapi Hide this for inner system use. -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getOperatorConfigs(slotId: number): Promise>; - -@@ -1277,7 +1297,8 @@ declare namespace sim { - * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. - * @syscap SystemCapability.Telephony.CoreService - * @systemapi Hide this for inner system use. -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function unlockPin(slotId: number, pin: string, callback: AsyncCallback): void; - -@@ -1302,7 +1323,8 @@ declare namespace sim { - * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. - * @syscap SystemCapability.Telephony.CoreService - * @systemapi Hide this for inner system use. -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function unlockPin(slotId: number, pin: string): Promise; - -@@ -1328,7 +1350,8 @@ declare namespace sim { - * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. - * @syscap SystemCapability.Telephony.CoreService - * @systemapi Hide this for inner system use. -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function unlockPuk(slotId: number, newPin: string, puk: string, callback: AsyncCallback): void; - -@@ -1354,7 +1377,8 @@ declare namespace sim { - * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. - * @syscap SystemCapability.Telephony.CoreService - * @systemapi Hide this for inner system use. -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function unlockPuk(slotId: number, newPin: string, puk: string): Promise; - -@@ -1833,7 +1857,8 @@ declare namespace sim { - * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. - * @syscap SystemCapability.Telephony.CoreService - * @systemapi Hide this for inner system use. -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getLockState(slotId: number, lockType: LockType, callback: AsyncCallback): void; - -@@ -1857,7 +1882,8 @@ declare namespace sim { - * @throws { BusinessError } 8301002 - The SIM card failed to read or update data. - * @syscap SystemCapability.Telephony.CoreService - * @systemapi Hide this for inner system use. -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getLockState(slotId: number, lockType: LockType): Promise; - -@@ -2223,7 +2249,8 @@ declare namespace sim { - * @interface OperatorConfig - * @syscap SystemCapability.Telephony.CoreService - * @systemapi Hide this for inner system use. -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface OperatorConfig { - /** -@@ -2232,7 +2259,8 @@ declare namespace sim { - * @type { string } - * @syscap SystemCapability.Telephony.CoreService - * @systemapi Hide this for inner system use. -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - field: string; - -@@ -2242,7 +2270,8 @@ declare namespace sim { - * @type { string } - * @syscap SystemCapability.Telephony.CoreService - * @systemapi Hide this for inner system use. -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - value: string; - } -@@ -2252,7 +2281,8 @@ declare namespace sim { - * - * @interface IccAccountInfo - * @syscap SystemCapability.Telephony.CoreService -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface IccAccountInfo { - /** -@@ -2260,7 +2290,8 @@ declare namespace sim { - * - * @type { number } - * @syscap SystemCapability.Telephony.CoreService -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - simId: number; - -@@ -2270,7 +2301,8 @@ declare namespace sim { - * - * @type { number } - * @syscap SystemCapability.Telephony.CoreService -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - slotIndex: number; - -@@ -2279,7 +2311,8 @@ declare namespace sim { - * - * @type { boolean } - * @syscap SystemCapability.Telephony.CoreService -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isEsim: boolean; - -@@ -2288,7 +2321,8 @@ declare namespace sim { - * - * @type { boolean } - * @syscap SystemCapability.Telephony.CoreService -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isActive: boolean; - -@@ -2297,7 +2331,8 @@ declare namespace sim { - * - * @type { string } - * @syscap SystemCapability.Telephony.CoreService -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - iccId: string; - -@@ -2306,7 +2341,8 @@ declare namespace sim { - * - * @type { string } - * @syscap SystemCapability.Telephony.CoreService -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - showName: string; - -@@ -2315,7 +2351,8 @@ declare namespace sim { - * - * @type { string } - * @syscap SystemCapability.Telephony.CoreService -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - showNumber: string; - } -@@ -2326,7 +2363,8 @@ declare namespace sim { - * @interface LockStatusResponse - * @syscap SystemCapability.Telephony.CoreService - * @systemapi Hide this for inner system use. -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface LockStatusResponse { - /** -@@ -2335,7 +2373,8 @@ declare namespace sim { - * @type { number } - * @syscap SystemCapability.Telephony.CoreService - * @systemapi Hide this for inner system use. -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - result: number; - -@@ -2345,7 +2384,8 @@ declare namespace sim { - * @type { ?number } - * @syscap SystemCapability.Telephony.CoreService - * @systemapi Hide this for inner system use. -- * @since 7 -+ * @since arkts {'1.1':'7','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - remain?: number; - } -@@ -2476,7 +2516,8 @@ declare namespace sim { - * @enum { number } - * @syscap SystemCapability.Telephony.CoreService - * @systemapi Hide this for inner system use. -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum LockType { - /** -@@ -2484,7 +2525,8 @@ declare namespace sim { - * - * @syscap SystemCapability.Telephony.CoreService - * @systemapi Hide this for inner system use. -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PIN_LOCK = 1, - -@@ -2493,7 +2535,8 @@ declare namespace sim { - * - * @syscap SystemCapability.Telephony.CoreService - * @systemapi Hide this for inner system use. -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FDN_LOCK = 2, - } -@@ -2591,7 +2634,8 @@ declare namespace sim { - * - * @enum { number } - * @syscap SystemCapability.Telephony.CoreService -- * @since 6 -+ * @since arkts {'1.1':'6','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum SimState { - /** -@@ -2599,7 +2643,8 @@ declare namespace sim { - * obtained. - * - * @syscap SystemCapability.Telephony.CoreService -- * @since 6 -+ * @since arkts {'1.1':'6','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SIM_STATE_UNKNOWN, - -@@ -2608,7 +2653,8 @@ declare namespace sim { - * no SIM card is inserted into the card slot. - * - * @syscap SystemCapability.Telephony.CoreService -- * @since 6 -+ * @since arkts {'1.1':'6','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SIM_STATE_NOT_PRESENT, - -@@ -2618,7 +2664,8 @@ declare namespace sim { - * unblocking key (PUK) or network. - * - * @syscap SystemCapability.Telephony.CoreService -- * @since 6 -+ * @since arkts {'1.1':'6','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SIM_STATE_LOCKED, - -@@ -2627,7 +2674,8 @@ declare namespace sim { - * the SIM card is in position but cannot work properly. - * - * @syscap SystemCapability.Telephony.CoreService -- * @since 6 -+ * @since arkts {'1.1':'6','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SIM_STATE_NOT_READY, - -@@ -2636,7 +2684,8 @@ declare namespace sim { - * SIM card is in position and is working properly. - * - * @syscap SystemCapability.Telephony.CoreService -- * @since 6 -+ * @since arkts {'1.1':'6','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SIM_STATE_READY, - -@@ -2645,7 +2694,8 @@ declare namespace sim { - * SIM card is in position and is working properly. - * - * @syscap SystemCapability.Telephony.CoreService -- * @since 6 -+ * @since arkts {'1.1':'6','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SIM_STATE_LOADED - } -@@ -2656,7 +2706,8 @@ declare namespace sim { - * @enum { number } - * @syscap SystemCapability.Telephony.CoreService - * @systemapi Hide this for inner system use. -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum LockState { - /** -@@ -2664,7 +2715,8 @@ declare namespace sim { - * - * @syscap SystemCapability.Telephony.CoreService - * @systemapi Hide this for inner system use. -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LOCK_OFF = 0, - -@@ -2673,7 +2725,8 @@ declare namespace sim { - * - * @syscap SystemCapability.Telephony.CoreService - * @systemapi Hide this for inner system use. -- * @since 8 -+ * @since arkts {'1.1':'8','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LOCK_ON = 1, - } -diff --git a/api/@ohos.thermal.d.ts b/api/@ohos.thermal.d.ts -index 74059dff5..fadd6ea48 100644 ---- a/api/@ohos.thermal.d.ts -+++ b/api/@ohos.thermal.d.ts -@@ -35,7 +35,7 @@ declare namespace thermal { - /** - * Enumerates the {@link ThermalLevel} types. - * -- * @enum {number} -+ * @enum {int} - * @syscap SystemCapability.PowerManager.ThermalManager - * @since arkts {'1.1':'8', '1.2':'20'} - * @arkts 1.1&1.2 -diff --git a/api/@ohos.transfer.d.ets b/api/@ohos.transfer.d.ets -index b07994d16..9f401a850 100644 ---- a/api/@ohos.transfer.d.ets -+++ b/api/@ohos.transfer.d.ets -@@ -47,6 +47,7 @@ declare namespace transfer { - * @param { Any } input The 1.0 object that needs to be converted - * @param { string } inputName name registered by the subsystem. - * @returns { Object } Object -+ * @throws { BusinessError } 10200067 - Transfer Error. The input name is not supported! - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -@@ -60,6 +61,7 @@ declare namespace transfer { - * @param { Object } input The 1.2 object that needs to be converted - * @param { string } inputName name registered by the subsystem. - * @returns { Any } Object -+ * @throws { BusinessError } 10200067 - Transfer Error. The input name is not supported! - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -diff --git a/api/@ohos.uri.d.ts b/api/@ohos.uri.d.ts -index 4073c2867..0567d481b 100644 ---- a/api/@ohos.uri.d.ts -+++ b/api/@ohos.uri.d.ts -@@ -1162,7 +1162,7 @@ declare namespace uri { - * @since 20 - * @arkts 1.2 - */ -- set encodedSSP(input: string | null) -+ set encodedSSP(input: string | null); - } - } - export default uri; -diff --git a/api/@ohos.usbManager.d.ts b/api/@ohos.usbManager.d.ts -index f5d0c0274..f4fc45df4 100644 ---- a/api/@ohos.usbManager.d.ts -+++ b/api/@ohos.usbManager.d.ts -@@ -73,7 +73,8 @@ declare namespace usbManager { - * @throws { BusinessError } 801 - Capability not supported. - * @throws { BusinessError } 14400001 - Access right denied. Call requestRight to get the USBDevicePipe access right first. - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function connectDevice(device: USBDevice): Readonly; - -@@ -98,7 +99,8 @@ declare namespace usbManager { - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function hasRight(deviceName: string): boolean; - -@@ -125,7 +127,8 @@ declare namespace usbManager { - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function requestRight(deviceName: string): Promise; - -@@ -152,7 +155,8 @@ declare namespace usbManager { - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function removeRight(deviceName: string): boolean; - -@@ -314,7 +318,8 @@ declare namespace usbManager { - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function addDeviceAccessRight(tokenId: string, deviceName: string): boolean; - -@@ -337,7 +342,7 @@ declare namespace usbManager { - * - * @permission ohos.permission.MANAGE_USB_CONFIG - * @param { string } funcs - descriptor of the supported function list. It cannot be empty. -- * @returns { number } the numeric mask combination of the function list. -+ * @returns { int } the numeric mask combination of the function list. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. - * @throws { BusinessError } 401 - Parameter error. Possible causes: -@@ -346,9 +351,10 @@ declare namespace usbManager { - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getFunctionsFromString(funcs: string): number; -+ function getFunctionsFromString(funcs: string): int; - - /** - * Converts the numeric mask combination of a given USB function list to a string descriptor. -@@ -378,7 +384,8 @@ declare namespace usbManager { - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getStringFromFunctions(funcs: FunctionType): string; - -@@ -414,7 +421,8 @@ declare namespace usbManager { - * @throws { BusinessError } 14400006 - Unsupported operation. The function is not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function setDeviceFunctions(funcs: FunctionType): Promise; - -@@ -438,7 +446,8 @@ declare namespace usbManager { - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getDeviceFunctions(): FunctionType; - -@@ -464,7 +473,8 @@ declare namespace usbManager { - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getPortList(): Array; - -@@ -486,7 +496,7 @@ declare namespace usbManager { - * Gets the mask combination for the supported mode list of the specified USBPort. - * - * @permission ohos.permission.MANAGE_USB_CONFIG -- * @param { number } portId - unique ID of the port. It cannot be empty. -+ * @param { int } portId - unique ID of the port. It cannot be empty. - * @returns { PortModeType } the mask combination for the supported mode list in PortModeType. - * @throws { BusinessError } 201 - Permission verification failed. The application does not have the permission required to call the API. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. -@@ -496,9 +506,10 @@ declare namespace usbManager { - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getPortSupportModes(portId: number): PortModeType; -+ function getPortSupportModes(portId: int): PortModeType; - - /** - * Sets the role types supported by the specified USBPort, which can be powerRole (for charging) and dataRole (for data transfer). -@@ -521,7 +532,7 @@ declare namespace usbManager { - * Sets the role types supported by the specified USBPort, which can be powerRole (for charging) and dataRole (for data transfer). - * - * @permission ohos.permission.MANAGE_USB_CONFIG -- * @param { number } portId - unique ID of the port. It cannot be empty. -+ * @param { int } portId - unique ID of the port. It cannot be empty. - * @param { PowerRoleType } powerRole - charging role. It cannot be empty. - * @param { DataRoleType } dataRole - data role. It cannot be empty. - * @returns { Promise } the promise returned by the function. -@@ -534,9 +545,10 @@ declare namespace usbManager { - * @throws { BusinessError } 14400003 - Unsupported operation. The current device does not support port role switching. - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function setPortRoleTypes(portId: number, powerRole: PowerRoleType, dataRole: DataRoleType): Promise; -+ function setPortRoleTypes(portId: int, powerRole: PowerRoleType, dataRole: DataRoleType): Promise; - - /** - * Adds USB accessory access right. -@@ -560,7 +572,7 @@ declare namespace usbManager { - * Adds USB accessory access right. - * - * @permission ohos.permission.MANAGE_USB_CONFIG -- * @param { number } tokenId - refers to application that require access permissions. It cannot be empty. -+ * @param { int } tokenId - refers to application that require access permissions. It cannot be empty. - * @param { USBAccessory } accessory - USB accessory. It cannot be empty. - * @throws { BusinessError } 201 - The permission check failed. - * @throws { BusinessError } 202 - Permission denied. Normal application do not have permission to use system api. -@@ -573,9 +585,10 @@ declare namespace usbManager { - * @throws { BusinessError } 14400005 - Database operation exception. - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function addAccessoryRight(tokenId: number, accessory: USBAccessory): void; -+ function addAccessoryRight(tokenId: int, accessory: USBAccessory): void; - - /* usb pipe functions begin */ - /** -@@ -597,15 +610,16 @@ declare namespace usbManager { - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @param { USBInterface } iface - USB interface, which is used to determine the interface to claim. It cannot be empty. - * @param { boolean } [force] - optional parameter that determines whether to forcibly claim the USB interface. -- * @returns { number } returns **0** if the USB interface is successfully claimed; returns an error code otherwise. -+ * @returns { int } returns **0** if the USB interface is successfully claimed; returns an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function claimInterface(pipe: USBDevicePipe, iface: USBInterface, force?: boolean): number; -+ function claimInterface(pipe: USBDevicePipe, iface: USBInterface, force?: boolean): int; - - /** - * Releases a USB interface. -@@ -624,15 +638,16 @@ declare namespace usbManager { - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @param { USBInterface } iface - USB interface, which is used to determine the interface to release. It cannot be empty. -- * @returns { number } returns **0** if the USB interface is successfully released; returns an error code otherwise. -+ * @returns { int } returns **0** if the USB interface is successfully released; returns an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function releaseInterface(pipe: USBDevicePipe, iface: USBInterface): number; -+ function releaseInterface(pipe: USBDevicePipe, iface: USBInterface): int; - - /** - * Sets the device configuration. -@@ -651,15 +666,16 @@ declare namespace usbManager { - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @param { USBConfiguration } config - device configuration. It cannot be empty. -- * @returns { number } returns **0** if the device configuration is successfully set; returns an error code otherwise. -+ * @returns { int } returns **0** if the device configuration is successfully set; returns an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function setConfiguration(pipe: USBDevicePipe, config: USBConfiguration): number; -+ function setConfiguration(pipe: USBDevicePipe, config: USBConfiguration): int; - - /** - * Sets a USB interface. -@@ -678,15 +694,16 @@ declare namespace usbManager { - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the bus number and device address. It cannot be empty. - * @param { USBInterface } iface - USB interface, which is used to determine the interface to set. It cannot be empty. -- * @returns { number } returns **0** if the USB interface is successfully set; return an error code otherwise. -+ * @returns { int } returns **0** if the USB interface is successfully set; return an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function setInterface(pipe: USBDevicePipe, iface: USBInterface): number; -+ function setInterface(pipe: USBDevicePipe, iface: USBInterface): int; - - /** - * Obtains the raw USB descriptor. -@@ -709,7 +726,8 @@ declare namespace usbManager { - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getRawDescriptor(pipe: USBDevicePipe): Uint8Array; - -@@ -728,15 +746,16 @@ declare namespace usbManager { - * Obtains the file descriptor. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. -- * @returns { number } returns the file descriptor of the USB device. -+ * @returns { int } returns the file descriptor of the USB device. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getFileDescriptor(pipe: USBDevicePipe): number; -+ function getFileDescriptor(pipe: USBDevicePipe): int; - - /** - * Performs control transfer. -@@ -775,17 +794,18 @@ declare namespace usbManager { - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. - * @param { USBDeviceRequestParams } requestparam - control transfer parameters. It cannot be empty. -- * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. -- * @returns { Promise } returns the size of the transmitted or received data block if the control transfer is successful; -+ * @param { int } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. -+ * @returns { Promise } returns the size of the transmitted or received data block if the control transfer is successful; - * return -1 if an exception occurs. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function usbControlTransfer(pipe: USBDevicePipe, requestparam: USBDeviceRequestParams, timeout?: number): Promise; -+ function usbControlTransfer(pipe: USBDevicePipe, requestparam: USBDeviceRequestParams, timeout?: int): Promise; - - /** - * Performs bulk transfer. -@@ -808,22 +828,23 @@ declare namespace usbManager { - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. - * @param { USBEndpoint } endpoint - USB endpoint, which is used to determine the USB port for data transfer. It cannot be empty. - * @param { Uint8Array } buffer - buffer for writing or reading data. It cannot be empty. -- * @param { number } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. -- * @returns { Promise } the size of the transmitted or received data block if the control transfer is successful; -+ * @param { int } [timeout] - timeout duration. This parameter is optional. The default value is **0**, indicating no timeout. -+ * @returns { Promise } the size of the transmitted or received data block if the control transfer is successful; - * return -1 if an exception occurs. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function bulkTransfer( - pipe: USBDevicePipe, - endpoint: USBEndpoint, - buffer: Uint8Array, -- timeout?: number -- ): Promise; -+ timeout?: int -+ ): Promise; - - /** - * Closes a USB device pipe. -@@ -840,15 +861,16 @@ declare namespace usbManager { - * Closes a USB device pipe. - * - * @param { USBDevicePipe } pipe - device pipe, which is used to determine the USB device. It cannot be empty. -- * @returns { number } returns **0** if the USB device pipe is closed successfully; return an error code otherwise. -+ * @returns { int } returns **0** if the USB device pipe is closed successfully; return an error code otherwise. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - *
    1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. - * @throws { BusinessError } 801 - Capability not supported. - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function closePipe(pipe: USBDevicePipe): number; -+ function closePipe(pipe: USBDevicePipe): int; - - /** - * Checks whether the application has the right to access the USB accessory. -@@ -879,7 +901,8 @@ declare namespace usbManager { - * @throws { BusinessError } 14400005 - Database operation exception. - * @throws { BusinessError } 14401001 - The target USBAccessory not matched. - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function hasAccessoryRight(accessory: USBAccessory): boolean; - -@@ -912,7 +935,8 @@ declare namespace usbManager { - * @throws { BusinessError } 14400005 - Database operation exception. - * @throws { BusinessError } 14401001 - The target USBAccessory not matched. - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function requestAccessoryRight(accessory: USBAccessory): Promise; - -@@ -943,7 +967,8 @@ declare namespace usbManager { - * @throws { BusinessError } 14400005 - Database operation exception. - * @throws { BusinessError } 14401001 - The target USBAccessory not matched. - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function cancelAccessoryRight(accessory: USBAccessory): void; - -@@ -964,7 +989,8 @@ declare namespace usbManager { - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getAccessoryList(): Array>; - -@@ -1001,7 +1027,8 @@ declare namespace usbManager { - * @throws { BusinessError } 14401002 - Failed to open the native accessory node. - * @throws { BusinessError } 14401003 - Cannot reopen the accessory. - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function openAccessory(accessory: USBAccessory): USBAccessoryHandle; - -@@ -1028,7 +1055,8 @@ declare namespace usbManager { - * @throws { BusinessError } 14400004 - Service exception. Possible causes: - *
    1. No accessory is plugged in. - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function closeAccessory(accessoryHandle: USBAccessoryHandle): void; - -@@ -1044,42 +1072,42 @@ declare namespace usbManager { - /** - * Endpoint address - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- address: number; -+ address: int; - - /** - * Endpoint attributes - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- attributes: number; -+ attributes: int; - - /** - * Endpoint interval - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- interval: number; -+ interval: int; - - /** - * Maximum size of data packets on the endpoint - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- maxPacketSize: number; -+ maxPacketSize: int; - - /** - * Endpoint direction -@@ -1113,22 +1141,22 @@ declare namespace usbManager { - /** - * Endpoint type - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- type: number; -+ type: int; - - /** - * Unique ID defined by USBInterface.id, which indicates the interface to which the endpoint belongs - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- interfaceId: number; -+ interfaceId: int; - } - - /** -@@ -1143,52 +1171,52 @@ declare namespace usbManager { - /** - * Unique ID of the USB interface - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- id: number; -+ id: int; - - /** - * Interface protocol - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- protocol: number; -+ protocol: int; - - /** - * Device type - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- clazz: number; -+ clazz: int; - - /** - * Device subclass - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- subClass: number; -+ subClass: int; - - /** - * Alternation between descriptors of the same USB interface - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- alternateSetting: number; -+ alternateSetting: int; - - /** - * Interface name -@@ -1223,32 +1251,32 @@ declare namespace usbManager { - /** - * Unique ID of the USB configuration - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- id: number; -+ id: int; - - /** - * Configuration attributes - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- attributes: number; -+ attributes: int; - - /** - * Maximum power consumption, in mA - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- maxPower: number; -+ maxPower: int; - - /** - * Configuration name, which can be left empty -@@ -1303,22 +1331,22 @@ declare namespace usbManager { - /** - * Bus address - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- busNum: number; -+ busNum: int; - - /** - * Device address - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- devAddress: number; -+ devAddress: int; - - /** - * Device SN -@@ -1373,52 +1401,52 @@ declare namespace usbManager { - /** - * Vendor ID - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- vendorId: number; -+ vendorId: int; - - /** - * Product ID - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- productId: number; -+ productId: int; - - /** - * Device class - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- clazz: number; -+ clazz: int; - - /** - * Device subclass - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- subClass: number; -+ subClass: int; - - /** - * Device protocol code - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- protocol: number; -+ protocol: int; - - /** - * Device configuration descriptor information -@@ -1436,35 +1464,39 @@ declare namespace usbManager { - * - * @typedef USBDevicePipe - * @syscap SystemCapability.USB.USBManager -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface USBDevicePipe { - /** - * Bus address. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- busNum: number; -+ busNum: int; - - /** - * Device address - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- devAddress: number; -+ devAddress: int; - } - - /** - * Enumerates power role types. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum PowerRoleType { - /** -@@ -1472,7 +1504,8 @@ declare namespace usbManager { - * - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NONE = 0, - -@@ -1481,7 +1514,8 @@ declare namespace usbManager { - * - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SOURCE = 1, - -@@ -1490,7 +1524,8 @@ declare namespace usbManager { - * - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SINK = 2 - } -@@ -1498,10 +1533,11 @@ declare namespace usbManager { - /** - * Enumerates data role types. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum DataRoleType { - /** -@@ -1509,7 +1545,8 @@ declare namespace usbManager { - * - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NONE = 0, - -@@ -1518,7 +1555,8 @@ declare namespace usbManager { - * - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - HOST = 1, - -@@ -1527,7 +1565,8 @@ declare namespace usbManager { - * - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DEVICE = 2 - } -@@ -1535,10 +1574,11 @@ declare namespace usbManager { - /** - * Enumerates port mode types - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum PortModeType { - /** -@@ -1546,7 +1586,8 @@ declare namespace usbManager { - * - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NONE = 0, - -@@ -1555,7 +1596,8 @@ declare namespace usbManager { - * - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - UFP = 1, - -@@ -1564,7 +1606,8 @@ declare namespace usbManager { - * - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DFP = 2, - -@@ -1573,7 +1616,8 @@ declare namespace usbManager { - * - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DRP = 3, - -@@ -1582,7 +1626,8 @@ declare namespace usbManager { - * - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NUM_MODES = 4 - } -@@ -1593,38 +1638,42 @@ declare namespace usbManager { - * @typedef USBPortStatus - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface USBPortStatus { - /** - * USB mode - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- currentMode: number; -+ currentMode: int; - - /** - * Power role - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- currentPowerRole: number; -+ currentPowerRole: int; - - /** - * Data role - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- currentDataRole: number; -+ currentDataRole: int; - } - - /** -@@ -1633,18 +1682,20 @@ declare namespace usbManager { - * @typedef USBPort - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface USBPort { - /** - * Unique ID of the USB port - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- id: number; -+ id: int; - - /** - * Mask combination for the supported mode list of the USB port -@@ -1652,7 +1703,8 @@ declare namespace usbManager { - * @type { PortModeType } - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - supportedModes: PortModeType; - -@@ -1662,7 +1714,8 @@ declare namespace usbManager { - * @type { USBPortStatus } - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - status: USBPortStatus; - } -@@ -1743,60 +1796,67 @@ declare namespace usbManager { - * - * @typedef USBDeviceRequestParams - * @syscap SystemCapability.USB.USBManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface USBDeviceRequestParams { - /** - * Bit map request type - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- bmRequestType: number; -+ bmRequestType: int; - - /** - * Byte request - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- bRequest: number; -+ bRequest: int; - - /** - * Request parameter word value - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- wValue: number; -+ wValue: int; - - /** - * Word index of the parameter value - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- wIndex: number; -+ wIndex: int; - - /** - * Word length of the parameter value - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- wLength: number; -+ wLength: int; - - /** - * Data written to or read from the buffer - * - * @type { Uint8Array } - * @syscap SystemCapability.USB.USBManager -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - data: Uint8Array; - } -@@ -1804,16 +1864,18 @@ declare namespace usbManager { - /** - * Enumerates USB request target types. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.USB.USBManager -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum USBRequestTargetType { - /** - * USB device - * - * @syscap SystemCapability.USB.USBManager -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - USB_REQUEST_TARGET_DEVICE = 0, - -@@ -1821,7 +1883,8 @@ declare namespace usbManager { - * USB interface - * - * @syscap SystemCapability.USB.USBManager -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - USB_REQUEST_TARGET_INTERFACE = 1, - -@@ -1829,7 +1892,8 @@ declare namespace usbManager { - * Endpoint - * - * @syscap SystemCapability.USB.USBManager -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - USB_REQUEST_TARGET_ENDPOINT = 2, - -@@ -1837,7 +1901,8 @@ declare namespace usbManager { - * Others - * - * @syscap SystemCapability.USB.USBManager -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - USB_REQUEST_TARGET_OTHER = 3 - } -@@ -1845,16 +1910,18 @@ declare namespace usbManager { - /** - * Enumerates control request types. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.USB.USBManager -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum USBControlRequestType { - /** - * Standard - * - * @syscap SystemCapability.USB.USBManager -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - USB_REQUEST_TYPE_STANDARD = 0, - -@@ -1862,7 +1929,8 @@ declare namespace usbManager { - * Class - * - * @syscap SystemCapability.USB.USBManager -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - USB_REQUEST_TYPE_CLASS = 1, - -@@ -1870,7 +1938,8 @@ declare namespace usbManager { - * Vendor - * - * @syscap SystemCapability.USB.USBManager -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - USB_REQUEST_TYPE_VENDOR = 2 - } -@@ -1878,7 +1947,7 @@ declare namespace usbManager { - /** - * Enumerates request directions. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.USB.USBManager - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 -@@ -1906,10 +1975,11 @@ declare namespace usbManager { - /** - * Enumerates function modes. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum FunctionType { - /** -@@ -1917,7 +1987,8 @@ declare namespace usbManager { - * - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NONE = 0, - -@@ -1926,7 +1997,8 @@ declare namespace usbManager { - * - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ACM = 1, - -@@ -1935,7 +2007,8 @@ declare namespace usbManager { - * - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ECM = 2, - -@@ -1944,7 +2017,8 @@ declare namespace usbManager { - * - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - HDC = 4, - -@@ -1953,7 +2027,8 @@ declare namespace usbManager { - * - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MTP = 8, - -@@ -1962,7 +2037,8 @@ declare namespace usbManager { - * - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PTP = 16, - -@@ -1971,7 +2047,8 @@ declare namespace usbManager { - * - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RNDIS = 32, - -@@ -1980,7 +2057,8 @@ declare namespace usbManager { - * - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - MIDI = 64, - -@@ -1989,7 +2067,8 @@ declare namespace usbManager { - * - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AUDIO_SOURCE = 128, - -@@ -1998,7 +2077,8 @@ declare namespace usbManager { - * - * @syscap SystemCapability.USB.USBManager - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NCM = 256 - } -@@ -2008,7 +2088,8 @@ declare namespace usbManager { - * - * @typedef USBAccessory - * @syscap SystemCapability.USB.USBManager -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface USBAccessory { - /** -@@ -2016,7 +2097,8 @@ declare namespace usbManager { - * - * @type { string } - * @syscap SystemCapability.USB.USBManager -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - manufacturer: string; - -@@ -2025,7 +2107,8 @@ declare namespace usbManager { - * - * @type { string } - * @syscap SystemCapability.USB.USBManager -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - product: string; - -@@ -2034,7 +2117,8 @@ declare namespace usbManager { - * - * @type { string } - * @syscap SystemCapability.USB.USBManager -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - description: string; - -@@ -2043,7 +2127,8 @@ declare namespace usbManager { - * - * @type { string } - * @syscap SystemCapability.USB.USBManager -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - version: string; - -@@ -2052,7 +2137,8 @@ declare namespace usbManager { - * - * @type { string } - * @syscap SystemCapability.USB.USBManager -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - serialNumber: string; - } -@@ -2062,32 +2148,36 @@ declare namespace usbManager { - * - * @typedef USBAccessoryHandle - * @syscap SystemCapability.USB.USBManager -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface USBAccessoryHandle { - /** - * The file descriptor of the accessory.The valid USBAccessoryHandle.accessoryFd is a positive value. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- accessoryFd: number; -+ accessoryFd: int; - } - - /** - * Usb transfer flag. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum UsbTransferFlags { - /** - * Report short frames as errors - * - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - USB_TRANSFER_SHORT_NOT_OK = 0, - -@@ -2095,7 +2185,8 @@ declare namespace usbManager { - * Automatically free transfer buffer - * - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - USB_TRANSFER_FREE_BUFFER = 1, - -@@ -2103,7 +2194,8 @@ declare namespace usbManager { - * Automatically free transfer after callback returns - * - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - USB_TRANSFER_FREE_TRANSFER = 2, - -@@ -2111,7 +2203,8 @@ declare namespace usbManager { - * Transmissions that are multiples of wMaxPacketSize will add an additional zero packet. - * - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - USB_TRANSFER_ADD_ZERO_PACKET = 3 - } -@@ -2119,16 +2212,18 @@ declare namespace usbManager { - /** - * Usb transfer status. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum UsbTransferStatus { - /** - * Transfer completed - * - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TRANSFER_COMPLETED = 0, - -@@ -2136,7 +2231,8 @@ declare namespace usbManager { - * Transfer failed - * - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TRANSFER_ERROR = 1, - -@@ -2144,7 +2240,8 @@ declare namespace usbManager { - * Transfer timed out - * - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TRANSFER_TIMED_OUT = 2, - -@@ -2152,7 +2249,8 @@ declare namespace usbManager { - * Transfer was canceled - * - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TRANSFER_CANCELED = 3, - -@@ -2161,7 +2259,8 @@ declare namespace usbManager { - * stalled). For control endpoints: control request not supported. - * - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TRANSFER_STALL = 4, - -@@ -2169,7 +2268,8 @@ declare namespace usbManager { - * Device was disconnected - * - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TRANSFER_NO_DEVICE = 5, - -@@ -2177,7 +2277,8 @@ declare namespace usbManager { - * Device sent more data than requested - * - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TRANSFER_OVERFLOW = 6 - } -@@ -2185,16 +2286,18 @@ declare namespace usbManager { - /** - * USB DATA transfer type. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum UsbEndpointTransferType { - /** - * Isochronous endpoint - * - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TRANSFER_TYPE_ISOCHRONOUS = 0x1, - -@@ -2202,7 +2305,8 @@ declare namespace usbManager { - * Bulk endpoint - * - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TRANSFER_TYPE_BULK = 0x2, - -@@ -2210,7 +2314,8 @@ declare namespace usbManager { - * Interrupt endpoint - * - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TRANSFER_TYPE_INTERRUPT = 0x3 - } -@@ -2220,33 +2325,37 @@ declare namespace usbManager { - * - * @typedef UsbIsoPacketDescriptor - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface UsbIsoPacketDescriptor { - /** - * Length of data to request in this packet - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- length: number; -+ length: int; - - /** - * Amount of data that was actually transferred - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- actualLength: number; -+ actualLength: int; - - /** - * Status code for this packet - * - * @type { UsbTransferStatus } - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - status: UsbTransferStatus; - } -@@ -2256,25 +2365,28 @@ declare namespace usbManager { - * - * @typedef SubmitTransferCallback - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface SubmitTransferCallback { - /** - * Actual length of data that was transferred. Read-only, and only for - * use within transfer callback function. Not valid for isochronous endpoint transfers. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- actualLength: number; -+ actualLength: int; - - /** - * The status of the transfer. Read-only, and only for use within transfer callback function. - * - * @type { UsbTransferStatus } - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - status: UsbTransferStatus; - -@@ -2283,7 +2395,8 @@ declare namespace usbManager { - * - * @type { Array> } - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isoPacketDescs: Array>; - } -@@ -2294,7 +2407,8 @@ declare namespace usbManager { - * - * @typedef UsbDataTransferParams - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface UsbDataTransferParams { - /** -@@ -2302,7 +2416,8 @@ declare namespace usbManager { - * - * @type { USBDevicePipe } - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - devPipe: USBDevicePipe; - -@@ -2311,52 +2426,58 @@ declare namespace usbManager { - * - * @type { UsbTransferFlags } - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - flags: UsbTransferFlags; - - /** - * Address of the endpoint where this transfer will be sent. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- endpoint: number; -+ endpoint: int; - - /** - * Type of the transfer - * - * @type { UsbEndpointTransferType } - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type: UsbEndpointTransferType; - - /** - * Timeout for this transfer in milliseconds. A value of 0 indicates no timeout. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- timeout: number; -+ timeout: int; - - /** - * Length of the data buffer. Must be non-negative. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- length: number; -+ length: int; - - /** - * Callback function. This will be invoked when the transfer completes, fails, or is canceled. - * - * @type { AsyncCallback } - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - callback: AsyncCallback; - -@@ -2366,7 +2487,8 @@ declare namespace usbManager { - * - * @type { Uint8Array } - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - userData: Uint8Array; - -@@ -2375,18 +2497,20 @@ declare namespace usbManager { - * - * @type { Uint8Array } - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - buffer: Uint8Array; - - /** - * Count of isochronous packets. Only used for I/O with isochronous endpoints. Must be non-negative. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- isoPacketCount: number; -+ isoPacketCount: int; - } - - /** -@@ -2401,7 +2525,8 @@ declare namespace usbManager { - * @throws { BusinessError } 14400009 - Insufficient memory. - * @throws { BusinessError } 14400012 - Transmission I/O error. - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function usbSubmitTransfer(transfer: UsbDataTransferParams): void; - -@@ -2416,7 +2541,8 @@ declare namespace usbManager { - *
    1.Unrecognized discard error code. - * @throws { BusinessError } 14400011 - The transfer is not in progress, or is already complete or cancelled. - * @syscap SystemCapability.USB.USBManager -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function usbCancelTransfer(transfer: UsbDataTransferParams): void; - -@@ -2437,6 +2563,7 @@ declare namespace usbManager { - *
    2.The call chain used to obtain the input parameters is not resonable. - * @syscap SystemCapability.USB.USBManager - * @since 20 -+ * @arkts 1.1&1.2 - */ - function resetUsbDevice(pipe: USBDevicePipe): boolean; - } -diff --git a/api/@ohos.usbManager.serial.d.ts b/api/@ohos.usbManager.serial.d.ts -index 937fe88b3..838f6c3b5 100644 ---- a/api/@ohos.usbManager.serial.d.ts -+++ b/api/@ohos.usbManager.serial.d.ts -@@ -22,7 +22,8 @@ - * Provides APIs for managing USB-to-virtual serial ports and implementing USB-to-virtual serial port communication. - * @namespace serialManager - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace serialManager { - -@@ -30,224 +31,230 @@ declare namespace serialManager { - * Obtains the serial port device list. - * @returns { Readonly[]} Returns the list of serial port devices obtained. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getPortList(): Readonly[]; - - /** - * Checks whether a serial port device has the access right. The system applications have the access right by default. -- * @param { number} portId ID of the target device. For details, see SerialPort.portId. -+ * @param { int} portId ID of the target device. For details, see SerialPort.portId. - * @returns {boolean} Returns true if the device has the right; returns false otherwise. -- * @throws { BusinessError } 401 Parameter error. Possible causes: -- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14400005 Database operation exception. - * @throws { BusinessError } 31400001 Serial port management exception. - * @throws { BusinessError } 31400003 Device does not exist. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts{ '1.1':'19','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function hasSerialRight(portId: number): boolean; -+ function hasSerialRight(portId: int): boolean; - - /** - * Requests the right for accessing a serial port device from the user. The system applications do not need to call this API. -- * @param { number} portId ID of the target device. For details, see SerialPort.portId. -- * @returns { Promise} Promise used to return the result. -- * The value true means the user allows the access; -- * the value false means the opposite. -- * @throws { BusinessError } 401 Parameter error. Possible causes: -- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. -+ * @param { int} portId ID of the target device. For details, see SerialPort.portId. -+ * @returns { Promise} Promise used to return the result. The value true means the user allows the access; the value false means the opposite. -+ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14400005 Database operation exception. - * @throws { BusinessError } 31400001 Serial port management exception. - * @throws { BusinessError } 31400003 Device does not exist. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts{ '1.1':'19','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function requestSerialRight(portId: number): Promise; -+ function requestSerialRight(portId: int): Promise; - - /** - * Adds the access right for a serial port device. - * @permission ohos.permission.MANAGE_USB_CONFIG -- * @param { number } tokenId Token ID of the target application. -- * @param { number} portId ID of the target device. For details, see SerialPort.portId. -+ * @param { int } tokenId Token ID of the target application. -+ * @param { int} portId ID of the target device. For details, see SerialPort.portId. - * @throws { BusinessError } 201 Permission verification failed. The application does not have the permission required to call the API. - * @throws { BusinessError } 202 Permission verification failed. A non-system application calls a system API. -- * @throws { BusinessError } 401 Parameter error. Possible causes: -- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14400005 Database operation exception. - * @throws { BusinessError } 31400001 Serial port management exception. - * @throws { BusinessError } 31400003 Device does not exist. - * @syscap SystemCapability.USB.USBManager.Serial - * @systemapi -- * @since 19 -+ * @since arkts{ '1.1':'19','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function addSerialRight(tokenId: number, portId: number): void; -+ function addSerialRight(tokenId: int, portId: int): void; - - /** - * Cancels the access right for a serial port device. This API will not cancel the default access right of system applications. -- * @param { number} portId ID of the target device. For details, see SerialPort.portId. -- * @throws { BusinessError } 401 Parameter error. Possible causes: -- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. -+ * @param { int} portId ID of the target device. For details, see SerialPort.portId. -+ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 14400005 Database operation exception. - * @throws { BusinessError } 31400001 Serial port management exception. - * @throws { BusinessError } 31400002 Access denied. Call requestSerialRight to request user authorization first. - * @throws { BusinessError } 31400003 Device does not exist. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts{ '1.1':'19','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function cancelSerialRight(portId: number): void; -+ function cancelSerialRight(portId: int): void; - - /** - * Opens a serial port device. -- * @param { number} portId ID of the target device. For details, see SerialPort.portId. -- * @throws { BusinessError } 401 Parameter error. Possible causes: -- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. -+ * @param { int} portId ID of the target device. For details, see SerialPort.portId. -+ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 31400001 Serial port management exception. - * @throws { BusinessError } 31400002 Access denied. Call requestSerialRight to request user authorization first. - * @throws { BusinessError } 31400003 Device does not exist. - * @throws { BusinessError } 31400004 The serial port device is occupied. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts{ '1.1':'19','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function open(portId: number): void; -+ function open(portId: int): void; - - /** - * Closes a serial port device. -- * @param { number} portId ID of the target device. For details, see SerialPort.portId. -- * @throws { BusinessError } 401 Parameter error. Possible causes: -- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. -+ * @param { int} portId ID of the target device. For details, see SerialPort.portId. -+ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 31400001 Serial port management exception. - * @throws { BusinessError } 31400003 Device does not exist. - * @throws { BusinessError } 31400005 The serial port device is not opened. Call the open API first. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts{ '1.1':'19','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function close(portId: number): void; -+ function close(portId: int): void; - - /** - * Obtains the communication parameters of a serial port device. -- * @param { number} portId ID of the target device. For details, see SerialPort.portId. -+ * @param { int} portId ID of the target device. For details, see SerialPort.portId. - * @returns { Readonly} Communication parameters obtained, which are read-only. -- * @throws { BusinessError } 401 Parameter error. Possible causes: -- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 31400001 Serial port management exception. - * @throws { BusinessError } 31400003 Device does not exist. - * @throws { BusinessError } 31400005 The serial port device is not opened. Call the open API first. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts{ '1.1':'19','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function getAttribute(portId: number): Readonly; -+ function getAttribute(portId: int): Readonly; - - /** - * Sets the communication parameters for a serial port device. -- * @param { number} portId ID of the target device. For details, see SerialPort.portId. -+ * @param { int} portId ID of the target device. For details, see SerialPort.portId. - * @param { SerialAttribute} attribute Communication parameters to set. -- * @throws { BusinessError } 401 Parameter error. Possible causes: -- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. -+ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 31400001 Serial port management exception. - * @throws { BusinessError } 31400003 Device does not exist. - * @throws { BusinessError } 31400005 The serial port device is not opened. Call the open API first. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts{ '1.1':'19','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function setAttribute(portId: number, attribute: SerialAttribute): void; -+ function setAttribute(portId: int, attribute: SerialAttribute): void; - - /** - * Reads data from a serial port device. This API uses a promise to return the result. -- * @param { number} portId ID of the target device. For details, see SerialPort.portId. -+ * @param { int} portId ID of the target device. For details, see SerialPort.portId. - * @param { Uint8Array } buffer Buffer for storing the data read, with a maximum length of 8192 bytes. -- * @param { number } timeout Timeout duration for reading data. The value is a non-negative number. -- * The default value 0 indicates that there is no time limit for data reading. -- * @returns { Promise } Promise used to return the length of the data read. -- * @throws { BusinessError } 401 Parameter error. Possible causes: -- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. -+ * @param { int } timeout Timeout duration for reading data. The value is a non-negative number. The default value 0 indicates that there is no time limit for data reading. -+ * @returns { Promise } Promise used to return the length of the data read. -+ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 31400001 Serial port management exception. - * @throws { BusinessError } 31400003 Device does not exist. - * @throws { BusinessError } 31400005 The serial port device is not opened. Call the open API first. - * @throws { BusinessError } 31400006 Data transfer timed out. -- * @throws { BusinessError } 31400007 I/O exception. -+ * @throws { BusinessError } 31400007 I/O exception. Possible causes: -+ *
    1. The transfer was canceled. -+ *
    2. The device offered more data. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts{ '1.1':'19','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function read(portId: number, buffer: Uint8Array, timeout?: number): Promise; -+ function read(portId: int, buffer: Uint8Array, timeout?: int): Promise; - - /** - * Reads data from a serial port device. This API returns the result synchronously. -- * @param { number} portId ID of the target device. For details, see SerialPort.portId. -+ * @param { int} portId ID of the target device. For details, see SerialPort.portId. - * @param { Uint8Array } buffer Buffer for storing the data read, with a maximum length of 8192 bytes. -- * @param { number } timeout Timeout duration for reading data. The value is a non-negative number. -- * The default value 0 indicates that there is no time limit for data reading. -- * @returns {number} Length of the data read. -- * @throws { BusinessError } 401 Parameter error. Possible causes: -- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. -+ * @param { int } timeout Timeout duration for reading data. The value is a non-negative number. The default value 0 indicates that there is no time limit for data reading. -+ * @returns { int } Length of the data read. -+ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 31400001 Serial port management exception. - * @throws { BusinessError } 31400003 Device does not exist. - * @throws { BusinessError } 31400005 The serial port device is not opened. Call the open API first. - * @throws { BusinessError } 31400006 Data transfer timed out. -- * @throws { BusinessError } 31400007 I/O exception. -+ * @throws { BusinessError } 31400007 I/O exception. Possible causes: -+ *
    1. The transfer was canceled. -+ *
    2. The device offered more data. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts{ '1.1':'19','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function readSync(portId: number, buffer: Uint8Array, timeout?: number): number; -+ function readSync(portId: int, buffer: Uint8Array, timeout?: int): int; - - /** - * Writes data to a serial port device. This API uses a promise to return the result. -- * @param { number} portId ID of the target device. For details, see SerialPort.portId. -+ * @param { int} portId ID of the target device. For details, see SerialPort.portId. - * @param { Uint8Array } buffer Buffer for storing the data written, with a maximum length of 128 KB. -- * @param { number } timeout Timeout duration for writing data. The value is a non-negative number. -- * The default value 0 indicates that there is no time limit for data writing. -- * @returns { Promise } Promise used to return the length of the data written. -- * @throws { BusinessError } 401 Parameter error. Possible causes: -- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. -+ * @param { int } timeout Timeout duration for writing data. The value is a non-negative number. The default value 0 indicates that there is no time limit for data writing. -+ * @returns { Promise } Promise used to return the length of the data written. -+ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 31400001 Serial port management exception. - * @throws { BusinessError } 31400003 Device does not exist. - * @throws { BusinessError } 31400005 The serial port device is not opened. Call the open API first. - * @throws { BusinessError } 31400006 Data transfer timed out. -- * @throws { BusinessError } 31400007 I/O exception. -+ * @throws { BusinessError } 31400007 I/O exception. Possible causes: -+ *
    1. The transfer was canceled. -+ *
    2. The device offered more data. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts{ '1.1':'19','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function write(portId: number, buffer: Uint8Array, timeout?: number): Promise; -+ function write(portId: int, buffer: Uint8Array, timeout?: int): Promise; - - /** - * Writes data to a serial port device. This API returns the result synchronously. -- * @param { number} portId ID of the target device. For details, see SerialPort.portId. -+ * @param { int} portId ID of the target device. For details, see SerialPort.portId. - * @param { Uint8Array } buffer Buffer for storing the data written, with a maximum length of 128 KB. -- * @param { number } timeout Timeout duration for writing data. The value is a non-negative number. -- * The default value 0 indicates that there is no time limit for data writing. -- * @returns { number } Length of the data written. -- * @throws { BusinessError } 401 Parameter error. Possible causes: -- * 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. -+ * @param { int } timeout Timeout duration for writing data. The value is a non-negative number. The default value 0 indicates that there is no time limit for data writing. -+ * @returns { int } Length of the data written. -+ * @throws { BusinessError } 401 Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 31400001 Serial port management exception. - * @throws { BusinessError } 31400003 Device does not exist. - * @throws { BusinessError } 31400005 The serial port device is not opened. Call the open API first. - * @throws { BusinessError } 31400006 Data transfer timed out. -- * @throws { BusinessError } 31400007 I/O exception. -+ * @throws { BusinessError } 31400007 I/O exception. Possible causes: -+ *
    1. The transfer was canceled. -+ *
    2. The device offered more data. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts{ '1.1':'19','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- function writeSync(portId: number, buffer: Uint8Array, timeout?: number): number; -+ function writeSync(portId: int, buffer: Uint8Array, timeout?: int): int; - - /** - * Represents a serial port device. - * @typedef SerialPort - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface SerialPort { - - /** - * Serial port device ID. -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- portId: number; -+ portId: int; - - /** - * Serial port device name. - * @type { string } - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - deviceName: string; - } -@@ -255,7 +262,8 @@ declare namespace serialManager { - * Represents the communication parameters of a serial port device. - * @typedef SerialAttribute - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface SerialAttribute { - -@@ -263,7 +271,8 @@ declare namespace serialManager { - * Baud rate. - * @type { BaudRates } - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - baudRate: BaudRates; - -@@ -272,7 +281,8 @@ declare namespace serialManager { - * @type { DataBits } - * @default DATABIT_8 - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - dataBits?: DataBits; - -@@ -281,7 +291,8 @@ declare namespace serialManager { - * @type { Parity } - * @default NONE - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - parity?: Parity; - -@@ -290,43 +301,49 @@ declare namespace serialManager { - * @type { StopBits } - * @default STOPBIT_1 - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - stopBits?: StopBits; - } - /** - * Enumerates the baud rates of a serial port device, in bit/s. -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum BaudRates { - - /** - * The baud rate is 50 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_50 = 50, - - /** - * The baud rate is 75 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_75 = 75, - - /** - * The baud rate is 110 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_110 = 110, - - /** - * The baud rate is 134 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_134 = 134, - -@@ -334,300 +351,326 @@ declare namespace serialManager { - * The baud rate is 150 bit/s. - * - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_150 = 150, - - /** - * The baud rate is 200 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_200 = 200, - - /** - * The baud rate is 300 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_300 = 300, - - /** - * The baud rate is 600 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_600 = 600, - - /** - * The baud rate is 1200 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_1200 = 1200, - - /** - * The baud rate is 1800 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_1800 = 1800, - - /** - * The baud rate is 2400 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_2400 = 2400, - - /** - * The baud rate is 4800 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_4800 = 4800, - - /** - * The baud rate is 9600 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_9600 = 9600, - - /** - * The baud rate is 19200 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_19200 = 19200, - - /** - * The baud rate is 38400 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_38400 = 38400, - - /** - * The baud rate is 57600 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_57600 = 57600, - - /** - * The baud rate is 115200 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_115200 = 115200, - - /** - * The baud rate is 230400 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_230400 = 230400, - - /** - * The baud rate is 460800 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_460800 = 460800, - - /** - * The baud rate is 500000 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_500000 = 500000, - - /** - * The baud rate is 576000 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_576000 = 576000, - - /** - * The baud rate is 921600 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_921600 = 921600, - - /** - * The baud rate is 1000000 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_1000000 = 1000000, - - /** - * The baud rate is 1152000 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_1152000 = 1152000, - - /** - * The baud rate is 1500000 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_1500000 = 1500000, - - /** - * The baud rate is 2000000 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_2000000 = 2000000, - - /** - * The baud rate is 2500000 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_2500000 = 2500000, - - /** - * The baud rate is 3000000 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_3000000 = 3000000, - - /** - * The baud rate is 3500000 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_3500000 = 3500000, - - /** - * The baud rate is 4000000 bit/s. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BAUDRATE_4000000 = 4000000 - } - /** - * Enumerates the data bits of a serial port device. -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum DataBits { - - /** - * The number of data bits is 8. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DATABIT_8 = 8, - - /** - * The number of data bits is 7. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DATABIT_7 = 7, - - /** - * The number of data bits is 6. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DATABIT_6 = 6, - - /** - * The number of data bits is 5. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- DATABIT_5 = 5, -- -- /** -- * The number of data bits is 4. -- * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -- */ -- DATABIT_4 = 4 -+ DATABIT_5 = 5 - } - /** - * Enumerates the parity bits of a serial port device. -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum Parity { - - /** - * No parity. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PARITY_NONE = 0, - - /** - * Odd parity. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PARITY_ODD = 1, - - /** - * Even parity. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PARITY_EVEN = 2, - - /** - * Mark parity, whose parity bit is always 1. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PARITY_MARK = 3, - - /** - * Space parity, whose parity bit is always 0. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PARITY_SPACE = 4 - } - /** - * Enumerates the stop bits for serial port communication. -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum StopBits { - - /** - * The number of stop bits is 1. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - STOPBIT_1 = 0, - -- /** -- * The number of stop bits is 1.5. -- * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -- */ -- STOPBIT_1P5 = 1, -- - /** - * The number of stop bits is 2. - * @syscap SystemCapability.USB.USBManager.Serial -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- STOPBIT_2 = 2 -+ STOPBIT_2 = 1 - } - } - --export default serialManager; -\ No newline at end of file -+export default serialManager; -diff --git a/api/@ohos.util.ArrayList.d.ts b/api/@ohos.util.ArrayList.d.ts -index f8853a190..e09649fdc 100644 ---- a/api/@ohos.util.ArrayList.d.ts -+++ b/api/@ohos.util.ArrayList.d.ts -@@ -484,14 +484,14 @@ declare class ArrayList { - /** - * Replaces each element of this arrayList with the result of applying the operator to that element. - * -- * @param { ArrayListCbFn1 } callbackFn - A callback function to execute for each element. -+ * @param { ArrayListReplaceCb } callbackFn - A callback function to execute for each element. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ -- replaceAllElements(callbackFn: ArrayListCbFn1): void; -+ replaceAllElements(callbackFn: ArrayListReplaceCb): void; - - /** - * Executes a provided function once for each value in the arraylist object. -@@ -549,14 +549,14 @@ declare class ArrayList { - /** - * Iterates over elements in a generic ArrayList and executes a callback function for each element. - * -- * @param { ArrayListCbFn } callbackFn - A callback function to execute for each element. -+ * @param { ArrayListForEachCb } callbackFn - A callback function to execute for each element. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ -- forEach(callbackFn: ArrayListCbFn): void; -+ forEach(callbackFn: ArrayListForEachCb): void; - - /** - * Sorts this arraylist according to the order induced by the specified comparator,without comparator this parameter, -@@ -815,37 +815,13 @@ declare class ArrayList { - * @throws { BusinessError } 401 - Parameter error. - * @throws { BusinessError } 10200001 - The value of index is out of range. - * @syscap SystemCapability.Utils.Lang -+ * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - [index: number]: T; - -- /** -- * Returns the item at that index. -- * -- * @param { number } index - The zero-based index of the desired code unit. -- * @returns { T } The element in the arrayList matching the given index. -- * @throws { BusinessError } 10200001 - The value of index is out of range. -- * @syscap SystemCapability.Utils.Lang -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ -- $_get(index: number): T; -- -- /** -- * Set the value of item at that index. -- * -- * @param { number } index - The index of the element to set. -- * @param { T } value - The value to set at the specified index. -- * @throws { BusinessError } 10200001 - The value of index is out of range. -- * @syscap SystemCapability.Utils.Lang -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ -- $_set(index: number, value: T): void; -- - /** - * If the newCapacity provided by the user is greater than or equal to length, - * change the capacity of the arraylist to newCapacity, otherwise the capacity will not be changed -@@ -958,7 +934,7 @@ declare class ArrayList { - /** - * The type of ArrayList callback function. - * -- * @typedef { function } ArrayListCbFn -+ * @typedef { function } ArrayListForEachCb - * @param { T } value - The current element being processed - * @param { number } index - The index of the current element - * @param { ArrayList } arrlist - The ArrayList instance being traversed -@@ -968,12 +944,12 @@ declare class ArrayList { - * @since 20 - * @arkts 1.2 - */ -- type ArrayListCbFn = (value: T, index: number, arrlist: ArrayList) => void; -+ export type ArrayListForEachCb = (value: T, index: number, arrlist: ArrayList) => void; - - /** - * The type of ArrayList callback function. - * -- * @typedef { function } ArrayListCbFn -+ * @typedef { function } ArrayListReplaceCb - * @param { T } value - The current element being processed - * @param { number } index - The index of the current element - * @param { ArrayList } arrlist - The ArrayList instance being traversed -@@ -983,6 +959,6 @@ declare class ArrayList { - * @since 20 - * @arkts 1.2 - */ -- type ArrayListCbFn1 = (value: T, index?: number, arrlist?: ArrayList) => T; -+ export type ArrayListReplaceCb = (value: T, index: number, arrlist: ArrayList) => T; - - export default ArrayList; -diff --git a/api/@ohos.util.Deque.d.ts b/api/@ohos.util.Deque.d.ts -index 8e4758b12..ddf7fcb85 100644 ---- a/api/@ohos.util.Deque.d.ts -+++ b/api/@ohos.util.Deque.d.ts -@@ -419,39 +419,29 @@ declare class Deque { - /** - * Iterates over elements in a generic Deque (double-ended queue) and executes a callback function for each element. - * -- * @param { DequeCbFnforEach } callbackFn - A callback function to execute for each element. -+ * @param { DequeForEachCb } callbackFn - A callback function to execute for each element. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ -- forEach(callbackFn: DequeCbFnforEach): void; -- /** -- * Returns the byte at the specified index. -- * -- * @param { number } index - The zero-based index of the desired code unit. -- * @returns { T } The element in the deque matching the given index. -- * @syscap SystemCapability.Utils.Lang -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ -- $_get(index: number): T; -+ forEach(callbackFn: DequeForEachCb): void; - -- /** -- * Sets the byte at the specified index. -- * -- * @param { number } index – The index of the element to set. -- * @param { T } value – The value to set at the specified index. -+ /** -+ * Returns the item at that index. -+ * -+ * @param { number } index - The zero-based index of the desired code unit. -+ * Throws error if index < 0 or index >= deque.length. -+ * @returns { T } The element in the deque matching the given index. -+ * @throws { BusinessError } 10200001 - The value of index is out of range. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ -- $_set(index: number, value: T): void; -+ [index: number]: T; - - /** - * returns an iterator.Each item of the iterator is a Javascript Object -@@ -498,7 +488,7 @@ declare class Deque { - /** - * The type of Deque forEach callback function. - * -- * @typedef { function } DequeCbFnforEach -+ * @typedef { function } DequeForEachCb - * @param { T } value - The current element being processed - * @param { number } index - The index of the current element - * @param { Deque } deque - The Deque instance being traversed -@@ -508,6 +498,6 @@ declare class Deque { - * @since 20 - * @arkts 1.2 - */ -- type DequeCbFnforEach = (value: T, index: number, deque: Deque) => void; -+ export type DequeForEachCb = (value: T, index: number, deque: Deque) => void; - - export default Deque; -diff --git a/api/@ohos.util.HashMap.d.ts b/api/@ohos.util.HashMap.d.ts -index 7ade3272f..d7d500dc1 100644 ---- a/api/@ohos.util.HashMap.d.ts -+++ b/api/@ohos.util.HashMap.d.ts -@@ -639,6 +639,6 @@ declare class HashMap { - * @since 20 - * @arkts 1.2 - */ -- type HashMapCbFn = (value: V, key: K, map: HashMap) => void; -+ export type HashMapCbFn = (value: V, key: K, map: HashMap) => void; - - export default HashMap; -diff --git a/api/@ohos.util.HashSet.d.ts b/api/@ohos.util.HashSet.d.ts -index 654a6e7c8..6607d94f1 100644 ---- a/api/@ohos.util.HashSet.d.ts -+++ b/api/@ohos.util.HashSet.d.ts -@@ -468,6 +468,6 @@ declare class HashSet { - * @since 20 - * @arkts 1.2 - */ --type HashSetCbFn = (value: T, key: T, set: HashSet) => void; -+export type HashSetCbFn = (value: T, key: T, set: HashSet) => void; - - export default HashSet; -diff --git a/api/@ohos.util.LightWeightMap.d.ts b/api/@ohos.util.LightWeightMap.d.ts -index 20cca18d6..3433c11fc 100644 ---- a/api/@ohos.util.LightWeightMap.d.ts -+++ b/api/@ohos.util.LightWeightMap.d.ts -@@ -459,10 +459,22 @@ declare class LightWeightMap { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - getKeyAt(index: number): K; -+ /** -+ * Obtains the key at the location identified by index in an LightWeightMap container -+ * -+ * @param { number } index - index index Target subscript for search -+ * @returns { K | undefined } the key of key-value pairs or undefined -+ * @throws { BusinessError } 10200001 - The value of index is out of range. -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ getKeyAt(index: number): K | undefined; - /** - * Obtains a ES6 iterator that contains all the keys of an LightWeightMap container - * -@@ -911,10 +923,22 @@ declare class LightWeightMap { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - getValueAt(index: number): V; -+ /** -+ * Obtains the value identified by index in an LightWeightMap container -+ * -+ * @param { number } index - index index Target subscript for search -+ * @returns { V | undefined } the value of key-value pairs or undefined -+ * @throws { BusinessError } 10200001 - The value of index is out of range. -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ getValueAt(index: number): V | undefined; - /** - * Returns an iterator of the values contained in this map - * -@@ -959,6 +983,6 @@ declare class LightWeightMap { - * @since 20 - * @arkts 1.2 - */ -- type LightWeightMapCbFn = (value: V, key: K, map: LightWeightMap) => void; -+ export type LightWeightMapCbFn = (value: V, key: K, map: LightWeightMap) => void; - - export default LightWeightMap; -diff --git a/api/@ohos.util.LightWeightSet.d.ts b/api/@ohos.util.LightWeightSet.d.ts -index 612b677db..cd20907d0 100644 ---- a/api/@ohos.util.LightWeightSet.d.ts -+++ b/api/@ohos.util.LightWeightSet.d.ts -@@ -787,6 +787,6 @@ declare class LightWeightSet { - * @since 20 - * @arkts 1.2 - */ --type LightWeightSetForEachCb = (value: T, key: T, set: LightWeightSet) => void -+export type LightWeightSetForEachCb = (value: T, key: T, set: LightWeightSet) => void - - export default LightWeightSet; -diff --git a/api/@ohos.util.LinkedList.d.ts b/api/@ohos.util.LinkedList.d.ts -index 8e05f2190..33c16b088 100644 ---- a/api/@ohos.util.LinkedList.d.ts -+++ b/api/@ohos.util.LinkedList.d.ts -@@ -1036,6 +1036,6 @@ declare class LinkedList { - * @since 20 - * @arkts 1.2 - */ --type LinkedListForEachCb = (value: T, index: number, linkedList: LinkedList) => void -+export type LinkedListForEachCb = (value: T, index: number, linkedList: LinkedList) => void - - export default LinkedList; -diff --git a/api/@ohos.util.List.d.ts b/api/@ohos.util.List.d.ts -index 5967f7ce6..fa7ee0b4d 100644 ---- a/api/@ohos.util.List.d.ts -+++ b/api/@ohos.util.List.d.ts -@@ -947,32 +947,22 @@ declare class List { - * @arkts 1.1&1.2 - */ - isEmpty(): boolean; -- /** -- * Returns the item at that index -- * -- * @param { number } index - the zero-based index of the desired code unit. -- * @returns { T | undefined } the element in the list matching the given index, -- * or undefined if the index is out of range. -- * @syscap SystemCapability.Utils.Lang -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ -- $_get(index: number): T | undefined; - - /** -- * Set the value of item at that index. -- * -- * @param { number } index – the index of the element to set. -- * @param { T } value – the value to set at the specified index -+ * Returns the item at that index. -+ * -+ * @param { number } index - The zero-based index of the desired code unit. -+ * Throws error if index < 0 or index >= list.length. -+ * @returns { T } The element in the list matching the given index. -+ * @throws { BusinessError } 10200001 - The value of index is out of range. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ -- $_set(index: number, value: T): void; -+ [index: number]: T; -+ - /** - * returns an iterator.Each item of the iterator is a Javascript Object - * -@@ -1029,7 +1019,7 @@ declare class List { - * @since 20 - * @arkts 1.2 - */ --type ListForEachCb = (value: T, index: number, list: List) => void -+export type ListForEachCb = (value: T, index: number, list: List) => void - - /** - * The type of List callback function. -@@ -1044,6 +1034,6 @@ type ListForEachCb = (value: T, index: number, list: List) => void - * @since 20 - * @arkts 1.2 - */ --type ListReplaceCb = (value: T, index: number, list: List) => T -+export type ListReplaceCb = (value: T, index: number, list: List) => T - - export default List; -diff --git a/api/@ohos.util.PlainArray.d.ts b/api/@ohos.util.PlainArray.d.ts -index 6b28d6ba1..d6c40f936 100644 ---- a/api/@ohos.util.PlainArray.d.ts -+++ b/api/@ohos.util.PlainArray.d.ts -@@ -439,10 +439,22 @@ declare class PlainArray { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - getKeyAt(index: number): number; -+ /** -+ * Queries the key at a specified index -+ * -+ * @param { number } index - index index Target subscript for search -+ * @returns { number | undefined } the key of key-value pairs, or undefined if the index is out of range. -+ * @throws { BusinessError } 10200011 - The getKeyAt method cannot be bound. -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ getKeyAt(index: number): number | undefined; - /** - * Remove the key-value pair based on a specified key if it exists and return the value - * -@@ -838,6 +850,6 @@ declare class PlainArray { - * @since 20 - * @arkts 1.2 - */ --type PlainArrayForEachCb = (value: T, key: number, PlainArray: PlainArray) => void -+export type PlainArrayForEachCb = (value: T, key: number, PlainArray: PlainArray) => void - - export default PlainArray; -diff --git a/api/@ohos.util.Queue.d.ts b/api/@ohos.util.Queue.d.ts -index abdba11d4..90724be60 100644 ---- a/api/@ohos.util.Queue.d.ts -+++ b/api/@ohos.util.Queue.d.ts -@@ -349,6 +349,6 @@ declare class Queue { - * @since 20 - * @arkts 1.2 - */ --type QueueForEachCb = (value: T, index: number, queue: Queue) => void -+export type QueueForEachCb = (value: T, index: number, queue: Queue) => void - - export default Queue; -diff --git a/api/@ohos.util.Stack.d.ts b/api/@ohos.util.Stack.d.ts -index 340ed2c85..1e76aa057 100644 ---- a/api/@ohos.util.Stack.d.ts -+++ b/api/@ohos.util.Stack.d.ts -@@ -412,6 +412,6 @@ declare class Stack { - * @since 20 - * @arkts 1.2 - */ --type StackForEachCb = (value: T, index: number, stack: Stack) => void -+export type StackForEachCb = (value: T, index: number, stack: Stack) => void - - export default Stack; -diff --git a/api/@ohos.util.TreeMap.d.ts b/api/@ohos.util.TreeMap.d.ts -index ad93707e3..abd92fe67 100644 ---- a/api/@ohos.util.TreeMap.d.ts -+++ b/api/@ohos.util.TreeMap.d.ts -@@ -871,7 +871,7 @@ declare class TreeMap { - * @since 20 - * @arkts 1.2 - */ --type TreeMapForEachCb = (value: V, key: K, map: TreeMap) => void -+export type TreeMapForEachCb = (value: V, key: K, map: TreeMap) => void - - /** - * The type of TreeMap comparator. -@@ -885,6 +885,6 @@ type TreeMapForEachCb = (value: V, key: K, map: TreeMap) => void - * @since 20 - * @arkts 1.2 - */ --type TreeMapComparator = (firstValue: K, secondValue: K) => number -+export type TreeMapComparator = (firstValue: K, secondValue: K) => number - - export default TreeMap; -diff --git a/api/@ohos.util.TreeSet.d.ts b/api/@ohos.util.TreeSet.d.ts -index d09e7b054..234c1885d 100644 ---- a/api/@ohos.util.TreeSet.d.ts -+++ b/api/@ohos.util.TreeSet.d.ts -@@ -765,7 +765,7 @@ declare class TreeSet { - * @since 20 - * @arkts 1.2 - */ --type TreeSetForEachCb = (value: T, key: T, set: TreeSet) => void -+export type TreeSetForEachCb = (value: T, key: T, set: TreeSet) => void - - /** - * The type of TreeSet comparator. -@@ -779,6 +779,6 @@ type TreeSetForEachCb = (value: T, key: T, set: TreeSet) => void - * @since 20 - * @arkts 1.2 - */ --type TreeSetComparator = (firstValue: T, secondValue: T) => number -+export type TreeSetComparator = (firstValue: T, secondValue: T) => number - - export default TreeSet; -diff --git a/api/@ohos.util.d.ets b/api/@ohos.util.d.ets -index 72a794baa..522478ab1 100644 ---- a/api/@ohos.util.d.ets -+++ b/api/@ohos.util.d.ets -@@ -143,7 +143,7 @@ declare namespace util { - * @atomicservice - * @since 20 - */ -- encodeSync(src: Uint8Array, options: Type = Type.BASIC): Uint8Array; -+ encodeSync(src: Uint8Array, options?: Type): Uint8Array; - - /** - * Encodes the specified byte array into a String using the Base64 encoding scheme. -@@ -159,12 +159,12 @@ declare namespace util { - * @atomicservice - * @since 20 - */ -- encodeToStringSync(src: Uint8Array, options: Type = Type.BASIC): string; -+ encodeToStringSync(src: Uint8Array, options?: Type): string; - - /** - * Decodes a Base64 encoded String or input u8 array into a newly-allocated u8 array using the Base64 encoding scheme. - * -- * @param { string } src - A string value -+ * @param { string } src - A Uint8Array value or a string value - * @param { Type } [options] - one of the Type enumeration - * @returns { Uint8Array } Return the decoded Uint8Array. - * @throws { BusinessError } 401 - Parameter error. Possible causes: -@@ -175,23 +175,7 @@ declare namespace util { - * @atomicservice - * @since 20 - */ -- decodeSync(src: string, options: Type = Type.BASIC): Uint8Array; -- -- /** -- * Decodes a Base64 encoded String or input u8 array into a newly-allocated u8 array using the Base64 encoding scheme. -- * -- * @param { Uint8Array } src - A Uint8Array value -- * @param { Type } [options] - one of the Type enumeration -- * @returns { Uint8Array } Return the decoded Uint8Array. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: -- * 1.Mandatory parameters are left unspecified; -- * 2.Incorrect parameter types. -- * @syscap SystemCapability.Utils.Lang -- * @crossplatform -- * @atomicservice -- * @since 20 -- */ -- decodeSync(src: Uint8Array, options: Type = Type.BASIC): Uint8Array; -+ decodeSync(src: Uint8Array | string, options?: Type): Uint8Array; - - /** - * Asynchronously encodes all bytes in the specified u8 array into the newly allocated u8 array using the Base64 encoding scheme. -@@ -207,7 +191,7 @@ declare namespace util { - * @atomicservice - * @since 20 - */ -- encode(src: Uint8Array, options: Type = Type.BASIC): Promise; -+ encode(src: Uint8Array, options?: Type): Promise; - - /** - * Asynchronously encodes the specified byte array into a String using the Base64 encoding scheme. -@@ -223,30 +207,13 @@ declare namespace util { - * @atomicservice - * @since 20 - */ -- encodeToString(src: Uint8Array, options: Type = Type.BASIC): Promise; -- -- /** -- * Use the Base64 encoding scheme to asynchronously decode a Base64-encoded string or -- * input u8 array into a newly allocated u8 array. -- * -- * @param { Uint8Array } src - A Uint8Array value -- * @param { Type } [options] - one of the Type enumeration -- * @returns { Promise } Return the decoded asynchronous Uint8Array. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: -- * 1.Mandatory parameters are left unspecified; -- * 2.Incorrect parameter types. -- * @syscap SystemCapability.Utils.Lang -- * @crossplatform -- * @atomicservice -- * @since 20 -- */ -- decode(src: Uint8Array, options: Type = Type.BASIC): Promise; -+ encodeToString(src: Uint8Array, options?: Type): Promise; - - /** - * Use the Base64 encoding scheme to asynchronously decode a Base64-encoded string or - * input u8 array into a newly allocated u8 array. - * -- * @param { string } src - A string value -+ * @param { Uint8Array | string } src - A Uint8Array value or a string value - * @param { Type } [options] - one of the Type enumeration - * @returns { Promise } Return the decoded asynchronous Uint8Array. - * @throws { BusinessError } 401 - Parameter error. Possible causes: -@@ -257,7 +224,7 @@ declare namespace util { - * @atomicservice - * @since 20 - */ -- decode(src: string, options: Type = Type.BASIC): Promise; -+ decode(src: Uint8Array | string, options?: Type): Promise; - } - - /** -@@ -966,7 +933,8 @@ declare namespace util { - * Compares two objects for equality. - * - * @param { Object } obj - An object -- * @returns { boolean } Returns true if the given object is the same as the current object; Otherwise, false is returned. -+ * @returns { boolean } Returns true if the given object is the same as the current object; -+ * Otherwise, false is returned. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -@@ -1048,7 +1016,8 @@ declare namespace util { - /** - * Checks whether the current RationalNumber object represents the value 0. - * -- * @returns { boolean } If the value represented by the current object is 0, true is returned. Otherwise, false is returned. -+ * @returns { boolean } If the value represented by the current object is 0, true is returned. -+ * Otherwise, false is returned. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -@@ -1179,7 +1148,8 @@ declare namespace util { - * Check whether the entered value is of arraybuffer type. - * - * @param { Object } value - A arraybuffer value -- * @returns { boolean } Returns true if the value is a built-in ArrayBuffer instance. This does not include SharedArrayBuffer instances. -+ * @returns { boolean } Returns true if the value is a built-in ArrayBuffer instance. -+ * This does not include SharedArrayBuffer instances. - * Usually, it is desirable to test for both; See isAnyArrayBuffer() for that. - * @syscap SystemCapability.Utils.Lang - * @crossplatform -@@ -1442,6 +1412,19 @@ declare namespace util { - isWeakSet(value: Object): boolean; - } - -+ /** -+ * Takes a function following the common error-first callback style, i.e taking an (err, value) => -+ * callback as the last argument, and return a function that returns promises. -+ * -+ * @param { Function } original - Asynchronous Function -+ * @returns { Function } Return a function that returns promises -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ function promisify(original: Function): (...args: FixedArray) => Promise; -+ - /** - * Get the hash code of an object. - * -@@ -1453,5 +1436,30 @@ declare namespace util { - * @since 20 - */ - function getHash(object: object): number; -+ -+ /** -+ * Generate a random RFC 4122 version 4 binary UUID using a cryptographically secure random number generator. -+ * -+ * @param { boolean } [entropyCache] - Whether to generate the UUID with using the cache. Default: true. -+ * @returns { Uint8Array | undefined } Return a Uint8Array representing this UUID, or undefined on failure. -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ function generateRandomBinaryUUID(entropyCache?: boolean): Uint8Array | undefined; -+ -+ /** -+ * Parse a UUID from the string standard representation as described in the RFC 4122 version 4. -+ * -+ * @param { string } uuid - String that specifies a UUID -+ * @returns { Uint8Array } Return a Uint8Array representing this UUID. Throw SyntaxError if parsing fails. -+ * @throws { BusinessError } 10200002 - Invalid uuid string. -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ function parseUUID(uuid: string): Uint8Array; - } - export default util; -diff --git a/api/@ohos.util.stream.d.ts b/api/@ohos.util.stream.d.ts -index 0903242cb..226fdfb29 100644 ---- a/api/@ohos.util.stream.d.ts -+++ b/api/@ohos.util.stream.d.ts -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2024 Huawei Device Co., Ltd. -+ * Copyright (c) 2024-2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at -@@ -12,40 +12,66 @@ - * See the License for the specific language governing permissions and - * limitations under the License. - */ -- -- /** -+ -+/** - * @file - * @kit ArkTS - */ -- import { Callback } from './@ohos.base'; -- import emitter from './@ohos.events.emitter'; -- -- /** -- * The stream module provides a comprehensive set of stream processing capabilities, including four types of streams: -- * - Writable: streams designed for writing data to. -- * - Readable: streams designed for reading data from. -- * - Duplex: streams that are both readable and writable. -- * - Transform: a specialized type of duplex stream that can modify or transform data as it's being written and read. -- * -- * @namespace stream -- * @syscap SystemCapability.Utils.Lang -- * @crossplatform -- * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -- */ -+ -+/*** if arkts 1.1 */ -+import { Callback } from './@ohos.base'; -+import emitter from './@ohos.events.emitter'; -+/*** endif */ -+/*** if arkts 1.2 */ -+import buffer from '@ohos.buffer'; -+/*** endif */ -+ -+/** -+ * The stream module provides a comprehensive set of stream processing capabilities, including four types of streams: -+ * - Writable: streams designed for writing data to. -+ * - Readable: streams designed for reading data from. -+ * - Duplex: streams that are both readable and writable. -+ * - Transform: a specialized type of duplex stream that can modify or transform data as it's being written and read. -+ * -+ * @namespace stream -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - declare namespace stream { - /** -- * The type of stream callback function. -+ * Return readable options. - * -- * @typedef { function } StreamCb -- * @returns { void } - The function return void -+ * @interface ReadableOptions - * @syscap SystemCapability.Utils.Lang -+ * @crossplatform - * @atomicservice -- * @since 20 -- * @arkts 1.2 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- type StreamCb = () => void; -+ interface ReadableOptions { -+ /** -+ * Specifies the encoding format of the data. If this parameter is provided, -+ * the readable stream decodes the data into a string in the specified encoding format. Default: utf8. -+ * If an invalid string is entered, a 401 exception is thrown in the Readable constructor. -+ * Supported encoding formats: utf-8, ibm866, iso-8859-2, iso-8859-3, iso-8859-4, iso-8859-5, iso-8859-6, -+ * iso-8859-7, iso-8859-8, iso-8859-8-i, iso-8859-10, iso-8859-13, iso-8859-14, iso-8859-15, koi8-r, koi8-u, -+ * macintosh, windows-874, windows-1250, windows-1251, windows-1252, windows-1253, windows-1254, windows-1255, -+ * windows-1256, windows-1257, windows-1258, x-mac-cyrillic, gbk, gb18030, big5, euc-jp, iso-2022-jp, shift_jis, -+ * euc-kr, utf-16be, utf-16le. -+ * -+ * @type { ?string } -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ encoding?: string; -+ } -+ - /** - * Streams to which data can be written. - * -@@ -66,6 +92,7 @@ declare namespace stream { - * @arkts 1.1&1.2 - */ - constructor(); -+ - /** - * writes a chunk to Writable and invokes callback when the chunk is flushed. The return value indicates - * whether the internal buffer of the Writable reaches the hightWaterMark. If true is returned, the buffer -@@ -87,31 +114,11 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - write(chunk?: string | Uint8Array, encoding?: string, callback?: Function): boolean; - -- /** -- * writes a chunk to Writable and invokes callback when the chunk is flushed. The return value indicates -- * whether the internal buffer of the Writable reaches the hightWaterMark. If true is returned, the buffer -- * does not reach the hightWaterMark. If false is returned, the buffer has been reached. The write function -- * should be called after the drain event is triggered. If the write function is called continuously, -- * the chunk is still added to the buffer until the memory overflows -- * -- * @param { string | Uint8Array } [chunk] - Data to be written. -- * @param { string } [encoding] - Encoding type. -- * @param { StreamCb } [callback] - Callback after writing. -- * @returns { boolean } Write success returns true, write failure returns false. -- * @throws { BusinessError } 10200035 - The doWrite method has not been implemented. -- * @throws { BusinessError } 10200036 - The stream has been ended. -- * @syscap SystemCapability.Utils.Lang -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ -- write(chunk?: string | Uint8Array, encoding?: string, callback?: StreamCb): boolean; -- - /** - * Write the last chunk to Writable. - * -@@ -127,26 +134,11 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - end(chunk?: string | Uint8Array, encoding?: string, callback?: Function): Writable; - -- /** -- * Write the last chunk to Writable. -- * -- * @param { string | Uint8Array } [chunk] - Data to be written. -- * @param { string } [encoding] - Encoding type. -- * @param { StreamCb } [callback] - Callback after writing. -- * @returns { Writable } Returns the Writable object. -- * @throws { BusinessError } 10200035 - The doWrite method has not been implemented. -- * @syscap SystemCapability.Utils.Lang -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ -- end(chunk?: string | Uint8Array, encoding?: string, callback?: StreamCb): Writable; -- - /** - * Set the default encoding mode. - * -@@ -163,6 +155,7 @@ declare namespace stream { - * @arkts 1.1&1.2 - */ - setDefaultEncoding(encoding?: string): boolean; -+ - /** - * After the call, all Write operations will be forced to write to the buffer instead of being flushed. - * -@@ -174,6 +167,7 @@ declare namespace stream { - * @arkts 1.1&1.2 - */ - cork(): boolean; -+ - /** - * After calling, flush all buffers. - * -@@ -185,6 +179,7 @@ declare namespace stream { - * @arkts 1.1&1.2 - */ - uncork(): boolean; -+ - /** - * Registering Event Messages. - * -@@ -197,30 +192,28 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - on(event: string, callback: Callback): void; -+ - /** -- * Cancel event message. -+ * Registering Event Messages. - * - * @param { string } event - Register Event. -- * @param { Callback } callback - event callbacks. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: -- * 1.Mandatory parameters are left unspecified; -- * 2.Incorrect parameter types. -+ * @param { Function } callback - event callbacks. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 20 -+ * @arkts 1.2 - */ -- off(event: string, callback?: Callback): void; -+ on(event: string, callback: Function): void; -+ - /** -- * This method is invoked by the Writable method during initialization and must not be invoked directly. -- * After the resource is initialized in the doInitialize method, the callback () method is invoked. -+ * Cancel event message. - * -- * @param { Function } callback - Callback when the stream has completed the initial. -+ * @param { string } event - Register Event. -+ * @param { Callback } callback - event callbacks. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.Mandatory parameters are left unspecified; - * 2.Incorrect parameter types. -@@ -229,52 +222,56 @@ declare namespace stream { - * @atomicservice - * @since 12 - */ -- doInitialize(callback: Function): void; -+ off(event: string, callback?: Callback): void; - - /** -- * This method is invoked by the Writable method during initialization and must not be invoked directly. -- * After the resource is initialized in the doInitialize method, the callback () method is invoked. -+ * Cancel event message. - * -- * @param { StreamCb } callback - Callback when the stream has completed the initial. -+ * @param { string } event - Register Event. -+ * @param { Function } [callback] - event callbacks. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ -- doInitialize(callback: StreamCb): void; -+ off(event: string, callback?: Function): void; - - /** -- * Implemented by subclass inheritance. The implementation logic of flushing chunks in the buffer must not be -- * directly called. The call is controlled by Writable.write. -+ * This method is invoked by the Writable method during initialization and must not be invoked directly. -+ * After the resource is initialized in the doInitialize method, the callback () method is invoked. - * -- * @param { string | Uint8Array } [chunk] - Data to be written. -- * @param { string } [encoding] - Encoding type. -- * @param { Function } [callback] - Callback after writing. -+ * @param { Function } callback - Callback when the stream has completed the initial. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.Mandatory parameters are left unspecified; -- * 2.Incorrect parameter types; -- * 3.Parameter verification failed. -+ * 2.Incorrect parameter types. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- doWrite(chunk: string | Uint8Array, encoding: string, callback: Function): void; -+ doInitialize(callback: Function): void; -+ - /** - * Implemented by subclass inheritance. The implementation logic of flushing chunks in the buffer must not be - * directly called. The call is controlled by Writable.write. - * - * @param { string | Uint8Array } [chunk] - Data to be written. - * @param { string } [encoding] - Encoding type. -- * @param { StreamCb } [callback] - Callback after writing. -+ * @param { Function } [callback] - Callback after writing. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: -+ * 1.Mandatory parameters are left unspecified; -+ * 2.Incorrect parameter types; -+ * 3.Parameter verification failed. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 20 -- * @arkts 1.2 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- doWrite(chunk: string | Uint8Array, encoding: string, callback: StreamCb): void; -+ doWrite(chunk: string | Uint8Array, encoding: string, callback: Function): void; -+ - /** - * The implementation logic of flushing chunks in the buffer in batches should not be actively called. - * The call is controlled by Writable.write. -@@ -288,35 +285,35 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - doWritev(chunks: string[] | Uint8Array[], callback: Function): void; -+ - /** -- * The implementation logic of flushing chunks in the buffer in batches should not be actively called. -- * The call is controlled by Writable.write. -+ * Returns boolean indicating whether it is in ObjectMode. - * -- * @param { string[] | Uint8Array[] } [chunks] - Data to be written. -- * @param { StreamCb } [callback] - Callback after writing. -+ * @type { boolean } -+ * @readonly - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 20 -- * @arkts 1.2 -+ * @since 12 - */ -- doWritev(chunks: string[] | Uint8Array[], callback: StreamCb): void; -+ readonly writableObjectMode: boolean; - - /** - * Returns boolean indicating whether it is in ObjectMode. - * - * @type { boolean } -- * @readonly - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 20 -+ * @arkts 1.2 - */ -- readonly writableObjectMode: boolean; -+ get writableObjectMode(): boolean; -+ - /** - * Value of highWatermark. - * -@@ -325,10 +322,22 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - readonly writableHighWatermark: number; -+ -+ /** -+ * Value of highWatermark. -+ * -+ * @type { number } -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get writableHighWatermark(): number; -+ - /** - * Is true if it is safe to call writable.write(), which means the stream has not been destroyed, error or end. - * -@@ -337,10 +346,22 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - readonly writable: boolean; -+ -+ /** -+ * Is true if it is safe to call writable.write(), which means the stream has not been destroyed, error or end. -+ * -+ * @type { boolean } -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get writable(): boolean; -+ - /** - * Size of data that can be flushed, in bytes or objects. - * -@@ -349,10 +370,22 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - readonly writableLength: number; -+ -+ /** -+ * Size of data that can be flushed, in bytes or objects. -+ * -+ * @type { number } -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get writableLength(): number; -+ - /** - * Number of times writable.uncork() needs to be called in order to fully uncork the stream. - * -@@ -361,10 +394,22 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - readonly writableCorked: number; -+ -+ /** -+ * Number of times writable.uncork() needs to be called in order to fully uncork the stream. -+ * -+ * @type { number } -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get writableCorked(): number; -+ - /** - * Whether Writable.end has been called. - * -@@ -373,10 +418,22 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - readonly writableEnded: boolean; -+ -+ /** -+ * Whether Writable.end has been called. -+ * -+ * @type { boolean } -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get writableEnded(): boolean; -+ - /** - * Whether Writable.end has been called and all buffers have been flushed. - * -@@ -385,25 +442,35 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - readonly writableFinished: boolean; -+ -+ /** -+ * Whether Writable.end has been called and all buffers have been flushed. -+ * -+ * @type { boolean } -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get writableFinished(): boolean; - } -+ - /** -- * Transform stream is a Duplex stream where the output is computed in some way from the input. -- * Transform implementations must implement the doTransform() method and may also implement the doFlush() method. -+ * The stream from which data can be read. - * -- * @extends Duplex - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- class Transform extends Duplex { -+ class Readable { - /** -- * The Transform constructor. -+ * The Readable constructor. - * - * @syscap SystemCapability.Utils.Lang - * @crossplatform -@@ -412,14 +479,11 @@ declare namespace stream { - * @arkts 1.1&1.2 - */ - constructor(); -+ - /** -- * Convert the input data. After the conversion, Transform.push can be called to send the input to the read stream. -- * Transform.push should not be called Transform.write to call. -+ * The Readable constructor. - * -- * @param { string } chunk - Input data to be converted. -- * @param { string } encoding - If the chunk is a string, then this is the encoding type. If chunk is a buffer, -- * then this is the special value 'buffer'. Ignore it in that case. -- * @param { Function } callback - Callback after conversion. -+ * @param { ReadableOptions } options - Provide options. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.Mandatory parameters are left unspecified; - * 2.Incorrect parameter types; -@@ -427,129 +491,35 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- doTransform(chunk: string, encoding: string, callback: Function): void; -+ constructor(options: ReadableOptions); - - /** -- * Convert the input data. After the conversion, Transform.push can be called to send the input to the read stream. -- * Transform.push should not be called Transform.write to call. -- * -- * @param { string } chunk - Input data to be converted. -- * @param { string } encoding - If the chunk is a string, then this is the encoding type. If chunk is a buffer, -- * then this is the special value 'buffer'. Ignore it in that case. -- * @param { StreamCb } callback - Callback after conversion. -- * @syscap SystemCapability.Utils.Lang -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ -- doTransform(chunk: string, encoding: string, callback: StreamCb): void; -- -- /** -- * After all data is flushed to the write stream, you can use the Transform.doFlush writes some extra data, must -- * not be called directly, only called by Writable after flushing all data. -+ * Reads a buffer of a specified size from the buffer. If the available buffer is sufficient, the result -+ * of the specified size is returned. Otherwise, if Readable has ended, all remaining buffers are returned. - * -- * @param { Function } callback - Callback after flush completion. -+ * @param { number } size - Expected length of the data to be read. -+ * @returns { string | null } If no data is available to read, null is returned. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.Mandatory parameters are left unspecified; - * 2.Incorrect parameter types; - * 3.Parameter verification failed. -+ * @throws { BusinessError } 10200038 - The doRead method has not been implemented. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 12 - */ -- doFlush(callback: Function): void; -- -- /** -- * After all data is flushed to the write stream, you can use the Transform.doFlush writes some extra data, must -- * not be called directly, only called by Writable after flushing all data. -- * -- * @param { StreamCb } callback - Callback after flush completion. -- * @syscap SystemCapability.Utils.Lang -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ -- doFlush(callback: StreamCb): void; -- -- } -- -- /** -- * Return readable options. -- * -- * @interface ReadableOptions -- * @syscap SystemCapability.Utils.Lang -- * @crossplatform -- * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -- */ -- interface ReadableOptions { -- /** -- * Specifies the encoding format of the data. If this parameter is provided, -- * the readable stream decodes the data into a string in the specified encoding format. Default: utf8. -- * If an invalid string is entered, a 401 exception is thrown in the Readable constructor. -- * Supported encoding formats: utf-8, ibm866, iso-8859-2, iso-8859-3, iso-8859-4, iso-8859-5, iso-8859-6, -- * iso-8859-7, iso-8859-8, iso-8859-8-i, iso-8859-10, iso-8859-13, iso-8859-14, iso-8859-15, koi8-r, koi8-u, -- * macintosh, windows-874, windows-1250, windows-1251, windows-1252, windows-1253, windows-1254, windows-1255, -- * windows-1256, windows-1257, windows-1258, x-mac-cyrillic, gbk, gb18030, big5, euc-jp, iso-2022-jp, shift_jis, -- * euc-kr, utf-16be, utf-16le. -- * -- * @type { ?string } -- * @syscap SystemCapability.Utils.Lang -- * @crossplatform -- * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -- */ -- encoding?: string; -- } -+ read(size?: number): string | null; - -- /** -- * The stream from which data can be read. -- * -- * @syscap SystemCapability.Utils.Lang -- * @crossplatform -- * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -- */ -- class Readable { -- /** -- * The Readable constructor. -- * -- * @syscap SystemCapability.Utils.Lang -- * @crossplatform -- * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -- */ -- constructor(); -- /** -- * The Readable constructor. -- * -- * @param { ReadableOptions } options - Provide options. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: -- * 1.Mandatory parameters are left unspecified; -- * 2.Incorrect parameter types; -- * 3.Parameter verification failed. -- * @syscap SystemCapability.Utils.Lang -- * @crossplatform -- * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -- */ -- constructor(options: ReadableOptions); - /** - * Reads a buffer of a specified size from the buffer. If the available buffer is sufficient, the result - * of the specified size is returned. Otherwise, if Readable has ended, all remaining buffers are returned. - * -- * @param { number } size - Expected length of the data to be read. -- * @returns { string | null } If no data is available to read, null is returned. -+ * @param { number } [size] - Expected length of the data to be read. -+ * @returns { buffer.Buffer | string | null } If no data is available to read, null is returned. - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1.Mandatory parameters are left unspecified; - * 2.Incorrect parameter types; -@@ -558,10 +528,11 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 20 -+ * @arkts 1.2 - */ -- read(size?: number): string | null; -+ read(size?: number): buffer.Buffer | string | null; -+ - /** - * Switch Readable to Streaming Mode. - * -@@ -573,6 +544,7 @@ declare namespace stream { - * @arkts 1.1&1.2 - */ - resume(): Readable; -+ - /** - * Toggle Readable to Suspend Mode. - * -@@ -584,6 +556,7 @@ declare namespace stream { - * @arkts 1.1&1.2 - */ - pause(): Readable; -+ - /** - * Sets the encoding format of the input binary data.Default: utf8. - * -@@ -599,6 +572,7 @@ declare namespace stream { - * @arkts 1.1&1.2 - */ - setEncoding(encoding?: string): boolean; -+ - /** - * Query whether it is in pause state. - * -@@ -610,6 +584,7 @@ declare namespace stream { - * @arkts 1.1&1.2 - */ - isPaused(): boolean; -+ - /** - * Concatenated a Writable to a Readable and switches the Readable to stream mode. - * -@@ -627,6 +602,7 @@ declare namespace stream { - * @arkts 1.1&1.2 - */ - pipe(destination: Writable, options?: Object): Writable; -+ - /** - * Disconnect Writable from Readable. - * -@@ -643,6 +619,7 @@ declare namespace stream { - * @arkts 1.1&1.2 - */ - unpipe(destination?: Writable): Readable; -+ - /** - * Registering Event Messages. - * -@@ -654,10 +631,23 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - on(event: string, callback: Callback): void; -+ -+ /** -+ * Registering Event Messages. -+ * -+ * @param { string } event - Registering Events. -+ * @param { Function } callback - Event callback. -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ on(event: string, callback: Function): void; -+ - /** - * Cancel event message. - * -@@ -669,38 +659,39 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - off(event: string, callback?: Callback): void; -+ - /** -- * It may be implemented by child classes, and if so, will be called by the Readable class methods only. -- * It must not be called directly. -+ * Cancel event message. - * -- * @param { Function } callback - Callback when the stream has completed the initial. -- * @throws { BusinessError } 401 - Parameter error. Possible causes: -- * 1.Mandatory parameters are left unspecified; -- * 2.Incorrect parameter types; -- * 3.Parameter verification failed. -+ * @param { string } event - Registering Events. -+ * @param { Function } [callback] - Event callback. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since 20 -+ * @arkts 1.2 - */ -- doInitialize(callback: Function): void; -+ off(event: string, callback?: Function): void; - - /** - * It may be implemented by child classes, and if so, will be called by the Readable class methods only. - * It must not be called directly. - * -- * @param { StreamCb } callback - Callback when the stream has completed the initial. -+ * @param { Function } callback - Callback when the stream has completed the initial. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: -+ * 1.Mandatory parameters are left unspecified; -+ * 2.Incorrect parameter types; -+ * 3.Parameter verification failed. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 20 -- * @arkts 1.2 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- doInitialize(callback: StreamCb): void; -+ doInitialize(callback: Function): void; - - /** - * The specific implementation of data production. It must not be actively called. -@@ -719,6 +710,7 @@ declare namespace stream { - * @arkts 1.1&1.2 - */ - doRead(size: number): void; -+ - /** - * Adds the generated data to the buffer. The return value indicates whether the data in the buffer has not - * reached the highWaterMark (similar to Writable.write). If the chunk is null, all data has been generated. -@@ -737,6 +729,7 @@ declare namespace stream { - * @arkts 1.1&1.2 - */ - push(chunk: Uint8Array | string | null, encoding?: string): boolean; -+ - /** - * Returns boolean indicating whether it is in ObjectMode. - * -@@ -745,10 +738,22 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - readonly readableObjectMode: boolean; -+ -+ /** -+ * Returns boolean indicating whether it is in ObjectMode. -+ * -+ * @type { boolean } -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get readableObjectMode(): boolean; -+ - /** - * Is true if it is safe to call readable.read(), which means - * the stream has not been destroyed or emitted 'error' or 'end'. -@@ -758,10 +763,23 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - readonly readable: boolean; -+ -+ /** -+ * Is true if it is safe to call readable.read(), which means -+ * the stream has not been destroyed or emitted 'error' or 'end'. -+ * -+ * @type { boolean } -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get readable(): boolean; -+ - /** - * Returns the value of highWatermark passed when creating this Readable. - * -@@ -770,10 +788,22 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - readonly readableHighWatermark: number; -+ -+ /** -+ * Returns the value of highWatermark passed when creating this Readable. -+ * -+ * @type { number } -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get readableHighWatermark(): number; -+ - /** - * This property reflects the current state of the readable stream null/true/false. - * -@@ -782,10 +812,22 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - readonly readableFlowing: boolean | null; -+ -+ /** -+ * This property reflects the current state of the readable stream null/true/false. -+ * -+ * @type { boolean | null } -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get readableFlowing(): boolean | null; -+ - /** - * Size of the data that can be read, in bytes or objects. - * -@@ -794,10 +836,22 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - readonly readableLength: number; -+ -+ /** -+ * Size of the data that can be read, in bytes or objects. -+ * -+ * @type { number } -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get readableLength(): number; -+ - /** - * Getter for the property encoding of a given Readable stream. The encoding property can be set using the - * readable.setEncoding() method. -@@ -807,10 +861,23 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - readonly readableEncoding: string | null; -+ -+ /** -+ * Getter for the property encoding of a given Readable stream. The encoding property can be set using the -+ * readable.setEncoding() method. -+ * -+ * @type { string | null } -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get readableEncoding(): string | null; -+ - /** - * Whether all data has been generated. - * -@@ -819,11 +886,23 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - readonly readableEnded: boolean; -+ -+ /** -+ * Whether all data has been generated. -+ * -+ * @type { boolean } -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get readableEnded(): boolean; - } -+ - /** - * Duplex streams are streams that implement both the Readable streams and Writable streams interfaces. - * -@@ -836,7 +915,7 @@ declare namespace stream { - */ - class Duplex extends Readable { - /** -- * The Duplex constructor. -+ * The Duplex constructor. - * - * @syscap SystemCapability.Utils.Lang - * @crossplatform -@@ -845,6 +924,7 @@ declare namespace stream { - * @arkts 1.1&1.2 - */ - constructor(); -+ - /** - * writes a chunk to Writable and invokes callback when the chunk is flushed. The return value indicates - * whether the internal buffer of the Writable reaches the hightWaterMark. If true is returned, the buffer -@@ -866,32 +946,11 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - write(chunk?: string | Uint8Array, encoding?: string, callback?: Function): boolean; - -- /** -- * writes a chunk to Writable and invokes callback when the chunk is flushed. The return value indicates -- * whether the internal buffer of the Writable reaches the hightWaterMark. If true is returned, the buffer -- * does not reach the hightWaterMark. If false is returned, the buffer has been reached. The write function -- * should be called after the drain event is triggered. If the write function is called continuously, -- * the chunk is still added to the buffer until the memory overflows -- * -- * @param { string | Uint8Array } [chunk] - Data to be written. -- * @param { string } [encoding] - Encoding type. -- * @param { StreamCb } [callback] - Callback after writing. -- * @returns { boolean } Write success returns true, write failure returns false. -- * @throws { BusinessError } 10200036 - The stream has been ended. -- * @throws { BusinessError } 10200037 - The callback is invoked multiple times consecutively. -- * @throws { BusinessError } 10200039 - The doTransform method has not been implemented for a class that inherits from Transform. -- * @syscap SystemCapability.Utils.Lang -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ -- write(chunk?: string | Uint8Array, encoding?: string, callback?: StreamCb): boolean; -- - /** - * Write the last chunk to Writable. - * -@@ -907,26 +966,11 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - end(chunk?: string | Uint8Array, encoding?: string, callback?: Function): Writable; - -- /** -- * Write the last chunk to Writable. -- * -- * @param { string | Uint8Array } [chunk] - Data to be written. -- * @param { string } [encoding] - Encoding type. -- * @param { StreamCb } [callback] - Callback after writing. -- * @returns { Writable } Returns the Writable object. -- * @throws { BusinessError } 10200039 - The doTransform method has not been implemented for a class that inherits from Transform. -- * @syscap SystemCapability.Utils.Lang -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ -- end(chunk?: string | Uint8Array, encoding?: string, callback?: StreamCb): Writable; -- - /** - * Set the default encoding mode. - * -@@ -943,6 +987,7 @@ declare namespace stream { - * @arkts 1.1&1.2 - */ - setDefaultEncoding(encoding?: string): boolean; -+ - /** - * After the call, all Write operations will be forced to write to the buffer instead of being flushed. - * -@@ -954,6 +999,7 @@ declare namespace stream { - * @arkts 1.1&1.2 - */ - cork(): boolean; -+ - /** - * After calling, flush all buffers. - * -@@ -965,6 +1011,7 @@ declare namespace stream { - * @arkts 1.1&1.2 - */ - uncork(): boolean; -+ - /** - * Implemented by subclass inheritance. The implementation logic of flushing chunks in the buffer must not be - * directly called. The call is controlled by Writable.write. -@@ -979,25 +1026,11 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - doWrite(chunk: string | Uint8Array, encoding: string, callback: Function): void; - -- /** -- * Implemented by subclass inheritance. The implementation logic of flushing chunks in the buffer must not be -- * directly called. The call is controlled by Writable.write. -- * -- * @param { string | Uint8Array } [chunk] - Data to be written. -- * @param { string } [encoding] - Encoding type. -- * @param { StreamCb } [callback] - Callback after writing. -- * @syscap SystemCapability.Utils.Lang -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ -- doWrite(chunk: string | Uint8Array, encoding: string, callback: StreamCb): void; -- - /** - * The implementation logic of flushing chunks in the buffer in batches should not be actively called. - * The call is controlled by Writable.write. -@@ -1011,36 +1044,35 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - doWritev(chunks: string[] | Uint8Array[], callback: Function): void; - - /** -- * The implementation logic of flushing chunks in the buffer in batches should not be actively called. -- * The call is controlled by Writable.write. -+ * Returns boolean indicating whether it is in ObjectMode. - * -- * @param { string[] | Uint8Array[] } [chunks] - Data to be written. -- * @param { StreamCb } [callback] - Callback after writing. -+ * @type { boolean } -+ * @readonly - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 20 -- * @arkts 1.2 -+ * @since 12 - */ -- doWritev(chunks: string[] | Uint8Array[], callback: StreamCb): void; -+ readonly writableObjectMode: boolean; - - /** - * Returns boolean indicating whether it is in ObjectMode. - * - * @type { boolean } -- * @readonly - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 20 -+ * @arkts 1.2 - */ -- readonly writableObjectMode: boolean; -+ get writableObjectMode(): boolean; -+ - /** - * Value of highWatermark. - * -@@ -1049,10 +1081,22 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - readonly writableHighWatermark: number; -+ -+ /** -+ * Value of highWatermark. -+ * -+ * @type { number } -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get writableHighWatermark(): number; -+ - /** - * Is true if it is safe to call writable.write(), which means the stream has not been destroyed, error or end. - * -@@ -1061,10 +1105,22 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - readonly writable: boolean; -+ -+ /** -+ * Is true if it is safe to call writable.write(), which means the stream has not been destroyed, error or end. -+ * -+ * @type { boolean } -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get writable(): boolean; -+ - /** - * Size of data that can be flushed, in bytes or objects. - * -@@ -1073,10 +1129,22 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - readonly writableLength: number; -+ -+ /** -+ * Size of data that can be flushed, in bytes or objects. -+ * -+ * @type { number } -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get writableLength(): number; -+ - /** - * Number of times writable.uncork() needs to be called in order to fully uncork the stream. - * -@@ -1085,10 +1153,22 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - readonly writableCorked: number; -+ -+ /** -+ * Number of times writable.uncork() needs to be called in order to fully uncork the stream. -+ * -+ * @type { number } -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get writableCorked(): number; -+ - /** - * Whether Writable.end has been called. - * -@@ -1097,10 +1177,22 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - readonly writableEnded: boolean; -+ -+ /** -+ * Whether Writable.end has been called. -+ * -+ * @type { boolean } -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get writableEnded(): boolean; -+ - /** - * Whether Writable.end has been called and all buffers have been flushed. - * -@@ -1109,10 +1201,82 @@ declare namespace stream { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -+ * @since 12 -+ */ -+ readonly writableFinished: boolean; -+ -+ /** -+ * Whether Writable.end has been called and all buffers have been flushed. -+ * -+ * @type { boolean } -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get writableFinished(): boolean; -+ } -+ -+ /** -+ * Transform stream is a Duplex stream where the output is computed in some way from the input. -+ * Transform implementations must implement the doTransform() method and may also implement the doFlush() method. -+ * -+ * @extends Duplex -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ class Transform extends Duplex { -+ /** -+ * The Transform constructor. -+ * -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly writableFinished: boolean; -+ constructor(); -+ -+ /** -+ * Convert the input data. After the conversion, Transform.push can be called to send the input to the read stream. -+ * Transform.push should not be called Transform.write to call. -+ * -+ * @param { string } chunk - Input data to be converted. -+ * @param { string } encoding - If the chunk is a string, then this is the encoding type. If chunk is a buffer, -+ * then this is the special value 'buffer'. Ignore it in that case. -+ * @param { Function } callback - Callback after conversion. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: -+ * 1.Mandatory parameters are left unspecified; -+ * 2.Incorrect parameter types; -+ * 3.Parameter verification failed. -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ doTransform(chunk: string, encoding: string, callback: Function): void; -+ -+ /** -+ * After all data is flushed to the write stream, you can use the Transform.doFlush writes some extra data, must -+ * not be called directly, only called by Writable after flushing all data. -+ * -+ * @param { Function } callback - Callback after flush completion. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: -+ * 1.Mandatory parameters are left unspecified; -+ * 2.Incorrect parameter types; -+ * 3.Parameter verification failed. -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ doFlush(callback: Function): void; - } - } - export default stream; -\ No newline at end of file -diff --git a/api/@ohos.web.webview.d.ts b/api/@ohos.web.webview.d.ts -index 7de05c6f6..de0be74a2 100644 ---- a/api/@ohos.web.webview.d.ts -+++ b/api/@ohos.web.webview.d.ts -@@ -25,9 +25,8 @@ import { AsyncCallback, BusinessError } from './@ohos.base'; - import { Callback } from './@ohos.base'; - import type cert from './@ohos.security.cert'; - import type image from './@ohos.multimedia.image'; --/*** if arkts 1.1 */ - import type print from './@ohos.print'; --/*** endif */ -+ - import { WebNetErrorList } from './@ohos.web.netErrorList'; - - /** -@@ -3076,14 +3075,14 @@ declare namespace webview { - */ - /** - * Current index in BackForwardList. -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Web.Webview.Core - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- currentIndex: number; -+ currentIndex: int; - - /** - * Size of in BackForwardList. -@@ -3092,19 +3091,19 @@ declare namespace webview { - */ - /** - * Size of in BackForwardList. -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.Web.Webview.Core - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- size: number; -+ size: int; - - /** - * Get history entry at given index. - * -- * @param { number } index Index of back forward list entry. -+ * @param { int } index Index of back forward list entry. - * @returns { HistoryItem } HistoryItem at given index in back forward list. - * @throws { BusinessError } 401 - Invalid input parameter. - * @syscap SystemCapability.Web.Webview.Core -@@ -3113,7 +3112,7 @@ declare namespace webview { - /** - * Get history entry at given index. - * -- * @param { number } index Index of back forward list entry. -+ * @param { int } index Index of back forward list entry. - * @returns { HistoryItem } HistoryItem at given index in back forward list. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. 3.Parameter verification failed. -@@ -3123,7 +3122,7 @@ declare namespace webview { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- getItemAtIndex(index: number): HistoryItem; -+ getItemAtIndex(index: int): HistoryItem; - } - - /** -@@ -4105,7 +4104,7 @@ declare namespace webview { - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice - * @since 11 -- * @deprecated since 16 -+ * @deprecated since 18 - * @useinstead ohos.web.webview.WebviewController#getLastHitTest - */ - getHitTest(): WebHitTestType; -@@ -4302,7 +4301,7 @@ declare namespace webview { - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice - * @since 11 -- * @deprecated since 16 -+ * @deprecated since 18 - * @useinstead ohos.web.webview.WebviewController#getLastHitTest - */ - getHitTestValue(): HitTestValue; -@@ -4581,7 +4580,28 @@ declare namespace webview { - * The WebviewController must be associated with a Web component. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Registers the JavaScript object and method list. -+ * -+ * @param { object } object - Application side JavaScript objects participating in registration. -+ * @param { string } name - The name of the registered object, which is consistent with the -+ * object name called in the window. -+ * @param { Array } methodList - The method of the application side JavaScript object participating -+ * in the registration. -+ * @param { Array } [asyncMethodList] - The async method of the application side JavaScript object -+ * participating in the registration. -+ * @param { string } [permission] - permission configuration defining web page URLs that can access JavaScriptProxy methods. -+ * The configuration can be defined at two levels, object level and method level. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameter types. 3.Parameter verification failed. -+ * @throws { BusinessError } 17100001 - Init error. -+ * The WebviewController must be associated with a Web component. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - registerJavaScriptProxy(object: object, name: string, methodList: Array, -@@ -4609,7 +4629,21 @@ declare namespace webview { - * @throws { BusinessError } 17100008 - Failed to delete JavaScriptProxy because it does not exist. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Deletes a registered JavaScript object with given name. -+ * -+ * @param { string } name - The name of a registered JavaScript object to be deleted. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameter types. 3.Parameter verification failed. -+ * @throws { BusinessError } 17100001 - Init error. -+ * The WebviewController must be associated with a Web component. -+ * @throws { BusinessError } 17100008 - Failed to delete JavaScriptProxy because it does not exist. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - deleteJavaScriptRegister(name: string): void; -@@ -5516,7 +5550,8 @@ declare namespace webview { - * @param { string } url - Which url to preresolve/preconnect. - * @param { boolean } preconnectable - Indicates whether to preconnect. - * @param { number } numSockets - If preconnectable is true, this parameter indicates the number of sockets to be preconnected. -- * @throws { BusinessError } 17100002 - Invalid url. -+ * @throws { BusinessError } 17100002 - URL error. The webpage corresponding to the URL is invalid, or the URL -+ * length exceeds 2048. - * @throws { BusinessError } 171000013 - The number of preconnect sockets is invalid. - * @syscap SystemCapability.Web.Webview.Core - * @since 10 -@@ -5526,7 +5561,8 @@ declare namespace webview { - * @param { string } url - Which url to preresolve/preconnect. - * @param { boolean } preconnectable - Indicates whether to preconnect. - * @param { number } numSockets - If preconnectable is true, this parameter indicates the number of sockets to be preconnected. -- * @throws { BusinessError } 17100002 - Invalid url. -+ * @throws { BusinessError } 17100002 - URL error. The webpage corresponding to the URL is invalid, or the URL -+ * length exceeds 2048. - * @throws { BusinessError } 171000013 - The number of preconnect sockets is invalid. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -@@ -5681,7 +5717,8 @@ declare namespace webview { - * @throws { BusinessError } 17100001 - Init error. - * The WebviewController must be associated with a Web component. - * @syscap SystemCapability.Web.Webview.Core -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - createWebPrintDocumentAdapter(jobName: string): print.PrintDocumentAdapter; - -@@ -5958,7 +5995,20 @@ declare namespace webview { - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Enable the ability to use Intelligent Tracking Prevention; default is disabled. -+ * -+ * @param { boolean } enable {@code true} enable Intelligent Tracking Prevention; {@code false} otherwise. -+ * @throws { BusinessError } 17100001 - Init error. -+ * The WebviewController must be associated with a Web component. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameter types. -+ * @throws { BusinessError } 801 - Capability not supported. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - enableIntelligentTrackingPrevention(enable: boolean): void; -@@ -5971,7 +6021,18 @@ declare namespace webview { - * The WebviewController must be associated with a Web component. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Get whether Intelligent Tracking Prevention is enabled. -+ * -+ * @returns { boolean } True if enable the Intelligent Tracking Prevention; else false. -+ * @throws { BusinessError } 17100001 - Init error. -+ * The WebviewController must be associated with a Web component. -+ * @throws { BusinessError } 801 - Capability not supported. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - isIntelligentTrackingPreventionEnabled(): boolean; -@@ -5984,7 +6045,18 @@ declare namespace webview { - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Add bypassing hosts for Intelligent Tracking Prevention. -+ * -+ * @param { Array } hostList - Hosts that bypass the Intelligent Tracking Prevention. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameter types. -+ * @throws { BusinessError } 801 - Capability not supported. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - static addIntelligentTrackingPreventionBypassingList(hostList: Array): void; -@@ -5997,7 +6069,18 @@ declare namespace webview { - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Remove bypassing hosts for Intelligent Tracking Prevention. -+ * -+ * @param { Array } hostList - Hosts needs to remove from bypass list. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameter types. -+ * @throws { BusinessError } 801 - Capability not supported. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - static removeIntelligentTrackingPreventionBypassingList(hostList: Array): void; -@@ -6007,7 +6090,15 @@ declare namespace webview { - * - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Clear bypassing hosts for Intelligent Tracking Prevention. -+ * -+ * @throws { BusinessError } 801 - Capability not supported. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - static clearIntelligentTrackingPreventionBypassingList(): void; -@@ -6028,7 +6119,8 @@ declare namespace webview { - * @param { CreateNativeMediaPlayerCallback } callback - Called everytime when web pages try to play media. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onCreateNativeMediaPlayer(callback: CreateNativeMediaPlayerCallback): void; - -@@ -6210,7 +6302,20 @@ declare namespace webview { - * The WebviewController must be associated with a Web component. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Enable the ability to block Ads, disabled by default. -+ * -+ * @param { boolean } enable {@code true} Enable Ads block; {@code false} otherwise. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -+ *
    2. Parameter string is too long. 3.Parameter verification failed. -+ * @throws { BusinessError } 17100001 - Init error. -+ * The WebviewController must be associated with a Web component. -+ * @throws { BusinessError } 801 - Capability not supported. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - enableAdsBlock(enable: boolean): void; -@@ -6221,7 +6326,16 @@ declare namespace webview { - * @returns { boolean } True if the ability of AdsBlock is enabled; else false. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Get whether Ads block is enabled. -+ * -+ * @returns { boolean } True if the ability of AdsBlock is enabled; else false. -+ * @throws { BusinessError } 801 - Capability not supported. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - isAdsBlockEnabled(): boolean; -@@ -6232,7 +6346,16 @@ declare namespace webview { - * @returns { boolean } True if the ability of AdsBlock is enabled for current Webpage; else false. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Get whether Ads block is enabled for current Webpage. -+ * -+ * @returns { boolean } True if the ability of AdsBlock is enabled for current Webpage; else false. -+ * @throws { BusinessError } 801 - Capability not supported. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - isAdsBlockEnabledForCurPage(): boolean; -@@ -8256,6 +8379,27 @@ declare namespace webview { - AUTO_CLEANUP - } - -+ /** -+ * The function of reusme media play. -+ * -+ * @typedef { function } ResumePlayerFn -+ * @syscap SystemCapability.Web.Webview.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ type ResumePlayerFn = () => void; -+ -+ /** -+ * The function of suspend media play. -+ * -+ * @typedef { function } SuspendPlayerFn -+ * @param { SuspendType } type - The scenario for suspending the media player. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ type SuspendPlayerFn = (type: SuspendType) => void; -+ - /** - * The bridge between web core and native media player. - * Apps should implements this interface, and pass an instance to web core. -@@ -8264,7 +8408,8 @@ declare namespace webview { - * @typedef NativeMediaPlayerBridge - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface NativeMediaPlayerBridge { - /** -@@ -8276,7 +8421,8 @@ declare namespace webview { - * @param { number } height - The height of video tag. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - updateRect(x: number, y: number, width: number, height: number): void - -@@ -8285,7 +8431,8 @@ declare namespace webview { - * - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - play(): void - -@@ -8294,7 +8441,8 @@ declare namespace webview { - * - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - pause(): void - -@@ -8306,7 +8454,8 @@ declare namespace webview { - * @param { number } targetTime - The target time (in seconds) to FF/BF to. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - seek(targetTime: number): void - -@@ -8318,7 +8467,8 @@ declare namespace webview { - * @param { number } volume - The volume of native media player. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setVolume(volume: number): void - -@@ -8328,7 +8478,8 @@ declare namespace webview { - * @param { boolean } muted - Should mute native media player. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setMuted(muted: boolean): void - -@@ -8340,7 +8491,8 @@ declare namespace webview { - * @param { number } playbackRate - The playback rate of native media player. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setPlaybackRate(playbackRate: number): void - -@@ -8349,7 +8501,8 @@ declare namespace webview { - * - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - release(): void - -@@ -8358,7 +8511,8 @@ declare namespace webview { - * - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enterFullscreen(): void - -@@ -8367,7 +8521,8 @@ declare namespace webview { - * - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - exitFullscreen(): void - -@@ -8379,6 +8534,16 @@ declare namespace webview { - */ - resumePlayer?(): void - -+ /** -+ * Resume the native media player. -+ * -+ * @type { ?ResumePlayerFn } -+ * @syscap SystemCapability.Web.Webview.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ resumePlayer?: ResumePlayerFn; -+ - /** - * Suspend to release native media player, not the NativeMediaPlayerBridge. The - * embedder should save the status of player when release the native media player -@@ -8389,6 +8554,18 @@ declare namespace webview { - * @since 12 - */ - suspendPlayer?(type: SuspendType): void -+ -+ /** -+ * Suspend to release native media player, not the NativeMediaPlayerBridge. The -+ * embedder should save the status of player when release the native media player -+ * through NativeMediaPlayerBridge. -+ * -+ * @type { ?SuspendPlayerFn } -+ * @syscap SystemCapability.Web.Webview.Core -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ suspendPlayer?: SuspendPlayerFn; - } - - /** -@@ -8713,7 +8890,8 @@ declare namespace webview { - * @returns { NativeMediaPlayerBridge } Returns whether the app takes over the media. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type CreateNativeMediaPlayerCallback = - (handler: NativeMediaPlayerHandler, mediaInfo: MediaInfo) => NativeMediaPlayerBridge; -@@ -8734,7 +8912,18 @@ declare namespace webview { - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * set Ads Block ruleset file, containing easylist rules. -+ * @param {string} rulesFile - absolute file path contains app customized ads block rules. -+ * @param {boolean} replace - (@code true)replace internal rules;(@code false) add to internal rules. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameter types. -+ * @throws { BusinessError } 801 - Capability not supported. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - static setAdsBlockRules(rulesFile: string, replace: boolean): void; -@@ -8747,7 +8936,18 @@ declare namespace webview { - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Add items to Ads Block Disallow list. -+ * @param { Array } domainSuffixes - list of domain suffix, if web page url matches someone in the list, -+ * Ads Block will be disallowed for the web page. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameter types. -+ * @throws { BusinessError } 801 - Capability not supported. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - static addAdsBlockDisallowedList(domainSuffixes: Array): void; -@@ -8763,7 +8963,21 @@ declare namespace webview { - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Add items to Ads Block Allow list. -+ * By default, ads block is allowed for all pages unless they are added to the -+ * disallow list. The priority of allowlist is higher than the disallowlist. It is -+ * used to re-enable ads block on the page that matches disallow list. -+ * @param { Array } domainSuffixes - list of domain suffix, if web page url matches someone in the list, -+ * Ads Block will be allowed for the web page. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameter types. -+ * @throws { BusinessError } 801 - Capability not supported. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - static addAdsBlockAllowedList(domainSuffixes: Array): void; -@@ -8775,7 +8989,17 @@ declare namespace webview { - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * remove items from Ads Block Disallowed list. -+ * @param { Array } domainSuffixes - list of domain suffix needed be removed from disallow list -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameter types. -+ * @throws { BusinessError } 801 - Capability not supported. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - static removeAdsBlockDisallowedList(domainSuffixes: Array): void; -@@ -8787,7 +9011,17 @@ declare namespace webview { - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * remove items from Ads Block Allowed list. -+ * @param { Array } domainSuffixes - list of domain suffix needed be removed from allow list -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameter types. -+ * @throws { BusinessError } 801 - Capability not supported. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - static removeAdsBlockAllowedList(domainSuffixes: Array): void; -@@ -8796,7 +9030,14 @@ declare namespace webview { - * clear Ads Block Disallowed list. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * clear Ads Block Disallowed list. -+ * @throws { BusinessError } 801 - Capability not supported. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - static clearAdsBlockDisallowedList(): void; -@@ -8805,7 +9046,14 @@ declare namespace webview { - * clear Ads Block Allowed list. - * @syscap SystemCapability.Web.Webview.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * clear Ads Block Allowed list. -+ * @throws { BusinessError } 801 - Capability not supported. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - static clearAdsBlockAllowedList(): void; -@@ -8891,37 +9139,69 @@ declare namespace webview { - * Enum type supplied to {@link insertProxyRule} for indicating the scheme filter for proxy. - * @enum { number } - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'15', '1.2':'20'} -+ * @since 15 -+ */ -+ /** -+ * Enum type supplied to {@link insertProxyRule} for indicating the scheme filter for proxy. -+ * @enum { number } -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - enum ProxySchemeFilter { - /** - * This indicates all the schemes will use the proxy. - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'15', '1.2':'20'} -+ * @since 15 -+ */ -+ /** -+ * This indicates all the schemes will use the proxy. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - MATCH_ALL_SCHEMES = 0, - /** - * This indicates only the HTTP requests will use the proxy. - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'15', '1.2':'20'} -+ * @since 15 -+ */ -+ /** -+ * This indicates only the HTTP requests will use the proxy. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - MATCH_HTTP = 1, - /** - * This indicates only the HTTPS requests will use the proxy. - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'15', '1.2':'20'} -+ * @since 15 -+ */ -+ /** -+ * This indicates only the HTTPS requests will use the proxy. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - MATCH_HTTPS = 2, - } - /** - * The ProxyConfig used by applyProxyOverride. -- * -+ * - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'15', '1.2':'20'} -+ * @since 15 -+ */ -+ /** -+ * The ProxyConfig used by applyProxyOverride. -+ * -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - class ProxyConfig { -@@ -8929,23 +9209,45 @@ declare namespace webview { - * Insert a bypass rule that indicates URLs that should skip the override proxy and connect the server directly instead. - * These maybe URLs or IP addresses and wildcards are supported. e.g. "*.example.com" means that requests to - * "https://www.example.com" and "http://test.example.com" will connect the server directly. -- * -+ * - * @param { string } bypassRule - The bypass rule. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'15', '1.2':'20'} -+ * @since 15 -+ */ -+ /** -+ * Insert a bypass rule that indicates URLs that should skip the override proxy and connect the server directly instead. -+ * These maybe URLs or IP addresses and wildcards are supported. e.g. "*.example.com" means that requests to -+ * "https://www.example.com" and "http://test.example.com" will connect the server directly. -+ * -+ * @param { string } bypassRule - The bypass rule. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameter types. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - insertBypassRule(bypassRule: string): void; - /** - * Insert a proxy rule that indicates URLs that match the schemeFilter will connect the server directly. -- * -+ * - * @param { ProxySchemeFilter } schemeFilter - The scheme filter for this rule. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'15', '1.2':'20'} -+ * @since 15 -+ */ -+ /** -+ * Insert a proxy rule that indicates URLs that match the schemeFilter will connect the server directly. -+ * -+ * @param { ProxySchemeFilter } schemeFilter - The scheme filter for this rule. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameter types. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - insertDirectRule(schemeFilter?: ProxySchemeFilter): void; -@@ -8970,7 +9272,31 @@ declare namespace webview { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'15', '1.2':'20'} -+ * @since 15 -+ */ -+ /** -+ * Insert a proxy rule which indicates that requests matching the schemeFilter should use an override proxy, all requests will -+ * use the proxy rule if schemeFilter is null. -+ * -+ * The format for proxy is [scheme://]host[:port]. Scheme is optional and must be HTTP, HTTPS, or SOCKS if present. Scheme defaults to HTTP. -+ * Host is an IPv6 literal with brackets, an IPv4 literal or one or more labels seperated by a period. Port number is optional and defaults -+ * to 80 for HTTP, 443 for HTTPS and 1080 for SOCKS. -+ * -+ * e.g. example.com host: example.com -+ * https://example.com scheme: https host: example.com -+ * example.com:8888 host: example.com port: 8888 -+ * https://example.com:8888 scheme:https host: example.com port:8888 -+ * 192.168.1.1 host: 192.168.1.1 -+ * 192.168.1.1:8888 host:192.168.1.1 port: 8888 -+ * [10:20:30:40:50:60:70:80] -+ * -+ * @param { string } proxyRule - The proxy rule. -+ * @param { ProxySchemeFilter } schemeFilter - The scheme filter for this rule. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameter types. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - insertProxyRule(proxyRule: string, schemeFilter?: ProxySchemeFilter): void; -@@ -8979,7 +9305,15 @@ declare namespace webview { - * Examples: "abc", "local", "some-domain". - * - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'15', '1.2':'20'} -+ * @since 15 -+ */ -+ /** -+ * Hostnames without a period in them (and that are not IP literals) will skip the proxy and connect the server directly. -+ * Examples: "abc", "local", "some-domain". -+ * -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - bypassHostnamesWithoutPeriod(): void; -@@ -8989,7 +9323,16 @@ declare namespace webview { - * Call this function to override the default behavior and force localhost and link-local URLs to be sent through the proxy. - * - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'15', '1.2':'20'} -+ * @since 15 -+ */ -+ /** -+ * By default, certain hostnames implicitly bypass the proxy if they are link-local IPs, or localhost addresses. For instance -+ * hostnames matching any of (non-exhaustive list): localhost *.localhost [::1] 127.0.0.1/8 169.254/16 [FE80::]/10 -+ * Call this function to override the default behavior and force localhost and link-local URLs to be sent through the proxy. -+ * -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - clearImplicitRules(): void; -@@ -9003,7 +9346,20 @@ declare namespace webview { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'15', '1.2':'20'} -+ * @since 15 -+ */ -+ /** -+ * Reverse the bypass rules. -+ * -+ * If false all URLs will use proxy settings except URLs match the bypass rules. -+ * If true only URLs in the bypass list will use proxy, and all other URLs will be connected to directly. -+ * -+ * @param { boolean } reverse - If reverse the bypass rule. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameter types. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - enableReverseBypass(reverse: boolean): void; -@@ -9012,7 +9368,15 @@ declare namespace webview { - * - * @returns { Array } The bypass rules. - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'15', '1.2':'20'} -+ * @since 15 -+ */ -+ /** -+ * Returns the bypass rules. -+ * -+ * @returns { Array } The bypass rules. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - getBypassRules(): Array; -@@ -9021,7 +9385,15 @@ declare namespace webview { - * - * @returns { Array } The proxy rules. - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'15', '1.2':'20'} -+ * @since 15 -+ */ -+ /** -+ * Returns the proxy rules. -+ * -+ * @returns { Array } The proxy rules. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - getProxyRules(): Array; -@@ -9030,7 +9402,15 @@ declare namespace webview { - * - * @returns { boolean } If reverse bypass enabled. - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'15', '1.2':'20'} -+ * @since 15 -+ */ -+ /** -+ * Returns if reverse bypass rules. -+ * -+ * @returns { boolean } If reverse bypass enabled. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - isReverseBypassEnabled(): boolean; -@@ -9040,7 +9420,14 @@ declare namespace webview { - * The ProxyRule used by insertProxyRule. - * - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'15', '1.2':'20'} -+ * @since 15 -+ */ -+ /** -+ * The ProxyRule used by insertProxyRule. -+ * -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - class ProxyRule { -@@ -9049,7 +9436,15 @@ declare namespace webview { - * - * @returns { ProxySchemeFilter } The scheme filter used for this rule. - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'15', '1.2':'20'} -+ * @since 15 -+ */ -+ /** -+ * Returns the scheme filter used for this rule. -+ * -+ * @returns { ProxySchemeFilter } The scheme filter used for this rule. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - getSchemeFilter(): ProxySchemeFilter; -@@ -9058,7 +9453,15 @@ declare namespace webview { - * - * @returns { string } The proxy URL. - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'15', '1.2':'20'} -+ * @since 15 -+ */ -+ /** -+ * Returns the proxy URL. -+ * -+ * @returns { string } The proxy URL. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - getUrl(): string; -@@ -9069,7 +9472,15 @@ declare namespace webview { - * - * @typedef { function } - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'18', '1.2':'20'} -+ * @since 15 -+ */ -+ /** -+ * The callback for proxy changed. -+ * -+ * @typedef { function } -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - type OnProxyConfigChangeCallback = () => void; -@@ -9078,7 +9489,14 @@ declare namespace webview { - * This class is used for set proxy for ArkWeb. - * - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'15', '1.2':'20'} -+ * @since 15 -+ */ -+ /** -+ * This class is used for set proxy for ArkWeb. -+ * -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - class ProxyController { -@@ -9093,7 +9511,21 @@ declare namespace webview { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'15', '1.2':'20'} -+ * @since 15 -+ */ -+ /** -+ * Sets ProxyConfig which will be used by all Webs in the app. URLs that match patterns in the bypass list will connect the server directly. -+ * Instead, the request will use the proxy specified by the config. Requests are not guaranteed to use the new proxy immediately; wait for -+ * the listener before loading a page. This listener will be called on the UI thread. -+ * Note: calling applyProxyOverride will cause any existing system wide setting to be ignored. -+ * -+ * @param { ProxyConfig } proxyConfig - The proxy config. -+ * @param { OnProxyConfigChangeCallback } callback - Called when the proxy has been changed. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameter types. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - static applyProxyOverride(proxyConfig: ProxyConfig, callback: OnProxyConfigChangeCallback): void; -@@ -9105,7 +9537,18 @@ declare namespace webview { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. - * @syscap SystemCapability.Web.Webview.Core -- * @since arkts {'1.1':'15', '1.2':'20'} -+ * @since 15 -+ */ -+ /** -+ * Remove the proxy config. Requests are not guaranteed to not use the proxy; wait for the listener before loading a page. This listener -+ * will be called on the UI thread. -+ * -+ * @param { OnProxyConfigChangeCallback } callback - Called when the proxy has been changed. -+ * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. -+ *
    2. Incorrect parameter types. -+ * @syscap SystemCapability.Web.Webview.Core -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} - * @arkts 1.1&1.2 - */ - static removeProxyOverride(callback: OnProxyConfigChangeCallback): void; -diff --git a/api/@ohos.wifi.d.ts b/api/@ohos.wifi.d.ts -index bc98aa0fb..e38024591 100644 ---- a/api/@ohos.wifi.d.ts -+++ b/api/@ohos.wifi.d.ts -@@ -23,7 +23,8 @@ import { AsyncCallback, Callback } from './@ohos.base'; - /** - * Provides methods to operate or manage Wi-Fi. - * @namespace wifi -- * @since 6 -+ * @since arkts {'1.1':'6', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - declare namespace wifi { - /** -diff --git a/api/@ohos.wifiManager.d.ts b/api/@ohos.wifiManager.d.ts -index 76816bcb2..2dbe81d96 100644 ---- a/api/@ohos.wifiManager.d.ts -+++ b/api/@ohos.wifiManager.d.ts -@@ -50,7 +50,8 @@ declare namespace wifiManager { - * @throws {BusinessError} 2501000 - Operation failed. - * @throws {BusinessError} 2501003 - Operation failed because the service is being closed. - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function enableWifi(): void; - -@@ -64,7 +65,8 @@ declare namespace wifiManager { - * @throws {BusinessError} 2501004 - Operation failed because the service is being opened. - * @syscap SystemCapability.Communication.WiFi.STA - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function disableWifi(): void; - -@@ -78,7 +80,8 @@ declare namespace wifiManager { - * @throws {BusinessError} 2501004 - Operation failed because the service is being opened. - * @syscap SystemCapability.Communication.WiFi.STA - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function enableSemiWifi(): void; - -@@ -179,7 +182,8 @@ declare namespace wifiManager { - * @throws {BusinessError} 2501000 - Operation failed. - * @syscap SystemCapability.Communication.WiFi.STA - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getWifiDetailState(): WifiDetailState; - -@@ -233,7 +237,8 @@ declare namespace wifiManager { - * @throws {BusinessError} 2501000 - Operation failed. - * @syscap SystemCapability.Communication.WiFi.STA - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getScanInfoList(): Array; - -@@ -571,7 +576,8 @@ declare namespace wifiManager { - * @throws {BusinessError} 801 - Capability not supported. - * @throws {BusinessError} 2501000 - Operation failed. - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getSignalLevel(rssi: number, band: number): number; - -@@ -598,7 +604,8 @@ declare namespace wifiManager { - * @syscap SystemCapability.Communication.WiFi.STA - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getLinkedInfo(): Promise; - -@@ -642,7 +649,8 @@ declare namespace wifiManager { - * @throws {BusinessError} 2501001 - Wi-Fi STA disabled. - * @syscap SystemCapability.Communication.WiFi.STA - * @crossplatform -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getLinkedInfo(callback: AsyncCallback): void; - -@@ -656,7 +664,8 @@ declare namespace wifiManager { - * @throws {BusinessError} 2501001 - Wi-Fi STA disabled. - * @syscap SystemCapability.Communication.WiFi.STA - * @crossplatform -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getLinkedInfoSync(): WifiLinkedInfo; - -@@ -681,7 +690,8 @@ declare namespace wifiManager { - * @syscap SystemCapability.Communication.WiFi.STA - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isConnected(): boolean; - -@@ -738,7 +748,8 @@ declare namespace wifiManager { - * @throws {BusinessError} 801 - Capability not supported. - * @throws {BusinessError} 2501000 - Operation failed. - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getIpInfo(): IpInfo; - -@@ -751,7 +762,8 @@ declare namespace wifiManager { - * @throws {BusinessError} 801 - Capability not supported. - * @throws {BusinessError} 2501000 - Operation failed. - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getIpv6Info(): Ipv6Info; - -@@ -959,7 +971,8 @@ declare namespace wifiManager { - * @throws {BusinessError} 2501000 - Operation failed. - * @throws {BusinessError} 2501001 - Wi-Fi STA disabled. - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isMeteredHotspot(): boolean; - -@@ -1049,7 +1062,8 @@ declare namespace wifiManager { - * @throws {BusinessError} 2601000 - Operation failed. - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @systemapi Hide this for inner system use. -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function isOpenSoftApAllowed(): boolean; - -@@ -1133,7 +1147,8 @@ declare namespace wifiManager { - * @throws {BusinessError} 2601000 - Operation failed. - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @systemapi Hide this for inner system use. -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - function getStations(): Array; - -@@ -2177,7 +2192,8 @@ declare namespace wifiManager { - * @enum { number } - * @syscap SystemCapability.Communication.WiFi.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum DeviceAddressType { - /** -@@ -2190,7 +2206,8 @@ declare namespace wifiManager { - * random device address - * @syscap SystemCapability.Communication.WiFi.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - RANDOM_DEVICE_ADDRESS, - -@@ -2204,7 +2221,8 @@ declare namespace wifiManager { - * real device address - * @syscap SystemCapability.Communication.WiFi.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - REAL_DEVICE_ADDRESS, - } -@@ -2367,14 +2385,16 @@ declare namespace wifiManager { - * @enum { number } WifiDetailState - * @syscap SystemCapability.Communication.WiFi.STA - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum WifiDetailState { - /** - * state is unknown - * @syscap SystemCapability.Communication.WiFi.STA - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - UNKNOWN = -1, - -@@ -2382,7 +2402,8 @@ declare namespace wifiManager { - * wifi is closed - * @syscap SystemCapability.Communication.WiFi.STA - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INACTIVE = 0, - -@@ -2390,7 +2411,8 @@ declare namespace wifiManager { - * wifi is opened - * @syscap SystemCapability.Communication.WiFi.STA - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ACTIVATED = 1, - -@@ -2398,7 +2420,8 @@ declare namespace wifiManager { - * wifi is opening - * @syscap SystemCapability.Communication.WiFi.STA - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ACTIVATING = 2, - -@@ -2406,7 +2429,8 @@ declare namespace wifiManager { - * wifi is closing - * @syscap SystemCapability.Communication.WiFi.STA - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DEACTIVATING = 3, - -@@ -2414,7 +2438,8 @@ declare namespace wifiManager { - * wifi sta is entering semi active - * @syscap SystemCapability.Communication.WiFi.STA - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SEMI_ACTIVATING = 4, - -@@ -2422,7 +2447,8 @@ declare namespace wifiManager { - * wifi sta is semi active - * @syscap SystemCapability.Communication.WiFi.STA - * @systemapi Hide this for inner system use. -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SEMI_ACTIVE = 5, - } -@@ -2464,41 +2490,47 @@ declare namespace wifiManager { - * Wi-Fi Category. - * @enum { number } - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum WifiCategory { - /** - * Default. - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DEFAULT = 1, - - /** - * Wifi6. - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WIFI6 = 2, - - /** - * Wifi6+. - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WIFI6_PLUS = 3, - - /** - * Wifi7. - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WIFI7 = 4, - - /** - * Wifi7+. - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WIFI7_PLUS = 5 - } -@@ -2740,7 +2772,8 @@ declare namespace wifiManager { - * @typedef WifiDeviceConfig - * @syscap SystemCapability.Communication.WiFi.STA - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface WifiDeviceConfig { - /** -@@ -2754,7 +2787,8 @@ declare namespace wifiManager { - * @type { string } - * @syscap SystemCapability.Communication.WiFi.STA - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ssid: string; - -@@ -2769,7 +2803,8 @@ declare namespace wifiManager { - * @type { ?string } - * @syscap SystemCapability.Communication.WiFi.STA - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - bssid?: string; - -@@ -2799,7 +2834,8 @@ declare namespace wifiManager { - * @type { string } - * @syscap SystemCapability.Communication.WiFi.STA - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - preSharedKey: string; - -@@ -2823,7 +2859,8 @@ declare namespace wifiManager { - * @type { WifiSecurityType } - * @syscap SystemCapability.Communication.WiFi.STA - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - securityType: WifiSecurityType; - -@@ -3111,7 +3148,8 @@ declare namespace wifiManager { - * @typedef WifiScanInfo - * @syscap SystemCapability.Communication.WiFi.STA - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface WifiScanInfo { - /** -@@ -3125,7 +3163,8 @@ declare namespace wifiManager { - * @type { string } - * @syscap SystemCapability.Communication.WiFi.STA - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ssid: string; - -@@ -3140,7 +3179,8 @@ declare namespace wifiManager { - * @type { string } - * @syscap SystemCapability.Communication.WiFi.STA - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - bssid: string; - -@@ -3178,7 +3218,8 @@ declare namespace wifiManager { - * @type { WifiSecurityType } - * @syscap SystemCapability.Communication.WiFi.STA - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - securityType: WifiSecurityType; - -@@ -3193,7 +3234,8 @@ declare namespace wifiManager { - * @type { number } - * @syscap SystemCapability.Communication.WiFi.STA - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - rssi: number; - -@@ -3201,7 +3243,8 @@ declare namespace wifiManager { - * Frequency band, 1: 2.4G, 2: 5G - * @type { number } - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - band: number; - -@@ -3264,7 +3307,8 @@ declare namespace wifiManager { - * Supported wifi category - * @type { WifiCategory } - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - supportedWifiCategory: WifiCategory; - -@@ -3288,14 +3332,16 @@ declare namespace wifiManager { - * @enum { number } - * @syscap SystemCapability.Communication.WiFi.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum WifiSecurityType { - /** - * Invalid security type - * - * @syscap SystemCapability.Communication.WiFi.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WIFI_SEC_TYPE_INVALID = 0, - -@@ -3310,7 +3356,8 @@ declare namespace wifiManager { - * - * @syscap SystemCapability.Communication.WiFi.Core - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WIFI_SEC_TYPE_OPEN = 1, - -@@ -3318,7 +3365,8 @@ declare namespace wifiManager { - * Wired Equivalent Privacy (WEP) - * - * @syscap SystemCapability.Communication.WiFi.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WIFI_SEC_TYPE_WEP = 2, - -@@ -3326,7 +3374,8 @@ declare namespace wifiManager { - * Pre-shared key (PSK) - * - * @syscap SystemCapability.Communication.WiFi.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WIFI_SEC_TYPE_PSK = 3, - -@@ -3334,7 +3383,8 @@ declare namespace wifiManager { - * Simultaneous Authentication of Equals (SAE) - * - * @syscap SystemCapability.Communication.WiFi.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WIFI_SEC_TYPE_SAE = 4, - -@@ -3342,7 +3392,8 @@ declare namespace wifiManager { - * EAP authentication. - * - * @syscap SystemCapability.Communication.WiFi.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WIFI_SEC_TYPE_EAP = 5, - -@@ -3350,7 +3401,8 @@ declare namespace wifiManager { - * SUITE_B_192 192 bit level. - * - * @syscap SystemCapability.Communication.WiFi.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WIFI_SEC_TYPE_EAP_SUITE_B = 6, - -@@ -3358,7 +3410,8 @@ declare namespace wifiManager { - * Opportunistic Wireless Encryption. - * - * @syscap SystemCapability.Communication.WiFi.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WIFI_SEC_TYPE_OWE = 7, - -@@ -3366,7 +3419,8 @@ declare namespace wifiManager { - * WAPI certificate to be specified. - * - * @syscap SystemCapability.Communication.WiFi.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WIFI_SEC_TYPE_WAPI_CERT = 8, - -@@ -3374,7 +3428,8 @@ declare namespace wifiManager { - * WAPI pre-shared key to be specified. - * - * @syscap SystemCapability.Communication.WiFi.Core -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - WIFI_SEC_TYPE_WAPI_PSK = 9 - } -@@ -3527,7 +3582,8 @@ declare namespace wifiManager { - * @typedef WifiLinkedInfo - * @syscap SystemCapability.Communication.WiFi.STA - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - - interface WifiLinkedInfo { -@@ -3542,7 +3598,8 @@ declare namespace wifiManager { - * @type { string } - * @syscap SystemCapability.Communication.WiFi.STA - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ssid: string; - -@@ -3557,7 +3614,8 @@ declare namespace wifiManager { - * @type { string } - * @syscap SystemCapability.Communication.WiFi.STA - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - bssid: string; - -@@ -3581,7 +3639,8 @@ declare namespace wifiManager { - * @type { number } - * @syscap SystemCapability.Communication.WiFi.STA - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - rssi: number; - -@@ -3589,7 +3648,8 @@ declare namespace wifiManager { - * The frequency band of a Wi-Fi access point. - * @type { number } - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - band: number; - -@@ -3686,7 +3746,8 @@ declare namespace wifiManager { - * The Wi-Fi MAC address of a device. - * @type { string } - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - macAddress: string; - -@@ -3711,7 +3772,8 @@ declare namespace wifiManager { - * The state of this Wi-Fi connection. - * @type { ConnState } - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - connState: ConnState; - -@@ -3735,7 +3797,8 @@ declare namespace wifiManager { - * Supported wifi category - * @type { WifiCategory } - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - supportedWifiCategory: WifiCategory; - -@@ -3760,14 +3823,16 @@ declare namespace wifiManager { - * Wi-Fi IP information. - * @typedef IpInfo - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface IpInfo { - /** - * The IP address of the Wi-Fi connection - * @type { number } - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ipAddress: number; - -@@ -3824,14 +3889,16 @@ declare namespace wifiManager { - * Wi-Fi IPv6 information. - * @typedef Ipv6Info - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface Ipv6Info { - /** - * The link IPv6 address of the Wi-Fi connection - * @type { string } - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - linkIpv6Address: string; - -@@ -3905,7 +3972,8 @@ declare namespace wifiManager { - * @typedef HotspotConfig - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface HotspotConfig { - /** -@@ -3913,7 +3981,8 @@ declare namespace wifiManager { - * @type { string } - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ssid: string; - -@@ -3922,7 +3991,8 @@ declare namespace wifiManager { - * @type { WifiSecurityType } - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - securityType: WifiSecurityType; - -@@ -3931,7 +4001,8 @@ declare namespace wifiManager { - * @type { number } - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - band: number; - -@@ -3949,7 +4020,8 @@ declare namespace wifiManager { - * @type { string } - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - preSharedKey: string; - -@@ -3977,7 +4049,8 @@ declare namespace wifiManager { - * @typedef StationInfo - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface StationInfo { - /** -@@ -3994,7 +4067,8 @@ declare namespace wifiManager { - * @type { string } - * @syscap SystemCapability.Communication.WiFi.AP.Core - * @systemapi Hide this for inner system use. -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - macAddress: string; - -@@ -4162,14 +4236,16 @@ declare namespace wifiManager { - * - * @enum { number } - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum ConnState { - /** - * The device is searching for an available AP. - * - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - SCANNING, - -@@ -4177,7 +4253,8 @@ declare namespace wifiManager { - * The Wi-Fi connection is being set up. - * - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CONNECTING, - -@@ -4185,7 +4262,8 @@ declare namespace wifiManager { - * The Wi-Fi connection is being authenticated. - * - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AUTHENTICATING, - -@@ -4193,7 +4271,8 @@ declare namespace wifiManager { - * The IP address of the Wi-Fi connection is being obtained. - * - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - OBTAINING_IPADDR, - -@@ -4201,7 +4280,8 @@ declare namespace wifiManager { - * The Wi-Fi connection has been set up. - * - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CONNECTED, - -@@ -4209,7 +4289,8 @@ declare namespace wifiManager { - * The Wi-Fi connection is being torn down. - * - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DISCONNECTING, - -@@ -4217,7 +4298,8 @@ declare namespace wifiManager { - * The Wi-Fi connection has been torn down. - * - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DISCONNECTED, - -@@ -4225,7 +4307,8 @@ declare namespace wifiManager { - * Failed to set up the Wi-Fi connection. - * - * @syscap SystemCapability.Communication.WiFi.STA -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - UNKNOWN - } -@@ -4235,14 +4318,16 @@ declare namespace wifiManager { - * - * @typedef WifiP2pDevice - * @syscap SystemCapability.Communication.WiFi.P2P -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface WifiP2pDevice { - /** - * Device name - * @type { string } - * @syscap SystemCapability.Communication.WiFi.P2P -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - deviceName: string; - -@@ -4250,7 +4335,8 @@ declare namespace wifiManager { - * Device mac address - * @type { string } - * @syscap SystemCapability.Communication.WiFi.P2P -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - deviceAddress: string; - -@@ -4258,7 +4344,8 @@ declare namespace wifiManager { - * Device mac address type - * @type { ?DeviceAddressType } - * @syscap SystemCapability.Communication.WiFi.P2P -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - deviceAddressType?: DeviceAddressType; - -@@ -4266,7 +4353,8 @@ declare namespace wifiManager { - * Primary device type - * @type { string } - * @syscap SystemCapability.Communication.WiFi.P2P -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - primaryDeviceType: string; - -@@ -4274,7 +4362,8 @@ declare namespace wifiManager { - * Device status - * @type { P2pDeviceStatus } - * @syscap SystemCapability.Communication.WiFi.P2P -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - deviceStatus: P2pDeviceStatus; - -@@ -4282,7 +4371,8 @@ declare namespace wifiManager { - * Device group capabilities - * @type { number } - * @syscap SystemCapability.Communication.WiFi.P2P -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - groupCapabilities: number; - } -@@ -4431,20 +4521,23 @@ declare namespace wifiManager { - * - * @enum { number } - * @syscap SystemCapability.Communication.WiFi.P2P -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum P2pConnectState { - /** - * p2p is disconnected - * @syscap SystemCapability.Communication.WiFi.P2P -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DISCONNECTED = 0, - - /** - * p2p is connected - * @syscap SystemCapability.Communication.WiFi.P2P -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CONNECTED = 1 - } -@@ -4454,14 +4547,16 @@ declare namespace wifiManager { - * - * @typedef WifiP2pLinkedInfo - * @syscap SystemCapability.Communication.WiFi.P2P -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - interface WifiP2pLinkedInfo { - /** - * Connection status - * @type { P2pConnectState } - * @syscap SystemCapability.Communication.WiFi.P2P -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - connectState: P2pConnectState; - -@@ -4469,7 +4564,8 @@ declare namespace wifiManager { - * Indicates whether it is group owner - * @type { boolean } - * @syscap SystemCapability.Communication.WiFi.P2P -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isGroupOwner: boolean; - -@@ -4477,7 +4573,8 @@ declare namespace wifiManager { - * Group owner address - * @type { string } - * @syscap SystemCapability.Communication.WiFi.P2P -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - groupOwnerAddr: string; - } -@@ -4487,41 +4584,47 @@ declare namespace wifiManager { - * - * @enum { number } - * @syscap SystemCapability.Communication.WiFi.P2P -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - enum P2pDeviceStatus { - /** - * Indicate p2p device is connected. - * @syscap SystemCapability.Communication.WiFi.P2P -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CONNECTED = 0, - - /** - * Indicate p2p device is invited. - * @syscap SystemCapability.Communication.WiFi.P2P -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - INVITED = 1, - - /** - * Indicate p2p device is failed. - * @syscap SystemCapability.Communication.WiFi.P2P -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FAILED = 2, - - /** - * Indicate p2p device is available. - * @syscap SystemCapability.Communication.WiFi.P2P -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - AVAILABLE = 3, - - /** - * Indicate p2p device is unavailable. - * @syscap SystemCapability.Communication.WiFi.P2P -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - UNAVAILABLE = 4 - } -diff --git a/api/@ohos.window.d.ts b/api/@ohos.window.d.ts -index 1710a7c23..41f83ca05 100644 ---- a/api/@ohos.window.d.ts -+++ b/api/@ohos.window.d.ts -@@ -33,7 +33,6 @@ import bundleManager from './@ohos.bundle.bundleManager'; - import { LocalStorage } from '@ohos.arkui.stateManagement'; - import { UIContext } from '@ohos.arkui.UIContext'; - import { ColorMetrics } from '@ohos.arkui.node'; --import { Callback } from './@ohos.base'; - /*** endif */ - - /*** if arkts 1.1 */ -@@ -59,6 +58,18 @@ declare interface Callback { - } - /*** endif */ - -+/*** if arkts 1.2 */ -+/** -+ * Defines the window callback. -+ * -+ * @typedef {function} -+ * @syscap SystemCapability.Window.SessionManager -+ * @atomicservice -+ * @since 20 -+ */ -+type Callback = (data: T) => V; -+/*** endif */ -+ - /** - * Window manager. - * -@@ -1771,7 +1782,8 @@ declare namespace window { - * @type { ?colorMode } - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - colorMode?: ConfigurationConstant.ColorMode; - -@@ -1781,7 +1793,8 @@ declare namespace window { - * @type { ?number } - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - buttonBackgroundSize? : number; - -@@ -1791,7 +1804,8 @@ declare namespace window { - * @type { ?number } - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - spacingBetweenButtons? : number; - -@@ -1801,7 +1815,8 @@ declare namespace window { - * @type { ?number } - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - closeButtonRightMargin? : number; - } -@@ -6459,7 +6474,8 @@ declare namespace window { - * @throws { BusinessError } 1300004 - Unauthorized operation. - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'windowWillClose', callback: Callback>): void; - -@@ -6475,7 +6491,8 @@ declare namespace window { - * @throws { BusinessError } 1300004 - Unauthorized operation. - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'windowWillClose', callback?: Callback>): void; - -@@ -8314,7 +8331,8 @@ declare namespace window { - * @throws { BusinessError } 1300003 - This window manager service works abnormally. - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - minimize(callback: AsyncCallback): void; - -@@ -8337,7 +8355,8 @@ declare namespace window { - * @throws { BusinessError } 1300003 - This window manager service works abnormally. - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - minimize(): Promise; - -@@ -8746,7 +8765,8 @@ declare namespace window { - * @throws { BusinessError } 1300004 - Unauthorized operation. - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setDecorButtonStyle(dectorStyle: DecorButtonStyle): void; - -@@ -8834,7 +8854,8 @@ declare namespace window { - * @throws { BusinessError } 1300004 - Unauthorized operation. - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setWindowTitleButtonVisible(isMaximizeButtonVisible: boolean, isMinimizeButtonVisible: boolean, isCloseButtonVisible?: boolean): void; - -@@ -8873,7 +8894,8 @@ declare namespace window { - * @throws { BusinessError } 1300004 - Unauthorized operation. - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - startMoving(): Promise; - -@@ -8892,7 +8914,8 @@ declare namespace window { - * @throws { BusinessError } 1300004 - Unauthorized operation. - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - startMoving(offsetX: number, offsetY: number): Promise; - -@@ -8965,7 +8988,8 @@ declare namespace window { - * @throws { BusinessError } 1300002 - This window state is abnormal. - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(type: 'windowTitleButtonRectChange', callback: Callback): void; - -@@ -8992,41 +9016,11 @@ declare namespace window { - * @throws { BusinessError } 1300002 - This window state is abnormal. - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(type: 'windowTitleButtonRectChange', callback?: Callback): void; - -- /** -- * Register the callback of title buttons visible change. -- * -- * @param { 'windowTitleButtonVisibleChange' } type - The value is fixed at 'windowTitleButtonVisibleChange', indicating the title buttons visible change event. -- * @param { Callback } callback - Callback used to return the current title buttons visibility. -- * @throws { BusinessError } 401 - Parameter error. Possible cause: 1. Mandatory parameters are left unspecified; -- * 2. Incorrect parameter types; -- * 3. Parameter verification failed. -- * @throws { BusinessError } 801 - Capability not supported. Failed to call the API due to limited device capabilities. -- * @throws { BusinessError } 1300002 - This window state is abnormal. -- * @syscap SystemCapability.Window.SessionManager -- * @atomicservice -- * @since 18 -- */ -- on(type: 'windowTitleButtonVisibleChange', callback: Callback): void; -- -- /** -- * Unregister the callback of title buttons visible change. -- * -- * @param { 'windowTitleButtonVisibleChange' } type - The value is fixed at 'windowTitleButtonVisibleChange', indicating the title buttons visible change event. -- * @param { Callback } callback - Callback used to return the current title buttons visibility. -- * @throws { BusinessError } 401 - Parameter error. Possible cause: 1. Incorrect parameter types; -- * 2. Parameter verification failed. -- * @throws { BusinessError } 801 - Capability not supported. Failed to call the API due to limited device capabilities. -- * @throws { BusinessError } 1300002 - This window state is abnormal. -- * @syscap SystemCapability.Window.SessionManager -- * @atomicservice -- * @since 18 -- */ -- off(type: 'windowTitleButtonVisibleChange', callback?: Callback): void; -- - /** - * Set the window mask of window - * -@@ -9133,7 +9127,8 @@ declare namespace window { - * @throws { BusinessError } 1300002 - This window state is abnormal. - * @syscap SystemCapability.Window.SessionManager - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getWindowStatus(): WindowStatusType; - -@@ -10192,7 +10187,8 @@ declare namespace window { - * @syscap SystemCapability.Window.SessionManager - * @stagemodelonly - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(eventType: 'windowStageClose', callback: Callback): void; - -@@ -10209,7 +10205,8 @@ declare namespace window { - * @syscap SystemCapability.Window.SessionManager - * @stagemodelonly - * @atomicservice -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(eventType: 'windowStageClose', callback?: Callback): void; - -diff --git a/api/@ohos.zlib.d.ts b/api/@ohos.zlib.d.ts -index 9cffb4b8d..fbbf04617 100644 ---- a/api/@ohos.zlib.d.ts -+++ b/api/@ohos.zlib.d.ts -@@ -73,7 +73,7 @@ declare namespace zlib { - /** - * CompressLevel - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.Zlib - * @crossplatform - * @atomicservice -@@ -157,7 +157,7 @@ declare namespace zlib { - /** - * CompressStrategy - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.Zlib - * @crossplatform - * @atomicservice -@@ -250,7 +250,7 @@ declare namespace zlib { - /** - * ParallelStrategy - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.Zlib - * @crossplatform - * @atomicservice -@@ -287,7 +287,7 @@ declare namespace zlib { - /** - * MemLevel - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.Zlib - * @crossplatform - * @atomicservice -@@ -348,7 +348,7 @@ declare namespace zlib { - /** - * CompressFlushMode - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 -@@ -415,7 +415,7 @@ declare namespace zlib { - /** - * Return codes for the compression/decompression functions. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 -@@ -450,7 +450,7 @@ declare namespace zlib { - /** - * The deflate compression method (the only one supported in this version). - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 -@@ -469,7 +469,7 @@ declare namespace zlib { - /** - * Define the reference point for offset. - * -- * @enum { number } -+ * @enum { int } - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 -@@ -598,22 +598,22 @@ declare namespace zlib { - /** - * Number of bytes available at nextIn. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- availableIn?: number; -+ availableIn?: int; - - /** - * Total number of input bytes read so far. - * -- * @type { ?number } -+ * @type { ?long } - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- totalIn?: number; -+ totalIn?: long; - - /** - * Next output byte will go here. -@@ -628,42 +628,42 @@ declare namespace zlib { - /** - * Remaining free space at nextOut. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- availableOut?: number; -+ availableOut?: int; - - /** - * Total number of bytes output so far. - * -- * @type { ?number } -+ * @type { ?long } - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- totalOut?: number; -+ totalOut?: long; - - /** - * Best guess about the data type. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- dataType?: number; -+ dataType?: int; - - /** - * Adler-32 or CRC-32 value of the uncompressed data. - * -- * @type { ?number } -+ * @type { ?long } - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- adler?: number; -+ adler?: long; - } - - /** -@@ -688,32 +688,32 @@ declare namespace zlib { - /** - * Operating system. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- os?: number; -+ os?: int; - - /** - * Modification time. - * -- * @type { ?number } -+ * @type { ?long } - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- time?: number; -+ time?: long; - - /** - * Extra flags. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- xflags?: number; -+ xflags?: int; - - /** - * Extra field. -@@ -728,12 +728,12 @@ declare namespace zlib { - /** - * Extra field length. - * -- * @type { ?number } -+ * @type { ?int } - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- extraLen?: number; -+ extraLen?: int; - - /** - * Zero-terminated file name. -@@ -798,12 +798,12 @@ declare namespace zlib { - /** - * Total sizeof the destination buffer. - * -- * @type { number } -+ * @type { long } - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- destLen: number -+ destLen: long - } - - /** -@@ -828,12 +828,12 @@ declare namespace zlib { - /** - * Return dictionary length. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- dictionaryLength: number -+ dictionaryLength: int - } - - /** -@@ -858,22 +858,22 @@ declare namespace zlib { - /** - * Total sizeof the destination buffer. - * -- * @type { number } -+ * @type { long } - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- destLength: number -+ destLength: long - - /** - * Total sizeof the sourceLen. - * -- * @type { number } -+ * @type { long } - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- sourceLength: number -+ sourceLength: long - } - - /** -@@ -898,22 +898,22 @@ declare namespace zlib { - /** - * The number of bytes of output that have been generated. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- pending: number -+ pending: int - - /** - * The number of bits of output that have been generated. - * -- * @type { number } -+ * @type { int } - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- bits: number -+ bits: int - } - - /** -@@ -967,13 +967,13 @@ declare namespace zlib { - * @typedef { function } - * @param { object } outDesc - Object passed to output function. Object dependency requirement implementation. - * @param { ArrayBuffer } buf - Used to store data to be written. -- * @param { number } length - Write the length of the output buffer. -- * @returns { number } Return the number of bytes output. -+ * @param { int } length - Write the length of the output buffer. -+ * @returns { int } Return the number of bytes output. - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- type InflateBackOutputCallback = (outDesc: object, buf: ArrayBuffer, length: number) => number; -+ type InflateBackOutputCallback = (outDesc: object, buf: ArrayBuffer, length: int) => int; - - /** - * Compress the specified file. -@@ -1209,7 +1209,7 @@ declare namespace zlib { - * Get the original size of the compressed zip file, the size is the meta data stored in zip file. - * - * @param { string } compressedFile - Indicates the path of the compressed file. -- * @returns { Promise } Returns the original size of the compressed file. -+ * @returns { Promise } Returns the original size of the compressed file. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; 2. Incorrect parameter types. - * @throws { BusinessError } 900001 - The input source file is invalid. - * @throws { BusinessError } 900003 - The input source file is not in ZIP format or is damaged. -@@ -1219,7 +1219,7 @@ declare namespace zlib { - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- function getOriginalSize(compressedFile: string): Promise; -+ function getOriginalSize(compressedFile: string): Promise; - - /** - * Asynchronous creation of verification objects. -@@ -1296,9 +1296,9 @@ declare namespace zlib { - /** - * Update a running Adler-32 checksum with the bytes buf. - * -- * @param { number } adler - Initial value of Adler32 checksum. -+ * @param { long } adler - Initial value of Adler32 checksum. - * @param { ArrayBuffer } buf - Calculate checksum data buffer. -- * @returns { Promise } Return the updated checksum. -+ * @returns { Promise } Return the updated checksum. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.BundleManager.Zlib -@@ -1306,15 +1306,15 @@ declare namespace zlib { - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- adler32(adler: number, buf: ArrayBuffer): Promise; -+ adler32(adler: long, buf: ArrayBuffer): Promise; - - /** - * Combine two Adler-32 checksum into one. - * -- * @param { number } adler1 - The first Adler32 checksum. -- * @param { number } adler2 - The second Adler32 checksum. -- * @param { number } len2 - The length of the data block associated with the second Adler32 checksum. -- * @returns { Promise } Returns the Adler-32 checksum. -+ * @param { long } adler1 - The first Adler32 checksum. -+ * @param { long } adler2 - The second Adler32 checksum. -+ * @param { long } len2 - The length of the data block associated with the second Adler32 checksum. -+ * @returns { Promise } Returns the Adler-32 checksum. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.BundleManager.Zlib -@@ -1322,14 +1322,14 @@ declare namespace zlib { - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- adler32Combine(adler1: number, adler2: number, len2: number): Promise; -+ adler32Combine(adler1: long, adler2: long, len2: long): Promise; - - /** - * Update a running CRC-32 with the bytes buf. - * -- * @param { number } crc - Initial value of CRC-32 checksum. -+ * @param { long } crc - Initial value of CRC-32 checksum. - * @param { ArrayBuffer } buf - Calculate checksum data buffer. -- * @returns { Promise } Return the updated CRC-32. -+ * @returns { Promise } Return the updated CRC-32. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.BundleManager.Zlib -@@ -1337,15 +1337,15 @@ declare namespace zlib { - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- crc32(crc: number, buf: ArrayBuffer): Promise; -+ crc32(crc: long, buf: ArrayBuffer): Promise; - - /** - * Combine two CRC-32 check values into one. - * -- * @param { number } crc1 - The first CRC-32 checksum. -- * @param { number } crc2 - The second CRC-32 checksum. -- * @param { number } len2 - The length of the data block associated with the second CRC-32 checksum. -- * @returns { Promise } Returns the CRC-32 check value. -+ * @param { long } crc1 - The first CRC-32 checksum. -+ * @param { long } crc2 - The second CRC-32 checksum. -+ * @param { long } len2 - The length of the data block associated with the second CRC-32 checksum. -+ * @returns { Promise } Returns the CRC-32 check value. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.BundleManager.Zlib -@@ -1353,42 +1353,42 @@ declare namespace zlib { - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- crc32Combine(crc1: number, crc2: number, len2: number): Promise; -+ crc32Combine(crc1: long, crc2: long, len2: long): Promise; - - /** - * Update a running CRC-64 with the bytes buf. - * -- * @param { number } crc - Initial value of CRC-64 checksum. -+ * @param { long } crc - Initial value of CRC-64 checksum. - * @param { ArrayBuffer } buf - Calculate checksum data buffer. -- * @returns { Promise } Return the updated CRC-64. -+ * @returns { Promise } Return the updated CRC-64. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified; - *
    2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- crc64(crc: number, buf: ArrayBuffer): Promise; -+ crc64(crc: long, buf: ArrayBuffer): Promise; - - /** - * Get CRC-32 table. - * -- * @returns { Promise> } Return a array to the CRC-32 table. -+ * @returns { Promise> } Return a array to the CRC-32 table. - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- getCrcTable(): Promise>; -+ getCrcTable(): Promise>; - - /** - * Get CRC-64 table. - * -- * @returns { Promise> } Return a array to the CRC-64 table. -+ * @returns { Promise> } Return a array to the CRC-64 table. - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- getCrc64Table(): Promise>; -+ getCrc64Table(): Promise>; - } - - /** -@@ -1423,7 +1423,7 @@ declare namespace zlib { - /** - * Return flags indicating compile-time options. - * -- * @returns { Promise } Return flags indicating compile-time options. -+ * @returns { Promise } Return flags indicating compile-time options. - * Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: - * 1.0: size of uInt. - * 3.2: size of uLong. -@@ -1456,14 +1456,14 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- zlibCompileFlags(): Promise; -+ zlibCompileFlags(): Promise; - - /** - * Compresses the source buffer into the destination buffer. - * - * @param { ArrayBuffer } dest - Destination buffer. - * @param { ArrayBuffer } source - Source data buffer. -- * @param { number } sourceLen - Source data length. -+ * @param { long } sourceLen - Source data length. - * @returns { Promise } Return ReturnStatus and total sizeof the destination buffer. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. -@@ -1472,7 +1472,7 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- compress(dest: ArrayBuffer, source: ArrayBuffer, sourceLen?: number): Promise; -+ compress(dest: ArrayBuffer, source: ArrayBuffer, sourceLen?: long): Promise; - - /** - * Compresses the source buffer into the destination buffer. -@@ -1480,7 +1480,7 @@ declare namespace zlib { - * @param { ArrayBuffer } dest - Destination buffer. - * @param { ArrayBuffer } source - Source data buffer. - * @param { CompressLevel } level - Compression level. -- * @param { number } sourceLen - Source data length. -+ * @param { long } sourceLen - Source data length. - * @returns { Promise } Return ReturnStatus and total sizeof the destination buffer. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. -@@ -1490,27 +1490,27 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- compress2(dest: ArrayBuffer, source: ArrayBuffer, level: CompressLevel, sourceLen?: number,): Promise; -+ compress2(dest: ArrayBuffer, source: ArrayBuffer, level: CompressLevel, sourceLen?: long,): Promise; - - /** - * Calculate the upper limit of the return compression size. - * -- * @param { number } sourceLen - The length of the source data. -- * @returns { Promise } Returns an upper bound on the compressed size after. -+ * @param { int } sourceLen - The length of the source data. -+ * @returns { Promise } Returns an upper bound on the compressed size after. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- compressBound(sourceLen: number): Promise; -+ compressBound(sourceLen: int): Promise; - - /** - * Decompress the compressed data into its original uncompressed form. - * - * @param { ArrayBuffer } dest - Destination buffer. - * @param { ArrayBuffer } source - Source data buffer. -- * @param { number } sourceLen - Source data length. -+ * @param { long } sourceLen - Source data length. - * @returns { Promise } Return ReturnStatus and total sizeof the destination buffer. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. -@@ -1520,14 +1520,14 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- uncompress(dest:ArrayBuffer, source: ArrayBuffer, sourceLen?: number): Promise; -+ uncompress(dest:ArrayBuffer, source: ArrayBuffer, sourceLen?: long): Promise; - - /** - * Decompress the compressed data into its original uncompressed form. - * - * @param { ArrayBuffer } dest - Destination buffer. - * @param { ArrayBuffer } source - Source data buffer. -- * @param { number } sourceLen - Source data length. -+ * @param { long } sourceLen - Source data length. - * @returns { Promise } Return ReturnStatus and total sizeof the destination buffer and total sizeof the sourceLen. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. -@@ -1537,13 +1537,13 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- uncompress2(dest: ArrayBuffer, source: ArrayBuffer, sourceLen?: number): Promise; -+ uncompress2(dest: ArrayBuffer, source: ArrayBuffer, sourceLen?: long): Promise; - - /** - * Verify the checksum inside the structure of compressed stream z_stream. - * - * @param { ZStream } strm - Object to structure z_stream. -- * @param { number } check - Expected checksum. -+ * @param { int } check - Expected checksum. - * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. -@@ -1552,7 +1552,7 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- inflateValidate(strm: ZStream, check: number): Promise; -+ inflateValidate(strm: ZStream, check: int): Promise; - - /** - * Find a synchronization point for the current decompressed stream. -@@ -1618,7 +1618,7 @@ declare namespace zlib { - * This function is equivalent to inflateEnd followed by inflateInit, but does not free and reallocate the internal decompression state. - * - * @param { ZStream } strm - Object to structure z_stream. -- * @param { number } windowBits - Parameter is interpreted the same as it is for inflateInit2. -+ * @param { int } windowBits - Parameter is interpreted the same as it is for inflateInit2. - * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. -@@ -1627,7 +1627,7 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- inflateReset2(strm: ZStream, windowBits: number): Promise; -+ inflateReset2(strm: ZStream, windowBits: int): Promise; - - /** - * This function is equivalent to inflateEnd followed by inflateInit, but does not free and reallocate the internal decompression state. -@@ -1647,8 +1647,8 @@ declare namespace zlib { - * This function inserts bits in the inflate input stream. - * - * @param { ZStream } strm - Object to structure z_stream. -- * @param { number } bits - The provided bits. -- * @param { number } value - The provided value. -+ * @param { int } bits - The provided bits. -+ * @param { int } value - The provided value. - * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. -@@ -1657,26 +1657,26 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- inflatePrime(strm: ZStream, bits: number, value: number): Promise; -+ inflatePrime(strm: ZStream, bits: int, value: int): Promise; - - /** - * Is used to mark locations in the input data for random access. - * - * @param { ZStream } strm - Object to structure z_stream. -- * @returns { Promise } Return the internal marker position of the current decompressed stream. -+ * @returns { Promise } Return the internal marker position of the current decompressed stream. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- inflateMark(strm: ZStream): Promise; -+ inflateMark(strm: ZStream): Promise; - - /** - * Initializes the internal stream state for decompression. - * - * @param { ZStream } strm - Object to structure z_stream. -- * @param { number } windowBits - Is the base two logarithm of the maximum window size. -+ * @param { int } windowBits - Is the base two logarithm of the maximum window size. - * It should be in the range 8..15 for this version of the library. The default value is 15 if inflateInit is used instead. - * windowBits must be greater than or equal to the windowBits value provided to deflateInit2() while compressing, - * or it must be equal to 15 if deflateInit2() was not used. If a compressed stream with a larger window size is given as input, -@@ -1702,7 +1702,7 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- inflateInit2(strm: ZStream, windowBits: number): Promise; -+ inflateInit2(strm: ZStream, windowBits: int): Promise; - - /** - * Initializes the internal stream state for decompression. -@@ -1779,20 +1779,20 @@ declare namespace zlib { - * Obtain the number of Huffman encoding trees that have been used in the current decompression stream during the inflate process. - * - * @param { ZStream } strm - Object to structure z_stream. -- * @returns { Promise } Return the number of used Huffman encoding trees. -+ * @returns { Promise } Return the number of used Huffman encoding trees. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- inflateCodesUsed(strm: ZStream): Promise; -+ inflateCodesUsed(strm: ZStream): Promise; - - /** - * Initialize the internal stream state for decompression using inflateBack() calls. - * - * @param { ZStream } strm - Object to structure z_stream. -- * @param { number } windowBits - Parameter is interpreted the same as it is for inflateInit2. The value range is between 8~15. -+ * @param { long } windowBits - Parameter is interpreted the same as it is for inflateInit2. The value range is between 8~15. - * @param { ArrayBuffer } window - The preset sliding window buffer. - * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; -@@ -1802,7 +1802,7 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- inflateBackInit(strm: ZStream, windowBits: number, window: ArrayBuffer): Promise; -+ inflateBackInit(strm: ZStream, windowBits: long, window: ArrayBuffer): Promise; - - /** - * All memory allocated by inflateBackInit() is freed. -@@ -1873,7 +1873,7 @@ declare namespace zlib { - * @param { ZStream } strm - Object to structure z_stream. - * @param { CompressLevel } level - Compression level. - * @param { CompressMethod } method - The compression method. -- * @param { number } windowBits - Parameter is interpreted the same as it is for inflateInit2. -+ * @param { int } windowBits - Parameter is interpreted the same as it is for inflateInit2. - * @param { MemLevel } memLevel - The memory usage level. - * @param { CompressStrategy } strategy - The compression strategy. - * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. -@@ -1884,7 +1884,7 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- deflateInit2(strm: ZStream, level: CompressLevel, method: CompressMethod, windowBits: number, -+ deflateInit2(strm: ZStream, level: CompressLevel, method: CompressMethod, windowBits: int, - memLevel: MemLevel, strategy: CompressStrategy): Promise; - - /** -@@ -1921,15 +1921,15 @@ declare namespace zlib { - * Calculate an upper bound on the compressed size. - * - * @param { ZStream } strm - Object to structure z_stream. -- * @param { number } sourceLength - The length of uncompressed data. -- * @returns { Promise } Return an upper bound on the compressed size. -+ * @param { long } sourceLength - The length of uncompressed data. -+ * @returns { Promise } Return an upper bound on the compressed size. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- deflateBound(strm: ZStream, sourceLength: number): Promise; -+ deflateBound(strm: ZStream, sourceLength: long): Promise; - - /** - * Provides gzip header information for when a gzip stream is requested by deflateInit2(). -@@ -1994,10 +1994,10 @@ declare namespace zlib { - * Fine tune deflate's internal compression parameters. - * - * @param { ZStream } strm - Object to structure z_stream. -- * @param { number } goodLength - Good matching length threshold. -- * @param { number } maxLazy - Maximum lazy matching times. -- * @param { number } niceLength - Good Lazy Length Threshold. -- * @param { number } maxChain - Maximum chain length. -+ * @param { int } goodLength - Good matching length threshold. -+ * @param { int } maxLazy - Maximum lazy matching times. -+ * @param { int } niceLength - Good Lazy Length Threshold. -+ * @param { int } maxChain - Maximum chain length. - * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. -@@ -2006,7 +2006,7 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- deflateTune(strm: ZStream, goodLength: number, maxLazy: number, niceLength: number, maxChain: number): Promise; -+ deflateTune(strm: ZStream, goodLength: int, maxLazy: int, niceLength: int, maxChain: int): Promise; - - /** - * This function is equivalent to deflateEnd followed by deflateInit, but does not free and reallocate the internal compression state. -@@ -2070,8 +2070,8 @@ declare namespace zlib { - * Inserts bits in the deflate output stream. - * - * @param { ZStream } strm - Object to structure z_stream. -- * @param { number } bits - The number of bits to be inserted. The value range is between 0~16. -- * @param { number } value - The bit value corresponding to the number of bits. -+ * @param { int } bits - The number of bits to be inserted. The value range is between 0~16. -+ * @param { int } value - The bit value corresponding to the number of bits. - * @returns { Promise } Return ReturnStatus the specific meaning is defined as enum. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. -@@ -2080,7 +2080,7 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- deflatePrime(strm: ZStream, bits: number, value: number): Promise; -+ deflatePrime(strm: ZStream, bits: int, value: int): Promise; - } - - /** -@@ -2096,7 +2096,7 @@ declare namespace zlib { - /** - * Associate a gzFile with the file descriptor fd. - * -- * @param { number } fd - The file descriptor. Usually this is obtained through system calls to 'open' or other methods. -+ * @param { int } fd - The file descriptor. Usually this is obtained through system calls to 'open' or other methods. - * @param { string } mode - Used to specify access mode. - * @returns { Promise } - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; -@@ -2106,13 +2106,13 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- gzdopen(fd: number, mode: string): Promise; -+ gzdopen(fd: int, mode: string): Promise; - - /** - * Set the internal buffer size used by this library's functions for file to size. - * -- * @param { number } size - The internal buffer size to be set. -- * @returns { Promise } Returns 0 on success. -+ * @param { long } size - The internal buffer size to be set. -+ * @returns { Promise } Returns 0 on success. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17800009 - Internal structure error. -@@ -2120,7 +2120,7 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- gzbuffer(size: number): Promise; -+ gzbuffer(size: long): Promise; - - /** - * Open the gzip (.gz) file at path for reading and decompressing, or compressing and writing. -@@ -2140,22 +2140,22 @@ declare namespace zlib { - /** - * Check if the reading position of the gzip compressed file has reached the end of the file. - * -- * @returns { Promise } Return 1 (true) if the end-of-file indicator for file has been set while reading. -+ * @returns { Promise } Return 1 (true) if the end-of-file indicator for file has been set while reading. - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- gzeof(): Promise; -+ gzeof(): Promise; - - /** - * Check if the specified gzip file handle file directly accesses the original uncompressed data. - * -- * @returns { Promise } returns 1 (true) if transparent writing was requested. -+ * @returns { Promise } returns 1 (true) if transparent writing was requested. - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- gzdirect(): Promise; -+ gzdirect(): Promise; - - /** - * Flush all pending output for file, if necessary, close file and deallocate the (de)compression state. -@@ -2193,13 +2193,13 @@ declare namespace zlib { - /** - * Read and decompress one byte from file. - * -- * @returns { Promise } Return the ASCII code of a character. -+ * @returns { Promise } Return the ASCII code of a character. - * @throws { BusinessError } 17800009 - Internal structure error. - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- gzgetc(): Promise; -+ gzgetc(): Promise; - - /** - * Flush all pending output to file. -@@ -2219,9 +2219,9 @@ declare namespace zlib { - * Compress and write nitems items of size size from buf to file. - * - * @param { ArrayBuffer } buf - The buffer to write data to. -- * @param { number } size - The number of bytes in a single data block. -- * @param { number } nitems - Number of data blocks to be written. -- * @returns { Promise } Return the number of full items written of size size. -+ * @param { long } size - The number of bytes in a single data block. -+ * @param { long } nitems - Number of data blocks to be written. -+ * @returns { Promise } Return the number of full items written of size size. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17800009 - Internal structure error. -@@ -2229,15 +2229,15 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- gzfwrite(buf: ArrayBuffer, size: number, nitems: number): Promise; -+ gzfwrite(buf: ArrayBuffer, size: long, nitems: long): Promise; - - /** - * Read and decompress data from gzip compressed files. - * - * @param { ArrayBuffer } buf - Target buffer for storing read results. -- * @param { number } size - The number of bytes in a single data block. -- * @param { number } nitems - Number of data blocks to be read. -- * @returns { Promise } Return the number of full items read of size size. -+ * @param { long } size - The number of bytes in a single data block. -+ * @param { long } nitems - Number of data blocks to be read. -+ * @returns { Promise } Return the number of full items read of size size. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17800009 - Internal structure error. -@@ -2245,7 +2245,7 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- gzfread(buf: ArrayBuffer, size: number, nitems: number): Promise; -+ gzfread(buf: ArrayBuffer, size: long, nitems: long): Promise; - - /** - * Same as gzclose(), gzclosew() only for use when writing or appending. -@@ -2274,8 +2274,8 @@ declare namespace zlib { - * Compress and write the len uncompressed bytes at buf to file. - * - * @param { ArrayBuffer } buf - Object to the data buffer to be written. -- * @param { number } len - The len uncompressed bytes. -- * @returns { Promise } Return the number of uncompressed bytes written. -+ * @param { long } len - The len uncompressed bytes. -+ * @returns { Promise } Return the number of uncompressed bytes written. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17800009 - Internal structure error. -@@ -2283,13 +2283,13 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- gzwrite(buf: ArrayBuffer, len: number): Promise; -+ gzwrite(buf: ArrayBuffer, len: long): Promise; - - /** - * Push c back onto the stream for file to be read as the first character on the next read. - * -- * @param { number } c - To fall back to the character before the input stream. -- * @returns { Promise } Return the character pushed. -+ * @param { int } c - To fall back to the character before the input stream. -+ * @returns { Promise } Return the character pushed. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17800009 - Internal structure error. -@@ -2297,18 +2297,18 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- gzungetc(c: number): Promise; -+ gzungetc(c: int): Promise; - - /** - * Return the starting position for the next gzread or gzwrite on file. - * -- * @returns { Promise } Return the starting position for the next gzread or gzwrite on file. -+ * @returns { Promise } Return the starting position for the next gzread or gzwrite on file. - * @throws { BusinessError } 17800009 - Internal structure error. - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- gztell(): Promise; -+ gztell(): Promise; - - /** - * Dynamically update the compression level and strategy for file. -@@ -2328,9 +2328,9 @@ declare namespace zlib { - /** - * Set the starting position to offset relative to whence for the next gzread or gzwrite on file. - * -- * @param { number } offset - Specify the new offset to move to. -+ * @param { long } offset - Specify the new offset to move to. - * @param { OffsetReferencePoint } whence - Define the reference point for offset. -- * @returns { Promise } Return the resulting offset location as measured in bytes from the beginning of the uncompressed stream. -+ * @returns { Promise } Return the resulting offset location as measured in bytes from the beginning of the uncompressed stream. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17800009 - Internal structure error. -@@ -2338,7 +2338,7 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- gzseek(offset: number, whence: OffsetReferencePoint): Promise; -+ gzseek(offset: long, whence: OffsetReferencePoint): Promise; - - /** - * Rewind file. This function is supported only for reading. -@@ -2355,7 +2355,7 @@ declare namespace zlib { - * Read and decompress up to len uncompressed bytes from file into buf. - * - * @param { ArrayBuffer } buf - User provided buffer address. -- * @returns { Promise } Return the number of uncompressed bytes actually read, less than len for end of file. -+ * @returns { Promise } Return the number of uncompressed bytes actually read, less than len for end of file. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17800009 - Internal structure error. -@@ -2363,13 +2363,13 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- gzread(buf: ArrayBuffer): Promise; -+ gzread(buf: ArrayBuffer): Promise; - - /** - * Compress and write the given null-terminated string s to file, excluding the terminating null character. - * - * @param { string } str - Format descriptors and plain text. -- * @returns { Promise } Return the number of characters written. -+ * @returns { Promise } Return the number of characters written. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17800009 - Internal structure error. -@@ -2377,13 +2377,13 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- gzputs(str: string): Promise; -+ gzputs(str: string): Promise; - - /** - * Compress and write c, converted to an unsigned char, into file. - * -- * @param { number } char - Write ASCII values for characters. -- * @returns { Promise } Return the value that was written. -+ * @param { int } ch - Write ASCII values for characters. -+ * @returns { Promise } Return the value that was written. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17800009 - Internal structure error. -@@ -2391,14 +2391,14 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- gzputc(char: number): Promise; -+ gzputc(ch: int): Promise; - - /** - * Convert, format, compress, and write the arguments to file under control of the string format, as in fprintf. - * - * @param { string } format - Format descriptors and plain text. - * @param { Array } args - Variable argument lists. -- * @returns { Promise } Return the number of uncompressed bytes actually written. -+ * @returns { Promise } Return the number of uncompressed bytes actually written. - * @throws { BusinessError } 401 - The parameter check failed. Possible causes: 1. Mandatory parameters are left unspecified; - * 2. Incorrect parameter types; 3. Parameter verification failed. - * @throws { BusinessError } 17800004 - ZStream error. -@@ -2407,18 +2407,18 @@ declare namespace zlib { - * @atomicservice - * @since 12 - */ -- gzprintf(format: string, ...args: Array): Promise; -+ gzprintf(format: string, ...args: Array): Promise; - - /** - * Return the current compressed (actual) read or write offset of file. - * -- * @returns { Promise } Return the current compressed (actual) read or write offset of file. -+ * @returns { Promise } Return the current compressed (actual) read or write offset of file. - * @throws { BusinessError } 17800009 - Internal structure error. - * @syscap SystemCapability.BundleManager.Zlib - * @atomicservice - * @since 12 - */ -- gzoffset(): Promise; -+ gzoffset(): Promise; - - /** - * Read and decompress bytes from file into buf, until len-1 characters are read, or until a newline character is read and transferred to buf, -diff --git a/api/@system.notification.d.ts b/api/@system.notification.d.ts -index 1a7bc665c..0f4704a85 100644 ---- a/api/@system.notification.d.ts -+++ b/api/@system.notification.d.ts -@@ -21,8 +21,8 @@ - /** - * @typedef ActionResult - * @syscap SystemCapability.Notification.Notification -- * @since arkts {'1.1':'3', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 3 -+ * @deprecated since 7 - */ - export interface ActionResult { - /** -@@ -30,8 +30,8 @@ export interface ActionResult { - * - * @type { string } - * @syscap SystemCapability.Notification.Notification -- * @since arkts {'1.1':'3', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 3 -+ * @deprecated since 7 - */ - bundleName: string; - -@@ -40,8 +40,8 @@ export interface ActionResult { - * - * @type { string } - * @syscap SystemCapability.Notification.Notification -- * @since arkts {'1.1':'3', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 3 -+ * @deprecated since 7 - */ - abilityName: string; - -@@ -54,8 +54,8 @@ export interface ActionResult { - * - * @type { string } - * @syscap SystemCapability.Notification.Notification -- * @since arkts {'1.1':'3', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 3 -+ * @deprecated since 7 - */ - uri: string; - } -@@ -63,8 +63,8 @@ export interface ActionResult { - /** - * @typedef ShowNotificationOptions - * @syscap SystemCapability.Notification.Notification -- * @since arkts {'1.1':'3', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 3 -+ * @deprecated since 7 - */ - export interface ShowNotificationOptions { - /** -@@ -72,8 +72,8 @@ export interface ShowNotificationOptions { - * - * @type { ?string } - * @syscap SystemCapability.Notification.Notification -- * @since arkts {'1.1':'3', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 3 -+ * @deprecated since 7 - */ - contentTitle?: string; - -@@ -82,8 +82,8 @@ export interface ShowNotificationOptions { - * - * @type { ?string } - * @syscap SystemCapability.Notification.Notification -- * @since arkts {'1.1':'3', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 3 -+ * @deprecated since 7 - */ - contentText?: string; - -@@ -92,16 +92,19 @@ export interface ShowNotificationOptions { - * - * @type { ?ActionResult } - * @syscap SystemCapability.Notification.Notification -- * @since arkts {'1.1':'3', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 3 -+ * @deprecated since 7 - */ - clickAction?: ActionResult; - } - - /** -+ * Manages notifications. -+ * - * @syscap SystemCapability.Notification.Notification -- * @since arkts {'1.1':'3', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 3 -+ * @deprecated since 7 -+ * @useinstead ohos.notification/notification - */ - declare class Notification { - /** -@@ -110,6 +113,7 @@ declare class Notification { - * @param { ShowNotificationOptions } [options] - Options. - * @syscap SystemCapability.Notification.Notification - * @since 3 -+ * @deprecated since 7 - */ - static show(options?: ShowNotificationOptions): void; - } -diff --git a/api/@system.prompt.d.ts b/api/@system.prompt.d.ts -index 1fd665e50..fd5d186c3 100644 ---- a/api/@system.prompt.d.ts -+++ b/api/@system.prompt.d.ts -@@ -503,7 +503,7 @@ export interface ShowActionMenuOptions { - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 - */ --export default class Prompt { -+declare class Prompt { - /** - * Displays the notification text. - * -@@ -517,8 +517,7 @@ export default class Prompt { - * @param { ShowToastOptions } options - Options. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice -- * @since arkts {'1.1':'11','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - static showToast(options: ShowToastOptions): void; - -@@ -558,3 +557,5 @@ export default class Prompt { - */ - static showActionMenu(options: ShowActionMenuOptions): void; - } -+ -+export default Prompt; -\ No newline at end of file -diff --git a/api/ability/connectOptions.d.ts b/api/ability/connectOptions.d.ts -index de9b99940..f3235571e 100644 ---- a/api/ability/connectOptions.d.ts -+++ b/api/ability/connectOptions.d.ts -@@ -45,7 +45,8 @@ export interface ConnectOptions { - * @param { ElementName } elementName - The ohos.bundleManager.ElementName object of the service ability - * @param { rpc.IRemoteObject } remote - The remote object instance - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onConnect(elementName: ElementName, remote: rpc.IRemoteObject): void; - -@@ -61,7 +62,8 @@ export interface ConnectOptions { - * - * @param { ElementName } elementName - The ohos.bundleManager.ElementName object of the service ability - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onDisconnect(elementName: ElementName): void; - -@@ -70,7 +72,8 @@ export interface ConnectOptions { - * - * @param { number } code - The error code of the failed. - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onFailed(code: number): void; - } -diff --git a/api/application/AbilityDelegator.d.ts b/api/application/AbilityDelegator.d.ts -index aab8f7b34..532b10238 100644 ---- a/api/application/AbilityDelegator.d.ts -+++ b/api/application/AbilityDelegator.d.ts -@@ -18,10 +18,8 @@ - * @kit AbilityKit - */ - --/*** if arkts 1.1 */ - import AbilityStage from '../@ohos.app.ability.AbilityStage'; - import { AbilityStageMonitor } from './AbilityStageMonitor'; --/*** endif */ - import { AsyncCallback } from '../@ohos.base'; - import UIAbility from '../@ohos.app.ability.UIAbility'; - import { AbilityMonitor } from './AbilityMonitor'; -@@ -146,7 +144,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - addAbilityMonitorSync(monitor: AbilityMonitor): void; - -@@ -181,7 +180,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - addAbilityStageMonitor(monitor: AbilityStageMonitor, callback: AsyncCallback): void; - -@@ -216,7 +216,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - addAbilityStageMonitor(monitor: AbilityStageMonitor): Promise; - -@@ -239,7 +240,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - addAbilityStageMonitorSync(monitor: AbilityStageMonitor): void; - -@@ -274,7 +276,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - removeAbilityMonitor(monitor: AbilityMonitor, callback: AsyncCallback): void; - -@@ -309,7 +312,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - removeAbilityMonitor(monitor: AbilityMonitor): Promise; - -@@ -332,7 +336,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - removeAbilityMonitorSync(monitor: AbilityMonitor): void; - -@@ -367,7 +372,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - removeAbilityStageMonitor(monitor: AbilityStageMonitor, callback: AsyncCallback): void; - -@@ -402,7 +408,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - removeAbilityStageMonitor(monitor: AbilityStageMonitor): Promise; - -@@ -425,7 +432,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - removeAbilityStageMonitorSync(monitor: AbilityStageMonitor): void; - -@@ -460,7 +468,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - waitAbilityMonitor(monitor: AbilityMonitor, callback: AsyncCallback): void; - -@@ -498,7 +507,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - waitAbilityMonitor(monitor: AbilityMonitor, timeout: number, callback: AsyncCallback): void; - -@@ -536,7 +546,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - waitAbilityMonitor(monitor: AbilityMonitor, timeout?: number): Promise; - -@@ -571,7 +582,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - waitAbilityStageMonitor(monitor: AbilityStageMonitor, callback: AsyncCallback): void; - -@@ -609,7 +621,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - waitAbilityStageMonitor(monitor: AbilityStageMonitor, timeout: number, callback: AsyncCallback): void; - -@@ -647,7 +660,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - waitAbilityStageMonitor(monitor: AbilityStageMonitor, timeout?: number): Promise; - -@@ -706,7 +720,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getAbilityState(ability: UIAbility): number; - -@@ -956,7 +971,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - doAbilityForeground(ability: UIAbility, callback: AsyncCallback): void; - -@@ -991,7 +1007,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - doAbilityForeground(ability: UIAbility): Promise; - -@@ -1026,7 +1043,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - doAbilityBackground(ability: UIAbility, callback: AsyncCallback): void; - -@@ -1061,7 +1079,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - doAbilityBackground(ability: UIAbility): Promise; - -@@ -1093,7 +1112,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - print(msg: string, callback: AsyncCallback): void; - -@@ -1125,7 +1145,8 @@ export interface AbilityDelegator { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - print(msg: string): Promise; - -diff --git a/api/application/AbilityRunningInfo.d.ts b/api/application/AbilityRunningInfo.d.ts -index d19e8366d..26f2e1656 100644 ---- a/api/application/AbilityRunningInfo.d.ts -+++ b/api/application/AbilityRunningInfo.d.ts -@@ -26,7 +26,8 @@ import abilityManager from '../@ohos.app.ability.abilityManager'; - * - * @typedef AbilityRunningInfo - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface AbilityRunningInfo { - /** -@@ -43,7 +44,8 @@ export interface AbilityRunningInfo { - * @type { ElementName } - * @default the ohos.bundleManager.ElementName object of the ability. - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ability: ElementName; - -@@ -53,7 +55,8 @@ export interface AbilityRunningInfo { - * @type { number } - * @default process id - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - pid: number; - -@@ -63,7 +66,8 @@ export interface AbilityRunningInfo { - * @type { number } - * @default user id - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - uid: number; - -@@ -73,7 +77,8 @@ export interface AbilityRunningInfo { - * @type { string } - * @default the name of the process - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - processName: string; - -@@ -83,7 +88,8 @@ export interface AbilityRunningInfo { - * @type { number } - * @default ability start time - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - startTime: number; - -@@ -93,7 +99,8 @@ export interface AbilityRunningInfo { - * @type { abilityManager.AbilityState } - * @default Enumerates state of the ability state info - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - abilityState: abilityManager.AbilityState; - } -diff --git a/api/application/AbilityStageMonitor.d.ts b/api/application/AbilityStageMonitor.d.ts -index a74f23dd1..3ae864014 100644 ---- a/api/application/AbilityStageMonitor.d.ts -+++ b/api/application/AbilityStageMonitor.d.ts -@@ -43,7 +43,8 @@ - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface AbilityStageMonitor { - /** -@@ -68,7 +69,8 @@ export interface AbilityStageMonitor { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - moduleName: string; - -@@ -94,9 +96,12 @@ export interface AbilityStageMonitor { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - srcEntrance: string; - } - --export default AbilityStageMonitor; -\ No newline at end of file -+/*** if arkts 1.1 */ -+export default AbilityStageMonitor; -+/*** endif */ -\ No newline at end of file -diff --git a/api/application/ApplicationContext.d.ts b/api/application/ApplicationContext.d.ts -index 8ccb17f1c..7825ee431 100644 ---- a/api/application/ApplicationContext.d.ts -+++ b/api/application/ApplicationContext.d.ts -@@ -615,7 +615,8 @@ declare class ApplicationContext extends Context { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getCurrentAppCloneIndex(): number; - -@@ -639,7 +640,8 @@ declare class ApplicationContext extends Context { - * @throws { BusinessError } 16000078 - The multi-instance is not supported. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getCurrentInstanceKey(): string; - -@@ -652,7 +654,8 @@ declare class ApplicationContext extends Context { - * @throws { BusinessError } 16000078 - The multi-instance is not supported. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getAllRunningInstanceKeys(): Promise>; - } -diff --git a/api/application/ApplicationStateObserver.d.ts b/api/application/ApplicationStateObserver.d.ts -index 378543e43..f275299b0 100644 ---- a/api/application/ApplicationStateObserver.d.ts -+++ b/api/application/ApplicationStateObserver.d.ts -@@ -20,13 +20,10 @@ - - - import AppStateData from './AppStateData'; --import AbilityStateData from './AbilityStateData'; - /*** if arkts 1.1 */ -+import AbilityStateData from './AbilityStateData'; - import * as _ProcessData from './ProcessData'; - /*** endif */ --/*** if arkts 1.2 */ --import processData from './ProcessData'; --/*** endif */ - - /** - * The application state observer. -@@ -108,13 +105,4 @@ declare class ApplicationStateObserver { - */ - export type ProcessData = _ProcessData.default; - --/** -- * The process data. -- * @typedef { processData } -- * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since 20 -- * @arkts 1.2 -- */ --export type ProcessData = processData; -- - export default ApplicationStateObserver; -\ No newline at end of file -diff --git a/api/application/AutoFillType.d.ts b/api/application/AutoFillType.d.ts -index 8a5d9eb3b..ec2bc6591 100644 ---- a/api/application/AutoFillType.d.ts -+++ b/api/application/AutoFillType.d.ts -@@ -25,7 +25,8 @@ - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export enum AutoFillType { - /** -@@ -34,7 +35,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - UNSPECIFIED = 0, - -@@ -44,7 +46,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PASSWORD = 1, - -@@ -54,7 +57,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - USER_NAME = 2, - -@@ -64,7 +68,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NEW_PASSWORD = 3, - -@@ -74,7 +79,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FULL_STREET_ADDRESS = 4, - -@@ -84,7 +90,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - HOUSE_NUMBER = 5, - -@@ -94,7 +101,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DISTRICT_ADDRESS = 6, - -@@ -104,7 +112,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - CITY_ADDRESS = 7, - -@@ -114,7 +123,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PROVINCE_ADDRESS = 8, - -@@ -124,7 +134,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - COUNTRY_ADDRESS = 9, - -@@ -134,7 +145,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PERSON_FULL_NAME = 10, - -@@ -144,7 +156,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PERSON_LAST_NAME = 11, - -@@ -154,7 +167,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PERSON_FIRST_NAME = 12, - -@@ -164,7 +178,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PHONE_NUMBER = 13, - -@@ -174,7 +189,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PHONE_COUNTRY_CODE = 14, - -@@ -184,7 +200,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FULL_PHONE_NUMBER = 15, - -@@ -204,7 +221,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - BANK_CARD_NUMBER = 17, - -@@ -214,7 +232,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ID_CARD_NUMBER = 18, - -@@ -224,7 +243,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - NICKNAME = 24, - -@@ -234,7 +254,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - DETAIL_INFO_WITHOUT_STREET = 25, - -@@ -244,7 +265,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @StageModelOnly -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FORMAT_ADDRESS = 26, - -@@ -254,7 +276,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - PASSPORT_NUMBER = 27, - -@@ -264,7 +287,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - VALIDITY = 28, - -@@ -274,7 +298,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ISSUE_AT = 29, - -@@ -284,7 +309,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ORGANIZATION = 30, - -@@ -294,7 +320,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - TAX_ID = 31, - -@@ -304,7 +331,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ADDRESS_CITY_AND_STATE = 32, - -@@ -314,7 +342,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - FLIGHT_NUMBER = 33, - -@@ -324,7 +353,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LICENSE_NUMBER = 34, - -@@ -334,7 +364,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LICENSE_FILE_NUMBER = 35, - -@@ -344,7 +375,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LICENSE_PLATE = 36, - -@@ -354,7 +386,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ENGINE_NUMBER = 37, - -@@ -364,7 +397,8 @@ export enum AutoFillType { - * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore - * @systemapi - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - LICENSE_CHASSIS_NUMBER = 38 - } -\ No newline at end of file -diff --git a/api/application/Context.d.ts b/api/application/Context.d.ts -index 08e7ede8a..5c45e1b95 100644 ---- a/api/application/Context.d.ts -+++ b/api/application/Context.d.ts -@@ -293,7 +293,8 @@ declare class Context extends BaseContext { - * @stagemodelonly - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - bundleCodeDir: string; - -@@ -312,7 +313,8 @@ declare 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 - */ - distributedFilesDir: string; - -@@ -324,7 +326,8 @@ declare class Context extends BaseContext { - * @stagemodelonly - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - resourceDir: string; - -@@ -335,7 +338,8 @@ declare class Context extends BaseContext { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - cloudFileDir: string; - -@@ -384,11 +388,34 @@ declare class Context extends BaseContext { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 11 - */ - area: contextConstant.AreaMode; - -+ /** -+ * Get file area. -+ * -+ * @return { contextConstant.AreaMode } -+ * @syscap SystemCapability.Ability.AbilityRuntime.Core -+ * @stagemodelonly -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get area(): contextConstant.AreaMode; -+ -+ /** -+ * Set file area. -+ * -+ * @param { contextConstant.AreaMode } -+ * @syscap SystemCapability.Ability.AbilityRuntime.Core -+ * @stagemodelonly -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ set area(mode: contextConstant.AreaMode); -+ - /** - * Indicates process name. - * -@@ -397,7 +424,8 @@ declare class Context extends BaseContext { - * @stagemodelonly - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - processName: string; - -@@ -541,7 +569,8 @@ declare 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 - */ - getGroupDir(dataGroupID: string, callback: AsyncCallback): void; - -@@ -566,7 +595,8 @@ declare 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 - */ - getGroupDir(dataGroupID: string): Promise; - -@@ -597,7 +627,8 @@ declare class Context extends BaseContext { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - createAreaModeContext(areaMode: contextConstant.AreaMode): Context; - -@@ -611,7 +642,8 @@ declare class Context extends BaseContext { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly - * @atomicservice -- * @since 15 -+ * @since arkts {'1.1':'15', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - createDisplayContext(displayId: number): Context; - } -diff --git a/api/application/DriverExtensionContext.d.ts b/api/application/DriverExtensionContext.d.ts -index 6a87f00f8..6c64f808f 100644 ---- a/api/application/DriverExtensionContext.d.ts -+++ b/api/application/DriverExtensionContext.d.ts -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2023 Huawei Device Co., Ltd. -+ * Copyright (c) 2023-2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"), - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at -@@ -27,16 +27,26 @@ import ExtensionContext from './ExtensionContext'; - * @extends ExtensionContext - * @syscap SystemCapability.Driver.ExternalDevice - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ --export default class DriverExtensionContext extends ExtensionContext { -- -- -+declare class DriverExtensionContext extends ExtensionContext { - /** - * update the state of driver extension. - * @syscap SystemCapability.Driver.ExternalDevice - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - updateDriverState(): void; --} -\ No newline at end of file -+} -+/** -+ * Define a DriverExtensionContext. -+ * -+ * @typedef { DriverExtensionContext } -+ * @syscap SystemCapability.Driver.ExternalDevice -+ * @stagemodelonly -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+export default DriverExtensionContext; -diff --git a/api/application/ErrorObserver.d.ts b/api/application/ErrorObserver.d.ts -index acc0b8c03..24ee69262 100644 ---- a/api/application/ErrorObserver.d.ts -+++ b/api/application/ErrorObserver.d.ts -@@ -31,6 +31,15 @@ - * @atomicservice - * @since 11 - */ -+/** -+ * The observer will be called by system when an error occurs. -+ * -+ * @syscap SystemCapability.Ability.AbilityRuntime.Core -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - export default class ErrorObserver { - /** - * Will be called when the js runtime throws an exception which doesn't caught by user. -@@ -47,6 +56,16 @@ export default class ErrorObserver { - * @atomicservice - * @since 11 - */ -+ /** -+ * Will be called when the js runtime throws an exception which doesn't caught by user. -+ * -+ * @param { string } errMsg - the message and error stacktrace about the exception. -+ * @syscap SystemCapability.Ability.AbilityRuntime.Core -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - onUnhandledException(errMsg: string): void; - - /** -@@ -64,5 +83,15 @@ export default class ErrorObserver { - * @atomicservice - * @since 11 - */ -+ /** -+ * Will be called when the js runtime throws an exception which doesn't caught by user. -+ * -+ * @param { Error } errObject - the error object about the exception. -+ * @syscap SystemCapability.Ability.AbilityRuntime.Core -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - onException?(errObject: Error): void; - } -diff --git a/api/application/EventHub.d.ts b/api/application/EventHub.d.ts -index 09738ce0f..7dc88272b 100644 ---- a/api/application/EventHub.d.ts -+++ b/api/application/EventHub.d.ts -@@ -80,7 +80,8 @@ declare class EventHub { - * @stagemodelonly - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts{ '1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - on(event: string, callback: Function): void; - -@@ -118,7 +119,8 @@ declare class EventHub { - * @stagemodelonly - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts{ '1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - off(event: string, callback?: Function): void; - -@@ -159,6 +161,19 @@ declare class EventHub { - * @since 12 - */ - emit(event: string, ...args: Object[]): void; -+ -+ /** -+ * Trigger the event callbacks. -+ * -+ * @param { string } event - Indicates the event. -+ * @param { (Object|null|undefined)[] } args - Indicates the callback arguments. -+ * @syscap SystemCapability.Ability.AbilityRuntime.Core -+ * @stagemodelonly -+ * @crossplatform -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ emit(event: string, ...args: (Object|null|undefined)[]): void; - } - - export default EventHub; -\ No newline at end of file -diff --git a/api/application/ExtensionRunningInfo.d.ts b/api/application/ExtensionRunningInfo.d.ts -index 6c23c5536..7b6bdaaf4 100644 ---- a/api/application/ExtensionRunningInfo.d.ts -+++ b/api/application/ExtensionRunningInfo.d.ts -@@ -27,7 +27,8 @@ import bundle from '../@ohos.bundle.bundleManager'; - * @typedef ExtensionRunningInfo - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface ExtensionRunningInfo { - /** -@@ -35,7 +36,8 @@ export interface ExtensionRunningInfo { - * @default Indicates the extension of the extension info - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - extension: ElementName; - -@@ -44,7 +46,8 @@ export interface ExtensionRunningInfo { - * @default process id - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - pid: number; - -@@ -53,7 +56,8 @@ export interface ExtensionRunningInfo { - * @default user id - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - uid: number; - -@@ -62,7 +66,8 @@ export interface ExtensionRunningInfo { - * @default the name of the process - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - processName: string; - -@@ -71,7 +76,8 @@ export interface ExtensionRunningInfo { - * @default ability start time - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - startTime: number; - -@@ -80,7 +86,8 @@ export interface ExtensionRunningInfo { - * @default All package names under the current process - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - clientPackage: Array; - -@@ -89,7 +96,8 @@ export interface ExtensionRunningInfo { - * @default Enumerates types of the extension info - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - type: bundle.ExtensionAbilityType; - } -diff --git a/api/application/FormEditExtensionContext.d.ts b/api/application/FormEditExtensionContext.d.ts -index ff4e8be5e..c236f8d1a 100644 ---- a/api/application/FormEditExtensionContext.d.ts -+++ b/api/application/FormEditExtensionContext.d.ts -@@ -38,8 +38,6 @@ export default class FormEditExtensionContext extends UIExtensionContext { - * @param { Want } want - Including second extension ability name. - * @returns { Promise } Returns the result of start second form editor extension ability. - * @throws { BusinessError } 202 - The application is not a system application. -- * @throws { BusinessError } 401 - Params error. Possible causes: -- * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. - * @throws { BusinessError } 16500050 - An IPC connection error happened. - * @throws { BusinessError } 16500100 - Failed to obtain the configuration information. - * @throws { BusinessError } 16501000 - An internal functional error occurred. -diff --git a/api/application/LoopObserver.d.ts b/api/application/LoopObserver.d.ts -index 24f582f9d..9e3161620 100644 ---- a/api/application/LoopObserver.d.ts -+++ b/api/application/LoopObserver.d.ts -@@ -26,6 +26,16 @@ - * @atomicservice - * @since 12 - */ -+/** -+ * The observer will be called by system when application main thread loop -+ * execute timeout -+ * @interface LoopObserver -+ * @syscap SystemCapability.Ability.AbilityRuntime.Core -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - export interface LoopObserver { - /** - * Will be called when the application main thread loop execute timeout. -@@ -35,5 +45,15 @@ export interface LoopObserver { - * @atomicservice - * @since 12 - */ -+ /** -+ * Will be called when the application main thread loop execute timeout. -+ * -+ * @param { number } timeout - the actual executing time of loop event. -+ * @syscap SystemCapability.Ability.AbilityRuntime.Core -+ * @crossplatform -+ * @atomicservice -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ - onLoopTimeOut?(timeout: number): void; - } -diff --git a/api/application/ProcessData.d.ts b/api/application/ProcessData.d.ts -index 4a811f5dc..eb9818d60 100644 ---- a/api/application/ProcessData.d.ts -+++ b/api/application/ProcessData.d.ts -@@ -31,8 +31,7 @@ declare class ProcessData { - * - * @type { string } - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since arkts {'1.1':'14', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 14 - */ - bundleName: string; - -@@ -41,8 +40,7 @@ declare class ProcessData { - * - * @type { number } - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since arkts {'1.1':'14', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 14 - */ - pid: number; - -@@ -51,8 +49,7 @@ declare class ProcessData { - * - * @type { number } - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since arkts {'1.1':'14', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 14 - */ - uid: number; - -@@ -61,8 +58,7 @@ declare class ProcessData { - * - * @type { number } - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since arkts {'1.1':'14', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 14 - */ - state: number; - -@@ -71,8 +67,7 @@ declare class ProcessData { - * - * @type { boolean } - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since arkts {'1.1':'14', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 14 - */ - isContinuousTask: boolean; - -@@ -81,8 +76,7 @@ declare class ProcessData { - * - * @type { boolean } - * @syscap SystemCapability.Ability.AbilityRuntime.Core -- * @since arkts {'1.1':'14', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 14 - */ - isKeepAlive: boolean; - } -diff --git a/api/application/ProcessInformation.d.ts b/api/application/ProcessInformation.d.ts -index 4ffb3aabb..8a7320f66 100644 ---- a/api/application/ProcessInformation.d.ts -+++ b/api/application/ProcessInformation.d.ts -@@ -17,8 +17,12 @@ - * @file - * @kit AbilityKit - */ -- -+/*** if arkts 1.1 */ -+import type appManager from '../@ohos.app.ability.appManager'; -+/*** endif */ -+/*** if arkts 1.2 */ - import appManager from '../@ohos.app.ability.appManager'; -+/*** endif */ - import bundleManager from '../@ohos.bundle.bundleManager'; - - /** -diff --git a/api/application/RunningAppClone.d.ts b/api/application/RunningAppClone.d.ts -index b85dcbade..261cb1d15 100644 ---- a/api/application/RunningAppClone.d.ts -+++ b/api/application/RunningAppClone.d.ts -@@ -24,7 +24,8 @@ - * @typedef RunningAppClone - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface RunningAppClone { - /** -@@ -33,7 +34,8 @@ export interface RunningAppClone { - * @type { number } - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - appCloneIndex: number; - -@@ -43,7 +45,8 @@ export interface RunningAppClone { - * @type { number } - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - uid: number; - -@@ -53,7 +56,8 @@ export interface RunningAppClone { - * @type { Array } - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - pids: Array; - } -\ No newline at end of file -diff --git a/api/application/RunningMultiAppInfo.d.ts b/api/application/RunningMultiAppInfo.d.ts -index 780f16fec..f5732fa40 100644 ---- a/api/application/RunningMultiAppInfo.d.ts -+++ b/api/application/RunningMultiAppInfo.d.ts -@@ -18,10 +18,8 @@ - * @kit AbilityKit - */ - --/*** if arkts 1.1 */ - import { MultiAppMode } from './MultiAppMode'; - import { RunningAppClone } from './RunningAppClone'; --/*** endif */ - import { RunningMultiInstanceInfo } from './RunningMultiInstanceInfo'; - - /** -@@ -53,7 +51,8 @@ export interface RunningMultiAppInfo { - * @type { MultiAppMode } - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - mode: MultiAppMode; - -@@ -74,7 +73,8 @@ export interface RunningMultiAppInfo { - * @type { ?Array } - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - runningAppClones?: Array; - } -\ No newline at end of file -diff --git a/api/application/RunningMultiInstanceInfo.d.ts b/api/application/RunningMultiInstanceInfo.d.ts -index 1645db405..c64921df6 100644 ---- a/api/application/RunningMultiInstanceInfo.d.ts -+++ b/api/application/RunningMultiInstanceInfo.d.ts -@@ -45,7 +45,8 @@ export interface RunningMultiInstanceInfo { - * @type { number } - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - uid: number; - -@@ -55,7 +56,8 @@ export interface RunningMultiInstanceInfo { - * @type { Array } - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - pids: Array; - } -\ No newline at end of file -diff --git a/api/application/ServiceExtensionContext.d.ts b/api/application/ServiceExtensionContext.d.ts -index 30b639fa6..30e64a1ff 100644 ---- a/api/application/ServiceExtensionContext.d.ts -+++ b/api/application/ServiceExtensionContext.d.ts -@@ -1614,7 +1614,8 @@ declare class ServiceExtensionContext extends ExtensionContext { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi - * @stagemodelonly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - stopServiceExtensionAbility(want: Want, callback: AsyncCallback): void; - -@@ -1662,7 +1663,8 @@ declare class ServiceExtensionContext extends ExtensionContext { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @systemapi - * @stagemodelonly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - stopServiceExtensionAbility(want: Want): Promise; - -diff --git a/api/application/UIAbilityContext.d.ts b/api/application/UIAbilityContext.d.ts -index 14016ac66..2c4f3ce3f 100644 ---- a/api/application/UIAbilityContext.d.ts -+++ b/api/application/UIAbilityContext.d.ts -@@ -30,16 +30,18 @@ import { ConnectOptions } from '../ability/connectOptions'; - import { HapModuleInfo } from '../bundleManager/HapModuleInfo'; - import OpenLinkOptions from '../@ohos.app.ability.OpenLinkOptions'; - import { Caller } from '../@ohos.app.ability.UIAbility'; -+import type ConfigurationConstant from '../@ohos.app.ability.ConfigurationConstant'; - /*** if arkts 1.1 */ - import image from '../@ohos.multimedia.image'; - import dialogRequest from '../@ohos.app.ability.dialogRequest'; - import AbilityConstant from '../@ohos.app.ability.AbilityConstant'; - import type AtomicServiceOptions from '../@ohos.app.ability.AtomicServiceOptions'; --import type ConfigurationConstant from '../@ohos.app.ability.ConfigurationConstant'; - import type UIServiceProxy from './UIServiceProxy'; - import type UIServiceExtensionConnectCallback from './UIServiceExtensionConnectCallback'; - /*** endif */ -- -+/*** if arkts 1.2 */ -+import { LocalStorage } from '@ohos.arkui.stateManagement'; -+/*** endif */ - /** - * The context of an ability. It allows access to ability-specific resources. - * -@@ -3560,7 +3562,8 @@ declare class UIAbilityContext extends Context { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly - * @atomicservice -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - backToCallerAbilityWithResult(abilityResult: AbilityResult, requestCode: string): Promise; - -@@ -3604,7 +3607,8 @@ declare class UIAbilityContext extends Context { - * @throws { BusinessError } 16000055 - Installation-free timed out. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - connectServiceExtensionAbility(want: Want, options: ConnectOptions): number; - -@@ -3670,7 +3674,8 @@ declare class UIAbilityContext extends Context { - * @throws { BusinessError } 16000050 - Internal error. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - disconnectServiceExtensionAbility(connection: number, callback: AsyncCallback): void; - -@@ -3684,7 +3689,8 @@ declare class UIAbilityContext extends Context { - * @throws { BusinessError } 16000050 - Internal error. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - disconnectServiceExtensionAbility(connection: number): Promise; - -@@ -3711,7 +3717,8 @@ declare class UIAbilityContext extends Context { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setMissionLabel(label: string, callback: AsyncCallback): void; - -@@ -3738,7 +3745,8 @@ declare class UIAbilityContext extends Context { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setMissionLabel(label: string): Promise; - -@@ -3875,7 +3883,8 @@ declare class UIAbilityContext extends Context { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - restoreWindowStage(localStorage: LocalStorage): void; - -@@ -4499,8 +4508,7 @@ declare class UIAbilityContext extends Context { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - startAbilityByType(type: string, wantParam: Record, - abilityStartCallback: AbilityStartCallback, callback: AsyncCallback): void; -@@ -4541,8 +4549,7 @@ declare class UIAbilityContext extends Context { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - startAbilityByType(type: string, wantParam: Record, - abilityStartCallback: AbilityStartCallback): Promise; -@@ -4817,7 +4824,8 @@ declare class UIAbilityContext extends Context { - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setColorMode(colorMode: ConfigurationConstant.ColorMode): void; - } -diff --git a/api/application/UIExtensionContext.d.ts b/api/application/UIExtensionContext.d.ts -index c2a8a7ac9..b49c53b66 100755 ---- a/api/application/UIExtensionContext.d.ts -+++ b/api/application/UIExtensionContext.d.ts -@@ -21,7 +21,6 @@ - /*** if arkts 1.1 */ - import type { AbilityResult } from '../ability/abilityResult'; - import type { ConnectOptions } from '../ability/connectOptions'; --import type ConfigurationConstant from '../@ohos.app.ability.ConfigurationConstant'; - import type AtomicServiceOptions from '../@ohos.app.ability.AtomicServiceOptions'; - import OpenLinkOptions from '../@ohos.app.ability.OpenLinkOptions'; - import type UIServiceProxy from './UIServiceProxy'; -@@ -31,6 +30,7 @@ import type UIServiceExtensionConnectCallback from './UIServiceExtensionConnectC - import { ConnectOptions } from '../ability/connectOptions'; - import { AbilityResult } from '../ability/abilityResult'; - /*** endif */ -+import type ConfigurationConstant from '../@ohos.app.ability.ConfigurationConstant'; - import type { AsyncCallback } from '../@ohos.base'; - import ExtensionContext from './ExtensionContext'; - import type Want from '../@ohos.app.ability.Want'; -@@ -528,7 +528,8 @@ declare class UIExtensionContext extends ExtensionContext { - * @throws { BusinessError } 16200001 - The caller has been released. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - startAbilityForResult(want: Want, callback: AsyncCallback): void; - -@@ -637,7 +638,8 @@ declare class UIExtensionContext extends ExtensionContext { - * @throws { BusinessError } 16200001 - The caller has been released. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - startAbilityForResult(want: Want, options: StartOptions, callback: AsyncCallback): void; - -@@ -752,7 +754,8 @@ declare class UIExtensionContext extends ExtensionContext { - * @throws { BusinessError } 16200001 - The caller has been released. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly -- * @since 14 -+ * @since arkts {'1.1':'14', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - startAbilityForResult(want: Want, options?: StartOptions): Promise; - -@@ -840,7 +843,8 @@ declare class UIExtensionContext extends ExtensionContext { - * @throws { BusinessError } 16000070 - The extension cannot start the service. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - connectServiceExtensionAbility(want: Want, options: ConnectOptions): number; - -@@ -854,7 +858,8 @@ declare class UIExtensionContext extends ExtensionContext { - * @throws { BusinessError } 16000050 - Internal error. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - disconnectServiceExtensionAbility(connection: number, callback: AsyncCallback): void; - -@@ -868,7 +873,8 @@ declare class UIExtensionContext extends ExtensionContext { - * @throws { BusinessError } 16000050 - Internal error. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - disconnectServiceExtensionAbility(connection: number): Promise; - -@@ -880,7 +886,8 @@ declare class UIExtensionContext extends ExtensionContext { - * @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 - */ - reportDrawnCompleted(callback: AsyncCallback): void; - -@@ -1113,7 +1120,8 @@ declare class UIExtensionContext extends ExtensionContext { - * @throws { BusinessError } 16000011 - The context does not exist. - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setColorMode(colorMode: ConfigurationConstant.ColorMode): void; - } -diff --git a/api/application/ViewData.d.ts b/api/application/ViewData.d.ts -index 010ded1ba..e12e73372 100644 ---- a/api/application/ViewData.d.ts -+++ b/api/application/ViewData.d.ts -@@ -17,10 +17,8 @@ - * @file - * @kit AbilityKit - */ -- --import PageNodeInfo from './PageNodeInfo'; --import AutoFillRect from './AutoFillRect'; -- -+import type PageNodeInfo from './PageNodeInfo'; -+import type AutoFillRect from './AutoFillRect'; - /** - * View data for automatic filling. - * -diff --git a/api/application/WorkSchedulerExtensionContext.d.ts b/api/application/WorkSchedulerExtensionContext.d.ts -index 094e08daf..e998f96c0 100644 ---- a/api/application/WorkSchedulerExtensionContext.d.ts -+++ b/api/application/WorkSchedulerExtensionContext.d.ts -@@ -28,7 +28,8 @@ import type Want from '../@ohos.app.ability.Want'; - * @extends ExtensionContext - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @StageModelOnly -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export default class WorkSchedulerExtensionContext extends ExtensionContext { - /** -@@ -58,7 +59,8 @@ export default class WorkSchedulerExtensionContext extends ExtensionContext { - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @systemapi - * @stagemodelonly -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - startServiceExtensionAbility(want: Want): Promise; - -@@ -86,7 +88,8 @@ export default class WorkSchedulerExtensionContext extends ExtensionContext { - * @syscap SystemCapability.ResourceSchedule.WorkScheduler - * @systemapi - * @stagemodelonly -- * @since 13 -+ * @since arkts {'1.1':'13','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - stopServiceExtensionAbility(want: Want): Promise; - } -diff --git a/api/arkui/AttributeUpdater.d.ts b/api/arkui/AttributeUpdater.d.ts -index c67d24245..749b995ed 100644 ---- a/api/arkui/AttributeUpdater.d.ts -+++ b/api/arkui/AttributeUpdater.d.ts -@@ -28,7 +28,7 @@ - * @atomicservice - * @since 12 - */ --export type Initializer = () => T; -+declare type Initializer = () => T; - - /** - * Defines a modifier which can update attributes to native side. -diff --git a/api/arkui/BuilderNode.d.ts b/api/arkui/BuilderNode.d.ts -index 768c24322..0f2af0027 100644 ---- a/api/arkui/BuilderNode.d.ts -+++ b/api/arkui/BuilderNode.d.ts -@@ -22,7 +22,8 @@ import { UIContext } from '../@ohos.arkui.UIContext'; - import { FrameNode } from './FrameNode'; - import { Size } from './Graphics'; - /*** if arkts 1.2 */ --import { WrappedBuilder, TouchEvent} from './component/common'; -+import { TouchEvent } from './component/common'; -+import { WrappedBuilder, CustomBuilder, CustomBuilderT } from './component/builder'; - /*** endif */ - - /** -@@ -204,16 +205,7 @@ export interface BuildOptions { - * @atomicservice - * @since 12 - */ --/** -- * Defines BuilderNode. -- * -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.1&1.2 -- */ --export declare class BuilderNode { -+export class BuilderNode { - /** - * Constructor. - * -@@ -231,8 +223,7 @@ export declare class BuilderNode { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - constructor(uiContext: UIContext, options?: RenderOptions); - -@@ -253,8 +244,7 @@ export declare class BuilderNode { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - build(builder: WrappedBuilder, arg?: Object): void; - -@@ -267,8 +257,7 @@ export declare class BuilderNode { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - build(builder: WrappedBuilder, arg: Object, options: BuildOptions): void; - -@@ -287,8 +276,7 @@ export declare class BuilderNode { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - update(arg: Object): void; - -@@ -307,8 +295,7 @@ export declare class BuilderNode { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - getFrameNode(): FrameNode | null; - -@@ -329,8 +316,7 @@ export declare class BuilderNode { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - postTouchEvent(event: TouchEvent): boolean; - -@@ -340,8 +326,7 @@ export declare class BuilderNode { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - dispose(): void; - -@@ -352,8 +337,7 @@ export declare class BuilderNode { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - reuse(param?: Object): void; - -@@ -363,8 +347,7 @@ export declare class BuilderNode { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 - */ - recycle(): void; - -@@ -374,8 +357,152 @@ export declare class BuilderNode { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 12 -+ */ -+ updateConfiguration(): void; -+} -+ -+/** -+ * Defines BuilderNode. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+export declare class BuilderNode { -+ /** -+ * Constructor. -+ * -+ * @param { UIContext } uiContext - uiContext used to create the BuilderNode -+ * @param { RenderOptions } [options] - Render options of the Builder Node -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ constructor(uiContext: UIContext, options?: RenderOptions); -+ -+ /** -+ * Build the BuilderNode with the builder. -+ * -+ * @param { WrappedBuilder } builder - Defined the builder will be called to build the node. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ build(builder: WrappedBuilder): void; -+ -+ /** -+ * Build the BuilderNode with the builder. -+ * -+ * @param { WrappedBuilder> } builder - Defined the builder will be called to build the node. -+ * @param { T } arg - Defined the args will be used in the builder. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ build(builder: WrappedBuilder>, arg: T): void; -+ -+ /** -+ * Build the BuilderNode with the builder.Support the type that WrappedBuilder contains builder used different params. -+ * -+ * @param { WrappedBuilder> } builder - Defined the builder will be called to build the node. -+ * @param { T } arg - Defined the args will be used in the builder. -+ * @param { BuildOptions } options - Defined the options will be used when build. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ build(builder: WrappedBuilder>, arg: T, options: BuildOptions): void; -+ -+ /** -+ * Update the BuilderNode based on the provided parameters. -+ * -+ * @param { T } arg - Parameters used to update the BuilderNode, which must match the types required by the builder bound to the BuilderNode. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ update(arg: T): void; -+ -+ /** -+ * Get the FrameNode in BuilderNode. -+ * -+ * @returns { FrameNode | null } - Returns a FrameNode inside the BuilderNode, or null if not contained. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ getFrameNode(): FrameNode | null; -+ -+ /** -+ * Dispatch touchEvent to targetNode. -+ * -+ * @param { TouchEvent } event - The touchEvent which will be sent to the targetNode. -+ * @returns { boolean } - Returns true if the TouchEvent has been successfully posted to the targetNode, false otherwise. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ postTouchEvent(event: TouchEvent): boolean; -+ -+ /** -+ * Dispose the BuilderNode immediately. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ dispose(): void; -+ -+ /** -+ * Reuse the BuilderNode based on the provided parameters. -+ * -+ * @param { Record } [param] - Parameters for reusing BuilderNode. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ reuse(param?: Record): void; -+ -+ /** -+ * Recycle the BuilderNode. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ recycle(): void; -+ -+ /** -+ * Notify BuilderNode to update the configuration to trigger a reload of the BuilderNode. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 - */ -- updateConfiguration(): void; -+ updateConfiguration(): void; - } -diff --git a/api/arkui/ComponentContent.d.ts b/api/arkui/ComponentContent.d.ts -index 88fe8a0b2..9d0396417 100644 ---- a/api/arkui/ComponentContent.d.ts -+++ b/api/arkui/ComponentContent.d.ts -@@ -29,7 +29,7 @@ import { WrappedBuilder } from 'wrappedBuilderObject'; - import { BuildOptions } from './BuilderNode'; - import { Content } from './Content'; - import { UIContext } from '../@ohos.arkui.UIContext'; --import { WrappedBuilder } from './component/common'; -+import { WrappedBuilder, CustomBuilder, CustomBuilderT } from './component/builder'; - /*** endif */ - - /** -@@ -41,7 +41,7 @@ import { WrappedBuilder } from './component/common'; - * @atomicservice - * @since 12 - */ --export class ComponentContent extends Content{ -+export class ComponentContent extends Content { - /** - * Constructor. - * -@@ -135,7 +135,6 @@ export class ComponentContent extends Content{ - updateConfiguration(): void; - } - --/*** if arkts 1.2 */ - /** - * Defines ComponentContent. - * -@@ -146,25 +145,25 @@ export class ComponentContent extends Content{ - * @since 20 - * @arkts 1.2 - */ --export declare class ComponentContent extends Content { -+export declare class ComponentContent extends Content { - /** - * Constructor. - * - * @param { UIContext } uiContext - uiContext used to create the ComponentContent -- * @param { WrappedBuilder> } builder - Defined the builder will be called to build ComponentContent. -+ * @param { WrappedBuilder } builder - Defined the builder will be called to build ComponentContent. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ -- constructor(uiContext: UIContext, builder: WrappedBuilder>); -+ constructor(uiContext: UIContext, builder: WrappedBuilder); - - /** - * Constructor. - * - * @param { UIContext } uiContext - uiContext used to create the ComponentContent -- * @param { WrappedBuilder> } builder - Defined the builder will be called to build ComponentContent. -+ * @param { WrappedBuilder> } builder - Defined the builder will be called to build ComponentContent. - * @param { T } args - Parameters used to update the ComponentContent. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform -@@ -172,13 +171,13 @@ export declare class ComponentContent extends Content - * @since 20 - * @arkts 1.2 - */ -- constructor(uiContext: UIContext, builder: WrappedBuilder>, args: T); -+ constructor(uiContext: UIContext, builder: WrappedBuilder>, args: T); - - /** - * Constructor. - * - * @param { UIContext } uiContext - uiContext used to create the ComponentContent -- * @param { WrappedBuilder> } builder - Defined the builder will be called to build ComponentContent. -+ * @param { WrappedBuilder> } builder - Defined the builder will be called to build ComponentContent. - * @param { T } args - Parameters used to update the ComponentContent. - * @param { BuildOptions } options - Defined the options will be used when build. - * @syscap SystemCapability.ArkUI.ArkUI.Full -@@ -187,8 +186,7 @@ export declare class ComponentContent extends Content - * @since 20 - * @arkts 1.2 - */ -- constructor(uiContext: UIContext, builder: WrappedBuilder>, args: T, options: BuildOptions); -- -+ constructor(uiContext: UIContext, builder: WrappedBuilder>, args: T, options: BuildOptions); - - /** - * Update the ComponentContent based on the provided parameters. -@@ -205,14 +203,14 @@ export declare class ComponentContent extends Content - /** - * Reuse the ComponentContent based on the provided parameters. - * -- * @param { Object } [param] - Parameters for reusing ComponentContent. -+ * @param { Record } [param] - Parameters for reusing ComponentContent. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ -- reuse(param?: Object): void; -+ reuse(param?: Record): void; - - /** - * Recycle the ComponentContent. -@@ -247,4 +245,3 @@ export declare class ComponentContent extends Content - */ - updateConfiguration(): void; - } --/*** endif */ -\ No newline at end of file -diff --git a/api/arkui/FrameNode.d.ts b/api/arkui/FrameNode.d.ts -index cbc125790..2fc0e0f33 100644 ---- a/api/arkui/FrameNode.d.ts -+++ b/api/arkui/FrameNode.d.ts -@@ -37,8 +37,7 @@ import { ListOptions, ListAttribute } from './component/list' - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts { '1.1':'12','1.2':'20' } -- * @arkts 1.1&1.2 -+ * @since 12 - */ - /** - * Layout constraint, include the max size, the min size and the reference size for children to calculate percent. -@@ -969,15 +968,14 @@ export declare abstract class TypedFrameNode extends FrameNode { - /** - * Get attribute instance of FrameNode to set attributes. - * -- * @type { T } -- * @readonly -+ * @returns { T } - Returns the attribute instance of FrameNode. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ -- readonly attribute: T; -+ get attribute(): T; - } - - /** -@@ -2029,8 +2027,7 @@ export declare namespace typeNode { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts { '1.1':'12','1.2':'20' } -- * @arkts 1.1&1.2 -+ * @since 12 - */ - /** - * Used for lazy loading of typeNode. -diff --git a/api/arkui/Graphics.d.ts b/api/arkui/Graphics.d.ts -index fe6833011..c10e0a424 100644 ---- a/api/arkui/Graphics.d.ts -+++ b/api/arkui/Graphics.d.ts -@@ -679,10 +679,19 @@ export interface Edges { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'12','1.2':'20'} -+ * @since 12 -+ */ -+/** -+ * Defines the Length Unit. -+ * -+ * @enum { number } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ --declare enum LengthUnit { -+export declare enum LengthUnit { - /** - * Logical pixel used in Ace1.0. It's based on frontend design width. - * For example, when a frontend with 750px design width running on a -diff --git a/api/arkui/NodeController.d.ts b/api/arkui/NodeController.d.ts -index 98fda7d36..f43c7de24 100644 ---- a/api/arkui/NodeController.d.ts -+++ b/api/arkui/NodeController.d.ts -@@ -181,7 +181,8 @@ export declare abstract class NodeController { - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice -- * @since 12 -+ * @since arkts{'1.1':'12','1.2':'20'} -+ * @arkts 1.1&1.2 - */ - rebuild(): void; - -diff --git a/api/arkui/stateManagement/decorators/decoratorLink.d.ets b/api/arkui/component/animation.d.ets -similarity index 60% -rename from api/arkui/stateManagement/decorators/decoratorLink.d.ets -rename to api/arkui/component/animation.d.ets -index 5d65d77da..fba0dc459 100644 ---- a/api/arkui/stateManagement/decorators/decoratorLink.d.ets -+++ b/api/arkui/component/animation.d.ets -@@ -18,12 +18,5 @@ - * @arkts 1.2 - */ - --import { DecoratedV1VariableBase, IDecoratedMutableVariable } from '../base/decoratorBase'; --import { WatchFuncType } from './decoratorWatch'; -- --export declare class LinkDecoratedVariable extends DecoratedV1VariableBase -- implements IDecoratedMutableVariable { -- public constructor(varName: string, source: DecoratedV1VariableBase, watchFunc?: WatchFuncType) -- public get(): T -- public set(newValue: T): void --} -\ No newline at end of file -+@Retention({policy: "SOURCE"}) -+export declare @interface AnimatableExtend {} -diff --git a/api/arkui/component/builder.d.ets b/api/arkui/component/builder.d.ets -old mode 100644 -new mode 100755 -index 9f1bb60f0..fcebce52e ---- a/api/arkui/component/builder.d.ets -+++ b/api/arkui/component/builder.d.ets -@@ -17,30 +17,96 @@ - * @kit ArkUI - * @arkts 1.2 - */ -- -+ - import { memo, ComponentBuilder, __memo_context_type, __memo_id_type } from "../stateManagement/runtime"; - -+/** -+ * Defines Builder Annotation. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface Builder {} -+ -+/** -+ * Defines BuilderParam Annotation. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface BuilderParam {} -+ - /** - * Defines the CustomBuilder Type. - * -- * @typedef { @memo (() => void) } CustomBuilder -+ * @typedef { @Builder (() => void) } CustomBuilder - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @form - * @atomicservice - * @since 20 - */ --export type CustomBuilder = @memo (() => void); -+export type CustomBuilder = @Builder (() => void); - -+/** -+ * Defines the CustomBuilder Type. -+ * -+ * @typedef { @Builder ((t:T) => void) } CustomBuilderT -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @form -+ * @atomicservice -+ * @since 20 -+ */ -+export type CustomBuilderT = @Builder ((t: T) => void); - - /** - * Defines the PageMapBuilder Type. - * -- * @typedef { @memo ((name: string, param: Object | null | undefined) => void) } PageMapBuilder -+ * @typedef { @Builder ((name: string, param: Object | null | undefined) => void) } PageMapBuilder - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @form - * @atomicservice - * @since 20 - */ --export type PageMapBuilder = @memo ((name: string, param: Object | null | undefined) => void) -\ No newline at end of file -+export type PageMapBuilder = @Builder ((name: string, param: Object | null | undefined) => void) -+ -+/** -+ * Defining wrapBuilder function. -+ * @param { function } builder -+ * @returns { WrappedBuilder } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare function wrapBuilder(builder: T): WrappedBuilder; -+ -+/** -+ * Defines the WrappedBuilder class. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare class WrappedBuilder { -+ -+ /** -+ * @type { function } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ @Builder public builder: T; -+ -+ /** -+ * @param { function } builder -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ public constructor(builder: T); -+} -diff --git a/api/arkui/component/customComponent.d.ets b/api/arkui/component/customComponent.d.ets -index 62cd26fdf..cfd065cf4 100755 ---- a/api/arkui/component/customComponent.d.ets -+++ b/api/arkui/component/customComponent.d.ets -@@ -18,73 +18,381 @@ - * @arkts 1.2 - */ - -- -- - import { memo, ComponentBuilder, __memo_context_type, __memo_id_type } from "../stateManagement/runtime"; -+import { ExtendableComponent } from './extendableComponent'; -+import { GeometryInfo, Layoutable, Measurable, SizeResult } from './common' -+import { ConstraintSizeOptions } from './units' -+import { Builder } from './builder' -+import { LocalStorage } from './../stateManagement/storage/localStorage'; - --import { UIContext } from './../../../api/@ohos.arkui.UIContext' --import { WatchFuncType } from '../stateManagement/decorators/decoratorWatch' --import { ProvideDecoratedVariable } from '../stateManagement/decorators/decoratorProvide' --import { ConsumeDecoratedVariable } from '../stateManagement/decorators/decoratorConsume' -+/** -+ * Defines Entry Annotation. -+ * -+ * Entry is an Annotation and it supports parameters. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export @interface Entry { -+ /** -+ * Named route name. -+ * -+ * @type { string } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @atomicservice -+ * @since 20 -+ */ -+ routeName: string = ""; - -+ /** -+ * Name of the function which returns LocalStorage instance. -+ * -+ * @type { string } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @atomicservice -+ * @since 20 -+ */ -+ storage: string = ""; - -+ /** -+ * Determines whether to use the LocalStorage instance object returned by UIContext.getSharedLocalStorage() interface. -+ * -+ * @type { boolean } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ useSharedStorage: boolean = false; -+} - -+/** -+ * Defining Component Annotation -+ * -+ * Component is an Annotation to define a custom component using state management V1. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ - @Retention({policy: "SOURCE"}) --export declare @interface Component { -- freezeWhenInactive: boolean = false; --} -+export @interface Component {} -+ -+/** -+ * Defining ComponentV2 Annotation -+ * -+ * ComponentV2 is an Annotation to define a custom component using state management V2. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export @interface ComponentV2 {} - -+/** -+ * Defining Reusable Annotation that is used to decorate @Component. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ - @Retention({policy: "SOURCE"}) --export declare @interface Builder {} -+export @interface Reusable {} - -+/** -+ * Defining ReusableV2 Annotation that is used to decorate @ComponentV2. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ - @Retention({policy: "SOURCE"}) --export declare @interface BuilderParam {} -+export @interface ReusableV2 {} - -+/** -+ * Defining CustomLayout Annotation that is used to decorate @Component and @ComponentV2. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ - @Retention({policy: "SOURCE"}) --export declare @interface Entry { -- routeName: string = ""; -- storage: string = ""; -- useSharedStorage: boolean = false; --} -+export @interface CustomLayout {} - -+/** -+ * Defining CustomDialog Annotation -+ * -+ * CustomDialog is an Annotation to define a custom dialog. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ - @Retention({policy: "SOURCE"}) --export declare @interface Reusable {} -+export @interface CustomDialog {} - --export interface CustomBuild { -- @memo -- build(): void; -+/** -+ * Definition of base custom dialog class. -+ * -+ * @extends ExtendableComponent -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+export declare abstract class BaseCustomDialog, T_Options> extends ExtendableComponent { -+ /** -+ * Constructor to use to create a custom dialog instance. -+ * @param {boolean} [useSharedStorage] - determine whether to use the LocalStorage instance object returned by UIContext.getSharedLocalStorage() interface. -+ * @param {LocalStorage} [storage] - localStorage instance. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ constructor(useSharedStorage?: boolean, storage?: LocalStorage); -+ -+ /** -+ * Define the constructor of custom dialog -+ * -+ * @param { () => T } factory - factory to create instance of custom dialog -+ * @param { T_Options } initializers - initial data for all the fields in custom dialog -+ * @param { @Builder () => void } content - tail closure for custom dialog -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ @ComponentBuilder -+ static $_instantiate( -+ factory: () => T, -+ initializers?: T_Options, -+ @Builder content?: () => void -+ ): T -+} -+ -+/** -+ * Definition of base custom component, which is base class of custom component. -+ * -+ * @extends ExtendableComponent -+ * @implements CommonAttribute -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+export declare abstract class BaseCustomComponent extends ExtendableComponent { -+ /** -+ * aboutToRecycle Method. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ aboutToRecycle(): void; - } - --export interface CustomLayout { -+/** -+ * Definition of custom component class. -+ * -+ * @extends BaseCustomComponent -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+export declare abstract class CustomComponent, T_Options> extends BaseCustomComponent { -+ /** -+ * Constructor to use to create a customComponent instance. -+ * @param {boolean} [useSharedStorage] - determine whether to use the LocalStorage instance object returned by UIContext.getSharedLocalStorage() interface. -+ * @param {LocalStorage} [storage] - localStorage instance. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ constructor(useSharedStorage?: boolean, storage?: LocalStorage); -+ -+ /** -+ * Define the constructor of custom component -+ * -+ * @param { () => T } factory - factory to create instance of custom component -+ * @param { T_Options } initializers - initial data for all the fields in custom component -+ * @param { string } reuseId - reuse id for reusable. Only valid if custom component decorated with @Reusable -+ * @param { @Builder () => void } content - tail closure for custom component -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ @ComponentBuilder -+ static $_instantiate( -+ factory: () => T, -+ initializers?: T_Options, -+ reuseId?: string, -+ @Builder content?: () => void -+ ): T - -+ /** -+ * aboutToReuse Method -+ * -+ * @param { Record } params - Custom component init params. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ aboutToReuse(params: Record): void; - } - --export declare abstract class CustomComponent, T_Options> { -- public addProvidedVar(varName: string, providedPropName: string, initValue: T, allowOverride: boolean = false, watchFunc?: WatchFuncType): ProvideDecoratedVariable; -- public initConsume(varName: string, providedPropName: string, watchFunc?: WatchFuncType): ConsumeDecoratedVariable; -- @memo -+/** -+ * Definition of V2 custom component class. -+ * -+ * @extends BaseCustomComponent -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+export declare abstract class CustomComponentV2, T_Options> extends BaseCustomComponent { -+ /** -+ * Define the constructor of custom component -+ * -+ * @param { () => T } factory - factory to create instance of custom component -+ * @param { T_Options } initializers - initial data for all the fields in custom component -+ * @param { string } reuseId - reuse id for reusable. Only valid if custom component decorated with @Reusable -+ * @param { @Builder () => void } content - tail closure for custom component -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ - @ComponentBuilder -- static $_instantiate, S_Options>( -- factory: () => S, -- initializers?: S_Options, -- @memo -- content?: () => void, -- reuseKey?: string -- ): S; -- -- // Life cycle for custom component -- aboutToAppear(): void -- aboutToDisappear(): void -- onDidBuild(): void -- -- onPageShow(): void -- onPageHide(): void -- onBackPress(): boolean -- getUIContext(): UIContext -- -- @memo -- build(): void; -- -- aboutToReuse(): void -- aboutToRecycle(): void --} -\ No newline at end of file -+ static $_instantiate( -+ factory: () => T, -+ initializers?: T_Options, -+ reuseId?: string, -+ @Builder content?: () => void -+ ): T -+ -+ /** -+ * aboutToReuse Method -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ aboutToReuse(): void; -+} -+ -+/** -+ * Defining interface of PageLifeCycle for custom component, when decorate with @Entry. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+export interface PageLifeCycle { -+ /** -+ * onPageShow Method. -+ * -+ * The page is triggered once each time it is displayed, including scenarios such as the routing process and the application entering the foreground -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ onPageShow(): void {} -+ -+ /** -+ * onPageHide Method. -+ * -+ * It is triggered once each time the page is hidden, including scenarios such as the routing process and the application entering the background -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ onPageHide(): void {} -+ -+ /** -+ * onBackPress Method. -+ * -+ * Triggered when the user clicks the back button -+ * -+ * @returns { boolean } true means that the page itself processes the return logic. -+ * false means that the default return logic is used. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ onBackPress(): boolean { return false } -+ -+ /** -+ * PageTransition Method. -+ * Implement Animation when enter this page or move to other pages. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ pageTransition(): void {} -+ -+ /** -+ * Triggered when the Entry custom component has been pushed with singleton mode. -+ * -+ * @param { object | undefined | null } param - New parameters pushed with singleton mode. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ onNewParam(param: object | undefined | null): void {} -+} -+ -+/** -+ * Defining interface of LayoutCallback for custom component, when decorate with @Layoutable. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+export interface LayoutCallback { -+ /** -+ * Custom component override this method to layout each of its sub components. -+ * -+ * @param { GeometryInfo } selfLayoutInfo -+ * @param { Array } children -+ * @param { ConstraintSizeOptions } constraint -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ onPlaceChildren(selfLayoutInfo: GeometryInfo, children: Array, constraint: ConstraintSizeOptions): void {} -+ -+ /** -+ * Custom component override this method to measure each of its sub components. -+ * @param { GeometryInfo } selfLayoutInfo -+ * @param { Array } children - indicate the measure child -+ * @param { ConstraintSizeOptions } constraint - indicate child constraint size -+ * @returns { SizeResult } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ onMeasureSize(selfLayoutInfo: GeometryInfo, children: Array, constraint: ConstraintSizeOptions): SizeResult { -+ return {width: 0, height: 0} as SizeResult -+ } -+} -diff --git a/api/arkui/component/extendableComponent.d.ets b/api/arkui/component/extendableComponent.d.ets -new file mode 100644 -index 000000000..ae28068b4 ---- /dev/null -+++ b/api/arkui/component/extendableComponent.d.ets -@@ -0,0 +1,113 @@ -+/* -+ * Copyright (C) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+/** -+ * @file -+ * @kit ArkUI -+ * @arkts 1.2 -+ */ -+ -+import { UIContext } from '@ohos.arkui.UIContext' -+import { Builder } from './builder' -+ -+/** -+ * Defining interface of LifeCycle for custom component and custom dialog -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+export interface LifeCycle { -+ /** -+ * aboutToAppear Method. -+ * -+ * The aboutToAppear function is executed after a new instance of the custom component is created, -+ * before its build() function is executed. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ aboutToAppear(): void {} -+ -+ /** -+ * aboutToDisappear Method. -+ * -+ * The aboutToDisappear function executes before a custom component is destroyed. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ aboutToDisappear(): void {} -+ -+ /** -+ * The callback method after the custom component is built. -+ * -+ * Triggered when the custom component has been built. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ onDidBuild(): void {} -+ -+ /** -+ * Customize the build process of the custom component. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ @Builder -+ build(): void -+} -+ -+/** -+ * Definition of extendable component, which is base class of custom component and custom dialog. -+ * -+ * @implements LifeCycle -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+export declare abstract class ExtendableComponent implements LifeCycle { -+ /** -+ * Get current UIContext. -+ * -+ * @returns { UIContext } The UIContext that the custom component belongs to. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ getUIContext(): UIContext -+ -+ /** -+ * Get uniqueId of the custom component. -+ * -+ * @returns { int } - The uniqueId of the custom component. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ */ -+ getUniqueId(): int -+} -\ No newline at end of file -diff --git a/api/arkui/component/interop.d.ets b/api/arkui/component/interop.d.ets -index b7d49b051..a576e7f18 100644 ---- a/api/arkui/component/interop.d.ets -+++ b/api/arkui/component/interop.d.ets -@@ -1,10 +1,10 @@ - /* -- * Copyright (C) 2025 Huawei Device Co., Ltd. -+ * Copyright (c) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * -- * http://www.apache.org/licenses/LICENSE-2.0 -+ * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, -@@ -18,16 +18,98 @@ - * @arkts 1.2 - */ - -+import { Builder } from './builder'; -+import { ExtendableComponent } from './extendableComponent'; -+import { IDecoratedV1Variable } from '../stateManagement/decorator'; - --import { memo, __memo_context_type, __memo_id_type } from '../stateManagement/runtime'; -+/** -+ * Defines the info of compatible custom component. -+ * -+ * @typedef CompatibleComponentInfo -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export interface CompatibleComponentInfo { -+ /** -+ * the name of compatible custom component -+ * -+ * @type { string } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ name: string; - --export interface InteropComponent { -- name: string, -- component: Object -+ /** -+ * the compatible custom component -+ * -+ * @type { ESValue } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ component: ESValue; - } - --@memo --export declare function ArkUICompatible( -- init: () => InteropComponent, -- update: (elmtId: number, instance: ESObject) => void --): void -\ No newline at end of file -+/** -+ * Defines the callback for initializing compatible custom component. -+ * -+ * @typedef { function } CompatibleInitCallback -+ * @returns { CompatibleComponentInfo } the info of compatible custom component -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export type CompatibleInitCallback = () => CompatibleComponentInfo; -+ -+/** -+ * Defines the callback for updating compatible custom component. -+ * -+ * @typedef { function } CompatibleUpdateCallback -+ * @param { ESValue } component - the compatible custom component -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export type CompatibleUpdateCallback = (component: ESValue) => void; -+ -+/** -+ * Obtains the compatible custom component. -+ * -+ * @param { CompatibleInitCallback } init - the callback for initializing compatible custom component -+ * @param { CompatibleUpdateCallback } update - the callback for updating compatible custom component -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Builder -+export declare function compatibleComponent( -+ init: CompatibleInitCallback, -+ update: CompatibleUpdateCallback -+): void; -+ -+/** -+ * Binds the callback for obtaining the provide's compatible state with compatible custom component. -+ * -+ * @param { ExtendableComponent } component - the custom component -+ * @param { ESValue } createCompatibleState - the callback for creating compatible state -+ * @param { ESValue } setCallback - set the callback for binding the provide's compatible state -+ * @param { ESValue } [compatibleComponent] - the compatible custom component -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare function bindCompatibleProvideCallback( -+ component: ExtendableComponent, -+ createCompatibleState: ESValue, -+ setCallback: ESValue, -+ compatibleComponent?: ESValue -+): void; -+ -+/** -+ * Obtains the compatible state. -+ * -+ * @param { IDecoratedV1Variable } state - the source state -+ * @param { ESValue } createCompatibleState - the callback for creating compatible state -+ * @returns { ESValue } the compatible state -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare function getCompatibleState( -+ state: IDecoratedV1Variable, -+ createCompatibleState: ESValue -+): ESValue; -diff --git a/api/arkui/component/repeat.d.ets b/api/arkui/component/repeat.d.ets -index fcbbca917..0d9490370 100755 ---- a/api/arkui/component/repeat.d.ets -+++ b/api/arkui/component/repeat.d.ets -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2024-2025 Huawei Device Co., Ltd. -+ * Copyright (c) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at -@@ -12,23 +12,21 @@ - * See the License for the specific language governing permissions and - * limitations under the License. - */ -+ - /** - * @file - * @kit ArkUI - * @arkts 1.2 - */ - -- --import { memo, ComponentBuilder, __memo_context_type, __memo_id_type } from './../stateManagement/runtime' -+import { Builder } from './builder'; -+import { ComponentBuilder } from './../stateManagement/runtime'; - - /** - * Indicates the type of Repeat's Data Source. - * - * @typedef { Array | ReadonlyArray | Readonly> } - * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @form -- * @atomicservice - * @since 20 - */ - type RepeatArray = Array | ReadonlyArray | Readonly>; -@@ -37,11 +35,9 @@ type RepeatArray = Array | ReadonlyArray | Readonly>; - * - * @typedef {function} TemplateTypedFunc - * @param { T } item - data item. -- * @param {number} index - data index number in array. -+ * @param { number } index - data index number in array. - * @returns { string } template type. - * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice - * @since 20 - */ - type TemplateTypedFunc = (item: T, index: number) => string; -@@ -51,11 +47,9 @@ type TemplateTypedFunc = (item: T, index: number) => string; - * @typedef {function} RepeatItemBuilder - * @param { RepeatItem } repeatItem - the repeat item builder function. - * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice - * @since 20 - */ --@memo -+@Builder - type RepeatItemBuilder = (repeatItem: RepeatItem) => void; - - /** -@@ -63,86 +57,109 @@ type RepeatItemBuilder = (repeatItem: RepeatItem) => void; - * - * @interface RepeatItem - * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @form -- * @atomicservice - * @since 20 - */ - export interface RepeatItem { -- /** -- * The origin data. -- * -- * @type { T } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @form -- * @atomicservice -- * @since 20 -- */ -- item: T; -- /** -- * index of each item. -- * -- * @type { number } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @form -- * @atomicservice -- * @since 20 -- */ -- index: number; -+ /** -+ * The origin data. -+ * -+ * @type { T } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ item: T; -+ /** -+ * index of each item. -+ * -+ * @type { number } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ index: number; - } - -+/** -+ * Function that is used to do lazy loading. -+ * -+ * @typedef {function} OnLazyLoadingFunc -+ * @param { number } index - data index. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+type OnLazyLoadingFunc = (index: number) => void; -+ -+/** -+ * Define key generator function. -+ * -+ * @typedef {function} KeyGeneratorFunc -+ * @param { T } item - data item. -+ * @param { number } index - data index number in array. -+ * @returns { string } key value. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+type KeyGeneratorFunc = (item: T, index: number) => string; -+ -+/** -+ * Function that is used to get total count. -+ * -+ * @typedef {function} OnTotalCountFunc -+ * @returns { number } Returns the total data count -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+type OnTotalCountFunc = () => number; -+ - /** - * Define the options of repeat virtualScroll to implement reuse and lazy loading. - * - * @interface VirtualScrollOptions - * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice - * @since 20 - */ - export interface VirtualScrollOptions { -- /** -- * Total data count. -- * -- * @type { ?number } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 20 -- */ -- totalCount?: number; -- /** -- * Reuse or not. -- * -- * @type { ?boolean } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 20 -- */ -- reusable?: boolean; -- /** -- * Data lazy loading -- * -- * @param { number } index -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 20 -- */ -- onLazyLoading?: (index: number) => void; -- /** -- * The function of total data count. -- * -- * @returns { number } Returns the total data count. -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 20 -- */ -- onTotalCount?: () => number; -+ /** -+ * Total data count. -+ * -+ * @type { ?number } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ totalCount?: number; -+ /** -+ * Reuse or not. -+ * -+ * @type { ?boolean } -+ * @default true -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ reusable?: boolean; -+ /** -+ * Data lazy loading -+ * -+ * @type { ?OnLazyLoadingFunc } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ onLazyLoading?: OnLazyLoadingFunc; -+ /** -+ * The function of total data count. -+ * -+ * @type { ?OnTotalCountFunc } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ onTotalCount?: OnTotalCountFunc; -+ /** -+ * Indicates whether to activate virtual scroll mode. -+ * -+ * @type { ?boolean } -+ * @default false -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ disableVirtualScroll?: boolean; - } - - /** -@@ -150,111 +167,84 @@ export interface VirtualScrollOptions { - * - * @interface TemplateOptions - * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice - * @since 20 - */ - export interface TemplateOptions { -- /** -- * The cached number of each template. -- * -- * @type { ?number } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 20 -- */ -- cachedCount?: number; -+ /** -+ * The cached number of each template. -+ * -+ * @type { ?number } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ cachedCount?: number; - } - - /** - * Defines the Repeat component attribute functions. - * -+ * @typedef RepeatAttribute - * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @form -- * @atomicservice - * @since 20 - */ --export interface UIRepeatAttribute { -- /** -- * Executes itemGenerator of each item. -- * -- * @param { RepeatItemBuilder } itemGenerator -- * @returns { UIRepeatAttribute } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @form -- * @atomicservice -- * @since 20 -- */ -- @memo -- each(itemGenerator: RepeatItemBuilder): this; -- /** -- * Obtains key of each item. -- * -- * @param { function } keyGenerator -- * @returns { UIRepeatAttribute } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @form -- * @atomicservice -- * @since 20 -- */ -- @memo -- key(keyGenerator: (item: T, index: number) => string): this; -- /** -- * Enable UI lazy loading when scroll up or down. -- * -- * @param { VirtualScrollOptions } virtualScrollOptions that defines the options of repeat virtual scroll to implement reuse and lazy loading. -- * @returns { UIRepeatAttribute } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 20 -- */ -- @memo -- virtualScroll(virtualScrollOptions?: VirtualScrollOptions): this; -- /** -- * Type builder function to render specific type of data item. -- * -- * @param { string } type that defines the template id. -- * @param { RepeatItemBuilder } itemBuilder that defines UI builder function. -- * @param { TemplateOptions } templateOptions that defines a builder template option parameter. -- * @returns { UIRepeatAttribute } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 20 -- */ -- @memo -- template(type: string, itemBuilder: RepeatItemBuilder, templateOptions?: TemplateOptions): this; -- /** -- * Typed function to render specific type of data item. -- * -- * @param { TemplateTypedFunc } typedFunc that define template typed function. -- * @returns { UIRepeatAttribute } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 20 -- */ -- @memo -- templateId(typedFunc: TemplateTypedFunc): this; -+export interface RepeatAttribute { -+ /** -+ * Executes itemGenerator of each item. -+ * -+ * @param { RepeatItemBuilder } itemGenerator -+ * @returns { this } RepeatAttribute instance -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ each(itemGenerator: RepeatItemBuilder): this; -+ /** -+ * Obtains key of each item. -+ * -+ * @param { KeyGeneratorFunc } keyGenerator -+ * @returns { this } RepeatAttribute instance -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ key(keyGenerator: KeyGeneratorFunc): this; -+ /** -+ * Enable UI lazy loading when scroll up or down. -+ * -+ * @param { VirtualScrollOptions } [virtualScrollOptions] that defines the options of repeat virtual scroll to -+ * implement reuse and lazy loading. -+ * @returns { this } RepeatAttribute instance -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ virtualScroll(virtualScrollOptions?: VirtualScrollOptions): this; -+ /** -+ * Type builder function to render specific type of data item. -+ * -+ * @param { string } type that defines the template id. -+ * @param { RepeatItemBuilder } itemBuilder that defines UI builder function. -+ * @param { TemplateOptions } [templateOptions] that defines a builder template option parameter. -+ * @returns { this } RepeatAttribute instance -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ template(type: string, itemBuilder: RepeatItemBuilder, templateOptions?: TemplateOptions): this; -+ /** -+ * Typed function to render specific type of data item. -+ * -+ * @param { TemplateTypedFunc } typedFunc that define template typed function. -+ * @returns { this } RepeatAttribute instance -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ templateId(typedFunc: TemplateTypedFunc): this; - } - - /** - * Indicates the type of Repeat. - * -- * @typedef { function } RepeatInterface - * @param { RepeatArray } arr - The Data Source -- * @returns { UIRepeatAttribute } -+ * @returns { RepeatAttribute } - * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @form -- * @atomicservice - * @since 20 - */ --@memo - @ComponentBuilder --export declare function Repeat(arr: RepeatArray): UIRepeatAttribute -\ No newline at end of file -+export declare function Repeat(arr: RepeatArray): RepeatAttribute; -\ No newline at end of file -diff --git a/api/arkui/component/resources.d.ets b/api/arkui/component/resources.d.ets -index 2a749e6b5..68448421a 100755 ---- a/api/arkui/component/resources.d.ets -+++ b/api/arkui/component/resources.d.ets -@@ -35,6 +35,24 @@ import { Resource } from './../../../api/global/resource' - */ - export declare function _r(bundleName: string, moduleName: string, name: string, ...params: Object[]): Resource; - -+/** -+ * Obtain the resource in resources, used by plugin. -+ * -+ * @param { number } id - Indicates the id of resource. -+ * @param { number } type - Indicates the type of resource. -+ * @param { string } bundleName - Indicates the name of bundle. -+ * @param { string } moduleName - Indicates the name of module. -+ * @param { Object[] } params - Custom parameters. -+ * @returns { Resource } Returns the resource instance. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+export declare function _r( -+ id: number, type: number, bundleName: string, moduleName: string, ...params: Object[]): Resource; -+ - /** - * Obtain the resource in resources/rawfile, used by plugin. - * -@@ -48,3 +66,21 @@ export declare function _r(bundleName: string, moduleName: string, name: string, - * @arkts 1.2 - */ - export declare function _rawfile(bundleName: string, moduleName: string, name: string): Resource; -+ -+/** -+ * Obtain the resource in resources/rawfile, used by plugin. -+ * -+ * @param { number } id - Indicates the id of resource. -+ * @param { number } type - Indicates the type of resource. -+ * @param { string } bundleName - Indicates the name of bundle. -+ * @param { string } moduleName - Indicates the name of module. -+ * @param { Object[] } params - Custom parameters. -+ * @returns { Resource } Returns the resource instance. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+export declare function _rawfile( -+ id: number, type: number, bundleName: string, moduleName: string, ...params: Object[]): Resource; -diff --git a/api/arkui/stateManagement/base/decoratorBase.d.ets b/api/arkui/stateManagement/base/decoratorBase.d.ets -deleted file mode 100644 -index 47f8b147f..000000000 ---- a/api/arkui/stateManagement/base/decoratorBase.d.ets -+++ /dev/null -@@ -1,50 +0,0 @@ --/* -- * Copyright (C) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ --/** -- * @file -- * @kit ArkUI -- * @arkts 1.2 -- */ -- --import { WatchFuncType } from '../decorators/decoratorWatch'; -- --export declare interface IDecoratedImmutableVariable { -- get(): T --} -- --export declare interface IDecoratedMutableVariable { -- get(): T -- set(newValue: T): void --} -- --export declare interface IDecoratedUpdatableVariable { -- update(newValue: T): void --} -- --export declare interface AbstractProperty extends IDecoratedMutableVariable { -- info(): string; --} -- --export declare interface SubscribedAbstractProperty extends AbstractProperty { -- aboutToBeDeleted(): void; --} -- --export declare class DecoratedVariableBase { -- public constructor(decorator: string, varName: string) --} -- --export declare class DecoratedV1VariableBase extends DecoratedVariableBase { -- public constructor(decorator: string, varName: string, initValue:T, watchFunc?: WatchFuncType) --} -\ No newline at end of file -diff --git a/api/arkui/stateManagement/base/mutableStateMeta.d.ets b/api/arkui/stateManagement/base/mutableStateMeta.d.ets -deleted file mode 100644 -index 6aee33a1b..000000000 ---- a/api/arkui/stateManagement/base/mutableStateMeta.d.ets -+++ /dev/null -@@ -1,35 +0,0 @@ --/* -- * Copyright (C) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ --/** -- * @file -- * @kit ArkUI -- * @arkts 1.2 -- */ -- --export declare class MutableStateMetaBase { -- public constructor(decorator: string) --} -- --export declare class MutableStateMeta extends MutableStateMetaBase { -- public addRef(): void -- public fireChange(): void -- public constructor(decorator: string) --} -- --export declare class MutableKeyedStateMeta extends MutableStateMetaBase { -- public addRef(key: string): void -- public fireChange(key: string): void -- public constructor(decorator: string) --} -\ No newline at end of file -diff --git a/api/arkui/stateManagement/common.d.ets b/api/arkui/stateManagement/common.d.ets -deleted file mode 100644 -index 2f4798536..000000000 ---- a/api/arkui/stateManagement/common.d.ets -+++ /dev/null -@@ -1,81 +0,0 @@ --/* -- * Copyright (C) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ --/** -- * @file -- * @kit ArkUI -- * @arkts 1.2 -- */ -- --@Retention({policy: "SOURCE"}) --export declare @interface State {}; -- --@Retention({policy: "SOURCE"}) --export declare @interface Prop {}; -- --@Retention({policy: "SOURCE"}) --export declare @interface Link {}; -- --@Retention({policy: "SOURCE"}) --export declare @interface Observed {}; -- --@Retention({policy: "SOURCE"}) --export declare @interface Track {}; -- --@Retention({policy: "SOURCE"}) --export declare @interface ObjectLink {}; -- --@Retention({policy: "SOURCE"}) --export declare @interface StorageProp { -- property: string; --}; -- --@Retention({policy: "SOURCE"}) --export declare @interface StorageLink { -- property: string; --}; -- --@Retention({policy: "SOURCE"}) --export declare @interface LocalStorageProp { -- property: string; --}; -- --@Retention({policy: "SOURCE"}) --export declare @interface LocalStorageLink { -- property: string; --}; -- --@Retention({policy: "SOURCE"}) --export declare @interface Provide { -- alias: string = ""; -- allowOverride: boolean = false; --}; -- --@Retention({policy: "SOURCE"}) --export declare @interface Consume { -- alias: string = ""; --}; -- --@Retention({policy: "SOURCE"}) --export declare @interface Watch { -- callback: string; --}; -- --@Retention({policy: "SOURCE"}) --export declare @interface Require {}; -- --export declare class UIUtils { -- static getTarget(source: T): T; -- static makeObserved(source: T): T; --} -diff --git a/api/arkui/stateManagement/decorator.d.ets b/api/arkui/stateManagement/decorator.d.ets -new file mode 100644 -index 000000000..4acc119c9 ---- /dev/null -+++ b/api/arkui/stateManagement/decorator.d.ets -@@ -0,0 +1,850 @@ -+/* -+ * Copyright (C) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+/** -+ * @file -+ * @kit ArkUI -+ * @arkts 1.2 -+ */ -+ -+import { ExtendableComponent } from '../component/extendableComponent'; -+ -+/** -+ * Defining State annotation -+ * State variable that holds the state property and is used to render the owning custom component. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface State {}; -+ -+/** -+ * Defining Prop annotation -+ * Prop is an annotation which is mutable, and its changes will not be synchronized to the parent component. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface Prop {}; -+ -+/** -+ * Defining PropRef annotation -+ * PropRef is an annotation which is mutable. -+ * Any object property modifications made through PropRef are visible in the -+ * parent component, which is different from Prop. -+ * In order to prevent this, need to take a deep copy of the parent data. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface PropRef {}; -+ -+/** -+ * Defining Link annotation -+ * Link decorated variable creates two-way synchronization with a variable of its parent component. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface Link {}; -+ -+/** -+ * Defining Observed annotation -+ * Observed is used to decorate a class. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface Observed {}; -+ -+/** -+ * Defining Track annotation -+ * Track is a decorator used to decorate properties of class objects. -+ * Any changes to the properties decorated by Track will trigger only updates to the UI associated with those properties. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface Track {}; -+ -+/** -+ * Defining ObjectLink annotation -+ * ObjectLink is used to observe property changes in nested class objects. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface ObjectLink {}; -+ -+/** -+ * Defining StorageProp annotation -+ * StorageProp a one-way data synchronization is established from the attribute with the given key in AppStorage to the variable. -+ * A local change can be made, but it will not be synchronized to AppStorage. -+ * An update to the attribute with the given key in AppStorage will overwrite local changes. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface StorageProp { -+ property: string; -+}; -+ -+/** -+ * Defining StoragePropRef annotation -+ * StoragePropRef is an annotation which is mutable. -+ * Any object property modifications made through StoragePropRef are visible in the -+ * AppStorage, which is different from StorageProp. -+ * In order to prevent this, need to take a deep copy of AppStorage instance data. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface StoragePropRef { -+ /** -+ * The give property in AppStorage. -+ * -+ * @type { string } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ property: string; -+}; -+ -+/** -+ * Defining StorageLink annotation -+ * StorageLink is used to create a two-way data synchronization between the variable -+ * it decorates and the attribute with the given key in AppStorage. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface StorageLink { -+ /** -+ * The give property in AppStorage. -+ * -+ * @type { string } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ property: string; -+}; -+ -+/** -+ * Defining LocalStorageProp annotation -+ * LocalStorageProp is a one-way data synchronization is established from the attribute with the given key in -+ * LocalStorage to the variable. This means that, local changes -+ * (if any) will not be synchronized to LocalStorage, and an update to the attribute with the given key in LocalStorage. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface LocalStorageProp { -+ /** -+ * The give property in LocalStorage. -+ * -+ * @type { string } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ property: string; -+}; -+ -+/** -+ * Defining LocalStoragePropRef annotation -+ * LocalStoragePropRef is an annotation which is mutable. -+ * Any object property modifications made through LocalStoragePropRef are visible in the -+ * LocalStorage, which is different from LocalStorageProp. -+ * In order to prevent this, need to take a deep copy of LocalStorage data. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface LocalStoragePropRef { -+ /** -+ * The give property in AppStorage. -+ * -+ * @type { string } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ property: string; -+}; -+ -+/** -+ * Defining LocalStorageLink annotation -+ * LocalStorageLink is used to create a two-way data synchronization with the attribute -+ * in LocalStorage. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface LocalStorageLink { -+ /** -+ * The give property in LocalStorage. -+ * -+ * @type { string } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ property: string; -+}; -+ -+/** -+ * Defining Provide annotation -+ * Provide is used for two-way data synchronization with descendant components when -+ * state data needs to be transferred between multiple levels. An @Provide decorated state -+ * variable exists in the ancestor component and is said to be "provided" to descendent components. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface Provide { -+ /** -+ * The alias name. -+ * -+ * @type { string } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ alias: string = ""; -+ /** -+ * allowOverride is used to override an existing @Provide decorated variable. -+ * -+ * @type { boolean } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ allowOverride: boolean = false; -+}; -+ -+/** -+ * Defining Consume annotation -+ * Consume is used to access the provided state variable for a descendent component -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface Consume { -+ /** -+ * The alias name. -+ * -+ * @type { string } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ alias: string = ""; -+}; -+ -+/** -+ * Defining Watch annotation -+ * Watch is used to listen for state variables. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface Watch { -+ /** -+ * The callback function name. -+ * -+ * @type { string } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ callback: string; -+}; -+ -+/** -+ * Defining Require annotation -+ * Require is a decorator for declaring that parameters – regular variables. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface Require {}; -+ -+/** -+ * Defining Local annotation -+ * Local is the internal state of a component, which enables the variables in the -+ * custom component to observe changes. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface Local {}; -+ -+/** -+ * Defining Param annotation -+ * Param indicates the state passed in from the external, ensuring that -+ * data can be synchronized between the parent and child components. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface Param {}; -+ -+/** -+ * Defining Once annotation -+ * Once annotation accepts values passed in only during variable initialization -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface Once {}; -+ -+/** -+ * Defining Event annotation -+ * Event is used to decorate the callback method is a standard, indicating that the -+ * child component needs to pass in the callback for updating the data source. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface Event {}; -+ -+/** -+ * Defining Provider annotation -+ * Provider is used for two-way data synchronization with descendant components when -+ * state data needs to be transferred between multiple levels. An @Provider decorated state -+ * variable exists in the ancestor component and is said to be "provider" to descendent components. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface Provider { -+ /** -+ * The alias name. -+ * -+ * @type { string } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ alias: string = ""; -+}; -+ -+/** -+ * Defining Consumer annotation -+ * Consumer is used to access the provided state variable for a descendent component -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface Consumer { -+ /** -+ * The alias name. -+ * -+ * @type { string } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ alias: string = ""; -+}; -+ -+/** -+ * Defining ObservedV2 annotation -+ * ObservedV2 is used to decorate with class. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface ObservedV2 {}; -+ -+/** -+ * Defining Trace annotation -+ * Trace is used to directly observe the property changes of nested objects -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface Trace {}; -+ -+/** -+ * Defining Computed annotation -+ * Computed is a method decorator that decorates the getter method. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface Computed {}; -+ -+/** -+ * Defining Monitor annotation -+ * Monitor provides the capability of listening for state variables of V2. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+@Retention({policy: "SOURCE"}) -+export declare @interface Monitor { -+ /** -+ * Listened property name. -+ * -+ * @type { string[] } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ path: string[]; -+}; -+ -+/** -+ * Define IMonitor interface -+ * -+ * @interface IMonitor -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+declare interface IMonitor { -+ /** -+ * Array of changed paths(keys) -+ * -+ * @type { Array } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ dirty: Array; -+ /** -+ * Return the pair of the value before the most recent change and current value for given path. -+ * If path does not exist, return undefined; If path is not specified, return the value pair corresponding to the first path in dirty. -+ * -+ * @param { string } [path] Listened property name -+ * @returns { IMonitorValue | undefined } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ value(path?: string): IMonitorValue | undefined; -+} -+ -+/** -+ * Define IMonitorValue interface -+ * -+ * @interface IMonitorValue -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+declare interface IMonitorValue { -+ /** -+ * Get the previous value. -+ * -+ * @type { T } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ before: T; -+ /** -+ * Get current value. -+ * -+ * @type { T } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ now: T; -+ /** -+ * Monitored path input by the user. -+ * -+ * @type { string } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ path: string; -+} -+ -+/** -+ * Define decorated variable interface. -+ * -+ * @interface IDecoratedVariable -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare interface IDecoratedVariable { -+ /** -+ * Decorated variable name. -+ * -+ * @type { string } -+ * @readonly -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ readonly varName: string; -+} -+ -+/** -+ * Define V1 decorated variable interface. -+ * -+ * @extends IDecoratedVariable -+ * @interface IDecoratedVariable -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare interface IDecoratedV1Variable extends IDecoratedVariable { -+ /** -+ * Registers the watch callback function with the data source. -+ * -+ * @param { IDecoratedV1Variable } decoratedVar -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ registerWatchToSource(decoratedVar: IDecoratedV1Variable): void; -+} -+ -+/** -+ * Define decorated immutable variable interface. -+ * -+ * @interface IDecoratedImmutableVariable -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare interface IDecoratedImmutableVariable { -+ /** -+ * Get the state variable. -+ * -+ * @returns { T } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ get(): T; -+} -+ -+/** -+ * Define decorated mutable variable interface. -+ * -+ * @interface IDecoratedMutableVariable -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare interface IDecoratedMutableVariable { -+ /** -+ * Get the state variable. -+ * -+ * @returns { T } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ get(): T; -+ /** -+ * Set the state variable with a new Value. -+ * -+ * @param { T } newValue -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ set(newValue: T): void; -+} -+ -+/** -+ * Define decorated updatable variable interface. -+ * -+ * @interface IDecoratedUpdatableVariable -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare interface IDecoratedUpdatableVariable { -+ /** -+ * Update the state variable with a new Value. -+ * -+ * @param { T } newValue -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ update(newValue: T): void; -+} -+ -+/** -+ * Define state decoration variable interface. -+ * -+ * @extends IDecoratedMutableVariable, IDecoratedV1Variable -+ * @interface IStateDecoratedVariable -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare interface IStateDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} -+ -+export declare interface IPropDecoratedVariable extends IDecoratedMutableVariable, -+ IDecoratedUpdatableVariable, IDecoratedV1Variable { -+} -+ -+/** -+ * Define PropRef decoration variable interface. -+ * -+ * @extends IDecoratedMutableVariable, IDecoratedUpdatableVariable, IDecoratedV1Variable -+ * @interface IPropRefDecoratedVariable -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare interface IPropRefDecoratedVariable extends IDecoratedMutableVariable, -+ IDecoratedUpdatableVariable, IDecoratedV1Variable {} -+ -+/** -+ * Define LocalStoragePropRef decoration variable interface. -+ * -+ * @extends IDecoratedMutableVariable, IDecoratedV1Variable -+ * @interface ILocalStoragePropRefDecoratedVariable -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare interface ILocalStoragePropRefDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} -+ -+/** -+ * Define Link decoration variable interface. -+ * -+ * @extends IDecoratedMutableVariable, IDecoratedV1Variable -+ * @interface ILinkDecoratedVariable -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare interface ILinkDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} -+ -+/** -+ * Define Provide decoration variable interface. -+ * -+ * @extends IDecoratedMutableVariable, IDecoratedV1Variable -+ * @interface IProvideDecoratedVariable -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare interface IProvideDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} -+ -+/** -+ * Define Consume decoration variable interface. -+ * -+ * @extends IDecoratedMutableVariable, IDecoratedV1Variable -+ * @interface IConsumeDecoratedVariable -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare interface IConsumeDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} -+ -+/** -+ * Define ObjectLink decoration variable interface. -+ * -+ * @extends IDecoratedImmutableVariable, IDecoratedUpdatableVariable, IDecoratedV1Variable -+ * @interface IObjectLinkDecoratedVariable -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare interface IObjectLinkDecoratedVariable extends IDecoratedImmutableVariable, -+ IDecoratedUpdatableVariable, IDecoratedV1Variable {} -+ -+/** -+ * Define StorageLink decoration variable interface. -+ * -+ * @extends IDecoratedMutableVariable, IDecoratedV1Variable -+ * @interface IStorageLinkDecoratedVariable -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare interface IStorageLinkDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} -+ -+/** -+ * Define StorageProp decoration variable interface. -+ * -+ * @extends IDecoratedMutableVariable, IDecoratedV1Variable -+ * @interface IStoragePropDecoratedVariable -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare interface IStoragePropDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable { -+} -+ -+/** -+ * Define StoragePropRef decoration variable interface. -+ * -+ * @extends IDecoratedMutableVariable, IDecoratedV1Variable -+ * @interface IStoragePropRefDecoratedVariable -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare interface IStoragePropRefDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} -+ -+/** -+ * Define LocalStorageLink decoration variable interface. -+ * -+ * @extends IDecoratedMutableVariable, IDecoratedV1Variable -+ * @interface ILocalStorageLinkDecoratedVariable -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare interface ILocalStorageLinkDecoratedVariable extends IDecoratedMutableVariable, IDecoratedV1Variable {} -+ -+/** -+ * Define Link source type. -+ * -+ * @typedef { IStateDecoratedVariable | ILinkDecoratedVariable | IObjectLinkDecoratedVariable | -+ IPropDecoratedVariable | IStorageLinkDecoratedVariable | ILocalStorageLinkDecoratedVariable | IStoragePropRefDecoratedVariable | -+ IProvideDecoratedVariable | IConsumeDecoratedVariable } LinkSourceType -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export type LinkSourceType = IStateDecoratedVariable | ILinkDecoratedVariable | IObjectLinkDecoratedVariable | -+ IPropDecoratedVariable | IStorageLinkDecoratedVariable | ILocalStorageLinkDecoratedVariable | IStoragePropRefDecoratedVariable | -+ IProvideDecoratedVariable | IConsumeDecoratedVariable; -+ -+ -+/** -+ * Define mutable state meta interface. -+ * -+ * @interface IMutableStateMeta -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare interface IMutableStateMeta { -+ /** -+ * Collect the dependancy for UI component with state variable -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ addRef(): void; -+ /** -+ * Notify UI component to update when state variable is changed -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ fireChange(): void; -+} -+ -+export declare interface IMutableKeyedStateMeta { -+ addRef(key: string): void; -+ addRef(index: int): void; -+ fireChange(key: string): void; -+ fireChange(index: int): void; -+} -+ -+export declare interface IObserve { -+ readonly renderingComponent: number; -+ readonly renderingId: RenderIdType; -+ shouldAddRef(iObjectsRenderId: RenderIdType): boolean; -+} -+ -+export declare const OBSERVE: IObserve; -+ -+export type RenderIdType = int; -+ -+export declare interface IObservedObject extends IWatchSubscriberRegister { -+ setV1RenderId(renderId: RenderIdType): void; -+} -+ -+export declare const STATE_MGMT_FACTORY: IStateMgmtFactory; -+ -+export declare interface IStateMgmtFactory { -+ makeMutableStateMeta(): IMutableStateMeta; -+ makeSubscribedWatches(): ISubscribedWatches; -+ makeState(owningView: ExtendableComponent, varName: string, initValue: T, -+ watchFunc?: WatchFuncType): IStateDecoratedVariable; -+ makeProp(owningView: ExtendableComponent, varName: string, initValue: T, -+ watchFunc?: WatchFuncType): IPropDecoratedVariable; -+ makeLink(owningView: ExtendableComponent, varName: string, source: LinkSourceType, -+ watchFunc?: WatchFuncType): ILinkDecoratedVariable; -+ makeProvide(owningView: ExtendableComponent, varName: string, provideAlias: string, -+ initValue: T, allowOverride: boolean, wathcFunc?: WatchFuncType): IProvideDecoratedVariable; -+ makeConsume(owningView: ExtendableComponent, varName: string, -+ provideAlias: string, watchFunc?: WatchFuncType): IConsumeDecoratedVariable; -+ makeObjectLink(owningView: ExtendableComponent, varName: string, -+ initValue: T, wathcFunc?: WatchFuncType): IObjectLinkDecoratedVariable; -+ -+ /** -+ * Create a PropRef variable instance. -+ * -+ * @param { ExtendableComponent } owningView - custom component. -+ * @param { string } varName - state variable name. -+ * @param { T } initValue - state variable initValue. -+ * @param { WatchFuncType } [watchFunc] - watch type -+ * @returns { IPropRefDecoratedVariable } PropRef instance -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ makePropRef(owningView: ExtendableComponent, varName: string, initValue: T, -+ watchFunc?: WatchFuncType): IPropRefDecoratedVariable; -+ -+ /** -+ * Create a StorageLink variable instance. -+ * -+ * @param { ExtendableComponent } owningView - custom component. -+ * @param { string } propName - property name. -+ * @param { string } varName - state variable name. -+ * @param { T } initValue - init value. -+ * @param { Type } ttype - value type. -+ * @param { WatchFuncType } [watchFunc] - watch type -+ * @returns { IStorageLinkDecoratedVariable } StorageLink instance -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ makeStorageLink(owningView: ExtendableComponent, propName: string, -+ varName: string, initValue: T, ttype: Type, watchFunc?: WatchFuncType): IStorageLinkDecoratedVariable; -+ /** -+ * Create a StoragePropRef variable instance. -+ * -+ * @param { ExtendableComponent } owningView - custom component. -+ * @param { string } propName - property name. -+ * @param { string } varName - state variable name. -+ * @param { T } initValue - init value. -+ * @param { Type } ttype - value type. -+ * @param { WatchFuncType } [watchFunc] - watch type -+ * @returns { IStoragePropRefDecoratedVariable } StoragePropRef instance -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ makeStoragePropRef(owningView: ExtendableComponent, propName: string, -+ varName: string, initValue: T, ttype: Type, watchFunc?: WatchFuncType): IStoragePropRefDecoratedVariable; -+ /** -+ * Create a LocalStoragePropRef variable instance. -+ * -+ * @param { ExtendableComponent } owningView - custom component. -+ * @param { string } propName - property name. -+ * @param { string } varName - state variable name. -+ * @param { T } initValue - init value. -+ * @param { Type } ttype - value type. -+ * @param { WatchFuncType } [watchFunc] - watch type -+ * @returns { ILocalStoragePropRefDecoratedVariable } LocalStoragePropRef instance -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ makeLocalStoragePropRef(owningView: ExtendableComponent, propName: string, -+ varName: string, initValue: T, ttype: Type, watchFunc?: WatchFuncType): ILocalStoragePropRefDecoratedVariable; -+ -+ /** -+ * Create a LocalStorageLink variable instance. -+ * -+ * @param { ExtendableComponent } owningView - custom component. -+ * @param { string } propName - property name. -+ * @param { string } varName - state variable name. -+ * @param { T } initValue - init value. -+ * @param { Type } ttype - value type -+ * @param { WatchFuncType } [watchFunc] - watch type -+ * @returns { ILocalStorageLinkDecoratedVariable } LocalStorageLink instance -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ makeLocalStorageLink(owningView: ExtendableComponent, propName: string, -+ varName: string, initValue: T, ttype: Type, watchFunc?: WatchFuncType): ILocalStorageLinkDecoratedVariable; -+} -+ -+export type WatchFuncType = ((propertyName: string) => void); -+ -+export type WatchIdType = int; -+ -+export declare interface IWatchSubscriberRegister { -+ addWatchSubscriber(watchId: WatchIdType): void; -+ removeWatchSubscriber(watchId: WatchIdType): boolean; -+} -+ -+export declare interface ISubscribedWatches extends IWatchSubscriberRegister { -+ executeOnSubscribingWatches(propertyName: string): void; -+} -+ -+export declare interface AbstractProperty extends IDecoratedMutableVariable { -+ info(): string; -+} -+ -+export declare interface SubscribedAbstractProperty extends AbstractProperty { -+ aboutToBeDeleted(): void; -+} -\ No newline at end of file -diff --git a/api/arkui/stateManagement/decorators/decoratorConsume.d.ets b/api/arkui/stateManagement/decorators/decoratorConsume.d.ets -deleted file mode 100644 -index bedeb8b5d..000000000 ---- a/api/arkui/stateManagement/decorators/decoratorConsume.d.ets -+++ /dev/null -@@ -1,35 +0,0 @@ --/* -- * Copyright (C) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ --/** -- * @file -- * @kit ArkUI -- * @arkts 1.2 -- */ -- --import { DecoratedV1VariableBase, IDecoratedMutableVariable } from '../base/decoratorBase'; --import { ProvideDecoratedVariable } from './decoratorProvide' --import { WatchIdType, WatchFuncType } from './decoratorWatch'; -- --export declare class ConsumeDecoratedVariable extends DecoratedV1VariableBase -- implements IDecoratedMutableVariable { -- public constructor( -- varName: string, -- provideAlias: string, -- source: ProvideDecoratedVariable, -- watchFunc?: WatchFuncType -- ) -- public get(): T -- public set(newValue: T): void --} -\ No newline at end of file -diff --git a/api/arkui/stateManagement/decorators/decoratorObjectLink.d.ets b/api/arkui/stateManagement/decorators/decoratorObjectLink.d.ets -deleted file mode 100644 -index c94321977..000000000 ---- a/api/arkui/stateManagement/decorators/decoratorObjectLink.d.ets -+++ /dev/null -@@ -1,29 +0,0 @@ --/* -- * Copyright (C) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ --/** -- * @file -- * @kit ArkUI -- * @arkts 1.2 -- */ -- --import { DecoratedV1VariableBase, IDecoratedImmutableVariable, IDecoratedUpdatableVariable } from '../base/decoratorBase'; --import { WatchFuncType } from './decoratorWatch'; -- --export declare class ObjectLinkDecoratedVariable extends DecoratedV1VariableBase -- implements IDecoratedImmutableVariable, IDecoratedUpdatableVariable { -- public constructor(varName: string, parentInitValue: T, watchFunc?: WatchFuncType) -- public get(): T -- public update(newValue: T): void --} -\ No newline at end of file -diff --git a/api/arkui/stateManagement/decorators/decoratorProp.d.ets b/api/arkui/stateManagement/decorators/decoratorProp.d.ets -deleted file mode 100644 -index 89eb7968b..000000000 ---- a/api/arkui/stateManagement/decorators/decoratorProp.d.ets -+++ /dev/null -@@ -1,30 +0,0 @@ --/* -- * Copyright (C) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ --/** -- * @file -- * @kit ArkUI -- * @arkts 1.2 -- */ -- --import { DecoratedV1VariableBase, IDecoratedMutableVariable, IDecoratedUpdatableVariable } from '../base/decoratorBase'; --import { WatchFuncType } from './decoratorWatch'; -- --export declare class PropDecoratedVariable extends DecoratedV1VariableBase -- implements IDecoratedMutableVariable, IDecoratedUpdatableVariable { -- public constructor(varName: string, sourceValue: T, watchFunc?: WatchFuncType) -- public get(): T -- public set(newValue: T): void -- public update(newValue: T): void --} -\ No newline at end of file -diff --git a/api/arkui/stateManagement/decorators/decoratorState.d.ets b/api/arkui/stateManagement/decorators/decoratorState.d.ets -deleted file mode 100644 -index 5992f62fc..000000000 ---- a/api/arkui/stateManagement/decorators/decoratorState.d.ets -+++ /dev/null -@@ -1,35 +0,0 @@ --/* -- * Copyright (C) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ --/** -- * @file -- * @kit ArkUI -- * @arkts 1.2 -- */ -- --import { DecoratedV1VariableBase, IDecoratedMutableVariable } from '../base/decoratorBase'; --import { PropDecoratedVariable } from './decoratorProp'; --import { WatchIdType, WatchFuncType } from './decoratorWatch'; -- --export declare interface __MkPropReturnType { -- prop: PropDecoratedVariable; -- watchId: WatchIdType; --} -- --export declare class StateDecoratedVariable extends DecoratedV1VariableBase -- implements IDecoratedMutableVariable { -- public constructor(varName: string, initValue: T, watchFunc?: WatchFuncType) -- public get(): T -- public set(newValue: T): void --} -\ No newline at end of file -diff --git a/api/arkui/stateManagement/decorators/decoratorStorageLink.d.ets b/api/arkui/stateManagement/decorators/decoratorStorageLink.d.ets -deleted file mode 100644 -index 45821e860..000000000 ---- a/api/arkui/stateManagement/decorators/decoratorStorageLink.d.ets -+++ /dev/null -@@ -1,31 +0,0 @@ --/* -- * Copyright (C) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --/** -- * @file -- * @kit ArkUI -- * @arkts 1.2 -- */ -- --import { DecoratedV1VariableBase, IDecoratedMutableVariable } from '../base/decoratorBase'; --import { WatchFuncType } from './decoratorWatch'; -- --export declare class StorageLinkDecoratedVariable extends DecoratedV1VariableBase -- implements IDecoratedMutableVariable { -- public constructor(propName: string, varName: string, localValue: T, watchFunc?: WatchFuncType) -- public getInfo(): string -- public get(): T -- public set(newValue: T): void --} -\ No newline at end of file -diff --git a/api/arkui/stateManagement/decorators/decoratorStorageProp.d.ets b/api/arkui/stateManagement/decorators/decoratorStorageProp.d.ets -deleted file mode 100644 -index 574844395..000000000 ---- a/api/arkui/stateManagement/decorators/decoratorStorageProp.d.ets -+++ /dev/null -@@ -1,30 +0,0 @@ --/* -- * Copyright (C) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ --/** -- * @file -- * @kit ArkUI -- * @arkts 1.2 -- */ -- --import { DecoratedV1VariableBase, IDecoratedMutableVariable } from '../base/decoratorBase'; --import { WatchFuncType } from './decoratorWatch'; -- --export declare class StoragePropDecoratedVariable extends DecoratedV1VariableBase -- implements IDecoratedMutableVariable { -- public constructor(propName: string, varName:string, localVal: T, watchFunc?: WatchFuncType) -- public getInfo(): string -- public get(): T -- public set(newValue: T): void --} -\ No newline at end of file -diff --git a/api/arkui/stateManagement/decorators/decoratorWatch.d.ets b/api/arkui/stateManagement/decorators/decoratorWatch.d.ets -deleted file mode 100644 -index 9607eb38c..000000000 ---- a/api/arkui/stateManagement/decorators/decoratorWatch.d.ets -+++ /dev/null -@@ -1,40 +0,0 @@ --/* -- * Copyright (C) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ --/** -- * @file -- * @kit ArkUI -- * @arkts 1.2 -- */ --import { int32 } from '@koalaui.runtime.common'; -- --export type WatchFuncType = ((propertyName: string) => void); -- --export type WatchIdType = int32; -- --export declare class WatchFunc { -- public constructor(func: WatchFuncType) --} -- --export declare interface IWatchTrigger { -- addWatchSubscriber(watchId: WatchIdType): void -- removeWatchSubscriber(watchId: WatchIdType): boolean -- executeOnSubscribingWatches(propertyName: string): void --} -- --export declare class SubscribedWatches implements IWatchTrigger { -- public addWatchSubscriber(id: WatchIdType): void -- public removeWatchSubscriber(id: WatchIdType): boolean -- public executeOnSubscribingWatches(propertyName: string): void --} -\ No newline at end of file -diff --git a/api/arkui/stateManagement/storage.d.ets b/api/arkui/stateManagement/storage.d.ets -deleted file mode 100644 -index d9db07a64..000000000 ---- a/api/arkui/stateManagement/storage.d.ets -+++ /dev/null -@@ -1,339 +0,0 @@ --/* -- * Copyright (C) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ --/** -- * @file -- * @kit ArkUI -- * @arkts 1.2 -- */ -- --export interface StorageProperty { -- key: string; -- defaultValue: number | string | boolean | Object; --} -- --export type PersistPropsOptions = StorageProperty; -- --interface AbstractProperty { -- info(): string; -- get(): T; -- set(newValue: T): void; --} -- --interface SubscribedAbstractProperty extends AbstractProperty { -- aboutToBeDeleted(): void; --} -- --declare class LocalStorage { -- static getShared(): LocalStorage | undefined; -- -- constructor(initializingProperties?: StorageProperty[]); -- -- has(propName: string): boolean; -- -- keys(): IterableIterator; -- -- size(): int; -- -- get(propName: string): T | undefined; -- -- set(propName: string, newValue: T): boolean; -- -- setOrCreate(propName: string, newValue?: T): boolean; -- -- ref(propName: string): AbstractProperty | undefined; -- -- setAndRef(propName: string, defaultValue: T): AbstractProperty; -- -- link(propName: string): SubscribedAbstractProperty | undefined; -- -- setAndLink(propName: string, defaultValue: T): SubscribedAbstractProperty; -- -- prop(propName: string): SubscribedAbstractProperty | undefined; -- -- setAndProp(propName: string, defaultValue: T): SubscribedAbstractProperty; -- -- delete(propName: string): boolean; -- -- clear(): boolean; --} -- --declare class AppStorage { -- static has(propName: string): boolean; -- -- static keys(): IterableIterator; -- -- static size(): int; -- -- static get(propName: string): T | undefined; -- -- static set(propName: string, newValue: T): boolean; -- -- static setOrCreate(propName: string, newValue?: T): boolean; -- -- static ref(propName: string): AbstractProperty | undefined; -- -- static setAndRef(propName: string, defaultValue: T): AbstractProperty; -- -- static link(propName: string): SubscribedAbstractProperty | undefined; -- -- static setAndLink(propName: string, defaultValue: T): SubscribedAbstractProperty; -- -- static prop(propName: string): SubscribedAbstractProperty | undefined; -- -- static setAndProp(propName: string, defaultValue: T): SubscribedAbstractProperty; -- -- static delete(propName: string): boolean; -- -- static clear(): boolean; --} -- --export declare class PersistentStorage { -- -- static persistProp(key: string, defaultValue: T): void; -- -- static deleteProp(key: string): void; -- -- static persistProps(props: PersistPropsOptions[]): void; -- -- static keys(): Array; --} -- --export interface EnvPropsOptions { -- key: string; -- defaultValue: number | string | boolean; --} -- --export declare class Environment { -- static envProp(key: string, value: S): boolean; -- -- static envProps(props: EnvPropsOptions[]): void; -- -- static keys(): Array; --} -- -- --/** -- * Function that returns default creator. -- * -- * @typedef { function } StorageDefaultCreator -- * @returns { T } default creator -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 12 -- */ --export type StorageDefaultCreator = () => T; -- --/** -- * Define class constructor with arbitrary parameters. -- * @interface TypeConstructorWithArgs -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 12 -- */ --// #ToDO: fix --export interface TypeConstructorWithArgs { -- /** -- * @param { any } args the arguments of the constructor. -- * @returns { T } return class instance. -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 12 -- */ -- // new(...args: Array): T; --} -- --/** -- * AppStorageV2 is for UI state of app-wide access, has same life cycle as the app, -- * and saves database content only in memory. -- * -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 12 -- */ --export declare class AppStorageV2 { -- /** -- * If the value for the given key is already available, return the value. -- * If not, add the key with value generated by calling defaultFunc and return it to caller. -- * -- * @param { TypeConstructorWithArgs } type class type of the stored value. -- * @param { string | StorageDefaultCreator } [keyOrDefaultCreator] alias name of the key, -- * or the function generating the default value. -- * @param { StorageDefaultCreator } [defaultCreator] the function generating the default value -- * @returns { T | undefined } the value of the existed key or the default value -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 12 -- */ -- static connect( -- type: TypeConstructorWithArgs, -- keyOrDefaultCreator?: string | StorageDefaultCreator, -- defaultCreator?: StorageDefaultCreator -- ): T | undefined; -- -- /** -- * Removes data with the given key or given class type. -- * -- * @param { string | TypeConstructorWithArgs } keyOrType key or class type removing -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 12 -- */ -- static remove(keyOrType: string | TypeConstructorWithArgs): void; -- /** -- * Return the array of all keys. -- * -- * @returns { Array } the array of all keys -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 12 -- */ -- static keys(): Array; --} -- --/** -- * Function that returns reason type when error. -- * -- * @typedef { function } PersistenceErrorCallback -- * @param { string } key persisted key when error -- * @param { 'quota' | 'serialization' | 'unknown' } reason reason type when error -- * @param { string } message more message when error -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 12 -- */ --export type PersistenceErrorCallback = (key: string, reason: 'quota' | 'serialization' | 'unknown', message: string) => void; -- --/** -- * PersistenceV2 is for UI state of app-wide access, available on app re-start, -- * and saves database content in disk. -- * -- * @extends AppStorageV2 -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 12 -- */ --export declare class PersistenceV2 extends AppStorageV2 { -- /** -- * Used to manually persist data changes to disks. -- * -- * @param { string | TypeConstructorWithArgs } keyOrType key or class type need to persist. -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 12 -- */ -- static save(keyOrType: string | TypeConstructorWithArgs): void; -- -- /** -- * Be called when persisting has encountered an error. -- * -- * @param { PersistenceErrorCallback | undefined } callback called when error -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 12 -- */ -- static notifyOnError(callback: PersistenceErrorCallback | undefined): void; --} -- --/** -- * Define TypeConstructor type. -- * -- * @interface TypeConstructor -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 12 -- */ --export interface TypeConstructor { -- /** -- * @returns { T } -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 12 -- */ -- // new(): T; --} -- --/** -- * Function that returns PropertyDecorator. -- * -- * @typedef { function } TypeDecorator -- * @param { TypeConstructor } type type info -- * @returns { PropertyDecorator } Type decorator -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 12 -- */ --// export type TypeDecorator = (type: TypeConstructor) => PropertyDecorator; -- -- --/** -- * Define Type PropertyDecorator, adds type information to an object. -- * -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 12 -- */ --// export declare const Type: TypeDecorator; -- --/** -- * UIUtils is a state management tool class for operating the observed data. -- * -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 12 -- */ --export declare class UIUtils { -- /** -- * Get raw object from the Object wrapped with an ObservedObject. -- * If input parameter is a regular Object without ObservedObject, return Object itself. -- * -- * @param { T } source input source Object data. -- * @returns { T } raw object from the Object wrapped with an ObservedObject. -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 12 -- */ -- static getTarget(source: T): T; -- -- /** -- * Make non-observed data into observed data. -- * Support non-observed class, JSON.parse Object and Sendable class. -- * -- * @param { T } source input source object data. -- * @returns { T } proxy object from the source object data. -- * @syscap SystemCapability.ArkUI.ArkUI.Full -- * @crossplatform -- * @atomicservice -- * @since 12 -- */ -- static makeObserved(source: T): T; -- --} -\ No newline at end of file -diff --git a/api/arkui/stateManagement/base/iObservedObject.d.ets b/api/arkui/stateManagement/storage/appStorage.d.ets -similarity index 70% -rename from api/arkui/stateManagement/base/iObservedObject.d.ets -rename to api/arkui/stateManagement/storage/appStorage.d.ets -index 0ea4c2fe5..4a3bf1b8f 100644 ---- a/api/arkui/stateManagement/base/iObservedObject.d.ets -+++ b/api/arkui/stateManagement/storage/appStorage.d.ets -@@ -17,12 +17,7 @@ - * @kit ArkUI - * @arkts 1.2 - */ --import { int32 } from '@koalaui.runtime.common'; - --export declare interface IObservedObject { -- _permissibleAddRefDepth: int32; --} -+import { LocalStorage } from './localStorage'; - --export declare function castToIObservedObject(obj: T): T | undefined; -- --export declare function setObservationDepth(obj: T, depth: int32): void; -\ No newline at end of file -+export const AppStorage: LocalStorage = new LocalStorage(); -diff --git a/api/arkui/stateManagement/storage/environment.d.ets b/api/arkui/stateManagement/storage/environment.d.ets -new file mode 100644 -index 000000000..0a5fef29d ---- /dev/null -+++ b/api/arkui/stateManagement/storage/environment.d.ets -@@ -0,0 +1,91 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"), -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+/** -+ * @file -+ * @kit ArkUI -+ * @arkts 1.2 -+ */ -+ -+/** -+ * EnvProps object -+ * -+ * @interface EnvPropsOptions -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare interface EnvPropsOptions { -+ -+ /** -+ * Property name of Environment variable -+ * -+ * @type { string } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ key: string; -+ -+ /** -+ * DefaultValue is the default value if cannot get the environment property value -+ * -+ * @type { number | string | boolean } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ defaultValue: number | string | boolean; -+} -+ -+/** -+ * Defines the Environment interface. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare class Environment { -+ /** -+ * Creates a new property in AppStorage. The UI framework implementation takes care of updating -+ * its value whenever the named device environment property changes. Recommended use is at app startup. -+ * The function call fails and returns false if a property with given name exists in AppStorage already. -+ * It is wrong API use to access a property with given name in AppStorage before calling Environment.envProp. -+ * -+ * @param { string } key - environment property -+ * @param { T } value - is the default value if cannot get the environment property value -+ * @returns { boolean } false if method failed -+ * @static -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ static envProp(key: string, value: T): boolean; -+ -+ /** -+ * Called when multiple property values are added to Environment. -+ * -+ * @param { EnvPropsOptions[] } props environment parameter -+ * @static -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ static envProps(props: EnvPropsOptions[]): void; -+ -+ /** -+ * returns an Array of all environment property keys -+ * -+ * @returns { Array } all environment property keys -+ * @static -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ static keys(): Array; -+} -\ No newline at end of file -diff --git a/api/arkui/stateManagement/storage/localStorage.d.ets b/api/arkui/stateManagement/storage/localStorage.d.ets -new file mode 100644 -index 000000000..4ddea45ee ---- /dev/null -+++ b/api/arkui/stateManagement/storage/localStorage.d.ets -@@ -0,0 +1,197 @@ -+/* -+ * Copyright (C) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+/** -+ * @file -+ * @kit ArkUI -+ * @arkts 1.2 -+ */ -+ -+import { IStorageProperties, AbstractProperty, SubscribedAbstractProperty } from './storageProperty'; -+ -+/** -+ * LocalStorage -+ * Class implements a Map of ObservableObjectBase UI state variables. -+ * Instances can be created to manage UI state within a limited "local" -+ * access, and life cycle as defined by the app. -+ * AppStorage singleton is sub-class of LocalStorage for -+ * UI state of app-wide access and same life cycle as the app. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare class LocalStorage { -+ /** -+ * Construct new instance of LocalStorage -+ * initialize with all properties and their values that Object.keys(params) returns -+ * Property values must not be undefined. -+ * -+ * @param { Record } [initializingProperties] - Record -+ * containing keys and values. -+ * see set() for valid values -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ public constructor(initializingProperties?: Record); -+ /** -+ * Obtain a handler or an alias to LocalStorage property with given name. -+ * -+ * @param { string } propName LocalStorage property name -+ * @param {Type} ttype - data type -+ * @returns { AbstractProperty | undefined } AbstractProperty object if property with given name exists -+ * return undefined otherwise. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ public ref(propName: string, ttype: Type): AbstractProperty | undefined; -+ /** -+ * Obtain a handler or an alias to LocalStorage property with given name. -+ * -+ * If property does not exist in LocalStorage, create it with given default value. -+ * -+ * @param { string } propName LocalStorage property name -+ * @param { T } defaultValue If property does not exist in LocalStorage, -+ * create it with given default value. -+ * @param {Type} ttype - data type -+ * @returns { AbstractProperty } AbstractProperty object -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ public setAndRef(propName: string, defaultValue: T, ttype: Type): AbstractProperty; -+ /** -+ * Create and return a two-way sync "(link") to named property -+ * -+ * @param { string } propName - name of source property in LocalStorage -+ * @param { Type } ttype - data type -+ * @returns { SubscribedAbstractProperty | undefined } instance of SubscribedAbstractProperty -+ * return undefined if named property does not already exist in LocalStorage -+ * Apps can use SDK functions of base class SubscribedPropertyAbstract -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @crossplatform -+ * @since 20 -+ */ -+ public link(propName: string, ttype: Type): SubscribedAbstractProperty | undefined; -+ -+ /** -+ * Like see link(), but will create and initialize a new source property in LocalStorage if missing -+ * -+ * @param { string } propName - name of source property in LocalStorage -+ * @param { T } defaultValue - value to be used for initializing new property in LocalStorage -+ * default value must be of type T, can be undefined or null. -+ * @param { Type } ttype - data type -+ * @returns { SubscribedAbstractProperty } instance of SubscribedAbstractProperty -+ * Apps can use SDK functions of base class SubscribedAbstractProperty -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ public setAndLink(propName: string, defaultValue: T, ttype: Type): SubscribedAbstractProperty; -+ -+ /** -+ * Check if LocalStorage has a property with given name -+ * return true if property with given name exists -+ * same as ES6 Map.prototype.has() -+ * -+ * @param { string } propName - searched property -+ * @param { Type } [ttype] - data type -+ * @returns { boolean } true if property with such name exists in LocalStorage -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ public has(propName: string, ttype?: Type): boolean; -+ /** -+ * Returns value of given property -+ * return undefined if no property with this name -+ * -+ * @param { string } propName - property name -+ * @param {Type} ttype - data type -+ * @returns { T | undefined } property value if found or undefined -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ public get(propName: string, ttype: Type): T | undefined; -+ /** -+ * Set value of given property in LocalStorage -+ * Method sets nothing and returns false if property with this name does not exist in LocalStorage -+ * newValue can be undefined or null from API 20. -+ * -+ * @param { string } propName -+ * @param { T } newValue - must be of type T, can be undefined or null -+ * @returns { boolean } true on success, i.e. when above conditions are satisfied, otherwise false -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ public set(propName: string, newValue: T): boolean; -+ /** -+ * Set value of given property, if it exists, see set() . -+ * Add property if no property with given name and initialize with given value. -+ * newValue can be undefined or null from API 12 -+ * -+ * @param { string } propName -+ * @param { T } newValue - must be of type T, can be undefined or null -+ * @param { Type } ttype - data type -+ * @returns { boolean } true on success, i.e. when above conditions are satisfied, otherwise false -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ public setOrCreate(propName: string, newValue: T, ttype: Type): boolean; -+ /** -+ * Provide names of all properties in LocalStorage -+ * same as ES6 Map.prototype.keys() -+ * -+ * @returns { IterableIterator } return a Map Iterator -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ public keys(): IterableIterator; -+ /** -+ * Returns number of properties in LocalStorage -+ * same as Map.prototype.size() -+ * -+ * @returns { number } return number of properties -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ public size(): number; -+ /** -+ * Delete property from StorageBase -+ * Use with caution: -+ * Before deleting a prop from LocalStorage all its subscribers need to -+ * unsubscribe from the property. -+ * This method fails and returns false if given property still has subscribers -+ * Another reason for failing is unknown property. -+ * Developer advise: -+ * Subscribers are created with see link(), see prop() -+ * and also via @LocalStorageLink and @LocalStorageProp state variable decorators. -+ * That means as long as their is a @Component instance that uses such decorated variable -+ * or a sync relationship with a SubscribedAbstractProperty variable the property can nit -+ * (and also should not!) be deleted from LocalStorage. -+ * -+ * @param { string } propName -+ * @returns { boolean } false if method failed -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ public delete(propName: string): boolean; -+ /** -+ * Delete all properties from the LocalStorage instance -+ * Precondition is that there are no subscribers. -+ * method returns false and deletes no properties if there is any property -+ * that still has subscribers -+ * -+ * @returns { boolean } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ public clear(): boolean; -+} -\ No newline at end of file -diff --git a/api/arkui/stateManagement/storage/persistentStorage.d.ets b/api/arkui/stateManagement/storage/persistentStorage.d.ets -new file mode 100644 -index 000000000..fcb91d1ec ---- /dev/null -+++ b/api/arkui/stateManagement/storage/persistentStorage.d.ets -@@ -0,0 +1,89 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"), -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+/** -+ * @file -+ * @kit ArkUI -+ * @arkts 1.2 -+ */ -+ -+/** -+ * Defines the PersistentStorage interface. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare class PersistentStorage { -+ /** -+ * Add property 'key' to AppStorage properties whose current value will be -+ * persistent. -+ * If AppStorage does not include this property it will be added and initializes -+ * with given value -+ * -+ * @param { string } key - property name -+ * @param { Type } ttype - persist value type -+ * @param { T } defaultValue - If AppStorage does not include this property it will be initialized with this value -+ * @param { ToJSONType } [toJson] - serialization function -+ * @param { FromJSONType } [fromJson] - deserialization function -+ * @returns { boolean } -+ * @static -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ static persistProp(key: string, ttype: Type, defaultValue: T, -+ toJson?: ToJSONType, fromJson?: FromJSONType): boolean; -+ -+ /** -+ * Reverse of @see persistProp -+ * -+ * @param { string } key - no longer persist the property named key -+ * @static -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ static deleteProp(key: string): void; -+ -+ /** -+ * Inform persisted AppStorage property names -+ * -+ * @returns { Array } array of AppStorage keys -+ * @static -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ static keys(): Array; -+} -+ -+/** -+ * Define toJson type function. -+ * -+ * @typedef { function } ToJSONType -+ * @param { T } value toJson value -+ * @returns { jsonx.JsonElement } Json stringify element object -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare type ToJSONType = (value: T) => jsonx.JsonElement; -+ -+/** -+ * Define fromJson type function. -+ * -+ * @typedef { function } FromJSONType -+ * @param { jsonx.JsonElement } element json element -+ * @returns { T } deserialization result -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare type FromJSONType = (element: jsonx.JsonElement) => T; -\ No newline at end of file -diff --git a/api/arkui/stateManagement/storage/storageProperty.d.ets b/api/arkui/stateManagement/storage/storageProperty.d.ets -new file mode 100644 -index 000000000..191374a7e ---- /dev/null -+++ b/api/arkui/stateManagement/storage/storageProperty.d.ets -@@ -0,0 +1,144 @@ -+/* -+ * Copyright (C) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+/** -+ * @file -+ * @kit ArkUI -+ * @arkts 1.2 -+ */ -+ -+/** -+ * Defines the callback that is called when state variable with value is change -+ * @typedef { function } OnChangeType -+ * @param {string} propertyName - property name -+ * @param {T} newValue - the new value of state variable -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export type OnChangeType = (propertyName: string, newValue: T) => void; -+ -+/** -+ * Define AbstractProperty interface. -+ * -+ * AbstractProperty can be understood as a handler or an alias -+ * to a property inside LocalStorage / AppStorage singleton -+ * allows to read the value with @see get and to change the -+ * value with @see set. -+ * -+ * @interface AbstractProperty -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export interface AbstractProperty { -+ /** -+ * Returns the name of the referenced property -+ * -+ * @returns { string } name of the referenced property -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ info(): string { return ""; }; -+ -+ /** -+ * Returns the type of the referenced property -+ * -+ * @returns { Type } type of the referenced property -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ ttype(): Type { return Type.of(undefined); }; -+ -+ /** -+ * Reads value of the referenced AppStorage/LocalStorage property. -+ * -+ * @returns { T } value of the referenced AppStorage/LocalStorage property. -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ get(): T { return undefined; }; -+ -+ /** -+ * Assign a new value to the referenced property -+ * -+ * @param {T} newValue - a new value of the referenced property -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ set(newValue: T): void {}; -+ /** -+ * Register callback function to be called on value change of the referenced property -+ * calling with value undefined clear the callback. -+ * -+ * @param {OnChangeType | undefined} onChangeFunc - register callback function -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ onChange(onChangeFunc: OnChangeType | undefined): void {}; -+} -+ -+/** -+ * SubscribedAbstractProperty is the return value of -+ * - AppStorage static functions Link(), Prop(), SetAndLink(), and SetAndProp() -+ * - LocalStorage member methods link(), prop(), setAndLink(), and setAndProp() -+ * 'T' can be boolean, string, number or custom class. -+ * Main functions -+ * see get() reads the linked AppStorage/LocalStorage property value, -+ * see set(newValue) write a new value to the synched AppStorage/LocalStorage property -+ * see aboutToBeDeleted() ends the sync relationship with the AppStorage/LocalStorage property -+ * The app must call this function before the SubscribedAbstractProperty object -+ * goes out of scope. -+ * -+ * @extends AbstractProperty -+ * @interface SubscribedAbstractProperty -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export interface SubscribedAbstractProperty extends AbstractProperty { -+ /** -+ * An app needs to call this function before the instance of SubscribedAbstractProperty -+ * goes out of scope / is subject to garbage collection. Its purpose is to unregister the -+ * variable from the two-way/one-way sync relationship that AppStorage/LocalStorage.link()/prop() -+ * and related functions create. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ aboutToBeDeleted(): void {}; -+} -+ -+/** -+ * Define IStorageProperties interface -+ * -+ * @interface IStorageProperties -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export interface IStorageProperties { -+ /** -+ * Storage value. -+ * -+ * @type { NullishType } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ value: NullishType; -+ /** -+ * Storage variable ttype. -+ * -+ * @type { Type } -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ ttype: Type; -+} -\ No newline at end of file -diff --git a/api/arkui/stateManagement/storages/appStorage.d.ets b/api/arkui/stateManagement/storages/appStorage.d.ets -deleted file mode 100644 -index b5d4066fe..000000000 ---- a/api/arkui/stateManagement/storages/appStorage.d.ets -+++ /dev/null -@@ -1,39 +0,0 @@ --/* -- * Copyright (C) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ --/** -- * @file -- * @kit ArkUI -- * @arkts 1.2 -- */ -- --import { LocalStorage } from './localStorage'; --import { AbstractProperty, SubscribedAbstractProperty } from '../base/decoratorBase'; -- --export declare class AppStorage extends LocalStorage { -- public static ref(propName: string): AbstractProperty | undefined; -- public static setAndRef(propName: string, defaultValue: T): AbstractProperty; -- public static link(propName: string): SubscribedAbstractProperty | undefined; -- public static setAndLink(propName: string, defaultValue: T): SubscribedAbstractProperty; -- public static prop(propName: string): SubscribedAbstractProperty | undefined; -- public static setAndProp(propName: string, defaultValue: T): SubscribedAbstractProperty; -- public static has(propName: string): boolean; -- public static get(propName: string): T | undefined; -- public static set(propName: string, newValue: T): boolean; -- public static setOrCreate(propName: string, newValue: T): void; -- public static keys(): IterableIterator; -- public static size(): number; -- public static delete(propName: string): boolean; -- public static clear(): boolean; --} -\ No newline at end of file -diff --git a/api/arkui/stateManagement/storages/localStorage.d.ets b/api/arkui/stateManagement/storages/localStorage.d.ets -deleted file mode 100644 -index 96f279061..000000000 ---- a/api/arkui/stateManagement/storages/localStorage.d.ets -+++ /dev/null -@@ -1,40 +0,0 @@ --/* -- * Copyright (C) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ --/** -- * @file -- * @kit ArkUI -- * @arkts 1.2 -- */ -- --import { AbstractProperty, SubscribedAbstractProperty } from '../base/decoratorBase'; -- --export declare class LocalStorage { -- public constructor(initializingProperties?: Object); -- public static getShared(): LocalStorage | undefined; -- public ref(propName: string): AbstractProperty | undefined; -- public setAndRef(propName: string, defaultValue: T): AbstractProperty; -- public link(propName: string): SubscribedAbstractProperty | undefined; -- public setAndLink(propName: string, defaultValue: T): SubscribedAbstractProperty; -- public prop(propName: string): SubscribedAbstractProperty | undefined; -- public setAndProp(propName: string, defaultValue: T): SubscribedAbstractProperty; -- public has(propName: string): boolean; -- public get(propName: string): T | undefined; -- public set(propName: string, newValue: T): boolean; -- public setOrCreate(propName: string, newValue: T): boolean; -- public keys(): IterableIterator; -- public size(): number; -- public delete(propName: string): boolean; -- public clear(): boolean; --} -\ No newline at end of file -diff --git a/api/arkui/stateManagement/utils.d.ets b/api/arkui/stateManagement/utils.d.ets -new file mode 100644 -index 000000000..a764b6d31 ---- /dev/null -+++ b/api/arkui/stateManagement/utils.d.ets -@@ -0,0 +1,51 @@ -+/* -+ * Copyright (C) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+/** -+ * @file -+ * @kit ArkUI -+ * @arkts 1.2 -+ */ -+ -+/** -+ * UIUtils is a state management tool class for operating the observed data. -+ * -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+export declare class UIUtils { -+ /** -+ * Get raw object from the Object, like builtin type, objectLiteral. -+ * If input parameter is a regular Object without proxy, return Object itself. -+ * -+ * @param { T } source input source Object data. -+ * @returns { T } raw object. -+ * @static -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ static getTarget(source: T): T; -+ -+ /** -+ * Make non-observed data into observed data. -+ * Support builtin type and objectLiteral. -+ * -+ * @param { T } source input source object data. -+ * @returns { T } proxy object from the source object data. -+ * @static -+ * @syscap SystemCapability.ArkUI.ArkUI.Full -+ * @since 20 -+ */ -+ static makeObserved(source: T): T; -+} -\ No newline at end of file -diff --git a/api/bundleManager/AbilityInfo.d.ts b/api/bundleManager/AbilityInfo.d.ts -index d380d7c95..19e7675b4 100644 ---- a/api/bundleManager/AbilityInfo.d.ts -+++ b/api/bundleManager/AbilityInfo.d.ts -@@ -80,7 +80,7 @@ export interface AbilityInfo { - readonly bundleName: string; - - /** -- * Indicates the name of the .hap package to which the capability belongs -+ * Indicates the module name of the package to which the capability belongs - * - * @type { string } - * @readonly -@@ -88,7 +88,7 @@ export interface AbilityInfo { - * @since 9 - */ - /** -- * Indicates the name of the .hap package to which the capability belongs -+ * Indicates the module name of the package to which the capability belongs - * - * @type { string } - * @readonly -@@ -97,7 +97,7 @@ export interface AbilityInfo { - * @since 10 - */ - /** -- * Indicates the name of the .hap package to which the capability belongs -+ * Indicates the module name of the package to which the capability belongs - * - * @type { string } - * @readonly -@@ -189,7 +189,7 @@ export interface AbilityInfo { - /** - * Indicates the label id of the ability - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform -@@ -197,7 +197,7 @@ export interface AbilityInfo { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly labelId: number; -+ readonly labelId: long; - - /** - * Indicates the ability -@@ -249,7 +249,7 @@ export interface AbilityInfo { - /** - * Indicates the description id of the ability - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform -@@ -257,7 +257,7 @@ export interface AbilityInfo { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly descriptionId: number; -+ readonly descriptionId: long; - - /** - * Indicates the icon of the ability -@@ -309,7 +309,7 @@ export interface AbilityInfo { - /** - * Indicates the icon id of the ability - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform -@@ -317,7 +317,7 @@ export interface AbilityInfo { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly iconId: number; -+ readonly iconId: long; - - /** - * Process of ability, if user do not set it, the value equal application process -@@ -334,7 +334,17 @@ export interface AbilityInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Process of ability, if user do not set it, the value equal application process -+ * -+ * @type { string } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly process: string; -@@ -354,7 +364,17 @@ export interface AbilityInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates whether this ability can be called by other abilities -+ * -+ * @type { boolean } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly exported: boolean; -@@ -385,7 +405,17 @@ export interface AbilityInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Enumerates ability display orientations -+ * -+ * @type { bundleManager.DisplayOrientation } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly orientation: bundleManager.DisplayOrientation; -@@ -435,7 +465,17 @@ export interface AbilityInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * The permissions that others need to launch this ability -+ * -+ * @type { Array } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly permissions: Array; -@@ -488,7 +528,17 @@ export interface AbilityInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * The device types that this ability can run on -+ * -+ * @type { Array } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly deviceTypes: Array; -@@ -568,7 +618,17 @@ export interface AbilityInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates whether the ability is enabled -+ * -+ * @type { boolean } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly enabled: boolean; -@@ -588,7 +648,17 @@ export interface AbilityInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates which window mode is supported -+ * -+ * @type { Array } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly supportWindowModes: Array; -@@ -608,7 +678,17 @@ export interface AbilityInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates window size -+ * -+ * @type { WindowSize } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly windowSize: WindowSize; -@@ -640,25 +720,25 @@ export interface AbilityInfo { - /** - * Indicates the appIndex of application, only work in clone app mode - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly appIndex: number; -+ readonly appIndex: int; - - /** - * Indicates the orientation id of the ability - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly orientationId: number; -+ readonly orientationId: long; - } - - /** -@@ -674,7 +754,16 @@ export interface AbilityInfo { - * @typedef WindowSize - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+/** -+ * Indicates the window size. -+ * -+ * @typedef WindowSize -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - export interface WindowSize { -@@ -693,10 +782,20 @@ export interface WindowSize { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates maximum ratio of width over height of window under free window status. -+ * -+ * @type { double } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ -- readonly maxWindowRatio: number; -+ readonly maxWindowRatio: double; - - /** - * Indicates minimum ratio of width over height of window under free window status. -@@ -713,10 +812,20 @@ export interface WindowSize { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates minimum ratio of width over height of window under free window status. -+ * -+ * @type { double } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ -- readonly minWindowRatio: number; -+ readonly minWindowRatio: double; - - /** - * Indicates maximum width of window under free window status. -@@ -733,10 +842,20 @@ export interface WindowSize { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates maximum width of window under free window status. -+ * -+ * @type { long } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ -- readonly maxWindowWidth: number; -+ readonly maxWindowWidth: long; - - /** - * Indicates minimum width of window under free window status. -@@ -753,10 +872,20 @@ export interface WindowSize { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates minimum width of window under free window status. -+ * -+ * @type { long } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ -- readonly minWindowWidth: number; -+ readonly minWindowWidth: long; - - /** - * Indicates maximum height of window under free window status. -@@ -773,10 +902,20 @@ export interface WindowSize { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates maximum height of window under free window status. -+ * -+ * @type { long } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ -- readonly maxWindowHeight: number; -+ readonly maxWindowHeight: long; - - /** - * Indicates minimum height of window under free window status. -@@ -793,8 +932,18 @@ export interface WindowSize { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates minimum height of window under free window status. -+ * -+ * @type { long } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ -- readonly minWindowHeight: number; -+ readonly minWindowHeight: long; - } -diff --git a/api/bundleManager/AppProvisionInfo.d.ts b/api/bundleManager/AppProvisionInfo.d.ts -index 43351d697..fde167d36 100644 ---- a/api/bundleManager/AppProvisionInfo.d.ts -+++ b/api/bundleManager/AppProvisionInfo.d.ts -@@ -24,19 +24,21 @@ - * @typedef AppProvisionInfo - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface AppProvisionInfo { - /** - * Indicates the version code of the profile file. - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly versionCode: number; -+ readonly versionCode: long; - - /** - * Indicates the version name of the profile file. -@@ -45,7 +47,8 @@ export interface AppProvisionInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly versionName: string; - -@@ -56,7 +59,8 @@ export interface AppProvisionInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly uuid: string; - -@@ -67,7 +71,8 @@ export interface AppProvisionInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly type: string; - -@@ -78,7 +83,8 @@ export interface AppProvisionInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly appDistributionType: string; - -@@ -89,7 +95,8 @@ export interface AppProvisionInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly validity: Validity; - -@@ -100,7 +107,8 @@ export interface AppProvisionInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly developerId: string; - -@@ -111,7 +119,8 @@ export interface AppProvisionInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly certificate: string; - -@@ -122,7 +131,8 @@ export interface AppProvisionInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly apl: string; - -@@ -133,7 +143,8 @@ export interface AppProvisionInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly issuer: string; - -@@ -146,7 +157,8 @@ export interface AppProvisionInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly appIdentifier: string; - -@@ -157,7 +169,8 @@ export interface AppProvisionInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly organization: string; - } -@@ -168,28 +181,31 @@ export interface AppProvisionInfo { - * @typedef Validity - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface Validity { - /** - * Indicates the earliest validity of the profile file. - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly notBefore: number; -+ readonly notBefore: long; - - /** - * Indicates the latest validity of the profile file. - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly notAfter: number; -+ readonly notAfter: long; - } -diff --git a/api/bundleManager/ApplicationInfo.d.ts b/api/bundleManager/ApplicationInfo.d.ts -index e0e84c3d2..0ca6bfa0d 100644 ---- a/api/bundleManager/ApplicationInfo.d.ts -+++ b/api/bundleManager/ApplicationInfo.d.ts -@@ -128,7 +128,7 @@ export interface ApplicationInfo { - /** - * Indicates the description id of the application - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform -@@ -136,7 +136,7 @@ export interface ApplicationInfo { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly descriptionId: number; -+ readonly descriptionId: long; - - /** - * Indicates whether or not this application may be instantiated -@@ -153,7 +153,17 @@ export interface ApplicationInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates whether or not this application may be instantiated -+ * -+ * @type { boolean } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly enabled: boolean; -@@ -208,7 +218,7 @@ export interface ApplicationInfo { - /** - * Indicates the label id of the application - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform -@@ -216,7 +226,7 @@ export interface ApplicationInfo { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly labelId: number; -+ readonly labelId: long; - - /** - * Indicates the icon of the application -@@ -268,7 +278,7 @@ export interface ApplicationInfo { - /** - * Indicates the icon id of the application - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform -@@ -276,7 +286,7 @@ export interface ApplicationInfo { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly iconId: number; -+ readonly iconId: long; - - /** - * Process of application, if user do not set it ,the value equal bundleName -@@ -293,7 +303,17 @@ export interface ApplicationInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Process of application, if user do not set it ,the value equal bundleName -+ * -+ * @type { string } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly process: string; -@@ -313,7 +333,17 @@ export interface ApplicationInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the permissions required for accessing the application. -+ * -+ * @type { Array } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly permissions: Array; -@@ -375,7 +405,17 @@ export interface ApplicationInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the metadata of the application -+ * -+ * @type { Array } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly metadataArray: Array; -@@ -395,7 +435,17 @@ export interface ApplicationInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates whether or not this application may be removable -+ * -+ * @type { boolean } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly removable: boolean; -@@ -415,10 +465,20 @@ export interface ApplicationInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the access token of the application -+ * -+ * @type { long } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ -- readonly accessTokenId: number; -+ readonly accessTokenId: long; - - /** - * Indicates the uid of the application -@@ -435,10 +495,20 @@ export interface ApplicationInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the uid of the application -+ * -+ * @type { int } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ -- readonly uid: number; -+ readonly uid: int; - - /** - * Indicates icon resource of the application -@@ -455,7 +525,17 @@ export interface ApplicationInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates icon resource of the application -+ * -+ * @type { Resource } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly iconResource: Resource; -@@ -475,7 +555,17 @@ export interface ApplicationInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates label resource of the application -+ * -+ * @type { Resource } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly labelResource: Resource; -@@ -495,7 +585,17 @@ export interface ApplicationInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates description resource of the application -+ * -+ * @type { Resource } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly descriptionResource: Resource; -@@ -515,7 +615,17 @@ export interface ApplicationInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the appDistributionType of the application -+ * -+ * @type { string } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly appDistributionType: string; -@@ -535,7 +645,17 @@ export interface ApplicationInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the appProvisionType of the application -+ * -+ * @type { string } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly appProvisionType: string; -@@ -555,7 +675,17 @@ export interface ApplicationInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates whether the application is a system application -+ * -+ * @type { boolean } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly systemApp: boolean; -@@ -595,7 +725,17 @@ export interface ApplicationInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates whether the application is in debug mode. -+ * -+ * @type { boolean } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly debug: boolean; -@@ -607,7 +747,17 @@ export interface ApplicationInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates whether the application data is unclearable, that is, whether the application data cannot be cleared. -+ * -+ * @type { boolean } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly dataUnclearable: boolean; -@@ -618,7 +768,16 @@ export interface ApplicationInfo { - * @type { string } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Indicates native library path. -+ * -+ * @type { string } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly nativeLibraryPath: string; -@@ -637,13 +796,13 @@ export interface ApplicationInfo { - /** - * Indicates the index of the bundle - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly appIndex: number; -+ readonly appIndex: int; - - /** - * Indicates sources to install the app -@@ -664,7 +823,17 @@ export interface ApplicationInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Indicates the release type of the app -+ * -+ * @type { string } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly releaseType: string; -@@ -684,14 +853,14 @@ export interface ApplicationInfo { - /** - * Indicates the flags of the application. - * -- * @type { ?number } -+ * @type { ?int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly flags?: number; -+ readonly flags?: int; - } - - /** -@@ -707,7 +876,16 @@ export interface ApplicationInfo { - * @typedef ModuleMetadata - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+/** -+ * Indicates the ModuleMetadata -+ * -+ * @typedef ModuleMetadata -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - export interface ModuleMetadata { -@@ -726,7 +904,17 @@ export interface ModuleMetadata { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the name of this hap module -+ * -+ * @type { string } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly moduleName: string; -@@ -746,7 +934,17 @@ export interface ModuleMetadata { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the metadata of this hap module -+ * -+ * @type { Array } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly metadata: Array; -@@ -775,13 +973,13 @@ export interface MultiAppMode { - /** - * Indicates the max count of the bundle - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly maxCount: number; -+ readonly maxCount: int; - } - - /** -@@ -822,24 +1020,24 @@ export interface PreinstalledApplicationInfo { - /** - * Indicates the icon id of the application - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly iconId: number; -+ readonly iconId: long; - - /** - * Indicates the label id of the application - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly labelId: number; -+ readonly labelId: long; - } -\ No newline at end of file -diff --git a/api/bundleManager/BundleInfo.d.ts b/api/bundleManager/BundleInfo.d.ts -index 14e62627c..39159d0df 100644 ---- a/api/bundleManager/BundleInfo.d.ts -+++ b/api/bundleManager/BundleInfo.d.ts -@@ -35,7 +35,16 @@ import bundleManager from './../@ohos.bundle.bundleManager'; - * @typedef BundleInfo - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+/** -+ * Obtains configuration information about a bundle -+ * -+ * @typedef BundleInfo -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - export interface BundleInfo { -@@ -54,7 +63,17 @@ export interface BundleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the name of this bundle -+ * -+ * @type { string } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly name: string; -@@ -74,7 +93,17 @@ export interface BundleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the bundle vendor -+ * -+ * @type { string } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly vendor: string; -@@ -94,10 +123,20 @@ export interface BundleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the version code of the bundle -+ * -+ * @type { long } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ -- readonly versionCode: number; -+ readonly versionCode: long; - - /** - * Indicates the version name of the bundle -@@ -114,7 +153,17 @@ export interface BundleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the version name of the bundle -+ * -+ * @type { string } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly versionName: string; -@@ -134,10 +183,20 @@ export interface BundleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the **minimum ** version compatible with the bundle -+ * -+ * @type { int } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ -- readonly minCompatibleVersionCode: number; -+ readonly minCompatibleVersionCode: int; - - /** - * Indicates the target version number of the bundle -@@ -154,10 +213,20 @@ export interface BundleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the target version number of the bundle -+ * -+ * @type { int } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ -- readonly targetVersion: number; -+ readonly targetVersion: int; - - /** - * Obtains configuration information about an application -@@ -174,7 +243,17 @@ export interface BundleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Obtains configuration information about an application -+ * -+ * @type { ApplicationInfo } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly appInfo: ApplicationInfo; -@@ -194,7 +273,17 @@ export interface BundleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Obtains configuration information about a module -+ * -+ * @type { Array } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly hapModulesInfo: Array; -@@ -214,7 +303,17 @@ export interface BundleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the required permissions details defined in the bundle -+ * -+ * @type { Array } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly reqPermissionDetails: Array; -@@ -234,7 +333,17 @@ export interface BundleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the grant state of required permissions -+ * -+ * @type { Array } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly permissionGrantStates: Array; -@@ -254,7 +363,17 @@ export interface BundleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the SignatureInfo of the bundle -+ * -+ * @type { SignatureInfo } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly signatureInfo: SignatureInfo; -@@ -270,14 +389,14 @@ export interface BundleInfo { - /** - * Indicates the hap install time - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly installTime: number; -+ readonly installTime: long; - - /** - * Indicates the hap update time -@@ -290,14 +409,14 @@ export interface BundleInfo { - /** - * Indicates the hap update time - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly updateTime: number; -+ readonly updateTime: long; - - /** - * Indicates the router information of the application -@@ -314,25 +433,25 @@ export interface BundleInfo { - /** - * Indicates the appIndex of application, only work in appClone mode - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly appIndex: number; -+ readonly appIndex: int; - - /** - * Indicates the hap first install time - * -- * @type { ?number } -+ * @type { ?long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly firstInstallTime?: number; -+ readonly firstInstallTime?: long; - } - - /** -@@ -348,7 +467,16 @@ export interface BundleInfo { - * @typedef ReqPermissionDetail - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+/** -+ * Indicates the required permissions details defined in configuration file -+ * -+ * @typedef ReqPermissionDetail -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - export interface ReqPermissionDetail { -@@ -365,7 +493,16 @@ export interface ReqPermissionDetail { - * @type { string } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the name of this required permissions -+ * -+ * @type { string } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - name: string; -@@ -401,7 +538,16 @@ export interface ReqPermissionDetail { - * @type { string } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the reason of this required permissions -+ * -+ * @type { string } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - reason: string; -@@ -419,10 +565,19 @@ export interface ReqPermissionDetail { - * @type { number } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the reason id of this required permissions -+ * -+ * @type { long } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ -- reasonId: number; -+ reasonId: long; - - /** - * Indicates the used scene of this required permissions -@@ -437,7 +592,16 @@ export interface ReqPermissionDetail { - * @type { UsedScene } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the used scene of this required permissions -+ * -+ * @type { UsedScene } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - usedScene: UsedScene; -@@ -456,7 +620,16 @@ export interface ReqPermissionDetail { - * @typedef UsedScene - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+/** -+ * The scene which is used -+ * -+ * @typedef UsedScene -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - export interface UsedScene { -@@ -473,7 +646,16 @@ export interface UsedScene { - * @type { Array } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the abilities that need the permission -+ * -+ * @type { Array } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - abilities: Array; -@@ -491,7 +673,16 @@ export interface UsedScene { - * @type { string } - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the time when the permission is used -+ * -+ * @type { string } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - when: string; -@@ -510,7 +701,16 @@ export interface UsedScene { - * @typedef SignatureInfo - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+/** -+ * Indicates SignatureInfo -+ * -+ * @typedef SignatureInfo -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - export interface SignatureInfo { -@@ -531,7 +731,18 @@ export interface SignatureInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the ID of the application to which this bundle belongs -+ * The application ID uniquely identifies an application. It is determined by the bundle name and signature -+ * -+ * @type { string } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly appId: string; -@@ -551,7 +762,17 @@ export interface SignatureInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the fingerprint of the certificate -+ * -+ * @type { string } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly fingerprint: string; -@@ -605,11 +826,11 @@ export interface AppCloneIdentity { - /** - * Indicates the index of clone app. - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since arkts {'1.1':'14', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly appIndex: number; -+ readonly appIndex: int; - } -diff --git a/api/bundleManager/BundlePackInfo.d.ts b/api/bundleManager/BundlePackInfo.d.ts -index e8ea4a275..60ea30db7 100644 ---- a/api/bundleManager/BundlePackInfo.d.ts -+++ b/api/bundleManager/BundlePackInfo.d.ts -@@ -479,14 +479,14 @@ export interface AbilityFormInfo { - /** - * Indicates the update duration - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly updateDuration: number; -+ readonly updateDuration: int; - - /** - * Indicates the ability support dimensions -@@ -526,14 +526,14 @@ export interface Version { - /** - * Indicates the min compatible code of this version - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly minCompatibleVersionCode: number; -+ readonly minCompatibleVersionCode: int; - - /** - * Indicates the name of this version -@@ -550,14 +550,14 @@ export interface Version { - /** - * Indicates the code of this version - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly code: number; -+ readonly code: int; - } - - /** -@@ -585,24 +585,24 @@ export interface ApiVersion { - /** - * Indicates the compatible version code of the api - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly compatible: number; -+ readonly compatible: int; - - /** - * Indicates the target version code of the api - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.FreeInstall - * @systemapi - * @since arkts {'1.1':'9', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly target: number; -+ readonly target: int; - } -diff --git a/api/bundleManager/BundleResourceInfo.d.ts b/api/bundleManager/BundleResourceInfo.d.ts -index 6952f3d65..3c597f579 100644 ---- a/api/bundleManager/BundleResourceInfo.d.ts -+++ b/api/bundleManager/BundleResourceInfo.d.ts -@@ -18,9 +18,7 @@ - * @kit AbilityKit - */ - --/*** if arkts 1.1 */ - import { DrawableDescriptor } from './../@ohos.arkui.drawableDescriptor'; --/*** endif */ - - /** - * Obtains resource information about a bundle -@@ -75,19 +73,20 @@ export interface BundleResourceInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Resource - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly drawableDescriptor: DrawableDescriptor; - - /** - * Indicates the index of the bundle - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Resource - * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly appIndex: number; -+ readonly appIndex: int; - } -diff --git a/api/bundleManager/ExtensionAbilityInfo.d.ts b/api/bundleManager/ExtensionAbilityInfo.d.ts -index d86329417..c4fb184a0 100644 ---- a/api/bundleManager/ExtensionAbilityInfo.d.ts -+++ b/api/bundleManager/ExtensionAbilityInfo.d.ts -@@ -111,14 +111,14 @@ export interface ExtensionAbilityInfo { - /** - * Indicates the label id of the extension ability info - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly labelId: number; -+ readonly labelId: long; - - /** - * Indicates the description id of the extension ability info -@@ -131,14 +131,14 @@ export interface ExtensionAbilityInfo { - /** - * Indicates the description id of the extension ability info - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly descriptionId: number; -+ readonly descriptionId: long; - - /** - * Indicates the icon id of the extension ability info -@@ -151,14 +151,14 @@ export interface ExtensionAbilityInfo { - /** - * Indicates the icon id of the extension ability info - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly iconId: number; -+ readonly iconId: long; - - /** - * Indicates whether this ability can be called by other abilities -@@ -347,11 +347,11 @@ export interface ExtensionAbilityInfo { - /** - * Indicates the appIndex of extension ability, only work in clone app mode - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly appIndex: number; -+ readonly appIndex: int; - } -diff --git a/api/bundleManager/HapModuleInfo.d.ts b/api/bundleManager/HapModuleInfo.d.ts -index e662cfcf4..d9f0e8db6 100644 ---- a/api/bundleManager/HapModuleInfo.d.ts -+++ b/api/bundleManager/HapModuleInfo.d.ts -@@ -129,7 +129,7 @@ export interface HapModuleInfo { - /** - * Indicates the icon id of this hap module - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform -@@ -137,7 +137,7 @@ export interface HapModuleInfo { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly iconId: number; -+ readonly iconId: long; - - /** - * Indicates the label of this hap module -@@ -189,7 +189,7 @@ export interface HapModuleInfo { - /** - * Indicates the label id of this hap module - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform -@@ -197,7 +197,7 @@ export interface HapModuleInfo { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly labelId: number; -+ readonly labelId: long; - - /** - * Describes the hap module -@@ -249,7 +249,7 @@ export interface HapModuleInfo { - /** - * Indicates the description of this hap module - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @crossplatform -@@ -257,7 +257,7 @@ export interface HapModuleInfo { - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly descriptionId: number; -+ readonly descriptionId: long; - - /** - * Indicates main elementName of the hap module -@@ -384,7 +384,17 @@ export interface HapModuleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * The device types that this hap module can run on -+ * -+ * @type { Array } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly deviceTypes: Array; -@@ -404,7 +414,17 @@ export interface HapModuleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates whether free installation of the hap module is supported -+ * -+ * @type { boolean } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly installationFree: boolean; -@@ -424,7 +444,17 @@ export interface HapModuleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the hash value of the hap module -+ * -+ * @type { string } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly hashValue: string; -@@ -444,7 +474,17 @@ export interface HapModuleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice -- * @since arkts {'1.1':'11', '1.2':'20'} -+ * @since 11 -+ */ -+ /** -+ * Indicates the type of the module -+ * -+ * @type { bundleManager.ModuleType } -+ * @readonly -+ * @syscap SystemCapability.BundleManager.BundleFramework.Core -+ * @crossplatform -+ * @atomicservice -+ * @since 20 - * @arkts 1.1&1.2 - */ - readonly type: bundleManager.ModuleType; -@@ -524,7 +564,7 @@ export interface HapModuleInfo { - */ - readonly nativeLibraryPath: string; - -- /** -+ /** - * Indicates the code path - * - * @type { string } -@@ -534,7 +574,7 @@ export interface HapModuleInfo { - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly codePath: string; -+ readonly codePath: string; - } - - /** -@@ -605,14 +645,14 @@ export interface Dependency { - /** - * Indicates the version code of the dependency - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly versionCode: number; -+ readonly versionCode: long; - } - - /** -diff --git a/api/bundleManager/LauncherAbilityInfo.d.ts b/api/bundleManager/LauncherAbilityInfo.d.ts -index de21df51c..22b5bb431 100644 ---- a/api/bundleManager/LauncherAbilityInfo.d.ts -+++ b/api/bundleManager/LauncherAbilityInfo.d.ts -@@ -55,44 +55,44 @@ export interface LauncherAbilityInfo { - /** - * Obtains labelId about an launcher ability. - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly labelId: number; -+ readonly labelId: long; - - /** - * Obtains iconId about an launcher ability. - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly iconId: number; -+ readonly iconId: long; - - /** - * Obtains userId about an launcher ability. - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly userId: number; -+ readonly userId: int; - - /** - * Obtains installTime about an launcher ability. - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly installTime: number; -+ readonly installTime: long; - } -diff --git a/api/bundleManager/LauncherAbilityResourceInfo.d.ts b/api/bundleManager/LauncherAbilityResourceInfo.d.ts -index bd303e501..930c593c6 100644 ---- a/api/bundleManager/LauncherAbilityResourceInfo.d.ts -+++ b/api/bundleManager/LauncherAbilityResourceInfo.d.ts -@@ -18,9 +18,7 @@ - * @kit AbilityKit - */ - --/*** if arkts 1.1 */ - import { DrawableDescriptor } from './../@ohos.arkui.drawableDescriptor'; --/*** endif */ - - /** - * Obtains resource information about a launcher ability -@@ -99,19 +97,20 @@ export interface LauncherAbilityResourceInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Resource - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly drawableDescriptor: DrawableDescriptor; - - /** - * Indicates the index of the bundle - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Resource - * @systemapi - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly appIndex: number; -+ readonly appIndex: int; - } -diff --git a/api/bundleManager/Metadata.d.ts b/api/bundleManager/Metadata.d.ts -index da2d1b139..e049546ef 100644 ---- a/api/bundleManager/Metadata.d.ts -+++ b/api/bundleManager/Metadata.d.ts -@@ -129,12 +129,12 @@ export interface Metadata { - /** - * Indicates the value id of the metadata - * -- * @type { ?number } -+ * @type { ?long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice - * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly valueId?: number; -+ readonly valueId?: long; - } -diff --git a/api/bundleManager/OverlayModuleInfo.d.ts b/api/bundleManager/OverlayModuleInfo.d.ts -index aa2b660c7..1c9f68037 100644 ---- a/api/bundleManager/OverlayModuleInfo.d.ts -+++ b/api/bundleManager/OverlayModuleInfo.d.ts -@@ -63,22 +63,22 @@ export interface OverlayModuleInfo { - /** - * Indicates the priority of the overlay module - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly priority: number; -+ readonly priority: int; - - /** - * Indicates the state of the overlay module - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @since arkts {'1.1':'10', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly state: number; -+ readonly state: int; - } -diff --git a/api/bundleManager/PermissionDef.d.ts b/api/bundleManager/PermissionDef.d.ts -index 6d6634bea..8b7847b0b 100644 ---- a/api/bundleManager/PermissionDef.d.ts -+++ b/api/bundleManager/PermissionDef.d.ts -@@ -24,7 +24,8 @@ - * @typedef PermissionDef - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface PermissionDef { - /** -@@ -34,40 +35,44 @@ export interface PermissionDef { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly permissionName: string; - - /** - * Indicates the grant mode of this permission - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly grantMode: number; -+ readonly grantMode: int; - - /** - * Indicates the labelId of this permission - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly labelId: number; -+ readonly labelId: long; - - /** - * Indicates the descriptionId of this permission - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly descriptionId: number; -+ readonly descriptionId: long; - } -diff --git a/api/bundleManager/PluginBundleInfo.d.ts b/api/bundleManager/PluginBundleInfo.d.ts -index d3bc13ecb..c92159c05 100644 ---- a/api/bundleManager/PluginBundleInfo.d.ts -+++ b/api/bundleManager/PluginBundleInfo.d.ts -@@ -24,7 +24,8 @@ - * @typedef PluginBundleInfo - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface PluginBundleInfo { - /** -@@ -34,20 +35,22 @@ export interface PluginBundleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly label: string; - - /** - * Indicates the label id of the plugin - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly labelId: number; -+ readonly labelId: long; - - /** - * Indicates the icon of the plugin -@@ -56,20 +59,22 @@ export interface PluginBundleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly icon: string; - - /** - * Indicates the icon id of the plugin - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly iconId: number; -+ readonly iconId: long; - - /** - * Indicates the name of the plugin -@@ -78,20 +83,22 @@ export interface PluginBundleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly pluginBundleName: string; - - /** - * Indicates the version code of the plugin - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly versionCode: number; -+ readonly versionCode: long; - - /** - * Indicates the version name of the plugin -@@ -100,7 +107,8 @@ export interface PluginBundleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly versionName: string; - -@@ -111,7 +119,8 @@ export interface PluginBundleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly pluginModuleInfos: Array; - } -@@ -122,7 +131,8 @@ export interface PluginBundleInfo { - * @typedef PluginModuleInfo - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface PluginModuleInfo { - /** -@@ -132,20 +142,22 @@ export interface PluginModuleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly moduleName: string; - - /** - * Indicates the description of the plugin - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly descriptionId: number; -+ readonly descriptionId: long; - - /** - * Describes the plugin -@@ -154,7 +166,8 @@ export interface PluginModuleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 19 -+ * @since arkts {'1.1':'19', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly description: string; - } -\ No newline at end of file -diff --git a/api/bundleManager/RecoverableApplicationInfo.d.ts b/api/bundleManager/RecoverableApplicationInfo.d.ts -index 62b36b0ea..144d48471 100644 ---- a/api/bundleManager/RecoverableApplicationInfo.d.ts -+++ b/api/bundleManager/RecoverableApplicationInfo.d.ts -@@ -26,7 +26,8 @@ import bundleManager from './../@ohos.bundle.bundleManager'; - * @typedef RecoverableApplicationInfo - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface RecoverableApplicationInfo { - /** -@@ -36,7 +37,8 @@ export interface RecoverableApplicationInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly bundleName: string; - -@@ -47,31 +49,34 @@ export interface RecoverableApplicationInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly moduleName: string; - - /** - * Indicates the label id - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly labelId: number; -+ readonly labelId: long; - - /** - * Indicates the icon id - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly iconId: number; -+ readonly iconId: long; - - /** - * Indicates whether the application is a system application -@@ -80,7 +85,8 @@ export interface RecoverableApplicationInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly systemApp: boolean; - -@@ -91,7 +97,8 @@ export interface RecoverableApplicationInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly bundleType: bundleManager.BundleType; - -@@ -102,7 +109,8 @@ export interface RecoverableApplicationInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly codePaths: Array; - } -diff --git a/api/bundleManager/RemoteAbilityInfo.d.ts b/api/bundleManager/RemoteAbilityInfo.d.ts -index efd294bc3..217b88d04 100644 ---- a/api/bundleManager/RemoteAbilityInfo.d.ts -+++ b/api/bundleManager/RemoteAbilityInfo.d.ts -@@ -26,7 +26,8 @@ import { ElementName } from './ElementName'; - * @typedef RemoteAbilityInfo - * @syscap SystemCapability.BundleManager.DistributedBundleFramework - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface RemoteAbilityInfo { - /** -@@ -36,7 +37,8 @@ export interface RemoteAbilityInfo { - * @readonly - * @syscap SystemCapability.BundleManager.DistributedBundleFramework - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly elementName: ElementName; - -@@ -47,7 +49,8 @@ export interface RemoteAbilityInfo { - * @readonly - * @syscap SystemCapability.BundleManager.DistributedBundleFramework - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly label: string; - -@@ -58,7 +61,8 @@ export interface RemoteAbilityInfo { - * @readonly - * @syscap SystemCapability.BundleManager.DistributedBundleFramework - * @systemapi -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly icon: string; - } -diff --git a/api/bundleManager/SharedBundleInfo.d.ts b/api/bundleManager/SharedBundleInfo.d.ts -index 3e8078810..e5ce19fff 100644 ---- a/api/bundleManager/SharedBundleInfo.d.ts -+++ b/api/bundleManager/SharedBundleInfo.d.ts -@@ -27,7 +27,8 @@ import bundleManager from '../@ohos.bundle.bundleManager'; - * @typedef SharedBundleInfo - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface SharedBundleInfo { - /** -@@ -37,7 +38,8 @@ export interface SharedBundleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly name: string; - -@@ -48,7 +50,8 @@ export interface SharedBundleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly compatiblePolicy: bundleManager.CompatiblePolicy; - -@@ -59,7 +62,8 @@ export interface SharedBundleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly sharedModuleInfo: Array; - } -@@ -70,7 +74,8 @@ export interface SharedBundleInfo { - * @typedef SharedModuleInfo - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface SharedModuleInfo { - /** -@@ -80,20 +85,22 @@ export interface SharedModuleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly name: string; - - /** - * Indicates the version code of the shared module - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly versionCode: number; -+ readonly versionCode: long; - - /** - * Indicates the version name of the shared module -@@ -102,7 +109,8 @@ export interface SharedModuleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly versionName: string; - -@@ -113,18 +121,20 @@ export interface SharedModuleInfo { - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - readonly description: string; - - /** - * Indicates the description of this shared module - * -- * @type { number } -+ * @type { long } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- readonly descriptionId: number; -+ readonly descriptionId: long; - } -diff --git a/api/bundleManager/ShortcutInfo.d.ts b/api/bundleManager/ShortcutInfo.d.ts -index 9654cd59f..f36d271a2 100644 ---- a/api/bundleManager/ShortcutInfo.d.ts -+++ b/api/bundleManager/ShortcutInfo.d.ts -@@ -24,7 +24,14 @@ - * @typedef ShortcutInfo - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'9', '1.2':'20'} -+ * @since 9 -+ */ -+/** -+ * Provides information about a shortcut, including the shortcut ID and label. -+ * -+ * @typedef ShortcutInfo -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - export interface ShortcutInfo { -@@ -43,7 +50,14 @@ export interface ShortcutInfo { - * @type { string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Indicates the ID of the application to which this shortcut belongs -+ * -+ * @type { string } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - id: string; -@@ -63,7 +77,14 @@ export interface ShortcutInfo { - * @type { string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Indicates the name of the bundle containing the shortcut -+ * -+ * @type { string } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - bundleName: string; -@@ -83,7 +104,14 @@ export interface ShortcutInfo { - * @type { ?string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Indicates the moduleName of the shortcut -+ * -+ * @type { ?string } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - moduleName?: string; -@@ -103,7 +131,14 @@ export interface ShortcutInfo { - * @type { ?string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Indicates the host ability of the shortcut -+ * -+ * @type { ?string } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - hostAbility?: string; -@@ -123,7 +158,14 @@ export interface ShortcutInfo { - * @type { ?string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Indicates the icon of the shortcut -+ * -+ * @type { ?string } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - icon?: string; -@@ -143,10 +185,17 @@ export interface ShortcutInfo { - * @type { ?number } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Indicates the icon id of the shortcut -+ * -+ * @type { ?long } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ -- iconId?: number; -+ iconId?: long; - - /** - * Indicates the label of the shortcut -@@ -163,7 +212,14 @@ export interface ShortcutInfo { - * @type { ?string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Indicates the label of the shortcut -+ * -+ * @type { ?string } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - label?: string; -@@ -183,10 +239,17 @@ export interface ShortcutInfo { - * @type { ?number } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Indicates the label id of the shortcut -+ * -+ * @type { ?long } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ -- labelId?: number; -+ labelId?: long; - - /** - * Indicates the wants of the shortcut -@@ -203,7 +266,14 @@ export interface ShortcutInfo { - * @type { ?Array } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Indicates the wants of the shortcut -+ * -+ * @type { ?Array } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - wants?: Array; -@@ -214,10 +284,17 @@ export interface ShortcutInfo { - * @type { number } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Indicates the index of application clone. -+ * -+ * @type { int } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ -- appIndex: number; -+ appIndex: int; - - /** - * Indicates the source type of shortcut. -@@ -225,10 +302,17 @@ export interface ShortcutInfo { - * @type { number } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Indicates the source type of shortcut. -+ * -+ * @type { int } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ -- sourceType: number; -+ sourceType: int; - } - - /** -@@ -237,7 +321,14 @@ export interface ShortcutInfo { - * @typedef ShortcutWant - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'9', '1.2':'20'} -+ * @since 9 -+ */ -+/** -+ * Obtains information about the ability that a shortcut will start. -+ * -+ * @typedef ShortcutWant -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - export interface ShortcutWant { -@@ -256,7 +347,14 @@ export interface ShortcutWant { - * @type { string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Indicates the target bundle of the shortcut want -+ * -+ * @type { string } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - targetBundle: string; -@@ -276,7 +374,14 @@ export interface ShortcutWant { - * @type { ?string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Indicates the target module of the shortcut want -+ * -+ * @type { ?string } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - targetModule?: string; -@@ -296,7 +401,14 @@ export interface ShortcutWant { - * @type { string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Indicates the target ability of the shortcut want -+ * -+ * @type { string } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - targetAbility: string; -@@ -307,7 +419,14 @@ export interface ShortcutWant { - * @type { ?Array } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Indicates the parameters of the shortcut want -+ * -+ * @type { ?Array } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - parameters?: Array; -@@ -319,7 +438,14 @@ export interface ShortcutWant { - * @typedef ParameterItem - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+/** -+ * Obtains information about the ability that a shortcut will start. -+ * -+ * @typedef ParameterItem -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - export interface ParameterItem { -@@ -329,7 +455,14 @@ export interface ParameterItem { - * @type { string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Indicates the key of the parameter item. -+ * -+ * @type { string } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - key: string; -@@ -340,7 +473,14 @@ export interface ParameterItem { - * @type { string } - * @syscap SystemCapability.BundleManager.BundleFramework.Launcher - * @systemapi -- * @since arkts {'1.1':'12', '1.2':'20'} -+ * @since 12 -+ */ -+ /** -+ * Indicates the value of the parameter item. -+ * -+ * @type { string } -+ * @syscap SystemCapability.BundleManager.BundleFramework.Launcher -+ * @since 20 - * @arkts 1.1&1.2 - */ - value: string; -diff --git a/api/bundleManager/Skill.d.ts b/api/bundleManager/Skill.d.ts -index 7e09ec678..ddaedcf47 100644 ---- a/api/bundleManager/Skill.d.ts -+++ b/api/bundleManager/Skill.d.ts -@@ -114,14 +114,14 @@ export interface SkillUri { - /** - * Indicates the port of the skillUri - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly port: number; -+ readonly port: int; - - /** - * Indicates the path of the skillUri -@@ -186,14 +186,14 @@ export interface SkillUri { - /** - * Indicates the maxFileSupported of the skillUri - * -- * @type { number } -+ * @type { int } - * @readonly - * @syscap SystemCapability.BundleManager.BundleFramework.Core - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- readonly maxFileSupported: number; -+ readonly maxFileSupported: int; - - /** - * Indicates the linkFeature of the skillUri -diff --git a/api/commonEvent/commonEventData.d.ts b/api/commonEvent/commonEventData.d.ts -index 7b8710b26..24833aee3 100644 ---- a/api/commonEvent/commonEventData.d.ts -+++ b/api/commonEvent/commonEventData.d.ts -@@ -140,9 +140,8 @@ export interface CommonEventData { - /** - * The description of the parameters in a common event. - * -- * @type { ?object } -+ * @type { ?Record } - * @syscap SystemCapability.Notification.CommonEvent -- * @atomicservice - * @since 20 - * @arkts 1.2 - */ -diff --git a/api/commonEvent/commonEventPublishData.d.ts b/api/commonEvent/commonEventPublishData.d.ts -index 40d88120e..6b71b21ca 100644 ---- a/api/commonEvent/commonEventPublishData.d.ts -+++ b/api/commonEvent/commonEventPublishData.d.ts -@@ -169,9 +169,8 @@ export interface CommonEventPublishData { - /** - * The description of the parameters in a common event. - * -- * @type { ?object } -+ * @type { ?Record } - * @syscap SystemCapability.Notification.CommonEvent -- * @atomicservice - * @since 20 - * @arkts 1.2 - */ -diff --git a/api/commonEvent/commonEventSubscriber.d.ts b/api/commonEvent/commonEventSubscriber.d.ts -index 321161fc2..89e27ea03 100644 ---- a/api/commonEvent/commonEventSubscriber.d.ts -+++ b/api/commonEvent/commonEventSubscriber.d.ts -@@ -22,6 +22,10 @@ - import { AsyncCallback } from './../@ohos.base'; - import { CommonEventSubscribeInfo } from './commonEventSubscribeInfo'; - /*** endif */ -+/*** if arkts 1.2 */ -+import { AsyncCallback } from './../@ohos.base'; -+import { CommonEventSubscribeInfo } from './commonEventSubscribeInfo'; -+/*** endif */ - - /** - * the subscriber of common event -@@ -57,7 +61,8 @@ export interface CommonEventSubscriber { - *
    2. Incorrect parameter types. 3. Parameter verification failed. - * @syscap SystemCapability.Notification.CommonEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getCode(callback: AsyncCallback): void; - -@@ -74,7 +79,8 @@ export interface CommonEventSubscriber { - * @returns { Promise } Returns code of this common event - * @syscap SystemCapability.Notification.CommonEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getCode(): Promise; - -@@ -91,7 +97,8 @@ export interface CommonEventSubscriber { - * @returns { number } Returns code of this common event - * @syscap SystemCapability.Notification.CommonEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getCodeSync(): number; - -@@ -114,7 +121,8 @@ export interface CommonEventSubscriber { - *
    2. Incorrect parameter types. 3. Parameter verification failed. - * @syscap SystemCapability.Notification.CommonEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setCode(code: number, callback: AsyncCallback): void; - -@@ -137,7 +145,8 @@ export interface CommonEventSubscriber { - *
    2. Incorrect parameter types. 3. Parameter verification failed. - * @syscap SystemCapability.Notification.CommonEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setCode(code: number): Promise; - -@@ -158,7 +167,8 @@ export interface CommonEventSubscriber { - *
    2. Incorrect parameter types. 3. Parameter verification failed. - * @syscap SystemCapability.Notification.CommonEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setCodeSync(code: number): void; - -@@ -179,7 +189,8 @@ export interface CommonEventSubscriber { - *
    2. Incorrect parameter types. 3. Parameter verification failed. - * @syscap SystemCapability.Notification.CommonEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getData(callback: AsyncCallback): void; - -@@ -196,7 +207,8 @@ export interface CommonEventSubscriber { - * @returns { Promise } Returns data of this common event - * @syscap SystemCapability.Notification.CommonEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getData(): Promise; - -@@ -213,7 +225,8 @@ export interface CommonEventSubscriber { - * @returns { string } Returns data of this common event - * @syscap SystemCapability.Notification.CommonEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getDataSync(): string; - -@@ -236,7 +249,8 @@ export interface CommonEventSubscriber { - *
    2. Incorrect parameter types. 3. Parameter verification failed. - * @syscap SystemCapability.Notification.CommonEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setData(data: string, callback: AsyncCallback): void; - -@@ -259,7 +273,8 @@ export interface CommonEventSubscriber { - *
    2. Incorrect parameter types. 3. Parameter verification failed. - * @syscap SystemCapability.Notification.CommonEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setData(data: string): Promise; - -@@ -280,7 +295,8 @@ export interface CommonEventSubscriber { - *
    2. Incorrect parameter types. 3. Parameter verification failed. - * @syscap SystemCapability.Notification.CommonEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setDataSync(data: string): void; - -@@ -305,7 +321,8 @@ export interface CommonEventSubscriber { - *
    2. Incorrect parameter types. 3. Parameter verification failed. - * @syscap SystemCapability.Notification.CommonEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setCodeAndData(code: number, data: string, callback: AsyncCallback): void; - -@@ -330,7 +347,8 @@ export interface CommonEventSubscriber { - *
    2. Incorrect parameter types. 3. Parameter verification failed. - * @syscap SystemCapability.Notification.CommonEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setCodeAndData(code: number, data: string): Promise; - -@@ -353,7 +371,8 @@ export interface CommonEventSubscriber { - *
    2. Incorrect parameter types. 3. Parameter verification failed. - * @syscap SystemCapability.Notification.CommonEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - setCodeAndDataSync(code: number, data: string): void; - -@@ -364,7 +383,8 @@ export interface CommonEventSubscriber { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. 3. Parameter verification failed. - * @syscap SystemCapability.Notification.CommonEvent -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isOrderedCommonEvent(callback: AsyncCallback): void; - -@@ -373,7 +393,8 @@ export interface CommonEventSubscriber { - * - * @returns { Promise } Returns true if this common event is ordered, false otherwise - * @syscap SystemCapability.Notification.CommonEvent -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isOrderedCommonEvent(): Promise; - -@@ -382,7 +403,8 @@ export interface CommonEventSubscriber { - * - * @returns { boolean } Returns true if this common event is ordered, false otherwise - * @syscap SystemCapability.Notification.CommonEvent -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isOrderedCommonEventSync(): boolean; - -@@ -393,7 +415,8 @@ export interface CommonEventSubscriber { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. 3. Parameter verification failed. - * @syscap SystemCapability.Notification.CommonEvent -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isStickyCommonEvent(callback: AsyncCallback): void; - -@@ -402,7 +425,8 @@ export interface CommonEventSubscriber { - * - * @returns { Promise } Returns true if this common event is sticky, false otherwise - * @syscap SystemCapability.Notification.CommonEvent -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isStickyCommonEvent(): Promise; - -@@ -411,7 +435,8 @@ export interface CommonEventSubscriber { - * - * @returns { boolean } Returns true if this common event is sticky, false otherwise - * @syscap SystemCapability.Notification.CommonEvent -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - isStickyCommonEventSync(): boolean; - -@@ -422,7 +447,8 @@ export interface CommonEventSubscriber { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. 3. Parameter verification failed. - * @syscap SystemCapability.Notification.CommonEvent -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - abortCommonEvent(callback: AsyncCallback): void; - -@@ -431,7 +457,8 @@ export interface CommonEventSubscriber { - * - * @returns { Promise } The promise returned by the function. - * @syscap SystemCapability.Notification.CommonEvent -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - abortCommonEvent(): Promise; - -@@ -439,7 +466,8 @@ export interface CommonEventSubscriber { - * Abort the current ordered common event. - * - * @syscap SystemCapability.Notification.CommonEvent -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - abortCommonEventSync(): void; - -@@ -450,7 +478,8 @@ export interface CommonEventSubscriber { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. 3. Parameter verification failed. - * @syscap SystemCapability.Notification.CommonEvent -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - clearAbortCommonEvent(callback: AsyncCallback): void; - -@@ -459,7 +488,8 @@ export interface CommonEventSubscriber { - * - * @returns { Promise } The promise returned by the function. - * @syscap SystemCapability.Notification.CommonEvent -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - clearAbortCommonEvent(): Promise; - -@@ -467,7 +497,8 @@ export interface CommonEventSubscriber { - * Clears the abort state of the current ordered common event - * - * @syscap SystemCapability.Notification.CommonEvent -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - clearAbortCommonEventSync(): void; - -@@ -478,7 +509,8 @@ export interface CommonEventSubscriber { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. 3. Parameter verification failed. - * @syscap SystemCapability.Notification.CommonEvent -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getAbortCommonEvent(callback: AsyncCallback): void; - -@@ -487,7 +519,8 @@ export interface CommonEventSubscriber { - * - * @returns { Promise } Returns true if this common event is aborted, false otherwise - * @syscap SystemCapability.Notification.CommonEvent -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getAbortCommonEvent(): Promise; - -@@ -496,7 +529,8 @@ export interface CommonEventSubscriber { - * - * @returns { boolean } Returns true if this common event is aborted, false otherwise - * @syscap SystemCapability.Notification.CommonEvent -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getAbortCommonEventSync(): boolean; - -@@ -518,7 +552,8 @@ export interface CommonEventSubscriber { - * @syscap SystemCapability.Notification.CommonEvent - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSubscribeInfo(callback: AsyncCallback): void; - -@@ -536,7 +571,8 @@ export interface CommonEventSubscriber { - * @syscap SystemCapability.Notification.CommonEvent - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSubscribeInfo(): Promise; - -@@ -553,7 +589,8 @@ export interface CommonEventSubscriber { - * @returns { CommonEventSubscribeInfo } Returns the commonEvent subscribe information - * @syscap SystemCapability.Notification.CommonEvent - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - getSubscribeInfoSync(): CommonEventSubscribeInfo; - -@@ -564,7 +601,8 @@ export interface CommonEventSubscriber { - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. - *
    2. Incorrect parameter types. 3. Parameter verification failed. - * @syscap SystemCapability.Notification.CommonEvent -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - finishCommonEvent(callback: AsyncCallback): void; - -@@ -573,7 +611,8 @@ export interface CommonEventSubscriber { - * - * @returns { Promise } The promise returned by the function. - * @syscap SystemCapability.Notification.CommonEvent -- * @since 9 -+ * @since arkts {'1.1':'9', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - finishCommonEvent(): Promise; - } -diff --git a/api/device-define/tablet.json b/api/device-define/tablet.json -index 153f694bf..aab906b49 100644 ---- a/api/device-define/tablet.json -+++ b/api/device-define/tablet.json -@@ -223,6 +223,7 @@ - "SystemCapability.Multimedia.Image.ImageCreator", - "SystemCapability.Graphic.Graphic2D.WebGL2", - "SystemCapability.Ability.AppStartup", -- "SystemCapability.Ability.AppExtension.PhotoEditorExtension" -+ "SystemCapability.Ability.AppExtension.PhotoEditorExtension", -+ "SystemCapability.MultimodalAwareness.RoomLocation" - ] - } -diff --git a/api/device-define/wearable.json b/api/device-define/wearable.json -index 3bcd44cee..d0337769e 100644 ---- a/api/device-define/wearable.json -+++ b/api/device-define/wearable.json -@@ -198,6 +198,7 @@ - "SystemCapability.Communication.WiFi.AP.Extension", - "SystemCapability.Location.Location.Core", - "SystemCapability.Location.Location.Gnss", -- "SystemCapability.Test.UiTest" -+ "SystemCapability.Test.UiTest", -+ "SystemCapability.MultimodalAwareness.RoomLocation" - ] - } -diff --git a/api/global/rawFileDescriptor.d.ts b/api/global/rawFileDescriptor.d.ts -index 76d4c8959..8a85921c4 100644 ---- a/api/global/rawFileDescriptor.d.ts -+++ b/api/global/rawFileDescriptor.d.ts -@@ -16,7 +16,6 @@ - /** - * @file - * @kit LocalizationKit -- * @arkts 1.1&1.2 - */ - - /** -@@ -42,6 +41,7 @@ - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export interface RawFileDescriptor { - /** -@@ -65,6 +65,7 @@ export interface RawFileDescriptor { - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - fd: number; - -@@ -89,6 +90,7 @@ export interface RawFileDescriptor { - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - offset: number; - -@@ -113,6 +115,7 @@ export interface RawFileDescriptor { - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - length: number; - } -\ No newline at end of file -diff --git a/api/global/resource.d.ts b/api/global/resource.d.ts -index 6ebfe1cd8..15b2ce8e9 100644 ---- a/api/global/resource.d.ts -+++ b/api/global/resource.d.ts -@@ -98,7 +98,7 @@ export interface Resource { - * - * @type { ?any[] } - * @syscap SystemCapability.Global.ResourceManager -- * @since 7 -+ * @since 9 - */ - /** - * Set params. -@@ -128,7 +128,7 @@ export interface Resource { - * - * @type { ?number } - * @syscap SystemCapability.Global.ResourceManager -- * @since 7 -+ * @since 9 - */ - /** - * Set type. -diff --git a/api/multimedia/soundPool.d.ts b/api/multimedia/soundPool.d.ts -index 3ffd0b117..b657a7347 100644 ---- a/api/multimedia/soundPool.d.ts -+++ b/api/multimedia/soundPool.d.ts -@@ -18,7 +18,7 @@ - * @kit MediaKit - */ - --import { ErrorCallback, AsyncCallback, Callback, BusinessError } from '../@ohos.base'; -+import { ErrorCallback, AsyncCallback, Callback } from '../@ohos.base'; - import type audio from '../@ohos.multimedia.audio'; - - /** -@@ -32,21 +32,21 @@ export interface PlayParameters { - /** - * loop mode (0 = no loop, -1 = loop forever) - * -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.SoundPool - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- loop?: int; -+ loop?: number; - /** - * playback rate - * -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.SoundPool - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- rate?: int; -+ rate?: number; - /** - * left volume value(range = 0.0 to 1.0),current leftVolume = rightVolume - * -@@ -68,12 +68,12 @@ export interface PlayParameters { - /** - * stream priority (0 = lowest priority) - * -- * @type { ?int } -+ * @type { ?number } - * @syscap SystemCapability.Multimedia.Media.SoundPool - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- priority?: int; -+ priority?: number; - /** - * Flag indicating that the sound effect and audio can be played in parallel. - * -@@ -94,12 +94,12 @@ export interface PlayParameters { - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ --export interface SoundPool { -+export declare interface SoundPool { - /** - * Load the sound from the specified path. - * - * @param {string} uri The path to the audio file -- * @param {AsyncCallback} callback Callback a sound ID. This value can be used to play or unload the sound. -+ * @param {AsyncCallback} callback Callback a sound ID. This value can be used to play or unload the sound. - * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. - * @throws { BusinessError } 5400103 - I/O error. Return by callback. - * @throws { BusinessError } 5400105 - Service died. Return by callback. -@@ -107,12 +107,12 @@ export interface SoundPool { - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- load(uri: string, callback: AsyncCallback): void; -+ load(uri: string, callback: AsyncCallback): void; - /** - * Load the sound from the specified path. - * - * @param {string} uri The path to the audio file -- * @returns {Promise} Promise a sound ID. This value can be used to play or unload the sound. -+ * @returns {Promise} Promise a sound ID. This value can be used to play or unload the sound. - * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. - * @throws { BusinessError } 5400103 - I/O error. Return by promise. - * @throws { BusinessError } 5400105 - Service died. Return by promise. -@@ -120,14 +120,14 @@ export interface SoundPool { - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- load(uri: string): Promise; -+ load(uri: string): Promise; - /** - * Load the sound from a FileDescriptor. - * -- * @param {int} fd A FileDescriptor object -+ * @param {number} fd A FileDescriptor object - * @param {number} offset Offset to the start of the sound - * @param {number} length Length of the sound -- * @param {AsyncCallback} callback Callback a sound ID. This value can be used to play or unload the sound. -+ * @param {AsyncCallback} callback Callback a sound ID. This value can be used to play or unload the sound. - * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. - * @throws { BusinessError } 5400103 - I/O error. Return by callback. - * @throws { BusinessError } 5400105 - Service died. Return by callback. -@@ -135,14 +135,14 @@ export interface SoundPool { - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- load(fd: int, offset: number, length: number, callback: AsyncCallback): void; -+ load(fd: number, offset: number, length: number, callback: AsyncCallback): void; - /** - * Load the sound from a FileDescriptor. - * -- * @param {int} fd A FileDescriptor object -+ * @param {number} fd A FileDescriptor object - * @param {number} offset Offset to the start of the sound - * @param {number} length Length of the sound -- * @returns {Promise} Promise a sound ID. This value can be used to play or unload the sound. -+ * @returns {Promise} Promise a sound ID. This value can be used to play or unload the sound. - * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. - * @throws { BusinessError } 5400103 - I/O error. Return by promise. - * @throws { BusinessError } 5400105 - Service died. Return by promise. -@@ -150,13 +150,13 @@ export interface SoundPool { - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- load(fd: int, offset: number, length: number): Promise; -+ load(fd: number, offset: number, length: number): Promise; - /** - * Play a sound from a sound ID. - * -- * @param {int} soundID Returned by the load() -+ * @param {number} soundID Returned by the load() - * @param {PlayParameters} params Player parameters -- * @param {AsyncCallback} callback Callback used to return a non-zero streamID if successful, zero if it fails. -+ * @param {AsyncCallback} callback Callback used to return a non-zero streamID if successful, zero if it fails. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. 3.Parameter verification failed. Return by callback. - * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. -@@ -165,12 +165,12 @@ export interface SoundPool { - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- play(soundID: int, params: PlayParameters, callback: AsyncCallback): void; -+ play(soundID: number, params: PlayParameters, callback: AsyncCallback): void; - /** - * Play a sound from a sound ID. - * -- * @param {int} soundID Returned by the load() -- * @param {AsyncCallback} callback Callback used to return a non-zero streamID if successful, zero if it fails. -+ * @param {number} soundID Returned by the load() -+ * @param {AsyncCallback} callback Callback used to return a non-zero streamID if successful, zero if it fails. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. 3.Parameter verification failed. Return by callback. - * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. -@@ -179,13 +179,13 @@ export interface SoundPool { - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- play(soundID: int, callback: AsyncCallback): void; -+ play(soundID: number, callback: AsyncCallback): void; - /** - * Play a sound from a sound ID. - * -- * @param {int} soundID Returned by the load() -+ * @param {number} soundID Returned by the load() - * @param {PlayParameters} [params] Player parameters -- * @returns {Promise} Promise used to return a non-zero streamID if successful, zero if it fails. -+ * @returns {Promise} Promise used to return a non-zero streamID if successful, zero if it fails. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. 3.Parameter verification failed. Return by promise. - * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. -@@ -194,11 +194,11 @@ export interface SoundPool { - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- play(soundID: int, params?: PlayParameters): Promise; -+ play(soundID: number, params?: PlayParameters): Promise; - /** - * Stop a stream which is playing. - * -- * @param {int} streamID Returned by the play() -+ * @param {number} streamID Returned by the play() - * @param {AsyncCallback} callback Callback used to return the result. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. 3.Parameter verification failed. Return by callback. -@@ -208,11 +208,11 @@ export interface SoundPool { - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- stop(streamID: int, callback: AsyncCallback): void; -+ stop(streamID: number, callback: AsyncCallback): void; - /** - * Stop a stream which is playing. - * -- * @param {int} streamID Returned by the play() -+ * @param {number} streamID Returned by the play() - * @returns {Promise} Promise used to return the result. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. 3.Parameter verification failed. Return by promise. -@@ -222,67 +222,71 @@ export interface SoundPool { - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- stop(streamID: int): Promise; -+ stop(streamID: number): Promise; - /** - * Set loop mode. - * -- * @param {int} streamID Returned by the play() -- * @param {int} loop Loop mode (0 = no loop, -1 = loop forever) -+ * @param {number} streamID Returned by the play() -+ * @param {number} loop Loop mode (0 = no loop, -1 = loop forever) - * @param {AsyncCallback} callback Callback used to return the result. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. 3.Parameter verification failed. Return by callback. - * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. - * @throws { BusinessError } 5400105 - Service died. Return by callback. - * @syscap SystemCapability.Multimedia.Media.SoundPool -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- setLoop(streamID: int, loop: int, callback: AsyncCallback): void; -+ setLoop(streamID: number, loop: number, callback: AsyncCallback): void; - /** - * Set loop mode. - * -- * @param {int} streamID Returned by the play() -- * @param {int} loop Loop mode (0 = no loop, -1 = loop forever) -+ * @param {number} streamID Returned by the play() -+ * @param {number} loop Loop mode (0 = no loop, -1 = loop forever) - * @returns {Promise} Promise used to return the result. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. 3.Parameter verification failed. Return by promise. - * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. - * @throws { BusinessError } 5400105 - Service died. Return by promise. - * @syscap SystemCapability.Multimedia.Media.SoundPool -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- setLoop(streamID: int, loop: int): Promise; -+ setLoop(streamID: number, loop: number): Promise; - /** - * Set stream priority. - * -- * @param {int} streamID Returned by the play() -- * @param {int} priority Stream priority (0 = lowest priority) -+ * @param {number} streamID Returned by the play() -+ * @param {number} priority Stream priority (0 = lowest priority) - * @param {AsyncCallback} callback Callback used to return the result. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. 3.Parameter verification failed. Return by callback. - * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. - * @throws { BusinessError } 5400105 - Service died. Return by callback. - * @syscap SystemCapability.Multimedia.Media.SoundPool -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- setPriority(streamID: int, priority: int, callback: AsyncCallback): void; -+ setPriority(streamID: number, priority: number, callback: AsyncCallback): void; - /** - * Set stream priority. - * -- * @param {int} streamID Returned by the play() -- * @param {int} priority Stream priority (0 = lowest priority) -+ * @param {number} streamID Returned by the play() -+ * @param {number} priority Stream priority (0 = lowest priority) - * @returns {Promise} Promise used to return the result. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. - *
    2.Incorrect parameter types. 3.Parameter verification failed. Return by promise. - * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. - * @throws { BusinessError } 5400105 - Service died. Return by promise. - * @syscap SystemCapability.Multimedia.Media.SoundPool -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- setPriority(streamID: int, priority: int): Promise; -+ setPriority(streamID: number, priority: number): Promise; - /** - * Set playback rate. - * -- * @param {int} streamID Returned by the play() -+ * @param {number} streamID Returned by the play() - * @param {audio.AudioRendererRate} rate Playback rate - * @param {AsyncCallback} callback Callback used to return the result. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. -@@ -292,11 +296,11 @@ export interface SoundPool { - * @syscap SystemCapability.Multimedia.Media.SoundPool - * @since 10 - */ -- setRate(streamID: int, rate: audio.AudioRendererRate, callback: AsyncCallback): void; -+ setRate(streamID: number, rate: audio.AudioRendererRate, callback: AsyncCallback): void; - /** - * Set playback rate. - * -- * @param {int} streamID Returned by the play() -+ * @param {number} streamID Returned by the play() - * @param {audio.AudioRendererRate} rate Playback rate - * @returns {Promise} Promise used to return the result. - * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. -@@ -306,11 +310,11 @@ export interface SoundPool { - * @syscap SystemCapability.Multimedia.Media.SoundPool - * @since 10 - */ -- setRate(streamID: int, rate: audio.AudioRendererRate): Promise; -+ setRate(streamID: number, rate: audio.AudioRendererRate): Promise; - /** - * Set stream volume. - * -- * @param {int} streamID Returned by the play() -+ * @param {number} streamID Returned by the play() - * @param {number} leftVolume Volume value(range = 0.0 to 1.0),current leftVolume = rightVolume - * @param {number} rightVolume Volume value(range = 0.0 to 1.0),current leftVolume = rightVolume - * @param {AsyncCallback} callback Callback used to return the result. -@@ -319,13 +323,14 @@ export interface SoundPool { - * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. - * @throws { BusinessError } 5400105 - Service died. Return by callback. - * @syscap SystemCapability.Multimedia.Media.SoundPool -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- setVolume(streamID: int, leftVolume: number, rightVolume: number, callback: AsyncCallback): void; -+ setVolume(streamID: number, leftVolume: number, rightVolume: number, callback: AsyncCallback): void; - /** - * Set stream volume. - * -- * @param {int} streamID Returned by the play() -+ * @param {number} streamID Returned by the play() - * @param {number} leftVolume Volume value(range = 0.0 to 1.0),current leftVolume = rightVolume - * @param {number} rightVolume Volume value(range = 0.0 to 1.0),current leftVolume = rightVolume - * @returns {Promise} Promise used to return the result. -@@ -334,13 +339,14 @@ export interface SoundPool { - * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. - * @throws { BusinessError } 5400105 - Service died. Return by promise. - * @syscap SystemCapability.Multimedia.Media.SoundPool -- * @since 10 -+ * @since arkts {'1.1':'10','1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- setVolume(streamID: int, leftVolume: number, rightVolume: number): Promise; -+ setVolume(streamID: number, leftVolume: number, rightVolume: number): Promise; - /** - * Unload a sound from a sound ID. - * -- * @param {int} soundID Returned by the load() -+ * @param {number} soundID Returned by the load() - * @param {AsyncCallback} callback Callback used to return the result. - * @throws { BusinessError } 5400102 - Operation not allowed. Return by callback. - * @throws { BusinessError } 5400103 - I/O error. Return by callback. -@@ -349,11 +355,11 @@ export interface SoundPool { - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- unload(soundID: int, callback: AsyncCallback): void; -+ unload(soundID: number, callback: AsyncCallback): void; - /** - * Unload a sound from a sound ID. - * -- * @param {int} soundID Returned by the load() -+ * @param {number} soundID Returned by the load() - * @returns {Promise} Promise used to return the result. - * @throws { BusinessError } 5400102 - Operation not allowed. Return by promise. - * @throws { BusinessError } 5400103 - I/O error. Return by promise. -@@ -362,7 +368,7 @@ export interface SoundPool { - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ -- unload(soundID: int): Promise; -+ unload(soundID: number): Promise; - /** - * Releases the soundPool. This method uses an asynchronous callback to return the result. - * -@@ -392,7 +398,7 @@ export interface SoundPool { - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ --// on(type: 'loadComplete', callback: Callback): void; -+ on(type: 'loadComplete', callback: Callback): void; - /** - * Cancel Listens for load result event. - * -@@ -401,30 +407,29 @@ export interface SoundPool { - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ --// off(type: 'loadComplete'): void; -+ off(type: 'loadComplete'): void; - /** - * Register the listener for playing finished event. The conditions which this event is called - * are the same as {@link #playFinished}, additionally, this event can callback the streamId of finishing playing. - * If this event and the {@link #playFinished} event are registered at the same time, - * only this event will be called, and the {@link #playFinished} event will not be called. - * -- * @param {'playFinishedWithStreamId' | 'playFinished' | 'error' | 'loadComplete'} type name of the play finished event to listen for. -- * @param {Callback | Callback | ErrorCallback} callback Callback used to listen which stream id has finished playback. -- * @syscap SystemCapability.Multimedia.Media.SoundPool -- * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 -- */ -- on(type: 'playFinishedWithStreamId' | 'playFinished' | 'error' | 'loadComplete', -- callback: Callback | Callback | ErrorCallback): void; -- /** -- * Cancel listening for playing finished event. -- * -- * @param {'playFinishedWithStreamId' | 'loadComplete' | 'playFinished' | 'error'} type name of the play finished event to listen for. -+ * @param {'playFinishedWithStreamId'} type name of the play finished event to listen for. -+ * @param {Callback} callback Callback used to listen which stream id has finished playback. - * @syscap SystemCapability.Multimedia.Media.SoundPool - * @since arkts {'1.1':'18','1.2':'20'} - * @arkts 1.1&1.2 - */ -- off(type: 'playFinishedWithStreamId' | 'loadComplete' | 'playFinished' | 'error'): void; -+ on(type: 'playFinishedWithStreamId', callback: Callback): void; -+ /** -+ * Cancel listening for playing finished event. -+ * -+ * @param {'playFinishedWithStreamId'} type name of the play finished event to listen for. -+ * @syscap SystemCapability.Multimedia.Media.SoundPool -+ * @since arkts {'1.1':'18','1.2':'20'} -+ * @arkts 1.1&1.2 -+ */ -+ off(type: 'playFinishedWithStreamId'): void; - /** - * Register listens for play finish event. - * -@@ -434,7 +439,7 @@ export interface SoundPool { - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ --// on(type: 'playFinished', callback: Callback): void; -+ on(type: 'playFinished', callback: Callback): void; - /** - * Cancel Listens for play finish event. - * -@@ -443,7 +448,7 @@ export interface SoundPool { - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ --// off(type: 'playFinished'): void; -+ off(type: 'playFinished'): void; - /** - * Register listens for sound play error events. - * -@@ -453,7 +458,7 @@ export interface SoundPool { - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ --// on(type: 'error', callback: ErrorCallback): void; -+ on(type: 'error', callback: ErrorCallback): void; - /** - * Cancel Listens for sound play error events. - * -@@ -462,6 +467,6 @@ export interface SoundPool { - * @since arkts {'1.1':'10','1.2':'20'} - * @arkts 1.1&1.2 - */ --// off(type: 'error'): void; -+ off(type: 'error'): void; - } - -diff --git a/api/notification/notificationSubscriber.d.ts b/api/notification/notificationSubscriber.d.ts -index 65252b0a3..7fa0bd560 100644 ---- a/api/notification/notificationSubscriber.d.ts -+++ b/api/notification/notificationSubscriber.d.ts -@@ -24,6 +24,9 @@ import { NotificationSortingMap } from './notificationSortingMap'; - import notification from '../@ohos.notification'; - import type notificationManager from '../@ohos.notificationManager'; - /*** endif */ -+/*** if arkts 1.2 */ -+import type notificationManager from '../@ohos.notificationManager'; -+/*** endif */ - - /** - * Provides methods that will be called back when the subscriber receives a new notification or -@@ -42,7 +45,8 @@ export interface NotificationSubscriber { - * @type { ?function } - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onConsume?: (data: SubscribeCallbackData) => void; - -@@ -52,7 +56,8 @@ export interface NotificationSubscriber { - * @type { ?function } - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onCancel?: (data: SubscribeCallbackData) => void; - -@@ -62,7 +67,8 @@ export interface NotificationSubscriber { - * @type { ?function } - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onUpdate?: (data: NotificationSortingMap) => void; - -@@ -72,7 +78,8 @@ export interface NotificationSubscriber { - * @type { ?function } - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onConnect?: () => void; - -@@ -82,7 +89,8 @@ export interface NotificationSubscriber { - * @type { ?function } - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onDisconnect?: () => void; - -@@ -92,7 +100,8 @@ export interface NotificationSubscriber { - * @type { ?function } - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 7 -+ * @since arkts {'1.1':'7', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onDestroy?: () => void; - -@@ -114,7 +123,8 @@ export interface NotificationSubscriber { - * @type { ?function } - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onDoNotDisturbChanged?: (mode: notificationManager.DoNotDisturbDate) => void; - -@@ -124,7 +134,8 @@ export interface NotificationSubscriber { - * @type { ?function } - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 8 -+ * @since arkts {'1.1':'8', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onEnabledNotificationChanged?: (callbackData: EnabledNotificationCallbackData) => void; - -@@ -134,7 +145,8 @@ export interface NotificationSubscriber { - * @type { ?function } - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 10 -+ * @since arkts {'1.1':'10', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onBadgeChanged?: (data: BadgeNumberCallbackData) => void; - -@@ -144,7 +156,8 @@ export interface NotificationSubscriber { - * @type { ?BadgeEnabledChangedCallback } - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 12 -+ * @since arkts {'1.1':'12', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onBadgeEnabledChanged?: BadgeEnabledChangedCallback; - -@@ -154,7 +167,8 @@ export interface NotificationSubscriber { - * @type { ?function } - * @syscap SystemCapability.Notification.Notification - * @systemapi -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - onBatchCancel?: (data: Array) => void; - } -@@ -369,19 +383,11 @@ export interface BadgeEnabledChangedCallback { - } - - /** -- * Defines the callback of BadgeEnabledChanged. -- * @typedef BadgeEnabledChangedCallback -+ * Defines the BadgeEnabledChanged callback. -+ * @param { EnabledNotificationCallbackData } data - * @syscap SystemCapability.Notification.Notification -+ * @systemapi - * @since 20 - * @arkts 1.2 - */ -- -- /** -- * Defines the BadgeEnabledChanged callback. -- * @param { EnabledNotificationCallbackData } data -- * @syscap SystemCapability.Notification.Notification -- * @systemapi -- * @since 20 -- * @arkts 1.2 -- */ - export type BadgeEnabledChangedCallback = (data: EnabledNotificationCallbackData) => void; -diff --git a/api/permissions.d.ts b/api/permissions.d.ts -index a2aea7151..a18d38e1e 100644 ---- a/api/permissions.d.ts -+++ b/api/permissions.d.ts -@@ -16,7 +16,6 @@ - /** - * @file Defines all permissions. - * @kit AbilityKit -- * @arkts 1.1&1.2 - */ - - /** -@@ -33,5 +32,6 @@ - * @syscap SystemCapability.Security.AccessToken - * @atomicservice - * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - export type Permissions = string; -diff --git a/api/security/PermissionRequestResult.d.ts b/api/security/PermissionRequestResult.d.ts -index 05d2bceac..16ff14dba 100644 ---- a/api/security/PermissionRequestResult.d.ts -+++ b/api/security/PermissionRequestResult.d.ts -@@ -18,9 +18,6 @@ - * @kit AbilityKit - */ - --/*** if arkts 1.1 */ --import { int } from '@ohos.base'; --/*** endif */ - /** - * The result of requestPermissionsFromUser with asynchronous callback. - * -@@ -46,7 +43,7 @@ import { int } from '@ohos.base'; - * @since arkts {'1.1':'11', '1.2':'20'} - * @arkts 1.1&1.2 - */ --export default class PermissionRequestResult { -+declare class PermissionRequestResult { - /** - * The permissions passed in by the user. - * -@@ -72,28 +69,16 @@ export default class PermissionRequestResult { - * @stagemodelonly - * @crossplatform - * @atomicservice -- * @since 11 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - permissions: Array; - -- /** -- * The permissions passed in by the user. -- * -- * @type { Array } -- * @syscap SystemCapability.Security.AccessToken -- * @stagemodelonly -- * @crossplatform -- * @atomicservice -- * @since 20 -- * @arkts 1.2 -- */ -- permissions: Array = new Array(); -- - /** - * The results for the corresponding request permissions. The value 0 indicates that a - * permission is granted, the value -1 indicates not, and the value 2 indicates the request is invalid. - * -- * @type { Array } -+ * @type { Array } - * @syscap SystemCapability.Security.AccessToken - * @stagemodelonly - * @since 9 -@@ -102,25 +87,12 @@ export default class PermissionRequestResult { - * The results for the corresponding request permissions. The value 0 indicates that a - * permission is granted, the value -1 indicates not, and the value 2 indicates the request is invalid. - * -- * @type { Array } -+ * @type { Array } - * @syscap SystemCapability.Security.AccessToken - * @stagemodelonly - * @crossplatform - * @since 10 - */ -- /** -- * The results for the corresponding request permissions. The value 0 indicates that a -- * permission is granted, the value -1 indicates not, and the value 2 indicates the request is invalid. -- * -- * @type { Array } -- * @syscap SystemCapability.Security.AccessToken -- * @stagemodelonly -- * @crossplatform -- * @atomicservice -- * @since 11 -- */ -- authResults: Array; -- - /** - * The results for the corresponding request permissions. The value 0 indicates that a - * permission is granted, the value -1 indicates not, and the value 2 indicates the request is invalid. -@@ -130,10 +102,10 @@ export default class PermissionRequestResult { - * @stagemodelonly - * @crossplatform - * @atomicservice -- * @since 20 -- * @arkts 1.2 -+ * @since arkts {'1.1':'11', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- authResults: Array = new Array(); -+ authResults: Array; - - /** - * Specifies whether a dialog box is shown for each requested permission. -@@ -168,3 +140,5 @@ export default class PermissionRequestResult { - */ - errorReasons?: Array; - } -+ -+export default PermissionRequestResult; -diff --git a/arkts/@arkts.collections.d.ets b/arkts/@arkts.collections.d.ets -index 05198598d..cea44257c 100644 ---- a/arkts/@arkts.collections.d.ets -+++ b/arkts/@arkts.collections.d.ets -@@ -16,10 +16,11 @@ - /** - * @file Defines the collections for ArkTS - * @kit ArkTS -- * @arkts 1.1 - */ - -+/*** if arkts 1.1 */ - import lang from './@arkts.lang' -+/*** endif */ - - /** - * ArkTS collections. -@@ -37,7 +38,7 @@ import lang from './@arkts.lang' - * @crossplatform - * @atomicservice - * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1 & 1.2 -+ * @arkts 1.1&1.2 - */ - declare namespace collections { - /** -@@ -11993,30 +11994,22 @@ declare namespace collections { - * @arkts 1.2 - */ - values(): IterableIterator; -+ - /** - * Returns the item at that index. - * - * @param { number } index - The zero-based index of the desired code unit. -- * @returns { number } The element in the bitVector matching the given index. -+ * Throws error if index < 0 or index >= bitVector.length. -+ * @returns { number } The element in the bitVector matching the given index. -+ * @throws { BusinessError } 10200001 - The value of index is out of range. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ -- $_get(index: number): number; -- /** -- * Set the value of item at that index. -- * -- * @param { number } index - The index of the element to set. -- * @param { number } value - The value to set at the specified index. -- * @syscap SystemCapability.Utils.Lang -- * @atomicservice -- * @crossplatform -- * @since 20 -- * @arkts 1.2 -- */ -- $_set(index: number, value: number): void; -+ [index: number]: number; -+ - } - - /** -diff --git a/arkts/@arkts.math.Decimal.d.ets b/arkts/@arkts.math.Decimal.d.ets -index de5982cf7..a5f61722a 100644 ---- a/arkts/@arkts.math.Decimal.d.ets -+++ b/arkts/@arkts.math.Decimal.d.ets -@@ -38,6 +38,7 @@ type Rounding = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8; - /** - * The type uesd to set rounding - * -+ * @typedef { number } - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -@@ -66,6 +67,7 @@ type Modulo = Rounding | 9; - /** - * The type uesd to set modulo - * -+ * @typedef { number } - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -@@ -84,13 +86,14 @@ type Modulo = number; - /** - * The type uesd to denote decimal value - * -+ * @typedef { string | number | Decimal } - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ --type DecimalValue = string | number | Decimal; -+type Value = string | number | Decimal; - - /** - * Provides configuration for decimal. -@@ -107,7 +110,7 @@ type DecimalValue = string | number | Decimal; - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - interface DecimalConfig { -@@ -128,7 +131,7 @@ interface DecimalConfig { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - precision?: number; -@@ -153,7 +156,7 @@ interface DecimalConfig { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - rounding?: Rounding; -@@ -174,7 +177,7 @@ interface DecimalConfig { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toExpNeg?: number; -@@ -195,7 +198,7 @@ interface DecimalConfig { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toExpPos?: number; -@@ -216,7 +219,7 @@ interface DecimalConfig { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - minE?: number; -@@ -237,7 +240,7 @@ interface DecimalConfig { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - maxE?: number; -@@ -258,7 +261,7 @@ interface DecimalConfig { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - crypto?: boolean; -@@ -279,7 +282,7 @@ interface DecimalConfig { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - modulo?: Modulo; -@@ -300,7 +303,7 @@ interface DecimalConfig { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - defaults?: boolean; -@@ -319,7 +322,7 @@ interface DecimalConfig { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - declare class Decimal { -@@ -355,7 +358,7 @@ declare class Decimal { - * @since 20 - * @arkts 1.2 - */ -- readonly d: Array | null; -+ get d(): Array | null; - - /** - * The number of decimal exponent. -@@ -374,11 +377,23 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 18 - */ - readonly e: number; - -+ /** -+ * The number of decimal exponent. -+ * -+ * @type { number } -+ * @readonly -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get e(): number; -+ - /** - * The number of decimal sign. - * -@@ -396,15 +411,27 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -- * @arkts 1.1&1.2 -+ * @since 18 - */ - readonly s: number; - -+ /** -+ * The number of decimal sign. -+ * -+ * @type { number } -+ * @readonly -+ * @syscap SystemCapability.Utils.Lang -+ * @crossplatform -+ * @atomicservice -+ * @since 20 -+ * @arkts 1.2 -+ */ -+ get s(): number; -+ - /** - * Return a new Decimal whose value is the absolute value of this Decimal. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; - * 2. Parameter verification failed. -@@ -415,17 +442,17 @@ declare class Decimal { - /** - * Return a new Decimal whose value is the absolute value of this Decimal. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; - * 2. Parameter verification failed. - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- constructor(n: DecimalValue); -+ constructor(n: Value); - - /** - * Return a new Decimal whose value is the absolute value of this Decimal. -@@ -442,7 +469,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - abs(): Decimal; -@@ -464,7 +491,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - floor(): Decimal; -@@ -486,7 +513,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - ceil(): Decimal; -@@ -506,7 +533,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - trunc(): Decimal; -@@ -515,8 +542,8 @@ declare class Decimal { - * Return a new Decimal whose value is the value of this Decimal clamped to the range - * delineated by `min` and `max`. - * -- * @param { DecimalValue } min {number | string | Decimal} -- * @param { DecimalValue } max {number | string | Decimal} -+ * @param { Value } min {number | string | Decimal} -+ * @param { Value } max {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -530,8 +557,8 @@ declare class Decimal { - * Return a new Decimal whose value is the value of this Decimal clamped to the range - * delineated by `min` and `max`. - * -- * @param { DecimalValue } min {number | string | Decimal} -- * @param { DecimalValue } max {number | string | Decimal} -+ * @param { Value } min {number | string | Decimal} -+ * @param { Value } max {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -540,16 +567,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- clamp(min: DecimalValue, max: DecimalValue): Decimal; -+ clamp(min: Value, max: Value): Decimal; - - /** - * Return a new Decimal whose value is the value of this Decimal plus `n`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -562,7 +589,7 @@ declare class Decimal { - * Return a new Decimal whose value is the value of this Decimal plus `n`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -570,16 +597,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- add(n: DecimalValue): Decimal; -+ add(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the value of this Decimal minus `n`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -592,7 +619,7 @@ declare class Decimal { - * Return a new Decimal whose value is the value of this Decimal minus `n`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -600,15 +627,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- sub(n: DecimalValue): Decimal; -+ sub(n: Value): Decimal; - - /** - * Return a new Decimal whose value is this Decimal times `n`, rounded to `precision` significant - * digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -621,7 +649,7 @@ declare class Decimal { - * Return a new Decimal whose value is this Decimal times `n`, rounded to `precision` significant - * digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -629,16 +657,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- mul(n: DecimalValue): Decimal; -+ mul(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the value of this Decimal divided by `n`, rounded to - * `precision` significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -651,7 +679,7 @@ declare class Decimal { - * Return a new Decimal whose value is the value of this Decimal divided by `n`, rounded to - * `precision` significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -659,15 +687,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- div(n: DecimalValue): Decimal; -+ div(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the value of this Decimal modulo `n`, rounded to - * `precision` significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal }the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -680,7 +709,7 @@ declare class Decimal { - * Return a new Decimal whose value is the value of this Decimal modulo `n`, rounded to - * `precision` significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal }the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -688,9 +717,10 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- mod(n: DecimalValue): Decimal; -+ mod(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the square root of this Decimal, rounded to `precision` -@@ -709,7 +739,8 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - sqrt(): Decimal; - -@@ -730,7 +761,8 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - cbrt(): Decimal; - -@@ -738,7 +770,7 @@ declare class Decimal { - * Return a new Decimal whose value is the value of this Decimal raised to the power `n`, rounded - * to `precision` significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -752,7 +784,7 @@ declare class Decimal { - * Return a new Decimal whose value is the value of this Decimal raised to the power `n`, rounded - * to `precision` significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -761,9 +793,10 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- pow(n: DecimalValue): Decimal; -+ pow(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the natural exponential of the value of this Decimal, -@@ -786,7 +819,8 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - exp(): Decimal; - -@@ -794,7 +828,7 @@ declare class Decimal { - * Return the logarithm of the value of this Decimal to the specified base, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -808,7 +842,7 @@ declare class Decimal { - * Return the logarithm of the value of this Decimal to the specified base, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -817,9 +851,10 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- log(n: DecimalValue): Decimal; -+ log(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the natural logarithm of the value of this Decimal, -@@ -840,7 +875,8 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - ln(): Decimal; - -@@ -859,7 +895,8 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - cos(): Decimal; - -@@ -878,7 +915,8 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - sin(): Decimal; - -@@ -897,7 +935,8 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - tan(): Decimal; - -@@ -918,7 +957,8 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - cosh(): Decimal; - -@@ -937,7 +977,8 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - sinh(): Decimal; - -@@ -956,7 +997,8 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - tanh(): Decimal; - -@@ -977,7 +1019,8 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - acos(): Decimal; - -@@ -1000,7 +1043,8 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - asin(): Decimal; - -@@ -1021,7 +1065,8 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - atan(): Decimal; - -@@ -1044,7 +1089,8 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - acosh(): Decimal; - -@@ -1067,7 +1113,8 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - asinh(): Decimal; - -@@ -1090,7 +1137,8 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - atanh(): Decimal; - -@@ -1101,7 +1149,7 @@ declare class Decimal { - * 0 if they have the same value, - * NaN if the value of either Decimal is NaN. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { number } the number type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -1117,7 +1165,7 @@ declare class Decimal { - * 0 if they have the same value, - * NaN if the value of either Decimal is NaN. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { number } the number type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -1125,15 +1173,15 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- comparedTo(n: DecimalValue): number; -+ comparedTo(n: Value): number; - - /** - * Return true if the value of this Decimal is equal to the value of `n`, otherwise return false. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { boolean } the boolean type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -1145,7 +1193,7 @@ declare class Decimal { - /** - * Return true if the value of this Decimal is equal to the value of `n`, otherwise return false. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { boolean } the boolean type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -1153,15 +1201,15 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- equals(n: DecimalValue): boolean; -+ equals(n: Value): boolean; - - /** - * Return true if the value of this Decimal is greater than the value of `n`, otherwise return false. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { boolean } the boolean type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -1173,7 +1221,7 @@ declare class Decimal { - /** - * Return true if the value of this Decimal is greater than the value of `n`, otherwise return false. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { boolean } the boolean type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -1181,16 +1229,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- greaterThan(n: DecimalValue): boolean; -+ greaterThan(n: Value): boolean; - - /** - * Return true if the value of this Decimal is greater than or equal to the value of `n`, - * otherwise return false. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { boolean } the boolean type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -1203,7 +1251,7 @@ declare class Decimal { - * Return true if the value of this Decimal is greater than or equal to the value of `n`, - * otherwise return false. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { boolean } the boolean type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -1211,15 +1259,15 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- greaterThanOrEqualTo(n: DecimalValue): boolean; -+ greaterThanOrEqualTo(n: Value): boolean; - - /** - * Return true if the value of this Decimal is less than `n`, otherwise return false. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { boolean } the boolean type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -1231,7 +1279,7 @@ declare class Decimal { - /** - * Return true if the value of this Decimal is less than `n`, otherwise return false. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { boolean } the boolean type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -1239,15 +1287,15 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- lessThan(n: DecimalValue): boolean; -+ lessThan(n: Value): boolean; - - /** - * Return true if the value of this Decimal is less than or equal to `n`, otherwise return false. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { boolean } the boolean type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -1259,7 +1307,7 @@ declare class Decimal { - /** - * Return true if the value of this Decimal is less than or equal to `n`, otherwise return false. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { boolean } the boolean type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -1267,10 +1315,10 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- lessThanOrEqualTo(n: DecimalValue): boolean; -+ lessThanOrEqualTo(n: Value): boolean; - - /** - * Return true if the value of this Decimal is a finite number, otherwise return false. -@@ -1287,7 +1335,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - isFinite(): boolean; -@@ -1307,7 +1355,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - isInteger(): boolean; -@@ -1327,7 +1375,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - isNaN(): boolean; -@@ -1347,7 +1395,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - isNegative(): boolean; -@@ -1367,7 +1415,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - isPositive(): boolean; -@@ -1387,7 +1435,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - isZero(): boolean; -@@ -1396,7 +1444,7 @@ declare class Decimal { - * Return a new Decimal whose value is the integer part of dividing the value of this Decimal - * by the value of `n`, rounded to `precision` significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -1409,7 +1457,7 @@ declare class Decimal { - * Return a new Decimal whose value is the integer part of dividing the value of this Decimal - * by the value of `n`, rounded to `precision` significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -1417,9 +1465,10 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- dividedToIntegerBy(n: DecimalValue): Decimal; -+ dividedToIntegerBy(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the value of this Decimal negated, i.e. as if multiplied by -1. -@@ -1436,7 +1485,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - negate(): Decimal; -@@ -1456,7 +1505,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toBinary(): string; -@@ -1482,7 +1531,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toBinary(significantDigits: number): string; -@@ -1510,7 +1559,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toBinary(significantDigits: number, rounding: Rounding): string; -@@ -1530,7 +1579,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toOctal(): string; -@@ -1554,7 +1603,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toOctal(significantDigits: number): string; -@@ -1582,7 +1631,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toOctal(significantDigits: number, rounding: Rounding): string; -@@ -1602,7 +1651,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toHexadecimal(): string; -@@ -1626,7 +1675,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toHexadecimal(significantDigits: number): string; -@@ -1654,7 +1703,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toHexadecimal(significantDigits: number, rounding: Rounding): string; -@@ -1674,7 +1723,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toDecimalPlaces(): Decimal; -@@ -1700,7 +1749,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toDecimalPlaces(decimalPlaces: number): Decimal; -@@ -1728,7 +1777,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toDecimalPlaces(decimalPlaces: number, rounding: Rounding): Decimal; -@@ -1748,7 +1797,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toExponential(): string; -@@ -1774,7 +1823,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toExponential(decimalPlaces: number): string; -@@ -1802,7 +1851,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toExponential(decimalPlaces: number, rounding: Rounding): string; -@@ -1822,7 +1871,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toFixed(): string; -@@ -1846,7 +1895,7 @@ declare class Decimal { - * @throws { BusinessError } 10200001 - The value of `decimalPlaces` is out of range. - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toFixed(decimalPlaces: number): string; -@@ -1874,7 +1923,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toFixed(decimalPlaces: number, rounding: Rounding): string; -@@ -1896,7 +1945,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toFraction(): Decimal[]; -@@ -1906,7 +1955,7 @@ declare class Decimal { - * numerator and an integer denominator. The denominator will be a positive non-zero value - * less than or equal to `max_denominator`. - * -- * @param { DecimalValue } maxDenominator {number | string | Decimal} -+ * @param { Value } maxDenominator {number | string | Decimal} - * @returns { Decimal[] } the Decimal[] type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -1920,7 +1969,7 @@ declare class Decimal { - * numerator and an integer denominator. The denominator will be a positive non-zero value - * less than or equal to `max_denominator`. - * -- * @param { DecimalValue } maxDenominator {number | string | Decimal} -+ * @param { Value } maxDenominator {number | string | Decimal} - * @returns { Decimal[] } the Decimal[] type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -1928,15 +1977,15 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- toFraction(maxDenominator: DecimalValue): Decimal[]; -+ toFraction(maxDenominator: Value): Decimal[]; - - /** - * Returns a new Decimal whose value is the nearest multiple of `n`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -1948,7 +1997,7 @@ declare class Decimal { - /** - * Returns a new Decimal whose value is the nearest multiple of `n`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -1956,16 +2005,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- toNearest(n: DecimalValue): Decimal; -+ toNearest(n: Value): Decimal; - - /** - * Returns a new Decimal whose value is the nearest multiple of `n` in the direction of rounding - * mode `rounding`, to the value of this Decimal. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @param { Rounding } rounding Rounding mode. Integer, 0 to 8 inclusive. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: -@@ -1980,7 +2029,7 @@ declare class Decimal { - * Returns a new Decimal whose value is the nearest multiple of `n` in the direction of rounding - * mode `rounding`, to the value of this Decimal. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @param { Rounding } rounding Rounding mode. Integer, 0 to 8 inclusive. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: -@@ -1990,10 +2039,10 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- toNearest(n: DecimalValue, rounding: Rounding): Decimal; -+ toNearest(n: Value, rounding: Rounding): Decimal; - - /** - * Return a string representing the value of this Decimal. -@@ -2010,7 +2059,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toPrecision(): string; -@@ -2034,7 +2083,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toPrecision(significantDigits: number): string; -@@ -2062,7 +2111,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toPrecision(significantDigits: number, rounding: Rounding): string; -@@ -2082,7 +2131,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toSignificantDigits(): Decimal; -@@ -2108,7 +2157,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toSignificantDigits(significantDigits: number): Decimal; -@@ -2136,7 +2185,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toSignificantDigits(significantDigits: number, rounding: Rounding): Decimal; -@@ -2156,7 +2205,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toNumber(): number; -@@ -2180,7 +2229,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - toString(): string; -@@ -2202,7 +2251,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - valueOf(): string; -@@ -2222,7 +2271,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - decimalPlaces(): number; -@@ -2242,7 +2291,8 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - precision(): number; - -@@ -2269,14 +2319,15 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - precision(includeZeros: boolean | number): number; - - /** - * Return a new Decimal whose value is the absolute value of `n`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2289,7 +2340,7 @@ declare class Decimal { - /** - * Return a new Decimal whose value is the absolute value of `n`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2298,15 +2349,15 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- static abs(n: DecimalValue): Decimal; -+ static abs(n: Value): Decimal; - - /** - * Return a new Decimal whose value is `n` round to an integer using `ROUND_FLOOR`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2319,7 +2370,7 @@ declare class Decimal { - /** - * Return a new Decimal whose value is `n` round to an integer using `ROUND_FLOOR`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2328,15 +2379,15 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- static floor(n: DecimalValue): Decimal; -+ static floor(n: Value): Decimal; - - /** - * Return a new Decimal whose value is `n` rounded to an integer using `ROUND_CEIL`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2349,7 +2400,7 @@ declare class Decimal { - /** - * Return a new Decimal whose value is `n` rounded to an integer using `ROUND_CEIL`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2358,15 +2409,15 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- static ceil(n: DecimalValue): Decimal; -+ static ceil(n: Value): Decimal; - - /** - * Return a new Decimal whose value is `n` truncated to an integer. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2379,7 +2430,7 @@ declare class Decimal { - /** - * Return a new Decimal whose value is `n` truncated to an integer. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2388,17 +2439,17 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- static trunc(n: DecimalValue): Decimal; -+ static trunc(n: Value): Decimal; - - /** - * Return a new Decimal whose value is `n` clamped to the range delineated by `min` and `max`. - * -- * @param { DecimalValue } n {number | string | Decimal} -- * @param { DecimalValue } min {number | string | Decimal} -- * @param { DecimalValue } max {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} -+ * @param { Value } min {number | string | Decimal} -+ * @param { Value } max {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2412,9 +2463,9 @@ declare class Decimal { - /** - * Return a new Decimal whose value is `n` clamped to the range delineated by `min` and `max`. - * -- * @param { DecimalValue } n {number | string | Decimal} -- * @param { DecimalValue } min {number | string | Decimal} -- * @param { DecimalValue } max {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} -+ * @param { Value } min {number | string | Decimal} -+ * @param { Value } max {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2424,17 +2475,17 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- static clamp(n: DecimalValue, min: DecimalValue, max: DecimalValue): Decimal; -+ static clamp(n: Value, min: Value, max: Value): Decimal; - - /** - * Return a new Decimal whose value is the sum of `x` and `y`, rounded to `precision` significant - * digits using rounding mode `rounding`. - * -- * @param { DecimalValue } x {number | string | Decimal} -- * @param { DecimalValue } y {number | string | Decimal} -+ * @param { Value } x {number | string | Decimal} -+ * @param { Value } y {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2448,8 +2499,8 @@ declare class Decimal { - * Return a new Decimal whose value is the sum of `x` and `y`, rounded to `precision` significant - * digits using rounding mode `rounding`. - * -- * @param { DecimalValue } x {number | string | Decimal} -- * @param { DecimalValue } y {number | string | Decimal} -+ * @param { Value } x {number | string | Decimal} -+ * @param { Value } y {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2458,10 +2509,10 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- static add(x: DecimalValue, y: DecimalValue): Decimal; -+ static add(x: Value, y: Value): Decimal; - - /** - * Return a new Decimal whose value is the sum of the arguments, rounded to `precision` -@@ -2469,7 +2520,7 @@ declare class Decimal { - * - * Only the result is rounded, not the intermediate calculations. - * -- * @param { DecimalValue[] } n {number | string | Decimal} -+ * @param { Value[] } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2485,7 +2536,7 @@ declare class Decimal { - * - * Only the result is rounded, not the intermediate calculations. - * -- * @param { DecimalValue[] } n {number | string | Decimal} -+ * @param { Value[] } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2494,17 +2545,17 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- static sum(...n: DecimalValue[]): Decimal; -+ static sum(...n: Value[]): Decimal; - - /** - * Return a new Decimal whose value is `x` minus `y`, rounded to `precision` significant digits - * using rounding mode `rounding`. - * -- * @param { DecimalValue } x {number | string | Decimal} -- * @param { DecimalValue } y {number | string | Decimal} -+ * @param { Value } x {number | string | Decimal} -+ * @param { Value } y {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2518,8 +2569,8 @@ declare class Decimal { - * Return a new Decimal whose value is `x` minus `y`, rounded to `precision` significant digits - * using rounding mode `rounding`. - * -- * @param { DecimalValue } x {number | string | Decimal} -- * @param { DecimalValue } y {number | string | Decimal} -+ * @param { Value } x {number | string | Decimal} -+ * @param { Value } y {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2528,17 +2579,17 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- static sub(x: DecimalValue, y: DecimalValue): Decimal; -+ static sub(x: Value, y: Value): Decimal; - - /** - * Return a new Decimal whose value is `x` multiplied by `y`, rounded to `precision` significant - * digits using rounding mode `rounding`. - * -- * @param { DecimalValue } x {number | string | Decimal} -- * @param { DecimalValue } y {number | string | Decimal} -+ * @param { Value } x {number | string | Decimal} -+ * @param { Value } y {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2552,8 +2603,8 @@ declare class Decimal { - * Return a new Decimal whose value is `x` multiplied by `y`, rounded to `precision` significant - * digits using rounding mode `rounding`. - * -- * @param { DecimalValue } x {number | string | Decimal} -- * @param { DecimalValue } y {number | string | Decimal} -+ * @param { Value } x {number | string | Decimal} -+ * @param { Value } y {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2562,17 +2613,17 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- static mul(x: DecimalValue, y: DecimalValue): Decimal; -+ static mul(x: Value, y: Value): Decimal; - - /** - * Return a new Decimal whose value is `x` divided by `y`, rounded to `precision` significant - * digits using rounding mode `rounding`. - * -- * @param { DecimalValue } x {number | string | Decimal} -- * @param { DecimalValue } y {number | string | Decimal} -+ * @param { Value } x {number | string | Decimal} -+ * @param { Value } y {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2586,8 +2637,8 @@ declare class Decimal { - * Return a new Decimal whose value is `x` divided by `y`, rounded to `precision` significant - * digits using rounding mode `rounding`. - * -- * @param { DecimalValue } x {number | string | Decimal} -- * @param { DecimalValue } y {number | string | Decimal} -+ * @param { Value } x {number | string | Decimal} -+ * @param { Value } y {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2596,16 +2647,17 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static div(x: DecimalValue, y: DecimalValue): Decimal; -+ static div(x: Value, y: Value): Decimal; - - /** - * Return a new Decimal whose value is `x` modulo `y`, rounded to `precision` significant digits - * using rounding mode `rounding`. - * -- * @param { DecimalValue } x {number | string | Decimal} -- * @param { DecimalValue } y {number | string | Decimal} -+ * @param { Value } x {number | string | Decimal} -+ * @param { Value } y {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2619,8 +2671,8 @@ declare class Decimal { - * Return a new Decimal whose value is `x` modulo `y`, rounded to `precision` significant digits - * using rounding mode `rounding`. - * -- * @param { DecimalValue } x {number | string | Decimal} -- * @param { DecimalValue } y {number | string | Decimal} -+ * @param { Value } x {number | string | Decimal} -+ * @param { Value } y {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2629,15 +2681,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static mod(x: DecimalValue, y: DecimalValue): Decimal; -+ static mod(x: Value, y: Value): Decimal; - - /** - * Return a new Decimal whose value is the square root of `n`, rounded to `precision` significant - * digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2651,7 +2704,7 @@ declare class Decimal { - * Return a new Decimal whose value is the square root of `n`, rounded to `precision` significant - * digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2660,15 +2713,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static sqrt(n: DecimalValue): Decimal; -+ static sqrt(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the cube root of `n`, rounded to `precision` significant - * digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2682,7 +2736,7 @@ declare class Decimal { - * Return a new Decimal whose value is the cube root of `n`, rounded to `precision` significant - * digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2691,16 +2745,17 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static cbrt(n: DecimalValue): Decimal; -+ static cbrt(n: Value): Decimal; - - /** - * Return a new Decimal whose value is `base` raised to the power `exponent`, rounded to precision - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } base {number | string | Decimal} The base. -- * @param { DecimalValue } exponent {number | string | Decimal} The exponent. -+ * @param { Value } base {number | string | Decimal} The base. -+ * @param { Value } exponent {number | string | Decimal} The exponent. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2715,8 +2770,8 @@ declare class Decimal { - * Return a new Decimal whose value is `base` raised to the power `exponent`, rounded to precision - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } base {number | string | Decimal} The base. -- * @param { DecimalValue } exponent {number | string | Decimal} The exponent. -+ * @param { Value } base {number | string | Decimal} The base. -+ * @param { Value } exponent {number | string | Decimal} The exponent. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2726,15 +2781,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static pow(base: DecimalValue, exponent: DecimalValue): Decimal; -+ static pow(base: Value, exponent: Value): Decimal; - - /** - * Return a new Decimal whose value is the natural exponential of `n`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2749,7 +2805,7 @@ declare class Decimal { - * Return a new Decimal whose value is the natural exponential of `n`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2759,16 +2815,17 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static exp(n: DecimalValue): Decimal; -+ static exp(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the log of `n` to the base `base`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -- * @param { DecimalValue } base {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} -+ * @param { Value } base {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2783,8 +2840,8 @@ declare class Decimal { - * Return a new Decimal whose value is the log of `n` to the base `base`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -- * @param { DecimalValue } base {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} -+ * @param { Value } base {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2794,15 +2851,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static log(n: DecimalValue, base: DecimalValue): Decimal; -+ static log(n: Value, base: Value): Decimal; - - /** - * Return a new Decimal whose value is the natural logarithm of `n`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2817,7 +2875,7 @@ declare class Decimal { - * Return a new Decimal whose value is the natural logarithm of `n`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2827,15 +2885,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static ln(n: DecimalValue): Decimal; -+ static ln(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the base 2 logarithm of `n`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2850,7 +2909,7 @@ declare class Decimal { - * Return a new Decimal whose value is the base 2 logarithm of `n`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2860,15 +2919,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static log2(n: DecimalValue): Decimal; -+ static log2(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the base 10 logarithm of `n`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2883,7 +2943,7 @@ declare class Decimal { - * Return a new Decimal whose value is the base 10 logarithm of `n`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2893,15 +2953,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static log10(n: DecimalValue): Decimal; -+ static log10(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the cosine of `n`, rounded to `precision` significant - * digits using rounding mode `rounding` - * -- * @param { DecimalValue } n {number | string | Decimal} A value in radians. -+ * @param { Value } n {number | string | Decimal} A value in radians. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2915,7 +2976,7 @@ declare class Decimal { - * Return a new Decimal whose value is the cosine of `n`, rounded to `precision` significant - * digits using rounding mode `rounding` - * -- * @param { DecimalValue } n {number | string | Decimal} A value in radians. -+ * @param { Value } n {number | string | Decimal} A value in radians. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2924,15 +2985,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static cos(n: DecimalValue): Decimal; -+ static cos(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the sine of `n`, rounded to `precision` significant digits - * using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} A value in radians. -+ * @param { Value } n {number | string | Decimal} A value in radians. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2946,7 +3008,7 @@ declare class Decimal { - * Return a new Decimal whose value is the sine of `n`, rounded to `precision` significant digits - * using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} A value in radians. -+ * @param { Value } n {number | string | Decimal} A value in radians. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2955,15 +3017,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static sin(n: DecimalValue): Decimal; -+ static sin(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the tangent of `n`, rounded to `precision` significant - * digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} A value in radians. -+ * @param { Value } n {number | string | Decimal} A value in radians. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2977,7 +3040,7 @@ declare class Decimal { - * Return a new Decimal whose value is the tangent of `n`, rounded to `precision` significant - * digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} A value in radians. -+ * @param { Value } n {number | string | Decimal} A value in radians. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -2986,15 +3049,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static tan(n: DecimalValue): Decimal; -+ static tan(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the hyperbolic cosine of `n`, rounded to precision - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} A value in radians. -+ * @param { Value } n {number | string | Decimal} A value in radians. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3008,7 +3072,7 @@ declare class Decimal { - * Return a new Decimal whose value is the hyperbolic cosine of `n`, rounded to precision - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} A value in radians. -+ * @param { Value } n {number | string | Decimal} A value in radians. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3017,15 +3081,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static cosh(n: DecimalValue): Decimal; -+ static cosh(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the hyperbolic sine of `n`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3039,7 +3104,7 @@ declare class Decimal { - * Return a new Decimal whose value is the hyperbolic sine of `n`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3048,15 +3113,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static sinh(n: DecimalValue): Decimal; -+ static sinh(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the hyperbolic tangent of `n`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} A value in radians. -+ * @param { Value } n {number | string | Decimal} A value in radians. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3070,7 +3136,7 @@ declare class Decimal { - * Return a new Decimal whose value is the hyperbolic tangent of `n`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} A value in radians. -+ * @param { Value } n {number | string | Decimal} A value in radians. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3079,14 +3145,15 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static tanh(n: DecimalValue): Decimal; -+ static tanh(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the arccosine in radians of `n`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3100,7 +3167,7 @@ declare class Decimal { - /** - * Return a new Decimal whose value is the arccosine in radians of `n`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3110,15 +3177,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static acos(n: DecimalValue): Decimal; -+ static acos(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the arcsine in radians of `n`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3133,7 +3201,7 @@ declare class Decimal { - * Return a new Decimal whose value is the arcsine in radians of `n`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3143,15 +3211,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static asin(n: DecimalValue): Decimal; -+ static asin(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the arctangent in radians of `n`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3166,7 +3235,7 @@ declare class Decimal { - * Return a new Decimal whose value is the arctangent in radians of `n`, rounded to `precision` - * significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3176,15 +3245,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static atan(n: DecimalValue): Decimal; -+ static atan(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the inverse of the hyperbolic cosine of `n`, rounded to - * `precision` significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3199,7 +3269,7 @@ declare class Decimal { - * Return a new Decimal whose value is the inverse of the hyperbolic cosine of `n`, rounded to - * `precision` significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3209,15 +3279,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static acosh(n: DecimalValue): Decimal; -+ static acosh(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the inverse of the hyperbolic sine of `n`, rounded to - * `precision` significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} A value in radians. -+ * @param { Value } n {number | string | Decimal} A value in radians. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3232,7 +3303,7 @@ declare class Decimal { - * Return a new Decimal whose value is the inverse of the hyperbolic sine of `n`, rounded to - * `precision` significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} A value in radians. -+ * @param { Value } n {number | string | Decimal} A value in radians. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3242,15 +3313,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static asinh(n: DecimalValue): Decimal; -+ static asinh(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the inverse of the hyperbolic tangent of `n`, rounded to - * `precision` significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} A value in radians. -+ * @param { Value } n {number | string | Decimal} A value in radians. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3265,7 +3337,7 @@ declare class Decimal { - * Return a new Decimal whose value is the inverse of the hyperbolic tangent of `n`, rounded to - * `precision` significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} A value in radians. -+ * @param { Value } n {number | string | Decimal} A value in radians. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3275,16 +3347,17 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static atanh(n: DecimalValue): Decimal; -+ static atanh(n: Value): Decimal; - - /** - * Return a new Decimal whose value is the arctangent in radians of `y/x` in the range -pi to pi - * (inclusive), rounded to `precision` significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } y {number | string | Decimal} The y-coordinate. -- * @param { DecimalValue } x {number | string | Decimal} The x-coordinate. -+ * @param { Value } y {number | string | Decimal} The y-coordinate. -+ * @param { Value } x {number | string | Decimal} The x-coordinate. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3299,8 +3372,8 @@ declare class Decimal { - * Return a new Decimal whose value is the arctangent in radians of `y/x` in the range -pi to pi - * (inclusive), rounded to `precision` significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue } y {number | string | Decimal} The y-coordinate. -- * @param { DecimalValue } x {number | string | Decimal} The x-coordinate. -+ * @param { Value } y {number | string | Decimal} The y-coordinate. -+ * @param { Value } x {number | string | Decimal} The x-coordinate. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3310,15 +3383,16 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ -- static atan2(y: DecimalValue, x: DecimalValue): Decimal; -+ static atan2(y: Value, x: Value): Decimal; - - /** - * Return a new Decimal whose value is the square root of the sum of the squares of the arguments, - * rounded to `precision` significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue[] } n {number | string | Decimal} Decimal -+ * @param { Value[] } n {number | string | Decimal} Decimal - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3332,7 +3406,7 @@ declare class Decimal { - * Return a new Decimal whose value is the square root of the sum of the squares of the arguments, - * rounded to `precision` significant digits using rounding mode `rounding`. - * -- * @param { DecimalValue[] } n {number | string | Decimal} Decimal -+ * @param { Value[] } n {number | string | Decimal} Decimal - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3341,15 +3415,15 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- static hypot(...n: DecimalValue[]): Decimal; -+ static hypot(...n: Value[]): Decimal; - - /** - * Return a new Decimal whose value is the maximum of the arguments. - * -- * @param { DecimalValue[] } n {number | string | Decimal} -+ * @param { Value[] } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3362,7 +3436,7 @@ declare class Decimal { - /** - * Return a new Decimal whose value is the maximum of the arguments. - * -- * @param { DecimalValue[] } n {number | string | Decimal} -+ * @param { Value[] } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3371,15 +3445,15 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- static max(...n: DecimalValue[]): Decimal; -+ static max(...n: Value[]): Decimal; - - /** - * Return a new Decimal whose value is the minimum of the arguments. - * -- * @param { DecimalValue[] } n {number | string | Decimal} -+ * @param { Value[] } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3392,7 +3466,7 @@ declare class Decimal { - /** - * Return a new Decimal whose value is the minimum of the arguments. - * -- * @param { DecimalValue[] } n {number | string | Decimal} -+ * @param { Value[] } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3401,10 +3475,10 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- static min(...n: DecimalValue[]): Decimal; -+ static min(...n: Value[]): Decimal; - - /** - * Returns a new Decimal with a random value equal to or greater than 0 and less than 1. -@@ -3425,7 +3499,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - static random(): Decimal; -@@ -3434,7 +3508,7 @@ declare class Decimal { - * Returns a new Decimal with a random value equal to or greater than 0 and less than 1, and with - * `significantDigits` significant digits (or less if trailing zeros are produced). - * -- * @param { DecimalValue } significantDigits {number} Significant digits. Integer, 0 to MAX_DIGITS inclusive. -+ * @param { Value } significantDigits {number} Significant digits. Integer, 0 to MAX_DIGITS inclusive. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3449,7 +3523,7 @@ declare class Decimal { - * Returns a new Decimal with a random value equal to or greater than 0 and less than 1, and with - * `significantDigits` significant digits (or less if trailing zeros are produced). - * -- * @param { DecimalValue } significantDigits {number} Significant digits. Integer, 0 to MAX_DIGITS inclusive. -+ * @param { Value } significantDigits {number} Significant digits. Integer, 0 to MAX_DIGITS inclusive. - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3459,7 +3533,7 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ - static random(significantDigits: number): Decimal; -@@ -3472,7 +3546,7 @@ declare class Decimal { - * -0 if x is -0, - * NaN otherwise - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3490,8 +3564,8 @@ declare class Decimal { - * -0 if x is -0, - * NaN otherwise - * -- * @param { DecimalValue } n {number | string | Decimal} -- * @returns { Decimal } the Decimal type -+ * @param { Value } n {number | string | Decimal} -+ * @returns { number } the number type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; - * 2. Parameter verification failed. -@@ -3499,15 +3573,15 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- static sign(n: DecimalValue): number; -+ static sign(n: Value): number; - - /** - * Return a new Decimal whose value is `n` rounded to an integer using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3520,7 +3594,7 @@ declare class Decimal { - /** - * Return a new Decimal whose value is `n` rounded to an integer using rounding mode `rounding`. - * -- * @param { DecimalValue } n {number | string | Decimal} -+ * @param { Value } n {number | string | Decimal} - * @returns { Decimal } the Decimal type - * @throws { BusinessError } 401 - Parameter error. Possible causes: - * 1. Incorrect parameter types; -@@ -3529,10 +3603,10 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since arkts {'1.1':'18','1.2':'20'} -+ * @since arkts {'1.1':'18', '1.2':'20'} - * @arkts 1.1&1.2 - */ -- static round(n: DecimalValue): Decimal; -+ static round(n: Value): Decimal; - - /** - * Configures the 'global' settings for this particular Decimal constructor. -@@ -3581,7 +3655,8 @@ declare class Decimal { - * @syscap SystemCapability.Utils.Lang - * @crossplatform - * @atomicservice -- * @since 18 -+ * @since arkts {'1.1':'18', '1.2':'20'} -+ * @arkts 1.1&1.2 - */ - static set(config: DecimalConfig): void; - -@@ -3609,6 +3684,7 @@ declare class Decimal { - /** - * Rounds away from zero - * -+ * @type { number } - * @readonly - * @static - * @syscap SystemCapability.Utils.Lang -@@ -3643,6 +3719,7 @@ declare class Decimal { - /** - * Rounds towards zero - * -+ * @type { number } - * @readonly - * @static - * @syscap SystemCapability.Utils.Lang -@@ -3677,6 +3754,7 @@ declare class Decimal { - /** - * Rounds towards Infinity - * -+ * @type { number } - * @readonly - * @static - * @syscap SystemCapability.Utils.Lang -@@ -3711,6 +3789,7 @@ declare class Decimal { - /** - * Rounds towards -Infinity - * -+ * @type { number } - * @readonly - * @static - * @syscap SystemCapability.Utils.Lang -@@ -3745,6 +3824,7 @@ declare class Decimal { - /** - * Rounds towards nearest neighbour. If equidistant, rounds away from zero - * -+ * @type { number } - * @readonly - * @static - * @syscap SystemCapability.Utils.Lang -@@ -3779,6 +3859,7 @@ declare class Decimal { - /** - * Rounds towards nearest neighbour. If equidistant, rounds towards zero - * -+ * @type { number } - * @readonly - * @static - * @syscap SystemCapability.Utils.Lang -@@ -3813,6 +3894,7 @@ declare class Decimal { - /** - * Rounds towards nearest neighbour. If equidistant, rounds towards even neighbour - * -+ * @type { number } - * @readonly - * @static - * @syscap SystemCapability.Utils.Lang -@@ -3847,6 +3929,7 @@ declare class Decimal { - /** - * Rounds towards nearest neighbour. If equidistant, rounds towards Infinity - * -+ * @type { number } - * @readonly - * @static - * @syscap SystemCapability.Utils.Lang -@@ -3881,6 +3964,7 @@ declare class Decimal { - /** - * Rounds towards nearest neighbour. If equidistant, rounds towards -Infinity - * -+ * @type { number } - * @readonly - * @static - * @syscap SystemCapability.Utils.Lang -@@ -3915,6 +3999,7 @@ declare class Decimal { - /** - * Not a rounding mode, see modulo - * -+ * @type { number } - * @readonly - * @static - * @syscap SystemCapability.Utils.Lang -diff --git a/arkui_transformer.py b/arkui_transformer.py -index 0d00f1b74..0f6919fd6 100755 ---- a/arkui_transformer.py -+++ b/arkui_transformer.py -@@ -30,6 +30,10 @@ def compile_package(options): - nodejs = os.path.abspath(options.node_js) - input_dir = os.path.abspath(options.input) - output = os.path.abspath(options.output) -+ config_path = '' -+ if (len(options.config_path) > 0): -+ config_path = os.path.abspath(options.config_path) -+ - custom_env = { - 'PATH': f"{os.path.dirname(os.path.abspath(options.node_js))}:{os.environ.get('PATH')}", - 'NODE_HOME': os.path.dirname(os.path.abspath(options.node_js)), -@@ -38,7 +42,10 @@ def compile_package(options): - process = subprocess.run([npm, "run", "compile:arkui"], env=custom_env, cwd=tool_path, shell=False) - - if os.path.exists(package_path): -- p = subprocess.run([nodejs, package_path, "--input-dir", input_dir, "--target-dir", output], cwd=tool_path, shell=False) -+ if (len(config_path) > 0): -+ p = subprocess.run([nodejs, package_path, "--input-dir", input_dir, "--target-dir", output, "--config-path", config_path], cwd=tool_path, shell=False) -+ else: -+ p = subprocess.run([nodejs, package_path, "--input-dir", input_dir, "--target-dir", output], cwd=tool_path, shell=False) - else: - print("arkui_transformer: tool path does not exist") - -@@ -49,6 +56,7 @@ def main(): - parser = argparse.ArgumentParser() - parser.add_argument('--input', required=True) - parser.add_argument('--output', required=True) -+ parser.add_argument('--config_path', required=False, default='') - parser.add_argument('--source_root_dir', required=True) - parser.add_argument('--npm-path', required=True) - parser.add_argument('--node-js', required=True) -diff --git a/build-tools/arkui_transformer/config/arkui_config.json b/build-tools/arkui_transformer/config/arkui_config.json -index bb1069ea5..890f2d737 100644 ---- a/build-tools/arkui_transformer/config/arkui_config.json -+++ b/build-tools/arkui_transformer/config/arkui_config.json -@@ -54,7 +54,6 @@ - "Menu", - "MenuItem", - "MenuItemGroup", -- "Metaball", - "MovingPhotoView", - "NavDestination", - "NavRouter", -@@ -130,8 +129,6 @@ - "ContainerSpan", - "ArcSwiper", - "ArcScrollBar", -- "ArcAlphabetIndexer", -- "HdsNavigation", -- "HdsNavDestination" -+ "ArcAlphabetIndexer" - ] - } -\ No newline at end of file -diff --git a/build-tools/arkui_transformer/config/arkui_m3_white_list.json b/build-tools/arkui_transformer/config/arkui_m3_white_list.json -deleted file mode 100644 -index ea4926b92..000000000 ---- a/build-tools/arkui_transformer/config/arkui_m3_white_list.json -+++ /dev/null -@@ -1,4 +0,0 @@ --{ -- "useM3": [ -- ] --} -\ No newline at end of file -diff --git a/build-tools/arkui_transformer/package-lock.json b/build-tools/arkui_transformer/package-lock.json -new file mode 100644 -index 000000000..6709ce648 ---- /dev/null -+++ b/build-tools/arkui_transformer/package-lock.json -@@ -0,0 +1,306 @@ -+{ -+ "name": "arkui_transformer", -+ "version": "1.0.0", -+ "lockfileVersion": 3, -+ "requires": true, -+ "packages": { -+ "": { -+ "name": "arkui_transformer", -+ "version": "1.0.0", -+ "license": "ISC", -+ "dependencies": { -+ "@types/node": "^18.0.0", -+ "commander": "^10.0.0", -+ "typescript": "^4.9.5" -+ }, -+ "devDependencies": { -+ "@rollup/plugin-node-resolve": "^16.0.1", -+ "@rollup/plugin-typescript": "^12.1.2", -+ "rollup": "^3.29.5", -+ "tslib": "^2.8.1" -+ } -+ }, -+ "node_modules/@rollup/plugin-node-resolve": { -+ "version": "16.0.1", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.1.tgz", -+ "integrity": "sha512-tk5YCxJWIG81umIvNkSod2qK5KyQW19qcBF/B78n1bjtOON6gzKoVeSzAE8yHCZEDmqkHKkxplExA8KzdJLJpA==", -+ "dev": true, -+ "license": "MIT", -+ "dependencies": { -+ "@rollup/pluginutils": "^5.0.1", -+ "@types/resolve": "1.20.2", -+ "deepmerge": "^4.2.2", -+ "is-module": "^1.0.0", -+ "resolve": "^1.22.1" -+ }, -+ "engines": { -+ "node": ">=14.0.0" -+ }, -+ "peerDependencies": { -+ "rollup": "^2.78.0||^3.0.0||^4.0.0" -+ }, -+ "peerDependenciesMeta": { -+ "rollup": { -+ "optional": true -+ } -+ } -+ }, -+ "node_modules/@rollup/plugin-typescript": { -+ "version": "12.1.2", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/@rollup/plugin-typescript/-/plugin-typescript-12.1.2.tgz", -+ "integrity": "sha512-cdtSp154H5sv637uMr1a8OTWB0L1SWDSm1rDGiyfcGcvQ6cuTs4MDk2BVEBGysUWago4OJN4EQZqOTl/QY3Jgg==", -+ "dev": true, -+ "license": "MIT", -+ "dependencies": { -+ "@rollup/pluginutils": "^5.1.0", -+ "resolve": "^1.22.1" -+ }, -+ "engines": { -+ "node": ">=14.0.0" -+ }, -+ "peerDependencies": { -+ "rollup": "^2.14.0||^3.0.0||^4.0.0", -+ "tslib": "*", -+ "typescript": ">=3.7.0" -+ }, -+ "peerDependenciesMeta": { -+ "rollup": { -+ "optional": true -+ }, -+ "tslib": { -+ "optional": true -+ } -+ } -+ }, -+ "node_modules/@rollup/pluginutils": { -+ "version": "5.1.4", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/@rollup/pluginutils/-/pluginutils-5.1.4.tgz", -+ "integrity": "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==", -+ "dev": true, -+ "license": "MIT", -+ "dependencies": { -+ "@types/estree": "^1.0.0", -+ "estree-walker": "^2.0.2", -+ "picomatch": "^4.0.2" -+ }, -+ "engines": { -+ "node": ">=14.0.0" -+ }, -+ "peerDependencies": { -+ "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" -+ }, -+ "peerDependenciesMeta": { -+ "rollup": { -+ "optional": true -+ } -+ } -+ }, -+ "node_modules/@types/estree": { -+ "version": "1.0.7", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/@types/estree/-/estree-1.0.7.tgz", -+ "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", -+ "dev": true, -+ "license": "MIT" -+ }, -+ "node_modules/@types/node": { -+ "version": "18.19.110", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/@types/node/-/node-18.19.110.tgz", -+ "integrity": "sha512-WW2o4gTmREtSnqKty9nhqF/vA0GKd0V/rbC0OyjSk9Bz6bzlsXKT+i7WDdS/a0z74rfT2PO4dArVCSnapNLA5Q==", -+ "license": "MIT", -+ "dependencies": { -+ "undici-types": "~5.26.4" -+ } -+ }, -+ "node_modules/@types/resolve": { -+ "version": "1.20.2", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/@types/resolve/-/resolve-1.20.2.tgz", -+ "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==", -+ "dev": true, -+ "license": "MIT" -+ }, -+ "node_modules/commander": { -+ "version": "10.0.1", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/commander/-/commander-10.0.1.tgz", -+ "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", -+ "license": "MIT", -+ "engines": { -+ "node": ">=14" -+ } -+ }, -+ "node_modules/deepmerge": { -+ "version": "4.3.1", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/deepmerge/-/deepmerge-4.3.1.tgz", -+ "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", -+ "dev": true, -+ "license": "MIT", -+ "engines": { -+ "node": ">=0.10.0" -+ } -+ }, -+ "node_modules/estree-walker": { -+ "version": "2.0.2", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/estree-walker/-/estree-walker-2.0.2.tgz", -+ "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", -+ "dev": true, -+ "license": "MIT" -+ }, -+ "node_modules/fsevents": { -+ "version": "2.3.3", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/fsevents/-/fsevents-2.3.3.tgz", -+ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", -+ "dev": true, -+ "hasInstallScript": true, -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "darwin" -+ ], -+ "engines": { -+ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" -+ } -+ }, -+ "node_modules/function-bind": { -+ "version": "1.1.2", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/function-bind/-/function-bind-1.1.2.tgz", -+ "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", -+ "dev": true, -+ "license": "MIT", -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/hasown": { -+ "version": "2.0.2", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/hasown/-/hasown-2.0.2.tgz", -+ "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", -+ "dev": true, -+ "license": "MIT", -+ "dependencies": { -+ "function-bind": "^1.1.2" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ } -+ }, -+ "node_modules/is-core-module": { -+ "version": "2.16.1", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/is-core-module/-/is-core-module-2.16.1.tgz", -+ "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", -+ "dev": true, -+ "license": "MIT", -+ "dependencies": { -+ "hasown": "^2.0.2" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/is-module": { -+ "version": "1.0.0", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/is-module/-/is-module-1.0.0.tgz", -+ "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==", -+ "dev": true, -+ "license": "MIT" -+ }, -+ "node_modules/path-parse": { -+ "version": "1.0.7", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/path-parse/-/path-parse-1.0.7.tgz", -+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", -+ "dev": true, -+ "license": "MIT" -+ }, -+ "node_modules/picomatch": { -+ "version": "4.0.2", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/picomatch/-/picomatch-4.0.2.tgz", -+ "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", -+ "dev": true, -+ "license": "MIT", -+ "engines": { -+ "node": ">=12" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/jonschlinkert" -+ } -+ }, -+ "node_modules/resolve": { -+ "version": "1.22.10", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/resolve/-/resolve-1.22.10.tgz", -+ "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", -+ "dev": true, -+ "license": "MIT", -+ "dependencies": { -+ "is-core-module": "^2.16.0", -+ "path-parse": "^1.0.7", -+ "supports-preserve-symlinks-flag": "^1.0.0" -+ }, -+ "bin": { -+ "resolve": "bin/resolve" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/rollup": { -+ "version": "3.29.5", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/rollup/-/rollup-3.29.5.tgz", -+ "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==", -+ "dev": true, -+ "license": "MIT", -+ "bin": { -+ "rollup": "dist/bin/rollup" -+ }, -+ "engines": { -+ "node": ">=14.18.0", -+ "npm": ">=8.0.0" -+ }, -+ "optionalDependencies": { -+ "fsevents": "~2.3.2" -+ } -+ }, -+ "node_modules/supports-preserve-symlinks-flag": { -+ "version": "1.0.0", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", -+ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", -+ "dev": true, -+ "license": "MIT", -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, -+ "node_modules/tslib": { -+ "version": "2.8.1", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/tslib/-/tslib-2.8.1.tgz", -+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", -+ "dev": true, -+ "license": "0BSD" -+ }, -+ "node_modules/typescript": { -+ "version": "4.9.5", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/typescript/-/typescript-4.9.5.tgz", -+ "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", -+ "license": "Apache-2.0", -+ "bin": { -+ "tsc": "bin/tsc", -+ "tsserver": "bin/tsserver" -+ }, -+ "engines": { -+ "node": ">=4.2.0" -+ } -+ }, -+ "node_modules/undici-types": { -+ "version": "5.26.5", -+ "resolved": "https://repo.huaweicloud.com/repository/npm/undici-types/-/undici-types-5.26.5.tgz", -+ "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", -+ "license": "MIT" -+ } -+ } -+} -diff --git a/build-tools/arkui_transformer/pattern/arkts_component_decl.pattern b/build-tools/arkui_transformer/pattern/arkts_component_decl.pattern -index ae4a5689f..c4b09a33d 100644 ---- a/build-tools/arkui_transformer/pattern/arkts_component_decl.pattern -+++ b/build-tools/arkui_transformer/pattern/arkts_component_decl.pattern -@@ -5,4 +5,4 @@ export declare function %COMPONENT_NAME%( - %FUNCTION_PARAMETERS% - @memo - content_?: () => void, --): UI%COMPONENT_NAME%Attribute -\ No newline at end of file -+): %COMPONENT_NAME%Attribute -\ No newline at end of file -diff --git a/build-tools/arkui_transformer/pattern/arkts_component_decl_m3.pattern b/build-tools/arkui_transformer/pattern/arkts_component_decl_m3.pattern -deleted file mode 100644 -index c4b09a33d..000000000 ---- a/build-tools/arkui_transformer/pattern/arkts_component_decl_m3.pattern -+++ /dev/null -@@ -1,8 +0,0 @@ --%COMPONENT_COMMENT% --@memo --@ComponentBuilder --export declare function %COMPONENT_NAME%( -- %FUNCTION_PARAMETERS% -- @memo -- content_?: () => void, --): %COMPONENT_NAME%Attribute -\ No newline at end of file -diff --git a/build-tools/arkui_transformer/src/add_import.ts b/build-tools/arkui_transformer/src/add_import.ts -index daf313dd4..83a69d9b3 100644 ---- a/build-tools/arkui_transformer/src/add_import.ts -+++ b/build-tools/arkui_transformer/src/add_import.ts -@@ -68,15 +68,9 @@ function handleImportDeclaration(node: ts.ImportDeclaration): [ts.Node, boolean] - if (importClause && ts.isImportClause(importClause) && importClause.namedBindings && ts.isNamedImports(importClause.namedBindings)) { - const namedImports = importClause.namedBindings.elements; - const existingImports = namedImports.map((element) => element.name.text); -- existingImports.forEach((element) => { -- if (uiconfig.isUIHeritage(element)) { -- uiconfig.useMemoM3 || uiprefixImports.add(`UI${element}`) -- } -- }) - if (moduleText.includes("common")) { - uiprefixImports.add('AttributeModifier'); - uiprefixImports.add('CommonMethod'); -- uiconfig.useMemoM3 || uiprefixImports.add('UICommonMethod'); - } - - const addedImports = Array.from(uiprefixImports).filter((im) => !existingImports.includes(im)); -@@ -146,9 +140,6 @@ function createTargetImport(sourceFile: ts.SourceFile, context: ts.Transformatio - ts.factory.createNamedImports([ - ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("AttributeModifier")), - ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("CommonMethod")), -- ...(uiconfig.useMemoM3 !== true ? [ -- ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier("UICommonMethod")) -- ] : []) - ]) - ), - ts.factory.createStringLiteral("./common"), -diff --git a/build-tools/arkui_transformer/src/arkui_config_util.ts b/build-tools/arkui_transformer/src/arkui_config_util.ts -index a293a73c6..5feba8166 100644 ---- a/build-tools/arkui_transformer/src/arkui_config_util.ts -+++ b/build-tools/arkui_transformer/src/arkui_config_util.ts -@@ -13,85 +13,95 @@ - * limitations under the License. - */ - --import { OptionValues } from "commander" --import * as fs from "fs" -+import { OptionValues } from 'commander'; -+import * as fs from 'fs'; - --import path from "path" -+import path from 'path'; - - export interface ArkUIConfig { -- components: Array -+ components: Array; - } - - interface NoneUIConfig { -- files: Array --} -- --interface UseM3Config { -- useM3: Array -+ files: Array; - } - - export class ArkUIConfigUtil { -- static instance: ArkUIConfigUtil = new ArkUIConfigUtil -+ static instance: ArkUIConfigUtil = new ArkUIConfigUtil(); - constructor() { -- this.config = JSON.parse(fs.readFileSync("./config/arkui_config.json", 'utf-8')) -+ this.config = JSON.parse(fs.readFileSync('./config/arkui_config.json', 'utf-8')); - this.config.components.forEach(c => { -- this.componentSet.add(c) -- }) -- this.noneUIconfig = JSON.parse(fs.readFileSync("./config/none_arkui_files.json", 'utf-8')) -+ this.componentSet.add(c); -+ }); -+ this.noneUIconfig = JSON.parse(fs.readFileSync('./config/none_arkui_files.json', 'utf-8')); - this.noneUIconfig.files.forEach(f => { -- this.noneUIFielSet.add(f) -- }) -- const useM3Config: UseM3Config = JSON.parse(fs.readFileSync("./config/arkui_m3_white_list.json", 'utf-8')) -- this._useM3Files = useM3Config.useM3 -+ this.noneUIFileSet.add(f); -+ }); - } - // ui components -- private config: ArkUIConfig -+ private config: ArkUIConfig; - // None ui files -- private noneUIconfig: NoneUIConfig -- private noneUIFielSet: Set = new Set -+ private noneUIconfig: NoneUIConfig; -+ private noneUIFileSet: Set = new Set(); - // Full set of component, should be manually mantained by config file -- private componentSet: Set = new Set -+ private componentSet: Set = new Set(); - // Component superclass set, generated by traversing the declartion AST -- private componentSuperclassSet: Set = new Set -+ private componentSuperclassSet: Set = new Set(); - // All class/interface name related to component attribute heritage -- private componentHeritage: Set = new Set -+ private componentHeritage: Set = new Set(); - // All implement relationship of component heritage -- private componentHerirageRelation: Map = new Map -+ private componentHerirageRelation: Map = new Map(); - // All component filename -- private componentFiles: Set = new Set -- private file2Attrbiute: Map = new Map -- private shouldNotHaveAttributeModifier: Set = new Set -- private _useMemoM3: boolean = false -- private _useM3Files: Array = [] -- get useMemoM3(): boolean { -- return this._useMemoM3 -+ private componentFiles: Set = new Set(); -+ private file2Attrbiute: Map = new Map(); -+ private shouldNotHaveAttributeModifier: Set = new Set(); -+ private _useMemoM3: boolean = false; -+ private _configPath: string = ''; -+ get isHdsComponent(): boolean { -+ return this._configPath.length > 0; - } -- -- set useMemoM3(value: boolean) { -- this._useMemoM3 = value -- } -- -- withM3File(file: string): boolean { -- if (this._useMemoM3) { -- return true; -- } -- return this._useM3Files.includes(path.basename(file)) -+ get useMemoM3(): boolean { -+ return this._useMemoM3; - } -- - public loadConfig(config: OptionValues): void { - if (config.useMemoM3) { -- this._useMemoM3 = true -+ this._useMemoM3 = true; -+ } -+ -+ if (config.configPath != undefined && config.configPath != '') { -+ this._configPath = config.configPath; -+ // exception process: avoid non-existing given path -+ try { -+ this.config = JSON.parse(fs.readFileSync(this._configPath + '/hds_uicomponents.json', 'utf-8')); -+ this.componentSet.clear(); -+ this.config.components.forEach(c => { -+ this.componentSet.add(c); -+ }); -+ this.noneUIconfig = JSON.parse(fs.readFileSync(this._configPath + '/hds_non_uicomponents.json', 'utf-8')); -+ this.noneUIFileSet.clear(); -+ this.noneUIconfig.files.forEach(f => { -+ this.noneUIFileSet.add(f); -+ }); -+ } catch (error) { -+ this._configPath = ''; -+ console.log('Load given hds_uicomponents file failed!', error); -+ } - } - } - private getPureName(name: string): string { -- return path.basename(name).replaceAll(".d.ts", "").replaceAll(".d.ets", "").replaceAll("_","").toLowerCase() -+ return path -+ .basename(name) -+ .replace(/\.d\.e?ts/g, '') -+ .replace(/_/g, '') -+ .toLowerCase(); - } - - public isRelatedToComponent(name: string): boolean { -- return this.componentSet.has(name) || this.componentSuperclassSet.has(name) -+ return this.componentSet.has(name) || this.componentSuperclassSet.has(name); - } - public isComponent(name: string, subfix: string): boolean { -- return this.componentSet.has(name.replaceAll(subfix, "")) -+ const regSubfix = new RegExp(subfix, 'g'); -+ return this.componentSet.has(name.replace(regSubfix, '')); - } - public addComponentSuperclass(name: string): void { - if (!this.isComponent(name, 'Attribute')) { -@@ -99,36 +109,39 @@ export class ArkUIConfigUtil { - } - } - public addComponentAttributeHeritage(name: string[]): void { -- let prev: string | undefined = undefined -+ let prev: string | undefined = undefined; - name.forEach(n => { - if (prev) { -- this.componentHerirageRelation.set(prev, n) -+ this.componentHerirageRelation.set(prev, n); - } -- prev = n -- this.componentHeritage.add(n) -- }) -+ prev = n; -+ this.componentHeritage.add(n); -+ }); - if (name.length == 1) { -- this.shouldNotHaveAttributeModifier.add(name[0]) -+ this.shouldNotHaveAttributeModifier.add(name[0]); - } - } - public getComponentSuperclass(name: string): string | undefined { -- return this.componentHerirageRelation.get(name) -+ return this.componentHerirageRelation.get(name); - } - public isUIHeritage(name: string): boolean { -- return this.componentHeritage.has(name) -+ return this.componentHeritage.has(name); - } - public notUIFile(name: string): boolean { -- return this.noneUIFielSet.has(this.getPureName(name)) -+ return this.noneUIFileSet.has(this.getPureName(name)); - } - public addComponentFile(name: string): void { -- this.componentFiles.add(this.getPureName(name)) -+ this.componentFiles.add(this.getPureName(name)); - } - public isComponentFile(name: string): boolean { -- return this.componentFiles.has(this.getPureName(name)) -+ return this.componentFiles.has(this.getPureName(name)); - } - public shouldHaveAttributeModifier(name: string): boolean { -- return !this.shouldNotHaveAttributeModifier.has(name) && this.isComponent(name, 'Attribute') -+ if (this.isHdsComponent) { -+ return false; -+ } -+ return !this.shouldNotHaveAttributeModifier.has(name) && this.isComponent(name, 'Attribute'); - } - } - --export default ArkUIConfigUtil.instance -+export default ArkUIConfigUtil.instance; -diff --git a/build-tools/arkui_transformer/src/arkui_transformer.ts b/build-tools/arkui_transformer/src/arkui_transformer.ts -index 65a17e6bf..30802ad34 100644 ---- a/build-tools/arkui_transformer/src/arkui_transformer.ts -+++ b/build-tools/arkui_transformer/src/arkui_transformer.ts -@@ -14,6 +14,7 @@ - */ - - import { program } from "commander" -+import { exit } from "process" - import * as ts from 'typescript'; - import * as path from 'path'; - import * as fs from 'fs'; -@@ -29,8 +30,14 @@ function getFiles(dir: string, fileFilter: (f: string) => boolean): string[] { - for (const entry of dirents) { - const fullPath = path.join(dir, entry.name) - if (entry.isFile() && fileFilter(fullPath) && !uiconfig.notUIFile(fullPath)) { -- result.push(fullPath) -- uiconfig.addComponentFile(fullPath) -+ let addFile: boolean = true -+ if (uiconfig.isHdsComponent) { -+ addFile = entry.name.startsWith("@hms.hds.") -+ } -+ if (addFile) { -+ result.push(fullPath) -+ uiconfig.addComponentFile(fullPath) -+ } - } - } - return result -@@ -46,58 +53,90 @@ function convertFiles(files: string[]): string[] { - return result - } - -+function getTransformationResult(sourceFile: ts.SourceFile, program: ts.Program, componentFile: ComponentFile): ts.TransformationResult { -+ if (uiconfig.isHdsComponent) { -+ return ts.transform(sourceFile, [interfaceTransformer(program, componentFile), exportAllTransformer()]); -+ } -+ return ts.transform(sourceFile, [interfaceTransformer(program, componentFile), exportAllTransformer(), addImportTransformer()]); -+} -+ - function printResult(source: string, file: ComponentFile) { - const outPath = path.join(options.targetDir, file.outFileName) - fs.mkdirSync(path.dirname(outPath), { recursive: true }); - fs.writeFileSync(outPath, source.concat(file.concactSource)) - } - --function withM3Config(f: string, func: () => void) { -- if (uiconfig.withM3File(f)) { -- uiconfig.useMemoM3 = true; -- func() -- uiconfig.useMemoM3 = false; -- return; -- } -- func() --} -- - function main() { -- uiconfig.loadConfig(options) -- const files = getFiles(options.inputDir, f => f.endsWith(".d.ets")) -- const convertedFile = convertFiles(files) -- const program = ts.createProgram(convertedFile, { allowJs: true }) -- const componentFileMap = new Map() -- convertedFile.forEach(f => { -- const sourceFile = program.getSourceFile(f)! -- const componentFile = new ComponentFile(f, sourceFile) -- componentFileMap.set(f, componentFile) -- ts.transform(sourceFile, [componentInterfaceCollector(program, componentFile)]) -- }) -+ uiconfig.loadConfig(options); -+ const files = getFiles(options.inputDir, f => f.endsWith(".d.ets")); -+ const program = ts.createProgram(files, { allowJs: true }); - const { printFile } = ts.createPrinter({ removeComments: false }); -- convertedFile.forEach(f => { -- withM3Config(f, () => { -- try { -- const sourceFile = program.getSourceFile(f)!; -+ const componentFileMap = new Map(); -+ const componentFileCallback = (f: string) => { -+ return (context: ts.TransformationContext) => { -+ return (sourceFile: ts.SourceFile) => { -+ const componentFile = new ComponentFile(f, sourceFile); -+ componentFileMap.set(f, componentFile); -+ ts.transform(sourceFile, [componentInterfaceCollector(program, componentFile)]); -+ return sourceFile; -+ } -+ } -+ } -+ -+ const transformerCallback = (f: string) => { -+ return (context: ts.TransformationContext) => { -+ return (sourceFile: ts.SourceFile) => { - const componentFile = componentFileMap.get(f)!; -- const result = ts.transform(sourceFile, [interfaceTransformer(program, componentFile), exportAllTransformer(), addImportTransformer()]); -+ const result = getTransformationResult(sourceFile, program, componentFile); - const transformedFile = ts.createSourceFile(f, printFile(result.transformed[0]), ts.ScriptTarget.Latest, true); -- const addMemoResult = ts.transform(transformedFile, [addMemoTransformer(componentFile)]); -- const transformedSource = ts.createPrinter().printFile(addMemoResult.transformed[0]); -- printResult(transformedSource, componentFile) -- fs.unlinkSync(f) -- } catch (e) { -- console.log("Error transforming file:", f, e); -+ const transformedSource = ts.createPrinter().printFile(transformedFile); -+ printResult(transformedSource, componentFile); -+ return ts.createSourceFile("", "", ts.ScriptTarget.Latest, true); - } -- }) -+ } -+ } -+ -+ // Step1 collect all component dependencies -+ files.forEach(f => { -+ try { -+ const content = fs.readFileSync(f, 'utf-8'); -+ ts.transpileModule(content, { -+ compilerOptions: { -+ target: ts.ScriptTarget.ES2017, -+ }, -+ fileName: f, -+ transformers: { before: [componentFileCallback(f)] } -+ }) -+ } catch (e) { -+ console.log("Error collecting file: ", f, e); -+ exit(1) -+ } -+ }) -+ -+ // Step2 make transformation -+ files.forEach(f => { -+ try { -+ const content = fs.readFileSync(f, 'utf-8'); -+ ts.transpileModule(content, { -+ compilerOptions: { -+ target: ts.ScriptTarget.ES2017, -+ }, -+ fileName: f, -+ transformers: { before: [transformerCallback(f)] } -+ }) -+ } catch (e) { -+ console.log("Error transforming file: ", f, e); -+ exit(1) -+ } - }) - } - - const options = program - .option('--input-dir ', "Path of where d.ets exist") - .option('--target-dir ', "Path to generate d.ets file") -+ .option('--config-path ', "Path to folder with config files") - .option('--use-memo-m3', "Generate code with m3 @memo annotations and functions with @ComponentBuilder", false) - .parse() - .opts() - --main() -\ No newline at end of file -+main() -diff --git a/build-tools/arkui_transformer/src/component_file.ts b/build-tools/arkui_transformer/src/component_file.ts -index 56bc9e62c..6e2defbf4 100644 ---- a/build-tools/arkui_transformer/src/component_file.ts -+++ b/build-tools/arkui_transformer/src/component_file.ts -@@ -17,8 +17,8 @@ import * as ts from 'typescript'; - import * as path from 'path'; - - export class ComponentFile { -- public componentName: string -- public outFileName: string -+ public componentName: string; -+ public outFileName: string; - - static snake2Camel(name: string, low: boolean = false): string { - if (!name.includes('_')) { -@@ -37,15 +37,15 @@ export class ComponentFile { - } - - public appendAttribute(str: string) { -- this.attributeSource.push(str) -+ this.attributeSource.push(str); - } - - public appendFunction(str: string) { -- this.functionSource = str -+ this.functionSource += str; - } - - get concactSource() { -- return [...this.attributeSource, this.functionSource].join('\n') -+ return [...this.attributeSource, this.functionSource].join('\n'); - } - - constructor( -@@ -54,8 +54,8 @@ export class ComponentFile { - public attributeSource: string[] = [], - public functionSource: string = '', - ) { -- const pureName = path.basename(this.fileName).replaceAll(".d.ts", ""); -- this.componentName = ComponentFile.snake2Camel(pureName) -- this.outFileName = ComponentFile.snake2Camel(pureName, true).concat(".d.ets") -+ const pureName = path.basename(this.fileName).replace(/\.d\.e?ts/g, ""); -+ this.componentName = ComponentFile.snake2Camel(pureName); -+ this.outFileName = ComponentFile.snake2Camel(pureName, true).concat(".d.ets"); - } - } -\ No newline at end of file -diff --git a/build-tools/arkui_transformer/src/interface_converter.ts b/build-tools/arkui_transformer/src/interface_converter.ts -index 983db2f3c..affa082b2 100644 ---- a/build-tools/arkui_transformer/src/interface_converter.ts -+++ b/build-tools/arkui_transformer/src/interface_converter.ts -@@ -17,12 +17,12 @@ import * as ts from 'typescript'; - import * as fs from 'fs'; - import * as path from 'path'; - import { assert } from 'console'; --import uiconfig from './arkui_config_util' -+import uiconfig from './arkui_config_util'; - import { ComponentFile } from './component_file'; --import { analyzeBaseClasses, isComponentHerirage, getBaseClassName, removeDuplicateMethods, mergeUniqueOrdered } from './lib/attribute_utils' -+import { analyzeBaseClasses, isComponentHerirage, getBaseClassName, removeDuplicateMethods, mergeUniqueOrdered } from './lib/attribute_utils'; - - function readLangTemplate(): string { -- return uiconfig.useMemoM3 ? fs.readFileSync('./pattern/arkts_component_decl_m3.pattern', 'utf8') : fs.readFileSync('./pattern/arkts_component_decl.pattern', 'utf8') -+ return fs.readFileSync('./pattern/arkts_component_decl.pattern', 'utf8'); - } - - function extractSignatureComment( -@@ -34,19 +34,19 @@ function extractSignatureComment( - - - const commentText = sourceFile.text -- .slice(jsDoc.getStart(sourceFile), jsDoc.getEnd()) -+ .slice(jsDoc.getStart(sourceFile), jsDoc.getEnd()); - - return commentText.split('\n').map((l, index) => { - if (index == 0) { - return l.trimStart(); - } -- return ' ' + l.trimStart() -- }).join('\n') -+ return ' ' + l.trimStart(); -+ }).join('\n'); - } - - interface ComponnetFunctionInfo { - sig: string[], -- comment: string -+ comment: string; - } - - interface ComponentPram { -@@ -57,13 +57,13 @@ interface ComponentPram { - - function getAllInterfaceCallSignature(node: ts.InterfaceDeclaration, originalCode: ts.SourceFile, mergeCallSig: boolean = false): Array { - const signatureParams: Array = []; -- const comments: string[] = [] -- const paramList: Array = [] -+ const comments: string[] = []; -+ const paramList: Array = []; - - node.members.forEach(member => { - if (ts.isCallSignatureDeclaration(member)) { - const currentSignature: string[] = []; -- const currentParam: ComponentPram[] = [] -+ const currentParam: ComponentPram[] = []; - const comment = extractSignatureComment(member, originalCode); - comments.push(comment); - -@@ -71,38 +71,38 @@ function getAllInterfaceCallSignature(node: ts.InterfaceDeclaration, originalCod - currentSignature.push(param.getText(originalCode)); - currentParam.push({ name: (param.name as ts.Identifier).escapedText as string, type: [param.type!.getText(originalCode)], isOptional: !!param.questionToken }); - }); -- signatureParams.push(currentSignature) -- paramList.push(currentParam) -+ signatureParams.push(currentSignature); -+ paramList.push(currentParam); - } - }); - -- const result: Array = new Array -+ const result: Array = new Array; - - if (mergeCallSig) { -- const mergedParamList: Array = [] -+ const mergedParamList: Array = []; - paramList.forEach((params, _) => { - params.forEach((param, index) => { - if (!mergedParamList[index]) { -- mergedParamList.push(param) -+ mergedParamList.push(param); - if (index > 0) { - (mergedParamList[index] as ComponentPram).isOptional = true; - } - } else { -- mergedParamList[index] = { name: param.name, type: mergeUniqueOrdered(mergedParamList[index].type, param.type), isOptional: mergedParamList[index].isOptional || param.isOptional } -+ mergedParamList[index] = { name: param.name, type: mergeUniqueOrdered(mergedParamList[index].type, param.type), isOptional: mergedParamList[index].isOptional || param.isOptional }; - } -- }) -- }) -+ }); -+ }); - const mergedSignature: string[] = []; - mergedParamList.forEach((param, index) => { -- mergedSignature.push(`${param.name}${param.isOptional ? '?' : ''}: ${param.type.join(' | ')}`) -- }) -+ mergedSignature.push(`${param.name}${param.isOptional ? '?' : ''}: ${param.type.join(' | ')}`); -+ }); - result.push({ - sig: mergedSignature, - comment: '' -- }) -+ }); - } else { - for (let i = 0; i < signatureParams.length; i++) { -- result.push({ sig: signatureParams[i], comment: comments[i] }) -+ result.push({ sig: signatureParams[i], comment: comments[i] }); - } - } - return result; -@@ -110,15 +110,17 @@ function getAllInterfaceCallSignature(node: ts.InterfaceDeclaration, originalCod - - function handleComponentInterface(node: ts.InterfaceDeclaration, file: ComponentFile) { - const result = getAllInterfaceCallSignature(node, file.sourceFile, !uiconfig.useMemoM3); -- const declPattern = readLangTemplate() -- const declComponentFunction: string[] = [] -+ const declPattern = readLangTemplate(); -+ const declComponentFunction: string[] = []; -+ const attributeName = node.name!.escapedText as string; -+ const componentName = attributeName.replace(/Interface/g, ''); - result.forEach(p => { - declComponentFunction.push(declPattern -- .replaceAll("%COMPONENT_NAME%", file.componentName) -- .replaceAll("%FUNCTION_PARAMETERS%", p.sig?.map(it => `${it}, `).join("") ?? "") -- .replaceAll("%COMPONENT_COMMENT%", p.comment)) -- }) -- return declComponentFunction.join('\n') -+ .replace(/%COMPONENT_NAME%/g, componentName) -+ .replace(/%FUNCTION_PARAMETERS%/g, p.sig?.map(it => `${it}, `).join("") ?? "") -+ .replace(/%COMPONENT_COMMENT%/g, p.comment)); -+ }); -+ return declComponentFunction.join('\n'); - } - - function updateMethodDoc(node: ts.MethodDeclaration): ts.MethodDeclaration { -@@ -127,7 +129,7 @@ function updateMethodDoc(node: ts.MethodDeclaration): ts.MethodDeclaration { - const paramNameType: Map = new Map(); - node.parameters.forEach(param => { - paramNameType.set((param.name as ts.Identifier).escapedText!, param.type!); -- }) -+ }); - const jsDoc = node.jsDoc as ts.JSDoc[]; - const updatedJsDoc = jsDoc.map((doc) => { - const updatedTags = (doc.tags || []).map((tag: ts.JSDocTag) => { -@@ -137,10 +139,10 @@ function updateMethodDoc(node: ts.MethodDeclaration): ts.MethodDeclaration { - tag.tagName, - ts.factory.createJSDocTypeExpression(returnType), - tag.comment -- ) -+ ); - } - if (tag.tagName.escapedText === 'param') { -- const paramTag = tag as ts.JSDocParameterTag -+ const paramTag = tag as ts.JSDocParameterTag; - return ts.factory.updateJSDocParameterTag( - paramTag, - paramTag.tagName, -@@ -149,15 +151,15 @@ function updateMethodDoc(node: ts.MethodDeclaration): ts.MethodDeclaration { - ts.factory.createJSDocTypeExpression(paramNameType.get((paramTag.name as ts.Identifier).escapedText!)!), - paramTag.isNameFirst, - paramTag.comment -- ) -+ ); - } -- return tag -- }) -+ return tag; -+ }); - return ts.factory.updateJSDocComment(doc, doc.comment, updatedTags); - }); -- (node as any).jsDoc = updatedJsDoc -+ (node as any).jsDoc = updatedJsDoc; - } -- return node -+ return node; - } - - function handleOptionalType(paramType: ts.TypeNode, wrapUndefined: boolean = true): ts.TypeNode { -@@ -174,7 +176,7 @@ function handleOptionalType(paramType: ts.TypeNode, wrapUndefined: boolean = tru - ...(ts.isUnionTypeNode(type) ? type.types : [type]), - ts.factory.createKeywordTypeNode(ts.SyntaxKind.UndefinedKeyword), - ]); -- } -+ }; - - // Check if the parameter type is Optional - if (typeName === 'Optional' && paramType.typeArguments?.length === 1) { -@@ -203,7 +205,7 @@ function handleAttributeMember(node: ts.MethodDeclaration): ts.MethodSignature { - } else if (ts.isUnionTypeNode(paramType)) { - const removeOptionalTypes = paramType.types.map(type => { - return handleOptionalType(type, false); -- }) -+ }); - // Check if the union type already includes undefined - const hasUndefined = removeOptionalTypes.some( - type => type.kind === ts.SyntaxKind.UndefinedKeyword -@@ -258,7 +260,7 @@ function handleAttributeMember(node: ts.MethodDeclaration): ts.MethodSignature { - returnType - ); - -- return methodSignature -+ return methodSignature; - } - - function handleHeritageClause(node: ts.NodeArray | undefined): ts.HeritageClause[] { -@@ -282,7 +284,7 @@ function handleHeritageClause(node: ts.NodeArray | undefined) - const newClause = ts.factory.createHeritageClause(ts.SyntaxKind.ExtendsKeyword, types); - heritageClauses.push(newClause); - }); -- return heritageClauses -+ return heritageClauses; - } - - function handleAttributeModifier(node: ts.ClassDeclaration, members: ts.MethodSignature[]) { -@@ -291,8 +293,8 @@ function handleAttributeModifier(node: ts.ClassDeclaration, members: ts.MethodSi - if ((m.name as ts.Identifier).escapedText === 'attributeModifier') { - members.splice(members.indexOf(m), 1); - } -- }) -- return -+ }); -+ return; - } - members.push( - ts.factory.createMethodSignature( -@@ -326,7 +328,7 @@ function handleAttributeModifier(node: ts.ClassDeclaration, members: ts.MethodSi - )], - ts.factory.createThisTypeNode() - ) -- ) -+ ); - } - - function transformComponentAttribute(node: ts.ClassDeclaration): ts.Node[] { -@@ -337,16 +339,16 @@ function transformComponentAttribute(node: ts.ClassDeclaration): ts.Node[] { - return handleAttributeMember(member); - }).filter((member): member is ts.MethodSignature => member !== undefined); - -- const filetredMethos = removeDuplicateMethods(members) -+ const filetredMethos = removeDuplicateMethods(members); - - if (uiconfig.shouldHaveAttributeModifier(node.name!.escapedText as string)) { -- handleAttributeModifier(node, filetredMethos) -+ handleAttributeModifier(node, filetredMethos); - } - - const exportModifier = ts.factory.createModifier(ts.SyntaxKind.ExportKeyword); - const delcareModifier = ts.factory.createModifier(ts.SyntaxKind.DeclareKeyword); - -- const heritageClauses = handleHeritageClause(node.heritageClauses) -+ const heritageClauses = handleHeritageClause(node.heritageClauses); - - const noneUIAttribute = ts.factory.createInterfaceDeclaration( - [exportModifier, delcareModifier], -@@ -355,7 +357,7 @@ function transformComponentAttribute(node: ts.ClassDeclaration): ts.Node[] { - heritageClauses, - filetredMethos - ); -- return [noneUIAttribute] -+ return [noneUIAttribute]; - } - - function getLeadingSpace(line: string): string { -@@ -385,10 +387,10 @@ function addAttributeMemo(node: ts.ClassDeclaration, componentFile: ComponentFil - - const functionSet: Set = new Set(); - node.members.forEach(m => { -- functionSet.add((m.name! as ts.Identifier).escapedText!) -- }) -+ functionSet.add((m.name! as ts.Identifier).escapedText!); -+ }); - -- const updatedCode: string[] = [] -+ const updatedCode: string[] = []; - originalCode.forEach(l => { - const name = extractMethodName(l); - if (!name) { -@@ -396,53 +398,53 @@ function addAttributeMemo(node: ts.ClassDeclaration, componentFile: ComponentFil - return; - } - if (functionSet.has(name)) { -- updatedCode.push(getLeadingSpace(l) + "@memo") -+ updatedCode.push(getLeadingSpace(l) + "@memo"); - } - updatedCode.push(l); -- }) -- const attributeName = node.name!.escapedText! -- const superInterface = getBaseClassName(node) -+ }); -+ const attributeName = node.name!.escapedText!; -+ const superInterface = getBaseClassName(node); - componentFile.appendAttribute(updatedCode.join('\n') - .replace(`export declare interface ${attributeName}`, `export declare interface UI${attributeName}`) - .replace(`extends ${superInterface}`, `extends UI${superInterface}`) -- ) -+ ); - } - - function isComponentAttribute(node: ts.Node) { - if (!(ts.isClassDeclaration(node) && node.name?.escapedText)) { - return false; - } -- return uiconfig.isComponent(node.name.escapedText, 'Attribute') -+ return uiconfig.isComponent(node.name.escapedText, 'Attribute'); - } - - function isComponentInterface(node: ts.Node) { - if (!(ts.isInterfaceDeclaration(node) && node.name?.escapedText)) { - return false; - } -- return uiconfig.isComponent(node.name.escapedText, 'Interface') -+ return uiconfig.isComponent(node.name.escapedText, 'Interface'); - } - - export function addMemoTransformer(componentFile: ComponentFile): ts.TransformerFactory { - return (context) => { - const visit: ts.Visitor = (node) => { -- if (isComponentHerirage(node) && !uiconfig.useMemoM3) { -- addAttributeMemo(node as ts.ClassDeclaration, componentFile) -+ if (isComponentHerirage(node)) { -+ addAttributeMemo(node as ts.ClassDeclaration, componentFile); - } - return ts.visitEachChild(node, visit, context); -- } -- return (sourceFile) => { componentFile.sourceFile = sourceFile; return ts.visitNode(sourceFile, visit) }; -- } -+ }; -+ return (sourceFile) => { componentFile.sourceFile = sourceFile; return ts.visitNode(sourceFile, visit); }; -+ }; - } - - export function interfaceTransformer(program: ts.Program, componentFile: ComponentFile): ts.TransformerFactory { - return (context) => { - const visit: ts.Visitor = (node) => { - if (isComponentInterface(node)) { -- componentFile.appendFunction(handleComponentInterface(node as ts.InterfaceDeclaration, componentFile)) -+ componentFile.appendFunction(handleComponentInterface(node as ts.InterfaceDeclaration, componentFile)); - return undefined; - } - if (isComponentHerirage(node)) { -- return transformComponentAttribute(node as ts.ClassDeclaration) -+ return transformComponentAttribute(node as ts.ClassDeclaration); - } - return ts.visitEachChild(node, visit, context); - }; -@@ -455,10 +457,10 @@ export function componentInterfaceCollector(program: ts.Program, componentFile: - return (context) => { - const visit: ts.Visitor = (node) => { - if (isComponentAttribute(node)) { -- const attributeName = (node as ts.ClassDeclaration).name!.escapedText as string -- componentFile.componentName = attributeName.replaceAll('Attribute', ''); -+ const attributeName = (node as ts.ClassDeclaration).name!.escapedText as string; -+ componentFile.componentName = attributeName.replace(/Attribute/g, ''); - const baseTypes = analyzeBaseClasses(node as ts.ClassDeclaration, componentFile.sourceFile, program); -- uiconfig.addComponentAttributeHeritage([attributeName, ...baseTypes]) -+ uiconfig.addComponentAttributeHeritage([attributeName, ...baseTypes]); - } - return ts.visitEachChild(node, visit, context); - }; -diff --git a/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/index.ts b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/index.ts -new file mode 100644 -index 000000000..00f377561 ---- /dev/null -+++ b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/index.ts -@@ -0,0 +1,17 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+export * from './utils/api_check_wrapper_typedef'; -+export * from './utils/api_check_wrapper_enums'; -\ No newline at end of file -diff --git a/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/src/api_check_wrapper.ts b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/src/api_check_wrapper.ts -new file mode 100644 -index 000000000..e69de29bb -diff --git a/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_enums.ts b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_enums.ts -new file mode 100644 -index 000000000..78e1f83cb ---- /dev/null -+++ b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_enums.ts -@@ -0,0 +1,19 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+export enum DiagnosticCategory { -+ Warning = 0, -+ Error = 1 -+} -\ No newline at end of file -diff --git a/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_typedef.ts b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_typedef.ts -new file mode 100644 -index 000000000..7fc25348f ---- /dev/null -+++ b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_typedef.ts -@@ -0,0 +1,113 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+import { DiagnosticCategory } from "./api_check_wrapper_enums"; -+import * as arkts from '@koalaui/libarkts'; -+ -+/** -+ * ApiCheckWrapper服务,绑定校验规则 -+ */ -+export interface ApiCheckWrapperServiceHost { -+ getJsDocNodeCheckedConfig: (currentFileName: string, symbolSourceFilePath: string) => JsDocNodeCheckConfig; -+ // getJsDocNodeConditionCheckedResult: (jsDocFileCheckedInfo: FileCheckModuleInfo, jsDocs: JSDoc[]) => ConditionCheckResult; -+ getFileCheckedModuleInfo: (containFilePath: string) => FileCheckModuleInfo; -+ pushLogInfo: (apiName: string, currentFilePath: string, currentAddress: CurrentAddress, logLevel: DiagnosticCategory, logMessage: string) => void; -+ collectImportInfo: (moduleName: string[], modulePath: string, currentFilePath: string) => void; -+} -+ -+export interface JsDocNodeCheckConfig { -+ nodeNeedCheck: boolean; -+ checkConfig: JsDocNodeCheckConfigItem[]; -+} -+ -+export interface JsDocNodeCheckConfigItem { -+ tagName: string[]; -+ message: string; -+ type: DiagnosticCategory; -+ tagNameShouldExisted: boolean; -+ checkValidCallback?: (jsDocs: JSDoc[], config: JsDocNodeCheckConfigItem) => boolean; -+} -+ -+/** -+ * JSDoc类型 -+ */ -+export interface JSDoc { -+ description: string; -+ tags: JSDocTag[]; -+} -+ -+/** -+ * JSDoc标签类型 -+ */ -+export interface JSDocTag { -+ /** -+ * 标签名 -+ */ -+ tag: string; -+ /** -+ * 参数名称 -+ */ -+ name: string; -+ /** -+ * 默认值 -+ */ -+ default?: string; -+ /** -+ * 类型 -+ */ -+ type: string; -+ /** -+ * 是否可选 -+ */ -+ optional: boolean; -+ /** -+ * 描述 -+ */ -+ description: string; -+} -+ -+export interface CurrentAddress { -+ line: number; -+ column: number; -+} -+ -+export interface FileCheckModuleInfo { -+ currentFileName: string; -+ fileNeedCheck: boolean; -+} -+ -+export interface ConditionCheckResult { -+ valid: boolean; -+ type?: DiagnosticCategory; -+ message?: string; -+} -+ -+export interface ASTDeclaration extends arkts.AstNode { -+ kind: number; -+ pos: number; -+ end: number; -+ parent?: ASTDeclaration; -+ jsDoc?: JSDoc[]; -+} -+ -+export interface ASTIdentifier extends arkts.AstNode { -+ kind: number; -+ text: string; -+} -+ -+export interface ASTSourceFile extends arkts.AstNode { -+ fileName: string; -+ text: string; -+} -\ No newline at end of file -diff --git a/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_utils.ts b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_utils.ts -new file mode 100644 -index 000000000..556a4a036 ---- /dev/null -+++ b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/api_check_wrapper_utils.ts -@@ -0,0 +1,41 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+import { Block, parse, Spec } from 'comment-parser'; -+import { JSDoc, JSDocTag } from './api_check_wrapper_typedef'; -+ -+export function parseCommand2JSDoc(comment: string): JSDoc[] { -+ const jsDocs: JSDoc[] = []; -+ const commentBlock: Block[] = parse(comment); -+ commentBlock.forEach((block: Block) => { -+ const tags: JSDocTag[] = []; -+ const blockTags: Spec[] = block.tags; -+ blockTags.forEach((blockTag: Spec) => { -+ tags.push({ -+ tag: blockTag.tag, -+ name: blockTag.name, -+ default: blockTag.default, -+ type: blockTag.type, -+ optional: blockTag.optional, -+ description: blockTag.description -+ }); -+ }); -+ jsDocs.push({ -+ description: block.description, -+ tags: tags -+ }); -+ }); -+ return jsDocs; -+} -\ No newline at end of file -diff --git a/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/ts_wrapper_node_util.ts b/build-tools/compiler-plugins/api-check-plugin-static/api-check-wrapper/utils/ts_wrapper_node_util.ts -new file mode 100644 -index 000000000..e69de29bb -diff --git a/api/arkui/stateManagement/decorators/decoratorProvide.d.ets b/build-tools/compiler-plugins/api-check-plugin-static/babel.config.js -similarity index 51% -rename from api/arkui/stateManagement/decorators/decoratorProvide.d.ets -rename to build-tools/compiler-plugins/api-check-plugin-static/babel.config.js -index eea12b024..6d04bc928 100644 ---- a/api/arkui/stateManagement/decorators/decoratorProvide.d.ets -+++ b/build-tools/compiler-plugins/api-check-plugin-static/babel.config.js -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2025 Huawei Device Co., Ltd. -+ * Copyright (c) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at -@@ -12,18 +12,29 @@ - * See the License for the specific language governing permissions and - * limitations under the License. - */ --/** -- * @file -- * @kit ArkUI -- * @arkts 1.2 -- */ - --import { DecoratedV1VariableBase, IDecoratedMutableVariable } from '../base/decoratorBase'; --import { WatchIdType, WatchFuncType } from './decoratorWatch'; -+module.exports = function(api) { -+ api.cache(true); -+ -+ const presets = ['@babel/typescript']; -+ const plugins = [ -+ '@babel/plugin-transform-modules-commonjs', -+ '@babel/plugin-proposal-class-properties', -+ [ -+ '@babel/plugin-transform-arrow-functions', -+ { -+ spec: true -+ } -+ ] -+ ]; -+ const ignore = [ -+ '**/test/**', -+ '**/node_modules/**' -+ ]; - --export declare class ProvideDecoratedVariable extends DecoratedV1VariableBase -- implements IDecoratedMutableVariable { -- public constructor(varName: string, provideAlias: string, initValue: T, watchFunc?: WatchFuncType) -- public get(): T -- public set(newValue: T): void --} -\ No newline at end of file -+ return { -+ presets, -+ plugins, -+ ignore -+ }; -+}; -diff --git a/build-tools/compiler-plugins/api-check-plugin-static/index.ts b/build-tools/compiler-plugins/api-check-plugin-static/index.ts -new file mode 100644 -index 000000000..9ebab635e ---- /dev/null -+++ b/build-tools/compiler-plugins/api-check-plugin-static/index.ts -@@ -0,0 +1,72 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+import { Plugins, PluginContext } from '../common/plugin-context'; -+import { GlobalObject, ProjectConfig } from './utils/api_check_plugin_typedef'; -+import { createOrCleanProjectConfig, updateProjectConfig, initProjectConfig } from './utils/api_check_plugin_utils'; -+import { ApiCheckWrapperServiceHost } from './api-check-wrapper'; -+import { getApiCheckWrapperServiceHost } from './src/api_check_config'; -+import { checkApiExpression, WrapperApi } from './api-check-wrapper/src/api_check_wrapper'; -+ -+/** -+ * 导出projectConfig作为全局变量 -+ */ -+export const globalObject: GlobalObject = { -+ projectConfig: createOrCleanProjectConfig() -+} -+ -+/** -+ * 预留apiCheckProjectConfig对象 -+ */ -+export class apiCheckProjectConfig { -+ constructor(projectConfig: ProjectConfig | undefined) { -+ if (projectConfig) { -+ updateProjectConfig(projectConfig); -+ initProjectConfig(); -+ } -+ } -+} -+ -+/** -+ * 入口方法 -+ * @returns {Plugins} -+ */ -+export function apiCheckPlugin(): Plugins { -+ return { -+ name: 'api-check-plugins', -+ checked: apiCheckCallback, -+ clean() { -+ console.log("API_CHECK_PLUGIN CLEAN") -+ WrapperApi.arktsGlobal.clearContext(); -+ } -+ }; -+} -+ -+/** -+ * 入口回调 -+ * @param {this} -+ */ -+function apiCheckCallback(this: PluginContext): void { -+ console.log('[API_CHECK_PLUGIN] AFTER CHECKED ENTER'); -+ const currentProjectConfig: ProjectConfig | undefined = this.getProjectConfig() as ProjectConfig | undefined; -+ if (currentProjectConfig) { -+ updateProjectConfig(currentProjectConfig); -+ initProjectConfig(); -+ } -+ const ContextPtr = this.getContextPtr(); -+ const apiCheckHost: ApiCheckWrapperServiceHost = getApiCheckWrapperServiceHost(); -+ checkApiExpression(apiCheckHost, ContextPtr); -+ console.log('[API_CHECK_PLUGIN] AFTER CHECKED EXIT'); -+} -\ No newline at end of file -diff --git a/build-tools/compiler-plugins/api-check-plugin-static/package.json b/build-tools/compiler-plugins/api-check-plugin-static/package.json -new file mode 100644 -index 000000000..cedbccb1a ---- /dev/null -+++ b/build-tools/compiler-plugins/api-check-plugin-static/package.json -@@ -0,0 +1,24 @@ -+{ -+ "name": "api-check-plugin-static", -+ "version": "1.0.0", -+ "description": "", -+ "main": "compiler-plugins/api-check-plugin-static/index.ts", -+ "scripts": { -+ "test": "echo \"Error: no test specified\" && exit 1", -+ "compile:plugins": "./node_modules/.bin/babel ./ --out-dir ./lib --extensions .ts" -+ }, -+ "author": "", -+ "license": "ISC", -+ "dependencies": { -+ "comment-parser": "1.3.1", -+ "fs": "^0.0.1-security", -+ "path": "^0.12.7", -+ "@babel/cli": "7.20.7", -+ "@babel/core": "7.20.12", -+ "@babel/plugin-proposal-class-properties": "7.18.6", -+ "@babel/preset-env": "7.20.2", -+ "@babel/preset-typescript": "7.18.6", -+ "@babel/runtime": "7.20.13", -+ "typescript": "npm:ohos-typescript@4.9.5-r5" -+ } -+} -diff --git a/build-tools/compiler-plugins/api-check-plugin-static/src/api_check_config.ts b/build-tools/compiler-plugins/api-check-plugin-static/src/api_check_config.ts -new file mode 100644 -index 000000000..104c9f50f ---- /dev/null -+++ b/build-tools/compiler-plugins/api-check-plugin-static/src/api_check_config.ts -@@ -0,0 +1,172 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+import path from 'path'; -+import { -+ PERMISSION_TAG_CHECK_NAME, -+ PERMISSION_TAG_CHECK_ERROR, -+ SYSTEM_API_TAG_CHECK_NAME, -+ SYSTEM_API_TAG_CHECK_WARNING, -+ TEST_TAG_CHECK_NAME, -+ TEST_TAG_CHECK_ERROR, -+ SYSCAP_TAG_CHECK_NAME, -+ SYSCAP_TAG_CHECK_WARNING, -+ FORM_TAG_CHECK_NAME, -+ FORM_TAG_CHECK_ERROR, -+ FIND_MODULE_WARNING, -+ CROSSPLATFORM_TAG_CHECK_NAME, -+ CROSSPLATFORM_TAG_CHECK_ERROR, -+ DEPRECATED_TAG_CHECK_NAME, -+ DEPRECATED_TAG_CHECK_WARNING, -+ FA_TAG_CHECK_NAME, -+ FA_TAG_HUMP_CHECK_NAME, -+ FA_TAG_CHECK_ERROR, -+ ATOMICSERVICE_BUNDLE_TYPE, -+ ATOMICSERVICE_TAG_CHECK_NAME, -+ ATOMICSERVICE_TAG_CHECK_ERROR, -+ ATOMICSERVICE_TAG_CHECK_VERSION, -+ SINCE_TAG_NAME, -+ SINCE_TAG_CHECK_ERROR, -+ STAGE_TAG_CHECK_NAME, -+ STAGE_TAG_HUMP_CHECK_NAME, -+ STAGE_TAG_CHECK_ERROR, -+ STAGE_COMPILE_MODE -+} from '../utils/api_check_plugin_define'; -+import { globalObject } from '../index'; -+import { -+ checkPermissionTag, -+ checkSinceTag, -+ checkSyscapTag, -+ getJsDocNodeCheckConfigItem, -+ isCardFile, -+ pushLog, -+ collectInfo -+} from '../utils/api_check_plugin_utils'; -+import { -+ ApiCheckWrapperServiceHost, -+ CurrentAddress, -+ DiagnosticCategory, -+ JsDocNodeCheckConfig, -+ JsDocNodeCheckConfigItem -+} from '../api-check-wrapper'; -+ -+const jsDocNodeCheckConfigCache: Map> = -+ new Map>(); -+ -+/** -+ * 根据ProjectConfig对象存入JsDoc校验规则 -+ * -+ * @param {string} fileName - 原始node文件路径 -+ * @param {string} sourceFileName - 目标api文件路径 -+ * @returns {JsDocNodeCheckConfig} - 返回校验规则对象 -+ */ -+function getJsDocNodeCheckConfig(fileName: string, sourceFileName: string): JsDocNodeCheckConfig { -+ let byFileName: Map | undefined = jsDocNodeCheckConfigCache.get(fileName); -+ if (byFileName === undefined) { -+ byFileName = new Map(); -+ jsDocNodeCheckConfigCache.set(fileName, byFileName); -+ } -+ let result: JsDocNodeCheckConfig | undefined = byFileName.get(sourceFileName); -+ if (result !== undefined) { -+ return result; -+ } -+ // 预留check条件 -+ let needCheckResult: boolean = true; -+ const checkConfigArray: JsDocNodeCheckConfigItem[] = []; -+ const apiName: string = path.basename(fileName); -+ const sourceBaseName: string = path.basename(sourceFileName); -+ if (/(?= ATOMICSERVICE_TAG_CHECK_VERSION) { -+ checkConfigArray.push(getJsDocNodeCheckConfigItem([ATOMICSERVICE_TAG_CHECK_NAME], ATOMICSERVICE_TAG_CHECK_ERROR, -+ DiagnosticCategory.Error, true)); -+ } -+ } -+ result = { -+ nodeNeedCheck: needCheckResult, -+ checkConfig: checkConfigArray -+ }; -+ byFileName.set(sourceFileName, result); -+ return result; -+} -+ -+ -+/** -+ * 返回apiHost -+ * @returns {ApiCheckWrapperServiceHost} - apiHost -+ */ -+export function getApiCheckWrapperServiceHost(): ApiCheckWrapperServiceHost { -+ return { -+ getJsDocNodeCheckedConfig: (currentFileName: string, symbolSourceFilePath: string) => { -+ return getJsDocNodeCheckConfig(currentFileName, symbolSourceFilePath); -+ }, -+ getFileCheckedModuleInfo: (containFilePath: string) => { -+ return { -+ fileNeedCheck: true, -+ currentFileName: containFilePath -+ }; -+ }, -+ pushLogInfo: (apiName: string, currentFilePath: string, currentAddress: CurrentAddress, -+ logLevel: DiagnosticCategory, logMessage: string) => { -+ return pushLog(apiName, currentFilePath, currentAddress, logLevel, logMessage); -+ }, -+ collectImportInfo: (moduleName: string[], modulePath: string, currentFilePath: string) => { -+ collectInfo(moduleName, modulePath, currentFilePath); -+ } -+ }; -+} -\ No newline at end of file -diff --git a/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_define.ts b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_define.ts -new file mode 100644 -index 000000000..061091846 ---- /dev/null -+++ b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_define.ts -@@ -0,0 +1,103 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+export const PERMISSION_TAG_CHECK_NAME: string = 'permission'; -+ -+export const PERMISSION_TAG_CHECK_ERROR: string = "To use this API, you need to apply for the permissions: $DT"; -+ -+export const SYSTEM_API_TAG_CHECK_NAME: string = 'systemapi'; -+ -+export const SYSTEM_API_TAG_CHECK_WARNING: string = "'{0}' is system api"; -+ -+export const TEST_TAG_CHECK_NAME: string = 'test'; -+ -+export const TEST_TAG_CHECK_ERROR: string = "'{0}' can only be used for testing directories "; -+ -+export const SYSCAP_TAG_CHECK_NAME: string = 'syscap'; -+ -+export const SYSCAP_TAG_CHECK_WARNING: string = "The system capacity of this api '{0}' is not supported on all devices"; -+ -+export const SYSCAP_TAG_CONDITION_CHECK_WARNING: string = -+ 'The API is not supported on all devices. Use the canIUse condition to determine whether the API is supported.'; -+ -+export const CANIUSE_FUNCTION_NAME: string = 'canIUse'; -+ -+export const VERSION_CHECK_FUNCTION_NAME: string = 'isApiVersionGreaterOrEqual'; -+ -+export const RUNTIME_OS_OH: string = 'OpenHarmony'; -+ -+export const FORM_TAG_CHECK_NAME: string = 'form'; -+ -+export const FORM_TAG_CHECK_ERROR: string = "'{0}' can't support form application."; -+ -+export const CROSSPLATFORM_TAG_CHECK_NAME: string = 'crossplatform'; -+ -+export const CROSSPLATFORM_TAG_CHECK_ERROR: string = "'{0}' can't support crossplatform application."; -+ -+export const DEPRECATED_TAG_CHECK_NAME: string = 'deprecated'; -+ -+export const DEPRECATED_TAG_CHECK_WARNING: string = "'{0}' has been deprecated."; -+ -+export const FA_TAG_CHECK_NAME: string = 'famodelonly'; -+ -+export const FA_TAG_HUMP_CHECK_NAME: string = 'FAModelOnly'; -+ -+export const FA_TAG_CHECK_ERROR: string = 'This API is used only in FA Mode, but the current Mode is Stage.'; -+ -+export const STAGE_TAG_CHECK_NAME: string = 'stagemodelonly'; -+ -+export const STAGE_TAG_HUMP_CHECK_NAME: string = 'StageModelOnly'; -+ -+export const STAGE_TAG_CHECK_ERROR: string = 'This API is used only in Stage Mode, but the current Mode is FA.'; -+ -+export const STAGE_COMPILE_MODE: string = 'moduleJson'; -+ -+export const ATOMICSERVICE_BUNDLE_TYPE: string = 'atomicService'; -+ -+export const ATOMICSERVICE_TAG_CHECK_NAME: string = 'atomicservice'; -+ -+export const ATOMICSERVICE_TAG_CHECK_ERROR: string = "'{0}' can't support atomicservice application."; -+ -+export const SINCE_TAG_NAME: string = 'since'; -+ -+export const SINCE_TAG_CHECK_ERROR: string = -+ "The '{0}' API is supported since SDK version $SINCE1. However, the current compatible SDK version is $SINCE2."; -+ -+export const ATOMICSERVICE_TAG_CHECK_VERSION: number = 11; -+ -+export const FIND_MODULE_WARNING: string = "Cannot find name '{0}'."; -+ -+export const CONSTANT_STEP_0: number = 0; -+ -+export const CONSTANT_STEP_1: number = 1; -+ -+export const CONSTANT_STEP_2: number = 2; -+ -+export const CONSTANT_STEP_3: number = 3; -+ -+export const GLOBAL_DECLARE_WHITE_LIST: Set = new Set(['Context', 'PointerStyle', 'PixelMap', 'UnifiedData', -+ 'Summary', 'UniformDataType', 'IntentionCode', 'NavDestinationInfo', 'UIContext', 'Resource', 'WebviewController']); -+ -+export const MESSAGE_CONFIG_COLOR_RED: string = '\u001b[31m'; -+ -+export const MESSAGE_CONFIG_COLOR_RESET: string = '\u001b[39m'; -+ -+export const MESSAGE_CONFIG_COLOR_ERROR: string = 'color:#f5a623'; -+ -+export const MESSAGE_CONFIG_COLOR_WARNING: string = 'color:#d0021b'; -+ -+export const MESSAGE_CONFIG_HEADER_ERROR: string = 'ERROR: ArkTS:ERROR File: '; -+ -+export const MESSAGE_CONFIG_HEADER_WARNING: string = 'WARN: ArkTS:WARN File: '; -\ No newline at end of file -diff --git a/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_enums.ts b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_enums.ts -new file mode 100644 -index 000000000..1208ff3c6 ---- /dev/null -+++ b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_enums.ts -@@ -0,0 +1,23 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+export enum PermissionValidTokenState { -+ Init, -+ LeftParenthesis, -+ RightParenthesis, -+ PermissionChar, -+ And, -+ Or, -+} -\ No newline at end of file -diff --git a/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_typedef.ts b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_typedef.ts -new file mode 100644 -index 000000000..9231f06d9 ---- /dev/null -+++ b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_typedef.ts -@@ -0,0 +1,123 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+import { JSDoc, JsDocNodeCheckConfigItem } from "../api-check-wrapper"; -+import { PermissionValidTokenState } from "./api_check_plugin_enums"; -+ -+// 定义 JSON 数据结构接口 -+export interface WindowConfig { -+ designWidth: number; -+ autoDesignWidth: boolean; -+} -+ -+export interface FormConfig { -+ name: string; -+ displayName: string; -+ description: string; -+ src: string; // 目标字段 -+ uiSyntax: string; -+ window: WindowConfig; -+ colorMode: string; -+ isDynamic: boolean; -+ isDefault: boolean; -+ updateEnabled: boolean; -+ scheduledUpdateTime: string; -+ updateDuration: number; -+ defaultDimension: string; -+ supportDimensions: string[]; -+} -+ -+export interface ConfigSchema { -+ forms: FormConfig[]; -+} -+ -+/** -+ * 工程编译配置 -+ */ -+export interface ProjectConfig { -+ bundleName: string; -+ moduleName: string; -+ cachePath: string; -+ aceModuleJsonPath: string; -+ compileMode: string; -+ permissions: ConfigPermission; -+ requestPermissions: string[]; -+ definePermissions: string[]; -+ projectRootPath: string; -+ isCrossplatform: boolean; -+ ignoreCrossplatformCheck: boolean; -+ bundleType: string; -+ compileSdkVersion: number; -+ compatibleSdkVersion: number; -+ projectPath: string; -+ aceProfilePath: string; -+ cardPageSet: string[]; -+ compileSdkPath: string; -+ systemModules: string[]; -+ allModulesPaths: string[]; -+ sdkConfigs: SdkConfig[]; -+ externalApiPaths: string; -+ externalSdkPaths: string[]; -+ sdkConfigPrefix: string; -+ deviceTypes: string[]; -+ deviceTypesMessage: string; -+ runtimeOS: string; -+ syscapIntersectionSet: Set; -+ syscapUnionSet: Set; -+ permissionsArray: string[]; -+ buildSdkPath: string; -+ nativeDependencies: string[]; -+ aceSoPath: string; -+} -+ -+export interface CheckValidCallbackInterface { -+ (jsDocTag: JSDoc[], config: JsDocNodeCheckConfigItem): boolean; -+} -+ -+export interface SyscapConfig { -+ sysCaps: string[] -+} -+ -+export interface SdkConfig { -+ prefix: string; -+ apiPath: string[]; -+} -+ -+export interface GlobalObject { -+ projectConfig: ProjectConfig -+} -+ -+export interface PermissionVaildCalcInfo { -+ valid: boolean; -+ currentToken: PermissionValidTokenState; -+ finish: boolean; -+ currentPermissionMatch: boolean; -+} -+ -+export interface PermissionValidCalcGroup { -+ subQueue: string[]; -+ includeParenthesis: boolean; -+} -+ -+export interface PermissionModule { -+ modulePath: string; -+ testPermissions: string[]; -+ permissions: string[]; -+} -+ -+export interface ConfigPermission { -+ requestPermissions: Array<{ name: string }>; -+ definePermissions: Array<{ name: string }>; -+} -\ No newline at end of file -diff --git a/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_utils.ts b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_utils.ts -new file mode 100644 -index 000000000..ea074944e ---- /dev/null -+++ b/build-tools/compiler-plugins/api-check-plugin-static/utils/api_check_plugin_utils.ts -@@ -0,0 +1,903 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+import fs from 'fs'; -+import path from 'path'; -+import { globalObject } from '../index'; -+import { -+ CheckValidCallbackInterface, -+ ConfigPermission, -+ ConfigSchema, -+ PermissionValidCalcGroup, -+ PermissionVaildCalcInfo, -+ ProjectConfig, -+ SdkConfig, -+ SyscapConfig -+} from './api_check_plugin_typedef'; -+import { -+ MESSAGE_CONFIG_COLOR_ERROR, -+ MESSAGE_CONFIG_COLOR_RED, -+ MESSAGE_CONFIG_COLOR_RESET, -+ MESSAGE_CONFIG_COLOR_WARNING, -+ MESSAGE_CONFIG_HEADER_ERROR, -+ MESSAGE_CONFIG_HEADER_WARNING, -+ PERMISSION_TAG_CHECK_ERROR, -+ PERMISSION_TAG_CHECK_NAME, -+ RUNTIME_OS_OH, -+ SINCE_TAG_CHECK_ERROR, -+ SINCE_TAG_NAME, -+ STAGE_COMPILE_MODE, -+ SYSCAP_TAG_CHECK_NAME -+} from './api_check_plugin_define'; -+import { -+ CurrentAddress, -+ DiagnosticCategory, -+ JSDoc, -+ JsDocNodeCheckConfigItem, -+ JSDocTag -+} from '../api-check-wrapper'; -+import { PermissionValidTokenState } from './api_check_plugin_enums'; -+ -+/** -+ * 从 JSON 文件中提取所有 src 字段到数组 -+ * @param filePath JSON 文件的绝对路径 -+ * @returns 包含所有 src 字段的字符串数组 -+ * @throws 文件不存在、JSON 解析错误或数据结构不符时抛出异常 -+ */ -+export function extractSrcPaths(filePath: string): string[] { -+ // 1. 验证路径格式和存在性 -+ if (!path.isAbsolute(filePath)) { -+ throw new Error(`路径必须是绝对路径: ${filePath}`); -+ } -+ -+ if (!fs.existsSync(filePath)) { -+ throw new Error(`文件不存在: ${filePath}`); -+ } -+ -+ try { -+ // 2. 读取并解析 JSON 文件 -+ const rawData = fs.readFileSync(filePath, 'utf-8'); -+ const config: ConfigSchema = JSON.parse(rawData); -+ -+ // 3. 验证数据结构 -+ if (!config.forms || !Array.isArray(config.forms)) { -+ throw new Error('JSON 缺少 forms 数组'); -+ } -+ -+ // 4. 提取所有 src 字段 -+ const srcPaths: string[] = []; -+ for (const form of config.forms) { -+ if (form.src && typeof form.src === 'string') { -+ let src = form.src.replace(/^\.\/ets/, ''); -+ srcPaths.push(globalObject.projectConfig?.projectPath + src); -+ } else { -+ console.warn(`跳过无效 src 字段的表单项: ${form.name}`); -+ } -+ } -+ -+ // 5. 返回结果数组 -+ return srcPaths; -+ } catch (error) { -+ // 6. 增强错误信息 -+ if (error instanceof SyntaxError) { -+ throw new SyntaxError(`JSON 解析错误: ${error.message}`); -+ } -+ throw new Error(`处理失败: ${error instanceof Error ? error.message : String(error)}`); -+ } -+} -+ -+export function isCardFile(file: string): boolean { -+ if (globalObject.projectConfig.cardPageSet.includes(file)) { -+ return true; -+ } -+ return false; -+} -+ -+/** -+ * 校验since标签,当前api版本是否小于等于compatibleSdkVersion -+ * -+ * @param { JSDoc[] } jsDocs -+ * @param config -+ * @returns -+ */ -+export function checkSinceTag(jsDocs: JSDoc[], config: JsDocNodeCheckConfigItem): boolean { -+ if (jsDocs && jsDocs.length > 0) { -+ const minorJSDocVersion: number = getJSDocMinorVersion(jsDocs); -+ const compatibleSdkVersion: number = globalObject.projectConfig.compatibleSdkVersion; -+ if (minorJSDocVersion > compatibleSdkVersion) { -+ config.message = SINCE_TAG_CHECK_ERROR.replace('$SINCE1', minorJSDocVersion.toString()) -+ .replace('$SINCE2', compatibleSdkVersion.toString()); -+ return true; -+ } -+ } -+ return false; -+} -+ -+/** -+ * 获取版本号最小的JSDoc -+ * @param { JSDoc[] } jsDocs -+ * @returns { number } -+ */ -+function getJSDocMinorVersion(jsDocs: JSDoc[]): number { -+ let minorVersion: number = 0; -+ if (jsDocs && jsDocs.length > 0) { -+ for (let i = 0; i < jsDocs.length; i++) { -+ const jsdoc: JSDoc = jsDocs[i]; -+ if (jsdoc.tags && jsdoc.tags.length > 0) { -+ for (let j = 0; j < jsdoc.tags.length; j++) { -+ const tag: JSDocTag = jsdoc.tags[j]; -+ if (tag.name === SINCE_TAG_NAME) { -+ const currentVersion: number = Number.parseInt(tag.name); -+ if (minorVersion === 0 || -+ !Number.isNaN(currentVersion) && currentVersion > minorVersion) { -+ minorVersion = currentVersion; -+ } -+ break; -+ } -+ } -+ } -+ } -+ } -+ return minorVersion; -+} -+ -+/** -+ * 获取最新版本的JSDoc -+ * @param { JSDoc[] } jsDocs -+ * @returns { JSDoc } -+ */ -+function getCurrentJSDoc(jsDocs: JSDoc[]): JSDoc { -+ let minorVersion: number = 0; -+ let currentJsDoc: JSDoc = jsDocs[0]; -+ if (jsDocs && jsDocs.length > 0) { -+ for (let i = 0; i < jsDocs.length; i++) { -+ const jsdoc: JSDoc = jsDocs[i]; -+ if (jsdoc.tags && jsdoc.tags.length > 0) { -+ for (let j = 0; j < jsdoc.tags.length; j++) { -+ const tag: JSDocTag = jsdoc.tags[j]; -+ if (tag.name === SINCE_TAG_NAME) { -+ const currentVersion: number = Number.parseInt(tag.name); -+ if (!Number.isNaN(currentVersion) && minorVersion > currentVersion) { -+ minorVersion = currentVersion; -+ currentJsDoc = jsdoc; -+ } -+ break; -+ } -+ } -+ } -+ } -+ } -+ return currentJsDoc; -+} -+ -+/** -+ * 获取最新版本的JSDoc -+ * @param { JSDoc } jsDoc -+ * @param { string } tagName -+ * @returns { JSDocTag | undefined } -+ */ -+function getJSDocTag(jsDoc: JSDoc, tagName: string): JSDocTag | undefined { -+ const jsDocTag: JSDocTag | undefined = jsDoc.tags.find((item: JSDocTag) => { -+ return item.name === tagName; -+ }); -+ return jsDocTag; -+} -+ -+/** -+ * STER1. Parse the permission information configured on the API -+ * STEP2. Recursive queue to obtain whether the current permission configuration supports it -+ */ -+function validPermission(comment: string, permissionsArray: string[]): boolean { -+ const permissionsItem: string[] = getSplitsArrayWithDesignatedCharAndStr(comment ?? '', ' ') -+ .filter((item) => { -+ return item !== ''; -+ }); -+ const permissionsQueue: string[] = []; -+ permissionsItem.forEach((item: string) => { -+ //STEP1.1 Parse'(' -+ const leftParenthesisItem: string[] = getSplitsArrayWithDesignatedCharAndArrayStr([item], '('); -+ //STEP1.2 Parse')' -+ const rightParenthesisItem: string[] = getSplitsArrayWithDesignatedCharAndArrayStr(leftParenthesisItem, ')'); -+ permissionsQueue.push(...rightParenthesisItem); -+ }); -+ //STEP2 -+ const calcValidResult: PermissionVaildCalcInfo = { -+ valid: false, -+ currentToken: PermissionValidTokenState.Init, -+ finish: false, -+ currentPermissionMatch: true, -+ }; -+ validPermissionRecursion(permissionsQueue, permissionsArray, calcValidResult); -+ return calcValidResult.valid; -+} -+ -+function validPermissionRecursion(permissionsQueue: string[], permissions: string[], -+ calcValidResult: PermissionVaildCalcInfo): void { -+ if (permissionsQueue.some(item => ['(', ')'].includes(item))) { -+ const groups: PermissionValidCalcGroup[] = groupWithParenthesis(permissionsQueue); -+ const groupJoin: string[] = getGroupItemPermission(groups, calcValidResult, permissions); -+ getPermissionVaildAtoms(groupJoin, calcValidResult, permissions ?? []); -+ } else { -+ getPermissionVaildAtoms(permissionsQueue, calcValidResult, permissions ?? []); -+ } -+} -+ -+function getSplitsArrayWithDesignatedCharAndStr(permission: string, designatedChar: string): string[] { -+ return permission.split(designatedChar).map(item => item.trim()); -+} -+ -+function getGroupItemPermission( -+ groups: PermissionValidCalcGroup[], -+ calcValidResult: PermissionVaildCalcInfo, -+ permissions: string[]): string[] { -+ const groupJoin: string[] = []; -+ groups.forEach((groupItem: PermissionValidCalcGroup) => { -+ if (groupItem.includeParenthesis) { -+ const calcValidResultItem: PermissionVaildCalcInfo = { -+ ...calcValidResult, -+ }; -+ const subStack: string[] = groupItem.subQueue.slice(1, groupItem.subQueue.length - 1); -+ validPermissionRecursion(subStack, permissions, calcValidResultItem); -+ if (calcValidResultItem.valid) { -+ groupJoin.push(''); -+ } else { -+ groupJoin.push('NA'); -+ } -+ } else { -+ groupJoin.push(...groupItem.subQueue); -+ } -+ }); -+ return groupJoin; -+} -+ -+function groupWithParenthesis(stack: string[]): PermissionValidCalcGroup[] { -+ let currentLeftParenthesisCount: number = 0; -+ const groups: PermissionValidCalcGroup[] = []; -+ let currentGroupItem: PermissionValidCalcGroup = { -+ subQueue: [], -+ includeParenthesis: false, -+ }; -+ stack.forEach((item: string, index: number) => { -+ if (item === '(') { -+ if (currentLeftParenthesisCount === 0) { -+ groups.push(currentGroupItem); -+ currentGroupItem = { -+ subQueue: [item], -+ includeParenthesis: true -+ }; -+ } else { -+ currentGroupItem.subQueue.push(item); -+ } -+ currentLeftParenthesisCount++; -+ } else if (item === ')') { -+ currentLeftParenthesisCount--; -+ currentGroupItem.subQueue.push(item); -+ if (currentLeftParenthesisCount === 0) { -+ groups.push(currentGroupItem); -+ currentGroupItem = { -+ subQueue: [], -+ includeParenthesis: false, -+ }; -+ } -+ } else { -+ currentGroupItem.subQueue.push(item); -+ if (index === stack.length - 1) { -+ groups.push(currentGroupItem); -+ } -+ } -+ }); -+ return groups; -+} -+ -+function getPermissionVaildAtoms(atomStacks: string[], calcValidResult: PermissionVaildCalcInfo, -+ configPermissions: string[]): void { -+ if (calcValidResult.finish) { -+ return; -+ } -+ if (atomStacks[0] === 'and') { -+ calcValidResult.currentToken = PermissionValidTokenState.And; -+ } else if (atomStacks[0] === 'or') { -+ calcValidResult.currentToken = PermissionValidTokenState.Or; -+ } else { -+ if (calcValidResult.currentToken === PermissionValidTokenState.Or) { -+ if (inValidOrExpression( -+ atomStacks, -+ calcValidResult, -+ configPermissions -+ )) { -+ calcValidResult.currentPermissionMatch = false; -+ } -+ } else if (calcValidResult.currentToken === PermissionValidTokenState.And) { -+ if (inValidAndExpression( -+ atomStacks, -+ calcValidResult, -+ configPermissions -+ )) { -+ calcValidResult.currentPermissionMatch = false; -+ } -+ } else { -+ calcValidResult.currentPermissionMatch = -+ validPermissionItem(atomStacks[0], configPermissions); -+ } -+ } -+ if (atomStacks.length > 1) { -+ getPermissionVaildAtoms( -+ atomStacks.slice(1), -+ calcValidResult, -+ configPermissions -+ ); -+ } else { -+ calcValidResult.valid = calcValidResult.currentPermissionMatch; -+ calcValidResult.finish = true; -+ } -+} -+ -+function inValidOrExpression( -+ atomStacks: string[], -+ calcValidResult: PermissionVaildCalcInfo, -+ configPermissions: string[]): boolean { -+ if ( -+ !calcValidResult.currentPermissionMatch && -+ !validPermissionItem(atomStacks[0], configPermissions) -+ ) { -+ calcValidResult.valid = false; -+ return true; -+ } -+ calcValidResult.currentPermissionMatch = true; -+ return false; -+} -+ -+function inValidAndExpression( -+ atomStacks: string[], -+ calcValidResult: PermissionVaildCalcInfo, -+ configPermissions: string[]): boolean { -+ if ( -+ !calcValidResult.currentPermissionMatch || -+ !validPermissionItem(atomStacks[0], configPermissions) -+ ) { -+ calcValidResult.valid = false; -+ return true; -+ } -+ calcValidResult.currentPermissionMatch = -+ validPermissionItem(atomStacks[0], configPermissions); -+ return false; -+} -+ -+function validPermissionItem(atomStackItem: string, configPermissions: string[]): boolean { -+ return atomStackItem === '' || configPermissions.includes(atomStackItem); -+} -+ -+function getSplitsArrayWithDesignatedCharAndArrayStr( -+ leftParenthesisItems: string[], -+ designatedChar: string -+): string[] { -+ const rightParenthesisItems: string[] = []; -+ leftParenthesisItems.forEach((leftParenthesisItem: string) => { -+ if (leftParenthesisItem.includes(designatedChar)) { -+ const rightParenthesis: string[] = -+ getSplitsArrayWithDesignatedCharAndStr( -+ leftParenthesisItem, -+ designatedChar -+ ); -+ rightParenthesis.forEach((item: string) => { -+ if (item === '') { -+ rightParenthesisItems.push(designatedChar); -+ } else { -+ rightParenthesisItems.push(item); -+ } -+ }); -+ } else { -+ rightParenthesisItems.push(leftParenthesisItem); -+ } -+ }); -+ return rightParenthesisItems; -+} -+ -+/** -+* get jsDocNodeCheckConfigItem object -+* -+* @param {string[]} tagName - tag name -+* @param {string} message - error message -+* @param {DiagnosticCategory} type - error type -+* @param {boolean} tagNameShouldExisted - tag is required -+* @param {CheckValidCallbackInterface} checkValidCallback -+* @returns {JsDocNodeCheckConfigItem} -+*/ -+export function getJsDocNodeCheckConfigItem(tagName: string[], message: string, type: DiagnosticCategory, -+ tagNameShouldExisted: boolean, checkValidCallback?: CheckValidCallbackInterface): JsDocNodeCheckConfigItem { -+ return { -+ tagName: tagName, -+ message: message, -+ type: type, -+ tagNameShouldExisted: tagNameShouldExisted, -+ checkValidCallback: checkValidCallback -+ }; -+} -+ -+/** -+ * 创建/清空工程配置 -+ * @param { ProjectConfig } projectConfig -+ * @returns { ProjectConfig } -+ */ -+export function createOrCleanProjectConfig(): ProjectConfig { -+ return { -+ bundleName: '', -+ moduleName: '', -+ cachePath: '', -+ aceModuleJsonPath: '', -+ compileMode: '', -+ permissions: { -+ requestPermissions: [], -+ definePermissions: [] -+ }, -+ requestPermissions: [], -+ definePermissions: [], -+ projectRootPath: '', -+ isCrossplatform: false, -+ ignoreCrossplatformCheck: false, -+ bundleType: '', -+ compileSdkVersion: 0, -+ compatibleSdkVersion: 0, -+ projectPath: '', -+ aceProfilePath: '', -+ cardPageSet: [], -+ compileSdkPath: '', -+ systemModules: [], -+ allModulesPaths: [], -+ sdkConfigs: [], -+ externalApiPaths: '', -+ externalSdkPaths: [], -+ sdkConfigPrefix: '', -+ deviceTypes: [], -+ deviceTypesMessage: '', -+ runtimeOS: '', -+ syscapIntersectionSet: new Set([]), -+ syscapUnionSet: new Set([]), -+ permissionsArray: [], -+ buildSdkPath: '', -+ nativeDependencies: [], -+ aceSoPath: '' -+ }; -+} -+ -+/** -+ * 初始化工程配置 -+ * @param { ProjectConfig } projectConfig -+ */ -+export function initProjectConfig(): void { -+ // 绑定cardPageSet -+ readCardPageSet(); -+ // 绑定systemModules -+ readSystemModules(); -+ // 绑定syscap -+ readSyscapInfo(); -+ // 绑定permission -+ readPermissions(); -+} -+ -+/** -+ * read permissionInfo to this.share.projectConfig -+ */ -+export function readPermissions(): void { -+ const permission: ConfigPermission = globalObject.projectConfig.permissions; -+ if (permission.requestPermissions) { -+ globalObject.projectConfig.requestPermissions = getPermissionFromConfig(permission.requestPermissions); -+ } -+ if (permission.definePermissions) { -+ globalObject.projectConfig.definePermissions = getPermissionFromConfig(permission.definePermissions); -+ } -+ globalObject.projectConfig.permissionsArray = -+ [...globalObject.projectConfig.requestPermissions, ...globalObject.projectConfig.definePermissions]; -+} -+ -+function getPermissionFromConfig(array: Array<{ name: string }>): string[] { -+ return array.map((item: { name: string }) => { -+ return String(item.name); -+ }); -+} -+ -+function readSystemModules() { -+ const apiDirPath = path.resolve(globalObject.projectConfig.buildSdkPath, './api'); -+ const arktsDirPath = path.resolve(globalObject.projectConfig.buildSdkPath, './arkts'); -+ const kitsDirPath = path.resolve(globalObject.projectConfig.buildSdkPath, './kits'); -+ const systemModulePathArray = [apiDirPath, arktsDirPath, kitsDirPath]; -+ -+ systemModulePathArray.forEach(systemModulesPath => { -+ if (fs.existsSync(systemModulesPath)) { -+ const modulePaths = []; -+ readFile(systemModulesPath, modulePaths); -+ globalObject.projectConfig.systemModules.push(...fs.readdirSync(systemModulesPath)); -+ modulePaths.filter(filePath => { -+ const dirName = path.dirname(filePath); -+ return !(dirName === apiDirPath || dirName === arktsDirPath || dirName === kitsDirPath); -+ }).map((filePath: string) => { -+ return filePath -+ .replace(apiDirPath, '') -+ .replace(arktsDirPath, '') -+ .replace(kitsDirPath, '') -+ .replace(/(^\\)|(.d.e?ts$)/g, '') -+ .replace(/\\/g, '/'); -+ }); -+ globalObject.projectConfig.allModulesPaths.push(...modulePaths); -+ } -+ }); -+ const defaultSdkConfigs: SdkConfig[] = [ -+ { -+ 'apiPath': systemModulePathArray, -+ 'prefix': '@ohos' -+ }, { -+ 'apiPath': systemModulePathArray, -+ 'prefix': '@system' -+ }, { -+ 'apiPath': systemModulePathArray, -+ 'prefix': '@arkts' -+ } -+ ]; -+ const externalApiPathStr = globalObject.projectConfig.externalApiPaths || ''; -+ const externalApiPaths = externalApiPathStr.split(path.delimiter); -+ globalObject.projectConfig.externalSdkPaths = [...externalApiPaths]; -+ const extendSdkConfigs: SdkConfig[] = []; -+ collectExternalModules(externalApiPaths, extendSdkConfigs); -+ globalObject.projectConfig.sdkConfigs = [...defaultSdkConfigs, ...extendSdkConfigs]; -+} -+ -+function collectExternalModules(sdkPaths: string[], extendSdkConfigs: SdkConfig[]): void { -+ for (let i = 0; i < sdkPaths.length; i++) { -+ const sdkPath = sdkPaths[i]; -+ const sdkConfigPath = path.resolve(sdkPath, 'sdkConfig.json'); -+ if (!fs.existsSync(sdkConfigPath)) { -+ continue; -+ } -+ const sdkConfig: SdkConfig = JSON.parse(fs.readFileSync(sdkConfigPath, 'utf-8')); -+ if (!sdkConfig.apiPath) { -+ continue; -+ } -+ let externalApiPathArray: string[] = []; -+ if (Array.isArray(sdkConfig.apiPath)) { -+ externalApiPathArray = sdkConfig.apiPath; -+ } else { -+ externalApiPathArray.push(sdkConfig.apiPath); -+ } -+ const resolveApiPathArray: string[] = []; -+ externalApiPathArray.forEach((element: string) => { -+ const resolvePath: string = path.resolve(sdkPath, element); -+ resolveApiPathArray.push(resolvePath); -+ if (fs.existsSync(resolvePath)) { -+ const extrenalModulePaths = []; -+ globalObject.projectConfig.systemModules.push(...fs.readdirSync(resolvePath)); -+ readFile(resolvePath, extrenalModulePaths); -+ globalObject.projectConfig.allModulesPaths.push(...extrenalModulePaths); -+ } -+ }); -+ globalObject.projectConfig.sdkConfigPrefix += `|${sdkConfig.prefix.replace(/^@/, '')}`; -+ sdkConfig.apiPath = resolveApiPathArray; -+ extendSdkConfigs.push(sdkConfig); -+ } -+} -+ -+/** -+ * 根据配置读取卡片列表 -+ */ -+function readCardPageSet(): void { -+ if (globalObject.projectConfig.aceModuleJsonPath && fs.existsSync(globalObject.projectConfig.aceModuleJsonPath)) { -+ globalObject.projectConfig.compileMode = STAGE_COMPILE_MODE; -+ const moduleJson: any = JSON.parse(fs.readFileSync(globalObject.projectConfig.aceModuleJsonPath).toString()); -+ const extensionAbilities: any = moduleJson?.module?.extensionAbilities; -+ if (extensionAbilities && extensionAbilities.length > 0) { -+ setCardPages(extensionAbilities); -+ } -+ } -+} -+ -+function setCardPages(extensionAbilities: any) { -+ if (extensionAbilities && extensionAbilities.length > 0) { -+ extensionAbilities.forEach((extensionAbility: any) => { -+ if (extensionAbility.type === 'form' && extensionAbility.metadata) { -+ extensionAbility.metadata.forEach((metadata: any) => { -+ if (metadata.resource) { -+ readCardResource(metadata.resource); -+ } -+ }); -+ } -+ }); -+ } -+} -+ -+function readCardResource(resource: string) { -+ const cardJsonFileName: string = `${resource.replace(/\$profile\:/, '')}.json`; -+ const modulePagePath: string = path.resolve(globalObject.projectConfig.aceProfilePath, cardJsonFileName); -+ if (fs.existsSync(modulePagePath)) { -+ const cardConfig: any = JSON.parse(fs.readFileSync(modulePagePath, 'utf-8')); -+ if (cardConfig.forms) { -+ cardConfig.forms.forEach((form: any) => { -+ readCardForm(form); -+ }); -+ } -+ } -+} -+ -+function readCardForm(form: any) { -+ if ((form.type && form.type === 'eTS') || (form.uiSyntax && form.uiSyntax === 'arkts')) { -+ const cardPath = path.resolve(globalObject.projectConfig.projectPath, '..', form.src); -+ if (cardPath && fs.existsSync(cardPath) && !globalObject.projectConfig.cardPageSet.includes(cardPath)) { -+ globalObject.projectConfig.cardPageSet.push(cardPath); -+ } -+ } -+} -+ -+/** -+ * 更新工程配置 -+ * @param { ProjectConfig } targetProjectConfig -+ * @param { ProjectConfig } newProjectConfig -+ */ -+export function updateProjectConfig(newProjectConfig: ProjectConfig): void { -+ Object.assign(globalObject.projectConfig, { -+ bundleName: newProjectConfig.bundleName, -+ moduleName: newProjectConfig.moduleName, -+ cachePath: newProjectConfig.cachePath, -+ requestPermissions: newProjectConfig.requestPermissions, -+ projectRootPath: newProjectConfig.projectRootPath, -+ isCrossplatform: newProjectConfig.isCrossplatform, -+ ignoreCrossplatformCheck: newProjectConfig.ignoreCrossplatformCheck, -+ bundleType: newProjectConfig.bundleType, -+ compileSdkVersion: newProjectConfig.compileSdkVersion, -+ compatibleSdkVersion: newProjectConfig.compatibleSdkVersion, -+ projectPath: newProjectConfig.projectPath, -+ aceProfilePath: newProjectConfig.aceProfilePath, -+ buildSdkPath: newProjectConfig.buildSdkPath -+ }); -+} -+ -+export function readFile(dir: string, utFiles: string[]): void { -+ try { -+ const files: string[] = fs.readdirSync(dir); -+ files.forEach((element) => { -+ const filePath: string = path.join(dir, element); -+ const status: fs.Stats = fs.statSync(filePath); -+ if (status.isDirectory()) { -+ readFile(filePath, utFiles); -+ } else { -+ utFiles.push(filePath); -+ } -+ }); -+ } catch (e) { -+ console.error(MESSAGE_CONFIG_COLOR_RED, 'ArkTS ERROR: ' + e, MESSAGE_CONFIG_COLOR_RESET); -+ } -+} -+ -+/** -+* Determine the necessity of permission check -+* -+* @param { JSDoc[] } jsDocs -+* @param { JsDocNodeCheckConfigItem } config -+* @returns { boolean } -+*/ -+export function checkPermissionTag(jsDocs: JSDoc[], config: JsDocNodeCheckConfigItem): boolean { -+ const currentJSDoc: JSDoc = getCurrentJSDoc(jsDocs); -+ const jsDocTag: JSDocTag | undefined = getJSDocTag(currentJSDoc, PERMISSION_TAG_CHECK_NAME); -+ if (!jsDocTag) { -+ return false; -+ } -+ const permissionExpression: string = jsDocTag.name + ' ' + jsDocTag.description; -+ config.message = PERMISSION_TAG_CHECK_ERROR.replace('$DT', permissionExpression); -+ return permissionExpression !== '' && !validPermission(permissionExpression, globalObject.projectConfig.permissionsArray); -+} -+ -+/** -+ * Confirm compliance since -+ * Only major version can be passed in, such as "19"; -+ * major and minor version can be passed in, such as "19.1"; major minor and patch -+ * patch version can be passed in, such as "19.1.2" -+ * the major version be from 1-999 -+ * the minor version be from 0-999 -+ * the patch version be from 0-999 -+ * -+ * @param {string} since -+ * @return {boolean} -+ */ -+function isCompliantSince(since: string): boolean { -+ return /^(?!0\d)[1-9]\d{0,2}(?:\.[1-9]\d{0,2}|\.0){0,2}$\d{0,2}$/.test(since); -+} -+ -+/** -+ * compare point version -+ * @param { string } firstVersion -+ * @param { string } secondVersion -+ * @returns { number } -+ */ -+function comparePointVersion(firstVersion: string, secondVersion: string): number { -+ const firstPointVersion = firstVersion.split('.'); -+ const secondPointVersion = secondVersion.split('.'); -+ for (let i = 0; i < 3; i++) { -+ const part1 = parseInt(firstPointVersion[i] || '0', 10); -+ const part2 = parseInt(secondPointVersion[i] || '0', 10); -+ if (part1 < part2) { -+ return -1; -+ } -+ if (part1 > part2) { -+ return 1; -+ } -+ } -+ return 0; -+} -+ -+/** -+ * Determine the necessity of syscap check. -+ * @param { JSDoc[] } jsDocs -+ * @param { JsDocNodeCheckConfigItem } config -+ * @returns { boolean } -+ */ -+export function checkSyscapTag(jsDocs: JSDoc[], config: JsDocNodeCheckConfigItem): boolean { -+ let currentSyscapValue: string = ''; -+ if (jsDocs && jsDocs.length > 0) { -+ const jsDoc: JSDoc = getCurrentJSDoc(jsDocs); -+ for (let i = 0; i < jsDoc.tags.length; i++) { -+ const jsDocTag: JSDocTag = jsDoc.tags[i]; -+ if (jsDocTag && jsDocTag.name === SYSCAP_TAG_CHECK_NAME) { -+ currentSyscapValue = jsDocTag.comment; -+ break; -+ } -+ } -+ } -+ return globalObject.projectConfig.syscapIntersectionSet && !globalObject.projectConfig.syscapIntersectionSet.has(currentSyscapValue); -+} -+ -+/** -+ * read syscapInfo to projectConfig -+ */ -+export function readSyscapInfo(): void { -+ globalObject.projectConfig.deviceTypesMessage = globalObject.projectConfig.deviceTypes.join(','); -+ const deviceDir: string = path.resolve(__dirname, '../../../../../api/device-define/'); -+ const deviceInfoMap: Map = new Map(); -+ const syscaps: Array = []; -+ let allSyscaps: string[] = []; -+ globalObject.projectConfig.deviceTypes.forEach((deviceType: string) => { -+ collectOhSyscapInfos(deviceType, deviceDir, deviceInfoMap); -+ }); -+ if (globalObject.projectConfig.runtimeOS !== RUNTIME_OS_OH) { -+ collectExternalSyscapInfos(globalObject.projectConfig.externalSdkPaths, globalObject.projectConfig.deviceTypes, -+ deviceInfoMap); -+ } -+ deviceInfoMap.forEach((value: string[]) => { -+ syscaps.push(value); -+ allSyscaps = allSyscaps.concat(value); -+ }); -+ const intersectNoRepeatTwice = (arrs: Array) => { -+ return arrs.reduce(function (prev: string[], cur: string[]) { -+ return Array.from(new Set(cur.filter((item: string) => { -+ return prev.includes(item); -+ }))); -+ }); -+ }; -+ let syscapIntersection: string[] = []; -+ if (globalObject.projectConfig.deviceTypes.length === 1 || syscaps.length === 1) { -+ syscapIntersection = syscaps[0]; -+ } else if (syscaps.length > 1) { -+ syscapIntersection = intersectNoRepeatTwice(syscaps); -+ } -+ globalObject.projectConfig.syscapIntersectionSet = new Set(syscapIntersection); -+ globalObject.projectConfig.syscapUnionSet = new Set(allSyscaps); -+} -+ -+function collectOhSyscapInfos(deviceType: string, deviceDir: string, deviceInfoMap: Map) { -+ let syscapFilePath: string = ''; -+ if (deviceType === 'phone') { -+ syscapFilePath = path.resolve(deviceDir, 'default.json'); -+ } else { -+ syscapFilePath = path.resolve(deviceDir, deviceType + '.json'); -+ } -+ if (fs.existsSync(syscapFilePath)) { -+ const content: SyscapConfig = JSON.parse(fs.readFileSync(syscapFilePath, 'utf-8')); -+ if (deviceInfoMap.get(deviceType)) { -+ deviceInfoMap.set(deviceType, (deviceInfoMap.get(deviceType) as string[]).concat(content.sysCaps)); -+ } else { -+ deviceInfoMap.set(deviceType, content.sysCaps); -+ } -+ } -+} -+ -+function collectExternalSyscapInfos( -+ externalApiPaths: string[], -+ deviceTypes: string[], -+ deviceInfoMap: Map -+) { -+ const externalDeviceDirs: string[] = []; -+ externalApiPaths.forEach((externalApiPath: string) => { -+ const externalDeviceDir: string = path.resolve(externalApiPath, './api/device-define'); -+ if (fs.existsSync(externalDeviceDir)) { -+ externalDeviceDirs.push(externalDeviceDir); -+ } -+ }); -+ externalDeviceDirs.forEach((externalDeviceDir: string) => { -+ deviceTypes.forEach((deviceType: string) => { -+ let syscapFilePath: string = ''; -+ const files: string[] = fs.readdirSync(externalDeviceDir); -+ files.forEach((fileName: string) => { -+ if (fileName.startsWith(deviceType)) { -+ syscapFilePath = path.resolve(externalDeviceDir, fileName); -+ if (fs.existsSync(syscapFilePath)) { -+ const content: SyscapConfig = JSON.parse(fs.readFileSync(syscapFilePath, 'utf-8')); -+ if (deviceInfoMap.get(deviceType)) { -+ deviceInfoMap.set(deviceType, (deviceInfoMap.get(deviceType) as string[]).concat(content.sysCaps)); -+ } else { -+ deviceInfoMap.set(deviceType, content.sysCaps); -+ } -+ } -+ } -+ }); -+ }); -+ }); -+} -+ -+export function pushLog(apiName: string, currentFilePath: string, currentAddress: CurrentAddress, -+ logLevel: DiagnosticCategory, logMessage: string) { -+ // 组装文件全路径 -+ const fileFullPath: string = currentFilePath + `(${currentAddress.column}:${currentAddress.line}).`; -+ // 替换api名称 -+ logMessage = logMessage.replace('{0}', apiName); -+ // 打印日志信息 -+ printMessage(fileFullPath, logMessage, logLevel); -+} -+ -+/** -+ * 日志打印 -+ * @param fileInfo -+ * @param message -+ * @param level -+ */ -+function printMessage(fileInfo: string, message: string, level: DiagnosticCategory) { -+ let messageHead: string = MESSAGE_CONFIG_HEADER_WARNING; -+ let messageColor: string = MESSAGE_CONFIG_COLOR_WARNING; -+ if (level === DiagnosticCategory.Error) { -+ messageHead = MESSAGE_CONFIG_HEADER_ERROR; -+ messageColor = MESSAGE_CONFIG_COLOR_ERROR; -+ } -+ // TODO: 待工具链日志输出方式确认后同步适配 -+ console.log(`%c${messageHead}${fileInfo}\n ${message}`, messageColor); -+} -+ -+export function collectInfo(moduleName: string[], modulePath: string, currentFilePath: string) { -+ // 收集so模块依赖 -+ if (/lib(\S+)\.so/g.test(modulePath) && !globalObject.projectConfig.nativeDependencies.includes(currentFilePath)) { -+ globalObject.projectConfig.nativeDependencies.push(currentFilePath); -+ } -+} -+ -+export function writeUseOSFiles(useOSFiles: string[]): void { -+ let info: string = useOSFiles.join('\n'); -+ if (!fs.existsSync(globalObject.projectConfig.aceSoPath)) { -+ const parent: string = path.resolve(globalObject.projectConfig.aceSoPath, '..'); -+ if (!(fs.existsSync(parent) && !fs.statSync(parent).isFile())) { -+ mkDir(parent); -+ } -+ } else { -+ const currentUseOSFiles: string[] = fs.readFileSync(globalObject.projectConfig.aceSoPath, 'utf-8').split('\n'); -+ useOSFiles.forEach((filePath: string) => { -+ if (!currentUseOSFiles.includes(filePath)) { -+ currentUseOSFiles.push(filePath); -+ } -+ }); -+ info = currentUseOSFiles.join('\n'); -+ } -+ fs.writeFileSync(globalObject.projectConfig.aceSoPath, info); -+} -+ -+function mkDir(path_: string): void { -+ const parent: string = path.join(path_, '..'); -+ if (!(fs.existsSync(parent) && !fs.statSync(parent).isFile())) { -+ mkDir(parent); -+ } -+ fs.mkdirSync(path_); -+} -\ No newline at end of file -diff --git a/build-tools/declgen.js b/build-tools/declgen.js -new file mode 100644 -index 000000000..c2f54541f ---- /dev/null -+++ b/build-tools/declgen.js -@@ -0,0 +1,97 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+const fs = require('fs'); -+const path = require('path'); -+const commander = require('commander'); -+const { generateInteropDecls } = require('declgen/build/src/generateInteropDecls'); -+let inputFileDir = ''; -+let outputFileDir = ''; -+const CONFIG = JSON.parse( -+ fs.readFileSync(path.join(__dirname, 'remove_declgen.json'), 'utf8') -+); -+ -+function main() { -+ const program = new commander.Command(); -+ program.name('intToNumber').version('0.0.1'); -+ program -+ .option('--input ', 'input path') -+ .option('--output ', 'output path') -+ .action((opts) => { -+ if (!opts.input || !opts.output) { -+ console.error( -+ 'Error: Must provide --input and --output parameters' -+ ); -+ process.exit(1); -+ } -+ // 将相对路径解析为绝对路径 -+ inputFileDir = path.resolve(opts.input); -+ outputFileDir = path.resolve(opts.output); -+ // 检查输入目录是否存在 -+ if (!fs.existsSync(inputFileDir)) { -+ console.error( -+ `Error: Input directory does not exist: ${inputFileDir}` -+ ); -+ process.exit(1); -+ } -+ runDeclgen(inputFileDir, outputFileDir); -+ }); -+ program.parse(process.argv); -+} -+ -+function runDeclgen(inputDir, outputDir) { -+ const inputFiles = []; -+ readFile(inputDir + '/api', inputFiles); -+ readFile(inputDir + '/arkts', inputFiles); -+ readFile(inputDir + '/kits', inputFiles); -+ const config = { -+ inputDirs: [], -+ inputFiles: inputFiles, -+ outDir: outputDir, -+ rootDir: inputDir -+ }; -+ generateInteropDecls(config); -+} -+ -+/** -+ -+读取目录下所有文件 -+@param {string} inputDir 文件目录 -+@param {Array} utFiles 所有文件 -+*/ -+function readFile(inputDir, utFiles) { -+ try { -+ const files = fs.readdirSync(inputDir); -+ files.forEach((element) => { -+ if (element === 'build-tools') { -+ return; -+ } -+ const filePath = path.join(inputDir, element); -+ const status = fs.statSync(filePath); -+ const relativePath = path.normalize( -+ path.relative(inputFileDir, filePath) -+ ); -+ if (status.isDirectory()) { -+ readFile(filePath, utFiles); -+ } else if (!CONFIG.removeFile.includes(relativePath.replace(/\//g, '\\'))) { -+ utFiles.push(filePath); -+ } -+ }); -+ } catch (e) { -+ console.error('Error reading files: ' + e.message); -+ } -+} -+ -+main(); -\ No newline at end of file -diff --git a/build-tools/delete_systemapi_plugin.js b/build-tools/delete_systemapi_plugin.js -index 9b5224036..d4fe9c661 100644 ---- a/build-tools/delete_systemapi_plugin.js -+++ b/build-tools/delete_systemapi_plugin.js -@@ -184,7 +184,7 @@ function processKitImportDeclaration(statement, needDeleteExportName) { - } - const importPath = statement.moduleSpecifier.text.replace('../', ''); - if (kitFileNeedDeleteMap === undefined || !kitFileNeedDeleteMap.has(importPath)) { -- const hasFilePath = hasFileByImportPath(importPath, inputDir); -+ const hasFilePath = hasFileByImportPath(inputDir, importPath); - if (hasFilePath) { - return statement; - } -@@ -233,20 +233,35 @@ function processKitImportDeclaration(statement, needDeleteExportName) { - - /** - * 判断文件路径对应的文件是否存在 -- * @param {string} importPath kit文件import - * @param {string} apiDir 引用接口所在目录 -+ * @param {string} importPath kit文件import - * @returns {boolean} importPath是否存在 - */ --function hasFileByImportPath(importPath, apiDir) { -+function hasFileByImportPath(apiDir, importPath) { - let fileDir = path.resolve(apiDir); - if (importPath.startsWith('@arkts')) { - fileDir = path.resolve(inputDir, '../arkts'); - } -- return isExistArkUIFile(path.resolve(inputDir, 'arkui', 'component'), importPath) || -- isExistImportFile(fileDir, importPath); -+ return isExistImportFile(fileDir, importPath) || -+ isExistArkUIFile(path.resolve(inputDir, 'arkui', 'component'), importPath); - } - -+ -+/** -+ * Arkui import路径特殊处理 -+ * @param {string} resolvedPath 引用接口所在目录 -+ * @param {string} importPath kit文件import -+ * @returns {boolean} importPath是否存在 -+ */ - function isExistArkUIFile(resolvedPath, importPath) { -+ // TODO arkui 特殊处理import -+ if (importPath.startsWith('@ohos.arkui.')) { -+ resolvedPath = path.resolve(inputDir); -+ } -+ if (importPath.startsWith('arkui.component.') || importPath.startsWith('arkui.stateManagement.')) { -+ resolvedPath = path.resolve(inputDir); -+ importPath = importPath.replace(/\./g, '/'); -+ } - const filePath = path.resolve(resolvedPath, importPath); - if ( - filePath.includes(path.resolve(inputDir, '@internal', 'component', 'ets')) || -@@ -303,28 +318,40 @@ function tsTransform(utFiles, callback) { - } - return; - } -- if (/\.json/.test(url) || apiBaseName === 'index-full.d.ts' || !/\@systemapi/.test(content) && apiBaseName !== '@ohos.arkui.component.d.ets') { -- // 特殊类型文件处理 -+ let isTransformer = /\.d\.ts/.test(apiBaseName) || /\.d\.ets/.test(apiBaseName); -+ if (/\.json/.test(url) || apiBaseName === 'index-full.d.ts') { -+ isTransformer = false; -+ } -+ if (etsType === 'ets2') { -+ if (!/\@systemapi/.test(content) && apiBaseName !== '@ohos.arkui.component.d.ets') { -+ isTransformer = false; -+ } -+ } -+ if (/\.static\.d\.ets$/.test(apiBaseName)) { -+ writeFile(url.substring(0, url.length - 12) + 'd.ets', content); -+ return; -+ } -+ if (!isTransformer) { - writeFile(url, content); -- } else if (/\.d\.ts/.test(apiBaseName) || /\.d\.ets/.test(apiBaseName)) { -- // dts文件处理 -- const fileName = processFileName(url); -- let references = content.match(PATT.GET_REFERENCE); -- if (references) { -- referencesMap.set(url, { references: references }); -- for (let index = 0; index < references.length; index++) { -- const item = references[index]; -- content = content.replace(item, ''); -- } -+ return; -+ } -+ // dts文件处理 -+ const fileName = processFileName(url); -+ let references = content.match(PATT.GET_REFERENCE); -+ if (references) { -+ referencesMap.set(url, { references: references }); -+ for (let index = 0; index < references.length; index++) { -+ const item = references[index]; -+ content = content.replace(item, ''); - } -- ts.transpileModule(content, { -- compilerOptions: { -- target: ts.ScriptTarget.ES2017, -- }, -- fileName: fileName, -- transformers: { before: [callback(url)] }, -- }); - } -+ ts.transpileModule(content, { -+ compilerOptions: { -+ target: ts.ScriptTarget.ES2017, -+ }, -+ fileName: fileName, -+ transformers: { before: [callback(url)] }, -+ }); - }); - } - /** -@@ -604,7 +631,7 @@ function formatAllNodesImportDeclaration(node, statement, url, currReferencesMod - } - const importSpecifier = statement.moduleSpecifier.getText().replace(/[\'\"]/g, ''); - const fileDir = path.dirname(url); -- let hasImportSpecifierFile = hasFileByImportPath(importSpecifier, fileDir); -+ let hasImportSpecifierFile = hasFileByImportPath(fileDir, importSpecifier); - let hasImportSpecifierInModules = globalModules.has(importSpecifier); - if ((hasImportSpecifierFile || hasImportSpecifierInModules) && clauseSet.size > 0) { - let currModule = []; -diff --git a/build-tools/handleApiFiles.js b/build-tools/handleApiFiles.js -index 64ab86c91..7c8758a55 100755 ---- a/build-tools/handleApiFiles.js -+++ b/build-tools/handleApiFiles.js -@@ -20,6 +20,7 @@ const commander = require('commander'); - // 处理的目录类型 - let dirType = ''; - const deleteApiSet = new Set(); -+const importNameSet = new Set(); - - // 处理的目录类型,ets代表处理的是1.1目录,ets2代表处理的是1.2目录里有@arkts 1.1&1.2标签的文件, - // noTagInEts2代表处理的是1.2目录里无标签的文件 -@@ -29,6 +30,15 @@ const DirType = { - 'typeThree': 'noTagInEts2', - }; - -+const NotNullFilePath = [ -+ 'api', -+ 'api/@internal/ets', -+ 'api/@internal/component/ets', -+ 'api/arkui/component', -+ 'arkts', -+ 'kits', -+]; -+ - const NOT_COPY_DIR = ['build-tools', '.git', '.gitee']; - - function isEtsFile(path) { -@@ -39,6 +49,10 @@ function isTsFile(path) { - return path.endsWith('d.ts'); - } - -+function isStaticFile(path) { -+ return path.endsWith('static.d.ets'); -+} -+ - function hasEtsFile(path) { - // 为StateManagement.d.ts设定白名单,在1.2打包的时候在Linux上有大小写不同的重名,碰到直接返回true - if (path.includes('StateManagement.d.ts')) { -@@ -102,6 +116,20 @@ function handleApiFiles(rootPath, type, output) { - console.log('error===>', error); - } - } -+ if (type === DirType.typeTwo) { -+ NotNullFilePath.forEach((dir) => { -+ const outDir = path.join(output, dir); -+ if (!fs.existsSync(outDir)) { -+ fs.mkdirSync(outDir, { recursive: true }); -+ writeFile(path.join(outDir, '.keep'), ' '); -+ return; -+ } -+ const fileNames = fs.readdirSync(outDir); -+ if (fileNames.length === 0) { -+ writeFile(path.join(outDir, '.keep'), ' '); -+ } -+ }); -+ } - } - - -@@ -118,9 +146,19 @@ function handleApiFileByType(apiRelativePath, rootPath, type, output) { - const fullPath = path.join(rootPath, apiRelativePath); - const isEndWithEts = isEtsFile(apiRelativePath); - const isEndWithTs = isTsFile(apiRelativePath); -+ const isEndWithStatic = isStaticFile(apiRelativePath); - const outputPath = output ? path.join(output, apiRelativePath) : fullPath; - const fileContent = fs.readFileSync(fullPath, 'utf-8'); - -+ if (isEndWithStatic) { -+ if (type === 'ets2') { -+ writeFile(outputPath, fileContent); -+ return; -+ } else { -+ return; -+ } -+ } -+ - if (!isEndWithEts && !isEndWithTs) { - writeFile(outputPath, fileContent); - return; -@@ -272,7 +310,7 @@ function handleNoTagFileInFirstType(sourceFile, outputPath, fileContent) { - * @returns - */ - function deleteArktsTag(fileContent) { -- const arktsTagRegx = /\*\s*@arkts\s+1.1&1.2\s*(\r|\n)\s*|\*\s*@arkts\s*1.2s*(\r|\n)\s*/g; -+ const arktsTagRegx = /\*\s*@arkts\s+1.1&1.2\s*(\r|\n)\s*|\*\s*@arkts\s*1.2s*(\r|\n)\s*|\*\s*@arkts\s*1.1s*(\r|\n)\s*/g; - fileContent = fileContent.replace(arktsTagRegx, (substring, p1) => { - return ''; - }); -@@ -583,24 +621,36 @@ function deleteApi(sourceFile) { - */ - const transformExportApi = (context) => { - return (rootNode) => { -- const visit = (node) => { -+ const importOrExportNodeVisitor = (node) => { -+ if (ts.isImportClause(node) && node.name && ts.isIdentifier(node.name) || -+ ts.isImportSpecifier(node) && node.name && ts.isIdentifier(node.name)) { -+ importNameSet.add(node.name?.getText()); -+ } - // 剩下未被删除的API中,如果还有与被删除API名字一样的API,就将其从set集合中删掉 - if (apiNodeTypeArr.includes(node.kind) && deleteApiSet.has(node.name?.getText())) { - deleteApiSet.delete(node.name?.getText()); - } -+ // 非目标节点:继续遍历子节点 -+ return ts.visitEachChild(node, importOrExportNodeVisitor, context); -+ }; -+ ts.visitNode(rootNode, importOrExportNodeVisitor); -+ -+ const allNodeVisitor = (node) => { - // 判断是否为要删除的变量声明 -- if (ts.isExportAssignment(node) && deleteApiSet.has(node.expression.escapedText.toString())) { -+ if (ts.isExportAssignment(node) && deleteApiSet.has(node.expression.escapedText.toString()) && -+ !importNameSet.has(node.expression.escapedText.toString())) { - return undefined; - } - -- if (ts.isExportSpecifier(node) && deleteApiSet.has(node.name.escapedText.toString())) { -+ if (ts.isExportSpecifier(node) && deleteApiSet.has(node.name.escapedText.toString()) && -+ !importNameSet.has(node.name.escapedText.toString())) { - return undefined; - } - - // 非目标节点:继续遍历子节点 -- return ts.visitEachChild(node, visit, context); -+ return ts.visitEachChild(node, allNodeVisitor, context); - }; -- return ts.visitNode(rootNode, visit); -+ return ts.visitNode(rootNode, allNodeVisitor); - }; - }; - -diff --git a/build-tools/intToNumber.js b/build-tools/intToNumber.js -new file mode 100644 -index 000000000..37c448abb ---- /dev/null -+++ b/build-tools/intToNumber.js -@@ -0,0 +1,490 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+const ts = require('typescript'); -+const fs = require('fs'); -+const path = require('path'); -+const commander = require('commander'); -+ -+const typeArray = ['long', 'double', 'int']; -+ -+let inputDir = ''; -+let outputDir = ''; -+let jsDocContent = ''; -+let tagDataList = []; -+ -+function main() { -+ const program = new commander.Command(); -+ program -+ .name('intToNumber') -+ .version('0.0.1'); -+ program -+ .option('--path ', 'input path') -+ .option('--output ', 'output path') -+ .action((opts) => { -+ if (!opts.path || !opts.output) { -+ console.error('Error: Must provide --path and --output parameters'); -+ process.exit(1); -+ } -+ -+ // 将相对路径解析为绝对路径 -+ inputDir = path.resolve(opts.path); -+ outputDir = path.resolve(opts.output); -+ -+ // 检查输入目录是否存在 -+ if (!fs.existsSync(inputDir)) { -+ console.error(`Error: Input directory does not exist: ${inputDir}`); -+ process.exit(1); -+ } -+ -+ const apiUtFiles1 = []; -+ readFile(inputDir + '/api', apiUtFiles1); -+ readFile(inputDir + '/arkts', apiUtFiles1); -+ tsTransform(apiUtFiles1, recursionAstCallback); -+ const apiUtFiles2 = []; -+ readFile(outputDir + '/api', apiUtFiles2); -+ readFile(outputDir + '/arkts', apiUtFiles2); -+ tsTransform(apiUtFiles2, recursionAstCallback2); -+ -+ const jsDocUtFiles1 = []; -+ readFile(outputDir + '/api', jsDocUtFiles1); -+ readFile(outputDir + '/arkts', jsDocUtFiles1); -+ tsTransform(jsDocUtFiles1, parseJSDocCallback); -+ const jsDocUtFiles2 = []; -+ readFile(outputDir + '/api', jsDocUtFiles2); -+ readFile(outputDir + '/arkts', jsDocUtFiles2); -+ tsTransform(jsDocUtFiles2, parseJSDocCallback2); -+ }); -+ program.parse(process.argv); -+} -+ -+/** -+ * 读取目录下所有文件 -+ * @param {string} dir 文件目录 -+ * @param {Array} utFiles 所有文件 -+ */ -+function readFile(dir, utFiles) { -+ try { -+ const files = fs.readdirSync(dir); -+ files.forEach((element) => { -+ if (element === 'build-tools') { -+ return; -+ } -+ const filePath = path.join(dir, element); -+ const status = fs.statSync(filePath); -+ if (status.isDirectory()) { -+ readFile(filePath, utFiles); -+ } else { -+ utFiles.push(filePath); -+ } -+ }); -+ } catch (e) { -+ console.error('Error reading files: ' + e.message); -+ } -+} -+ -+ -+/** -+ * 遍历所有文件进行处理 -+ * @param {Array} utFiles 所有文件 -+ * @param {recursionAstCallback} callback 回调函数 -+ */ -+function tsTransform(utFiles, callback) { -+ utFiles.forEach((url) => { -+ let content = fs.readFileSync(url, 'utf-8'); -+ jsDocContent = content; -+ const apiBaseName = path.basename(url); -+ tagDataList = []; -+ if (/\.d\.ts/.test(apiBaseName) || /\.d\.ets/.test(apiBaseName)) { -+ const fileName = processFileName(url); -+ ts.transpileModule(content, { -+ compilerOptions: { -+ target: ts.ScriptTarget.ES2017, -+ }, -+ fileName: fileName, -+ transformers: { before: [callback(url)] } -+ }); -+ } else { -+ const outputPath = replaceInputDirWithOutputDir(url, inputDir, outputDir); -+ ensureDirectoryExists(outputPath); -+ fs.writeFileSync(outputPath, content); -+ } -+ }); -+} -+ -+/** -+ * 统一处理文件名称,修改后缀等 -+ * @param {string} filePath 文件路径 -+ * @returns {string} filename 文件名称 -+ */ -+function processFileName(filePath) { -+ return path -+ .basename(filePath) -+ .replace(/\.d\.ts$/g, '.ts') -+ .replace(/\.d\.ets$/g, '.ets'); -+} -+ -+/** -+ * 每个文件处理签回调函数第一个 -+ * @callback recursionAstCallback -+ * @param {string} url 文件路径 -+ * @returns {Function} -+ */ -+function recursionAstCallback(url) { -+ return (context) => { -+ return (sourceFile) => { -+ node = processVisitEachChild1(context, sourceFile); -+ const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed }); -+ const result = printer.printNode(ts.EmitHint.Unspecified, node, sourceFile); -+ const outputPath = replaceInputDirWithOutputDir(url, inputDir, outputDir); -+ ensureDirectoryExists(outputPath); -+ fs.writeFileSync(outputPath, result); -+ return ts.factory.createSourceFile([], ts.SyntaxKind.EndOfFileToken, ts.NodeFlags.None); -+ }; -+ }; -+} -+ -+/** -+ * 每个文件处理签回调函数第一个 -+ * @callback recursionAstCallback -+ * @param {string} url 文件路径 -+ * @returns {Function} -+ */ -+function recursionAstCallback2(url) { -+ return (context) => { -+ return (sourceFile) => { -+ node = processVisitEachChild2(context, sourceFile); -+ const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed }); -+ const result = printer.printNode(ts.EmitHint.Unspecified, node, sourceFile); -+ fs.writeFileSync(url, result); -+ return ts.factory.createSourceFile([], ts.SyntaxKind.EndOfFileToken, ts.NodeFlags.None); -+ }; -+ }; -+} -+ -+/** -+ * 每个文件处理签回调函数第一个 -+ * @callback parseJSDocCallback -+ * @param {string} url 文件路径 -+ * @returns {Function} -+ */ -+function parseJSDocCallback(url) { -+ return (context) => { -+ return (sourceFile) => { -+ node = parseJSDocVisitEachChild1(context, sourceFile); -+ changeContent(tagDataList); -+ fs.writeFileSync(url, jsDocContent); -+ return ts.factory.createSourceFile([], ts.SyntaxKind.EndOfFileToken, ts.NodeFlags.None); -+ }; -+ }; -+} -+ -+/** -+ * 每个文件处理签回调函数第一个 -+ * @callback parseJSDocCallback -+ * @param {string} url 文件路径 -+ * @returns {Function} -+ */ -+function parseJSDocCallback2(url) { -+ return (context) => { -+ return (sourceFile) => { -+ const contents = fs.readFileSync(url, 'utf-8'); -+ node = parseJSDocVisitEachChild2(context, sourceFile, contents); -+ changeContent(tagDataList); -+ fs.writeFileSync(url, jsDocContent); -+ return ts.factory.createSourceFile([], ts.SyntaxKind.EndOfFileToken, ts.NodeFlags.None); -+ }; -+ }; -+} -+ -+/** -+ * 遍历处理tsnode节点 -+ * @param {context} 解下过后的内容 -+ * @param {node} 解下过后的节点 -+ * @returns ts.node -+ */ -+function parseJSDocVisitEachChild1(context, node) { -+ return ts.visitEachChild(node, processAllNodes, context); -+ function processAllNodes(node) { -+ if (node.jsDoc) { -+ processAllNodesJSDoc(node.jsDoc); -+ } -+ return ts.visitEachChild(node, processAllNodes, context); -+ } -+ function jsDocNodeForeach(tags) { -+ tags.forEach(tag => { -+ if (!tag.typeExpression) { -+ return; -+ } -+ const typeExpr = tag.typeExpression; -+ const newTypeExpr = parseTypeExpr(typeExpr); -+ applJSDocTransformations(typeExpr.type, newTypeExpr, tagDataList); -+ }); -+ } -+ function processAllNodesJSDoc(jsDocNode) { -+ jsDocNode.forEach(doc => { -+ if (!doc.tags) { -+ return; -+ } -+ if (/(long|double|int)/g.test(doc.getText())) { -+ jsDocNodeForeach(doc.tags); -+ } -+ }); -+ } -+ function parseTypeExpr(typeExpr) { -+ let newTypeExpr = typeExpr; -+ if (typeExpr.type.kind === ts.SyntaxKind.JSDocNullableType) { -+ newTypeExpr = judgeKind(typeExpr.type); -+ } else { -+ newTypeExpr = parseTypeExpression(typeExpr.type); -+ } -+ return newTypeExpr; -+ } -+ function judgeKind(typeExprType) { -+ if (typeExprType.type.kind && typeExprType.type.kind === ts.SyntaxKind.ParenthesizedType) { -+ return parseTypeExpression(typeExprType.type.type); -+ } else { -+ return parseTypeExpression(typeExprType.type); -+ } -+ } -+ function parseTypeExpression(node) { -+ if (ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && typeArray.includes(node.typeName.getText())) { -+ node = ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword); -+ } -+ return ts.visitEachChild(node, parseTypeExpression, context); -+ } -+} -+ -+/** -+ * -+ * @param {typeExpr} 原始typeExpr -+ * @param {newTypeExpr} 新typeExpr -+ * @param {content} 文本内容 -+ */ -+function applJSDocTransformations(typeExpr, newTypeExpr, tagDataList) { -+ const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed }); -+ const finalContent = printer.printNode(ts.EmitHint.Unspecified, newTypeExpr); -+ if (finalContent.includes('number')) { -+ const data = { -+ pos: typeExpr.pos, -+ end: typeExpr.end, -+ convertedText: finalContent -+ }; -+ tagDataList.push(data); -+ } -+} -+ -+/** -+ * -+ * @param {typeExpr} 原始typeExpr -+ * @param {newTypeExpr} 新typeExpr -+ * @param {content} 文本内容 -+ */ -+function changeContent(tagDataList) { -+ tagDataList.sort((a, b) => b.pos - a.pos); -+ for (const data of tagDataList) { -+ const before = jsDocContent.substring(0, data.pos); -+ const after = jsDocContent.substring(data.end); -+ jsDocContent = before + ` ${data.convertedText}` + after; -+ } -+} -+ -+/** -+ * 遍历处理tsnode节点 -+ * @param {context} 解下过后的内容 -+ * @param {node} 解下过后的节点 -+ * @returns ts.node -+ */ -+function parseJSDocVisitEachChild2(context, node) { -+ return ts.visitEachChild(node, processAllNodes, context); -+ function processAllNodes(node) { -+ if (node.jsDoc) { -+ removeChangeData(node.jsDoc); -+ } -+ return ts.visitEachChild(node, processAllNodes, context); -+ } -+ function jsDocNodeForeach(tags) { -+ tags.forEach(tag => { -+ if (!tag.typeExpression) { -+ return; -+ } -+ writeDataToFile(tag); -+ }); -+ } -+ function removeChangeData(node) { -+ node.forEach(doc => { -+ if (!doc.tags) { -+ return; -+ } -+ jsDocNodeForeach(doc.tags); -+ }); -+ } -+ function writeDataToFile(tag) { -+ const typeExpr = tag.typeExpression; -+ const newTypeExpr = parseTypeExpression(typeExpr.type); -+ applJSDocTransformations(typeExpr.type, newTypeExpr, tagDataList); -+ } -+ function parseTypeExpression(node) { -+ if (ts.isUnionTypeNode(node)) { -+ const types = node.types; -+ const newTypes1 = []; -+ let newTypes2 = []; -+ types.forEach(type => { -+ newTypes1.push(collectNewTypes(type)); -+ }); -+ newTypes1.forEach(type => { -+ newTypes2 = duplicateRemoval(type); -+ }); -+ node = ts.factory.updateUnionTypeNode(node, newTypes2); -+ } -+ return ts.visitEachChild(node, parseTypeExpression, context); -+ } -+} -+ -+ -+/** -+ * @param {type} 需要去重的节点 -+ */ -+function collectNewTypes(type) { -+ if (ts.isTypeReferenceNode(type) && ts.isIdentifier(type.typeName) && typeArray.includes(type.typeName.getText())) { -+ return ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword); -+ } else { -+ return type; -+ } -+} -+ -+ -+/** -+ * -+ * @param {type} 解析过后的节点 -+ * @returns -+ */ -+function duplicateRemoval(type) { -+ let newTypes2 = []; -+ let hasNumberKeyWorld = false; -+ if (type.kind === ts.SyntaxKind.NumberKeyword) { -+ if (!hasNumberKeyWorld) { -+ newTypes2.push(type); -+ hasNumberKeyWorld = true; -+ } -+ } else { -+ newTypes2.push(type); -+ } -+ return newTypes2; -+} -+ -+/** -+ * 遍历处理tsnode节点 -+ * @param {context} 解下过后的内容 -+ * @param {node} 解下过后的节点 -+ * @returns ts.node -+ */ -+function processVisitEachChild1(context, node) { -+ return ts.visitEachChild(node, processAllNodes, context); -+ function processAllNodes(node) { -+ if (ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && typeArray.includes(node.typeName.getText())) { -+ node = ts.factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword); -+ } -+ if (ts.isStructDeclaration(node)) { -+ node = processStructDeclaration(node); -+ } -+ return ts.visitEachChild(node, processAllNodes, context); -+ }; -+} -+ -+/** -+ * 处理struct子节点 -+ */ -+function processStructDeclaration(node) { -+ const newMembers = []; -+ node.members.forEach((member, index) => { -+ if (index >= 1) { -+ newMembers.push(member); -+ } -+ }); -+ node = ts.factory.updateStructDeclaration( -+ node, -+ node.modifiers, -+ node.name, -+ node.typeParameters, -+ node.heritageClauses, -+ newMembers -+ ); -+ return node; -+} -+ -+ -+/** -+ * 遍历处理tsnode节点去重 -+ * @param {context} 解下过后的内容 -+ * @param {node} 解下过后的节点 -+ * @returns ts.node -+ */ -+function processVisitEachChild2(context, node) { -+ const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed }); -+ return ts.visitEachChild(node, processAllNodes, context); -+ function processAllNodes(node) { -+ if (ts.isUnionTypeNode(node)) { -+ node = apiDuplicateRemoval(node); -+ } -+ if (ts.isStructDeclaration(node)) { -+ node = processStructDeclaration(node); -+ } -+ return ts.visitEachChild(node, processAllNodes, context); -+ }; -+ -+ function apiDuplicateRemoval(node) { -+ const types = node.types; -+ const newTypes = []; -+ const newTypesText = new Set([]); -+ types.forEach(type => { -+ const text = printer.printNode(ts.EmitHint.Unspecified, type); -+ if (!newTypesText.has(text)) { -+ newTypes.push(type); -+ newTypesText.add(text); -+ } -+ }); -+ node = ts.factory.updateUnionTypeNode(node, newTypes); -+ return node; -+ } -+} -+ -+/** -+ * 将输入路径替换为输出路径 -+ * @param {string} inputFilePath 输入文件的绝对路径 -+ * @param {string} inputDir 输入目录的绝对路径 -+ * @param {string} outputDir 输出目录的绝对路径 -+ * @returns {string} 输出文件的绝对路径 -+ */ -+function replaceInputDirWithOutputDir(inputFilePath, inputDir, outputDir) { -+ return inputFilePath.replace(inputDir, outputDir); -+} -+ -+/** -+ * 确保目录结构存在,如果不存在则创建 -+ * @param {string} filePath 文件路径 -+ */ -+function ensureDirectoryExists(filePath) { -+ try { -+ const dir = path.dirname(filePath); -+ if (!fs.existsSync(dir)) { -+ fs.mkdirSync(dir, { recursive: true }); -+ } -+ } catch (error) { -+ console.error(`Error creating directory: ${error.message}`); -+ } -+} -+ -+main(); -\ No newline at end of file -diff --git a/build-tools/package-lock.json b/build-tools/package-lock.json -deleted file mode 100644 -index 516ab7e28..000000000 ---- a/build-tools/package-lock.json -+++ /dev/null -@@ -1,53 +0,0 @@ --{ -- "name": "delete", -- "version": "1.0.0", -- "lockfileVersion": 1, -- "requires": true, -- "dependencies": { -- "fs": { -- "version": "0.0.1-security", -- "resolved": "https://repo.huaweicloud.com/repository/npm/fs/-/fs-0.0.1-security.tgz", -- "integrity": "sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w==" -- }, -- "inherits": { -- "version": "2.0.3", -- "resolved": "https://repo.huaweicloud.com/repository/npm/inherits/-/inherits-2.0.3.tgz", -- "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==" -- }, -- "json5": { -- "version": "2.2.3", -- "resolved": "https://repo.huaweicloud.com/repository/npm/json5/-/json5-2.2.3.tgz", -- "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" -- }, -- "path": { -- "version": "0.12.7", -- "resolved": "https://repo.huaweicloud.com/repository/npm/path/-/path-0.12.7.tgz", -- "integrity": "sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==", -- "requires": { -- "process": "^0.11.1", -- "util": "^0.10.3" -- } -- }, -- "process": { -- "version": "0.11.10", -- "resolved": "https://repo.huaweicloud.com/repository/npm/process/-/process-0.11.10.tgz", -- "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==" -- }, -- "typescript": { -- "version": "npm:ohos-typescript@4.2.3-r5", -- "resolved": "https://repo.huaweicloud.com/repository/npm/ohos-typescript/-/ohos-typescript-4.2.3-r5.tgz", -- "integrity": "sha512-9l72RIvrz8RMpU8j1uK7cIL5/gpNR11nelIFOmMDDOA3LJf70NlMgVIXOIg7MjCgjPb+U9PDwYBpalvb+rd2LA==", -- "requires": { -- "json5": "^2.2.3" -- } -- }, -- "util": { -- "version": "0.10.4", -- "resolved": "https://repo.huaweicloud.com/repository/npm/util/-/util-0.10.4.tgz", -- "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", -- "requires": { -- "inherits": "2.0.3" -- } -- } -- } --} -diff --git a/build-tools/package.json b/build-tools/package.json -index 130a68730..2cbaa3b9a 100644 ---- a/build-tools/package.json -+++ b/build-tools/package.json -@@ -5,7 +5,7 @@ - "main": "delete_systemapi_plugin.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", -- "postinstall": "cd arkui_transformer && npm install" -+ "postinstall": "cd arkui_transformer && npm install && cd ../compiler-plugins/api-check-plugin-static && npm install" - }, - "author": "", - "license": "ISC", -@@ -13,6 +13,12 @@ - "commander": "^13.1.0", - "fs": "^0.0.1-security", - "path": "^0.12.7", -- "typescript": "npm:ohos-typescript@4.9.5-r5" -+ "typescript": "npm:ohos-typescript@4.9.5-r5", -+ "@babel/cli": "7.20.7", -+ "@babel/core": "7.20.12", -+ "@babel/plugin-proposal-class-properties": "7.18.6", -+ "@babel/preset-env": "7.20.2", -+ "@babel/preset-typescript": "7.18.6", -+ "@babel/runtime": "7.20.13" - } - } -diff --git a/build-tools/package_tools/.gitignore b/build-tools/package_tools/.gitignore -new file mode 100644 -index 000000000..938479ff0 ---- /dev/null -+++ b/build-tools/package_tools/.gitignore -@@ -0,0 +1,3 @@ -+package-lock.json -+node_modules/ -+package/ -\ No newline at end of file -diff --git a/build-tools/package_tools/main.ts b/build-tools/package_tools/main.ts -new file mode 100644 -index 000000000..07b263e20 ---- /dev/null -+++ b/build-tools/package_tools/main.ts -@@ -0,0 +1,28 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+// import { Command } from "commander"; -+// import { PackagingType } from "./model/Enums"; -+// import { makePackagingOption } from "./utils/utils"; -+import { packagingEntry } from "./src/PackagingEntry"; -+ -+function main(type: string, inputDir: string, outputDir?: string): void { -+ // const program: Command = makePackagingOption('package_tools', '1.0.0', packagingEntry); -+ // program.parse(process.argv); -+ packagingEntry(type, inputDir, outputDir); -+} -+ -+// node package_tools.js type inputDir outputDir -+main(process.argv[2], process.argv[3], process.argv[4]); -\ No newline at end of file -diff --git a/build-tools/package_tools/model/Constants.ts b/build-tools/package_tools/model/Constants.ts -new file mode 100644 -index 000000000..5e61c2d4a ---- /dev/null -+++ b/build-tools/package_tools/model/Constants.ts -@@ -0,0 +1,62 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+import ts from "typescript"; -+import { OperateType } from "./Enums"; -+ -+export const OPERATE_MESSAGE_MAP: Map = new Map([ -+ [OperateType.DELETE_FILE, 'delete file message, reson $2'] -+ // TODO -+]) -+ -+export class fileDir { -+ // 处理的目录类型,ets代表处理的是1.1目录,ets2代表处理的是1.2目录里有@arkts 1.1&1.2标签的文件, -+ // noTagInEts2代表处理的是1.2目录里无标签的文件 -+ // static readonly DirType = { -+ // 'typeOne': 'ets', -+ // 'typeTwo': 'ets2', -+ // 'typeThree': 'noTagInEts2', -+ // }; -+ -+ // 1.2SDK兼容行打包方案过滤文件 -+ static readonly API_NO_TAGS_FILTER_LIST = [ -+ '@arkts.collections.d.ets', -+ '@arkts.lang.d.ets', -+ '@arkts.utils.d.ets' -+ ]; -+ -+ // 无需处理的文件路径 -+ static readonly NOT_COPY_DIR = ['build-tools', '.git', '.gitee']; -+ -+ // 所有API的节点类型 -+ static readonly apiNodeTypeArr = [ -+ ts.SyntaxKind.VariableStatement, -+ ts.SyntaxKind.MethodDeclaration, -+ ts.SyntaxKind.MethodSignature, -+ ts.SyntaxKind.FunctionDeclaration, -+ ts.SyntaxKind.Constructor, -+ ts.SyntaxKind.ConstructSignature, -+ ts.SyntaxKind.CallSignature, -+ ts.SyntaxKind.PropertyDeclaration, -+ ts.SyntaxKind.PropertySignature, -+ ts.SyntaxKind.EnumMember, -+ ts.SyntaxKind.EnumDeclaration, -+ ts.SyntaxKind.TypeAliasDeclaration, -+ ts.SyntaxKind.ClassDeclaration, -+ ts.SyntaxKind.InterfaceDeclaration, -+ ts.SyntaxKind.ModuleDeclaration, -+ ts.SyntaxKind.StructDeclaration -+ ]; -+} -\ No newline at end of file -diff --git a/build-tools/package_tools/model/Enums.ts b/build-tools/package_tools/model/Enums.ts -new file mode 100644 -index 000000000..6f78ccc91 ---- /dev/null -+++ b/build-tools/package_tools/model/Enums.ts -@@ -0,0 +1,43 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+export enum PackagingType { -+ ETS = 'ets', -+ ETS2 = 'ets2', -+ NO_TAG_IN_ETS2 = 'noTagInEts2' -+} -+ -+export enum PackagingModelType { -+ ETS = 'ets', -+ ETS2 = 'ets2', -+ BOTH = 'both' -+} -+ -+export enum LogType { -+ INFO = 'info', -+ ERROR = 'error' -+} -+ -+export enum OperateType { -+ DELETE_FILE = 'delete_file', -+ COPY_FILE = 'copy_file', -+ DELETE_IF_STATEMENT = 'delete_if_statement', -+ ADD_USE_STATIC = 'add_use_static', -+ DELETE_ARKTS_TAG = 'delete_arkts_tag', -+ UPDATE_SINCE_TAG = 'update_since_tag', -+ DELETE_HISTORY_JSDOC = 'delete_history_jsdoc', -+ DELETE_DEPRECATED_API = 'delete_deprecated_api' -+ // TODO -+} -\ No newline at end of file -diff --git a/build-tools/package_tools/model/FileModify.ts b/build-tools/package_tools/model/FileModify.ts -new file mode 100644 -index 000000000..d8f7cc610 ---- /dev/null -+++ b/build-tools/package_tools/model/FileModify.ts -@@ -0,0 +1,321 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+import fs from 'fs'; -+import path from 'path'; -+import ts from 'typescript'; -+import { PackagingType } from '../model/Enums'; -+import { packagingEntry } from '../src/PackagingEntry'; -+ -+export class getFile { -+ /** -+ * 判断文件是否为空 -+ * @param {*} node -+ */ -+ public static isEmptyFile(node: ts.Node) { -+ let isEmpty = true; -+ if (ts.isSourceFile(node) && node.statements) { -+ const needExportName = new Set(); -+ for (let i = 0; i < node.statements.length; i++) { -+ const statement = node.statements[i]; -+ if (ts.isExportDeclaration(statement) && statement.moduleSpecifier) { -+ isEmpty = false; -+ break; -+ } -+ if (this.judgeExportHasImport(statement, needExportName)) { -+ continue; -+ } -+ isEmpty = false; -+ break; -+ } -+ } -+ return isEmpty; -+ } -+ -+ /** -+ * 判断import节点和export节点。 -+ * 当前文本如果还有其他节点则不能删除, -+ * 如果只有import和export则判断是否export导出import节点 -+ * -+ * @param {*} statement -+ * @param {*} needExportName -+ * @returns -+ */ -+ public static judgeExportHasImport(statement: ts.Statement, needExportName: Set) { -+ if (ts.isImportDeclaration(statement)) { -+ this.processImportDeclaration(statement, needExportName); -+ return true; -+ } else if (ts.isExportAssignment(statement) && -+ !needExportName.has(statement.expression.getText().toString())) { -+ return true; -+ } else if (ts.isExportDeclaration(statement)) { -+ return !statement.exportClause?.elements.some((element) => { -+ const exportName = element.propertyName ? -+ element.propertyName.escapedText.toString() : -+ element.name.escapedText.toString(); -+ return needExportName.has(exportName); -+ }); -+ } -+ return false; -+ } -+ -+ /** -+ * -+ * @param { string } apiPath 需要处理的api文件所在路径 -+ * @param { string } rootPath ets文件夹路径 -+ * @returns { Set } 需要处理的api文件的相对于ets目录的路径 -+ */ -+ public static getApiFileName(apiPath: string, rootPath: string, allApiFilePathSet: Set) { -+ const apiFilePathSet = new Set(); -+ const fileNames = fs.readdirSync(apiPath); -+ -+ fileNames.forEach(fileName => { -+ const apiFilePath = path.join(apiPath, fileName).replace(/\\/g, '/'); -+ const stat = fs.statSync(apiFilePath); -+ -+ if (stat.isDirectory()) { -+ this.getApiFileName(apiFilePath, rootPath, allApiFilePathSet); -+ } else { -+ const apiRelativePath = apiFilePath.replace(rootPath, ''); -+ allApiFilePathSet.add(apiRelativePath); -+ } -+ }); -+ -+ return apiFilePathSet; -+ } -+ -+ public static processImportDeclaration(statement: ts.Statement, needExportName: Set) { -+ const importClause = statement.importClause; -+ if (!ts.isImportClause(importClause)) { -+ return; -+ } -+ if (importClause.name) { -+ needExportName.add(importClause.name.escapedText.toString()); -+ } -+ const namedBindings = importClause.namedBindings; -+ if (namedBindings !== undefined && ts.isNamedImports(namedBindings)) { -+ const elements = namedBindings.elements; -+ elements.forEach((element) => { -+ const exportName = element.propertyName ? -+ element.propertyName.escapedText.toString() : -+ element.name.escapedText.toString(); -+ needExportName.add(exportName); -+ }); -+ } -+ } -+ -+ /** -+ * -+ * @param { string } path 需要处理的api文件所在路径 -+ * @returns { boolean } 文件是否是ets类型 -+ */ -+ public static isEtsFile(path: string) { -+ return path.endsWith('d.ets'); -+ } -+ -+ /** -+ * -+ * @param { string } path 需要处理的api文件所在路径 -+ * @returns { boolean } 文件是否是ts类型 -+ */ -+ public static isTsFile(path: string) { -+ return path.endsWith('d.ts'); -+ } -+ -+ /** -+ * -+ * @param { string } path 需要处理的api文件所在路径 -+ * @returns { boolean } 验证是否存在ets类型文件 -+ */ -+ public static hasEtsFile(path: string) { -+ // 为StateManagement.d.ts设定白名单,在1.2打包的时候在Linux上有大小写不同的重名,碰到直接返回true -+ // TODO:白名单提出去 -+ if (path.includes('StateManagement.d.ts')) { -+ console.log('StateManagement.d.ts is in white list, return true. path = ', path); -+ return true; -+ } else { -+ return fs.existsSync(path.replace(/\.d\.[e]?ts$/g, '.d.ets')); -+ } -+ } -+ -+ /** -+ * -+ * @param { string } path 需要处理的api文件所在路径 -+ * @returns { boolean } 验证是否存在ts类型文件 -+ */ -+ public static hasTsFile(path: string) { -+ return fs.existsSync(path.replace(/\.d\.[e]?ts$/g, '.d.ts')); -+ } -+ -+ /** -+ * 判断新生成的文件内容有没有版权头 -+ * -+ * @param {*} fileText 新生成的文件内容 -+ * @returns -+ */ -+ public static hasCopyright(fileText: string) { -+ return /http(\:|\?:)\/\/www(\.|\/)apache\.org\/licenses\/LICENSE\-2\.0 | Copyright\s*\(c\)/gi.test(fileText); -+ } -+ -+ /** -+ * 判断node节点中是否有famodelonly/deprecated/arkts <=1.1标签 -+ * -+ * @param {*} node -+ * @returns -+ */ -+ public static judgeIsDeleteApi(node: ts.Node, dirType: string) { -+ const notesContent = node.getFullText().replace(node.getText(), '').replace(/[\s]/g, ''); -+ const notesArr = notesContent.split(/\/\*\*/); -+ const notesStr = notesArr[notesArr.length - 1]; -+ const sinceArr = notesStr.match(/@since\d+/); -+ let sinceVersion = 20; -+ -+ if (dirType === PackagingType.ETS) { -+ return /@arkts1.2/g.test(notesStr); -+ } -+ -+ if (sinceArr) { -+ sinceVersion = Number(sinceArr[0].replace('@since', '')); -+ } -+ -+ if (dirType === PackagingType.ETS2) { -+ return (/@deprecated/g.test(notesStr) && sinceVersion < 20) || /@arkts<=1.1/g.test(notesStr); -+ } -+ -+ if (dirType === PackagingType.NO_TAG_IN_ETS2) { -+ return !/@arkts1.2|@arkts1.1&1.2/g.test(notesStr); -+ } -+ -+ return false; -+ } -+ -+ -+ /** -+ * @param firstNode 获取的第一个node节点 -+ * @returns fileJSDoc -+ */ -+ public static getFileJsdoc(firstNode: ts.Node) { -+ const firstNodeJSDoc = firstNode.getFullText().replace(firstNode.getText(), ''); -+ const jsdocs = firstNodeJSDoc.split('*/'); -+ let fileJSDoc = ''; -+ for (let i = 0; i < jsdocs.length; i++) { -+ const jsdoc = jsdocs[i]; -+ if (/\@file/.test(jsdoc)) { -+ fileJSDoc = jsdoc; -+ break; -+ } -+ } -+ return fileJSDoc; -+ } -+} -+ -+export class writeFile { -+ /** -+ * -+ * @param { string } path 输出文件的路径 -+ * @param { string } path 需要文件内容 -+ */ -+ public static rewriteFileType(outputPath: string, fileContent: string) { -+ const outputDir = path.dirname(outputPath); -+ let newPath = outputPath; -+ let dirType = ''; -+ if (!fs.existsSync(outputDir)) { -+ fs.mkdirSync(outputDir, { recursive: true }); -+ } -+ -+ if (dirType !== PackagingType.ETS && getFile.isTsFile(outputPath)) { -+ newPath = outputPath.replace('.d.ts', '.d.ets'); -+ } -+ fs.writeFileSync(newPath, fileContent); -+ } -+ -+ /** -+ * 添加use static字符串 -+ * -+ * @param {*} fileContent 文件内容 -+ * @param {*} copyrightMessage 版权头内容 -+ * @returns -+ */ -+ public static addStaticString(fileContent: string, copyrightMessage: string) { -+ const hasStaticMessage = /use\s+static/g.test(fileContent); -+ const regex = /\/\*\r?\n\s*\*\s*Copyright[\s\S]*?limitations under the License\.\r?\n\s*\*\//g; -+ const staticMessage = 'use static'; -+ let newContent = fileContent; -+ if (!hasStaticMessage) { -+ const newfileJsdoc = `${copyrightMessage}'${staticMessage}'\r\n`; -+ newContent = newContent.replace(regex, newfileJsdoc); -+ } -+ return newContent; -+ } -+ -+ /** -+ * 拼接上被删除的文件注释 -+ * -+ * @param {*} deletionContent -+ * @param {*} sourceFile -+ * @param {*} dirType -+ * @returns -+ */ -+ public static joinFileJsdoc(deletionContent: string, sourceFile: ts.Node, dirType: string) { -+ const fileJsdoc = sourceFile.getFullText().replace(sourceFile.getText(), ''); -+ const copyrightMessage = getFile.hasCopyright(fileJsdoc.split('*/')[0]) ? fileJsdoc.split('*/')[0] + '*/\r\n' : ''; -+ const regx = /@kit | @file/g; -+ let kitMessage = ''; -+ -+ if (regx.test(fileJsdoc)) { -+ kitMessage = fileJsdoc.split('*/')[1] + '*/\r\n'; -+ } -+ let newContent = deletionContent; -+ const isHasCopyright = getFile.hasCopyright(deletionContent); -+ -+ if (!isHasCopyright && !regx.test(deletionContent)) { -+ newContent = copyrightMessage + kitMessage + deletionContent; -+ } else if (!isHasCopyright) { -+ newContent = copyrightMessage + deletionContent; -+ } else if (isHasCopyright && !/@kit | @file/g.test(deletionContent)) { -+ const joinFileJsdoc = copyrightMessage + kitMessage; -+ newContent = deletionContent.replace(copyrightMessage, joinFileJsdoc); -+ } -+ -+ if (dirType !== PackagingType.ETS) { -+ // TODO:添加use static字符串 -+ } -+ return newContent; -+ } -+} -+ -+export class deleteFile { -+ /** -+ * 删除指定的arkts标签 -+ * -+ * @param {*} fileContent 文件内容 -+ * @param {*} regx 删除的正则表达式 -+ * @returns -+ */ -+ public static deleteArktsTag(fileContent: string) { -+ const arktsTagRegx = /\*\s*@arkts\s+1.1&1.2\s*(\r|\n)\s*|\*\s*@arkts\s*1.2s*(\r|\n)\s*/g; -+ fileContent = fileContent.replace(arktsTagRegx, (substring, p1) => { -+ return ''; -+ }); -+ return fileContent; -+ } -+ -+ public static deleteSameNameFile(fullPath: string) { -+ try { -+ fs.unlinkSync(fullPath); -+ } catch (error) { -+ console.error('delete file failed: ', error); -+ } -+ } -+} -\ No newline at end of file -diff --git a/build-tools/package_tools/model/LogModel.ts b/build-tools/package_tools/model/LogModel.ts -new file mode 100644 -index 000000000..598a7cccf ---- /dev/null -+++ b/build-tools/package_tools/model/LogModel.ts -@@ -0,0 +1,126 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+import path from 'path'; -+import fs from 'fs'; -+import { LogType, OperateType, PackagingType } from './Enums'; -+ -+export interface Position { -+ line: number; -+ column: number; -+} -+ -+interface LogBaseInterface { -+ print(): void; -+} -+ -+export class LogModel implements LogBaseInterface { -+ // 文件全路径 -+ private filePath: string; -+ // 文件名 -+ private fileName: string; -+ // 打包类型 -+ private packagingType: PackagingType; -+ // 位置信息 -+ private position: Position; -+ // 打包日志 -+ private packagingLog: PackagingBaseLog; -+ -+ constructor(filePath: string, fileName: string, packagingType: PackagingType, position: Position, packagingLog: PackagingBaseLog) { -+ this.filePath = filePath; -+ this.fileName = fileName; -+ this.packagingType = packagingType; -+ this.position = position; -+ this.packagingLog = packagingLog; -+ } -+ -+ print(): void { -+ -+ } -+} -+ -+export interface LogParameters { -+ filePath: string; -+ packagingType: PackagingType; -+ position: Position; -+ apiPath: string; -+ logType: LogType; -+ operateType?: OperateType; -+ errcode?: number; -+ errorMessage?: string; -+} -+ -+abstract class PackagingBaseLog { -+ // API路径 -+ private apiPath: string; -+ // 日志类型 -+ private logType: LogType; -+ // 日志信息 -+ private message?: string; -+ // 日志实例 -+ private logModel?: LogModel; -+ -+ constructor(apiPath: string, logType: LogType) { -+ this.apiPath = apiPath; -+ this.logType = logType; -+ } -+ -+ abstract getMessage(msg: string): string; -+ -+ static emitLog(logParam: LogParameters): void { -+ // TODO 日志唯一入口,构建LogModel实例化对象,并push到全局对象中(process.env/globalObject -+ const fileName: string = path.basename(logParam.filePath) -+ const logModelObject: LogModel = new LogModel(logParam.filePath, fileName, logParam.packagingType, logParam.position, this) -+ } -+ -+ updateMessage(msg: string): void { -+ // TODO -+ } -+ -+ abstract getPackagingLogInstance(logParam: LogParameters): PackagingBaseLog; -+} -+ -+export class PackagingError extends PackagingBaseLog { -+ private errcode: number; -+ private errorMessage: string; -+ -+ constructor(errcode: number, errorMessage: string, apiPath: string, logType: LogType) { -+ super(apiPath, logType); -+ this.errcode = errcode; -+ this.errorMessage = this.getMessage(errorMessage); -+ super.updateMessage(this.errorMessage); -+ } -+ getMessage(message: string): string { -+ // TODO 实现组装operateMessage的方法 -+ return '' -+ } -+} -+ -+export class PackagingLog extends PackagingBaseLog { -+ // 操作类型 -+ private type: OperateType; -+ private operateMessage: string; -+ -+ constructor(type: OperateType, operateMessage: string, apiPath: string, logType: LogType) { -+ super(apiPath, logType); -+ this.type = type; -+ this.operateMessage = this.getMessage(operateMessage); -+ super.updateMessage(this.operateMessage); -+ } -+ getMessage(message: string): string { -+ // TODO 实现组装operateMessage的方法 -+ return '' -+ } -+} -\ No newline at end of file -diff --git a/build-tools/package_tools/model/PackagingModel.ts b/build-tools/package_tools/model/PackagingModel.ts -new file mode 100644 -index 000000000..4c55aaa5f ---- /dev/null -+++ b/build-tools/package_tools/model/PackagingModel.ts -@@ -0,0 +1,55 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+import { PackagingModelType } from "./Enums"; -+ -+export class PackagingModel { -+ private apiName: string; -+ private type: PackagingModelType; -+ private etsPath: string; -+ private ets2Path: string; -+ -+ constructor(apiName: string, type: PackagingModelType, etsPath: string = '', ets2Path: string = '') { -+ this.apiName = apiName; -+ this.type = type; -+ this.etsPath = etsPath; -+ this.ets2Path = ets2Path; -+ } -+ -+ setApiName(apiName: string): void { -+ this.apiName = apiName; -+ } -+ getApiName(): string { -+ return this.apiName; -+ } -+ setType(type: PackagingModelType): void { -+ this.type = type; -+ } -+ getType(): PackagingModelType { -+ return this.type; -+ } -+ setEtsPath(etsPath: string): void { -+ this.etsPath = etsPath; -+ } -+ getEtsPath(): string { -+ return this.etsPath; -+ } -+ setEts2Path(ets2Path: string): void { -+ this.ets2Path = ets2Path; -+ } -+ getEts2Path(): string { -+ return this.ets2Path; -+ } -+} -\ No newline at end of file -diff --git a/build-tools/package_tools/package.json b/build-tools/package_tools/package.json -new file mode 100644 -index 000000000..403172045 ---- /dev/null -+++ b/build-tools/package_tools/package.json -@@ -0,0 +1,23 @@ -+{ -+ "name": "package_tools", -+ "version": "1.0.0", -+ "description": "packagind tools for SDK1.2", -+ "main": "main.ts", -+ "scripts": { -+ "test": "echo \"Error: no test specified\" && exit 1", -+ "pack": "webpack --mode=production" -+ }, -+ "author": "", -+ "license": "ISC", -+ "dependencies": { -+ "@types/node": "^22.13.14", -+ "commander": "^13.1.0", -+ "fs": "^0.0.1-security", -+ "path": "^0.12.7", -+ "terser-webpack-plugin": "^5.3.14", -+ "ts-loader": "^9.5.2", -+ "typescript": "npm:ohos-typescript@4.9.5-r5", -+ "webpack": "^5.98.0", -+ "webpack-cli": "^6.0.1" -+ } -+} -\ No newline at end of file -diff --git a/build-tools/package_tools/src/PackagingEntry.ts b/build-tools/package_tools/src/PackagingEntry.ts -new file mode 100644 -index 000000000..9dfe844c1 ---- /dev/null -+++ b/build-tools/package_tools/src/PackagingEntry.ts -@@ -0,0 +1,80 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+import fs from 'fs'; -+import path from 'path'; -+import { PackagingType } from "../model/Enums"; -+import { PackagingModel } from "../model/PackagingModel"; -+import { getApiFileName } from "../utils/utils"; -+ -+export function packagingEntry(type: string, inputDir: string, outputDir?: string): void { -+ // 获取全量API路径 -+ const allApiFileSet: Set = collectApiFiles(inputDir); -+ -+ // 获取数据类集合 -+ const packagingData: PackagingModel[] = collectPackagingModels(allApiFileSet, type); -+ -+ // 处理API文件 -+ outputDir = outputDir ?? inputDir; -+ handleApiFileByType(packagingData, type, outputDir); -+} -+ -+ -+/** -+ * 获取全路径集合 -+ * -+ * @param {string} rootPath -+ */ -+function collectApiFiles(rootPath: string): Set { -+ const allApiFilePathSet: Set = new Set(); -+ const fileNames: string[] = fs.readdirSync(rootPath); -+ const apiRootPath = rootPath.replace(/\\/g, '/'); -+ fileNames.forEach(fileName => { -+ const apiPath: string = path.join(apiRootPath, fileName); -+ const stat: fs.Stats = fs.statSync(apiPath); -+ if (stat.isDirectory()) { -+ getApiFileName(apiPath, apiRootPath, allApiFilePathSet); -+ } else { -+ allApiFilePathSet.add(fileName); -+ } -+ }); -+ // 此处应收集文件全路径集合,不应分rootdir与realpath -+ return allApiFilePathSet; -+} -+ -+/** -+ * 获取数据类 -+ * -+ * @param {Set} allApiFiles -+ * @param {PackagingType} type -+ */ -+function collectPackagingModels(allApiFiles: Set, type: string): PackagingModel[] { -+ const packagingData: PackagingModel[] = []; -+ for (const apiFiles of allApiFiles) { -+ // TODO new PackagingModel() -+ } -+ return packagingData; -+} -+ -+/** -+ * 根据传入的type值去处理文件 -+ * -+ * @param {PackagingModel[]} packagingData -+ * @param {PackagingType} type -+ * @param {string} outputDir -+ */ -+function handleApiFileByType(packagingData: PackagingModel[], type: string, outputDir: string): void { -+ // TODO 当outputDir未传入时,默认修改入口路径 -+} -\ No newline at end of file -diff --git a/build-tools/package_tools/src/handleApiMainPage.ts b/build-tools/package_tools/src/handleApiMainPage.ts -new file mode 100644 -index 000000000..e82c768b8 ---- /dev/null -+++ b/build-tools/package_tools/src/handleApiMainPage.ts -@@ -0,0 +1,499 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+import { fileDir } from '../model/Constants'; -+import { PackagingType } from '../model/Enums'; -+import { deleteFile, getFile, writeFile } from '../model/FileModify'; -+ -+import fs from 'fs'; -+import path from 'path'; -+import commander from 'commander'; -+import ts from 'typescript'; -+ -+// 处理的目录类型 -+const deleteApiSet: Set = new Set(); -+let dirType: string = ''; -+ -+/** -+ * 配置参数 -+ */ -+export function start() { -+ const program = new commander.Command(); -+ program -+ .name('handleApiFile') -+ .version('0.0.1'); -+ program -+ .option('--path ', 'path name') -+ .option('--type ', 'handle type') -+ .option('--output [string]', 'output path') -+ .action((opts) => { -+ dirType = opts.type; -+ handleApiFiles(opts.path, opts.type, opts.output); -+ }); -+ program.parse(process.argv); -+} -+ -+/** -+ * 处理API文件的入口函数 -+ * -+ * @param {*} rootPath -+ * @param {*} type -+ */ -+function handleApiFiles(rootPath: string, type: string, output: string) { -+ const allApiFilePathSet: Set = new Set(); -+ const fileNames = fs.readdirSync(rootPath); -+ const apiRootPath = rootPath.replace(/\\/g, '/'); -+ fileNames.forEach(fileName => { -+ const apiPath = path.join(apiRootPath, fileName); -+ const stat = fs.statSync(apiPath); -+ if (fileDir.NOT_COPY_DIR.includes(fileName)) { -+ return; -+ } -+ -+ if (stat.isDirectory()) { -+ getFile.getApiFileName(apiPath, apiRootPath, allApiFilePathSet); -+ } else { -+ allApiFilePathSet.add(fileName); -+ } -+ -+ }); -+ -+ for (const apiRelativePath of allApiFilePathSet) { -+ try { -+ handleApiFileByType(apiRelativePath as string, rootPath, type, output); -+ } catch (error) { -+ console.log('error===>', error); -+ } -+ } -+} -+ -+/** -+ * 根据传入的type值去处理文件 -+ * -+ * @param {*} apiRelativePath -+ * @param {*} allApiFilePathSet -+ * @param {*} rootPath -+ * @param {*} type -+ * @returns -+ */ -+function handleApiFileByType(apiRelativePath: string, rootPath: string, type: string, output: string) { -+ const fullPath = path.join(rootPath, apiRelativePath); -+ const isEndWithEts = getFile.isEtsFile(apiRelativePath); -+ const isEndWithTs = getFile.isTsFile(apiRelativePath); -+ const outputPath = output ? path.join(output, apiRelativePath) : fullPath; -+ const fileContent = fs.readFileSync(fullPath, 'utf-8'); -+ -+ if (!isEndWithEts && !isEndWithTs) { -+ writeFile.rewriteFileType(outputPath, fileContent); -+ return; -+ } -+ if (type === 'ets2' && !(getFile.hasEtsFile(fullPath) && isEndWithTs)) { -+ handleFileInSecondType(apiRelativePath, fullPath, type, output); -+ } else if (type === 'ets' && !(getFile.hasTsFile(fullPath) && isEndWithEts)) { -+ handleFileInFirstType(apiRelativePath, fullPath, type, output); -+ } -+} -+ -+/** -+ * 处理文件过滤 if arkts 1.1|1.2|1.1&1.2 定义 -+ * -+ * @param {*} type -+ * @param {*} fileContent -+ * @returns -+ */ -+function handleArktsDefinition(type: string, fileContent: string) { -+ let regx = /\/\*\*\* if arkts 1\.1 \*\/\s*([\s\S]*?)\s*\/\*\*\* endif \*\//g; -+ let regx2 = /\/\*\*\* if arkts 1\.2 \*\/\s*([\s\S]*?)\s*\/\*\*\* endif \*\//g; -+ let regx3 = /\/\*\*\* if arkts 1\.1\&1\.2 \*\/\s*([\s\S]*?)\s*\/\*\*\* endif \*\//g; -+ fileContent = fileContent.replace(regx, (substring, p1) => { -+ return type === 'ets' ? p1 : ''; -+ }); -+ fileContent = fileContent.replace(regx2, (substring, p1) => { -+ if (type === 'ets2') { -+ return p1.replace(/(\s*)(\*\s\@since)/g, '$1* @arkts 1.2$1$2'); -+ } else { -+ return ''; -+ } -+ }); -+ fileContent = fileContent.replace(regx3, (substring, p1) => { -+ if (type === 'ets') { -+ return p1; -+ } else { -+ return p1.replace(/(\s*)(\*\s\@since)/g, '$1* @arkts 1.2$1$2'); -+ } -+ }); -+ return fileContent; -+} -+ -+/** -+ * 保留每个api最新一段jsdoc -+ * -+ * @param {*} fileContent -+ * @returns -+ */ -+function saveLatestJsDoc(fileContent: string) { -+ let regx = /(\/\*[\s\S]*?\*\*\/)/g; -+ -+ fileContent = fileContent.split('').reverse().join(''); -+ let preset = 0; -+ fileContent = fileContent.replace(regx, (substring, p1, offset, str) => { -+ if (!/ecnis@\s*\*/g.test(substring)) { -+ return substring; -+ } -+ const preStr = str.substring(preset, offset); -+ preset = offset + substring.length; -+ if (/\S/g.test(preStr)) { -+ return substring; -+ } -+ return ''; -+ }); -+ fileContent = fileContent.split('').reverse().join(''); -+ return fileContent; -+} -+ -+/** -+ * 处理ets目录 -+ * -+ * @param {string} apiRelativePath -+ * @param {string} fullPath -+ * @returns -+ */ -+function handleFileInFirstType(apiRelativePath: string, fullPath: string, type: string, output: string) { -+ const outputPath = output ? path.join(output, apiRelativePath) : fullPath; -+ let fileContent = fs.readFileSync(fullPath, 'utf-8'); -+ //删除使用/*** if arkts 1.2 */ -+ fileContent = handleArktsDefinition(type, fileContent); -+ -+ const sourceFile = ts.createSourceFile(path.basename(apiRelativePath), fileContent, ts.ScriptTarget.ES2017, true); -+ const secondRegx = /(?:@arkts1.2only|@arkts\s+>=\s*1.2|@arkts\s*1.2)/; -+ const thirdRegx = /(?:\*\s*@arkts\s+1.1&1.2\s*(\r|\n)\s*)/; -+ if (sourceFile.statements.length === 0) { -+ // reference文件识别不到首段jsdoc,全文匹配1.2标签,有的话直接删除 -+ if (secondRegx.test(sourceFile.getFullText())) { -+ return; -+ } -+ // 标有@arkts 1.1&1.2的声明文件,处理since版本号,删除@arkts 1.1&1.2标签 -+ if (thirdRegx.test(sourceFile.getFullText())) { -+ fileContent = handleSinceInFirstType(deleteFile.deleteArktsTag(fileContent)); -+ writeFile.rewriteFileType(outputPath, fileContent); -+ return; -+ } -+ -+ handleNoTagFileInFirstType(sourceFile, outputPath, fileContent); -+ return; -+ } -+ const firstNode = sourceFile.statements.find(statement => { -+ return !ts.isExpressionStatement(statement); -+ }); -+ -+ -+ if (firstNode) { -+ const firstJsdocText = getFile.getFileJsdoc(firstNode); -+ // 标有1.2标签的声明文件,不拷贝 -+ if (secondRegx.test(firstJsdocText)) { -+ return; -+ } -+ // 标有@arkts 1.1&1.2的声明文件,处理since版本号,删除@arkts 1.1&1.2标签 -+ if (thirdRegx.test(firstJsdocText)) { -+ fileContent = handleSinceInFirstType(deleteFile.deleteArktsTag(fileContent)); -+ writeFile.rewriteFileType(outputPath, fileContent); -+ return; -+ } -+ } -+ -+ handleNoTagFileInFirstType(sourceFile, outputPath, fileContent); -+} -+ -+/** -+ * 处理1.1目录中无arkts标签的文件 -+ * @param {*} sourceFile -+ * @param {*} outputPath -+ * @returns -+ */ -+function handleNoTagFileInFirstType(sourceFile: ts.SourceFile, outputPath: string, fileContent: string) { -+ if (path.basename(outputPath) === 'index-full.d.ts') { -+ writeFile.rewriteFileType(outputPath, fileContent); -+ return; -+ } -+ fileContent = deleteApi(sourceFile); -+ -+ if (fileContent === '') { -+ return; -+ } -+ fileContent = deleteFile.deleteArktsTag(fileContent); -+ fileContent = writeFile.joinFileJsdoc(fileContent, sourceFile, dirType); -+ -+ fileContent = handleSinceInFirstType(fileContent); -+ writeFile.rewriteFileType(outputPath, fileContent); -+} -+ -+ -+/** -+ * 生成1.1目录里文件时,需要去掉since标签里的1.2版本号 -+ * -+ * @param {*} sourceFile -+ * @param {*} fullPath -+ */ -+function handleSinceInFirstType(fileContent: string) { -+ const regx = /@since\s+arkts\s*(\{.*\})/g; -+ fileContent = fileContent.replace(regx, (substring, p1) => { -+ return '@since ' + JSON.parse(p1.replace(/'/g, '"'))['1.1']; -+ }); -+ return fileContent; -+} -+ -+/** -+ * 处理ets2目录 -+ * -+ * @param {string} fullPath 文件完整路径 -+ * @returns -+ */ -+function handleFileInSecondType(apiRelativePath: string, fullPath: string, type: string, output: string) { -+ const secondRegx = /(?:@arkts1.2only|@arkts\s+>=\s*1.2|@arkts\s*1.2)/; -+ const thirdRegx = /(?:\*\s*@arkts\s+1.1&1.2\s*(\r|\n)\s*)/; -+ const arktsRegx = /\/\*\*\* if arkts (1.1&)?1.2 \*\/\s*([\s\S]*?)\s*\/\*\*\* endif \*\//g; -+ let fileContent = fs.readFileSync(fullPath, 'utf-8'); -+ let sourceFile = ts.createSourceFile(path.basename(fullPath), fileContent, ts.ScriptTarget.ES2017, true); -+ const outputPath = output ? path.join(output, apiRelativePath) : fullPath; -+ if (!secondRegx.test(fileContent) && !thirdRegx.test(fileContent) && arktsRegx.test(fileContent)) { -+ saveApiByArktsDefinition(sourceFile, fileContent, outputPath); -+ return; -+ } -+ //删除使用/*** if arkts 1.2 */ -+ fileContent = handleArktsDefinition(type, fileContent); -+ sourceFile = ts.createSourceFile(path.basename(fullPath), fileContent, ts.ScriptTarget.ES2017, true); -+ const regx = /(?:@arkts1.1only|@arkts\s+<=\s+1.1)/; -+ if (sourceFile.statements.length === 0) { -+ // 有1.2标签的文件,删除标记 -+ if (secondRegx.test(sourceFile.getFullText())) { -+ writeFile.rewriteFileType(outputPath, deleteFile.deleteArktsTag(fileContent)); -+ return; -+ } -+ // 处理标有@arkts 1.1&1.2的声明文件 -+ if (thirdRegx.test(sourceFile.getFullText())) { -+ handlehasTagFile(sourceFile, outputPath); -+ return; -+ } -+ // 处理既没有@arkts 1.2,也没有@arkts 1.1&1.2的声明文件 -+ handleNoTagFileInSecondType(sourceFile, outputPath); -+ return; -+ } -+ -+ const firstNode = sourceFile.statements.find(statement => { -+ return !ts.isExpressionStatement(statement); -+ }); -+ -+ if (firstNode) { -+ const firstJsdocText = getFile.getFileJsdoc(firstNode); -+ if (regx.test(firstJsdocText)) { -+ return; -+ } -+ // 有1.2标签的文件,删除标记 -+ if (secondRegx.test(firstJsdocText)) { -+ writeFile.rewriteFileType(outputPath, deleteFile.deleteArktsTag(fileContent)); -+ return; -+ } -+ // 处理标有@arkts 1.1&1.2的声明文件 -+ if (thirdRegx.test(firstJsdocText)) { -+ handlehasTagFile(sourceFile, outputPath); -+ return; -+ } -+ } -+ -+ // 处理既没有@arkts 1.2,也没有@arkts 1.1&1.2的声明文件 -+ handleNoTagFileInSecondType(sourceFile, outputPath); -+} -+ -+/** -+ * 处理有@arkts 1.1&1.2标签的文件 -+ * @param {*} outputPath -+ */ -+function handlehasTagFile(sourceFile: ts.SourceFile, outputPath: string) { -+ dirType = PackagingType.ETS2; -+ let newContent = getDeletionContent(sourceFile); -+ if (newContent === '') { -+ return; -+ } -+ // 保留最后一段注释 -+ newContent = saveLatestJsDoc(newContent); -+ writeFile.rewriteFileType(outputPath, deleteFile.deleteArktsTag(newContent)); -+} -+ -+/** -+ * 处理1.2目录中无arkts标签的文件 -+ * @param {*} sourceFile -+ * @param {*} outputPath -+ * @returns -+ */ -+function handleNoTagFileInSecondType(sourceFile: ts.SourceFile, outputPath: string) { -+ dirType = PackagingType.NO_TAG_IN_ETS2; -+ const arktsTagRegx = /\*\s*@arkts\s+1.1&1.2\s*(\r|\n)\s*|@arkts\s*1.2/g; -+ const fileContent = sourceFile.getFullText(); -+ // API未标@arkts 1.2或@arkts 1.1&1.2标签,删除文件 -+ if (!arktsTagRegx.test(fileContent)) { -+ if (!fileDir.API_NO_TAGS_FILTER_LIST.includes(path.basename(outputPath))) { -+ writeFile.rewriteFileType(outputPath, writeFile.joinFileJsdoc(fileContent, sourceFile, dirType)); -+ } -+ // TODO:api未标标签,删除文件 -+ return; -+ } -+ let newContent = getDeletionContent(sourceFile); -+ if (newContent === '') { -+ return; -+ } -+ // 保留最后一段注释 -+ newContent = saveLatestJsDoc(newContent); -+ newContent = deleteFile.deleteArktsTag(newContent); -+ writeFile.rewriteFileType(outputPath, newContent); -+} -+ -+/** -+ * 生成1.2目录里文件时,需要去掉since标签里的dynamic版本号 -+ * -+ * @param {*} fileContent -+ * @returns -+ */ -+function handleSinceInSecondType(fileContent: string) { -+ const regx = /@since\s+arkts\s*(\{.*\})/g; -+ fileContent = fileContent.replace(regx, (substring, p1) => { -+ return '@since ' + JSON.parse(p1.replace(/'/g, '"'))['1.2']; -+ }); -+ return fileContent; -+} -+ -+ -+function getDeletionContent(sourceFile: ts.SourceFile) { -+ const deletionContent = deleteApi(sourceFile); -+ if (deletionContent === '') { -+ return ''; -+ } -+ let newContent = writeFile.joinFileJsdoc(deletionContent, sourceFile, dirType); -+ -+ // 处理since版本 -+ newContent = handleSinceInSecondType(newContent); -+ return newContent; -+} -+ -+function collectDeletionApiName(node: ts.Node) { -+ if (!ts.isImportClause(node)) { -+ deleteApiSet.add((node as ts.ImportClause).name?.getText()); -+ return; -+ } -+ if (ts.isImportDeclaration(node) && (node as ts.ImportDeclaration).importClause?.name) { -+ deleteApiSet.add((node as ts.ImportDeclaration).importClause?.name?.escapedText.toString()); -+ return; -+ } -+ const namedBindings = node.namedBindings; -+ if (namedBindings !== undefined && ts.isNamedImports(namedBindings)) { -+ const elements = namedBindings.elements; -+ elements.forEach((element) => { -+ const exportName = element.propertyName ? -+ element.propertyName.escapedText.toString() : -+ element.name.escapedText.toString(); -+ deleteApiSet.add(exportName); -+ }); -+ } -+} -+ -+/** -+ * 删除API -+ * @param {*} sourceFile -+ * @returns -+ */ -+function deleteApi(sourceFile: ts.SourceFile) { -+ let result = ts.transform(sourceFile, [transformer]); -+ const newSourceFile = result.transformed[0]; -+ if (getFile.isEmptyFile(newSourceFile)) { -+ return ''; -+ } -+ -+ // 打印结果 -+ const printer = ts.createPrinter(); -+ let fileContent = printer.printFile(newSourceFile as ts.SourceFile); -+ result = ts.transform(newSourceFile, [transformExportApi]); -+ fileContent = printer.printFile(result.transformed[0] as ts.SourceFile); -+ deleteApiSet.clear(); -+ return fileContent.replace(/export\s*(?:type\s*)?\{\s*\}\s*(;)?/g, ''); -+} -+ -+// 创建 Transformer -+const transformer = (context: ts.TransformationContext) => { -+ return (rootNode: ts.Node) => { -+ const visit = (node: ts.Node) => { -+ //struct节点下面会自动生成constructor节点, 置为undefined -+ if (node.kind === ts.SyntaxKind.Constructor && node.parent.kind === ts.SyntaxKind.StructDeclaration) { -+ return undefined; -+ } -+ // 判断是否为要删除的变量声明 -+ if (fileDir.apiNodeTypeArr.includes(node.kind) && getFile.judgeIsDeleteApi(node, dirType)) { -+ collectDeletionApiName(node); -+ // 删除该节点 -+ return undefined; -+ } -+ -+ // 非目标节点:继续遍历子节点 -+ return ts.visitEachChild(node, visit, context); -+ }; -+ return ts.visitNode(rootNode, visit); -+ }; -+}; -+ -+/** -+ * 没有arkts标签,但有if arkts 1.2和1.1&1.2的情况 -+ * @param {*} sourceFile -+ * @param {*} fileContent -+ * @param {*} outputPath -+ */ -+function saveApiByArktsDefinition(sourceFile: ts.SourceFile, fileContent: string, outputPath: string) { -+ const regx = /\/\*\*\* if arkts (1.1&)?1.2 \*\/\s*([\s\S]*?)\s*\/\*\*\* endif \*\//g; -+ const regex = /\/\*\r?\n\s*\*\s*Copyright[\s\S]*?limitations under the License\.\r?\n\s*\*\//g; -+ const copyrightMessage = fileContent.match(regex)?.[0]; -+ const firstNode = sourceFile.statements.find(statement => { -+ return !ts.isExpressionStatement(statement); -+ }); -+ let fileJsdoc = firstNode ? getFile.getFileJsdoc(firstNode) + '*/\n' : ''; -+ let newContent = copyrightMessage + fileJsdoc + Array.from(fileContent.matchAll(regx), match => match[2]).join('\n'); -+ -+ writeFile.rewriteFileType(outputPath, saveLatestJsDoc(newContent)); -+} -+ -+ -+/** -+ * api被删除后,对应的export api也需要被删除 -+ * @param {*} context -+ * @returns -+ */ -+const transformExportApi = (context: ts.TransformationContext) => { -+ return (rootNode: ts.Node) => { -+ const visit = (node: ts.Node) => { -+ //struct节点下面会自动生成constructor节点, 置为undefined -+ if (node.kind === ts.SyntaxKind.Constructor && node.parent.kind === ts.SyntaxKind.StructDeclaration) { -+ return undefined; -+ } -+ // 判断是否为要删除的变量声明 -+ if (ts.isExportAssignment(node) && deleteApiSet.has(node.expression.getText().toString())) { -+ return undefined; -+ } -+ -+ if (ts.isExportSpecifier(node) && deleteApiSet.has(node.name.escapedText.toString())) { -+ return undefined; -+ } -+ -+ // 非目标节点:继续遍历子节点 -+ return ts.visitEachChild(node, visit, context); -+ }; -+ return ts.visitNode(rootNode, visit); -+ }; -+}; -\ No newline at end of file -diff --git a/build-tools/package_tools/tsconfig.json b/build-tools/package_tools/tsconfig.json -new file mode 100644 -index 000000000..ef92221cf ---- /dev/null -+++ b/build-tools/package_tools/tsconfig.json -@@ -0,0 +1,96 @@ -+{ -+ "compilerOptions": { -+ /* Visit https://aka.ms/tsconfig.json to read more about this file */ -+ /* Projects */ -+ // "incremental": true, /* Enable incremental compilation */ -+ // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ -+ // "tsBuildInfoFile": "./", /* Specify the folder for .tsbuildinfo incremental compilation files. */ -+ // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects */ -+ // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ -+ // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ -+ /* Language and Environment */ -+ "target": "es2020", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ -+ "lib": [ -+ "es2015", -+ "es2020" -+ ], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ -+ // "jsx": "preserve", /* Specify what JSX code is generated. */ -+ "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */ -+ // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ -+ // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h' */ -+ // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ -+ // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx*`.` */ -+ // "reactNamespace": "", /* Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit. */ -+ // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ -+ // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ -+ /* Modules */ -+ "module": "commonjs", /* Specify what module code is generated. */ -+ // "rootDir": "./", /* Specify the root folder within your source files. */ -+ // "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */ -+ // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ -+ // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ -+ // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ -+ // "typeRoots": [], /* Specify multiple folders that act like `./node_modules/@types`. */ -+ // "types": [], /* Specify type package names to be included without being referenced in a source file. */ -+ // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ -+ "resolveJsonModule": true, /* Enable importing .json files */ -+ // "noResolve": true, /* Disallow `import`s, `require`s or ``s from expanding the number of files TypeScript should add to a project. */ -+ /* JavaScript Support */ -+ // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */ -+ // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ -+ // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`. */ -+ /* Emit */ -+ // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ -+ // "declarationMap": true, /* Create sourcemaps for d.ts files. */ -+ // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ -+ // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ -+ // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */ -+ // "outDir": "./", /* Specify an output folder for all emitted files. */ -+ // "removeComments": true, /* Disable emitting comments. */ -+ // "noEmit": true, /* Disable emitting files from a compilation. */ -+ // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ -+ // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types */ -+ // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ -+ // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ -+ // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ -+ // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ -+ // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ -+ // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ -+ // "newLine": "crlf", /* Set the newline character for emitting files. */ -+ // "stripInternal": true, /* Disable emitting declarations that have `@internal` in their JSDoc comments. */ -+ // "noEmitHelpers": true, /* Disable generating custom helper functions like `__extends` in compiled output. */ -+ // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ -+ // "preserveConstEnums": true, /* Disable erasing `const enum` declarations in generated code. */ -+ // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ -+ // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ -+ /* Interop Constraints */ -+ // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ -+ // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ -+ "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */ -+ // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ -+ "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */ -+ /* Type Checking */ -+ "strict": true, /* Enable all strict type-checking options. */ -+ // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied `any` type.. */ -+ // "strictNullChecks": true, /* When type checking, take into account `null` and `undefined`. */ -+ // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ -+ // "strictBindCallApply": true, /* Check that the arguments for `bind`, `call`, and `apply` methods match the original function. */ -+ // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ -+ // "noImplicitThis": true, /* Enable error reporting when `this` is given the type `any`. */ -+ // "useUnknownInCatchVariables": true, /* Type catch clause variables as 'unknown' instead of 'any'. */ -+ // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ -+ // "noUnusedLocals": true, /* Enable error reporting when a local variables aren't read. */ -+ // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read */ -+ // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ -+ // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ -+ // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ -+ // "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */ -+ // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ -+ // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type */ -+ // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ -+ // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ -+ /* Completeness */ -+ // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ -+ // "skipLibCheck": true /* Skip type checking all .d.ts files. */ -+ } -+} -\ No newline at end of file -diff --git a/build-tools/package_tools/utils/Log.ts b/build-tools/package_tools/utils/Log.ts -new file mode 100644 -index 000000000..bf5736961 ---- /dev/null -+++ b/build-tools/package_tools/utils/Log.ts -@@ -0,0 +1,16 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+// TODO 补充日志分析接口 -\ No newline at end of file -diff --git a/build-tools/package_tools/utils/Utils.ts b/build-tools/package_tools/utils/Utils.ts -new file mode 100644 -index 000000000..3a92a6245 ---- /dev/null -+++ b/build-tools/package_tools/utils/Utils.ts -@@ -0,0 +1,66 @@ -+/* -+ * Copyright (c) 2025 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+import { Command } from 'commander'; -+import fs from 'fs'; -+import path from 'path'; -+import { OperateType } from '../model/Enums'; -+import { OPERATE_MESSAGE_MAP } from '../model/Constants'; -+ -+export function makePackagingOption(name: string, version: string, customCallback: Function): Command { -+ const program: Command = new Command(); -+ program -+ .name(name) -+ .version(version); -+ program -+ .option('--path ', 'path name') -+ .option('--type ', 'handle type') -+ .action((opts) => { -+ customCallback(opts.path, opts.type); -+ }); -+ return program; -+} -+ -+/** -+ * -+ * @param { string } apiPath 需要处理的api文件所在路径 -+ * @param { string } rootPath ets文件夹路径 -+ * @returns { Set } 需要处理的api文件的相对于ets目录的路径 -+ */ -+export function getApiFileName(apiPath: string, rootPath: string, allApiFilePathSet: Set) { -+ const apiFilePathSet: Set = new Set(); -+ const fileNames: string[] = fs.readdirSync(apiPath); -+ -+ fileNames.forEach((fileName: string) => { -+ const apiFilePath: string = path.join(apiPath, fileName).replace(/\\/g, '/'); -+ const stat: fs.Stats = fs.statSync(apiFilePath); -+ -+ if (stat.isDirectory()) { -+ getApiFileName(apiFilePath, rootPath, allApiFilePathSet); -+ } else { -+ const apiRelativePath: string = apiFilePath.replace(rootPath, ''); -+ allApiFilePathSet.add(apiRelativePath); -+ } -+ }); -+ return apiFilePathSet; -+} -+ -+export function getOperateMessage(operateType: OperateType, ...supplys: string[]): string { -+ const operateMessage: string | undefined = OPERATE_MESSAGE_MAP.get(operateType); -+ supplys.forEach((supply: string, index: number) => { -+ // TODO 替换$2 -+ }); -+ return operateMessage ?? ''; -+} -\ No newline at end of file -diff --git a/build-tools/package_tools/webpack.config.js b/build-tools/package_tools/webpack.config.js -new file mode 100644 -index 000000000..ddc7bcf8d ---- /dev/null -+++ b/build-tools/package_tools/webpack.config.js -@@ -0,0 +1,61 @@ -+/* -+ * Copyright (c) 2023 Huawei Device Co., Ltd. -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+const path = require('path'); -+const TerserPlugin = require('terser-webpack-plugin'); -+const packageInfo = require('./package.json'); -+ -+module.exports = (env, argv) => { -+ const config = { -+ name: 'package_tools', -+ target: 'node', -+ mode: 'none', -+ entry: './main.ts', -+ module: { -+ rules: [ -+ { -+ test: /\.ts$/, -+ include: path.resolve(__dirname, './'), -+ exclude: [/node_modules/, /test/], -+ loader: 'ts-loader', -+ options: { -+ onlyCompileBundledFiles: true, -+ }, -+ }, -+ { -+ test: /build\.json$/, -+ use: [ -+ { -+ loader: path.resolve(__dirname, 'loader/flavor.js'), -+ }, -+ ], -+ }, -+ ], -+ }, -+ resolve: { -+ extensions: ['.js', '.ts', '.json'], -+ }, -+ output: { -+ filename: `${packageInfo.name}.js`, -+ path: path.resolve(__dirname, './package'), -+ }, -+ optimization: { -+ minimize: true, -+ minimizer: [new TerserPlugin({ extractComments: false })], -+ }, -+ plugins: [] -+ }; -+ return config; -+}; -diff --git a/build-tools/remove_declgen.json b/build-tools/remove_declgen.json -new file mode 100644 -index 000000000..a14b25c42 ---- /dev/null -+++ b/build-tools/remove_declgen.json -@@ -0,0 +1,6 @@ -+{ -+ "removeFile": [ -+ "api\\@internal\\component\\ets\\ability_component.d.ts", -+ "api\\@internal\\component\\ets\\action_sheet.d.ts" -+ ] -+} -\ No newline at end of file -diff --git a/build_api_check_plugin.py b/build_api_check_plugin.py -new file mode 100755 -index 000000000..4f833e598 ---- /dev/null -+++ b/build_api_check_plugin.py -@@ -0,0 +1,74 @@ -+#!/usr/bin/env python -+# -*- coding: utf-8 -*- -+# Copyright (c) 2025 Huawei Device Co., Ltd. -+# Licensed under the Apache License, Version 2.0 (the "License"); -+# you may not use this file except in compliance with the License. -+# You may obtain a copy of the License at -+# -+# http://www.apache.org/licenses/LICENSE-2.0 -+# -+# Unless required by applicable law or agreed to in writing, software -+# distributed under the License is distributed on an "AS IS" BASIS, -+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+# See the License for the specific language governing permissions and -+# limitations under the License. -+ -+import argparse -+import os -+import shutil -+import subprocess -+import sys -+import tarfile -+ -+ -+def copy_files(source_path, dest_path, is_file=False): -+ try: -+ if is_file: -+ os.makedirs(os.path.dirname(dest_path), exist_ok=True) -+ shutil.copy(source_path, dest_path) -+ else: -+ shutil.copytree(source_path, dest_path, dirs_exist_ok=True, -+ symlinks=True) -+ except Exception as err: -+ raise Exception("Copy files failed. Error: " + str(err)) from err -+ -+ -+def run_cmd(cmd, execution_path=None): -+ proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, -+ stdin=subprocess.PIPE, -+ stderr=subprocess.PIPE, -+ cwd=execution_path) -+ stdout, stderr = proc.communicate(timeout=1000) -+ if proc.returncode != 0: -+ raise Exception(stderr.decode()) -+ -+ -+def build(options): -+ build_cmd = [options.npm, 'run', 'compile:plugins'] -+ run_cmd(build_cmd, options.source_path) -+ -+ -+def copy_output(options): -+ copy_files(os.path.join(options.source_path, './lib'), -+ os.path.join(options.output_path, 'api-check-plugin')) -+ -+ -+def parse_args(): -+ parser = argparse.ArgumentParser() -+ parser.add_argument('--npm', help='path to a npm exetuable') -+ parser.add_argument('--source_path', help='path to api_check_plugin source') -+ parser.add_argument('--output_path', help='path to output') -+ -+ options = parser.parse_args() -+ return options -+ -+ -+def main(): -+ options = parse_args() -+ -+ build(options) -+ copy_output(options) -+ -+ -+if __name__ == '__main__': -+ sys.exit(main()) -\ No newline at end of file -diff --git a/bundle.json b/bundle.json -index 678960db8..31acbd8ca 100644 ---- a/bundle.json -+++ b/bundle.json -@@ -26,7 +26,7 @@ - "rom": "0KB", - "ram": "0KB", - "deps": { -- "components": [], -+ "components": ["runtime_core"], - "third_party": [] - }, - "build": { -diff --git a/kits/@kit.AbilityKit.d.ts b/kits/@kit.AbilityKit.d.ts -index 943347b17..3e5c9de4b 100644 ---- a/kits/@kit.AbilityKit.d.ts -+++ b/kits/@kit.AbilityKit.d.ts -@@ -136,17 +136,23 @@ import { - } from '@ohos.app.ability.UIAbility'; - import wantAgent from '@ohos.app.ability.wantAgent'; - import { WantAgent } from '@ohos.app.ability.wantAgent'; -+import appControl from '@ohos.bundle.appControl'; - import bundleManager from '@ohos.bundle.bundleManager'; - import bundleMonitor from '@ohos.bundle.bundleMonitor'; - import bundleResourceManager from '@ohos.bundle.bundleResourceManager'; -+import defaultAppManager from '@ohos.bundle.defaultAppManager'; -+import distributedBundleManager from '@ohos.bundle.distributedBundleManager'; -+import freeInstall from '@ohos.bundle.freeInstall'; - import installer from '@ohos.bundle.installer'; - import launcherBundleManager from '@ohos.bundle.launcherBundleManager'; -+import overlay from '@ohos.bundle.overlay'; - import shortcutManager from '@ohos.bundle.shortcutManager'; - - export { - common, ConfigurationConstant, Configuration, Want, StartOptions, contextConstant, AbilityConstant, - UIExtensionContentSession, wantConstant, UIAbility, Callee, Caller, OnReleaseCallback, AbilityStage, - UIExtensionAbility, uriPermissionManager, ServiceExtensionAbility, wantAgent, WantAgent, -- bundleManager, bundleMonitor, bundleResourceManager, installer, launcherBundleManager, shortcutManager -+ appControl, bundleManager, bundleMonitor, bundleResourceManager, defaultAppManager, distributedBundleManager, -+ freeInstall, installer, launcherBundleManager, overlay, shortcutManager - }; - /*** endif */ -diff --git a/kits/@kit.ArkTS.d.ets b/kits/@kit.ArkTS.d.ets -index b33621b96..a495996fb 100644 ---- a/kits/@kit.ArkTS.d.ets -+++ b/kits/@kit.ArkTS.d.ets -@@ -38,8 +38,11 @@ import PlainArray from '@ohos.util.PlainArray'; - import Stack from '@ohos.util.Stack'; - import TreeMap from '@ohos.util.TreeMap'; - import TreeSet from '@ohos.util.TreeSet'; -+import xml from '@ohos.xml'; -+import collections from '@arkts.collections'; -+import Decimal from '@arkts.math.Decimal'; - - export { - ArrayList, Deque, HashMap, HashSet, LightWeightMap, LightWeightSet, LinkedList, List, -- PlainArray, Queue, Stack, TreeMap, TreeSet, buffer, uri, url, util, JSON, stream -+ PlainArray, Queue, Stack, TreeMap, TreeSet, buffer, uri, url, util, JSON, stream, xml, collections, Decimal - }; -diff --git a/kits/@kit.ArkUI.d.ets b/kits/@kit.ArkUI.d.ets -index 1d7094b31..c5a5329bc 100644 ---- a/kits/@kit.ArkUI.d.ets -+++ b/kits/@kit.ArkUI.d.ets -@@ -23,4 +23,5 @@ import promptAction from '@ohos.promptAction'; - import { ComponentContent } from '@ohos.arkui.node'; - export { promptAction, ComponentContent }; - export * from '@ohos.arkui.component'; --export * from '@ohos.arkui.stateManagement'; -\ No newline at end of file -+export * from '@ohos.arkui.stateManagement'; -+export { GETINSPECTORBYKEY as getInspectorByKey, GETINSPECTORTREE as getInspectorTree , SENDEVENTBYKEY as sendEventByKey } from '@ohos.arkui.inspector'; -\ No newline at end of file -diff --git a/kits/@kit.ArkUI.d.ts b/kits/@kit.ArkUI.d.ts -index c24c9a524..4d6a2e908 100644 ---- a/kits/@kit.ArkUI.d.ts -+++ b/kits/@kit.ArkUI.d.ts -@@ -51,19 +51,22 @@ import { - import { ComposeTitleBar, ComposeTitleBarMenuItem } from '@ohos.arkui.advanced.ComposeTitleBar'; - import { CounterComponent, CounterOptions, CounterType, DateData } from '@ohos.arkui.advanced.Counter'; - import { -- AlertDialog, ButtonOptions, ConfirmDialog, LoadingDialog, SelectDialog, TipsDialog, CustomContentDialog, PopoverDialog, PopoverOptions, -+ AlertDialog, ButtonOptions, ConfirmDialog, LoadingDialog, SelectDialog, TipsDialog, CustomContentDialog, PopoverDialog, PopoverOptions - } from '@ohos.arkui.advanced.Dialog'; - import { - AlertDialogV2, AdvancedDialogV2Button, AdvancedDialogV2ButtonOptions, AdvancedDialogV2ButtonAction, AdvancedDialogV2OnCheckedChange, -- ConfirmDialogV2, LoadingDialogV2, SelectDialogV2, TipsDialogV2, CustomContentDialogV2, PopoverDialogV2, PopoverDialogV2OnVisibleChange, PopoverDialogV2Options, -+ ConfirmDialogV2, LoadingDialogV2, SelectDialogV2, TipsDialogV2, CustomContentDialogV2, PopoverDialogV2, -+ PopoverDialogV2OnVisibleChange, PopoverDialogV2Options - } from '@ohos.arkui.advanced.DialogV2'; - import { -- EditableLeftIconType, EditableTitleBar, EditableTitleBarMenuItem, EditableTitleBarItem, EditableTitleBarOptions, -+ EditableLeftIconType, EditableTitleBar, EditableTitleBarMenuItem, EditableTitleBarItem, EditableTitleBarOptions - } from '@ohos.arkui.advanced.EditableTitleBar'; - import { MarginType, PromptOptions, ExceptionPrompt } from '@ohos.arkui.advanced.ExceptionPrompt'; - import { Filter, FilterParams, FilterResult, FilterType } from '@ohos.arkui.advanced.Filter'; - import { AddFormMenuItem, FormMenuItemStyle, AddFormOptions } from '@ohos.arkui.advanced.FormMenu'; --import { GridObjectSortComponentType, GridObjectSortComponentItem, GridObjectSortComponentOptions, GridObjectSortComponent } from '@ohos.arkui.advanced.GridObjectSortComponent'; -+import { GridObjectSortComponentType, GridObjectSortComponentItem, GridObjectSortComponentOptions, -+ GridObjectSortComponent -+} from '@ohos.arkui.advanced.GridObjectSortComponent'; - import { - Popup, PopupButtonOptions, PopupIconOptions, PopupOptions, PopupTextOptions - } from '@ohos.arkui.advanced.Popup'; -@@ -95,19 +98,25 @@ import { InterstitialDialogAction, IconStyle, TitlePosition, BottomOffset } from - import componentSnapshot from '@ohos.arkui.componentSnapshot'; - import componentUtils from '@ohos.arkui.componentUtils'; - import dragController from '@ohos.arkui.dragController'; --import { DrawableDescriptor, LayeredDrawableDescriptor, PixelMapDrawableDescriptor, AnimationOptions, AnimatedDrawableDescriptor } from '@ohos.arkui.drawableDescriptor'; -+import { DrawableDescriptor, LayeredDrawableDescriptor, PixelMapDrawableDescriptor, AnimationOptions, -+ AnimatedDrawableDescriptor -+} from '@ohos.arkui.drawableDescriptor'; - import inspector from '@ohos.arkui.inspector'; - import { -- NodeRenderType, RenderOptions, BuilderNode, BuildOptions, NodeController, FrameNode, DrawContext, Size, Offset, Position, Pivot, Scale, Translation, Matrix4, Rotation, -- Frame, RenderNode, XComponentNode, LengthMetrics, LengthMetricsUnit, LengthUnit, ColorMetrics, LayoutConstraint, ComponentContent, NodeContent, Content, typeNode, ShapeMask, ShapeClip, -+ NodeRenderType, RenderOptions, BuilderNode, BuildOptions, NodeController, FrameNode, DrawContext, Size, Offset, -+ Position, Pivot, Scale, Translation, Matrix4, Rotation, -+ Frame, RenderNode, XComponentNode, LengthMetrics, LengthMetricsUnit, LengthUnit, ColorMetrics, LayoutConstraint, -+ ComponentContent, NodeContent, Content, typeNode, ShapeMask, ShapeClip, - NodeAdapter, Rect, RoundRect, edgeColors, edgeWidths, borderStyles, borderRadiuses, ExpandMode - } from '@ohos.arkui.node'; - import uiObserver from '@ohos.arkui.observer'; - import performanceMonitor from '@ohos.arkui.performanceMonitor'; - import { RectShape, CircleShape, EllipseShape, PathShape } from '@ohos.arkui.shape'; - import { -- AtomicServiceBar, ComponentUtils, ContextMenuController, CursorController, DragController, Font, KeyboardAvoidMode, MediaQuery, OverlayManager, PromptAction, Router, -- UIContext, UIInspector, UIObserver, PageInfo, SwiperDynamicSyncScene, SwiperDynamicSyncSceneType, MarqueeDynamicSyncScene, MarqueeDynamicSyncSceneType, FrameCallback, -+ AtomicServiceBar, ComponentUtils, ContextMenuController, CursorController, DragController, Font, -+ KeyboardAvoidMode, MediaQuery, OverlayManager, PromptAction, Router, -+ UIContext, UIInspector, UIObserver, PageInfo, SwiperDynamicSyncScene, SwiperDynamicSyncSceneType, -+ MarqueeDynamicSyncScene, MarqueeDynamicSyncSceneType, FrameCallback, - MeasureUtils, OverlayManagerOptions, TargetInfo - } from '@ohos.arkui.UIContext'; - import curves from '@ohos.curves'; -@@ -175,7 +184,7 @@ import { - PolygonModifier, PolylineModifier, RectModifier, ShapeModifier, AlphabetIndexerModifier, - HyperlinkModifier, MenuModifier, MenuItemModifier, PanelModifier, SymbolGlyphModifier, AttributeUpdater, - ContainerSpanModifier, SymbolSpanModifier, ParticleModifier --} from "@ohos.arkui.modifier"; -+} from '@ohos.arkui.modifier'; - import { - DownloadFileButton, - DownloadLayoutDirection, -@@ -245,7 +254,8 @@ export { - LabelOptions, LayeredDrawableDescriptor, LoadingDialog, LocaleResponse, MarginType, Matrix4, MeasureOptions, MeasureText, - MediaQuery, MediaQueryEvent, MediaQueryList, NodeController, NodeParam, NodeRenderType, Offset, OperateButton, OperateCheck, OperateIcon, - OperateItem, OperationOption, OperationType, OverlayManager, PathShape, PiPWindow, Pivot, Popup, PopupButtonOptions, PopupIconOptions, PopupOptions, -- PopupTextOptions, Position, PrefixIconOptions, ProgressButton, ProgressButtonV2, ProgressButtonV2Color, ProgressButtonV2ColorOptions, Prompt, PromptAction, PromptOptions, RectShape, RenderNode, RenderOptions, BuildOptions, -+ PopupTextOptions, Position, PrefixIconOptions, ProgressButton, ProgressButtonV2, ProgressButtonV2Color, -+ ProgressButtonV2ColorOptions, Prompt, PromptAction, PromptOptions, RectShape, RenderNode, RenderOptions, BuildOptions, - RequestFullWindowOptions, Rotation, Router, RouterOptions, RouterState, Scale, ScreenOnVisibleOptions, SegmentButton, SegmentButtonItemOptionsArray, - SegmentButtonOptions, SelectDialog, SelectOptions, SelectTitleBar, SelectTitleBarMenuItem, SelectionMenu, - SelectionMenuOptions, ShapeMask, ShapeClip, ShowActionMenuOptions, ShowDialogOptions, ShowDialogSuccessResponse, -@@ -257,8 +267,10 @@ export { - ToolBarV2ItemState, ToolBarV2SymbolGlyph, ToolBarV2SymbolGlyphOptions, ToolBarV2ItemText, ToolBarV2ItemTextOptions, ToolBarV2ItemIconType, - ToolBarV2ItemImage, ToolBarV2ItemImageOptions, ToolBarV2, ToolBarV2Item, ToolBarV2ItemOptions, ToolBarV2Modifier, ToolBarV2ItemAction, - TreeListenerManager, TreeView, UIContext, UIInspector, UIObserver, PageInfo, WindowExtensionAbility, WindowExtensionContext, XComponentNode, -- LengthMetrics, LengthMetricsUnit, LengthUnit, ColorMetrics, LayoutConstraint, ComponentContent, NodeContent, Content, componentSnapshot, componentUtils, curves, display, dragController, dragInteraction, -- font, inspector, matrix4, mediaquery, performanceMonitor, pluginComponentManager, PluginComponentTemplate, prompt, promptAction, LevelMode, ImmersiveMode, LevelOrder, router, -+ LengthMetrics, LengthMetricsUnit, LengthUnit, ColorMetrics, LayoutConstraint, ComponentContent, NodeContent, Content, -+ componentSnapshot, componentUtils, curves, display, dragController, dragInteraction, -+ font, inspector, matrix4, mediaquery, performanceMonitor, pluginComponentManager, PluginComponentTemplate, prompt, promptAction, -+ LevelMode, ImmersiveMode, LevelOrder, router, - AtomicServiceWeb, OnMessageEvent, OnErrorReceiveEvent, OnHttpErrorReceiveEvent, OnPageBeginEvent, OnPageEndEvent, - AtomicServiceWebController, OnLoadInterceptEvent, OnProgressChangeEvent, OnLoadInterceptCallback, WebHeader, - screen, screenshot, uiAppearance, uiExtensionHost, uiObserver, window, windowAnimationManager, CustomContentDialog, PopoverDialog, PopoverOptions, -@@ -268,8 +280,8 @@ export { - ExtraRegionPosition, ExpandedRegionLayoutOptions, HoverModeRegionLayoutOptions, FoldedRegionLayoutOptions, PresetSplitRatio, FoldSplitContainer, - HoverModeStatus, OnHoverStatusChangeHandler, - AppStorageV2, PersistenceV2, Type, UIUtils, ConnectOptions, typeNode, -- IDataSourcePrefetching, IPrefetcher, BasicPrefetcher, SwiperDynamicSyncScene, SwiperDynamicSyncSceneType, MarqueeDynamicSyncScene, MarqueeDynamicSyncSceneType, -- uiExtension, FullScreenLaunchComponent, MeasureUtils, -+ IDataSourcePrefetching, IPrefetcher, BasicPrefetcher, SwiperDynamicSyncScene, SwiperDynamicSyncSceneType, -+ MarqueeDynamicSyncScene, MarqueeDynamicSyncSceneType, uiExtension, FullScreenLaunchComponent, MeasureUtils, - CommonModifier, ColumnModifier, ColumnSplitModifier, RowModifier, RowSplitModifier, SideBarContainerModifier, - BlankModifier, DividerModifier, GridColModifier, GridRowModifier, NavDestinationModifier, NavigatorModifier, - StackModifier, NavigationModifier, NavRouterModifier, StepperItemModifier, TabsModifier, GridModifier, -@@ -283,7 +295,8 @@ export { - PolygonModifier, PolylineModifier, RectModifier, ShapeModifier, AlphabetIndexerModifier, FormComponentModifier, - HyperlinkModifier, MenuModifier, MenuItemModifier, PanelModifier, SymbolGlyphModifier, AttributeUpdater, SymbolSpanModifier, - ContainerSpanModifier, SegmentButtonTextItem, SegmentButtonIconItem, SegmentButtonIconTextItem, DimensionNoPercentage, -- CommonSegmentButtonOptions, ItemRestriction, SegmentButtonItemTuple, SegmentButtonItemArray, SegmentButtonItemOptionsConstructorOptions, SegmentButtonItemOptions, -+ CommonSegmentButtonOptions, ItemRestriction, SegmentButtonItemTuple, SegmentButtonItemArray, -+ SegmentButtonItemOptionsConstructorOptions, SegmentButtonItemOptions, - PixelMapDrawableDescriptor, AnimationOptions, AnimatedDrawableDescriptor, NodeAdapter, DownloadFileButton, - DownloadLayoutDirection, DownloadIconStyle, DownloadDescription, DownloadContentOptions, DownloadStyleOptions, - Rect, RoundRect, edgeColors, edgeWidths, borderStyles, borderRadiuses, ParticleModifier, -@@ -295,8 +308,10 @@ export { - ArcSlider, ArcSliderOptions, ArcSliderOptionsConstructorOptions, ArcSliderLayoutOptions, - ArcSliderLayoutOptionsConstructorOptions, ArcSliderStyleOptions, ArcSliderStyleOptionsConstructorOptions, - ArcSliderValueOptions, ArcSliderValueOptionsConstructorOptions, -- SegmentButtonV2ItemOptions, OnSelectedIndexChange, OnSelectedIndexesChange, SegmentButtonV2Item, SegmentButtonV2Items, TabSegmentButtonV2, CapsuleSegmentButtonV2, MultiCapsuleSegmentButtonV2, -+ SegmentButtonV2ItemOptions, OnSelectedIndexChange, OnSelectedIndexesChange, SegmentButtonV2Item, -+ SegmentButtonV2Items, TabSegmentButtonV2, CapsuleSegmentButtonV2, MultiCapsuleSegmentButtonV2, - AlertDialogV2, AdvancedDialogV2Button, AdvancedDialogV2ButtonOptions, AdvancedDialogV2ButtonAction, AdvancedDialogV2OnCheckedChange, -- ConfirmDialogV2, LoadingDialogV2, SelectDialogV2, TipsDialogV2, CustomContentDialogV2, PopoverDialogV2, PopoverDialogV2OnVisibleChange, PopoverDialogV2Options, ExpandMode, -+ ConfirmDialogV2, LoadingDialogV2, SelectDialogV2, TipsDialogV2, CustomContentDialogV2, PopoverDialogV2, -+ PopoverDialogV2OnVisibleChange, PopoverDialogV2Options, ExpandMode, - HalfScreenLaunchComponent, ArcSliderPosition, ArcSwiper, ArcSwiperAttribute, ArcDotIndicator, ArcDirection, ArcSwiperController, TargetInfo, - }; -diff --git a/kits/@kit.BasicServicesKit.d.ts b/kits/@kit.BasicServicesKit.d.ts -index c5f1ca0a1..4d80e2a50 100644 ---- a/kits/@kit.BasicServicesKit.d.ts -+++ b/kits/@kit.BasicServicesKit.d.ts -@@ -83,3 +83,11 @@ export { - systemTimer, thermal, update, usb, usbManager, serialManager, wallpaper, zlib, commonEventManager, emitter, StaticSubscriberExtensionAbility, - StaticSubscriberExtensionContext, systemLoad, intelligentVoice - }; -+ -+/*** if arkts 1.2 */ -+import zlib from '@ohos.zlib'; -+ -+export { -+ zlib -+}; -+/*** endif */ -diff --git a/kits/@kit.ImageKit.d.ts b/kits/@kit.ImageKit.d.ts -index eb73247fb..b7bbca490 100644 ---- a/kits/@kit.ImageKit.d.ts -+++ b/kits/@kit.ImageKit.d.ts -@@ -18,7 +18,15 @@ - * @kit ImageKit - */ - -+/*** if arkts 1.1 */ - import image from '@ohos.multimedia.image'; - import sendableImage from '@ohos.multimedia.sendableImage'; - - export { image, sendableImage }; -+/*** endif */ -+ -+/*** if arkts 1.2 */ -+import image from '@ohos.multimedia.image'; -+ -+export { image }; -+/*** endif */ -\ No newline at end of file -diff --git a/api/arkui/stateManagement/base/backingValue.d.ets b/kits/@kit.MechanicKit.d.ts -similarity index 78% -rename from api/arkui/stateManagement/base/backingValue.d.ets -rename to kits/@kit.MechanicKit.d.ts -index 0a915e71f..8f70c78e1 100644 ---- a/api/arkui/stateManagement/base/backingValue.d.ets -+++ b/kits/@kit.MechanicKit.d.ts -@@ -1,6 +1,6 @@ - /* - * Copyright (c) 2025 Huawei Device Co., Ltd. -- * Licensed under the Apache License, Version 2.0 (the "License"); -+ * Licensed under the Apache License, Version 2.0 (the "License"), - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * -@@ -12,14 +12,12 @@ - * See the License for the specific language governing permissions and - * limitations under the License. - */ -+ - /** - * @file -- * @kit ArkUI -- * @arkts 1.2 -+ * @kit MechanicKit - */ - -- export declare class BackingValue { -- public constructor(initValue: T) -- public get value(): T -- public set value(newVale: T) -- } -\ No newline at end of file -+import mechanicManager from '@ohos.distributedHardware.mechanicManager'; -+ -+export { mechanicManager }; -\ No newline at end of file -diff --git a/kits/@kit.MultimodalAwarenessKit.d.ts b/kits/@kit.MultimodalAwarenessKit.d.ts -index 783b130d2..7c28449ac 100644 ---- a/kits/@kit.MultimodalAwarenessKit.d.ts -+++ b/kits/@kit.MultimodalAwarenessKit.d.ts -@@ -18,7 +18,8 @@ - * @kit MultimodalAwarenessKit - */ - --import stationary from '@ohos.stationary'; - import motion from '@ohos.multimodalAwareness.motion'; -+import roomLocation from '@ohos.multimodalAwareness.roomLocation'; -+import stationary from '@ohos.stationary'; - --export { stationary, motion }; -+export { motion, roomLocation, stationary }; -diff --git a/kits/@kit.NetworkKit.d.ts b/kits/@kit.NetworkKit.d.ts -index 20fd60361..52c8c0139 100644 ---- a/kits/@kit.NetworkKit.d.ts -+++ b/kits/@kit.NetworkKit.d.ts -@@ -19,29 +19,29 @@ - */ - /*** if arkts 1.1&1.2 */ - import connection from '@ohos.net.connection'; -+import http from '@ohos.net.http'; -+import sharing from '@ohos.net.sharing'; -+import webSocket from '@ohos.net.webSocket'; -+import statistics from '@ohos.net.statistics'; -+import networkSecurity from '@ohos.net.networkSecurity'; - export { -- connection -+ connection, http, sharing, webSocket, statistics, networkSecurity - }; - /*** endif */ - - /*** if arkts 1.1*/ - import ethernet from '@ohos.net.ethernet'; --import http from '@ohos.net.http'; - import mdns from '@ohos.net.mdns'; - import policy from '@ohos.net.policy'; --import sharing from '@ohos.net.sharing'; - import socket from '@ohos.net.socket'; --import statistics from '@ohos.net.statistics'; - import vpn from '@ohos.net.vpn'; --import webSocket from '@ohos.net.webSocket'; - import vpnExtension from '@ohos.net.vpnExtension'; --import networkSecurity from '@ohos.net.networkSecurity'; - import VpnExtensionAbility, { VpnExtensionContext } from '@ohos.app.ability.VpnExtensionAbility'; - import netFirewall from '@ohos.net.netFirewall'; - - export { -- ethernet, http, mdns, policy, sharing, webSocket, -- socket, statistics, vpn, vpnExtension, networkSecurity, -+ ethernet, mdns, policy, -+ socket, vpn, vpnExtension, - VpnExtensionAbility, VpnExtensionContext, netFirewall - }; - /*** endif */ -diff --git a/kits/@kit.PerformanceAnalysisKit.d.ts b/kits/@kit.PerformanceAnalysisKit.d.ts -index 2d9730b26..0e52f38c1 100644 ---- a/kits/@kit.PerformanceAnalysisKit.d.ts -+++ b/kits/@kit.PerformanceAnalysisKit.d.ts -@@ -18,6 +18,7 @@ - * @kit PerformanceAnalysisKit - */ - -+/*** if arkts 1.1&1.2 */ - import FaultLogger from '@ohos.faultLogger'; - import hiAppEvent from '@ohos.hiviewdfx.hiAppEvent'; - import hichecker from '@ohos.hichecker'; -@@ -33,3 +34,4 @@ export { - FaultLogger, hiAppEvent, hiSysEvent, hiTraceChain, hiTraceMeter, hichecker, hidebug, hilog, - logLibrary, jsLeakWatcher - }; -+/*** endif */ -diff --git a/process_internal.py b/process_internal.py -index f34172db4..3b794a5e7 100755 ---- a/process_internal.py -+++ b/process_internal.py -@@ -15,6 +15,7 @@ - - import os - import sys -+import shutil - import optparse - import json - -@@ -64,7 +65,7 @@ def copy_files(options): - - - def format_path(filepath, base_dir): -- return os.path.relpath(filepath, base_dir) -+ return os.path.abspath(filepath) - - - def parse_args(args): -@@ -76,6 +77,7 @@ def parse_args(args): - parser.add_option('--project-dir', help='current project dir path') - parser.add_option('--ispublic', help='whether or not sdk build public') - parser.add_option('--name', help='module label name') -+ parser.add_option('--output', help='output path') - options, _ = parser.parse_args(args) - options.input = os.path.realpath(options.input) - return options -@@ -84,8 +86,11 @@ def parse_args(args): - def main(argv): - '''main函数入口''' - options = parse_args(argv) -+ if not os.path.exists(options.output): -+ os.makedirs(options.output) - result = copy_files(options) -- print(json.dumps(result)) -+ for file_path in result: -+ shutil.copy(file_path, options.output) - return 0 - - -diff --git a/process_internal.pydeps b/process_internal.pydeps -new file mode 100644 -index 000000000..f1dd75ee8 ---- /dev/null -+++ b/process_internal.pydeps -@@ -0,0 +1,3 @@ -+# Generated by running: -+# build/print_python_deps.py --root interface/sdk-js --output interface/sdk-js/process_internal.pydeps interface/sdk-js/process_internal.py -+process_internal.py -diff --git a/remove_list.json b/remove_list.json -index 5e26b0ee8..49dc0656e 100644 ---- a/remove_list.json -+++ b/remove_list.json -@@ -6,9 +6,7 @@ - ] - }, - "ets_component": { -- "global_remove": [ -- "inspector.d.ts" -- ], -+ "global_remove": [], - "sdk_build_public_remove": [ - "ability_component.d.ts", - "animator.d.ts", -@@ -30,4 +28,4 @@ - "featureability.d.ts" - ] - } --} -+} -\ No newline at end of file -diff --git a/run_compile_declgen.py b/run_compile_declgen.py -new file mode 100755 -index 000000000..52b72297a ---- /dev/null -+++ b/run_compile_declgen.py -@@ -0,0 +1,93 @@ -+#!/usr/bin/env python -+# -*- coding: utf-8 -*- -+# Copyright (c) 2025 Huawei Device Co., Ltd. -+# Licensed under the Apache License, Version 2.0 (the "License"); -+# you may not use this file except in compliance with the License. -+# You may obtain a copy of the License at -+# -+# http://www.apache.org/licenses/LICENSE-2.0 -+# -+# Unless required by applicable law or agreed to in writing, software -+# distributed under the License is distributed on an "AS IS" BASIS, -+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+# See the License for the specific language governing permissions and -+# limitations under the License. -+ -+import os -+import sys -+import subprocess -+import argparse -+import shutil -+import tarfile -+from pathlib import Path -+ -+PACKAGE_PATH = "interface/sdk-js/build-tools/declgen.js" -+TOOL_WAREHOURSE = 'interface/sdk-js/build-tools' -+ -+ -+def ensure_dir_exists(target_path): -+ path = Path(target_path).absolute() -+ if not path.exists(): -+ print(f"compile_declgen out_path not exit and creating:{path}") -+ path.mkdir(parents=True, exist_ok=True) -+ return str(path) -+ else: -+ print(f"compile_declgen out_path already exit:{path}") -+ return str(path) -+ -+ -+def traverse_function(source_root_dir: str, input_path: str, node_js: str): -+ source_root_dir = os.path.abspath(source_root_dir) -+ input_dir = os.path.abspath(os.path.join(input_path, 'ets1.1/sdk-js')) -+ out_path = os.path.abspath(os.path.join(input_path, 'ets1.1interop')) -+ package_path = os.path.abspath(os.path.join(source_root_dir, PACKAGE_PATH)) -+ nodejs = os.path.abspath(node_js) -+ output_dir = ensure_dir_exists(out_path) -+ if os.path.exists(package_path): -+ try: -+ result = subprocess.run([nodejs, package_path, "--input", input_dir, "--output", output_dir], cwd=source_root_dir, shell=False) -+ print('run_compile_declgen success:', result) -+ except subprocess.CalledProcessError as e: -+ print(f"run_compile_declgen node failed: {str(e.stderr)}") -+ else: -+ print("run_compile_declgen: tool path does not exist") -+ -+ -+def extract(package_path, dest_path, package_name, current_os): -+ # 解压tar.gz包到目录 -+ dest_package_path = os.path.join(dest_path, package_name) -+ temp_package_path = os.path.join(dest_path, current_os + package_name) -+ if (os.path.exists(dest_package_path) or os.path.exists(temp_package_path)): -+ return -+ os.makedirs(temp_package_path, exist_ok=True) -+ try: -+ with tarfile.open(package_path, 'r:gz') as tar: -+ tar.extractall(path=temp_package_path) -+ except tarfile.TarError as e: -+ print(f'Error extracting files: {e}') -+ package_path = os.path.join(temp_package_path, 'package') -+ if not (os.path.exists(dest_package_path)): -+ shutil.copytree(package_path, dest_package_path, symlinks=True, dirs_exist_ok=True) -+ shutil.rmtree(temp_package_path, ignore_errors=True) -+ -+ -+def run(args): -+ parser = argparse.ArgumentParser() -+ parser.add_argument('--root-build-dir', required=True) -+ parser.add_argument('--current-os-dir', required=True) -+ parser.add_argument('--output-interface-sdk', required=True) -+ parser.add_argument('--tool-dir', required=True) -+ parser.add_argument('--node-js', required=True) -+ options = parser.parse_args() -+ source_path = options.root_build_dir -+ current_os = options.current_os_dir -+ sdk_path = options.output_interface_sdk -+ node_path = options.node_js -+ declgen_path = options.tool_dir -+ node_modules_path = os.path.join(source_path, TOOL_WAREHOURSE, "node_modules") -+ extract(declgen_path, node_modules_path, 'declgen', current_os) -+ traverse_function(source_path, sdk_path, node_path) -+ -+ -+if __name__ == "__main__": -+ sys.exit(run(sys.argv[1:])) diff --git a/kits/@kit.AbilityKit.d.ts b/kits/@kit.AbilityKit.d.ts index 376cdad043..793da982bf 100644 --- a/kits/@kit.AbilityKit.d.ts +++ b/kits/@kit.AbilityKit.d.ts @@ -142,13 +142,9 @@ import bundleResourceManager from '@ohos.bundle.bundleResourceManager'; import defaultAppManager from '@ohos.bundle.defaultAppManager'; import distributedBundleManager from '@ohos.bundle.distributedBundleManager'; import freeInstall from '@ohos.bundle.freeInstall'; -import defaultAppManager from '@ohos.bundle.defaultAppManager'; -import distributedBundleManager from '@ohos.bundle.distributedBundleManager'; -import freeInstall from '@ohos.bundle.freeInstall'; import installer from '@ohos.bundle.installer'; import launcherBundleManager from '@ohos.bundle.launcherBundleManager'; import overlay from '@ohos.bundle.overlay'; -import overlay from '@ohos.bundle.overlay'; import shortcutManager from '@ohos.bundle.shortcutManager'; export { diff --git a/kits/@kit.ImageKit.d.ts b/kits/@kit.ImageKit.d.ts index 67a8cdbe4e..529fd7c15e 100644 --- a/kits/@kit.ImageKit.d.ts +++ b/kits/@kit.ImageKit.d.ts @@ -18,12 +18,8 @@ * @kit ImageKit */ -/*** if arkts 1.1 */ import image from '@ohos.multimedia.image'; import sendableImage from '@ohos.multimedia.sendableImage'; import videoProcessingEngine from '@ohos.multimedia.videoProcessingEngine'; export { image, sendableImage, videoProcessingEngine }; - -export { image }; -/*** endif */ \ No newline at end of file diff --git a/kits/@kit.MultimodalAwarenessKit.d.ts b/kits/@kit.MultimodalAwarenessKit.d.ts index e4703c11e8..605939d0a7 100644 --- a/kits/@kit.MultimodalAwarenessKit.d.ts +++ b/kits/@kit.MultimodalAwarenessKit.d.ts @@ -18,6 +18,7 @@ * @kit MultimodalAwarenessKit */ +import stationary from '@ohos.stationary'; import motion from '@ohos.multimodalAwareness.motion'; import deviceStatus from '@ohos.multimodalAwareness.deviceStatus'; import metadataBinding from '@ohos.multimodalAwareness.metadataBinding'; diff --git a/kits/@kit.PerformanceAnalysisKit.d.ts b/kits/@kit.PerformanceAnalysisKit.d.ts index 0e52f38c10..2d9730b266 100644 --- a/kits/@kit.PerformanceAnalysisKit.d.ts +++ b/kits/@kit.PerformanceAnalysisKit.d.ts @@ -18,7 +18,6 @@ * @kit PerformanceAnalysisKit */ -/*** if arkts 1.1&1.2 */ import FaultLogger from '@ohos.faultLogger'; import hiAppEvent from '@ohos.hiviewdfx.hiAppEvent'; import hichecker from '@ohos.hichecker'; @@ -34,4 +33,3 @@ export { FaultLogger, hiAppEvent, hiSysEvent, hiTraceChain, hiTraceMeter, hichecker, hidebug, hilog, logLibrary, jsLeakWatcher }; -/*** endif */ -- Gitee From 16be8ae9791305cbe37301e4e765337b04743857 Mon Sep 17 00:00:00 2001 From: zhushengle Date: Sun, 13 Jul 2025 16:16:04 +0800 Subject: [PATCH 097/746] =?UTF-8?q?feat:=20ArkWeb=200328=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=88=B00702?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhushengle Change-Id: I4578284d98038cf761e163e49a20ddbf7e46b92a --- api/@internal/component/ets/rich_text.d.ts | 30 +- api/@internal/component/ets/web.d.ts | 1929 +++++++++++++------- api/@ohos.web.netErrorList.d.ts | 723 +++++--- api/@ohos.web.webview.d.ts | 1832 ++++++++++++------- 4 files changed, 3009 insertions(+), 1505 deletions(-) diff --git a/api/@internal/component/ets/rich_text.d.ts b/api/@internal/component/ets/rich_text.d.ts index 2f0984f050..adfb8f1845 100644 --- a/api/@internal/component/ets/rich_text.d.ts +++ b/api/@internal/component/ets/rich_text.d.ts @@ -18,6 +18,10 @@ * @kit ArkUI */ +/*** if arkts 1.2 */ +import { CommonMethod} from './common'; +/*** endif */ + /** * Provides an interface for RichText component. * @@ -40,7 +44,8 @@ * @interface RichTextInterface * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ interface RichTextInterface { /** @@ -73,13 +78,25 @@ interface RichTextInterface { /** * Set value. * - * @param { string | Resource } content + * @param { string | Resource} content * @returns { RichTextAttribute } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @since 20 */ (content: string | Resource): RichTextAttribute; + + /** + * Set value. + * + * @param { string } content + * @returns { RichTextAttribute } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @since 12 + * @arkts 1.2 + */ + (content: string): RichTextAttribute; } /** @@ -104,7 +121,8 @@ interface RichTextInterface { * @extends CommonMethod * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ declare class RichTextAttribute extends CommonMethod { /** @@ -132,7 +150,8 @@ declare class RichTextAttribute extends CommonMethod { * @returns { RichTextAttribute } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ onStart(callback: () => void): RichTextAttribute; @@ -161,7 +180,8 @@ declare class RichTextAttribute extends CommonMethod { * @returns { RichTextAttribute } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ onComplete(callback: () => void): RichTextAttribute; } diff --git a/api/@internal/component/ets/web.d.ts b/api/@internal/component/ets/web.d.ts index f94ee18739..a1e98e20b7 100644 --- a/api/@internal/component/ets/web.d.ts +++ b/api/@internal/component/ets/web.d.ts @@ -18,6 +18,28 @@ * @kit ArkWeb */ +/*** if arkts 1.2 */ +import webview from '../../@ohos.web.webview'; +import image from '../../@ohos.multimedia.image'; +import { CommonMethod, Callback, TouchEvent, NestedScrollOptions, KeyEvent } from './common'; +import { CustomBuilder } from './builder' +import { Resource } from '../../global/resource'; +import { Position, ResourceStr } from './units'; +import { MenuType, EditMenuOptions } from './textCommon'; +import { CopyOptions, NestedScrollMode } from './enums'; +/*** endif */ + +/** + * Provides methods for controlling the web controller. + * + * @typedef { webview.WebviewController } + * @syscap SystemCapability.Web.Webview.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ +type WebviewController = webview.WebviewController; + /** * Provides methods for controlling the web controller. * @@ -49,7 +71,8 @@ declare type WebviewController = import('../api/@ohos.web.webview').default.Webv * @param { LoadCommittedDetails } loadCommittedDetails - callback information of onNavigationEntryCommitted. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ type OnNavigationEntryCommittedCallback = (loadCommittedDetails: LoadCommittedDetails) => void; @@ -60,7 +83,8 @@ type OnNavigationEntryCommittedCallback = (loadCommittedDetails: LoadCommittedDe * @param { SslErrorEvent } sslErrorEvent - callback information of onSslErrorEvent. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ type OnSslErrorEventCallback = (sslErrorEvent: SslErrorEvent) => void; @@ -71,7 +95,8 @@ type OnSslErrorEventCallback = (sslErrorEvent: SslErrorEvent) => void; * @param { LargestContentfulPaint } largestContentfulPaint - callback information of onLargestContentfulPaint. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ type OnLargestContentfulPaintCallback = (largestContentfulPaint: LargestContentfulPaint) => void; @@ -82,7 +107,8 @@ type OnLargestContentfulPaintCallback = (largestContentfulPaint: LargestContentf * @param { FirstMeaningfulPaint } firstMeaningfulPaint - callback information of onFirstMeaningfulPaint. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ type OnFirstMeaningfulPaintCallback = (firstMeaningfulPaint: FirstMeaningfulPaint) => void; @@ -96,7 +122,8 @@ type OnFirstMeaningfulPaintCallback = (firstMeaningfulPaint: FirstMeaningfulPain * false causes the Web to continue loading the url as usual. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ type OnOverrideUrlLoadingCallback = (webResourceRequest: WebResourceRequest) => boolean; @@ -107,7 +134,8 @@ type OnOverrideUrlLoadingCallback = (webResourceRequest: WebResourceRequest) => * @param { IntelligentTrackingPreventionDetails } details - callback information of onIntelligentTrackingPrevention. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ type OnIntelligentTrackingPreventionCallback = (details: IntelligentTrackingPreventionDetails) => void; @@ -117,7 +145,8 @@ type OnIntelligentTrackingPreventionCallback = (details: IntelligentTrackingPrev * @typedef { function } OnNativeEmbedVisibilityChangeCallback * @param { NativeEmbedVisibilityInfo } nativeEmbedVisibilityInfo - callback information of onNativeEmbedVisibilityChange. * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ type OnNativeEmbedVisibilityChangeCallback = (nativeEmbedVisibilityInfo: NativeEmbedVisibilityInfo) => void; @@ -127,7 +156,8 @@ type OnNativeEmbedVisibilityChangeCallback = (nativeEmbedVisibilityInfo: NativeE * @typedef NativeMediaPlayerConfig * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface NativeMediaPlayerConfig { /** @@ -138,7 +168,8 @@ declare interface NativeMediaPlayerConfig { * Deflault value: false. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enable: boolean; @@ -150,7 +181,8 @@ declare interface NativeMediaPlayerConfig { * Deflault value: false. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ shouldOverlay: boolean; } @@ -161,7 +193,8 @@ declare interface NativeMediaPlayerConfig { * @typedef { function } OnRenderProcessNotRespondingCallback * @param { RenderProcessNotRespondingData } data - details of onRenderProcessNotResponding. * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ type OnRenderProcessNotRespondingCallback = (data : RenderProcessNotRespondingData) => void; @@ -170,18 +203,20 @@ type OnRenderProcessNotRespondingCallback = (data : RenderProcessNotRespondingDa * * @typedef { function } OnRenderProcessRespondingCallback * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ type OnRenderProcessRespondingCallback = () => void; /** - * The callback of ViewportFit Changed. +* The callback of ViewportFit Changed. * * @typedef { function } OnViewportFitChangedCallback * @param { ViewportFit } viewportFit - details of OnViewportFitChangedCallback. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ type OnViewportFitChangedCallback = (viewportFit: ViewportFit) => void; @@ -192,7 +227,8 @@ type OnViewportFitChangedCallback = (viewportFit: ViewportFit) => void; * @param { AdsBlockedDetails } details - details of OnAdsBlockedCallback. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ type OnAdsBlockedCallback = (details: AdsBlockedDetails) => void; @@ -202,7 +238,8 @@ type OnAdsBlockedCallback = (details: AdsBlockedDetails) => void; * @interface AdsBlockedDetails * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface AdsBlockedDetails { /** @@ -211,7 +248,8 @@ declare interface AdsBlockedDetails { * @type { string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ url: string; @@ -221,7 +259,8 @@ declare interface AdsBlockedDetails { * @type { Array } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ adsBlocked: Array; } @@ -232,7 +271,8 @@ declare interface AdsBlockedDetails { * @interface WebKeyboardOptions * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface WebKeyboardOptions { /** @@ -241,7 +281,8 @@ declare interface WebKeyboardOptions { * @type { boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ useSystemKeyboard: boolean; @@ -251,7 +292,8 @@ declare interface WebKeyboardOptions { * @type { ?number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enterKeyType?: number; @@ -261,7 +303,8 @@ declare interface WebKeyboardOptions { * @type { ?CustomBuilder } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ customKeyboard?: CustomBuilder; } @@ -271,7 +314,8 @@ declare interface WebKeyboardOptions { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare class WebKeyboardController { /** @@ -279,7 +323,8 @@ declare class WebKeyboardController { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -288,7 +333,8 @@ declare class WebKeyboardController { * * @param { string } text - text which will be inserted. * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ insertText(text: string): void; @@ -297,7 +343,8 @@ declare class WebKeyboardController { * * @param { number } length - length of text, which will be deleted from back to front. * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ deleteForward(length: number): void; @@ -306,7 +353,8 @@ declare class WebKeyboardController { * * @param { number } length - length of text, which will be deleted from front to back. * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ deleteBackward(length: number): void; @@ -315,7 +363,8 @@ declare class WebKeyboardController { * * @param { number } key - action indicates the "enter" key related to the {@link inputMethodEngine} * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ sendFunctionKey(key: number): void; @@ -323,7 +372,8 @@ declare class WebKeyboardController { * Close the custom keyboard. * * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ close(): void; } @@ -334,7 +384,8 @@ declare class WebKeyboardController { * @interface WebKeyboardCallbackInfo * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface WebKeyboardCallbackInfo { /** @@ -343,7 +394,8 @@ declare interface WebKeyboardCallbackInfo { * @type { WebKeyboardController } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ controller: WebKeyboardController; @@ -353,7 +405,8 @@ declare interface WebKeyboardCallbackInfo { * @type { Record } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ attributes: Record; } @@ -366,7 +419,8 @@ declare interface WebKeyboardCallbackInfo { * @returns { WebKeyboardOptions } Return the web keyboard options of this web component. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ type WebKeyboardCallback = (keyboardCallbackInfo: WebKeyboardCallbackInfo) => WebKeyboardOptions; @@ -384,7 +438,8 @@ type WebKeyboardCallback = (keyboardCallbackInfo: WebKeyboardCallbackInfo) => We * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum MessageLevel { /** @@ -399,7 +454,8 @@ declare enum MessageLevel { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Debug, @@ -415,7 +471,8 @@ declare enum MessageLevel { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Error, @@ -431,7 +488,8 @@ declare enum MessageLevel { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Info, @@ -447,7 +505,8 @@ declare enum MessageLevel { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Log, @@ -463,7 +522,8 @@ declare enum MessageLevel { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Warn } @@ -490,7 +550,8 @@ declare enum MessageLevel { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum MixedMode { /** @@ -512,7 +573,8 @@ declare enum MixedMode { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ All = 0, @@ -535,7 +597,8 @@ declare enum MixedMode { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ Compatible = 1, @@ -558,7 +621,8 @@ declare enum MixedMode { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ None = 2 } @@ -570,7 +634,8 @@ declare enum MixedMode { * @param { ThreatType } threatType - callback information of onSafeBrowsingCheckResult. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ type OnSafeBrowsingCheckResultCallback = (threatType: ThreatType) => void; @@ -587,7 +652,8 @@ type OnSafeBrowsingCheckResultCallback = (threatType: ThreatType) => void; * @enum { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum HitTestType { /** @@ -601,7 +667,8 @@ declare enum HitTestType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ EditText = 0, @@ -616,7 +683,8 @@ declare enum HitTestType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Email = 1, @@ -631,7 +699,8 @@ declare enum HitTestType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ HttpAnchor = 2, @@ -646,7 +715,8 @@ declare enum HitTestType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ HttpAnchorImg = 3, @@ -661,7 +731,8 @@ declare enum HitTestType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Img = 4, @@ -676,7 +747,8 @@ declare enum HitTestType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Map = 5, @@ -691,7 +763,8 @@ declare enum HitTestType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Phone = 6, @@ -706,7 +779,8 @@ declare enum HitTestType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Unknown = 7 } @@ -733,7 +807,8 @@ declare enum HitTestType { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum CacheMode { /** @@ -755,7 +830,8 @@ declare enum CacheMode { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ Default = 0, @@ -778,7 +854,8 @@ declare enum CacheMode { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ None = 1, @@ -801,7 +878,8 @@ declare enum CacheMode { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ Online = 2, @@ -824,7 +902,8 @@ declare enum CacheMode { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ Only = 3 } @@ -835,7 +914,8 @@ declare enum CacheMode { * @enum { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum OverScrollMode { /** @@ -843,7 +923,8 @@ declare enum OverScrollMode { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ NEVER = 0, @@ -852,7 +933,8 @@ declare enum OverScrollMode { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ ALWAYS = 1 } @@ -863,7 +945,8 @@ declare enum OverScrollMode { * @enum { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum BlurOnKeyboardHideMode { /** @@ -871,7 +954,8 @@ declare enum BlurOnKeyboardHideMode { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ SILENT = 0, @@ -880,7 +964,8 @@ declare enum BlurOnKeyboardHideMode { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ BLUR = 1 } @@ -898,7 +983,8 @@ declare enum BlurOnKeyboardHideMode { * @enum { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum WebDarkMode { /** @@ -912,7 +998,8 @@ declare enum WebDarkMode { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Off = 0, @@ -927,7 +1014,8 @@ declare enum WebDarkMode { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ On = 1, @@ -942,7 +1030,8 @@ declare enum WebDarkMode { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Auto = 2 } @@ -960,7 +1049,8 @@ declare enum WebDarkMode { * @enum { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum WebCaptureMode { /** @@ -972,7 +1062,8 @@ declare enum WebCaptureMode { * Capture of the home screen. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ HOME_SCREEN = 0 } @@ -983,7 +1074,8 @@ declare enum WebCaptureMode { * @enum { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum ThreatType { /** @@ -991,7 +1083,8 @@ declare enum ThreatType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ THREAT_ILLEGAL = 0, @@ -1000,7 +1093,8 @@ declare enum ThreatType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ THREAT_FRAUD = 1, @@ -1009,7 +1103,8 @@ declare enum ThreatType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ THREAT_RISK = 2, @@ -1019,7 +1114,8 @@ declare enum ThreatType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ THREAT_WARNING = 3 } @@ -1045,7 +1141,8 @@ declare enum ThreatType { * @typedef WebMediaOptions * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface WebMediaOptions { /** @@ -1063,7 +1160,8 @@ declare interface WebMediaOptions { * @type { ?number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ resumeInterval?: number; @@ -1078,10 +1176,10 @@ declare interface WebMediaOptions { * Whether the audio of multiple Web instances in an application is exclusive. * * @type { ?boolean } - * {@code true} means audio exclusivity for multiple web instances within the application, {@code false} otherwise. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ audioExclusive?: boolean; @@ -1116,7 +1214,8 @@ declare interface WebMediaOptions { * @typedef ScreenCaptureConfig * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface ScreenCaptureConfig { /** @@ -1132,7 +1231,8 @@ declare interface ScreenCaptureConfig { * @type { WebCaptureMode } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ captureMode: WebCaptureMode; } @@ -1156,7 +1256,8 @@ declare interface ScreenCaptureConfig { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ declare class FullScreenExitHandler { /** @@ -1178,7 +1279,8 @@ declare class FullScreenExitHandler { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -1201,7 +1303,8 @@ declare class FullScreenExitHandler { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ exitFullScreen(): void; } @@ -1221,7 +1324,8 @@ declare class FullScreenExitHandler { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface FullScreenEnterEvent { /** @@ -1239,7 +1343,8 @@ declare interface FullScreenEnterEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ handler: FullScreenExitHandler; @@ -1258,7 +1363,8 @@ declare interface FullScreenEnterEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ videoWidth?: number; @@ -1277,7 +1383,8 @@ declare interface FullScreenEnterEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ videoHeight?: number; } @@ -1299,7 +1406,8 @@ declare interface FullScreenEnterEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ type OnFullScreenEnterCallback = (event: FullScreenEnterEvent) => void; @@ -1327,7 +1435,8 @@ type MouseInfoCallback = (event: NativeEmbedMouseInfo) => void; * @enum { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum RenderExitReason { /** @@ -1341,7 +1450,8 @@ declare enum RenderExitReason { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ ProcessAbnormalTermination = 0, @@ -1356,7 +1466,8 @@ declare enum RenderExitReason { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ ProcessWasKilled = 1, @@ -1371,7 +1482,8 @@ declare enum RenderExitReason { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ ProcessCrashed = 2, @@ -1386,7 +1498,8 @@ declare enum RenderExitReason { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ ProcessOom = 3, @@ -1401,7 +1514,8 @@ declare enum RenderExitReason { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ ProcessExitUnknown = 4 } @@ -1412,7 +1526,8 @@ declare enum RenderExitReason { * @typedef { function } OnContextMenuHideCallback * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ type OnContextMenuHideCallback = () => void; @@ -1429,7 +1544,8 @@ type OnContextMenuHideCallback = () => void; * @enum { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum SslError { /** @@ -1443,7 +1559,8 @@ declare enum SslError { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Invalid = 0, @@ -1458,7 +1575,8 @@ declare enum SslError { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ HostMismatch = 1, @@ -1473,7 +1591,8 @@ declare enum SslError { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DateInvalid = 2, @@ -1488,7 +1607,8 @@ declare enum SslError { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Untrusted = 3 } @@ -1507,7 +1627,8 @@ declare enum SslError { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum FileSelectorMode { /** @@ -1522,7 +1643,8 @@ declare enum FileSelectorMode { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ FileOpenMode = 0, @@ -1538,7 +1660,8 @@ declare enum FileSelectorMode { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ FileOpenMultipleMode = 1, @@ -1554,7 +1677,8 @@ declare enum FileSelectorMode { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ FileOpenFolderMode = 2, @@ -1570,7 +1694,8 @@ declare enum FileSelectorMode { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ FileSaveMode = 3 } @@ -1581,7 +1706,8 @@ declare enum FileSelectorMode { * @enum { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum WebLayoutMode { /** @@ -1589,7 +1715,8 @@ declare enum WebLayoutMode { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ NONE = 0, @@ -1598,7 +1725,8 @@ declare enum WebLayoutMode { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ FIT_CONTENT = 1 } @@ -1608,14 +1736,16 @@ declare enum WebLayoutMode { * * @enum { number } * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum RenderProcessNotRespondingReason { /** * Timeout for input sent to render process. * * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ INPUT_TIMEOUT = 0, @@ -1623,7 +1753,8 @@ declare enum RenderProcessNotRespondingReason { * The new webpage loading navigation response timed out. * * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NAVIGATION_COMMIT_TIMEOUT = 1 } @@ -1640,7 +1771,8 @@ declare enum RenderProcessNotRespondingReason { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare class FileSelectorParam { /** @@ -1655,7 +1787,8 @@ declare class FileSelectorParam { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -1671,7 +1804,8 @@ declare class FileSelectorParam { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getTitle(): string; @@ -1687,7 +1821,8 @@ declare class FileSelectorParam { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMode(): FileSelectorMode; @@ -1703,7 +1838,8 @@ declare class FileSelectorParam { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getAcceptType(): Array; @@ -1721,7 +1857,8 @@ declare class FileSelectorParam { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isCapture(): boolean; @@ -1729,7 +1866,8 @@ declare class FileSelectorParam { * Gets an array of raw acceptable MIME type. * @returns { Array } Return an array of raw acceptable MIME type. * @syscap SystemCapability.Web.Webview.Core - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getMimeTypes(): Array; } @@ -1746,7 +1884,8 @@ declare class FileSelectorParam { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare class JsResult { /** @@ -1761,7 +1900,8 @@ declare class JsResult { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -1777,7 +1917,8 @@ declare class JsResult { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ handleCancel(): void; @@ -1793,7 +1934,8 @@ declare class JsResult { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ handleConfirm(): void; @@ -1811,7 +1953,8 @@ declare class JsResult { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ handlePromptConfirm(result: string): void; } @@ -1828,7 +1971,8 @@ declare class JsResult { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare class FileSelectorResult { /** @@ -1843,7 +1987,8 @@ declare class FileSelectorResult { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -1861,7 +2006,8 @@ declare class FileSelectorResult { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ handleFileList(fileList: Array): void; } @@ -1878,7 +2024,8 @@ declare class FileSelectorResult { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare class HttpAuthHandler { /** @@ -1893,7 +2040,8 @@ declare class HttpAuthHandler { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -1915,7 +2063,8 @@ declare class HttpAuthHandler { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ confirm(userName: string, password: string): boolean; @@ -1931,7 +2080,8 @@ declare class HttpAuthHandler { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ cancel(): void; @@ -1949,7 +2099,8 @@ declare class HttpAuthHandler { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isHttpAuthInfoSaved(): boolean; } @@ -1965,7 +2116,8 @@ declare class HttpAuthHandler { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare class SslErrorHandler { /** @@ -1979,7 +2131,8 @@ declare class SslErrorHandler { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -1994,7 +2147,8 @@ declare class SslErrorHandler { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ handleConfirm(): void; @@ -2009,7 +2163,8 @@ declare class SslErrorHandler { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ handleCancel(): void; @@ -2039,7 +2194,8 @@ declare class SslErrorHandler { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare class ClientAuthenticationHandler { /** @@ -2053,7 +2209,8 @@ declare class ClientAuthenticationHandler { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -2072,7 +2229,8 @@ declare class ClientAuthenticationHandler { * @param { string } certChainFile - The file that store client certificate chain. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ confirm(priKeyFile: string, certChainFile: string): void; @@ -2089,7 +2247,8 @@ declare class ClientAuthenticationHandler { * @param { string } authUri is the key of credentials.The credentials contain sign info and client certificates info. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ confirm(authUri: string): void; @@ -2104,7 +2263,8 @@ declare class ClientAuthenticationHandler { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ cancel(): void; @@ -2119,7 +2279,8 @@ declare class ClientAuthenticationHandler { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ ignore(): void; } @@ -2138,7 +2299,8 @@ declare class ClientAuthenticationHandler { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum ProtectedResourceType { /** @@ -2152,7 +2314,8 @@ declare enum ProtectedResourceType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ MidiSysex = 'TYPE_MIDI_SYSEX', @@ -2168,7 +2331,8 @@ declare enum ProtectedResourceType { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ VIDEO_CAPTURE = 'TYPE_VIDEO_CAPTURE', @@ -2184,7 +2348,8 @@ declare enum ProtectedResourceType { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ AUDIO_CAPTURE = 'TYPE_AUDIO_CAPTURE', @@ -2193,7 +2358,8 @@ declare enum ProtectedResourceType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ SENSOR = 'TYPE_SENSOR' } @@ -2210,7 +2376,8 @@ declare enum ProtectedResourceType { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare class PermissionRequest { /** @@ -2225,7 +2392,8 @@ declare class PermissionRequest { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -2241,7 +2409,8 @@ declare class PermissionRequest { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ deny(): void; @@ -2259,7 +2428,8 @@ declare class PermissionRequest { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getOrigin(): string; @@ -2277,7 +2447,8 @@ declare class PermissionRequest { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getAccessibleResource(): Array; @@ -2295,7 +2466,8 @@ declare class PermissionRequest { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ grant(resources: Array): void; } @@ -2309,7 +2481,8 @@ declare class PermissionRequest { * Defines the onScreenCapture callback, related to {@link onScreenCapture} method. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare class ScreenCaptureHandler { /** @@ -2321,7 +2494,8 @@ declare class ScreenCaptureHandler { * Constructor. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -2338,7 +2512,8 @@ declare class ScreenCaptureHandler { * @returns { string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getOrigin(): string; @@ -2353,7 +2528,8 @@ declare class ScreenCaptureHandler { * @param { ScreenCaptureConfig } config The screen capture configuration. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ grant(config: ScreenCaptureConfig): void; @@ -2366,7 +2542,8 @@ declare class ScreenCaptureHandler { * Rejects this screen capture request. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ deny(): void; } @@ -2382,7 +2559,8 @@ declare class ScreenCaptureHandler { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare class DataResubmissionHandler { /** @@ -2396,7 +2574,8 @@ declare class DataResubmissionHandler { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -2411,7 +2590,8 @@ declare class DataResubmissionHandler { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ resend(): void; @@ -2426,7 +2606,8 @@ declare class DataResubmissionHandler { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ cancel(): void; } @@ -2442,7 +2623,8 @@ declare class DataResubmissionHandler { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare class ControllerHandler { /** @@ -2456,7 +2638,8 @@ declare class ControllerHandler { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -2468,12 +2651,13 @@ declare class ControllerHandler { * @since 9 */ /** - * Set WebController object. * Set to null if you don't need to open a new window. + * * @param { WebviewController } controller * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setWebController(controller: WebviewController): void; } @@ -2491,7 +2675,8 @@ declare class ControllerHandler { * @enum { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum ContextMenuSourceType { /** @@ -2505,7 +2690,8 @@ declare enum ContextMenuSourceType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ None = 0, @@ -2520,7 +2706,8 @@ declare enum ContextMenuSourceType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Mouse = 1, @@ -2535,7 +2722,8 @@ declare enum ContextMenuSourceType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ LongPress = 2 } @@ -2553,7 +2741,8 @@ declare enum ContextMenuSourceType { * @enum { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum ContextMenuMediaType { /** @@ -2567,7 +2756,8 @@ declare enum ContextMenuMediaType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ None = 0, @@ -2582,9 +2772,10 @@ declare enum ContextMenuMediaType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - Image = 1, + Image = 1 /** * Video. @@ -2616,7 +2807,8 @@ declare enum ContextMenuMediaType { * @enum { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum ContextMenuInputFieldType { /** @@ -2630,7 +2822,8 @@ declare enum ContextMenuInputFieldType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ None = 0, @@ -2645,7 +2838,8 @@ declare enum ContextMenuInputFieldType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ PlainText = 1, @@ -2660,7 +2854,8 @@ declare enum ContextMenuInputFieldType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Password = 2, @@ -2675,7 +2870,8 @@ declare enum ContextMenuInputFieldType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Number = 3, @@ -2690,7 +2886,8 @@ declare enum ContextMenuInputFieldType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Telephone = 4, @@ -2705,7 +2902,8 @@ declare enum ContextMenuInputFieldType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Other = 5 } @@ -2719,7 +2917,8 @@ declare enum ContextMenuInputFieldType { * @enum { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum NativeEmbedStatus { /** @@ -2727,7 +2926,8 @@ declare enum NativeEmbedStatus { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CREATE = 0, @@ -2736,7 +2936,8 @@ declare enum NativeEmbedStatus { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ UPDATE = 1, @@ -2745,7 +2946,8 @@ declare enum NativeEmbedStatus { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DESTROY = 2, @@ -2754,7 +2956,8 @@ declare enum NativeEmbedStatus { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ENTER_BFCACHE = 3, @@ -2763,7 +2966,8 @@ declare enum NativeEmbedStatus { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ LEAVE_BFCACHE = 4 } @@ -2781,7 +2985,8 @@ declare enum NativeEmbedStatus { * @enum { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum ContextMenuEditStateFlags { /** @@ -2795,7 +3000,8 @@ declare enum ContextMenuEditStateFlags { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ NONE = 0, @@ -2810,7 +3016,8 @@ declare enum ContextMenuEditStateFlags { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CAN_CUT = 1 << 0, @@ -2825,7 +3032,8 @@ declare enum ContextMenuEditStateFlags { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CAN_COPY = 1 << 1, @@ -2840,7 +3048,8 @@ declare enum ContextMenuEditStateFlags { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CAN_PASTE = 1 << 2, @@ -2855,7 +3064,8 @@ declare enum ContextMenuEditStateFlags { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ CAN_SELECT_ALL = 1 << 3 } @@ -2866,7 +3076,8 @@ declare enum ContextMenuEditStateFlags { * @enum { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum WebNavigationType { /** @@ -2874,7 +3085,8 @@ declare enum WebNavigationType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ UNKNOWN = 0, @@ -2886,7 +3098,8 @@ declare enum WebNavigationType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ MAIN_FRAME_NEW_ENTRY = 1, @@ -2899,7 +3112,8 @@ declare enum WebNavigationType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ MAIN_FRAME_EXISTING_ENTRY = 2, @@ -2908,7 +3122,8 @@ declare enum WebNavigationType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ NAVIGATION_TYPE_NEW_SUBFRAME = 4, @@ -2917,7 +3132,8 @@ declare enum WebNavigationType { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ NAVIGATION_TYPE_AUTO_SUBFRAME = 5 } @@ -2929,7 +3145,8 @@ declare enum WebNavigationType { * @enum { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum RenderMode { /** @@ -2939,7 +3156,8 @@ declare enum RenderMode { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ASYNC_RENDER = 0, @@ -2950,7 +3168,8 @@ declare enum RenderMode { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ SYNC_RENDER = 1 } @@ -2961,7 +3180,8 @@ declare enum RenderMode { * @enum { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum ViewportFit { /** @@ -2969,7 +3189,8 @@ declare enum ViewportFit { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ AUTO = 0, @@ -2979,7 +3200,8 @@ declare enum ViewportFit { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ CONTAINS = 1, @@ -2989,7 +3211,8 @@ declare enum ViewportFit { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ COVER = 2 } @@ -3005,7 +3228,8 @@ declare enum ViewportFit { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare class WebContextMenuParam { /** @@ -3019,7 +3243,8 @@ declare class WebContextMenuParam { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -3038,7 +3263,8 @@ declare class WebContextMenuParam { * Unit: vp. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ x(): number; @@ -3057,7 +3283,8 @@ declare class WebContextMenuParam { * Unit: vp. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ y(): number; @@ -3074,7 +3301,8 @@ declare class WebContextMenuParam { * @returns { string } If relate to a link return link url, else return null. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getLinkUrl(): string; @@ -3091,7 +3319,8 @@ declare class WebContextMenuParam { * @returns { string } If relate to a link return unfiltered link url, else return null. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getUnfilteredLinkUrl(): string; @@ -3108,7 +3337,8 @@ declare class WebContextMenuParam { * @returns { string } If this context menu is "src" attribute, return link url, else return null. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getSourceUrl(): string; @@ -3125,7 +3355,8 @@ declare class WebContextMenuParam { * @returns { boolean } Return whether this context menu has image content. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ existsImageContents(): boolean; @@ -3142,7 +3373,8 @@ declare class WebContextMenuParam { * @returns { ContextMenuMediaType } Returns the type of context node. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMediaType(): ContextMenuMediaType; @@ -3159,7 +3391,8 @@ declare class WebContextMenuParam { * @returns { string } Returns the text of the selection, or return null if no text is selected. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getSelectionText(): string; @@ -3176,7 +3409,8 @@ declare class WebContextMenuParam { * @returns { ContextMenuSourceType } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getSourceType(): ContextMenuSourceType; @@ -3193,7 +3427,8 @@ declare class WebContextMenuParam { * @returns { ContextMenuInputFieldType } Input field type if the context menu was invoked on an input field. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getInputFieldType(): ContextMenuInputFieldType; @@ -3210,7 +3445,8 @@ declare class WebContextMenuParam { * @returns { boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isEditable(): boolean; @@ -3227,7 +3463,8 @@ declare class WebContextMenuParam { * @returns { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getEditStateFlags(): number; @@ -3236,7 +3473,8 @@ declare class WebContextMenuParam { * * @returns { number } The preview menu width. * @syscap SystemCapability.Web.Webview.Core - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ getPreviewWidth(): number; @@ -3245,7 +3483,8 @@ declare class WebContextMenuParam { * * @returns { number } The preview menu height. * @syscap SystemCapability.Web.Webview.Core - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ getPreviewHeight(): number; } @@ -3261,7 +3500,8 @@ declare class WebContextMenuParam { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare class WebContextMenuResult { /** @@ -3275,7 +3515,8 @@ declare class WebContextMenuResult { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -3292,7 +3533,8 @@ declare class WebContextMenuResult { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ closeContextMenu(): void; @@ -3309,7 +3551,8 @@ declare class WebContextMenuResult { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ copyImage(): void; @@ -3324,7 +3567,8 @@ declare class WebContextMenuResult { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ copy(): void; @@ -3343,7 +3587,8 @@ declare class WebContextMenuResult { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ paste(): void; @@ -3358,7 +3603,8 @@ declare class WebContextMenuResult { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ cut(): void; @@ -3373,7 +3619,8 @@ declare class WebContextMenuResult { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ selectAll(): void; @@ -3414,7 +3661,8 @@ declare class WebContextMenuResult { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare class ConsoleMessage { /** @@ -3443,7 +3691,8 @@ declare class ConsoleMessage { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -3461,7 +3710,8 @@ declare class ConsoleMessage { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMessage(): string; @@ -3487,7 +3737,8 @@ declare class ConsoleMessage { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getSourceId(): string; @@ -3513,7 +3764,8 @@ declare class ConsoleMessage { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getLineNumber(): number; @@ -3531,7 +3783,8 @@ declare class ConsoleMessage { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getMessageLevel(): MessageLevel; } @@ -3561,7 +3814,8 @@ declare class ConsoleMessage { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare class WebResourceRequest { /** @@ -3583,7 +3837,8 @@ declare class WebResourceRequest { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -3609,7 +3864,8 @@ declare class WebResourceRequest { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getRequestHeader(): Array
    ; @@ -3635,7 +3891,8 @@ declare class WebResourceRequest { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getRequestUrl(): string; @@ -3661,7 +3918,8 @@ declare class WebResourceRequest { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ isRequestGesture(): boolean; @@ -3687,7 +3945,8 @@ declare class WebResourceRequest { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ isMainFrame(): boolean; @@ -3713,7 +3972,8 @@ declare class WebResourceRequest { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ isRedirect(): boolean; @@ -3739,7 +3999,8 @@ declare class WebResourceRequest { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getRequestMethod(): string; } @@ -3756,7 +4017,8 @@ declare class WebResourceRequest { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare class WebResourceResponse { /** @@ -3771,7 +4033,8 @@ declare class WebResourceResponse { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -3797,7 +4060,8 @@ declare class WebResourceResponse { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getResponseData(): string; @@ -3822,7 +4086,8 @@ declare class WebResourceResponse { * ArrayBuffer type indicate binary data. * @syscap SystemCapability.Web.Webview.Core * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getResponseDataEx(): string | number | ArrayBuffer | Resource | undefined; @@ -3840,7 +4105,8 @@ declare class WebResourceResponse { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getResponseEncoding(): string; @@ -3858,7 +4124,8 @@ declare class WebResourceResponse { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getResponseMimeType(): string; @@ -3884,7 +4151,8 @@ declare class WebResourceResponse { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getReasonMessage(): string; @@ -3910,7 +4178,8 @@ declare class WebResourceResponse { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getResponseHeader(): Array
    ; @@ -3928,7 +4197,8 @@ declare class WebResourceResponse { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getResponseCode(): number; @@ -3959,7 +4229,8 @@ declare class WebResourceResponse { * ArrayBuffer type indicate binary data. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setResponseData(data: string | number | Resource | ArrayBuffer): void; @@ -3984,7 +4255,8 @@ declare class WebResourceResponse { * @param { string } encoding the response encoding. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ setResponseEncoding(encoding: string): void; @@ -4009,7 +4281,8 @@ declare class WebResourceResponse { * @param { string } mimeType the response MIME type. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ setResponseMimeType(mimeType: string): void; @@ -4034,7 +4307,8 @@ declare class WebResourceResponse { * @param { string } reason the reason message. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ setReasonMessage(reason: string): void; @@ -4059,7 +4333,8 @@ declare class WebResourceResponse { * @param { Array
    } header the response headers. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ setResponseHeader(header: Array
    ): void; @@ -4084,7 +4359,8 @@ declare class WebResourceResponse { * @param { number } code the response code. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ setResponseCode(code: number): void; @@ -4109,7 +4385,8 @@ declare class WebResourceResponse { * @param { boolean } IsReady whether the response is ready. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ setResponseIsReady(IsReady: boolean): void; @@ -4126,7 +4403,8 @@ declare class WebResourceResponse { * @returns { boolean } True indicates the response data is ready and false is not ready. * @syscap SystemCapability.Web.Webview.Core * @crossplatform - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getResponseIsReady(): boolean; } @@ -4161,7 +4439,8 @@ declare class WebResourceResponse { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface Header { /** @@ -4186,7 +4465,8 @@ declare interface Header { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ headerKey: string; @@ -4212,7 +4492,8 @@ declare interface Header { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ headerValue: string; } @@ -4236,7 +4517,8 @@ declare interface Header { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare class WebResourceError { /** @@ -4258,7 +4540,8 @@ declare class WebResourceError { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -4284,7 +4567,8 @@ declare class WebResourceError { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getErrorInfo(): string; @@ -4310,7 +4594,8 @@ declare class WebResourceError { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getErrorCode(): number; } @@ -4327,7 +4612,8 @@ declare class WebResourceError { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare class JsGeolocation { /** @@ -4342,7 +4628,8 @@ declare class JsGeolocation { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -4369,7 +4656,8 @@ declare class JsGeolocation { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ invoke(origin: string, allow: boolean, retain: boolean): void; } @@ -4433,7 +4721,8 @@ declare class WebCookie { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare class EventResult { /** @@ -4441,7 +4730,8 @@ declare class EventResult { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ constructor(); @@ -4454,7 +4744,8 @@ declare class EventResult { * Default value: true. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ setGestureEventResult(result: boolean): void; @@ -4471,16 +4762,23 @@ declare class EventResult { * {@code false} Indicates the propagation of events farther along. * Default value: true. * @syscap SystemCapability.Web.Webview.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ setGestureEventResult(result: boolean, stopPropagation: boolean): void; /** * Sets the mouse event consumption result. * - * @param { boolean } result - True if the event is consumed. - * @param { boolean } [stopPropagation] - {@code true} means to prevent mouse events from bubbling up - * {code false} otherwise, The default value is true. + * @param { boolean } result - Whether to consume the mouse event. + * {@code true} Indicates the consumption of the mouse event. + * {@code false} Indicates the non-consumption of the mouse event. + * Default value: true. + * @param { boolean } [stopPropagation] - Whether to stop propagation. + * This parameter is valid only when result is set to true. + * {@code true} Indicates stops the propagation of events farther along. + * {@code false} Indicates the propagation of events farther along. + * Default value: true. * @syscap SystemCapability.Web.Webview.Core * @since 20 */ @@ -4748,7 +5046,8 @@ declare class WebController { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface WebOptions { /** @@ -4777,7 +5076,8 @@ declare interface WebOptions { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ src: string | Resource; @@ -4807,6 +5107,7 @@ declare interface WebOptions { * Controller, through which you can control various behaviors of Web components * (including page navigation, declaring cycle state, JavaScript interaction and other behaviors). * Since API Version 9, WebController is no longer maintained, so it is recommended to use WebviewController instead. + * * @type { WebController | WebviewController } * @syscap SystemCapability.Web.Webview.Core * @crossplatform @@ -4816,14 +5117,26 @@ declare interface WebOptions { controller: WebController | WebviewController; /** - * Rendering mode. - * RenderMode.ASYNC_RENDER (default, cannot be dynamically adjusted): The Web component is rendered asynchronously. - * RenderMode.SYNC_RENDER: The Web component is rendered synchronously within the current execution context. + * Sets the controller of the Web. + * + * @type { WebviewController } + * @syscap SystemCapability.Web.Webview.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + controller: WebviewController; + + /** + * Rendering mode. + * RenderMode.ASYNC_RENDER (default, cannot be dynamically adjusted): The Web component is rendered asynchronously. + * RenderMode.SYNC_RENDER: The Web component is rendered synchronously within the current execution context. * * @type { ?RenderMode } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ renderMode? : RenderMode; @@ -4846,7 +5159,8 @@ declare interface WebOptions { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ incognitoMode? : boolean; @@ -4859,7 +5173,8 @@ declare interface WebOptions { * * @type { ?string } * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ sharedRenderProcessToken? : string; } @@ -4878,7 +5193,8 @@ declare interface WebOptions { * @typedef ScriptItem * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface ScriptItem { /** @@ -4887,7 +5203,8 @@ declare interface ScriptItem { * @type { string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ script: string; @@ -4897,7 +5214,8 @@ declare interface ScriptItem { * @type { Array } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ scriptRules: Array; } @@ -4916,7 +5234,8 @@ declare interface ScriptItem { * @typedef LoadCommittedDetails * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface LoadCommittedDetails { /** @@ -4925,7 +5244,8 @@ declare interface LoadCommittedDetails { * @type { boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isMainFrame: boolean; @@ -4939,7 +5259,8 @@ declare interface LoadCommittedDetails { * @type { boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isSameDocument: boolean; @@ -4951,7 +5272,8 @@ declare interface LoadCommittedDetails { * @type { boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ didReplaceEntry: boolean; @@ -4961,7 +5283,8 @@ declare interface LoadCommittedDetails { * @type { WebNavigationType } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ navigationType: WebNavigationType; @@ -4971,7 +5294,8 @@ declare interface LoadCommittedDetails { * @type { string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ url: string; } @@ -4982,7 +5306,8 @@ declare interface LoadCommittedDetails { * @typedef IntelligentTrackingPreventionDetails * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface IntelligentTrackingPreventionDetails { /** @@ -4991,7 +5316,8 @@ declare interface IntelligentTrackingPreventionDetails { * @type { string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ host: string; @@ -5001,7 +5327,8 @@ declare interface IntelligentTrackingPreventionDetails { * @type { string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ trackerHost: string; } @@ -5037,36 +5364,38 @@ declare interface IntelligentTrackingPreventionDetails { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface WebInterface { /** - * Sets Value. - * - * @param { WebOptions } value - * @returns { WebAttribute } - * @syscap SystemCapability.Web.Webview.Core - * @since 8 - */ - /** - * Sets Value. - * - * @param { WebOptions } value - * @returns { WebAttribute } - * @syscap SystemCapability.Web.Webview.Core - * @crossplatform - * @since 10 - */ - /** - * Sets Value. - * - * @param { WebOptions } value - * @returns { WebAttribute } - * @syscap SystemCapability.Web.Webview.Core - * @crossplatform - * @atomicservice - * @since 11 - */ + * Sets Value. + * + * @param { WebOptions } value + * @returns { WebAttribute } + * @syscap SystemCapability.Web.Webview.Core + * @since 8 + */ + /** + * Sets Value. + * + * @param { WebOptions } value + * @returns { WebAttribute } + * @syscap SystemCapability.Web.Webview.Core + * @crossplatform + * @since 10 + */ + /** + * Sets Value. + * + * @param { WebOptions } value + * @returns { WebAttribute } + * @syscap SystemCapability.Web.Webview.Core + * @crossplatform + * @atomicservice + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 + */ (value: WebOptions): WebAttribute; } @@ -5084,7 +5413,8 @@ interface WebInterface { * @typedef NativeEmbedInfo * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface NativeEmbedInfo { /** @@ -5093,7 +5423,8 @@ declare interface NativeEmbedInfo { * @type { ?string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ id?: string; @@ -5103,7 +5434,8 @@ declare interface NativeEmbedInfo { * @type { ?string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ type?: string; @@ -5113,7 +5445,8 @@ declare interface NativeEmbedInfo { * @type { ?string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ src?: string; @@ -5123,7 +5456,8 @@ declare interface NativeEmbedInfo { * @type { ?Position } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ position?: Position; @@ -5133,7 +5467,8 @@ declare interface NativeEmbedInfo { * @type { ?number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ width?: number; @@ -5143,7 +5478,8 @@ declare interface NativeEmbedInfo { * @type { ?number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ height?: number; @@ -5153,7 +5489,8 @@ declare interface NativeEmbedInfo { * @type { ?string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ url?: string; @@ -5163,7 +5500,8 @@ declare interface NativeEmbedInfo { * @type { ?string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ tag?: string; @@ -5173,7 +5511,8 @@ declare interface NativeEmbedInfo { * @type { ?Map } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ params?: Map; } @@ -5192,7 +5531,8 @@ declare interface NativeEmbedInfo { * @typedef NativeEmbedDataInfo * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface NativeEmbedDataInfo { /** @@ -5201,7 +5541,8 @@ declare interface NativeEmbedDataInfo { * @type { ?NativeEmbedStatus } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ status?: NativeEmbedStatus; @@ -5211,7 +5552,8 @@ declare interface NativeEmbedDataInfo { * @type { ?string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ surfaceId?: string; @@ -5221,7 +5563,8 @@ declare interface NativeEmbedDataInfo { * @type { ?string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ embedId?: string; @@ -5231,7 +5574,8 @@ declare interface NativeEmbedDataInfo { * @type { ?NativeEmbedInfo } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ info?: NativeEmbedInfo; } @@ -5241,7 +5585,8 @@ declare interface NativeEmbedDataInfo { * * @typedef NativeEmbedVisibilityInfo * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface NativeEmbedVisibilityInfo { /** @@ -5249,7 +5594,8 @@ declare interface NativeEmbedVisibilityInfo { * * @type { boolean } * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ visibility: boolean; @@ -5258,7 +5604,8 @@ declare interface NativeEmbedVisibilityInfo { * * @type { string } * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ embedId: string; } @@ -5277,7 +5624,8 @@ declare interface NativeEmbedVisibilityInfo { * @typedef NativeEmbedTouchInfo * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface NativeEmbedTouchInfo { /** @@ -5286,7 +5634,8 @@ declare interface NativeEmbedTouchInfo { * @type { ?string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ embedId?: string; @@ -5296,7 +5645,8 @@ declare interface NativeEmbedTouchInfo { * @type { ?TouchEvent } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ touchEvent?: TouchEvent; @@ -5306,7 +5656,8 @@ declare interface NativeEmbedTouchInfo { * @type { ?EventResult } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ result?: EventResult; } @@ -5343,9 +5694,9 @@ declare interface NativeEmbedMouseInfo { * @type { ?EventResult } * @syscap SystemCapability.Web.Webview.Core * @since 20 - */ - result?: EventResult; -} + */ + result?: EventResult; + } /** * Defines the first content paint rendering of web page. @@ -5353,7 +5704,8 @@ declare interface NativeEmbedMouseInfo { * @typedef FirstMeaningfulPaint * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface FirstMeaningfulPaint { /** @@ -5362,7 +5714,8 @@ declare interface FirstMeaningfulPaint { * @type { ?number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ navigationStartTime?: number; @@ -5372,7 +5725,8 @@ declare interface FirstMeaningfulPaint { * @type { ?number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ firstMeaningfulPaintTime?: number; } @@ -5383,7 +5737,8 @@ declare interface FirstMeaningfulPaint { * @typedef LargestContentfulPaint * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface LargestContentfulPaint { /** @@ -5392,7 +5747,8 @@ declare interface LargestContentfulPaint { * @type { ?number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ navigationStartTime?: number; @@ -5402,7 +5758,8 @@ declare interface LargestContentfulPaint { * @type { ?number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ largestImagePaintTime?: number; @@ -5412,7 +5769,8 @@ declare interface LargestContentfulPaint { * @type { ?number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ largestTextPaintTime?: number; @@ -5422,7 +5780,8 @@ declare interface LargestContentfulPaint { * @type { ?number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ imageBPP?: number; @@ -5432,7 +5791,8 @@ declare interface LargestContentfulPaint { * @type { ?number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ largestImageLoadStartTime?: number; @@ -5442,7 +5802,8 @@ declare interface LargestContentfulPaint { * @type { ?number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ largestImageLoadEndTime?: number; } @@ -5452,7 +5813,8 @@ declare interface LargestContentfulPaint { * * @interface RenderProcessNotRespondingData * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface RenderProcessNotRespondingData { /** @@ -5460,7 +5822,8 @@ declare interface RenderProcessNotRespondingData { * * @type { string } * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ jsStack: string; @@ -5469,7 +5832,8 @@ declare interface RenderProcessNotRespondingData { * * @type { number } * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ pid: number; @@ -5478,7 +5842,8 @@ declare interface RenderProcessNotRespondingData { * * @type { RenderProcessNotRespondingReason } * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ reason: RenderProcessNotRespondingReason; } @@ -5490,7 +5855,8 @@ declare interface RenderProcessNotRespondingData { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnPageEndEvent { /** @@ -5500,7 +5866,8 @@ declare interface OnPageEndEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ url: string; } @@ -5512,7 +5879,8 @@ declare interface OnPageEndEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnPageBeginEvent { /** @@ -5522,7 +5890,8 @@ declare interface OnPageBeginEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ url: string; } @@ -5558,10 +5927,10 @@ declare interface OnLoadFinishedEvent { * * @type { string } * @syscap SystemCapability.Web.Webview.Core - * @since 20 - */ - url: string; -} + * @since 20 + */ + url: string; + } /** * Defines the triggered function when the page loading progress changes. @@ -5570,19 +5939,21 @@ declare interface OnLoadFinishedEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnProgressChangeEvent { /** * The new progress of the page. * - * @type { number } + * @type { int } * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ - newProgress: number; + newProgress: int; } /** @@ -5592,7 +5963,8 @@ declare interface OnProgressChangeEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnTitleReceiveEvent { /** @@ -5602,7 +5974,8 @@ declare interface OnTitleReceiveEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ title: string; @@ -5624,7 +5997,8 @@ declare interface OnTitleReceiveEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnGeolocationShowEvent { /** @@ -5634,7 +6008,8 @@ declare interface OnGeolocationShowEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ origin: string; @@ -5645,7 +6020,8 @@ declare interface OnGeolocationShowEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ geolocation: JsGeolocation; } @@ -5657,7 +6033,8 @@ declare interface OnGeolocationShowEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnAlertEvent { /** @@ -5667,7 +6044,8 @@ declare interface OnAlertEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ url: string; @@ -5678,7 +6056,8 @@ declare interface OnAlertEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ message: string; @@ -5689,7 +6068,8 @@ declare interface OnAlertEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ result: JsResult; } @@ -5709,7 +6089,8 @@ declare interface OnAlertEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnBeforeUnloadEvent { /** @@ -5727,7 +6108,8 @@ declare interface OnBeforeUnloadEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ url: string; @@ -5746,7 +6128,8 @@ declare interface OnBeforeUnloadEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ message: string; @@ -5765,7 +6148,8 @@ declare interface OnBeforeUnloadEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ result: JsResult; @@ -5787,7 +6171,8 @@ declare interface OnBeforeUnloadEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnConfirmEvent { /** @@ -5797,7 +6182,8 @@ declare interface OnConfirmEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ url: string; @@ -5808,7 +6194,8 @@ declare interface OnConfirmEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ message: string; @@ -5819,7 +6206,8 @@ declare interface OnConfirmEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ result: JsResult; } @@ -5831,7 +6219,8 @@ declare interface OnConfirmEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnPromptEvent { /** @@ -5841,7 +6230,8 @@ declare interface OnPromptEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ url: string; @@ -5852,7 +6242,8 @@ declare interface OnPromptEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ message: string; @@ -5863,7 +6254,8 @@ declare interface OnPromptEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ value: string; @@ -5874,7 +6266,8 @@ declare interface OnPromptEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ result: JsResult; } @@ -5886,7 +6279,8 @@ declare interface OnPromptEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnConsoleEvent { /** @@ -5896,7 +6290,8 @@ declare interface OnConsoleEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ message: ConsoleMessage; } @@ -5908,7 +6303,8 @@ declare interface OnConsoleEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnErrorReceiveEvent { /** @@ -5918,7 +6314,8 @@ declare interface OnErrorReceiveEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ request: WebResourceRequest; @@ -5929,7 +6326,8 @@ declare interface OnErrorReceiveEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ error: WebResourceError; } @@ -5941,7 +6339,8 @@ declare interface OnErrorReceiveEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnHttpErrorReceiveEvent { /** @@ -5951,7 +6350,8 @@ declare interface OnHttpErrorReceiveEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ request: WebResourceRequest; @@ -5962,7 +6362,8 @@ declare interface OnHttpErrorReceiveEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ response: WebResourceResponse; } @@ -5974,7 +6375,8 @@ declare interface OnHttpErrorReceiveEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnDownloadStartEvent { /** @@ -5984,7 +6386,8 @@ declare interface OnDownloadStartEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ url: string; @@ -5995,7 +6398,8 @@ declare interface OnDownloadStartEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ userAgent: string; @@ -6014,7 +6418,8 @@ declare interface OnDownloadStartEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ contentDisposition: string; @@ -6025,7 +6430,8 @@ declare interface OnDownloadStartEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ mimetype: string; @@ -6036,7 +6442,8 @@ declare interface OnDownloadStartEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ contentLength: number; } @@ -6056,7 +6463,8 @@ declare interface OnDownloadStartEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnRefreshAccessedHistoryEvent { /** @@ -6074,7 +6482,8 @@ declare interface OnRefreshAccessedHistoryEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ url: string; @@ -6093,7 +6502,8 @@ declare interface OnRefreshAccessedHistoryEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ isRefreshed: boolean; } @@ -6104,7 +6514,8 @@ declare interface OnRefreshAccessedHistoryEvent { * @typedef OnRenderExitedEvent * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnRenderExitedEvent { /** @@ -6113,7 +6524,8 @@ declare interface OnRenderExitedEvent { * @type { RenderExitReason } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ renderExitReason: RenderExitReason; } @@ -6125,7 +6537,8 @@ declare interface OnRenderExitedEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnShowFileSelectorEvent { /** @@ -6135,7 +6548,8 @@ declare interface OnShowFileSelectorEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ result: FileSelectorResult; @@ -6146,7 +6560,8 @@ declare interface OnShowFileSelectorEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ fileSelector: FileSelectorParam; } @@ -6157,7 +6572,8 @@ declare interface OnShowFileSelectorEvent { * @typedef OnResourceLoadEvent * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnResourceLoadEvent { /** @@ -6166,7 +6582,8 @@ declare interface OnResourceLoadEvent { * @type { string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ url: string; } @@ -6178,7 +6595,8 @@ declare interface OnResourceLoadEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnScaleChangeEvent { /** @@ -6188,7 +6606,8 @@ declare interface OnScaleChangeEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ oldScale: number; @@ -6199,7 +6618,8 @@ declare interface OnScaleChangeEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ newScale: number; } @@ -6211,7 +6631,8 @@ declare interface OnScaleChangeEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnHttpAuthRequestEvent { /** @@ -6221,7 +6642,8 @@ declare interface OnHttpAuthRequestEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ handler: HttpAuthHandler; @@ -6232,7 +6654,8 @@ declare interface OnHttpAuthRequestEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ host: string; @@ -6243,7 +6666,8 @@ declare interface OnHttpAuthRequestEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ realm: string; } @@ -6254,7 +6678,8 @@ declare interface OnHttpAuthRequestEvent { * @typedef OnInterceptRequestEvent * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnInterceptRequestEvent { /** @@ -6263,7 +6688,8 @@ declare interface OnInterceptRequestEvent { * @type { WebResourceRequest } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ request: WebResourceRequest; } @@ -6276,7 +6702,8 @@ declare interface OnInterceptRequestEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnPermissionRequestEvent { /** @@ -6286,7 +6713,8 @@ declare interface OnPermissionRequestEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ request: PermissionRequest; } @@ -6298,7 +6726,8 @@ declare interface OnPermissionRequestEvent { * @typedef OnScreenCaptureRequestEvent * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnScreenCaptureRequestEvent { /** @@ -6307,7 +6736,8 @@ declare interface OnScreenCaptureRequestEvent { * @type { ScreenCaptureHandler } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ handler: ScreenCaptureHandler; } @@ -6318,7 +6748,8 @@ declare interface OnScreenCaptureRequestEvent { * @typedef OnContextMenuShowEvent * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnContextMenuShowEvent { /** @@ -6327,7 +6758,8 @@ declare interface OnContextMenuShowEvent { * @type { WebContextMenuParam } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ param: WebContextMenuParam; @@ -6337,7 +6769,8 @@ declare interface OnContextMenuShowEvent { * @type { WebContextMenuResult } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ result: WebContextMenuResult; } @@ -6348,7 +6781,8 @@ declare interface OnContextMenuShowEvent { * @typedef OnSearchResultReceiveEvent * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnSearchResultReceiveEvent { /** @@ -6357,7 +6791,8 @@ declare interface OnSearchResultReceiveEvent { * @type { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ activeMatchOrdinal: number; @@ -6367,7 +6802,8 @@ declare interface OnSearchResultReceiveEvent { * @type { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ numberOfMatches: number; @@ -6377,7 +6813,8 @@ declare interface OnSearchResultReceiveEvent { * @type { boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ isDoneCounting: boolean; } @@ -6389,7 +6826,8 @@ declare interface OnSearchResultReceiveEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnScrollEvent { /** @@ -6399,7 +6837,8 @@ declare interface OnScrollEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ xOffset: number; @@ -6410,7 +6849,8 @@ declare interface OnScrollEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ yOffset: number; } @@ -6421,7 +6861,8 @@ declare interface OnScrollEvent { * @typedef OnSslErrorEventReceiveEvent * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnSslErrorEventReceiveEvent { /** @@ -6430,7 +6871,8 @@ declare interface OnSslErrorEventReceiveEvent { * @type { SslErrorHandler } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ handler: SslErrorHandler; @@ -6440,7 +6882,8 @@ declare interface OnSslErrorEventReceiveEvent { * @type { SslError } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ error: SslError; @@ -6449,7 +6892,8 @@ declare interface OnSslErrorEventReceiveEvent { * * @type { ?Array } * @syscap SystemCapability.Web.Webview.Core - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ certChainData?: Array; } @@ -6460,7 +6904,8 @@ declare interface OnSslErrorEventReceiveEvent { * @typedef OnClientAuthenticationEvent * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnClientAuthenticationEvent { /** @@ -6469,7 +6914,8 @@ declare interface OnClientAuthenticationEvent { * @type { ClientAuthenticationHandler } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ handler : ClientAuthenticationHandler; @@ -6479,7 +6925,8 @@ declare interface OnClientAuthenticationEvent { * @type { string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ host : string; @@ -6489,7 +6936,8 @@ declare interface OnClientAuthenticationEvent { * @type { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ port : number; @@ -6499,7 +6947,8 @@ declare interface OnClientAuthenticationEvent { * @type { Array } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ keyTypes : Array; @@ -6509,7 +6958,8 @@ declare interface OnClientAuthenticationEvent { * @type { Array } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ issuers : Array; } @@ -6520,7 +6970,8 @@ declare interface OnClientAuthenticationEvent { * @typedef OnWindowNewEvent * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnWindowNewEvent { /** @@ -6529,7 +6980,8 @@ declare interface OnWindowNewEvent { * @type { boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ isAlert: boolean; @@ -6539,7 +6991,8 @@ declare interface OnWindowNewEvent { * @type { boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ isUserTrigger: boolean; @@ -6549,7 +7002,8 @@ declare interface OnWindowNewEvent { * @type { string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ targetUrl: string; @@ -6559,7 +7013,8 @@ declare interface OnWindowNewEvent { * @type { ControllerHandler } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ handler: ControllerHandler; } @@ -6570,7 +7025,8 @@ declare interface OnWindowNewEvent { * @typedef OnTouchIconUrlReceivedEvent * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnTouchIconUrlReceivedEvent { /** @@ -6579,7 +7035,8 @@ declare interface OnTouchIconUrlReceivedEvent { * @type { string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ url: string; @@ -6589,7 +7046,8 @@ declare interface OnTouchIconUrlReceivedEvent { * @type { boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ precomposed: boolean; } @@ -6600,7 +7058,8 @@ declare interface OnTouchIconUrlReceivedEvent { * @typedef OnFaviconReceivedEvent * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnFaviconReceivedEvent { /** @@ -6612,6 +7071,16 @@ declare interface OnFaviconReceivedEvent { * @since 12 */ favicon: PixelMap; + + /** + * Received the Favicon icon for the image.PixelMap object. + * + * @type { image.PixelMap } + * @syscap SystemCapability.Web.Webview.Core + * @since 20 + * @arkts 1.2 + */ + favicon: image.PixelMap; } /** @@ -6621,7 +7090,8 @@ declare interface OnFaviconReceivedEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnPageVisibleEvent { /** @@ -6631,7 +7101,8 @@ declare interface OnPageVisibleEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ url: string; } @@ -6642,7 +7113,8 @@ declare interface OnPageVisibleEvent { * @typedef OnDataResubmittedEvent * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnDataResubmittedEvent { /** @@ -6651,7 +7123,8 @@ declare interface OnDataResubmittedEvent { * @type { DataResubmissionHandler } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ handler: DataResubmissionHandler; } @@ -6662,7 +7135,8 @@ declare interface OnDataResubmittedEvent { * @typedef OnAudioStateChangedEvent * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnAudioStateChangedEvent { /** @@ -6671,7 +7145,8 @@ declare interface OnAudioStateChangedEvent { * @type { boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ playing: boolean; } @@ -6682,7 +7157,8 @@ declare interface OnAudioStateChangedEvent { * @typedef OnFirstContentfulPaintEvent * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnFirstContentfulPaintEvent { /** @@ -6691,7 +7167,8 @@ declare interface OnFirstContentfulPaintEvent { * @type { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ navigationStartTick: number; @@ -6701,7 +7178,8 @@ declare interface OnFirstContentfulPaintEvent { * @type { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ firstContentfulPaintMs: number; } @@ -6713,7 +7191,8 @@ declare interface OnFirstContentfulPaintEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnLoadInterceptEvent { /** @@ -6723,7 +7202,8 @@ declare interface OnLoadInterceptEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ data: WebResourceRequest; } @@ -6734,7 +7214,8 @@ declare interface OnLoadInterceptEvent { * @typedef OnOverScrollEvent * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnOverScrollEvent { /** @@ -6744,7 +7225,8 @@ declare interface OnOverScrollEvent { * @type { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ xOffset: number; @@ -6755,7 +7237,8 @@ declare interface OnOverScrollEvent { * @type { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ yOffset: number; } @@ -6776,6 +7259,7 @@ declare interface OnOverScrollEvent { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ declare interface JavaScriptProxy { /** @@ -6794,6 +7278,7 @@ declare interface JavaScriptProxy { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ object: object; @@ -6815,6 +7300,7 @@ declare interface JavaScriptProxy { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ name: string; @@ -6836,6 +7322,7 @@ declare interface JavaScriptProxy { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ methodList: Array; @@ -6858,6 +7345,17 @@ declare interface JavaScriptProxy { */ controller: WebController | WebviewController; + /** + * Controller. + * + * @type { WebviewController } + * @syscap SystemCapability.Web.Webview.Core + * @crossplatform + * @since 20 + * @arkts 1.2 + */ + controller: WebviewController; + /** * The async method of the application side JavaScript object participating in the registration. * @@ -6874,6 +7372,7 @@ declare interface JavaScriptProxy { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ asyncMethodList?: Array; @@ -6884,7 +7383,8 @@ declare interface JavaScriptProxy { * @type { ?string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ permission?: string; } @@ -6895,7 +7395,8 @@ declare interface JavaScriptProxy { * @enum { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum WebKeyboardAvoidMode { /** @@ -6903,7 +7404,8 @@ declare enum WebKeyboardAvoidMode { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ RESIZE_VISUAL = 0, @@ -6913,7 +7415,8 @@ declare enum WebKeyboardAvoidMode { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ RESIZE_CONTENT = 1, @@ -6922,7 +7425,8 @@ declare enum WebKeyboardAvoidMode { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ OVERLAYS_CONTENT = 2 } @@ -6932,14 +7436,16 @@ declare enum WebKeyboardAvoidMode { * * @enum { number } * @syscap SystemCapability.Web.Webview.Core - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum WebElementType { /** * Image,corresponding HTML image type. * * @syscap SystemCapability.Web.Webview.Core - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ IMAGE = 1, @@ -6948,7 +7454,7 @@ declare enum WebElementType { * * @syscap SystemCapability.Web.Webview.Core * @since 20 - */ + */ LINK = 2 } @@ -6957,14 +7463,16 @@ declare enum WebElementType { * * @enum { number } * @syscap SystemCapability.Web.Webview.Core - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ declare enum WebResponseType { /** * Long press. * * @syscap SystemCapability.Web.Webview.Core - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ LONG_PRESS = 1 } @@ -7035,7 +7543,8 @@ declare interface PreviewMenuOptions { * * @typedef SelectionMenuOptionsExt * @syscap SystemCapability.Web.Webview.Core - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface SelectionMenuOptionsExt { /** @@ -7043,7 +7552,8 @@ declare interface SelectionMenuOptionsExt { * * @type { ?Callback } * @syscap SystemCapability.Web.Webview.Core - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ onAppear?: Callback; @@ -7052,7 +7562,8 @@ declare interface SelectionMenuOptionsExt { * * @type { ?Callback } * @syscap SystemCapability.Web.Webview.Core - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ onDisappear?: Callback; @@ -7061,7 +7572,8 @@ declare interface SelectionMenuOptionsExt { * * @type { ?CustomBuilder } * @syscap SystemCapability.Web.Webview.Core - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ preview?: CustomBuilder; @@ -7070,7 +7582,8 @@ declare interface SelectionMenuOptionsExt { * * @type { ?MenuType } * @syscap SystemCapability.Web.Webview.Core - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ menuType?: MenuType; @@ -7106,7 +7619,8 @@ declare interface SelectionMenuOptionsExt { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare class WebAttribute extends CommonMethod { /** @@ -7137,7 +7651,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ javaScriptAccess(javaScriptAccess: boolean): WebAttribute; @@ -7174,7 +7689,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ fileAccess(fileAccess: boolean): WebAttribute; @@ -7209,7 +7725,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ onlineImageAccess(onlineImageAccess: boolean): WebAttribute; @@ -7241,7 +7758,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ domStorageAccess(domStorageAccess: boolean): WebAttribute; @@ -7274,7 +7792,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ imageAccess(imageAccess: boolean): WebAttribute; @@ -7305,7 +7824,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ mixedMode(mixedMode: MixedMode): WebAttribute; @@ -7337,7 +7857,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ zoomAccess(zoomAccess: boolean): WebAttribute; @@ -7361,7 +7882,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ geolocationAccess(geolocationAccess: boolean): WebAttribute; @@ -7427,6 +7949,7 @@ declare class WebAttribute extends CommonMethod { * @crossplatform * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ javaScriptProxy(javaScriptProxy: JavaScriptProxy): WebAttribute; @@ -7466,7 +7989,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ cacheMode(cacheMode: CacheMode): WebAttribute; @@ -7489,7 +8013,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ darkMode(mode: WebDarkMode): WebAttribute; @@ -7512,7 +8037,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ forceDarkAccess(access: boolean): WebAttribute; @@ -7541,7 +8067,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ mediaOptions(options: WebMediaOptions): WebAttribute; @@ -7587,21 +8114,23 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ overviewModeAccess(overviewModeAccess: boolean): WebAttribute; /** * Sets the over-scroll mode for web * When the scrolling mode is enabled, when the user slides to the edge on the web root page, the web will bounce back - * the interface through elastic animation, and the internal pages on the root page will not trigger the bounce back. + * the interface through elastic animation, and the internal pages on the root page will not trigger the bounce back. * * @param { OverScrollMode } mode - The over-scroll mode, which can be {@link OverScrollMode}. * The default value is OverScrollMode.NEVER. * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ overScrollMode(mode: OverScrollMode): WebAttribute; @@ -7612,7 +8141,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ blurOnKeyboardHideMode(mode: BlurOnKeyboardHideMode): WebAttribute; @@ -7643,7 +8173,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ textZoomRatio(textZoomRatio: number): WebAttribute; @@ -7666,7 +8197,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ databaseAccess(databaseAccess: boolean): WebAttribute; @@ -7687,7 +8219,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ initialScale(percent: number): WebAttribute; @@ -7730,42 +8263,39 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ metaViewport(enabled: boolean): WebAttribute; /** * Triggered at the end of web page loading. - * This callback is only invoked for the main frame and not for subframes. * * @param { function } callback The triggered function at the end of web page loading. - * @returns { WebAttribute } The WebAttribute object representing the attributes of the web page. + * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @since 8 */ /** * Triggered at the end of web page loading. - * This callback is only invoked for the main frame and not for subframes. * * @param { function } callback The triggered function at the end of web page loading. - * @returns { WebAttribute } The WebAttribute object representing the attributes of the web page. + * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @since 10 */ /** * Triggered at the end of web page loading. - * This callback is only invoked for the main frame and not for subframes. * * @param { function } callback The triggered function at the end of web page loading. - * @returns { WebAttribute } The WebAttribute object representing the attributes of the web page. + * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice * @since 11 */ /** - * Triggered at the end of web page loading. * This callback is only invoked for the main frame and not for subframes. * * @param { Callback } callback The triggered function at the end of web page loading. @@ -7773,7 +8303,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onPageEnd(callback: Callback): WebAttribute; @@ -7813,7 +8344,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onPageBegin(callback: Callback): WebAttribute; @@ -7874,7 +8406,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onProgressChange(callback: Callback): WebAttribute; @@ -7906,7 +8439,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onTitleReceive(callback: Callback): WebAttribute; @@ -7927,7 +8461,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onGeolocationHide(callback: () => void): WebAttribute; @@ -7957,7 +8492,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onGeolocationShow(callback: Callback): WebAttribute; @@ -7976,7 +8512,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onRequestSelected(callback: () => void): WebAttribute; @@ -8010,7 +8547,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onAlert(callback: Callback): WebAttribute; @@ -8048,7 +8586,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ onBeforeUnload(callback: Callback): WebAttribute; @@ -8081,7 +8620,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onConfirm(callback: Callback): WebAttribute; @@ -8114,7 +8654,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onPrompt(callback: Callback): WebAttribute; @@ -8146,7 +8687,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onConsole(callback: Callback): WebAttribute; @@ -8185,7 +8727,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onErrorReceive(callback: Callback): WebAttribute; @@ -8215,7 +8758,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onHttpErrorReceive(callback: Callback): WebAttribute; @@ -8245,7 +8789,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onDownloadStart(callback: Callback): WebAttribute; @@ -8283,7 +8828,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ onRefreshAccessedHistory(callback: Callback): WebAttribute; @@ -8338,7 +8884,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onRenderExited(callback: Callback): WebAttribute; @@ -8373,7 +8920,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onShowFileSelector(callback: Callback): WebAttribute; @@ -8425,7 +8973,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onResourceLoad(callback: Callback): WebAttribute; @@ -8454,7 +9003,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ onFullScreenExit(callback: () => void): WebAttribute; @@ -8492,7 +9042,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ onFullScreenEnter(callback: OnFullScreenEnterCallback): WebAttribute; @@ -8522,7 +9073,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onScaleChange(callback: Callback): WebAttribute; @@ -8552,7 +9104,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onHttpAuthRequest(callback: Callback): WebAttribute; @@ -8580,7 +9133,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } If the response value is null, the Web will continue to load the resources. Otherwise, the response value will be used * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onInterceptRequest(callback: Callback): WebAttribute; @@ -8612,7 +9166,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onPermissionRequest(callback: Callback): WebAttribute; @@ -8640,7 +9195,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onScreenCaptureRequest(callback: Callback): WebAttribute; @@ -8670,7 +9226,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } If custom display return true.Otherwise, default display return false. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onContextMenuShow(callback: Callback): WebAttribute; @@ -8681,7 +9238,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onContextMenuHide(callback: OnContextMenuHideCallback): WebAttribute; @@ -8704,7 +9262,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ mediaPlayGestureAccess(access: boolean): WebAttribute; @@ -8735,7 +9294,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onSearchResultReceive(callback: Callback): WebAttribute; @@ -8765,13 +9325,13 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onScroll(callback: Callback): WebAttribute; /** - * Called to notify users when an SSL error occurs with a request for the main frame. - * To include errors with requests for subframes, use the OnSslErrorEvent API. + * Triggered when the Web page receives an ssl Error. * * @param { function } callback The triggered callback when the Web page receives an ssl Error. * @returns { WebAttribute } @@ -8779,8 +9339,7 @@ declare class WebAttribute extends CommonMethod { * @since 9 */ /** - * Called to notify users when an SSL error occurs with a request for the main frame. - * To include errors with requests for subframes, use the OnSslErrorEvent API. + * Triggered when the Web page receives an ssl Error. * * @param { function } callback The triggered callback when the Web page receives an ssl Error. * @returns { WebAttribute } @@ -8796,7 +9355,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onSslErrorEventReceive(callback: Callback): WebAttribute; @@ -8808,7 +9368,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onSslErrorEvent(callback: OnSslErrorEventCallback): WebAttribute; @@ -8836,7 +9397,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onClientAuthenticationRequest(callback: Callback): WebAttribute; @@ -8873,7 +9435,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onWindowNew(callback: Callback): WebAttribute; @@ -8893,7 +9456,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onWindowExit(callback: () => void): WebAttribute; @@ -8914,7 +9478,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ multiWindowAccess(multiWindow: boolean): WebAttribute; @@ -8933,7 +9498,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } True if the application consumes key events else false. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onInterceptKeyEvent(callback: (event: KeyEvent) => boolean): WebAttribute; @@ -8953,7 +9519,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ webStandardFont(family: string): WebAttribute; @@ -8973,7 +9540,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ webSerifFont(family: string): WebAttribute; @@ -8993,7 +9561,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ webSansSerifFont(family: string): WebAttribute; @@ -9013,7 +9582,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ webFixedFont(family: string): WebAttribute; @@ -9033,7 +9603,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ webFantasyFont(family: string): WebAttribute; @@ -9053,7 +9624,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ webCursiveFont(family: string): WebAttribute; @@ -9075,7 +9647,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ defaultFixedFontSize(size: number): WebAttribute; @@ -9096,7 +9669,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ defaultFontSize(size: number): WebAttribute; @@ -9119,7 +9693,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ minFontSize(size: number): WebAttribute; @@ -9141,7 +9716,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ minLogicalFontSize(size: number): WebAttribute; @@ -9152,7 +9728,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ defaultTextEncodingFormat(textEncodingFormat: string): WebAttribute; @@ -9163,7 +9740,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ forceDisplayScrollBar(enabled: boolean): WebAttribute; @@ -9192,7 +9770,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ blockNetwork(block: boolean): WebAttribute; @@ -9219,7 +9798,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ horizontalScrollBarAccess(horizontalScrollBar: boolean): WebAttribute; @@ -9246,7 +9826,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ verticalScrollBarAccess(verticalScrollBar: boolean): WebAttribute; @@ -9277,7 +9858,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onTouchIconUrlReceived(callback: Callback): WebAttribute; @@ -9308,7 +9890,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onFaviconReceived(callback: Callback): WebAttribute; @@ -9341,7 +9924,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onPageVisible(callback: Callback): WebAttribute; @@ -9369,7 +9953,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onDataResubmitted(callback: Callback): WebAttribute; @@ -9391,7 +9976,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ pinchSmooth(isEnabled: boolean): WebAttribute; @@ -9431,7 +10017,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ allowWindowOpenMethod(flag: boolean): WebAttribute; @@ -9459,7 +10046,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onAudioStateChanged(callback: Callback): WebAttribute; @@ -9487,7 +10075,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onFirstContentfulPaint(callback: Callback): WebAttribute; @@ -9498,7 +10087,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onFirstMeaningfulPaint(callback: OnFirstMeaningfulPaintCallback): WebAttribute; @@ -9509,7 +10099,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onLargestContentfulPaint(callback: OnLargestContentfulPaintCallback): WebAttribute; @@ -9539,7 +10130,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onLoadIntercept(callback: Callback): WebAttribute; @@ -9563,7 +10155,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onControllerAttached(callback: () => void): WebAttribute; @@ -9588,7 +10181,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onOverScroll(callback: Callback): WebAttribute; @@ -9599,7 +10193,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onSafeBrowsingCheckResult(callback: OnSafeBrowsingCheckResultCallback): WebAttribute; @@ -9610,7 +10205,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onNavigationEntryCommitted(callback: OnNavigationEntryCommittedCallback): WebAttribute; @@ -9621,7 +10217,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onIntelligentTrackingPreventionResult(callback: OnIntelligentTrackingPreventionCallback): WebAttribute; @@ -9642,7 +10239,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ javaScriptOnDocumentStart(scripts: Array): WebAttribute; @@ -9663,7 +10261,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ javaScriptOnDocumentEnd(scripts: Array): WebAttribute; @@ -9691,7 +10290,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ layoutMode(mode: WebLayoutMode): WebAttribute; @@ -9725,7 +10325,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } the attribute of the scroll. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ nestedScroll(value: NestedScrollOptions | NestedScrollOptionsExt): WebAttribute; @@ -9742,7 +10343,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ enableNativeEmbedMode(mode: boolean): WebAttribute; @@ -9761,7 +10363,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ registerNativeEmbedRule(tag: string, type:string): WebAttribute; @@ -9778,7 +10381,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onNativeEmbedLifecycleChange(callback: (event: NativeEmbedDataInfo) => void): WebAttribute; @@ -9793,7 +10397,8 @@ declare class WebAttribute extends CommonMethod { * @param { OnNativeEmbedVisibilityChangeCallback } callback - Callback triggered when embed visibility changes. * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onNativeEmbedVisibilityChange(callback: OnNativeEmbedVisibilityChangeCallback): WebAttribute; @@ -9810,7 +10415,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onNativeEmbedGestureEvent(callback: (event: NativeEmbedTouchInfo) => void): WebAttribute; @@ -9831,7 +10437,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } the attribute of the scroll. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ copyOptions(value: CopyOptions): WebAttribute; @@ -9843,7 +10450,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onOverrideUrlLoading(callback: OnOverrideUrlLoadingCallback): WebAttribute; @@ -9857,7 +10465,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ textAutosizing(textAutosizing: boolean): WebAttribute; @@ -9871,7 +10480,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enableNativeMediaPlayer(config: NativeMediaPlayerConfig): WebAttribute; @@ -9886,7 +10496,8 @@ declare class WebAttribute extends CommonMethod { * @param { OnRenderProcessNotRespondingCallback } callback The triggered function when render process not responding. * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onRenderProcessNotResponding(callback: OnRenderProcessNotRespondingCallback): WebAttribute; @@ -9897,7 +10508,8 @@ declare class WebAttribute extends CommonMethod { * @param { OnRenderProcessRespondingCallback } callback The triggered function when the unresponsive render process becomes responsive. * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onRenderProcessResponding(callback: OnRenderProcessRespondingCallback): WebAttribute; @@ -9929,7 +10541,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onViewportFitChanged(callback: OnViewportFitChangedCallback): WebAttribute; @@ -9944,7 +10557,8 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onInterceptKeyboardAttach(callback: WebKeyboardCallback): WebAttribute; @@ -9957,20 +10571,23 @@ declare class WebAttribute extends CommonMethod { * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onAdsBlocked(callback: OnAdsBlockedCallback): WebAttribute; /** * When the keyboard avoidance mode set by UIContext is {@link KeyboardAvoidMode.RESIZE} mode, * the interface function will not take effect. + * * @param { WebKeyboardAvoidMode } mode - The web keyboard avoid mode, which can be {@link WebKeyboardAvoidMode}. * Web soft keyboard avoidance is not recommended in nested scrolling scenes, * including RESIZE_VISUAL and RESIZE_CONTENT. * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ keyboardAvoidMode(mode: WebKeyboardAvoidMode): WebAttribute; @@ -9996,7 +10613,8 @@ declare class WebAttribute extends CommonMethod { * and the input value is -1. * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ editMenuOptions(editMenu: EditMenuOptions): WebAttribute; @@ -10006,7 +10624,8 @@ declare class WebAttribute extends CommonMethod { * @param { boolean } enabled - Default value is true, set false to disable haptic feedback. * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ enableHapticFeedback(enabled: boolean): WebAttribute; @@ -10019,7 +10638,8 @@ declare class WebAttribute extends CommonMethod { * @param { SelectionMenuOptionsExt } [options] - Indicates the options of selection menu. * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ bindSelectionMenu(elementType: WebElementType, content: CustomBuilder, responseType: WebResponseType, options?: SelectionMenuOptionsExt): WebAttribute; @@ -10030,7 +10650,8 @@ declare class WebAttribute extends CommonMethod { * @param { boolean} optimizeParserBudget Default value is false, set true to enable optimize parser budget. * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ optimizeParserBudget(optimizeParserBudget: boolean): WebAttribute; @@ -10040,7 +10661,8 @@ declare class WebAttribute extends CommonMethod { * @param { boolean } follow The value true means to follow the system font weight, and false means the opposite. * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ enableFollowSystemFontWeight(follow: boolean): WebAttribute; @@ -10050,7 +10672,8 @@ declare class WebAttribute extends CommonMethod { * @param { boolean } enabled Whether to enable AVSession. The value true means to enable AVSession, and false means the opposite. * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ enableWebAVSession(enabled: boolean): WebAttribute; @@ -10060,7 +10683,8 @@ declare class WebAttribute extends CommonMethod { * @param { Array } scripts - The JavaScripts executed in array order. * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ runJavaScriptOnDocumentStart(scripts: Array): WebAttribute; @@ -10070,7 +10694,8 @@ declare class WebAttribute extends CommonMethod { * @param { Array } scripts - The JavaScripts executed in array order. * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ runJavaScriptOnDocumentEnd(scripts: Array): WebAttribute; @@ -10080,7 +10705,8 @@ declare class WebAttribute extends CommonMethod { * @param { Array } scripts - The JavaScripts executed in array order. * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ runJavaScriptOnHeadEnd(scripts: Array): WebAttribute; @@ -10090,7 +10716,8 @@ declare class WebAttribute extends CommonMethod { * @param { EmbedOptions } options The embed options, which can be {@link EmbedOptions}. * @returns { WebAttribute } * @syscap SystemCapability.Web.Webview.Core - * @since 16 + * @since arkts {'1.1':'16', '1.2':'20'} + * @arkts 1.1&1.2 */ nativeEmbedOptions(options?: EmbedOptions): WebAttribute; @@ -10206,7 +10833,8 @@ declare const WebInstance: WebAttribute; * @typedef SslErrorEvent * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface SslErrorEvent { /** @@ -10215,7 +10843,8 @@ declare interface SslErrorEvent { * @type { SslErrorHandler } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ handler: SslErrorHandler; @@ -10225,7 +10854,8 @@ declare interface SslErrorEvent { * @type { SslError } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ error: SslError; @@ -10235,7 +10865,8 @@ declare interface SslErrorEvent { * @type { string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ url: string; @@ -10245,7 +10876,8 @@ declare interface SslErrorEvent { * @type { string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ originalUrl: string; @@ -10255,7 +10887,8 @@ declare interface SslErrorEvent { * @type { string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ referrer: string; @@ -10265,7 +10898,8 @@ declare interface SslErrorEvent { * @type { boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ isFatalError: boolean; @@ -10275,18 +10909,10 @@ declare interface SslErrorEvent { * @type { boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ isMainFrame: boolean; - - /** - * Certificate chain data in DER format. - * - * @type { ?Array } - * @syscap SystemCapability.Web.Webview.Core - * @since 20 - */ - certChainData?: Array; } /** @@ -10338,7 +10964,8 @@ declare interface ExpandedMenuItemOptions { * * @interface NestedScrollOptionsExt * @syscap SystemCapability.Web.Webview.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface NestedScrollOptionsExt { /** @@ -10346,7 +10973,8 @@ declare interface NestedScrollOptionsExt { * * @type { ?NestedScrollMode } * @syscap SystemCapability.Web.Webview.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ scrollUp?: NestedScrollMode; @@ -10355,7 +10983,8 @@ declare interface NestedScrollOptionsExt { * * @type { ?NestedScrollMode } * @syscap SystemCapability.Web.Webview.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ scrollDown?: NestedScrollMode; @@ -10364,7 +10993,8 @@ declare interface NestedScrollOptionsExt { * * @type { ?NestedScrollMode } * @syscap SystemCapability.Web.Webview.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ scrollRight?: NestedScrollMode; @@ -10373,7 +11003,8 @@ declare interface NestedScrollOptionsExt { * * @type { ?NestedScrollMode } * @syscap SystemCapability.Web.Webview.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ scrollLeft?: NestedScrollMode; } @@ -10383,7 +11014,8 @@ declare interface NestedScrollOptionsExt { * * @typedef EmbedOptions * @syscap SystemCapability.Web.Webview.Core - * @since 16 + * @since arkts {'1.1':'16', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface EmbedOptions { /** @@ -10395,7 +11027,8 @@ declare interface EmbedOptions { * @type { ?boolean } * @default false * @syscap SystemCapability.Web.Webview.Core - * @since 16 + * @since arkts {'1.1':'16', '1.2':'20'} + * @arkts 1.1&1.2 */ supportDefaultIntrinsicSize?: boolean; @@ -10438,4 +11071,4 @@ declare enum GestureFocusMode { * @since 20 */ GESTURE_TAP_AND_LONG_PRESS = 1 -} \ No newline at end of file +} diff --git a/api/@ohos.web.netErrorList.d.ts b/api/@ohos.web.netErrorList.d.ts index 480ae74b90..11a0fd41d5 100644 --- a/api/@ohos.web.netErrorList.d.ts +++ b/api/@ohos.web.netErrorList.d.ts @@ -24,7 +24,8 @@ * @enum { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export declare enum WebNetErrorList { /** @@ -32,7 +33,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ NET_OK = 0, @@ -44,7 +46,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_IO_PENDING = -1, @@ -53,7 +56,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_FAILED = -2, @@ -62,7 +66,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_ABORTED = -3, @@ -71,7 +76,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_INVALID_ARGUMENT = -4, @@ -80,7 +86,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_INVALID_HANDLE = -5, @@ -89,7 +96,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_FILE_NOT_FOUND = -6, @@ -98,7 +106,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_TIMED_OUT = -7, @@ -107,7 +116,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_FILE_TOO_LARGE = -8, @@ -117,7 +127,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_UNEXPECTED = -9, @@ -126,7 +137,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_ACCESS_DENIED = -10, @@ -135,7 +147,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_NOT_IMPLEMENTED = -11, @@ -144,7 +157,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_INSUFFICIENT_RESOURCES = -12, @@ -153,7 +167,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_OUT_OF_MEMORY = -13, @@ -163,7 +178,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_UPLOAD_FILE_CHANGED = -14, @@ -172,7 +188,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SOCKET_NOT_CONNECTED = -15, @@ -181,7 +198,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_FILE_EXISTS = -16, @@ -190,7 +208,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_FILE_PATH_TOO_LONG = -17, @@ -199,7 +218,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_FILE_NO_SPACE = -18, @@ -208,7 +228,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_FILE_VIRUS_INFECTED = -19, @@ -217,7 +238,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_BLOCKED_BY_CLIENT = -20, @@ -226,7 +248,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_NETWORK_CHANGED = -21, @@ -236,7 +259,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_BLOCKED_BY_ADMINISTRATOR = -22, @@ -245,7 +269,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SOCKET_CONNECTED = -23, @@ -255,7 +280,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_UPLOAD_STREAM_REWIND_NOT_SUPPORTED = -25, @@ -265,7 +291,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CONTEXT_SHUT_DOWN = -26, @@ -276,7 +303,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_BLOCKED_BY_RESPONSE = -27, @@ -286,7 +314,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CLEARTEXT_NOT_PERMITTED = -29, @@ -295,7 +324,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_BLOCKED_BY_CSP = -30, @@ -304,7 +334,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_H2_OR_QUIC_REQUIRED = -31, @@ -313,7 +344,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_BLOCKED_BY_ORB = -32, @@ -322,7 +354,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CONNECTION_CLOSED = -100, @@ -331,7 +364,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CONNECTION_RESET = -101, @@ -340,7 +374,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CONNECTION_REFUSED = -102, @@ -350,7 +385,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CONNECTION_ABORTED = -103, @@ -359,7 +395,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CONNECTION_FAILED = -104, @@ -368,7 +405,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_NAME_NOT_RESOLVED = -105, @@ -377,7 +415,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_INTERNET_DISCONNECTED = -106, @@ -386,7 +425,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_PROTOCOL_ERROR = -107, @@ -396,7 +436,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_ADDRESS_INVALID = -108, @@ -406,7 +447,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_ADDRESS_UNREACHABLE = -109, @@ -415,7 +457,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_CLIENT_AUTH_CERT_NEEDED = -110, @@ -424,7 +467,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_TUNNEL_CONNECTION_FAILED = -111, @@ -433,7 +477,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_NO_SSL_VERSIONS_ENABLED = -112, @@ -443,7 +488,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_VERSION_OR_CIPHER_MISMATCH = -113, @@ -452,7 +498,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_RENEGOTIATION_REQUESTED = -114, @@ -462,7 +509,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_PROXY_AUTH_UNSUPPORTED = -115, @@ -471,7 +519,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_BAD_SSL_CLIENT_AUTH_CERT = -117, @@ -480,7 +529,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CONNECTION_TIMED_OUT = -118, @@ -490,7 +540,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_HOST_RESOLVER_QUEUE_TOO_LARGE = -119, @@ -499,7 +550,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SOCKS_CONNECTION_FAILED = -120, @@ -509,7 +561,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SOCKS_CONNECTION_HOST_UNREACHABLE = -121, @@ -518,7 +571,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_ALPN_NEGOTIATION_FAILED = -122, @@ -527,7 +581,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_NO_RENEGOTIATION = -123, @@ -537,7 +592,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_WINSOCK_UNEXPECTED_WRITTEN_BYTES = -124, @@ -548,7 +604,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_DECOMPRESSION_FAILURE_ALERT = -125, @@ -558,7 +615,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_BAD_RECORD_MAC_ALERT = -126, @@ -567,7 +625,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_PROXY_AUTH_REQUESTED = -127, @@ -579,7 +638,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_PROXY_CONNECTION_FAILED = -130, @@ -589,7 +649,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_MANDATORY_PROXY_CONFIGURATION_FAILED = -131, @@ -599,7 +660,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_PRECONNECT_MAX_SOCKET_LIMIT = -133, @@ -608,7 +670,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_CLIENT_AUTH_PRIVATE_KEY_ACCESS_DENIED = -134, @@ -617,7 +680,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_CLIENT_AUTH_CERT_NO_PRIVATE_KEY = -135, @@ -626,7 +690,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_PROXY_CERTIFICATE_INVALID = -136, @@ -635,7 +700,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_NAME_RESOLUTION_FAILED = -137, @@ -646,7 +712,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_NETWORK_ACCESS_DENIED = -138, @@ -655,7 +722,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_TEMPORARILY_THROTTLED = -139, /** @@ -665,7 +733,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_HTTPS_PROXY_TUNNEL_RESPONSE_REDIRECT = -140, @@ -679,7 +748,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED = -141, @@ -689,7 +759,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_MSG_TOO_BIG = -142, @@ -699,7 +770,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_WS_PROTOCOL_ERROR = -145, @@ -708,7 +780,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_ADDRESS_IN_USE = -147, @@ -717,7 +790,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_HANDSHAKE_NOT_COMPLETED = -148, @@ -726,7 +800,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_BAD_PEER_PUBLIC_KEY = -149, @@ -737,7 +812,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN = -150, @@ -746,7 +822,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CLIENT_AUTH_CERT_TYPE_UNSUPPORTED = -151, @@ -757,7 +834,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_DECRYPT_ERROR_ALERT = -153, @@ -767,7 +845,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_WS_THROTTLE_QUEUE_TOO_LARGE = -154, @@ -776,7 +855,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_SERVER_CERT_CHANGED = -156, @@ -785,7 +865,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_UNRECOGNIZED_NAME_ALERT = -159, @@ -794,7 +875,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SOCKET_SET_RECEIVE_BUFFER_SIZE_ERROR = -160, @@ -803,7 +885,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SOCKET_SET_SEND_BUFFER_SIZE_ERROR = -161, @@ -813,7 +896,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SOCKET_RECEIVE_BUFFER_SIZE_UNCHANGEABLE = -162, @@ -823,7 +907,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SOCKET_SEND_BUFFER_SIZE_UNCHANGEABLE = -163, @@ -833,7 +918,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_CLIENT_AUTH_CERT_BAD_FORMAT = -164, @@ -845,7 +931,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_ICANN_NAME_COLLISION = -166, @@ -856,7 +943,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_SERVER_CERT_BAD_FORMAT = -167, @@ -865,7 +953,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CT_STH_PARSING_FAILED = -168, @@ -875,7 +964,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CT_STH_INCOMPLETE = -169, @@ -887,7 +977,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_UNABLE_TO_REUSE_CONNECTION_FOR_PROXY_AUTH = -170, @@ -896,7 +987,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CT_CONSISTENCY_PROOF_PARSING_FAILED = -171, @@ -908,7 +1000,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_OBSOLETE_CIPHER = -172, @@ -918,7 +1011,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_WS_UPGRADE = -173, @@ -928,7 +1022,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_READ_IF_READY_NOT_IMPLEMENTED = -174, @@ -937,7 +1032,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_NO_BUFFER_SPACE = -176, @@ -947,7 +1043,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_CLIENT_AUTH_NO_COMMON_ALGORITHMS = -177, @@ -958,7 +1055,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_EARLY_DATA_REJECTED = -178, @@ -972,7 +1070,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_WRONG_VERSION_ON_EARLY_DATA = -179, @@ -985,7 +1084,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_TLS13_DOWNGRADE_DETECTED = -180, @@ -995,7 +1095,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_KEY_USAGE_INCOMPATIBLE = -181, @@ -1004,7 +1105,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_INVALID_ECH_CONFIG_LIST = -182, @@ -1014,7 +1116,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_ECH_NOT_NEGOTIATED = -183, @@ -1024,7 +1127,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_ECH_FALLBACK_CERTIFICATE_INVALID = -184, @@ -1041,7 +1145,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERT_COMMON_NAME_INVALID = -200, @@ -1055,7 +1160,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERT_DATE_INVALID = -201, @@ -1071,7 +1177,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERT_AUTHORITY_INVALID = -202, @@ -1085,7 +1192,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERT_CONTAINS_ERRORS = -203, @@ -1095,7 +1203,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERT_NO_REVOCATION_MECHANISM = -204, @@ -1109,7 +1218,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERT_UNABLE_TO_CHECK_REVOCATION = -205, @@ -1120,7 +1230,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERT_REVOKED = -206, @@ -1132,7 +1243,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERT_INVALID = -207, @@ -1142,7 +1254,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERT_WEAK_SIGNATURE_ALGORITHM = -208, @@ -1151,7 +1264,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERT_NON_UNIQUE_NAME = -210, @@ -1161,7 +1275,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERT_WEAK_KEY = -211, @@ -1170,7 +1285,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERT_NAME_CONSTRAINT_VIOLATION = -212, @@ -1179,7 +1295,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERT_VALIDITY_TOO_LONG = -213, @@ -1189,7 +1306,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERTIFICATE_TRANSPARENCY_REQUIRED = -214, @@ -1198,7 +1316,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERT_SYMANTEC_LEGACY = -215, @@ -1208,7 +1327,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERT_KNOWN_INTERCEPTION_BLOCKED = -217, @@ -1217,7 +1337,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SSL_OBSOLETE_VERSION_OR_CIPHER = -218, @@ -1226,7 +1347,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERT_END = -219, @@ -1235,7 +1357,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_INVALID_URL = -300, @@ -1244,7 +1367,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_DISALLOWED_URL_SCHEME = -301, @@ -1253,7 +1377,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_UNKNOWN_URL_SCHEME = -302, @@ -1262,7 +1387,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_INVALID_REDIRECT = -303, @@ -1271,7 +1397,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_TOO_MANY_REDIRECTS = -310, @@ -1281,7 +1408,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_UNSAFE_REDIRECT = -311, @@ -1290,7 +1418,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_UNSAFE_PORT = -312, @@ -1299,7 +1428,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_INVALID_RESPONSE = -320, @@ -1308,7 +1438,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_INVALID_CHUNKED_ENCODING = -321, @@ -1317,7 +1448,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_METHOD_UNSUPPORTED = -322, @@ -1327,7 +1459,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_UNEXPECTED_PROXY_AUTH = -323, @@ -1336,7 +1469,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_EMPTY_RESPONSE = -324, @@ -1345,7 +1479,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_RESPONSE_HEADERS_TOO_BIG = -325, @@ -1354,7 +1489,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_PAC_SCRIPT_FAILED = -327, @@ -1364,7 +1500,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_REQUEST_RANGE_NOT_SATISFIABLE = -328, @@ -1373,7 +1510,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_MALFORMED_IDENTITY = -329, @@ -1382,7 +1520,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CONTENT_DECODING_FAILED = -330, @@ -1392,7 +1531,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_NETWORK_IO_SUSPENDED = -331, @@ -1401,7 +1541,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SYN_REPLY_NOT_RECEIVED = -332, @@ -1410,7 +1551,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_ENCODING_CONVERSION_FAILED = -333, @@ -1419,7 +1561,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_UNRECOGNIZED_FTP_DIRECTORY_LISTING_FORMAT = -334, @@ -1428,7 +1571,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_NO_SUPPORTED_PROXIES = -336, @@ -1437,7 +1581,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_HTTP2_PROTOCOL_ERROR = -337, @@ -1446,7 +1591,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_INVALID_AUTH_CREDENTIALS = -338, @@ -1456,7 +1602,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_UNSUPPORTED_AUTH_SCHEME = -339, @@ -1465,7 +1612,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_ENCODING_DETECTION_FAILED = -340, @@ -1474,7 +1622,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_MISSING_AUTH_CREDENTIALS = -341, @@ -1483,7 +1632,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_UNEXPECTED_SECURITY_LIBRARY_STATUS = -342, @@ -1493,7 +1643,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_MISCONFIGURED_AUTH_ENVIRONMENT = -343, @@ -1502,7 +1653,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_UNDOCUMENTED_SECURITY_LIBRARY_STATUS = -344, @@ -1511,7 +1663,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_RESPONSE_BODY_TOO_BIG_TO_DRAIN = -345, @@ -1520,7 +1673,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_RESPONSE_HEADERS_MULTIPLE_CONTENT_LENGTH = -346, @@ -1530,7 +1684,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_INCOMPLETE_HTTP2_HEADERS = -347, @@ -1541,7 +1696,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_PAC_NOT_IN_DHCP = -348, @@ -1550,7 +1706,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_RESPONSE_HEADERS_MULTIPLE_CONTENT_DISPOSITION = -349, @@ -1559,7 +1716,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_RESPONSE_HEADERS_MULTIPLE_LOCATION = -350, @@ -1572,7 +1730,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_HTTP2_SERVER_REFUSED_STREAM = -351, @@ -1581,7 +1740,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_HTTP2_PING_FAILED = -352, @@ -1591,7 +1751,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CONTENT_LENGTH_MISMATCH = -354, @@ -1601,7 +1762,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_INCOMPLETE_CHUNKED_ENCODING = -355, @@ -1610,7 +1772,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_QUIC_PROTOCOL_ERROR = -356, @@ -1619,7 +1782,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_RESPONSE_HEADERS_TRUNCATED = -357, /** @@ -1628,7 +1792,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_QUIC_HANDSHAKE_FAILED = -358, @@ -1637,7 +1802,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_HTTP2_INADEQUATE_TRANSPORT_SECURITY = -360, @@ -1646,7 +1812,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_HTTP2_FLOW_CONTROL_ERROR = -361, @@ -1655,7 +1822,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_HTTP2_FRAME_SIZE_ERROR = -362, @@ -1664,7 +1832,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_HTTP2_COMPRESSION_ERROR = -363, @@ -1673,7 +1842,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_PROXY_AUTH_REQUESTED_WITH_NO_CONNECTION = -364, @@ -1682,7 +1852,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_HTTP_1_1_REQUIRED = -365, @@ -1691,7 +1862,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_PROXY_HTTP_1_1_REQUIRED = -366, @@ -1700,7 +1872,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_PAC_SCRIPT_TERMINATED = -367, @@ -1710,7 +1883,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_INVALID_HTTP_RESPONSE = -370, @@ -1719,7 +1893,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CONTENT_DECODING_INIT_FAILED = -371, @@ -1730,7 +1905,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_HTTP2_RST_STREAM_NO_ERROR_RECEIVED = -372, @@ -1739,7 +1915,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_HTTP2_PUSHED_STREAM_NOT_AVAILABLE = -373, @@ -1749,7 +1926,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_HTTP2_CLAIMED_PUSHED_STREAM_RESET_BY_SERVER = -374, @@ -1759,7 +1937,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_TOO_MANY_RETRIES = -375, @@ -1768,7 +1947,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_HTTP2_STREAM_CLOSED = -376, @@ -1777,7 +1957,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_HTTP2_CLIENT_REFUSED_STREAM = -377, @@ -1787,7 +1968,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_HTTP2_PUSHED_RESPONSE_DOES_NOT_MATCH = -378, @@ -1796,7 +1978,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_HTTP_RESPONSE_CODE_FAILURE = -379, @@ -1807,7 +1990,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_QUIC_UNKNOWN_CERT_ROOT = -380, @@ -1817,7 +2001,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_QUIC_GOAWAY_REQUEST_CAN_BE_RETRIED = -381, @@ -1826,7 +2011,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_TOO_MANY_ACCEPT_CH_RESTARTS = -382, @@ -1837,7 +2023,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_INCONSISTENT_IP_ADDRESS_SPACE = -383, @@ -1847,7 +2034,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CACHED_IP_ADDRESS_SPACE_BLOCKED_BY_LOCAL_NETWORK_ACCESS_POLICY = -384, @@ -1856,7 +2044,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CACHE_MISS = -400, @@ -1865,7 +2054,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CACHE_READ_FAILURE = -401, @@ -1874,7 +2064,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CACHE_WRITE_FAILURE = -402, @@ -1883,7 +2074,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CACHE_OPERATION_UNSUPPORTED = -403, @@ -1892,7 +2084,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CACHE_OPEN_FAILURE = -404, @@ -1901,7 +2094,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CACHE_CREATE_FAILURE = -405, @@ -1910,7 +2104,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CACHE_RACE = -406, @@ -1919,7 +2114,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CACHE_CHECKSUM_READ_FAILURE = -407, @@ -1928,7 +2124,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CACHE_CHECKSUM_MISMATCH = -408, @@ -1937,7 +2134,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CACHE_LOCK_TIMEOUT = -409, @@ -1947,7 +2145,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CACHE_AUTH_FAILURE_AFTER_READ = -410, @@ -1956,7 +2155,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CACHE_ENTRY_NOT_SUITABLE = -411, @@ -1965,7 +2165,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CACHE_DOOM_FAILURE = -412, @@ -1974,7 +2175,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CACHE_OPEN_OR_CREATE_FAILURE = -413, @@ -1983,7 +2185,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_INSECURE_RESPONSE = -501, @@ -1993,7 +2196,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_NO_PRIVATE_KEY_FOR_CERT = -502, @@ -2002,7 +2206,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_ADD_USER_CERT_FAILED = -503, @@ -2011,7 +2216,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_INVALID_SIGNED_EXCHANGE = -504, @@ -2020,7 +2226,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_INVALID_WEB_BUNDLE = -505, @@ -2030,7 +2237,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_TRUST_TOKEN_OPERATION_FAILED = -506, @@ -2041,7 +2249,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_TRUST_TOKEN_OPERATION_SUCCESS_WITHOUT_SENDING_REQUEST = -507, @@ -2051,7 +2260,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_FTP_FAILED = -601, @@ -2061,7 +2271,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_FTP_SERVICE_UNAVAILABLE = -602, @@ -2071,7 +2282,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_FTP_TRANSFER_ABORTED = -603, @@ -2081,7 +2293,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_FTP_FILE_BUSY = -604, @@ -2091,7 +2304,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_FTP_SYNTAX_ERROR = -605, @@ -2101,7 +2315,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_FTP_COMMAND_UNSUPPORTED = -606, @@ -2111,7 +2326,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_FTP_BAD_COMMAND_SEQUENCE = -607, @@ -2120,7 +2336,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_PKCS12_IMPORT_BAD_PASSWORD = -701, @@ -2129,7 +2346,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_PKCS12_IMPORT_FAILED = -702, @@ -2138,7 +2356,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_IMPORT_CA_CERT_NOT_CA = -703, @@ -2147,7 +2366,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_IMPORT_CERT_ALREADY_EXISTS = -704, @@ -2156,7 +2376,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_IMPORT_CA_CERT_FAILED = -705, @@ -2165,7 +2386,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_IMPORT_SERVER_CERT_FAILED = -706, @@ -2174,7 +2396,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_PKCS12_IMPORT_INVALID_MAC = -707, @@ -2183,7 +2406,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_PKCS12_IMPORT_INVALID_FILE = -708, @@ -2192,7 +2416,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_PKCS12_IMPORT_UNSUPPORTED = -709, @@ -2201,7 +2426,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_KEY_GENERATION_FAILED = -710, @@ -2210,7 +2436,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_PRIVATE_KEY_EXPORT_FAILED = -712, @@ -2219,7 +2446,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_SELF_SIGNED_CERT_GENERATION_FAILED = -713, @@ -2228,7 +2456,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERT_DATABASE_CHANGED = -714, @@ -2237,7 +2466,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_CERT_VERIFIER_CHANGED = -716, @@ -2246,7 +2476,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_DNS_MALFORMED_RESPONSE = -800, @@ -2255,7 +2486,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_DNS_SERVER_REQUIRES_TCP = -801, @@ -2272,7 +2504,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_DNS_SERVER_FAILED = -802, /** @@ -2280,7 +2513,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_DNS_TIMED_OUT = -803, @@ -2290,7 +2524,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_DNS_CACHE_MISS = -804, @@ -2299,7 +2534,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_DNS_SEARCH_EMPTY = -805, @@ -2308,7 +2544,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_DNS_SORT_ERROR = -806, @@ -2317,7 +2554,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_DNS_SECURE_RESOLVER_HOSTNAME_RESOLUTION_FAILED = -808, @@ -2328,7 +2566,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_DNS_NAME_HTTPS_ONLY = -809, @@ -2337,7 +2576,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_DNS_REQUEST_CANCELED = -810, @@ -2347,7 +2587,8 @@ export declare enum WebNetErrorList { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ ERR_DNS_NO_MATCHING_SUPPORTED_ALPN = -811, } \ No newline at end of file diff --git a/api/@ohos.web.webview.d.ts b/api/@ohos.web.webview.d.ts index 5911146701..0a42f4b3d6 100644 --- a/api/@ohos.web.webview.d.ts +++ b/api/@ohos.web.webview.d.ts @@ -18,11 +18,15 @@ * @kit ArkWeb */ +/*** if arkts 1.2 */ +import { Resource } from './global/resource'; +/*** endif */ import { AsyncCallback, BusinessError } from './@ohos.base'; import { Callback } from './@ohos.base'; -import cert from './@ohos.security.cert'; -import image from './@ohos.multimedia.image'; +import type cert from './@ohos.security.cert'; +import type image from './@ohos.multimedia.image'; import type print from './@ohos.print'; + import { WebNetErrorList } from './@ohos.web.netErrorList'; /** @@ -47,7 +51,8 @@ import { WebNetErrorList } from './@ohos.web.netErrorList'; * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace webview { /** @@ -81,7 +86,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface WebHeader { /** @@ -101,7 +107,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ headerKey: string; @@ -122,7 +129,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ headerValue: string; } @@ -138,7 +146,8 @@ declare namespace webview { * @enum {number} * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ enum WebHitTestType { /** @@ -150,7 +159,8 @@ declare namespace webview { * The edit text. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ EditText, @@ -163,7 +173,8 @@ declare namespace webview { * The email address. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Email, @@ -176,7 +187,8 @@ declare namespace webview { * The HTML::a tag with src=http. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ HttpAnchor, @@ -189,7 +201,8 @@ declare namespace webview { * The HTML::a tag with src=http + HTML::img. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ HttpAnchorImg, @@ -202,7 +215,8 @@ declare namespace webview { * The HTML::img tag. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Img, @@ -215,7 +229,8 @@ declare namespace webview { * The map address. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Map, @@ -228,7 +243,8 @@ declare namespace webview { * The phone number. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Phone, @@ -241,7 +257,8 @@ declare namespace webview { * Other unknown HitTest. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ Unknown } @@ -257,7 +274,8 @@ declare namespace webview { * @enum {number} * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ enum SecureDnsMode { /** @@ -269,7 +287,8 @@ declare namespace webview { * Do not use HttpDns, can be used to revoke previously used HttpDns configuration. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ OFF = 0, /** @@ -283,7 +302,8 @@ declare namespace webview { * the system dns is used for resolution. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ AUTO = 1, /** @@ -297,7 +317,8 @@ declare namespace webview { * fall back to the system dns, which will directly cause the page to fail to load. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SECURE_ONLY = 2, } @@ -308,7 +329,8 @@ declare namespace webview { * @enum {number} * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ enum SecurityLevel { /** @@ -316,7 +338,8 @@ declare namespace webview { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ NONE = 0, @@ -325,7 +348,8 @@ declare namespace webview { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ SECURE = 1, @@ -335,7 +359,8 @@ declare namespace webview { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ WARNING = 2, @@ -344,7 +369,8 @@ declare namespace webview { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ DANGEROUS = 3, } @@ -354,14 +380,16 @@ declare namespace webview { * @enum {number} * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum MediaPlaybackState { /** * No audio or video currently. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NONE = 0, @@ -369,7 +397,8 @@ declare namespace webview { * The audio and video on the page are being played. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PLAYING = 1, @@ -377,7 +406,8 @@ declare namespace webview { * The audio and video on the page are paused. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ PAUSED = 2, @@ -385,7 +415,8 @@ declare namespace webview { * The audio and video on the page are stopped. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ STOPPED = 3 } @@ -395,14 +426,16 @@ declare namespace webview { * @enum {number} * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ enum PressureLevel { /** * Modules are advised to free buffers that are cheap to re-allocate and not immediately needed. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ MEMORY_PRESSURE_LEVEL_MODERATE = 1, @@ -410,7 +443,8 @@ declare namespace webview { * At this level, modules are advised to free all possible memory. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ MEMORY_PRESSURE_LEVEL_CRITICAL = 2 } @@ -436,7 +470,8 @@ declare namespace webview { * @typedef HitTestValue * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface HitTestValue { @@ -452,7 +487,8 @@ declare namespace webview { * @type { WebHitTestType } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ type: WebHitTestType; @@ -469,7 +505,8 @@ declare namespace webview { * @type { string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ extra: string; } @@ -495,7 +532,8 @@ declare namespace webview { * @typedef WebCustomScheme * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface WebCustomScheme { @@ -511,7 +549,8 @@ declare namespace webview { * @type { string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ schemeName: string; @@ -527,7 +566,8 @@ declare namespace webview { * @type { boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isSupportCORS: boolean; @@ -543,7 +583,8 @@ declare namespace webview { * @type { boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isSupportFetch: boolean; @@ -555,7 +596,8 @@ declare namespace webview { * @type { ?boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ isStandard?: boolean; @@ -566,7 +608,8 @@ declare namespace webview { * @type { ?boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ isLocal?: boolean; @@ -577,7 +620,8 @@ declare namespace webview { * @type { ?boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ isDisplayIsolated?: boolean; @@ -588,7 +632,8 @@ declare namespace webview { * @type { ?boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ isSecure?: boolean; @@ -599,7 +644,8 @@ declare namespace webview { * @type { ?boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ isCspBypassing?: boolean; @@ -608,7 +654,8 @@ declare namespace webview { * * @type { ?boolean } * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ isCodeCacheSupported?: boolean; } @@ -618,7 +665,8 @@ declare namespace webview { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ class PdfData { /** @@ -627,7 +675,8 @@ declare namespace webview { * @returns { Uint8Array } return pdf data. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ pdfArrayBuffer(): Uint8Array; } @@ -638,7 +687,8 @@ declare namespace webview { * @typedef PdfConfiguration * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ interface PdfConfiguration { /** @@ -647,7 +697,8 @@ declare namespace webview { * @type { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ width: number; @@ -657,7 +708,8 @@ declare namespace webview { * @type { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ height: number; @@ -667,7 +719,8 @@ declare namespace webview { * @type { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ marginTop: number; @@ -677,7 +730,8 @@ declare namespace webview { * @type { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ marginBottom: number; @@ -687,7 +741,8 @@ declare namespace webview { * @type { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ marginRight: number; @@ -697,7 +752,8 @@ declare namespace webview { * @type { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ marginLeft: number; @@ -707,17 +763,19 @@ declare namespace webview { * @type { ?number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ scale?: number; /** - * Whether background should be printed when creating pdf. + * Whether background should be printed when creating pdf. * * @type { ?boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ shouldPrintBackground?: boolean; } @@ -752,7 +810,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ interface WebStorageOrigin { /** @@ -774,9 +833,10 @@ declare namespace webview { * * @type { string } * @syscap SystemCapability.Web.Webview.Core - * @crossplatform + * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ origin: string; /** @@ -798,9 +858,10 @@ declare namespace webview { * * @type { number } * @syscap SystemCapability.Web.Webview.Core - * @crossplatform + * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ usage: number; /** @@ -822,9 +883,10 @@ declare namespace webview { * * @type { number } * @syscap SystemCapability.Web.Webview.Core - * @crossplatform + * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ quota: number; } @@ -835,7 +897,8 @@ declare namespace webview { * @typedef RequestInfo * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface RequestInfo { /** @@ -843,7 +906,8 @@ declare namespace webview { * @type { string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ url: string; @@ -852,7 +916,8 @@ declare namespace webview { * @type { string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ method: string; @@ -861,7 +926,8 @@ declare namespace webview { * @type { string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ formData: string; } @@ -873,7 +939,8 @@ declare namespace webview { * @typedef ScrollOffset * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ interface ScrollOffset { /** @@ -881,7 +948,8 @@ declare namespace webview { * @type { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ x: number; @@ -890,7 +958,8 @@ declare namespace webview { * @type { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 13 + * @since arkts {'1.1':'13', '1.2':'20'} + * @arkts 1.1&1.2 */ y: number; } @@ -916,7 +985,8 @@ declare namespace webview { *
    2. Incorrect parameter types. 3.Parameter verification failed. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function once(type: string, callback: Callback): void; @@ -944,7 +1014,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ class WebStorage { /** @@ -971,7 +1042,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static deleteAllData(incognito?: boolean): void; @@ -1006,7 +1078,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static deleteOrigin(origin: string): void; @@ -1040,7 +1113,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static getOrigins(): Promise>; @@ -1074,7 +1148,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static getOrigins(callback: AsyncCallback>): void; @@ -1108,7 +1183,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static getOriginQuota(origin: string): Promise; @@ -1143,7 +1219,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static getOriginQuota(origin: string, callback: AsyncCallback): void; @@ -1178,7 +1255,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static getOriginUsage(origin: string): Promise; @@ -1213,7 +1291,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static getOriginUsage(origin: string, callback: AsyncCallback): void; } @@ -1233,7 +1312,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ class WebDataBase { /** @@ -1248,7 +1328,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static existHttpAuthCredentials(): boolean; @@ -1264,7 +1345,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static deleteHttpAuthCredentials(): void; @@ -1287,7 +1369,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static getHttpAuthCredentials(host: string, realm: string): Array; @@ -1312,7 +1395,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static saveHttpAuthCredentials(host: string, realm: string, username: string, password: string): void; } @@ -1338,7 +1422,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ class GeolocationPermissions { /** @@ -1374,7 +1459,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static allowGeolocation(origin: string, incognito?: boolean): void; @@ -1409,7 +1495,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static deleteGeolocation(origin: string, incognito?: boolean): void; @@ -1430,6 +1517,7 @@ declare namespace webview { */ /** * Clears the geolocation permission status of all sources. + * Delete all geolocation permissions. * * @param { boolean } incognito - Whether to clear the geolocation permission status of all sources in incognito * mode. {@code true} means to clear the geolocation permission status of @@ -1438,7 +1526,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static deleteAllGeolocation(incognito?: boolean): void; @@ -1488,7 +1577,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static getAccessibleGeolocation(origin: string, incognito?: boolean): Promise; @@ -1541,7 +1631,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static getAccessibleGeolocation(origin: string, callback: AsyncCallback, incognito?: boolean): void; @@ -1577,7 +1668,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static getStoredGeolocation(incognito?: boolean): Promise>; @@ -1612,7 +1704,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static getStoredGeolocation(callback: AsyncCallback>, incognito?: boolean): void; } @@ -1629,7 +1722,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ class WebCookieManager { /** @@ -1659,7 +1753,8 @@ declare namespace webview { * @throws { BusinessError } 17100002 - URL error. No valid cookie found for the specified URL. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static fetchCookieSync(url: string, incognito?: boolean): string; @@ -1674,7 +1769,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static fetchCookie(url: string): Promise; @@ -1689,7 +1785,8 @@ declare namespace webview { *
    2. Incorrect parameter types. * @throws { BusinessError } 17100002 - URL error. No valid cookie found for the specified URL. * @syscap SystemCapability.Web.Webview.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ static fetchCookie(url: string, incognito: boolean): Promise; @@ -1704,7 +1801,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static fetchCookie(url: string, callback: AsyncCallback): void; @@ -1717,7 +1815,7 @@ declare namespace webview { *
    2. Incorrect parameter types. * @throws { BusinessError } 17100002 - URL error. No valid cookie found for the specified URL. * @throws { BusinessError } 17100005 - The provided cookie value is invalid. It must follow the format specified - *
    in RFC 6265. + *
    in RFC 6265. * @syscap SystemCapability.Web.Webview.Core * @since 9 * @deprecated since 11 @@ -1739,7 +1837,8 @@ declare namespace webview { *
    in RFC 6265. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static configCookieSync(url: string, value: string, incognito?: boolean): void; @@ -1758,7 +1857,8 @@ declare namespace webview { * @throws { BusinessError } 17100005 - The provided cookie value is invalid. It must follow the format specified *
    in RFC 6265. * @syscap SystemCapability.Web.Webview.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ static configCookieSync(url: string, value: string, incognito: boolean, includeHttpOnly: boolean): void; @@ -1776,7 +1876,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static configCookie(url: string, value: string): Promise; @@ -1796,7 +1897,8 @@ declare namespace webview { * @throws { BusinessError } 17100005 - The provided cookie value is invalid. It must follow the format specified *
    in RFC 6265. * @syscap SystemCapability.Web.Webview.Core - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ static configCookie(url: string, value: string, incognito: boolean, includeHttpOnly: boolean): Promise; @@ -1814,14 +1916,16 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static configCookie(url: string, value: string, callback: AsyncCallback): void; /** * Save the cookies synchronously. * @syscap SystemCapability.Web.Webview.Core - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ static saveCookieSync(): void; @@ -1840,7 +1944,8 @@ declare namespace webview { *
    2. Incorrect parameter types. 3.Parameter verification failed. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static saveCookieAsync(): Promise; @@ -1859,7 +1964,8 @@ declare namespace webview { *
    2. Incorrect parameter types. 3.Parameter verification failed. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static saveCookieAsync(callback: AsyncCallback): void; @@ -1876,7 +1982,8 @@ declare namespace webview { * @returns { boolean } True if the instance can send and accept cookies else false. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static isCookieAllowed(): boolean; @@ -1898,7 +2005,8 @@ declare namespace webview { *
    2. Incorrect parameter types. 3.Parameter verification failed. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static putAcceptCookieEnabled(accept: boolean): void; @@ -1915,7 +2023,8 @@ declare namespace webview { * @returns { boolean } True if the instance can send and accept thirdparty cookies else false. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static isThirdPartyCookieAllowed(): boolean; @@ -1938,7 +2047,8 @@ declare namespace webview { *
    2. Incorrect parameter types. 3.Parameter verification failed. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static putAcceptThirdPartyCookieEnabled(accept: boolean): void; @@ -1968,7 +2078,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static existCookie(incognito?: boolean): boolean; @@ -1988,7 +2099,8 @@ declare namespace webview { * {@code false} otherwise. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static clearAllCookiesSync(incognito?: boolean): void; @@ -1999,7 +2111,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static clearAllCookies(): Promise; @@ -2011,7 +2124,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static clearAllCookies(callback: AsyncCallback): void; @@ -2028,7 +2142,8 @@ declare namespace webview { * Delete the session cookies. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static clearSessionCookieSync(): void; @@ -2038,7 +2153,8 @@ declare namespace webview { * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ static clearSessionCookie(): Promise; @@ -2059,7 +2175,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ static clearSessionCookie(callback: AsyncCallback): void; } @@ -2086,7 +2203,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ enum WebMessageType { /** @@ -2100,7 +2218,8 @@ declare namespace webview { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ NOT_SUPPORT, @@ -2123,7 +2242,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ STRING, @@ -2146,7 +2266,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ NUMBER, @@ -2169,7 +2290,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ BOOLEAN, @@ -2184,7 +2306,8 @@ declare namespace webview { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ ARRAY_BUFFER, @@ -2207,7 +2330,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ ARRAY, @@ -2230,7 +2354,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ ERROR } @@ -2254,7 +2379,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ class WebMessageExt { /** @@ -2276,7 +2402,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getType(): WebMessageType; @@ -2305,7 +2432,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getString(): string; @@ -2334,7 +2462,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getNumber(): number; @@ -2363,7 +2492,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getBoolean(): boolean; @@ -2382,7 +2512,8 @@ declare namespace webview { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getArrayBuffer(): ArrayBuffer; @@ -2411,7 +2542,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getArray(): Array; @@ -2440,7 +2572,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getError(): Error; @@ -2474,7 +2607,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ setType(type: WebMessageType): void; @@ -2508,7 +2642,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ setString(message: string): void; @@ -2542,7 +2677,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ setNumber(message: number): void; @@ -2576,7 +2712,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ setBoolean(message: boolean): void; @@ -2598,7 +2735,8 @@ declare namespace webview { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ setArrayBuffer(message: ArrayBuffer): void; @@ -2629,7 +2767,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ setArray(message: Array): void; @@ -2664,7 +2803,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ setError(message: Error): void; } @@ -2681,7 +2821,8 @@ declare namespace webview { * @typedef { ArrayBuffer | string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ type WebMessage = ArrayBuffer | string; /** @@ -2704,7 +2845,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface WebMessagePort { /** @@ -2719,7 +2861,8 @@ declare namespace webview { * @type { ?boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isExtentionType?: boolean; @@ -2733,7 +2876,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ close(): void; @@ -2754,7 +2898,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ postMessageEvent(message: WebMessage): void; @@ -2775,7 +2920,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onMessageEvent(callback: (result: WebMessage) => void): void; @@ -2806,7 +2952,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ postMessageEventExt(message: WebMessageExt): void; @@ -2837,7 +2984,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ onMessageEventExt(callback: (result: WebMessageExt) => void): void; } @@ -2862,7 +3010,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface HistoryItem { /** @@ -2875,7 +3024,8 @@ declare namespace webview { * @type { image.PixelMap } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ icon: image.PixelMap; @@ -2890,7 +3040,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ historyUrl: string; @@ -2905,7 +3056,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ historyRawUrl: string; @@ -2920,7 +3072,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ title: string; } @@ -2945,7 +3098,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface BackForwardList { /** @@ -2955,13 +3109,14 @@ declare namespace webview { */ /** * Current index in BackForwardList. - * @type { number } + * @type { int } * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - currentIndex: number; + currentIndex: int; /** * Size of in BackForwardList. @@ -2970,18 +3125,19 @@ declare namespace webview { */ /** * Size of in BackForwardList. - * @type { number } + * @type { int } * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - size: number; + size: int; /** * Get history entry at given index. * - * @param { number } index Index of back forward list entry. + * @param { int } index Index of back forward list entry. * @returns { HistoryItem } HistoryItem at given index in back forward list. * @throws { BusinessError } 401 - Invalid input parameter. * @syscap SystemCapability.Web.Webview.Core @@ -2990,16 +3146,17 @@ declare namespace webview { /** * Get history entry at given index. * - * @param { number } index Index of back forward list entry. + * @param { int } index Index of back forward list entry. * @returns { HistoryItem } HistoryItem at given index in back forward list. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified. *
    2. Incorrect parameter types. 3.Parameter verification failed. * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - getItemAtIndex(index: number): HistoryItem; + getItemAtIndex(index: int): HistoryItem; } /** @@ -3008,7 +3165,8 @@ declare namespace webview { * @typedef SnapshotInfo * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface SnapshotInfo { /** @@ -3017,7 +3175,8 @@ declare namespace webview { * @type { ?string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ id?: string; @@ -3038,7 +3197,8 @@ declare namespace webview { * @typedef SnapshotResult * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface SnapshotResult { /** @@ -3047,7 +3207,8 @@ declare namespace webview { * @type { ?string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ id?: string; @@ -3057,7 +3218,8 @@ declare namespace webview { * @type { ?boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ status?: boolean; @@ -3077,7 +3239,8 @@ declare namespace webview { * @type { ?image.PixelMap } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ imagePixelMap?: image.PixelMap; } @@ -3100,7 +3263,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ enum JsMessageType { /** @@ -3112,7 +3276,8 @@ declare namespace webview { * Unsupported data type. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ NOT_SUPPORT, @@ -3132,7 +3297,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ STRING, @@ -3152,7 +3318,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ NUMBER, @@ -3172,7 +3339,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ BOOLEAN, @@ -3185,7 +3353,8 @@ declare namespace webview { * The arraybuffer data type. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ ARRAY_BUFFER, @@ -3205,7 +3374,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ ARRAY } @@ -3226,7 +3396,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ class JsMessageExt { /** @@ -3248,7 +3419,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getType(): JsMessageType; @@ -3274,7 +3446,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getString(): string; @@ -3300,7 +3473,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getNumber(): number; @@ -3326,7 +3500,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getBoolean(): boolean; @@ -3343,7 +3518,8 @@ declare namespace webview { * @throws { BusinessError } 17100014 - The type and value of the message do not match. * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getArrayBuffer(): ArrayBuffer; @@ -3369,7 +3545,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ getArray(): Array; } @@ -3380,7 +3557,8 @@ declare namespace webview { * @enum {number} * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum RenderProcessMode { /** @@ -3388,7 +3566,8 @@ declare namespace webview { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ SINGLE = 0, @@ -3397,7 +3576,8 @@ declare namespace webview { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ MULTIPLE, } @@ -3406,7 +3586,8 @@ declare namespace webview { * Options of generating code cache * @typedef CacheOptions * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface CacheOptions { /** @@ -3415,7 +3596,8 @@ declare namespace webview { * * @type { Array } * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ responseHeaders: Array; } @@ -3424,14 +3606,16 @@ declare namespace webview { * Enum type supplied to {@link OfflineResourceMap} for indicating the type of resource. * @enum {number} * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ enum OfflineResourceType { /** * Resource of the image type. * * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ IMAGE, @@ -3439,7 +3623,8 @@ declare namespace webview { * Resource of the CSS type. * * @syscap SystemCapability.Web.Webview.Core - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ CSS, @@ -3447,7 +3632,8 @@ declare namespace webview { * Javascript resource loaded through the